multilib fixes for amd64's 2005.0.

Package-Manager: portage-2.0.51-r13

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 1f69b6c4ce78313c4965258b6d12967dc73ccce2..6a5e695e46d612520d98592444c50c72d78999c4 100644 (file)
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/perl
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.101 2004/12/29 22:03:25 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.102 2005/01/16 17:56:50 eradicator Exp $
+
+  16 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  perl-5.8.5-r2.ebuild, perl-5.8.6-r1.ebuild, perl-5.8.6.ebuild:
+  multilib fixes for amd64's 2005.0.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index b54d39642e1aa931b0bcd4eb80f84f95d252b4ac..7bbb2efccb8ec11700aa7871b9e4ffcc43b6cf53 100644 (file)
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,44 +1,54 @@
-MD5 f26a32cd5257f9f0f9582cea15a1836b perl-5.8.5.ebuild 11515
-MD5 290436c9dd02b452400830bb5820132f perl-5.8.6-r1.ebuild 11718
-MD5 55eb9292a050b8a1f33bdb7a3a4177aa perl-5.8.4-r1.ebuild 12148
-MD5 54e6d30d2f25356da85572b4f126c609 ChangeLog 31133
-MD5 eb87d12c071d618361010dc200c96a80 perl-5.8.5-r1.ebuild 11327
-MD5 b0e5e06b8171deef98febb36052ffe23 perl-5.8.6.ebuild 11329
-MD5 2aa17a409e6c2ecec0f52176bca8b34f perl-5.8.5-r2.ebuild 11705
-MD5 bf56ee74ad687ee93d617e0897514b11 perl-5.8.2-r1.ebuild 10010
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 349757b6d82860a12cfe61fb6f8f05f6 ChangeLog 31296
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 01af75daf3d222a668059e90d78a1f9d files/perl-5.8.4-nonblock.patch 400
-MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.6-noksh.patch 611
-MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.5-picdl.patch 250
-MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.4-reorder-INC.patch 2211
+MD5 0a8a42957053c5e35daeef59a80e5e10 perl-5.8.2-r1.ebuild 10011
+MD5 b37d94840cedea35d672ff8db46b1a47 perl-5.8.5-r2.ebuild 11774
+MD5 543934693fe590d4cf99d72f7b9e70ab perl-5.8.6-r1.ebuild 11791
+MD5 b36304514ba321213f46228cef0308f3 perl-5.8.4-r1.ebuild 12152
+MD5 76294281f5b62cd9789c43267e1d8b95 perl-5.8.6.ebuild 11402
+MD5 209da21854ae41ebdaedb6707fb6c3a2 perl-5.8.5-r1.ebuild 11334
+MD5 3e38f787015236ca28ffdbcbfcffc52a perl-5.8.5.ebuild 11519
+MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2-r1 64
 MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-perl-5.8.5-r1 64
-MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428
-MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.6-reorder-INC.patch 2211
+MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-perl-5.8.5-r2 64
 MD5 6caaa0ce64adceb186379769063b3250 files/libperl_rebuilder 10260
-MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.5-prelink-lpthread.patch 476
+MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
+MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.2-perldoc-emptydirs.patch 489
+MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.2-picdl.patch 250
+MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.2-prelink-lpthread.patch 476
 MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.2-reorder-INC.patch 2211
+MD5 5dfd23c2236b382d031a9513bc12f3f1 files/perl-5.8.5-tempfiles.patch 2113
+MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.6-noksh.patch 611
+MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.6-perldoc-emptydirs.patch 489
+MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.6-picdl.patch 250
 MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.4-noksh.patch 611
-MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.5-reorder-INC.patch 2211
+MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.4-perldoc-emptydirs.patch 489
 MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.4-picdl.patch 250
-MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-perl-5.8.4-r1 64
-MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r1 64
-MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2-r1 64
-MD5 ce442db939c59218a16be167f793b817 files/perl-5.8.2-uclibc.patch 573
 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.4-prelink-lpthread.patch 476
+MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.4-reorder-INC.patch 2211
 MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884
-MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115
-MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6 64
-MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.2-perldoc-emptydirs.patch 489
-MD5 01af75daf3d222a668059e90d78a1f9d files/perl-5.8.5-nonblock.patch 400
-MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.6-perldoc-emptydirs.patch 489
-MD5 5dfd23c2236b382d031a9513bc12f3f1 files/perl-5.8.5-tempfiles.patch 2113
-MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.6-prelink-lpthread.patch 476
-MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
-MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.2-prelink-lpthread.patch 476
+MD5 ce442db939c59218a16be167f793b817 files/perl-5.8.2-uclibc.patch 573
+MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-perl-5.8.4-r1 64
+MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428
+MD5 01af75daf3d222a668059e90d78a1f9d files/perl-5.8.4-nonblock.patch 400
 MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-perl-5.8.5 64
 MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.5-noksh.patch 611
-MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.4-perldoc-emptydirs.patch 489
-MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-perl-5.8.5-r2 64
+MD5 01af75daf3d222a668059e90d78a1f9d files/perl-5.8.5-nonblock.patch 400
 MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.5-perldoc-emptydirs.patch 489
-MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.6-picdl.patch 250
-MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.2-picdl.patch 250
+MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.5-picdl.patch 250
+MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.5-prelink-lpthread.patch 476
+MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.5-reorder-INC.patch 2211
+MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6 64
+MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r1 64
+MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.6-prelink-lpthread.patch 476
+MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.6-reorder-INC.patch 2211
+MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB6qrsArHZZzCEUG0RAvglAJ99Sii3Vx/fcvL8fYeLbGnVBDnD5ACfTeMb
+Y4rMyDhUILxNjR9WAGkyB9c=
+=Ogx/
+-----END PGP SIGNATURE-----

diff --git a/dev-lang/perl/perl-5.8.2-r1.ebuild b/dev-lang/perl/perl-5.8.2-r1.ebuild
index 381a5edd7caf15e396ef81c655dcf71afe8afaf6..9de19fd7bc555f361605e9986fffeab94aac8fd9 100644 (file)
--- a/dev-lang/perl/perl-5.8.2-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2-r1.ebuild,v 1.23 2004/10/25 11:41:36 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r1.ebuild,v 1.24 2005/01/16 17:56:50 eradicator Exp $
 
 inherit eutils flag-o-matic gcc
 

diff --git a/dev-lang/perl/perl-5.8.4-r1.ebuild b/dev-lang/perl/perl-5.8.4-r1.ebuild
index 3f7577a935ba9cc0fa4e551f205274602988c1f4..53af1a5efae80f168f434b089348a8464b992d0f 100644 (file)
--- a/dev-lang/perl/perl-5.8.4-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.4-r1.ebuild,v 1.20 2004/11/12 15:18:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r1.ebuild,v 1.21 2005/01/16 17:56:50 eradicator Exp $
 
 inherit eutils flag-o-matic gcc
 

diff --git a/dev-lang/perl/perl-5.8.5-r1.ebuild b/dev-lang/perl/perl-5.8.5-r1.ebuild
index 572ff90f9de111b5bd71bb902c9e186ef749f2c1..dc9aa4770fcfcc95672eebf514cb7147cdda1e7d 100644 (file)
--- a/dev-lang/perl/perl-5.8.5-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.5-r1.ebuild,v 1.2 2004/11/14 01:00:27 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r1.ebuild,v 1.3 2005/01/16 17:56:50 eradicator Exp $
 
 inherit eutils flag-o-matic gcc
 

diff --git a/dev-lang/perl/perl-5.8.5-r2.ebuild b/dev-lang/perl/perl-5.8.5-r2.ebuild
index 8059780da407abd99d240dcc390f361f3e994729..836505804549097c7acb1caa668cf32cacfbc1be 100644 (file)
--- a/dev-lang/perl/perl-5.8.5-r2.ebuild
+++ b/dev-lang/perl/perl-5.8.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.5-r2.ebuild,v 1.6 2004/12/07 20:42:51 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r2.ebuild,v 1.7 2005/01/16 17:56:50 eradicator Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -199,6 +199,8 @@ src_configure() {
                myconf="${myconf} -Ui_db -Ui_ndbm"
        fi
 
+       [ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)"
+
        sh Configure -des \
                -Darchname="${myarch}" \
                -Dcccdlflags='-fPIC' \

diff --git a/dev-lang/perl/perl-5.8.5.ebuild b/dev-lang/perl/perl-5.8.5.ebuild
index e08950f5e8a5222190386f5bcf06989905f785bb..d2845d288ca18e0433fe227af37bed4b6e7e5708 100644 (file)
--- a/dev-lang/perl/perl-5.8.5.ebuild
+++ b/dev-lang/perl/perl-5.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.5.ebuild,v 1.11 2004/11/12 15:18:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5.ebuild,v 1.12 2005/01/16 17:56:50 eradicator Exp $
 
 inherit eutils flag-o-matic gcc
 

diff --git a/dev-lang/perl/perl-5.8.6-r1.ebuild b/dev-lang/perl/perl-5.8.6-r1.ebuild
index 506a0eeefecbd51976b50821646ad8f9ea3b4179..79548d574da4102e975acb42108d57209d31bd5c 100644 (file)
--- a/dev-lang/perl/perl-5.8.6-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-r1.ebuild,v 1.1 2004/12/04 20:14:30 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r1.ebuild,v 1.2 2005/01/16 17:56:50 eradicator Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -199,6 +199,8 @@ src_configure() {
                myconf="${myconf} -Ui_db -Ui_ndbm"
        fi
 
+       [ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)"
+
        sh Configure -des \
                -Darchname="${myarch}" \
                -Dcccdlflags='-fPIC' \

diff --git a/dev-lang/perl/perl-5.8.6.ebuild b/dev-lang/perl/perl-5.8.6.ebuild
index e254171f0b5102895eaaba92badb8f93327fe51c..580e5141a05fb44041654394975b4fe01cc6912d 100644 (file)
--- a/dev-lang/perl/perl-5.8.6.ebuild
+++ b/dev-lang/perl/perl-5.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.ebuild,v 1.2 2004/12/01 22:50:49 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6.ebuild,v 1.3 2005/01/16 17:56:50 eradicator Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -190,6 +190,8 @@ src_configure() {
                myconf="${myconf} -Ui_db -Ui_ndbm"
        fi
 
+       [ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)"
+
        sh Configure -des \
                -Darchname="${myarch}" \
                -Dcccdlflags='-fPIC' \