gentoo resync : 12.07.2021

5 files changed, 2 insertions, 247 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 55ba0d2943e8..43446da77090 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 ~riscv ~s390 sparc x86 ~x64-macos"
 
 IUSE="mariadb +mysql test +ssl"
 RESTRICT="!test? ( test )"
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index 11110f25b6fc..263a1db192f9 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -1,9 +1,6 @@
-AUX 4.041-mariadb-10.2.patch 1276 BLAKE2B 9e29ec5d423e77afe825adbf5146763edf168ed1050a8022d28c220d3fdeaa6cf631e15191be2da7dabccf41b9bc7ae1a13f4728a0f6790b7d230d0eb37c997c SHA512 1e2b4b98d285c7a0b0cfada98e7e65896b322dcf26985cb1f3bc0ceb1e72e71650b23a8b0600e887df33ed316545f8adc22c4cfd9318485f04195d3825d8ceee
-AUX DBD-mysql-4.044-amvis-type-conversions.patch 1739 BLAKE2B 25fcf1c74798a2c0aaaeae3788e69e9735533ffeb6ed3455eecc0e3500d961522081745e3e0d6a99bcbe28996555ca0caf935628688446d4ab2e896c5ee92f3f SHA512 3335e80f756b75299dd8f398a6e6f2aa3902ad581f6c46e8a1e5d032b10c586b5b3ad4a237ccd7dae48b2039a72eb3de537dcab193aba294114392ba32c42c29
-AUX DBD-mysql-4.044-no-dot-inc.patch 4927 BLAKE2B dd952d2dac0de6c9d428832083034041058c019d16f29df2e06f107181cc10a1924c1ff954e33d2269cc6d1d6e0b379b3887ad75bc1542afd6dc6714b9876dc0 SHA512 faf3f4fbe551b8dfe65e747dc78f6136c059934c145ffbd5b83781eec044f8d764f1b02cf5f11af542476853c887fa98b09c6b939740e934c57db235b0668a67
 AUX DBD-mysql-4.050-fix-float-type-conversion.patch 1627 BLAKE2B 466df4b1cb2419a30d58e7e2305f6370cf6279c77d6f0cf16e9b637136e45406f671bc1061d8e47bf3dba7e1156ea28f7ace2c9c04cfdf2afe752d9d50532f54 SHA512 94074573635f457deaace20c0166710f2ff2aed664eb4e49d57aea0de6cc9d933263cb8842cea1ff13e8907ff7e5c89b4a73dee8da9a56875798eb87d4dbad02
 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 2329 BLAKE2B f3e2b8aaa1835af654ae169b30fb4aa38f26d986a06a74813556b5b490e4b34e8b3474ec93e9abfac80159058c3f607d70a8eea41bc13d1c7199cb0283bcf204 SHA512 33b2afc2e53e063d62a2d21fdc43a346d871081369fdf3b5eb5f9c0c2c5876752d3e59370fd94f80a09c59c79e433654229015dc22b0d25a9c72213d91f4d2b3
+EBUILD DBD-mysql-4.50.0-r1.ebuild 2336 BLAKE2B f7184f90105637425d678cbe1fc0a4b4f16c2baa034071b98436d5550772c04658a2e62931b30643398b4cd00896beb409be3dee6d593304fc481974e3cdfb51 SHA512 8f9454006c797f648f61bdaf7b0d441ecfa233d58495ff9f4aa894964bc67341e1a12d6fe6270673a3d3390f11318d3f732ed7ea74766918ac53c6eb8cf0b4c8
 MISC metadata.xml 995 BLAKE2B 6aa64b675959e1e02b7480a08f1ba8f875cb2f6ecca588512c46b2bc265ab61d996ad30eba6b487d0b9af14e77ca225a25b53be77dc7a9e7647746f656aa39bc SHA512 916a209009bf9d19b2844ca0aa01dc24cfb3d66a556905b5208e94d9137199e25dac0e56280ab6e012746e79d6808aba7ca9af2987ed78f875dfdf48b642aaf2
diff --git a/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch b/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch
deleted file mode 100644
index 13fa2775a3c4..000000000000
--- a/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 509fd6a054de9408ce9032e93fff61f6bdbc568a Mon Sep 17 00:00:00 2001
-From: Brian Evans <grknight@gentoo.org>
-Date: Fri, 13 Oct 2017 15:03:50 -0400
-Subject: Fix building/linking against MariaDB 10.2
-
-Bug: https://bugs.gentoo.org/634192
----
- mysql.xs | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mysql.xs b/mysql.xs
-index 13c6a57..6de3c8e 100644
---- a/mysql.xs
-+++ b/mysql.xs
-@@ -790,7 +790,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
-     D_imp_dbh(dbh);
-     IV type = 0;
-     SV* retsv=NULL;
--#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
-+#if ( !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 ) || MYSQL_VERSION_ID >= 100202
- /* MariaDB 10 is not MySQL source level compatible so this only applies to MySQL*/
-     IV buffer_len;
- #endif 
-@@ -822,7 +822,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
- 	    retsv = newSVpvn("`", 1);
- 	    break;
- 	case SQL_MAXIMUM_STATEMENT_LENGTH:
--#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
-+#if ( !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 ) || MYSQL_VERSION_ID >= 100202
-         /* MariaDB 10 is not MySQL source level compatible so this
-            only applies to MySQL*/
- 	    /* mysql_get_option() was added in mysql 5.7.3 */
--- 
-2.14.2
-
diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-4.044-amvis-type-conversions.patch b/dev-perl/DBD-mysql/files/DBD-mysql-4.044-amvis-type-conversions.patch
deleted file mode 100644
index 9cf9ff91fc8a..000000000000
--- a/dev-perl/DBD-mysql/files/DBD-mysql-4.044-amvis-type-conversions.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From eb7eddaa2341b853df045ad4a3690c60fc38c6c8 Mon Sep 17 00:00:00 2001
-From: Pali <pali@cpan.org>
-Date: Fri, 24 Feb 2017 19:51:36 +0100
-Subject: Fix type conversions
-
-Calling SvNV() for magical scalar is not enough for float type conversion.
-It caused problem for Amavis in tainted mode -- all float values were zero.
-On the other hand SvIV() and SvUV() seems to work fine. To be sure that
-correct value of float is in scalar use sv_setnv() with explicit NV float
-value. Similar code is changed also for integers IV/UV.
-
-This patch should fix reported Amavis bug:
-https://github.com/perl5-dbi/DBD-mysql/issues/78
-
-See also reported perl bug about SvNV():
-https://rt.perl.org/Public/Bug/Display.html?id=130801
-
-Bugs: https://github.com/perl5-dbi/DBD-mysql/issues/78
-Bugs-Debian: https://bugs.debian.org/856064
----
- dbdimp.c | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/dbdimp.c b/dbdimp.c
-index 9c33994..7fdfba1 100644
---- a/dbdimp.c
-+++ b/dbdimp.c
-@@ -4380,8 +4380,7 @@ process:
-           if (!(fields[i].flags & ZEROFILL_FLAG))
-           {
-             /* Coerce to dobule and set scalar as NV */
--            (void) SvNV(sv);
--            SvNOK_only(sv);
-+            sv_setnv(sv, SvNV(sv));
-           }
-           break;
- 
-@@ -4392,13 +4391,11 @@ process:
-             /* Coerce to integer and set scalar as UV resp. IV */
-             if (fields[i].flags & UNSIGNED_FLAG)
-             {
--              (void) SvUV(sv);
--              SvIOK_only_UV(sv);
-+              sv_setuv(sv, SvUV(sv));
-             }
-             else
-             {
--              (void) SvIV(sv);
--              SvIOK_only(sv);
-+              sv_setiv(sv, SvIV(sv));
-             }
-           }
-           break;
--- 
-2.15.1
-
diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-4.044-no-dot-inc.patch b/dev-perl/DBD-mysql/files/DBD-mysql-4.044-no-dot-inc.patch
deleted file mode 100644
index 5e0829384be4..000000000000
--- a/dev-perl/DBD-mysql/files/DBD-mysql-4.044-no-dot-inc.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 35931a7465f19da53b97cd1bc5369a69aeac2ff6 Mon Sep 17 00:00:00 2001
-From: Pali <pali@cpan.org>
-Date: Mon, 17 Apr 2017 21:38:58 +0200
-Subject: Fix tests on Perl On 5.25.10 or greater with
- -Ddefault_inc_excludes_dot
-
-Some tests do not include dot in %INC and fails with error:
-Can't locate t/lib.pl in @INC
-
-Fixes: https://rt.cpan.org/Public/Bug/Display.html?id=120709
----
- t/40server_prepare_crash.t             | 3 ++-
- t/lib.pl                               | 5 +++--
- t/rt118977-zerofill.t                  | 2 +-
- t/rt25389-bin-case.t                   | 3 ++-
- t/rt50304-column_info_parentheses.t    | 3 ++-
- t/rt61849-bind-param-buffer-overflow.t | 3 ++-
- t/rt75353-innodb-lock-timeout.t        | 3 ++-
- t/rt83494-quotes-comments.t            | 3 ++-
- 8 files changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/t/40server_prepare_crash.t b/t/40server_prepare_crash.t
-index df6e2b3..e2c8c9f 100644
---- a/t/40server_prepare_crash.t
-+++ b/t/40server_prepare_crash.t
-@@ -5,7 +5,8 @@ use Test::More;
- use DBI;
- 
- use vars qw($test_dsn $test_user $test_password);
--require "t/lib.pl";
-+use lib 't', '.';
-+require "lib.pl";
- 
- my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 1, AutoCommit => 0, mysql_server_prepare => 1, mysql_server_prepare_disable_fallback => 1 }) };
- plan skip_all => "no database connection" if $@ or not $dbh;
-diff --git a/t/lib.pl b/t/lib.pl
-index 2221c40..0c756a0 100644
---- a/t/lib.pl
-+++ b/t/lib.pl
-@@ -2,6 +2,7 @@ use strict;
- use warnings;
- 
- use Test::More;
-+use File::Spec ();
- use DBI::Const::GetInfoType;
- use vars qw($mdriver $dbdriver $childPid $test_dsn $test_user $test_password);
- 
-@@ -31,7 +32,7 @@ if (-f ($file = "t/$dbdriver.dbtest")  ||
-     -f ($file = "$dbdriver.dbtest")    ||
-     -f ($file = "../tests/$dbdriver.dbtest")  ||
-     -f ($file = "tests/$dbdriver.dbtest")) {
--    eval { require $file; };
-+    eval { require File::Spec->rel2abs($file); };
-     if ($@) {
- 	print STDERR "Cannot execute $file: $@.\n";
- 	print "1..0\n";
-@@ -45,7 +46,7 @@ if (-f ($file = "t/$mdriver.mtest")  ||
-     -f ($file = "$mdriver.mtest")    ||
-     -f ($file = "../tests/$mdriver.mtest")  ||
-     -f ($file = "tests/$mdriver.mtest")) {
--    eval { require $file; };
-+    eval { require File::Spec->rel2abs($file); };
-     if ($@) {
- 	print STDERR "Cannot execute $file: $@.\n";
- 	print "1..0\n";
-diff --git a/t/rt118977-zerofill.t b/t/rt118977-zerofill.t
-index 27ba1b7..86edb8e 100644
---- a/t/rt118977-zerofill.t
-+++ b/t/rt118977-zerofill.t
-@@ -5,7 +5,7 @@ use Test::More;
- use DBI;
- 
- use vars qw($test_dsn $test_user $test_password);
--require "t/lib.pl";
-+require "./t/lib.pl";
- 
- my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 1 }) };
- plan skip_all => "no database connection" if $@ or not $dbh;
-diff --git a/t/rt25389-bin-case.t b/t/rt25389-bin-case.t
-index 37bffb9..9d091b3 100644
---- a/t/rt25389-bin-case.t
-+++ b/t/rt25389-bin-case.t
-@@ -4,7 +4,8 @@ use warnings;
- use DBI;
- 
- use vars qw($test_dsn $test_user $test_password);
--require "t/lib.pl";
-+use lib 't', '.';
-+require "lib.pl";
- 
- use Test::More;
- 
-diff --git a/t/rt50304-column_info_parentheses.t b/t/rt50304-column_info_parentheses.t
-index 5b6d799..8c31bf6 100644
---- a/t/rt50304-column_info_parentheses.t
-+++ b/t/rt50304-column_info_parentheses.t
-@@ -4,7 +4,8 @@ use warnings;
- use DBI;
- 
- use vars qw($test_dsn $test_user $test_password $state);
--require "t/lib.pl";
-+use lib 't', '.';
-+require "lib.pl";
- 
- use Test::More;
- 
-diff --git a/t/rt61849-bind-param-buffer-overflow.t b/t/rt61849-bind-param-buffer-overflow.t
-index 99a4ccc..494f985 100644
---- a/t/rt61849-bind-param-buffer-overflow.t
-+++ b/t/rt61849-bind-param-buffer-overflow.t
-@@ -5,7 +5,8 @@ use Test::More;
- use DBI;
- 
- use vars qw($test_dsn $test_user $test_password);
--require "t/lib.pl";
-+use lib 't', '.';
-+require "lib.pl";
- 
- my $INSECURE_VALUE_FROM_USER = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
- 
-diff --git a/t/rt75353-innodb-lock-timeout.t b/t/rt75353-innodb-lock-timeout.t
-index 69b740e..41d1b8f 100644
---- a/t/rt75353-innodb-lock-timeout.t
-+++ b/t/rt75353-innodb-lock-timeout.t
-@@ -5,7 +5,8 @@ use Test::More;
- use DBI;
- 
- use vars qw($test_dsn $test_user $test_password);
--require "t/lib.pl";
-+use lib 't', '.';
-+require "lib.pl";
- 
- my $dbh1 = eval { DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, AutoCommit => 0 }) };
- plan skip_all => "no database connection" if $@ or not $dbh1;
-diff --git a/t/rt83494-quotes-comments.t b/t/rt83494-quotes-comments.t
-index 9df0d90..c42afe4 100644
---- a/t/rt83494-quotes-comments.t
-+++ b/t/rt83494-quotes-comments.t
-@@ -9,7 +9,8 @@ use DBI;
- use Test::More;
- 
- use vars qw($test_dsn $test_user $test_password $state);
--require "t/lib.pl";
-+use lib 't', '.';
-+require "lib.pl";
- 
- my $dbh;
- eval {$dbh= DBI->connect($test_dsn, $test_user, $test_password,
--- 
-2.15.1
-