[gentoo-commits] proj/perl-overlay:master commit in: perl-core/ExtUtils-MakeMaker/files/6.571.0_rc/, perl-core/ExtUtils-MakeMaker/

[Kent Fredric]

commit:     dc1e694f379150cc56682aff660b53a2f8c5d475
Author:     Kent Fredric <kentfredric <AT> gmail <DOT> com>
AuthorDate: Mon Apr  4 12:52:42 2011 +0000
Commit:     Kent Fredric <kentfredric <AT> gmail <DOT> com>
CommitDate: Mon Apr  4 12:52:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/perl-overlay.git;a=commit;h=dc1e694f

[newversion] *ExtUtils-MakeMaker-6.571.0_rc

(Portage version: 2.2.0_alpha29/git/Linux x86_64, signed Manifest commit with key 0A0CB301)

---
 perl-core/ExtUtils-MakeMaker/ChangeLog             |    8 ++
 .../ExtUtils-MakeMaker-6.571.0_rc.ebuild           |   36 +++++++++
 ...d-patch-from-gentoo-as-stolen-from-debian.patch |   84 ++++++++++++++++++++
 .../0002-Add-RUNPATH-patch-from-gentoo.patch       |   30 +++++++
 4 files changed, 158 insertions(+), 0 deletions(-)

diff --git a/perl-core/ExtUtils-MakeMaker/ChangeLog b/perl-core/ExtUtils-MakeMaker/ChangeLog
index e40d42c..a69a1ac 100644
--- a/perl-core/ExtUtils-MakeMaker/ChangeLog
+++ b/perl-core/ExtUtils-MakeMaker/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ChangeLog,v 1.21 2010/09/13 14:41:47 josejx Exp $
 
+*ExtUtils-MakeMaker-6.571.0_rc (04 Apr 2011)
+
+  04 Apr 2011; Kent Fredric <kentfredric@×××××.com>
+  +files/6.571.0_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch,
+  +files/6.571.0_rc/0002-Add-RUNPATH-patch-from-gentoo.patch,
+  +ExtUtils-MakeMaker-6.571.0_rc.ebuild:
+  Bump
+
 *ExtUtils-MakeMaker-6.570.600_rc (10 Jan 2011)
 
   10 Jan 2011; Kent Fredric <kentfredric@×××××.com>

diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.571.0_rc.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.571.0_rc.ebuild
new file mode 100644
index 0000000..97eb052
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.571.0_rc.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+MODULE_VERSION="6.57_10"
+MODULE_AUTHOR=MSCHWERN
+inherit perl-module eutils
+
+DESCRIPTION="Create a module Makefile"
+HOMEPAGE="http://makemaker.org ${HOMEPAGE}"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+comment() { echo ''; }
+
+DEPEND="
+	>=virtual/perl-ExtUtils-Manifest-1.56
+	>=virtual/perl-ExtUtils-Command-1.16
+	>=virtual/perl-ExtUtils-Install-1.52
+	>=virtual/perl-File-Spec-0.8 $(comment 0.800.0)
+"
+RDEPEND="${DEPEND}
+	!!<dev-lang/perl-5.8.8-r7"
+
+PATCHES=(
+	"${FILESDIR}/${PV}/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch"
+	"${FILESDIR}/${PV}/0002-Add-RUNPATH-patch-from-gentoo.patch"
+)
+src_prepare (){
+	edos2unix "${S}/lib/ExtUtils/MM_Unix.pm"
+	edos2unix "${S}/lib/ExtUtils/MM_Any.pm"
+
+	perl-module_src_prepare
+}
+SRC_TEST=do

diff --git a/perl-core/ExtUtils-MakeMaker/files/6.571.0_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch b/perl-core/ExtUtils-MakeMaker/files/6.571.0_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch
new file mode 100644
index 0000000..7290d04
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/files/6.571.0_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch
@@ -0,0 +1,84 @@
+From af42678f775138c9c3cfb7d5a0141b0f1bb727bf Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@×××××.com>
+Date: Thu, 18 Nov 2010 15:30:36 +1300
+Subject: [PATCH 1/2] Add patch from ::gentoo as stolen from debian.
+
+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);
+-- 
+1.7.4.rc1
+

diff --git a/perl-core/ExtUtils-MakeMaker/files/6.571.0_rc/0002-Add-RUNPATH-patch-from-gentoo.patch b/perl-core/ExtUtils-MakeMaker/files/6.571.0_rc/0002-Add-RUNPATH-patch-from-gentoo.patch
new file mode 100644
index 0000000..30feaa8
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/files/6.571.0_rc/0002-Add-RUNPATH-patch-from-gentoo.patch
@@ -0,0 +1,30 @@
+From a748ae9e83e90244b0d48147085fc223743ebd8a Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@×××××.com>
+Date: Thu, 18 Nov 2010 15:38:06 +1300
+Subject: [PATCH 2/2] Add RUNPATH patch from ::gentoo
+
+---
+ lib/ExtUtils/MM_Any.pm |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm
+index 3ea0947..dde1628 100644
+--- 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;
+         }
+     }
+-- 
+1.7.4.rc1
+