More multilib fixes thanks to Christophe Saout, bug 104509.

Package-Manager: portage-2.0.51.22-r2

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 5348ba24c7c081fe4014c6c2a8c8fe0c6eab3309..9effebb051f6bf177051050a526c39a50e7f63b0 100644 (file)
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.151 2005/09/04 11:49:15 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.152 2005/09/05 14:46:38 herbs Exp $
+
+  05 Sep 2005; Herbie Hopkins <herbs@gentoo.org> perl-5.8.7.ebuild:
+  More multilib fixes thanks to Christophe Saout, bug 104509.
 
   04 Sep 2005; Elfyn McBratney <beu@gentoo.org>
   files/perl-5.8.7-regexp-nossp.patch:

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 1a191a8b5858b89a6a4911ecf1bc8083c1fd0916..55f85d41383554ba8c26d295c71fe80f59a45c94 100644 (file)
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,35 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d9dff60a26106a24dd9d315f82f0719d perl-5.8.7.ebuild 19097
+MD5 4f053817f817904cf1ad814f1811161e perl-5.8.7.ebuild 19239
 MD5 933d62fc4adab220ae0707bf6ba26f25 perl-5.8.6-r5.ebuild 17611
+MD5 21121bd2871415704facb6d289c79e3f ChangeLog 42446
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 2e2c376f0953048ce02aa8081c7ebbb5 ChangeLog 42313
-MD5 ce442db939c59218a16be167f793b817 files/perl-uclibc.patch 573
-MD5 01af75daf3d222a668059e90d78a1f9d files/perl-nonblock.patch 400
-MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629
-MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64
 MD5 26a1e7c48c7f68f39db4262500f6a1d8 files/perl-5.8.7-tempfiles.patch 1007
 MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-picdl.patch 250
-MD5 528fa2521c530d5a47df32b663e629af files/perl-5.8.7-regexp-nossp.patch 460
 MD5 f98759a75347e0b54190850b8295c2cb files/perl-tempfiles.patch 2023
-MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-noksh.patch 611
-MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115
-MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446
-MD5 c2612d59f380ad6e0c2de4d941e83dfd files/perl-cleaner 8879
-MD5 4e99f7529e149661372283c981cf17ff files/perl-prelink-lpthread.patch 476
 MD5 f7324a62f22aabde3387b7e8a8b2106e files/perl-reorder-INC.patch 1141
-MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068
+MD5 4e99f7529e149661372283c981cf17ff files/perl-prelink-lpthread.patch 476
+MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-noksh.patch 611
+MD5 01af75daf3d222a668059e90d78a1f9d files/perl-nonblock.patch 400
 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703
+MD5 c2612d59f380ad6e0c2de4d941e83dfd files/perl-cleaner 8879
 MD5 5dfd23c2236b382d031a9513bc12f3f1 files/perl-5.8.5-tempfiles.patch 2113
-MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428
+MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-perldoc-emptydirs.patch 489
 MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7 64
 MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961
-MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-perldoc-emptydirs.patch 489
+MD5 ce442db939c59218a16be167f793b817 files/perl-uclibc.patch 573
+MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115
+MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629
+MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64
+MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446
+MD5 528fa2521c530d5a47df32b663e629af files/perl-5.8.7-regexp-nossp.patch 460
+MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428
+MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDGu18jUHll2nfF60RAhLbAJ94DOoI36sC9ondFAfazvveZxEg9ACgsyoN
-QrmZBJZ7XA1TNI1vheI91DM=
-=lRi5
+iD8DBQFDHFpm2G5bA0cA/ScRArvnAKCtKt6bl4wMJVNlZmUiJwWK3cfSmACdFsJm
+4e75EuFf2vjvF30b9sPu39k=
+=CEhK
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/perl/perl-5.8.7.ebuild b/dev-lang/perl/perl-5.8.7.ebuild
index 6aaa78e87349f898ccf126bab01ae34812f0c221..c6048a1af7636cc22bfdf2241544a84bf0ae1141 100644 (file)
--- a/dev-lang/perl/perl-5.8.7.ebuild
+++ b/dev-lang/perl/perl-5.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7.ebuild,v 1.11 2005/09/04 06:22:00 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7.ebuild,v 1.12 2005/09/05 14:46:39 herbs Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -218,6 +218,11 @@ src_configure() {
 
        [[ ${ELIBC} == "FreeBSD" ]] && myconf="${myconf} -Dlibc=/usr/lib/libc.a"
 
+       if [[ $(get_libdir) != "lib" ]] ; then
+               myconf="${myconf} -Dlibpth='/usr/local/$(get_libdir) /$(get_libdir) \
+               /usr/$(get_libdir)'"
+       fi
+
        sh Configure -des \
                -Darchname="${myarch}" \
                -Dcccdlflags='-fPIC' \