diff --git a/trunk/novell4gentoo/net-nds/novell-ndscommon/ChangeLog b/trunk/novell4gentoo/net-nds/novell-ndscommon/ChangeLog
index 64e1fad2..82fcf89c 100644
--- a/trunk/novell4gentoo/net-nds/novell-ndscommon/ChangeLog
+++ b/trunk/novell4gentoo/net-nds/novell-ndscommon/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  +novell-ndscommon-8.8.5.2.10.ebuild:
+  first round of edir 8.8 ebuild mods
+
   12 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
   -novell-ndscommon-8.7.3_p37-r1.ebuild,
   -novell-ndscommon-8.7.3_p37-r2.ebuild, -files/80novell-edir,
diff --git a/trunk/novell4gentoo/net-nds/novell-ndscommon/Manifest b/trunk/novell4gentoo/net-nds/novell-ndscommon/Manifest
index 52bce095..f9f97fd5 100644
--- a/trunk/novell4gentoo/net-nds/novell-ndscommon/Manifest
+++ b/trunk/novell4gentoo/net-nds/novell-ndscommon/Manifest
@@ -1,4 +1,6 @@
 DIST eDir_873_linux_full.tar.gz 100502582 RMD160 c7e4ce732a2f1caec45031b4727eff71b0546e1f SHA1 5b14b89766a37cff868143e91619efa82844adb4 SHA256 609abda0346ed77cc510df60172007a5a2e9d1cb6ea70c77a0b1b44c6c9bf507
+DIST edir885_Patch2.tar.gz 306609536 RMD160 4483666615f90ba16c6996e562c4dc182c3f6f6c SHA1 b9b8b9d3659b70738674f356f0691ab7545bc7c2 SHA256 12153f6a17d69bdf3fc968c067db9bcdd284b6910738ebbdde232f5e204c11bc
 EBUILD novell-ndscommon-8.7.3.37.ebuild 1827 RMD160 c5ae269ed91be318eded7dfb054d4355eb876954 SHA1 11c436f7caca379cb056a5fb1a948ec901e86aa6 SHA256 8ad5fc3578e03aefef6a0cec9bf9b86792d8fbd69d7ed2fd8a68fa19d7e02f91
-MISC ChangeLog 1924 RMD160 b48f5095193cf47b9595f6479efd22873e70d26b SHA1 9ae727c5659c382dd6aa0b4763db38fb0985fdc8 SHA256 425fc93da8913dd2c70f762be9755088bffba1211493b1404e3b053229cc8a58
+EBUILD novell-ndscommon-8.8.5.2.10.ebuild 2195 RMD160 ef6c3d42d09439b8feec40371bb56d9a17f0f2cf SHA1 7b84992e09f7afe4c3de3aff93a462abb66b9ea8 SHA256 4484f815cfef71d413f888520d16ce073b6a33ad180daa466c8845cfea2c71c7
+MISC ChangeLog 2053 RMD160 32a0ea1309dd137d81e7ec774561c15bba3fd7b0 SHA1 56c9a56c3e5ccbaba07d634e8931905eb9c7c133 SHA256 3444143bb0df6c1bfbf4fdaf7e8c8f6713d782c7b49b59f57e6199347c12b1fd
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/net-nds/novell-ndscommon/novell-ndscommon-8.8.5.2.10.ebuild b/trunk/novell4gentoo/net-nds/novell-ndscommon/novell-ndscommon-8.8.5.2.10.ebuild
new file mode 100644
index 00000000..bf6acd16
--- /dev/null
+++ b/trunk/novell4gentoo/net-nds/novell-ndscommon/novell-ndscommon-8.8.5.2.10.ebuild
@@ -0,0 +1,73 @@
+# 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 Directory User Agent"
+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 multilib"
+
+DEPEND="!net-nds/novell-ndscommon:0
+	!net-nds/novell-ndscommon:8.7"
+
+RDEPEND="virtual/libc
+	net-nds/novell-ndsbase:8.8
+	net-nds/novell-edir-env"
+
+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-NDScommon.${narch}.rpm
+}
+
+src_compile() { :; }
+
+src_install() {
+	into /usr
+	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
+}
+
+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"
+}