From e439d8f7c291763338ca7a646770d94cb402eec3 Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Sat, 4 Aug 2007 18:23:27 +0000
Subject: [PATCH] Correct some ebuild errors

---
 branches/experimental/app-crypt/novell-nici/Manifest      | 8 ++++----
 .../app-crypt/novell-nici/novell-nici-2.7.3_p5-r1.ebuild  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/branches/experimental/app-crypt/novell-nici/Manifest b/branches/experimental/app-crypt/novell-nici/Manifest
index 42684357..0e72dbf6 100644
--- a/branches/experimental/app-crypt/novell-nici/Manifest
+++ b/branches/experimental/app-crypt/novell-nici/Manifest
@@ -9,10 +9,10 @@ EBUILD novell-nici-2.7.2_p001.ebuild 1593 RMD160 d96ce2a8a84d393f5f59cd6bac2e65b
 MD5 2a4fbefa1b48e12d2f0e0255a1e3fa38 novell-nici-2.7.2_p001.ebuild 1593
 RMD160 d96ce2a8a84d393f5f59cd6bac2e65b1f8916982 novell-nici-2.7.2_p001.ebuild 1593
 SHA256 9fde78e3b2212b33077dcf623801ae355ce7e9c3feca9d302b39188fd1b1e261 novell-nici-2.7.2_p001.ebuild 1593
-EBUILD novell-nici-2.7.3_p5-r1.ebuild 2893 RMD160 f3754cf01742359b3d1879d428a55165297d6674 SHA1 569902b6feec1466f4dcf8f5b7d268576313eee0 SHA256 1dd3cb91184e4c36c2f0b7714ce2a5055d138f15f560a847f676caec327052fc
-MD5 0f14c1575f8d646fa0aca635448ed8ed novell-nici-2.7.3_p5-r1.ebuild 2893
-RMD160 f3754cf01742359b3d1879d428a55165297d6674 novell-nici-2.7.3_p5-r1.ebuild 2893
-SHA256 1dd3cb91184e4c36c2f0b7714ce2a5055d138f15f560a847f676caec327052fc novell-nici-2.7.3_p5-r1.ebuild 2893
+EBUILD novell-nici-2.7.3_p5-r1.ebuild 2852 RMD160 f474b078c67e08f6541223959b74f8533eaef653 SHA1 81f993fad675929fb31efb517d9538e2fed28203 SHA256 a144427d221d47b46773778d3854570de8f92600bca334b1b37bcaadd5574964
+MD5 7348ba79e1d269a4aa7488d2a0832639 novell-nici-2.7.3_p5-r1.ebuild 2852
+RMD160 f474b078c67e08f6541223959b74f8533eaef653 novell-nici-2.7.3_p5-r1.ebuild 2852
+SHA256 a144427d221d47b46773778d3854570de8f92600bca334b1b37bcaadd5574964 novell-nici-2.7.3_p5-r1.ebuild 2852
 EBUILD novell-nici-2.7.3_p5.ebuild 1858 RMD160 067c995c26d3a71b77f25e34d535c94720cea6e6 SHA1 7df0b2b97297f5201440ef2e07d17bb00fe49928 SHA256 53e5a62e5000c18d99ca6301b318b8bae7aaf3022055598cef1d4753587fe2c6
 MD5 5926a7ae659d5812332f954c1a3b886f novell-nici-2.7.3_p5.ebuild 1858
 RMD160 067c995c26d3a71b77f25e34d535c94720cea6e6 novell-nici-2.7.3_p5.ebuild 1858
diff --git a/branches/experimental/app-crypt/novell-nici/novell-nici-2.7.3_p5-r1.ebuild b/branches/experimental/app-crypt/novell-nici/novell-nici-2.7.3_p5-r1.ebuild
index ad6b0722..779eaaf9 100644
--- a/branches/experimental/app-crypt/novell-nici/novell-nici-2.7.3_p5-r1.ebuild
+++ b/branches/experimental/app-crypt/novell-nici/novell-nici-2.7.3_p5-r1.ebuild
@@ -38,7 +38,7 @@ src_unpack() {
     	    mkdir -p ${WORKDIR}/${PN}-${MY_P}
 	    cd ${PN}-${MY_P}
 	    rpm_unpack ${WORKDIR}/suse/${narch}/nici64-${MY_PV}.${narch}.rpm
-	    if has_multilib_profile && ABI="x86" ; then
+	    if has_multilib_profile ; then
 		rpm_unpack ${WORKDIR}/suse/i586/nici-${MY_PV}.i586.rpm
 	    fi 
         fi
@@ -51,7 +51,7 @@ src_install() {
 	if use x86
 	then
 	    dolib.so ${WORKDIR}/${PN}-${MY_P}/opt/novell/${nlib}/*
-	elif has_multilib_profile && ABI="x86"
+	elif has_multilib_profile 
 	then
 	    dolib.so ${WORKDIR}/${PN}-${MY_P}/opt/novell/${nlib}/*
 	    exeinto /opt/novell/$(get_multilibdir)
@@ -65,7 +65,7 @@ src_install() {
 	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 && ABI="x86" )
+	if use x86 || has_multilib_profile 
 	then
 	    dosym opt/novell/nici.cfg /etc/nici.cfg
 	fi