diff --git a/trunk/novell4gentoo/app-admin/novell-ndsswan/ChangeLog b/trunk/novell4gentoo/app-admin/novell-ndsswan/ChangeLog
index da1e30d..213c01d 100644
--- a/trunk/novell4gentoo/app-admin/novell-ndsswan/ChangeLog
+++ b/trunk/novell4gentoo/app-admin/novell-ndsswan/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-ndsswan-8.7.0_p1-r4.ebuild:
+  initial import ConsoleOne 1.3.6h
+
   04 Apr 2007; Mario Fetka <mario-fetka@gmx.at>
   -novell-ndsswan-8.7.0_p1.ebuild, -novell-ndsswan-8.7.0_p1-r1.ebuild,
   -novell-ndsswan-8.7.0_p1-r2.ebuild:
diff --git a/trunk/novell4gentoo/app-admin/novell-ndsswan/Manifest b/trunk/novell4gentoo/app-admin/novell-ndsswan/Manifest
index 841495a..e5e0a2c 100644
--- a/trunk/novell4gentoo/app-admin/novell-ndsswan/Manifest
+++ b/trunk/novell4gentoo/app-admin/novell-ndsswan/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-ndsswan-8.7.0_p1-r3.ebuild 1900 RMD160 529d8fc2141ae8f0125650333cc127db8beb356e SHA1 263320559f3f2ca16c51beb1a2b0bc86f1ac6c8d SHA256 339d83072c68b74afa9d19b48618cc1b531776fffe5d89d22581e7868349a7eb
 MD5 1fd2495875030bc35bde1530ab983757 novell-ndsswan-8.7.0_p1-r3.ebuild 1900
 RMD160 529d8fc2141ae8f0125650333cc127db8beb356e novell-ndsswan-8.7.0_p1-r3.ebuild 1900
 SHA256 339d83072c68b74afa9d19b48618cc1b531776fffe5d89d22581e7868349a7eb novell-ndsswan-8.7.0_p1-r3.ebuild 1900
-MISC ChangeLog 852 RMD160 4950930369225a1696ca11062ce622052adc4177 SHA1 ea00b53763dccbb9f559ed81fa5bf380477383e5 SHA256 7d27c5206c6f75494a60d058b8df2924431e565f2e96d660c0cff50fdeaf5853
-MD5 07e5e80ae11f5fd11da752c79c28320b ChangeLog 852
-RMD160 4950930369225a1696ca11062ce622052adc4177 ChangeLog 852
-SHA256 7d27c5206c6f75494a60d058b8df2924431e565f2e96d660c0cff50fdeaf5853 ChangeLog 852
+EBUILD novell-ndsswan-8.7.0_p1-r4.ebuild 2623 RMD160 d1311f02bccbc859f5a30d973cb839423c5658b0 SHA1 63232c06c1875fc3aeb27cf3f83961ad9441e16e SHA256 ab29899e106125e945aa3c882d8c5291ce95d0cd55bcf3ca3b8ceb85df610b6e
+MD5 38dc2bf6a8e424fe9a99ac61b31b241d novell-ndsswan-8.7.0_p1-r4.ebuild 2623
+RMD160 d1311f02bccbc859f5a30d973cb839423c5658b0 novell-ndsswan-8.7.0_p1-r4.ebuild 2623
+SHA256 ab29899e106125e945aa3c882d8c5291ce95d0cd55bcf3ca3b8ceb85df610b6e novell-ndsswan-8.7.0_p1-r4.ebuild 2623
+MISC ChangeLog 974 RMD160 ee2a9366b20fb7fb8cdef2641d6dd4ada1767307 SHA1 71098653d048193eaa66e410ec43cf252fb666e6 SHA256 d8ff057c3aca0362ff6a619ed830668072de43d9b82b2151b32a525b73fe032c
+MD5 c459fe2ab899ed00869e9a1672e66b08 ChangeLog 974
+RMD160 ee2a9366b20fb7fb8cdef2641d6dd4ada1767307 ChangeLog 974
+SHA256 d8ff057c3aca0362ff6a619ed830668072de43d9b82b2151b32a525b73fe032c ChangeLog 974
 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-ndsswan-8.7.0_p1-r3 247
 RMD160 c3e583a3699abd86e770a9e27b5bee7553fa2e75 files/digest-novell-ndsswan-8.7.0_p1-r3 247
 SHA256 cbd3ff4d7cff845a6c8d6cc774c759679c678796c839e423f72d19ef5d6830b8 files/digest-novell-ndsswan-8.7.0_p1-r3 247
+MD5 c37570dc956a0b1e99dde5d817db3c33 files/digest-novell-ndsswan-8.7.0_p1-r4 247
+RMD160 90967aec29ff52d987a9305efc4c3d4f963d15f6 files/digest-novell-ndsswan-8.7.0_p1-r4 247
+SHA256 717404e01f7fb0d72d105228f4a05e0980d6b1986c8f48d269176aeb21267ed9 files/digest-novell-ndsswan-8.7.0_p1-r4 247
diff --git a/trunk/novell4gentoo/app-admin/novell-ndsswan/files/digest-novell-ndsswan-8.7.0_p1-r4 b/trunk/novell4gentoo/app-admin/novell-ndsswan/files/digest-novell-ndsswan-8.7.0_p1-r4
new file mode 100644
index 0000000..42f2e87
--- /dev/null
+++ b/trunk/novell4gentoo/app-admin/novell-ndsswan/files/digest-novell-ndsswan-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-ndsswan/novell-ndsswan-8.7.0_p1-r4.ebuild b/trunk/novell4gentoo/app-admin/novell-ndsswan/novell-ndsswan-8.7.0_p1-r4.ebuild
new file mode 100644
index 0000000..2ed19be
--- /dev/null
+++ b/trunk/novell4gentoo/app-admin/novell-ndsswan/novell-ndsswan-8.7.0_p1-r4.ebuild
@@ -0,0 +1,69 @@
+# 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 NDS Wanman 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_de linguas_es linguas_fr linguas_it linguas_ja linguas_pt linguas_ru"
+
+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/NDSswan-${MY_PV}.i386.rpm
+	use linguas_de && rpm_unpack ${WORKDIR}/Linux/NDSswan_de-${MY_PV}.i386.rpm
+	use linguas_es && rpm_unpack ${WORKDIR}/Linux/NDSswan_es-${MY_PV}.i386.rpm
+	use linguas_fr && rpm_unpack ${WORKDIR}/Linux/NDSswan_fr-${MY_PV}.i386.rpm
+	use linguas_it && rpm_unpack ${WORKDIR}/Linux/NDSswan_it-${MY_PV}.i386.rpm
+	use linguas_pt && rpm_unpack ${WORKDIR}/Linux/NDSswan_pt-${MY_PV}.i386.rpm
+	use linguas_ru && rpm_unpack ${WORKDIR}/Linux/NDSswan_ru-${MY_PV}.i386.rpm
+}
+
+src_compile() { :; }
+
+src_install() {
+	java-pkg_jarinto /usr/ConsoleOne/lib/wanman
+        java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/lib/wanman/*.jar
+	java-pkg_jarinto /usr/ConsoleOne/resources/wanman
+        java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/resources/wanman/*.jar
+	java-pkg_jarinto /usr/ConsoleOne/snapins/wanman
+        java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/snapins/wanman/*.jar
+	insinto /usr/ConsoleOne/lib/wanman
+        doins ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/lib/wanman/*.wmg
+	insinto /usr/ConsoleOne/help
+        doins -r ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/help/*
+}
+
+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"
+}
+