diff --git a/branches/experimental/sys-auth/novell-nmasclient/ChangeLog b/branches/experimental/sys-auth/novell-nmasclient/ChangeLog
index d751565e..8eed6d61 100644
--- a/branches/experimental/sys-auth/novell-nmasclient/ChangeLog
+++ b/branches/experimental/sys-auth/novell-nmasclient/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Aug 2007; Mario Fetka <mario-fetka@gmx.at> ++, ++,
+  -novell-nmasclient-3.2.0_p9-r3.ebuild,
+  -novell-nmasclient-3.4.0_p10.ebuild,
+  -novell-nmasclient-3.4.0_p10-r1.ebuild:
+  Bump nmasclient to latest beta
+
   04 Aug 2007; Mario Fetka <mario-fetka@gmx.at>
   +files/80novell-nmasclient64, +novell-nmasclient-3.4.0_p10-r1.ebuild:
   make nmasclient multilib aware
diff --git a/branches/experimental/sys-auth/novell-nmasclient/Manifest b/branches/experimental/sys-auth/novell-nmasclient/Manifest
index d316c691..c66d18d8 100644
--- a/branches/experimental/sys-auth/novell-nmasclient/Manifest
+++ b/branches/experimental/sys-auth/novell-nmasclient/Manifest
@@ -6,35 +6,20 @@ AUX 80novell-nmasclient64 288 RMD160 06117f95845084c85ab32efbe9e68a17adcce285 SH
 MD5 79822561186e98c750277eaa44497134 files/80novell-nmasclient64 288
 RMD160 06117f95845084c85ab32efbe9e68a17adcce285 files/80novell-nmasclient64 288
 SHA256 e88434c5fd93939c04356ac99dee523ea0bfc4303edfb3045fb1db1fcc8eb3e2 files/80novell-nmasclient64 288
-DIST Novell_Client_SLED10-i386-2007531-CD1.iso 10256384 RMD160 5296935f1b2b5cb0796b685f5c6bacd532f49094 SHA1 96d1df5bce5f0afb0a625084226fb347728fcffb SHA256 3433f30fed62339de2fe12426e4e4e064ec4823073d2271531d7a1009f9cdecf
-DIST Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352 RMD160 9b5a8704e518ac7ce1d9d03a890e77a67610cbaa SHA1 0430885f18e803bba63ec264022589c4d934ef03 SHA256 f170dad7e9774d6b55186228f0ed3de512b09255d5d19f54e86964a327b62806
-DIST novell-client-1.2-SLE10.tar.gz 13963983 RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 SHA1 14278f74c8226afabc0c602bdc31d4e20acff6b9 SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241
-EBUILD novell-nmasclient-3.2.0_p9-r3.ebuild 926 RMD160 6f1160c56e08cf33a82d34b755aabc2637e7953c SHA1 118f2f1babcde6732b5cc680b27ba0c099305e92 SHA256 81daa1bffba06efd568bd7d5ad70209e7703a5e50b8108cdfeeff370c3bb7959
-MD5 05c94f880acc3088f1995d3d65b76b44 novell-nmasclient-3.2.0_p9-r3.ebuild 926
-RMD160 6f1160c56e08cf33a82d34b755aabc2637e7953c novell-nmasclient-3.2.0_p9-r3.ebuild 926
-SHA256 81daa1bffba06efd568bd7d5ad70209e7703a5e50b8108cdfeeff370c3bb7959 novell-nmasclient-3.2.0_p9-r3.ebuild 926
-EBUILD novell-nmasclient-3.4.0_p10-r1.ebuild 2342 RMD160 a46d6b6dd6c7a200e848763a785c24358170ad78 SHA1 ccd3646fd2098e79c6e8e818bdc3bd9501182910 SHA256 786ee04b349e1ab1bdf5d3f1b10256c3378e8bf13eef89053b7c31b35ef4a39d
-MD5 33bfd6fb712f219db01752f32633f6de novell-nmasclient-3.4.0_p10-r1.ebuild 2342
-RMD160 a46d6b6dd6c7a200e848763a785c24358170ad78 novell-nmasclient-3.4.0_p10-r1.ebuild 2342
-SHA256 786ee04b349e1ab1bdf5d3f1b10256c3378e8bf13eef89053b7c31b35ef4a39d novell-nmasclient-3.4.0_p10-r1.ebuild 2342
-EBUILD novell-nmasclient-3.4.0_p10.ebuild 1222 RMD160 4091306b5f09c6270f71300703675389bdee06c2 SHA1 950e4ea13667909981979b78a63b22b45b76d74a SHA256 bd6b4051f904c73aef58fccf478200f92ab82ec9c1ac8a0bdb0dc8fab86c384f
-MD5 e6470c5c823917bb6272c7c3df771148 novell-nmasclient-3.4.0_p10.ebuild 1222
-RMD160 4091306b5f09c6270f71300703675389bdee06c2 novell-nmasclient-3.4.0_p10.ebuild 1222
-SHA256 bd6b4051f904c73aef58fccf478200f92ab82ec9c1ac8a0bdb0dc8fab86c384f novell-nmasclient-3.4.0_p10.ebuild 1222
-MISC ChangeLog 923 RMD160 a5b9e5e2c0cc048736326211fc9d6fed3f76d998 SHA1 1dcc8dfa7b278761baffd36eeb6ab1d3cd98024d SHA256 282dedaac7b2657520f6c056544f583cf5eaa6f23edf3b36c002e95bc4c7e5cb
-MD5 d84817ef239b20e93b6009ec26f09b26 ChangeLog 923
-RMD160 a5b9e5e2c0cc048736326211fc9d6fed3f76d998 ChangeLog 923
-SHA256 282dedaac7b2657520f6c056544f583cf5eaa6f23edf3b36c002e95bc4c7e5cb ChangeLog 923
+DIST Novell_Client_SLED10-i386-2007809-CD1.iso 10700800 RMD160 62391aee905e3bb6b53da52f472ee0cd23466c26 SHA1 34055efbd487157c6ac9988cc8093408e806f8d5 SHA256 3f1bb4bbc63e947a23f77103160af3947bbaa3a83f33e3f87e78c714551be66d
+DIST Novell_Client_SLED10-x86_64-2007809-CD1.iso 11520000 RMD160 f5499e3881f5f90f19fc14386d7c1971478d38db SHA1 eeb406ab76eeaf231562dcc58a9313f2432b14e4 SHA256 cfb733b8adf5ea6b0454e37a8761bfc55af965df962630818dea023911567ea1
+EBUILD novell-nmasclient-3.4.0_p16.ebuild 2345 RMD160 5fe0ec0815123fbe1d6e296661773f344cf3f384 SHA1 e4a3ca2a50241f8461a43b02739837cb821cdb8c SHA256 3ec6c142d48bc9b9b59ce1a0cc7aa678ebe71dba30f8b3436a0be1e49ad04d58
+MD5 218180bb2d715ad0447cd9d222d92610 novell-nmasclient-3.4.0_p16.ebuild 2345
+RMD160 5fe0ec0815123fbe1d6e296661773f344cf3f384 novell-nmasclient-3.4.0_p16.ebuild 2345
+SHA256 3ec6c142d48bc9b9b59ce1a0cc7aa678ebe71dba30f8b3436a0be1e49ad04d58 novell-nmasclient-3.4.0_p16.ebuild 2345
+MISC ChangeLog 1135 RMD160 58bdf5befca52a58c22e7e4f0fecfd0418a66e92 SHA1 8c927196613c06e6f5c8058a3afe989f7306cf0b SHA256 b92affc5be50ad6d68f09feee5dc5d907f92a05fe6fdb8c299f082e3f5b98010
+MD5 ba45349dab80122a6cd28cca57215b2c ChangeLog 1135
+RMD160 58bdf5befca52a58c22e7e4f0fecfd0418a66e92 ChangeLog 1135
+SHA256 b92affc5be50ad6d68f09feee5dc5d907f92a05fe6fdb8c299f082e3f5b98010 ChangeLog 1135
 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 dcdc80c8269e53d3a5ecd72aa4034a06 files/digest-novell-nmasclient-3.2.0_p9-r3 277
-RMD160 4767389e6f47ba8fb5b8907a954b9f80ce106b78 files/digest-novell-nmasclient-3.2.0_p9-r3 277
-SHA256 aa21d5b182ad571f4bedf0694cc608f211146d09e0af2bdd1addd6415a2bf0b8 files/digest-novell-nmasclient-3.2.0_p9-r3 277
-MD5 ec699dae9428f5ecd71e3b6fdc0b8405 files/digest-novell-nmasclient-3.4.0_p10 626
-RMD160 a08fca1bf3e2cb25ea5b9fb70f27de63c0e9974a files/digest-novell-nmasclient-3.4.0_p10 626
-SHA256 d20395db16f0e2a59b7411ac9ea0817b657bd9804d54da40d459a518a13b5153 files/digest-novell-nmasclient-3.4.0_p10 626
-MD5 ec699dae9428f5ecd71e3b6fdc0b8405 files/digest-novell-nmasclient-3.4.0_p10-r1 626
-RMD160 a08fca1bf3e2cb25ea5b9fb70f27de63c0e9974a files/digest-novell-nmasclient-3.4.0_p10-r1 626
-SHA256 d20395db16f0e2a59b7411ac9ea0817b657bd9804d54da40d459a518a13b5153 files/digest-novell-nmasclient-3.4.0_p10-r1 626
+MD5 4afa41e8d7745d382c45876dcba25c65 files/digest-novell-nmasclient-3.4.0_p16 626
+RMD160 a8dc846c8ee80833077235c36bce2579d49d2461 files/digest-novell-nmasclient-3.4.0_p16 626
+SHA256 0472256482752825cbb9a3be850a9fddb846c8880ed1719dfcaebb9432758d1f files/digest-novell-nmasclient-3.4.0_p16 626
diff --git a/branches/experimental/sys-auth/novell-nmasclient/files/digest-novell-nmasclient-3.2.0_p9-r3 b/branches/experimental/sys-auth/novell-nmasclient/files/digest-novell-nmasclient-3.2.0_p9-r3
deleted file mode 100644
index 9702858d..00000000
--- a/branches/experimental/sys-auth/novell-nmasclient/files/digest-novell-nmasclient-3.2.0_p9-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2aab6c7358a733d1d8d9a4e893500a36 novell-client-1.2-SLE10.tar.gz 13963983
-RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 novell-client-1.2-SLE10.tar.gz 13963983
-SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241 novell-client-1.2-SLE10.tar.gz 13963983
diff --git a/branches/experimental/sys-auth/novell-nmasclient/files/digest-novell-nmasclient-3.4.0_p10 b/branches/experimental/sys-auth/novell-nmasclient/files/digest-novell-nmasclient-3.4.0_p10
deleted file mode 100644
index 3dc529b7..00000000
--- a/branches/experimental/sys-auth/novell-nmasclient/files/digest-novell-nmasclient-3.4.0_p10
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 476f30aa3db4de7b884b2085f89b837b Novell_Client_SLED10-i386-2007531-CD1.iso 10256384
-RMD160 5296935f1b2b5cb0796b685f5c6bacd532f49094 Novell_Client_SLED10-i386-2007531-CD1.iso 10256384
-SHA256 3433f30fed62339de2fe12426e4e4e064ec4823073d2271531d7a1009f9cdecf Novell_Client_SLED10-i386-2007531-CD1.iso 10256384
-MD5 94c4812cfd6400e3e9360de01cb9d304 Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352
-RMD160 9b5a8704e518ac7ce1d9d03a890e77a67610cbaa Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352
-SHA256 f170dad7e9774d6b55186228f0ed3de512b09255d5d19f54e86964a327b62806 Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352
diff --git a/branches/experimental/sys-auth/novell-nmasclient/files/digest-novell-nmasclient-3.4.0_p10-r1 b/branches/experimental/sys-auth/novell-nmasclient/files/digest-novell-nmasclient-3.4.0_p10-r1
deleted file mode 100644
index 3dc529b7..00000000
--- a/branches/experimental/sys-auth/novell-nmasclient/files/digest-novell-nmasclient-3.4.0_p10-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 476f30aa3db4de7b884b2085f89b837b Novell_Client_SLED10-i386-2007531-CD1.iso 10256384
-RMD160 5296935f1b2b5cb0796b685f5c6bacd532f49094 Novell_Client_SLED10-i386-2007531-CD1.iso 10256384
-SHA256 3433f30fed62339de2fe12426e4e4e064ec4823073d2271531d7a1009f9cdecf Novell_Client_SLED10-i386-2007531-CD1.iso 10256384
-MD5 94c4812cfd6400e3e9360de01cb9d304 Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352
-RMD160 9b5a8704e518ac7ce1d9d03a890e77a67610cbaa Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352
-SHA256 f170dad7e9774d6b55186228f0ed3de512b09255d5d19f54e86964a327b62806 Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352
diff --git a/branches/experimental/sys-auth/novell-nmasclient/files/digest-novell-nmasclient-3.4.0_p16 b/branches/experimental/sys-auth/novell-nmasclient/files/digest-novell-nmasclient-3.4.0_p16
new file mode 100644
index 00000000..d8e4d2a5
--- /dev/null
+++ b/branches/experimental/sys-auth/novell-nmasclient/files/digest-novell-nmasclient-3.4.0_p16
@@ -0,0 +1,6 @@
+MD5 6b230917694d84b2af9a187ff31008b3 Novell_Client_SLED10-i386-2007809-CD1.iso 10700800
+RMD160 62391aee905e3bb6b53da52f472ee0cd23466c26 Novell_Client_SLED10-i386-2007809-CD1.iso 10700800
+SHA256 3f1bb4bbc63e947a23f77103160af3947bbaa3a83f33e3f87e78c714551be66d Novell_Client_SLED10-i386-2007809-CD1.iso 10700800
+MD5 64907055593fcb03a0ffeca1933a1dd4 Novell_Client_SLED10-x86_64-2007809-CD1.iso 11520000
+RMD160 f5499e3881f5f90f19fc14386d7c1971478d38db Novell_Client_SLED10-x86_64-2007809-CD1.iso 11520000
+SHA256 cfb733b8adf5ea6b0454e37a8761bfc55af965df962630818dea023911567ea1 Novell_Client_SLED10-x86_64-2007809-CD1.iso 11520000
diff --git a/branches/experimental/sys-auth/novell-nmasclient/novell-nmasclient-3.2.0_p9-r3.ebuild b/branches/experimental/sys-auth/novell-nmasclient/novell-nmasclient-3.2.0_p9-r3.ebuild
deleted file mode 100644
index 7f05fe0a..00000000
--- a/branches/experimental/sys-auth/novell-nmasclient/novell-nmasclient-3.2.0_p9-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils rpm
-
-MY_PV="${PV/_p/-}"
-DESCRIPTION="Novell NMAS Client for Linux"
-HOMEPAGE="http://www.novell.com"
-SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/2JyMn7sWP_Q~/novell-client-1.2-SLE10.tar.gz"
-LICENSE="Novell-NCL"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="gtk"
-DEPEND=""
-RDEPEND="virtual/libc
-	!net-misc/novell-nmasclient"
-RESTRICT="nomirror nostrip"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p ${WORKDIR}/${PN}-${MY_PV}
-	cd ${PN}-${MY_PV}
-	rpm_unpack ${WORKDIR}/ncl_build_711/NCL_disk/novell/i386/${PN}-${MY_PV}.i386.rpm
-}
-
-src_compile() { :; }
-
-src_install() {
-	into /opt/novell/nmas/client/
-	dobin ${WORKDIR}/${PN}-${MY_PV}/opt/novell/nmas/client/bin/*
-	dolib.so ${WORKDIR}/${PN}-${MY_PV}/opt/novell/nmas/client/lib/*
-	doenvd "${FILESDIR}"/80novell-nmasclient
-}
\ No newline at end of file
diff --git a/branches/experimental/sys-auth/novell-nmasclient/novell-nmasclient-3.4.0_p10.ebuild b/branches/experimental/sys-auth/novell-nmasclient/novell-nmasclient-3.4.0_p10.ebuild
deleted file mode 100644
index d09581e1..00000000
--- a/branches/experimental/sys-auth/novell-nmasclient/novell-nmasclient-3.4.0_p10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils rpm
-
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Novell NMAS Client for Linux"
-HOMEPAGE="http://www.novell.com"
-SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/21a91ftmUKk~/Novell_Client_SLED10-i386-2007531-CD1.iso
-        http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/21a91ftmUKk~/Novell_Client_SLED10-x86_64-2007531-CD1.iso"
-LICENSE="Novell-NCL"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="gtk"
-
-DEPEND=">=app-arch/p7zip-4.15"
-
-RDEPEND="virtual/libc
-	>=app-crypt/novell-nici-2.7.3_p5"
-
-RESTRICT="nomirror strip"
-
-src_unpack() {
-	cd ${WORKDIR}
-        7z x ${DISTDIR}/Novell_Client_SLED10-i386-2007531-CD1.iso
-#       7z x ${DISTDIR}/Novell_Client_SLED10-x86_64-2007531-CD1.iso
-	mkdir -p ${WORKDIR}/${PN}-${MY_PV}
-	cd ${PN}-${MY_PV}
-	rpm_unpack ${WORKDIR}/suse/i586/${PN}-${MY_PV}.i586.rpm
-}
-
-src_compile() { :; }
-
-src_install() {
-	into /opt/novell/nmas/client/
-	dobin ${WORKDIR}/${PN}-${MY_PV}/opt/novell/nmas/client/bin/*
-	dolib.so ${WORKDIR}/${PN}-${MY_PV}/opt/novell/nmas/client/lib/*
-	doenvd "${FILESDIR}"/80novell-nmasclient
-}
\ No newline at end of file
diff --git a/branches/experimental/sys-auth/novell-nmasclient/novell-nmasclient-3.4.0_p10-r1.ebuild b/branches/experimental/sys-auth/novell-nmasclient/novell-nmasclient-3.4.0_p16.ebuild
similarity index 87%
rename from branches/experimental/sys-auth/novell-nmasclient/novell-nmasclient-3.4.0_p10-r1.ebuild
rename to branches/experimental/sys-auth/novell-nmasclient/novell-nmasclient-3.4.0_p16.ebuild
index 76a27db8..480d7f10 100644
--- a/branches/experimental/sys-auth/novell-nmasclient/novell-nmasclient-3.4.0_p10-r1.ebuild
+++ b/branches/experimental/sys-auth/novell-nmasclient/novell-nmasclient-3.4.0_p16.ebuild
@@ -8,10 +8,10 @@ MY_PV="${PV/_p/-}"
 
 DESCRIPTION="Novell NMAS Client for Linux"
 HOMEPAGE="http://www.novell.com"
-SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/21a91ftmUKk~/Novell_Client_SLED10-i386-2007531-CD1.iso
-	amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/21a91ftmUKk~/Novell_Client_SLED10-x86_64-2007531-CD1.iso )"
+SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/21a91ftmUKk~/Novell_Client_SLED10-i386-2007809-CD1.iso
+	amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/21a91ftmUKk~/Novell_Client_SLED10-x86_64-2007809-CD1.iso )"
 	
-LICENSE="Novell-NCL"
+LICENSE="Novell-ncl-EULA"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
@@ -21,7 +21,7 @@ DEPEND=">=app-arch/p7zip-4.15"
 RDEPEND="virtual/libc
 	>=app-crypt/novell-nici-2.7.3_p5-r1"
 
-RESTRICT="nomirror strip"
+RESTRICT="mirror strip"
 
 src_unpack() {
         cd ${WORKDIR}
@@ -30,7 +30,7 @@ src_unpack() {
             narch=i586
             nlib=lib
 
-            7z x ${DISTDIR}/Novell_Client_SLED10-i386-2007531-CD1.iso
+            7z x ${DISTDIR}/Novell_Client_SLED10-i386-2007809-CD1.iso
             mkdir -p ${WORKDIR}/${PN}-${MY_PV}
             cd ${PN}-${MY_PV}
             rpm_unpack ${WORKDIR}/suse/${narch}/${PN}-${MY_PV}.${narch}.rpm
@@ -41,9 +41,9 @@ src_unpack() {
 
             if has_multilib_profile
             then
-        	7z x ${DISTDIR}/Novell_Client_SLED10-i386-2007531-CD1.iso
+        	7z x ${DISTDIR}/Novell_Client_SLED10-i386-2007809-CD1.iso
             fi
-            7z x -y ${DISTDIR}/Novell_Client_SLED10-x86_64-2007531-CD1.iso
+            7z x -y ${DISTDIR}/Novell_Client_SLED10-x86_64-2007809-CD1.iso
             mkdir -p ${WORKDIR}/${PN}-${MY_PV}
             cd ${PN}-${MY_PV}
             rpm_unpack ${WORKDIR}/suse/${narch}/${PN}-${MY_PV}.${narch}.rpm