diff --git a/trunk/novell4gentoo/app-admin/novell-ndssimgr/Manifest b/trunk/novell4gentoo/app-admin/novell-ndssimgr/Manifest
index 0289b22f..7a7995e5 100644
--- a/trunk/novell4gentoo/app-admin/novell-ndssimgr/Manifest
+++ b/trunk/novell4gentoo/app-admin/novell-ndssimgr/Manifest
@@ -1,5 +1,4 @@
 DIST c1_136h-linux.tar.gz 41771356 RMD160 0c2b8ac9309962492936a5c988ec519103bad0f2 SHA1 de6525532a5b89b0872c129a54bb82e8f2e08aec SHA256 481c20119c0d84659a25a5f79e32740b27c7ffa69d4ac1ce810aeebbae211a2b
-EBUILD novell-ndssimgr-8.7.0.1.ebuild 3055 RMD160 fe8de09489b4192e8dea164bfb6f49471a003f13 SHA1 94905987bb63f88efe2199b9d243592e2a550eb5 SHA256 742be379bfdc8d346fd560cb044638d45b938590475eb55cb98ba4c6fa2a8b28
-EBUILD novell-ndssimgr-8.7.0_p1-r5.ebuild 3068 RMD160 8fc74e1ec0d2ae44547633c5b94c9b9e6ee9d3d5 SHA1 01384d6e192ed1ecbb3e0decf70a3f6bcdd89ffe SHA256 5d475ebe0b5f1ac71c74070ad9c477cfd161b4e5d5549ce3315a7869fbdb09c4
+EBUILD novell-ndssimgr-8.7.0.1.ebuild 3067 RMD160 df1b5aada831966d087451e4126ef7c0cf98d740 SHA1 10b4824832d2a0d0e998c1391f12785304f1313d SHA256 7b7dec267395b483b6c761704bcff589f63d3465bcb021ff65413a6f633eb877
 MISC ChangeLog 1714 RMD160 596f28257f9d58908db7680ff73a356cee5b8059 SHA1 ca091d1bf909927a5486f5655ff0809f29fd9953 SHA256 13ec2581266092591cf2fcb56cb4d4097ef1175041d0cf1c3c3ca9fa993277a4
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/app-admin/novell-ndssimgr/novell-ndssimgr-8.7.0.1.ebuild b/trunk/novell4gentoo/app-admin/novell-ndssimgr/novell-ndssimgr-8.7.0.1.ebuild
index 73ab3b38..920d0628 100644
--- a/trunk/novell4gentoo/app-admin/novell-ndssimgr/novell-ndssimgr-8.7.0.1.ebuild
+++ b/trunk/novell4gentoo/app-admin/novell-ndssimgr/novell-ndssimgr-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-ndssimgr/novell-ndssimgr-8.7.0_p1-r5.ebuild b/trunk/novell4gentoo/app-admin/novell-ndssimgr/novell-ndssimgr-8.7.0_p1-r5.ebuild
deleted file mode 100644
index 3fbf9a02..00000000
--- a/trunk/novell4gentoo/app-admin/novell-ndssimgr/novell-ndssimgr-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 IndexManager ConsoleOne 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/NDSsimgr-${MY_PV}.i386.rpm
-	use linguas_de && rpm_unpack "${WORKDIR}"/Linux/NDSsimgr_de-${MY_PV}.i386.rpm
-	use linguas_es && rpm_unpack "${WORKDIR}"/Linux/NDSsimgr_es-${MY_PV}.i386.rpm
-	use linguas_fr && rpm_unpack "${WORKDIR}"/Linux/NDSsimgr_fr-${MY_PV}.i386.rpm
-	use linguas_it && rpm_unpack "${WORKDIR}"/Linux/NDSsimgr_it-${MY_PV}.i386.rpm
-	use linguas_pt && rpm_unpack "${WORKDIR}"/Linux/NDSsimgr_pt-${MY_PV}.i386.rpm
-	use linguas_ru && rpm_unpack "${WORKDIR}"/Linux/NDSsimgr_ru-${MY_PV}.i386.rpm
-}
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_jarinto /usr/ConsoleOne/snapins/indxmgr
-	java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/indxmgr/indexmanager.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/indxmgr
-	    use linguas_de && java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/indxmgr/*_de.jar
-	    use linguas_es && java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/indxmgr/*_es.jar
-	    use linguas_fr && java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/indxmgr/*_fr.jar
-	    use linguas_it && java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/indxmgr/*_it.jar
-	    use linguas_pt && java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/indxmgr/*_pt.jar
-	    use linguas_ru && java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/indxmgr/*_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"
-}