Revbumps for new mysql packaging splitting client and server

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

4 files changed, 166 insertions, 18 deletions

diff --git a/dev-db/mariadb-galera/ChangeLog b/dev-db/mariadb-galera/ChangeLog
index 28b447334488..73f2230b789c 100644
--- a/dev-db/mariadb-galera/ChangeLog
+++ b/dev-db/mariadb-galera/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2015/06/29 17:06:14 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/ChangeLog,v 1.17 2015/07/28 02:26:22 grknight Exp $
+
+*mariadb-galera-10.0.20-r1 (28 Jul 2015)
+
+  28 Jul 2015; Brian Evans <grknight@gentoo.org>
+  +mariadb-galera-10.0.20-r1.ebuild, metadata.xml:
+  Revbumps for new mysql packaging splitting client and server
 
 *mariadb-galera-10.0.20 (29 Jun 2015)
 
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index d14873e5be63..8e02110d8e9a 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -6,26 +6,28 @@ AUX my.cnf-5.6 5259 SHA256 ce22f1829abad1770614b161ad86a01007458f1080332aaa9f1ed
 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
+DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
 EBUILD mariadb-galera-10.0.19.ebuild 4511 SHA256 0635d16ee891d12dc5dbbde316d17321e23e202be17fd5e62e58f933d8bdd822 SHA512 88d65f197887471d22130d205ab7fe59ba102ba1fab6814a09aa6583dfa231feeb8627175845a6cd49cb8ed37e1fe02d1368b59761fbcb24c8af82843ddc3521 WHIRLPOOL 5b239d62bd9b7d14f9a1e71650ccdd24e75e6e69d4cc357a2f5bcde4c9023bc3e061492902df12546806a92b08bab3a3156d4ae86e09ba4b4f74f14cf5c28b0c
+EBUILD mariadb-galera-10.0.20-r1.ebuild 4913 SHA256 28d1a187ca7ff1d1e50d06a21fa501ec857dfd47923398c574acc03e1e14acf9 SHA512 f8f8d588d7480ec509c8d706c6cdddf70d1d10dd5d13412552e06a03c37ac3edded4c9b0d558adb43db88986c70221cabf4bd1bf4afbfe0cbe77fa4ebfd2d5b0 WHIRLPOOL 9f4e7d947f91f4fcf14d571a36ae5a4fb96725bad5b4399b4a7d301770347e3d82e1e8a23239561109283887ad79968d1b815e6b0a6c02f83e094d039576c510
 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
+MISC ChangeLog 2731 SHA256 3c6b2f3f6424f3d27bd3a8e96303e02a265a93e386f7b783243d2c417a6979b2 SHA512 cbdeb596fdf2a22b6e3bc4344a29ecfa939de2a9a175ee9a9c57cbaca988494cddb67d71a4dfeff3a848c2f4e7bfbda1c3fe4982f8a5005484d9b01377efdd79 WHIRLPOOL 3d2ce00f9a4546e2064b6375cac1fc3538ca8ee6dfc2cbb324e18b948ab824da0aedd4cf8543bf2017773c9e385fe3f0fa5c51afbe2101acc9334ca8f89d15af
+MISC metadata.xml 1737 SHA256 8cdb67a57c2e7ed4ff1765024bc4f39e3821a054b539931cc8ace41f2a684d35 SHA512 b888c83c131a06d8031e9081ac072d53680649d83a7616af46c1a57ee80f3880220bff44409562f276b4c62adbf9fa495c3ce9b9106e92be5f0cf8c5ebecc495 WHIRLPOOL 3dfee51057736d9679be490aee5633c03367a3598475844fc265ba6c511f7768cb5d19ac4758dfdfe6357350965c079fbd7135e4f42b6d744f78cc957a2d7ad6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ7BAEBCABmBQJVkXuVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVtuhPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-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
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2eDgP/A9oAb6OxiSjMSwa4tmPIme2
+XBoHd5CXGLtlN1rxsWOgQkpMCR90kGNRUSjMLot5QoyONO0tvRSXvyd7tUcS114X
+V+IV1LKm2t0DML/1oWoemeJxMr3rdN+Tw4pc+iTRXy+E0Kt9yzs/6A20igBQBx8o
+ilOpaemd4N0KdTcxt/KBLbsrEIp2HkOXwxHXSoS/Ux9cyHFUhDmr/HS5WdRoVLEQ
+Tn5rZGJpTLbpJl6CS+tHp4j0/J4tggh4CxY6/PnsK1MSelwvyB3emwQ3ljpX0WBv
+1QiU2/WjDACsZDMB5OHQNhAlgeDNs6L9EvgwLJAXdiNaJtpzmFJnqiN4ll1IfNKZ
+m6MNTYLUeW0GKMY843UZO3XjapCqTlWfBOBl7XAeIq8GuCN9e7SQkjkotcuQGH3t
+AJAdAL/qNtuDrrVhnGj5b0GpEkrvx/IF2/mIHD9C0NVPwoEAPjYDlaJW9W/YefKu
+LpWnq5g1/Z2o2nXJ4nD4q/nhInh8Vy3zva47EGF6FSRVFwr69qiqxbSL/NywL36E
+E5dC/pJcUuWxYeZR0sqa34EQ1/JdOLR9Sls7j4AT7a+Usgu6Ys6h4bSJGiMDWupM
+w1h8UzxiCZvDX0Ib6WJKweq1WOZ9a3eldjTEjuWzF27ePiazPJaXZKJjsg/YYhxW
+f7xPAxfqhcM4l0XMin86
+=QToS
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.20-r1.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.20-r1.ebuild
new file mode 100644
index 000000000000..33e9659999e6
--- /dev/null
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.20-r1.ebuild
@@ -0,0 +1,137 @@
+# 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-r1.ebuild,v 1.1 2015/07/28 02:26:22 grknight Exp $
+
+EAPI="5"
+MY_EXTRAS_VER="20150717-1707Z"
+WSREP_REVISION="25"
+HAS_TOOLS_PATCH="1"
+SUBSLOT="18"
+
+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 server ; 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}
+
+		# Create a symlink to provided binaries so the tests can find them when client-libs is off
+		if ! use client-libs ; then
+			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
+			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
+			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
+		fi
+
+		# 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
+}
diff --git a/dev-db/mariadb-galera/metadata.xml b/dev-db/mariadb-galera/metadata.xml
index 7c8bf6edc4ec..e0a0598ce6ff 100644
--- a/dev-db/mariadb-galera/metadata.xml
+++ b/dev-db/mariadb-galera/metadata.xml
@@ -8,6 +8,7 @@ dev-db/mysql
 dev-db/mariadb
 -->
 <use>
+  <flag name='client-libs'>Build the libmysqlclient libraries</flag>
   <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
   <flag name='community'>Enables the community features from upstream.</flag>
   <flag name='embedded'>Build embedded server (libmysqld)</flag>
@@ -17,11 +18,13 @@ dev-db/mariadb
   <flag name='minimal'>Install client programs only, no server</flag>
   <flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
   <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
+  <flag name='server'>Build the server program</flag>
   <flag name='sst-rsync'>Add tools needed to support the rsync SST method</flag>
   <flag name='sst-xtrabackup'>Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
   <flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
   <flag name='test'>Install upstream testsuites for end use.</flag>
   <flag name='tokudb'>Add support for TokuDB storage engine</flag>
+  <flag name='tools'>Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
 </use>
 </pkgmetadata>