diff --git a/trunk/novell4gentoo/net-nds/novell-ndsserv/ChangeLog b/trunk/novell4gentoo/net-nds/novell-ndsserv/ChangeLog
index f1116f37..08a05769 100644
--- a/trunk/novell4gentoo/net-nds/novell-ndsserv/ChangeLog
+++ b/trunk/novell4gentoo/net-nds/novell-ndsserv/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  +novell-ndsserv-8.8.5.2.12.ebuild:
+  first round of edir 8.8 ebuild mods
+
   12 Dec 2009; Mario Fetka <mario.fetka@gmail.com> -files/80novell-edir,
   -novell-ndsserv-8.7.3.10_p78.ebuild, -novell-ndsserv-8.7.3.10_p88.ebuild,
   -novell-ndsserv-8.7.3.10_p88-r1.ebuild:
diff --git a/trunk/novell4gentoo/net-nds/novell-ndsserv/Manifest b/trunk/novell4gentoo/net-nds/novell-ndsserv/Manifest
index 53e8dd22..9ec07196 100644
--- a/trunk/novell4gentoo/net-nds/novell-ndsserv/Manifest
+++ b/trunk/novell4gentoo/net-nds/novell-ndsserv/Manifest
@@ -6,6 +6,8 @@ AUX nldap.initd 321 RMD160 404e9e69ab9224841d675caecec02ed94d2d19c0 SHA1 3490484
 AUX nldap87.initd 3137 RMD160 2e8532d8ea4889e99114236555aa82ba295c3b4e SHA1 51baa74d3ccb5598ac0e0bc6b669e07b08816505 SHA256 ae740abc714063b8870bc09aa6998bc4135e8aec1893bb377886c4ceaa8b32a2
 AUX nldap88.initd 3263 RMD160 9d8fe9efb8d6b637a0392b586314c4df82df521e SHA1 3d646b1edb0639c4ff5adca803426396f64013a4 SHA256 76854724718301f3fbe0f5f0cbcc2c0c69467d0d1a8f3f703f1dccd7dbec2156
 DIST edir87310_ftf2.tar.gz 254893129 RMD160 5db2ec018ecf7de9f3eb1e5a8ba8022e99f8cce2 SHA1 9fabfdfd807428c760942fdf49fc35b55a4b4e9a SHA256 36c657623419edb2e43b14943785d24f3d1872b4ecf5d6fc97a35792a8db3ba7
-EBUILD novell-ndsserv-8.7.3.10.114.ebuild 3207 RMD160 c06716c8a1384409950e7189645008f35390afb7 SHA1 958b57a4cbf079b581475ac8ddc9df2982ebf83d SHA256 acb7df40fa02463f5e0544fb0bfd6448168b2bb0df43d3bb9b8b4dd6b792659b
-MISC ChangeLog 2215 RMD160 90b4c966a75a8788d4a900df6524b00ceea9492c SHA1 62ed050352a7961a71fcdfc3aee8a2517cf784b2 SHA256 be5b96a978e9f86231c60a45fad1fb93832df4e408f6e2fb608901ab3e17c795
+DIST edir885_Patch2.tar.gz 306609536 RMD160 4483666615f90ba16c6996e562c4dc182c3f6f6c SHA1 b9b8b9d3659b70738674f356f0691ab7545bc7c2 SHA256 12153f6a17d69bdf3fc968c067db9bcdd284b6910738ebbdde232f5e204c11bc
+EBUILD novell-ndsserv-8.7.3.10.114.ebuild 3210 RMD160 0604625d281bb5c19337f759ea233709a8335107 SHA1 fb21720db34fbe6034a7479bbbf616bc1e7f8cdf SHA256 913d3bb7ddb7569f2f817b389e354757bb87a0b5a67074808be003a239fe1d30
+EBUILD novell-ndsserv-8.8.5.2.12.ebuild 4321 RMD160 6027f364a32df1f6b50536701d67fd3b942432c2 SHA1 b1c46eb147c6ebdc4e1aba35702188f4c1dc5dcf SHA256 1f045d8de5ac6543c95aac1f86da49da4401eedf8c768920945443de84dd8ff9
+MISC ChangeLog 2342 RMD160 dccf910a88dadb03c44be09517625e5162dce0be SHA1 9d321a9065dd2c5e4952a4a75af479ae2f97fba6 SHA256 b7317c3b04f3801bcc9e1d67f6d3eea255325abe885d05cdf50be4a607695880
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/net-nds/novell-ndsserv/novell-ndsserv-8.8.5.2.12.ebuild b/trunk/novell4gentoo/net-nds/novell-ndsserv/novell-ndsserv-8.8.5.2.12.ebuild
new file mode 100644
index 00000000..f92d67ce
--- /dev/null
+++ b/trunk/novell4gentoo/net-nds/novell-ndsserv/novell-ndsserv-8.8.5.2.12.ebuild
@@ -0,0 +1,113 @@
+# 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 Server and DS Utilities"
+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-88"
+SLOT="8.8"
+KEYWORDS="~x86 ~amd64"
+IUSE="linguas_fr linguas_ja"
+
+DEPEND="!net-nds/novell-ndsserv:0
+	!net-nds/novell-ndsserv:8.7"
+
+RDEPEND="virtual/libc
+	net-misc/novell-ncpenc:8.8
+	net-nds/novell-ndsbase:8.8
+	net-nds/novell-ndscommon:8.8
+	net-nds/novell-ndsmasv:8.8
+	net-nds/novell-nldapsdk:8.8
+	app-crypt/novell-npkiapi:8.8
+	app-crypt/novell-npkit:8.8
+	sys-auth/novell-nmas: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-NDSserv.${narch}.rpm
+}                                                                        
+
+src_compile() { :; }
+
+src_install() {
+	has_multilib_profile && ABI="x86"
+
+	into /opt/novell/eDirectory/
+	dobin "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/bin/*
+	dosbin "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/sbin/ndsd
+	dosbin "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/sbin/nldap
+	dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/*.*
+
+        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)
+        insinto /opt/novell/eDirectory/$(get_libdir)/nds-schema
+        doins "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/nds-schema/*
+        insinto /opt/novell/eDirectory/res
+        doins "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/res/*
+
+	insinto /etc/opt/novell/eDirectory/conf
+	doins "${WORKDIR}"/${PN}-${MY_PV}/etc/opt/novell/eDirectory/conf/*.*
+
+	keepdir /opt/novell/eDirectory/$(get_libdir)/nds-install
+	insinto /opt/novell/eDirectory/$(get_libdir)/nds-modules/nds-http/iconsole
+	doins "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/nds-modules/nds-http/iconsole/*.css
+	insinto /opt/novell/eDirectory/$(get_libdir)/nds-modules/nds-http/iconsole/images
+	doins "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/eDirectory/${nlib}/nds-modules/nds-http/iconsole/images/*.gif
+	doman "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/*/*.gz
+	use linguas_fr && doman -i18n=fr "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/fr/*/*.gz
+	use linguas_ja && doman -i18n=ja "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/ja/*/*.gz
+
+	newconfd "${FILESDIR}"/ndsd88.confd ndsd
+	newinitd "${FILESDIR}"/ndsd88.initd ndsd
+	newinitd "${FILESDIR}"/nldap88.initd nldapd
+	# add fake nldap bash script for compatibility
+	newinitd "${FILESDIR}"/nldap.initd nldap
+}
+
+#pkg_postinst(){
+#	/usr/bin/ether
+#}
+
+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"
+}