From: James Le Cuirot <chewi@gentoo.org>
Date: Sat, 2 Dec 2017 22:17:19 +0000 (+0000)
Subject: dev-lang/perl: makemaker-test.patch isn't present in perl-cross 5.26
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=040d14463d3850211562b54db62d05bc1d391515;p=gentoo.git

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
---

diff --git a/dev-lang/perl/perl-5.26.0.ebuild b/dev-lang/perl/perl-5.26.0.ebuild
index 6a1ce9639e77..cbf0ad1a94d2 100644
--- a/dev-lang/perl/perl-5.26.0.ebuild
+++ b/dev-lang/perl/perl-5.26.0.ebuild
@@ -284,10 +284,6 @@ echo "${patchoutput}" >> "${S}/MANIFEST"
 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/' \
diff --git a/dev-lang/perl/perl-5.26.1-r1.ebuild b/dev-lang/perl/perl-5.26.1-r1.ebuild
index f4f6054d3728..3a6ded81ff59 100644
--- a/dev-lang/perl/perl-5.26.1-r1.ebuild
+++ b/dev-lang/perl/perl-5.26.1-r1.ebuild
@@ -285,10 +285,6 @@ echo "${patchoutput}" >> "${S}/MANIFEST"
 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/' \
diff --git a/dev-lang/perl/perl-5.26.1.ebuild b/dev-lang/perl/perl-5.26.1.ebuild
index a7e2522f1e1d..d201810751b7 100644
--- a/dev-lang/perl/perl-5.26.1.ebuild
+++ b/dev-lang/perl/perl-5.26.1.ebuild
@@ -285,10 +285,6 @@ echo "${patchoutput}" >> "${S}/MANIFEST"
 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/' \
diff --git a/dev-lang/perl/perl-5.26.9999.ebuild b/dev-lang/perl/perl-5.26.9999.ebuild
index 3dc88edc18b6..79b8c3037c1f 100644
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ b/dev-lang/perl/perl-5.26.9999.ebuild
@@ -285,10 +285,6 @@ echo "${patchoutput}" >> "${S}/MANIFEST"
 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/' \
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index 267767fa38dc..ea454ceccebf 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -285,10 +285,6 @@ echo "${patchoutput}" >> "${S}/MANIFEST"
 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/' \