[gentoo-commits] repo/gentoo:master commit in: app-portage/g-cpan/

["Sam James" <sam@gentoo.org>]

commit:     128d47e603e3d0c43fa4ececc1e15f62961d0b7a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 22:32:44 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 22:32:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=128d47e6

app-portage/g-cpan: add 0.18.0

Bug: https://bugs.gentoo.org/819513
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-portage/g-cpan/Manifest                        |  1 +
 .../{g-cpan-9999.ebuild => g-cpan-0.18.0.ebuild}   | 25 ++++++++++++----------
 app-portage/g-cpan/g-cpan-9999.ebuild              | 25 ++++++++++++----------
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/app-portage/g-cpan/Manifest b/app-portage/g-cpan/Manifest
index 137f2cdf37e2..5ecb05477b55 100644
--- a/app-portage/g-cpan/Manifest
+++ b/app-portage/g-cpan/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/app-portage/g-cpan/g-cpan-9999.ebuild b/app-portage/g-cpan/g-cpan-0.18.0.ebuild
similarity index 79%
copy from app-portage/g-cpan/g-cpan-9999.ebuild
copy to app-portage/g-cpan/g-cpan-0.18.0.ebuild
index fca42099a130..245e333b5463 100644
--- a/app-portage/g-cpan/g-cpan-9999.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.18.0.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,24 +33,28 @@ 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_postinst() {

diff --git a/app-portage/g-cpan/g-cpan-9999.ebuild b/app-portage/g-cpan/g-cpan-9999.ebuild
index fca42099a130..245e333b5463 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,24 +33,28 @@ 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_postinst() {