Fixing bug #190217 for the release.

(Portage version: 2.1.4.1)

3 files changed, 20 insertions, 16 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/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
 }