diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/Manifest b/trunk/novell4gentoo/net-nds/novell-xtier-base/Manifest
index 90bace0f..a01e69cf 100644
--- a/trunk/novell4gentoo/net-nds/novell-xtier-base/Manifest
+++ b/trunk/novell4gentoo/net-nds/novell-xtier-base/Manifest
@@ -1,16 +1,16 @@
-AUX i586/libbfd-2.18.50.20080409-11.1.so 2396184 RMD160 9fc7c6bc0828d83e145fba3c22a8c8fe88ac6a70 SHA1 7cfd608d8181d2b5faabd02d7236f0859107adb7 SHA256 20d931cbafe7241c09bb6e2c7956c8dd915c63cb572930c0dfba370785fb5386
 AUX novell-xregd20.initd 650 RMD160 a68a152abd479ac2e4292dcb633b085b0683585d SHA1 ced9d00bb48bdc770b0e2c4ed6da0ac018794bbe SHA256 c708d5e30c1340dedea93a56294efbc66bb419d324c4b3a7ec8586c0d0e75d52
-AUX x86_64/libbfd-2.18.50.20080409-11.1.so 2670672 RMD160 cc830682e18221366fb98cb76a04e780fae49b1d SHA1 e23129c2972e7efcd5dcefc2cb91a887a2abb2d2 SHA256 8e37c3cfcdd2713b0d55195a8725a7bf226c4fb71c2d56a89a2399a5fcb6b100
 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 binutils-2.16.91.0.5-18.i586.rpm 4265211 RMD160 aa5d41e1cd94e2cdcffa655db49647794066d42d SHA1 b9a2ae1479543d887cb7caa9035759afa2796a8a SHA256 616f3acba1d84e59d243a8d1b1e3fb4814e5cd0f72d121e5beaf1221f4f54e2f
 DIST binutils-2.16.91.0.5-18.x86_64.rpm 4370737 RMD160 f56f6d9ec337f1a125e2e92bab1351b3666931e9 SHA1 f92b793d2ea11ff5a0e2b6994fa22132497eb5b7 SHA256 c8d33d41b99378e0cb17b1d484395499fb2f6ca5f3062a5d5e80c73d69962d2e
+DIST binutils-2.18.50.20080409-11.1.i586.rpm 2881787 RMD160 ce45948d6cb20eb12318442b18fbf0304e6448b0 SHA1 4b177ed76f6f64b9574c36e665cc4264b4a1cc07 SHA256 94062af06e7f3f07921a4ea430fd953cacc2c7ba556dd4481ed1583a1604d82f
+DIST binutils-2.18.50.20080409-11.1.x86_64.rpm 2920759 RMD160 36a7b490466206b1ac6d0e37806473dae191b747 SHA1 2baccf5e17849f1c2a5951c21df81064370ad441 SHA256 fd192731ef7a85dd5209e19d9da8944f0c116b43bc7cfd2c015b5f6cc2238953
 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-xtier-base-3.1.5_p46.ebuild 7574 RMD160 1bcb33ddee3a12fc84e74947bbfbeb80265713f4 SHA1 05b63e4bb82acebeb185426c0ab1c3d8bb296288 SHA256 289f05b14c587d110675ba34a228f6a3839db6c65b3391e400b1a969051a5365
 EBUILD novell-xtier-base-3.1.6.0.8.ebuild 7640 RMD160 822529a90d48cbe36055b01ab3470497cd4078bb SHA1 0a6ad7b0be0d85559bc3ac71cb15a62132920acc SHA256 46bc360afa53e3d1696c47bb71229e0947d355cff90eb5592dcf98a167071191
-EBUILD novell-xtier-base-3.1.6.8.ebuild 7653 RMD160 08a90f4a2c5f5d03ce6429182917153ed1bbbeab SHA1 280af88843ee77e3d0b7265cdf126ba4e34d559c SHA256 08c0ca2953582f5f119e0e6829ab6770b67a3307abb4021ed900bbb5f4f43faa
+EBUILD novell-xtier-base-3.1.6.8.ebuild 7666 RMD160 cc1b7516c3dc1acf69062b6c044c18742383f8a9 SHA1 e07459c18ca4b1714b5687aa51a7d6843ba85097 SHA256 a9eb238c359b089fae50a88be2918c9e706f441821c813d6b869db87e155e5e7
 MISC ChangeLog 1854 RMD160 622b2d6f6f1fc84e798f9c1f651d4f9d2e8d2b10 SHA1 6ed737a8393eb115efafebc1c53b5fff3abee0b2 SHA256 c305f754c02ea62bf659055bbdb8f380f4c3643423f3fe638d6149c7628490d4
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/files/i586/libbfd-2.18.50.20080409-11.1.so b/trunk/novell4gentoo/net-nds/novell-xtier-base/files/i586/libbfd-2.18.50.20080409-11.1.so
deleted file mode 100644
index de426f13..00000000
Binary files a/trunk/novell4gentoo/net-nds/novell-xtier-base/files/i586/libbfd-2.18.50.20080409-11.1.so and /dev/null differ
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/files/x86_64/libbfd-2.18.50.20080409-11.1.so b/trunk/novell4gentoo/net-nds/novell-xtier-base/files/x86_64/libbfd-2.18.50.20080409-11.1.so
deleted file mode 100644
index 21f7140d..00000000
Binary files a/trunk/novell4gentoo/net-nds/novell-xtier-base/files/x86_64/libbfd-2.18.50.20080409-11.1.so and /dev/null differ
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.6.8.ebuild b/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.6.8.ebuild
index db298219..89c9dcae 100644
--- a/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.6.8.ebuild
+++ b/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.6.8.ebuild
@@ -14,17 +14,18 @@ MY_PV="${MY_PVV/_p/-}"
 
 DESCRIPTION="Novell Xtier Base"
 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} )"
-#	http://download.opensuse.org/distribution/11.0/repo/oss/suse/x86_64/binutils-2.18.50.20080409-11.1.x86_64.rpm )
-#	http://download.opensuse.org/distribution/11.0/repo/oss/suse/i586/binutils-2.18.50.20080409-11.1.i586.rpm )
+SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32}
+	http://download.opensuse.org/distribution/11.0/repo/oss/suse/i586/binutils-2.18.50.20080409-11.1.i586.rpm )
+	amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE64}
+	http://download.opensuse.org/distribution/11.0/repo/oss/suse/x86_64/binutils-2.18.50.20080409-11.1.x86_64.rpm )"
 
 LICENSE="Novell-NCL"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=">=app-arch/p7zip-4.15"
+DEPEND=">=app-arch/p7zip-4.15
+	>=app-arch/rpm-5.1"
 
 RDEPEND="virtual/libc
 	net-nds/novell-xtier-env
@@ -46,7 +47,7 @@ src_unpack() {
 	    nlib=lib64
 	    7z x "${DISTDIR}"/${NOVELL_FILE64}
 	fi
-#	rpm_unpack "${DISTDIR}"/binutils-2.18.50.20080409-11.1.${narch}.rpm
+	rpm_unpack "${DISTDIR}"/binutils-2.18.50.20080409-11.1.${narch}.rpm
 	mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
 	cd ${PN}-${MY_PV}
 	rpm_unpack "${WORKDIR}"/suse/${narch}/${PN}-${MY_PV}.${narch}.rpm