gentoo Easter resync : 12.04.2020

6 files changed, 36 insertions, 103 deletions

diff --git a/app-portage/g-cpan/Manifest b/app-portage/g-cpan/Manifest
index f3dc5694715e..db025a7443e3 100644
--- a/app-portage/g-cpan/Manifest
+++ b/app-portage/g-cpan/Manifest
@@ -1,10 +1,6 @@
-DIST g-cpan-0.16.5.tar.gz 33894 BLAKE2B e5ffee0086b9a2dcc5bd32ae21f13f01464756d2483e21bdd5e455ff0044d864767f7bfef9ad7bf6618126e921784fa08162400e6b44014d70c3f35265a0243e SHA512 f2eab23281abe567ee2df42895e3f0783228c6ab5e3a8230089e900fd2700367d736299da20fb228f2d4542491a24da05fd035a81aff7d79ce5132e35c48ad0b
-DIST g-cpan-0.16.6.tar.gz 33844 BLAKE2B 3c8b4b39fbeec4e15aa49db877e24a99883112fb79538b5d94a87b60dfea436bffa6f50cbbb97f759c4a2ad75e254d30913105f3f1ee87628cbc9291be69ba87 SHA512 f8e9e211ffc09ca42d1444a42ad2b8111beb8988e4a01387cf8788f7e4a52e6133168820c2800ac82429fa022e2ff473a774c48ac140b5cde184b3d77cd6e1b1
-DIST g-cpan-0.16.7.tar.gz 33621 BLAKE2B 531c2668756b8f31dc038136580dc5fa26b4bb20307b72b4b15202f6f1135824271ae031113fbad71e6096e916d2e10c28c02d5c869d7cfa51ffb04b5a73a9a6 SHA512 2412b30fa4c3432882db0f31da6ace841e353a363e15a3b536ea1febcf601a7f9c4e14968e3abcf848e3557098088012472179688caf36cd97ae9b528a3db7fb
 DIST g-cpan-0.16.9.tar.gz 34463 BLAKE2B 7eff6b7da75219712504ac7b9ea1833e9eaa9ba4a49f609baec6407beb16f4764baf2c35e15c779c93ca8c09bba9058e6acb6fda7f3fd2df06296724f2c3c3fc SHA512 f26d81974fedb024808fe3671ae297fd36abc37a5b04783f36f6c9e8c6000a411c675e999e91da48801a7c84fde15a59587df02fa9d7b3833ccc0916993b1783
-EBUILD g-cpan-0.16.5.ebuild 1058 BLAKE2B 161e1060a549998941598ee286e180130d4d64decf909357f6000c1d635d8b462ef37399454c0209d2a28f4c926669fb7207195be012ef0e175605184f5e2c8a SHA512 cf243233ca7352e5bd3be468622e7866d9f420ef406c899cc4996ca07880e9d0f9b03157f98c72395ca17e551b879b03b6bd8c22678cd705698656c31102214a
-EBUILD g-cpan-0.16.6.ebuild 1152 BLAKE2B 61e9caa00ce569ed6d60ff1f6fcd1bf758dbc4ef4b2eabb2b926c5788416eb068519a6de8aad5fbde96e4a6b3927494dead5e896b134c531f0b998469596a5c0 SHA512 0def8a8ea3c3644fc55dc1a99110213814063e881bf4c5ae49c8bd69fd460c9236b6d95d7a0ffa76bcd42d1175f451eeea4998832f09f780b96d07daedf0650f
-EBUILD g-cpan-0.16.7.ebuild 1468 BLAKE2B f8ba91e84563aac09c7266d1d9d2bf9c30162d5752355af3b63f4b759783eadfd37b5f35d68e49e34a11af25c51deb6edd11a8a1355bc4e2318b075e4d44c615 SHA512 7c0ed9ec7266b95e827265754ea1c81e9fe746769bad46ee9d5a24043e368afe30bcd5b987df07925a97482d6cb8af8c287b2533275426d2b964eb2dc299287f
-EBUILD g-cpan-0.16.9-r1.ebuild 1454 BLAKE2B a0fa8d0befd69c47bd988298d161b374ab0b250aa5a88ed79582e578e7d9ad7ab81a5bd6fff2ef72892d9424b3379750cd84a94c656bd43e68a04a8d437da6b9 SHA512 2e961379a457dd0a8ce6ae64bbb1cdadc21060813fa07aa05e07ecc35cdc984734abeb5749371b7cde8e38a1d2b0514a700a2d6085d310db2d25d5946b26dc61
-EBUILD g-cpan-9999.ebuild 1504 BLAKE2B 7f81cadbbe38dd2b0249d81502a69727d29b20ab1961af4a8ce8ae6cd896408b77db96a9f29b564c456ea654aa6463dc578f2a9013400929bd2ab62b9ea5c43c SHA512 cbfab6a500463cc1c471e81bf5cf941d02ff0d00d07d9233f6bdf94c9cf1d6d4ceeaac3f68dd33496652797b91c1b6d6fd5be82cf06107bff773c79cf62a2cf8
+DIST g-cpan-0.17.0.tar.gz 38786 BLAKE2B 3f4a165920c7c075919f0eeca9554fe32bd3f72cd8010fced4d7e45aa44e80de7800fb78587d1429ac88643dd812d58725b66fbbdce305bd762db8d4ca2f0720 SHA512 80475560a00fddce31f8a92dd460bd22e0de57445a56628ad76f35ab3fc4d2f801ebd2a2a9542ed675245a994e53bb7ae842f714c35ab1f6bdbc40dd49ce2d86
+EBUILD g-cpan-0.16.9-r1.ebuild 1503 BLAKE2B 300235c17ab66b2e1964966edaa09e475ab6d5bfd0fd41bd9ff09af41194e2d5b6e4819256bc35af0571b41ad6d7517cf28045b19b828db8e1a6f3662b137644 SHA512 8689b0c723e2e7d668a5759f05ac7fb8245dbd47523418b682718f216154d18fe7355a1d1c478b9371bdbd331cf63ffeb23052d219677045fb3aa251b2ffe2db
+EBUILD g-cpan-0.17.0.ebuild 1552 BLAKE2B cb4c8fc80e95b56311039f56b9815e8b25444b692150dbdd4c6e761b62e747dff6fd54c1dc3c017d293c80cf16a238c7a1be2d16e404fc124d32345c28c7e35a SHA512 022b215dc0e330d2042cbc63426ea56bc42c2bb4e393db5721f51c436662bd21159f65310ce07cdb047492dd62533fc98a0a08e118ec48afefbe0c028b305c40
+EBUILD g-cpan-9999.ebuild 1552 BLAKE2B cb4c8fc80e95b56311039f56b9815e8b25444b692150dbdd4c6e761b62e747dff6fd54c1dc3c017d293c80cf16a238c7a1be2d16e404fc124d32345c28c7e35a SHA512 022b215dc0e330d2042cbc63426ea56bc42c2bb4e393db5721f51c436662bd21159f65310ce07cdb047492dd62533fc98a0a08e118ec48afefbe0c028b305c40
 MISC metadata.xml 565 BLAKE2B 3614246d5827779c1fd4f713fcadc54210893e680d8d10edbd98bad63ac93bb0e642b6a44fa5496f2bdf40eb3accdb79eca0c1fbd8a459655d192fe7af6f99b5 SHA512 057c2d4a401423d789283661cef0a4c42955d10cbf9671f671de279975fde004d0836e5fec8bd1d34c5f0f1f0bf21d6ebded0bb716d7445001c975a22ff2d0c9
diff --git a/app-portage/g-cpan/g-cpan-0.16.5.ebuild b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
deleted file mode 100644
index 2d33871b8624..000000000000
--- a/app-portage/g-cpan/g-cpan-0.16.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-		 https://dev.gentoo.org/~chainsaw/distfiles/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-		>=dev-perl/YAML-0.60
-		dev-perl/Shell-EnvImporter
-		dev-perl/Log-Agent"
-RDEPEND="${DEPEND}"
-
-src_install() {
-		perl-module_src_install
-		diropts "-m0755"
-		dodir "/var/tmp/g-cpan"
-		keepdir "/var/tmp/g-cpan"
-		dodir "/var/log/g-cpan"
-		keepdir "/var/log/g-cpan"
-}
-
-pkg_postinst() {
-	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
-	elog "if you have users besides root expecting to use g-cpan."
-	elog "Please note that some CPAN packages need additional manual"
-	elog "parameters or tweaking, due to bugs in their build systems."
-}
diff --git a/app-portage/g-cpan/g-cpan-0.16.6.ebuild b/app-portage/g-cpan/g-cpan-0.16.6.ebuild
deleted file mode 100644
index 876c6180f0f3..000000000000
--- a/app-portage/g-cpan/g-cpan-0.16.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/perl
-		>=dev-perl/YAML-0.60
-		>=dev-perl/Shell-EnvImporter-1.70.0-r2
-		dev-perl/Log-Agent"
-RDEPEND="${DEPEND}"
-
-src_install() {
-		perl-module_src_install
-		diropts "-m0755"
-		dodir "/var/tmp/g-cpan"
-		dodir "/var/log/g-cpan"
-		keepdir "/var/log/g-cpan"
-}
-
-pkg_postinst() {
-	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
-	elog "if you have users besides root expecting to use g-cpan."
-	elog "Please note that some CPAN packages need additional manual"
-	elog "parameters or tweaking, due to bugs in their build systems."
-}
diff --git a/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild b/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
index 97bac08d3294..8bf683d29b85 100644
--- a/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit perl-module
+
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
 	inherit git-r3
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
@@ -41,7 +42,11 @@ DEPEND="${COMMONDEPEND}
 
 src_install() {
 	perl-module_src_install
-	diropts -m0775 -o portage -g portage
+	if ! use prefix; then
+		diropts -m0775 -o portage -g portage
+	else
+		diropts -m0775
+	fi
 	dodir "/var/tmp/g-cpan"
 	dodir "/var/log/g-cpan"
 	keepdir "/var/log/g-cpan"
diff --git a/app-portage/g-cpan/g-cpan-0.16.7.ebuild b/app-portage/g-cpan/g-cpan-0.17.0.ebuild
index c8552409d5f7..fca42099a130 100644
--- a/app-portage/g-cpan/g-cpan-0.16.7.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.17.0.ebuild
@@ -1,16 +1,17 @@
-# 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
 
 inherit perl-module
+
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
 	inherit git-r3
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/gentoo-perl/g-cpan/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
@@ -22,11 +23,13 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 COMMONDEPEND="
+	dev-perl/Config-Tiny
 	virtual/perl-File-Path
 	virtual/perl-File-Spec
 	dev-perl/Log-Agent
 	virtual/perl-Memoize
 	virtual/perl-IO
+	dev-perl/Path-Tiny
 	dev-perl/Shell-EnvImporter
 	virtual/perl-Term-ANSIColor
 	>=dev-perl/YAML-0.60
@@ -40,11 +43,15 @@ DEPEND="${COMMONDEPEND}
 "
 
 src_install() {
-		perl-module_src_install
+	perl-module_src_install
+	if ! use prefix; then
 		diropts -m0775 -o portage -g portage
-		dodir "/var/tmp/g-cpan"
-		dodir "/var/log/g-cpan"
-		keepdir "/var/log/g-cpan"
+	else
+		diropts -m0775
+	fi
+	dodir "/var/tmp/g-cpan"
+	dodir "/var/log/g-cpan"
+	keepdir "/var/log/g-cpan"
 }
 
 pkg_postinst() {
diff --git a/app-portage/g-cpan/g-cpan-9999.ebuild b/app-portage/g-cpan/g-cpan-9999.ebuild
index fdd2d32c2860..fca42099a130 100644
--- a/app-portage/g-cpan/g-cpan-9999.ebuild
+++ b/app-portage/g-cpan/g-cpan-9999.ebuild
@@ -1,16 +1,17 @@
-# 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
 
 inherit perl-module
+
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
 	inherit git-r3
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
@@ -43,7 +44,11 @@ DEPEND="${COMMONDEPEND}
 
 src_install() {
 	perl-module_src_install
-	diropts -m0775 -o portage -g portage
+	if ! use prefix; then
+		diropts -m0775 -o portage -g portage
+	else
+		diropts -m0775
+	fi
 	dodir "/var/tmp/g-cpan"
 	dodir "/var/log/g-cpan"
 	keepdir "/var/log/g-cpan"