diff --git a/trunk/novell4gentoo/app-crypt/novell-npkit/ChangeLog b/trunk/novell4gentoo/app-crypt/novell-npkit/ChangeLog
index f1050eac..abd0b9fb 100644
--- a/trunk/novell4gentoo/app-crypt/novell-npkit/ChangeLog
+++ b/trunk/novell4gentoo/app-crypt/novell-npkit/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  +novell-npkit-3.3.3.20090416_p0934.ebuild,
+  +novell-npkit-3.3.3.20090416_p0937.ebuild:
+  first round of edir 8.8 ebuild mods
+
   17 Jan 2009; Mario Fetka <mario.fetka@gmail.com>
   +novell-npkit-3.3.0.20070815_p1823-r3.ebuild:
   multilib support
diff --git a/trunk/novell4gentoo/app-crypt/novell-npkit/Manifest b/trunk/novell4gentoo/app-crypt/novell-npkit/Manifest
index 6921b416..72772ebd 100644
--- a/trunk/novell4gentoo/app-crypt/novell-npkit/Manifest
+++ b/trunk/novell4gentoo/app-crypt/novell-npkit/Manifest
@@ -1,7 +1,11 @@
 AUX 80novell 175 RMD160 6706cbb05c0079b008b1e35a74518b137c1842c4 SHA1 ce625b90ee4b612381334b879468d9f0cc9e2a2b SHA256 1602e6f7016cd33476f398196f1061158d9f8f5e302b83911c92e013d6a7d81c
+DIST eDirectory_88SP5_Linux_i586.tar.gz 92524434 RMD160 8c3cb42aabb13eab2c13c4596faf0034eef3a0ed SHA1 51b6f8c6390b0a9f92d86d9af7bab6054bc8f268 SHA256 891447378202d3822b8de1599086994fee9e186c58e06d561ca4a0c855c4b4ea
+DIST eDirectory_88SP5_Linux_x86_64.tar.gz 96059884 RMD160 dac9cc0631b5206eb289d417c602d43f0b74f0b0 SHA1 6c9ece98af9510ac3c284bc72695d771e155bb37 SHA256 7f4d46594909b46f11dc3a5e62a283e8fb8da9bb93e9fbcb02420ca004098092
 DIST ss206_SLAH.tgz 31143941 RMD160 6dbfa508a374c2b5139cc45214e9ad1a17919791 SHA1 98916a96c7e5232a8deb3c2a9919e645f4bb1fdc SHA256 513faf240d85b189a64a1e88f9fdb08ee273c1f44e2bf0b51d9611fc9e4f3838
 EBUILD novell-npkit-3.3.0.20070815_p1823-r1.ebuild 1687 RMD160 272a49c40ca90a718ace3debc571a47059cfa08d SHA1 6f92dae865da45bb25d7d83fe3f8b6fda3237d8e SHA256 74b6e497380ed769406a1aea45c1b0dcbbd54b1142e33120f29b309845f78f0b
 EBUILD novell-npkit-3.3.0.20070815_p1823-r2.ebuild 1723 RMD160 a00e7fd6e09c327501fe7775837379844cc97e14 SHA1 eb3651d6e192b4d6523129c9ac3c35e498d745b7 SHA256 5006a675a39bf68d77e6b79b0760a6c7b3404f8308178ad18c57a010ad920593
 EBUILD novell-npkit-3.3.0.20070815_p1823-r3.ebuild 1832 RMD160 525cb1ffa0bf319fee9d629226343373daa47edf SHA1 4667c687d0483b330a2b4bc0fba2d5fa471c50ef SHA256 7f858ea6b7e53747e97eaa0c3892dc1893ecdf5a79bec4e6a7ad457ad5529bc0
-MISC ChangeLog 1836 RMD160 ecbac78291099d38c0afb4db535adc9fc74ed160 SHA1 531652e043fce00738bbe5447b68a44c72b2d780 SHA256 890752e76e97ce83fa338d0296781248536587f4a72f97c9fd98dbe915388b41
+EBUILD novell-npkit-3.3.3.20090416_p0934.ebuild 2363 RMD160 25d0c4b346a96712b4cf078e0e30b98a1860c6c6 SHA1 9d245d40ec8fff047208f5290dc6bff89165086c SHA256 92ed7975c19a6439916f873420ce93b72a4dbe641a4c182aa514d095ad8c2c6a
+EBUILD novell-npkit-3.3.3.20090416_p0937.ebuild 2365 RMD160 ecc793f5326fe8a2f3e22c758b02574a30e9216e SHA1 8dfa875af37a67659390807d3db898488097ce0d SHA256 56daaf5b5356ce16c32ec2139f5e607453924a67f1a0ab0f4087e26d3844581e
+MISC ChangeLog 2016 RMD160 0652048549257bd361c8c3ebd762e1b35a165932 SHA1 26796dbe799b76dce62f5dbf829bbf0eef942e26 SHA256 0850f23c5288a3aee33c7dca5481d59f93c8b1fa33ef090f72127e3f8508918b
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0934.ebuild b/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0934.ebuild
new file mode 100644
index 00000000..7315d7df
--- /dev/null
+++ b/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0934.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_BUILDID32="63eV_vS9dv4~"
+NOVELL_FILE32="eDirectory_88SP5_Linux_i586.tar.gz"
+NOVELL_BUILDID64="ffdH4AJgrFs~"                   
+NOVELL_FILE64="eDirectory_88SP5_Linux_x86_64.tar.gz"
+RESTRICT="mirror strip"
+
+inherit novell eutils rpm versionator multilib
+
+MY_PVV=$(replace_version_separator 3 '-')
+MY_PV="${MY_PVV/_p/_}"
+
+DESCRIPTION="Novell Public Key Infrastructure Toolbox"
+HOMEPAGE="http://www.novell.com"
+SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID32}/${NOVELL_FILE32} )
+        amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID64}/${NOVELL_FILE64} )"
+
+LICENSE="Novell-eDir-88"
+SLOT="8.8"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="!app-crypt/novell-npkit:0
+	!app-crypt/novell-npkit:8.7"
+
+RDEPEND="virtual/libc
+	x86? ( sys-libs/lib-compat )
+	amd64? ( app-emulation/emul-linux-x86-compat )
+	>=app-crypt/novell-nici-2.7.3_p001
+	net-misc/novell-ntls:8.8
+	net-nds/novell-ndsbase:8.8
+	net-nds/novell-nldapsdk: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/eDirectory/setup/${PN}-${MY_PV}.${narch}.rpm
+}
+
+src_compile() { :; }
+
+src_install() {
+        into /opt/novell
+        dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*
+}
+
+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"
+}
+
diff --git a/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0937.ebuild b/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0937.ebuild
new file mode 100644
index 00000000..73a5b336
--- /dev/null
+++ b/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0937.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_BUILDID32="63eV_vS9dv4~"
+NOVELL_FILE32="eDirectory_88SP5_Linux_i586.tar.gz"
+NOVELL_BUILDID64="ffdH4AJgrFs~"                   
+NOVELL_FILE64="eDirectory_88SP5_Linux_x86_64.tar.gz"
+RESTRICT="mirror strip"
+
+inherit novell eutils rpm versionator multilib
+
+MY_PVV=$(replace_version_separator 3 '-')
+MY_PV="${MY_PVV/_p/_}"
+
+DESCRIPTION="Novell Public Key Infrastructure Toolbox"
+HOMEPAGE="http://www.novell.com"
+SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID32}/${NOVELL_FILE32} )
+        amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID64}/${NOVELL_FILE64} )"
+
+LICENSE="Novell-eDir-88"
+SLOT="8.8"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="!app-crypt/novell-npkit:0
+	!app-crypt/novell-npkit:8.7"
+
+RDEPEND="virtual/libc
+	x86? ( sys-libs/lib-compat )
+	amd64? ( app-emulation/emul-linux-x86-compat )
+	>=app-crypt/novell-nici-2.7.3_p001
+	net-misc/novell-ntls:8.8
+	net-nds/novell-ndsbase:8.8
+	net-nds/novell-nldapsdk: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/eDirectory/setup/${PN}-${MY_PV}.${narch}.rpm
+}
+
+src_compile() { :; }
+
+src_install() {
+        into /opt/novell
+        dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*
+}
+
+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"
+}
+