Add Novell Client 2.0 Beta to the experimental tree; the next step is to cleanup the ebuilds; then start extending the ebuilds to amd64 (yes novell created a public amd64 version)

2007-08-02 20:17:08 +00:00 · 2007-08-02 20:17:08 +00:00 · 473b8d5775
commit 473b8d5775
parent c73a6acd4c
69 changed files with 306 additions and 34662 deletions
--- a/branches/experimental/app-admin/novell-groupwise-admin/Manifest
+++ b/branches/experimental/app-admin/novell-groupwise-admin/Manifest
@ -1,8 +1,8 @@
 DIST gw702HP1lnxmulti.tar.gz 410982696 RMD160 24e8fc8d92c25278bedc914380d61369b3c1fbb0 SHA1 a9fb7071db328fe225ed7581153888994eb22d93 SHA256 13c91682a17378c872762fc9d352c539341c803c2fb93f34b1dfff3264899e6e
-EBUILD novell-groupwise-admin-7.0.2_p20070524.ebuild 2751 RMD160 0f59c049246cbd6a8561a19a99e5e4909331af7a SHA1 0469ca995647c7ec2f2cda7b159a8e88a0cdbaaf SHA256 378e3ca771404c317ca27e1c01a4260edf298c72daca1f68092f21285d56dc7d
+EBUILD novell-groupwise-admin-7.0.2_p20070524.ebuild 2749 RMD160 27c32bc7794360e35681953cb8a772e2f41c08d2 SHA1 3a56b43bf17a65a422aba4ad85ca9ed4223a7457 SHA256 0b71937a33f50c1b290fe7a2f0f7729cdfd0613d8cc77032d34085e08d0d707e
-MD5 c32cffe3572b317ceb5ad7ac921ac236 novell-groupwise-admin-7.0.2_p20070524.ebuild 2751
+MD5 a7c436de3e63cff2d9b6251cfae185e6 novell-groupwise-admin-7.0.2_p20070524.ebuild 2749
-RMD160 0f59c049246cbd6a8561a19a99e5e4909331af7a novell-groupwise-admin-7.0.2_p20070524.ebuild 2751
+RMD160 27c32bc7794360e35681953cb8a772e2f41c08d2 novell-groupwise-admin-7.0.2_p20070524.ebuild 2749
-SHA256 378e3ca771404c317ca27e1c01a4260edf298c72daca1f68092f21285d56dc7d novell-groupwise-admin-7.0.2_p20070524.ebuild 2751
+SHA256 0b71937a33f50c1b290fe7a2f0f7729cdfd0613d8cc77032d34085e08d0d707e novell-groupwise-admin-7.0.2_p20070524.ebuild 2749
 MD5 ffcffd62e623cc4125a3f650e3c7eefd files/digest-novell-groupwise-admin-7.0.2_p20070524 259
 RMD160 537aa1dfa006521266bde11d4c3a03cde3222765 files/digest-novell-groupwise-admin-7.0.2_p20070524 259
 SHA256 e66b646a8707f4180b97da239e60602f73321b5b214ba24663d8b57751502861 files/digest-novell-groupwise-admin-7.0.2_p20070524 259
--- a/branches/experimental/app-admin/novell-groupwise-admin/novell-groupwise-admin-7.0.2_p20070524.ebuild
+++ b/branches/experimental/app-admin/novell-groupwise-admin/novell-groupwise-admin-7.0.2_p20070524.ebuild
@ -21,7 +21,7 @@ RDEPEND="virtual/libc
 	>=virtual/jdk-1.4
 	>=app-admin/novell-novlc1-1.3.6_p1"
-RESTRICT="nomirror nostrip"
+RESTRICT="nomirror strip"
 src_unpack() {
 	unpack ${A}
--- a/branches/experimental/kde-misc/kio_slp/ChangeLog
+++ b/branches/experimental/kde-misc/kio_slp/ChangeLog
@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  02 Aug 2007; Mario Fetka <mario-fetka@gmx.at> -kio_slp-0.4.1_p92.ebuild,
  -kio_slp-0.4.1_p93.ebuild, +kio_slp-0.4.1_p100.ebuild:
  Bump Package to latest version also added a new mirror
  17 Jul 2007; Mario Fetka <mario-fetka@gmx.at> -kio_slp-0.4.1_p62.ebuild,
  -kio_slp-0.4.1_p75.ebuild, +kio_slp-0.4.1_p93.ebuild:
  Bump Version and drop old
--- a/branches/experimental/kde-misc/kio_slp/Manifest
+++ b/branches/experimental/kde-misc/kio_slp/Manifest
@ -1,13 +1,8 @@
-DIST kio_slp-0.4.1-92.src.rpm 24061 RMD160 69a0141f55aebda10aee28416943f404a25488f1 SHA1 fe0320408d005d2d171ce45abf5b8e960fcc50bb SHA256 e6c5076cb32c46325eedf2a7fc6c790883f3e377eadeee46eff67dc99fdbdb1e
+DIST kio_slp-0.4.1-100.src.rpm 24069 RMD160 8a28d42e3d768788ddb827ac13d329cf39912bef SHA1 fe0dcd384234e3cbdab6d16b7c20dd05db0153b9 SHA256 4862d5d8302e1e450debde2c6e1ee86e940adc1fc043a186133d56761f1ca947
-DIST kio_slp-0.4.1-93.src.rpm 24067 RMD160 3544d2ed1c375163d9cdcaf5709219a9061c9b95 SHA1 1857093613bed1cc5944ff688f8bc6e87a318402 SHA256 bfeed0e1822cd94eb8d889fa5e3bd47ee5ec6a4aa7b26d41e2e3cf9874a33520
+EBUILD kio_slp-0.4.1_p100.ebuild 873 RMD160 88b5f388494ee316b2ba16c9946980665c4e62d9 SHA1 6f3aa4506737aad1f782cb6110f0d250637b38a9 SHA256 63fa7af5def1023494f3f96ed9abeec55b026f5d8ce364e33e24cdc4df3a064e
-EBUILD kio_slp-0.4.1_p92.ebuild 897 RMD160 b4c8231398faf050cca1675d8c6e5f8b0a7943f7 SHA1 befda536d0465002cba547820a7c866f7f010fb6 SHA256 7df386fecad0734c1653e0edeb35f6ffad13bd6ea0a01a7a539eba6561fb23f5
+MD5 94646a9e71e4bed983d07bc2de0b07b4 kio_slp-0.4.1_p100.ebuild 873
-MD5 429f2629e085c6ff4be60b2370fc6cc1 kio_slp-0.4.1_p92.ebuild 897
+RMD160 88b5f388494ee316b2ba16c9946980665c4e62d9 kio_slp-0.4.1_p100.ebuild 873
-RMD160 b4c8231398faf050cca1675d8c6e5f8b0a7943f7 kio_slp-0.4.1_p92.ebuild 897
+SHA256 63fa7af5def1023494f3f96ed9abeec55b026f5d8ce364e33e24cdc4df3a064e kio_slp-0.4.1_p100.ebuild 873
 SHA256 7df386fecad0734c1653e0edeb35f6ffad13bd6ea0a01a7a539eba6561fb23f5 kio_slp-0.4.1_p92.ebuild 897
 EBUILD kio_slp-0.4.1_p93.ebuild 897 RMD160 b4c8231398faf050cca1675d8c6e5f8b0a7943f7 SHA1 befda536d0465002cba547820a7c866f7f010fb6 SHA256 7df386fecad0734c1653e0edeb35f6ffad13bd6ea0a01a7a539eba6561fb23f5
 MD5 429f2629e085c6ff4be60b2370fc6cc1 kio_slp-0.4.1_p93.ebuild 897
 RMD160 b4c8231398faf050cca1675d8c6e5f8b0a7943f7 kio_slp-0.4.1_p93.ebuild 897
 SHA256 7df386fecad0734c1653e0edeb35f6ffad13bd6ea0a01a7a539eba6561fb23f5 kio_slp-0.4.1_p93.ebuild 897
 MISC ChangeLog 1423 RMD160 d348f6390e73c4abbf8d9af91d7a9352f9afbfab SHA1 5d121df8cc8c026a815e32198d096662272570ac SHA256 b8b3067fb6f64c209fb2e9d57d710bf6719b9541137fa7c0990d02bd0d7966bf
 MD5 403022a210256b48dc2770479705c481 ChangeLog 1423
 RMD160 d348f6390e73c4abbf8d9af91d7a9352f9afbfab ChangeLog 1423
@ -16,9 +11,6 @@ MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f4
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 6f784736950054f0e2f7401eed2ad106 files/digest-kio_slp-0.4.1_p92 250
+MD5 7722b4027a4287954884e38adc932e85 files/digest-kio_slp-0.4.1_p100 253
-RMD160 b11f7503e29d63a590b8edcb83baaa81f17466d3 files/digest-kio_slp-0.4.1_p92 250
+RMD160 a1d9544ecf8aaf4b7538a73506273860505ef43b files/digest-kio_slp-0.4.1_p100 253
-SHA256 ec091c2e54f0d81a2cd7e463eab72d6f9ddbb4f01cd713e341b52ba7c2d6a6fc files/digest-kio_slp-0.4.1_p92 250
+SHA256 63d1b8c34fc9012cf52aba9429dd1019e564843a9978845ca7a1ecb4afb3cfff files/digest-kio_slp-0.4.1_p100 253
 MD5 cf6999a2b4910c40c9924cf9beaa6867 files/digest-kio_slp-0.4.1_p93 250
 RMD160 d4f8af7e06fa9c09a5e38943632f412a3801252c files/digest-kio_slp-0.4.1_p93 250
 SHA256 35d7e9c54c669a0a5e18bde6a74fde06675cd09829b0354c708c95fe5c729bfb files/digest-kio_slp-0.4.1_p93 250
--- a/branches/experimental/kde-misc/kio_slp/files/digest-kio_slp-0.4.1_p100
+++ b/branches/experimental/kde-misc/kio_slp/files/digest-kio_slp-0.4.1_p100
@ -0,0 +1,3 @@
 MD5 e736c6f610b73f1d6c7079f6360a203b kio_slp-0.4.1-100.src.rpm 24069
 RMD160 8a28d42e3d768788ddb827ac13d329cf39912bef kio_slp-0.4.1-100.src.rpm 24069
 SHA256 4862d5d8302e1e450debde2c6e1ee86e940adc1fc043a186133d56761f1ca947 kio_slp-0.4.1-100.src.rpm 24069
--- a/branches/experimental/kde-misc/kio_slp/files/digest-kio_slp-0.4.1_p92
+++ b/branches/experimental/kde-misc/kio_slp/files/digest-kio_slp-0.4.1_p92
@ -1,3 +0,0 @@
 MD5 288b6c88c781ddb1221bd6ff5c8aaf8d kio_slp-0.4.1-92.src.rpm 24061
 RMD160 69a0141f55aebda10aee28416943f404a25488f1 kio_slp-0.4.1-92.src.rpm 24061
 SHA256 e6c5076cb32c46325eedf2a7fc6c790883f3e377eadeee46eff67dc99fdbdb1e kio_slp-0.4.1-92.src.rpm 24061
--- a/branches/experimental/kde-misc/kio_slp/files/digest-kio_slp-0.4.1_p93
+++ b/branches/experimental/kde-misc/kio_slp/files/digest-kio_slp-0.4.1_p93
@ -1,3 +0,0 @@
 MD5 664420ded430e881af3421439f2356c8 kio_slp-0.4.1-93.src.rpm 24067
 RMD160 3544d2ed1c375163d9cdcaf5709219a9061c9b95 kio_slp-0.4.1-93.src.rpm 24067
 SHA256 bfeed0e1822cd94eb8d889fa5e3bd47ee5ec6a4aa7b26d41e2e3cf9874a33520 kio_slp-0.4.1-93.src.rpm 24067
--- a/branches/experimental/kde-misc/kio_slp/kio_slp-0.4.1_p100.ebuild
+++ b/branches/experimental/kde-misc/kio_slp/kio_slp-0.4.1_p100.ebuild
@ -8,8 +8,8 @@ MY_P=${P/_p/-}
 DESCRIPTION="KDE kio slave for slp (using openslp)"
 HOMEPAGE="http://opensuse.org"
-SRC_URI="http://download.opensuse.org/distribution/SL-OSS-factory/inst-source/suse/src/${MY_P}.src.rpm
+SRC_URI="ftp://mars.arge.at/n4g/${MY_P}.src.rpm 
-	http://lepetitfou.dyndns.org/download/distfiles/${MY_P}.src.rpm"
+	http://download.opensuse.org/distribution/SL-OSS-factory/inst-source/suse/src/${MY_P}.src.rpm"
 LICENSE="GPL-2"
 SLOT="0"
--- a/branches/experimental/kde-misc/kio_slp/kio_slp-0.4.1_p93.ebuild
+++ b/branches/experimental/kde-misc/kio_slp/kio_slp-0.4.1_p93.ebuild
@ -1,43 +0,0 @@
 # Copyright 1999-2007 Gentoo Foundation, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 inherit autotools rpm kde
 MY_P=${P/_p/-}
 DESCRIPTION="KDE kio slave for slp (using openslp)"
 HOMEPAGE="http://opensuse.org"
 SRC_URI="http://download.opensuse.org/distribution/SL-OSS-factory/inst-source/suse/src/${MY_P}.src.rpm
 	http://lepetitfou.dyndns.org/download/distfiles/${MY_P}.src.rpm"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 KEYWORDS="~x86 ~amd64"
 RDEPEND="net-libs/openslp"
 DEPEND="|| ( kde-base/kapptemplate kde-base/kdesdk )
 	${RDEPEND}"
 S=${WORKDIR}/${PN}
 need-kde 3.4
 src_unpack() {
 	rpm_src_unpack
 	cd ${PN}
 	cp -a ${KDEDIR}/share/apps/kapptemplate/admin admin
 	chmod +x admin/detect-autoconf.pl
 }
 pkg_postinst()
 {
 	echo
 	einfo "To start using the services provided by kio_slp,"
 	einfo "point Konqueror to 'service:/', 'slp:/' and/or 'mdns:/'"
 	echo
 }
--- a/branches/experimental/kde-misc/novell-qtgui/ChangeLog
+++ b/branches/experimental/kde-misc/novell-qtgui/ChangeLog
@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  02 Aug 2007; Mario Fetka <mario-fetka@gmx.at>
  -novell-qtgui-1.2.0_p323-r4.ebuild, +novell-qtgui-2.0.425_p2.ebuild:
  beta ebuild novell client
  04 Apr 2007; Mario Fetka <mario-fetka@gmx.at>
  -novell-qtgui-1.2.0_p323-r2.ebuild, -novell-qtgui-1.2.0_p323-r3.ebuild:
  Drop old buggy ebuild
--- a/branches/experimental/kde-misc/novell-qtgui/Manifest
+++ b/branches/experimental/kde-misc/novell-qtgui/Manifest
@ -2,11 +2,12 @@ AUX 80novell-client 164 RMD160 1873d6c60904a7c729f0e7ed9f5a21ac7dd6bbe8 SHA1 240
 MD5 6768ec207bdfb38f47d151aba0105d05 files/80novell-client 164
 RMD160 1873d6c60904a7c729f0e7ed9f5a21ac7dd6bbe8 files/80novell-client 164
 SHA256 dafe1812e1005f625deba9bcc6e60f3623c7ddd633e584c6a4533f7836af691f files/80novell-client 164
-DIST novell-client-1.2-SLE10.tar.gz 13963983 RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 SHA1 14278f74c8226afabc0c602bdc31d4e20acff6b9 SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241
+DIST Novell_Client_SLED10-i386-2007531-CD1.iso 10256384 RMD160 5296935f1b2b5cb0796b685f5c6bacd532f49094 SHA1 96d1df5bce5f0afb0a625084226fb347728fcffb SHA256 3433f30fed62339de2fe12426e4e4e064ec4823073d2271531d7a1009f9cdecf
-EBUILD novell-qtgui-1.2.0_p323-r4.ebuild 2755 RMD160 ff0832d6b75477fe4c5409bec5eb91a91ba8aa3e SHA1 92f9055c5251392e27d992e39e0f9614ff6977c9 SHA256 9195d2ef02d639fd2c63f0b3bd3390105bd5ed7725c294751e9837b3830ae964
+DIST Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352 RMD160 9b5a8704e518ac7ce1d9d03a890e77a67610cbaa SHA1 0430885f18e803bba63ec264022589c4d934ef03 SHA256 f170dad7e9774d6b55186228f0ed3de512b09255d5d19f54e86964a327b62806
-MD5 ef6bafd35e82c33d3fb1846628d1f044 novell-qtgui-1.2.0_p323-r4.ebuild 2755
+EBUILD novell-qtgui-2.0.425_p2.ebuild 3080 RMD160 64a9cebe8ec35545caab958e059873820eca044d SHA1 0ceff330fb177adf64dcd8ff96bc9a8546178560 SHA256 447d67bcba6eee4d1dd5a9d671b4bcd889d544967f93cedd22e93af946cd4166
-RMD160 ff0832d6b75477fe4c5409bec5eb91a91ba8aa3e novell-qtgui-1.2.0_p323-r4.ebuild 2755
+MD5 49c4625463cf7f90a340ecb5ab124f17 novell-qtgui-2.0.425_p2.ebuild 3080
-SHA256 9195d2ef02d639fd2c63f0b3bd3390105bd5ed7725c294751e9837b3830ae964 novell-qtgui-1.2.0_p323-r4.ebuild 2755
+RMD160 64a9cebe8ec35545caab958e059873820eca044d novell-qtgui-2.0.425_p2.ebuild 3080
 SHA256 447d67bcba6eee4d1dd5a9d671b4bcd889d544967f93cedd22e93af946cd4166 novell-qtgui-2.0.425_p2.ebuild 3080
 MISC ChangeLog 857 RMD160 8861bcd5225c26170932a014deec0f446fb8aa0d SHA1 d249df8d4274fefcd9943740ac2e69b760a6b362 SHA256 dba1f86d5f5b397eeff7d44c628b30331814b014a8ac6955c093d3d8d3cb7fe2
 MD5 50c0a27b83dc5772a8c59d6934ca6a7f ChangeLog 857
 RMD160 8861bcd5225c26170932a014deec0f446fb8aa0d ChangeLog 857
@ -15,6 +16,6 @@ MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f4
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 dcdc80c8269e53d3a5ecd72aa4034a06 files/digest-novell-qtgui-1.2.0_p323-r4 277
+MD5 ec699dae9428f5ecd71e3b6fdc0b8405 files/digest-novell-qtgui-2.0.425_p2 626
-RMD160 4767389e6f47ba8fb5b8907a954b9f80ce106b78 files/digest-novell-qtgui-1.2.0_p323-r4 277
+RMD160 a08fca1bf3e2cb25ea5b9fb70f27de63c0e9974a files/digest-novell-qtgui-2.0.425_p2 626
-SHA256 aa21d5b182ad571f4bedf0694cc608f211146d09e0af2bdd1addd6415a2bf0b8 files/digest-novell-qtgui-1.2.0_p323-r4 277
+SHA256 d20395db16f0e2a59b7411ac9ea0817b657bd9804d54da40d459a518a13b5153 files/digest-novell-qtgui-2.0.425_p2 626
--- a/branches/experimental/kde-misc/novell-qtgui/files/digest-novell-qtgui-1.2.0_p323-r4
+++ b/branches/experimental/kde-misc/novell-qtgui/files/digest-novell-qtgui-1.2.0_p323-r4
@ -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
--- a/branches/experimental/kde-misc/novell-qtgui/files/digest-novell-qtgui-2.0.425_p2
+++ b/branches/experimental/kde-misc/novell-qtgui/files/digest-novell-qtgui-2.0.425_p2
@ -0,0 +1,6 @@
 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
--- a/branches/experimental/kde-misc/novell-qtgui/novell-qtgui-1.2.0_p323-r4.ebuild
+++ b/branches/experimental/kde-misc/novell-qtgui/novell-qtgui-1.2.0_p323-r4.ebuild
@ -7,19 +7,20 @@ inherit eutils rpm qt3
 MY_PV="${PV/_p/-}"
 DESCRIPTION="Novell Client UI Base"
 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"
+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 linguas_cs_CZ linguas_de_DE linguas_en_US linguas_es_ES linguas_fr_FR linguas_hu_HU linguas_it_IT linguas_ja_JP linguas_pl_PL linguas_pt_BR linguas_ru_RU linguas_sk_SK linguas_zh_CN linguas_zh_TW"
+IUSE="gtk linguas_cs_CZ linguas_de_DE linguas_da_DA linguas_en_US linguas_es_ES linguas_fi_FI linguas_fr_FR linguas_hu_HU linguas_it_IT linguas_ja_JP linguas_nb_NB linguas_pl_PL linguas_pt_BR linguas_ru_RU linguas_sk_SK linguas_zh_CN linguas_zh_TW"
 DEPEND=""
 RDEPEND="virtual/libc
 	virtual/fam
 	$(qt_min_version 3.3)
-	>=net-fs/novell-novfsd-1.2.0
+	>=net-fs/novell-novfsd-2.0.0
 	>=dev-libs/expat-2.0
 	>=kde-misc/novell-ui-base-1.2.0
 	>=kde-base/kdelibs-3.5.1
@ -31,7 +32,7 @@ RDEPEND="virtual/libc
 	>=sys-apps/acl-2.2.34
 	>=sys-apps/attr-2.4.28
 	>=sys-libs/pam-0.99.3
-	>=sys-libs/novell-xplatlib-1.0.2
+	>=sys-libs/novell-xplatlib-1.0.3
 	>=x11-libs/libICE-1.0
 	>=x11-libs/libSM-1.0
 	>=x11-libs/libX11-1.0
@ -43,22 +44,23 @@ RDEPEND="virtual/libc
 	>=x11-libs/libXrandr-1.1
 	>=x11-libs/libXrender-0.9
 	>=sys-devel/gcc-4.1
-	>=sys-libs/zlib-1.2.3
+	>=sys-libs/zlib-1.2.3"
 	!net-misc/novell-qtgui"
-RESTRICT="nomirror nostrip"
+RESTRICT="nomirror strip"
 src_unpack() {
-	unpack ${A}
+        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}/ncl_build_711/NCL_disk/novell/i586/${PN}-${MY_PV}.code10.i586.rpm
+        rpm_unpack ${WORKDIR}/suse/i586/${PN}-2.0.b425-2.i586.rpm
 }
 src_compile() { :; }
 src_install() {
-        for x in cs_CZ de_DE en_US es_ES fr_FR hu_HU it_IT ja_JP pl_PL pt_BR ru_RU sk_SK zh_CN zh_TW
+        for x in cs_CZ de_DE da_DA en_US es_ES fi_FI fr_FR hu_HU it_IT ja_JP nb_NB pl_PL pt_BR ru_RU sk_SK zh_CN zh_TW
        do
            if use linguas_${x}
            then
--- a/branches/experimental/kde-misc/novell-ui-base/ChangeLog
+++ b/branches/experimental/kde-misc/novell-ui-base/ChangeLog
@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  02 Aug 2007; Mario Fetka <mario-fetka@gmx.at>
  +novell-ui-base-2.0.421_p3.ebuild, -novell-ui-base-2.0.b421_p3.ebuild:
  Add beta client 2.0 ebuild
  04 Apr 2007; Mario Fetka <mario-fetka@gmx.at>
  -novell-ui-base-1.2.0_p323-r3.ebuild,
  -novell-ui-base-1.2.0_p323-r4.ebuild:
--- a/branches/experimental/kde-misc/novell-ui-base/Manifest
+++ b/branches/experimental/kde-misc/novell-ui-base/Manifest
@ -2,19 +2,20 @@ AUX 80novell 175 RMD160 6706cbb05c0079b008b1e35a74518b137c1842c4 SHA1 ce625b90ee
 MD5 1cb295c31c8b72610363844e9ccd5138 files/80novell 175
 RMD160 6706cbb05c0079b008b1e35a74518b137c1842c4 files/80novell 175
 SHA256 1602e6f7016cd33476f398196f1061158d9f8f5e302b83911c92e013d6a7d81c files/80novell 175
-DIST novell-client-1.2-SLE10.tar.gz 13963983 RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 SHA1 14278f74c8226afabc0c602bdc31d4e20acff6b9 SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241
+DIST Novell_Client_SLED10-i386-2007531-CD1.iso 10256384 RMD160 5296935f1b2b5cb0796b685f5c6bacd532f49094 SHA1 96d1df5bce5f0afb0a625084226fb347728fcffb SHA256 3433f30fed62339de2fe12426e4e4e064ec4823073d2271531d7a1009f9cdecf
-EBUILD novell-ui-base-1.2.0_p323-r5.ebuild 2374 RMD160 d8a117c5ce161f11415d7194ab7ad1628cd20862 SHA1 40a6ff9333c9ebc5dd80da41c6f8b9b7cd872691 SHA256 0e4ab9933106636f6eae010be82e77b4aa92cf107078c1c635a4c3430561e7ac
+DIST Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352 RMD160 9b5a8704e518ac7ce1d9d03a890e77a67610cbaa SHA1 0430885f18e803bba63ec264022589c4d934ef03 SHA256 f170dad7e9774d6b55186228f0ed3de512b09255d5d19f54e86964a327b62806
-MD5 5b66a536d8f853aa074450f455a1160b novell-ui-base-1.2.0_p323-r5.ebuild 2374
+EBUILD novell-ui-base-2.0.421_p3.ebuild 1785 RMD160 09fded83c8f81a553e6b448a9518e5f206ddde30 SHA1 01d06c72995aa313be68e0502282b3627d20436d SHA256 521947f41e975fd67f7d708145f8cafbb7ebe7e2d59b6035899fcd49418892ed
-RMD160 d8a117c5ce161f11415d7194ab7ad1628cd20862 novell-ui-base-1.2.0_p323-r5.ebuild 2374
+MD5 41d3c0f032243a9b8ddb285c8220ac1d novell-ui-base-2.0.421_p3.ebuild 1785
-SHA256 0e4ab9933106636f6eae010be82e77b4aa92cf107078c1c635a4c3430561e7ac novell-ui-base-1.2.0_p323-r5.ebuild 2374
+RMD160 09fded83c8f81a553e6b448a9518e5f206ddde30 novell-ui-base-2.0.421_p3.ebuild 1785
-MISC ChangeLog 1004 RMD160 54bfa99ab025984345fde4251dfb0d9057e22271 SHA1 9c07460475166138be22530ce467bb83d9e71b5c SHA256 dd1e5e0c3d1d172d287dceb3136207de96b9092e259d1cf5aa9d1522175044dd
+SHA256 521947f41e975fd67f7d708145f8cafbb7ebe7e2d59b6035899fcd49418892ed novell-ui-base-2.0.421_p3.ebuild 1785
-MD5 b26b51e138064518fc717ae4e9cd77f4 ChangeLog 1004
+MISC ChangeLog 1155 RMD160 b37b7dcde007f5ed718dab4dcd3aecfe525567b8 SHA1 4dba232d1b9d174f993b8927e6a8012a8afff551 SHA256 8d9e309fef3198dab4ff9be3bf2fc52f00bf26732a9088759c323e086a5c8555
-RMD160 54bfa99ab025984345fde4251dfb0d9057e22271 ChangeLog 1004
+MD5 96b11995c79e1d574e5e6ce51d7854a1 ChangeLog 1155
-SHA256 dd1e5e0c3d1d172d287dceb3136207de96b9092e259d1cf5aa9d1522175044dd ChangeLog 1004
+RMD160 b37b7dcde007f5ed718dab4dcd3aecfe525567b8 ChangeLog 1155
 SHA256 8d9e309fef3198dab4ff9be3bf2fc52f00bf26732a9088759c323e086a5c8555 ChangeLog 1155
 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-ui-base-1.2.0_p323-r5 277
+MD5 ec699dae9428f5ecd71e3b6fdc0b8405 files/digest-novell-ui-base-2.0.421_p3 626
-RMD160 4767389e6f47ba8fb5b8907a954b9f80ce106b78 files/digest-novell-ui-base-1.2.0_p323-r5 277
+RMD160 a08fca1bf3e2cb25ea5b9fb70f27de63c0e9974a files/digest-novell-ui-base-2.0.421_p3 626
-SHA256 aa21d5b182ad571f4bedf0694cc608f211146d09e0af2bdd1addd6415a2bf0b8 files/digest-novell-ui-base-1.2.0_p323-r5 277
+SHA256 d20395db16f0e2a59b7411ac9ea0817b657bd9804d54da40d459a518a13b5153 files/digest-novell-ui-base-2.0.421_p3 626
--- a/branches/experimental/kde-misc/novell-ui-base/files/digest-novell-ui-base-2.0.421_p3
+++ b/branches/experimental/kde-misc/novell-ui-base/files/digest-novell-ui-base-2.0.421_p3
@ -0,0 +1,6 @@
 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
--- a/branches/experimental/kde-misc/novell-ui-base/files/digest-novell-ui-base-2.0.b421_p3
+++ b/branches/experimental/kde-misc/novell-ui-base/files/digest-novell-ui-base-2.0.b421_p3
@ -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
--- a/branches/experimental/kde-misc/novell-ui-base/novell-ui-base-2.0.b421_p3.ebuild
+++ b/branches/experimental/kde-misc/novell-ui-base/novell-ui-base-2.0.b421_p3.ebuild
@ -30,7 +30,7 @@ src_unpack() {
 #       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
+        rpm_unpack ${WORKDIR}/suse/i586/${PN}-2.0.b421-3.i586.rpm
 }
 src_compile() { :; }
--- a/branches/experimental/net-fs/novell-novfs/ChangeLog
+++ b/branches/experimental/net-fs/novell-novfs/ChangeLog
@ -2,6 +2,25 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  02 Aug 2007; Mario Fetka <mario-fetka@gmx.at>
  -novell-novfs-1.2.0_p17-r2.ebuild, -files/novell-novfs-1.2.0-dentry.patch,
  -files/novell-novfs-1.2.0-dont_use_tasklist_lock.patch,
  -files/novell-novfs-1.2.0-getsb.patch,
  -files/novell-novfs-1.2.0-getsb-fix.patch,
  -files/novell-novfs-1.2.0-license.patch,
  -files/novell-novfs-1.2.0_to_2.0.0.patch,
  -novell-novfs-2.0.0_p2-r1.ebuild, -novell-novfs-2.0.0_p16.ebuild,
  +novell-novfs-2.0.0_p21.ebuild,
  -files/novell-novfs-2.0.0-2_6_15-compat.patch,
  -files/novell-novfs-2.0.0-config_h.patch,
  -files/novell-novfs-2.0.0-dont_use_tasklist_lock.patch,
  -files/novell-novfs-2.0.0-generic_file_read.patch,
  -files/novell-novfs-2.0.0-i_blksize.patch,
  -files/novell-novfs-2.0.0-u.generic_ip.patch,
  +files/novell-novfs-2.0.0-vfs.patch,
  -files/novell-novfs-2.0.0_p16-vfs.patch:
  Update to 2.0.1 still named 2.0.0_p21 also added a new mirror
  17 May 2007; Mario Fetka <mario-fetka@gmx.at>
  +novell-novfs-2.0.0_p16.ebuild, +files/novell-novfs-2.0.0_p16-vfs.patch:
  Update to the new stable novfs.ko (no crash on shutdown)
--- a/branches/experimental/net-fs/novell-novfs/Manifest
+++ b/branches/experimental/net-fs/novell-novfs/Manifest
@ -1,83 +1,20 @@
-AUX novell-novfs-1.2.0-dentry.patch 852 RMD160 4c92b94cc7fb30113e6ee33277425f214d371440 SHA1 86b7c066b3911cf742b948d9ccd22ed647142765 SHA256 4e434ecd6948ec1f3eef339f00674f25ebe23f730e17ec24c56fb1a9c03edd9c
+AUX novell-novfs-2.0.0-vfs.patch 524 RMD160 e33cb2ab1a4f2afb08d05191e5dcddba07cc5aed SHA1 7ff1da61bdafc8a6ad7b193f4f63f4cee3144c64 SHA256 8b664acf9845c539a1f5e405f0e957ed1f906b7ca6c493999076a4865f8b9b08
-MD5 754b1ae21b5ecea0870ee8868a3f9f15 files/novell-novfs-1.2.0-dentry.patch 852
+MD5 38413557e9dd3779b198956963714cf1 files/novell-novfs-2.0.0-vfs.patch 524
-RMD160 4c92b94cc7fb30113e6ee33277425f214d371440 files/novell-novfs-1.2.0-dentry.patch 852
+RMD160 e33cb2ab1a4f2afb08d05191e5dcddba07cc5aed files/novell-novfs-2.0.0-vfs.patch 524
-SHA256 4e434ecd6948ec1f3eef339f00674f25ebe23f730e17ec24c56fb1a9c03edd9c files/novell-novfs-1.2.0-dentry.patch 852
+SHA256 8b664acf9845c539a1f5e405f0e957ed1f906b7ca6c493999076a4865f8b9b08 files/novell-novfs-2.0.0-vfs.patch 524
-AUX novell-novfs-1.2.0-dont_use_tasklist_lock.patch 701 RMD160 094e93515b6a81f53e24fbe10f004c7bae9a904a SHA1 66ec260a0a234f18c09207207e5bfd52ee10e5cf SHA256 7ed7f3e3f5df515fa0fe9afef1dbe8ad92dfe113c9d2ecab9e51ca41a7658ca7
+DIST novfs-2.0.0-21.src.rpm 132718 RMD160 3f02ec1e012683c13d6e99220916853a70664435 SHA1 51898723ad8d694163f7a4ad84cb9cd26e87ff74 SHA256 e6b0d502ec055215ac4dd2da2088a7e771eb6378b14d260ca6d0e3c7dc74cdbb
-MD5 7449d36b869699eececd3b8bc7357a97 files/novell-novfs-1.2.0-dont_use_tasklist_lock.patch 701
+EBUILD novell-novfs-2.0.0_p21.ebuild 1567 RMD160 644cbde8827a8c0e8cc8917f71da0230398e90ab SHA1 b594b79d6f8a23552a81c6d9828e2332e98c5be5 SHA256 465879be7fab05a9212f24337c3d8d888fb3880964eadb9312c43382822d5c2f
-RMD160 094e93515b6a81f53e24fbe10f004c7bae9a904a files/novell-novfs-1.2.0-dont_use_tasklist_lock.patch 701
+MD5 525561b1b411637d66b89a3edaf5f49e novell-novfs-2.0.0_p21.ebuild 1567
-SHA256 7ed7f3e3f5df515fa0fe9afef1dbe8ad92dfe113c9d2ecab9e51ca41a7658ca7 files/novell-novfs-1.2.0-dont_use_tasklist_lock.patch 701
+RMD160 644cbde8827a8c0e8cc8917f71da0230398e90ab novell-novfs-2.0.0_p21.ebuild 1567
-AUX novell-novfs-1.2.0-getsb-fix.patch 3606 RMD160 c0d9c72890fe6d57876ce8036e30fed166bef219 SHA1 1c310bb9dcc74d4051d47657fb01ccb99efd8897 SHA256 ad558d8fc4d19f61b7bf68052733e71c0b83743c01d7b8f9ae0d32c2824a7be1
+SHA256 465879be7fab05a9212f24337c3d8d888fb3880964eadb9312c43382822d5c2f novell-novfs-2.0.0_p21.ebuild 1567
-MD5 084ca881c6014536ce1339e27ccd2d7a files/novell-novfs-1.2.0-getsb-fix.patch 3606
+MISC ChangeLog 2761 RMD160 1a50cf01c34beace8eeb66444d9f27ce9f5a193a SHA1 1e2dffa4d2788219563d60ba51f0314f2a918ced SHA256 4ff6dbda8eb5190e001ce24e352933c8c6c10abf9660519cfc28324d964df425
-RMD160 c0d9c72890fe6d57876ce8036e30fed166bef219 files/novell-novfs-1.2.0-getsb-fix.patch 3606
+MD5 d2b66e2b4ce3d0d6c6f20dc1f28b439b ChangeLog 2761
-SHA256 ad558d8fc4d19f61b7bf68052733e71c0b83743c01d7b8f9ae0d32c2824a7be1 files/novell-novfs-1.2.0-getsb-fix.patch 3606
+RMD160 1a50cf01c34beace8eeb66444d9f27ce9f5a193a ChangeLog 2761
-AUX novell-novfs-1.2.0-getsb.patch 4993 RMD160 73e06868eff0d7ae06a773d4a55be51690ca20e0 SHA1 e9103ad09921bb516322ba62014e4eb114294379 SHA256 008738c15bf0af35084387c3f7852cc47db72fa2df3af3486f7ef710751beaf8
+SHA256 4ff6dbda8eb5190e001ce24e352933c8c6c10abf9660519cfc28324d964df425 ChangeLog 2761
 MD5 4b7233a93e7023f55fd0151f139b6410 files/novell-novfs-1.2.0-getsb.patch 4993
 RMD160 73e06868eff0d7ae06a773d4a55be51690ca20e0 files/novell-novfs-1.2.0-getsb.patch 4993
 SHA256 008738c15bf0af35084387c3f7852cc47db72fa2df3af3486f7ef710751beaf8 files/novell-novfs-1.2.0-getsb.patch 4993
 AUX novell-novfs-1.2.0-license.patch 18620 RMD160 0685ae1d2fe1b88872f83aac50dd545a90ec0bc3 SHA1 96f47c93cd19688ef40a09c13b162ecd44e25deb SHA256 e6e2c5c13b3f4fb6225532d53c1de264d6d3994fe86277b6ab15b4910c140c35
 MD5 9e1367517129a2381c4b29ba27f32052 files/novell-novfs-1.2.0-license.patch 18620
 RMD160 0685ae1d2fe1b88872f83aac50dd545a90ec0bc3 files/novell-novfs-1.2.0-license.patch 18620
 SHA256 e6e2c5c13b3f4fb6225532d53c1de264d6d3994fe86277b6ab15b4910c140c35 files/novell-novfs-1.2.0-license.patch 18620
 AUX novell-novfs-1.2.0_to_2.0.0.patch 934748 RMD160 83cf2e11354171acc045b3571e08654e082833fc SHA1 f6982ddf4f018baaeafbc5f19457b5ed52817643 SHA256 5a53ea406ac75848301a2d4d2e6f64a2610e1be5901de7638cdac18fb1db4667
 MD5 e835b754e6295e6c912284f19a53fa1e files/novell-novfs-1.2.0_to_2.0.0.patch 934748
 RMD160 83cf2e11354171acc045b3571e08654e082833fc files/novell-novfs-1.2.0_to_2.0.0.patch 934748
 SHA256 5a53ea406ac75848301a2d4d2e6f64a2610e1be5901de7638cdac18fb1db4667 files/novell-novfs-1.2.0_to_2.0.0.patch 934748
 AUX novell-novfs-2.0.0-2_6_15-compat.patch 1076 RMD160 57db9103b3fffb4185fc1a979ecd85e63c6f56f3 SHA1 a6856987f3290baae804cbd24e6dfc05ec10b584 SHA256 79e055c4a0a2b9cf7e5e4d3ef2744af680a322ed4189831b53e497cc836faa5b
 MD5 e44ee72f6d2f79b1d8978d422b43dad2 files/novell-novfs-2.0.0-2_6_15-compat.patch 1076
 RMD160 57db9103b3fffb4185fc1a979ecd85e63c6f56f3 files/novell-novfs-2.0.0-2_6_15-compat.patch 1076
 SHA256 79e055c4a0a2b9cf7e5e4d3ef2744af680a322ed4189831b53e497cc836faa5b files/novell-novfs-2.0.0-2_6_15-compat.patch 1076
 AUX novell-novfs-2.0.0-config_h.patch 387 RMD160 c029426c8cfe7d6f8c63aefa3f94c801c8f397d8 SHA1 b43868344bc1d0d93ed12b325278a85fe49da767 SHA256 6ef79f82f4fbc2e15e0e914767166a9e7424426bc6a2a8a6597f6cc33738e17c
 MD5 ce1ba8bd6c62ed620571dfd89e97eb9c files/novell-novfs-2.0.0-config_h.patch 387
 RMD160 c029426c8cfe7d6f8c63aefa3f94c801c8f397d8 files/novell-novfs-2.0.0-config_h.patch 387
 SHA256 6ef79f82f4fbc2e15e0e914767166a9e7424426bc6a2a8a6597f6cc33738e17c files/novell-novfs-2.0.0-config_h.patch 387
 AUX novell-novfs-2.0.0-dont_use_tasklist_lock.patch 697 RMD160 a431437c46ba7ae8dd2105f785533d07c632e353 SHA1 c35467e9646d196e6a13f8edf19a266a9f42c512 SHA256 57e09616338ef0d6c8084b31eb5faf4acdcf8a2789a95462dde11e4bc7832818
 MD5 d37acca52d7eed5a32fc59ce0c03027f files/novell-novfs-2.0.0-dont_use_tasklist_lock.patch 697
 RMD160 a431437c46ba7ae8dd2105f785533d07c632e353 files/novell-novfs-2.0.0-dont_use_tasklist_lock.patch 697
 SHA256 57e09616338ef0d6c8084b31eb5faf4acdcf8a2789a95462dde11e4bc7832818 files/novell-novfs-2.0.0-dont_use_tasklist_lock.patch 697
 AUX novell-novfs-2.0.0-generic_file_read.patch 749 RMD160 5e57f0392dfa973fc94100c032463292347b883c SHA1 b2f985d366c1031fbc3d664d8933fabb61e2fe0a SHA256 9783dc6082597175af79073ec32e550210907cc7b0f1130d43cf65c9fed6d419
 MD5 ad0967dafd28c60736f5bacd80431300 files/novell-novfs-2.0.0-generic_file_read.patch 749
 RMD160 5e57f0392dfa973fc94100c032463292347b883c files/novell-novfs-2.0.0-generic_file_read.patch 749
 SHA256 9783dc6082597175af79073ec32e550210907cc7b0f1130d43cf65c9fed6d419 files/novell-novfs-2.0.0-generic_file_read.patch 749
 AUX novell-novfs-2.0.0-i_blksize.patch 2920 RMD160 8ae931e01954ee69288ece87bf67bafb81172ae3 SHA1 728aa3f689fbfe64966b78d54e85a2dd9df0ba58 SHA256 5fa30bf88f252e07481f03b2e875cfaff639d017f8f20c356930e973bf6e3740
 MD5 763e227d6b1ba5218633a2bc5d08402b files/novell-novfs-2.0.0-i_blksize.patch 2920
 RMD160 8ae931e01954ee69288ece87bf67bafb81172ae3 files/novell-novfs-2.0.0-i_blksize.patch 2920
 SHA256 5fa30bf88f252e07481f03b2e875cfaff639d017f8f20c356930e973bf6e3740 files/novell-novfs-2.0.0-i_blksize.patch 2920
 AUX novell-novfs-2.0.0-u.generic_ip.patch 24168 RMD160 37046de7e80c853327f2865f45f05458970feea9 SHA1 01b9aada0bdcd411e9b152c65b6fcdc591b3dd9b SHA256 950b959d82a21902ac0579bbb8721fc22a0813bd4ed5e0bf1ee835b1ad8dfbca
 MD5 95fe1b20b61bda4152c6140ef7b07241 files/novell-novfs-2.0.0-u.generic_ip.patch 24168
 RMD160 37046de7e80c853327f2865f45f05458970feea9 files/novell-novfs-2.0.0-u.generic_ip.patch 24168
 SHA256 950b959d82a21902ac0579bbb8721fc22a0813bd4ed5e0bf1ee835b1ad8dfbca files/novell-novfs-2.0.0-u.generic_ip.patch 24168
 AUX novell-novfs-2.0.0_p16-vfs.patch 524 RMD160 f80558761c3a2cff1ac4709ecc41fae4ebb8b83a SHA1 6d3654efb7620f34ef9d27e37a14529d6b24a269 SHA256 4aa2195da32e91d20d6a64282ad22cce9f3601622be2b35c15580756ad1e738b
 MD5 375c66859993a01086e33561bcfcef92 files/novell-novfs-2.0.0_p16-vfs.patch 524
 RMD160 f80558761c3a2cff1ac4709ecc41fae4ebb8b83a files/novell-novfs-2.0.0_p16-vfs.patch 524
 SHA256 4aa2195da32e91d20d6a64282ad22cce9f3601622be2b35c15580756ad1e738b files/novell-novfs-2.0.0_p16-vfs.patch 524
 DIST novell-client-1.2-SLE10.tar.gz 13963983 RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 SHA1 14278f74c8226afabc0c602bdc31d4e20acff6b9 SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241
 DIST novfs-2.0.0-16.src.rpm 131164 RMD160 66fdbe1ac20e7c5a1ba03b3476354363cbef9e76 SHA1 30955ebfbb6cc534b2296ce03858a04e6a59ba2b SHA256 b74be1b71275217e52fa1fae391b0a807e3c82b0f2e9fd65af90968e32bc1491
 EBUILD novell-novfs-1.2.0_p17-r2.ebuild 1489 RMD160 ceb5173d5207ef5de76a81299baaaf16c3db9ce4 SHA1 2d7a71e11c7fd9477e3546e2c0383a46e4fcdb08 SHA256 662bf378500afaa0d561f6779ef9a67c7d68a4b8215bef128b402dd976478592
 MD5 656ac481e9df037933ac960dbff7055e novell-novfs-1.2.0_p17-r2.ebuild 1489
 RMD160 ceb5173d5207ef5de76a81299baaaf16c3db9ce4 novell-novfs-1.2.0_p17-r2.ebuild 1489
 SHA256 662bf378500afaa0d561f6779ef9a67c7d68a4b8215bef128b402dd976478592 novell-novfs-1.2.0_p17-r2.ebuild 1489
 EBUILD novell-novfs-2.0.0_p16.ebuild 1519 RMD160 f8a696e1f75c60979f8e0c4df25482f8b1f0f0d2 SHA1 cc45688a00d23b685daa387d76b2847ba689758d SHA256 56021d32f2528f3170f77584e4cd0043bb8a2347009bca156562b5c6555e863b
 MD5 2aabaad44f57265b0c813cbd594614c3 novell-novfs-2.0.0_p16.ebuild 1519
 RMD160 f8a696e1f75c60979f8e0c4df25482f8b1f0f0d2 novell-novfs-2.0.0_p16.ebuild 1519
 SHA256 56021d32f2528f3170f77584e4cd0043bb8a2347009bca156562b5c6555e863b novell-novfs-2.0.0_p16.ebuild 1519
 EBUILD novell-novfs-2.0.0_p2-r1.ebuild 1776 RMD160 e4fc7ff47a9aba5dc8854faeb5b0e30917661236 SHA1 72f428d40440d611e6471c47fd0e0c7efea54e37 SHA256 c04fdfc306dc02d6eb3802bfe13263d8d5be2395dd291519c8902db416fe5911
 MD5 0ddb5f95a5d00c7854c04776600e713c novell-novfs-2.0.0_p2-r1.ebuild 1776
 RMD160 e4fc7ff47a9aba5dc8854faeb5b0e30917661236 novell-novfs-2.0.0_p2-r1.ebuild 1776
 SHA256 c04fdfc306dc02d6eb3802bfe13263d8d5be2395dd291519c8902db416fe5911 novell-novfs-2.0.0_p2-r1.ebuild 1776
 MISC ChangeLog 1859 RMD160 9971c11ee380ccff23f7034b58a1e00b79c196c0 SHA1 e064231f999a0b582871cc0e2c12612273775281 SHA256 7422b100227e58076fca7bea240e2ea5de5cd505362fa158cfaeca08d2c7584a
 MD5 345ef28912afe6a094bd5774259a27b4 ChangeLog 1859
 RMD160 9971c11ee380ccff23f7034b58a1e00b79c196c0 ChangeLog 1859
 SHA256 7422b100227e58076fca7bea240e2ea5de5cd505362fa158cfaeca08d2c7584a ChangeLog 1859
 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-novfs-1.2.0_p17-r2 277
+MD5 7a0d2edb2160834190b972e3201fff83 files/digest-novell-novfs-2.0.0_p21 247
-RMD160 4767389e6f47ba8fb5b8907a954b9f80ce106b78 files/digest-novell-novfs-1.2.0_p17-r2 277
+RMD160 f4ef868a6539dfd96526e220b137c7236d737f4b files/digest-novell-novfs-2.0.0_p21 247
-SHA256 aa21d5b182ad571f4bedf0694cc608f211146d09e0af2bdd1addd6415a2bf0b8 files/digest-novell-novfs-1.2.0_p17-r2 277
+SHA256 0bb4ca4dc96987758a14a312da94dc242e9610d13ff24d92c8c1a836cd62afe6 files/digest-novell-novfs-2.0.0_p21 247
 MD5 f29cdd765df82535c6d72c0a1c624ce1 files/digest-novell-novfs-2.0.0_p16 247
 RMD160 325482478e47b001e96e42807f6f3c9371313b4b files/digest-novell-novfs-2.0.0_p16 247
 SHA256 c66115fcc6e533206a37610862b220d385959e93fd87998532ba3bbe9f613c49 files/digest-novell-novfs-2.0.0_p16 247
 MD5 dcdc80c8269e53d3a5ecd72aa4034a06 files/digest-novell-novfs-2.0.0_p2-r1 277
 RMD160 4767389e6f47ba8fb5b8907a954b9f80ce106b78 files/digest-novell-novfs-2.0.0_p2-r1 277
 SHA256 aa21d5b182ad571f4bedf0694cc608f211146d09e0af2bdd1addd6415a2bf0b8 files/digest-novell-novfs-2.0.0_p2-r1 277
--- a/branches/experimental/net-fs/novell-novfs/files/digest-novell-novfs-1.2.0_p17-r2
+++ b/branches/experimental/net-fs/novell-novfs/files/digest-novell-novfs-1.2.0_p17-r2
@ -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
--- a/branches/experimental/net-fs/novell-novfs/files/digest-novell-novfs-2.0.0_p16
+++ b/branches/experimental/net-fs/novell-novfs/files/digest-novell-novfs-2.0.0_p16
@ -1,3 +0,0 @@
 MD5 2210f636ece0b6cd29d588ebd0f973e6 novfs-2.0.0-16.src.rpm 131164
 RMD160 66fdbe1ac20e7c5a1ba03b3476354363cbef9e76 novfs-2.0.0-16.src.rpm 131164
 SHA256 b74be1b71275217e52fa1fae391b0a807e3c82b0f2e9fd65af90968e32bc1491 novfs-2.0.0-16.src.rpm 131164
--- a/branches/experimental/net-fs/novell-novfs/files/digest-novell-novfs-2.0.0_p2-r1
+++ b/branches/experimental/net-fs/novell-novfs/files/digest-novell-novfs-2.0.0_p2-r1
@ -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
--- a/branches/experimental/net-fs/novell-novfs/files/digest-novell-novfs-2.0.0_p21
+++ b/branches/experimental/net-fs/novell-novfs/files/digest-novell-novfs-2.0.0_p21
@ -0,0 +1,3 @@
 MD5 97111bdbdd94948351e08f5c953073b0 novfs-2.0.0-21.src.rpm 132718
 RMD160 3f02ec1e012683c13d6e99220916853a70664435 novfs-2.0.0-21.src.rpm 132718
 SHA256 e6b0d502ec055215ac4dd2da2088a7e771eb6378b14d260ca6d0e3c7dc74cdbb novfs-2.0.0-21.src.rpm 132718
--- a/branches/experimental/net-fs/novell-novfs/files/novell-novfs-1.2.0-dentry.patch
+++ b/branches/experimental/net-fs/novell-novfs/files/novell-novfs-1.2.0-dentry.patch
@ -1,21 +0,0 @@
 diff -uNr novfs-1.2.0.orig/novfs/daemon.c novfs-1.2.0/novfs/daemon.c
 --- novfs-1.2.0.orig/novfs/daemon.c	2006-07-11 21:24:18.000000000 +0200
 +++ novfs-1.2.0/novfs/daemon.c	2006-08-30 22:32:57.000000000 +0200
@@ -2784,7 +2784,7 @@
       if (nd.last_type == LAST_NORM)
       {
          mutex_lock(&nd.dentry->d_inode->i_mutex);
 -         dentry = lookup_hash( &nd );
 +         dentry = lookup_create( &nd, 1);
          DbgPrint("local_unlink: lookup_hash 0x%p\n", dentry);
          error = PTR_ERR(dentry);
@@ -2839,7 +2839,7 @@
       if (nd.last_type == LAST_NORM)
       {
          down(&nd.dentry->d_inode->i_sem);
 -         dentry = lookup_hash(&nd.last, nd.dentry);
 +         dentry = lookup_one_len(&nd.last, nd.dentry, sizeof(nd.last));
          DbgPrint("local_unlink: lookup_hash 0x%p\n", dentry);
          error = PTR_ERR(dentry);
--- a/branches/experimental/net-fs/novell-novfs/files/novell-novfs-1.2.0-dont_use_tasklist_lock.patch
+++ b/branches/experimental/net-fs/novell-novfs/files/novell-novfs-1.2.0-dont_use_tasklist_lock.patch
@ -1,21 +0,0 @@
 diff -uNr novfs-1.2.0.orig/novfs/scope.c novfs-1.2.0/novfs/scope.c
 --- novfs-1.2.0.orig/novfs/scope.c	2006-08-30 22:32:57.000000000 +0200
 +++ novfs-1.2.0/novfs/scope.c	2006-10-15 16:35:47.000000000 +0200
@@ -869,7 +869,7 @@
          sl = sl->next;
          rscope = NULL;
 -         read_lock(&tasklist_lock);
 +         rcu_read_lock();
          for_each_process(task)
          {
             if ( (task->uid == scope->ScopeUid) || (task->euid == scope->ScopeUid) )
@@ -878,7 +878,7 @@
                break;
             }
          }
 -         read_unlock(&tasklist_lock);
 +         rcu_read_unlock();
          if ( !rscope )
          {
             list_move( &scope->ScopeList, &cleanup );
--- a/branches/experimental/net-fs/novell-novfs/files/novell-novfs-1.2.0-getsb-fix.patch
+++ b/branches/experimental/net-fs/novell-novfs/files/novell-novfs-1.2.0-getsb-fix.patch
@ -1,99 +0,0 @@
 diff -uNr novfs-1.2.0.orig/novfs/inode.c novfs-1.2.0/novfs/inode.c
 --- novfs-1.2.0.orig/novfs/inode.c	2006-08-30 22:32:57.000000000 +0200
 +++ novfs-1.2.0/novfs/inode.c	2006-10-15 16:15:58.000000000 +0200
@@ -47,7 +47,6 @@
 /*===[ Include files specific to this module ]============================*/
 #include "vfs.h"
 -#include "conf.h"
 /*===[ External data ]====================================================*/
@@ -129,8 +128,8 @@
 unsigned long Novfs_internal_hash (struct qstr *name);
 -#ifdef GET_SB_HAS_STRUCT_VFSMOUNT
 -struct super_block * Novfs_get_sb(struct file_system_type *Fstype, int Flags, const char *Dev_name, void *Data, struct vfsmount *Mnt);
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
 +int Novfs_get_sb(struct file_system_type *Fstype, int Flags, const char *Dev_name, void *Data, struct vfsmount *Mnt);
 #else
 struct super_block * Novfs_get_sb(struct file_system_type *Fstype, int Flags, const char *Dev_name, void *Data);
 #endif
@@ -204,7 +203,11 @@
 int Novfs_notify_change(struct dentry *dentry, struct iattr *attr);
 void Novfs_clear_inode(struct inode *inode);
 int Novfs_show_options( struct seq_file *s, struct vfsmount *m );
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
 +int Novfs_statfs(struct dentry *de, struct kstatfs *buf);
 +#else
 int Novfs_statfs(struct super_block *sb, struct kstatfs *buf);
 +#endif
 /*
  * Declared control interface functions
@@ -3241,7 +3244,11 @@
 }
 /*++======================================================================*/
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
 +int Novfs_statfs(struct dentry *de, struct kstatfs *buf)
 +#else
 int Novfs_statfs(struct super_block *sb, struct kstatfs *buf)
 +#endif
 /*
  * Arguments:    sb - pointer to the super_block
  *               buf - pointer to the statfs buffer
@@ -3257,6 +3264,9 @@
  *========================================================================*/
 {
    uint64_t td, fd, te, fe;
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
 +   struct super_block *sb = de->d_sb;
 +#endif
    UNUSED_VARIABLE(sb);
@@ -3517,8 +3527,8 @@
 }
 /*++======================================================================*/
 -#ifdef GET_SB_HAS_STRUCT_VFSMOUNT
 -struct super_block *Novfs_get_sb(struct file_system_type *Fstype, int Flags, const char *Dev_name, void *Data, struct vfsmount *Mnt)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
 +int Novfs_get_sb(struct file_system_type *Fstype, int Flags, const char *Dev_name, void *Data, struct vfsmount *Mnt)
 #else
 struct super_block *Novfs_get_sb(struct file_system_type *Fstype, int Flags, const char *Dev_name, void *Data)
 #endif
@@ -3536,10 +3546,14 @@
  *
  *========================================================================*/
 {
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
 +   int sb;
 +#else
    struct super_block *sb;
 +#endif
    UNUSED_VARIABLE(Dev_name);
 -#ifdef GET_SB_HAS_STRUCT_VFSMOUNT
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
     sb = get_sb_nodev(Fstype, Flags, Data, Novfs_fill_super, Mnt);
 #else
     sb = get_sb_nodev(Fstype, Flags, Data, Novfs_fill_super);
 diff -uNr novfs-1.2.0.orig/novfs/scope.c novfs-1.2.0/novfs/scope.c
 --- novfs-1.2.0.orig/novfs/scope.c	2006-08-30 22:32:57.000000000 +0200
 +++ novfs-1.2.0/novfs/scope.c	2006-10-15 16:22:55.000000000 +0200
@@ -45,11 +45,10 @@
 /*===[ Include files specific to this module ]============================*/
 #include "vfs.h"
 -#include "conf.h"
 #define LEADER signal->leader
 -#ifndef TYPE_DEFINED_TASK_T
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
 typedef struct task_struct task_t;
 #endif
--- a/branches/experimental/net-fs/novell-novfs/files/novell-novfs-1.2.0-getsb.patch
+++ b/branches/experimental/net-fs/novell-novfs/files/novell-novfs-1.2.0-getsb.patch
@ -1,172 +0,0 @@
 diff -uNr novfs-1.2.0.orig/novfs/conf novfs-1.2.0/novfs/conf
 --- novfs-1.2.0.orig/novfs/conf	1970-01-01 01:00:00.000000000 +0100
 +++ novfs-1.2.0/novfs/conf	2006-08-30 22:32:57.000000000 +0200
@@ -0,0 +1,63 @@
 +#!/bin/sh
 +
 +if [ -z "$1" ];then
 +    echo "Usage: ssb linux-kernel-source-dir" >&2
 +    exit 3
 +fi
 +
 +echo > conf.h
 +
 +sbtdir='/tmp/sbtest'
 +
 +rm -fr $sbtdir || exit 3 
 +mkdir $sbtdir || exit 3
 +
 +echo "
 +obj-m := sb.o
 +
 +all :
 +	\$(MAKE) -C $1 SUBDIRS=$sbtdir modules
 +" >> $sbtdir/Makefile
 +
 +echo "
 +#include <linux/fs.h>
 +int main()
 +{
 +    get_sb_nodev(0, 0, 0, 0, 0);
 +    return 0;
 +}
 +" >> $sbtdir/sb.c
 +
 +(cd $sbtdir && make > /dev/null 2>&1)
 +
 +if test -e $sbtdir/sb.ko ;then
 +    echo "
 +#define GET_SB_HAS_STRUCT_VFSMOUNT 1
 +    " >> conf.h
 +fi
 +
 +rm -fr $sbtdir  || exit 3
 +mkdir $sbtdir || exit 3
 +
 +echo "
 +obj-m := sb.o
 +
 +all :
 +	\$(MAKE) -C $1 SUBDIRS=$sbtdir modules
 +" >> $sbtdir/Makefile
 +
 +echo "
 +#include <linux/sched.h>
 +typedef struct task_struct task_t;
 +" >> $sbtdir/sb.c
 +
 +(cd $sbtdir && make > /dev/null 2>&1)
 +
 +if test ! -e $sbtdir/sb.ko ;then
 +    echo "
 +#define TYPE_DEFINED_TASK_T 1
 +    " >> conf.h
 +fi
 +
 +rm -fr $sbtdir  || exit 3
 +
 diff -uNr novfs-1.2.0.orig/novfs/inode.c novfs-1.2.0/novfs/inode.c
 --- novfs-1.2.0.orig/novfs/inode.c	2006-07-11 21:24:18.000000000 +0200
 +++ novfs-1.2.0/novfs/inode.c	2006-08-30 22:32:57.000000000 +0200
@@ -47,9 +47,11 @@
 /*===[ Include files specific to this module ]============================*/
 #include "vfs.h"
 +#include "conf.h"
 /*===[ External data ]====================================================*/
 +
 /*===[ External prototypes ]==============================================*/
 extern int DbgPrint( char *Fmt, ... );
 extern int LocalPrint( char *Fmt, ... );
@@ -126,7 +128,13 @@
 struct inode *Novfs_get_inode(struct super_block *sb, int mode, int dev, uid_t uid, ino_t ino, struct qstr *name);
 unsigned long Novfs_internal_hash (struct qstr *name);
 -struct super_block *Novfs_get_sb (struct file_system_type *Fstype, int Flags, const char *Dev_name, void *Data);
 +
 +#ifdef GET_SB_HAS_STRUCT_VFSMOUNT
 +struct super_block * Novfs_get_sb(struct file_system_type *Fstype, int Flags, const char *Dev_name, void *Data, struct vfsmount *Mnt);
 +#else
 +struct super_block * Novfs_get_sb(struct file_system_type *Fstype, int Flags, const char *Dev_name, void *Data);
 +#endif
 +
 void Novfs_kill_sb(struct super_block *SB);
 int Novfs_fill_super (struct super_block *SB, void *Data, int Silent);
@@ -3509,7 +3517,12 @@
 }
 /*++======================================================================*/
 +#ifdef GET_SB_HAS_STRUCT_VFSMOUNT
 +struct super_block *Novfs_get_sb(struct file_system_type *Fstype, int Flags, const char *Dev_name, void *Data, struct vfsmount *Mnt)
 +#else
 struct super_block *Novfs_get_sb(struct file_system_type *Fstype, int Flags, const char *Dev_name, void *Data)
 +#endif
 +
 /*
  *  Arguments:
  *
@@ -3526,7 +3539,11 @@
    struct super_block *sb;
    UNUSED_VARIABLE(Dev_name);
 -   sb = get_sb_nodev(Fstype, Flags, Data, Novfs_fill_super);
 +#ifdef GET_SB_HAS_STRUCT_VFSMOUNT
 +    sb = get_sb_nodev(Fstype, Flags, Data, Novfs_fill_super, Mnt);
 +#else
 +    sb = get_sb_nodev(Fstype, Flags, Data, Novfs_fill_super);
 +#endif
    DbgPrint( "Novfs_get_sb: sb=0x%x Fstype=0x%x Dev_name=%s\n", sb, Fstype, Dev_name);
 diff -uNr novfs-1.2.0.orig/novfs/Makefile novfs-1.2.0/novfs/Makefile
 --- novfs-1.2.0.orig/novfs/Makefile	2006-07-11 21:24:18.000000000 +0200
 +++ novfs-1.2.0/novfs/Makefile	2006-08-30 22:32:57.000000000 +0200
@@ -34,12 +34,15 @@
 NOVFS_VFS_SUB = 0
 NOVFS_VFS_RELEASE = 17
 +KERNEL_SOURCE_DIR="/usr/src/linux"
 +#KERNEL_SOURCE_DIR="/usr/src/linux-2.6.18-rc4"
 +
 # Remove # from the following line for debug version
 EXTRA_CFLAGS += -finstrument-functions
 EXTRA_CFLAGS += -g
 EXTRA_CFLAGS += -I.
 EXTRA_CFLAGS += -I$(obj)/../include
 -#EXTRA_CFLAGS += -I$(obj)/../../include
 +EXTRA_CFLAGS += -I$(obj)/../../include
 EXTRA_CFLAGS += -DNOVFS_VFS_MAJOR=$(NOVFS_VFS_MAJOR)
 EXTRA_CFLAGS += -DNOVFS_VFS_MINOR=$(NOVFS_VFS_MINOR)
 EXTRA_CFLAGS += -DNOVFS_VFS_SUB=$(NOVFS_VFS_SUB)
@@ -50,3 +53,10 @@
 obj-m := novfs.o
 novfs-y := inode.o proc.o profile.o daemon.o file.o scope.o nwcapi.o
 +
 +all:
 +	./conf $(KERNEL_SOURCE_DIR)
 +	make -C $(KERNEL_SOURCE_DIR) SUBDIRS=`pwd` modules
 +
 +clean:
 +	make -C $(KERNEL_SOURCE_DIR) SUBDIRS=`pwd` modules clean
 diff -uNr novfs-1.2.0.orig/novfs/scope.c novfs-1.2.0/novfs/scope.c
 --- novfs-1.2.0.orig/novfs/scope.c	2006-07-11 21:24:18.000000000 +0200
 +++ novfs-1.2.0/novfs/scope.c	2006-08-30 22:32:57.000000000 +0200
@@ -45,8 +45,14 @@
 /*===[ Include files specific to this module ]============================*/
 #include "vfs.h"
 +#include "conf.h"
 #define LEADER signal->leader
 +
 +#ifndef TYPE_DEFINED_TASK_T
 +typedef struct task_struct task_t;
 +#endif
 +
 /*===[ External data ]====================================================*/
 /*===[ External prototypes ]==============================================*/
--- a/branches/experimental/net-fs/novell-novfs/files/novell-novfs-1.2.0-license.patch
+++ b/branches/experimental/net-fs/novell-novfs/files/novell-novfs-1.2.0-license.patch
@ -1,347 +0,0 @@
 diff -uNr novfs-1.2.0.orig/LICENSE novfs-1.2.0/LICENSE
 --- novfs-1.2.0.orig/LICENSE	1970-01-01 01:00:00.000000000 +0100
 +++ novfs-1.2.0/LICENSE	2006-08-30 22:32:57.000000000 +0200
@@ -0,0 +1,343 @@
 +"Use of the novfs source code is governed by the terms of the GPL:"
 +
 +		    GNU GENERAL PUBLIC LICENSE
 +		       Version 2, June 1991
 +
 + Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 +                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 + Everyone is permitted to copy and distribute verbatim copies
 + of this license document, but changing it is not allowed.
 +
 +			    Preamble
 +
 +  The licenses for most software are designed to take away your
 +freedom to share and change it.  By contrast, the GNU General Public
 +License is intended to guarantee your freedom to share and change free
 +software--to make sure the software is free for all its users.  This
 +General Public License applies to most of the Free Software
 +Foundation's software and to any other program whose authors commit to
 +using it.  (Some other Free Software Foundation software is covered by
 +the GNU Library General Public License instead.)  You can apply it to
 +your programs, too.
 +
 +  When we speak of free software, we are referring to freedom, not
 +price.  Our General Public Licenses are designed to make sure that you
 +have the freedom to distribute copies of free software (and charge for
 +this service if you wish), that you receive source code or can get it
 +if you want it, that you can change the software or use pieces of it
 +in new free programs; and that you know you can do these things.
 +
 +  To protect your rights, we need to make restrictions that forbid
 +anyone to deny you these rights or to ask you to surrender the rights.
 +These restrictions translate to certain responsibilities for you if you
 +distribute copies of the software, or if you modify it.
 +
 +  For example, if you distribute copies of such a program, whether
 +gratis or for a fee, you must give the recipients all the rights that
 +you have.  You must make sure that they, too, receive or can get the
 +source code.  And you must show them these terms so they know their
 +rights.
 +
 +  We protect your rights with two steps: (1) copyright the software, and
 +(2) offer you this license which gives you legal permission to copy,
 +distribute and/or modify the software.
 +
 +  Also, for each author's protection and ours, we want to make certain
 +that everyone understands that there is no warranty for this free
 +software.  If the software is modified by someone else and passed on, we
 +want its recipients to know that what they have is not the original, so
 +that any problems introduced by others will not reflect on the original
 +authors' reputations.
 +
 +  Finally, any free program is threatened constantly by software
 +patents.  We wish to avoid the danger that redistributors of a free
 +program will individually obtain patent licenses, in effect making the
 +program proprietary.  To prevent this, we have made it clear that any
 +patent must be licensed for everyone's free use or not licensed at all.
 +
 +  The precise terms and conditions for copying, distribution and
 +modification follow.
 +
 +		    GNU GENERAL PUBLIC LICENSE
 +   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 +
 +  0. This License applies to any program or other work which contains
 +a notice placed by the copyright holder saying it may be distributed
 +under the terms of this General Public License.  The "Program", below,
 +refers to any such program or work, and a "work based on the Program"
 +means either the Program or any derivative work under copyright law:
 +that is to say, a work containing the Program or a portion of it,
 +either verbatim or with modifications and/or translated into another
 +language.  (Hereinafter, translation is included without limitation in
 +the term "modification".)  Each licensee is addressed as "you".
 +
 +Activities other than copying, distribution and modification are not
 +covered by this License; they are outside its scope.  The act of
 +running the Program is not restricted, and the output from the Program
 +is covered only if its contents constitute a work based on the
 +Program (independent of having been made by running the Program).
 +Whether that is true depends on what the Program does.
 +
 +  1. You may copy and distribute verbatim copies of the Program's
 +source code as you receive it, in any medium, provided that you
 +conspicuously and appropriately publish on each copy an appropriate
 +copyright notice and disclaimer of warranty; keep intact all the
 +notices that refer to this License and to the absence of any warranty;
 +and give any other recipients of the Program a copy of this License
 +along with the Program.
 +
 +You may charge a fee for the physical act of transferring a copy, and
 +you may at your option offer warranty protection in exchange for a fee.
 +
 +  2. You may modify your copy or copies of the Program or any portion
 +of it, thus forming a work based on the Program, and copy and
 +distribute such modifications or work under the terms of Section 1
 +above, provided that you also meet all of these conditions:
 +
 +    a) You must cause the modified files to carry prominent notices
 +    stating that you changed the files and the date of any change.
 +
 +    b) You must cause any work that you distribute or publish, that in
 +    whole or in part contains or is derived from the Program or any
 +    part thereof, to be licensed as a whole at no charge to all third
 +    parties under the terms of this License.
 +
 +    c) If the modified program normally reads commands interactively
 +    when run, you must cause it, when started running for such
 +    interactive use in the most ordinary way, to print or display an
 +    announcement including an appropriate copyright notice and a
 +    notice that there is no warranty (or else, saying that you provide
 +    a warranty) and that users may redistribute the program under
 +    these conditions, and telling the user how to view a copy of this
 +    License.  (Exception: if the Program itself is interactive but
 +    does not normally print such an announcement, your work based on
 +    the Program is not required to print an announcement.)
 +
 +These requirements apply to the modified work as a whole.  If
 +identifiable sections of that work are not derived from the Program,
 +and can be reasonably considered independent and separate works in
 +themselves, then this License, and its terms, do not apply to those
 +sections when you distribute them as separate works.  But when you
 +distribute the same sections as part of a whole which is a work based
 +on the Program, the distribution of the whole must be on the terms of
 +this License, whose permissions for other licensees extend to the
 +entire whole, and thus to each and every part regardless of who wrote it.
 +
 +Thus, it is not the intent of this section to claim rights or contest
 +your rights to work written entirely by you; rather, the intent is to
 +exercise the right to control the distribution of derivative or
 +collective works based on the Program.
 +
 +In addition, mere aggregation of another work not based on the Program
 +with the Program (or with a work based on the Program) on a volume of
 +a storage or distribution medium does not bring the other work under
 +the scope of this License.
 +
 +  3. You may copy and distribute the Program (or a work based on it,
 +under Section 2) in object code or executable form under the terms of
 +Sections 1 and 2 above provided that you also do one of the following:
 +
 +    a) Accompany it with the complete corresponding machine-readable
 +    source code, which must be distributed under the terms of Sections
 +    1 and 2 above on a medium customarily used for software interchange; or,
 +
 +    b) Accompany it with a written offer, valid for at least three
 +    years, to give any third party, for a charge no more than your
 +    cost of physically performing source distribution, a complete
 +    machine-readable copy of the corresponding source code, to be
 +    distributed under the terms of Sections 1 and 2 above on a medium
 +    customarily used for software interchange; or,
 +
 +    c) Accompany it with the information you received as to the offer
 +    to distribute corresponding source code.  (This alternative is
 +    allowed only for noncommercial distribution and only if you
 +    received the program in object code or executable form with such
 +    an offer, in accord with Subsection b above.)
 +
 +The source code for a work means the preferred form of the work for
 +making modifications to it.  For an executable work, complete source
 +code means all the source code for all modules it contains, plus any
 +associated interface definition files, plus the scripts used to
 +control compilation and installation of the executable.  However, as a
 +special exception, the source code distributed need not include
 +anything that is normally distributed (in either source or binary
 +form) with the major components (compiler, kernel, and so on) of the
 +operating system on which the executable runs, unless that component
 +itself accompanies the executable.
 +
 +If distribution of executable or object code is made by offering
 +access to copy from a designated place, then offering equivalent
 +access to copy the source code from the same place counts as
 +distribution of the source code, even though third parties are not
 +compelled to copy the source along with the object code.
 +
 +  4. You may not copy, modify, sublicense, or distribute the Program
 +except as expressly provided under this License.  Any attempt
 +otherwise to copy, modify, sublicense or distribute the Program is
 +void, and will automatically terminate your rights under this License.
 +However, parties who have received copies, or rights, from you under
 +this License will not have their licenses terminated so long as such
 +parties remain in full compliance.
 +
 +  5. You are not required to accept this License, since you have not
 +signed it.  However, nothing else grants you permission to modify or
 +distribute the Program or its derivative works.  These actions are
 +prohibited by law if you do not accept this License.  Therefore, by
 +modifying or distributing the Program (or any work based on the
 +Program), you indicate your acceptance of this License to do so, and
 +all its terms and conditions for copying, distributing or modifying
 +the Program or works based on it.
 +
 +  6. Each time you redistribute the Program (or any work based on the
 +Program), the recipient automatically receives a license from the
 +original licensor to copy, distribute or modify the Program subject to
 +these terms and conditions.  You may not impose any further
 +restrictions on the recipients' exercise of the rights granted herein.
 +You are not responsible for enforcing compliance by third parties to
 +this License.
 +
 +  7. If, as a consequence of a court judgment or allegation of patent
 +infringement or for any other reason (not limited to patent issues),
 +conditions are imposed on you (whether by court order, agreement or
 +otherwise) that contradict the conditions of this License, they do not
 +excuse you from the conditions of this License.  If you cannot
 +distribute so as to satisfy simultaneously your obligations under this
 +License and any other pertinent obligations, then as a consequence you
 +may not distribute the Program at all.  For example, if a patent
 +license would not permit royalty-free redistribution of the Program by
 +all those who receive copies directly or indirectly through you, then
 +the only way you could satisfy both it and this License would be to
 +refrain entirely from distribution of the Program.
 +
 +If any portion of this section is held invalid or unenforceable under
 +any particular circumstance, the balance of the section is intended to
 +apply and the section as a whole is intended to apply in other
 +circumstances.
 +
 +It is not the purpose of this section to induce you to infringe any
 +patents or other property right claims or to contest validity of any
 +such claims; this section has the sole purpose of protecting the
 +integrity of the free software distribution system, which is
 +implemented by public license practices.  Many people have made
 +generous contributions to the wide range of software distributed
 +through that system in reliance on consistent application of that
 +system; it is up to the author/donor to decide if he or she is willing
 +to distribute software through any other system and a licensee cannot
 +impose that choice.
 +
 +This section is intended to make thoroughly clear what is believed to
 +be a consequence of the rest of this License.
 +
 +  8. If the distribution and/or use of the Program is restricted in
 +certain countries either by patents or by copyrighted interfaces, the
 +original copyright holder who places the Program under this License
 +may add an explicit geographical distribution limitation excluding
 +those countries, so that distribution is permitted only in or among
 +countries not thus excluded.  In such case, this License incorporates
 +the limitation as if written in the body of this License.
 +
 +  9. The Free Software Foundation may publish revised and/or new versions
 +of the General Public License from time to time.  Such new versions will
 +be similar in spirit to the present version, but may differ in detail to
 +address new problems or concerns.
 +
 +Each version is given a distinguishing version number.  If the Program
 +specifies a version number of this License which applies to it and "any
 +later version", you have the option of following the terms and conditions
 +either of that version or of any later version published by the Free
 +Software Foundation.  If the Program does not specify a version number of
 +this License, you may choose any version ever published by the Free Software
 +Foundation.
 +
 +  10. If you wish to incorporate parts of the Program into other free
 +programs whose distribution conditions are different, write to the author
 +to ask for permission.  For software which is copyrighted by the Free
 +Software Foundation, write to the Free Software Foundation; we sometimes
 +make exceptions for this.  Our decision will be guided by the two goals
 +of preserving the free status of all derivatives of our free software and
 +of promoting the sharing and reuse of software generally.
 +
 +			    NO WARRANTY
 +
 +  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
 +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
 +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
 +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
 +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
 +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 +REPAIR OR CORRECTION.
 +
 +  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
 +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
 +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
 +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
 +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
 +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 +POSSIBILITY OF SUCH DAMAGES.
 +
 +		     END OF TERMS AND CONDITIONS
 +
 +	    How to Apply These Terms to Your New Programs
 +
 +  If you develop a new program, and you want it to be of the greatest
 +possible use to the public, the best way to achieve this is to make it
 +free software which everyone can redistribute and change under these terms.
 +
 +  To do so, attach the following notices to the program.  It is safest
 +to attach them to the start of each source file to most effectively
 +convey the exclusion of warranty; and each file should have at least
 +the "copyright" line and a pointer to where the full notice is found.
 +
 +    <one line to give the program's name and a brief idea of what it does.>
 +    Copyright (C) <year>  <name of author>
 +
 +    This program is free software; you can redistribute it and/or modify
 +    it under the terms of the GNU General Public License as published by
 +    the Free Software Foundation; either version 2 of the License, or
 +    (at your option) any later version.
 +
 +    This program is distributed in the hope that it will be useful,
 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +    GNU General Public License for more details.
 +
 +    You should have received a copy of the GNU General Public License
 +    along with this program; if not, write to the Free Software
 +    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 +
 +
 +Also add information on how to contact you by electronic and paper mail.
 +
 +If the program is interactive, make it output a short notice like this
 +when it starts in an interactive mode:
 +
 +    Gnomovision version 69, Copyright (C) year name of author
 +    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
 +    This is free software, and you are welcome to redistribute it
 +    under certain conditions; type `show c' for details.
 +
 +The hypothetical commands `show w' and `show c' should show the appropriate
 +parts of the General Public License.  Of course, the commands you use may
 +be called something other than `show w' and `show c'; they could even be
 +mouse-clicks or menu items--whatever suits your program.
 +
 +You should also get your employer (if you work as a programmer) or your
 +school, if any, to sign a "copyright disclaimer" for the program, if
 +necessary.  Here is a sample; alter the names:
 +
 +  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
 +  `Gnomovision' (which makes passes at compilers) written by James Hacker.
 +
 +  <signature of Ty Coon>, 1 April 1989
 +  Ty Coon, President of Vice
 +
 +This General Public License does not permit incorporating your program into
 +proprietary programs.  If your program is a subroutine library, you may
 +consider it more useful to permit linking proprietary applications with the
 +library.  If this is what you want to do, use the GNU Library General
 +Public License instead of this License.
 +
--- a/branches/experimental/net-fs/novell-novfs/files/novell-novfs-1.2.0_to_2.0.0.patch
+++ b/branches/experimental/net-fs/novell-novfs/files/novell-novfs-1.2.0_to_2.0.0.patch
--- a/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0-2_6_15-compat.patch
+++ b/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0-2_6_15-compat.patch
@ -1,31 +0,0 @@
 --- novfs-2.0.0/src/vfs.h.orig	2007-02-18 13:09:59.000000000 +0100
 +++ novfs-2.0.0/src/vfs.h	2007-02-18 13:07:14.000000000 +0100
@@ -70,7 +70,7 @@
 #define IOC_SESSION  0x4a540003
 #define IOC_DEBUGPRINT  0x4a540004
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #define D_CHILD d_u.d_child
 #define AS_TREE_LOCK(l)   read_lock_irq(l)
 #define AS_TREE_UNLOCK(l) read_unlock_irq(l)
 --- novfs-2.0.0/src/daemon.c.orig	2007-02-18 13:06:44.000000000 +0100
 +++ novfs-2.0.0/src/daemon.c	2007-02-18 13:12:00.000000000 +0100
@@ -2769,7 +2769,7 @@
       error = -EISDIR;
       if (nd.last_type == LAST_NORM)
       {
 -         mutex_lock(&nd.dentry->d_inode->i_mutex);
 +         down(&nd.dentry->d_inode->i_sem);
          dentry = lookup_create( &nd, 1);
          DbgPrint("local_unlink: lookup_hash 0x%p\n", dentry);
@@ -2792,7 +2792,7 @@
             }
             dput(dentry);
          }
 -         mutex_unlock(&nd.dentry->d_inode->i_mutex);
 +         up(&nd.dentry->d_inode->i_sem);
       }
    	path_release(&nd);
--- a/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0-config_h.patch
+++ b/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0-config_h.patch
@ -1,12 +0,0 @@
 Index: novfs-2.0.0/src/inode.c
 ===================================================================
 --- novfs-2.0.0.orig/src/inode.c
 +++ novfs-2.0.0/src/inode.c
@@ -29,7 +29,6 @@
 /*===[ Include files specific to Linux ]==================================*/
 #include <linux/module.h>
 -#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/dcache.h>
--- a/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0-dont_use_tasklist_lock.patch
+++ b/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0-dont_use_tasklist_lock.patch
@ -1,21 +0,0 @@
 diff -uNr novfs-1.2.0.orig/novfs/scope.c novfs-1.2.0/novfs/scope.c
 --- novfs-1.2.0.orig/src/scope.c	2006-08-30 22:32:57.000000000 +0200
 +++ novfs-1.2.0/src/scope.c	2006-10-15 16:35:47.000000000 +0200
@@ -869,7 +869,7 @@
          sl = sl->next;
          rscope = NULL;
 -         read_lock(&tasklist_lock);
 +         rcu_read_lock();
          for_each_process(task)
          {
             if ( (task->uid == scope->ScopeUid) || (task->euid == scope->ScopeUid) )
@@ -878,7 +878,7 @@
                break;
             }
          }
 -         read_unlock(&tasklist_lock);
 +         rcu_read_unlock();
          if ( !rscope )
          {
             list_move( &scope->ScopeList, &cleanup );
--- a/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0-generic_file_read.patch
+++ b/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0-generic_file_read.patch
@ -1,22 +0,0 @@
 Index: novfs-2.0.0/src/inode.c
 ===================================================================
 --- novfs-2.0.0.orig/src/inode.c
 +++ novfs-2.0.0/src/inode.c
@@ -1629,7 +1629,7 @@ ssize_t Novfs_f_read(struct file *file, 
            !(file->f_flags & O_DIRECT) && 
            id->CacheFlag )
       {
 -         totalread = generic_file_read(file, buf, len, off);
 +         totalread = do_sync_read(file, buf, len, off);
       }
       else
       {
@@ -1693,7 +1693,7 @@ ssize_t Novfs_f_write(struct file *file,
            !(file->f_flags & O_DIRECT) &&
            id->CacheFlag )
       {
 -         totalwrite = generic_file_write(file, buf, len, off);
 +         totalwrite = do_sync_write(file, buf, len, off);
       }
       else
       {
--- a/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0-i_blksize.patch
+++ b/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0-i_blksize.patch
@ -1,67 +0,0 @@
 ---
 src/inode.c |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
 Index: novfs-2.0.0/src/inode.c
 ===================================================================
 --- novfs-2.0.0.orig/src/inode.c
 +++ novfs-2.0.0/src/inode.c
@@ -1731,7 +1731,7 @@ ssize_t Novfs_f_write(struct file *file,
             if (offset > i_size_read(inode))
             {
                i_size_write(inode, offset);
 -               inode->i_blocks = (offset + inode->i_blksize - 1) >> inode->i_blkbits;
 +               inode->i_blocks = (offset + inode->i_sb->s_blocksize - 1) >> inode->i_blkbits;
             }
             inode->i_mtime = inode->i_atime = CURRENT_TIME;
             id->Flags |= UPDATE_INODE;
@@ -2913,12 +2913,12 @@ void update_inode(struct inode *Inode, P
    Inode->i_ctime = Info->ctime;
    Inode->i_mtime = Info->mtime;
 -   if (Inode->i_size && Inode->i_blksize)
 +   if (Inode->i_size && Inode->i_sb->s_blocksize)
    {
       Inode->i_blocks = (u_long)(Info->size >> (loff_t)Inode->i_blkbits);
 -      Inode->i_bytes = Info->size & (Inode->i_blksize - 1);
 +      Inode->i_bytes = Info->size & (Inode->i_sb->s_blocksize - 1);
 -      DbgPrint("update_inode: i_blksize=%d\n", Inode->i_blksize);
 +      DbgPrint("update_inode: i_blksize=%d\n", Inode->i_sb->s_blocksize);
       DbgPrint("update_inode: i_blkbits=%d\n", Inode->i_blkbits);
       DbgPrint("update_inode: i_blocks=%d\n", Inode->i_blocks);
       DbgPrint("update_inode: i_bytes=%d\n", Inode->i_bytes);
@@ -3604,7 +3604,7 @@ int Novfs_i_getattr(struct vfsmount *mnt
    kstat->atime   = inode->i_atime;
    kstat->mtime   = inode->i_mtime;
    kstat->ctime   = inode->i_ctime;
 -   kstat->blksize = inode->i_blksize;
 +   kstat->blksize = inode->i_sb->s_blocksize;
    kstat->blocks  = inode->i_blocks;
    if (inode->i_bytes)
    {
@@ -3909,7 +3909,6 @@ struct inode *Novfs_get_inode(struct sup
       inode->i_mode = mode;
       inode->i_uid = Uid;
       inode->i_gid = 0;
 -      inode->i_blksize = sb->s_blocksize;
       inode->i_blkbits = sb->s_blocksize_bits;
       inode->i_blocks = 0;
       inode->i_rdev = 0;
@@ -3962,7 +3961,6 @@ struct inode *Novfs_get_inode(struct sup
       case S_IFDIR:
          inode->i_op = &Novfs_inode_operations;
          inode->i_fop = &Novfs_dir_operations;
 -         inode->i_blksize = 0;
          inode->i_blkbits = 0;
          break;
@@ -3973,7 +3971,7 @@ struct inode *Novfs_get_inode(struct sup
       DbgPrint("Novfs_get_inode: size=%lld\n", inode->i_size);
       DbgPrint("Novfs_get_inode: mode=0%o\n", inode->i_mode);
 -      DbgPrint("Novfs_get_inode: i_blksize=%d\n", inode->i_blksize);
 +      DbgPrint("Novfs_get_inode: i_blksize=%d\n", inode->i_sb->s_blocksize);
       DbgPrint("Novfs_get_inode: i_blkbits=%d\n", inode->i_blkbits);
       DbgPrint("Novfs_get_inode: i_blocks=%d\n", inode->i_blocks);
       DbgPrint("Novfs_get_inode: i_bytes=%d\n", inode->i_bytes);
--- a/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0-u.generic_ip.patch
+++ b/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0-u.generic_ip.patch
@ -1,609 +0,0 @@
 ---
 src/inode.c |  194 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 97 insertions(+), 97 deletions(-)
 Index: novfs-2.0.0/src/inode.c
 ===================================================================
 --- novfs-2.0.0.orig/src/inode.c
 +++ novfs-2.0.0/src/inode.c
@@ -422,9 +422,9 @@ int Novfs_Remove_from_Root(char *RemoveN
    dentry = d_lookup( Novfs_root, &name);
    if (dentry)
    {
 -      if (dentry->d_inode && dentry->d_inode->u.generic_ip)
 +      if (dentry->d_inode && dentry->d_inode->i_private)
       {
 -         ((PINODE_DATA)(dentry->d_inode->u.generic_ip))->Scope = NULL;
 +         ((PINODE_DATA)(dentry->d_inode->i_private))->Scope = NULL;
       }
       dput(dentry);
    }
@@ -535,9 +535,9 @@ int Novfs_Add_to_Root2(char *AddName)
             inode->i_mtime = CURRENT_TIME;
             if ( !Novfs_d_add(Novfs_root, entry, inode, 1))
             {
 -               if (inode->u.generic_ip)
 +               if (inode->i_private)
                {
 -                  ((PINODE_DATA)inode->u.generic_ip)->Flags = USER_INODE;
 +                  ((PINODE_DATA)inode->i_private)->Flags = USER_INODE;
                }
                PRINT_DENTRY("After Novfs_d_add", entry);
             }
@@ -651,7 +651,7 @@ int verify_dentry( struct dentry *dentry
    if ( dentry && dentry->d_parent && 
         (dir = dentry->d_parent->d_inode) && 
 -        (id = dir->u.generic_ip) )
 +        (id = dir->i_private) )
    {
       parent = dget_parent(dentry);
@@ -675,7 +675,7 @@ int verify_dentry( struct dentry *dentry
                   /*
                    * Values don't match so update.
                    */
 -                  ((PINODE_DATA)inode->u.generic_ip)->Flags |= UPDATE_INODE;
 +                  ((PINODE_DATA)inode->i_private)->Flags |= UPDATE_INODE;
                }
                ctime = get_jiffies_64() - ctime;
@@ -776,9 +776,9 @@ int verify_dentry( struct dentry *dentry
                         id->Flags &= ~UPDATE_INODE;
                         dentry->d_inode->i_flags &= ~S_DEAD;
 -                        if (dentry->d_inode->u.generic_ip)
 +                        if (dentry->d_inode->i_private)
                         {
 -                           ((PINODE_DATA)dentry->d_inode->u.generic_ip)->Scope = id->Scope;
 +                           ((PINODE_DATA)dentry->d_inode->i_private)->Scope = id->Scope;
                         }
                      }
                   }
@@ -877,9 +877,9 @@ int Novfs_d_add(struct dentry *Parent, s
       Novfs_Free(buf);
    }
 -   if ( Parent && Parent->d_inode && Parent->d_inode->u.generic_ip)
 +   if ( Parent && Parent->d_inode && Parent->d_inode->i_private)
    {
 -      id = (PINODE_DATA)Parent->d_inode->u.generic_ip;
 +      id = (PINODE_DATA)Parent->d_inode->i_private;
    }
    if (id && id->Scope)
@@ -891,7 +891,7 @@ int Novfs_d_add(struct dentry *Parent, s
       scope = Scope_Get_ScopefromPath( d );
    }
 -   ((PINODE_DATA)i->u.generic_ip)->Scope = scope;
 +   ((PINODE_DATA)i->i_private)->Scope = scope;
    d->d_time = jiffies+(File_update_timeout*HZ);
    if (a)
@@ -944,7 +944,7 @@ int Novfs_d_revalidate(struct dentry *de
       if ( dentry->d_inode &&
            dentry->d_parent && 
            (dir = dentry->d_parent->d_inode) && 
 -           (id = dir->u.generic_ip) )
 +           (id = dir->i_private) )
       {
          /*
           * Check timer to see if in valid time limit
@@ -1399,15 +1399,15 @@ int Novfs_dir_readdir(struct file * file
 	{
 		if (!file->private_data)
 		{
 -			if ( inode && inode->u.generic_ip )
 +			if ( inode && inode->i_private )
 			{
 -				sessionId = Scope_Get_SessionId(((PINODE_DATA)inode->u.generic_ip)->Scope);
 +				sessionId = Scope_Get_SessionId(((PINODE_DATA)inode->i_private)->Scope);
 				if (0 == sessionId)
 				{
 -					((PINODE_DATA)inode->u.generic_ip)->Scope = Scope_Get_ScopefromPath(file->f_dentry);
 -					sessionId = Scope_Get_SessionId(((PINODE_DATA)inode->u.generic_ip)->Scope);
 +					((PINODE_DATA)inode->i_private)->Scope = Scope_Get_ScopefromPath(file->f_dentry);
 +					sessionId = Scope_Get_SessionId(((PINODE_DATA)inode->i_private)->Scope);
 				}
 -				uid = Scope_Get_Uid(((PINODE_DATA)inode->u.generic_ip)->Scope);
 +				uid = Scope_Get_Uid(((PINODE_DATA)inode->i_private)->Scope);
 			}
 			else
 			{
@@ -1501,9 +1501,9 @@ int Novfs_dir_readdir(struct file * file
 				struct inode *dinode = file->private_data;
 				PINODE_DATA id = (PINODE_DATA)((char *)file->private_data+sizeof(struct inode));
 -				dinode->u.generic_ip = id;
 +				dinode->i_private = id;
 -				id->Scope = ((PINODE_DATA)inode->u.generic_ip)->Scope;
 +				id->Scope = ((PINODE_DATA)inode->i_private)->Scope;
 				id->Flags = 0;
 				INIT_LIST_HEAD( &id->DirCache );
 				init_MUTEX( &id->DirCacheLock );
@@ -1616,7 +1616,7 @@ ssize_t Novfs_f_read(struct file *file, 
    if ( file->f_dentry && 
         (inode = file->f_dentry->d_inode) && 
 -        (id = (PINODE_DATA)inode->u.generic_ip))
 +        (id = (PINODE_DATA)inode->i_private))
    {
       DbgPrint("Novfs_f_read(0x%x 0x%p %d %lld %.*s)\n", 
@@ -1685,7 +1685,7 @@ ssize_t Novfs_f_write(struct file *file,
    if ( file->f_dentry && 
         (inode = file->f_dentry->d_inode) && 
 -        (id = file->f_dentry->d_inode->u.generic_ip) )
 +        (id = file->f_dentry->d_inode->i_private) )
    {
       DbgPrint("Novfs_f_write(0x%x %d %lld %.*s)\n", (unsigned long)file->private_data, len, offset, file->f_dentry->d_name.len, file->f_dentry->d_name.name);
@@ -1844,9 +1844,9 @@ int Novfs_f_open(struct inode *inode, st
       DbgPrint("Novfs_f_open: %.*s f_flags=0%o f_mode=0%o i_mode=0%o\n", file->f_dentry->d_name.len, file->f_dentry->d_name.name, file->f_flags, file->f_mode, inode->i_mode);
    }
 -   if (inode && inode->u.generic_ip)
 +   if (inode && inode->i_private)
    {
 -      id = (PINODE_DATA)file->f_dentry->d_inode->u.generic_ip;
 +      id = (PINODE_DATA)file->f_dentry->d_inode->i_private;
       session = Scope_Get_SessionId(id->Scope);
       if (0 == session)
       {
@@ -1888,7 +1888,7 @@ int Novfs_f_open(struct inode *inode, st
                   ino = 0;
                   if (Novfs_get_entry(dir, &file->f_dentry->d_name, &ino, info))
                   {
 -                     ((PINODE_DATA)inode->u.generic_ip)->Flags |= UPDATE_INODE;
 +                     ((PINODE_DATA)inode->i_private)->Flags |= UPDATE_INODE;
                   }
                   Novfs_unlock_inode_cache(dir);
@@ -1956,7 +1956,7 @@ int Novfs_f_release(struct inode *inode,
       file->f_dentry->d_name.name, 
       (unsigned long)file->private_data);
 -   if ( file->f_dentry->d_inode && (id = file->f_dentry->d_inode->u.generic_ip))
 +   if ( file->f_dentry->d_inode && (id = file->f_dentry->d_inode->i_private))
    {
       session = Scope_Get_SessionId(id->Scope);
       if (0 == session)
@@ -2109,13 +2109,13 @@ int Novfs_a_writepage(struct page* page,
 {
 	int retCode = -EFAULT;
    struct inode *inode = page->mapping->host;
 -   PINODE_DATA id = inode->u.generic_ip;
 +   PINODE_DATA id = inode->i_private;
 	loff_t pos = ((loff_t)page->index << PAGE_CACHE_SHIFT);
    session_t session=0;
    DATA_LIST dlst[2];
    size_t len = PAGE_CACHE_SIZE;
 -   session = Scope_Get_SessionId(((PINODE_DATA)inode->u.generic_ip)->Scope);
 +   session = Scope_Get_SessionId(((PINODE_DATA)inode->i_private)->Scope);
 	page_cache_get(page);
@@ -2185,10 +2185,10 @@ int Novfs_a_writepages(struct address_sp
    {
       DbgPrint(" Inode=0x%x Ino=%d\n", inode, inode->i_ino);
 -      if (inode->u.generic_ip)
 +      if (inode->i_private)
       {
 -         session = Scope_Get_SessionId(((PINODE_DATA)inode->u.generic_ip)->Scope);
 -         fh = ((PINODE_DATA)inode->u.generic_ip)->FileHandle;
 +         session = Scope_Get_SessionId(((PINODE_DATA)inode->i_private)->Scope);
 +         fh = ((PINODE_DATA)inode->i_private)->FileHandle;
       }
    }
@@ -2427,13 +2427,13 @@ int Novfs_a_readpage(struct file *file, 
    {
       DbgPrint(" Inode=0x%x Ino=%d", inode, inode->i_ino);
 -      if (inode->u.generic_ip)
 +      if (inode->i_private)
       {
 -         session = Scope_Get_SessionId(((PINODE_DATA)inode->u.generic_ip)->Scope);
 +         session = Scope_Get_SessionId(((PINODE_DATA)inode->i_private)->Scope);
          if (0 == session)
          {
 -            ((PINODE_DATA)inode->u.generic_ip)->Scope = Scope_Get_ScopefromPath( file->f_dentry );
 -            session = Scope_Get_SessionId(((PINODE_DATA)inode->u.generic_ip)->Scope);
 +            ((PINODE_DATA)inode->i_private)->Scope = Scope_Get_ScopefromPath( file->f_dentry );
 +            session = Scope_Get_SessionId(((PINODE_DATA)inode->i_private)->Scope);
          }
       }
    }
@@ -2519,13 +2519,13 @@ int Novfs_a_readpages(struct file *file,
    {
       DbgPrint(" Inode=0x%x Ino=%d\n", inode, inode->i_ino);
 -      if (inode->u.generic_ip)
 +      if (inode->i_private)
       {
 -         session = Scope_Get_SessionId(((PINODE_DATA)inode->u.generic_ip)->Scope);
 +         session = Scope_Get_SessionId(((PINODE_DATA)inode->i_private)->Scope);
          if (0 == session)
          {
 -            ((PINODE_DATA)inode->u.generic_ip)->Scope = Scope_Get_ScopefromPath( file->f_dentry );
 -            session = Scope_Get_SessionId(((PINODE_DATA)inode->u.generic_ip)->Scope);
 +            ((PINODE_DATA)inode->i_private)->Scope = Scope_Get_ScopefromPath( file->f_dentry );
 +            session = Scope_Get_SessionId(((PINODE_DATA)inode->i_private)->Scope);
          }
       }
    }
@@ -2653,13 +2653,13 @@ int Novfs_a_prepare_write(struct file *f
           */
          if (file->f_dentry && file->f_dentry->d_inode)
          {
 -            if (file->f_dentry->d_inode->u.generic_ip)
 +            if (file->f_dentry->d_inode->i_private)
             {
 -               session = Scope_Get_SessionId(((PINODE_DATA)inode->u.generic_ip)->Scope);
 +               session = Scope_Get_SessionId(((PINODE_DATA)inode->i_private)->Scope);
                if (0 == session)
                {
 -                  ((PINODE_DATA)inode->u.generic_ip)->Scope = Scope_Get_ScopefromPath( file->f_dentry );
 -                  session = Scope_Get_SessionId(((PINODE_DATA)inode->u.generic_ip)->Scope);
 +                  ((PINODE_DATA)inode->i_private)->Scope = Scope_Get_ScopefromPath( file->f_dentry );
 +                  session = Scope_Get_SessionId(((PINODE_DATA)inode->i_private)->Scope);
                }
             }
          }
@@ -2741,7 +2741,7 @@ int Novfs_a_commit_write(struct file *fi
    size_t len = to - offset;
    DbgPrint("Novfs_a_commit_write: File=0x%p Page=0x%p offset=0x%x To=%u filesize=%lld\n", file, page, offset, to, i_size_read(file->f_dentry->d_inode));
 -   if (file->f_dentry->d_inode && (id = file->f_dentry->d_inode->u.generic_ip))
 +   if (file->f_dentry->d_inode && (id = file->f_dentry->d_inode->i_private))
    {
       session = Scope_Get_SessionId(id->Scope);
       if (0 == session)
@@ -2836,13 +2836,13 @@ int Novfs_i_create(struct inode *dir, st
    if (mode | S_IFREG)
    {
 -      if (dir->u.generic_ip)
 +      if (dir->i_private)
       {
 -         session = Scope_Get_SessionId( ((PINODE_DATA)dir->u.generic_ip)->Scope);
 +         session = Scope_Get_SessionId( ((PINODE_DATA)dir->i_private)->Scope);
          if (0 == session)
          {
 -            ((PINODE_DATA)dir->u.generic_ip)->Scope = Scope_Get_ScopefromPath( dentry );
 -            session = Scope_Get_SessionId(((PINODE_DATA)dir->u.generic_ip)->Scope);
 +            ((PINODE_DATA)dir->i_private)->Scope = Scope_Get_ScopefromPath( dentry );
 +            session = Scope_Get_SessionId(((PINODE_DATA)dir->i_private)->Scope);
          }
          buf = (char *)Novfs_Malloc(PATH_LENGTH_BUFFER, GFP_KERNEL);
@@ -2859,7 +2859,7 @@ int Novfs_i_create(struct inode *dir, st
                   {
                      if (dentry->d_inode)
                      {
 -                        ((PINODE_DATA)dentry->d_inode->u.generic_ip)->Flags |= UPDATE_INODE;
 +                        ((PINODE_DATA)dentry->d_inode->i_private)->Flags |= UPDATE_INODE;
                      }
                   }
                }
@@ -2951,7 +2951,7 @@ struct dentry * Novfs_i_lookup(struct in
    DbgPrint("Novfs_i_lookup: dir 0x%x %d name %.*s hash %d inode 0x%0p\n", dir, dir->i_ino, dentry->d_name.len, dentry->d_name.name, dentry->d_name.hash, dentry->d_inode);
 -   if (dir && (id = dir->u.generic_ip) )
 +   if (dir && (id = dir->i_private) )
    {
       retVal = 0;
       if ( IS_ROOT( dentry ))
@@ -3066,13 +3066,13 @@ int Novfs_i_unlink(struct inode *dir, st
    if ( inode )
    {
       DbgPrint("Novfs_i_unlink: dir=0x%x dir->i_ino=%d inode=0x%x ino=%d\n", dir, dir->i_ino, inode, inode->i_ino);
 -      if (inode->u.generic_ip)
 +      if (inode->i_private)
       {
 -         session = Scope_Get_SessionId(((PINODE_DATA)inode->u.generic_ip)->Scope);
 +         session = Scope_Get_SessionId(((PINODE_DATA)inode->i_private)->Scope);
          if (0 == session)
          {
 -            ((PINODE_DATA)inode->u.generic_ip)->Scope = Scope_Get_ScopefromPath( dentry );
 -            session = Scope_Get_SessionId(((PINODE_DATA)inode->u.generic_ip)->Scope);
 +            ((PINODE_DATA)inode->i_private)->Scope = Scope_Get_ScopefromPath( dentry );
 +            session = Scope_Get_SessionId(((PINODE_DATA)inode->i_private)->Scope);
          }
          buf = (char *)Novfs_Malloc(PATH_LENGTH_BUFFER, GFP_KERNEL);
@@ -3142,16 +3142,16 @@ int Novfs_i_mkdir(struct inode *dir, str
    mode |= S_IFDIR;
    mode &= (S_IFMT | S_IRWXU);
 -   if ( dir->u.generic_ip )
 +   if ( dir->i_private )
    {
 -      session = Scope_Get_SessionId( ((PINODE_DATA)dir->u.generic_ip)->Scope);
 +      session = Scope_Get_SessionId( ((PINODE_DATA)dir->i_private)->Scope);
       if (0 == session)
       {
 -         ((PINODE_DATA)dir->u.generic_ip)->Scope = Scope_Get_ScopefromPath( dentry );
 -         session = Scope_Get_SessionId(((PINODE_DATA)dir->u.generic_ip)->Scope);
 +         ((PINODE_DATA)dir->i_private)->Scope = Scope_Get_ScopefromPath( dentry );
 +         session = Scope_Get_SessionId(((PINODE_DATA)dir->i_private)->Scope);
       }
 -      uid = Scope_Get_Uid( ((PINODE_DATA)dir->u.generic_ip)->Scope);
 +      uid = Scope_Get_Uid( ((PINODE_DATA)dir->i_private)->Scope);
       buf = (char *)Novfs_Malloc(PATH_LENGTH_BUFFER, GFP_KERNEL);
       if (buf)
       {
@@ -3170,7 +3170,7 @@ int Novfs_i_mkdir(struct inode *dir, str
                      if (inode)
                      {
                         update_inode(inode, &info);
 -                        ((PINODE_DATA)inode->u.generic_ip)->Flags &= ~UPDATE_INODE;
 +                        ((PINODE_DATA)inode->i_private)->Flags &= ~UPDATE_INODE;
                         dentry->d_time = jiffies+(File_update_timeout*HZ);
@@ -3238,9 +3238,9 @@ int Novfs_i_mknod(struct inode *dir, str
       return(-EACCES);
    }
 -   if ( ((PINODE_DATA)dir->u.generic_ip) )
 +   if ( ((PINODE_DATA)dir->i_private) )
    {
 -      uid = Scope_Get_Uid( ((PINODE_DATA)dir->u.generic_ip)->Scope);
 +      uid = Scope_Get_Uid( ((PINODE_DATA)dir->i_private)->Scope);
       if (mode & (S_IFREG | S_IFDIR))
       {
          inode = Novfs_get_inode(dir->i_sb, mode, dev, uid, 0, &dentry->d_name);
@@ -3344,27 +3344,27 @@ int Novfs_i_rename(struct inode *odir, s
                if ( !Novfs_d_strcmp(&newname, &oldname))
                {
 -                  if ( od->d_inode && od->d_inode->u.generic_ip )
 +                  if ( od->d_inode && od->d_inode->i_private )
                   {
 -                     if (nd->d_inode && nd->d_inode->u.generic_ip)
 +                     if (nd->d_inode && nd->d_inode->i_private)
                      {
 -                        session = Scope_Get_SessionId(((PINODE_DATA)ndir->u.generic_ip)->Scope);
 +                        session = Scope_Get_SessionId(((PINODE_DATA)ndir->i_private)->Scope);
                         if (0 == session)
                         {
 -                           ((PINODE_DATA)ndir->u.generic_ip)->Scope = Scope_Get_ScopefromPath( nd );
 -                           session = Scope_Get_SessionId(((PINODE_DATA)ndir->u.generic_ip)->Scope);
 +                           ((PINODE_DATA)ndir->i_private)->Scope = Scope_Get_ScopefromPath( nd );
 +                           session = Scope_Get_SessionId(((PINODE_DATA)ndir->i_private)->Scope);
                         }
                         retCode = Novfs_Delete(newpath, S_ISDIR(nd->d_inode->i_mode), session);
                      }
 -                     session = Scope_Get_SessionId(((PINODE_DATA)ndir->u.generic_ip)->Scope);
 +                     session = Scope_Get_SessionId(((PINODE_DATA)ndir->i_private)->Scope);
                      if (0 == session)
                      {
 -                        ((PINODE_DATA)ndir->u.generic_ip)->Scope = Scope_Get_ScopefromPath( nd );
 -                        session = Scope_Get_SessionId(((PINODE_DATA)ndir->u.generic_ip)->Scope);
 +                        ((PINODE_DATA)ndir->i_private)->Scope = Scope_Get_ScopefromPath( nd );
 +                        session = Scope_Get_SessionId(((PINODE_DATA)ndir->i_private)->Scope);
                      }
                      retCode = Novfs_Rename_File(
                                  S_ISDIR(od->d_inode->i_mode),
@@ -3458,13 +3458,13 @@ int Novfs_i_setattr(struct dentry *dentr
       return(-EACCES);
    }
 -   if (inode && inode->u.generic_ip)
 +   if (inode && inode->i_private)
    {
 -      session = Scope_Get_SessionId( ((PINODE_DATA)inode->u.generic_ip)->Scope);
 +      session = Scope_Get_SessionId( ((PINODE_DATA)inode->i_private)->Scope);
       if (0 == session)
       {
 -         ((PINODE_DATA)inode->u.generic_ip)->Scope = Scope_Get_ScopefromPath( dentry );
 -         session = Scope_Get_SessionId(((PINODE_DATA)inode->u.generic_ip)->Scope);
 +         ((PINODE_DATA)inode->i_private)->Scope = Scope_Get_ScopefromPath( dentry );
 +         session = Scope_Get_SessionId(((PINODE_DATA)inode->i_private)->Scope);
       }
       buf = (char *)Novfs_Malloc(PATH_LENGTH_BUFFER, GFP_KERNEL);
@@ -3513,7 +3513,7 @@ int Novfs_i_setattr(struct dentry *dentr
             if ( !(retVal = Novfs_Set_Attr(path, attr, session) ) )
             {
 -               ((PINODE_DATA)inode->u.generic_ip)->Flags |= UPDATE_INODE;
 +               ((PINODE_DATA)inode->i_private)->Flags |= UPDATE_INODE;
                if (ia_valid & ATTR_ATIME)
                   inode->i_atime = attr->ia_atime;
@@ -3563,7 +3563,7 @@ int Novfs_i_getattr(struct vfsmount *mnt
         !IS_ROOT(dentry->d_parent) )
    {
       session = 0;
 -      id = dentry->d_inode->u.generic_ip;
 +      id = dentry->d_inode->i_private;
       if (id && (id->Flags & UPDATE_INODE) )
       {
@@ -3744,9 +3744,9 @@ void Novfs_clear_inode(struct inode *ino
 {
    InodeCount--;
 -   if ( inode->u.generic_ip )
 +   if ( inode->i_private )
    {
 -      PINODE_DATA id=inode->u.generic_ip;
 +      PINODE_DATA id=inode->i_private;
       DbgPrint("Novfs_clear_inode: inode=0x%x ino=%d Scope=0x%p Name=%s\n", inode, inode->i_ino, id->Scope, id->Name);
@@ -3757,8 +3757,8 @@ void Novfs_clear_inode(struct inode *ino
       up( &InodeList_lock );
 -      Novfs_Free(inode->u.generic_ip);
 -      inode->u.generic_ip = NULL;
 +      Novfs_Free(inode->i_private);
 +      inode->i_private = NULL;
       remove_inode_hash( inode );
@@ -3921,12 +3921,12 @@ struct inode *Novfs_get_inode(struct sup
       DbgPrint("Novfs_get_inode: Inode=0x%p I_ino=%d len=%d\n", inode, inode->i_ino, name->len);
 -      if (NULL != (inode->u.generic_ip = Novfs_Malloc(sizeof(INODE_DATA)+name->len, GFP_KERNEL)))
 +      if (NULL != (inode->i_private = Novfs_Malloc(sizeof(INODE_DATA)+name->len, GFP_KERNEL)))
       {
          PINODE_DATA id;
 -         id = inode->u.generic_ip;
 +         id = inode->i_private;
 -         DbgPrint("Novfs_get_inode: u.generic_ip 0x%p\n", id);
 +         DbgPrint("Novfs_get_inode: i_private 0x%p\n", id);
          id->Scope = NULL;
          id->Flags = 0;
@@ -4343,7 +4343,7 @@ int Novfs_lock_inode_cache( struct inode
    int retVal = 0;
    DbgPrint("Novfs_lock_inode_cache: 0x%p\n", i);
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       down( &id->DirCacheLock );
       retVal = 1;
@@ -4369,7 +4369,7 @@ void Novfs_unlock_inode_cache( struct in
 {
    PINODE_DATA id;
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       up( &id->DirCacheLock );
    }
@@ -4397,7 +4397,7 @@ int Novfs_enumerate_inode_cache( struct 
    int retVal = -1;
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       if ( (NULL == iteration) || (NULL == *iteration) )
       {
@@ -4456,7 +4456,7 @@ int Novfs_get_entry( struct inode *i, st
    char *n="<NULL>";
    int nl=6;
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       if (name && name->len)
       {
@@ -4545,7 +4545,7 @@ int Novfs_get_entry_time( struct inode *
    char *n="<NULL>";
    int nl=6;
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       if (name && name->len)
       {
@@ -4605,7 +4605,7 @@ int Novfs_get_remove_entry( struct inode
    int retVal = -1;
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       l = id->DirCache.next;
@@ -4653,7 +4653,7 @@ void Novfs_invalidate_inode_cache( struc
    PDIR_CACHE dc;
    struct list_head *l;
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       list_for_each(l, &id->DirCache)
       {
@@ -4690,7 +4690,7 @@ PDIR_CACHE Novfs_lookup_inode_cache( str
    int nl=6;
    int hash=0;
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       if (name && name->name)
       {
@@ -4768,7 +4768,7 @@ int Novfs_lookup_validate( struct inode 
    char *n="<NULL>";
    int nl=6;
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       if (name && name->len)
       {
@@ -4815,7 +4815,7 @@ int Novfs_add_inode_entry( 
    PDIR_CACHE new;
    int retVal = -ENOMEM;
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       new = Novfs_Malloc(sizeof(DIR_CACHE)+name->len, GFP_KERNEL);
       if (new)
@@ -4888,7 +4888,7 @@ int Novfs_update_entry( struct inode *i,
    char mtime_buf[32];
    char ctime_buf[32];
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       if (name && name->len)
@@ -4966,7 +4966,7 @@ void Novfs_remove_inode_entry( struct in
    char *n="<NULL>";
    int nl=6;
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       dc = Novfs_lookup_inode_cache( i, name, ino );
       if (dc)
@@ -5015,7 +5015,7 @@ void Novfs_free_invalid_entries( struct 
    PDIR_CACHE dc;
    struct list_head *l;
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       list_for_each( l, &id->DirCache )
       {
@@ -5057,7 +5057,7 @@ void Novfs_free_inode_cache( struct inod
    PDIR_CACHE dc;
    struct list_head *l;
 -   if ( i && (id = i->u.generic_ip) && id->DirCache.next )
 +   if ( i && (id = i->i_private) && id->DirCache.next )
    {
       list_for_each( l, &id->DirCache )
       {
@@ -5109,7 +5109,7 @@ Novfs_dump_inode_cache(int argc, const c
    kdb_printf("Inode: 0x%p\n", inode);
    if (inode)
    {
 -      id = inode->u.generic_ip;
 +      id = inode->i_private;
       kdb_printf("INODE_DATA: 0x%p\n", id);
       if ( id && id->DirCache.next )
--- a/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0_p16-vfs.patch
+++ b/branches/experimental/net-fs/novell-novfs/files/novell-novfs-2.0.0_p16-vfs.patch
@ -5,7 +5,7 @@
                   atomic_inc(&inode->i_count);
                }
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
                // Version of 2.6.20 changed the number of
                // parameters passed to vfs_unlink.
                error = vfs_unlink(nd.dentry->d_inode, dentry, nd.mnt);
--- a/branches/experimental/net-fs/novell-novfs/novell-novfs-1.2.0_p17-r2.ebuild
+++ b/branches/experimental/net-fs/novell-novfs/novell-novfs-1.2.0_p17-r2.ebuild
@ -1,58 +0,0 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 inherit eutils rpm linux-mod
 MY_PV="${PV/_p/-}"
 DESCRIPTION="Novell Client for Linux Filesystem"
 HOMEPAGE="http://www.novell.com"
 SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cache.novell.com/prot/2JyMn7sWP_Q~/novell-client-1.2-SLE10.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 DEPEND=""
 RDEPEND="virtual/linux-sources
 	!net-misc/novell-novfs"
 RESTRICT="nomirror fetch"
 BUILD_PARAMS="-C $KERNEL_DIR SUBDIRS=${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/src/novfs"
 MODULE_NAMES="novfs(novfs:${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/src/novfs:${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/src/novfs"
 BUILD_TARGETS="modules"
 MODULESD_NOVFS_ENABLED=""
 src_unpack() {
 	unpack ${A}
 	mkdir -p ${WORKDIR}/${PN}-${MY_PV}
 	cd ${PN}-${MY_PV}
 	rpm_unpack ${WORKDIR}/ncl_build_711/NCL_disk/novell/i586/${PN}-${MY_PV}.i586.rpm
 	cd ${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/src
 	epatch ${FILESDIR}/novell-novfs-1.2.0-dentry.patch
 	epatch ${FILESDIR}/novell-novfs-1.2.0-getsb.patch
 	epatch ${FILESDIR}/novell-novfs-1.2.0-getsb-fix.patch
 	epatch ${FILESDIR}/novell-novfs-1.2.0-dont_use_tasklist_lock.patch
 	epatch ${FILESDIR}/novell-novfs-1.2.0-license.patch
 }
 src_compile() { 
 	linux-mod_src_compile
 }
 src_install() {
 	linux-mod_src_install
 	generate_modulesd	
 }
 pkg_postinst() {
 	linux-mod_pkg_postinst
 }
 pkg_postrm() {
 	linux-mod_pkg_postrm
 }
--- a/branches/experimental/net-fs/novell-novfs/novell-novfs-2.0.0_p2-r1.ebuild
+++ b/branches/experimental/net-fs/novell-novfs/novell-novfs-2.0.0_p2-r1.ebuild
@ -1,74 +0,0 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 inherit eutils rpm linux-mod
 MY_PV="${PV/_p/-}"
 DESCRIPTION="Novell Client for Linux Filesystem"
 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="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 DEPEND=""
 RDEPEND="virtual/linux-sources
 	!net-misc/novell-novfs"
 RESTRICT="nomirror"
 BUILD_PARAMS="-C $KERNEL_DIR SUBDIRS=${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/src/src"
 MODULE_NAMES="novfs(novfs:${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/src/src:${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/src/src"
 BUILD_TARGETS="modules"
 MODULESD_NOVFS_ENABLED=""
 src_unpack() {
 	unpack ${A}
 	mkdir -p ${WORKDIR}/${PN}-${MY_PV}
 	cd ${PN}-${MY_PV}
 	rpm_unpack ${WORKDIR}/ncl_build_711/NCL_disk/novell/i586/${PN}-1.2.0-17.i586.rpm
 	cd ${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/src
 	epatch ${FILESDIR}/novell-novfs-1.2.0_to_2.0.0.patch
 	if kernel_is eq 2 6 15
 	then
 	    epatch ${FILESDIR}/novell-novfs-2.0.0-2_6_15-compat.patch
 	fi
 	if kernel_is ge 2 6 17
 	then
 	    epatch ${FILESDIR}/novell-novfs-2.0.0-config_h.patch
 	fi
 	if kernel_is ge 2 6 18 
 	then
 	    epatch ${FILESDIR}/novell-novfs-2.0.0-generic_file_read.patch
 	fi
 	if kernel_is ge 2 6 19 
 	then
 	    epatch ${FILESDIR}/novell-novfs-2.0.0-i_blksize.patch
 	    epatch ${FILESDIR}/novell-novfs-2.0.0-u.generic_ip.patch
 	fi
 	epatch ${FILESDIR}/novell-novfs-2.0.0-dont_use_tasklist_lock.patch
 }
 src_compile() { 
 	linux-mod_src_compile
 }
 src_install() {
 	linux-mod_src_install
 	generate_modulesd	
 }
 pkg_postinst() {
 	linux-mod_pkg_postinst
 }
 pkg_postrm() {
 	linux-mod_pkg_postrm
 }
--- a/branches/experimental/net-fs/novell-novfs/novell-novfs-2.0.0_p21.ebuild
+++ b/branches/experimental/net-fs/novell-novfs/novell-novfs-2.0.0_p21.ebuild
@ -8,7 +8,8 @@ MY_PV="${PV/_p/-}"
 DESCRIPTION="Novell Client for Linux Filesystem"
 HOMEPAGE="http://www.novell.com"
-SRC_URI="http://download.opensuse.org/distribution/SL-OSS-factory/inst-source/suse/src/novfs-${MY_PV}.src.rpm"
+SRC_URI="ftp://mars.arge.at/n4g/novfs-${MY_PV}.src.rpm 
 	http://download.opensuse.org/distribution/SL-OSS-factory/inst-source/suse/src/novfs-${MY_PV}.src.rpm"
 LICENSE="GPL-2"
 SLOT="0"
@ -29,7 +30,7 @@ MODULESD_NOVFS_ENABLED=""
 src_unpack() {
 	rpm_src_unpack ${A}
-	epatch ${FILESDIR}/novell-novfs-${PV}-vfs.patch
+	epatch ${FILESDIR}/novell-novfs-2.0.0-vfs.patch
 #	if kernel_is eq 2 6 15
 #	then
--- a/branches/experimental/net-fs/novell-novfsd/Manifest
+++ b/branches/experimental/net-fs/novell-novfsd/Manifest
@ -21,10 +21,10 @@ EBUILD novell-novfsd-1.2.0_p8-r4.ebuild 2289 RMD160 f47bc69bebd197c1c4425b6326c0
 MD5 74ff5e88a0137262dcffc354810a403b novell-novfsd-1.2.0_p8-r4.ebuild 2289
 RMD160 f47bc69bebd197c1c4425b6326c05a4a4c1c33f9 novell-novfsd-1.2.0_p8-r4.ebuild 2289
 SHA256 e40a43bf2d654897b288414d38e43778589a88eb4d64b38982a2c96f13bf9927 novell-novfsd-1.2.0_p8-r4.ebuild 2289
-EBUILD novell-novfsd-2.0.0_p20.ebuild 2557 RMD160 59712859f5d878a629db293e84a23d3df72a13bb SHA1 f299996881b7af9ed0382255058049c4e587ea66 SHA256 33ef2079a28c189bb549f5ed5e5b843505b9e28bca1509628dd1c44bcaf71915
+EBUILD novell-novfsd-2.0.0_p20.ebuild 2555 RMD160 b7da696df4dc179c27076aa173b41d00389d75e3 SHA1 9e71141bef0e6c7ed2d029fadb6aae31d66a0f3d SHA256 53d534731b9d0b91ff735c6d416579798dd6df7a42131555888c120890011920
-MD5 fc5cb38b7aca220f9dc6fa5670dc5f58 novell-novfsd-2.0.0_p20.ebuild 2557
+MD5 f40a88852f2b007c32a42798072f0007 novell-novfsd-2.0.0_p20.ebuild 2555
-RMD160 59712859f5d878a629db293e84a23d3df72a13bb novell-novfsd-2.0.0_p20.ebuild 2557
+RMD160 b7da696df4dc179c27076aa173b41d00389d75e3 novell-novfsd-2.0.0_p20.ebuild 2555
-SHA256 33ef2079a28c189bb549f5ed5e5b843505b9e28bca1509628dd1c44bcaf71915 novell-novfsd-2.0.0_p20.ebuild 2557
+SHA256 53d534731b9d0b91ff735c6d416579798dd6df7a42131555888c120890011920 novell-novfsd-2.0.0_p20.ebuild 2555
 MISC ChangeLog 1055 RMD160 aee855e40d41eb2bf922201ef35a48ce5b78f39f SHA1 8e1ebb33119c5fc3f12b6b4967f4952928d3efc3 SHA256 4757a31de7f39403b9c55eb51dd5302f4f571d4484188f28215b927f41c14406
 MD5 5cdebf972f303ed85432dd38f79004e3 ChangeLog 1055
 RMD160 aee855e40d41eb2bf922201ef35a48ce5b78f39f ChangeLog 1055
--- a/branches/experimental/net-fs/novell-novfsd/novell-novfsd-2.0.0_p20.ebuild
+++ b/branches/experimental/net-fs/novell-novfsd/novell-novfsd-2.0.0_p20.ebuild
@ -24,7 +24,7 @@ RDEPEND="virtual/libc
 	net-fs/novell-novfs
 	!net-misc/novell-novfsd"
-RESTRICT="nomirror nostrip"
+RESTRICT="nomirror strip"
 src_unpack() {
 	cd ${WORKDIR}
--- a/branches/experimental/net-misc/novell-client-config/Manifest
+++ b/branches/experimental/net-misc/novell-client-config/Manifest
@ -22,11 +22,12 @@ AUX tray_app.conf 402 RMD160 785eea3a5e234f6a45de7dbce22c9849f5332adb SHA1 52b7b
 MD5 de92ac1f01db5f32aa861e47d38de5cc files/tray_app.conf 402
 RMD160 785eea3a5e234f6a45de7dbce22c9849f5332adb files/tray_app.conf 402
 SHA256 c1c338fef2dfabb62d0d7ac4bae3acd94c42ae339e1dbfecc3ea30bb0655f9d8 files/tray_app.conf 402
-DIST novell-client-1.2-SLE10.tar.gz 13963983 RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 SHA1 14278f74c8226afabc0c602bdc31d4e20acff6b9 SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241
+DIST Novell_Client_SLED10-i386-2007531-CD1.iso 10256384 RMD160 5296935f1b2b5cb0796b685f5c6bacd532f49094 SHA1 96d1df5bce5f0afb0a625084226fb347728fcffb SHA256 3433f30fed62339de2fe12426e4e4e064ec4823073d2271531d7a1009f9cdecf
-EBUILD novell-client-config-1.2.0_p12-r1.ebuild 1401 RMD160 f371c8d223f74769827177a4bbb7ebe42b268816 SHA1 d652c5524819a174c772ff8dcc06352dbef3dda5 SHA256 2d0bdae07ffb10fc8896f60eb66fdad54a72a717872e51df88381eca340611bb
+DIST Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352 RMD160 9b5a8704e518ac7ce1d9d03a890e77a67610cbaa SHA1 0430885f18e803bba63ec264022589c4d934ef03 SHA256 f170dad7e9774d6b55186228f0ed3de512b09255d5d19f54e86964a327b62806
-MD5 f8ae1cf5dfb505887831bd2230f44dc2 novell-client-config-1.2.0_p12-r1.ebuild 1401
+EBUILD novell-client-config-2.0.0_p7.ebuild 1692 RMD160 3ce012d9811d729e7173aabbbdcb5e8c81564820 SHA1 1644ea534f1f4d4f72d56824631ae2ccbd4e76eb SHA256 e1f9b41b8724a03048ad2283ad36c0f722df0bd7e8a15ab53d537e0fb5dc729b
-RMD160 f371c8d223f74769827177a4bbb7ebe42b268816 novell-client-config-1.2.0_p12-r1.ebuild 1401
+MD5 0091cfad0e5fe1046a46b36ca1da408f novell-client-config-2.0.0_p7.ebuild 1692
-SHA256 2d0bdae07ffb10fc8896f60eb66fdad54a72a717872e51df88381eca340611bb novell-client-config-1.2.0_p12-r1.ebuild 1401
+RMD160 3ce012d9811d729e7173aabbbdcb5e8c81564820 novell-client-config-2.0.0_p7.ebuild 1692
 SHA256 e1f9b41b8724a03048ad2283ad36c0f722df0bd7e8a15ab53d537e0fb5dc729b novell-client-config-2.0.0_p7.ebuild 1692
 MISC ChangeLog 658 RMD160 b7f18586ee42665b0643ed0213954c1d057ca226 SHA1 eaa3adcc5fb1c1095ee819940c9be497e302f409 SHA256 4a8c2eed9347a82cdff8e16f6f7b3ab653fab9cfdffd5addd40bfd06c708e97d
 MD5 52b098578526b33e6f1dcc00649330cd ChangeLog 658
 RMD160 b7f18586ee42665b0643ed0213954c1d057ca226 ChangeLog 658
@ -35,6 +36,6 @@ MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f4
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 dcdc80c8269e53d3a5ecd72aa4034a06 files/digest-novell-client-config-1.2.0_p12-r1 277
+MD5 ec699dae9428f5ecd71e3b6fdc0b8405 files/digest-novell-client-config-2.0.0_p7 626
-RMD160 4767389e6f47ba8fb5b8907a954b9f80ce106b78 files/digest-novell-client-config-1.2.0_p12-r1 277
+RMD160 a08fca1bf3e2cb25ea5b9fb70f27de63c0e9974a files/digest-novell-client-config-2.0.0_p7 626
-SHA256 aa21d5b182ad571f4bedf0694cc608f211146d09e0af2bdd1addd6415a2bf0b8 files/digest-novell-client-config-1.2.0_p12-r1 277
+SHA256 d20395db16f0e2a59b7411ac9ea0817b657bd9804d54da40d459a518a13b5153 files/digest-novell-client-config-2.0.0_p7 626
--- a/branches/experimental/net-misc/novell-client-config/files/digest-novell-client-config-1.2.0_p12-r1
+++ b/branches/experimental/net-misc/novell-client-config/files/digest-novell-client-config-1.2.0_p12-r1
@ -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
--- a/branches/experimental/net-misc/novell-client-config/files/digest-novell-client-config-2.0.0_p7
+++ b/branches/experimental/net-misc/novell-client-config/files/digest-novell-client-config-2.0.0_p7
@ -0,0 +1,6 @@
 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
--- a/branches/experimental/net-misc/novell-client-config/novell-client-config-1.2.0_p12-r1.ebuild
+++ b/branches/experimental/net-misc/novell-client-config/novell-client-config-1.2.0_p12-r1.ebuild
@ -8,7 +8,8 @@ MY_PV="${PV/_p/-}"
 DESCRIPTION="Novell Client for Linux Configuration"
 HOMEPAGE="http://www.novell.com"
-SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cache.novell.com/prot/2JyMn7sWP_Q~/novell-client-1.2-SLE10.tar.gz"
+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"
@ -18,17 +19,19 @@ IUSE="gtk"
 DEPEND=""
 RDEPEND="virtual/libc
-	>=app-crypt/novell-nici-2.7.0_p001
+	>=app-crypt/novell-nici-2.7.3_p5
-	>=net-misc/novell-client-script-1.2.0_p38
+	>=net-misc/novell-client-script-2.0.0_p11
-	>=net-nds/novell-xtier-base-3.1.4_p4"
+	>=net-nds/novell-xtier-base-3.1.5_p37"
-RESTRICT="nomirror nostrip"
+RESTRICT="nomirror strip"
 src_unpack() {
-	unpack ${A}
+        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}/ncl_build_711/NCL_disk/novell/i586/yast2-novell-client-${MY_PV}.i586.rpm
+        rpm_unpack ${WORKDIR}/suse/i586/yast2-novell-client-${MY_PV}.i586.rpm
 }
 src_compile() { :; }
--- a/branches/experimental/net-misc/novell-client-script/Manifest
+++ b/branches/experimental/net-misc/novell-client-script/Manifest
@ -2,11 +2,12 @@ AUX 80novell-client 164 RMD160 1873d6c60904a7c729f0e7ed9f5a21ac7dd6bbe8 SHA1 240
 MD5 6768ec207bdfb38f47d151aba0105d05 files/80novell-client 164
 RMD160 1873d6c60904a7c729f0e7ed9f5a21ac7dd6bbe8 files/80novell-client 164
 SHA256 dafe1812e1005f625deba9bcc6e60f3623c7ddd633e584c6a4533f7836af691f files/80novell-client 164
-DIST novell-client-1.2-SLE10.tar.gz 13963983 RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 SHA1 14278f74c8226afabc0c602bdc31d4e20acff6b9 SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241
+DIST Novell_Client_SLED10-i386-2007531-CD1.iso 10256384 RMD160 5296935f1b2b5cb0796b685f5c6bacd532f49094 SHA1 96d1df5bce5f0afb0a625084226fb347728fcffb SHA256 3433f30fed62339de2fe12426e4e4e064ec4823073d2271531d7a1009f9cdecf
-EBUILD novell-client-script-1.2.0_p38-r4.ebuild 2029 RMD160 9b2016ddbcff69c245d2adff7b74a64bd1bb981d SHA1 cb37af546a59df6ff8bc6449f133e8d201d38b5f SHA256 be2a0cbbb9c6d4e71a1f5b13e8d79ad0bad4f9063f2ede6ef70c69fffc6edc6b
+DIST Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352 RMD160 9b5a8704e518ac7ce1d9d03a890e77a67610cbaa SHA1 0430885f18e803bba63ec264022589c4d934ef03 SHA256 f170dad7e9774d6b55186228f0ed3de512b09255d5d19f54e86964a327b62806
-MD5 44d0ae98a4e296f8d3e0e554f191564b novell-client-script-1.2.0_p38-r4.ebuild 2029
+EBUILD novell-client-script-2.0.0_p11.ebuild 2356 RMD160 6fcd34981fd0330665ffd95e2464a74b1bd845d8 SHA1 5a3993791c22e85e584f78b3323edfb47c07ebcb SHA256 fdcc5da33de4549225b321aa88ff16f7ea530741e66702f7a33e588904ae492e
-RMD160 9b2016ddbcff69c245d2adff7b74a64bd1bb981d novell-client-script-1.2.0_p38-r4.ebuild 2029
+MD5 a448c3792660b85875cba6de1f224fe2 novell-client-script-2.0.0_p11.ebuild 2356
-SHA256 be2a0cbbb9c6d4e71a1f5b13e8d79ad0bad4f9063f2ede6ef70c69fffc6edc6b novell-client-script-1.2.0_p38-r4.ebuild 2029
+RMD160 6fcd34981fd0330665ffd95e2464a74b1bd845d8 novell-client-script-2.0.0_p11.ebuild 2356
 SHA256 fdcc5da33de4549225b321aa88ff16f7ea530741e66702f7a33e588904ae492e novell-client-script-2.0.0_p11.ebuild 2356
 MISC ChangeLog 990 RMD160 41ddb060b179632fdfe10f967ab77127c98f0b26 SHA1 0c0f4225a090cb38f190645df6a03fed74723f53 SHA256 4fa1e5f36d9d9940576911af89c8bcc5a60b78b36d18ecb1ae66c2759025bd9d
 MD5 183b5505746691878e3b7956e70da2a3 ChangeLog 990
 RMD160 41ddb060b179632fdfe10f967ab77127c98f0b26 ChangeLog 990
@ -15,6 +16,6 @@ MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f4
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 dcdc80c8269e53d3a5ecd72aa4034a06 files/digest-novell-client-script-1.2.0_p38-r4 277
+MD5 ec699dae9428f5ecd71e3b6fdc0b8405 files/digest-novell-client-script-2.0.0_p11 626
-RMD160 4767389e6f47ba8fb5b8907a954b9f80ce106b78 files/digest-novell-client-script-1.2.0_p38-r4 277
+RMD160 a08fca1bf3e2cb25ea5b9fb70f27de63c0e9974a files/digest-novell-client-script-2.0.0_p11 626
-SHA256 aa21d5b182ad571f4bedf0694cc608f211146d09e0af2bdd1addd6415a2bf0b8 files/digest-novell-client-script-1.2.0_p38-r4 277
+SHA256 d20395db16f0e2a59b7411ac9ea0817b657bd9804d54da40d459a518a13b5153 files/digest-novell-client-script-2.0.0_p11 626
--- a/branches/experimental/net-misc/novell-client-script/files/digest-novell-client-script-1.2.0_p38-r4
+++ b/branches/experimental/net-misc/novell-client-script/files/digest-novell-client-script-1.2.0_p38-r4
@ -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
--- a/branches/experimental/net-misc/novell-client-script/files/digest-novell-client-script-2.0.0_p11
+++ b/branches/experimental/net-misc/novell-client-script/files/digest-novell-client-script-2.0.0_p11
@ -0,0 +1,6 @@
 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
--- a/branches/experimental/net-misc/novell-client-script/novell-client-script-1.2.0_p38-r4.ebuild
+++ b/branches/experimental/net-misc/novell-client-script/novell-client-script-1.2.0_p38-r4.ebuild
@ -8,33 +8,36 @@ MY_PV="${PV/_p/-}"
 DESCRIPTION="Novell Modules for Login Script Procssing"
 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"
+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 linguas_cs_CZ linguas_de linguas_en linguas_es linguas_en linguas_fr linguas_hu linguas_hu linguas_it linguas_ja_JP linguas_pl linguas_pt linguas_ru linguas_sk_SK linguas_zh_CN linguas_zh_TW"
+IUSE="gtk linguas_cs_CZ linguas_da_DA linguas_de linguas_en linguas_es linguas_fi_FI linguas_fr linguas_hu linguas_it linguas_ja_JP linguas_nb_NB linguas_pl linguas_pt linguas_ru linguas_sk_SK linguas_zh_CN linguas_zh_TW"
 DEPEND=""
 RDEPEND="virtual/libc
 	!dev-perl/Unicode-MAP
-	>=sys-libs/novell-xplatlib-1.0.2
+	>=sys-libs/novell-xplatlib-1.0.3
 	>=sys-libs/pam-0.99.3"
-RESTRICT="nomirror nostrip"
+RESTRICT="nomirror strip"
 src_unpack() {
-	unpack ${A}
+        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}/ncl_build_711/NCL_disk/novell/i586/${PN}-${MY_PV}.i586.rpm
+        rpm_unpack ${WORKDIR}/suse/i586/${PN}-${MY_PV}.i586.rpm
 }
 src_compile() { :; }
 src_install() {
-	for x in cs_CZ de en es en fr hu hu it ja_JP pl pt ru sk_SK zh_CN zh_TW
+	for x in cs_CZ da_DA de en es fi_FI fr hu it ja_JP nb_NB pl pt ru sk_SK zh_CN zh_TW
 	do
 	    if use linguas_${x}
 	    then
@ -45,7 +48,7 @@ src_install() {
 	dosbin ${WORKDIR}/${PN}-${MY_PV}/sbin/*
 	dosed 's:MAP:map:' /usr/sbin/mount.map
 	dopamd ${WORKDIR}/${PN}-${MY_PV}/etc/pam.d/*
-	dopamsecurity / ${WORKDIR}/${PN}-${MY_PV}/etc/security/*.conf
+#	dopamsecurity / ${WORKDIR}/${PN}-${MY_PV}/etc/security/*.conf
 	dopammod ${WORKDIR}/${PN}-${MY_PV}/lib/security/*
 	into /opt/novell
 	dolib.so ${WORKDIR}/${PN}-${MY_PV}/opt/novell/lib/*
--- a/branches/experimental/net-misc/novell-client/Manifest
+++ b/branches/experimental/net-misc/novell-client/Manifest
@ -2,11 +2,12 @@ AUX 80novell-client 164 RMD160 1873d6c60904a7c729f0e7ed9f5a21ac7dd6bbe8 SHA1 240
 MD5 6768ec207bdfb38f47d151aba0105d05 files/80novell-client 164
 RMD160 1873d6c60904a7c729f0e7ed9f5a21ac7dd6bbe8 files/80novell-client 164
 SHA256 dafe1812e1005f625deba9bcc6e60f3623c7ddd633e584c6a4533f7836af691f files/80novell-client 164
-DIST novell-client-1.2-SLE10.tar.gz 13963983 RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 SHA1 14278f74c8226afabc0c602bdc31d4e20acff6b9 SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241
+DIST Novell_Client_SLED10-i386-2007531-CD1.iso 10256384 RMD160 5296935f1b2b5cb0796b685f5c6bacd532f49094 SHA1 96d1df5bce5f0afb0a625084226fb347728fcffb SHA256 3433f30fed62339de2fe12426e4e4e064ec4823073d2271531d7a1009f9cdecf
-EBUILD novell-client-1.2.0_p2-r5.ebuild 1360 RMD160 841287dd6070369291e4514726ebef91bb9ae2de SHA1 30ae29149a32a20a369df77e5c1533d20144b7f8 SHA256 0f63090625119708a7262c95022eed081e8d9ebdc089d65910044c985bcd1aa0
+DIST Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352 RMD160 9b5a8704e518ac7ce1d9d03a890e77a67610cbaa SHA1 0430885f18e803bba63ec264022589c4d934ef03 SHA256 f170dad7e9774d6b55186228f0ed3de512b09255d5d19f54e86964a327b62806
-MD5 0e64d286e758e0042e9353f866864259 novell-client-1.2.0_p2-r5.ebuild 1360
+EBUILD novell-client-2.0.0_p9.ebuild 1616 RMD160 dfb7def8c2d83990744f6f6d06a4319e0a48e949 SHA1 76752952fb27b123c447b6eb6bf7e3bfba6a4647 SHA256 7e3d197964cd2b63157da43ce1db99de233547fe76ab58fc57df65bbe66c0f6e
-RMD160 841287dd6070369291e4514726ebef91bb9ae2de novell-client-1.2.0_p2-r5.ebuild 1360
+MD5 04b6e265bbec80f447b7bc5fc769b5c4 novell-client-2.0.0_p9.ebuild 1616
-SHA256 0f63090625119708a7262c95022eed081e8d9ebdc089d65910044c985bcd1aa0 novell-client-1.2.0_p2-r5.ebuild 1360
+RMD160 dfb7def8c2d83990744f6f6d06a4319e0a48e949 novell-client-2.0.0_p9.ebuild 1616
 SHA256 7e3d197964cd2b63157da43ce1db99de233547fe76ab58fc57df65bbe66c0f6e novell-client-2.0.0_p9.ebuild 1616
 MISC ChangeLog 958 RMD160 de954907256e69be843a7847eed844ed3d93279e SHA1 6d6f1754a280e20fa2c9afc153ba9704739e54dd SHA256 8b868fbb067af62a97bdc323b721cc2a9c127a07671e1a5a557db280e5e193da
 MD5 828e98d064575e4efcfc5b8420957890 ChangeLog 958
 RMD160 de954907256e69be843a7847eed844ed3d93279e ChangeLog 958
@ -15,6 +16,6 @@ MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f4
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 dcdc80c8269e53d3a5ecd72aa4034a06 files/digest-novell-client-1.2.0_p2-r5 277
+MD5 ec699dae9428f5ecd71e3b6fdc0b8405 files/digest-novell-client-2.0.0_p9 626
-RMD160 4767389e6f47ba8fb5b8907a954b9f80ce106b78 files/digest-novell-client-1.2.0_p2-r5 277
+RMD160 a08fca1bf3e2cb25ea5b9fb70f27de63c0e9974a files/digest-novell-client-2.0.0_p9 626
-SHA256 aa21d5b182ad571f4bedf0694cc608f211146d09e0af2bdd1addd6415a2bf0b8 files/digest-novell-client-1.2.0_p2-r5 277
+SHA256 d20395db16f0e2a59b7411ac9ea0817b657bd9804d54da40d459a518a13b5153 files/digest-novell-client-2.0.0_p9 626
--- a/branches/experimental/net-misc/novell-client/files/digest-novell-client-1.2.0_p2-r5
+++ b/branches/experimental/net-misc/novell-client/files/digest-novell-client-1.2.0_p2-r5
@ -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
--- a/branches/experimental/net-misc/novell-client/files/digest-novell-client-2.0.0_p9
+++ b/branches/experimental/net-misc/novell-client/files/digest-novell-client-2.0.0_p9
@ -0,0 +1,6 @@
 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
--- a/branches/experimental/net-misc/novell-client/novell-client-1.2.0_p2-r5.ebuild
+++ b/branches/experimental/net-misc/novell-client/novell-client-1.2.0_p2-r5.ebuild
@ -1,50 +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 Modules for Login Script Procssing"
 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
 	>=app-crypt/novell-nici-2.7.0_p001
 	>=net-misc/novell-client-script-1.2.0_p38
 	>=net-misc/novell-client-config-1.2.0_p12
 	>=sys-auth/novell-nmasclient-3.2.0_p9
 	>=net-fs/novell-novfs-1.2.0_p17
 	>=net-fs/novell-novfsd-1.2.0_p8
 	>=kde-misc/novell-qtgui-1.2.0_p323
 	>=kde-misc/novell-ui-base-1.2.0_p323
 	>=sys-libs/novell-xplatlib-1.0.2_p5
 	>=net-nds/novell-xtier-base-3.1.4_p4
 	>=sys-auth/novell-nmasclient-3.2.0_p9"
 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/i586/${PN}-${MY_PV}.i586.rpm
 }
 src_compile() { :; }
 src_install() {
 	into /opt/novell/ncl
 	dobin ${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/bin/*
 	doman ${WORKDIR}/${PN}-${MY_PV}/opt/novell/man/*/*
 	dodoc ${WORKDIR}/${PN}-${MY_PV}/usr/share/doc/packages/${PN}/*
 	doenvd "${FILESDIR}"/80novell-client
 }
--- a/branches/experimental/net-misc/novell-client/novell-client-2.0.0_p9.ebuild
+++ b/branches/experimental/net-misc/novell-client/novell-client-2.0.0_p9.ebuild
@ -0,0 +1,52 @@
 # 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 Modules for Login Script Procssing"
 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=""
 RDEPEND="virtual/libc
 	>=app-crypt/novell-nici-2.7.3_p5
 	>=net-misc/novell-client-script-2.0.0_p11
 	>=net-misc/novell-client-config-2.0.0_p7
 	>=sys-auth/novell-nmasclient-3.4.0_p10
 	>=net-fs/novell-novfs-2.0.0_p20
 	>=net-fs/novell-novfsd-2.0.0_p20
 	>=kde-misc/novell-qtgui-2.0.425_p2
 	>=kde-misc/novell-ui-base-2.0.421_p3
 	>=sys-libs/novell-xplatlib-1.0.3_p21
 	>=net-nds/novell-xtier-base-3.1.5_p37"
 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/ncl
 	dobin ${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/bin/*
 	doman ${WORKDIR}/${PN}-${MY_PV}/opt/novell/man/*/*
 	dodoc ${WORKDIR}/${PN}-${MY_PV}/usr/share/doc/packages/${PN}/*
 	doenvd "${FILESDIR}"/80novell-client
 }
--- a/branches/experimental/net-nds/novell-xtier-base/Manifest
+++ b/branches/experimental/net-nds/novell-xtier-base/Manifest
@ -1,22 +1,18 @@
 AUX 3.1.4_p4/novell-xregd 650 RMD160 a68a152abd479ac2e4292dcb633b085b0683585d SHA1 ced9d00bb48bdc770b0e2c4ed6da0ac018794bbe SHA256 c708d5e30c1340dedea93a56294efbc66bb419d324c4b3a7ec8586c0d0e75d52
 MD5 a88889973c9ca37bc4e72f2eb5642faa files/3.1.4_p4/novell-xregd 650
 RMD160 a68a152abd479ac2e4292dcb633b085b0683585d files/3.1.4_p4/novell-xregd 650
 SHA256 c708d5e30c1340dedea93a56294efbc66bb419d324c4b3a7ec8586c0d0e75d52 files/3.1.4_p4/novell-xregd 650
 AUX 80novell-xtier 183 RMD160 c342ca807d858c64adf5e2808ab13abcc1524764 SHA1 01987259189cca71e36d1e4ee2f7c507b9ac1b9d SHA256 201cf6aeb826faf7ddd8ba99ff4847a686b23ca9821c0fde9e15c1b20bfb72d3
 MD5 f52d3a51b0482348825586842d5943b9 files/80novell-xtier 183
 RMD160 c342ca807d858c64adf5e2808ab13abcc1524764 files/80novell-xtier 183
 SHA256 201cf6aeb826faf7ddd8ba99ff4847a686b23ca9821c0fde9e15c1b20bfb72d3 files/80novell-xtier 183
-AUX novell-xregd12.initd 650 RMD160 a68a152abd479ac2e4292dcb633b085b0683585d SHA1 ced9d00bb48bdc770b0e2c4ed6da0ac018794bbe SHA256 c708d5e30c1340dedea93a56294efbc66bb419d324c4b3a7ec8586c0d0e75d52
+AUX novell-xregd20.initd 650 RMD160 a68a152abd479ac2e4292dcb633b085b0683585d SHA1 ced9d00bb48bdc770b0e2c4ed6da0ac018794bbe SHA256 c708d5e30c1340dedea93a56294efbc66bb419d324c4b3a7ec8586c0d0e75d52
-MD5 a88889973c9ca37bc4e72f2eb5642faa files/novell-xregd12.initd 650
+MD5 a88889973c9ca37bc4e72f2eb5642faa files/novell-xregd20.initd 650
-RMD160 a68a152abd479ac2e4292dcb633b085b0683585d files/novell-xregd12.initd 650
+RMD160 a68a152abd479ac2e4292dcb633b085b0683585d files/novell-xregd20.initd 650
-SHA256 c708d5e30c1340dedea93a56294efbc66bb419d324c4b3a7ec8586c0d0e75d52 files/novell-xregd12.initd 650
+SHA256 c708d5e30c1340dedea93a56294efbc66bb419d324c4b3a7ec8586c0d0e75d52 files/novell-xregd20.initd 650
 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 binutils-2.16.91.0.5-18.i586.rpm 4265211 RMD160 aa5d41e1cd94e2cdcffa655db49647794066d42d SHA1 b9a2ae1479543d887cb7caa9035759afa2796a8a SHA256 616f3acba1d84e59d243a8d1b1e3fb4814e5cd0f72d121e5beaf1221f4f54e2f
-EBUILD novell-xtier-base-3.1.5_p37.ebuild 6957 RMD160 44e5b32405f875e3adeb6751b7be76052c929ad5 SHA1 601bd2fad072070a1e1f8bfe9a0ace8441ce5f1a SHA256 6646b0cb83972aff3eb94e14d520c232ab63451e57e76528a7a2738051938fc3
+EBUILD novell-xtier-base-3.1.5_p37.ebuild 6971 RMD160 d805fdba4dd0a59c802518e2d090cd2dade627b8 SHA1 3937e25c31a2949bf036325f9b6ac40a47182d6a SHA256 da92a54ec4b0f756541e45ee0a1aeae9a0b22ddbdd9aa19bb8014058758096c5
-MD5 61e1fa44d795ee27b783c860bd8ce2b6 novell-xtier-base-3.1.5_p37.ebuild 6957
+MD5 d4c260501b360a912ee18cca25bbf36a novell-xtier-base-3.1.5_p37.ebuild 6971
-RMD160 44e5b32405f875e3adeb6751b7be76052c929ad5 novell-xtier-base-3.1.5_p37.ebuild 6957
+RMD160 d805fdba4dd0a59c802518e2d090cd2dade627b8 novell-xtier-base-3.1.5_p37.ebuild 6971
-SHA256 6646b0cb83972aff3eb94e14d520c232ab63451e57e76528a7a2738051938fc3 novell-xtier-base-3.1.5_p37.ebuild 6957
+SHA256 da92a54ec4b0f756541e45ee0a1aeae9a0b22ddbdd9aa19bb8014058758096c5 novell-xtier-base-3.1.5_p37.ebuild 6971
 MISC ChangeLog 1081 RMD160 f1a354c6b36df43ea5bb7a92ba9adb46a72059bd SHA1 4359509257247ad19bf5f273f5afd9a24aea317f SHA256 2ad115bc0336b044a38ea2757e362ca33bad42c85b75958f5b34d81c3fafa023
 MD5 a58f8e2df12edea14e514624551ff396 ChangeLog 1081
 RMD160 f1a354c6b36df43ea5bb7a92ba9adb46a72059bd ChangeLog 1081
--- a/branches/experimental/net-nds/novell-xtier-base/novell-xtier-base-3.1.5_p37.ebuild
+++ b/branches/experimental/net-nds/novell-xtier-base/novell-xtier-base-3.1.5_p37.ebuild
@ -25,7 +25,7 @@ RDEPEND="virtual/libc
 	>=sys-libs/ncurses-5.5
 	>=sys-devel/gcc-4.1"
-RESTRICT="nomirror nostrip"
+RESTRICT="nomirror strip"
 src_unpack() {
        cd ${WORKDIR}
@ -55,7 +55,7 @@ src_install() {
 	doenvd "${FILESDIR}"/80novell-xtier
-	newinitd "${FILESDIR}/novell-xregd20.initd novell-xregd
+	newinitd "${FILESDIR}"/novell-xregd20.initd novell-xregd
 }
 pkg_preinst(){
--- a/branches/experimental/net-nds/novell-xtier-core/Manifest
+++ b/branches/experimental/net-nds/novell-xtier-core/Manifest
@ -4,10 +4,10 @@ RMD160 c342ca807d858c64adf5e2808ab13abcc1524764 files/80novell-xtier 183
 SHA256 201cf6aeb826faf7ddd8ba99ff4847a686b23ca9821c0fde9e15c1b20bfb72d3 files/80novell-xtier 183
 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
-EBUILD novell-xtier-core-3.1.5_p37.ebuild 1264 RMD160 ef74beaa6b15d3f5680ed4a4d44d4f3fc9aa19f3 SHA1 9f03bb156f8f19cfae9cb7ae93bca20c232740ca SHA256 c231c1fc9d72f69ba54150c641ce449e64777e5b779973845b62e5691c508b30
+EBUILD novell-xtier-core-3.1.5_p37.ebuild 1265 RMD160 e378f48c053c4252406f1f8b4104857c5a09ca18 SHA1 cc60706945284605cf06036c76b92dac0e783067 SHA256 4596a43fceaf98368fa68736a836a3a295754b50e32043457c30a37477022f43
-MD5 7afa9bd6707446e8cdd59738e9f327f0 novell-xtier-core-3.1.5_p37.ebuild 1264
+MD5 ee3a043aab7e3c5504b1f363af02959e novell-xtier-core-3.1.5_p37.ebuild 1265
-RMD160 ef74beaa6b15d3f5680ed4a4d44d4f3fc9aa19f3 novell-xtier-core-3.1.5_p37.ebuild 1264
+RMD160 e378f48c053c4252406f1f8b4104857c5a09ca18 novell-xtier-core-3.1.5_p37.ebuild 1265
-SHA256 c231c1fc9d72f69ba54150c641ce449e64777e5b779973845b62e5691c508b30 novell-xtier-core-3.1.5_p37.ebuild 1264
+SHA256 4596a43fceaf98368fa68736a836a3a295754b50e32043457c30a37477022f43 novell-xtier-core-3.1.5_p37.ebuild 1265
 MISC ChangeLog 1035 RMD160 8e24f97d712e9ae1f24d9b00a97b2403aaa5eb26 SHA1 119646a8da1a2128b70e7e7a05e9b0258dc9eeb6 SHA256 0cd52723e3a06382eebc6524cd41c0d84d1c8b3579f5c2b51efb094442f990d0
 MD5 d8a1a64701d98e98ab3cc341335dfcac ChangeLog 1035
 RMD160 8e24f97d712e9ae1f24d9b00a97b2403aaa5eb26 ChangeLog 1035
--- a/branches/experimental/net-nds/novell-xtier-core/novell-xtier-core-3.1.5_p37.ebuild
+++ b/branches/experimental/net-nds/novell-xtier-core/novell-xtier-core-3.1.5_p37.ebuild
@ -22,7 +22,7 @@ RDEPEND="virtual/libc
 	>=sys-auth/novell-nmasclient-3.2.0
 	=net-nds/novell-xtier-base-${PV}"
-RESTRICT="fetch nostrip"
+RESTRICT="nomirror strip"
 src_unpack() {
        cd ${WORKDIR}
--- a/branches/experimental/net-nds/novell-xtier-xplat/Manifest
+++ b/branches/experimental/net-nds/novell-xtier-xplat/Manifest
@ -4,10 +4,10 @@ RMD160 c342ca807d858c64adf5e2808ab13abcc1524764 files/80novell-xtier 183
 SHA256 201cf6aeb826faf7ddd8ba99ff4847a686b23ca9821c0fde9e15c1b20bfb72d3 files/80novell-xtier 183
 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
-EBUILD novell-xtier-xplat-3.1.5_p37.ebuild 1258 RMD160 9c1b9afc7e4cc7d66d73a4dd7ef944f8b9a5b651 SHA1 b74254e2512cd1ab4178c93c5bbf99edfb299ae3 SHA256 20c3aa3fc35f7f864b54b4272f1d874a7a596c922875349b76d1abb6f214be3f
+EBUILD novell-xtier-xplat-3.1.5_p37.ebuild 1259 RMD160 1a8975a454529e4de9c0548d3438b9782e1e8592 SHA1 3500bb9d4a2d96182e50233c47aa41dd59403606 SHA256 98ce624dfe6aa707ee8af8d5712a955c86edf7aa47163a66e2f3e987f7e5cb3e
-MD5 436401c66c23be1772638d77b7ad397f novell-xtier-xplat-3.1.5_p37.ebuild 1258
+MD5 f6faf8ac2734b58212b487bd2e5e96cf novell-xtier-xplat-3.1.5_p37.ebuild 1259
-RMD160 9c1b9afc7e4cc7d66d73a4dd7ef944f8b9a5b651 novell-xtier-xplat-3.1.5_p37.ebuild 1258
+RMD160 1a8975a454529e4de9c0548d3438b9782e1e8592 novell-xtier-xplat-3.1.5_p37.ebuild 1259
-SHA256 20c3aa3fc35f7f864b54b4272f1d874a7a596c922875349b76d1abb6f214be3f novell-xtier-xplat-3.1.5_p37.ebuild 1258
+SHA256 98ce624dfe6aa707ee8af8d5712a955c86edf7aa47163a66e2f3e987f7e5cb3e novell-xtier-xplat-3.1.5_p37.ebuild 1259
 MISC ChangeLog 252 RMD160 93cba0172b10e83a0d58e214182fa87e1c88f6b8 SHA1 8eaec543c27d3aae17f9c842adba0732f984d90c SHA256 f19cf3d5afd39e8c85f08dda667ae65f8f46a93c10f5033e9fdca6e9efbee6e0
 MD5 b98c26e18af750ffef7cacd6f2836f6d ChangeLog 252
 RMD160 93cba0172b10e83a0d58e214182fa87e1c88f6b8 ChangeLog 252
--- a/branches/experimental/net-nds/novell-xtier-xplat/novell-xtier-xplat-3.1.5_p37.ebuild
+++ b/branches/experimental/net-nds/novell-xtier-xplat/novell-xtier-xplat-3.1.5_p37.ebuild
@ -22,7 +22,7 @@ RDEPEND="virtual/libc
 	>=sys-auth/novell-nmasclient-3.2.0
 	=net-nds/novell-xtier-core-${PV}"
-RESTRICT="fetch nostrip"
+RESTRICT="nomirror strip"
 src_unpack() {
        cd ${WORKDIR}
--- a/branches/experimental/sys-auth/novell-nmasclient/Manifest
+++ b/branches/experimental/sys-auth/novell-nmasclient/Manifest
@ -9,10 +9,10 @@ EBUILD novell-nmasclient-3.2.0_p9-r3.ebuild 926 RMD160 6f1160c56e08cf33a82d34b75
 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.ebuild 1195 RMD160 d38ea0e85e964e5aede5885ef80fd01d05143876 SHA1 4774d56ac77055d5a307676ddc009e831173545e SHA256 7a2295c9166fe17cff582553ecc8cd4725086e520a774c485d348be246dd777b
+EBUILD novell-nmasclient-3.4.0_p10.ebuild 1193 RMD160 21428961ca74fe8ed9651626afb287c460f433f4 SHA1 a27247b4eeb1a475562d43efcdfaf97a21fe8bc5 SHA256 20a06a755cd39ece1ba4df4d7415ccb636fc04ab40789a9071d6da7cc1a24568
-MD5 1947ca0f1d00134d0be39f6e82d56cf0 novell-nmasclient-3.4.0_p10.ebuild 1195
+MD5 704ec5ba1ed64b87543da64fba5d883c novell-nmasclient-3.4.0_p10.ebuild 1193
-RMD160 d38ea0e85e964e5aede5885ef80fd01d05143876 novell-nmasclient-3.4.0_p10.ebuild 1195
+RMD160 21428961ca74fe8ed9651626afb287c460f433f4 novell-nmasclient-3.4.0_p10.ebuild 1193
-SHA256 7a2295c9166fe17cff582553ecc8cd4725086e520a774c485d348be246dd777b novell-nmasclient-3.4.0_p10.ebuild 1195
+SHA256 20a06a755cd39ece1ba4df4d7415ccb636fc04ab40789a9071d6da7cc1a24568 novell-nmasclient-3.4.0_p10.ebuild 1193
 MISC ChangeLog 769 RMD160 33653a9210df281868929ea7b22a759e573923b7 SHA1 2e6665552b55f973316d52ea8f6e27ed72c9fb4c SHA256 56b1ca49c52345157a24d6e47d8797fcae6de346d08ec5f5ccaba2d230f688ce
 MD5 9c68d56de9ebf397a5924299e3454a11 ChangeLog 769
 RMD160 33653a9210df281868929ea7b22a759e573923b7 ChangeLog 769
--- 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
@ -17,7 +17,7 @@ IUSE="gtk"
 DEPEND=""
 RDEPEND="virtual/libc
 	!net-misc/novell-nmasclient"
-RESTRICT="nomirror nostrip"
+RESTRICT="nomirror strip"
 src_unpack() {
 	cd ${WORKDIR}
--- a/branches/experimental/sys-libs/novell-xplatlib/ChangeLog
+++ b/branches/experimental/sys-libs/novell-xplatlib/ChangeLog
@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  02 Aug 2007; Mario Fetka <mario-fetka@gmx.at>
  -novell-xplatlib-1.0.2_p5-r4.ebuild, +novell-xplatlib-1.0.3_p21.ebuild:
  Update xplatlib
  04 Apr 2007; Mario Fetka <mario-fetka@gmx.at>
  -novell-xplatlib-1.0.2_p5-r2.ebuild, -novell-xplatlib-1.0.2_p5-r3.ebuild:
  Drop old buggy Ebuild
--- a/branches/experimental/sys-libs/novell-xplatlib/Manifest
+++ b/branches/experimental/sys-libs/novell-xplatlib/Manifest
@ -2,19 +2,20 @@ AUX 80novell 175 RMD160 6706cbb05c0079b008b1e35a74518b137c1842c4 SHA1 ce625b90ee
 MD5 1cb295c31c8b72610363844e9ccd5138 files/80novell 175
 RMD160 6706cbb05c0079b008b1e35a74518b137c1842c4 files/80novell 175
 SHA256 1602e6f7016cd33476f398196f1061158d9f8f5e302b83911c92e013d6a7d81c files/80novell 175
-DIST novell-client-1.2-SLE10.tar.gz 13963983 RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 SHA1 14278f74c8226afabc0c602bdc31d4e20acff6b9 SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241
+DIST Novell_Client_SLED10-i386-2007531-CD1.iso 10256384 RMD160 5296935f1b2b5cb0796b685f5c6bacd532f49094 SHA1 96d1df5bce5f0afb0a625084226fb347728fcffb SHA256 3433f30fed62339de2fe12426e4e4e064ec4823073d2271531d7a1009f9cdecf
-EBUILD novell-xplatlib-1.0.2_p5-r4.ebuild 1095 RMD160 0217dfc99047ad5875d870881ecff9143be5f0c2 SHA1 f635bf49380fd77c9ef5c2af14b37bff8823a58a SHA256 a04e502f8bb4f56f7d83318cd9490a87b68fff047879e66ff7a3d436644d569e
+DIST Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352 RMD160 9b5a8704e518ac7ce1d9d03a890e77a67610cbaa SHA1 0430885f18e803bba63ec264022589c4d934ef03 SHA256 f170dad7e9774d6b55186228f0ed3de512b09255d5d19f54e86964a327b62806
-MD5 676b893a5815de214cbd60e10ffa5014 novell-xplatlib-1.0.2_p5-r4.ebuild 1095
+EBUILD novell-xplatlib-1.0.3_p21.ebuild 1402 RMD160 ae3fe75f29dd538be35c5420141bea8be4a92d20 SHA1 e31e4cbf756dbe82af91ac7a82c4c18ce15ce63a SHA256 8f5d928299951536e26bfc2acf88de0724979952e2436e42961537d27d42edf4
-RMD160 0217dfc99047ad5875d870881ecff9143be5f0c2 novell-xplatlib-1.0.2_p5-r4.ebuild 1095
+MD5 d871a14e5f218c5c6f1d587924b01759 novell-xplatlib-1.0.3_p21.ebuild 1402
-SHA256 a04e502f8bb4f56f7d83318cd9490a87b68fff047879e66ff7a3d436644d569e novell-xplatlib-1.0.2_p5-r4.ebuild 1095
+RMD160 ae3fe75f29dd538be35c5420141bea8be4a92d20 novell-xplatlib-1.0.3_p21.ebuild 1402
-MISC ChangeLog 1014 RMD160 3b85c00988ec5c02cac97b43977ea301b4a4ad2e SHA1 dc4311f841d8eb156e3a69b70259a85c0b4bf28d SHA256 e8185ad7523e830cc178875bdaab02c48c89e39927d1231b337abf8c0157f820
+SHA256 8f5d928299951536e26bfc2acf88de0724979952e2436e42961537d27d42edf4 novell-xplatlib-1.0.3_p21.ebuild 1402
-MD5 8ed3b1224dd1dc32f4b49851835ecb9c ChangeLog 1014
+MISC ChangeLog 1155 RMD160 3af67c36aa95516ab1e457a6613f475f4610ff24 SHA1 eb6183cfc0cdd023c62588c64887382246f8bf6d SHA256 5edfa468ac7e05b6c38689228b278ec656dfb95def23ee9a3999f31294914548
-RMD160 3b85c00988ec5c02cac97b43977ea301b4a4ad2e ChangeLog 1014
+MD5 7bc69f1062784d618c4a43361cfba363 ChangeLog 1155
-SHA256 e8185ad7523e830cc178875bdaab02c48c89e39927d1231b337abf8c0157f820 ChangeLog 1014
+RMD160 3af67c36aa95516ab1e457a6613f475f4610ff24 ChangeLog 1155
 SHA256 5edfa468ac7e05b6c38689228b278ec656dfb95def23ee9a3999f31294914548 ChangeLog 1155
 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-xplatlib-1.0.2_p5-r4 277
+MD5 ec699dae9428f5ecd71e3b6fdc0b8405 files/digest-novell-xplatlib-1.0.3_p21 626
-RMD160 4767389e6f47ba8fb5b8907a954b9f80ce106b78 files/digest-novell-xplatlib-1.0.2_p5-r4 277
+RMD160 a08fca1bf3e2cb25ea5b9fb70f27de63c0e9974a files/digest-novell-xplatlib-1.0.3_p21 626
-SHA256 aa21d5b182ad571f4bedf0694cc608f211146d09e0af2bdd1addd6415a2bf0b8 files/digest-novell-xplatlib-1.0.2_p5-r4 277
+SHA256 d20395db16f0e2a59b7411ac9ea0817b657bd9804d54da40d459a518a13b5153 files/digest-novell-xplatlib-1.0.3_p21 626
--- a/branches/experimental/sys-libs/novell-xplatlib/files/digest-novell-xplatlib-1.0.2_p5-r4
+++ b/branches/experimental/sys-libs/novell-xplatlib/files/digest-novell-xplatlib-1.0.2_p5-r4
@ -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
--- a/branches/experimental/sys-libs/novell-xplatlib/files/digest-novell-xplatlib-1.0.3_p21
+++ b/branches/experimental/sys-libs/novell-xplatlib/files/digest-novell-xplatlib-1.0.3_p21
@ -0,0 +1,6 @@
 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
--- a/branches/experimental/sys-libs/novell-xplatlib/novell-xplatlib-1.0.2_p5-r4.ebuild
+++ b/branches/experimental/sys-libs/novell-xplatlib/novell-xplatlib-1.0.2_p5-r4.ebuild
@ -9,7 +9,8 @@ MY_P="${PV/_p*/}"
 DESCRIPTION="Novell XPLAT Libraries"
 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"
+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"
@ -19,15 +20,17 @@ IUSE="gtk"
 DEPEND=""
 RDEPEND="virtual/libc
-	!net-misc/novell-xplatlib"
+	>=net-nds/novell-xtier-xplat-3.1.5_p37"
-RESTRICT="nomirror nostrip"
+RESTRICT="nomirror strip"
 src_unpack() {
-	unpack ${A}
+        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}/ncl_build_711/NCL_disk/novell/i586/${PN}-${MY_PV}.i586.rpm
+        rpm_unpack ${WORKDIR}/suse/i586/${PN}-${MY_PV}.i586.rpm
 }
 src_compile() { :; }