[gentoo-commits] proj/mysql:master commit in: dev-db/percona-server/

[Brian Evans]

commit:     3fe5e4a98305448370ffe741e56c9564d3cc0a51
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 29 20:33:56 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Aug 29 20:33:56 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3fe5e4a9

[percona-server] Version bump.  Needs tests reran before committing to tree.

---
 dev-db/percona-server/Manifest                     |  2 ++
 ....0.ebuild => percona-server-5.6.20.68.0.ebuild} | 30 +++++++++++-----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 36de275..79addb2 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,3 +1,5 @@
 DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256 28363c7ba1893677911451e7f05402a31afc0ed0a48ea1b7cf1915ae1be81e20 SHA512 d90e104b3e73af5589eb32ddbcf9098ad9d69898b55d4d662ebc9578f0281e87fef6b5adb6cdc33fa19a04bf066e01121ead2e6a2bffa0d44ffc10b895392a1c WHIRLPOOL 531a9e08f9231bfcd758bbe8d5b6d5968bd2cfce9c70bc8c15517f497606322da7cffbecd77a0cabd837c3c0ba4f2381a569d583f2fa5ecb14e95a367a93ee11
+DIST mysql-extras-20140817-2331Z.tar.bz2 1494554 SHA256 c2e338b4e6933d87696cf8c15b5c17e41c0227c05cb123ef2c84e78f26b04b0a SHA512 40a181eabbc112d0408883cf280cc14fc694d971601c35c34b8d6bde6f931aab3f909952676a23457773a5d015f17d57d7b409818ff8569a4b8977638ed80456 WHIRLPOOL 24d74c5be9514b59b18673777aa24f358c7ce4f2daddf23598eb910ca05baa22631849c406c581a864ebd0836b56a7f5ff69bf7377c2dae9d21e96c670ed0e3e
 DIST percona-server-5.5.38-35.2.tar.gz 22946764 SHA256 2726d8443a4e87e1a1f11c56dfcd1aa79a5a2ff8cbff9f229c8589cdedbf031d SHA512 5813736a4b0a74d20f1fbce9a30b0000023c55c3e7d5c300608d2b0445568c2034c77f3d97951503cc9d568aa0eea2516bb459b0a2d9a0ea161da561c0aaf3fb WHIRLPOOL 25b1680f7a8c1b8290fc7a9a2a0fb0556f88591da108d6b524f6ae18da7c6e155cf1c03516a2234529eba0f454715b88302495c53ce793e9823485e1ccbc31e9
 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

diff --git a/dev-db/percona-server/percona-server-5.6.19.67.0.ebuild b/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild
similarity index 87%
rename from dev-db/percona-server/percona-server-5.6.19.67.0.ebuild
rename to dev-db/percona-server/percona-server-5.6.20.68.0.ebuild
index 61e03c3..e8b8d56 100644
--- a/dev-db/percona-server/percona-server-5.6.19.67.0.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild
@@ -3,21 +3,12 @@
 # $Header: $
 
 EAPI="5"
+MY_EXTRAS_VER="20140817-2331Z"
 
-MY_EXTRAS_VER="20140729-2200Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
+inherit toolchain-funcs mysql-multilib
 # only to make repoman happy. it is really set in the eclass
 IUSE="$IUSE"
 
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
 
@@ -32,11 +23,16 @@ RDEPEND="${RDEPEND}"
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
 # Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# USE='embedded extraengine perl ssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild percona-server-X.X.XX.ebuild \
 # digest clean package
-src_test() {
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
 
 	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
 	local retstatus_unit
@@ -63,6 +59,10 @@ src_test() {
 
 		# 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 "${S}"/mysql-test/var-tests{,/log}
@@ -93,7 +93,7 @@ src_test() {
 			funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
 			main.variables main.myisam main.merge_recover \
 			main.percona_bug1289599; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		# Run mysql tests
@@ -104,7 +104,7 @@ src_test() {
 
 		# run mysql-test tests
 		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--testcase-timeout=30 --parallel=auto
+			--testcase-timeout=30
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"