diff --git a/trunk/novell4gentoo/sys-auth/novell-nmasclient/ChangeLog b/trunk/novell4gentoo/sys-auth/novell-nmasclient/ChangeLog
index 077d1437..036d11d2 100644
--- a/trunk/novell4gentoo/sys-auth/novell-nmasclient/ChangeLog
+++ b/trunk/novell4gentoo/sys-auth/novell-nmasclient/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  +novell-nmasclient-3.4.0_p21-r2.ebuild:
+  Bump
+
   10 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
   -novell-nmasclient-3.4.0_p17.ebuild, -novell-nmasclient-3.4.0_p20.ebuild,
   -novell-nmasclient-3.4.0_p20-r1.ebuild,
diff --git a/trunk/novell4gentoo/sys-auth/novell-nmasclient/Manifest b/trunk/novell4gentoo/sys-auth/novell-nmasclient/Manifest
index a953029a..15f43dc4 100644
--- a/trunk/novell4gentoo/sys-auth/novell-nmasclient/Manifest
+++ b/trunk/novell4gentoo/sys-auth/novell-nmasclient/Manifest
@@ -4,7 +4,10 @@ DIST Novell_Client_SLE11-i586-20081218-CD1.iso 8058880 RMD160 4a2a4146e82f0bb6f3
 DIST Novell_Client_SLE11-x86_64-20081218-CD1.iso 8388608 RMD160 749d45b32a1317a8e48f5c4346ea235078bab721 SHA1 7bb062942005e1316539e8b97e961c8cbb0a0c2e SHA256 cc0be51b5f3c61bd071751c26c65fd3fc0a5cea495622bbce2e811973fa70d59
 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
+DIST novell-client-3.0-sled11-i586-CD1.iso 7987200 RMD160 b98b4cb79ddfbd7fe6dc3442288ef71fac6baef3 SHA1 a15b18e570d32e3c0b3ae8f7cdb51c233214ee45 SHA256 59dba7ed244811c645b52c4b8476c725b771064e1ff43c33f37001f01c7584ed
+DIST novell-client-3.0-sled11-x86_64-CD1.iso 7968768 RMD160 9262874512d6c2ac7ae63b2ed108d097194741b5 SHA1 ef1987e0f71f4775d2e3b5d342fdeacd4f9ca3db SHA256 3223dc757e1788222d95c1b3353b9b156072d1b3a027b6fa4b71007b6aae4a05
 EBUILD novell-nmasclient-3.4.0_p21-r1.ebuild 3100 RMD160 28cd5755b40085f1080d14a22637eac3788adfc0 SHA1 601db4a996ab2277d7b69ebf8567236200e8f8c9 SHA256 9459cf7d1c79aaf3d9894816702ec0b453ce1ec34e8c35323ce9a40e54ef76ca
+EBUILD novell-nmasclient-3.4.0_p21-r2.ebuild 3102 RMD160 e401efffe5e0b2569fa494fe3b8fb03b5a9f3627 SHA1 3b9e149c1b2e2c1c923ce1ba61194751b6495e1c SHA256 c8e7450c2295266f4efe19ba8698f639c506a53bb3c3b39e6f59a28702dd8c2e
 EBUILD novell-nmasclient-3.4.0_p21.ebuild 3109 RMD160 db8eaa6fa016ff0606e5fc79978b85e22d864af0 SHA1 18092d4c881cd4db9e8849cb1a457a110fcbea1d SHA256 89f8779aa96d87e719e01f7f11cdf9c0e62018c4593fd9838612102c96eacab7
-MISC ChangeLog 1576 RMD160 b636c1d690a0d5d7ba279b00677930d6c4b6d9d1 SHA1 8f0932245b2be16adb44d5cd89fda737e65d3e2f SHA256 33897e86e8582b9cf3bf4ef992275d38f1fe03828becb441ec6210320b020d39
+MISC ChangeLog 1677 RMD160 90765fa572ae5de51a00430525404e46e2b08622 SHA1 24cf2f44de0e157d92306780802bfb6dce84a29b SHA256 ec4e3de895fa0daad36c8561d00f3d492b5a2a7b55ee4cdf1d3ff3a5a6f6f2c6
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/sys-auth/novell-nmasclient/novell-nmasclient-3.4.0_p21-r2.ebuild b/trunk/novell4gentoo/sys-auth/novell-nmasclient/novell-nmasclient-3.4.0_p21-r2.ebuild
new file mode 100644
index 00000000..51f6a63b
--- /dev/null
+++ b/trunk/novell4gentoo/sys-auth/novell-nmasclient/novell-nmasclient-3.4.0_p21-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+NOVELL_BUILDID="_xf1ppPR2xA~"
+NOVELL_FILE32="novell-client-3.0-sled11-i586-CD1.iso"
+NOVELL_FILE64="novell-client-3.0-sled11-x86_64-CD1.iso"
+RESTRICT="mirror strip"
+
+inherit novell eutils rpm5 multilib
+
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Novell NMAS Client for Linux"
+HOMEPAGE="http://www.novell.com"
+SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32} )
+	multilib? ( 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=""
+
+DEPEND=">=app-arch/p7zip-4.15"
+
+RDEPEND="virtual/libc
+	>=app-crypt/novell-nici-2.7.4.6-r1"
+
+src_unpack() {
+	cd "${WORKDIR}"
+	if use x86
+	then
+	    narch=i586
+	    nlib=lib
+
+	    7z x "${DISTDIR}"/${NOVELL_FILE32}
+	    mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
+	    cd ${PN}-${MY_PV}
+	    rpm5_unpack "${WORKDIR}"/suse/${narch}/${PN}-${MY_PV}.${narch}.rpm
+	elif use amd64
+	then
+	    narch=x86_64
+	    nlib=lib64
+
+	    if has_multilib_profile
+	    then
+		7z x "${DISTDIR}"/${NOVELL_FILE32}
+	    fi
+	    7z x -y "${DISTDIR}"/${NOVELL_FILE64}
+	    mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
+	    cd ${PN}-${MY_PV}
+	    rpm5_unpack "${WORKDIR}"/suse/${narch}/${PN}-${MY_PV}.${narch}.rpm
+
+	    if has_multilib_profile
+	    then
+		rpm5_unpack "${WORKDIR}"/suse/i586/${PN}-${MY_PV}.i586.rpm
+	    fi
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	into /opt/novell/nmas/client/
+	dobin "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/nmas/client/bin/*
+
+	if use x86
+	then
+	    dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/nmas/client/${nlib}/*
+	elif has_multilib_profile
+	then
+	    dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/nmas/client/${nlib}/*
+	    ABI="x86" dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/nmas/client/lib/*
+	else
+	    dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/nmas/client/${nlib}/*
+	fi
+
+	if use x86
+	then
+	    doenvd "${FILESDIR}"/80novell-nmasclient
+	elif use amd64
+	then
+	    doenvd "${FILESDIR}"/80novell-nmasclient64
+	fi
+}
+
+pkg_nofetch() {
+	einfo "This files require you to register at ${HOMEPAGE} (free account)"
+	einfo "Please download following file(s):"
+	if use x86
+	then
+	    einfo " - ${NOVELL_FILE32}"
+	elif use amd64
+	then
+	    einfo " - ${NOVELL_FILE64}"
+	    if use multilib
+	    then
+		einfo " - ${NOVELL_FILE32}"
+	    fi
+	fi
+	einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID}"
+	einfo "and place them 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"
+}