diff --git a/trunk/novell4gentoo/app-crypt/novell-npkiapi/ChangeLog b/trunk/novell4gentoo/app-crypt/novell-npkiapi/ChangeLog
index 30b0288e..ba738ef9 100644
--- a/trunk/novell4gentoo/app-crypt/novell-npkiapi/ChangeLog
+++ b/trunk/novell4gentoo/app-crypt/novell-npkiapi/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-npkiapi-3.3.3.20090416_p0951.ebuild,
+  +novell-npkiapi-3.3.3.20090416_p0955.ebuild:
+  first round of edir 8.8 ebuild mods
+
   17 Jan 2009; Mario Fetka <mario.fetka@gmail.com>
   +novell-npkiapi-3.3.0.1.20080710_p1008-r2.ebuild:
   multilib support
diff --git a/trunk/novell4gentoo/app-crypt/novell-npkiapi/Manifest b/trunk/novell4gentoo/app-crypt/novell-npkiapi/Manifest
index e14f7eca..cf41a4f4 100644
--- a/trunk/novell4gentoo/app-crypt/novell-npkiapi/Manifest
+++ b/trunk/novell4gentoo/app-crypt/novell-npkiapi/Manifest
@@ -1,7 +1,11 @@
 AUX 80novell-edir 268 RMD160 d67c5b1235cc2833cb5d13e9083e0cc312e1b55e SHA1 5402e607959e0c9ed9da3f9756ba709c780f8dc8 SHA256 6951e52fddfa7973a8ea99acfecfd758a9104de25f5a81b0b3efb439c9eab619
+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-npkiapi-3.3.0.1.20080710_p1008-r1.ebuild 1824 RMD160 13cd06c20cc79b28cb1136feda38b0962a0019f3 SHA1 868d4e51eb75d78d07bc7aa3ffeaab13495a81f2 SHA256 be01c504b6a73533f7f905021e4f86f2df523a3b11188009f40860061a6cea40
 EBUILD novell-npkiapi-3.3.0.1.20080710_p1008-r2.ebuild 1933 RMD160 e8ae9ff2f3eee5d6d9361583302867014464146c SHA1 98be0534846a49fea5993798355f6729f790c968 SHA256 a0623c846296fa2c4d67cf6da6f619ebc4bbb5cc8032d8e15e44eb41ec5eec84
 EBUILD novell-npkiapi-3.3.0.1.20080710_p1008.ebuild 1790 RMD160 a646c059584ba8acf9da40521f0403419aa96a4e SHA1 98fad7dfa3de34c7ff98c8db328e1fcad9d3374a SHA256 5e3628af925dd846c543c213f37bac839974638ca413aa8863452993c933f0b1
-MISC ChangeLog 2585 RMD160 3fd245973fa31385a5c4cdc39a8c9bd3d25f0235 SHA1 86fc1b6fbe5bfe643fd00529b25b3ed61890fced SHA256 86fea1e23d545b70baef557a610a6392ca8ad030a65f146a227cfd84c395c001
+EBUILD novell-npkiapi-3.3.3.20090416_p0951.ebuild 2482 RMD160 e80de04a9a629e5d4142459a14bc213edcbdf55e SHA1 f7dac8beff7fd4cfbc6be6cea1b0a87c3b5a08e6 SHA256 10da469e3e969be36595aa835c6cc1e8184bd5419794826c453a918f5748d2e8
+EBUILD novell-npkiapi-3.3.3.20090416_p0955.ebuild 2484 RMD160 8933cdaa9cdfcad6c82f5072d5f2c477cfadefc0 SHA1 d7d3ff699934230cf456c91ff290801ae12fbc49 SHA256 ef89340b70fb2e9229db3ce6d7d963d106b1a1e736e37e2b96e232283d6c3ab7
+MISC ChangeLog 2769 RMD160 c797a016dae40985c4a58894eb1628f28c0e37b4 SHA1 18acd2c77e82fc224e8d18ef02635d198c129ab6 SHA256 9b7a33f3bd6a40e4cd96d10110feedb87145cb7d938dcee0d72819086dcfd0b7
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/app-crypt/novell-npkiapi/novell-npkiapi-3.3.3.20090416_p0951.ebuild b/trunk/novell4gentoo/app-crypt/novell-npkiapi/novell-npkiapi-3.3.3.20090416_p0951.ebuild
new file mode 100644
index 00000000..3b5e4599
--- /dev/null
+++ b/trunk/novell4gentoo/app-crypt/novell-npkiapi/novell-npkiapi-3.3.3.20090416_p0951.ebuild
@@ -0,0 +1,81 @@
+# 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 java-utils-2 versionator multilib
+
+MY_PVV=$(replace_version_separator 3 '-')
+MY_PV="${MY_PVV/_p/_}"
+
+DESCRIPTION="Novell Public Key Infrastructure Services"
+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-npkiapi:0
+	!app-crypt/novell-npkiapi:8.7"
+
+RDEPEND="virtual/libc
+	>=virtual/jdk-1.4
+	x86? ( sys-libs/lib-compat )
+	amd64? ( app-emulation/emul-linux-x86-compat )
+	>=app-crypt/novell-nici-2.7.3_p001
+	app-crypt/novell-npkit:8.8
+	net-nds/novell-nldapsdk:8.8
+	net-nds/novell-ndsbase: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}/*
+	into /usr
+	java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*.jar
+}
+
+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-npkiapi/novell-npkiapi-3.3.3.20090416_p0955.ebuild b/trunk/novell4gentoo/app-crypt/novell-npkiapi/novell-npkiapi-3.3.3.20090416_p0955.ebuild
new file mode 100644
index 00000000..da9c4ccf
--- /dev/null
+++ b/trunk/novell4gentoo/app-crypt/novell-npkiapi/novell-npkiapi-3.3.3.20090416_p0955.ebuild
@@ -0,0 +1,81 @@
+# 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 java-utils-2 versionator multilib
+
+MY_PVV=$(replace_version_separator 3 '-')
+MY_PV="${MY_PVV/_p/_}"
+
+DESCRIPTION="Novell Public Key Infrastructure Services"
+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-npkiapi:0
+	!app-crypt/novell-npkiapi:8.7"
+
+RDEPEND="virtual/libc
+	>=virtual/jdk-1.4
+	x86? ( sys-libs/lib-compat )
+	amd64? ( app-emulation/emul-linux-x86-compat )
+	>=app-crypt/novell-nici-2.7.3_p001
+	app-crypt/novell-npkit:8.8
+	net-nds/novell-nldapsdk:8.8
+	net-nds/novell-ndsbase: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}/*
+	into /usr
+	java-pkg_dojar "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*.jar
+}
+
+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"
+}
+