diff --git a/trunk/novell4gentoo/app-crypt/novell-npkit/ChangeLog b/trunk/novell4gentoo/app-crypt/novell-npkit/ChangeLog
index abd0b9fb..27c16a6d 100644
--- a/trunk/novell4gentoo/app-crypt/novell-npkit/ChangeLog
+++ b/trunk/novell4gentoo/app-crypt/novell-npkit/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  novell-npkit-3.3.3.20090416_p0934.ebuild,
+  novell-npkit-3.3.3.20090416_p0937.ebuild:
+  add multilib support
+
   12 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
   +novell-npkit-3.3.3.20090416_p0934.ebuild,
   +novell-npkit-3.3.3.20090416_p0937.ebuild:
diff --git a/trunk/novell4gentoo/app-crypt/novell-npkit/Manifest b/trunk/novell4gentoo/app-crypt/novell-npkit/Manifest
index 72772ebd..8f59730e 100644
--- a/trunk/novell4gentoo/app-crypt/novell-npkit/Manifest
+++ b/trunk/novell4gentoo/app-crypt/novell-npkit/Manifest
@@ -5,7 +5,7 @@ DIST ss206_SLAH.tgz 31143941 RMD160 6dbfa508a374c2b5139cc45214e9ad1a17919791 SHA
 EBUILD novell-npkit-3.3.0.20070815_p1823-r1.ebuild 1687 RMD160 272a49c40ca90a718ace3debc571a47059cfa08d SHA1 6f92dae865da45bb25d7d83fe3f8b6fda3237d8e SHA256 74b6e497380ed769406a1aea45c1b0dcbbd54b1142e33120f29b309845f78f0b
 EBUILD novell-npkit-3.3.0.20070815_p1823-r2.ebuild 1723 RMD160 a00e7fd6e09c327501fe7775837379844cc97e14 SHA1 eb3651d6e192b4d6523129c9ac3c35e498d745b7 SHA256 5006a675a39bf68d77e6b79b0760a6c7b3404f8308178ad18c57a010ad920593
 EBUILD novell-npkit-3.3.0.20070815_p1823-r3.ebuild 1832 RMD160 525cb1ffa0bf319fee9d629226343373daa47edf SHA1 4667c687d0483b330a2b4bc0fba2d5fa471c50ef SHA256 7f858ea6b7e53747e97eaa0c3892dc1893ecdf5a79bec4e6a7ad457ad5529bc0
-EBUILD novell-npkit-3.3.3.20090416_p0934.ebuild 2363 RMD160 25d0c4b346a96712b4cf078e0e30b98a1860c6c6 SHA1 9d245d40ec8fff047208f5290dc6bff89165086c SHA256 92ed7975c19a6439916f873420ce93b72a4dbe641a4c182aa514d095ad8c2c6a
-EBUILD novell-npkit-3.3.3.20090416_p0937.ebuild 2365 RMD160 ecc793f5326fe8a2f3e22c758b02574a30e9216e SHA1 8dfa875af37a67659390807d3db898488097ce0d SHA256 56daaf5b5356ce16c32ec2139f5e607453924a67f1a0ab0f4087e26d3844581e
-MISC ChangeLog 2016 RMD160 0652048549257bd361c8c3ebd762e1b35a165932 SHA1 26796dbe799b76dce62f5dbf829bbf0eef942e26 SHA256 0850f23c5288a3aee33c7dca5481d59f93c8b1fa33ef090f72127e3f8508918b
+EBUILD novell-npkit-3.3.3.20090416_p0934.ebuild 2941 RMD160 796c3dbe625d94739411421f5b5af00f6c239b00 SHA1 4bdeb3f6a1dd9cec6fa7a2ebd322b653316bb981 SHA256 350c2535ac252600e6b8ab0cef39eeedc0d77fc62a9e89cd4c2060a9bdbeefca
+EBUILD novell-npkit-3.3.3.20090416_p0937.ebuild 2941 RMD160 796c3dbe625d94739411421f5b5af00f6c239b00 SHA1 4bdeb3f6a1dd9cec6fa7a2ebd322b653316bb981 SHA256 350c2535ac252600e6b8ab0cef39eeedc0d77fc62a9e89cd4c2060a9bdbeefca
+MISC ChangeLog 2179 RMD160 3ad6c77ad2c1fd0fbfaa9432b8bc6097682dab88 SHA1 01e0fe8e5deed51bf3c4f2a63bb7a75265b5f67a SHA256 abc8194f949912538b50261c5305d4b5bf333f96c4b79970e3485e4babd3e8b4
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0934.ebuild b/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0934.ebuild
index 7315d7df..8bbb6a2b 100644
--- a/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0934.ebuild
+++ b/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0934.ebuild
@@ -6,7 +6,7 @@ EAPI="1"
 
 NOVELL_BUILDID32="63eV_vS9dv4~"
 NOVELL_FILE32="eDirectory_88SP5_Linux_i586.tar.gz"
-NOVELL_BUILDID64="ffdH4AJgrFs~"                   
+NOVELL_BUILDID64="ffdH4AJgrFs~"
 NOVELL_FILE64="eDirectory_88SP5_Linux_x86_64.tar.gz"
 RESTRICT="mirror strip"
 
@@ -18,12 +18,13 @@ MY_PV="${MY_PVV/_p/_}"
 DESCRIPTION="Novell Public Key Infrastructure Toolbox"
 HOMEPAGE="http://www.novell.com"
 SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID32}/${NOVELL_FILE32} )
-        amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID64}/${NOVELL_FILE64} )"
+	multilib? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID32}/${NOVELL_FILE32} )
+	amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID64}/${NOVELL_FILE64} )"
 
 LICENSE="Novell-eDir-88"
 SLOT="8.8"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="~amd64"
+IUSE="multilib"
 
 DEPEND="!app-crypt/novell-npkit:0
 	!app-crypt/novell-npkit:8.7"
@@ -37,37 +38,60 @@ RDEPEND="virtual/libc
 	net-nds/novell-nldapsdk:8.8"
 
 src_unpack() {
-        cd "${WORKDIR}"
-        unpack  ${A}
-        if use x86
-        then
-            narch=i586
-            nlib=lib
-            ndir=Linux
-        elif use amd64
-        then
-            narch=x86_64
-            nlib=lib64
-            ndir=Linux64
-        fi
-        mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
-        cd ${PN}-${MY_PV}
-        rpm_unpack ../work/eDirectory/setup/${PN}-${MY_PV}.${narch}.rpm
+	cd "${WORKDIR}"
+	unpack  ${A}
+	if use x86
+	then
+	    narch=i386
+	    nlib=lib
+	    ndir=Linux
+	elif use amd64
+	then
+	    narch=x86_64
+	    nlib=lib64
+	    ndir=Linux64
+	fi
+	mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
+	cd ${PN}-${MY_PV}
+	if has_multilib_profile
+	then
+	    march=i386
+	    mlib=lib
+	    mdir=Linux
+	    rpm_unpack ../work/eDirectory/setup/${PN}-${MY_PV/_*/_0934}.${march}.rpm
+	fi
+	rpm_unpack ../work/eDirectory/setup/${PN}-${MY_PV}.${narch}.rpm
 }
 
 src_compile() { :; }
 
 src_install() {
-        into /opt/novell
-        dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*
+	into /opt/novell
+	dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*
+	if has_multilib_profile
+	then
+	    ABI="x86" dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${mlib}/*.*
+	fi
 }
 
 pkg_nofetch() {
 	einfo "This files require you to register at ${HOMEPAGE} (free account)"
-	einfo "Please download following file:"
-	einfo " - ${NOVELL_FILE32}"
-	einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID}"
-	einfo "and place it in ${DISTDIR}"
+	einfo "Please download following file(s):"
+	if use x86
+	then
+	    einfo " - ${NOVELL_FILE32}"
+	    einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID32}"
+	elif use amd64
+	then
+	    einfo " - ${NOVELL_FILE64}"
+	    einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID64}"
+	    if use multilib
+	    then
+		einfo " - ${NOVELL_FILE32}"
+		einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID32}"
+	    fi
+	fi
+	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"
@@ -75,4 +99,3 @@ pkg_nofetch() {
 	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/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0937.ebuild b/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0937.ebuild
index 73a5b336..8bbb6a2b 100644
--- a/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0937.ebuild
+++ b/trunk/novell4gentoo/app-crypt/novell-npkit/novell-npkit-3.3.3.20090416_p0937.ebuild
@@ -6,7 +6,7 @@ EAPI="1"
 
 NOVELL_BUILDID32="63eV_vS9dv4~"
 NOVELL_FILE32="eDirectory_88SP5_Linux_i586.tar.gz"
-NOVELL_BUILDID64="ffdH4AJgrFs~"                   
+NOVELL_BUILDID64="ffdH4AJgrFs~"
 NOVELL_FILE64="eDirectory_88SP5_Linux_x86_64.tar.gz"
 RESTRICT="mirror strip"
 
@@ -18,12 +18,13 @@ MY_PV="${MY_PVV/_p/_}"
 DESCRIPTION="Novell Public Key Infrastructure Toolbox"
 HOMEPAGE="http://www.novell.com"
 SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID32}/${NOVELL_FILE32} )
-        amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID64}/${NOVELL_FILE64} )"
+	multilib? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID32}/${NOVELL_FILE32} )
+	amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID64}/${NOVELL_FILE64} )"
 
 LICENSE="Novell-eDir-88"
 SLOT="8.8"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="multilib"
 
 DEPEND="!app-crypt/novell-npkit:0
 	!app-crypt/novell-npkit:8.7"
@@ -37,37 +38,60 @@ RDEPEND="virtual/libc
 	net-nds/novell-nldapsdk:8.8"
 
 src_unpack() {
-        cd "${WORKDIR}"
-        unpack  ${A}
-        if use x86
-        then
-            narch=i586
-            nlib=lib
-            ndir=Linux
-        elif use amd64
-        then
-            narch=x86_64
-            nlib=lib64
-            ndir=Linux64
-        fi
-        mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
-        cd ${PN}-${MY_PV}
-        rpm_unpack ../work/eDirectory/setup/${PN}-${MY_PV}.${narch}.rpm
+	cd "${WORKDIR}"
+	unpack  ${A}
+	if use x86
+	then
+	    narch=i386
+	    nlib=lib
+	    ndir=Linux
+	elif use amd64
+	then
+	    narch=x86_64
+	    nlib=lib64
+	    ndir=Linux64
+	fi
+	mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
+	cd ${PN}-${MY_PV}
+	if has_multilib_profile
+	then
+	    march=i386
+	    mlib=lib
+	    mdir=Linux
+	    rpm_unpack ../work/eDirectory/setup/${PN}-${MY_PV/_*/_0934}.${march}.rpm
+	fi
+	rpm_unpack ../work/eDirectory/setup/${PN}-${MY_PV}.${narch}.rpm
 }
 
 src_compile() { :; }
 
 src_install() {
-        into /opt/novell
-        dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*
+	into /opt/novell
+	dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${nlib}/*
+	if has_multilib_profile
+	then
+	    ABI="x86" dolib "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/${mlib}/*.*
+	fi
 }
 
 pkg_nofetch() {
 	einfo "This files require you to register at ${HOMEPAGE} (free account)"
-	einfo "Please download following file:"
-	einfo " - ${NOVELL_FILE32}"
-	einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID}"
-	einfo "and place it in ${DISTDIR}"
+	einfo "Please download following file(s):"
+	if use x86
+	then
+	    einfo " - ${NOVELL_FILE32}"
+	    einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID32}"
+	elif use amd64
+	then
+	    einfo " - ${NOVELL_FILE64}"
+	    einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID64}"
+	    if use multilib
+	    then
+		einfo " - ${NOVELL_FILE32}"
+		einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID32}"
+	    fi
+	fi
+	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"
@@ -75,4 +99,3 @@ pkg_nofetch() {
 	einfo "# echo \"NOVELL_ACCOUNT_USERNAME=\\\"balduin\\\"\" >> /etc/portage/novell.acc"
 	einfo "# echo \"NOVELL_ACCOUNT_PASSWORD=\\\"derfisch\\\"\" >> /etc/portage/novell.acc"
 }
-