gentoo resync : 31.05.2021

4 files changed, 29 insertions, 62 deletions

diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.14.2.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.14.2.ebuild
index 91aa69720e7c..2b055bbeddd3 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.14.2.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.14.2.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="PostgreSQL database driver for the DBI module"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild
index 697dbdda80b2..91aa69720e7c 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DIST_AUTHOR=TURNSTEP
 inherit perl-module
@@ -9,17 +9,28 @@ inherit perl-module
 DESCRIPTION="PostgreSQL database driver for the DBI module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-version
 	>=dev-perl/DBI-1.614.0
 	dev-db/postgresql:*
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	dev-db/postgresql:*
+"
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.880.0
+		virtual/perl-Time-HiRes
+	)
 "
+PERL_RM_FILES=(
+	"t/00_signature.t"
+)
 src_prepare() {
 	postgres_include="$(readlink -f "${EPREFIX}"/usr/include/postgresql)"
 	postgres_lib="${postgres_include//include/lib}"
@@ -38,10 +49,16 @@ src_prepare() {
 	perl-module_src_prepare
 }
 
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
+
 src_test() {
 	local MODULES=(
-		# Compile failure: https://rt.cpan.org/Ticket/Display.html?id=123218
-		# "Bundle::DBD::Pg v${PV}"
+		"Bundle::DBD::Pg v${PV}"
 		"DBD::Pg v${PV}"
 	)
 	local failed=()
@@ -74,9 +91,6 @@ src_test() {
 		"t/20savepoints.t"
 		"t/30unicode.t"
 	)
-	local SKIP_TESTS=(
-		"t/00_signature.t"
-	);
 	if [[ ! -v DBI_DSN ]]; then
 		ewarn "Functional database tests disabled due to lack of configuration."
 		ewarn "Please set the following environment variables values pertaining to a"
@@ -87,10 +101,9 @@ src_test() {
 		ewarn "  DBI_PASS - A Postgres Database Password"
 		ewarn ""
 		ewarn "For details, visit:"
-		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/DBD-Pg"
-		SKIP_TESTS+=( "${LIVEDB_TESTS[@]}" )
+		ewarn " https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/DBD-Pg"
+		perl_rm_files "${LIVEDB_TESTS[@]}"
 	fi
-	perl_rm_files "${SKIP_TESTS[@]}"
 	# Parallel testing breaks database access
 	DBDPG_TEST_ALWAYS_ENV=1 DIST_TEST="do" perl-module_src_test
 
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild
deleted file mode 100644
index ab20f333f4a0..000000000000
--- a/dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TURNSTEP
-inherit perl-module
-
-DESCRIPTION="PostgreSQL database driver for the DBI module"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-version
-	>=dev-perl/DBI-1.614.0
-	dev-db/postgresql:*
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-# testcases require a local database with an
-# open password for the postgres user.
-DIST_TEST="skip"
-
-src_prepare() {
-	postgres_include="$(readlink -f "${EPREFIX}"/usr/include/postgresql)"
-	postgres_lib="${postgres_include//include/lib}"
-	# Fall-through case is the non-split postgresql
-	# The active cases instead get us the matching libdir for the includedir.
-	for i in lib lib64 ; do
-		if [ -d "${postgres_lib}/${i}" ]; then
-			postgres_lib="${postgres_lib}/${i}"
-			break
-		fi
-	done
-
-	# env variables for compilation:
-	export POSTGRES_INCLUDE="${postgres_include}"
-	export POSTGRES_LIB="${postgres_lib}"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/DBD-Pg/Manifest b/dev-perl/DBD-Pg/Manifest
index 3f387fdef8f1..b33789024d6b 100644
--- a/dev-perl/DBD-Pg/Manifest
+++ b/dev-perl/DBD-Pg/Manifest
@@ -1,9 +1,7 @@
 DIST DBD-Pg-3.10.0.tar.gz 268414 BLAKE2B da6ac65519632aa95ee2554607d5e26820527042873ab78a9e40e671902b1b8e2fe39f37e44b15cf3db8eda243e57c7fab9077d4a08ec7f3c312825609fbc805 SHA512 46c985bbdeeed4ef60d6fe06034fa0959df288f2b9bbd434e2716676a3cb7a1ded168a3cf87a6a82eb397eb8edcc023c0b85483e948ce31abcac64a1919580ba
 DIST DBD-Pg-3.14.2.tar.gz 282024 BLAKE2B a8121a2c97b1e095576c40b9b305f0ac21b3a8062efd3ac9684ef68346fc9fb0e4384780dc79b7bb5b6b188825dbd2f3da4765eeeb0208c3bef4db28543f9021 SHA512 341df267a7dc1e28f8c71c1b03cb485caf5c9c2ba95a801f7e855ef8c2fb2ed2df2f3cef804fd36072ee5570d30b399f6fba7516216f7d24186c5b6eeb5d5c52
-DIST DBD-Pg-3.5.3.tar.gz 256570 BLAKE2B f589fc4ed978d2215d66b4cfd72b00e166f15dbe2caf004fa52c09fc6fc9f9b81ed84bc04ec0c4d3fe15f4eabb5a8a3b24b08acabb66b993c3ce67576a4c1721 SHA512 7a564e5c86fa41719289f6e391f0cd39f01df7d088892fca11175c60fec8a3af884f9204ae834caac2024ff0d45dcc013e314ec0c09a07fe7ee76170ec3a634f
-DIST DBD-Pg-3.7.0.tar.gz 260083 BLAKE2B 73ae253e8033dab58075f6dc3c639e5d21f2df09880f59cb00fcdc201c17db1573e4902c4bfd535916775c0ef61a020a70e8f542ce28e257a903d4aabb9f6730 SHA512 edd4d3448dac1b563899c5fd4a1bad6cb810afdbbbf57b558bbe6710aa3e58530a6cf0932e35c3316c7f4f59763764d75ce1049f13c8c13deeb2e8a7c60ff73e
+DIST DBD-Pg-3.15.0.tar.gz 284379 BLAKE2B e3d8d5a2e3339c88f92dc24cca47296b8b2e597dcb81f2645180dd90b27873f209728dc0ac320e493b573c73efb54292e89370a628fc304bf319e237e04b1912 SHA512 67912da5cda42d198cdffa3f5c93267ed9da681c837fd8a9b8c6a13873a461b1123ce0a8e1f4f4398264f57ead35950b4945018e6cead14c903a809a298aecb9
 EBUILD DBD-Pg-3.10.0.ebuild 2717 BLAKE2B 0dc600cd44185a34fe87846101ead421ce894315590bb1503be18c109266d5437976d16164662c06528e137b842c5ee5d3938794d61acb843e385efe109398c4 SHA512 56ab20907456ba3b05ee47cd7d0ea69a00752507cd2aaf21360a535d951f2b473e8b7d8a0c3cafb6f67465e1719fcdbbfc2668d3449e57578b8e69f5d848d35f
-EBUILD DBD-Pg-3.14.2.ebuild 2828 BLAKE2B 49fb0658cc408f258c02691b0d00b2aa3c6dc369d88a065889d8367fb384ecfe1d634f0585af61fc9fed58a66498849afbabb50dd4ff27a3bef7490a75f9362b SHA512 f5a546b249ff9e7ec3a21724d06540e678f5f1dc9f5ae7c290949e284d5830d6fa1ad0486a5fcd80ececc0bf63fc2f1a3ead6abf48f1dc9c1a7bc7f55ca03aad
-EBUILD DBD-Pg-3.5.3.ebuild 1110 BLAKE2B 1ab5c2b34a8280f2472c00b4397c92b5ad2d701edfbb22d4d122d5af419e1030413b98c22416ac7cc4d0964a26fe318af55da1eb8d755dbdaa0faef0cc97c9ec SHA512 4ab4872770eae4b5b2447afd1a063d5cb9a717606de0bce049f892a96756f0463d61c478fa16c8ca95e90212f791aa1f75385224a6ae0e64e4767f4488882222
-EBUILD DBD-Pg-3.7.0.ebuild 2717 BLAKE2B 1a37beded86fa05d2f7f8cfade442d4a1095c0c95feb21abdff82471bc6b365fdd6315f65ec6227a63650c228e5f08b4f986537718b398d2e6e67ecf87d7a870 SHA512 1fccbaf0f15748100019290bbe31235e128c0aef762d4b2c20e100620d1f2684bd70235ed594b07a66af1c943df8bc9b31c4db04eb35b2f9cf4de8875e649847
+EBUILD DBD-Pg-3.14.2.ebuild 2821 BLAKE2B 4c878c064a58c0ffaf54a76918ffcad6826d127264aa0c8d1a7624ace311e7f85b3e657b0593be4e19112a60a59a8b6bc9c04e076f87694941c1a44d0847050f SHA512 a26cc4c6076efccfa930e54877ee801566e3ff522c15b39248f19f967d161eba68f30c35cf9112c24c0a13c993693f9ab3c3f2abb4434238498b70c1da7cb3d4
+EBUILD DBD-Pg-3.15.0.ebuild 2828 BLAKE2B 49fb0658cc408f258c02691b0d00b2aa3c6dc369d88a065889d8367fb384ecfe1d634f0585af61fc9fed58a66498849afbabb50dd4ff27a3bef7490a75f9362b SHA512 f5a546b249ff9e7ec3a21724d06540e678f5f1dc9f5ae7c290949e284d5830d6fa1ad0486a5fcd80ececc0bf63fc2f1a3ead6abf48f1dc9c1a7bc7f55ca03aad
 MISC metadata.xml 446 BLAKE2B 428b5b91a84ab6026f482e2e3404f7b43a1557d16f42340453d927b4ea676caa3ab422705ea99439fd6369a43af9f2dcd0d7d3ec6a42f82b9e8df17cd2642a1a SHA512 23e05469a61761595bc52b6798d152dfc82b42a4ce1ed8010cd17b6343557ef92433cd31c00102098ed698ed0fd0260e3d165c926b9ce3de91f52112c9b40684