Merge updates from master

14 files changed, 67 insertions, 40 deletions

diff --git a/dev-perl/HTML-TableParser/HTML-TableParser-0.400.0.ebuild b/dev-perl/HTML-TableParser/HTML-TableParser-0.400.0.ebuild
index 77ed594eeafb..6ff43851bfb6 100644
--- a/dev-perl/HTML-TableParser/HTML-TableParser-0.400.0.ebuild
+++ b/dev-perl/HTML-TableParser/HTML-TableParser-0.400.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,8 +23,6 @@ DEPEND="${RDEPEND}
 	virtual/perl-CPAN-Meta
 	test? (
 		>=virtual/perl-Test-Simple-0.320.0
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
 	)
 "
 
diff --git a/dev-perl/Image-Imlib2/Image-Imlib2-2.30.0-r1.ebuild b/dev-perl/Image-Imlib2/Image-Imlib2-2.30.0-r1.ebuild
index 348bbdf8c8ce..b3fc1ec049d4 100644
--- a/dev-perl/Image-Imlib2/Image-Imlib2-2.30.0-r1.ebuild
+++ b/dev-perl/Image-Imlib2/Image-Imlib2-2.30.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,9 +18,12 @@ RDEPEND=">=media-libs/imlib2-1"
 DEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.28
 	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
 		>=media-libs/imlib2-1[jpeg,png]
 	)"
 
 SRC_TEST=do
+
+src_test() {
+	perl_rm_files t/pod.t t/pod_coverage.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.330.0.ebuild b/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.330.0.ebuild
index 64a992718148..b66d3a61f0e1 100644
--- a/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.330.0.ebuild
+++ b/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.330.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,9 +21,12 @@ DEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.380.0
 	test? (
 		>=virtual/perl-Test-Simple-0.940.0
-		>=dev-perl/Test-Pod-1.40.0
-		dev-perl/Test-Pod-Coverage
 	)
 "
 
 SRC_TEST="do parallel"
+
+src_test() {
+	perl_rm_files t/pod.t t/pod-coverage.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Locale-Msgfmt/Locale-Msgfmt-0.150.0-r1.ebuild b/dev-perl/Locale-Msgfmt/Locale-Msgfmt-0.150.0-r1.ebuild
index 7a66f112800a..2093d5c4eec8 100644
--- a/dev-perl/Locale-Msgfmt/Locale-Msgfmt-0.150.0-r1.ebuild
+++ b/dev-perl/Locale-Msgfmt/Locale-Msgfmt-0.150.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,6 +16,6 @@ IUSE="test"
 
 RDEPEND=""
 DEPEND="
-	test? ( dev-perl/Test-Pod )"
+	test? ( virtual/perl-Test-Simple )"
 
 SRC_TEST=do
diff --git a/dev-perl/MARC-Charset/MARC-Charset-1.350.0-r1.ebuild b/dev-perl/MARC-Charset/MARC-Charset-1.350.0-r1.ebuild
index 6c9c7539c74c..135c171422e2 100644
--- a/dev-perl/MARC-Charset/MARC-Charset-1.350.0-r1.ebuild
+++ b/dev-perl/MARC-Charset/MARC-Charset-1.350.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,6 +20,11 @@ RDEPEND="
 	dev-perl/Class-Accessor
 "
 DEPEND="${RDEPEND}
-	test? ( dev-perl/Test-Pod )"
+	test? ( virtual/perl-Test-Simple )"
 
 SRC_TEST=do
+
+src_test() {
+	perl_rm_files t/pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.30.0-r1.ebuild b/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.30.0-r1.ebuild
index 72ae20e9ee88..72c6294ba477 100644
--- a/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.30.0-r1.ebuild
+++ b/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.30.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,6 @@ DEPEND="${RDEPEND}
 	dev-perl/Module-Build
 	virtual/pkgconfig
 	test? (
-		dev-perl/Test-Pod
 		virtual/perl-Test-Simple
 	)
 "
@@ -46,3 +45,7 @@ src_install() {
 	docinto examples
 	dodoc examples/discid.pl
 }
+src_test() {
+	perl_rm_files t/05pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Net-Google-SafeBrowsing-UpdateRequest/Net-Google-SafeBrowsing-UpdateRequest-1.60.0-r1.ebuild b/dev-perl/Net-Google-SafeBrowsing-UpdateRequest/Net-Google-SafeBrowsing-UpdateRequest-1.60.0-r1.ebuild
index afc8a112e8cd..af91f5ab32ec 100644
--- a/dev-perl/Net-Google-SafeBrowsing-UpdateRequest/Net-Google-SafeBrowsing-UpdateRequest-1.60.0-r1.ebuild
+++ b/dev-perl/Net-Google-SafeBrowsing-UpdateRequest/Net-Google-SafeBrowsing-UpdateRequest-1.60.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,6 +18,11 @@ IUSE="test"
 RDEPEND="dev-perl/libwww-perl
 	 >=dev-perl/Net-Google-SafeBrowsing-Blocklist-1.04"
 DEPEND="${RDEPEND}
-	test? ( dev-perl/Test-Pod )"
+	test? ( virtual/perl-Test-Simple )"
 
 SRC_TEST="do"
+
+src_test() {
+	perl_rm_files t/pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Sys-Statistics-Linux/Sys-Statistics-Linux-0.660.0-r1.ebuild b/dev-perl/Sys-Statistics-Linux/Sys-Statistics-Linux-0.660.0-r1.ebuild
index 6ec0a85ec978..4c6ffe50042e 100644
--- a/dev-perl/Sys-Statistics-Linux/Sys-Statistics-Linux-0.660.0-r1.ebuild
+++ b/dev-perl/Sys-Statistics-Linux/Sys-Statistics-Linux-0.660.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,8 +18,7 @@ RDEPEND="dev-perl/YAML-Syck"
 DEPEND="
 	dev-perl/Module-Build
 	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
+		virtual/perl-Test-Simple
 	)"
 
 SRC_TEST="do"
@@ -31,3 +30,8 @@ src_install() {
 	insinto /usr/share/doc/$PF/examples
 	doins examples/*
 }
+
+src_test() {
+	perl_rm_files t/001-pod.t t/002-pod-coverage.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Sys-Virt/Sys-Virt-1.1.2.ebuild b/dev-perl/Sys-Virt/Sys-Virt-1.1.2.ebuild
index f4fc7992aaae..5c30a68f01ad 100644
--- a/dev-perl/Sys-Virt/Sys-Virt-1.1.2.ebuild
+++ b/dev-perl/Sys-Virt/Sys-Virt-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,9 +18,6 @@ RDEPEND=">=app-emulation/libvirt-${PV}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? (
-		dev-perl/CPAN-Changes
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
 		dev-perl/XML-XPath
 		virtual/perl-Time-HiRes
 	)"
@@ -30,3 +27,8 @@ SRC_TEST="do"
 src_compile() {
 	MAKEOPTS+=" -j1" perl-module_src_compile
 }
+
+src_test() {
+	perl_rm_files "t/010-pod-coverage.t" "t/005-pod.t" "t/015-changes.t"
+	perl-module_src_test
+}
diff --git a/dev-perl/Sys-Virt/Sys-Virt-1.2.9.ebuild b/dev-perl/Sys-Virt/Sys-Virt-1.2.9.ebuild
index fe47adb458a7..856bd1af3d7f 100644
--- a/dev-perl/Sys-Virt/Sys-Virt-1.2.9.ebuild
+++ b/dev-perl/Sys-Virt/Sys-Virt-1.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,9 +18,6 @@ RDEPEND=">=app-emulation/libvirt-${PV}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? (
-		dev-perl/CPAN-Changes
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
 		dev-perl/XML-XPath
 		virtual/perl-Time-HiRes
 	)"
@@ -30,3 +27,8 @@ SRC_TEST="do"
 src_compile() {
 	MAKEOPTS+=" -j1" perl-module_src_compile
 }
+
+src_test() {
+	perl_rm_files "t/010-pod-coverage.t" "t/005-pod.t" "t/015-changes.t"
+	perl-module_src_test
+}
diff --git a/dev-perl/TAP-Parser-SourceHandler-pgTAP/TAP-Parser-SourceHandler-pgTAP-3.29.ebuild b/dev-perl/TAP-Parser-SourceHandler-pgTAP/TAP-Parser-SourceHandler-pgTAP-3.29.ebuild
index aa43156562f2..15142b9a4da8 100644
--- a/dev-perl/TAP-Parser-SourceHandler-pgTAP/TAP-Parser-SourceHandler-pgTAP-3.29.ebuild
+++ b/dev-perl/TAP-Parser-SourceHandler-pgTAP/TAP-Parser-SourceHandler-pgTAP-3.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,9 +15,12 @@ KEYWORDS="amd64"
 
 RDEPEND="virtual/perl-Test-Harness"
 DEPEND="${RDEPEND}
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
 		dev-perl/Module-Build
 "
 
 SRC_TEST="do"
+
+src_test() {
+	perl_rm_files t/pod-coverage.t t/pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/TAP-Parser-SourceHandler-pgTAP/TAP-Parser-SourceHandler-pgTAP-3.310.0.ebuild b/dev-perl/TAP-Parser-SourceHandler-pgTAP/TAP-Parser-SourceHandler-pgTAP-3.310.0.ebuild
index 7fe9c7b4fd8d..c9f907203b27 100644
--- a/dev-perl/TAP-Parser-SourceHandler-pgTAP/TAP-Parser-SourceHandler-pgTAP-3.310.0.ebuild
+++ b/dev-perl/TAP-Parser-SourceHandler-pgTAP/TAP-Parser-SourceHandler-pgTAP-3.310.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,8 +20,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.300.0
 	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
 		>=virtual/perl-Test-Simple-0.880.0
 	)
 "
diff --git a/dev-perl/TAP-Parser-SourceHandler-pgTAP/TAP-Parser-SourceHandler-pgTAP-3.320.0.ebuild b/dev-perl/TAP-Parser-SourceHandler-pgTAP/TAP-Parser-SourceHandler-pgTAP-3.320.0.ebuild
index 400e156599a2..f636683ec196 100644
--- a/dev-perl/TAP-Parser-SourceHandler-pgTAP/TAP-Parser-SourceHandler-pgTAP-3.320.0.ebuild
+++ b/dev-perl/TAP-Parser-SourceHandler-pgTAP/TAP-Parser-SourceHandler-pgTAP-3.320.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,8 +20,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.300.0
 	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
 		>=virtual/perl-Test-Simple-0.880.0
 	)
 "
diff --git a/dev-perl/Test-Command-Simple/Test-Command-Simple-0.50.0.ebuild b/dev-perl/Test-Command-Simple/Test-Command-Simple-0.50.0.ebuild
index e7d7f2156ef7..65912dca4f3e 100644
--- a/dev-perl/Test-Command-Simple/Test-Command-Simple-0.50.0.ebuild
+++ b/dev-perl/Test-Command-Simple/Test-Command-Simple-0.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,9 +20,12 @@ DEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.420.0
 	test? (
 		virtual/perl-Test-Simple
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
 	)
 "
 
 SRC_TEST="do parallel"
+
+src_test() {
+	perl_rm_files t/pod.t t/manifest.t t/pod-coverage.t
+	perl-module_src_test
+}