commit:     1f685202789e3077e761a0ec477f7d381970c99c
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 30 17:47:37 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Sep  4 09:32:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f685202

perl-core/ExtUtils-MakeMaker: Remove last-rited package

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 .../ExtUtils-MakeMaker-7.240.0.ebuild              | 43 -------------
 perl-core/ExtUtils-MakeMaker/Manifest              |  1 -
 .../ExtUtils-MakeMaker/files/7.24-RUNPATH.patch    | 30 ---------
 .../files/7.24-delete_podlocal.patch               | 74 ----------------------
 perl-core/ExtUtils-MakeMaker/metadata.xml          | 41 ------------
 profiles/package.mask                              |  6 --
 6 files changed, 195 deletions(-)

diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-7.240.0.ebuild 
b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-7.240.0.ebuild
deleted file mode 100644
index 4f532ea664b..00000000000
--- a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-7.240.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=BINGOS
-DIST_VERSION=7.24
-inherit edos2unix perl-module
-
-DESCRIPTION="Create a module Makefile"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-       >=virtual/perl-ExtUtils-Install-1.520.0
-       >=virtual/perl-ExtUtils-Manifest-1.700.0
-       >=virtual/perl-File-Spec-0.800.0
-"
-DEPEND="${RDEPEND}
-       test? (
-               >=virtual/perl-File-Temp-0.220.0
-               >=virtual/perl-Scalar-List-Utils-1.130.0
-       )
-"
-PDEPEND="
-       >=virtual/perl-CPAN-Meta-2.143.240
-       >=virtual/perl-Parse-CPAN-Meta-1.441.400
-       virtual/perl-Test-Harness
-"
-
-PATCHES=(
-       "${FILESDIR}/7.24-delete_podlocal.patch"
-       "${FILESDIR}/7.24-RUNPATH.patch"
-)
-
-src_prepare() {
-       edos2unix "${S}/lib/ExtUtils/MM_Unix.pm"
-       edos2unix "${S}/lib/ExtUtils/MM_Any.pm"
-
-       export BUILDING_AS_PACKAGE=1
-       perl-module_src_prepare
-}

diff --git a/perl-core/ExtUtils-MakeMaker/Manifest 
b/perl-core/ExtUtils-MakeMaker/Manifest
deleted file mode 100644
index 7a42c9cbf24..00000000000
--- a/perl-core/ExtUtils-MakeMaker/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ExtUtils-MakeMaker-7.24.tar.gz 467714 BLAKE2B 
82c027584ad89cd1393cdb0f8db8ef6fff2a405304fbe11d791dadc7352facc5a852ca7ebc1ed3e1119a0073dce8868c01d210f666ef1fab5c09eee59e092f00
 SHA512 
f57f8407aea6101af964f105fb9ddd6567262fa2bad91456573c8fc019cdf1469563945029f5078e20d2f7d1d736a63586e7cde3bb72cb9ae80ad0b8ebe818d5

diff --git a/perl-core/ExtUtils-MakeMaker/files/7.24-RUNPATH.patch 
b/perl-core/ExtUtils-MakeMaker/files/7.24-RUNPATH.patch
deleted file mode 100644
index 6f21f2c733b..00000000000
--- a/perl-core/ExtUtils-MakeMaker/files/7.24-RUNPATH.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5da957658fba21be51b638bcfee32b97090ad0da Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfred...@gmail.com>
-Date: Sun, 19 Mar 2017 01:55:56 +1300
-Subject: Prevent build root appearing in RPATH
-
----
- lib/ExtUtils/MM_Any.pm | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm
-index 433a8dd..ebcb6fc 100644
---- a/lib/ExtUtils/MM_Any.pm
-+++ b/lib/ExtUtils/MM_Any.pm
-@@ -2422,6 +2422,13 @@ sub init_others {
-             # 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;
-         }
-     }
--- 
-2.12.0
-

diff --git a/perl-core/ExtUtils-MakeMaker/files/7.24-delete_podlocal.patch 
b/perl-core/ExtUtils-MakeMaker/files/7.24-delete_podlocal.patch
deleted file mode 100644
index 8277e0d37c2..00000000000
--- a/perl-core/ExtUtils-MakeMaker/files/7.24-delete_podlocal.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From f1939e044183c711f23468eb1aa068435add42c6 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfred...@gmail.com>
-Date: Sun, 19 Mar 2017 01:52:52 +1300
-Subject: Inhibit generation of perllocal.pod
-
----
- lib/ExtUtils/MM_Unix.pm | 5 +++++
- t/INSTALL_BASE.t        | 2 +-
- t/basic.t               | 6 +++---
- 3 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
-index 66a24d7..82d7b42 100644
---- a/lib/ExtUtils/MM_Unix.pm
-+++ b/lib/ExtUtils/MM_Unix.pm
-@@ -1682,6 +1682,11 @@ sub init_main {
- ###     $self->{NAME}) =~ s!::!/!g ; #eg. BSD/Foo/Socket
-     $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;
-+    }
-+
- 
-     # Copied from DynaLoader:
- 
-diff --git a/t/INSTALL_BASE.t b/t/INSTALL_BASE.t
-index 6939811..f7cf8d4 100644
---- a/t/INSTALL_BASE.t
-+++ b/t/INSTALL_BASE.t
-@@ -49,7 +49,7 @@ ok( chdir(File::Spec->catdir($SPACEDIR, 'Big-Dummy')), 
"chdir'd to Big-Dummy") |
- for my $instdir (@INSTDIRS) {
-   $instdir = File::Spec->rel2abs($instdir);
-   $instdir = VMS::Filespec::unixpath($instdir) if $Is_VMS;
--  my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=$instdir"});
-+  my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=$instdir" 
NO_PERLLOCAL=0 NO_PACKLIST=0});
- 
-   cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) ||
-     diag(@mpl_out);
-diff --git a/t/basic.t b/t/basic.t
-index c98e28c..97db20a 100644
---- a/t/basic.t
-+++ b/t/basic.t
-@@ -24,7 +24,7 @@ use ExtUtils::MM;
- use Test::More
-     !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
-     ? (skip_all => "cross-compiling and make not available")
--    : (tests => 186);
-+    : (tests => 180);
- use File::Find;
- use File::Spec;
- use File::Path;
-@@ -79,7 +79,7 @@ sub extrachar {
-   'š';
- }
- my $DUMMYINST = '../dummy-in'.extrachar().'tall';
--my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST"});
-+my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST" NO_PERLLOCAL=0 
NO_PACKLIST=0});
- 
- cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) ||
-   diag(@mpl_out);
-@@ -196,7 +196,7 @@ sub check_dummy_inst {
-     ok( $files{'liar.pm'},      '  Liar.pm installed'  ) unless $skipsubdir;
-     ok( $files{'program'},      '  program installed'  );
-     ok( $files{'.packlist'},    '  packlist created'   );
--    ok( $files{'perllocal.pod'},'  perllocal.pod created' );
-+#    ok( $files{'perllocal.pod'},'  perllocal.pod created' );
-     \%files;
- }
- 
--- 
-2.12.0
-

diff --git a/perl-core/ExtUtils-MakeMaker/metadata.xml 
b/perl-core/ExtUtils-MakeMaker/metadata.xml
deleted file mode 100644
index 960f40861df..00000000000
--- a/perl-core/ExtUtils-MakeMaker/metadata.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-  <maintainer type="project">
-    <email>p...@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">ExtUtils-MakeMaker</remote-id>
-    <remote-id type="cpan-module">DynaLoader</remote-id>
-    <remote-id type="cpan-module">ExtUtils::Command::MM</remote-id>
-    <remote-id type="cpan-module">ExtUtils::Liblist</remote-id>
-    <remote-id type="cpan-module">ExtUtils::Liblist::Kid</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_AIX</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_Any</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_BeOS</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_Cygwin</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_DOS</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_Darwin</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_MacOS</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_NW5</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_OS2</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_QNX</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_UWIN</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_Unix</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_VMS</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_VOS</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_Win32</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MM_Win95</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MY</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MakeMaker</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MakeMaker::Config</remote-id>
-    <remote-id type="cpan-module">ExtUtils::MakeMaker::_version</remote-id>
-    <remote-id type="cpan-module">ExtUtils::Mkbootstrap</remote-id>
-    <remote-id type="cpan-module">ExtUtils::Mksymlists</remote-id>
-    <remote-id type="cpan-module">ExtUtils::testlib</remote-id>
-    <remote-id type="cpan-module">MM</remote-id>
-    <remote-id type="cpan-module">MY</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index f90449b193c..9d4336cb8de 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -202,12 +202,6 @@ app-text/fb2edit
 mail-client/trojita
 <media-video/openshot-2.5.1_p20210228
 
-# Andreas K. Hüttel <dilfri...@gentoo.org> (2021-07-31)
-# Obsolete; all versions in current Perl core distributions
-# are newer, and no virtuals currently pull these packages.
-# Removal in 30 days.
-perl-core/ExtUtils-MakeMaker
-
 # Joonas Niilola <juip...@gentoo.org> (2021-07-29)
 # Upstream provided migration instructions from 2. -> 3. update,
 # breaks if not all at least many revdeps. #805011 for tracker bug.

Reply via email to