gentoo resync : 09.07.2022

3 files changed, 106 insertions, 12 deletions

diff --git a/app-portage/g-cpan/Manifest b/app-portage/g-cpan/Manifest
index db70900ebb6b..8955b9d09817 100644
--- a/app-portage/g-cpan/Manifest
+++ b/app-portage/g-cpan/Manifest
@@ -1,6 +1,8 @@
 DIST g-cpan-0.16.9.tar.gz 34463 BLAKE2B 7eff6b7da75219712504ac7b9ea1833e9eaa9ba4a49f609baec6407beb16f4764baf2c35e15c779c93ca8c09bba9058e6acb6fda7f3fd2df06296724f2c3c3fc SHA512 f26d81974fedb024808fe3671ae297fd36abc37a5b04783f36f6c9e8c6000a411c675e999e91da48801a7c84fde15a59587df02fa9d7b3833ccc0916993b1783
 DIST g-cpan-0.17.0.tar.gz 38786 BLAKE2B 3f4a165920c7c075919f0eeca9554fe32bd3f72cd8010fced4d7e45aa44e80de7800fb78587d1429ac88643dd812d58725b66fbbdce305bd762db8d4ca2f0720 SHA512 80475560a00fddce31f8a92dd460bd22e0de57445a56628ad76f35ab3fc4d2f801ebd2a2a9542ed675245a994e53bb7ae842f714c35ab1f6bdbc40dd49ce2d86
+DIST g-cpan-0.18.0.tar.gz 39099 BLAKE2B fd04d36706a63b66bf74d247d088397f77e42f8f33d6fcf068ea42601bfb89cca751ea35a6a10977077eeac2f3fd9b21d6f1d9990b87fe8cf60951a639730589 SHA512 bebb6187c80fb5228a6dcaa4dd51d7d9c9bb755e86d637ab1d740e4cbdc09c5b01f3d0b608f3c6b2b27a06e4e433ec77dfe49c6738cdef75f45c1e8231ebd9e9
 EBUILD g-cpan-0.16.9-r1.ebuild 1504 BLAKE2B f8881ff26a8df29ab71c4b7660ab6c79e862ab6dbe9a04ac2732953f073209c95b9ad87dd0099e47f76a2fc81b88073228ee63afa8ee8455b884d22a8a031529 SHA512 47e87d0d6ab7873db87f3cbc8c47e519b392af1ea05a52ac6c11d612794aecfa2a63b87ea00960d4eded7ce845c6c275599b24baf437963bfa05d143a3851f26
 EBUILD g-cpan-0.17.0.ebuild 1552 BLAKE2B cb4c8fc80e95b56311039f56b9815e8b25444b692150dbdd4c6e761b62e747dff6fd54c1dc3c017d293c80cf16a238c7a1be2d16e404fc124d32345c28c7e35a SHA512 022b215dc0e330d2042cbc63426ea56bc42c2bb4e393db5721f51c436662bd21159f65310ce07cdb047492dd62533fc98a0a08e118ec48afefbe0c028b305c40
-EBUILD g-cpan-9999.ebuild 1552 BLAKE2B cb4c8fc80e95b56311039f56b9815e8b25444b692150dbdd4c6e761b62e747dff6fd54c1dc3c017d293c80cf16a238c7a1be2d16e404fc124d32345c28c7e35a SHA512 022b215dc0e330d2042cbc63426ea56bc42c2bb4e393db5721f51c436662bd21159f65310ce07cdb047492dd62533fc98a0a08e118ec48afefbe0c028b305c40
+EBUILD g-cpan-0.18.0-r1.ebuild 2007 BLAKE2B 497e756d8f7b941ac52b3df646f2b0eb67e1f07895c8b5d2bc79fcd32cb663ca02c7b6b9fd4b191488913d2535771fb11b7204dc799c72d432a1d8aad490860b SHA512 0c09b6dcb02f584285240209f229f4df505e09d981551f3b6c119a7deaeafbdd94b2765058baaa9fc6ead1d7cec7aa719cf542441dded7965950c3d7a1d82029
+EBUILD g-cpan-9999.ebuild 2013 BLAKE2B 1b2ab97c270643cff7a7be76b5c0a019b2cfe7aa0c11d58e490f8ac7774865924cb5899d684d744adf584256e5407166acd065add5c0ade4757060ba67f2806e SHA512 59bce9e18c20a105f1e9747b8d20fda72fa9a1db7a4ff118bb0effcb7c20d1098df677ae3a4b1ae3a455f309fbd61639273f35373d04ba4ea11a72de2c3dc542
 MISC metadata.xml 480 BLAKE2B c438c0267eb220d45dbd24a611c246e528059c50b12f03e9c42a84b9352b54a15542033b72c6da41207de7c6b84652a96e2bc76706f3f99691a8012f944d4a20 SHA512 dce5096008dff924c9c2856b379b1c101db447cf96626042846931ee1d5e96844cc6376da8d9c918677ca625870f1d2ec25da7dd307994dc46369b07dbaa9926
diff --git a/app-portage/g-cpan/g-cpan-0.18.0-r1.ebuild b/app-portage/g-cpan/g-cpan-0.18.0-r1.ebuild
new file mode 100644
index 000000000000..01a9e11c8b90
--- /dev/null
+++ b/app-portage/g-cpan/g-cpan-0.18.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/gentoo-perl/g-cpan.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/${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"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl/g-cpan"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	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
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/portage-2.0.0
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.940.0 )
+"
+
+src_install() {
+	perl-module_src_install
+
+	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
+}
+
+pkg_preinst() {
+	has_version "<app-portage/g-cpan-0.18.0-r1" && HAD_EAPI5_GCPAN=1
+}
+
+pkg_postinst() {
+	if [[ ${HAD_EAPI5_GCPAN:-0} -eq 1 ]] ; then
+		ewarn "Please re-create your overlay with generated g-cpan ebuilds!"
+		ewarn "The old ebuilds will use EAPI 5 and be incompatible with newer"
+		ewarn "Perl eclass changes. This newer version of g-cpan (0.18.0+)"
+		ewarn "generates EAPI 8 ebuilds without this problem, but it cannot"
+		ewarn "change existing ebuilds. See bug #819513."
+	fi
+
+	elog "If you want to use g-cpan as non root user you may wish to adjust"
+	elog "the permissions on /var/tmp/g-cpan or add users to the portage group."
+	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-9999.ebuild b/app-portage/g-cpan/g-cpan-9999.ebuild
index fca42099a130..d37683277b73 100644
--- a/app-portage/g-cpan/g-cpan-9999.ebuild
+++ b/app-portage/g-cpan/g-cpan-9999.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit perl-module
 
-if [[ ${PV} == "9999" ]] ; then
+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"
+	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
@@ -22,7 +21,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-COMMONDEPEND="
+COMMON_DEPEND="
 	dev-perl/Config-Tiny
 	virtual/perl-File-Path
 	virtual/perl-File-Spec
@@ -34,27 +33,43 @@ COMMONDEPEND="
 	virtual/perl-Term-ANSIColor
 	>=dev-perl/YAML-0.60
 "
-RDEPEND="${COMMONDEPEND}
+RDEPEND="
+	${COMMON_DEPEND}
 	>=sys-apps/portage-2.0.0
 "
-DEPEND="${COMMONDEPEND}
+BDEPEND="
+	${COMMON_DEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? ( >=virtual/perl-Test-Simple-0.940.0 )
 "
 
 src_install() {
 	perl-module_src_install
+
 	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"
+
+	dodir /var/tmp/g-cpan
+	dodir /var/log/g-cpan
+	keepdir /var/log/g-cpan
+}
+
+pkg_preinst() {
+	has_version "<app-portage/g-cpan-0.18.0-r1" && HAD_EAPI5_GCPAN=1
 }
 
 pkg_postinst() {
+	if [[ ${HAD_EAPI5_GCPAN:-0} -eq 1 ]] ; then
+		ewarn "Please re-create your overlay with generated g-cpan ebuilds!"
+		ewarn "The old ebuilds will use EAPI 5 and be incompatible with newer"
+		ewarn "Perl eclass changes. This newer version of g-cpan (0.18.0+)"
+		ewarn "generates EAPI 8 ebuilds without this problem, but it cannot"
+		ewarn "change existing ebuilds. See bug #819513."
+	fi
+
 	elog "If you want to use g-cpan as non root user you may wish to adjust"
 	elog "the permissions on /var/tmp/g-cpan or add users to the portage group."
 	elog "Please note that some CPAN packages need additional manual"