get_libdir support for multilib archs.

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 2f61ebd04e09bd8924bd0746f133a37712f30b67..fb4e0588894d0b1a72ab77fb930247dcc5deaf27 100644 (file)
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,12 @@
 # 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.109 2004/12/14 16:21:50 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.110 2004/12/16 10:29:20 eradicator Exp $
+
+  16 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> db-1.85-r1.ebuild,
+  db-1.85-r2.ebuild, db-3.2.9-r10.ebuild, db-3.2.9-r7.ebuild,
+  db-4.0.14-r2.ebuild, db-4.0.14-r3.ebuild, db-4.1.25_p1-r3.ebuild,
+  db-4.1.25_p1-r4.ebuild, db-4.2.52_p1.ebuild, db-4.2.52_p2.ebuild:
+  get_libdir support for multilib archs.
 
   14 Dec 2004; Dylan Carlson <absinthe@gentoo.org> db-4.1.25_p1-r4.ebuild:
   Stable on amd64.

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 55e1d76b4ada9b73e27a330565101c5d87012cc7..1e286aa519dbc9f4c9bafdc1cb03b896e2d2f205 100644 (file)
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,34 +1,44 @@
-MD5 450ecc4602473494ddc536d98e60202d ChangeLog 17333
-MD5 4821c0f36864a874b10e6c23e64a0545 db-1.85-r1.ebuild 1403
-MD5 aa4631336b2cd28169027f0f9347b8f2 db-1.85-r2.ebuild 1443
-MD5 787ed8ad7a393781ec77e81cdfde8260 db-3.2.9-r10.ebuild 4154
-MD5 254b3560983fe477d0db2097f609f9ba db-3.2.9-r7.ebuild 4348
-MD5 0f6d49f985018ac3ddf80d36eea24f72 db-4.0.14-r2.ebuild 2164
-MD5 968165523d174efb458433c6defbc202 db-4.0.14-r3.ebuild 2412
-MD5 a3699e31e901b11f1ac8d3314475e0dc db-4.1.25_p1-r3.ebuild 2496
-MD5 06a0510dbc04e49e403e24d2ce30cbc5 db-4.1.25_p1-r4.ebuild 2760
-MD5 f3db8cf5807090698c572eae328a874f db-4.2.52_p1.ebuild 2773
-MD5 e044406264c76b10911a47353dc30175 db-4.2.52_p2.ebuild 2837
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 444280510d43ebe9268fce7efd34fbbc ChangeLog 17651
+MD5 65ddccb99462ea54a0cede7cbf3ae44d db-1.85-r1.ebuild 1447
+MD5 70c2f0029c3d32d10f9d0a85a3e10481 db-3.2.9-r10.ebuild 4266
+MD5 c44c1f91c41bc879f73dce1b7b3548fa db-3.2.9-r7.ebuild 4448
+MD5 3734e84d6a4cdbdf13b709a43537b139 db-4.0.14-r2.ebuild 2242
+MD5 f3b27954bfc1f5ae36ec3616fd1cbe1c db-4.0.14-r3.ebuild 2491
+MD5 97e2c1db9b0a6996c8425e905dca27a0 db-4.1.25_p1-r3.ebuild 2564
+MD5 defb926189d0ad7738f5b1e49cd3bbde db-4.2.52_p1.ebuild 2850
+MD5 fa6c8b4e3857d6a6f41857b13ec63e77 db-4.2.52_p2.ebuild 2906
 MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
+MD5 ae90a1a5449e5821ebf574ba6a3a5814 db-4.1.25_p1-r4.ebuild 2826
+MD5 d6cd1d1e88928bc706fc90102d17b42b db-1.85-r2.ebuild 1487
 MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
 MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
 MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
 MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
-MD5 395933484399c22681916b0e86db3258 files/db-4.1.25-java.patch 721
-MD5 75ba5de97737693cfdfe85908b5adfbd files/db-4.1.25-uclibc.patch 731
 MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
 MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
-MD5 4f68188f3bc051f50a85c5b72bab85c7 files/db-4.2-libtool.patch 665
 MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
 MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
-MD5 69bde9765bf0a2d6c55a253eb0e53190 files/digest-db-1.85-r2 120
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
+MD5 69bde9765bf0a2d6c55a253eb0e53190 files/digest-db-1.85-r2 120
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r3 62
 MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
-MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r4 118
 MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
 MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
 MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
 MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
+MD5 75ba5de97737693cfdfe85908b5adfbd files/db-4.1.25-uclibc.patch 731
+MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r4 118
+MD5 395933484399c22681916b0e86db3258 files/db-4.1.25-java.patch 721
+MD5 4f68188f3bc051f50a85c5b72bab85c7 files/db-4.2-libtool.patch 665
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBwWORArHZZzCEUG0RAm51AJ9h8KVRWbju8Y09cB0tehWErmwMrwCeMgK5
+OG68FDpawDjZJJ34PAHOAz4=
+=Xmgu
+-----END PGP SIGNATURE-----

diff --git a/sys-libs/db/db-1.85-r1.ebuild b/sys-libs/db/db-1.85-r1.ebuild
index 3737accf04190b0a0c0fef824c6eaa1e4e479511..2d677d512f8cca9d38ba8033f967b82a5d0f1523 100644 (file)
--- a/sys-libs/db/db-1.85-r1.ebuild
+++ b/sys-libs/db/db-1.85-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/db/db-1.85-r1.ebuild,v 1.28 2004/11/12 14:53:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r1.ebuild,v 1.29 2004/12/16 10:29:20 eradicator Exp $
 
 inherit eutils
 
@@ -33,10 +33,10 @@ src_install () {
 
        newlib.a libdb.a libdb1.a || die "newlib.a failed"
        newlib.so libdb.so.2 libdb1.so.2 || die "newlib.so failed"
-       dosym libdb1.so.2 /usr/lib/libdb1.so
-       dosym libdb1.so.2 /usr/lib/libdb.so.2
-       dosym libdb1.so.2 /usr/lib/libndbm.so
-       dosym libdb1.a /usr/lib/libndbm.a
+       dosym libdb1.so.2 /usr/$(get_libdir)/libdb1.so
+       dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2
+       dosym libdb1.so.2 /usr/$(get_libdir)/libndbm.so
+       dosym libdb1.a /usr/$(get_libdir)/libndbm.a
 
        dodir /usr/include/db1
        insinto /usr/include/db1

diff --git a/sys-libs/db/db-1.85-r2.ebuild b/sys-libs/db/db-1.85-r2.ebuild
index 130d8a7901ccb43290d16188c5f86d9f78c1d8a0..6be62059f26fac6b8ec754c9d0052431b2a37cc7 100644 (file)
--- a/sys-libs/db/db-1.85-r2.ebuild
+++ b/sys-libs/db/db-1.85-r2.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-1.85-r2.ebuild,v 1.5 2004/12/14 02:33:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r2.ebuild,v 1.6 2004/12/16 10:29:20 eradicator Exp $
 
 inherit eutils toolchain-funcs
 
@@ -35,10 +35,10 @@ src_install() {
 
        newlib.a libdb.a libdb1.a || die "newlib.a failed"
        newlib.so libdb.so.2 libdb1.so.2 || die "newlib.so failed"
-       dosym libdb1.so.2 /usr/lib/libdb1.so
-       dosym libdb1.so.2 /usr/lib/libdb.so.2
-       dosym libdb1.so.2 /usr/lib/libndbm.so
-       dosym libdb1.a /usr/lib/libndbm.a
+       dosym libdb1.so.2 /usr/$(get_libdir)/libdb1.so
+       dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2
+       dosym libdb1.so.2 /usr/$(get_libdir)/libndbm.so
+       dosym libdb1.a /usr/$(get_libdir)/libndbm.a
 
        dodir /usr/include/db1
        insinto /usr/include/db1

diff --git a/sys-libs/db/db-3.2.9-r10.ebuild b/sys-libs/db/db-3.2.9-r10.ebuild
index 9cfae39a7b4c2146a314447666b9c77d5642bd47..04cf814d11a40118617e5c9c20655d97e0cacacc 100644 (file)
--- a/sys-libs/db/db-3.2.9-r10.ebuild
+++ b/sys-libs/db/db-3.2.9-r10.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-3.2.9-r10.ebuild,v 1.14 2004/09/27 08:05:46 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r10.ebuild,v 1.15 2004/12/16 10:29:20 eradicator Exp $
 
 inherit gnuconfig libtool eutils db
 
@@ -93,12 +93,14 @@ src_compile() {
        mkdir -p ${S}/build-static
        cd ${S}/build-static
        ../dist/configure ${conf} ${conf_static} \
+               --libdir=/usr/$(get_libdir) \
                --enable-static || die
 
        einfo "Configuring ${P} (shared)..."
        mkdir -p ${S}/build-shared
        cd ${S}/build-shared
        ../dist/configure ${conf} ${conf_shared} \
+               --libdir=/usr/$(get_libdir) \
                --enable-shared || die
 
        # Parallel make does not work
@@ -116,6 +118,7 @@ src_install () {
        make libdb=libdb-3.2.a \
                libcxx=libcxx_3.2.a \
                prefix=${D}/usr \
+               libdir=${D}/usr/$(get_libdir) \
                install || die
 
        cd ${S}/build-static
@@ -131,7 +134,7 @@ src_install () {
        # For some reason, db.so's are *not* readable by group or others,
        # resulting in no one but root being able to use them!!!
        # This fixes it -- DR 15 Jun 2001
-       cd ${D}/usr/lib
+       cd ${D}/usr/$(get_libdir)
        chmod go+rx *.so
        # The .la's aren't readable either
        chmod go+r *.la

diff --git a/sys-libs/db/db-3.2.9-r7.ebuild b/sys-libs/db/db-3.2.9-r7.ebuild
index 39baa69f7ee2c47dceca46590cd5c361fb317870..32ccff5afcd95ff2a35d0821d2f2f08b2cdc565e 100644 (file)
--- a/sys-libs/db/db-3.2.9-r7.ebuild
+++ b/sys-libs/db/db-3.2.9-r7.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-3.2.9-r7.ebuild,v 1.15 2004/09/27 08:05:46 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r7.ebuild,v 1.16 2004/12/16 10:29:20 eradicator Exp $
 
 IUSE=""
 
@@ -66,6 +66,7 @@ src_compile() {
                --enable-cxx \
                --enable-compat185 \
                --enable-dump185 \
+               --libdir=/usr/$(get_libdir) \
                --prefix=/usr"
        # --enable-rpc aparently does not work .. should verify this
        # at some stage ...
@@ -100,6 +101,7 @@ src_install () {
        make libdb=libdb-3.2.a \
                libcxx=libcxx_3.2.a \
                prefix=${D}/usr \
+               libdir=${D}/usr/$(get_libdir) \
                install || die
 
        cd ${S}/build-static
@@ -112,13 +114,13 @@ src_install () {
        mv *.h db3
        ln db3/db.h db.h
 
-       cd ${D}/usr/lib
+       cd ${D}/usr/$(get_libdir)
        ln -s libdb-3.2.so libdb.so.3
 
        # For some reason, db.so's are *not* readable by group or others,
        # resulting in no one but root being able to use them!!!
        # This fixes it -- DR 15 Jun 2001
-       cd ${D}/usr/lib
+       cd ${D}/usr/$(get_libdir)
        chmod go+rx *.so
        # The .la's aren't readable either
        chmod go+r *.la
@@ -139,7 +141,7 @@ src_install () {
 }
 
 fix_so () {
-       cd ${ROOT}/usr/lib
+       cd ${ROOT}/usr/$(get_libdir)
        target=`find -type f -maxdepth 1 -name "libdb-*.so" |sort |tail -n 1`
        [ -n "${target}" ] && ln -sf ${target//.\//} libdb.so
        target=`find -type f -maxdepth 1 -name "libdb_cxx*.so" |sort |tail -n 1`

diff --git a/sys-libs/db/db-4.0.14-r2.ebuild b/sys-libs/db/db-4.0.14-r2.ebuild
index 4a9c32c55961c0e576a0c5a2657b7c4cc60459fa..c0ac23b5e61dc6b81a56c45cdaf20729dc5abc19 100644 (file)
--- a/sys-libs/db/db-4.0.14-r2.ebuild
+++ b/sys-libs/db/db-4.0.14-r2.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.0.14-r2.ebuild,v 1.24 2004/11/30 19:37:20 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r2.ebuild,v 1.25 2004/12/16 10:29:20 eradicator Exp $
 
 IUSE="tcltk java doc"
 
@@ -47,7 +47,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
@@ -62,6 +62,7 @@ src_compile() {
                --datadir=/usr/share \
                --sysconfdir=/etc \
                --localstatedir=/var/lib \
+               --libdir=/usr/$(get_libdir) \
                --enable-compat185 \
                --enable-cxx \
                --with-uniquename \
@@ -77,7 +78,7 @@ src_compile() {
 
 src_install () {
 
-       einstall || die
+       einstall libdir="${D}/usr/$(get_libdir)" || die
 
        db_src_install_usrbinslot
 

diff --git a/sys-libs/db/db-4.0.14-r3.ebuild b/sys-libs/db/db-4.0.14-r3.ebuild
index a0dad6be0e27688b4a0b404ce43976ccf458f814..2ff5c0aff59a16acdd56db339beea4c1471f269a 100644 (file)
--- a/sys-libs/db/db-4.0.14-r3.ebuild
+++ b/sys-libs/db/db-4.0.14-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.0.14-r3.ebuild,v 1.9 2004/11/30 19:37:20 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r3.ebuild,v 1.10 2004/12/16 10:29:20 eradicator Exp $
 
 IUSE="tcltk java doc"
 
@@ -52,7 +52,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
@@ -67,6 +67,7 @@ src_compile() {
                --datadir=/usr/share \
                --sysconfdir=/etc \
                --localstatedir=/var/lib \
+               --libdir=/usr/$(get_libdir) \
                --enable-compat185 \
                --enable-cxx \
                --with-uniquename \
@@ -82,7 +83,7 @@ src_compile() {
 
 src_install () {
 
-       einstall || die
+       einstall libdir="${D}/usr/$(get_libdir)" || die
 
        db_src_install_usrbinslot
 

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 1b3e3da1e1e71177c18faf5b7ba83c0b373aa386..af98c10e7b7da048d55853b31efb9d1935b2ea65 100644 (file)
--- 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.28 2004/11/30 19:37:20 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.29 2004/12/16 10:29:20 eradicator Exp $
 
 inherit eutils gnuconfig db
 
@@ -80,6 +80,7 @@ src_compile() {
                --datadir=/usr/share \
                --sysconfdir=/etc \
                --localstatedir=/var/lib \
+               --libdir=/usr/$(get_libdir) \
                --enable-compat185 \
                --enable-cxx \
                --with-uniquename \
@@ -91,7 +92,7 @@ src_compile() {
 
 src_install () {
 
-       einstall || die
+       einstall libdir="${D}/usr/$(get_libdir)" || die
 
        db_src_install_usrbinslot
 

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 09f71185e3156eab3634b4fb2c5cb333efbdb280..7673a1a831362ccc903c10df14daef552562cfd4 100644 (file)
--- 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.12 2004/12/14 16:21:50 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.13 2004/12/16 10:29:20 eradicator Exp $
 
 inherit eutils gnuconfig db
 
@@ -88,6 +88,7 @@ src_compile() {
                --datadir=/usr/share \
                --sysconfdir=/etc \
                --localstatedir=/var/lib \
+               --libdir=/usr/$(get_libdir) \
                --enable-compat185 \
                --with-uniquename \
                --host=${CHOST} \
@@ -98,7 +99,7 @@ src_compile() {
 
 src_install () {
 
-       einstall || die
+       einstall libdir="${D}/usr/$(get_libdir)" || die
 
        db_src_install_usrbinslot
 

diff --git a/sys-libs/db/db-4.2.52_p1.ebuild b/sys-libs/db/db-4.2.52_p1.ebuild
index 9c84e4dac349da5bf8b349d946234ae735af8503..04f299e4e7c623d9fb0687016be68ea83f31a934 100644 (file)
--- a/sys-libs/db/db-4.2.52_p1.ebuild
+++ b/sys-libs/db/db-4.2.52_p1.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_p1.ebuild,v 1.7 2004/09/01 18:24:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p1.ebuild,v 1.8 2004/12/16 10:29:20 eradicator 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
@@ -91,6 +91,7 @@ src_compile() {
                --datadir=/usr/share \
                --sysconfdir=/etc \
                --localstatedir=/var/lib \
+               --libdir=/usr/$(get_libdir) \
                --enable-compat185 \
                --enable-cxx \
                --with-uniquename \
@@ -101,7 +102,7 @@ src_compile() {
 
 src_install () {
 
-       einstall || die
+       einstall libdir="${D}/usr/$(get_libdir)" || die
 
        db_src_install_usrbinslot
 

diff --git a/sys-libs/db/db-4.2.52_p2.ebuild b/sys-libs/db/db-4.2.52_p2.ebuild
index d2739277dbc41243d61ec2eb274a54ffe434c7c1..054091bf396ef473648697697bbc97ca106ca84d 100644 (file)
--- 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.11 2004/12/08 15:51:41 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p2.ebuild,v 1.12 2004/12/16 10:29:20 eradicator Exp $
 
 IUSE="tcltk java doc"
 
@@ -92,6 +92,7 @@ src_compile() {
                --datadir=/usr/share \
                --sysconfdir=/etc \
                --localstatedir=/var/lib \
+               --libdir=/usr/$(get_libdir) \
                --enable-compat185 \
                --enable-cxx \
                --with-uniquename \
@@ -102,7 +103,7 @@ src_compile() {
 
 src_install () {
 
-       einstall || die
+       einstall libdir="${D}/usr/$(get_libdir)" || die
 
        db_src_install_usrbinslot