[gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     040d14463d3850211562b54db62d05bc1d391515
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  2 22:17:19 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 22:14:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=040d1446

dev-lang/perl: makemaker-test.patch isn't present in perl-cross 5.26

Unfortunately I ended up with a broken Perl (5.26.1) but this fix is
needed regardless.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-lang/perl/perl-5.26.0.ebuild    | 4 ----
 dev-lang/perl/perl-5.26.1-r1.ebuild | 4 ----
 dev-lang/perl/perl-5.26.1.ebuild    | 4 ----
 dev-lang/perl/perl-5.26.9999.ebuild | 4 ----
 dev-lang/perl/perl-5.28.9999.ebuild | 4 ----
 5 files changed, 20 deletions(-)

diff --git a/dev-lang/perl/perl-5.26.0.ebuild b/dev-lang/perl/perl-5.26.0.ebuild
index 6a1ce9639e7..cbf0ad1a94d 100644
--- a/dev-lang/perl/perl-5.26.0.ebuild
+++ b/dev-lang/perl/perl-5.26.0.ebuild
@@ -285,10 +285,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die

diff --git a/dev-lang/perl/perl-5.26.1-r1.ebuild b/dev-lang/perl/perl-5.26.1-r1.ebuild
index f4f6054d372..3a6ded81ff5 100644
--- a/dev-lang/perl/perl-5.26.1-r1.ebuild
+++ b/dev-lang/perl/perl-5.26.1-r1.ebuild
@@ -286,10 +286,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die

diff --git a/dev-lang/perl/perl-5.26.1.ebuild b/dev-lang/perl/perl-5.26.1.ebuild
index a7e2522f1e1..d201810751b 100644
--- a/dev-lang/perl/perl-5.26.1.ebuild
+++ b/dev-lang/perl/perl-5.26.1.ebuild
@@ -286,10 +286,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die

diff --git a/dev-lang/perl/perl-5.26.9999.ebuild b/dev-lang/perl/perl-5.26.9999.ebuild
index 3dc88edc18b..79b8c3037c1 100644
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ b/dev-lang/perl/perl-5.26.9999.ebuild
@@ -286,10 +286,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die

diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index 267767fa38d..ea454cecceb 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -286,10 +286,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die