diff --git a/trunk/novell4gentoo/app-admin/novell-ndssslp/Manifest b/trunk/novell4gentoo/app-admin/novell-ndssslp/Manifest
index 34cd4935..667fa6ea 100644
--- a/trunk/novell4gentoo/app-admin/novell-ndssslp/Manifest
+++ b/trunk/novell4gentoo/app-admin/novell-ndssslp/Manifest
@@ -1,5 +1,4 @@
 DIST c1_136h-linux.tar.gz 41771356 RMD160 0c2b8ac9309962492936a5c988ec519103bad0f2 SHA1 de6525532a5b89b0872c129a54bb82e8f2e08aec SHA256 481c20119c0d84659a25a5f79e32740b27c7ffa69d4ac1ce810aeebbae211a2b
-EBUILD novell-ndssslp-8.7.0.1.ebuild 2024 RMD160 ea1f00b285be0e5a391b61aa4fdfb01877e318d0 SHA1 26dba3c80f737211effbfb8950dc4ccdd6adffd0 SHA256 380d8956ad215f74a250c7cd3003158d3c2456c3394cdee95e0f2b07c87d5fa2
-EBUILD novell-ndssslp-8.7.0_p1-r5.ebuild 2011 RMD160 4b604e5b18e852903c09f42471a39166705654d5 SHA1 2aac6f85ed236706011e444f1df246cd2bc2211c SHA256 b6c7ce35a1a76497a130405c6bdf569de3af2c0c4d92134fe4c2d473c3061770
+EBUILD novell-ndssslp-8.7.0.1.ebuild 2036 RMD160 cd7e61251bc3376981869e7b2cba2570b267b2ab SHA1 930ebb74515233188131d63261bc7c12889e6396 SHA256 e6de38cd282f180313a242be965e0d4574644c8c1532daae51162ef7ae3695f4
 MISC ChangeLog 1574 RMD160 2d71b359233b34ca2d6a497b9c0bac7e18726a47 SHA1 d925b4343e3d9c51c749f647daa29231b6f2d4aa SHA256 49e63e45550f0d8acb886c33d1a81a52739d79695496afcbcc746bdebbd62efd
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/app-admin/novell-ndssslp/novell-ndssslp-8.7.0.1.ebuild b/trunk/novell4gentoo/app-admin/novell-ndssslp/novell-ndssslp-8.7.0.1.ebuild
index 4ea2c333..3695c478 100644
--- a/trunk/novell4gentoo/app-admin/novell-ndssslp/novell-ndssslp-8.7.0.1.ebuild
+++ b/trunk/novell4gentoo/app-admin/novell-ndssslp/novell-ndssslp-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-ndssslp/novell-ndssslp-8.7.0_p1-r5.ebuild b/trunk/novell4gentoo/app-admin/novell-ndssslp/novell-ndssslp-8.7.0_p1-r5.ebuild
deleted file mode 100644
index 2639d5a3..00000000
--- a/trunk/novell4gentoo/app-admin/novell-ndssslp/novell-ndssslp-8.7.0_p1-r5.ebuild
+++ /dev/null
@@ -1,57 +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 SLP 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_fr"
-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/NDSsslp-${MY_PV}.i386.rpm
-	use linguas_fr && rpm_unpack "${WORKDIR}"/Linux/NDSsslp_fr-${MY_PV}.i386.rpm
-}
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_jarinto /usr/ConsoleOne/lib/slpda
-	java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/lib/slpda/*.jar
-	java-pkg_jarinto /usr/ConsoleOne/snapins/slpda
-	java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/snapins/slpda/*.jar
-	java-pkg_jarinto /usr/ConsoleOne/resources/slpda
-	java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/usr/ConsoleOne/resources/slpda/*.jar
-	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"
-}