Version bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

3 files changed, 151 insertions, 16 deletions

diff --git a/dev-db/mariadb-galera/ChangeLog b/dev-db/mariadb-galera/ChangeLog
index b010fe9ab151..28b447334488 100644
--- a/dev-db/mariadb-galera/ChangeLog
+++ b/dev-db/mariadb-galera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mariadb-galera
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/ChangeLog,v 1.15 2015/05/18 20:07:51 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/ChangeLog,v 1.16 2015/06/29 17:06:14 grknight Exp $
+
+*mariadb-galera-10.0.20 (29 Jun 2015)
+
+  29 Jun 2015; Brian Evans <grknight@gentoo.org> +mariadb-galera-10.0.20.ebuild:
+  Version bump
 
 *mariadb-galera-10.0.19 (18 May 2015)
 
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 010847fd69c2..d14873e5be63 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -4,26 +4,28 @@ Hash: SHA256
 AUX my.cnf-5.5 5358 SHA256 c282f0545addccf14ca8f983eb26cba38af27177b7785ab20e6ae1af0930f7fc SHA512 82eb974309ddb0cbab5ec9f8e6699181efcd6e67dddb59ce9d98301c3f041276cdd813bdb3a8e7244fcb65f6f55ae587341789180430e6508cbff57e6cf92d3d WHIRLPOOL 0eb6d850b970c1eddbcee4543ca87baee18f08347b308cfcb69168f60c1fc4127a492135b75db03f7bf94490f908cbf38df3bc0cd8560a5de5a058a3f3d09125
 AUX my.cnf-5.6 5259 SHA256 ce22f1829abad1770614b161ad86a01007458f1080332aaa9f1ed9c4fb526705 SHA512 565e638ed41d9706dc1294a558e0e5bf7e576bfc6ca097ed016e142e0010bfceafe6ea56403408496a6acecf833410881284b1233dec15b15f86f1abf4c9cbfb WHIRLPOOL bd0d85adf51a0acc8ef2f04305ae61a2242a3a20c66f5a44a1d98cc75ed429a1d8aabebe1b64fae948ecb66d68029fab410f047ab82d213cca95ad8b8dfb2be2
 DIST mariadb-galera-10.0.19.tar.gz 56520261 SHA256 df5c0e8ff2db0dbf2490c52f5d9b509216e2d89bf6d340920aad2b41d4d1ae75 SHA512 9acba0d851c8bdfe0b28e3ec3dc9a21a41c8f283322d73a3c05ac10b9e9400302b9e6fe47d0d5ef73307254af715bc3ed144acaa325ce6c78841ddd14ee754c7 WHIRLPOOL 2c60ee6a82e8f6effed3b376a7647f0bc804de633d770bb215f37774bd7cd1f38b0ef173b68ec3f3eab9f59ffee77cb05668159873a5ebd863d0d96735f39edb
+DIST mariadb-galera-10.0.20.tar.gz 56558895 SHA256 f6b979cbae803d1b33e85407fcd2aaf19b07fb5e183726666e8c990f1f7d5ce8 SHA512 dbae146c798d08f624fcdac86d7f69aea2ebe8540f659004fee11dba4a0a6c234b7235544ae4adf3b58add989649533f86dbe1de4107eb7bbd433add42f55dad WHIRLPOOL 93ad52daae91463772a163a59beab57496102fc2cd23ba7f9b009875ea8cb7b854d8a0d857ddb90d6e3ec3e034ae8403eb7aedba55f9d2a97f72dbc999085f69
 DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
 EBUILD mariadb-galera-10.0.19.ebuild 4511 SHA256 0635d16ee891d12dc5dbbde316d17321e23e202be17fd5e62e58f933d8bdd822 SHA512 88d65f197887471d22130d205ab7fe59ba102ba1fab6814a09aa6583dfa231feeb8627175845a6cd49cb8ed37e1fe02d1368b59761fbcb24c8af82843ddc3521 WHIRLPOOL 5b239d62bd9b7d14f9a1e71650ccdd24e75e6e69d4cc357a2f5bcde4c9023bc3e061492902df12546806a92b08bab3a3156d4ae86e09ba4b4f74f14cf5c28b0c
-MISC ChangeLog 2389 SHA256 0106115ae19d20ea34cceb0689bb243841f779b9bb56cc7bac8c27c959e71c79 SHA512 d680b37b8d7ef74219f41cba3390ab92a800e99d6d98d7974f725169392c8615f6000cac1ffa287925f7a9ed0cd3b3e597faa83f111f528ae13457cb68b6cb54 WHIRLPOOL 90beba1228269cd975faccae82decee4d4ba24584313ae91451d599cfe2d9142924d1e19b81bdbdca023997fac58177974d99267e9a8eb8d6cb64e388d3b9d40
+EBUILD mariadb-galera-10.0.20.ebuild 4511 SHA256 d1ffac65b90bf586ab6dd5616fc760fbbbc04bca33caf59f3b6aefb06123f5b5 SHA512 ee2035502c67e1cab3687b33bd5d924725248f9a5e089a9436c737b174ae7937765c582aba6cb086e744e8116e31dc93aeebb7e92b78f2c6002847fd2a6b356c WHIRLPOOL 9c5ec02f550e918f9324827aee20b55560113c7a887d7a7d004446eda1e56032627d96dc481ed57795241b9e3bbfa166a7f8b07af64aee2a313653850efe7832
+MISC ChangeLog 2525 SHA256 49f81a4e150fc2546304cd52532f702fb5fd162216812d89462bfe0cff02f656 SHA512 132965da23ed6fab6a4b648400b4e275499f23b4b862967be37ded9de81f08d4ac627aa496b9b2d6431790889401ca91b9e1727e6b2f0ecf8301a4fadf12983b WHIRLPOOL f9cf10c2b90b4476f3a841e05ea62d1d7920faef8cc284e69cb169639b54441e20e9e12476b776038ba4b1e33347000bdeecd1ed3a6645999d080080d0b02d21
 MISC metadata.xml 1521 SHA256 9f2d38d33ed259f180c31db48b43bed4b4d123d2d204735813ac999a708478a7 SHA512 a232dd0d0926b501f79ed4748ef9aa7f01d5513d4f10cb286f8948cc5a4cdc266f1ae122f0a3631e56f3929648a3c6a4d7c56ea3cf11d05c73f8bdf458508e60 WHIRLPOOL db1d1697a97ab0de1b34c4b8c24e65866d460c2cb430b1f44ef91a2f6ddeb8ff9cd4b3d268aed4e1e1ad76ea9fa63e33c4dc2a33ccf8f79ca67933c468675c02
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVWkbkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ7BAEBCABmBQJVkXuVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2mAEQANxOEDPp40Y6VPMtcr4GDNSH
-jJqGHVQYa8QnAWvoFtY9W5XAvtxRrTHbAumk+bD0w8YpFXniPdNG9rPxeQODBq2F
-tLiJ2E1Z7kqxIr0PNFNY05qYmdZfHeUrK7rsI8s+WZWAX3kKzDLrKC0ZbLUusgax
-kSFzcisVVCRHGdmiJueES76pwea8KNcVKUGGypPAa0Ubw2wNg0BW5YTF1rUEdd6b
-BI9I4vXmJN/AIFbvxP4GrpUpR0YT6pSXaO6ttwGfMgw8gzQEoNEeWKSXZMxHlUNP
-8ENjwdQx7SANrXe0DFP1R2E+A2BQI5XIwtP+T6OvKhtP2KAiaPh6Ilij/m84cC/5
-+nXzqYxd3Ljsx07POUxqtX376C4qzC+oNUKgY17G6T7optidc11T3joN6EB1PqZd
-BDfer7WjTKHkvD/jew4Xonud67380RVqMU78txAMGwD6JiIGrfs7c/ZydAyBWk2u
-BSVkpOCRek5E+bZnP9W6M+UKz1En9R0TzFsnC1hPqF77QyExwGoP7+Kg5M246P/b
-DR6O87TQX1xl2FYa2BU4yZ0PyrlKhofPWQ1mWeAKobtrD2Rpf/5mM5yRWj1byRW9
-awRjZlcVEbrUovOawgwEhBWsg8Ci3RSnWhTpF9pRblZ9itD8ZsARDAc+dRaGjbI9
-1lXpfCF/r7T0WRGD0tvy
-=G3wI
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2My0P+LpzDfu1XlllYC+P9B7fyOqu
+5WXmvC5uxDeSyw77MVPNN6FESSGwUrbcZeXPkMJGPN/OcL7DjoTBq2oRxwQBeNKA
+cdZJ8B3aSESnO12JJ5Vn9WRNwzh8fVqR0BFzWRF9/esnjfUNsrJ6P7lJxD2xeQEl
+FbyptS4XHE9LkmvnoxeTG3vOtk1pAKZKEVkzgrGENmY/kawgHnaU4U0qy4s2UPtX
+oCLXU/6ZbXxoznCd07NICggs2kn5riPk/CFDBY8n5gtJbby/KeXG/SGnXAPv6cj6
+npNzMLM7blaDok95Y2OcOg2RTtkEp4hWmvI2IJRmpgBTSqSfnLvDQCJWcOlggvMz
+kgIG+WLmoK7V1VRdKSenPgw6jks/afzqyFedf7n5LjwzeJCJvl7QaQYWTtUm20+F
+b/CUj2ShVtFuQ2jOzv3R08WnFgtYqhA5LUvDSpDzOaX9ZYy9YWEyh9LtdUKa7d8h
+/aHF4G36I2TvClZbe16TAoWLnJu+Z0PM9VOyFbnw5JHLLLyrxneSF9P3X/YXcoUl
+Lxn7/DIp7gBGVr3npPEUzIZRHEFh2LOqX5lKqvrtqjfW3NSUwDAIMiOsdcBePKIB
+JUwb65UqochIoPF1V+qlD1WNlmQoBngoFmV37BVhnKK/KOavAZha9WRAo+0XSdQV
+JYrjyWL54j673QRC6xg=
+=N1d6
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.20.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.20.ebuild
new file mode 100644
index 000000000000..71b4908c209c
--- /dev/null
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.20.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 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.20.ebuild,v 1.1 2015/06/29 17:06:14 grknight Exp $
+
+EAPI="5"
+MY_EXTRAS_VER="20141215-0144Z"
+WSREP_REVISION="25"
+
+inherit toolchain-funcs mysql-multilib
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~x86"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# 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
+
+# Official test instructions:
+# USE='embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-galera-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, main.bootstrap
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# wsrep.variables:
+		# Expects the sys-cluster/galera library to be installed and configured
+		#
+		# wsrep.foreign_key:
+		# Issues a configuration deprecation warning which does not affect data
+		#
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			main.mysql_client_test_comp main.bootstrap \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help wsrep.variables wsrep.foreign_key \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		# The PATH addition is required for the galera suite to find the sst scripts
+		# Skipping galera tests for now until MDEV-7544 is resovled
+		WSREP_LOG_DIR="${T}/var-tests/wsrep" \
+		PATH="${BUILD_DIR}/scripts:${PATH}" \
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --skip-test=galera
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $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"
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}