diff --git a/trunk/novell4gentoo/net-nds/novell-ndsrepair/ChangeLog b/trunk/novell4gentoo/net-nds/novell-ndsrepair/ChangeLog
index 0ce22e25..fc606460 100644
--- a/trunk/novell4gentoo/net-nds/novell-ndsrepair/ChangeLog
+++ b/trunk/novell4gentoo/net-nds/novell-ndsrepair/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  +novell-ndsrepair-8.8.5.2.2.ebuild:
+  bump to 8.8
+
   12 Dec 2009; Mario Fetka <mario.fetka@gmail.com> -files/80novell-edir,
   -novell-ndsrepair-8.7.3.10_p76.ebuild,
   -novell-ndsrepair-8.7.3.10_p90.ebuild,
diff --git a/trunk/novell4gentoo/net-nds/novell-ndsrepair/Manifest b/trunk/novell4gentoo/net-nds/novell-ndsrepair/Manifest
index 1373f9ee..238e8c0b 100644
--- a/trunk/novell4gentoo/net-nds/novell-ndsrepair/Manifest
+++ b/trunk/novell4gentoo/net-nds/novell-ndsrepair/Manifest
@@ -1,4 +1,6 @@
 DIST edir87310_ftf2.tar.gz 254893129 RMD160 5db2ec018ecf7de9f3eb1e5a8ba8022e99f8cce2 SHA1 9fabfdfd807428c760942fdf49fc35b55a4b4e9a SHA256 36c657623419edb2e43b14943785d24f3d1872b4ecf5d6fc97a35792a8db3ba7
+DIST edir885_Patch2.tar.gz 306609536 RMD160 4483666615f90ba16c6996e562c4dc182c3f6f6c SHA1 b9b8b9d3659b70738674f356f0691ab7545bc7c2 SHA256 12153f6a17d69bdf3fc968c067db9bcdd284b6910738ebbdde232f5e204c11bc
 EBUILD novell-ndsrepair-8.7.3.10.118.ebuild 2046 RMD160 3484c04544dd88f30789eb9cdbe6ac71de42001b SHA1 f73c389ad261f04fdee80c3c2b3f588cb9901385 SHA256 1dbae790040daedbb18520557c41fd6280cc0208d0664907dce9f580af92e2ed
-MISC ChangeLog 2080 RMD160 1f9a1399429a4041cd4c6fb20929ee26fad3a5cb SHA1 c5f70a7458efb18404216fd82212a3f71b2f2cab SHA256 4cbf1346038861e0bcd11368f1894875c59f1cab00f6afbd2b2f499856dcadcf
+EBUILD novell-ndsrepair-8.8.5.2.2.ebuild 2808 RMD160 6f45d2e2f4c1f44a1eb0d416c5af2044721a96e7 SHA1 6d2c6af375d6b529b835b097078319c5187a6e49 SHA256 51893c171903804d643956ac74dd388b698ceaee597ea1050d3ee425a5f51527
+MISC ChangeLog 2184 RMD160 1799aecb7ea63cd31f1b75a3b48b8886f70b2b65 SHA1 80f95d2704a94cf8746a172c3e49b098debaa852 SHA256 0ab76fa476e09224ff98ed297bc3a40c23be3819643d64ff95337ad661520312
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/net-nds/novell-ndsrepair/novell-ndsrepair-8.8.5.2.2.ebuild b/trunk/novell4gentoo/net-nds/novell-ndsrepair/novell-ndsrepair-8.8.5.2.2.ebuild
new file mode 100644
index 00000000..377c15af
--- /dev/null
+++ b/trunk/novell4gentoo/net-nds/novell-ndsrepair/novell-ndsrepair-8.8.5.2.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+
+NOVELL_BUILDID="T2wcCZC5kh4~"
+NOVELL_FILE32="patchfiles/edir885_Patch2.tar.gz"
+NOVELL_FILE64="patchfiles/edir885_Patch2.tar.gz"
+RESTRICT="mirror strip"
+
+inherit novell eutils rpm multilib versionator
+
+MY_PV=$(replace_version_separator 4 '-')
+
+DESCRIPTION="Novell NDS Repair Utility"
+HOMEPAGE="http://www.novell.com"
+SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32} )
+        amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE64} )"
+
+LICENSE="Novell-eDir-87"
+SLOT="8.8"
+KEYWORDS="~x86 ~amd64"
+IUSE="linguas_fr"
+
+DEPEND="!net-nds/novell-ndsrepair:0
+	!net-nds/novell-ndsrepair:8.7"
+
+RDEPEND="virtual/libc
+	>=app-crypt/novell-nici-2.6.4_p005
+	net-nds/novell-ndsbase:8.8
+	net-nds/novell-ndsserv:8.8"
+
+src_unpack() {
+        cd "${WORKDIR}"
+        unpack ${A}    
+        if use x86     
+        then           
+            narch=i586 
+            nlib=lib   
+            ndir=Linux 
+        elif use amd64 
+        then           
+            narch=x86_64
+            nlib=lib64  
+            ndir=Linux64
+        fi              
+        mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
+        cd ${PN}-${MY_PV}                   
+        rpm_unpack ../work/edir8852/${ndir}/novell-NDSrepair.${narch}.rpm
+}                                                                        
+
+src_compile() { :; }
+
+src_install() {
+        into /opt/novell/eDirectory/
+        dobin "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/bin/*
+        dosym . /opt/novell/eDirectory/$(get_libdir)/nds-modules/$(get_libdir)
+        into /opt/novell/eDirectory/$(get_libdir)/nds-modules
+        dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/nds-modules/*
+        rm "${D}"/opt/novell/eDirectory/$(get_libdir)/nds-modules/$(get_libdir)
+        doman "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/*/*.gz
+        use linguas_fr && doman -i18n=fr "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/fr/*/*.gz
+}
+
+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"
+}