Backported some get_libdir functionality from 5.8.7 to 5.8.6-r6 to resolve bug #11224...

Package-Manager: portage-2.0.53_rc7

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 6067bec3d9270fc1b695294555ec1f91418f3c59..de722b354872db9f540fddfcdf643f86a490bbda 100644 (file)
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,10 @@
 # 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.163 2005/10/02 00:54:19 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.164 2005/11/12 10:37:55 chriswhite Exp $
+
+  12 Nov 2005; Chris White <chriswhite@gentoo.org> perl-5.8.6-r6.ebuild:
+  Backported some get_libdir functionality from 5.8.7 to 5.8.6-r6 to resolve
+  bug #112243. This is mainly a multi-lib support fix it seems.
 
   02 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> perl-5.8.7-r1.ebuild:
   Stable on ia64, bug 106678.

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 8925e997cfb9d2a7d96a5a38ddea1297116b9d06..d2ca082b8feb5820871c7ccef8e73097f041bfde 100644 (file)
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 03cc33fea015177bbac665dcd90d286b ChangeLog 43770
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 933d62fc4adab220ae0707bf6ba26f25 perl-5.8.6-r5.ebuild 17611
-MD5 0a8db6ec394840659a67d360db44f016 perl-5.8.6-r6.ebuild 17852
-MD5 1034b160ad486e2daeb9792934995c42 perl-5.8.7-r1.ebuild 19472
-MD5 4f053817f817904cf1ad814f1811161e perl-5.8.7.ebuild 19239
+MD5 e1f7a7180ea366e4dab5d5ac5c0fdd67 ChangeLog 43989
 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703
 MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64
+MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r6 64
 MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7 64
+MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7-r1 64
 MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068
 MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428
 MD5 5dfd23c2236b382d031a9513bc12f3f1 files/perl-5.8.5-tempfiles.patch 2113
 MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115
 MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961
+MD5 044b90a8895f8a03bef8e4cf5759eecc files/perl-5.8.7-MakeMaker-RUNPATH.patch 859
 MD5 528fa2521c530d5a47df32b663e629af files/perl-5.8.7-regexp-nossp.patch 460
 MD5 26a1e7c48c7f68f39db4262500f6a1d8 files/perl-5.8.7-tempfiles.patch 1007
 MD5 c2612d59f380ad6e0c2de4d941e83dfd files/perl-cleaner 8879
@@ -28,13 +26,15 @@ MD5 4e99f7529e149661372283c981cf17ff files/perl-prelink-lpthread.patch 476
 MD5 f7324a62f22aabde3387b7e8a8b2106e files/perl-reorder-INC.patch 1141
 MD5 f98759a75347e0b54190850b8295c2cb files/perl-tempfiles.patch 2023
 MD5 ce442db939c59218a16be167f793b817 files/perl-uclibc.patch 573
-MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r6 64
-MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7-r1 64
-MD5 044b90a8895f8a03bef8e4cf5759eecc files/perl-5.8.7-MakeMaker-RUNPATH.patch 859
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 933d62fc4adab220ae0707bf6ba26f25 perl-5.8.6-r5.ebuild 17611
+MD5 82b0f8a73c0be6d6e95e5ed5d2bdeb25 perl-5.8.6-r6.ebuild 17996
+MD5 1034b160ad486e2daeb9792934995c42 perl-5.8.7-r1.ebuild 19472
+MD5 4f053817f817904cf1ad814f1811161e perl-5.8.7.ebuild 19239
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDPy/JKf2g/qXtneoRAiaaAJ9et76HulGRt7oJ+sctO46vJKgj9gCZAf5l
-X3SCjwHlgBAbn98sLsWvexk=
-=4Sqq
+iD8DBQFDdjzoFdQwWVoAgN4RAkCdAKC7GdOkb+5ENXYaVqwdyKJFxeVeogCdGQc7
+lu/r6qjV7ANu77G8tvQBIQk=
+=W4MK
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/perl/perl-5.8.6-r6.ebuild b/dev-lang/perl/perl-5.8.6-r6.ebuild
index 06151d4142f9c2bab270cad2416ba9781e574e03..f67055c08574da3d0746b626f6830e27a48779f0 100644 (file)
--- a/dev-lang/perl/perl-5.8.6-r6.ebuild
+++ b/dev-lang/perl/perl-5.8.6-r6.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.6-r6.ebuild,v 1.7 2005/09/29 17:32:20 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r6.ebuild,v 1.8 2005/11/12 10:37:55 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -227,6 +227,12 @@ 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' \