[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-galera/

["Brian Evans" <grknight@gentoo.org>]

commit:     ca58b73af9bee23fea6d30a7ab70cd4f7026e471
Author:     layman <layman <AT> localhost>
AuthorDate: Wed Jun 10 17:33:20 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 17:33:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ca58b73a

Version bump; drop old

Package-Manager: portage-2.2.20
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mariadb-galera/ChangeLog                    |   6 +
 dev-db/mariadb-galera/Manifest                     |  33 ++---
 .../mariadb-galera/mariadb-galera-10.0.16.ebuild   | 137 ---------------------
 ...0.0.17.ebuild => mariadb-galera-10.0.19.ebuild} |   6 +-
 4 files changed, 26 insertions(+), 156 deletions(-)

diff --git a/dev-db/mariadb-galera/ChangeLog b/dev-db/mariadb-galera/ChangeLog
index 253e815..2e7607c 100644
--- a/dev-db/mariadb-galera/ChangeLog
+++ b/dev-db/mariadb-galera/ChangeLog
@@ -1,3 +1,9 @@
+*mariadb-galera-10.0.19 (10 Jun 2015)
+
+  10 Jun 2015; Brian Evans <grknight@gentoo.org> +mariadb-galera-10.0.19.ebuild,
+  -mariadb-galera-10.0.16.ebuild, -mariadb-galera-10.0.17.ebuild:
+  Version bump; drop old
+
 *mariadb-galera-10.0.17 (03 Apr 2015)
 
   03 Apr 2015; Brian Evans <grknight@gentoo.org> +mariadb-galera-10.0.17.ebuild:

diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index a97c780..75d40e6 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST mariadb-galera-10.0.16.tar.gz 55886236 SHA256 c730c6dbeee4e2985a8db9dc15a6b6e8e64db14cef1442ee5f6732d2754ed9fb SHA512 2a3fcb79bd32420b4b69118825ed4c954fcf7d1fd2358159687bc90157aef9e440d24209ffa71887029b66adca14f439f08d3edfdcee431b9d8bc49a9c7e6762 WHIRLPOOL 60c27680e8ba91f174cb9827e9def0760e8e388f4f072e9d8b71b102a57f2e141dc6cdd66604ad802512ad24855af9216ab4d87718f30c1ff599b3222b44d31c
-DIST mariadb-galera-10.0.17.tar.gz 56229230 SHA256 6ee9595630c0ddd498afe086953cbf7430aec48fe429230f8615627881897c6d SHA512 ee9e437d03b62f8416847ceb2843bb40110aa904ce4c8ae53e4fff95ae60871859128436a644e995ba1f62271c9c0f42efccda095747a9658e811367670ec2b6 WHIRLPOOL fe08438e96b87dc569d3b790147ee11c0af0394f56fdeb31230db3ed6d8dd1b58ad6e145fd636bd1574060b99b3736cf14a8a886980ef054d8f6e6a331c6c7cd
+DIST mariadb-galera-10.0.19.tar.gz 56520261 SHA256 df5c0e8ff2db0dbf2490c52f5d9b509216e2d89bf6d340920aad2b41d4d1ae75 SHA512 9acba0d851c8bdfe0b28e3ec3dc9a21a41c8f283322d73a3c05ac10b9e9400302b9e6fe47d0d5ef73307254af715bc3ed144acaa325ce6c78841ddd14ee754c7 WHIRLPOOL 2c60ee6a82e8f6effed3b376a7647f0bc804de633d770bb215f37774bd7cd1f38b0ef173b68ec3f3eab9f59ffee77cb05668159873a5ebd863d0d96735f39edb
 DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJVHodBAAoJENH3ge/59KO2+s4QAKtQPWKEtR7rbSwSbHeXM+1M
-AblY3ugnq5QMIIsaoqr+Ss4V+C/dQkvQ6JoE2g4qY2YGyZszBGLYCvnRfCnpCfu8
-D6AH4E+eOhgj2Sp3y3u+ztVwGAlvfpxsfl5E2ezeiEDYHdwDnOhLD9yMQ+NRntnl
-F/2AJTvB7J4yUsRP+BPtA/fRqViBJeD+QLEAnqREwJNY85QhzI3arpQtK+sPDafw
-snXMChFDgUbvhU15VplpE+ttUqYmnfVkCa5ErI37PlINLZ/DbfvwbG+Ll2+BDsm3
-pPOVLNSHS2slvMXTzVh+cOF+4JFM0piWIBI2dV6igaHhjtD/oaQZ2WmLAfV5tUJs
-AT+SbW9Skb26TCI11FdmwWEByDmpfYrbpA488B9J/Dd8s/P3kI39qy53cZArYYqO
-bYEujYXfSjToanYewcVOeMivH5ihdgoWTpPo00NGJJH3HtKSCmV6Jq04YEO67B+c
-KnTAA7qEcZZ+dYshcYzRJ6AdfgnR8Pzmsec7vL/3Xk23ijKiG3I4RPBdUUGhLUwe
-GdwepyiQEbQNNkNq+/5bDe5z7neOiiTDzX1iTGJ8xLlDNdj/Mfdt6sMo78BA+Rxh
-EULfQBWEmxDY+FOe7UnXcszj5G1Pv3TL1qCIvAQZiloKngyZprFuXCkNQCYmB9oR
-ri3kRuni7cBWeH0wUjPE
-=bWdI
+iQJ8BAEBCABmBQJVeHTbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2ZvUQAMOSbnTMqHLmglDOZMrRyCbo
+FcYoazg8rEeQaGCsi3SXl53h3zpAkdDBlf2ngPTldUOaoxcsGEM/Ge8a8YWMqnZ0
+2PEF/wofWKFX6DhWovaLRhb3Z5FnKb0hL1oL2bTPiJv63A95fHfW2t7i93wPQKXt
++DoFU6pRw+Det7CiPBXMZwkPRH7GBlbok7LswWvDSDVBEol9GuRDpU0sU4630L6k
+4hRqknyHg1QHlZGAlGLT7wDBslCB1+OqxH/cnIW6ep9PTl5eEedt56neFlLqd34w
+0JQejxFKV3ZUAt6BvRnONq2IaxxEsujc1iTSwMp2nPQp2CNJC7Wr/pIgciZf0rUc
+utcArE3+IuWPESNSOkfCsnBeEeMRSgzpxCkNCEwiiUfCfuE49iGaJUCbezUPi41b
+XF/KKpw2CMr67NeOxqJ2eTAYYc1Mk96InYu/lokAt0dCRfbsnhhp8FbAmA5iJWVO
+BtOBF3vvX6eKVgKae/Ktkxl6L0ES2yfcLX75FkrQbe0dEVAlvDz1y1aoKJD7QvrV
+Fl5JJne6EYmoinDmlkIUVUkcqsgdkpy/NLp5aceWrr73EbY2/62Ni1VryMEY0AmG
+E2+mnlQkCMV/pwIKBSMcPYsB4Bi5Pay6XAlRXbNWARM6uI/qCcunaKe8HfqfdONH
++oUxEUEYtRI15Uw6R/Cg
+=pSAR
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild
deleted file mode 100644
index 0d6812f..0000000
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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.16.ebuild,v 1.1 2015/02/06 14:07:36 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='-cluster 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))"
-		# 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
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock
-		# mina.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 \
-			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
-
-		for t in rpl.rpl_heartbeat_ssl rpl.rpl_ssl rpl.rpl_ssl1 main.ssl_cipher \
-			main.ssl_8k_key main.openssl_6975 main.openssl_1 main.ssl main.ssl_compress \
-			main.ssl_connect; do
-			mysql-multilib_disable_test "$t" "Disabled due to expired certificate"
-		done
-
-		for t in wsrep.binlog_format wsrep.pool_of_threads wsrep.mdev_6832 ; do
-			mysql-multilib_disable_test "$t" "Skipped for MDEV-7544"
-		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/mariadb-galera-10.0.17.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild
similarity index 95%
rename from dev-db/mariadb-galera/mariadb-galera-10.0.17.ebuild
rename to dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild
index 73404c6..3b972ef 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.17.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild,v 1.1 2015/05/18 20:07:51 grknight Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20141215-0144Z"
@@ -73,7 +73,7 @@ multilib_src_test() {
 		#
 		# 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
+		# funcs_1.is_columns_mysql, main.bootstrap
 		# fails due to USE=-latin1 / utf8 default
 		#
 		# main.mysql_client_test, main.mysql_client_test_nonblock
@@ -88,7 +88,7 @@ multilib_src_test() {
 		#
 
 		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			main.mysql_client_test_comp \
+			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