get_libdir-ized (#65871)

3 files changed, 15 insertions, 11 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index aba6d0d37d3b..825b651abccb 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libcap
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.28 2004/07/16 01:38:37 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.29 2004/10/01 14:35:52 blubb Exp $
+
+  01 Oct 2004; Simon Stelling <blubb@gentoo.org> libcap-1.10-r3.ebuild,
+  libcap-1.10-r4.ebuild:
+  get_libdir-ized
 
   15 Jul 2004; Tom Gall <tgall@gentoo.org> libcap-1.10-r4.ebuild:
   stable on ppc64, bug #55530
diff --git a/sys-libs/libcap/libcap-1.10-r3.ebuild b/sys-libs/libcap/libcap-1.10-r3.ebuild
index 8e22cbb73d5e..e5eb30b30147 100644
--- a/sys-libs/libcap/libcap-1.10-r3.ebuild
+++ b/sys-libs/libcap/libcap-1.10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r3.ebuild,v 1.14 2004/07/02 08:46:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r3.ebuild,v 1.15 2004/10/01 14:35:52 blubb Exp $
 
 inherit flag-o-matic eutils
 
@@ -34,7 +34,7 @@ src_compile() {
 	local PYTHONVER="`python -V 2>&1 | sed 's/^Python //'|sed 's/\([0-9]*\.[0-9]*\).*/\1/'`"
 	local myflags=""
 	if use python ; then
-		myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/lib/python${PYTHONVER}/site-packages"
+		myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/$(get_libdir)/python${PYTHONVER}/site-packages"
 		append-flags -I/usr/include/python${PYTHONVER}
 	fi
 
@@ -49,8 +49,8 @@ src_install() {
 	local PYTHONVER="`python -V 2>&1 | sed 's/^Python //'|sed 's/\([0-9]*\.[0-9]*\).*/\1/'`"
 	local myflags=""
 	if use python ; then
-		myflags="${myflags} PYTHON=1 PYTHONMODDIR=${D}/usr/lib/python${PYTHONVER}/site-packages"
+		myflags="${myflags} PYTHON=1 PYTHONMODDIR=${D}/usr/$(get_libdir)/python${PYTHONVER}/site-packages"
 	fi
-	make install FAKEROOT="${D}" man_prefix=/usr/share ${myflags} || die
+	make install FAKEROOT="${D}" man_prefix=/usr/share LIBDIR="${D}/$(get_libdir)" ${myflags} || die
 	dodoc CHANGELOG README pgp.keys.asc doc/capability.notes
 }
diff --git a/sys-libs/libcap/libcap-1.10-r4.ebuild b/sys-libs/libcap/libcap-1.10-r4.ebuild
index 3a153334c30e..8a1ee0e7282f 100644
--- a/sys-libs/libcap/libcap-1.10-r4.ebuild
+++ b/sys-libs/libcap/libcap-1.10-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r4.ebuild,v 1.7 2004/07/16 01:38:37 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r4.ebuild,v 1.8 2004/10/01 14:35:52 blubb Exp $
 
 inherit flag-o-matic eutils
 
@@ -36,7 +36,7 @@ src_compile() {
 	local myflags=""
 	use static && CFLAGS="${CFLAGS} -static" && LDFLAGS="${LDFLAGS} -static"
 	if use python ; then
-		myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/lib/python${PYTHONVER}/site-packages"
+		myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/$(get_libdir)/python${PYTHONVER}/site-packages"
 		append-flags -I/usr/include/python${PYTHONVER}
 	fi
 
@@ -47,10 +47,10 @@ src_install() {
 	local PYTHONVER="`python -V 2>&1 | sed 's/^Python //'|sed 's/\([0-9]*\.[0-9]*\).*/\1/'`"
 	local myflags=""
 	if use python ; then
-		myflags="${myflags} PYTHON=1 PYTHONMODDIR=${D}/usr/lib/python${PYTHONVER}/site-packages"
+		myflags="${myflags} PYTHON=1 PYTHONMODDIR=${D}/usr/$(get_libdir)/python${PYTHONVER}/site-packages"
 	fi
-	make install FAKEROOT="${D}" man_prefix=/usr/share ${myflags} || die
-	dodir /usr/lib
-	mv ${D}/lib/libcap.a ${D}/usr/lib
+	make install FAKEROOT="${D}" man_prefix=/usr/share LIBDIR="${D}/$(get_libdir)" ${myflags} || die
+	dodir /usr/$(get_libdir)
+	mv ${D}/$(get_libdir)/libcap.a ${D}/usr/$(get_libdir)
 	dodoc CHANGELOG README pgp.keys.asc doc/capability.notes capfaq-0.2.txt
 }