get_libdir-ized (#65871)

14 files changed, 59 insertions, 37 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index b466e6e59f70..44f081ed7702 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/db
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.103 2004/09/27 08:05:46 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.104 2004/10/01 14:33:56 blubb Exp $
+
+  01 Oct 2004; Simon Stelling <blubb@gentoo.org> db-4.1.25_p1-r3.ebuild,
+  db-4.1.25_p1-r4.ebuild, db-4.2.52_p2.ebuild:
+  get_libdir-ized
 
   27 Sep 2004; <pauldv@gentoo.org> db-3.2.9-r10.ebuild, db-3.2.9-r7.ebuild:
   Fix bug #65291 and mark the -r10 release testing on amd64.
diff --git a/sys-libs/db/db-4.1.25_p1-r3.ebuild b/sys-libs/db/db-4.1.25_p1-r3.ebuild
index 19a16bf3b384..dfdb237fe738 100644
--- a/sys-libs/db/db-4.1.25_p1-r3.ebuild
+++ b/sys-libs/db/db-4.1.25_p1-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/db/db-4.1.25_p1-r3.ebuild,v 1.25 2004/09/09 12:36:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.26 2004/10/01 14:33:56 blubb Exp $
 
 inherit eutils gnuconfig db
 
@@ -62,7 +62,7 @@ src_compile() {
 		|| myconf="${myconf} --disable-java"
 
 	use tcltk \
-		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
 		|| myconf="${myconf} --disable-tcl"
 
 	if use java && [ -n "${JAVAC}" ]; then
diff --git a/sys-libs/db/db-4.1.25_p1-r4.ebuild b/sys-libs/db/db-4.1.25_p1-r4.ebuild
index 213f85db39f3..bdce3b33b47c 100644
--- a/sys-libs/db/db-4.1.25_p1-r4.ebuild
+++ b/sys-libs/db/db-4.1.25_p1-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/db/db-4.1.25_p1-r4.ebuild,v 1.7 2004/09/09 12:36:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.8 2004/10/01 14:33:56 blubb Exp $
 
 inherit eutils gnuconfig db
 
@@ -70,7 +70,7 @@ src_compile() {
 		|| myconf="${myconf} --disable-java"
 
 	use tcltk \
-		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
 		|| myconf="${myconf} --disable-tcl"
 
 	if use java && [ -n "${JAVAC}" ]; then
diff --git a/sys-libs/db/db-4.2.52_p2.ebuild b/sys-libs/db/db-4.2.52_p2.ebuild
index f02a73e8002f..ddb911520522 100644
--- a/sys-libs/db/db-4.2.52_p2.ebuild
+++ b/sys-libs/db/db-4.2.52_p2.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/db/db-4.2.52_p2.ebuild,v 1.9 2004/09/22 20:41:03 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p2.ebuild,v 1.10 2004/10/01 14:33:56 blubb Exp $
 
 IUSE="tcltk java doc"
 
@@ -72,7 +72,7 @@ src_compile() {
 		|| myconf="${myconf} --disable-java"
 
 	use tcltk \
-		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
 		|| myconf="${myconf} --disable-tcl"
 
 	if use java && [ -n "${JAVAC}" ]; then
diff --git a/sys-libs/device-mapper/ChangeLog b/sys-libs/device-mapper/ChangeLog
index d136d642a82f..18b4812b7d89 100644
--- a/sys-libs/device-mapper/ChangeLog
+++ b/sys-libs/device-mapper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/device-mapper
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/ChangeLog,v 1.21 2004/08/17 19:58:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/ChangeLog,v 1.22 2004/10/01 14:34:31 blubb Exp $
+
+  01 Oct 2004; Simon Stelling <blubb@gentoo.org>
+  device-mapper-1.00.19-r1.ebuild:
+  get_libdir-ized and added IUSE=""
 
   17 Aug 2004; <agriffis@gentoo.org> device-mapper-1.00.19-r1.ebuild:
   add ~alpha #60071
diff --git a/sys-libs/device-mapper/device-mapper-1.00.19-r1.ebuild b/sys-libs/device-mapper/device-mapper-1.00.19-r1.ebuild
index 1d0218f8f218..c375f30eef9c 100644
--- a/sys-libs/device-mapper/device-mapper-1.00.19-r1.ebuild
+++ b/sys-libs/device-mapper/device-mapper-1.00.19-r1.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/device-mapper/device-mapper-1.00.19-r1.ebuild,v 1.3 2004/09/03 19:14:07 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.19-r1.ebuild,v 1.4 2004/10/01 14:34:31 blubb Exp $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ SRC_URI="ftp://sources.redhat.com/pub/dm/${PN}.${PV}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ppc ~sparc ~amd64 ppc64 ~alpha"
+IUSE=""
 
 DEPEND="virtual/linux-sources"
 
@@ -36,8 +37,8 @@ src_compile() {
 }
 
 src_install() {
-	einstall sbindir="${D}/sbin" libdir="${D}/lib"
-	dolib.a lib/ioctl/libdevmapper.a
+	einstall sbindir="${D}/sbin" libdir="${D}/$(get_libdir)"
+	dolib.a $(get_libdir)/ioctl/libdevmapper.a
 
 	# bug #4411
 	gen_usr_ldscript libdevmapper.so || die "gen_usr_ldscript failed"
diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index 3962be648434..28d198961547 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/gpm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.28 2004/07/02 08:45:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.29 2004/10/01 14:34:57 blubb Exp $
+
+  01 Oct 2004; Simon Stelling <blubb@gentoo.org> gpm-1.20.1.ebuild:
+  get_libdir-ized
 
   02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gpm-1.19.6.ebuild:
   virtual/glibc -> virtual/libc
diff --git a/sys-libs/gpm/gpm-1.20.1.ebuild b/sys-libs/gpm/gpm-1.20.1.ebuild
index 4b17f1199230..7a27bf1830fc 100644
--- a/sys-libs/gpm/gpm-1.20.1.ebuild
+++ b/sys-libs/gpm/gpm-1.20.1.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/gpm/gpm-1.20.1.ebuild,v 1.19 2004/09/27 21:30:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1.ebuild,v 1.20 2004/10/01 14:34:57 blubb Exp $
 
 # Please use this variable to keep patch names sane for our patches!
 PATCH_VER="1.0"
@@ -55,8 +55,8 @@ src_compile() {
 src_install() {
 	einstall
 
-	chmod 755 ${D}/usr/lib/*
-	# Fix missing /usr/lib/libgpm.so.1
+	chmod 755 ${D}/usr/$(get_libdir)/*
+	# Fix missing /usr/$(get_libdir)/libgpm.so.1
 	preplib
 
 	dodoc BUGS COPYING ChangeLog Changes MANIFEST README TODO
diff --git a/sys-libs/libaal/ChangeLog b/sys-libs/libaal/ChangeLog
index e74e10f7b5b5..2b8b1e09417a 100644
--- a/sys-libs/libaal/ChangeLog
+++ b/sys-libs/libaal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libaal
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/ChangeLog,v 1.12 2004/09/19 21:17:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/ChangeLog,v 1.13 2004/10/01 14:35:23 blubb Exp $
+
+  01 Oct 2004; Simon Stelling <blubb@gentoo.org> libaal-1.0.1.ebuild,
+  libaal-1.0.2_pre1.ebuild:
+  get_libdir-ized
 
 *libaal-1.0.2_pre1 (19 Sep 2004)
 
diff --git a/sys-libs/libaal/libaal-1.0.1.ebuild b/sys-libs/libaal/libaal-1.0.1.ebuild
index 9ded785f63bf..290d2aba749d 100644
--- a/sys-libs/libaal/libaal-1.0.1.ebuild
+++ b/sys-libs/libaal/libaal-1.0.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/libaal-1.0.1.ebuild,v 1.3 2004/09/19 21:16:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/libaal-1.0.1.ebuild,v 1.4 2004/10/01 14:35:23 blubb Exp $
+
+inherit eutils
 
 DESCRIPTION="library required by reiser4progs"
 HOMEPAGE="http://www.namesys.com/v4/v4.html"
@@ -17,7 +19,7 @@ src_compile() {
 	econf \
 		--enable-stand-alone \
 		--enable-memory-manager \
-		--libdir=/lib || die "configure failed"
+		--libdir=/$(get_libdir) || die "configure failed"
 	emake || die "make failed"
 }
 
@@ -26,10 +28,10 @@ src_install() {
 	dodoc AUTHORS BUGS CREDITS ChangeLog NEWS README THANKS TODO
 
 	# move silly .a libs out of /
-	dodir /usr/lib
+	dodir /usr/$(get_libdir)
 	local l=""
 	for l in libaal libaal-alone ; do
-		mv ${D}/lib/${l}.{a,la} ${D}/usr/lib/
-		dosym ../usr/lib/${l}.a /lib/${l}.a
+		mv ${D}/$(get_libdir)/${l}.{a,la} ${D}/usr/$(get_libdir)/
+		dosym ../usr/$(get_libdir)/${l}.a /$(get_libdir)/${l}.a
 	done
 }
diff --git a/sys-libs/libaal/libaal-1.0.2_pre1.ebuild b/sys-libs/libaal/libaal-1.0.2_pre1.ebuild
index cb3567d68329..0e984f7783c3 100644
--- a/sys-libs/libaal/libaal-1.0.2_pre1.ebuild
+++ b/sys-libs/libaal/libaal-1.0.2_pre1.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/libaal/libaal-1.0.2_pre1.ebuild,v 1.2 2004/09/19 21:36:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/libaal-1.0.2_pre1.ebuild,v 1.3 2004/10/01 14:35:23 blubb Exp $
 
 inherit eutils
 
@@ -23,7 +23,7 @@ src_compile() {
 	econf \
 		--enable-stand-alone \
 		--enable-memory-manager \
-		--libdir=/lib || die "configure failed"
+		--libdir=/$(get_libdir) || die "configure failed"
 	emake || die "make failed"
 }
 
@@ -32,11 +32,11 @@ src_install() {
 	dodoc AUTHORS BUGS CREDITS ChangeLog NEWS README THANKS TODO
 
 	# move silly .a libs out of /
-	dodir /usr/lib
+	dodir /usr/$(get_libdir)
 	local l=""
 	for l in libaal libaal-alone ; do
-		mv ${D}/lib/${l}.{a,la} ${D}/usr/lib/
-		dosym ../usr/lib/${l}.a /lib/${l}.a
+		mv ${D}/$(get_libdir)/${l}.{a,la} ${D}/usr/$(get_libdir)/
+		dosym ../usr/$(get_libdir)/${l}.a /$(get_libdir)/${l}.a
 		gen_usr_ldscript ${l}.so
 	done
 }
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
 }