Version bump

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

5 files changed, 156 insertions, 6 deletions

diff --git a/perl-core/ExtUtils-MakeMaker/ChangeLog b/perl-core/ExtUtils-MakeMaker/ChangeLog
index b8fdc4700262..206eed20cca4 100644
--- a/perl-core/ExtUtils-MakeMaker/ChangeLog
+++ b/perl-core/ExtUtils-MakeMaker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for perl-core/ExtUtils-MakeMaker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ChangeLog,v 1.22 2011/01/17 08:11:00 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ChangeLog,v 1.23 2011/07/09 17:37:47 tove Exp $
+
+*ExtUtils-MakeMaker-6.580.0 (09 Jul 2011)
+
+  09 Jul 2011; Torsten Veller <tove@gentoo.org> +files/6.58-RUNPATH.patch,
+  +files/6.58-delete_packlist_podlocal.patch,
+  +ExtUtils-MakeMaker-6.580.0.ebuild:
+  Version bump
 
   17 Jan 2011; Torsten Veller <tove@gentoo.org>
   -ExtUtils-MakeMaker-6.56.ebuild:
diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.580.0.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.580.0.ebuild
new file mode 100644
index 000000000000..81a380f81b04
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.580.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.580.0.ebuild,v 1.1 2011/07/09 17:37:47 tove Exp $
+
+EAPI=4
+MODULE_VERSION="6.58"
+MODULE_AUTHOR=MSCHWERN
+inherit eutils perl-module
+
+DESCRIPTION="Create a module Makefile"
+HOMEPAGE="http://makemaker.org ${HOMEPAGE}"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="
+	>=virtual/perl-CPAN-Meta-2.110.930
+	>=virtual/perl-ExtUtils-Command-1.16
+	>=virtual/perl-ExtUtils-Install-1.52
+	>=virtual/perl-ExtUtils-Manifest-1.58
+	>=virtual/perl-Parse-CPAN-Meta-1.440.100
+	>=virtual/perl-File-Spec-0.8
+"
+RDEPEND="${DEPEND}
+	!!<dev-lang/perl-5.8.8-r7"
+
+PATCHES=(
+	"${FILESDIR}/6.58-delete_packlist_podlocal.patch"
+	"${FILESDIR}/6.58-RUNPATH.patch"
+)
+SRC_TEST=do
+
+src_prepare (){
+	edos2unix "${S}/lib/ExtUtils/MM_Unix.pm"
+	edos2unix "${S}/lib/ExtUtils/MM_Any.pm"
+
+	perl-module_src_prepare
+}
+
+src_install() {
+	perl-module_src_install
+
+	# remove all the bundled distributions
+	pushd "${D}" >/dev/null
+	find ".${VENDOR_LIB}" -mindepth 1 -maxdepth 1 -not -name "ExtUtils" -exec rm -rf {} \+
+	popd >/dev/null
+}
diff --git a/perl-core/ExtUtils-MakeMaker/Manifest b/perl-core/ExtUtils-MakeMaker/Manifest
index cafc4d0abe62..0502ae8f86b3 100644
--- a/perl-core/ExtUtils-MakeMaker/Manifest
+++ b/perl-core/ExtUtils-MakeMaker/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 6.56-delete_packlist_podlocal.patch 3030 RMD160 47c52bb8cdb5c6a7ce1a1fac5dd2214c710b6d4c SHA1 76f99871fb33ccdcb5ab3b389e047726b9a78936 SHA256 bc79443cf1a4e1621e3a93e32706087e79a888fe3aa20510af483404c5689136
+AUX 6.58-RUNPATH.patch 723 RMD160 10a19b873763b03464ba934a6c84dc7fb6c6172d SHA1 abd68676af4b998658c5e8350fab6085dcdc2fc8 SHA256 e252bd4b044f5b79f19f8263c31ca6bb61686acadbf68c9ef933d51e67274731
+AUX 6.58-delete_packlist_podlocal.patch 2835 RMD160 45230e1b0b214ece984b2534a721757078b249d3 SHA1 2e92e8e0a5071ee75bf0240fce5663fa198f3d7d SHA256 ae79d7fc00fe9dcb30deb49366ac6d6df8fa2b610fadd70693ad100d287f0d8c
 AUX RUNPATH-6.54.patch 943 RMD160 1e2cf0bbd3554ab2d563cc9db3cff6f861cda847 SHA1 872e5aac55f0b21bba1f5d48e7da17c315cf0fa8 SHA256 d78e74b722c9fddb827c63d48e0c69a3ae3e45f1ddd3a42c79e6d90fde62b327
 DIST ExtUtils-MakeMaker-6.56.tar.gz 269788 RMD160 6a169a0b3fbf53341196bd97f32e3d33e596b227 SHA1 3f557c5cb8a4a0165d1b2e597f973003d8a49570 SHA256 8bb4a911e06204e5f6fb54f55b121bf97150844039238542b66291cda7a444c4
+DIST ExtUtils-MakeMaker-6.58.tar.gz 414244 RMD160 167b499623b823a1712a2ca0b8a52118d1715dda SHA1 1510b3a094badbb1814e70981f6d6dd6d0f6a854 SHA256 a9701ef338c9c773cbef5b22a25ddf1c73c47393784d0c750af328dc6123c192
 EBUILD ExtUtils-MakeMaker-6.56-r1.ebuild 726 RMD160 e02b2ebbadb24d8f4c4b15fb53461fb744cbac32 SHA1 f16c556daedd34ea643c90835bc4875adda6eb7b SHA256 2a3c7620d408c027ad852dbcf6f01967e8dd340adb4bb68cbab9646c53dd9cb4
-MISC ChangeLog 2878 RMD160 9ad80dea198ebf5f20c892296b879ef03ce2aabb SHA1 385b88f5851e28ddba3430ad47a941810129f9fe SHA256 557d5f5cb00e2bce967db16c92e65f0ba3fd4572f9addcd53ce8b8bc605f4948
+EBUILD ExtUtils-MakeMaker-6.580.0.ebuild 1207 RMD160 dc3b5a376dc0d3508ab9a08ec810df98ec274acf SHA1 7a40a257bce2cfece6184cc4a29bfbd82c445bd2 SHA256 a7b7246aa14dce54b534d439d6f9371d3c387c5490ef9b87b80797be3f06df44
+MISC ChangeLog 3096 RMD160 59d79dac3c5c30af71f94d5a0e42f0a59882dab6 SHA1 56c09d12a57905dd967d755008471da503b4ed9f SHA256 34fbfb4ce82974bf535f44428813b246ad112c84e45771d7a681d247d993aac7
 MISC metadata.xml 244 RMD160 1a789b65c26276ab126e63ba550598d413ce1b53 SHA1 30fc7ca2aae6a7b1834fcdfb8c7b3b697768d77b SHA256 a48f9fccdba1365367fdf76476d62f81e36864540da13472f3c92f6f490d93f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0z+ZoACgkQV3J2n04EauxGMACfVfbOn55oNpvJc2O3bSJ5FMTN
-gcYAoLmx2/QoRq4p/UEaTa+KaKurOO+n
-=7Ea4
+iEYEAREIAAYFAk4YkfEACgkQV3J2n04Eauym+QCePrq//E89o2to0IcpxzLOdsXF
+9XsAnjQcu0XkuHZ5gnkZSLVsf9wZJYLn
+=DMPp
 -----END PGP SIGNATURE-----
diff --git a/perl-core/ExtUtils-MakeMaker/files/6.58-RUNPATH.patch b/perl-core/ExtUtils-MakeMaker/files/6.58-RUNPATH.patch
new file mode 100644
index 000000000000..41f26098b2bd
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/files/6.58-RUNPATH.patch
@@ -0,0 +1,16 @@
+--- a/lib/ExtUtils/MM_Any.pm
++++ b/lib/ExtUtils/MM_Any.pm
+@@ -1900,6 +1900,13 @@ CODE
+             # LD_RUN_PATH now computed by ExtUtils::Liblist
+             ($self->{EXTRALIBS},  $self->{BSLOADLIBS}, 
+              $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
++            # We do not want the build root in RPATH
++            if ( exists $ENV{PORTAGE_TMPDIR} ){
++                # If we have a PORTAGE_TMPDIR set, strip that, as just testing for
++                # /usr and /opt might not be sufficient.
++                $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/,
++                                       split /:/, $self->{LD_RUN_PATH};
++            }
+             last;
+         }
+     }
diff --git a/perl-core/ExtUtils-MakeMaker/files/6.58-delete_packlist_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/6.58-delete_packlist_podlocal.patch
new file mode 100644
index 000000000000..c42d1d2c9f45
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/files/6.58-delete_packlist_podlocal.patch
@@ -0,0 +1,76 @@
+Don't install .packlist or perllocal.pod for perl or vendor.
+Extracted from the debian patchset.
+See also bug #241834
+---
+ lib/ExtUtils/MM_Unix.pm |   25 +------------------------
+ 1 files changed, 1 insertions(+), 24 deletions(-)
+
+diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
+index 10fcdf4..642b677 100644
+--- a/lib/ExtUtils/MM_Unix.pm
++++ b/lib/ExtUtils/MM_Unix.pm
+@@ -2047,8 +2047,6 @@ doc__install : doc_site_install
+ 
+ pure_perl_install :: all
+ 	$(NOECHO) $(MOD_INSTALL) \
+-		read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
+-		write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
+ 		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
+ 		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
+ 		$(INST_BIN) $(DESTINSTALLBIN) \
+@@ -2074,8 +2072,6 @@ pure_site_install :: all
+ 
+ pure_vendor_install :: all
+ 	$(NOECHO) $(MOD_INSTALL) \
+-		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
+-		write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
+ 		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
+ 		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
+ 		$(INST_BIN) $(DESTINSTALLVENDORBIN) \
+@@ -2084,15 +2080,6 @@ pure_vendor_install :: all
+ 		$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
+ 
+ doc_perl_install :: all
+-	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+-	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+-	-$(NOECHO) $(DOC_INSTALL) \
+-		"Module" "$(NAME)" \
+-		"installed into" "$(INSTALLPRIVLIB)" \
+-		LINKTYPE "$(LINKTYPE)" \
+-		VERSION "$(VERSION)" \
+-		EXE_FILES "$(EXE_FILES)" \
+-		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
+ 
+ doc_site_install :: all
+ 	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+@@ -2106,15 +2093,6 @@ doc_site_install :: all
+ 		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
+ 
+ doc_vendor_install :: all
+-	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+-	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+-	-$(NOECHO) $(DOC_INSTALL) \
+-		"Module" "$(NAME)" \
+-		"installed into" "$(INSTALLVENDORLIB)" \
+-		LINKTYPE "$(LINKTYPE)" \
+-		VERSION "$(VERSION)" \
+-		EXE_FILES "$(EXE_FILES)" \
+-		>> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
+ 
+ };
+ 
+@@ -2123,13 +2101,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
+ 	$(NOECHO) $(NOOP)
+ 
+ uninstall_from_perldirs ::
+-	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{
+ 
+ uninstall_from_sitedirs ::
+ 	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{
+ 
+ uninstall_from_vendordirs ::
+-	$(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{
++
+ };
+ 
+     join("",@m);