gentoo resync : 25.08.2020

3 files changed, 37 insertions, 15 deletions

diff --git a/dev-perl/DBIx-Class-InflateColumn-IP/DBIx-Class-InflateColumn-IP-0.20.30-r1.ebuild b/dev-perl/DBIx-Class-InflateColumn-IP/DBIx-Class-InflateColumn-IP-0.20.30-r2.ebuild
index a6a213a602f5..be97246c9fb8 100644
--- a/dev-perl/DBIx-Class-InflateColumn-IP/DBIx-Class-InflateColumn-IP-0.20.30-r1.ebuild
+++ b/dev-perl/DBIx-Class-InflateColumn-IP/DBIx-Class-InflateColumn-IP-0.20.30-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DIST_AUTHOR=ILMARI
 DIST_VERSION=0.02003
@@ -18,17 +18,14 @@ RDEPEND="
 	dev-perl/NetAddr-IP
 	>=dev-perl/DBIx-Class-0.81.70
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	test? ( dev-perl/DBD-SQLite )
 "
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install /use lib q[.];\nuse inc::Module::Install /' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
-
-src_test() {
-	perl_rm_files t/pod-coverage.t t/pod.t t/style-notabs.t
-	perl-module_src_test
-}
+PERL_RM_FILES=(
+	t/pod-coverage.t
+	t/pod-t.
+	t/style-notabs.t
+)
+PATCHES=(
+	"${FILESDIR}/${PN}-0.02003-no-dot-inc.patch"
+)
diff --git a/dev-perl/DBIx-Class-InflateColumn-IP/Manifest b/dev-perl/DBIx-Class-InflateColumn-IP/Manifest
index 2898c1e4854f..36f5814a71d2 100644
--- a/dev-perl/DBIx-Class-InflateColumn-IP/Manifest
+++ b/dev-perl/DBIx-Class-InflateColumn-IP/Manifest
@@ -1,3 +1,4 @@
+AUX DBIx-Class-InflateColumn-IP-0.02003-no-dot-inc.patch 509 BLAKE2B 9d9b4b468c6b8fe05790d80c9bd8e131782a4a3de6b2835136d4303dfcdb3a8518bd344b0f45ed19272146e38c4433b54d8ba1611509958c24ca47af877988b1 SHA512 280287f1ceb8c127b53fc2e0dd956cbc717d176b71fddbbad1851812f674291d722799ce92e9f0fcd79ba3ff8b048a4061679243321cb90923e0f2e9191b8c37
 DIST DBIx-Class-InflateColumn-IP-0.02003.tar.gz 24096 BLAKE2B 11f4dd82ef3913c749f3821cf3c5a8d5d99a95cdcedcd79706e24942eeaa4d234c2d6cedc87f14bb38fb28b140076800fcfbe8b287fe0fbc47c27f121aaa62bc SHA512 07a5f97f4e8fe148ca69ebbdf82276774e3ff68ad3956a6fc6523158ddf0a645b6a149d56a316fb5b23a52889f7dbd924e3ded6a940c9ca5d25d774cffc488d8
-EBUILD DBIx-Class-InflateColumn-IP-0.20.30-r1.ebuild 711 BLAKE2B eb5590e3804c8449b8d29ab3ac1d840c8c0d9c40ffd84453095ba11ecf93ee029227c237738b03bd22863b9dca3249305b78d64245686f83fbbc2f505508f358 SHA512 6b86eeb1b4c1f0400df046f34773c0123eb16fadad26d3cb60f52632b662d81d171a57ab289e4e4ec49d1c795088ad879749790d8ff8b265bdb167f6eaccff8f
+EBUILD DBIx-Class-InflateColumn-IP-0.20.30-r2.ebuild 545 BLAKE2B 1c5e668474726c2673607e558697f7c815f4e4b9086331da0eace5f77e8eddf149cf6085f6d1d6e75c8bd032a2aa9d081b4b253183a814df68a4ed14d948fc4a SHA512 ee84c1930929358b2fe2842b66efda10e3195fca421dd3fb290dbbcbb2e8aa8ec2c11010b4b33b8219df4025afd8bdfaadcba7dc2742ae21ecb1b82ef1849c8d
 MISC metadata.xml 428 BLAKE2B 82551582c2f76ef950325fb4f303b0d300f860450c47ea2272c4d2bbeee4a4f721db14f275afd9a7d5d1e419693599e1361e010299cf5827821906b781735aa6 SHA512 20affe888c9a1973d3b3913f3db78a3e331391c66e3fe94eeafd358f0fcbe2d15f3e7b878cad147047814940e49fc1b8e4c4589cc7ba36b397a0cff448e89678
diff --git a/dev-perl/DBIx-Class-InflateColumn-IP/files/DBIx-Class-InflateColumn-IP-0.02003-no-dot-inc.patch b/dev-perl/DBIx-Class-InflateColumn-IP/files/DBIx-Class-InflateColumn-IP-0.02003-no-dot-inc.patch
new file mode 100644
index 000000000000..11d943c35512
--- /dev/null
+++ b/dev-perl/DBIx-Class-InflateColumn-IP/files/DBIx-Class-InflateColumn-IP-0.02003-no-dot-inc.patch
@@ -0,0 +1,24 @@
+From 1346fbc9264cd17ec0082042d91ea5d6c2966a03 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Tue, 14 Jul 2020 07:59:34 +1200
+Subject: Include '.' in @INC on perl 5.26+
+
+---
+ Makefile.PL | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index df23607..6aa04ff 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,6 +1,7 @@
+ use strict;
+ use warnings;
+ use 5.008001;
++use lib '.';
+ use inc::Module::Install 1.05;
+ 
+ name 'DBIx-Class-InflateColumn-IP';
+-- 
+2.27.0
+