diff --git a/branches/experimental/app-admin/novell-consoleone/Manifest b/branches/experimental/app-admin/novell-consoleone/Manifest
index 008ff499..7f3b3242 100644
--- a/branches/experimental/app-admin/novell-consoleone/Manifest
+++ b/branches/experimental/app-admin/novell-consoleone/Manifest
@@ -1,7 +1,7 @@
-EBUILD novell-consoleone-1.3.6e.ebuild 537 RMD160 5847e12151f41276625e752bbcc16d7a2ba4bedd SHA1 0be8ca7696f1de55694aac97ea1f72da2e9bdf45 SHA256 c2f0e72919b44ad21310dd15f3ae3ea43e69fbbfa2a3f1b15a867fc673d2b21e
-MD5 1c27865ffc8020b1e93d5a9b736f8841 novell-consoleone-1.3.6e.ebuild 537
-RMD160 5847e12151f41276625e752bbcc16d7a2ba4bedd novell-consoleone-1.3.6e.ebuild 537
-SHA256 c2f0e72919b44ad21310dd15f3ae3ea43e69fbbfa2a3f1b15a867fc673d2b21e novell-consoleone-1.3.6e.ebuild 537
+EBUILD novell-consoleone-1.3.6e.ebuild 552 RMD160 68bcb04343ce32472036258eba066657f123874c SHA1 a7358bf974589d6ebd973c81af8a2192bcc694e6 SHA256 46b91055a85a15ff3ec62c00a1e4aa67865052e2152ffa093457d7bd102e2ccb
+MD5 8b75e9e1dc71a08985ca16edc4a74e3a novell-consoleone-1.3.6e.ebuild 552
+RMD160 68bcb04343ce32472036258eba066657f123874c novell-consoleone-1.3.6e.ebuild 552
+SHA256 46b91055a85a15ff3ec62c00a1e4aa67865052e2152ffa093457d7bd102e2ccb novell-consoleone-1.3.6e.ebuild 552
 MISC ChangeLog 333 RMD160 ed5526d7237120bb33d2c7951f4f9cb4b7595685 SHA1 6a12bad29027bf65f9521dce21a852b2648ad411 SHA256 e1ad7e500cefdd77a5d7fd008bacafb0db8e887f9d66fb981104d4e375470bca
 MD5 888fa3abc2ef5b5e054fb2e4c483d243 ChangeLog 333
 RMD160 ed5526d7237120bb33d2c7951f4f9cb4b7595685 ChangeLog 333
diff --git a/branches/experimental/app-admin/novell-consoleone/novell-consoleone-1.3.6e.ebuild b/branches/experimental/app-admin/novell-consoleone/novell-consoleone-1.3.6e.ebuild
index bde2c4e3..811e1775 100644
--- a/branches/experimental/app-admin/novell-consoleone/novell-consoleone-1.3.6e.ebuild
+++ b/branches/experimental/app-admin/novell-consoleone/novell-consoleone-1.3.6e.ebuild
@@ -9,10 +9,10 @@ LICENSE="Novell-eDir-87"
 SLOT="0"
 KEYWORDS="~x86"
 
-RDEPEND=">=app-apmin/novell-ndssfrep-8.7.0_p1
-	>=app-apmin/novell-ndssice-8.7.0_p1
-	>=app-apmin/novell-ndssimgr-8.7.0_p1
-	>=app-apmin/novell-ndssldap-8.7.0_p1
-	>=app-apmin/novell-ndssslp-8.7.0_p1
-	>=app-apmin/novell-ndsswan-8.7.0_p1
-	'net-nds/novell-consoleone"
+RDEPEND=">=app-admin/novell-ndssfrep-8.7.0_p1
+	>=app-admin/novell-ndssice-8.7.0_p1
+	>=app-admin/novell-ndssimgr-8.7.0_p1
+	>=app-admin/novell-ndssldap-8.7.0_p1
+	>=app-admin/novell-ndssslp-8.7.0_p1
+	>=app-admin/novell-ndsswan-8.7.0_p1
+	!net-nds/novell-consoleone"
diff --git a/branches/experimental/app-admin/novell-novlc1/Manifest b/branches/experimental/app-admin/novell-novlc1/Manifest
index 43d58fa0..a31325db 100644
--- a/branches/experimental/app-admin/novell-novlc1/Manifest
+++ b/branches/experimental/app-admin/novell-novlc1/Manifest
@@ -1,8 +1,16 @@
+AUX novell-novlc1-1.3.6 839 RMD160 b428e61fc2550d3818424a4e3c24710636951295 SHA1 897333bffe779d65b6a8b02687d995e42fc8e3a7 SHA256 48cd25e29d831e1daa083bad92af80b9fdc91f804ac613ac780d3a1f082a1d7b
+MD5 3c7b107d963df67c7deea293c084b8a1 files/novell-novlc1-1.3.6 839
+RMD160 b428e61fc2550d3818424a4e3c24710636951295 files/novell-novlc1-1.3.6 839
+SHA256 48cd25e29d831e1daa083bad92af80b9fdc91f804ac613ac780d3a1f082a1d7b files/novell-novlc1-1.3.6 839
 DIST c1_136f-linux.tar.gz 39985363 RMD160 f6a18cd0c9802c41ae35fb587e08f807776de92f SHA1 f592a1022fc6d64391b0c7dd7d6b2adb6ad5ad16 SHA256 1263d8e3610719d9f353ac43501b596bfcef126c24f749af8cee1247148927a9
 EBUILD novell-novlc1-1.3.6_p1-r3.ebuild 3467 RMD160 36af3ec3cb9c3c780f017de99ed11d165b673b88 SHA1 0d6491b090ee6c3e8d430f011251fa0919daea93 SHA256 85710a6ba33afb19a4e4f3e5542e206f98db4487f2dd8f1f2766f5f565a4c452
 MD5 5d0dc652ec7578a70ce7da74e535e0b8 novell-novlc1-1.3.6_p1-r3.ebuild 3467
 RMD160 36af3ec3cb9c3c780f017de99ed11d165b673b88 novell-novlc1-1.3.6_p1-r3.ebuild 3467
 SHA256 85710a6ba33afb19a4e4f3e5542e206f98db4487f2dd8f1f2766f5f565a4c452 novell-novlc1-1.3.6_p1-r3.ebuild 3467
+EBUILD novell-novlc1-1.3.6_p1-r4.ebuild 3705 RMD160 ab7dbac179f7911691b423c8ea37cd749b6ad3c8 SHA1 d18294e21f11edada99614a5bd632252f247937d SHA256 89bc896608e0906be94380327cd5987654242f7db82243e2ca726c93c15c509b
+MD5 8e79c414ee0594ff6d1a81271ff0c921 novell-novlc1-1.3.6_p1-r4.ebuild 3705
+RMD160 ab7dbac179f7911691b423c8ea37cd749b6ad3c8 novell-novlc1-1.3.6_p1-r4.ebuild 3705
+SHA256 89bc896608e0906be94380327cd5987654242f7db82243e2ca726c93c15c509b novell-novlc1-1.3.6_p1-r4.ebuild 3705
 MISC ChangeLog 871 RMD160 dce3eb9c9e403795af489d97966e35e666288404 SHA1 a27ce02da7b6fe1cbc0736c02e3c7ff763e24d4b SHA256 dc9e3d41e43ffed0b601b0f603c4e30a30de991f5f58a74c4ebc975d8c45ca54
 MD5 cb2c4ebf413a4093b7618305427a363b ChangeLog 871
 RMD160 dce3eb9c9e403795af489d97966e35e666288404 ChangeLog 871
@@ -14,3 +22,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata
 MD5 a4084ce2723c1a3ccc2f7000a4d3043a files/digest-novell-novlc1-1.3.6_p1-r3 247
 RMD160 c3e583a3699abd86e770a9e27b5bee7553fa2e75 files/digest-novell-novlc1-1.3.6_p1-r3 247
 SHA256 cbd3ff4d7cff845a6c8d6cc774c759679c678796c839e423f72d19ef5d6830b8 files/digest-novell-novlc1-1.3.6_p1-r3 247
+MD5 a4084ce2723c1a3ccc2f7000a4d3043a files/digest-novell-novlc1-1.3.6_p1-r4 247
+RMD160 c3e583a3699abd86e770a9e27b5bee7553fa2e75 files/digest-novell-novlc1-1.3.6_p1-r4 247
+SHA256 cbd3ff4d7cff845a6c8d6cc774c759679c678796c839e423f72d19ef5d6830b8 files/digest-novell-novlc1-1.3.6_p1-r4 247
diff --git a/branches/experimental/app-admin/novell-novlc1/files/digest-novell-novlc1-1.3.6_p1-r4 b/branches/experimental/app-admin/novell-novlc1/files/digest-novell-novlc1-1.3.6_p1-r4
new file mode 100644
index 00000000..f1a5e246
--- /dev/null
+++ b/branches/experimental/app-admin/novell-novlc1/files/digest-novell-novlc1-1.3.6_p1-r4
@@ -0,0 +1,3 @@
+MD5 414399d86aa3e7e6fba34937e69e59d3 c1_136f-linux.tar.gz 39985363
+RMD160 f6a18cd0c9802c41ae35fb587e08f807776de92f c1_136f-linux.tar.gz 39985363
+SHA256 1263d8e3610719d9f353ac43501b596bfcef126c24f749af8cee1247148927a9 c1_136f-linux.tar.gz 39985363
diff --git a/branches/experimental/app-admin/novell-novlc1/files/novell-novlc1-1.3.6 b/branches/experimental/app-admin/novell-novlc1/files/novell-novlc1-1.3.6
new file mode 100755
index 00000000..80fbe076
--- /dev/null
+++ b/branches/experimental/app-admin/novell-novlc1/files/novell-novlc1-1.3.6
@@ -0,0 +1,29 @@
+
+# Get Classpath
+unset classpath
+classpath="$classpath:$APPHOME/ConsoleOne.jar"
+classpath="$classpath:$APPHOME/ConsoleOneCore.jar"
+classpath="$classpath:$APPHOME/help"
+classpath="$classpath:/usr/lib/jclient.jar"
+classpath="$classpath:/opt/novell/eDirectory/lib/jclient.jar"
+classpath="$classpath:/opt/NOVLn4u/lib/jclient.jar"
+# BEGIN TEMP
+classpath="$classpath:/usr/lib/dirxml/classes/jclient.jar"
+classpath="$classpath:/opt/NOVLn4u/dirxml/classes/jclient.jar"
+# END TEMP
+for jar in $APPHOME/ConsoleOneExt/*.jar; do
+    classpath="$classpath:$jar"
+done
+classpath="$classpath:$CLASSPATH"
+
+prog="${jre}/bin/java"
+
+# Run.
+if [ -x "$prog" ]
+then
+     $prog -noverify -Dapplication.home="${APPHOME}" -classpath "$classpath" com.novell.application.console.shell.Console "$@"
+else
+    echo >&2 "$progname was not found in ${prog}"
+    exit 1
+fi
+
diff --git a/branches/experimental/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r4.ebuild b/branches/experimental/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r4.ebuild
new file mode 100644
index 00000000..2cd95e1e
--- /dev/null
+++ b/branches/experimental/app-admin/novell-novlc1/novell-novlc1-1.3.6_p1-r4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils rpm java-utils-2
+
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Novell ConsoleOne"
+HOMEPAGE="http://www.novell.com"
+SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/brBWU2uxSiM~/c1_136f-linux.tar.gz"
+
+LICENSE="Novell-eDir-87"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_pt linguas_ru linguas_zh_CN linguas_zh_TW"
+
+DEPEND=""
+
+RDEPEND="virtual/libc
+	>=virtual/jdk-1.4
+	>=dev-java/java-config-2
+	>=net-nds/novell-ndsbase-8.7.3.7_p38
+	>=net-nds/novell-ndscommon-8.7.3_p34
+	>=net-nds/novell-nldapbase-8.7.3_p34
+	>=net-nds/novell-nldapsdk-8.7.3_p34
+	>=net-nds/novell-novlice-8.7.3_p34
+	>=net-nds/novell-novllmgnt-8.7.3_p34
+	>=net-nds/novell-novlsas-8.7.3_p34
+	>=net-nds/novell-novlxis-8.7.3_p34
+	>=app-crypt/novell-npkit-2.7.0_p6
+	>=app-crypt/novell-pkiserver-2.7.0_p6
+	!net-nds/novell-novlc1"
+
+RESTRICT="nomirror nostrip"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p ${WORKDIR}/${PN}-${MY_PV}
+	cd ${PN}-${MY_PV}
+	rpm_unpack ${WORKDIR}/Linux/NOVLc1-${MY_PV}.i386.rpm
+	use linguas_de && rpm_unpack ${WORKDIR}/Linux/NOVLc1_de-${MY_PV}.i386.rpm
+	use linguas_es && rpm_unpack ${WORKDIR}/Linux/NOVLc1_es-${MY_PV}.i386.rpm
+	use linguas_fr && rpm_unpack ${WORKDIR}/Linux/NOVLc1_fr-${MY_PV}.i386.rpm
+	use linguas_it && rpm_unpack ${WORKDIR}/Linux/NOVLc1_it-${MY_PV}.i386.rpm
+	use linguas_ja && rpm_unpack ${WORKDIR}/Linux/NOVLc1_ja-${MY_PV}.i386.rpm
+	use linguas_pt && rpm_unpack ${WORKDIR}/Linux/NOVLc1_pt-${MY_PV}.i386.rpm
+	use linguas_ru && rpm_unpack ${WORKDIR}/Linux/NOVLc1_ru-${MY_PV}.i386.rpm
+	use linguas_zh_CN && rpm_unpack ${WORKDIR}/Linux/NOVLc1_zh_CN-${MY_PV}.i386.rpm
+	use linguas_zh_TW && rpm_unpack ${WORKDIR}/Linux/NOVLc1_zh_TW-${MY_PV}.i386.rpm
+	java-pkg_jar-from novell-ndsbase jclient.jar
+}
+
+src_compile() { :; }
+
+src_install() {
+	java-pkg_jarinto /usr/ConsoleOne
+	java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/*.jar
+	java-pkg_jarinto /usr/ConsoleOne/ConsoleOneExt
+	java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/ConsoleOneExt/*.jar
+	java-pkg_jarinto /usr/ConsoleOne/lib/core
+	java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/lib/core/*.jar
+	java-pkg_jarinto /usr/ConsoleOne/lib/mach
+	java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/lib/mach/*.jar
+	java-pkg_jarinto /usr/ConsoleOne/resources/core
+	java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/resources/core/*.jar
+	java-pkg_jarinto /usr/ConsoleOne/resources/mach
+	java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/resources/mach/*.jar
+	java-pkg_jarinto /usr/ConsoleOne/resources/widgets
+	java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/resources/widgets/*.jar
+	java-pkg_jarinto /usr/ConsoleOne/snapins/core
+	java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/snapins/core/*.jar
+	java-pkg_jarinto /usr/ConsoleOne/snapins/mach
+	java-pkg_dojar ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/snapins/mach/*.jar
+	into /usr/ConsoleOne
+	#dobin ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/bin/*
+	dosed 's%$APPHOME/jre%`java-config --jre-home`%' /usr/ConsoleOne/bin/ConsoleOne
+	insinto /usr/ConsoleOne/help
+	doins -r ${WORKDIR}/${PN}-${MY_PV}/usr/ConsoleOne/help/*
+	java-pkg_jar-from novell-ndsbase
+	java-pkg_dolauncher ConsoleOne --java_args -Dapplication.home=/usr/ConsoleOne --main com.novell.application.console.shell.Console
+
+#	insinto /usr/ConsoleOne/bin
+	doicon ${WORKDIR}/Linux/ConsoleOneIcon.png
+
+	insinto /usr/share/applications
+	doins ${WORKDIR}/Linux/consoleone.desktop
+	dosed 's%/usr/ConsoleOne/bin/ConsoleOneIcon.png%ConsoleOneIcon.png%' /usr/share/applications/consoleone.desktop
+}
\ No newline at end of file
diff --git a/branches/experimental/net-nds/novell-ndsserv/Manifest b/branches/experimental/net-nds/novell-ndsserv/Manifest
new file mode 100644
index 00000000..e5f0f06f
--- /dev/null
+++ b/branches/experimental/net-nds/novell-ndsserv/Manifest
@@ -0,0 +1,28 @@
+AUX 80novell-edir 303 RMD160 64062683170df6b99c1a4c42045a6f912ac5b6c6 SHA1 b37717d66ba1fd03e6d4896269a3e53b6f2c09ea SHA256 adf68d10cf4426db1e1747250fc4a42408117435f2c63db38b49f9ac81c33242
+MD5 d0a246ae85af9fc908fc1252769c2110 files/80novell-edir 303
+RMD160 64062683170df6b99c1a4c42045a6f912ac5b6c6 files/80novell-edir 303
+SHA256 adf68d10cf4426db1e1747250fc4a42408117435f2c63db38b49f9ac81c33242 files/80novell-edir 303
+AUX ndsd88.confd 68 RMD160 2c0c632c28f99c06f0ccb93ced8bc1cfafe4bd8e SHA1 fd21b6dca0f2b19edc1e7b0cea65aeedd1aa466c SHA256 692e648a0656dd763b2bc97e081102e2947579eaabf9cdfa1fcf724d3d8a711e
+MD5 49d72fc1878daae650b7393cf139e51e files/ndsd88.confd 68
+RMD160 2c0c632c28f99c06f0ccb93ced8bc1cfafe4bd8e files/ndsd88.confd 68
+SHA256 692e648a0656dd763b2bc97e081102e2947579eaabf9cdfa1fcf724d3d8a711e files/ndsd88.confd 68
+AUX ndsd88.initd 985 RMD160 146fc74cdfde9c8fb34b92cbe598480a50a6a7e6 SHA1 c2f152de5bbe09e684a8151f34141b87e1a803ec SHA256 63305fd9d81baa2f0c921e9d6d54e835434bda13bb827b9a4e2c693034d072b0
+MD5 6f7934c5a427164e0f49cd9b47a9199f files/ndsd88.initd 985
+RMD160 146fc74cdfde9c8fb34b92cbe598480a50a6a7e6 files/ndsd88.initd 985
+SHA256 63305fd9d81baa2f0c921e9d6d54e835434bda13bb827b9a4e2c693034d072b0 files/ndsd88.initd 985
+DIST edir881ftf_1.tgz 37493515 RMD160 726e2438a1c38619090e8832aaa70f9d2e15cae4 SHA1 4fc144be8473b674cd5191df5d0ea7bc1b2a8da1 SHA256 9633d94a79a7f242b80f9763aa54342b92005e21e6eda653ef00b88ea75ebca5
+EBUILD novell-ndsserv-8.8.1.1_p1.ebuild 1342 RMD160 31aa62a3a72f7e1c7a1642bb548c1592d96db822 SHA1 126769329446f106317710c8726d220d26b621a7 SHA256 ee947cd773c8abd6391f28a509059ee8b41b869156c030738c939ababdea2e8a
+MD5 1546fab39be8ca58097654e07d9c1574 novell-ndsserv-8.8.1.1_p1.ebuild 1342
+RMD160 31aa62a3a72f7e1c7a1642bb548c1592d96db822 novell-ndsserv-8.8.1.1_p1.ebuild 1342
+SHA256 ee947cd773c8abd6391f28a509059ee8b41b869156c030738c939ababdea2e8a novell-ndsserv-8.8.1.1_p1.ebuild 1342
+MISC ChangeLog 971 RMD160 e7c4e547a7874879758a485b89863e7ca0b65614 SHA1 0879306db21086045f73d265263db3f94a372814 SHA256 0524531a9119ba41a56638d6a5799f5dd0902318bb90b2600d21d03b7016ffe9
+MD5 7648a9cc9f5b0a86d2d4d77ca90d1a8a ChangeLog 971
+RMD160 e7c4e547a7874879758a485b89863e7ca0b65614 ChangeLog 971
+SHA256 0524531a9119ba41a56638d6a5799f5dd0902318bb90b2600d21d03b7016ffe9 ChangeLog 971
+MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
+MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
+RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
+SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
+MD5 ea1742792cf58ae5c23f19c60cd7de1f files/digest-novell-ndsserv-8.8.1.1_p1 235
+RMD160 1d5c1f2b8e7aecec5e9a66c08c9872196ae6e545 files/digest-novell-ndsserv-8.8.1.1_p1 235
+SHA256 bf49484a7ec26108465b468fea62815d3bf17abb76f06613a6903d9532f4fdd7 files/digest-novell-ndsserv-8.8.1.1_p1 235
diff --git a/branches/experimental/net-nds/novell-ndsserv/files/digest-novell-ndsserv-8.8.1.1_p1 b/branches/experimental/net-nds/novell-ndsserv/files/digest-novell-ndsserv-8.8.1.1_p1
new file mode 100644
index 00000000..91f88bff
--- /dev/null
+++ b/branches/experimental/net-nds/novell-ndsserv/files/digest-novell-ndsserv-8.8.1.1_p1
@@ -0,0 +1,3 @@
+MD5 301a9942f5c96c26ac1df5eeb74c1a02 edir881ftf_1.tgz 37493515
+RMD160 726e2438a1c38619090e8832aaa70f9d2e15cae4 edir881ftf_1.tgz 37493515
+SHA256 9633d94a79a7f242b80f9763aa54342b92005e21e6eda653ef00b88ea75ebca5 edir881ftf_1.tgz 37493515