diff --git a/trunk/novell4gentoo/net-misc/novell-client-script/ChangeLog b/trunk/novell4gentoo/net-misc/novell-client-script/ChangeLog
index cc8a8a4..afb1eb3 100644
--- a/trunk/novell4gentoo/net-misc/novell-client-script/ChangeLog
+++ b/trunk/novell4gentoo/net-misc/novell-client-script/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
+  -novell-client-script-2.0.0_p24.ebuild,
+  -novell-client-script-2.0.0_p27.ebuild,
+  -novell-client-script-2.0.0_p29.ebuild,
+  +novell-client-script-2.0.0_p32.ebuild:
+  bump cd version
+
   09 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
   novell-client-script-2.0.0_p30.ebuild:
   correct rpm_unpack
diff --git a/trunk/novell4gentoo/net-misc/novell-client-script/Manifest b/trunk/novell4gentoo/net-misc/novell-client-script/Manifest
index 50f044d..021cbd6 100644
--- a/trunk/novell4gentoo/net-misc/novell-client-script/Manifest
+++ b/trunk/novell4gentoo/net-misc/novell-client-script/Manifest
@@ -1,14 +1,8 @@
-DIST Novell_Client_11.0-i386-20081003-CD1.iso 10033152 RMD160 fadcd5ad983fd7c7dc103c16dcfe9830cf0cd574 SHA1 358e219ad0bda13bbd4835342f24c1b01c5f1775 SHA256 cc84aab8c954037479ed2fa3616b76de17047341d25a2aa6210ac050023e3c00
-DIST Novell_Client_11.0-x86_64-20081003-CD1.iso 10487808 RMD160 8965da596c4e339ff2b5b8d240f91a478f9ca2d5 SHA1 acb2ef899c9c593e6f16b1226ed68f54e12f7214 SHA256 81c3153f9fa435ab7251694873c9b4083b126ebae544bd30527fb8183e690789
 DIST Novell_Client_SLE11-i586-20081218-CD1.iso 8058880 RMD160 4a2a4146e82f0bb6f3f64e47f992fafcd20ce2e4 SHA1 e688c2571d90d5726928ff325e8da274f863d89f SHA256 7c3a6487879ae7846f3859e906e52811321b049667cbb04cb48fac079e6aee2e
 DIST Novell_Client_SLE11-x86_64-20081218-CD1.iso 8388608 RMD160 749d45b32a1317a8e48f5c4346ea235078bab721 SHA1 7bb062942005e1316539e8b97e961c8cbb0a0c2e SHA256 cc0be51b5f3c61bd071751c26c65fd3fc0a5cea495622bbce2e811973fa70d59
-DIST novell-client-2.0-SP1-sle10sp2-i386.iso 10100736 RMD160 dc9313c69a22359c9cdbb2f9105543d11a912381 SHA1 da0cfa59099a4de7d4bdc2a6390d8993c48ee00c SHA256 9c7edfcb67c6ea3a7c67c48568139b8c6dc369b106781320cf117cbda468ae70
-DIST novell-client-2.0-SP1-sle10sp2-x86_64.iso 10971136 RMD160 2cf2b3c0b73b827ab4be0d74f87a9764c807c76b SHA1 91318ad4e643d2f43d47fd9fb234050d9ad62194 SHA256 789dc3bb04d8e7a7714001bce6af6ba8aba769ed32251e9cad53274322261028
-DIST novell-client-2.0-sle10sp1-i386.iso 10866688 RMD160 b478e97de576987b0a3b801965dbddb4fc8d8ce0 SHA1 49d70ed6e7007b7e18468ec0b42bed6ac6b8702f SHA256 a6609aee78e90a5375fd698b571a015b3696d10ff2f11d085e4abf5b404a35d6
-DIST novell-client-2.0-sle10sp1-x86_64.iso 11649024 RMD160 4f3a08e9cfea2b78072ba9114ecf03b44d8da17a SHA1 f1f5c78851a66c963fef02c69d89e86a3ba12d00 SHA256 3b70e2c81ded3916771a22a5c284c0d5ac7b32b8a47207d01350f9f952fd216f
-EBUILD novell-client-script-2.0.0_p24.ebuild 3282 RMD160 b5bf8336dac7d422d4985bf7b3881e3d940f8ca4 SHA1 bb865bc675f0777a5019813caf983152a0364fe3 SHA256 1272b93438e5c45a40618f00e404cf9a8085832054c2e27cf84f4e61176e5caf
-EBUILD novell-client-script-2.0.0_p27.ebuild 3290 RMD160 8eb3de735fa0588112397f7bb9820becf9e032fb SHA1 18b90162b3280a496eca2fa49cde26bfe3c0bb98 SHA256 1e9922ad7083f4325dcc8576671b364fe8fc357620e9aad4ece1a5d120e6c456
-EBUILD novell-client-script-2.0.0_p29.ebuild 3292 RMD160 334cdad4e0e6348214343e147354bd68b1e1bb19 SHA1 69fba86a7cfc508ea18d41a86dcb4b7c6a943025 SHA256 880bed40809f1ec75c55e93836c52fbf7d17d078f1134aa8ea7c0f12cbceb719
+DIST novell-client-2.0-sp2-sle11-i586.iso 8083456 RMD160 2cbd4ff77d1c4894621efed58a92c728ee9adfe1 SHA1 4e61f5421b369a44966c848671c6db20aa478d1d SHA256 9aa9f5cc4cd415476bcfaae278c38947c5809802c36ae40855252d9167189a1f
+DIST novell-client-2.0-sp2-sle11-x86_64.iso 8400896 RMD160 92fe3ecfdb89e28cc3b417d1305e2ea8d79970f5 SHA1 b8241956f966ce55a24572aee25aa4747826f760 SHA256 cfb27415884042ecde16be9f671dc8910d578fb850b57aeb57bc96d26329dee9
 EBUILD novell-client-script-2.0.0_p30.ebuild 3296 RMD160 3bc4724e36174999579a167b809f3284701cd57d SHA1 16edc4828339c7f5dc16ede270ff7e354f5a0b08 SHA256 27782369d9b6ec1e1bb191db5c6c52bd06161b874855b45c5e421e3a023f5e7c
-MISC ChangeLog 1843 RMD160 89276ddc1ca245c5bb89b21ae3579bd8973ecb05 SHA1 dae935b3af4c015d2d1d64cc21ef1074509c0ff2 SHA256 7f85cc8d6a96582890dc332f8132e1bed8b6a999f88e0d6efe0e3a44dce58683
+EBUILD novell-client-script-2.0.0_p32.ebuild 3225 RMD160 caaa8e923ee9269ee0c0ce613b9ecf3fa26bbf44 SHA1 c2781db98a146f98c1574b23a158f9881fb41723 SHA256 b84ce72bb9af1fff4f483b565557c0c92bc5ce518eb8982a6e831f8121c0d0eb
+MISC ChangeLog 2081 RMD160 1288e42dfb28440eaaea7ba83b2fcbd72806eaa3 SHA1 259946741492f171b2c5ca6b7c0b22e170f507ee SHA256 f941cf7f50099dd6e5fa053a3e7e9e87facbaeaaf99f5970ea10d653ba599985
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/net-misc/novell-client-script/novell-client-script-2.0.0_p27.ebuild b/trunk/novell4gentoo/net-misc/novell-client-script/novell-client-script-2.0.0_p27.ebuild
deleted file mode 100644
index 7759c94..0000000
--- a/trunk/novell4gentoo/net-misc/novell-client-script/novell-client-script-2.0.0_p27.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NOVELL_BUILDID="bldJIQnntfA~"
-NOVELL_FILE32="novell-client-2.0-SP1-sle10sp2-i386.iso"
-NOVELL_FILE64="novell-client-2.0-SP1-sle10sp2-x86_64.iso"
-RESTRICT="mirror strip"
-
-inherit novell eutils rpm pam
-
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Novell Modules for Login Script Procssing"
-HOMEPAGE="http://www.novell.com"
-SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32} )
-	amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE64} )"
-
-LICENSE="Novell-NCL"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="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=">=app-arch/p7zip-4.15"
-
-RDEPEND="virtual/libc
-	net-misc/novell-client-env
-	!dev-perl/Unicode-MAP
-	>=sys-libs/novell-xplatlib-1.0.3_p31
-	>=sys-libs/pam-0.99.3"
-
-src_unpack() {
-	cd "${WORKDIR}"
-	if use x86
-	then
-	    narch=i586
-	    nlib=lib
-	    7z x "${DISTDIR}"/${NOVELL_FILE32}
-	elif use amd64
-	then
-	    narch=x86_64
-	    nlib=lib64
-	    7z x "${DISTDIR}"/${NOVELL_FILE64}
-	fi
-	mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
-	cd ${PN}-${MY_PV}
-	rpm_unpack "${WORKDIR}"/suse/${narch}/${PN}-${MY_PV}.${narch}.rpm
-}
-
-src_compile() { :; }
-
-src_install() {
-	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
-		cp "${WORKDIR}"/${PN}-${MY_PV}/usr/share/locale/${x}/LC_MESSAGES/${PN}.mo "${WORKDIR}"/${x}.mo
-		domo "${WORKDIR}"/${x}.mo
-	    fi
-	done
-	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
-	dopammod "${WORKDIR}"/${PN}-${MY_PV}/${nlib}/security/*
-	into /opt/novell
-	dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*
-	doman "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/*/*
-	into /opt/novell/ncl
-	dobin "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/ncl/bin/*
-	dodoc "${WORKDIR}"/${PN}-${MY_PV}/usr/share/doc/packages/${PN}/*
-	insinto /opt/novell/include/ncl_script
-	doins "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/include/ncl_script/*.h
-	dosym map /opt/novell/ncl/bin/nwmap
-}
-
-pkg_prerm() {
-	/opt/novell/ncl/bin/login_ucfg_pam
-}
-
-pkg_postinst() {
-	/opt/novell/ncl/bin/login_cfg_pam
-}
-
-pkg_nofetch() {
-	einfo "This files require you to register at ${HOMEPAGE} (free account)"
-	einfo "Please download following file:"
-	if use x86
-	then
-	    einfo " - ${NOVELL_FILE32}"
-	elif use amd64
-	then
-	    einfo " - ${NOVELL_FILE64}"
-	fi
-	einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID}"
-	einfo "and place it in ${DISTDIR}"
-	einfo ""
-	einfo "To get rid of downloading files from ${HOMEPAGE}"
-	einfo "you can create a file /etc/portage/novell.acc"
-	einfo "containing the novell account infos with following commands"
-	einfo "# echo \"NOVELL_ACCOUNT_USERNAME=\\\"balduin\\\"\" >> /etc/portage/novell.acc"
-	einfo "# echo \"NOVELL_ACCOUNT_PASSWORD=\\\"derfisch\\\"\" >> /etc/portage/novell.acc"
-}
diff --git a/trunk/novell4gentoo/net-misc/novell-client-script/novell-client-script-2.0.0_p29.ebuild b/trunk/novell4gentoo/net-misc/novell-client-script/novell-client-script-2.0.0_p29.ebuild
deleted file mode 100644
index b37d03d..0000000
--- a/trunk/novell4gentoo/net-misc/novell-client-script/novell-client-script-2.0.0_p29.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NOVELL_BUILDID="N848u3D7BjQ~"
-NOVELL_FILE32="Novell_Client_11.0-i386-20081003-CD1.iso"
-NOVELL_FILE64="Novell_Client_11.0-x86_64-20081003-CD1.iso"
-RESTRICT="mirror strip"
-
-inherit novell eutils rpm pam
-
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Novell Modules for Login Script Procssing"
-HOMEPAGE="http://www.novell.com"
-SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32} )
-	amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE64} )"
-
-LICENSE="Novell-NCL"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="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=">=app-arch/p7zip-4.15"
-
-RDEPEND="virtual/libc
-	net-misc/novell-client-env
-	!dev-perl/Unicode-MAP
-	>=sys-libs/novell-xplatlib-1.0.3_p31
-	>=sys-libs/pam-0.99.3"
-
-src_unpack() {
-	cd "${WORKDIR}"
-	if use x86
-	then
-	    narch=i586
-	    nlib=lib
-	    7z x "${DISTDIR}"/${NOVELL_FILE32}
-	elif use amd64
-	then
-	    narch=x86_64
-	    nlib=lib64
-	    7z x "${DISTDIR}"/${NOVELL_FILE64}
-	fi
-	mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
-	cd ${PN}-${MY_PV}
-	rpm_unpack "${WORKDIR}"/suse/${narch}/${PN}-${MY_PV}.${narch}.rpm
-}
-
-src_compile() { :; }
-
-src_install() {
-	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
-		cp "${WORKDIR}"/${PN}-${MY_PV}/usr/share/locale/${x}/LC_MESSAGES/${PN}.mo "${WORKDIR}"/${x}.mo
-		domo "${WORKDIR}"/${x}.mo
-	    fi
-	done
-	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
-	dopammod "${WORKDIR}"/${PN}-${MY_PV}/${nlib}/security/*
-	into /opt/novell
-	dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*
-	doman "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/man/*/*
-	into /opt/novell/ncl
-	dobin "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/ncl/bin/*
-	dodoc "${WORKDIR}"/${PN}-${MY_PV}/usr/share/doc/packages/${PN}/*
-	insinto /opt/novell/include/ncl_script
-	doins "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/include/ncl_script/*.h
-	dosym map /opt/novell/ncl/bin/nwmap
-}
-
-pkg_prerm() {
-	/opt/novell/ncl/bin/login_ucfg_pam
-}
-
-pkg_postinst() {
-	/opt/novell/ncl/bin/login_cfg_pam
-}
-
-pkg_nofetch() {
-	einfo "This files require you to register at ${HOMEPAGE} (free account)"
-	einfo "Please download following file:"
-	if use x86
-	then
-	    einfo " - ${NOVELL_FILE32}"
-	elif use amd64
-	then
-	    einfo " - ${NOVELL_FILE64}"
-	fi
-	einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID}"
-	einfo "and place it in ${DISTDIR}"
-	einfo ""
-	einfo "To get rid of downloading files from ${HOMEPAGE}"
-	einfo "you can create a file /etc/portage/novell.acc"
-	einfo "containing the novell account infos with following commands"
-	einfo "# echo \"NOVELL_ACCOUNT_USERNAME=\\\"balduin\\\"\" >> /etc/portage/novell.acc"
-	einfo "# echo \"NOVELL_ACCOUNT_PASSWORD=\\\"derfisch\\\"\" >> /etc/portage/novell.acc"
-}
diff --git a/trunk/novell4gentoo/net-misc/novell-client-script/novell-client-script-2.0.0_p24.ebuild b/trunk/novell4gentoo/net-misc/novell-client-script/novell-client-script-2.0.0_p32.ebuild
similarity index 79%
rename from trunk/novell4gentoo/net-misc/novell-client-script/novell-client-script-2.0.0_p24.ebuild
rename to trunk/novell4gentoo/net-misc/novell-client-script/novell-client-script-2.0.0_p32.ebuild
index 739586d..4e4f3e2 100644
--- a/trunk/novell4gentoo/net-misc/novell-client-script/novell-client-script-2.0.0_p24.ebuild
+++ b/trunk/novell4gentoo/net-misc/novell-client-script/novell-client-script-2.0.0_p32.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-NOVELL_BUILDID="pvOi9l3qYn4~"
-NOVELL_FILE32="novell-client-2.0-sle10sp1-i386.iso"
-NOVELL_FILE64="novell-client-2.0-sle10sp1-x86_64.iso"
+NOVELL_BUILDID="_xf1ppPR2xA~"
+NOVELL_FILE32="novell-client-2.0-sp2-sle11-i586.iso"
+NOVELL_FILE64="novell-client-2.0-sp2-sle11-x86_64.iso"
 RESTRICT="mirror strip"
 
-inherit novell eutils rpm pam
+inherit novell eutils rpm5 pam
 
 MY_PV="${PV/_p/-}"
 
@@ -19,7 +19,7 @@ SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn
 LICENSE="Novell-NCL"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="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"
+IUSE="linguas_cs linguas_da linguas_de linguas_en linguas_es linguas_fi linguas_fr linguas_hu linguas_it linguas_ja linguas_nb linguas_pl linguas_pt linguas_ru linguas_sk linguas_zh"
 
 DEPEND=">=app-arch/p7zip-4.15"
 
@@ -44,17 +44,17 @@ src_unpack() {
 	fi
 	mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
 	cd ${PN}-${MY_PV}
-	rpm_unpack "${WORKDIR}"/suse/${narch}/${PN}-${MY_PV}.${narch}.rpm
+	rpm5_unpack "${WORKDIR}"/suse/${narch}/${PN}-${MY_PV}.${narch}.rpm
 }
 
 src_compile() { :; }
 
 src_install() {
-	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
+	for x in cs da de en es fi fr hu it ja nb pl pt ru sk zh
 	do
 	    if use linguas_${x}
 	    then
-		cp "${WORKDIR}"/${PN}-${MY_PV}/usr/share/locale/${x}/LC_MESSAGES/${PN}.mo "${WORKDIR}"/${x}.mo
+		cp "${WORKDIR}"/${PN}-${MY_PV}/usr/share/locale/${x}*/LC_MESSAGES/${PN}.mo "${WORKDIR}"/${x}.mo
 		domo "${WORKDIR}"/${x}.mo
 	    fi
 	done