gentoo resync : 25.08.2020

2 files changed, 38 insertions, 17 deletions

diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
index e22c6ccf16f9..267364b75c27 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
@@ -1,25 +1,33 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DIST_AUTHOR=CAPTTOFU
-DIST_VERSION=4.044
-inherit eutils perl-module
+DIST_AUTHOR=DVEEDEN
+DIST_VERSION=4.050
+inherit perl-module
 
 DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+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
+DB_DEPENDS="
 	mysql? ( dev-db/mysql-connector-c:= )
 	mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] )
 "
+RDEPEND="
+	>=dev-perl/DBI-1.609.0
+	>=dev-perl/Devel-CheckLib-1.109.0
+	${DB_DEPENDS}
+"
+DEPEND="
+	${DB_DEPENDS}
+"
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	virtual/perl-Data-Dumper
@@ -30,9 +38,14 @@ DEPEND="${RDEPEND}
 	)
 "
 PATCHES=(
-	"${FILESDIR}/${PN}-${DIST_VERSION}-amvis-type-conversions.patch"
-	"${FILESDIR}/${PN}-${DIST_VERSION}-no-dot-inc.patch"
-	"${FILESDIR}/4.041-mariadb-10.2.patch"
+	"${FILESDIR}/${PN}-4.050-no-dot-inc.patch"
+	"${FILESDIR}/${PN}-4.050-fix-float-type-conversion.patch"
+	"${FILESDIR}/${PN}-4.050-fix-for-MariaDB-10.3.13-with-zerofil.patch"
+)
+
+PERL_RM_FILES=(
+	t/pod.t
+	t/manifest.t
 )
 src_configure() {
 	local impl
@@ -47,12 +60,17 @@ src_configure() {
 	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_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
 src_test() {
+	ewarn "Comprehensive testing requires additional manual steps. For details"
+	ewarn "see:"
+	ewarn " https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}#Testing"
+
 	einfo
 	einfo "If tests fail, you have to configure your MySQL instance to create"
 	einfo "and grant some privileges to the test user."
@@ -62,8 +80,11 @@ src_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
+
+	# 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" perl-module_src_test
 }
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index 6600d447fdcf..f62d4d8c6303 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -7,6 +7,6 @@ AUX DBD-mysql-4.050-no-dot-inc.patch 5470 BLAKE2B 09a9b2a3fe033c6ae68b949dfacf08
 DIST DBD-mysql-4.044.tar.gz 155006 BLAKE2B 2934224010bb09aaff9a334b25038a4c7d1eb5552f6ad2b73f44aa7e2d8cb3684644773a89f35363c156cf40867a28943320e1b8b7ef4b9d4b8ac0f6b2417b38 SHA512 e3dd9482e8f78c19dc91baba07e39e266f113ce5a014cfe6c5989c96ed0f85723a17ba6a6e00b65a1ed3c62362400bd3779eb63ed282f73587b4757da249af02
 DIST DBD-mysql-4.050.tar.gz 161579 BLAKE2B fb17e151db730fd6955d3e4424dd495a9fcf5f3f4e2b6b79d9fdc86bc42c3314b68771f1d3c393fd80ea14aeda626a5c5d21f5b921d487350ffd79802edab1f6 SHA512 910f5b4ba7a7890d50a79f37d04ec8971a4f62acd0fe30bf3ab634f66e3128f0cd6513e5c9da8c807a0f4477d0cc766682ea8dd0d8072d02821b78df51f37879
 EBUILD DBD-mysql-4.44.0-r1.ebuild 1833 BLAKE2B df6bd938063675db1406b7111bedc65ae3780ed40476f318c9dcf232defc935ce42ede0cda7c5db87a192abc87393e3ebaa7f9bcfdf85155fbab3047cc6e2889 SHA512 b1de7bc3f489dcf246ef98e82d7bd5b9109dd544d8be15c3aed0737db03252e90beb7c9436ea50e581ea988c10c2e3abddc358ecb5f9eb1a12bfe033d997f15e
-EBUILD DBD-mysql-4.44.0-r2.ebuild 1936 BLAKE2B 52195ed520d26898effd8763cbc0afc5e9ad043a63e1e7b430eaaf6053cead82d60f8b882210a27663dfd634fcc9492ffe25548c6f6a1266500a66c74fe745d9 SHA512 ebc5221d4eef9b58dc3fe6eab8cea559ac8d18be1df930f6e4cb3d845b0664ed41e8cf152f6199377a2ed983de2630d501c66471f924ce897e8ab17f977ae0a8
+EBUILD DBD-mysql-4.50.0-r1.ebuild 2317 BLAKE2B da73d471c6235ea21ad04160cee02a6ea5459ae42e9efbf9966e8979547f7696ff3ac6ef8a7258b2d852b9a4746bc0e485d0f576413955fa4326329d25a9c49e SHA512 e4fc4d7678a1e04e572ceac9b071a3f9e34637b73d3707e48f8a02c41f879c4b644ce93292cd41a646e9a6bcc16fc2568530e2011ba7446322754d3b6329ad14
 EBUILD DBD-mysql-4.50.0.ebuild 2018 BLAKE2B e0f5ccfccc9ee9af5154cee060d73bd22a4f87eb988814b7ce65cbe775558dd25cd155f9cd1e3322e1487358eb28a45a3f877389ad811380ad3ed9bc26fccb6b SHA512 a3a9c71079854e5a516e53bffa2003daa6268622fed44c6d69db0ca0826bf04be94d56112923809e95665bde0b0f13803bbb8396da7ffa868f2dee967e679e91
 MISC metadata.xml 995 BLAKE2B 6aa64b675959e1e02b7480a08f1ba8f875cb2f6ecca588512c46b2bc265ab61d996ad30eba6b487d0b9af14e77ca225a25b53be77dc7a9e7647746f656aa39bc SHA512 916a209009bf9d19b2844ca0aa01dc24cfb3d66a556905b5208e94d9137199e25dac0e56280ab6e012746e79d6808aba7ca9af2987ed78f875dfdf48b642aaf2