diff options
5 files changed, 177 insertions, 15 deletions
diff --git a/perl-core/ExtUtils-MakeMaker/ChangeLog b/perl-core/ExtUtils-MakeMaker/ChangeLog index e40d42c93..a69a1ac5a 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@gmail.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@gmail.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 000000000..97eb052e7 --- /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/Manifest b/perl-core/ExtUtils-MakeMaker/Manifest index 6c92ea631..457982342 100644 --- a/perl-core/ExtUtils-MakeMaker/Manifest +++ b/perl-core/ExtUtils-MakeMaker/Manifest @@ -3,24 +3,28 @@ Hash: SHA256 AUX 6.570.600_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch 3071 RMD160 014291e927e0737c23cc17c3fc2173d84023ae1b SHA1 a9b131c32b2cb279976e0f8c235145994c7a0ae5 SHA256 6718dc1b9c482346985298835e8ee12d0f2dfed007e7627b5ad01347116f3fae AUX 6.570.600_rc/0002-Add-RUNPATH-patch-from-gentoo.patch 1129 RMD160 62fce7edbda29278bd1011a4e3247961491c6908 SHA1 e0eeca78d782aae29737c8ed5c851996bbff0aaa SHA256 7fac0930599a9613427071f16566560146a411289f4ca92013216125e7cf3237 +AUX 6.571.0_rc/0001-Add-patch-from-gentoo-as-stolen-from-debian.patch 3071 RMD160 014291e927e0737c23cc17c3fc2173d84023ae1b SHA1 a9b131c32b2cb279976e0f8c235145994c7a0ae5 SHA256 6718dc1b9c482346985298835e8ee12d0f2dfed007e7627b5ad01347116f3fae +AUX 6.571.0_rc/0002-Add-RUNPATH-patch-from-gentoo.patch 1129 RMD160 62fce7edbda29278bd1011a4e3247961491c6908 SHA1 e0eeca78d782aae29737c8ed5c851996bbff0aaa SHA256 7fac0930599a9613427071f16566560146a411289f4ca92013216125e7cf3237 DIST ExtUtils-MakeMaker-6.57_06.tar.gz 282051 RMD160 b5db0d6b1e1d61bd412f5f2125675cad804114db SHA1 74abdc6491b508e843bbebea7f258d2f870fafa3 SHA256 b21240e244920865017e3c6267c877e55ddd6b85dc39d494863d2e0c5e50a627 +DIST ExtUtils-MakeMaker-6.57_10.tar.gz 412450 RMD160 d586578eb182a0c3ac87fb6b1f6d5fa969045bf7 SHA1 20179c7c1df55b0c6436beca34c1716e17511d9b SHA256 2b08e9bf370ba2a7623b3ceace3d9f81bbd443d5031bdce61f36cf1594c5ccb1 EBUILD ExtUtils-MakeMaker-6.570.600_rc.ebuild 775 RMD160 87f89dfcc5fdd0ecfcd12a771d355e665503f91d SHA1 e454b6cfcc2b6bb4ec77b5339f5309593691b0fd SHA256 74232c1adab45768ede490905361a371535801a3c61053621d63e617abf9f8c9 -MISC ChangeLog 4047 RMD160 38b875eac5b3e51a278de95d145ec25f4c2e2054 SHA1 f345ca9975a71c48a8502a25515dfbec319b7c80 SHA256 e8e009a37743665b1c57374a84393cd4fa5ea950387b50b64f64e6474d819d5d +EBUILD ExtUtils-MakeMaker-6.571.0_rc.ebuild 852 RMD160 3579800bda0d619c5bccf36eb837c0ef8effc73a SHA1 f78f27dd64f8032508d4191ef0ddfa8667f50d0f SHA256 f3a9171eca3267089661e9274d0d3871d89ad90794897ee19f468cdf96332f20 +MISC ChangeLog 4332 RMD160 afbfe2fc69351a7c200fef13e3d3771aa2b6e0cd SHA1 b2a0b88bf7241cbf410cd47fe3d4708ef68525c1 SHA256 37d665524adc4b4eecb884caefc153f4c9a14de78941aa7117e70985b0824b68 MISC metadata.xml 244 RMD160 1a789b65c26276ab126e63ba550598d413ce1b53 SHA1 30fc7ca2aae6a7b1834fcdfb8c7b3b697768d77b SHA256 a48f9fccdba1365367fdf76476d62f81e36864540da13472f3c92f6f490d93f9 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCAAGBQJNKuALAAoJEGAnLswKDLMBQ4MP/RhQXVEyU5femSWGAr+4KZVG -cGTGFkqbYJ21OvExa0OEbaMRDkqQW+7yD2gTRaVsIat16kW4OSGjzgW3I0gqANCn -DsI4QBT91ZvEX8w1b0xwzjipFeOABIrZ0DPBTsQmPOoTTszraZXsa34jgFDUZyyn -/6FlcRo2bcEz2J9PYWx44+zt/tXyfWZaNkGf1qf1JP1LtYGL2XHmIxaD3AZ1NFdH -YBWAVIj+CXIdyWuWKCjZSVsNMloWH660s25YLKfriMOh4lFzXHks25pcE9OYcTGe -gYL4+jpTbZd8A6fGDj/CdkDY15i5yjAnWI765KDrlpevRt+e5LXmHUcOPdmbOAlq -t7aRNMUhVerolGdBe5w07bcdebwSGAyQxP/7NxopmdrMwQm95uQGpINBFM2mu9sb -+nDDWaMyfJsry2Irk0UO+4J74b3jUfjoLNPzTGSr83fRYmnhLz9JuMfYu4MCXUQH -bbUiXGorG7HyIgI63YN4DEyess4Dv14dMEf9cZPWZqg+N/qLjAzFjH2bX1sfXSHw -NZwf05rz8l7/fsKf+uzOp3AptfWAuTUGJk6PuBS4yMzePHucM+CPSmNofO4jNY5k -MtRIPCr2bF6jvRzwBNdpx4E3VtN6G0IDBI6133yaLajLXTdXt7DUa3gFy/32myzd -vvBLyof84u170GHGBDpV -=DtYC +iQIcBAEBCAAGBQJNmb8ZAAoJEGAnLswKDLMBixIQAKtU+YVebxFElTmnG0nWkGIt +rRRV36EChsuvCtJpd1uGvM/R0rkG2LmtFsSAQyU1rz9ReAwnbVPVUP4O/oPxn/7Y +AI4xaWD+pjH1deHqmPJwELycTOvz8CCvNh0zoDIEjjm4qIVHG5HWnyanGEPHhkq3 +p90YkXyVO4Wyrmp8pTGJj6QwCZ4wD5sFquoQmpzzzp3pahaJaMLo+qUFDfjYnleh +Dm/AMJ5n2WkpdmlxCmmo7Z9Qj4e7zhb7Jn7/JE+koZLagyotas09AcU8/tZuZhOh +4nt0MtyCvwJpa6h43GRlMi7/MTYqa5ADx2BmCgfM8S1aogH8DusaRFCIXcpCnJr/ +t7eRZO6j/5BGlwjct5zi6geDYL4YrwHkySyzm7jdgfXKNjJSGGUnevoMjLQ3zLze +Q1I0qzHXq5avckttm/HCpMEVP8kVsW1gRkQftNY3l7UeM97mB21RVKsd2VyUfHsv +ZgfNJ44m9SI5oRvkr8bVGboOrKHvxOsPd8ZsNBnOMyxt/4Gi1BKuVSg27E/h+6ap +DidW/P4dJ54xoqvjvrKo6sB7JJ7Z+OPGNSvd0fq6ThELuj1Qnia9GiU6WIXRmAvZ +OlKy0gJRiU/y0vm+3OhRN0yf2iLR/chQPu+WDur8AmmOGuO8nOTyr+eUNtcYKcst +vl24qdkSeVGY38f2qXWz +=P7jQ -----END PGP SIGNATURE----- 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 000000000..7290d0452 --- /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@gmail.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 000000000..30feaa846 --- /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@gmail.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 + |