gentoo resync : 20.10.2017

3 files changed, 38 insertions, 1 deletions

diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r1.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r2.ebuild
index dd0e5c3e5dc2..34f18b06e628 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r1.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r2.ebuild
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${DIST_VERSION}-no-dot-inc.patch"
 	"${FILESDIR}/${DIST_VERSION}-amvis-type-conversions.patch"
+	"${FILESDIR}/${DIST_VERSION}-mariadb-10.2.patch"
 )
 src_configure() {
 	if use test; then
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index 90283d7f8962..fb5caa8ce71a 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -1,4 +1,5 @@
 AUX 4.041-amvis-type-conversions.patch 1503 SHA256 c7d3d058d72799dccd5225e1ae3025a0a540d373e55c7814564203d2eb45561f SHA512 e30e7d04fac5e19d710af7f116c82455bed5ab1a080bd4e8777e4a08915243f5059c687c936da82d92bbb53496c9a6848cb2fb36bc8e63140e6b230b78d3daae WHIRLPOOL 1919c1b2f99f071cbb667c62cf389809cbdfcff7fb3ee8463f98796e628df1e1587a07298000fecdc2dc3199893059e73d8f3f296f41934ff8a0f600895246cb
+AUX 4.041-mariadb-10.2.patch 1276 SHA256 0ecc3c1378a19f7322bf0706a7be50069cc4dfeb8767cf7c1d4dbebe4673d159 SHA512 1e2b4b98d285c7a0b0cfada98e7e65896b322dcf26985cb1f3bc0ceb1e72e71650b23a8b0600e887df33ed316545f8adc22c4cfd9318485f04195d3825d8ceee WHIRLPOOL 4b8fc48ecde789aeb3c5aa4ddbb46c5dd8135022e013e8594a2b5d40c6ad983b27b2b8260f946c0ab4b130300bef22c02151c066b634be621c0cc511e88a4e46
 AUX 4.041-no-dot-inc.patch 3470 SHA256 4a75b2eae0cca4b4bc9d122d12a6c96ad8f6ed823b70c85ff8bf91c740de4beb SHA512 b7a075b9e63bf80bf78a91fc732fccf2059638961d941b7be0dd73b3669a0a0df7bed3a8e5c12d8d88a9da7c28fb872669de5f3d6b6ac60da5510599a173cb26 WHIRLPOOL 085ad9532f6977ca5ebab4487e035caaf1cf30d4f07bf97e4d2edb244743c0c21a018fb361708ae7342d81c6eb2805820248d7b16e5e535e37c12fdb4fe345f5
 AUX 4.042-no-dot-inc.patch 5717 SHA256 a156c12ed5461a7e51fdd1a9fdd1613620a39ca1d90b3f1f04adccac465ac2a6 SHA512 8b8707cffc9ff711ea0effe9c2eb0ef56fd4b97729e76f3bffe52e780764a4f0d812e1ec00249752363475650dc803b2311c82cc645016d0449be296b8b1bf0b WHIRLPOOL 4b437edd2bbce3438e709a7f66fb56d990f6f20ce427f6884a40f176fd23be3de9160bf9110fc8c8d3b6965d71c2b5621749e79988c96f7e9073d296eee178ae
 AUX DBD-mysql-print_embedded_options.patch 616 SHA256 b1aeee3f0d34a909509b30b0713c1e9385061e2d5518f5210fd90c6d15d07348 SHA512 da7bbc1b65e58128af4c19673827c342de94e811b6ab20ff6844646eb7d6afdff79b61aaa6033ae2ac3d8dce8140f78505961e3da49306b5034a6c3eb5ba8157 WHIRLPOOL e7c755168a0d1c2cf6eeaf6c6fb68ad0ab16c20425adb1375cc40165b08606c309b88e22c320f4c5ceb0adcdf6aca009038ac8a99cd3fdf3907bbba1fbe087f2
@@ -8,7 +9,7 @@ DIST DBD-mysql-4.041.tar.gz 150508 SHA256 4777de11c464b515db9da95c08c225900d0594
 DIST DBD-mysql-4.042.tar.gz 160028 SHA256 dadb6884788dc3fdf40b13b72d8c60d5a83680cc2aeec7515c3e5999e064b455 SHA512 fe3c9e1e325f7056da783e0ea33f9a7810f25f3d9cd2c9a4bf4037b20a2148f2291b2f90d44730e63c7902b45e26993a7f9fcf1b3bf8d1bc5d3fca99893a019e WHIRLPOOL e8fe5c142028df4b10982f71e4aede68f01e0ecef6040fb6d4cf0d8006ab34f80fa8d20fd06794c2668dc8cb0a0459a8c97038f3abe280a6f6bd94e4d04f216f
 EBUILD DBD-mysql-4.32.0-r2.ebuild 1319 SHA256 4311abd6df474f5df7b2de8c8ca427048e93f840364126bbd5ee723c67c57d21 SHA512 e654b62fefeb79914ba77691a9b28777c594fc69f8ff91f77d190f831a79a7b5bd7caaf62d6cc9d6cc3d48a9ae43b96815d3bf87aa62cf9a1a2b3ef6189db776 WHIRLPOOL 3347586ae44a84463889dd804d17728f46bb3125455e65a92527f391197e1491a575595f1ef67ec785cdce71c8bb8eb4305fcaa5e3727beff830dde181ae2f98
 EBUILD DBD-mysql-4.37.0.ebuild 1973 SHA256 9f2a1dfe233565034158c407de65c1ce20e83125ca1c26291d103eb1b78e42ae SHA512 1b6e44cfff11f8f28e29721fd0c47b3b2b1c6a5bd638a9b219e94dd76ae23814bf86116006b1bebae49266e255cfe9b529b79e54076664a502013a6d057f1696 WHIRLPOOL 0dd10efdd7d76d46662f30dac1c96ccf4f56fee1e5630a2b2e36aa64c692e737fb27d091bb3bca572c5a4f43083841a8d37376fc6406fbf1558d03c4ff796063
-EBUILD DBD-mysql-4.41.0-r1.ebuild 2043 SHA256 dbd70d8134be8a9d3af71c5e217eeb358eb23db6eca3c5feb984f33fb48e9a37 SHA512 eb03419925b3b4018b5d9c0bce4561c925a381f1c66c99874bdc9b40e6641a607411362b9468fb01c0d7f628cfbf721c2727d2a7801b23fc21eae106929b339a WHIRLPOOL f6205ebfe8051a0f6cab27e57d49bf8096290b2f19055f562ad320493e7a3e2f725e0b20baf3d1944f91702c97ea930e6027a27a46da882fd4c9c47f94edc5c2
+EBUILD DBD-mysql-4.41.0-r2.ebuild 2093 SHA256 c5f2b75108c38b0717cc48a0d15a5c806c28312e5dc0dd715c14b3993afa7710 SHA512 72f9938a6e98a0a1631eb75d97af59c0ddcb8b7e5436572ab3049967452aac9d6d0339fb7c07e2e7fea58038c2d14f7cd5635767baa43967b480e3e3189fbdbe WHIRLPOOL 76fec5470969437131290fa8504f4e2d33e711657482df02319bd4612f8091943c52506ff3ffbdee1f7370ccc102396478f4fa794d3fc0a99d17f077fbca729c
 EBUILD DBD-mysql-4.41.0.ebuild 1966 SHA256 de13dfad6ab4a235869466d22ec5bad77e69ed566afac3a9a93f499bf7297521 SHA512 88e2669b1feb2b6bdeec630a9fa2fc4dfd62b907d0af3ac0b97a90608a4113593f704ce92d14fd542c8b9760d3a4a345dfdec251359d30075da1a500526182e0 WHIRLPOOL c559885c164743b6641a85fa9b9272e90681b66c7d3983ba8c2ba896e0779de634d1f2cde751f40e90f50bd97db537ce3ed1eba4407f9a72827298e5a4c5dd2b
 EBUILD DBD-mysql-4.42.0.ebuild 1977 SHA256 849f55ca8976cba4672bc823fc12271b3a8f6871480293a7c701bbee8df10680 SHA512 ee15ba80bc64c0073a81f9883ceb0366e21aed63d3543eb75427166f01ffe0125087d4ea0aa196eed1c5c8596581664038bc9f41c2486c2ea5b8c4f68cf9c201 WHIRLPOOL f9743ed08677ccbc9ba486168edfca587b11cf371438311166ae7c40d1ac53b438def464484934fc2122185029064208c6359cb4d2532c719720ec6ba4a9ee0c
 MISC ChangeLog 12301 SHA256 5542cd6880e4f05520c0bb77252bd7ba8e49a825f3330af412fcaaa11769f9a7 SHA512 f6df4409bb13951d3b2d8b4df4d05ace5c828c567e0b4b07e53dcb3a7f141e27028539b66c0ba30b5eb9d3704d79e8191607542f2893f94904cc88fd33c6f896 WHIRLPOOL 7670b320d6f9c3e2898fe922de8c6099350fe26900b4641fe2c244afa6333876766cf8867d7946fc02b37846280ad47d4b9dfd12a4af1fd05fd79302a92b4c92
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
new file mode 100644
index 000000000000..13fa2775a3c4
--- /dev/null
+++ b/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch
@@ -0,0 +1,35 @@
+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
+