gentoo resync : 19.10.2017

3 files changed, 32 insertions, 12 deletions

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 324417891e22..66549983be95 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,18 +1,17 @@
 AUX my.cnf-5.1 4658 SHA256 def067f194436548d9d41e2480d309a3727ba8bbfa7328798319fbf37ad5468c SHA512 6499e2cc1382e64be1f59d1e7855737067bfcf360f0acaede5dd357d97678eb55964de66ac0bece2bd0bfd2283997c7f335359242cfe396e21f0391de68c62ee WHIRLPOOL b90ed6abf8c0f71e6bd762f3b66b8ecdef95811eaa8c3374cd5819148e98dc1d5410ca36fce89c976e4997830cd1937f08162f8d2462173468368dd1767e9c08
 AUX my.cnf-5.5 4733 SHA256 197e84650b514dd4792df0bea3c27f9f23dee25b6363751562695f006a38e626 SHA512 6a5d183f1aeb30d9096838ac010c8f2dc004448924b3606bd03c1a5e0336a20fe5fcef1d2cd772977a167268fcff51a4b663f1f73a37d3066983621a8ca6c004 WHIRLPOOL 224e82ee0cd38c7d363dd6542d380e94638e2736767e4562c30efeb5afaf7bff086e964f330a5d26b1c2e061ac164410b96e76b44bc1de13b5f8539c9caeaba4
 AUX my.cnf-5.6 4504 SHA256 d6bfb754105464643f8f2efa14337c2f78a6a6e7e812e998b2ebcdd4b7c6f450 SHA512 866aa700460c2962bad6294b271efad09ef285dd428ab01551078be9972d2f961fbdf56aef7927439784711022e92a96f2eba30cd297f056f6562e8817c89aae WHIRLPOOL c91bb1ea6ef0b974377a60ef7ceb434ffcbf46d3fb57412deaa92930ab83e57bee3771b44a7b374f1df02211562ed5296182a218763145a7c41d96aa9b709afd
-DIST mysql-5.5.57.tar.gz 21044615 SHA256 c1c2bd321e524f92e43fe73d0d6745badd538c984c7561b273ae10e9aef57384 SHA512 493e6345a2d8ec407fcfc6ed5b67599c77b6351b7cfb1d676b39f68ac9446959cf0822c0d0bcd2206cea07b8c06c85734aa8501c938d6393ffab220f3f5ee6e8 WHIRLPOOL c321bfc26c7b5a1bdaddf2be9de84c174869743034f4d5b483767c0308875bc583f6705982ccb4935794b8ce94a1234b2b8561c933cced5aba11f48e93fbfe15
-DIST mysql-5.6.35.tar.gz 32167628 SHA256 dddcba169b98844d7c65346cbd791c853edf942d78440381685087b84aa35020 SHA512 106c4b05c52cd2bb5378376e4a453aeb55eda0adce527862c435068597c3e60f44e3c64476011befefd688e6fdf30f2245e28320d57d9fccbb2415d87498e7f2 WHIRLPOOL e8972bba163453e54dc3859a7cfd07b4dc38125e0b5f7b41940afa6f1466820079f18e88769ea198b12645383d105340ab5ea998b32a95d083d08689658510bc
+DIST mysql-5.5.58.tar.gz 21045852 SHA256 9b6912faf261555c8975db24a987f63f36aaa28052a301e85538346ace0009b9 SHA512 a57613034bb7456827d2dfa3e6d1fd006c3bd3f61e6ad4e882bb36a11beca4cf3d76b6b6d2bf0ccdb115d6896a08a7a20d0781a31e22abca2562b7b9a81614b0 WHIRLPOOL 3eb0ebafda2a43982f86c279fdeb32e03593ec8f77e1d9db6b773b14b5a7f18d282bfe5871ae9f8eafc915d909c04f05486d25247bb8de16b41850964057bafa
 DIST mysql-5.6.36.tar.gz 32192348 SHA256 0af81a5538fc7fe2b747295dfa96589ace8831d2a7d4a26660fca456babeb147 SHA512 b3e3bcb1d1e913994f274f4c6dc72c77f1f52b132389e784c675d1720b5913788ce035f045b99ef3754d1b257db55e8300b5c7622ec79c33afafec5968801c18 WHIRLPOOL 628e33a58532dcdca20e489c3120824604b8d51e10d609f1f9c2adb11552124a8f87f206df99766162d288d5877dac22d2cacffdba1458c73fb52b529245a1e6
 DIST mysql-5.6.37.tar.gz 32200158 SHA256 59c4ed39047279ddccd1bed9e247830d2bfad27d56dc2eb48d0b5695c94a1fbd SHA512 6935cf11490fb32832468e2a69a9d81a567b1b4ab0afaa0614896e3ddbb95a74b26406284f307637e4b2b9620ef4d96a167128ce7fcb1d338b0ebbc2cef2e597 WHIRLPOOL d5e7f6445bacfa7cb118a805f0efff5f4c22d96e77c174efa7ae2d286f3889ab7975ece8a0abe6232d278994d5991430d0d0ff89769883f278d2fa233341db25
-DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
+DIST mysql-5.6.38.tar.gz 32197625 SHA256 18f249752f6c64af6e39c5b99c89ee1c86d6eb7fac853707603453cf584c54f3 SHA512 8144aec822f053fbdfa11ae542e96d3e7da93552b60ed131f041ec4832f48c95025b322340a2e90a82c18b6ee6bfd708f209735f82e37532198245aad697b93d WHIRLPOOL b27cbf4f36bb805389dc7f335dff31d03666842bbff0f98852a4e0ead1766123f0f52d28fa0f42da6399575716b15e55714d34b7797599f11e5cd77810be8e2c
 DIST mysql-extras-20170302-1359Z.tar.bz2 306816 SHA256 0375bffa8a7b26caab3a13be299b30231f20ad3e8dc82fba9384e5463763a105 SHA512 2c096c68e0d545c98fb5520f92b9e85f6bbc910853793f60f0e67979ee927410bbecadece3400364fdc2b5682f9105664f6a2de8fa0ee1818fb266e063e82869 WHIRLPOOL 6629f0069b77c9add86f4a40168a1dad7bcc0ae18a513f05e44619366a5fdfb82238df2e925de88c358fca2dd50f162ffefd8efea335cb544ccdcf74e73ed25f
 DIST mysql-extras-20170719-1335Z.tar.bz2 311350 SHA256 725dc29fa4a553cfc0bd07dcc1259e5a38a6d945f757e9f49f554a9a7773abe7 SHA512 3450725b4cdcf1e330aee775c1c169510bd7f06f19b874a3e94203227d393b136165eca1e77270bfc37c534f4120aeeeb3df8fbd71704312836b79a99d81a122 WHIRLPOOL f1606df56f82847a8b4b332c1b61cb695aba2a51aef895fa9596495d89208535f829b8fa69a6e97a26d0b9171d817115b83ce447c8232197353dda258a6d38d0
-DIST mysql-extras-20170719-1630Z.tar.bz2 311320 SHA256 d21f42035850a3208a89d4271d2c544b8ccbb3b8855390b882248561451ae4cc SHA512 a2369d512b8e490b5859403c4c15cf9d8ff589000e56785f0fb02ad99535af189fe93ba9590035bf0b8cc1d0c7f3656c56d86d94d62ef97fa63cdaeade609f38 WHIRLPOOL aec2eb79350008464499f74cff002589628fc8e4e81970cbcf1d7d3ca0a7714d9ebc6408c7f25e037f452fb0b3397e7885dac83277884692eb3a88a26d6625c4
-EBUILD mysql-5.5.57.ebuild 4402 SHA256 3d8d94b5182b29cddb804f3b20ec99307186801341d501f27a0aeae207987b86 SHA512 35a7ea9160109174197c258d504c929e04b094d8e5cd5bfeb47d1155480b8f665f9edfecc1e3a53024536f8be80604da2b06f24d26246410870144b453a672d8 WHIRLPOOL e26942baeab07d395e9cf031acd354471e7704262de623e8fb22e1e9990f8eb7d0641e4c0163ede64061ce118fba4735e5ca9e4e98a1daf6874c12a84037ceb7
-EBUILD mysql-5.6.35.ebuild 5423 SHA256 b531c77f6d65f2ac0f557cf799f191df2ca1a75cc7af703ba9eae37e0c55489c SHA512 2a59c6801263a127b0a6a00bcace61677a98edfee5c79b2ee83bd30d3cb9d55d89a4409d37a4af4af48310966ae0b04fd1461ce370e1278bcb8f24eba58cccab WHIRLPOOL d0281c0403b9f8fb9e7b90aac330f348a8b4f0337cbd51b6e289f3dac52822487ffa5b31c82e6d8417a846a89cf27a59b1b592165b047f1ce0db09e4540634aa
+DIST mysql-extras-20171018-1948Z.tar.bz2 313540 SHA256 6b910637f7ac2d5132154357db46f47b585f6555846d5f1922e85954e93a527a SHA512 35ba9f3c8462ae188e47f5973e891cbd72e5d742e92fabc09678f93c83bb26337ae11d6fa8400b2a8c5125ba2a771f780e008b7448e3006446b13d3e51adcaba WHIRLPOOL 480c0aa3353076864795f0646a1c833cfeaddeff21e26404e98480f73ff6f4866a9ece39e7dd88e0d1a4ee9c820eb1fd31a46c09bfdb18537f839b0460fc3443
+EBUILD mysql-5.5.58.ebuild 4402 SHA256 f90aaf2c42115fd18c583cc2069f7d3e8a9525dfd9633456f4d24e024620cd3f SHA512 1e1a3e4a0285cd2b51763e91dfdc95daff97d2a2739d0b5938b1f2cd7f95dad33f01b66b0919943550a4f07922b33b69462528fc5c40f501e919444d22ef9916 WHIRLPOOL c7d790a65fb55a1676bf079ed8c18c710e41958a72cb9678c88a756a3d96d6894ac3adca9933b3ad3728bbae5ebebf3979b28146b0b5ee6bd1276fc675f85611
 EBUILD mysql-5.6.36.ebuild 5950 SHA256 aa2069134693657f666cbf7a100701e334a74f2acdeab5b609038d2ed79b6c57 SHA512 864b0a2be4a822855369c19a7c2879b9909caeb607181dc8e6b88617abd32c6ac93f006135a2ffc14a72f170d02a5ea9c80274e3c1cb0c00c253ca365583ae55 WHIRLPOOL b335dd3da99eb6d28a12d85ae1393aab72a9c9af67b3c8087d187fbb0b7f89cf3b69598e76c3f07e74636a0205808ce584d570bb6b9e2ed5b3dbca856876e730
 EBUILD mysql-5.6.37.ebuild 6169 SHA256 4ca65730c9608696fe46ef85933ce11076410aebacb5d0868665149c0664170f SHA512 97c04c4efc40db771592b0c5835b48520b3b5c6e99084f33c43cfae2f74883b99ecab35d8bd646bfe5e18717dd398ce946695d82bb8f7431b914e7060c8603d5 WHIRLPOOL edb2d8e3f65fb1be6a2480442aa72b027cb6fdafc1a541cad3a9d654aa75b18f2939512a747d1926593a9b62b0456191bd4a54dc1346b455575dde31ab32aed3
+EBUILD mysql-5.6.38.ebuild 6238 SHA256 6d9a62e5ec21b8921c1abea734b93e0ffc2572979516a988520a8abc0861a34d SHA512 33d8e28a27d890f0664449761d9ac2855a83cae0451915acb84312f5eebde1a68ee3421b4c9e503936218ad27b25faa9e5145173266532e8d7ca90f7e2fb05d9 WHIRLPOOL b33106c5da2a37d7a293842559086ce1dbf5ae22cada4f56eae34886029686f1c9775bae8469e9b4c3985c3d4906d1ea220d3e0a4ee187fa3ded73e18b5daf16
 MISC ChangeLog 18776 SHA256 3ff64ef7497a470510146081692817768857fd4f297b98a184202f5fd06f0a47 SHA512 bfcb679245574135e7e0b7f0592771954bba01b6977ca4ffc8a37de181fb7fb60e6bd8b7c23cee0d41c4397341d282f28d43fed11eb176f12178123e0f8032e4 WHIRLPOOL c4601fb0d1ac3238f2d69a439463d66a67d843c197a55f4d9b436493e979393047b9549053fa00b46a3ed3719d72565ebad38c35ace3abab145e751212c047a8
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC ChangeLog-2015 27542 SHA256 997fb94e9984a271cfd68316c0012c16f78234b1aad328c2c5e97e2940f7dcfa SHA512 f07244cfb59f613fcaed97ad0ed135857ba995b616962b145548ecf84176666986fc9fb5e55ec543110755e73d316ee5a733cfc1ce14eb1ca2a1449adfa50859 WHIRLPOOL aed27d4cb6a7cf33d354fb559268baac8c7977dd9cdc821b12af8008c94dc22d0dedace9e33caae6bd676405a3a02628e1a8ae8d3baac46af33b95251a94c70f
diff --git a/dev-db/mysql/mysql-5.5.57.ebuild b/dev-db/mysql/mysql-5.5.58.ebuild
index b34282c99920..fdf3c8d8ebc5 100644
--- a/dev-db/mysql/mysql-5.5.57.ebuild
+++ b/dev-db/mysql/mysql-5.5.58.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-MY_EXTRAS_VER="20170719-1630Z"
+MY_EXTRAS_VER="20171018-1948Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 
diff --git a/dev-db/mysql/mysql-5.6.35.ebuild b/dev-db/mysql/mysql-5.6.38.ebuild
index c173b55fdf5e..35dc3122c0a9 100644
--- a/dev-db/mysql/mysql-5.6.35.ebuild
+++ b/dev-db/mysql/mysql-5.6.38.ebuild
@@ -3,25 +3,37 @@
 
 EAPI="6"
 
-MY_EXTRAS_VER="20160212-0233Z"
+MY_EXTRAS_VER="20171018-1948Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 HAS_TOOLS_PATCH="1"
 SUBSLOT="18"
+#fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit mysql-multilib-r1
 # only to make repoman happy. it is really set in the eclass
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
 RDEPEND="${RDEPEND}"
 
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
+	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
+	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.6.35.patch
+	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
+	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch
+	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
+)
+
 # Please do not add a naive src_unpack to this ebuild
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
@@ -106,6 +118,10 @@ multilib_src_test() {
 		# fails due to bad cleanup of previous tests when run in parallel
 		# The tool is deprecated anyway
 		# Bug 532288
+		#
+		# main.events_2
+		# Fails on date in past without preserve causing the drop to fail
+
 		for t in \
 			binlog.binlog_mysqlbinlog_filter \
 			binlog.binlog_statement_insert_delayed \
@@ -119,6 +135,7 @@ multilib_src_test() {
 			perfschema.binlog_edge_stmt \
 			rpl.rpl_plugin_load \
 			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+			main.events_2 \
 		; do
 				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
 		done
@@ -130,6 +147,10 @@ multilib_src_test() {
 			done
 		fi
 
+		for t in main.mysql main.mysql_upgrade ; do
+			mysql-multilib-r1_disable_test  "$t" "Test $t broken upstream - error return value not updated"
+		done
+
 		# Run mysql tests
 		pushd "${TESTDIR}"