Fixing bug #190217 for the release.

Package-Manager: portage-2.1.4.1

4 files changed, 23 insertions, 19 deletions

diff --git a/sys-apps/rsbac-admin/ChangeLog b/sys-apps/rsbac-admin/ChangeLog
index 4b38424c2d18..f299d66f477a 100644
--- a/sys-apps/rsbac-admin/ChangeLog
+++ b/sys-apps/rsbac-admin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/rsbac-admin
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.34 2007/07/27 15:03:02 kang Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.35 2008/02/02 13:51:57 wolf31o2 Exp $
+
+  02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  rsbac-admin-1.3.4-r1.ebuild, rsbac-admin-1.3.5-r1.ebuild:
+  Fixing bug #190217 for the release.
 
 *rsbac-admin-1.3.5-r1 (27 Jul 2007)
 
diff --git a/sys-apps/rsbac-admin/Manifest b/sys-apps/rsbac-admin/Manifest
index 29efec586bfb..c772231afe0a 100644
--- a/sys-apps/rsbac-admin/Manifest
+++ b/sys-apps/rsbac-admin/Manifest
@@ -8,9 +8,9 @@ DIST rsbac-admin-1.3.5.tar.bz2 279824 RMD160 b5bb373290082cf9df580592fe8008c182c
 EBUILD rsbac-admin-1.2.99.ebuild 2162 RMD160 a11c80a643504307f7509a3eaad69425ecde362a SHA1 266afee824e35bbd60da341ae6830ef299d00d3e SHA256 845e71cfc97dce7c49cb11ce4bd6322f4b4d71948b37b29a184d304d16ca2fa9
 EBUILD rsbac-admin-1.3.0.ebuild 2151 RMD160 205bb66ab81e56c89277fa257e098605dc7ebae4 SHA1 de3de875eaacb873a9a3042bd2005a3303ed0b24 SHA256 663a8f646400207d70464ec137073d499b47a4ada2318abe01bfa9dff0a97234
 EBUILD rsbac-admin-1.3.1.ebuild 2149 RMD160 af89853dc2518e1b56950dec06f4f0f1784b5d0d SHA1 57ff5b3c2de215e0233eb807ed8beb5db975bea2 SHA256 4d6c5a440a3b7f6bbe54f0c7554cbf55270324b4a12926eede9669d81ff2b067
-EBUILD rsbac-admin-1.3.4-r1.ebuild 2393 RMD160 523228746dad357d2a27d90241b0092bda48b8b4 SHA1 147b1268288f19c24110c653246c8802faab0496 SHA256 5a00d3aed0d5e3997ea4e3f4d0bdaf58fc364a782ec719b229232b9483eeab54
+EBUILD rsbac-admin-1.3.4-r1.ebuild 2418 RMD160 3c5881ac82a29736445728b9bb716a52cf9f8ab4 SHA1 afad41a07614f82af570e51690a25263882b6f76 SHA256 b906b56e8f5aefb8485cbf08c057bef6cef9aa28cf0d615e62eba1688f5b1ab7
 EBUILD rsbac-admin-1.3.4.ebuild 2151 RMD160 0e6bad49597f3a7726b5a94b61c7d09dd7ced861 SHA1 b3e7ba6b52b3c5fb9874500c43936439a2914ca4 SHA256 35ddc79cc13c2e576ced69cfc79f3a4ca506b7c11fce66facb5c863a32b8f519
-EBUILD rsbac-admin-1.3.5-r1.ebuild 2419 RMD160 22d11f69c6a46f4fbd1321d379ef6f080fc426b0 SHA1 0222924527d4f596e9a84f94ace251ab6beb2b7e SHA256 5b6d40adb10d9ef4ec0fe61932e33ccf7efdcc59430ac1ddb886622250c31849
+EBUILD rsbac-admin-1.3.5-r1.ebuild 2464 RMD160 21411e70a4b0c6e1b8fdf6af658f0becaa9166e8 SHA1 dc8e5e2c1e9275bbb7ebd0eba230c59075dfa12f SHA256 0a4a609f47ecc30f82dcbcefe8308b75f5f7ca10a7bbaacd8ab2f7ebafbb952c
 EBUILD rsbac-admin-1.3.5.ebuild 2394 RMD160 3bc1bd6437cfac4b53a08a15b81a49c61fe190fa SHA1 0944bb03f4327253f991eb5240d2654d0fdfed79 SHA256 d41f6b6b1db7e31dcee601df77554e48cad24fc9514e4403f3bcbeab8dd6847f
-MISC ChangeLog 6296 RMD160 5cfd8f870f1007b34479f47b09bb9d7735590b12 SHA1 33e13f68d07e44bfd047b76bfc015a745d569306 SHA256 00bc8fcfdde91c312185525a1a173684861d00494238eeb25e509381fd0e747b
+MISC ChangeLog 6453 RMD160 cf7d01d53134f8de5308573e0d1b07600bdcdc7a SHA1 6830b8edb66f0ea661410d376dcbb3208b052dc4 SHA256 a79bb5f327752522e26981d3d0b2fb39ad8ecb3bec013377968bd6c93b19305a
 MISC metadata.xml 260 RMD160 93d035e25e95aa3588892ef261f67e427ac41239 SHA1 d4e1e029e9fb96ae91cb1e4eba0a7902da9e2964 SHA256 aff8f9d24589bbd26b4783bb4cf52d9a1baf38872e67de6ee30427007c0e0efe
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.3.4-r1.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.3.4-r1.ebuild
index 8e307b20d638..9e744920c0ee 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.3.4-r1.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.3.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.4-r1.ebuild,v 1.2 2007/07/24 09:41:34 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.4-r1.ebuild,v 1.3 2008/02/02 13:51:57 wolf31o2 Exp $
 
-inherit eutils libtool toolchain-funcs
+inherit eutils libtool multilib toolchain-funcs
 
 IUSE="pam"
 
@@ -54,9 +54,9 @@ src_install() {
 	dodir /var/log/rsbac
 	keepdir /var/log/rsbac
 	#FHS compliance
-	dodir /usr/lib
-	mv ${D}/lib/librsbac.la ${D}/lib/librsbac.a ${D}/usr/lib
-	mv ${D}/lib/libnss_rsbac.la ${D}/lib/libnss_rsbac.a ${D}/usr/lib
+	dodir /usr/$(get_libdir)
+	mv ${D}/$(get_libdir)/librsbac.{,l}a ${D}/usr/$(get_libdir)
+	mv ${D}/$(get_libdir)/libnss_rsbac.{,l}a ${D}/usr/$(get_libdir)
 	gen_usr_ldscript librsbac.so
 	gen_usr_ldscript libnss_rsbac.so
 }
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild
index fb05342bbc37..b6d751b08abe 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild,v 1.1 2007/07/27 15:03:02 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild,v 1.2 2008/02/02 13:51:57 wolf31o2 Exp $
 
-inherit eutils libtool toolchain-funcs
+inherit eutils libtool multilib toolchain-funcs
 
 IUSE="pam"
 
@@ -36,7 +36,7 @@ src_compile() {
 	use pam && {
 		rsbacmakeargs="${makeargs} pam nss"
 	}
-	emake PREFIX=/usr LIBDIR=/lib ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
+	emake PREFIX=/usr LIBDIR=/$(get_libdir) ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
 }
 
 src_install() {
@@ -45,7 +45,7 @@ src_install() {
 	use pam && {
 		rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
 	}
-	make PREFIX=/usr LIBDIR=/lib DESTDIR=${D} ${rsbacinstallargs} || \
+	make PREFIX=/usr LIBDIR=/$(get_libdir) DESTDIR=${D} ${rsbacinstallargs} || \
 	die "cannot install (${rsbacinstallargs})"
 	insinto /etc
 	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
@@ -54,9 +54,9 @@ src_install() {
 	dodir /var/log/rsbac
 	keepdir /var/log/rsbac
 	#FHS compliance
-	dodir /usr/lib
-	mv ${D}/lib/librsbac.la ${D}/lib/librsbac.a ${D}/usr/lib
-	mv ${D}/lib/libnss_rsbac.la ${D}/lib/libnss_rsbac.a ${D}/usr/lib
+	dodir /usr/$(get_libdir)
+	mv ${D}/$(get_libdir)/librsbac.{,l}a ${D}/usr/$(get_libdir)
+	mv ${D}/$(get_libdir)/libnss_rsbac.{,l}a ${D}/usr/$(get_libdir)
 	gen_usr_ldscript librsbac.so
 	gen_usr_ldscript libnss_rsbac.so
 }