Update test data locations wrt bug 524158

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

19 files changed, 99 insertions, 102 deletions

diff --git a/dev-db/mariadb-galera/ChangeLog b/dev-db/mariadb-galera/ChangeLog
index 7297a4799d22..4bcff7d40dba 100644
--- a/dev-db/mariadb-galera/ChangeLog
+++ b/dev-db/mariadb-galera/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/mariadb-galera
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/ChangeLog,v 1.4 2014/10/02 02:33:56 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/ChangeLog,v 1.5 2014/10/06 17:31:06 grknight Exp $
+
+  06 Oct 2014;  <grknight@gentoo.org> mariadb-galera-10.0.13.ebuild:
+  Update test data locations wrt bug 524158
 
   02 Oct 2014; Brian Evans <grknight@gentoo.org> mariadb-galera-10.0.12.ebuild,
   mariadb-galera-10.0.13.ebuild:
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 29b0cbe61ba7..01c4d43b832b 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -7,17 +7,17 @@ DIST mariadb-galera-10.0.13.tar.gz 51542182 SHA256 9302c5ca8447e4f33e6f043dbdf56
 DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256 28363c7ba1893677911451e7f05402a31afc0ed0a48ea1b7cf1915ae1be81e20 SHA512 d90e104b3e73af5589eb32ddbcf9098ad9d69898b55d4d662ebc9578f0281e87fef6b5adb6cdc33fa19a04bf066e01121ead2e6a2bffa0d44ffc10b895392a1c WHIRLPOOL 531a9e08f9231bfcd758bbe8d5b6d5968bd2cfce9c70bc8c15517f497606322da7cffbecd77a0cabd837c3c0ba4f2381a569d583f2fa5ecb14e95a367a93ee11
 DIST mysql-extras-20140903-1928Z.tar.bz2 1494599 SHA256 3a1e4ba87b301751f1964875bdba4c4baafe270267247ee79e4285e256f272f8 SHA512 2fcf08cca2ccf62533058e1994a8aca1ffc17867495d5c7fe588d42978e9c5c2e08f93991f44b0354818db14339a09b156471a7c428de17250c54f48c5aca7c4 WHIRLPOOL fc5983a0cb3c8a8faabdb2b8f8cba183188b5cfa2e40eda0207942ed92cf69675ca1753b7c35420c5b0882d4b77d1daacf586fb08f5cb5c701b7925e549cd2c8
 EBUILD mariadb-galera-10.0.12.ebuild 4003 SHA256 ee0c17a8d17822ad3b8eb8b197a6ab3a86609737115ca3abc373f2fb7dc817ae SHA512 97d67576e5e9b40eb795020b2ac19443557519a7e924d0ca5db312728a5d4e324fa60fd4d78db40b567b2577bbae65de57a5424f52ef4a9a83c60819ec3341af WHIRLPOOL 5ffe5bb3d1a9250dba49a07a29d100c25cbd0282698d0b2c39c94e9c59e4f6221d3b6e7051a8db0deb8d927333111c199f955693e62e6bb5fd2b0c17b05aee46
-EBUILD mariadb-galera-10.0.13.ebuild 4357 SHA256 b57b141f1d5f208a6ff65a0c9bcfa92b07fa34dd2d687cf61f3c214949862a60 SHA512 2b8e53dea2071bfe610696af110274bb8cc106582dbeced22bddb0f1b72e5f2e00839f1beeca14a5a3b50db802354b066894e6d0e5869ab1c8cd6c85c4887aba WHIRLPOOL b494b6dc4734ee09c56cfda9b4fabf019421dad282697a204bb221bb42b4d31984c7c4050b1965f8ec75c03b2a19d408912d4a88123916275c36f752389f17bf
-MISC ChangeLog 893 SHA256 993739151d1907d7fe2554881e317afcb9ef1e60eca2ba6d4a4513227327c441 SHA512 64c52d761417788b0b4edec822d07b96d14fd500770f6ebef8f1eb82a50737bce1c88fd606675a0539898fda759e9758ee8f15a2a4b87d8a6beba80ec8c47e0e WHIRLPOOL 616a366a748fce6f19e9b10388071a86a89670e0c644ccae8daae5d6ecb820b5ef5fc1cacbf23e1566d0f5a93042f8d1a7f0ce29ce5cb7d2ee063fb19f786ffe
+EBUILD mariadb-galera-10.0.13.ebuild 4143 SHA256 18a2aa8e237526f64a3e252db8790d04eac890cf58db6cf634cf3d90eb670270 SHA512 581798aef36fab5b94e992984bb2fb79c8fcfc5301808b7e79dc58703c31efc4177c3aace6c9c4a941e29f2153f84a681bf02e52c2af5864ad234e46a497cd4e WHIRLPOOL 80e8d83c23e4311d78275be9f97628598fe25d80988134cef8b7ada01f95a75d409442848f88af6258d20d813cc53c26ef795ee6decfd2e5940155c1fa8d147d
+MISC ChangeLog 1007 SHA256 0891d8136f7434d13c3edc623869d898d79ae0c924f20115b60c4826062ba123 SHA512 fb07ef4efeef3ab5b1643e7066e58eaaf26a25807100a5fc99ffd8302dd502c740abf75e0f712edea7d6dbcf1c2dd19e4a59157a58ee98506bcc4c1a46a7834e WHIRLPOOL 17dfcba29b44f487342e708f54b8902b29fa5cbce95b668945dff89f47757ce8ab56a1066d9257748024f86ca41a37959a202d99d249bd4be797451b006689c9
 MISC metadata.xml 1606 SHA256 2a7f23fcb98dbc719cf012e28d8309dcb8c746d3ab250693dbaad9230b676d4a SHA512 faf8ed70e620e2aca93c5da296b0dcac4bd412913e4d356ad5cb8e89bdf057fba4b0cc6f273d5f4fc9f75080773c2e240e273b0d49d92796708ffcb871f957c6 WHIRLPOOL 365d8e09f4fa80bdc79e555fcdf3cda4a03fa28f764bc4a64d8286ec76512d112c89b63311d94cbb39f0fd36dd05c4ad9ea0e161938152fac97528a8f9495b9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJULLmVAAoJEE4V4vFnx44dofkH/3KOP0hSpRsevDBF3mU8PQQx
-vmq1RJw2DF3fr7r2JMtdKomUrmk6gqWjD5ySO+OdUOH8gczr66mli0WI2LGDeInn
-LMPdoP97fTtdT7zplDo26INHbeEgRTfXsRrp1iIeMSLadkJYmsKTi4JM2cgZlCr8
-lETfa3aJjzkbjcez43qJZZWhDh+ZV6776tNrIoT9jDZq2/KxdqxwrGeLTlzBr+b6
-qXsKHMsKk8nmZgP1zT+1HrHjwDWk4xB9dECCeZ4EaWiML0QZxrJv6QZolHGM0T9O
-T3vQfukO1754qgD+pextApEAVD6DjCA9UTGBjmgMOAL85TbzZPkpKMczJLeyJsE=
-=ZPHJ
+iQEcBAEBCAAGBQJUMtHbAAoJEE4V4vFnx44dNGMH/02mIOd0e5vcIbXJ8qCDj9GS
+xYTuAflm8439wkW0qJGPUCUQ/ikyi8bIwW1aIDbTCzsr1heFBmwiUrq21EXx2GqO
+8k+tXwUHB6yxcbN6E8eiEXbaDcjV4X61J5WMolgsRMu/AJ2WrtbJhIqWL9DXVAvk
+lmgQp5KnjMw92Xn6czFjqEfgRr387kOqacVyRru43d7GVl/+8NwWNYaYT6xGzOKv
+4qWmRqzU7fwBhyeyyScsJCc/ket1D4OrWf8WvzGzOTZxU1oHt19KEBYbyd6arc6W
+ackWgmLEmbP3Fvt67ekQTI/S0aYp/E3ZrbpT+PZFDH3eKz9Aub4PQa2sEcDBVZI=
+=Ui2t
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild
index 7ee77dc3bb88..97811ada1b87 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild,v 1.2 2014/10/02 02:33:56 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild,v 1.3 2014/10/06 17:31:06 grknight Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20140903-1928Z"
@@ -65,7 +65,7 @@ multilib_src_test() {
 		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
 
 		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+		mkdir -p "${T}"/var-tests{,/log}
 
 		# These are failing in MariaDB 10.0 for now and are believed to be
 		# false positives:
@@ -97,7 +97,7 @@ multilib_src_test() {
 
 		# run mysql-test tests
 		# Skip all CONNECT engine tests until upstream respondes to how to reference data files
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
 				--skip-test=connect
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -114,11 +114,6 @@ multilib_src_test() {
 		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
 
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-		# Cleanup data files after tests
-		rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
 	else
 
 		einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 22252f434f2f..8e3b55d29c40 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.54 2014/10/02 02:32:22 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.55 2014/10/06 17:28:40 grknight Exp $
+
+  06 Oct 2014;  <grknight@gentoo.org> mariadb-10.0.14.ebuild,
+  mariadb-5.5.39.ebuild:
+  Update test data locations wrt bug 524158
 
   02 Oct 2014; Brian Evans <grknight@gentoo.org> mariadb-10.0.12.ebuild,
   mariadb-10.0.14.ebuild, mariadb-5.5.39.ebuild:
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index a778af434c0e..93285a579206 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -10,18 +10,18 @@ DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256 28363c7ba1893677911451e7
 DIST mysql-extras-20140817-2320Z.tar.bz2 1495153 SHA256 9a32dcc646c86cb8f9a941f4da6fd9fc183c0bd60faf47331d465e422ff7b8ac SHA512 d4eb8451a894206cc2d1f3431f6106a910495d357cc07b4e6088b545fc39a995a1d230a307467da73c8c6b11efa0eda634150e09a486a9c53fb063c7fa8d9bbc WHIRLPOOL f57573e6d3ca9f37c666848f07f65f963ed70cfe4e3408730e96be68073251a7611cad068c1d84a5fbfe42ee7c5f9e161d7962dcf591e6eae856ef1cfd286e9f
 DIST mysql-extras-20140924-1913Z.tar.bz2 1494659 SHA256 958114bbe5fe21220f27b478c67a9ad3edd8d88fc58b528c6e7b5cf20e46dabb SHA512 b5fc435804b5843ecb9e522dbc8c6b5d2bb9bc8a7c39633032aaf566f2a2488fc6c0017a92dd6db95db6c14d06d25c43a67fb2387818a0060611c3c811491037 WHIRLPOOL a6a3b1953180923882de75d2e15cdbbf29f42c90947c88e1b29ceee3a2d8094eb5ee015ce2f38b13dbb84d52120be9e867618c90b655ffeec10d32947ce625d0
 EBUILD mariadb-10.0.12.ebuild 3941 SHA256 4b8cf5c1a4b72377f5a933ff610233ad34da98d4acd6153a97bfeaf3b74a27b6 SHA512 04b7e448d28ba7282c70f6264904acbdd8d7cb29969bec0fa97b78b33dfd85a25069393c64a16658ea7a714384ff2588b2e48da36ab83926588e65e82e9824ac WHIRLPOOL 3ddbcb7acd924d4e7ac713f44fbe4c61599399b7ccdac93a5ac060379b290dc2c2535e47bc4309d7ee7fdcb4b1bd6ea455ce1eccef4241e9fa377767d44b0e09
-EBUILD mariadb-10.0.14.ebuild 4078 SHA256 c5c4ce4954c467082848425803d571c92ef5f5d11e4fa01e3e4030fcea96a512 SHA512 1d7a1a639bd405c694d3c0f40b137d67dde135795d989a6b198e2c3fcf968a4f9d2b7926a06663985c20c66b28f6192785cbe40938e55c6ac15b3c381afff8e4 WHIRLPOOL 62f99f59df80164f8b5f7ed8d86ca9e9c159241c0897486b5ebc98f87dabf42098bc8e190fb862fd09e64049644dbded21cfbef4d254867ee5e72ecec28a75ca
-EBUILD mariadb-5.5.39.ebuild 4046 SHA256 9cd48ecabf3764693662eb945e0762fb827e426c58b84859fff40c2bd0405fb8 SHA512 b1266ad1d278d4cf3da10f811051be0fe5be4c09aeccffab584ce3821bfad54dff3a11c7089c38b5ddc30c93619a8ac5f0d089cf90d5eb979bf5b09e499a1bf6 WHIRLPOOL 59df1ca45777e498ac3e0a46097b6ff845ef168c76eaa35bf19b9e116bbd159ede543a242be9f67910cf44bb0662238b5716f201754f63777644bea90f5e69c4
-MISC ChangeLog 10471 SHA256 385cd330499fb3011c3f10bac91b0de23e3b1eee5c3aa860db9e151c1fb2ef2d SHA512 9dd4c4cc1f327b04fc6a271063120c4ae9af6f4b7bd5c9ff3c3d5b22a28c707313441a50abf6d55367b8e74ac4a62917d51a9d8e73180a9705b1eb1e6f0c7b35 WHIRLPOOL 8b61780bbd5a4040e92e5467e5bdba25e594a7ec25b92c6405ae604ce14ed8f053c70e7b77f4e713b90d5905df8fd18c3380b8ec561684bfe5fde3f20a8c58cc
+EBUILD mariadb-10.0.14.ebuild 3961 SHA256 fe748747cbfdfceefb74150a1e48164669ec07589d61d11b0eb75955559a023b SHA512 e3bdef97ec5f54bd2471e62960228933a5c19fbde0d0326f586b2326ed3793dee6cf892f6d5b17f15f9925339158d186080839f16c1f7a4227484b03cf3b07fd WHIRLPOOL a3bb18d10a297ff2c8da10980c2b7c62018778ba7589413adb7f3d7098be9f79242d0ab4d827928062fb3faf144aa9fb3bc47d6228071e002eaf3a6e10e69ffa
+EBUILD mariadb-5.5.39.ebuild 3929 SHA256 efe94a248bf2b54429ab492f9d85c811676785a87fb0f291992f03278e8752c0 SHA512 16fe762c96bec6f60238539349e5f932814851918f0eaa8423c75386845a6211024e007978099f102bbe848e5b3e0f7dca7161a335294e498aa902f2fec0f6ca WHIRLPOOL c66df1b41774a19d98811a8e8b3b453029f1bc66c95f178ff2df289d2852cb0b74cdc975041f33a01fd18cc51270ccd60482e13ac748a8a8adf6fb4844f3d329
+MISC ChangeLog 10603 SHA256 6159b10faa1f8788bb2c521abe79ce7f7a9784e4c7fc180b0c7ff94554460cd6 SHA512 485c1666db150b4091671536752cb9120b594a4fa6e3254d42729c39c7ca8327d72d168eac48b1f9228c5a4ee3917e44e3fed355f21305edd9cfce65a7db31c9 WHIRLPOOL 4c6fc157feba6c02082b2bc1276580027f29fa1cd5125d33df28dbc7998af511f42b8f0b79dbf4518e40677981841e7c154157f3b3211ef775f1cb6d1cc9497c
 MISC metadata.xml 1415 SHA256 430ec7d576a92391d07ab1da50ded0e5f1344398b883bfc9e1ff5c49697d7bba SHA512 2e6623f94ec3be8458b6404d2e7c3908e654bef176ee56f8fe99dd0367e97890023dc4912179cb04bb4f7d69ad738f0946c6ef7830b6a6b2f6d449244332380d WHIRLPOOL 05ae047384acaee2245dbd39a4d810172e89e4fefd1276c0db1022154eb4c1273d24d1e8f773928f21a29bbdaa86fcc86e27de4a24f7692f917156290f322b35
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJULLk4AAoJEE4V4vFnx44dMSAIAKU25Zwa2NgbRD7ic1qmameH
-pJgpjxMOGbGTc4sHeglUmHYQdQ3Pr1dwj0OhdwsviXoYMnVwN4piN+Ts6EGVvdLc
-nW2qf1DBnxET74bVUJe6ULhXkX3Io7QEKAvLYJygNV6tOsD5QThIruGGSgGCJAQq
-ryFRiFdZiI/XRQet2Q10Df6vKAVSAkRt1M9DeMrIY0VXR5JZy5OS5Fb1udN4utrT
-laxdWEeW0jtqaaYtkZzqUMrDiewdT7xGbbsYT/jmZSDUPUFgZ8c+0P/3Qkelik67
-KXxRH4UbPRMwBSxJloIltxB3DoQ7txBJLGSavJmEWGuyMCjDn4W16LmmCAX3EhE=
-=7mG/
+iQEcBAEBCAAGBQJUMtFKAAoJEE4V4vFnx44duJAIAJrNKZ2WVd6Yla61Dl6k8l7D
+cCjF41HTpstRhExJmY9SpKowYRXWXAQA4Rznbc3T2RaiFh03wHMUu2K3+vsWPDt7
+SDPgU2OJXikqKvGlgdZEJDfEerNZv1mvQ54mxcDm/o6opyciWie0hpGciMkV6XO8
+nPkwISY6nE5ObyNrlwFzV2NvpYP8CkyIDeVDVgBljFEB41fkuOyyvvdqeB3seaUQ
+2EOfmdcReUnObEsBZ90Gelx7FqEeEXg3NqFHt1KgrexxvAXx1Ux6Jb0V5vNyYObV
+SDcumvfzV4vG2OlZxpV4VHFaCrFoNye1fSRLRm2rFAHPcbu4Z/d/TRfAU+OXs+I=
+=viB0
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.0.14.ebuild b/dev-db/mariadb/mariadb-10.0.14.ebuild
index 52516801342d..d336665c8133 100644
--- a/dev-db/mariadb/mariadb-10.0.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.14.ebuild,v 1.2 2014/10/02 02:32:22 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.14.ebuild,v 1.3 2014/10/06 17:28:40 grknight Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20140924-1913Z"
@@ -61,7 +61,7 @@ multilib_src_test() {
 		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
 
 		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+		mkdir -p "${T}"/var-tests{,/log}
 
 		# These are failing in MariaDB 10.0 for now and are believed to be
 		# false positives:
@@ -88,7 +88,7 @@ multilib_src_test() {
 		pushd "${TESTDIR}"
 
 		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests"
 
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -108,8 +108,6 @@ multilib_src_test() {
 		[[ -z "$failures" ]] || die "Test failures: $failures"
 		einfo "Tests successfully completed"
 
-		# Cleanup data files after tests
-		rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
 	else
 
 		einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mariadb/mariadb-5.5.39.ebuild b/dev-db/mariadb/mariadb-5.5.39.ebuild
index 45a6ecc7e1b9..951db81ce57e 100644
--- a/dev-db/mariadb/mariadb-5.5.39.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.39.ebuild,v 1.8 2014/10/02 02:32:22 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.39.ebuild,v 1.9 2014/10/06 17:28:40 grknight Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20140817-2320Z"
@@ -59,7 +59,7 @@ src_test() {
 		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
 
 		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+		mkdir -p "${T}"/var-tests{,/log}
 
 		# create symlink for the tests to find mysql_tzinfo_to_sql
 		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
@@ -87,7 +87,7 @@ src_test() {
 		pushd "${TESTDIR}"
 
 		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
 			--testcase-timeout=30
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -107,8 +107,6 @@ src_test() {
 		[[ -z "$failures" ]] || die "Test failures: $failures"
 		einfo "Tests successfully completed"
 
-		# Cleanup data files after tests
-		rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
 	else
 
 		einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mysql-cluster/ChangeLog b/dev-db/mysql-cluster/ChangeLog
index c667494930ee..545c642fb53a 100644
--- a/dev-db/mysql-cluster/ChangeLog
+++ b/dev-db/mysql-cluster/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql-cluster
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/ChangeLog,v 1.4 2014/10/02 02:38:28 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/ChangeLog,v 1.5 2014/10/06 17:37:46 grknight Exp $
+
+  06 Oct 2014;  <grknight@gentoo.org> mysql-cluster-7.2.17.ebuild,
+  mysql-cluster-7.3.6-r1.ebuild:
+  Update test data locations wrt bug 524158
 
   02 Oct 2014; Brian Evans <grknight@gentoo.org> mysql-cluster-7.2.17.ebuild,
   mysql-cluster-7.3.6-r1.ebuild, mysql-cluster-7.3.6.ebuild:
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 5146c3979483..340cea2675da 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -5,19 +5,19 @@ AUX my.cnf-5.5 4909 SHA256 56f5b341a0780a51d90bd51c72a917277606a6379e39a7f20c840
 DIST mysql-cluster-gpl-7.2.17.tar.gz 25882680 SHA256 d5bbf0fa7eda8056d01f564a9f50cba65794eefb07cb3c7b6b8819a86a66927b SHA512 ade82886867d897b23a6487c4efbbecef6842129a2b96df2a6097da73f4715e4e5ec4858f357d1e3f7eab5e1b4dc86bb89cd1ffe560ce17388ce26b06c5abd96 WHIRLPOOL cdf34ba72f971328a5ef10650df4a4ef482bfe6800543835fe5ea818f0fc8e8b57fda9c0608486fcada3590d84413c8e6c68db892ce1b36777c5bdce902e466b
 DIST mysql-cluster-gpl-7.3.6.tar.gz 42119293 SHA256 7f5405485ce05c88bd907269a75f161826ec92d763b46717a24880c378fd6dd4 SHA512 044a8854f61c7e4cb23343f84bf5c734244bbba8adc12a8a2c72d9febab4c1dbb404a7680aa0315de0df5459433eb578bc04f9ec169f0c2492e13e28aec6729d WHIRLPOOL 49b3eb455bad577d2a2d9d67c2fe78fef15ef184e7b56080d54f0a683f9a6596836108b727ed892a43dc0dc135ee65ab9293ddf0ad5f1587e41d31609090c8b6
 DIST mysql-extras-20140801-1950Z.tar.bz2 1494288 SHA256 a656486a7383d656ed33e279f41bb4384feba082cad3af48376ce9e1f395fe0b SHA512 b2c29c3d7c1ddacfa170125c9df0aaf65eac9f6112244b1deea97a46a3a2f2bd3eb069808e7b2ee3261d609b32046363830ba4ebcc7e74f449189a91145a6f9c WHIRLPOOL 41befc03a7382516849ecaecc1d02be7d00c47be489b97ce68c320c3aa8979c8f941525efe230d97ad2d1a85936a1e4d6c93d96a3f45930991a938e5f0fdab87
-EBUILD mysql-cluster-7.2.17.ebuild 4390 SHA256 96cee47ee8ff9d75fc5d6fae52fda22e93b74166d2fe74c7d4a562e9a7e84377 SHA512 16f66974c3bc8b6a467cbe9a92015801afe8a26d5e72b94708298446033c2df99952209004b5c08db7bf1325e1e8dd905f828196230d2475a16e033b20368ba6 WHIRLPOOL ff6a977dae4870cd24a432dca1b6e96914138fb769e2dfa7a41be29a982168fcdf39835bef83110dd7ee062e4ec4fab786ddbc03551932c3e8d1686b29d098eb
-EBUILD mysql-cluster-7.3.6-r1.ebuild 4746 SHA256 b3652cd4e41a420414dbf170c01776ef5e242b031881d32b728427031de2af15 SHA512 9455260d1b20c05da4b3de6d0b2766b88cf868d6fcbc4eecc8d97493f2d9f6d5d8a3dc91a6b3fa2474da48b3726ce00dfd40ee684a9c7fdc080554601e79fb33 WHIRLPOOL 80caaeb0dbfb985935faaa8818367260cbf450dd9a0e63d4ddd47125b4d5a485719499f58966e50aa47f2d776fff4f4e5f670b2470bea5ad6f00d7a2333d9114
+EBUILD mysql-cluster-7.2.17.ebuild 4273 SHA256 c7eef0014a9972dd9b456026398e2a5054161a8245f281df29cbadf0c8e8a580 SHA512 249ceab96ec28cb8a6f1b55c404ff1c93ed21956576d9037a8cdc8d48c58053cd0f4093b99490f5811cac061496f20f5ab896205b30b5006303185e12e51c79e WHIRLPOOL 3bd54a2c9c2d947d4bde6eb2f28f462362e35f077a79d545720d02819d61b53f9ab6d3eae62dbba03d1e8ba1e54a6d030c4c591812f86f300fc0c4a518b1e78c
+EBUILD mysql-cluster-7.3.6-r1.ebuild 4629 SHA256 74d7b0226268979a020e538564f4f031860c7317fa15a1e76b0796b27ed7d1f4 SHA512 d85bbb3915aa45bb2b30cbbe75f6727a1c237a4990a94c1bcab3f51e1726f63a95e400225c54948b8591fb04f9f3e05eb6b56caafe393c40162ba29a0cac4f37 WHIRLPOOL 81e93e50c52e64a7f6db0d388f68017beba9ff3b6c561f363a62246858de748b07f18c1d79f424b1b05530b4ad9c145d38204ea62515b98ffb15a5220ee46e53
 EBUILD mysql-cluster-7.3.6.ebuild 4672 SHA256 cd036b339eada1ecdecb99bc1abe9bc01ed9fbf218aedd6a51340e7a649ad619 SHA512 d6bdd49d7c73f4f09869b7e607c2c268508fee9d5bbac9655f98a972b5b902bf7874255136f7ca853cd098b3ed0969073d7c7748d6a6264c1b9630e7d9488b4c WHIRLPOOL 364dfe967031a2310618cafb7273c64fbf175327e5838f5697bac43584f889ab916a9d2874de78852a7a0f4dd79d2aaefa13d2671b57a53af19003a94c72ef39
-MISC ChangeLog 1178 SHA256 487aee58e25971220a403400d5b96e2d3a0145a57e12cf4d3f75b5aa787196b5 SHA512 4200d6417309a88364bd13f25b6b58c0ea81dcaf1daebdda8344cbc621953c9196db8476a757b97588a92070413c493970c5146109e7930d7fa33cc61ab15bf8 WHIRLPOOL 3da472dc963420a328ce611266cd53f4acad0565ac485e1f9ec7790d2d8c7d214189355345321ba2105ce40bdc5245434ac4e12107e49c071ee75a2d329d6b86
+MISC ChangeLog 1323 SHA256 0e4a78d0603cb040c7686beee11d622e3f3df9f176340d1fb57b036e3324f72f SHA512 13c670e3062ebb152de841779eba09a8532494ec06c01dcea200132451fecf232335e30eacceec17dbd4027d093dd989e429a2b57f317992b9ca790fc1208dbf WHIRLPOOL e834acf45f66dd7925a71547cf7548aff24bc1f2ddac906a277ece7187bc9af4a34c24dfe49b050ddb2cf26ec0686b9aa992ad71c383c2cfe8d1bc37eacc4c5d
 MISC metadata.xml 1075 SHA256 2e8f6b7bd966203f74776b642bd7d8007b89b3b1903d259a749088f9be6f333e SHA512 f5b5463c19d04ec24e6bb09decbfca589a0f26fb33a47f85854d54621d544963c662282980961fa58094d6078a8c0e387eb35066cb433a26cb3e8ea4365a2700 WHIRLPOOL 135e213130ff15bd48b97494afc14cbce3ce65b0da540be5d29e5260cbfdb8bab8cbb30dfa7749d244115588a2f1c3956ad5bbc818082926e34551a0922cd5f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJULLqlAAoJEE4V4vFnx44doTAH/0NVDxSJIeqazmT2gmGL6f+P
-YxOVxi1unMQVNgZvM6npKWcK+b33JE5PBE7Y2zNj0o2faNw5sN2eSkul56nsnxD8
-ACa2HGS/Jrdca0p5LreWhtQzR6I8yP5ydHTZkdEt8rMbs0kpywL67OV9gtSkwKce
-0TAZQyO4DUC8U88/GL5Zm/sC1BWWYplSFrFbFksFGmxmc1baM8/3UVhW2lhCWZvA
-v/K6W5mN36HdwdW5VkdLpXtADCUrcy0ikwX3twSR87wPTGTAUdO+Hi8FX4E0rgo/
-mJ9jOktieEPaJmWYj4D88lIVl4ApScsdAj2bvjW9I8FtSBRNJaZMv0uuJoUdvrY=
-=4dQg
+iQEcBAEBCAAGBQJUMtNrAAoJEE4V4vFnx44dqoEIAIOkTrtG2ujVCfdpkU22JIHV
+LDF2Z+RR/U+PkeNJgN2RfVasVLuzNec0M8uRU03mW97rkUQA2W+QJDtPVf+/T+yx
++4I/rkxHfu1eAkZCXj0IpiX9rnP7cxW+wgGgCRKfNdhee7ZaWf3tyW4FdWaF0ZE6
+rM4QBtSdhp06BS6/BLYN4hywpcc9yteN+dhSn3y6EfqnTqycs2vWavPe2Oq72OKJ
+QTQnb+EKbQGDTlQ/WUl7RDWfs4hkvVm1oERHRqN9Rqc48pCeji5sSPvsFNSTpJ0+
+occgXOJUsA+5XZfM1QDQUS4MG5YX0l41+sdems+EmIzi6gRWupK9wVv2Vrkzg54=
+=eImF
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild
index e3176dc0ffd3..79d6d2cff18d 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild,v 1.3 2014/10/02 02:38:28 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild,v 1.4 2014/10/06 17:37:46 grknight Exp $
 
 EAPI=4
 MY_EXTRAS_VER="none"
@@ -63,7 +63,7 @@ src_test() {
 		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
 
 		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+		mkdir -p "${T}"/var-tests{,/log}
 
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:
@@ -102,7 +102,7 @@ src_test() {
 		pushd "${TESTDIR}"
 
 		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
 			--parallel=auto
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -122,8 +122,6 @@ src_test() {
 		[[ -z "$failures" ]] || die "Test failures: $failures"
 		einfo "Tests successfully completed"
 
-		# Cleanup data files after tests
-		rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
 	else
 
 		einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild
index e803baa72053..b6e45550f8da 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild,v 1.2 2014/10/02 02:38:28 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild,v 1.3 2014/10/06 17:37:46 grknight Exp $
 
 EAPI=5
 MY_EXTRAS_VER="20140801-1950Z"
@@ -66,7 +66,7 @@ multilib_src_test() {
 		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
 
 		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+		mkdir -p "${T}"/var-tests{,/log}
 
 		# These are failing in MySQL 5.5/5.6 for now and are believed to be
 		# false positives:
@@ -108,7 +108,7 @@ multilib_src_test() {
 		pushd "${TESTDIR}"
 
 		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests"
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
@@ -127,8 +127,6 @@ multilib_src_test() {
 		[[ -z "$failures" ]] || die "Test failures: $failures"
 		einfo "Tests successfully completed"
 
-		# Cleanup data files after tests
-		rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
 	else
 
 		einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 9ea4effdd26b..d1cd8806ac5a 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.692 2014/10/02 02:25:51 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.693 2014/10/06 17:35:01 grknight Exp $
+
+  06 Oct 2014;  <grknight@gentoo.org> mysql-5.5.39.ebuild, mysql-5.5.40.ebuild,
+  mysql-5.6.21.ebuild:
+  Update test data locations wrt bug 524158
 
   02 Oct 2014; Brian Evans <grknight@gentoo.org> mysql-5.5.39.ebuild,
   mysql-5.5.40.ebuild, mysql-5.6.20.ebuild, mysql-5.6.21.ebuild:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 997fb92b6c50..4375db616a68 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -16,21 +16,21 @@ DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
 EBUILD mysql-5.1.70.ebuild 8874 SHA256 abd74f2cf58e5c8d4544c2dee89c8b30174b038aba91f3b45138cc299d8013b7 SHA512 303ee2ff791852dcab8d72a73e06b7f5e1fe0bd48b6e71730013c601eba412cebacb09cc76d06075f4e63b0eae80947a2bf9eb42da24d412b5c66d69d9aeb4c4 WHIRLPOOL 20d542a938589b3fefc738e64f5d9f9596faa1f1dad0175b144adc096d7354390eb6c4aed873dec9687e08483cba47fac56c786829c2ffbbb22e04ecea2b867a
 EBUILD mysql-5.1.73-r1.ebuild 8892 SHA256 a3f57db069a9d7eab793820178c0367ddeb912b604560db3a55553c9787cf230 SHA512 ebf6f4f196362b7623c6ee9b336e23ca94a67a32da4f389e4f49c9f44c1dc2b1c6e482de90e3afe1cfbf1edbcfbba02331ea4506cc5bc66fc2fed2624b9defd8 WHIRLPOOL c917e39875832571fdcdd5c37c58548c4bc25434b313b0dcbe569d0551b265ec3d2cf1811fbcbbac62213faa1de4855284769a2add53dc889e6998e76464e736
-EBUILD mysql-5.5.39.ebuild 4712 SHA256 294c6428b85df0856c64ed1671241934c5bcca6cb0742d1fc38a2ae15bc4ba05 SHA512 c67e41490140b54d4460bd82fe443bd73020c6c221a703c08c4080181e132c617a35e52a47fe83b918215ef572ddb8d0e4f365c71fd4e4d8e37397452f05849c WHIRLPOOL 64ad25eec2c8b3b6183fbb1afebb4327c9ed244942b3d91abc9f00bc10d4550b6ee4c10bfea621476e3c4805da0e68f25af92699273c26b823084bc0c2a1e40f
-EBUILD mysql-5.5.40.ebuild 4194 SHA256 769e59cf9a49309152ed39663a3dfdb67e5e388ea94f8d682f5ef7a80598a1ef SHA512 30ecef63e2b3a37cf3c63e7876c6fc57b4eba8d44280e6a002b6ac8ed0ebd7f241050bef5e152f6ad5fb53beea6efc324f0f9fe5b75bc819039f8563370b93d2 WHIRLPOOL 1b53a82b91522bbc48bed309f189483ab79f14b68180afd0ed9ad23f458743a87f9f115d84ce759df50b88df99fcf4bbe82c3898efe7c7553d2c609b52c47ac6
+EBUILD mysql-5.5.39.ebuild 4595 SHA256 5008452dda4183033da27924fa0e7368039990ecb25c1176136f42a0167929f6 SHA512 a451dbf6cb8b6452cb749bb3c9d070732d6453f406c6aec992a41f7a3d9aef4d8c8016c664823dcbd917264fc36d4da27c44bc740e399b87c93c925e7d273fff WHIRLPOOL d6696ffaffe4379407c41d217ff6efbef4d5b907bd20721d2d4fcede3b2e7821b483dc66a918752b44f92af8c66aea2345ee3c8114ad27242acf8021e335a641
+EBUILD mysql-5.5.40.ebuild 4077 SHA256 b7d0b692e701cb51758707c5d8715e326f0b10a28b066a4cd49963a5b70bd7a5 SHA512 eb3f01d3c927836553ebde49ea49ea38dd92cfd859c862f7480fa31eb677119863868d4506d3f5d7fcef2ef6c9f1edb31b55e381faaa84e3638dc1da8d77695d WHIRLPOOL 55fe1e58fbcd5d9dd7699b5a08508d00301cabf979fb566937dd5554571470909e5a5e55e95281651f50ea759d375fdb7133cc4f95e4664db8b1e2221d9b5636
 EBUILD mysql-5.6.20.ebuild 4966 SHA256 3899dac6c6db49d443f37fef2927e1122c39306549e7d4a19f2c5ffc78ed5e0e SHA512 fbe2aa9489ac2b01209785edd15e5e0ca1015a260a29721f65f3207ef8e2f67dd3cc31552e4dd0b1370db63dc42ead54363977a8597aa5dae17d3837ed891d68 WHIRLPOOL 926f210c2d90d8b4ad7a5b3f6d886bd6afe622e3a24fb77774a0be7b37d87bad31848a7138a2e7f2a895ebe44c5d9b1ca2acb354ecb3c996031c336e810375f4
-EBUILD mysql-5.6.21.ebuild 4955 SHA256 47fe668c772548e0471287bdbd799d34b0d9ca27959b428cb92ca14c00943b88 SHA512 538dfcfe28fe56d62ed5b916a64209e573bc760cf3f608877aefdf35e01257d097923aa5f5585ed75f1d1dc9b5337673c09e49663a0804502e1c388e6fd010de WHIRLPOOL d4aa2126d06e24b989dc977f2e5095e806b2932f4e67a7734bc3677c43e3182049841eeb658c7c78a77e2e08ad57d86631e4a42423e3aa63a270a49ce3b1477a
-MISC ChangeLog 20193 SHA256 ffb672b14fe346ba233089d973187c0084d913880837c46c6e036dc110046135 SHA512 42b7e813f83fc6d23e635352c1a03cc2c1d771d589e8cd1a517caae859f3446c6b08da42fb56f799fe1c7b13a3f2a2e8493de87e927ccba4d919313f36d87d37 WHIRLPOOL 3e7be8704731f0e26132cbe7c41d881769851d2e31189f47372b38603c08d440cc547cf0e0ac61c6846b8f0ffe11c525dd4781752549daddd00411584ed3f352
+EBUILD mysql-5.6.21.ebuild 4838 SHA256 b9e7559dd544f4ffd2abb332d86e413f36f4d237e2bf8b1266b7fd9578a37901 SHA512 f3b51d93034dcedbe4f2c3907d4cb6284792bf9e95d5ba528a91a59eff41d120052069c4ac6e2235de6ee74ad719d1bb0a5eb6816c5c85fad5fa492a7f05cd61 WHIRLPOOL 97d4c32e202003dce6e9afae70f357075988101958c50d028c6e197576c006ca99f4d04a8aef8b675ce2617d684feaca219df542a92a187c5407cca97520300a
+MISC ChangeLog 20341 SHA256 6f4a5fa59a08aee71bbc02a1ddb7e6b652d001646264271bb6ab04b32e097f12 SHA512 8ed118bdce2bad21062ad5e79a415d21375292aa566b2dcba93c82c6c7b03170778866bf51b5f5f761fdbf8c7e520d9a76e01ecebc9b66b075d27c4fe4ee7033 WHIRLPOOL 33f2f83a2cbe4ba0e6fe04c9f5dd8e45d71c7b224e6cb7ffca61930d1b612d9586c228bee837312c9d761db16e9f6a48ee7e76c17427dcf7248019071cf34982
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC metadata.xml 1440 SHA256 57b1430c744bb21c4f99b885b92c1ca27efec6757e06f51bc043e25737a226b5 SHA512 0a8f4cc67b3dee66b95c16edcb0c1dd70b95b199f7cd46ba4b509a9f52dbb7d45ed2da4280ed8ba93d96521f66fc80d486de91f0a23ff3e0baee48795e5151fa WHIRLPOOL d747dccd7d8ae91fd60c5c074a3d1f0ab64a96f8ec09658a36e42546d17cbd9644de45527ed1bc6babeb7329c666ecc01cea7283dc4640268ed5cd2ca045172b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJULLe1AAoJEE4V4vFnx44dNv0IAIvyNQaLWxqIxiAkqIMLNclY
-uCGYmkUnKtvUF8RcHPFwiMaN4R+xHgctXdCFslCIpxMMpWw+vbblblA1ez7YWDPs
-nHNecR/dxFdWwi+ZIJUDms1yzCwaH8ZNzGTnDZ9lRCBcGwv9qQV5mJH3sqHk4200
-VrEqd+tnjcTGHCZ5+HumVsbF3QYThpiroRawA/0RbkwEfzLe88bNHzdG545UzcVs
-7HqFi77ZGPyc7b6P/Eg4nl1RlJS6GICOmBBuCwr/VZ1hjGDkWh46mf2+GRzxL/fu
-GLj54K6YHZqDkJh8kMEgnNldLIuAV9uQKraPOwZ3iwVE9MVdfqDo4vB6486Ubhc=
-=0GA4
+iQEcBAEBCAAGBQJUMtLHAAoJEE4V4vFnx44dHBQH/3X5/uTHoWsVJ4d+JW5XJsc2
+f+y+zLPkyu5ZzRVdET1XPvDhXpmb0HsNz8jueFm1qz8BrWlDU2/kmBfEUd+eLUMC
+MZMkuTCp1ROOlIQpt4VG/du6R5aXhGVvtnUYd4+M3veIlk/I+W8M/bGJCMchLAWk
+QZKgByARc9SaBXf5M9vK9YPwvlrxLrry2yP/vAPimQIdCqU5tQulgOb5W9OlQV0e
+erAVqZ3tJTDjxkFJ0wr/UA+fq/aDRza3QTgSxw8ytFqJ2vc0stA0yd7TB0rBhZuH
+ogYC3s1dz5o/n80djeKhHkKAXvVs3Qgi6JRXxM79/6/VMyfkIhKzmbmOBxs71aI=
+=G+z/
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-5.5.39.ebuild b/dev-db/mysql/mysql-5.5.39.ebuild
index dad222000cb8..0158c94d99ac 100644
--- a/dev-db/mysql/mysql-5.5.39.ebuild
+++ b/dev-db/mysql/mysql-5.5.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.11 2014/10/02 02:25:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.12 2014/10/06 17:35:01 grknight Exp $
 
 EAPI="5"
 
@@ -65,7 +65,7 @@ src_test() {
 		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
 
 		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+		mkdir -p "${T}"/var-tests{,/log}
 
 		# create symlink for the tests to find mysql_tzinfo_to_sql
 		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
@@ -108,7 +108,7 @@ src_test() {
 		pushd "${TESTDIR}"
 
 		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
 			--testcase-timeout=30
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -128,8 +128,6 @@ src_test() {
 		[[ -z "$failures" ]] || die "Test failures: $failures"
 		einfo "Tests successfully completed"
 
-		# Cleanup data files after tests
-		rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
 	else
 
 		einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mysql/mysql-5.5.40.ebuild b/dev-db/mysql/mysql-5.5.40.ebuild
index 58289a934e1d..0abce41c9310 100644
--- a/dev-db/mysql/mysql-5.5.40.ebuild
+++ b/dev-db/mysql/mysql-5.5.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.2 2014/10/02 02:25:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.3 2014/10/06 17:35:01 grknight Exp $
 
 EAPI="5"
 
@@ -69,7 +69,7 @@ src_test() {
 		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
 
 		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+		mkdir -p "${T}"/var-tests{,/log}
 
 		# create symlink for the tests to find mysql_tzinfo_to_sql
 		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
@@ -94,7 +94,7 @@ src_test() {
 		pushd "${TESTDIR}"
 
 		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
 			--testcase-timeout=30
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -114,8 +114,6 @@ src_test() {
 		[[ -z "$failures" ]] || die "Test failures: $failures"
 		einfo "Tests successfully completed"
 
-		# Cleanup data files after tests
-		rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
 	else
 
 		einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mysql/mysql-5.6.21.ebuild b/dev-db/mysql/mysql-5.6.21.ebuild
index 0fc09a962132..8607c75aa383 100644
--- a/dev-db/mysql/mysql-5.6.21.ebuild
+++ b/dev-db/mysql/mysql-5.6.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.21.ebuild,v 1.2 2014/10/02 02:25:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.21.ebuild,v 1.3 2014/10/06 17:35:01 grknight Exp $
 
 EAPI="5"
 
@@ -68,7 +68,7 @@ multilib_src_test() {
 		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
 
 		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+		mkdir -p "${T}"/var-tests{,/log}
 
 		# create symlink for the tests to find mysql_tzinfo_to_sql
 		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
@@ -113,7 +113,7 @@ multilib_src_test() {
 		ulimit -n 3000
 
 		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
 			--suite-timeout=5000
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -133,8 +133,6 @@ multilib_src_test() {
 		[[ -z "$failures" ]] || die "Test failures: $failures"
 		einfo "Tests successfully completed"
 
-		# Cleanup data files after tests
-		rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
 	else
 
 		einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/percona-server/ChangeLog b/dev-db/percona-server/ChangeLog
index b10a485c2175..3cd9e95f263a 100644
--- a/dev-db/percona-server/ChangeLog
+++ b/dev-db/percona-server/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/percona-server
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-server/ChangeLog,v 1.3 2014/10/02 02:39:57 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-server/ChangeLog,v 1.4 2014/10/06 17:40:34 grknight Exp $
+
+  06 Oct 2014;  <grknight@gentoo.org> percona-server-5.6.20.68.0.ebuild:
+  Update test data locations wrt bug 524158
 
   02 Oct 2014; Brian Evans <grknight@gentoo.org>
   percona-server-5.6.19.67.0.ebuild, percona-server-5.6.20.68.0.ebuild:
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 227603e17a23..a6752c0a7225 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -7,17 +7,17 @@ DIST mysql-extras-20140817-2331Z.tar.bz2 1494554 SHA256 c2e338b4e6933d87696cf8c1
 DIST percona-server-5.6.19-67.0.tar.gz 34127811 SHA256 5099e9d0ec69124f44596005a2dad92697dc2b6f8ab54d32bdb089945b76c346 SHA512 62b08b074d94f19e28e6aaf73f1419ecf589bd441b75efa7f27dad78705623b6002f5fd510832afb821d70315c7537042977cfbbab5317dfb1f6aca6d4224dc5 WHIRLPOOL a36725f1500125e4a7ce3714cc1b67c9bd90180e4eb0fce2237a8cbebb956a5d014934aa9b405f510fc3514a6a7dffb1301394c21b3ec129517ba25090ffc0d1
 DIST percona-server-5.6.20-68.0.tar.gz 33900890 SHA256 68621fdb9cc195309e8d56eacedd9a8b97c86bdd1a6f0f2d8e300816a1a1d7cd SHA512 cf0c52967d5645f3e4bc3b5e2ef2158c94461dbcd21c08cc6027845ac4a46201642db59085dc487111db98539088c3c920c121673452af5e7aca6ae0b89370ff WHIRLPOOL 582ebbd4c6a633ef895936be873bb7b844515e49d5353ffc45d9814f436562595f41e22703a069688c62c186e67f585e6aac664776d83d6b169b8000aa09c85d
 EBUILD percona-server-5.6.19.67.0.ebuild 4504 SHA256 d5dcf4e4544eaa7badf9163d2a9b0c3ce8c04ca0c473123002b66580931794cb SHA512 dcc9a78599474734decbbea6dfd3d2e25cc01b428c34e6568f9ee5819d34c40751ff825dbb48761d93ada6eec43558ab0178e770ea6858fe9aae427547e883b9 WHIRLPOOL 5aa644af2b5c17f6fda67f412a45af9a956372f04eaf4c13173e7e8a72b93a4b5241e361c121839f334116a4c0a78d1fb33f7b9c55b3e296f58311aa6380559b
-EBUILD percona-server-5.6.20.68.0.ebuild 4629 SHA256 32689154c41e43bc6b38d4dd7fbe1c6ead82fb88c6d1e294f8dad6d4162b0f93 SHA512 996032ead84f53667aa98c5b77f05e9fb0efde039d539da1e2ecdbd36801d033cfcf1046612465667bafbc312094d2ad640a56b855ef32694f51a8257bd72f03 WHIRLPOOL 4606a7b23786f7bfcea7cd9d7ae22a26e18fbd4f1191bc11e116ed95b71ac7aa76efb1a0c8b2b835bf62741ea677d25dff7b6beec436aa2e03753af778472377
-MISC ChangeLog 856 SHA256 3738c0225892d697bce8570b4c798ed75b03c01c980bd3a303e087e8d167c089 SHA512 bd8b6306440bf867484e1d7d1433ef5bff7b442649013730d06756400a8a55ac004ae82ecfa16ec8149dae59509288dd00caf0002d6fe75c98d49dd4c99d36f6 WHIRLPOOL 3fa24048101ffeaaa7dc71dd8db59b5ebd07a02f24d9cf7442be0913bc5b436429331d00db53405c8a72678f92d79c38c9299ad856fe6b11587e0d9416a8a130
+EBUILD percona-server-5.6.20.68.0.ebuild 4512 SHA256 417886f4e26c8ec08a23afe5627ed130f9ccbf2a96101f4d6c9bc09e54932086 SHA512 8715a2c605a9a172d5205d3ceecdf38429c5485fae46d8a868fb2bee3d1853035e26a5d85cce04b4f478d11544c55c17474636767697cba89a32bab195b41a01 WHIRLPOOL e3dbf8aba4e2d23fa5b49cf7c8fbf219806558f526dd8f8f1344936a54490d41bfab7910f4c6c7396613aa3076670e54eb9815bb4416c3c622c03d35405e08f7
+MISC ChangeLog 974 SHA256 40d8d30771d8364b9abf472c4d95fff438d861e8c9487a7cd925138c16db9897 SHA512 a8185c7af3295b0ad4ce4fd8fce2d63d2400ca0ba7b98c72890747cbef519be07e44dd7fc6887da8040039019dcbb0a0066d51a3796c9fd3c4aca5cde22c9dcd WHIRLPOOL ffe8d631321e69b8080f85f79f42f27c9f91ff54ca7ef038f6bd511b1f2a61de5dd41d7b26b97f2e750b6f3d47563d92fc696f42be540e31d9322ed231e19e2d
 MISC metadata.xml 1088 SHA256 cc86c936f1bad3cfd435753a665dc928fc07700af3a77debecca068e3240abf7 SHA512 6663e5e9e9f4515e8410688113cc46a265b1499819a97a9c6fa83a87075017dd84bd026834e9d199d299d2f36d1f8555abf24e2a915aad4773b999f89a8029d0 WHIRLPOOL 7a7f8a8d15f101c0fd02ac3ad828ed988e66fd16933c4b7db8d4d356c0c46ec258c027be2a0cba098d8bc197f8a330d426b57ce5ef25694fd3acd328b7b866ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJULLr+AAoJEE4V4vFnx44doUcH/0E4o/mR2kEC6rzXpygbIayr
-lkoGK71o8bjxMsHjQMJ3VypwsKDv9Zwp6V7a8TUUH9GZSgbP+6/qAhWIwq+C/xTC
-R8efIfHpPNgGS/UGvg2lcbrsGSj3FB8bAPz37AfR9JVPEJDdhkDjezqKKA0Ebuw9
-3h2SuLUBMRr9pLqa/D5vtL2ef+8+T1zjR/8icxh/C8VkxSh6LmMb1G1T99Dqb2ku
-wJ3GcsZzX6Y4gGBJL4/dTJbGvlnmGHzw5NuHfUeN70EutxATf7p79ycWMzZNocJ+
-GrWkIee/xWTA9CUi4t9Qd+LJVYkdZIWvNDadObfFKFseXuZj6RVLsXUJmF25qE4=
-=uIrj
+iQEcBAEBCAAGBQJUMtQUAAoJEE4V4vFnx44dnDMH/R9uJ371sypsB2n4JwTxo6wy
+ht3io7lxPPjl09JGYZkL8JdaCnIsE5fKjbpx5TMtUndOaio0ULMufmhj3/X5urnc
+BPIbR1sPsOvXs8SMX5MbGGS7vacp0ymhzejsENW6IwYjSHjCJA4m1nXwr3F2dMsN
++B+uLXrcdk+0P0AXFYfiedjmulVWLiKiXPfk4wXTPzjmCJHwBq+uUAn+su8FQEB7
+HXCJ/sxVKxVdahHurEIt9Ek7u+f1yMrBP6V94jkCegbttyeSwrfDmGXc/RsG1Wyi
+yWgxjrSkWVWccn+TtYWNHZ2Ohv5bd2N0e9UbxDwrYagoRQzh+ojYj5TMDjEtUoI=
+=5Ovf
 -----END PGP SIGNATURE-----
diff --git a/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild b/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild
index f5636dec1212..05e4e5ce6a3b 100644
--- a/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild,v 1.2 2014/10/02 02:39:57 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild,v 1.3 2014/10/06 17:40:34 grknight Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20140817-2331Z"
@@ -65,7 +65,7 @@ multilib_src_test() {
 		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
 
 		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+		mkdir -p "${T}"/var-tests{,/log}
 
 		# These are failing in Percona 5.6 for now and are believed to be
 		# false positives:
@@ -103,7 +103,7 @@ multilib_src_test() {
 		ulimit -n 3000
 
 		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
 			--testcase-timeout=30
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -123,8 +123,6 @@ multilib_src_test() {
 		[[ -z "$failures" ]] || die "Test failures: $failures"
 		einfo "Tests successfully completed"
 
-		# Cleanup data files after tests
-		rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
 	else
 
 		einfo "Skipping server tests due to minimal build."