gentoo resync : 31.05.2021

3 files changed, 4 insertions, 75 deletions

diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
index 3e09d67b1a3c..55ba0d2943e8 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 IUSE="mariadb +mysql test +ssl"
 RESTRICT="!test? ( test )"
@@ -28,7 +28,7 @@ RDEPEND="
 DEPEND="
 	${DB_DEPENDS}
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	virtual/perl-Data-Dumper
 	test? (
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
 		virtual/perl-Time-HiRes
 	)
 "
+
 PATCHES=(
 	"${FILESDIR}/${PN}-4.050-no-dot-inc.patch"
 	"${FILESDIR}/${PN}-4.050-fix-float-type-conversion.patch"
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
deleted file mode 100644
index 0d197fd63108..000000000000
--- a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DVEEDEN
-DIST_VERSION=4.050
-inherit perl-module
-
-DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-IUSE="mariadb +mysql test +ssl"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( mysql mariadb )"
-
-RDEPEND=">=dev-perl/DBI-1.609.0
-	>=dev-perl/Devel-CheckLib-1.109.0
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] )
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/perl-Data-Dumper
-	test? (
-		dev-perl/Test-Deep
-		>=virtual/perl-Test-Simple-0.900.0
-		virtual/perl-Time-HiRes
-	)
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-${DIST_VERSION}-no-dot-inc.patch"
-	"${FILESDIR}/${PN}-${DIST_VERSION}-fix-float-type-conversion.patch"
-	"${FILESDIR}/${PN}-${DIST_VERSION}-fix-for-MariaDB-10.3.13-with-zerofil.patch"
-)
-
-src_configure() {
-	local impl
-	impl=$(usex mariadb mariadb mysql)
-	if use test; then
-		myconf="${myconf} --testdb=test \
-			--testhost=localhost \
-			--testuser=test \
-			--testpassword=test"
-	fi
-	myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX}/usr/bin/${impl}_config"
-	perl-module_src_configure
-}
-
-# Parallel testing is broken as 2 tests create the same table
-# and mysql isn't acid compliant and can't limit visibility of tables
-# to a transaction...
-DIST_TEST="do"
-
-src_test() {
-	einfo
-	einfo "If tests fail, you have to configure your MySQL instance to create"
-	einfo "and grant some privileges to the test user."
-	einfo "You can run the following commands at the MySQL prompt: "
-	einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';"
-	einfo "> CREATE DATABASE test;"
-	einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';"
-	einfo
-	sleep 5
-	perl_rm_files t/pod.t t/manifest.t
-	# Don't be a hero and try to do EXTENDED_TESTING=1 unless you can figure
-	# out why 60leaks.t fails
-	perl-module_src_test
-}
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index 5b8cd4e54ce3..11110f25b6fc 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -5,6 +5,5 @@ AUX DBD-mysql-4.050-fix-float-type-conversion.patch 1627 BLAKE2B 466df4b1cb2419a
 AUX DBD-mysql-4.050-fix-for-MariaDB-10.3.13-with-zerofil.patch 1217 BLAKE2B 928c53b8daabe7f750522ead8a79971662c8f7b1fc076a0a8d626b4e93536f08664420c9486c05fa4944a19e90b7389b65dc590cfe0b5f5149e01d802e0f3e9a SHA512 79c9c289665a5e28dab4f0b74f2c7cb5895109edbf2f2074f9d6116b6d57dee4ade7586309739356ab318005748194b30e352fb20f1f5341ffb077085b529c07
 AUX DBD-mysql-4.050-no-dot-inc.patch 5470 BLAKE2B 09a9b2a3fe033c6ae68b949dfacf08dbc1fa6cce13369a982ad99ee0226dc2b84a8ba1f8f7384325eb5d51b663d11b6163694a19ec343bd16c2a12f74c83bab8 SHA512 795bb73dda37311b4df06ddb541c39cd924f59453d0618c5cae53ccfb698556bc0bea97a0c644546cb6285092fdf71ef04cccf8d4efa47d71a9f64eeb5c02e3f
 DIST DBD-mysql-4.050.tar.gz 161579 BLAKE2B fb17e151db730fd6955d3e4424dd495a9fcf5f3f4e2b6b79d9fdc86bc42c3314b68771f1d3c393fd80ea14aeda626a5c5d21f5b921d487350ffd79802edab1f6 SHA512 910f5b4ba7a7890d50a79f37d04ec8971a4f62acd0fe30bf3ab634f66e3128f0cd6513e5c9da8c807a0f4477d0cc766682ea8dd0d8072d02821b78df51f37879
-EBUILD DBD-mysql-4.50.0-r1.ebuild 2334 BLAKE2B 93301951f5489372ded17718ed2987a806505326a271bd3a5aa8a93d33e4a070c358888eb7ff0ed92f240fd17f95e16651e03da7258787cfadb5799ddb116820 SHA512 acda2534cd6cbcdc7d425ce8084f5ce0ad6d49877d214e954630401ee12240f7ca3bb545288466ab71f528702a62e0cbda3272d4ecd2d0cb740c5b97e9da2130
-EBUILD DBD-mysql-4.50.0.ebuild 2013 BLAKE2B c759cea79aafb4df323d3701c5d103f6ad3d3fb60faf642bc096237f16b590b1d76a981ac805260153e6c904185ee225bde76bd716ade4f47fad270f0db67029 SHA512 ae8b98820c8eb769a93d44c20f38d33d9662350b8ee2e66b9edba38f32a9fa2a69ad30d01803a50ad3c01e978626a222a271c033136e8ddb237b51ff973a5a18
+EBUILD DBD-mysql-4.50.0-r1.ebuild 2329 BLAKE2B f3e2b8aaa1835af654ae169b30fb4aa38f26d986a06a74813556b5b490e4b34e8b3474ec93e9abfac80159058c3f607d70a8eea41bc13d1c7199cb0283bcf204 SHA512 33b2afc2e53e063d62a2d21fdc43a346d871081369fdf3b5eb5f9c0c2c5876752d3e59370fd94f80a09c59c79e433654229015dc22b0d25a9c72213d91f4d2b3
 MISC metadata.xml 995 BLAKE2B 6aa64b675959e1e02b7480a08f1ba8f875cb2f6ecca588512c46b2bc265ab61d996ad30eba6b487d0b9af14e77ca225a25b53be77dc7a9e7647746f656aa39bc SHA512 916a209009bf9d19b2844ca0aa01dc24cfb3d66a556905b5208e94d9137199e25dac0e56280ab6e012746e79d6808aba7ca9af2987ed78f875dfdf48b642aaf2