diff --git a/trunk/novell4gentoo/app-admin/novell-ndssfrep/Manifest b/trunk/novell4gentoo/app-admin/novell-ndssfrep/Manifest
index 3e7548d..c872cc5 100644
--- a/trunk/novell4gentoo/app-admin/novell-ndssfrep/Manifest
+++ b/trunk/novell4gentoo/app-admin/novell-ndssfrep/Manifest
@@ -1,5 +1,4 @@
 DIST c1_136h-linux.tar.gz 41771356 RMD160 0c2b8ac9309962492936a5c988ec519103bad0f2 SHA1 de6525532a5b89b0872c129a54bb82e8f2e08aec SHA256 481c20119c0d84659a25a5f79e32740b27c7ffa69d4ac1ce810aeebbae211a2b
-EBUILD novell-ndssfrep-8.7.0.1.ebuild 3243 RMD160 beb360a3ddb55b53bebdd5ba2660c485cb6def07 SHA1 4098fa5f41ebe38ddb2bd8006c551ed6204c70a2 SHA256 609966757e52bc6658791bde31ea76fe8ae1c14970ef178f30a7bf3f5635a1a2
-EBUILD novell-ndssfrep-8.7.0_p1-r5.ebuild 3255 RMD160 e248f48e1a5e7c6c2720f119e22236a52f3495fb SHA1 eadd87b49fc59f4f135402816e730de52a4ba4aa SHA256 d7919f56c6019603efd96c1b80163649e30b53e89b7dacf9239c4c51d3800d95
+EBUILD novell-ndssfrep-8.7.0.1.ebuild 3255 RMD160 d70428290b651500a50f96ce07a562aab7c6b1e5 SHA1 2749254286f464238a27d5e560c43bb93549eebd SHA256 355908a325d89d1cbcb72fb55736bc08935530f41bb03b8657397cfa84e63df9
 MISC ChangeLog 2031 RMD160 469fdca90dc32c9a57b5b17c23b412d401e31854 SHA1 d0a158aa71ade87e73bf5e9de2f358ad420580cd SHA256 421f4a339d45e62a85ac7a867121e7ddac889eb9af5283f52c4570f6c87979bd
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/app-admin/novell-ndssfrep/novell-ndssfrep-8.7.0.1.ebuild b/trunk/novell4gentoo/app-admin/novell-ndssfrep/novell-ndssfrep-8.7.0.1.ebuild
index 40b179b..8d9958b 100644
--- a/trunk/novell4gentoo/app-admin/novell-ndssfrep/novell-ndssfrep-8.7.0.1.ebuild
+++ b/trunk/novell4gentoo/app-admin/novell-ndssfrep/novell-ndssfrep-8.7.0.1.ebuild
@@ -6,7 +6,7 @@ NOVELL_BUILDID="-a_gSRIUOK0~"
 NOVELL_FILE32="c1_136h-linux.tar.gz"
 RESTRICT="mirror strip"
 
-inherit novell eutils rpm java-utils-2
+inherit novell eutils rpm java-utils-2 versionator
 
 MY_PV=$(replace_version_separator 3 '-')
 
diff --git a/trunk/novell4gentoo/app-admin/novell-ndssfrep/novell-ndssfrep-8.7.0_p1-r5.ebuild b/trunk/novell4gentoo/app-admin/novell-ndssfrep/novell-ndssfrep-8.7.0_p1-r5.ebuild
deleted file mode 100644
index 7b7ce3f..0000000
--- a/trunk/novell4gentoo/app-admin/novell-ndssfrep/novell-ndssfrep-8.7.0_p1-r5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NOVELL_BUILDID="-a_gSRIUOK0~"
-NOVELL_FILE32="c1_136h-linux.tar.gz"
-RESTRICT="mirror strip"
-
-inherit novell eutils rpm java-utils-2
-
-MY_PV="${PV/_p/-}"
-DESCRIPTION="Novell NDS Filterd Replica Snapins"
-HOMEPAGE="http://www.novell.com"
-SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32}"
-LICENSE="Novell-eDir-87"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_pt linguas_ru"
-DEPEND=""
-RDEPEND="virtual/libc
-	>=virtual/jdk-1.4
-	>=app-admin/novell-novlc1-1.3.6_p1"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
-	cd ${PN}-${MY_PV}
-	rpm_unpack "${WORKDIR}"/Linux/NDSsfrep-${MY_PV}.i386.rpm
-	use linguas_de && rpm_unpack "${WORKDIR}"/Linux/NDSsfrep_de-${MY_PV}.i386.rpm
-	use linguas_es && rpm_unpack "${WORKDIR}"/Linux/NDSsfrep_es-${MY_PV}.i386.rpm
-	use linguas_fr && rpm_unpack "${WORKDIR}"/Linux/NDSsfrep_fr-${MY_PV}.i386.rpm
-	use linguas_it && rpm_unpack "${WORKDIR}"/Linux/NDSsfrep_it-${MY_PV}.i386.rpm
-	use linguas_pt && rpm_unpack "${WORKDIR}"/Linux/NDSsfrep_pt-${MY_PV}.i386.rpm
-	use linguas_ru && rpm_unpack "${WORKDIR}"/Linux/NDSsfrep_ru-${MY_PV}.i386.rpm
-}
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_jarinto /usr/ConsoleOne/lib/dirxml
-	java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/lib/dirxml/*.jar
-	java-pkg_jarinto /usr/ConsoleOne/snapins/dirxml
-	java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/dirxml/FilteredReplica.jar
-	java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/dirxml/rwiz.jar
-	if use linguas_de || use linguas_es || use linguas_fr || use linguas_it || use linguas_pt || use linguas_ru ; then
-	    java-pkg_jarinto /usr/ConsoleOne/resources/dirxml
-	    use linguas_de && java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/dirxml/*_de.jar
-	    use linguas_es && java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/dirxml/*_es.jar
-	    use linguas_fr && java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/dirxml/*_fr.jar
-	    use linguas_it && java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/dirxml/*_it.jar
-	    use linguas_pt && java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/dirxml/*_pt.jar
-	    use linguas_ru && java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/dirxml/*_ru.jar
-	fi
-
-	insinto /usr/ConsoleOne/help
-	doins -r "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/help/*
-}
-
-pkg_nofetch() {
-	einfo "This files require you to register at ${HOMEPAGE} (free account)"
-	einfo "Please download following file:"
-	einfo " - ${NOVELL_FILE32}"
-	einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID}"
-	einfo "and place it in ${DISTDIR}"
-	einfo ""
-	einfo "To get rid of downloading files from ${HOMEPAGE}"
-	einfo "you can create a file /etc/portage/novell.acc"
-	einfo "containing the novell account infos with following commands"
-	einfo "# echo \"NOVELL_ACCOUNT_USERNAME=\\\"balduin\\\"\" >> /etc/portage/novell.acc"
-	einfo "# echo \"NOVELL_ACCOUNT_PASSWORD=\\\"derfisch\\\"\" >> /etc/portage/novell.acc"
-}