gentoo resync : 02.11.2017

2 files changed, 7 insertions, 42 deletions

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index e26e439a76d0..5bb5809282e1 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -10,7 +10,7 @@ DIST mariadb-10.0.33.tar.gz 69211872 SHA256 e3e3d583c51761aee2fcd0e51bfa7d592c12
 DIST mariadb-10.1.24.tar.gz 61780687 SHA256 b3df99ae5b1ec8cf6cede4cbc4ae3f54ce66464549cba6d56d9ff4d24e4d551e SHA512 0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c370340000209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9 WHIRLPOOL 91261a05e3d8b0cad925c382e0cf9a40fcfd3d35ae320c4a9860db110cb5655d1e1f992f9dea8987e50a07dd4a66aa42c9a3470a7acb3d0d706bcef7bc890122
 DIST mariadb-10.1.26.tar.gz 61887132 SHA256 ba88b1cb9967dea2909938a34ba89373b162b0d83e5c98a0f1c94540156bf73d SHA512 a7505c579728b58eb6a92bdee1f5dfea5c10c8389cb7a31eb99fe2c6bc416593925cf9708d3dec91ede12eb4e232098a0833af2185bdd60bc593c89d255f3c0b WHIRLPOOL 8fe0c23f70b441a1f8d32d1fedcd033443641288ef1a20c49fbedfe6f5da95cb82125faa68f676fd68c441d4bf096101f364e1b3976f54229f5d9d0d10edbe21
 DIST mariadb-10.1.28.tar.gz 67559689 SHA256 292dc8fff420c4bdaf3a2c3381ec3c99292965db2b09de0d7fec414c00032bbd SHA512 ca10d28f6b966719c7488c2b4ba928b65cbe9dc32ccf2a28d29c4d0c2d46ea1c59c3e339230017b317132dcd216925a71769dfba80a7d6321079c74ac41926d8 WHIRLPOOL d8ff24346a9e8ada4a9ec0ea8fd7657ff4972d43347afb7a9d7725293437ba70e0035c365738084b1e4828344861f000bd963260176524da2188c2c3a1389f67
-DIST mariadb-10.2.9.tar.gz 70858881 SHA256 12e0a01c52591ee77cf0f940fe65df024457fa16c70f08c6116048d576096124 SHA512 11ba0913144d7298ffa4c0a0128a3d1525a39b8205ffc580311751cf25a4e86159e46a32d3c8330c4ea028cdd50643eb5381651df654751ca3e4fb3d4698a373 WHIRLPOOL dba0a8dfd5079b314ffc399e116abf8582bdaf51657dfe6e72247ab92da874aca97af4ca27dbcfdca5634c926598a853b7a8ecd8a61fee453c2764085a05b949
+DIST mariadb-10.2.10.tar.gz 72388999 SHA256 5c7b83c4d2f7501ef9f187d8c97688a24fd3e53dc43bb388f8e1cead61a92fc2 SHA512 39c198009f8b19f4a08226ef9842b50e24636580b67c1c92d59c61cce3aa1edbd466e253c281dfcdfc58ab573ae9a59aaacb0ce3e8b82222043ddd849fc3e239 WHIRLPOOL b64e99254764556d6de947e254a45c5c2743d9e825ee109354b3101641048b3509dd26471abdb6f7b90f3a208ac7d2d13ad70cbb966e05ac49b26ef2ecb12e6e
 DIST mariadb-5.5.58.tar.gz 45784323 SHA256 26fdf8784a51e5d6f7624c0f4528433a6188065dd1bf92ef69e27db6b0a41002 SHA512 c5c8b52c613a1a3f30de2cd1d8e390f8110b0891af78ee2a24ef2c4b7b8c5f2e140970ca89865e8277e7486dbfd0ad01c1fdbf8791c67a9793392247d68fec63 WHIRLPOOL b507f3aaaced5da716de1a131dc4e69ace6f2ccd2ac58614d3d722b46b0b271ab0a452aef03b78d499b961f39a057ece5169f5af6fcce2e840aecd77ebf9295e
 DIST mysql-extras-20160721-1526Z.tar.bz2 301788 SHA256 45198f8adb4a61fdd89a5d3c7966ce2fe9241381510e1f7b93e793502a32dfcb SHA512 c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d WHIRLPOOL becdf0d4d7b8b5a269246d2fcf1bc09c4313046468b264f07394ae9f1de2f736ad3fff8cad35e544df7a3623688050e6fb9635dfea3876ea082d19cf9fe88927
 DIST mysql-extras-20170310-1426Z.tar.bz2 307052 SHA256 23f5becec389fc49e7cf0d52c6c914cbc8d7e3fc5851ee38881ee6884ffc5732 SHA512 2dbb3e46f14fbd0be9ee0e3a8ff2e4d5325f9a9be332014ea556283c0bc5f53349952d267d6713fac5b54e3167a66ddd36f18b18b79ca6b68ede399399488157 WHIRLPOOL 9f459d9e58938597e7919b29fc819d87920a51461d274bf87520fe322a67ad8638ef19212855ba8e37507d3b160d29ecad0099f4632f078cc503e1be0f809fb4
@@ -23,7 +23,7 @@ EBUILD mariadb-10.0.33.ebuild 6736 SHA256 b4594c937a2c57000c63d257a2d0db6c7a3442
 EBUILD mariadb-10.1.24-r1.ebuild 7187 SHA256 fb9a9a37ea87839b5df675be187df0756853d995e56af9f46e4d938f1f3bb778 SHA512 f88e2f171b9785ab6c834511ca71d9939eb36020a32cfdba5fb91f81253df8a35b891db321c0f796dfec03c7fa39226d1696607518efbaa446531590de97a75a WHIRLPOOL 95a507b48de0251948e1511c285d50b7fdbc490395ce3618a2e4517fd3223d62e17787837570f5f4ba5b78d3b7f773889826ef0966ae7b92ed7da9d6639a0f21
 EBUILD mariadb-10.1.26-r1.ebuild 7255 SHA256 3dfe3f3c0effdb9a13b4e89398169a58773c056da51a12ac9c79e28ed0cc2b02 SHA512 171bd1cf59c77e98505f9f2217a5522611977fcd1c13d67dbe551892da3569b45298a032e33d5aed8cc2caa95f326c6f011291f678436a7fb3069133792693c7 WHIRLPOOL 3bc062878d0be9c3211299ab3e2c2d90d970f2cb2cf311dfe3fa799545bc09fd32f6da3532883dc5a6a4adfb42e23459b302d43bb01ebb1d776f5811f5102156
 EBUILD mariadb-10.1.28.ebuild 7320 SHA256 b45d0316aed437a96b46648109783fd9a8d3252d92acadf89e8a763843327e49 SHA512 4868269e57a2951e6f51dafb51fea044902e390aedaf2d1229b85c61fda12f39cf0b01935dcd4ae111b5323b647c9f639cc4fbfe03d20f50b56085babcb275e9 WHIRLPOOL cbaf38b55fcc2d3f2b0ba00fbde07b513077952b33d3679f99a1b48eb5e15638f274753bc1b536570350890d0faa5ccaa3e45934984699d95c3c9fb8fb56f45f
-EBUILD mariadb-10.2.9.ebuild 33584 SHA256 2493e44d407da15ee064afb0dae082980514d5b8754a4f0cf9cf544a8f435724 SHA512 308a9089edb55264e290aed7fade8ba2e4c9bdb6c83204dbbbfdf3f0b205a64a82874079134d48de958b0755f92d3fc9a1a2e73fefd105c58862c4ca1a327e9b WHIRLPOOL 03a803a33eb343bfef919e4cc5b8aacba74b32ecad01d12dbecbddd71ce26a4a0862d1f539e735bdd91064f3476aca4128bd47852aeee7332b92587766fc72c3
+EBUILD mariadb-10.2.10.ebuild 32355 SHA256 b9e37664dc6efb4e70f996b277237efa926f564642942c93b08675a885bc31bb SHA512 56116f8a65f22c89b491cdd4e72c6fb118dbf7efae56c9827d1520055e555abef57e9b88957c3460e1e7ff76b44f2955a0092acda08e183a9ed867c08053ea44 WHIRLPOOL 9d72a6474950fbf3248d0c2e89aa8b9e249b5118f88d6bc291e9fcf8cb4277e1298c72ec7a86e97136d15434031651cc152369bccd0cdaff26e9eb92a5cf41c2
 EBUILD mariadb-5.5.58.ebuild 4241 SHA256 ebb8013626eb0a5a222b3bac6ef12606545e67338903c5872249589ae8d79aa8 SHA512 3de822605e73ca9094f6635ee232b133371823e3f3330d6ecad973c0e9176d2280a5fd5ae6032a4f6e3f914c8a937f912e2aeb91a5802342ced02aee6db11944 WHIRLPOOL 3d68d32e9d157c909659ddb17550c517e5407366c2e867a7d7ecc14594d329e551d42221e2a918155e0a1d6cbe7819a121f8ac3a417110156010ed1716ef230f
 MISC ChangeLog 24701 SHA256 3ff49394f0611c2c667536a084ba1816152d1770039e716db13ff905ed3382da SHA512 c7dce735d23de6f8c71f27d0047e5079bf6587ba386935800613cb36c0e3653f59e5021d73a4efaf56c74ba4a4f6ce4bbe21e10b214ed4618e0b2528bf13f65d WHIRLPOOL de0cbab6250b12fb8f55acc5978e3d135723ff727805e2c898a921ad7adae798702a16df7077159c195ea9854cada6840f1ef03d7f4934a183d5b0f081dd57b9
 MISC ChangeLog-2015 18661 SHA256 49a3541aba6998e4e877f4a11c5f3b9e3c6019c87d2f7ad8b8e55a25eab88eda SHA512 24861a1e538520bb16a70d09a34633dd51b15a4c2fee86928be65ec589ef54014aea54072124b245a4572b69208483c30cd2e26260fa09e30433e3ab617d25fc WHIRLPOOL 6b99d1767c2bf508d584fc9ab323e722079280aaad98ef7d56414f6b183a87b54b1907cc6f2bb2487d87e9cb672f9879cf65a49bf872f59fb09d794bb83253a7
diff --git a/dev-db/mariadb/mariadb-10.2.9.ebuild b/dev-db/mariadb/mariadb-10.2.10.ebuild
index cc434baea248..821eb9665f49 100644
--- a/dev-db/mariadb/mariadb-10.2.9.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.10.ebuild
@@ -61,7 +61,6 @@ PATCHES=(
 	"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.8-without-clientlibs-tools.patch
 	"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
 	"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
-	"${MY_PATCH_DIR}"/20026_all_mariadb-add-pkgdatadir.patch
 )
 
 # Be warned, *DEPEND are version-dependant
@@ -106,7 +105,7 @@ COMMON_DEPEND="
 		systemd? ( sys-apps/systemd:= )
 		tokudb? ( app-arch/snappy )
 	)
-	>=dev-libs/libpcre-8.35:3=
+	>=dev-libs/libpcre-8.41-r1:3=
 "
 DEPEND="virtual/yacc
 	static? ( sys-libs/ncurses[static-libs] )
@@ -601,46 +600,11 @@ multilib_src_test() {
 	fi
 
 	_disable_test() {
-
-		local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir
+		local rawtestname reason
 		rawtestname="${1}" ; shift
 		reason="${@}"
 		ewarn "test '${rawtestname}' disabled: '${reason}'"
-
-		testsuite="${rawtestname/.*}"
-		testname="${rawtestname/*.}"
-		for mysql_disabled_file in \
-			"${S}/mysql-test/disabled.def" \
-			"${S}/mysql-test/t/disabled.def" ; do
-			[[ -f ${mysql_disabled_file} ]] && break
-		done
-		#mysql_disabled_file="${S}/mysql-test/t/disabled.def"
-		#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
-		echo ${testname} : ${reason} >> "${mysql_disabled_file}"
-
-		if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
-			for mysql_disabled_file in \
-				"${S}/mysql-test/suite/${testsuite}/disabled.def" \
-				"${S}/mysql-test/suite/${testsuite}/t/disabled.def" \
-				FAILED ; do
-				[[ -f ${mysql_disabled_file} ]] && break
-			done
-			if [[ ${mysql_disabled_file} != "FAILED" ]]; then
-				echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
-			else
-				for mysql_disabled_dir in \
-					"${S}/mysql-test/suite/${testsuite}" \
-					"${S}/mysql-test/suite/${testsuite}/t" \
-					FAILED ; do
-					[[ -d ${mysql_disabled_dir} ]] && break
-				done
-				if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
-					echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def"
-				else
-					ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
-				fi
-			fi
-		fi
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
 	}
 
 	local TESTDIR="${BUILD_DIR}/mysql-test"
@@ -680,6 +644,7 @@ multilib_src_test() {
 	# Run mysql tests
 	pushd "${TESTDIR}" > /dev/null || die
 
+	touch "${T}/disabled.def"
 	# These are failing in MariaDB 10.0 for now and are believed to be
 	# false positives:
 	#
@@ -698,7 +663,7 @@ multilib_src_test() {
 	done
 
 	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
 	retstatus_tests=$?
 
 	popd > /dev/null || die