perl-core/ExtUtils-MakeMaker: remove unused patches
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>
Sat, 28 Jan 2017 09:05:09 +0000 (10:05 +0100)
committerKent Fredric <kentnl@gentoo.org>
Sat, 28 Jan 2017 11:22:18 +0000 (00:22 +1300)
Closes: https://github.com/gentoo/gentoo/pull/3691

perl-core/ExtUtils-MakeMaker/files/6.56-delete_packlist_podlocal.patch [deleted file]
perl-core/ExtUtils-MakeMaker/files/6.58-delete_packlist_podlocal.patch [deleted file]
perl-core/ExtUtils-MakeMaker/files/6.62-delete_packlist_podlocal.patch [deleted file]
perl-core/ExtUtils-MakeMaker/files/6.82-delete_packlist_podlocal.patch [deleted file]
perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch [deleted file]

diff --git a/perl-core/ExtUtils-MakeMaker/files/6.56-delete_packlist_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/6.56-delete_packlist_podlocal.patch
deleted file mode 100644 (file)
index c5763d1..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-Don't install .packlist or perllocal.pod for perl or vendor.
-Extracted from the debian patchset.
-See also bug #241834
-
----
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |   25 +----------------------
- 1 files changed, 1 insertions(+), 24 deletions(-)
-
-diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 239d6df..b4649ee 100644
---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-+++ b/cpan/ExtUtils-MakeMaker/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);
--- 
-tg: (b9ce030..) gentoo/MakeMaker-delete_packlist (depends on: upstream)
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
deleted file mode 100644 (file)
index c42d1d2..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-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);
diff --git a/perl-core/ExtUtils-MakeMaker/files/6.62-delete_packlist_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/6.62-delete_packlist_podlocal.patch
deleted file mode 100644 (file)
index 9d8ee7e..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/lib/ExtUtils/MM_Unix.pm
-+++ b/lib/ExtUtils/MM_Unix.pm
-@@ -2052,8 +2052,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) \
-@@ -2079,8 +2077,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) \
-@@ -2089,37 +2085,19 @@ 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
--      -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
-+      $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLSITEARCH)/perllocal.pod
-+      -$(NOECHO) $(MKPATH) $(DESTINSTALLSITEARCH)
-       -$(NOECHO) $(DOC_INSTALL) \
-               "Module" "$(NAME)" \
-               "installed into" "$(INSTALLSITELIB)" \
-               LINKTYPE "$(LINKTYPE)" \
-               VERSION "$(VERSION)" \
-               EXE_FILES "$(EXE_FILES)" \
--              >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
-+              >> }.$self->catfile('$(DESTINSTALLSITEARCH)','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{
- };
-@@ -2128,13 +2106,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);
diff --git a/perl-core/ExtUtils-MakeMaker/files/6.82-delete_packlist_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/6.82-delete_packlist_podlocal.patch
deleted file mode 100644 (file)
index 657a6b6..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
---- lib/ExtUtils/MakeMaker.pm.bak      2013-11-25 20:48:18.119741749 +0400
-+++ lib/ExtUtils/MakeMaker.pm  2013-11-25 20:49:26.798740829 +0400
-@@ -2246,13 +2246,13 @@
- When true, suppresses the generation of MYMETA.yml and MYMETA.json module
- meta-data files during 'perl Makefile.PL'.
--Defaults to false.
-+Defaults to true.
- =item NO_PACKLIST
- When true, suppresses the writing of C<packlist> files for installs.
--Defaults to false.
-+Defaults to true.
- =item NO_PERLLOCAL
---- lib/ExtUtils/MM_Unix.pm.bak        2013-11-25 20:48:24.903741658 +0400
-+++ lib/ExtUtils/MM_Unix.pm    2013-11-25 20:50:54.662739652 +0400
-@@ -1574,6 +1574,16 @@
-     $self->{FULLEXT} = $self->catdir(split /::/, $self->{NAME});
-+    # Workaround for https://bugs.gentoo.org/show_bug.cgi?id=221179
-+    if (!exists($self->{NO_PERLLOCAL})) {
-+        $self->{NO_PERLLOCAL} = 1;
-+    }
-+
-+    if (!exists($self->{NO_PACKLIST})) {
-+        $self->{NO_PACKLIST} = 1;
-+    }
-+
-+
-     # Copied from DynaLoader:
-     my(@modparts) = split(/::/,$self->{NAME});
---- t/basic.t.bak      2013-11-25 20:48:29.919741591 +0400
-+++ t/basic.t  2013-11-25 20:51:15.437739373 +0400
-@@ -43,7 +43,7 @@
- ok( chdir('Big-Dummy'), "chdir'd to Big-Dummy" ) ||
-   diag("chdir failed: $!");
--my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=../dummy-install"});
-+my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=../dummy-install" NO_PERLLOCAL=0 NO_PACKLIST=0});
- END { rmtree '../dummy-install'; }
- cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) ||
---- t/INSTALL_BASE.t.bak       2013-11-25 20:48:48.119741347 +0400
-+++ t/INSTALL_BASE.t   2013-11-25 20:51:42.549739010 +0400
-@@ -35,7 +35,7 @@
- ok( chdir('Big-Dummy'), "chdir'd to Big-Dummy") || diag("chdir failed; $!");
--my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=../dummy-install"});
-+my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=../dummy-install" NO_PERLLOCAL=0 NO_PACKLIST=0});
- END { rmtree '../dummy-install'; }
- cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) ||
\ No newline at end of file
diff --git a/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch b/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch
deleted file mode 100644 (file)
index 1385207..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur ExtUtils-MakeMaker-6.54/lib/ExtUtils/MM_Any.pm ExtUtils-MakeMaker-6.54.new/lib/ExtUtils/MM_Any.pm
---- ExtUtils-MakeMaker-6.54/lib/ExtUtils/MM_Any.pm     2009-07-08 11:49:05.000000000 +1200
-+++ ExtUtils-MakeMaker-6.54.new/lib/ExtUtils/MM_Any.pm 2009-08-19 21:37:31.494655658 +1200
-@@ -1799,6 +1799,13 @@
-             # 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 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;
-         }
-     }