diff --git a/trunk/novell4gentoo/app-admin/novell-ndsspki/ChangeLog b/trunk/novell4gentoo/app-admin/novell-ndsspki/ChangeLog
index 3cd00cb..4cad043 100644
--- a/trunk/novell4gentoo/app-admin/novell-ndsspki/ChangeLog
+++ b/trunk/novell4gentoo/app-admin/novell-ndsspki/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Nov 2007; Mario Fetka <mario-fetka@gmx.at>
+  +novell-ndsspki-8.7.0_p1-r4.ebuild:
+  initial import ConsoleOne 1.3.6h
+
   04 Apr 2007; Mario Fetka <mario-fetka@gmx.at>
   -novell-ndsspki-8.7.0_p1.ebuild, -novell-ndsspki-8.7.0_p1-r1.ebuild,
   -novell-ndsspki-8.7.0_p1-r2.ebuild:
diff --git a/trunk/novell4gentoo/app-admin/novell-ndsspki/Manifest b/trunk/novell4gentoo/app-admin/novell-ndsspki/Manifest
index 345799f..1fa6b2b 100644
--- a/trunk/novell4gentoo/app-admin/novell-ndsspki/Manifest
+++ b/trunk/novell4gentoo/app-admin/novell-ndsspki/Manifest
@@ -1,12 +1,17 @@
 DIST c1_136f-linux.tar.gz 39985363 RMD160 f6a18cd0c9802c41ae35fb587e08f807776de92f SHA1 f592a1022fc6d64391b0c7dd7d6b2adb6ad5ad16 SHA256 1263d8e3610719d9f353ac43501b596bfcef126c24f749af8cee1247148927a9
+DIST c1_136h-linux.tar.gz 41771356 RMD160 0c2b8ac9309962492936a5c988ec519103bad0f2 SHA1 de6525532a5b89b0872c129a54bb82e8f2e08aec SHA256 481c20119c0d84659a25a5f79e32740b27c7ffa69d4ac1ce810aeebbae211a2b
 EBUILD novell-ndsspki-8.7.0_p1-r3.ebuild 1526 RMD160 f57f457c031cdba034b436c5d91ca0844575286c SHA1 607a152f5572245bc281c66c1b800d57b0395190 SHA256 6dc879f3351d181d6adcc418a7a0057e7eb378db044e3d80599ced1cf32f64e2
 MD5 0487aa1e08d34c6acd878f6dd7966bad novell-ndsspki-8.7.0_p1-r3.ebuild 1526
 RMD160 f57f457c031cdba034b436c5d91ca0844575286c novell-ndsspki-8.7.0_p1-r3.ebuild 1526
 SHA256 6dc879f3351d181d6adcc418a7a0057e7eb378db044e3d80599ced1cf32f64e2 novell-ndsspki-8.7.0_p1-r3.ebuild 1526
-MISC ChangeLog 859 RMD160 c14a879aebf582973a95b80adf88e5af50307e21 SHA1 90c88f9908863e412f6a808b50fad57a57d621a7 SHA256 f66f6df5ce641936a31280bd7056193a4e87332a14fe382bdfe1b78bc0b32bd1
-MD5 34ab1f954bbafd21bd2c7767c7b7d14d ChangeLog 859
-RMD160 c14a879aebf582973a95b80adf88e5af50307e21 ChangeLog 859
-SHA256 f66f6df5ce641936a31280bd7056193a4e87332a14fe382bdfe1b78bc0b32bd1 ChangeLog 859
+EBUILD novell-ndsspki-8.7.0_p1-r4.ebuild 2260 RMD160 5e5040c32032527dd4efd2b01f3cae7bd102a868 SHA1 fab056e0b82166b762447a32a9399bcaae8a4519 SHA256 a507cdd41ce062dcfdaec7978d8478635a504410f72f5d3069be80fd48a5286f
+MD5 ca0955eb98dc705ab49f76579a684bf1 novell-ndsspki-8.7.0_p1-r4.ebuild 2260
+RMD160 5e5040c32032527dd4efd2b01f3cae7bd102a868 novell-ndsspki-8.7.0_p1-r4.ebuild 2260
+SHA256 a507cdd41ce062dcfdaec7978d8478635a504410f72f5d3069be80fd48a5286f novell-ndsspki-8.7.0_p1-r4.ebuild 2260
+MISC ChangeLog 981 RMD160 88c6a6ddf1d7c5cf3598348c7af07a5848507b7a SHA1 8954c01c6706b3860be2886b40cd5ca0697c9955 SHA256 d4049e752a7b5374254b35da4d730bc6be9614987e85da63016e2ed7dcace983
+MD5 c5ad7db9e03c9b341b065609f1485f17 ChangeLog 981
+RMD160 88c6a6ddf1d7c5cf3598348c7af07a5848507b7a ChangeLog 981
+SHA256 d4049e752a7b5374254b35da4d730bc6be9614987e85da63016e2ed7dcace983 ChangeLog 981
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
@@ -14,3 +19,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata
 MD5 a4084ce2723c1a3ccc2f7000a4d3043a files/digest-novell-ndsspki-8.7.0_p1-r3 247
 RMD160 c3e583a3699abd86e770a9e27b5bee7553fa2e75 files/digest-novell-ndsspki-8.7.0_p1-r3 247
 SHA256 cbd3ff4d7cff845a6c8d6cc774c759679c678796c839e423f72d19ef5d6830b8 files/digest-novell-ndsspki-8.7.0_p1-r3 247
+MD5 c37570dc956a0b1e99dde5d817db3c33 files/digest-novell-ndsspki-8.7.0_p1-r4 247
+RMD160 90967aec29ff52d987a9305efc4c3d4f963d15f6 files/digest-novell-ndsspki-8.7.0_p1-r4 247
+SHA256 717404e01f7fb0d72d105228f4a05e0980d6b1986c8f48d269176aeb21267ed9 files/digest-novell-ndsspki-8.7.0_p1-r4 247
diff --git a/trunk/novell4gentoo/app-admin/novell-ndsspki/files/digest-novell-ndsspki-8.7.0_p1-r4 b/trunk/novell4gentoo/app-admin/novell-ndsspki/files/digest-novell-ndsspki-8.7.0_p1-r4
new file mode 100644
index 0000000..42f2e87
--- /dev/null
+++ b/trunk/novell4gentoo/app-admin/novell-ndsspki/files/digest-novell-ndsspki-8.7.0_p1-r4
@@ -0,0 +1,3 @@
+MD5 e5abcae2516ffe98cb28aaa91a83294c c1_136h-linux.tar.gz 41771356
+RMD160 0c2b8ac9309962492936a5c988ec519103bad0f2 c1_136h-linux.tar.gz 41771356
+SHA256 481c20119c0d84659a25a5f79e32740b27c7ffa69d4ac1ce810aeebbae211a2b c1_136h-linux.tar.gz 41771356
diff --git a/trunk/novell4gentoo/app-admin/novell-ndsspki/novell-ndsspki-8.7.0_p1-r4.ebuild b/trunk/novell4gentoo/app-admin/novell-ndsspki/novell-ndsspki-8.7.0_p1-r4.ebuild
new file mode 100644
index 0000000..1e4c269
--- /dev/null
+++ b/trunk/novell4gentoo/app-admin/novell-ndsspki/novell-ndsspki-8.7.0_p1-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+NOVELL_BUILDID="-a_gSRIUOK0~"
+NOVELL_FILE32="c1_136h-linux.tar.gz"
+RESTRICT="mirror strip"
+
+inherit novell eutils rpm java-utils-2
+
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Novell PKI ConsoleOne Snapins"
+HOMEPAGE="http://www.novell.com"
+SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32}"
+
+LICENSE="Novell-eDir-87"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="linguas_fr"
+
+DEPEND=""
+
+RDEPEND="virtual/libc
+	>=virtual/jdk-1.4
+	>=app-admin/novell-novlc1-1.3.6_p1"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p ${WORKDIR}/${PN}-${MY_PV}
+	cd ${PN}-${MY_PV}
+	rpm_unpack ${WORKDIR}/Linux/NDSspki-${MY_PV}.i386.rpm
+	use linguas_fr && rpm_unpack ${WORKDIR}/Linux/NDSspki_fr-${MY_PV}.i386.rpm
+}
+
+src_compile() { :; }
+
+src_install() {
+	java-pkg_jarinto /usr/ConsoleOne/lib/Security
+        java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/lib/Security/*.jar
+        java-pkg_jarinto /usr/ConsoleOne/resources/Security
+        java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/resources/Security/*.jar
+        java-pkg_jarinto /usr/ConsoleOne/snapins/Security
+        java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/snapins/Security/*.jar
+	insinto /usr/ConsoleOne/bin
+        doins ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/bin/*.txt
+        insinto /usr/ConsoleOne/help
+        doins -r ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/help/*
+	into /usr/ConsoleOne
+	dolib.so ${WORKDIR}/${PN}-${MY_PV}/usr/lib/*.so
+}
+
+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"
+}
+