Merge updates from master

7 files changed, 41 insertions, 63 deletions

diff --git a/dev-perl/MusicBrainz-DiscID/Manifest b/dev-perl/MusicBrainz-DiscID/Manifest
index cdaa7a365426..56cab4347f07 100644
--- a/dev-perl/MusicBrainz-DiscID/Manifest
+++ b/dev-perl/MusicBrainz-DiscID/Manifest
@@ -1 +1,2 @@
 DIST MusicBrainz-DiscID-0.04.tar.gz 6907 BLAKE2B 1dc163515af1818816d223da5090dec67cf1102311370de0658d15488d5551207b27f8b817727f3ddad2a64f3f792cf1e094ace460fd3db7d4eb1b06fdeea18d SHA512 ccf93205f3485fa19e22cee079b2615326384513dc773f5d242216b680317d2d35d3a2421e46bc17651d8d7797a4d01bd3c2c0ae603a1d1e550ac2a558163125
+DIST MusicBrainz-DiscID-0.06.tar.gz 6663 BLAKE2B b5cb0820a37e30b33c27e2a57a28ae8143b4d60c3299e534dfdbade798afdc56d9905bfda044e5fdc08f77d56c2caece546e3245a17bf4960dd814d96485a210 SHA512 85483603c111d39f7e6490808817416612a96a0dc3d20ad432e7bd1e39ca0a21d4044dd4e25ff41eb713e4b0dd97c0cb1c486cb7a2c730369df9b782e61ec483
diff --git a/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.60.0.ebuild b/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.60.0.ebuild
new file mode 100644
index 000000000000..6c52e7782e3f
--- /dev/null
+++ b/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.60.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=NJH
+DIST_VERSION=0.06
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Perl interface for the MusicBrainz libdiscid library"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=media-libs/libdiscid-0.2.2"
+DEPEND="${RDEPEND}
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/pkgconfig
+	test? (
+		>=virtual/perl-Test-1.0.0
+		virtual/perl-Test-Simple
+	)
+"
+
+PERL_RM_FILES=( t/05pod.t )
diff --git a/dev-perl/Net-Amazon/Net-Amazon-0.620.0.ebuild b/dev-perl/Net-Amazon/Net-Amazon-0.620.0-r1.ebuild
index 2672155d5d26..c1c7dd99c758 100644
--- a/dev-perl/Net-Amazon/Net-Amazon-0.620.0.ebuild
+++ b/dev-perl/Net-Amazon/Net-Amazon-0.620.0-r1.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-MODULE_AUTHOR=BOUMENOT
-MODULE_VERSION=0.62
+DIST_AUTHOR=BOUMENOT
+DIST_VERSION=0.62
 inherit perl-module
 
 DESCRIPTION="Framework for accessing amazon.com via SOAP and XML/HTTP"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	dev-perl/libwww-perl
@@ -22,9 +21,8 @@ RDEPEND="
 	virtual/perl-Digest-SHA
 	dev-perl/URI
 "
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-0.62-no-dot-inc.patch"
 )
-
-SRC_TEST="do"
diff --git a/dev-perl/capitalization/capitalization-0.30.0-r1.ebuild b/dev-perl/capitalization/capitalization-0.30.0-r1.ebuild
deleted file mode 100644
index da4fe24f815d..000000000000
--- a/dev-perl/capitalization/capitalization-0.30.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MIYAGAWA
-MODULE_VERSION=0.03
-inherit perl-module
-
-DESCRIPTION="no capitalization on method names"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="dev-perl/Devel-Symdump"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/capitalization/capitalization-0.30.0-r2.ebuild b/dev-perl/capitalization/capitalization-0.30.0-r2.ebuild
index 55df105eac68..3b22816dd7f7 100644
--- a/dev-perl/capitalization/capitalization-0.30.0-r2.ebuild
+++ b/dev-perl/capitalization/capitalization-0.30.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DIST_AUTHOR=MIYAGAWA
 DIST_VERSION=0.03
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="no capitalization on method names"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
 
 RDEPEND="dev-perl/Devel-Symdump"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/constant-defer/constant-defer-6.0.0-r1.ebuild b/dev-perl/constant-defer/constant-defer-6.0.0-r1.ebuild
index 4910aca9d3e9..a25e293c9d6d 100644
--- a/dev-perl/constant-defer/constant-defer-6.0.0-r1.ebuild
+++ b/dev-perl/constant-defer/constant-defer-6.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ DESCRIPTION="constant subs with deferred value calculation"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test examples"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/constant-defer/constant-defer-6.0.0.ebuild b/dev-perl/constant-defer/constant-defer-6.0.0.ebuild
deleted file mode 100644
index 817eb3e8e174..000000000000
--- a/dev-perl/constant-defer/constant-defer-6.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR="KRYDE"
-DIST_VERSION="6"
-inherit perl-module
-
-DESCRIPTION="constant subs with deferred value calculation"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="test examples"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/perl-Carp"
-DEPEND="virtual/perl-ExtUtils-MakeMaker
-	virtual/perl-Exporter
-	test? ( virtual/perl-Data-Dumper
-		virtual/perl-Test
-		virtual/perl-Test-Simple )"
-
-src_install() {
-	perl-module_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}