Reverting changes made for bug 59328 until we can figure out why this breaks under...

Package-Manager: portage-2.1.2_rc4-r3

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 09046e7bfc4d783f5aee387cdf4432e127f4bc60..fcbe199f2a7a93f557dca9d0522fa4d9bc6887e5 100644 (file)
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.237 2007/01/09 12:55:06 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.238 2007/01/11 03:28:29 mcummings Exp $
+
+  11 Jan 2007; Michael Cummings <mcummings@gentoo.org> perl-5.8.8-r2.ebuild:
+  Reverting changes made for bug 59328 until we can figure out why this breaks
+  under catalyst
 
   09 Jan 2007; Michael Cummings <mcummings@gentoo.org> perl-5.8.8-r2.ebuild:
   Bug 144965, adjusted gcc patch line

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 5b05dc328f757fb206276374c708097b9ce8f8e3..47f708457b60075ca386f8ad940a2dfb8cd2d385 100644 (file)
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -70,14 +70,14 @@ MD5 528fa2521c530d5a47df32b663e629af files/perl-regexp-nossp.patch 460
 RMD160 dde3a25904275896e98d7b7f3a02926c8dbc5ca5 files/perl-regexp-nossp.patch 460
 SHA256 e2d923711bb856b3c7f790dbc1cd1f468d647c1e50a3ff8a18745023c73b3e36 files/perl-regexp-nossp.patch 460
 DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b SHA1 4aab490040727ca4419098720eca2ba4367df539 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9
-EBUILD perl-5.8.8-r2.ebuild 18759 RMD160 0285680816524fefe8a1d90abe423ebf7e814454 SHA1 b6fe4eec631f5e41a27cf00e4e4af19e844ff627 SHA256 4585b88beb0837933d861bdf799bf902e4fc9bca7716ef09bbeeefd6ce4fb407
-MD5 c7455229a008d6cc2dc818848d062f36 perl-5.8.8-r2.ebuild 18759
-RMD160 0285680816524fefe8a1d90abe423ebf7e814454 perl-5.8.8-r2.ebuild 18759
-SHA256 4585b88beb0837933d861bdf799bf902e4fc9bca7716ef09bbeeefd6ce4fb407 perl-5.8.8-r2.ebuild 18759
-MISC ChangeLog 54151 RMD160 7841377122d073ab9d4bbcedc35be8364984a64f SHA1 a4523ea999a55e45ff9823a4d88e082d0c3567d7 SHA256 cb036f87ba39ae57e3d3af7652dc6a52f544cf41a5bb09ccebd41050f9a4bd13
-MD5 5c5493ec9c086d4cfa381853fe207270 ChangeLog 54151
-RMD160 7841377122d073ab9d4bbcedc35be8364984a64f ChangeLog 54151
-SHA256 cb036f87ba39ae57e3d3af7652dc6a52f544cf41a5bb09ccebd41050f9a4bd13 ChangeLog 54151
+EBUILD perl-5.8.8-r2.ebuild 18251 RMD160 de09de0b91b26598575be1fddc44e152cdce5862 SHA1 cbb0130d0b7e70e1c4c91633a2dca0de027fa42a SHA256 83e682f2da607d7658a9f77586644eac4bd6d30582c9308fed7381faceac6f2b
+MD5 da37a324ad83a7757ba0b462e7c9a143 perl-5.8.8-r2.ebuild 18251
+RMD160 de09de0b91b26598575be1fddc44e152cdce5862 perl-5.8.8-r2.ebuild 18251
+SHA256 83e682f2da607d7658a9f77586644eac4bd6d30582c9308fed7381faceac6f2b perl-5.8.8-r2.ebuild 18251
+MISC ChangeLog 54325 RMD160 43ee92a7852b6dc96d41583484bf66116795fa25 SHA1 a0f61cfd03a8893a0bf67f0bd2a204c2db0b8f46 SHA256 b65a97ad65f2458417304118628dca4d25bc5402efca96f9ebe8dc4d9ebd159d
+MD5 27a0127c7d09cf9a76df4aee2fdffa8a ChangeLog 54325
+RMD160 43ee92a7852b6dc96d41583484bf66116795fa25 ChangeLog 54325
+SHA256 b65a97ad65f2458417304118628dca4d25bc5402efca96f9ebe8dc4d9ebd159d ChangeLog 54325
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
@@ -88,7 +88,7 @@ SHA256 1067b25eabccaa2d61cfc9db27e31c6b18d075e440713e44dcde000c71bbf178 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFo5CwtG5z4I8BtQoRApWyAJ9ORlGOHVe2tJZtOJZu8SVdwjz5vACghv4B
-f7Mghzfpxj8L2XwtyCR6XMc=
-=q5oH
+iD8DBQFFpa7jtG5z4I8BtQoRAmUUAKCNgNkoSbZ75k7V2+TXF1y90L2OMwCggb5U
+Zc4YjF1c0juAtToZ2Onbrq4=
+=ciBc
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/perl/perl-5.8.8-r2.ebuild b/dev-lang/perl/perl-5.8.8-r2.ebuild
index 816cfac7b7b34bf6e745182831179732cf069bfa..41292f44458511b106686ade61203e9323f0757f 100644 (file)
--- a/dev-lang/perl/perl-5.8.8-r2.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.27 2007/01/09 12:55:06 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.28 2007/01/11 03:28:29 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -236,40 +236,7 @@ src_configure() {
                myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
        fi
 
-       if has noman ${FEATURES} ; then
-               myconf "-Dinstallman1dir='' \
-               -Dinstallman3dir='' \
-               -Dinstallsiteman1dir='' \
-               -Dinstallsiteman3dir='' \
-               -Dinstallvendorman1dir='' \
-               -Dinstallvendorman3dir='' \
-               -Dman1dir='' \
-               -Dman1direxp='' \
-               -Dman1ext='0' \
-               -Dman3dir='' \
-               -Dman3direxp='' \
-               -Dman3ext='0' \
-               -Dsiteman1dir='' \
-               -Dsiteman1direxp='' \
-               -Dsiteman3dir='' \
-               -Dsiteman3direxp='' \
-               -Dsysman='' \
-               -Dvendorman1dir='' \
-               -Dvendorman1direxp='' \
-               -Dvendorman3dir='' \
-               -Dvendorman3direxp='' 
-               "
-       else
-               myconf "-Dman1dir=/usr/share/man/man1 \
-               -Dman3dir=/usr/share/man/man3 \
-               -Dinstallman1dir=/usr/share/man/man1 \
-               -Dinstallman3dir=/usr/share/man/man3 \
-               -Dman1ext='1' \
-               -Dman3ext='3pm'
-               "
-       fi
-
-       sh Configure -des \
+               sh Configure -des \
                -Darchname="${myarch}" \
                -Dcccdlflags='-fPIC' \
                -Dccdlflags='-rdynamic' \
@@ -282,6 +249,13 @@ src_configure() {
                -Duselargefiles \
                -Dd_semctl_semun \
                -Dscriptdir=/usr/bin \
+               -Dman1dir=/usr/share/man/man1 \
+               -Dman3dir=/usr/share/man/man3 \
+               -Dinstallman1dir=/usr/share/man/man1 \
+               -Dinstallman3dir=/usr/share/man/man3 \
+               -Dman1ext='1' \
+               -Dman3ext='3pm' \
+               -Dinc_version_list="$inclist" \
                -Dinc_version_list="$inclist" \
                -Dcf_by='Gentoo' \
                -Ud_csh \