diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog b/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog
index 21a0bad5..318e3c47 100644
--- a/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog
+++ b/trunk/novell4gentoo/app-crypt/novell-nici/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
+  -novell-nici-2.7.2_p001.ebuild, -novell-nici-2.7.3_p12.ebuild,
+  -novell-nici-2.7.4.0.7.ebuild, -novell-nici-2.7.4.3.ebuild,
+  +novell-nici-2.7.4.6-r1.ebuild:
+  Updated to new release drop old
+
   09 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
   novell-nici-2.7.4.6.ebuild:
   correct rpm_unpack
diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/Manifest b/trunk/novell4gentoo/app-crypt/novell-nici/Manifest
index c113a142..fb333980 100644
--- a/trunk/novell4gentoo/app-crypt/novell-nici/Manifest
+++ b/trunk/novell4gentoo/app-crypt/novell-nici/Manifest
@@ -1,17 +1,9 @@
-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 eDir_88_SP3_Linux.iso 108474368 RMD160 91a57fae04ded813e1907eb168b61e15a7745b92 SHA1 0512f75ab992aea0be72c38047dfa4cd7f0c4d45 SHA256 0d35135377e77924f3eab551beea7cd69639cc7843395dd95c4140d91ccda7ad
-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
-DIST ss206_SLAH.tgz 31143941 RMD160 6dbfa508a374c2b5139cc45214e9ad1a17919791 SHA1 98916a96c7e5232a8deb3c2a9919e645f4bb1fdc SHA256 513faf240d85b189a64a1e88f9fdb08ee273c1f44e2bf0b51d9611fc9e4f3838
-EBUILD novell-nici-2.7.2_p001.ebuild 1688 RMD160 9cb6e827fd8f65800e703286cb858db81253fc2a SHA1 2170f431a15f84b90e05f527a3c66ad0ca4362e8 SHA256 1509e990a854d1edf37edb9055fb77a589bc6517b0921f5d77605a8a49cb256b
-EBUILD novell-nici-2.7.3_p12.ebuild 3579 RMD160 ff8c0d7da8da1398b3836df7ddc14f13e2ad4a69 SHA1 1bcdd21d9f21b515bc90fd54d060cca9b89628b3 SHA256 351253f8e39fe023eb67889b4e7245ad03f26cf1a07588054e38c0b37fb2da96
-EBUILD novell-nici-2.7.4.0.7.ebuild 3645 RMD160 c6cf146cd1e2ab11768157124785a31ee20a78c2 SHA1 b41c6409a49454c9cde204870e78c174635da11a SHA256 969b190b31e8fc84d2411d9a246522ad698b8ee39d20186444919e092ff6e40d
-EBUILD novell-nici-2.7.4.3.ebuild 3681 RMD160 459e2e657b9ca1d64284893c14390ca11c26e7d3 SHA1 0b9ac696d4f554c03a821f65c516a75161295764 SHA256 6d728f9d409954e1d772da5cd8437c7fba2594b5e1d4713150f3b0f2f1a98014
+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-nici-2.7.4.6-r1.ebuild 4146 RMD160 15f27ee7bc7e0b596e5b71e930779e4db7db2c9a SHA1 033963c36dba737a5de118b4e12d30dbfdea75b6 SHA256 cddb8bdc85fd5412b4e12c24a057016543d8028a8eb4e7d5188fa9a6bf1211d5
 EBUILD novell-nici-2.7.4.6.ebuild 4156 RMD160 dd4f764c4374880e87b346a9ed39fd1eb7463ae8 SHA1 125d1d47a89f7fd24f0034698fb4b3f92907471c SHA256 f6b65b49e3fe7c1cf0cf0cc14e13d67a65487bfa2775b778f0f52d1fb77e8862
-MISC ChangeLog 3307 RMD160 0363b406dc0a6719954373e967fcb4df86f07a72 SHA1 a1f0282959cb4d24220716231970894ce034875e SHA256 4dc565252cf680e3011429e2c720cf59ffe79ae25bdb5d363110c4d261e1c568
+MISC ChangeLog 3554 RMD160 97c53d7d450272c42e037cba4323d9fc54166d4c SHA1 ccd18a618cfac63acd38ac985f74d08e41cfdb09 SHA256 696a866cf224f19f0d83a58cb43d0838b34d02e991850321acc124408c33b33f
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.2_p001.ebuild b/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.2_p001.ebuild
deleted file mode 100644
index efd7ed6d..00000000
--- a/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.2_p001.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NOVELL_BUILDID="LYlbZMAom6k~"
-NOVELL_FILE32="patchfiles/ss206_SLAH.tgz"
-RESTRICT="mirror strip"
-
-inherit novell eutils rpm
-
-MY_PV="${PV/_p*/}"
-
-DESCRIPTION="Novell NICI U.S./Worldwide (128bit) Crypto"
-HOMEPAGE="http://www.novell.com"
-SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32}"
-
-LICENSE="Novell-eDir-88"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-
-RDEPEND="virtual/libc
-	!net-misc/novell-nici"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${WORKDIR}"/${PN}-${MY_P}
-	cd ${PN}-${MY_P}
-	rpm_unpack "${WORKDIR}"/Linux/eDir87x/nici-${MY_PV}-0.01.i386.rpm
-}
-
-src_compile() { :; }
-
-src_install() {
-	into /opt/novell
-	dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/lib/*
-	doman "${WORKDIR}"/${PN}-${MY_P}/opt/novell/man/*/*
-	into /usr
-	dosym ../../opt/novell/lib/libccs2.so /usr/lib/libccs2.so
-	insinto /etc/opt/novell/
-	doins "${WORKDIR}"/${PN}-${MY_P}/etc/opt/novell/nici.cfg
-	dosym opt/novell/nici.cfg /etc/nici.cfg
-	diropts -m777
-	dodir /var/opt/novell/nici
-	exeinto /var/opt/novell/nici
-	doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/primenici
-	doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/nicimud
-	doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/set_server_mode
-	insinto /var/opt/novell/nici
-	doins "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/nicifk.new
-	doins "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/xmgrcfg.wks
-	dodir /var/novell
-	dosym ../opt/novell/nici /var/novell/nici
-	doenvd "${FILESDIR}"/80novell
-}
-
-pkg_postinst() {
-	/var/opt/novell/nici/primenici
-}
-
diff --git a/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.3_p12.ebuild b/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.3_p12.ebuild
deleted file mode 100644
index 8882d126..00000000
--- a/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.3_p12.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2008 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"
-RESTRICT="mirror strip"
-
-inherit novell eutils rpm multilib
-
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Novell NICI U.S./Worldwide (128bit) Crypto"
-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=""
-
-DEPEND=">=app-arch/p7zip-4.15"
-
-RDEPEND="virtual/libc
-	net-nds/novell-env"
-
-src_unpack() {
-	cd "${WORKDIR}"
-	if use x86
-	then
-	    narch=i586
-	    nlib=lib
-
-	    7z x "${DISTDIR}"/${NOVELL_FILE32}
-	    mkdir -p "${WORKDIR}"/${PN}-${MY_P}
-	    cd ${PN}-${MY_P}
-	    rpm_unpack "${WORKDIR}"/suse/${narch}/nici-${MY_PV}.${narch}.rpm
-	elif use amd64
-	then
-	    narch=x86_64
-	    nlib=lib64
-
-	    7z x "${DISTDIR}"/${NOVELL_FILE64}
-	    mkdir -p "${WORKDIR}"/${PN}-${MY_P}
-	    cd ${PN}-${MY_P}
-	    rpm_unpack "${WORKDIR}"/suse/${narch}/nici64-${MY_PV}.${narch}.rpm
-
-	    if has_multilib_profile
-	    then
-		rpm_unpack "${WORKDIR}"/suse/i586/nici-${MY_PV}.i586.rpm
-	    fi
-
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	into /opt/novell
-
-	if use x86
-	then
-	    dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/${nlib}/*
-	elif has_multilib_profile
-	then
-	    dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/${nlib}/*
-	    ABI="x86" dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/lib/*
-	    ABI="x86" dosym ../../opt/novell/$(get_libdir)/libccs2.so /usr/$(get_libdir)/libccs2.so
-	else
-	    dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/${nlib}/*
-	fi
-
-	doman "${WORKDIR}"/${PN}-${MY_P}/opt/novell/man/*/*
-
-	into /usr
-	dosym ../../opt/novell/$(get_libdir)/libccs2.so /usr/$(get_libdir)/libccs2.so
-
-	insinto /etc/opt/novell/
-	doins "${WORKDIR}"/${PN}-${MY_P}/etc/opt/novell/nici*.cfg
-
-	if use x86 || has_multilib_profile
-	then
-	    dosym opt/novell/nici.cfg /etc/nici.cfg
-	fi
-
-	diropts -m777
-	dodir /var/opt/novell/nici
-	exeinto /var/opt/novell/nici
-	doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/primenici*
-	doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/nicimud*
-	doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/set_server_mode*
-
-	insinto /var/opt/novell/nici
-	doins "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/nicifk.new
-	doins "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/xmgrcfg.wks
-	dodir /var/novell
-	dosym ../opt/novell/nici /var/novell/nici
-}
-
-pkg_postinst() {
-	if use x86
-	then
-	    /var/opt/novell/nici/primenici
-	elif use amd64
-	then
-	    /var/opt/novell/nici/primenici64
-	fi
-}
-
-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/app-crypt/novell-nici/novell-nici-2.7.4.3.ebuild b/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.4.3.ebuild
deleted file mode 100644
index 1cd5eec2..00000000
--- a/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.4.3.ebuild
+++ /dev/null
@@ -1,132 +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 multilib versionator
-
-MY_PVV=$(replace_version_separator 3 '-')
-MY_PV="${MY_PVV/_p/-}"
-
-DESCRIPTION="Novell NICI U.S./Worldwide (128bit) Crypto"
-HOMEPAGE="http://www.novell.com"
-SRC_URI="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
-	net-nds/novell-env"
-
-src_unpack() {
-	cd "${WORKDIR}"
-	if use x86
-	then
-	    narch=i586
-	    nlib=lib
-
-	    7z x "${DISTDIR}"/${NOVELL_FILE32}
-	    mkdir -p "${WORKDIR}"/${PN}-${MY_P}
-	    cd ${PN}-${MY_P}
-	    rpm_unpack "${WORKDIR}"/suse/${narch}/nici-${MY_PV}.${narch}.rpm
-	elif use amd64
-	then
-	    narch=x86_64
-	    nlib=lib64
-
-	    7z x "${DISTDIR}"/${NOVELL_FILE64}
-	    7z x -y "${DISTDIR}"/${NOVELL_FILE32}
-	    mkdir -p "${WORKDIR}"/${PN}-${MY_P}
-	    cd ${PN}-${MY_P}
-	    rpm_unpack "${WORKDIR}"/suse/${narch}/nici64-${MY_PV}.${narch}.rpm
-
-	    if has_multilib_profile
-	    then
-		rpm_unpack "${WORKDIR}"/suse/i586/nici-${MY_PV}.i586.rpm
-	    fi
-
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	into /opt/novell
-
-	if use x86
-	then
-	    dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/${nlib}/*
-	elif has_multilib_profile
-	then
-	    dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/${nlib}/*
-	    ABI="x86" dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/lib/*
-	    ABI="x86" dosym ../../opt/novell/$(get_libdir)/libccs2.so /usr/$(get_libdir)/libccs2.so
-	else
-	    dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/${nlib}/*
-	fi
-
-	doman "${WORKDIR}"/${PN}-${MY_P}/opt/novell/man/*/*
-
-	into /usr
-	dosym ../../opt/novell/$(get_libdir)/libccs2.so /usr/$(get_libdir)/libccs2.so
-
-	insinto /etc/opt/novell/
-	doins "${WORKDIR}"/${PN}-${MY_P}/etc/opt/novell/nici*.cfg
-
-	if use x86 || has_multilib_profile
-	then
-	    dosym opt/novell/nici.cfg /etc/nici.cfg
-	fi
-
-	diropts -m777
-	dodir /var/opt/novell/nici
-	exeinto /var/opt/novell/nici
-	doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/primenici*
-	doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/nicimud*
-	doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/set_server_mode*
-
-	insinto /var/opt/novell/nici
-	doins "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/nicifk.new
-	doins "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/xmgrcfg.wks
-	dodir /var/novell
-	dosym ../opt/novell/nici /var/novell/nici
-}
-
-pkg_postinst() {
-	if use x86
-	then
-	    /var/opt/novell/nici/primenici
-	elif use amd64
-	then
-	    /var/opt/novell/nici/primenici64
-	fi
-}
-
-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/app-crypt/novell-nici/novell-nici-2.7.4.0.7.ebuild b/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.4.6-r1.ebuild
similarity index 55%
rename from trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.4.0.7.ebuild
rename to trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.4.6-r1.ebuild
index e08c96f1..b1cdae26 100644
--- a/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.4.0.7.ebuild
+++ b/trunk/novell4gentoo/app-crypt/novell-nici/novell-nici-2.7.4.6-r1.ebuild
@@ -1,13 +1,16 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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"
+NOVELL_BUILDID="_xf1ppPR2xA~"
+NOVELL_FILE32="novell-client-2.0-sp2-sle11-i586.iso"
+NOVELL_FILE64="novell-client-2.0-sp2-sle11-x86_64.iso"
+NOVELL_BUILDID_1="SRO5fkNxGt8~"
+NOVELL_FILE32_1="eDir_88_SP3_Linux.iso"
 RESTRICT="mirror strip"
+USE_RPMOFFSET_ONLY="1"
 
-inherit novell eutils rpm multilib versionator
+inherit novell eutils rpm5 multilib versionator
 
 MY_PVV=$(replace_version_separator 3 '-')
 MY_PV="${MY_PVV/_p/-}"
@@ -15,12 +18,13 @@ MY_PV="${MY_PVV/_p/-}"
 DESCRIPTION="Novell NICI U.S./Worldwide (128bit) Crypto"
 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} )"
+	amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE64} )
+	multilib? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID_1}/${NOVELL_FILE32_1} )"
 
 LICENSE="Novell-NCL"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE=""
+IUSE="multilib"
 
 DEPEND=">=app-arch/p7zip-4.15"
 
@@ -35,22 +39,28 @@ src_unpack() {
 	    nlib=lib
 
 	    7z x "${DISTDIR}"/${NOVELL_FILE32}
-	    mkdir -p "${WORKDIR}"/${PN}-${MY_P}
-	    cd ${PN}-${MY_P}
-	    rpm_unpack "${WORKDIR}"/suse/${narch}/nici-${MY_PV}.${narch}.rpm
+	    mkdir -p "${WORKDIR}"/${PN}-${PV}
+	    cd ${PN}-${PV}
+	    rpm5_unpack "${WORKDIR}"/suse/${narch}/nici-${MY_PV}.${narch}.rpm
 	elif use amd64
 	then
 	    narch=x86_64
 	    nlib=lib64
 
 	    7z x "${DISTDIR}"/${NOVELL_FILE64}
-	    mkdir -p "${WORKDIR}"/${PN}-${MY_P}
-	    cd ${PN}-${MY_P}
-	    rpm_unpack "${WORKDIR}"/suse/${narch}/nici64-${MY_PV}.${narch}.rpm
 
 	    if has_multilib_profile
 	    then
-		rpm_unpack "${WORKDIR}"/suse/i586/nici-${MY_PV}.i586.rpm
+		7z x -y "${DISTDIR}"/${NOVELL_FILE32_1}
+	    fi
+
+	    mkdir -p "${WORKDIR}"/${PN}-${PV}
+	    cd ${PN}-${PV}
+	    rpm5_unpack "${WORKDIR}"/suse/${narch}/nici64-${MY_PV}.${narch}.rpm
+
+	    if has_multilib_profile
+	    then
+		rpm5_unpack "${WORKDIR}"/setup/nici-2.7.4-0.02.i386.rpm
 	    fi
 
 	fi
@@ -63,41 +73,48 @@ src_install() {
 
 	if use x86
 	then
-	    dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/${nlib}/*
+	    dolib.so "${WORKDIR}"/${PN}-${PV}/opt/novell/${nlib}/*
 	elif has_multilib_profile
 	then
-	    dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/${nlib}/*
-	    ABI="x86" dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/lib/*
+	    dolib.so "${WORKDIR}"/${PN}-${PV}/opt/novell/${nlib}/*
+	    ABI="x86" dolib.so "${WORKDIR}"/${PN}-${PV}/opt/novell/lib/*
 	    ABI="x86" dosym ../../opt/novell/$(get_libdir)/libccs2.so /usr/$(get_libdir)/libccs2.so
 	else
-	    dolib.so "${WORKDIR}"/${PN}-${MY_P}/opt/novell/${nlib}/*
+	    dolib.so "${WORKDIR}"/${PN}-${PV}/opt/novell/${nlib}/*
 	fi
 
-	doman "${WORKDIR}"/${PN}-${MY_P}/opt/novell/man/*/*
+	doman "${WORKDIR}"/${PN}-${PV}/opt/novell/man/*/*
 
 	into /usr
 	dosym ../../opt/novell/$(get_libdir)/libccs2.so /usr/$(get_libdir)/libccs2.so
 
 	insinto /etc/opt/novell/
-	doins "${WORKDIR}"/${PN}-${MY_P}/etc/opt/novell/nici*.cfg
+	doins "${WORKDIR}"/${PN}-${PV}/etc/opt/novell/nici*.cfg
 
 	if use x86 || has_multilib_profile
 	then
 	    dosym opt/novell/nici.cfg /etc/nici.cfg
+#	    ABI="x86" dosed "s$/opt/novell/lib$/opt/novell/$(get_libdir)$" /etc/opt/novell/nici.cfg
+	fi
+
+	if has_multilib_profile
+	then
+	    dosed "s|/opt/novell/lib|/opt/novell/lib32|" /etc/opt/novell/nici.cfg
 	fi
 
 	diropts -m777
 	dodir /var/opt/novell/nici
 	exeinto /var/opt/novell/nici
-	doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/primenici*
-	doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/nicimud*
-	doexe "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/set_server_mode*
+	doexe "${WORKDIR}"/${PN}-${PV}/var/opt/novell/nici/primenici*
+	doexe "${WORKDIR}"/${PN}-${PV}/var/opt/novell/nici/nicimud*
+	doexe "${WORKDIR}"/${PN}-${PV}/var/opt/novell/nici/set_server_mode*
 
 	insinto /var/opt/novell/nici
-	doins "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/nicifk.new
-	doins "${WORKDIR}"/${PN}-${MY_P}/var/opt/novell/nici/xmgrcfg.wks
+	doins "${WORKDIR}"/${PN}-${PV}/var/opt/novell/nici/nicifk.new
+	doins "${WORKDIR}"/${PN}-${PV}/var/opt/novell/nici/xmgrcfg.wks
 	dodir /var/novell
 	dosym ../opt/novell/nici /var/novell/nici
+
 }
 
 pkg_postinst() {