public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-02-17  3:15 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-02-17  3:15 UTC (permalink / raw
  To: gentoo-commits

commit:     0beb0358d2903503a68b04b6f305512317159686
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 17 03:13:37 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 03:13:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0beb0358

Bumped mysql to the 5.0.92 release.
This version is still breaking on a missing #endif at sql/sql_parse.cc.

---
 dev-db/mysql/ChangeLog           |    9 ++-
 dev-db/mysql/Manifest            |    4 +-
 dev-db/mysql/mysql-5.0.92.ebuild |  198 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 209 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 60e6131..79ee0cc 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for dev-db/mysql
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.0.92 (17 Feb 2011)
+
+  17 Feb 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.0.92.ebuild:
+  Bumped mysql to the 5.0.92 release.
+  This version is still breaking on a missing #endif at sql/sql_parse.cc.
+
   28 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.53-r1.ebuild:
   Add ~mips per main tree.
 

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index f867114..488c36b 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -4,6 +4,7 @@ AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc799
 AUX my.cnf-5.1 4199 RMD160 c12797534dd8273d1640844b4813ec7307911cef SHA1 5845dcaf469bd95d918cc07b1ffc80e2bd4c5a68 SHA256 c50e38004c901d4921d00a5f458bcd191852262a93f3d9fbfb6b040186b1ec45
 AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12
 DIST mysql-5.0.91.tar.gz 22340514 RMD160 3aaa638172f6916d3698c5421b24a01647f7e9db SHA1 14a79138a1296ce6ebb681fceba622d870feba3e SHA256 4669abf059bcf97c2fc1f3ce678e83f738ffe2299bd893e1a3d31afbc682c754
+DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 SHA1 10fffc7672a469af4a7fd980922b04d7ba0143ba SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55
 DIST mysql-5.1.50.tar.gz 23750564 RMD160 5f4b6ac445ee386bb3004f0c27607283d011da3c SHA1 fb5982fb73bb2eb0494615352a7510f75114c6d9 SHA256 e7137e65173f8f2a08be3f52def494bb2d268291e9c9bd98eb363772e58a6de8
 DIST mysql-5.1.51.tar.gz 23830456 RMD160 033fc88fba226caf2ec6a34ac3875deab3006f42 SHA1 45aa05a6a70d67b379272ec19ad3023230c94079 SHA256 39d962222f068c426d4616950f0e8451d947a132f0c42af17a2fc8b3b5a42882
 DIST mysql-5.1.52.tar.gz 23841760 RMD160 5809c7a5932a014fe412ddc5b9f15632c7367c27 SHA1 5ed4a3c12662b0329df870f4dcebea6903e94265 SHA256 b1c458b68aaf7b7745453c27b615ffc59cd213453ee78bc6b477b0f40df83917
@@ -14,6 +15,7 @@ DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
 EBUILD mysql-5.0.91.ebuild 6584 RMD160 2ebe1c33a183cfe20271771299eb9bb99ac2dd2d SHA1 29876213c5b917a4df42714c1094488a667e2e5b SHA256 4d565d0e0bd94aeca8c974ca12bdd9d9ff41bba35f239fe2099d4c85d1043fdb
+EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
 EBUILD mysql-5.1.50-r2.ebuild 8611 RMD160 2de3cec5ea88f8fcae48947519695bbad413e583 SHA1 bed507a5c4905e5316aded5fd16d5a56684cab94 SHA256 6d0b32efd9331923632b9e34c6210352d911e88a5a0db724609e85a485595f66
 EBUILD mysql-5.1.50-r3.ebuild 8525 RMD160 ede9ce50cd557df5651b655f4703bc9a444ab0da SHA1 5138082d8f4f1ce1eff652e69d6df76ad431a715 SHA256 1c7fd983581113197b456f4261c72cf0d6ee3658e0ab3869080194a47dcd9a9b
 EBUILD mysql-5.1.51-r1.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf80441 SHA1 4cf3312866227c0943326d42f17d2c010a71ea92 SHA256 f12785c65871d19a3988283f3a03b8b1b6562e7564d42eeb8c6f213d88205a5d
@@ -21,5 +23,5 @@ EBUILD mysql-5.1.51.ebuild 8535 RMD160 5ba70e7adcd64e12e82eb535626c62e0bfd037d9
 EBUILD mysql-5.1.52-r2.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf80441 SHA1 4cf3312866227c0943326d42f17d2c010a71ea92 SHA256 f12785c65871d19a3988283f3a03b8b1b6562e7564d42eeb8c6f213d88205a5d
 EBUILD mysql-5.1.53-r1.ebuild 8605 RMD160 48dc76fceda6b3d78c2eeb615e5b988cb8fb8dd4 SHA1 11546673524f53b852ecd89c768c628c2a7f2c97 SHA256 9cec68559741bf8c40252aae7366f637da863b91f19f21454f07e58f11c48c82
 EBUILD mysql-5.5.4_alpha_pre3.ebuild 6903 RMD160 dd85e75069e59ae77f5fccdd9fff994aaeb06899 SHA1 8a0f91a49b63681f428beb589512924d347cc643 SHA256 25cf50e56a99318309cd9f51d86695018d957dec53e7ef5eda7e9d2a3233d086
-MISC ChangeLog 3617 RMD160 86597feed0ffe4f16a9805fa48bf210446ed1b8b SHA1 4fe5a2183185381e14aa62a209244a1e43a14daf SHA256 838349c04b281de5afd528fa7659a8b1405f94608c55fec8e6878341781ee071
+MISC ChangeLog 3850 RMD160 dd70e610e6a0c7ebba50d3938bb89462b443c858 SHA1 2f1f30af90b1a6f0896a3ff00dee7008199970db SHA256 2dcd57dfaafff30655ed97b6677eec82e31b9218d8a9955ae9bf7ad5742ccb67
 MISC metadata.xml 1216 RMD160 02f8b2bd126a9336cddb83f3f9e811d4129688cc SHA1 5adf0187c051f9e9f79e3148cf0a074f5230060d SHA256 1eff466af9a3c635bfe480c6c6fd37c8cc87251285f0a5b3f2b7661a18ee5574

diff --git a/dev-db/mysql/mysql-5.0.92.ebuild b/dev-db/mysql/mysql-5.0.92.ebuild
new file mode 100644
index 0000000..7906c6c
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.92.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.90-r1.ebuild,v 1.1 2010/01/31 06:20:28 robbat2 Exp $
+
+MY_EXTRAS_VER="live"
+EAPI=2
+# 5.0.91 tarball has wrong version number in the directory.
+#MY_SOURCEDIR='mysql-5.0.90'
+
+inherit toolchain-funcs mysql
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# 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-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+# 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=""
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect ; do \
+					mysql_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.0 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		case ${PV} in
+			5.0.*)
+			for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do
+				mysql_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		case $PV in
+			5.0.91)
+			for t in archive archive_gis archive-big \
+				federated_archive mysqldump-max \
+				; do
+					mysql_disable_test $t "Broken in 5.0.91"
+				done
+			;;
+		esac
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-04-21 12:14 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2011-04-21 12:14 UTC (permalink / raw
  To: gentoo-commits

commit:     f14c4003a255d928040be893aebc98b9f3fa5a7f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 01:26:59 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 01:26:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f14c4003

Make a release of 5.1.56 using the old eclass.

(Portage version: 2.2.0_alpha29/git/Linux x86_64, unsigned Manifest commit)

---
 dev-db/mysql/ChangeLog                             |    6 ++++++
 dev-db/mysql/Manifest                              |    5 +++--
 ...{mysql-5.1.56.ebuild => mysql-5.1.56-r1.ebuild} |    0
 dev-db/mysql/mysql-5.1.56.ebuild                   |    4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index f756071..54ebb2c 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.1.56-r1 (18 Apr 2011)
+
+  18 Apr 2011; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.56.ebuild,
+  +mysql-5.1.56-r1.ebuild:
+  Make a release of 5.1.56 using the old eclass.
+
 *mysql-5.1.56 (28 Mar 2011)
 
   28 Mar 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index a76baf5..e8e05e5 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -24,8 +24,9 @@ EBUILD mysql-5.1.51-r1.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf804
 EBUILD mysql-5.1.51.ebuild 8535 RMD160 5ba70e7adcd64e12e82eb535626c62e0bfd037d9 SHA1 ff6b3977d1ef7d5478e252a2674f9f9908152fc6 SHA256 ec064ac9c531c81debdebdba0d82e5d9e60658313fd384afc411a11f54bb603b
 EBUILD mysql-5.1.52-r2.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf80441 SHA1 4cf3312866227c0943326d42f17d2c010a71ea92 SHA256 f12785c65871d19a3988283f3a03b8b1b6562e7564d42eeb8c6f213d88205a5d
 EBUILD mysql-5.1.53-r1.ebuild 8605 RMD160 48dc76fceda6b3d78c2eeb615e5b988cb8fb8dd4 SHA1 11546673524f53b852ecd89c768c628c2a7f2c97 SHA256 9cec68559741bf8c40252aae7366f637da863b91f19f21454f07e58f11c48c82
-EBUILD mysql-5.1.56.ebuild 8656 RMD160 1a6373b692f1d05d43e9762cc31cecbe3af47cb2 SHA1 cc4854bf71a9a9f9d45c92bdeffbe03f8e50cdff SHA256 2b0ce97fbaabab178a578db4656d5d6286a90259bd25de17bdd3c483ef5a2892
+EBUILD mysql-5.1.56-r1.ebuild 8656 RMD160 1a6373b692f1d05d43e9762cc31cecbe3af47cb2 SHA1 cc4854bf71a9a9f9d45c92bdeffbe03f8e50cdff SHA256 2b0ce97fbaabab178a578db4656d5d6286a90259bd25de17bdd3c483ef5a2892
+EBUILD mysql-5.1.56.ebuild 8650 RMD160 fdc41e801bdeedaebe03d966a81770738eeb3729 SHA1 da50c1ec2b881b0e9916fc32259cd466910377fc SHA256 0babf53aa040c4668a0acdca3246b55b6bfa078c25098507f44624fa73d11e16
 EBUILD mysql-5.5.10.ebuild 3094 RMD160 d5c858a6306ce8a9014d96c4576cb98515c5d877 SHA1 5954233017a1ad62ab076c9efc5896225a57ed27 SHA256 4cdf16465343f86cea98bcd9457eab60dd826491b46d641a54c3e71c6dbe52a5
 EBUILD mysql-5.5.4_alpha_pre3.ebuild 6903 RMD160 dd85e75069e59ae77f5fccdd9fff994aaeb06899 SHA1 8a0f91a49b63681f428beb589512924d347cc643 SHA256 25cf50e56a99318309cd9f51d86695018d957dec53e7ef5eda7e9d2a3233d086
-MISC ChangeLog 4755 RMD160 4008c773c0e239dc5b2f19a440eb4a800df01e2b SHA1 5311fe6fba62c3d28ade01af27ef83a547878f99 SHA256 49f79a8e3fe26d52a5e3e034531c09ad92cf488775fc4e919dd83c4136f54c59
+MISC ChangeLog 4938 RMD160 3e267aeb69b06b030d8172a3f952c8890ed376b3 SHA1 bb5363bd74a0cf9bb8658f76f1ee047fd937c142 SHA256 02bc159bf295406779c220881d94cde8f4335f0aa665df3e734d3f309b86b251
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2

diff --git a/dev-db/mysql/mysql-5.1.56.ebuild b/dev-db/mysql/mysql-5.1.56-r1.ebuild
similarity index 100%
copy from dev-db/mysql/mysql-5.1.56.ebuild
copy to dev-db/mysql/mysql-5.1.56-r1.ebuild

diff --git a/dev-db/mysql/mysql-5.1.56.ebuild b/dev-db/mysql/mysql-5.1.56.ebuild
index dbc6ce3..7a88bb1 100644
--- a/dev-db/mysql/mysql-5.1.56.ebuild
+++ b/dev-db/mysql/mysql-5.1.56.ebuild
@@ -13,7 +13,7 @@ PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
 # Build type
 BUILD="autotools"
 
-inherit toolchain-funcs mysql-v2
+inherit toolchain-funcs mysql
 
 # only to make repoman happy. it is really set in the eclass
 IUSE="$IUSE"
@@ -37,7 +37,7 @@ src_prepare() {
 	sed -i \
 		-e '/^noinst_PROGRAMS/s/basic-t//g' \
 		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
+	mysql_src_prepare
 }
 
 # Official test instructions:



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-05-11  2:30 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-05-11  2:30 UTC (permalink / raw
  To: gentoo-commits

commit:     8937ae7d70d65d5fdd26fd2ef80545eee406ee5a
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 02:20:54 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed May 11 02:23:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8937ae7d

Bumped mysql to the 5.1.57 and 5.5.12 releases.

---
 dev-db/mysql/ChangeLog           |    7 +
 dev-db/mysql/Manifest            |    6 +-
 dev-db/mysql/mysql-5.1.57.ebuild |  261 ++++++++++++++++++++++++++++++++++++++
 dev-db/mysql/mysql-5.5.12.ebuild |   97 ++++++++++++++
 4 files changed, 370 insertions(+), 1 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 54ebb2c..e25e5f9 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.5.12 (11 May 2011)
+*mysql-5.1.57 (11 May 2011)
+
+  11 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.1.57.ebuild, +mysql-5.5.12.ebuild:
+  Bumped mysql to the 5.1.57 and 5.5.12 releases.
+
 *mysql-5.1.56-r1 (18 Apr 2011)
 
   18 Apr 2011; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.56.ebuild,

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index e8e05e5..c6ef406 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -10,7 +10,9 @@ DIST mysql-5.1.51.tar.gz 23830456 RMD160 033fc88fba226caf2ec6a34ac3875deab3006f4
 DIST mysql-5.1.52.tar.gz 23841760 RMD160 5809c7a5932a014fe412ddc5b9f15632c7367c27 SHA1 5ed4a3c12662b0329df870f4dcebea6903e94265 SHA256 b1c458b68aaf7b7745453c27b615ffc59cd213453ee78bc6b477b0f40df83917
 DIST mysql-5.1.53.tar.gz 23871815 RMD160 e8fd69450dda85cf3f41269e6e3fca05caccc76d SHA1 24064a4c0f8b88b30acb6ddb03f32e897ef061f3 SHA256 d68c0db580bb514bb1759d4c69dc71ceb0e3573ac88a1025111bdd8f89e234a4
 DIST mysql-5.1.56.tar.gz 24795624 RMD160 c2ff6eb06d0797d4b56630b783d4ad2d1add1422 SHA1 8665c76ab4ab36e8d2379ddf6d678c89b95d9321 SHA256 930e731c8f9318aa3f5e2e6985f6776aaaec81cd32df310e79e73d87177f6613
+DIST mysql-5.1.57.tar.gz 23660514 RMD160 9ca7f79d14525fef2c1badf8410fecd238ee283e SHA1 fcfe037ee6cfd53fe336ef12854e79481bdc6681 SHA256 7944fa56476f44173af4c91ad685a9da5e9d5fa9dea69dafb4b9919df3f3667d
 DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5
+DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
 DIST mysql-5.5.4-m3.tar.gz 22761869 RMD160 502f5d4731abae86fa280f657a51bf3a9567e8a4 SHA1 5ea4e6a0385569654ab3e45ab0137ca16637594d SHA256 d1c45dd628593c6f872b234a28889bf249bdc872c4f4e3c91afff8ebda18e764
 DIST mysql-extras-20100201-0104Z.tar.bz2 933785 RMD160 7780fcc370d2eb8e48993aaeba480e2ec7785c14 SHA1 ce098829243327c5941a9864a9e0632ae5cee418 SHA256 d06f7d2e6920576392adf0fa544931aa6dcecf45060dac4968ea8d88e84c2f70
 DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb68961d3ffaff0755 SHA1 c1633295abb7f3d2ff463938f85e1bc8ed708b4f SHA256 a42c4988a25113bef5cc727fb24c994502f4d02469246ff839f8ea2a08c07bb7
@@ -26,7 +28,9 @@ EBUILD mysql-5.1.52-r2.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf804
 EBUILD mysql-5.1.53-r1.ebuild 8605 RMD160 48dc76fceda6b3d78c2eeb615e5b988cb8fb8dd4 SHA1 11546673524f53b852ecd89c768c628c2a7f2c97 SHA256 9cec68559741bf8c40252aae7366f637da863b91f19f21454f07e58f11c48c82
 EBUILD mysql-5.1.56-r1.ebuild 8656 RMD160 1a6373b692f1d05d43e9762cc31cecbe3af47cb2 SHA1 cc4854bf71a9a9f9d45c92bdeffbe03f8e50cdff SHA256 2b0ce97fbaabab178a578db4656d5d6286a90259bd25de17bdd3c483ef5a2892
 EBUILD mysql-5.1.56.ebuild 8650 RMD160 fdc41e801bdeedaebe03d966a81770738eeb3729 SHA1 da50c1ec2b881b0e9916fc32259cd466910377fc SHA256 0babf53aa040c4668a0acdca3246b55b6bfa078c25098507f44624fa73d11e16
+EBUILD mysql-5.1.57.ebuild 8661 RMD160 389ae8fe05c684b56f920a330978d5143df36c39 SHA1 999062efdfb546f3c00c6e514975c99d8209789a SHA256 45bf833d8c1d216ffdf54047910ac569cef49055b8dc32ee242578cfc41ad13d
 EBUILD mysql-5.5.10.ebuild 3094 RMD160 d5c858a6306ce8a9014d96c4576cb98515c5d877 SHA1 5954233017a1ad62ab076c9efc5896225a57ed27 SHA256 4cdf16465343f86cea98bcd9457eab60dd826491b46d641a54c3e71c6dbe52a5
+EBUILD mysql-5.5.12.ebuild 3094 RMD160 d5c858a6306ce8a9014d96c4576cb98515c5d877 SHA1 5954233017a1ad62ab076c9efc5896225a57ed27 SHA256 4cdf16465343f86cea98bcd9457eab60dd826491b46d641a54c3e71c6dbe52a5
 EBUILD mysql-5.5.4_alpha_pre3.ebuild 6903 RMD160 dd85e75069e59ae77f5fccdd9fff994aaeb06899 SHA1 8a0f91a49b63681f428beb589512924d347cc643 SHA256 25cf50e56a99318309cd9f51d86695018d957dec53e7ef5eda7e9d2a3233d086
-MISC ChangeLog 4938 RMD160 3e267aeb69b06b030d8172a3f952c8890ed376b3 SHA1 bb5363bd74a0cf9bb8658f76f1ee047fd937c142 SHA256 02bc159bf295406779c220881d94cde8f4335f0aa665df3e734d3f309b86b251
+MISC ChangeLog 5159 RMD160 ced9c748bff72cad260b6e725bd4fc44e2f9f691 SHA1 68de30863b8e5b60c3a9694c19e2539aaef47f52 SHA256 2e2f7222959a8b4ed2834d0a8cc2c1e2755e0c63205874e450dcebc38e51fd53
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2

diff --git a/dev-db/mysql/mysql-5.1.57.ebuild b/dev-db/mysql/mysql-5.1.57.ebuild
new file mode 100644
index 0000000..6ac2e2e
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.57.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.56.ebuild,v 1.4 2011/05/08 22:07:33 hwoarang Exp $
+
+EAPI="2"
+
+MY_EXTRAS_VER="live"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		# bug 332565
+		if ! use extraengine ; then
+			for t in main.range ; do
+				mysql_disable_test $t "Test $t requires USE=extraengine"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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/mysql/mysql-5.5.12.ebuild b/dev-db/mysql/mysql-5.5.12.ebuild
new file mode 100644
index 0000000..f8cb7ae
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.12.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+
+EAPI="2"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-05-15 23:07 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-05-15 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     154eb15bd08e90e061f3106caa8efe250588e0f5
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 23:02:22 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun May 15 23:02:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=154eb15b

Dropping old versions.

---
 dev-db/mysql/ChangeLog                     |    6 +
 dev-db/mysql/Manifest                      |   18 +--
 dev-db/mysql/mysql-5.0.91.ebuild           |  198 ---------------------
 dev-db/mysql/mysql-5.1.50-r2.ebuild        |  255 ---------------------------
 dev-db/mysql/mysql-5.1.50-r3.ebuild        |  254 ---------------------------
 dev-db/mysql/mysql-5.1.51-r1.ebuild        |  257 ----------------------------
 dev-db/mysql/mysql-5.1.51.ebuild           |  254 ---------------------------
 dev-db/mysql/mysql-5.1.52-r2.ebuild        |  257 ----------------------------
 dev-db/mysql/mysql-5.1.53-r1.ebuild        |  257 ----------------------------
 dev-db/mysql/mysql-5.5.4_alpha_pre3.ebuild |  201 ----------------------
 10 files changed, 7 insertions(+), 1950 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index e25e5f9..5f18bde 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -mysql-5.0.91.ebuild, -mysql-5.1.50-r2.ebuild, -mysql-5.1.50-r3.ebuild,
+  -mysql-5.1.51.ebuild, -mysql-5.1.51-r1.ebuild, -mysql-5.1.52-r2.ebuild,
+  -mysql-5.1.53-r1.ebuild, -mysql-5.5.4_alpha_pre3.ebuild:
+  Dropping old versions.
+
 *mysql-5.5.12 (11 May 2011)
 *mysql-5.1.57 (11 May 2011)
 

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index c6ef406..fb80bd9 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,34 +3,18 @@ AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f25
 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
 AUX my.cnf-5.1 4199 RMD160 c12797534dd8273d1640844b4813ec7307911cef SHA1 5845dcaf469bd95d918cc07b1ffc80e2bd4c5a68 SHA256 c50e38004c901d4921d00a5f458bcd191852262a93f3d9fbfb6b040186b1ec45
 AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12
-DIST mysql-5.0.91.tar.gz 22340514 RMD160 3aaa638172f6916d3698c5421b24a01647f7e9db SHA1 14a79138a1296ce6ebb681fceba622d870feba3e SHA256 4669abf059bcf97c2fc1f3ce678e83f738ffe2299bd893e1a3d31afbc682c754
 DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 SHA1 10fffc7672a469af4a7fd980922b04d7ba0143ba SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55
-DIST mysql-5.1.50.tar.gz 23750564 RMD160 5f4b6ac445ee386bb3004f0c27607283d011da3c SHA1 fb5982fb73bb2eb0494615352a7510f75114c6d9 SHA256 e7137e65173f8f2a08be3f52def494bb2d268291e9c9bd98eb363772e58a6de8
-DIST mysql-5.1.51.tar.gz 23830456 RMD160 033fc88fba226caf2ec6a34ac3875deab3006f42 SHA1 45aa05a6a70d67b379272ec19ad3023230c94079 SHA256 39d962222f068c426d4616950f0e8451d947a132f0c42af17a2fc8b3b5a42882
-DIST mysql-5.1.52.tar.gz 23841760 RMD160 5809c7a5932a014fe412ddc5b9f15632c7367c27 SHA1 5ed4a3c12662b0329df870f4dcebea6903e94265 SHA256 b1c458b68aaf7b7745453c27b615ffc59cd213453ee78bc6b477b0f40df83917
-DIST mysql-5.1.53.tar.gz 23871815 RMD160 e8fd69450dda85cf3f41269e6e3fca05caccc76d SHA1 24064a4c0f8b88b30acb6ddb03f32e897ef061f3 SHA256 d68c0db580bb514bb1759d4c69dc71ceb0e3573ac88a1025111bdd8f89e234a4
 DIST mysql-5.1.56.tar.gz 24795624 RMD160 c2ff6eb06d0797d4b56630b783d4ad2d1add1422 SHA1 8665c76ab4ab36e8d2379ddf6d678c89b95d9321 SHA256 930e731c8f9318aa3f5e2e6985f6776aaaec81cd32df310e79e73d87177f6613
 DIST mysql-5.1.57.tar.gz 23660514 RMD160 9ca7f79d14525fef2c1badf8410fecd238ee283e SHA1 fcfe037ee6cfd53fe336ef12854e79481bdc6681 SHA256 7944fa56476f44173af4c91ad685a9da5e9d5fa9dea69dafb4b9919df3f3667d
 DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5
 DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
-DIST mysql-5.5.4-m3.tar.gz 22761869 RMD160 502f5d4731abae86fa280f657a51bf3a9567e8a4 SHA1 5ea4e6a0385569654ab3e45ab0137ca16637594d SHA256 d1c45dd628593c6f872b234a28889bf249bdc872c4f4e3c91afff8ebda18e764
-DIST mysql-extras-20100201-0104Z.tar.bz2 933785 RMD160 7780fcc370d2eb8e48993aaeba480e2ec7785c14 SHA1 ce098829243327c5941a9864a9e0632ae5cee418 SHA256 d06f7d2e6920576392adf0fa544931aa6dcecf45060dac4968ea8d88e84c2f70
-DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb68961d3ffaff0755 SHA1 c1633295abb7f3d2ff463938f85e1bc8ed708b4f SHA256 a42c4988a25113bef5cc727fb24c994502f4d02469246ff839f8ea2a08c07bb7
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
-EBUILD mysql-5.0.91.ebuild 6584 RMD160 2ebe1c33a183cfe20271771299eb9bb99ac2dd2d SHA1 29876213c5b917a4df42714c1094488a667e2e5b SHA256 4d565d0e0bd94aeca8c974ca12bdd9d9ff41bba35f239fe2099d4c85d1043fdb
 EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
-EBUILD mysql-5.1.50-r2.ebuild 8611 RMD160 2de3cec5ea88f8fcae48947519695bbad413e583 SHA1 bed507a5c4905e5316aded5fd16d5a56684cab94 SHA256 6d0b32efd9331923632b9e34c6210352d911e88a5a0db724609e85a485595f66
-EBUILD mysql-5.1.50-r3.ebuild 8525 RMD160 ede9ce50cd557df5651b655f4703bc9a444ab0da SHA1 5138082d8f4f1ce1eff652e69d6df76ad431a715 SHA256 1c7fd983581113197b456f4261c72cf0d6ee3658e0ab3869080194a47dcd9a9b
-EBUILD mysql-5.1.51-r1.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf80441 SHA1 4cf3312866227c0943326d42f17d2c010a71ea92 SHA256 f12785c65871d19a3988283f3a03b8b1b6562e7564d42eeb8c6f213d88205a5d
-EBUILD mysql-5.1.51.ebuild 8535 RMD160 5ba70e7adcd64e12e82eb535626c62e0bfd037d9 SHA1 ff6b3977d1ef7d5478e252a2674f9f9908152fc6 SHA256 ec064ac9c531c81debdebdba0d82e5d9e60658313fd384afc411a11f54bb603b
-EBUILD mysql-5.1.52-r2.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f94abf80441 SHA1 4cf3312866227c0943326d42f17d2c010a71ea92 SHA256 f12785c65871d19a3988283f3a03b8b1b6562e7564d42eeb8c6f213d88205a5d
-EBUILD mysql-5.1.53-r1.ebuild 8605 RMD160 48dc76fceda6b3d78c2eeb615e5b988cb8fb8dd4 SHA1 11546673524f53b852ecd89c768c628c2a7f2c97 SHA256 9cec68559741bf8c40252aae7366f637da863b91f19f21454f07e58f11c48c82
 EBUILD mysql-5.1.56-r1.ebuild 8656 RMD160 1a6373b692f1d05d43e9762cc31cecbe3af47cb2 SHA1 cc4854bf71a9a9f9d45c92bdeffbe03f8e50cdff SHA256 2b0ce97fbaabab178a578db4656d5d6286a90259bd25de17bdd3c483ef5a2892
 EBUILD mysql-5.1.56.ebuild 8650 RMD160 fdc41e801bdeedaebe03d966a81770738eeb3729 SHA1 da50c1ec2b881b0e9916fc32259cd466910377fc SHA256 0babf53aa040c4668a0acdca3246b55b6bfa078c25098507f44624fa73d11e16
 EBUILD mysql-5.1.57.ebuild 8661 RMD160 389ae8fe05c684b56f920a330978d5143df36c39 SHA1 999062efdfb546f3c00c6e514975c99d8209789a SHA256 45bf833d8c1d216ffdf54047910ac569cef49055b8dc32ee242578cfc41ad13d
 EBUILD mysql-5.5.10.ebuild 3094 RMD160 d5c858a6306ce8a9014d96c4576cb98515c5d877 SHA1 5954233017a1ad62ab076c9efc5896225a57ed27 SHA256 4cdf16465343f86cea98bcd9457eab60dd826491b46d641a54c3e71c6dbe52a5
 EBUILD mysql-5.5.12.ebuild 3094 RMD160 d5c858a6306ce8a9014d96c4576cb98515c5d877 SHA1 5954233017a1ad62ab076c9efc5896225a57ed27 SHA256 4cdf16465343f86cea98bcd9457eab60dd826491b46d641a54c3e71c6dbe52a5
-EBUILD mysql-5.5.4_alpha_pre3.ebuild 6903 RMD160 dd85e75069e59ae77f5fccdd9fff994aaeb06899 SHA1 8a0f91a49b63681f428beb589512924d347cc643 SHA256 25cf50e56a99318309cd9f51d86695018d957dec53e7ef5eda7e9d2a3233d086
-MISC ChangeLog 5159 RMD160 ced9c748bff72cad260b6e725bd4fc44e2f9f691 SHA1 68de30863b8e5b60c3a9694c19e2539aaef47f52 SHA256 2e2f7222959a8b4ed2834d0a8cc2c1e2755e0c63205874e450dcebc38e51fd53
+MISC ChangeLog 5459 RMD160 0ee3a3ee620f2f438eef7af871ae7e3010943b4d SHA1 f1d7b4ceea6d9077b1ff9fe9524ab8e9d252b4f0 SHA256 d2ee958d2dcf475b6d93fec11e228b37804a707f77af8cc02b0c2ff2df1d5fa0
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2

diff --git a/dev-db/mysql/mysql-5.0.91.ebuild b/dev-db/mysql/mysql-5.0.91.ebuild
deleted file mode 100644
index 1d16c84..0000000
--- a/dev-db/mysql/mysql-5.0.91.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.90-r1.ebuild,v 1.1 2010/01/31 06:20:28 robbat2 Exp $
-
-MY_EXTRAS_VER="live"
-EAPI=2
-# 5.0.91 tarball has wrong version number in the directory.
-#MY_SOURCEDIR='mysql-5.0.90'
-
-inherit toolchain-funcs mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# 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-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-# 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=""
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.0 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		case ${PV} in
-			5.0.*)
-			for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		case $PV in
-			5.0.91)
-			for t in archive archive_gis archive-big \
-				federated_archive mysqldump-max \
-				; do
-					mysql_disable_test $t "Broken in 5.0.91"
-				done
-			;;
-		esac
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.50-r2.ebuild b/dev-db/mysql/mysql-5.1.50-r2.ebuild
deleted file mode 100644
index a4cadbd..0000000
--- a/dev-db/mysql/mysql-5.1.50-r2.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-MY_EXTRAS_VER="live"
-EAPI=2
-
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-inherit toolchain-funcs mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.50.patch'
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# 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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# bug 332565
-		if ! use extraengine ; then
-			for t in main.range ; do
-				mysql_disable_test $t "Test $t requires USE=extraengine"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.50-r3.ebuild b/dev-db/mysql/mysql-5.1.50-r3.ebuild
deleted file mode 100644
index d0d37b3..0000000
--- a/dev-db/mysql/mysql-5.1.50-r3.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-MY_EXTRAS_VER="live"
-EAPI=2
-
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-inherit toolchain-funcs mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-
-# 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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# bug 332565
-		if ! use extraengine ; then
-			for t in main.range ; do
-				mysql_disable_test $t "Test $t requires USE=extraengine"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.51-r1.ebuild b/dev-db/mysql/mysql-5.1.51-r1.ebuild
deleted file mode 100644
index 09fb59c..0000000
--- a/dev-db/mysql/mysql-5.1.51-r1.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-MY_EXTRAS_VER="live"
-EAPI=2
-
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-inherit toolchain-funcs mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-RDEPEND=""
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-
-# 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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# bug 332565
-		if ! use extraengine ; then
-			for t in main.range ; do
-				mysql_disable_test $t "Test $t requires USE=extraengine"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.51.ebuild b/dev-db/mysql/mysql-5.1.51.ebuild
deleted file mode 100644
index 562a626..0000000
--- a/dev-db/mysql/mysql-5.1.51.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-MY_EXTRAS_VER="20101006-0004Z"
-EAPI=2
-
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-inherit toolchain-funcs mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-
-# 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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# bug 332565
-		if ! use extraengine ; then
-			for t in main.range ; do
-				mysql_disable_test $t "Test $t requires USE=extraengine"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.52-r2.ebuild b/dev-db/mysql/mysql-5.1.52-r2.ebuild
deleted file mode 100644
index 09fb59c..0000000
--- a/dev-db/mysql/mysql-5.1.52-r2.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-MY_EXTRAS_VER="live"
-EAPI=2
-
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-inherit toolchain-funcs mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-RDEPEND=""
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-
-# 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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# bug 332565
-		if ! use extraengine ; then
-			for t in main.range ; do
-				mysql_disable_test $t "Test $t requires USE=extraengine"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.53-r1.ebuild b/dev-db/mysql/mysql-5.1.53-r1.ebuild
deleted file mode 100644
index 90e69cc..0000000
--- a/dev-db/mysql/mysql-5.1.53-r1.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-MY_EXTRAS_VER="live"
-EAPI=2
-
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-inherit toolchain-funcs mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-RDEPEND=""
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-
-# 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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# bug 332565
-		if ! use extraengine ; then
-			for t in main.range ; do
-				mysql_disable_test $t "Test $t requires USE=extraengine"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.5.4_alpha_pre3.ebuild b/dev-db/mysql/mysql-5.5.4_alpha_pre3.ebuild
deleted file mode 100644
index f7b533f..0000000
--- a/dev-db/mysql/mysql-5.5.4_alpha_pre3.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-MY_EXTRAS_VER="20100201-0104Z"
-EAPI=2
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-inherit toolchain-funcs mysql
-# 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"
-
-# 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="!media-sound/amarok[embedded]"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		make -j1 test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		make -j1 test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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
-}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-05-16  2:14 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-05-16  2:14 UTC (permalink / raw
  To: gentoo-commits

commit:     71a17c0d02014a30b878537d70a33593347db73f
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 02:09:38 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon May 16 02:09:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=71a17c0d

Disable tests that fail for mysql-5.5.*:
3 tests fail for latin/utf-8 charsets and 1 causes segmentation faults.

---
 dev-db/mysql/ChangeLog           |    5 +++++
 dev-db/mysql/Manifest            |    6 +++---
 dev-db/mysql/mysql-5.5.10.ebuild |   22 ++++++++++++++++++++++
 dev-db/mysql/mysql-5.5.12.ebuild |   22 ++++++++++++++++++++++
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 5f18bde..784e1bf 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.5.10.ebuild, mysql-5.5.12.ebuild:
+  Disable tests that fail for mysql-5.5.*:
+  3 tests fail for latin/utf-8 charsets and 1 causes segmentation faults.
+
   15 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   -mysql-5.0.91.ebuild, -mysql-5.1.50-r2.ebuild, -mysql-5.1.50-r3.ebuild,
   -mysql-5.1.51.ebuild, -mysql-5.1.51-r1.ebuild, -mysql-5.1.52-r2.ebuild,

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index fb80bd9..ffdc5f3 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -14,7 +14,7 @@ EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65
 EBUILD mysql-5.1.56-r1.ebuild 8656 RMD160 1a6373b692f1d05d43e9762cc31cecbe3af47cb2 SHA1 cc4854bf71a9a9f9d45c92bdeffbe03f8e50cdff SHA256 2b0ce97fbaabab178a578db4656d5d6286a90259bd25de17bdd3c483ef5a2892
 EBUILD mysql-5.1.56.ebuild 8650 RMD160 fdc41e801bdeedaebe03d966a81770738eeb3729 SHA1 da50c1ec2b881b0e9916fc32259cd466910377fc SHA256 0babf53aa040c4668a0acdca3246b55b6bfa078c25098507f44624fa73d11e16
 EBUILD mysql-5.1.57.ebuild 8661 RMD160 389ae8fe05c684b56f920a330978d5143df36c39 SHA1 999062efdfb546f3c00c6e514975c99d8209789a SHA256 45bf833d8c1d216ffdf54047910ac569cef49055b8dc32ee242578cfc41ad13d
-EBUILD mysql-5.5.10.ebuild 3094 RMD160 d5c858a6306ce8a9014d96c4576cb98515c5d877 SHA1 5954233017a1ad62ab076c9efc5896225a57ed27 SHA256 4cdf16465343f86cea98bcd9457eab60dd826491b46d641a54c3e71c6dbe52a5
-EBUILD mysql-5.5.12.ebuild 3094 RMD160 d5c858a6306ce8a9014d96c4576cb98515c5d877 SHA1 5954233017a1ad62ab076c9efc5896225a57ed27 SHA256 4cdf16465343f86cea98bcd9457eab60dd826491b46d641a54c3e71c6dbe52a5
-MISC ChangeLog 5459 RMD160 0ee3a3ee620f2f438eef7af871ae7e3010943b4d SHA1 f1d7b4ceea6d9077b1ff9fe9524ab8e9d252b4f0 SHA256 d2ee958d2dcf475b6d93fec11e228b37804a707f77af8cc02b0c2ff2df1d5fa0
+EBUILD mysql-5.5.10.ebuild 3851 RMD160 0669d516beb601a9e5cb0c547313c59df948e5bd SHA1 0bd4b3c3a8af1536facd946f935e4f3b8f729fd4 SHA256 1d4d3da66938ce91a705e9979e9be8d7ebc038c42077a11c0df66fed92ce10c3
+EBUILD mysql-5.5.12.ebuild 3851 RMD160 0669d516beb601a9e5cb0c547313c59df948e5bd SHA1 0bd4b3c3a8af1536facd946f935e4f3b8f729fd4 SHA256 1d4d3da66938ce91a705e9979e9be8d7ebc038c42077a11c0df66fed92ce10c3
+MISC ChangeLog 5688 RMD160 394fcba24ae36409e2ee7dcb8d815921f3f526e0 SHA1 2bbad54f9caeb59dec0540384bfdc7dc18fffcea SHA256 886198434de8ee6f8655d8cb4f08daaa86426ac2a363f2ed573ba8397bfcd545
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2

diff --git a/dev-db/mysql/mysql-5.5.10.ebuild b/dev-db/mysql/mysql-5.5.10.ebuild
index f8cb7ae..26a3261 100644
--- a/dev-db/mysql/mysql-5.5.10.ebuild
+++ b/dev-db/mysql/mysql-5.5.10.ebuild
@@ -67,6 +67,28 @@ src_test() {
 		# create directories because mysqladmin might right out of order
 		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
 
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		for t in main.mysql_client_test \
+			binlog_statement_insert_delayed.reject main.information_schema \
+			main.mysqld--help-notwin; do
+				mysql_disable_test  "$t" "False positives in Gentoo"
+		done
+
 		# Run mysql tests
 		pushd "${TESTDIR}"
 

diff --git a/dev-db/mysql/mysql-5.5.12.ebuild b/dev-db/mysql/mysql-5.5.12.ebuild
index f8cb7ae..26a3261 100644
--- a/dev-db/mysql/mysql-5.5.12.ebuild
+++ b/dev-db/mysql/mysql-5.5.12.ebuild
@@ -67,6 +67,28 @@ src_test() {
 		# create directories because mysqladmin might right out of order
 		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
 
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		for t in main.mysql_client_test \
+			binlog_statement_insert_delayed.reject main.information_schema \
+			main.mysqld--help-notwin; do
+				mysql_disable_test  "$t" "False positives in Gentoo"
+		done
+
 		# Run mysql tests
 		pushd "${TESTDIR}"
 



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-05-16 15:35 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-05-16 15:35 UTC (permalink / raw
  To: gentoo-commits

commit:     3e6975b9c13b1e46d83581d9e1198b4ed1ef7f2a
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 15:31:03 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon May 16 15:31:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3e6975b9

Really disable binlog.binlog_statement_insert_delayed test.

---
 dev-db/mysql/ChangeLog           |    4 ++++
 dev-db/mysql/Manifest            |    6 +++---
 dev-db/mysql/mysql-5.5.10.ebuild |    2 +-
 dev-db/mysql/mysql-5.5.12.ebuild |    2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 784e1bf..ce63aa9 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -4,6 +4,10 @@
 
   16 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   mysql-5.5.10.ebuild, mysql-5.5.12.ebuild:
+  Really disable binlog.binlog_statement_insert_delayed test. 
+
+  16 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.5.10.ebuild, mysql-5.5.12.ebuild:
   Disable tests that fail for mysql-5.5.*:
   3 tests fail for latin/utf-8 charsets and 1 causes segmentation faults.
 

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index ffdc5f3..26e9334 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -14,7 +14,7 @@ EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65
 EBUILD mysql-5.1.56-r1.ebuild 8656 RMD160 1a6373b692f1d05d43e9762cc31cecbe3af47cb2 SHA1 cc4854bf71a9a9f9d45c92bdeffbe03f8e50cdff SHA256 2b0ce97fbaabab178a578db4656d5d6286a90259bd25de17bdd3c483ef5a2892
 EBUILD mysql-5.1.56.ebuild 8650 RMD160 fdc41e801bdeedaebe03d966a81770738eeb3729 SHA1 da50c1ec2b881b0e9916fc32259cd466910377fc SHA256 0babf53aa040c4668a0acdca3246b55b6bfa078c25098507f44624fa73d11e16
 EBUILD mysql-5.1.57.ebuild 8661 RMD160 389ae8fe05c684b56f920a330978d5143df36c39 SHA1 999062efdfb546f3c00c6e514975c99d8209789a SHA256 45bf833d8c1d216ffdf54047910ac569cef49055b8dc32ee242578cfc41ad13d
-EBUILD mysql-5.5.10.ebuild 3851 RMD160 0669d516beb601a9e5cb0c547313c59df948e5bd SHA1 0bd4b3c3a8af1536facd946f935e4f3b8f729fd4 SHA256 1d4d3da66938ce91a705e9979e9be8d7ebc038c42077a11c0df66fed92ce10c3
-EBUILD mysql-5.5.12.ebuild 3851 RMD160 0669d516beb601a9e5cb0c547313c59df948e5bd SHA1 0bd4b3c3a8af1536facd946f935e4f3b8f729fd4 SHA256 1d4d3da66938ce91a705e9979e9be8d7ebc038c42077a11c0df66fed92ce10c3
-MISC ChangeLog 5688 RMD160 394fcba24ae36409e2ee7dcb8d815921f3f526e0 SHA1 2bbad54f9caeb59dec0540384bfdc7dc18fffcea SHA256 886198434de8ee6f8655d8cb4f08daaa86426ac2a363f2ed573ba8397bfcd545
+EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
+EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
+MISC ChangeLog 5863 RMD160 7b2602f70a92db94e3f5bfea21d92da7a7b09ad6 SHA1 4d80edf8353cc2b92b0df2e395c474802aefb520 SHA256 74e8f2f08fc5279c4590d3376d25292ba21f5f964ab6bd58932c196175a4f717
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2

diff --git a/dev-db/mysql/mysql-5.5.10.ebuild b/dev-db/mysql/mysql-5.5.10.ebuild
index 26a3261..2fa37b6 100644
--- a/dev-db/mysql/mysql-5.5.10.ebuild
+++ b/dev-db/mysql/mysql-5.5.10.ebuild
@@ -84,7 +84,7 @@ src_test() {
 		# main.flush_read_lock_kill
 		# fails because of unknown system variable 'DEBUG_SYNC'
 		for t in main.mysql_client_test \
-			binlog_statement_insert_delayed.reject main.information_schema \
+			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwin; do
 				mysql_disable_test  "$t" "False positives in Gentoo"
 		done

diff --git a/dev-db/mysql/mysql-5.5.12.ebuild b/dev-db/mysql/mysql-5.5.12.ebuild
index 26a3261..2fa37b6 100644
--- a/dev-db/mysql/mysql-5.5.12.ebuild
+++ b/dev-db/mysql/mysql-5.5.12.ebuild
@@ -84,7 +84,7 @@ src_test() {
 		# main.flush_read_lock_kill
 		# fails because of unknown system variable 'DEBUG_SYNC'
 		for t in main.mysql_client_test \
-			binlog_statement_insert_delayed.reject main.information_schema \
+			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwin; do
 				mysql_disable_test  "$t" "False positives in Gentoo"
 		done



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-05-18 19:28 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-05-18 19:28 UTC (permalink / raw
  To: gentoo-commits

commit:     fa9bc80e51898535f5232e06e39347bd5e64667f
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 19:21:07 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed May 18 19:21:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=fa9bc80e

Update mysql-v2 eclass to use the git-2 eclass.
Update the mysql-5.1.57 ebuild to use the mysql-v2 eclass.

(Portage version: 2.2.0_alpha34/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 dev-db/mysql/ChangeLog           |    5 +++++
 dev-db/mysql/Manifest            |   24 ++++++++++++++++++++++--
 dev-db/mysql/mysql-5.1.57.ebuild |    2 +-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index ce63aa9..5ef15e1 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.1.57.ebuild:
+  Update mysql-v2 eclass to use the git-2 eclass.
+  Update the mysql-5.1.57 ebuild to use the mysql-v2 eclass.
+
   16 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   mysql-5.5.10.ebuild, mysql-5.5.12.ebuild:
   Really disable binlog.binlog_statement_insert_delayed test. 

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 26e9334..7925ecc 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
@@ -13,8 +16,25 @@ DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711
 EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
 EBUILD mysql-5.1.56-r1.ebuild 8656 RMD160 1a6373b692f1d05d43e9762cc31cecbe3af47cb2 SHA1 cc4854bf71a9a9f9d45c92bdeffbe03f8e50cdff SHA256 2b0ce97fbaabab178a578db4656d5d6286a90259bd25de17bdd3c483ef5a2892
 EBUILD mysql-5.1.56.ebuild 8650 RMD160 fdc41e801bdeedaebe03d966a81770738eeb3729 SHA1 da50c1ec2b881b0e9916fc32259cd466910377fc SHA256 0babf53aa040c4668a0acdca3246b55b6bfa078c25098507f44624fa73d11e16
-EBUILD mysql-5.1.57.ebuild 8661 RMD160 389ae8fe05c684b56f920a330978d5143df36c39 SHA1 999062efdfb546f3c00c6e514975c99d8209789a SHA256 45bf833d8c1d216ffdf54047910ac569cef49055b8dc32ee242578cfc41ad13d
+EBUILD mysql-5.1.57.ebuild 8664 RMD160 ef5e19caa8dfdf04f82ca9aa6aa48d417e37d1ae SHA1 784c4f03a87e72255b2aaa2d9332ed8601824aa0 SHA256 3f5e7f58893be3cb5f997be4681a713c194e026b8cc53e5d6ab9878cc62d1219
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-MISC ChangeLog 5863 RMD160 7b2602f70a92db94e3f5bfea21d92da7a7b09ad6 SHA1 4d80edf8353cc2b92b0df2e395c474802aefb520 SHA256 74e8f2f08fc5279c4590d3376d25292ba21f5f964ab6bd58932c196175a4f717
+MISC ChangeLog 6065 RMD160 95779b300845c38a2573e8fa17f7322f19732630 SHA1 ec4ab909266a4b8fdfd8d1506b601ede4c8267e3 SHA256 c8dedfca95d419ccd6221da8baf7745ee28f09f1d05505854f78f6a7f5283a68
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJN1BwjAAoJEC8ZTXQF1qEPIK8P/0DyjU1pXjHTDYpsrJ7Qg3gt
+0sNDsPJAlB+7+pgXT78X93PMupdLtNGzBOETxTHNLRg8gnEh9LhSEtWSIZMsbR47
+PH+5V+KPZ6iCvjdrU7oKP1eTaKnz8SqOsw5xUUCoEmc4WwdWGp/YrPWftpkLQlY8
+bpUdRmwosh4baBHhUA7wnzFrqaf9yBsTsoF/QiSm3AvFeiOTqGa3deZDSSoog19V
+xBBtniD+npNb3bi3Y/iGQKb/erWUVkIGXaujP3Mv+wV9EB/jP6N1e1sVcs1hSGPL
++ys46jdmyPPnpzLfcfI/r+csE9mSixZfHaXF0sZ7YsVgiDUbo8wCdsy/fJTFaeJZ
+RQ5R0hebNOIsi3YuxGhYnuhyB+J7kX8y0QlS/Vnbu1244S/r4hdJilgb62rF64Lg
+a/J8q0k6FxbXUMHGKABDu/4cw/w4/L4S6j1IpT7V+59NHt/KunTdd3heqvZjr4uR
+e3Pq0Jqmmkgip8ZbT2oVdrO0L9EAAjXOyphVtGmgNSzbvHukeGO3g0eBtkZPARn+
+AcZiMTa9Y6GwUjhL05pbveCdgQJtWY1ZtIUvjZKxycrcF76DDEoh8uUefhQRgtkO
+Cw8C+C86xvkmvO0I2hwd78VAShc93tAIQU60w7i2ieP6M94E64k3JA6o00UX5/QH
+eyw3wbw7yFMwGKGs7FHB
+=ui9C
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.1.57.ebuild b/dev-db/mysql/mysql-5.1.57.ebuild
index 6ac2e2e..1f72a5b 100644
--- a/dev-db/mysql/mysql-5.1.57.ebuild
+++ b/dev-db/mysql/mysql-5.1.57.ebuild
@@ -13,7 +13,7 @@ PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
 # Build type
 BUILD="autotools"
 
-inherit toolchain-funcs mysql
+inherit toolchain-funcs mysql-v2
 
 # only to make repoman happy. it is really set in the eclass
 IUSE="$IUSE"



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-07-13  2:14 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-07-13  2:14 UTC (permalink / raw
  To: gentoo-commits

commit:     1a3bb4725223fae2b4027c4a124770a80d7e7209
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 12:28:49 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 12:28:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1a3bb472

[dev-db/mysql] 5.5.14 version bump.

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 dev-db/mysql/Manifest            |   30 +++++-----
 dev-db/mysql/mysql-5.5.14.ebuild |  120 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+), 14 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 187c2e6..b7c4cb4 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
@@ -12,6 +12,7 @@ DIST mysql-5.1.57.tar.gz 23660514 RMD160 9ca7f79d14525fef2c1badf8410fecd238ee283
 DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5
 DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
 DIST mysql-5.5.13.tar.gz 23709591 RMD160 5e249f533be51a8cb6d777edf630ecd82f5e68a0 SHA1 ccfb58c87e045e6679b442c6230cac222e73f740 SHA256 f05c5df8c53f85b094f415298eb8a7969e403604abc5a3b18ddd0e70e8b1d936
+DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
@@ -22,23 +23,24 @@ EBUILD mysql-5.1.57.ebuild 8664 RMD160 ef5e19caa8dfdf04f82ca9aa6aa48d417e37d1ae
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.13.ebuild 3909 RMD160 4b336f52f648a079c39b6602bcb4fbb3b3bd7b77 SHA1 5278dfe3d80a9a10c37dc0c2232aef7559eda27d SHA256 95f321d2c7f8627c49013ebba62a96ffcb3a89dce4b396d69b55680ced13b602
+EBUILD mysql-5.5.14.ebuild 3909 RMD160 4b336f52f648a079c39b6602bcb4fbb3b3bd7b77 SHA1 5278dfe3d80a9a10c37dc0c2232aef7559eda27d SHA256 95f321d2c7f8627c49013ebba62a96ffcb3a89dce4b396d69b55680ced13b602
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 MISC ChangeLog 6065 RMD160 95779b300845c38a2573e8fa17f7322f19732630 SHA1 ec4ab909266a4b8fdfd8d1506b601ede4c8267e3 SHA256 c8dedfca95d419ccd6221da8baf7745ee28f09f1d05505854f78f6a7f5283a68
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN9s7BAAoJEC8ZTXQF1qEP+04QAKq2lFZBVkdz5MikV9w5ZEZp
-p0g3ydgCMMM4rXs6ga0uqOfds7ooNjpBN29PgScQCl7iUgkp7CHayQtqLbnXIM8d
-IqYpZMA8B7IYZZCWrh9HyQKE3JNc6D/6s9Pw4pkOgxFr15GXfP7SPjKMDszhiPDo
-EFov3Iwr5Q45vQ+i0Y6OJ3GiD4vvV6vPau9W7UNx6I72oINdw8jjlopr4BhSC12g
-Hm0YpITt8UxkYCpjYa4e0QtozZO5osLaBsVYK2q6uTdyS7hbDjnonewcSxLithUq
-N2GsyiE2CKlZIjdstDmSyyJyOpjyGmREXHPyuqHt68zgqxPKBClU/SsSCnCmkV6B
-T2pjYQJnxOuTk3JVa/4vTlDDhRKAUCPxFXMwZ6WRCbsdS8+00etx07RqQel9qVb2
-gNtWA1n9nW3TdSnzifz5ZAUevanYg6LNf/59Js3p7eUnRv7fkdS+e58czq3UD3KA
-5UwY7GdsGeVcOwIgbF9G8UUTfnkdgU9bWOEg/xZXuMMSk/R8AckPDxiNMBkSZN1O
-sD0FfiREi3gVI2Bj7vi2GSbU86vexF57XDQoRtLT1XCqN7RL7NDn0ZVku9HblYJV
-DlemRjiBTM+yxM49GjM29sog31lOunfobDrjxwWbPvQMEEZ0PdWdDX8GDod5l+Wj
-0/Xnv8vumudSEisZfRVh
-=CiO2
+iQIcBAEBCgAGBQJOHD4BAAoJEC8ZTXQF1qEPX0wQAIynkss/6iT2dR3pQE+6XS2n
+bodTq63ThaN6ubeo6+K2NX7d8Ed+iegTL5BwSXOkIApxd16jfFhXTVBcW6zjJOYf
++9xZVddl0GAPqR7EX3NMSQfS+KG1d0TUge0DSNU0dKmYxLr6BEpJdoOB+1QAB2Bd
+yOlet7mVRQQJtfdjQx+X+qNsSQunKQQ0EOvszr9Na6lsQtMw2zB7bA8tLG4W940g
+pa8qTNjk6A0NDbhICNAOwoWsct7euoBPA1+f/2kHKjAbD7zwt1CO1jkE8GbJOqSc
+Q3a33KjEKBfc71+mWw9ae6ZQeyk+NCZRgR2df3dH20gXiLRitsckJUgvDrYvbfnW
+4j0ZaAtjt6q2nGAijJ8uY37acgOeYFZ7MWtiXIAyYvl/4uaBPMkd+xD9GcH2Wsgl
+fkCJEZrSRpefI2Nc1skr8wBmTYiQZDz0X4IB3J0bdw8E73HATAQeX/gX/Cl9d/kP
+Thu9zsFDaNn5d96tg4p8Q5Pci2Ryr+y0tuirw08YjSdLa2daMgSEWNWGSyQxFzZQ
+tRIUYCQjBROc+EjJrifl3uumbmfH+9vuV7U9iLAKp6iMdxOC0rLgINtcgUPhdp5x
+KDMmL0U8ni418nOcvQk6KijzF3xVdQ3iQ+hBhAun81zGQ5+T7khFJsEqAEkgIq+l
+nx8DBQj9gf/ECcxFB1qT
+=oKrh
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.5.14.ebuild b/dev-db/mysql/mysql-5.5.14.ebuild
new file mode 100644
index 0000000..b431953
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.14.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+
+EAPI="2"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic ; do
+				mysql_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-07-13  2:14 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-07-13  2:14 UTC (permalink / raw
  To: gentoo-commits

commit:     11973ccbc7a7da3e868597fb237155822b710342
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 02:12:10 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 02:12:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=11973ccb

[dev-db/mysql] 5.1.58 version bump.

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 dev-db/mysql/Manifest            |   28 ++--
 dev-db/mysql/mysql-5.1.58.ebuild |  261 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 276 insertions(+), 13 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index b7c4cb4..c083699 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -9,6 +9,7 @@ AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f
 DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 SHA1 10fffc7672a469af4a7fd980922b04d7ba0143ba SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55
 DIST mysql-5.1.56.tar.gz 24795624 RMD160 c2ff6eb06d0797d4b56630b783d4ad2d1add1422 SHA1 8665c76ab4ab36e8d2379ddf6d678c89b95d9321 SHA256 930e731c8f9318aa3f5e2e6985f6776aaaec81cd32df310e79e73d87177f6613
 DIST mysql-5.1.57.tar.gz 23660514 RMD160 9ca7f79d14525fef2c1badf8410fecd238ee283e SHA1 fcfe037ee6cfd53fe336ef12854e79481bdc6681 SHA256 7944fa56476f44173af4c91ad685a9da5e9d5fa9dea69dafb4b9919df3f3667d
+DIST mysql-5.1.58.tar.gz 24333490 RMD160 199729c701c764cd22584c2b952230c07d0f31a6 SHA1 cfd70bee07ad99576eecde01785b7b2a74ec87ab SHA256 3c69562399655fc62d1424437e6ef59ef7c1ed225f940f81558f549b803f3fd7
 DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5
 DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
 DIST mysql-5.5.13.tar.gz 23709591 RMD160 5e249f533be51a8cb6d777edf630ecd82f5e68a0 SHA1 ccfb58c87e045e6679b442c6230cac222e73f740 SHA256 f05c5df8c53f85b094f415298eb8a7969e403604abc5a3b18ddd0e70e8b1d936
@@ -20,6 +21,7 @@ EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65
 EBUILD mysql-5.1.56-r1.ebuild 8656 RMD160 1a6373b692f1d05d43e9762cc31cecbe3af47cb2 SHA1 cc4854bf71a9a9f9d45c92bdeffbe03f8e50cdff SHA256 2b0ce97fbaabab178a578db4656d5d6286a90259bd25de17bdd3c483ef5a2892
 EBUILD mysql-5.1.56.ebuild 8650 RMD160 fdc41e801bdeedaebe03d966a81770738eeb3729 SHA1 da50c1ec2b881b0e9916fc32259cd466910377fc SHA256 0babf53aa040c4668a0acdca3246b55b6bfa078c25098507f44624fa73d11e16
 EBUILD mysql-5.1.57.ebuild 8664 RMD160 ef5e19caa8dfdf04f82ca9aa6aa48d417e37d1ae SHA1 784c4f03a87e72255b2aaa2d9332ed8601824aa0 SHA256 3f5e7f58893be3cb5f997be4681a713c194e026b8cc53e5d6ab9878cc62d1219
+EBUILD mysql-5.1.58.ebuild 8664 RMD160 ef5e19caa8dfdf04f82ca9aa6aa48d417e37d1ae SHA1 784c4f03a87e72255b2aaa2d9332ed8601824aa0 SHA256 3f5e7f58893be3cb5f997be4681a713c194e026b8cc53e5d6ab9878cc62d1219
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.13.ebuild 3909 RMD160 4b336f52f648a079c39b6602bcb4fbb3b3bd7b77 SHA1 5278dfe3d80a9a10c37dc0c2232aef7559eda27d SHA256 95f321d2c7f8627c49013ebba62a96ffcb3a89dce4b396d69b55680ced13b602
@@ -30,17 +32,17 @@ MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOHD4BAAoJEC8ZTXQF1qEPX0wQAIynkss/6iT2dR3pQE+6XS2n
-bodTq63ThaN6ubeo6+K2NX7d8Ed+iegTL5BwSXOkIApxd16jfFhXTVBcW6zjJOYf
-+9xZVddl0GAPqR7EX3NMSQfS+KG1d0TUge0DSNU0dKmYxLr6BEpJdoOB+1QAB2Bd
-yOlet7mVRQQJtfdjQx+X+qNsSQunKQQ0EOvszr9Na6lsQtMw2zB7bA8tLG4W940g
-pa8qTNjk6A0NDbhICNAOwoWsct7euoBPA1+f/2kHKjAbD7zwt1CO1jkE8GbJOqSc
-Q3a33KjEKBfc71+mWw9ae6ZQeyk+NCZRgR2df3dH20gXiLRitsckJUgvDrYvbfnW
-4j0ZaAtjt6q2nGAijJ8uY37acgOeYFZ7MWtiXIAyYvl/4uaBPMkd+xD9GcH2Wsgl
-fkCJEZrSRpefI2Nc1skr8wBmTYiQZDz0X4IB3J0bdw8E73HATAQeX/gX/Cl9d/kP
-Thu9zsFDaNn5d96tg4p8Q5Pci2Ryr+y0tuirw08YjSdLa2daMgSEWNWGSyQxFzZQ
-tRIUYCQjBROc+EjJrifl3uumbmfH+9vuV7U9iLAKp6iMdxOC0rLgINtcgUPhdp5x
-KDMmL0U8ni418nOcvQk6KijzF3xVdQ3iQ+hBhAun81zGQ5+T7khFJsEqAEkgIq+l
-nx8DBQj9gf/ECcxFB1qT
-=oKrh
+iQIcBAEBCgAGBQJOHP76AAoJEC8ZTXQF1qEP0a0P/2+Db0ViAl8wu17jOVnOpDxn
+Ys4YdzbUT/qW89SYkmsN960gRBxmTA4PSepYsIZeZ7Z2dp4xQm/muZ+ROKDXEbV/
+zhbKxwgZEOksS2XZVSPSpVybXeyERQqQsmTtbcGkjnr5Ht92Um6v3k8UcjJP2NP/
+viO0brB1EG09znQ7BrUZqxItTYTEngewowEny6XAeCMMCWzXpGNgFL770EyfWv5t
+JBmflu2XyzSnsAm1bTq56hVpWfbQBrXPaKvgZ/zFCO0DAoXNgBH8/6npfv6pfEZ7
+AWNK+DoHf/rcagiU0LtFlr5JjVeTBjOsgHolbpOGOr+JCW2MoQQ0H7wvKJXQX5m+
+VNA/HTOfYLGEjfeWsqkeb0fHstwK8D8+/mwflvBt6SWnuWccTYpcP0WMPXWi7NNg
+3vaHmB7Bi+/kFinHIi0BthVwjC4iPBmlAxxVxSmCgEe7marzKuE+0mXnNyh2giA3
+F2A0fka44yT5cii+N1hyMNjmRLRVgY8pZd6hwy35K5Ob6CFS9d7VY2T1SJXJl8y/
+dyDbJBIPObUAx9q6Tu4nUxjUn0+VC3cHfYnG4/+AEb++nlB2qvRucTMirXrYEJrB
+kghT50WYVNy0tjI6aXU2D15XVGbG9D6CJoG/WdSnW0W8AUZmwvzARlmUQ3afjbgF
+dYq5NsanDYv38h3bmxVe
+=3neh
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.1.58.ebuild b/dev-db/mysql/mysql-5.1.58.ebuild
new file mode 100644
index 0000000..1f72a5b
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.58.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.56.ebuild,v 1.4 2011/05/08 22:07:33 hwoarang Exp $
+
+EAPI="2"
+
+MY_EXTRAS_VER="live"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		# bug 332565
+		if ! use extraengine ; then
+			for t in main.range ; do
+				mysql_disable_test $t "Test $t requires USE=extraengine"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-07-13  3:15 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-07-13  3:15 UTC (permalink / raw
  To: gentoo-commits

commit:     f229e8879c64888b6c5559cb5815c538b3fda681
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 03:12:50 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 03:12:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f229e887

Replace mysql_disable_test calls with mysql-v2_disable_test.
Should finally disable the remaining failing tests.

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 dev-db/mysql/ChangeLog           |    6 ++++++
 dev-db/mysql/Manifest            |   36 ++++++++++++++++++------------------
 dev-db/mysql/mysql-5.1.57.ebuild |   28 ++++++++++++++--------------
 dev-db/mysql/mysql-5.1.58.ebuild |   28 ++++++++++++++--------------
 dev-db/mysql/mysql-5.5.13.ebuild |    2 +-
 dev-db/mysql/mysql-5.5.14.ebuild |    2 +-
 6 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 5ef15e1..7618886 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.1.57.ebuild, mysql-5.1.58.ebuild, mysql-5.5.13.ebuild,
+  mysql-5.5.14.ebuild:
+  Replace mysql_disable_test calls with mysql-v2_disable_test.
+  Should finally disable the remaining failing tests.
+
   18 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   mysql-5.1.57.ebuild:
   Update mysql-v2 eclass to use the git-2 eclass.

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index c083699..3d9fa3f 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -20,29 +20,29 @@ DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711
 EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
 EBUILD mysql-5.1.56-r1.ebuild 8656 RMD160 1a6373b692f1d05d43e9762cc31cecbe3af47cb2 SHA1 cc4854bf71a9a9f9d45c92bdeffbe03f8e50cdff SHA256 2b0ce97fbaabab178a578db4656d5d6286a90259bd25de17bdd3c483ef5a2892
 EBUILD mysql-5.1.56.ebuild 8650 RMD160 fdc41e801bdeedaebe03d966a81770738eeb3729 SHA1 da50c1ec2b881b0e9916fc32259cd466910377fc SHA256 0babf53aa040c4668a0acdca3246b55b6bfa078c25098507f44624fa73d11e16
-EBUILD mysql-5.1.57.ebuild 8664 RMD160 ef5e19caa8dfdf04f82ca9aa6aa48d417e37d1ae SHA1 784c4f03a87e72255b2aaa2d9332ed8601824aa0 SHA256 3f5e7f58893be3cb5f997be4681a713c194e026b8cc53e5d6ab9878cc62d1219
-EBUILD mysql-5.1.58.ebuild 8664 RMD160 ef5e19caa8dfdf04f82ca9aa6aa48d417e37d1ae SHA1 784c4f03a87e72255b2aaa2d9332ed8601824aa0 SHA256 3f5e7f58893be3cb5f997be4681a713c194e026b8cc53e5d6ab9878cc62d1219
+EBUILD mysql-5.1.57.ebuild 8706 RMD160 673322b4ad8aff4c7066a165bcabc4bd2e22be5b SHA1 ade9a5df8f7c88de2ee19770940d17178ff913b3 SHA256 1ac52e0db3f449159eec6b672a416247e7a0199d4e831ce1b43446f554da365c
+EBUILD mysql-5.1.58.ebuild 8706 RMD160 673322b4ad8aff4c7066a165bcabc4bd2e22be5b SHA1 ade9a5df8f7c88de2ee19770940d17178ff913b3 SHA256 1ac52e0db3f449159eec6b672a416247e7a0199d4e831ce1b43446f554da365c
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-EBUILD mysql-5.5.13.ebuild 3909 RMD160 4b336f52f648a079c39b6602bcb4fbb3b3bd7b77 SHA1 5278dfe3d80a9a10c37dc0c2232aef7559eda27d SHA256 95f321d2c7f8627c49013ebba62a96ffcb3a89dce4b396d69b55680ced13b602
-EBUILD mysql-5.5.14.ebuild 3909 RMD160 4b336f52f648a079c39b6602bcb4fbb3b3bd7b77 SHA1 5278dfe3d80a9a10c37dc0c2232aef7559eda27d SHA256 95f321d2c7f8627c49013ebba62a96ffcb3a89dce4b396d69b55680ced13b602
+EBUILD mysql-5.5.13.ebuild 3912 RMD160 ef1efd740d8066b5df242008f710a589f1580670 SHA1 6cc53531a65b539ae30e561b692c8a6c46e4c9f8 SHA256 6eea234c5ca7c3298f8071487f915c60d06dc73f30b77a8274a854404e504b6a
+EBUILD mysql-5.5.14.ebuild 3912 RMD160 ef1efd740d8066b5df242008f710a589f1580670 SHA1 6cc53531a65b539ae30e561b692c8a6c46e4c9f8 SHA256 6eea234c5ca7c3298f8071487f915c60d06dc73f30b77a8274a854404e504b6a
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-MISC ChangeLog 6065 RMD160 95779b300845c38a2573e8fa17f7322f19732630 SHA1 ec4ab909266a4b8fdfd8d1506b601ede4c8267e3 SHA256 c8dedfca95d419ccd6221da8baf7745ee28f09f1d05505854f78f6a7f5283a68
+MISC ChangeLog 6338 RMD160 1262023ae8d67749555b81053a39d4eaf1d48951 SHA1 03497a58196205a086237847771b8d00afa905b2 SHA256 7966bf217b328b7a45c3e4a4a2218bf4031e94d23822e3119db6b7022a148b75
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOHP76AAoJEC8ZTXQF1qEP0a0P/2+Db0ViAl8wu17jOVnOpDxn
-Ys4YdzbUT/qW89SYkmsN960gRBxmTA4PSepYsIZeZ7Z2dp4xQm/muZ+ROKDXEbV/
-zhbKxwgZEOksS2XZVSPSpVybXeyERQqQsmTtbcGkjnr5Ht92Um6v3k8UcjJP2NP/
-viO0brB1EG09znQ7BrUZqxItTYTEngewowEny6XAeCMMCWzXpGNgFL770EyfWv5t
-JBmflu2XyzSnsAm1bTq56hVpWfbQBrXPaKvgZ/zFCO0DAoXNgBH8/6npfv6pfEZ7
-AWNK+DoHf/rcagiU0LtFlr5JjVeTBjOsgHolbpOGOr+JCW2MoQQ0H7wvKJXQX5m+
-VNA/HTOfYLGEjfeWsqkeb0fHstwK8D8+/mwflvBt6SWnuWccTYpcP0WMPXWi7NNg
-3vaHmB7Bi+/kFinHIi0BthVwjC4iPBmlAxxVxSmCgEe7marzKuE+0mXnNyh2giA3
-F2A0fka44yT5cii+N1hyMNjmRLRVgY8pZd6hwy35K5Ob6CFS9d7VY2T1SJXJl8y/
-dyDbJBIPObUAx9q6Tu4nUxjUn0+VC3cHfYnG4/+AEb++nlB2qvRucTMirXrYEJrB
-kghT50WYVNy0tjI6aXU2D15XVGbG9D6CJoG/WdSnW0W8AUZmwvzARlmUQ3afjbgF
-dYq5NsanDYv38h3bmxVe
-=3neh
+iQIcBAEBCgAGBQJOHQ0yAAoJEC8ZTXQF1qEP7tcQALMgDlluA45Kbutp92rnRbZ/
+k7OiRmjzyjiLDrV2F6Fr6y3CzGrzwb7GKj9Rjdgf30/X72Tqw4m91Vja2pXVicxD
+YGHMp24lkExa41VX9CSAeF2TvZLu6wsjmNi1Jxyxr9hAefOASMCOT4cC3RSKrVGy
+KQAdv3XS20b+AzVr5Bi0pYzHzi03zs50PEqd15sv/d0bTlrk5CnUsAEXmU+CDYU6
+6rQ08Vvsuz5bo4KIv0hbDzjBHIWzjFCb0vcCQrKX70+vT1EIh45GVd1M1q4AJhkE
+AVb6mkhqlwyguIHZBzwm+4OZgs5bMYB3H7tuy2BfwDVjg0QsQ/MziHi5bIVzfCB0
+/+lBJ2vQlAESRENWeqwNHVzopIsSKxEhmD9SVOc9V2r/TrJsMw7xnyuIUyhhw0kw
+n7xmVDeV9tMG5q2ccXuV7QMGIVf2aMw9MTYarWwmj6+jH92k/2Byv14mG6cNwh9C
+vhie2Lis3AU72HNTOmGSGJQOP12QW5tFdBnaE9qiQQC+2UP08olX50CA4fN7Fg/i
+xBfjCnuFyKDpRRE5El1DnyqUQs5QyT/5GxscwypdvlZ0ZBOV0TfQ77AeZ8o1D10u
+qqJyPUqp8IweOORopSKpUyoB6GS2YvMCt72jzV1xNF948wreUFvzEtgWDnfHz1KU
+gNLNcIlCklqFZGlUg0y6
+=LGFL
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.1.57.ebuild b/dev-db/mysql/mysql-5.1.57.ebuild
index 1f72a5b..96da70b 100644
--- a/dev-db/mysql/mysql-5.1.57.ebuild
+++ b/dev-db/mysql/mysql-5.1.57.ebuild
@@ -71,12 +71,12 @@ src_test() {
 		# USE=extraengines case
 		case ${PV} in
 			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
 			;;
 
 			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
 			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"archive_gis" \
 				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
 			;;
@@ -86,7 +86,7 @@ src_test() {
 		# was fixed.
 		case ${PV} in
 			5.0.54|5.0.51*)
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"read_only" \
 				"Broken in 5.0.51-54, output in wrong order"
 			;;
@@ -94,14 +94,14 @@ src_test() {
 
 		# Ditto to read_only
 		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"view" \
 				"Broken in 5.0.51, output in wrong order"
 
 		# x86-specific, OOM issue with some subselects on low memory servers
 		[ "${PV}" == "5.0.54" ] && \
 			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"subselect" \
 				"Testcase needs tuning on x86 for oom condition"
 
@@ -109,7 +109,7 @@ src_test() {
 		[ "${PV}" == "5.0.56" ] && \
 			for t in openssl_1 rpl_openssl rpl_ssl ssl \
 				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
+				mysql-v2_disable_test \
 					"$t" \
 					"OpenSSL tests broken on 5.0.56"
 			done
@@ -118,7 +118,7 @@ src_test() {
 		# Upstream bug 41066
 		# http://bugs.mysql.com/bug.php?id=41066
 		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"status2" \
 				"Broken in 5.0.72, new test is broken, upstream bug #41066"
 
@@ -141,7 +141,7 @@ src_test() {
 			5.0.*|5.1.*|5.4.*|5.5.*)
 				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
 					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
+					mysql-v2_disable_test \
 						"$t" \
 						"These OpenSSL tests break due to expired certificates"
 				done
@@ -168,7 +168,7 @@ src_test() {
 				main.information_schema \
 				main.not_partition funcs_1.is_columns_mysql \
 				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 			done
 			;;
 		esac
@@ -180,21 +180,21 @@ src_test() {
 		case ${PV} in
 			5.1.5*|5.4.*|5.5.*|6*)
 			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql_disable_test  "$t" \
+				mysql-v2_disable_test  "$t" \
 					"False positives in Gentoo: connect-timeout"
 			done
 			;;
 		esac
 
 		use profiling && use community \
-		|| mysql_disable_test main.profiling \
+		|| mysql-v2_disable_test main.profiling \
 			"Profiling test needs profiling support"
 
 		if [ "${PN}" == "mariadb" ]; then
 			for t in \
 				parts.part_supported_sql_func_ndb \
 				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
 			done
 		fi
 
@@ -213,14 +213,14 @@ src_test() {
 				innodb.innodb_bug49164 innodb.innodb_bug51920 \
 				innodb.innodb_bug54044 \
 				; do
-					mysql_disable_test $t "tests broken in xtradb"
+					mysql-v2_disable_test $t "tests broken in xtradb"
 			done
 		fi
 
 		# bug 332565
 		if ! use extraengine ; then
 			for t in main.range ; do
-				mysql_disable_test $t "Test $t requires USE=extraengine"
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
 			done
 		fi
 

diff --git a/dev-db/mysql/mysql-5.1.58.ebuild b/dev-db/mysql/mysql-5.1.58.ebuild
index 1f72a5b..96da70b 100644
--- a/dev-db/mysql/mysql-5.1.58.ebuild
+++ b/dev-db/mysql/mysql-5.1.58.ebuild
@@ -71,12 +71,12 @@ src_test() {
 		# USE=extraengines case
 		case ${PV} in
 			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
 			;;
 
 			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
 			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"archive_gis" \
 				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
 			;;
@@ -86,7 +86,7 @@ src_test() {
 		# was fixed.
 		case ${PV} in
 			5.0.54|5.0.51*)
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"read_only" \
 				"Broken in 5.0.51-54, output in wrong order"
 			;;
@@ -94,14 +94,14 @@ src_test() {
 
 		# Ditto to read_only
 		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"view" \
 				"Broken in 5.0.51, output in wrong order"
 
 		# x86-specific, OOM issue with some subselects on low memory servers
 		[ "${PV}" == "5.0.54" ] && \
 			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"subselect" \
 				"Testcase needs tuning on x86 for oom condition"
 
@@ -109,7 +109,7 @@ src_test() {
 		[ "${PV}" == "5.0.56" ] && \
 			for t in openssl_1 rpl_openssl rpl_ssl ssl \
 				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
+				mysql-v2_disable_test \
 					"$t" \
 					"OpenSSL tests broken on 5.0.56"
 			done
@@ -118,7 +118,7 @@ src_test() {
 		# Upstream bug 41066
 		# http://bugs.mysql.com/bug.php?id=41066
 		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"status2" \
 				"Broken in 5.0.72, new test is broken, upstream bug #41066"
 
@@ -141,7 +141,7 @@ src_test() {
 			5.0.*|5.1.*|5.4.*|5.5.*)
 				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
 					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
+					mysql-v2_disable_test \
 						"$t" \
 						"These OpenSSL tests break due to expired certificates"
 				done
@@ -168,7 +168,7 @@ src_test() {
 				main.information_schema \
 				main.not_partition funcs_1.is_columns_mysql \
 				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 			done
 			;;
 		esac
@@ -180,21 +180,21 @@ src_test() {
 		case ${PV} in
 			5.1.5*|5.4.*|5.5.*|6*)
 			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql_disable_test  "$t" \
+				mysql-v2_disable_test  "$t" \
 					"False positives in Gentoo: connect-timeout"
 			done
 			;;
 		esac
 
 		use profiling && use community \
-		|| mysql_disable_test main.profiling \
+		|| mysql-v2_disable_test main.profiling \
 			"Profiling test needs profiling support"
 
 		if [ "${PN}" == "mariadb" ]; then
 			for t in \
 				parts.part_supported_sql_func_ndb \
 				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
 			done
 		fi
 
@@ -213,14 +213,14 @@ src_test() {
 				innodb.innodb_bug49164 innodb.innodb_bug51920 \
 				innodb.innodb_bug54044 \
 				; do
-					mysql_disable_test $t "tests broken in xtradb"
+					mysql-v2_disable_test $t "tests broken in xtradb"
 			done
 		fi
 
 		# bug 332565
 		if ! use extraengine ; then
 			for t in main.range ; do
-				mysql_disable_test $t "Test $t requires USE=extraengine"
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
 			done
 		fi
 

diff --git a/dev-db/mysql/mysql-5.5.13.ebuild b/dev-db/mysql/mysql-5.5.13.ebuild
index b431953..c39e4d8 100644
--- a/dev-db/mysql/mysql-5.5.13.ebuild
+++ b/dev-db/mysql/mysql-5.5.13.ebuild
@@ -87,7 +87,7 @@ src_test() {
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwin main.flush_read_lock_kill \
 			sys_vars.plugin_dir_basic ; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		# Run mysql tests

diff --git a/dev-db/mysql/mysql-5.5.14.ebuild b/dev-db/mysql/mysql-5.5.14.ebuild
index b431953..c39e4d8 100644
--- a/dev-db/mysql/mysql-5.5.14.ebuild
+++ b/dev-db/mysql/mysql-5.5.14.ebuild
@@ -87,7 +87,7 @@ src_test() {
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwin main.flush_read_lock_kill \
 			sys_vars.plugin_dir_basic ; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		# Run mysql tests



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-07-13  7:43 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2011-07-13  7:43 UTC (permalink / raw
  To: gentoo-commits

commit:     3c77d942b0590e37da97a51aa72c90add44dae84
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 07:42:16 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 07:42:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3c77d942

Old versions moved to tree.

(Portage version: 2.2.0_alpha43/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 dev-db/mysql/ChangeLog              |    4 +
 dev-db/mysql/Manifest               |   27 +----
 dev-db/mysql/mysql-5.1.56-r1.ebuild |  261 -----------------------------------
 dev-db/mysql/mysql-5.1.56.ebuild    |  261 -----------------------------------
 dev-db/mysql/mysql-5.1.57.ebuild    |  261 -----------------------------------
 5 files changed, 5 insertions(+), 809 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 7618886..6c4bc10 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.1.56.ebuild,
+  -mysql-5.1.56-r1.ebuild, -mysql-5.1.57.ebuild:
+  Old versions moved to tree.
+
   13 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   mysql-5.1.57.ebuild, mysql-5.1.58.ebuild, mysql-5.5.13.ebuild,
   mysql-5.5.14.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 3d9fa3f..867c2ef 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,14 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
 AUX my.cnf-5.1 4199 RMD160 c12797534dd8273d1640844b4813ec7307911cef SHA1 5845dcaf469bd95d918cc07b1ffc80e2bd4c5a68 SHA256 c50e38004c901d4921d00a5f458bcd191852262a93f3d9fbfb6b040186b1ec45
 AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12
 DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 SHA1 10fffc7672a469af4a7fd980922b04d7ba0143ba SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55
-DIST mysql-5.1.56.tar.gz 24795624 RMD160 c2ff6eb06d0797d4b56630b783d4ad2d1add1422 SHA1 8665c76ab4ab36e8d2379ddf6d678c89b95d9321 SHA256 930e731c8f9318aa3f5e2e6985f6776aaaec81cd32df310e79e73d87177f6613
-DIST mysql-5.1.57.tar.gz 23660514 RMD160 9ca7f79d14525fef2c1badf8410fecd238ee283e SHA1 fcfe037ee6cfd53fe336ef12854e79481bdc6681 SHA256 7944fa56476f44173af4c91ad685a9da5e9d5fa9dea69dafb4b9919df3f3667d
 DIST mysql-5.1.58.tar.gz 24333490 RMD160 199729c701c764cd22584c2b952230c07d0f31a6 SHA1 cfd70bee07ad99576eecde01785b7b2a74ec87ab SHA256 3c69562399655fc62d1424437e6ef59ef7c1ed225f940f81558f549b803f3fd7
 DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5
 DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
@@ -18,31 +13,11 @@ DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0f
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
 EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
-EBUILD mysql-5.1.56-r1.ebuild 8656 RMD160 1a6373b692f1d05d43e9762cc31cecbe3af47cb2 SHA1 cc4854bf71a9a9f9d45c92bdeffbe03f8e50cdff SHA256 2b0ce97fbaabab178a578db4656d5d6286a90259bd25de17bdd3c483ef5a2892
-EBUILD mysql-5.1.56.ebuild 8650 RMD160 fdc41e801bdeedaebe03d966a81770738eeb3729 SHA1 da50c1ec2b881b0e9916fc32259cd466910377fc SHA256 0babf53aa040c4668a0acdca3246b55b6bfa078c25098507f44624fa73d11e16
-EBUILD mysql-5.1.57.ebuild 8706 RMD160 673322b4ad8aff4c7066a165bcabc4bd2e22be5b SHA1 ade9a5df8f7c88de2ee19770940d17178ff913b3 SHA256 1ac52e0db3f449159eec6b672a416247e7a0199d4e831ce1b43446f554da365c
 EBUILD mysql-5.1.58.ebuild 8706 RMD160 673322b4ad8aff4c7066a165bcabc4bd2e22be5b SHA1 ade9a5df8f7c88de2ee19770940d17178ff913b3 SHA256 1ac52e0db3f449159eec6b672a416247e7a0199d4e831ce1b43446f554da365c
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.13.ebuild 3912 RMD160 ef1efd740d8066b5df242008f710a589f1580670 SHA1 6cc53531a65b539ae30e561b692c8a6c46e4c9f8 SHA256 6eea234c5ca7c3298f8071487f915c60d06dc73f30b77a8274a854404e504b6a
 EBUILD mysql-5.5.14.ebuild 3912 RMD160 ef1efd740d8066b5df242008f710a589f1580670 SHA1 6cc53531a65b539ae30e561b692c8a6c46e4c9f8 SHA256 6eea234c5ca7c3298f8071487f915c60d06dc73f30b77a8274a854404e504b6a
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-MISC ChangeLog 6338 RMD160 1262023ae8d67749555b81053a39d4eaf1d48951 SHA1 03497a58196205a086237847771b8d00afa905b2 SHA256 7966bf217b328b7a45c3e4a4a2218bf4031e94d23822e3119db6b7022a148b75
+MISC ChangeLog 6493 RMD160 52305f0dba3f332c2a4e1a1f4d68aedb74eff5ba SHA1 61cffeaf745f7453d25845c7868029b1249434d9 SHA256 713b45744abe7e8d61475c8ff739066fb821d1a8344c0dedf9b2eaf0aa525bf1
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOHQ0yAAoJEC8ZTXQF1qEP7tcQALMgDlluA45Kbutp92rnRbZ/
-k7OiRmjzyjiLDrV2F6Fr6y3CzGrzwb7GKj9Rjdgf30/X72Tqw4m91Vja2pXVicxD
-YGHMp24lkExa41VX9CSAeF2TvZLu6wsjmNi1Jxyxr9hAefOASMCOT4cC3RSKrVGy
-KQAdv3XS20b+AzVr5Bi0pYzHzi03zs50PEqd15sv/d0bTlrk5CnUsAEXmU+CDYU6
-6rQ08Vvsuz5bo4KIv0hbDzjBHIWzjFCb0vcCQrKX70+vT1EIh45GVd1M1q4AJhkE
-AVb6mkhqlwyguIHZBzwm+4OZgs5bMYB3H7tuy2BfwDVjg0QsQ/MziHi5bIVzfCB0
-/+lBJ2vQlAESRENWeqwNHVzopIsSKxEhmD9SVOc9V2r/TrJsMw7xnyuIUyhhw0kw
-n7xmVDeV9tMG5q2ccXuV7QMGIVf2aMw9MTYarWwmj6+jH92k/2Byv14mG6cNwh9C
-vhie2Lis3AU72HNTOmGSGJQOP12QW5tFdBnaE9qiQQC+2UP08olX50CA4fN7Fg/i
-xBfjCnuFyKDpRRE5El1DnyqUQs5QyT/5GxscwypdvlZ0ZBOV0TfQ77AeZ8o1D10u
-qqJyPUqp8IweOORopSKpUyoB6GS2YvMCt72jzV1xNF948wreUFvzEtgWDnfHz1KU
-gNLNcIlCklqFZGlUg0y6
-=LGFL
------END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.1.56-r1.ebuild b/dev-db/mysql/mysql-5.1.56-r1.ebuild
deleted file mode 100644
index dbc6ce3..0000000
--- a/dev-db/mysql/mysql-5.1.56-r1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-EAPI="2"
-
-MY_EXTRAS_VER="live"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# bug 332565
-		if ! use extraengine ; then
-			for t in main.range ; do
-				mysql_disable_test $t "Test $t requires USE=extraengine"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.56.ebuild b/dev-db/mysql/mysql-5.1.56.ebuild
deleted file mode 100644
index 7a88bb1..0000000
--- a/dev-db/mysql/mysql-5.1.56.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $
-
-EAPI="2"
-
-MY_EXTRAS_VER="live"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# bug 332565
-		if ! use extraengine ; then
-			for t in main.range ; do
-				mysql_disable_test $t "Test $t requires USE=extraengine"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.57.ebuild b/dev-db/mysql/mysql-5.1.57.ebuild
deleted file mode 100644
index 96da70b..0000000
--- a/dev-db/mysql/mysql-5.1.57.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.56.ebuild,v 1.4 2011/05/08 22:07:33 hwoarang Exp $
-
-EAPI="2"
-
-MY_EXTRAS_VER="live"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# bug 332565
-		if ! use extraengine ; then
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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
-}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-07-13  7:43 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2011-07-13  7:43 UTC (permalink / raw
  To: gentoo-commits

commit:     1fd657acfe1bc7a170c91099135961659ee97116
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 07:43:33 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 07:43:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1fd657ac

5.5.13 removed from uptream mirrors, unable to verify digest.

(Portage version: 2.2.0_alpha43/git/Linux x86_64, unsigned Manifest commit)

---
 dev-db/mysql/ChangeLog           |    3 +
 dev-db/mysql/Manifest            |    4 +-
 dev-db/mysql/mysql-5.5.13.ebuild |  120 --------------------------------------
 3 files changed, 4 insertions(+), 123 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 6c4bc10..02772ad 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.5.13.ebuild:
+  5.5.13 removed from uptream mirrors, unable to verify digest.
+
   13 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.1.56.ebuild,
   -mysql-5.1.56-r1.ebuild, -mysql-5.1.57.ebuild:
   Old versions moved to tree.

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 867c2ef..9183829 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -7,7 +7,6 @@ DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef0
 DIST mysql-5.1.58.tar.gz 24333490 RMD160 199729c701c764cd22584c2b952230c07d0f31a6 SHA1 cfd70bee07ad99576eecde01785b7b2a74ec87ab SHA256 3c69562399655fc62d1424437e6ef59ef7c1ed225f940f81558f549b803f3fd7
 DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5
 DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
-DIST mysql-5.5.13.tar.gz 23709591 RMD160 5e249f533be51a8cb6d777edf630ecd82f5e68a0 SHA1 ccfb58c87e045e6679b442c6230cac222e73f740 SHA256 f05c5df8c53f85b094f415298eb8a7969e403604abc5a3b18ddd0e70e8b1d936
 DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
@@ -16,8 +15,7 @@ EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65
 EBUILD mysql-5.1.58.ebuild 8706 RMD160 673322b4ad8aff4c7066a165bcabc4bd2e22be5b SHA1 ade9a5df8f7c88de2ee19770940d17178ff913b3 SHA256 1ac52e0db3f449159eec6b672a416247e7a0199d4e831ce1b43446f554da365c
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-EBUILD mysql-5.5.13.ebuild 3912 RMD160 ef1efd740d8066b5df242008f710a589f1580670 SHA1 6cc53531a65b539ae30e561b692c8a6c46e4c9f8 SHA256 6eea234c5ca7c3298f8071487f915c60d06dc73f30b77a8274a854404e504b6a
 EBUILD mysql-5.5.14.ebuild 3912 RMD160 ef1efd740d8066b5df242008f710a589f1580670 SHA1 6cc53531a65b539ae30e561b692c8a6c46e4c9f8 SHA256 6eea234c5ca7c3298f8071487f915c60d06dc73f30b77a8274a854404e504b6a
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-MISC ChangeLog 6493 RMD160 52305f0dba3f332c2a4e1a1f4d68aedb74eff5ba SHA1 61cffeaf745f7453d25845c7868029b1249434d9 SHA256 713b45744abe7e8d61475c8ff739066fb821d1a8344c0dedf9b2eaf0aa525bf1
+MISC ChangeLog 6633 RMD160 3b6e8fbdaf9e25e3744dd643bfd3759ea9291efb SHA1 147dd6eb676012079e8b84035c45389219c48167 SHA256 6c30c87013595fe4cee31bcf87b321f6bc4eaf2b27fe38e2555339c820b30026
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2

diff --git a/dev-db/mysql/mysql-5.5.13.ebuild b/dev-db/mysql/mysql-5.5.13.ebuild
deleted file mode 100644
index c39e4d8..0000000
--- a/dev-db/mysql/mysql-5.5.13.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="2"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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
-}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-07-14  4:05 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-07-14  4:05 UTC (permalink / raw
  To: gentoo-commits

commit:     06388fe830f491a8254a8709050900dd4405475b
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 03:59:50 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 03:59:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=06388fe8

[dev-db/mysql-5.5.14] Don't use live version of mysql_extras.
Synced from the tree.

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 dev-db/mysql/Manifest            |   23 ++++++++++++++++++++++-
 dev-db/mysql/mysql-5.5.14.ebuild |    4 ++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 9183829..e066197 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
@@ -9,13 +12,31 @@ DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba
 DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
 DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
+DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
 EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
 EBUILD mysql-5.1.58.ebuild 8706 RMD160 673322b4ad8aff4c7066a165bcabc4bd2e22be5b SHA1 ade9a5df8f7c88de2ee19770940d17178ff913b3 SHA256 1ac52e0db3f449159eec6b672a416247e7a0199d4e831ce1b43446f554da365c
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-EBUILD mysql-5.5.14.ebuild 3912 RMD160 ef1efd740d8066b5df242008f710a589f1580670 SHA1 6cc53531a65b539ae30e561b692c8a6c46e4c9f8 SHA256 6eea234c5ca7c3298f8071487f915c60d06dc73f30b77a8274a854404e504b6a
+EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 MISC ChangeLog 6633 RMD160 3b6e8fbdaf9e25e3744dd643bfd3759ea9291efb SHA1 147dd6eb676012079e8b84035c45389219c48167 SHA256 6c30c87013595fe4cee31bcf87b321f6bc4eaf2b27fe38e2555339c820b30026
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOHmm2AAoJEC8ZTXQF1qEPyJsP/1jhLUD2haINSr2PTZbANZRm
+OOyWNy7HeZHmyNY0+JrN4lkzF9btP9MbPKhnTwktOzv+etAMfGREUXyI6nWcBLc/
+Ym7ZQzid/e2NIJjwBjMWuIR9gLfkqFZFg+A07XgFz0NbrIb3c+zAt1eqP9ijoonW
+e5Q9TA87eMymGN5u0aPpDZsTYOSltR2699h679phPLhjeGdLADPdyM+SBUuYhU0M
+DXJuLIiXXbmX8VAKA2pxQ3qIQLZRQGHXn7rTyTVWUTRm2PDr24WD8JaQr1Dbb/RM
+23Ug++9vmhxF3j861gjw5RoRCLWSD/hb49jNR0II8b6vl6hsmtool1DDQ/cs40rJ
+zXuzujHAZa25ivXZOcPMxlZTzWqbQj/g8A3/120ZohzACmI5c15Rts1HsC6SBNEe
+6DPEos/CwoXRI0mTZG5Bus4rrCoIPH5C0bOyNK/aWchowAok2xn2x8t7uwFhANp6
+1QPVlU/6YmwTJCS4vNEb6+5A7zeutMp+AKoGIgDdBT/6F8cZrya0tKHsq3oFOB9C
+e3wROqKrEe6dYONZQlIgyA/JO1Dm3nQXkDiifbWFaKEEgUclWJnlIqsGhvENBswh
+Lnd1qziidTnd+Hwkn1E0PftE7Tck+y+a+5ZXTCGqIONMxGgHFIEXasQ1DngKXwOP
+vuDFGKleu/X6SrkNrN2C
+=7O8X
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.5.14.ebuild b/dev-db/mysql/mysql-5.5.14.ebuild
index c39e4d8..83eb93b 100644
--- a/dev-db/mysql/mysql-5.5.14.ebuild
+++ b/dev-db/mysql/mysql-5.5.14.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
 
 EAPI="2"
 
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20110713-0702Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-07-14  4:05 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-07-14  4:05 UTC (permalink / raw
  To: gentoo-commits

commit:     daf7e5824d8d5dbf800976392402aea7c3ec68b9
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 04:03:02 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 04:03:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=daf7e582

[dev-db/mysql-5.1.58] Don't use live version of mysql_extras.
Synced from the tree.

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 dev-db/mysql/ChangeLog           |    6 ++++++
 dev-db/mysql/Manifest            |   30 +++++++++++++++---------------
 dev-db/mysql/mysql-5.1.58.ebuild |    4 ++--
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 02772ad..27da3ee 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.1.58.ebuild:
+  [dev-db/mysql-5.5.14] Don't use live version of mysql_extras.
+  [dev-db/mysql-5.1.58] Don't use live version of mysql_extras.
+  Synced from the tree.
+
   13 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.5.13.ebuild:
   5.5.13 removed from uptream mirrors, unable to verify digest.
 

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index e066197..94a61f4 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -16,27 +16,27 @@ DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d979
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
 EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
-EBUILD mysql-5.1.58.ebuild 8706 RMD160 673322b4ad8aff4c7066a165bcabc4bd2e22be5b SHA1 ade9a5df8f7c88de2ee19770940d17178ff913b3 SHA256 1ac52e0db3f449159eec6b672a416247e7a0199d4e831ce1b43446f554da365c
+EBUILD mysql-5.1.58.ebuild 8715 RMD160 4305acc12217685c7f32066067b216215cc96772 SHA1 41bfa19a00638c3ec92ebbb893be1a2423da764a SHA256 f357e63db8d923b463e4de55272d63afbf49f611830461122f24162cf61c1790
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-MISC ChangeLog 6633 RMD160 3b6e8fbdaf9e25e3744dd643bfd3759ea9291efb SHA1 147dd6eb676012079e8b84035c45389219c48167 SHA256 6c30c87013595fe4cee31bcf87b321f6bc4eaf2b27fe38e2555339c820b30026
+MISC ChangeLog 6876 RMD160 a681231ac086748f15cf62603bd4ea2a5f7ccb60 SHA1 0066f0b1a9539fa55c1f8fbf5ef8d93e655a00b8 SHA256 ee9bdc2d1891959c5aed299501a5262ad2f0921dc39d92a438851e46d5b3e4f3
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOHmm2AAoJEC8ZTXQF1qEPyJsP/1jhLUD2haINSr2PTZbANZRm
-OOyWNy7HeZHmyNY0+JrN4lkzF9btP9MbPKhnTwktOzv+etAMfGREUXyI6nWcBLc/
-Ym7ZQzid/e2NIJjwBjMWuIR9gLfkqFZFg+A07XgFz0NbrIb3c+zAt1eqP9ijoonW
-e5Q9TA87eMymGN5u0aPpDZsTYOSltR2699h679phPLhjeGdLADPdyM+SBUuYhU0M
-DXJuLIiXXbmX8VAKA2pxQ3qIQLZRQGHXn7rTyTVWUTRm2PDr24WD8JaQr1Dbb/RM
-23Ug++9vmhxF3j861gjw5RoRCLWSD/hb49jNR0II8b6vl6hsmtool1DDQ/cs40rJ
-zXuzujHAZa25ivXZOcPMxlZTzWqbQj/g8A3/120ZohzACmI5c15Rts1HsC6SBNEe
-6DPEos/CwoXRI0mTZG5Bus4rrCoIPH5C0bOyNK/aWchowAok2xn2x8t7uwFhANp6
-1QPVlU/6YmwTJCS4vNEb6+5A7zeutMp+AKoGIgDdBT/6F8cZrya0tKHsq3oFOB9C
-e3wROqKrEe6dYONZQlIgyA/JO1Dm3nQXkDiifbWFaKEEgUclWJnlIqsGhvENBswh
-Lnd1qziidTnd+Hwkn1E0PftE7Tck+y+a+5ZXTCGqIONMxGgHFIEXasQ1DngKXwOP
-vuDFGKleu/X6SrkNrN2C
-=7O8X
+iQIcBAEBCgAGBQJOHmp2AAoJEC8ZTXQF1qEPv60P/0V7Y3m++0x2yAO2Kddqpn0V
+rNv74WiJj6Uh7CNm85kAmJf3Sad2RTcR7nfP3NCR5EV6MyxDv5pKgIW6KGKWQhHi
+4b8sJ2ECEhZzRIDMRRFjjyNVeCgyr+BAamH9idNlHnBxNa6OjZKRmwLCd2BXwOhP
+I9Ws2Mp3F/IoJAQ7B8PrqpB8FuUGJm5JRRflzPizZ+u7/xv17DXyRxxnXqdcnlqz
+eb8g39D6mygLP3TVgvED/SbCHxEscV7pFQyZoFFxnC9uU+b6xi8yc+BTPpipTb51
+wguvJsWNUHv7mS1mjiKbMgvWU2oInGIpzRr6A7sfudxjIowWF7plGI1VAlaAZq9+
+yLqHaQstJr9fuefKpoa9HMZeEVOGrDTPRn+feTkNfep7K5JjzHBX44AmDlIn2YjX
+ggjbvXcenAdUMTL0Lr7HqRs+KjDJPyAw/qqmEz6yYTfUG8u9NL9sOhentGttjTdt
+V7PzQFYbEYnh5VpP/UiERbuN/7j72C5ST9k2wKIquA10spSO20XHoOnb1AsOlJxV
+jRk1YHkpbl0YIfpKn3m7avcqHVoyApYEXsDj1EpXM/be+hOsSNAzsFRVqSWeJqq8
+lmyxQkHAxWpAU20nRGkfmmejLpGSpYSjb9JU40XZc5Qfq6cynaRK/yirJzwnI6PP
+KWuFAIGG/im4VhiJRtet
+=kV/2
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.1.58.ebuild b/dev-db/mysql/mysql-5.1.58.ebuild
index 96da70b..34ed14c 100644
--- a/dev-db/mysql/mysql-5.1.58.ebuild
+++ b/dev-db/mysql/mysql-5.1.58.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.56.ebuild,v 1.4 2011/05/08 22:07:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
 
 EAPI="2"
 
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20110713-0702Z"
 # PBXT
 PBXT_VERSION='1.0.11-6-pre-ga'
 # XtraDB



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-07-21  5:39 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-07-21  5:39 UTC (permalink / raw
  To: gentoo-commits

commit:     c3255aeafce3be03be1b052bc4c484dac02d069e
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 05:21:02 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 05:21:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c3255aea

[dev-db/mysql-5.1.58-r1] Bumped mysql-5.1.58 to fix all the issues related to the ebuild and the mysql-v2 eclass. Fixes bug 375063.

(Portage version: 2.2.0_alpha45/git/Linux x86_64, unsigned Manifest commit)

---
 dev-db/mysql/ChangeLog              |    7 +
 dev-db/mysql/Manifest               |   24 +---
 dev-db/mysql/mysql-5.1.58-r1.ebuild |  261 +++++++++++++++++++++++++++++++++++
 3 files changed, 271 insertions(+), 21 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 27da3ee..359cef1 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.1.58-r1 (21 Jul 2011)
+
+  21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.1.58-r1.ebuild:
+  [dev-db/mysql-5.1.58-r1] Bumped mysql-5.1.58 to fix all the issues related to
+  the ebuild and the mysql-v2 eclass. Fixes bug 375063.
+
   14 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   mysql-5.1.58.ebuild:
   [dev-db/mysql-5.5.14] Don't use live version of mysql_extras.

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 94a61f4..852f57c 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
@@ -13,30 +10,15 @@ DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da
 DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
+DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
 EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
+EBUILD mysql-5.1.58-r1.ebuild 8718 RMD160 7f1869a8efa6e9b5e8691e529d2eac4e9f00b845 SHA1 1b98f9347b294fc5c2aee7d42914854c30a92c47 SHA256 0fc52351fb7e2cfc0ff1c0e1d5ed854ad43a2da5468713f72b5659cbadd5eb12
 EBUILD mysql-5.1.58.ebuild 8715 RMD160 4305acc12217685c7f32066067b216215cc96772 SHA1 41bfa19a00638c3ec92ebbb893be1a2423da764a SHA256 f357e63db8d923b463e4de55272d63afbf49f611830461122f24162cf61c1790
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-MISC ChangeLog 6876 RMD160 a681231ac086748f15cf62603bd4ea2a5f7ccb60 SHA1 0066f0b1a9539fa55c1f8fbf5ef8d93e655a00b8 SHA256 ee9bdc2d1891959c5aed299501a5262ad2f0921dc39d92a438851e46d5b3e4f3
+MISC ChangeLog 7139 RMD160 2a7fdff1646a612f322ca112e3bd2c9353d3580c SHA1 554eb5fe82b71af658afa96fe28f2b41dae54145 SHA256 76876bd77de8ccbae10913cba610e8ef33696ae9f47a9a007663ad97f84ce6e9
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOHmp2AAoJEC8ZTXQF1qEPv60P/0V7Y3m++0x2yAO2Kddqpn0V
-rNv74WiJj6Uh7CNm85kAmJf3Sad2RTcR7nfP3NCR5EV6MyxDv5pKgIW6KGKWQhHi
-4b8sJ2ECEhZzRIDMRRFjjyNVeCgyr+BAamH9idNlHnBxNa6OjZKRmwLCd2BXwOhP
-I9Ws2Mp3F/IoJAQ7B8PrqpB8FuUGJm5JRRflzPizZ+u7/xv17DXyRxxnXqdcnlqz
-eb8g39D6mygLP3TVgvED/SbCHxEscV7pFQyZoFFxnC9uU+b6xi8yc+BTPpipTb51
-wguvJsWNUHv7mS1mjiKbMgvWU2oInGIpzRr6A7sfudxjIowWF7plGI1VAlaAZq9+
-yLqHaQstJr9fuefKpoa9HMZeEVOGrDTPRn+feTkNfep7K5JjzHBX44AmDlIn2YjX
-ggjbvXcenAdUMTL0Lr7HqRs+KjDJPyAw/qqmEz6yYTfUG8u9NL9sOhentGttjTdt
-V7PzQFYbEYnh5VpP/UiERbuN/7j72C5ST9k2wKIquA10spSO20XHoOnb1AsOlJxV
-jRk1YHkpbl0YIfpKn3m7avcqHVoyApYEXsDj1EpXM/be+hOsSNAzsFRVqSWeJqq8
-lmyxQkHAxWpAU20nRGkfmmejLpGSpYSjb9JU40XZc5Qfq6cynaRK/yirJzwnI6PP
-KWuFAIGG/im4VhiJRtet
-=kV/2
------END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.1.58-r1.ebuild b/dev-db/mysql/mysql-5.1.58-r1.ebuild
new file mode 100644
index 0000000..3db6725
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.58-r1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
+
+EAPI="2"
+
+MY_EXTRAS_VER="20110721-0450Z"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		# bug 332565
+		if ! use extraengine ; then
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-07-21  5:39 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-07-21  5:39 UTC (permalink / raw
  To: gentoo-commits

commit:     d0dcbd9caedaf89d15940704d2ce57e632bc8481
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 05:28:39 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 05:28:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d0dcbd9c

Dropped broken mysql-5.1.58 ebuild.

(Portage version: 2.2.0_alpha45/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 dev-db/mysql/ChangeLog           |    4 +
 dev-db/mysql/Manifest            |   23 +++-
 dev-db/mysql/mysql-5.1.58.ebuild |  261 --------------------------------------
 3 files changed, 25 insertions(+), 263 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 359cef1..cb3670f 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -mysql-5.1.58.ebuild:
+  Dropped broken mysql-5.1.58 ebuild.
+
 *mysql-5.1.58-r1 (21 Jul 2011)
 
   21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 852f57c..0308ccf 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
@@ -15,10 +18,26 @@ DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a781549
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
 EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
 EBUILD mysql-5.1.58-r1.ebuild 8718 RMD160 7f1869a8efa6e9b5e8691e529d2eac4e9f00b845 SHA1 1b98f9347b294fc5c2aee7d42914854c30a92c47 SHA256 0fc52351fb7e2cfc0ff1c0e1d5ed854ad43a2da5468713f72b5659cbadd5eb12
-EBUILD mysql-5.1.58.ebuild 8715 RMD160 4305acc12217685c7f32066067b216215cc96772 SHA1 41bfa19a00638c3ec92ebbb893be1a2423da764a SHA256 f357e63db8d923b463e4de55272d63afbf49f611830461122f24162cf61c1790
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-MISC ChangeLog 7139 RMD160 2a7fdff1646a612f322ca112e3bd2c9353d3580c SHA1 554eb5fe82b71af658afa96fe28f2b41dae54145 SHA256 76876bd77de8ccbae10913cba610e8ef33696ae9f47a9a007663ad97f84ce6e9
+MISC ChangeLog 7269 RMD160 f257f77b6053da0fd00cddfc2b94ab078cbaf42f SHA1 61bcf0eac484195cf572e9ff430b7b2b48155b41 SHA256 98e2cc9922e66368152dcdd833d84d9e642469cc39a47e3851ecb98b2a4f128f
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOJ7kHAAoJEC8ZTXQF1qEPiD4QANBja0Eg11lPUGACLRxwDp4t
+xPT4h0cxp+EcubP9tI6nBXonKERWA6F3SuhN7mGNAXzWi5VpcCxA8vw+255h9Bzx
+FuAtDbs53IPT6LXyIJkoS1BEmRZhIP6uP0MlqVSZXGF6xmqLGAeTA3OtFpmlv0Np
+3BwvyHJHxQYU4nbpAFR3h42h3OCZVtjvmdkqxcuPuWI0HQJ8kepq7UDxtgQf0Al3
+jzAMAjULHt1R4pi+/b2P6GyeA0RqgKrnnmI1OpE35UvQDzZsZpEHrzW60sIQtaol
+f/mdgtohbuuP+5xo4BL02AV/Fxlb9+NZ0v7vzPJqplR2Pqut4lwo/wFINpUul67P
+7wzstu6NgYHSy2s9zLydyib80DNHPsOLQSbBbBJuL14gFS76xiF/q7f7Doxs8gD4
+enFhNkQi5cz5Hx5ynx0VH/5qsSHmSub6evJk8CkQSu7PO/tITiVT3ZcAk94dqVl9
+WrWJpOrZZeFwbW3wCGNa+n7g0YiGmJg36ZDPVVIGxrIz7JY9EFRfxTDAtPo3NIAB
+Z5v77G7gwpjI7JupHFm8oYRgU6pNA4OiOIA4BHxl5xGsUTfUzIy2D2iAINUuSbz4
+E0RZT6d3vZOta+G3I9L136alK0r+90DQzYWSrKLXqLa0L+3pgWhpzjaJ6eqNFiWt
+/CWkWPn3AA5TZE4JpAoI
+=TssC
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.1.58.ebuild b/dev-db/mysql/mysql-5.1.58.ebuild
deleted file mode 100644
index 34ed14c..0000000
--- a/dev-db/mysql/mysql-5.1.58.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
-
-EAPI="2"
-
-MY_EXTRAS_VER="20110713-0702Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# bug 332565
-		if ! use extraengine ; then
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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
-}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-07-30  3:37 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-07-30  3:37 UTC (permalink / raw
  To: gentoo-commits

commit:     99bdd95e70764bf50b56c64caa6d6abfd7412447
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 03:37:08 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 03:37:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=99bdd95e

[dev-db/mysql] 5.5.15 release version bump.

(Portage version: 2.2.0_alpha47/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 dev-db/mysql/ChangeLog           |    6 ++
 dev-db/mysql/Manifest            |   30 +++++-----
 dev-db/mysql/mysql-5.5.15.ebuild |  120 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 142 insertions(+), 14 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index cb3670f..65a5145 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.5.15 (30 Jul 2011)
+
+  30 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.5.15.ebuild:
+  [dev-db/mysql] 5.5.15 release version bump.
+
   21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   -mysql-5.1.58.ebuild:
   Dropped broken mysql-5.1.58 ebuild.

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 0308ccf..66aa3f8 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -11,6 +11,7 @@ DIST mysql-5.1.58.tar.gz 24333490 RMD160 199729c701c764cd22584c2b952230c07d0f31a
 DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5
 DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
 DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738
+DIST mysql-5.5.15.tar.gz 23774015 RMD160 536bdcc576583b2ca5b937c1db237dab02453237 SHA1 c89be9fe209d74b62a5e5e71e099dad1e0674a87 SHA256 bed15094b15bb89836c164b9d93eb8f3180caeb6017c8312e33a0c71eb9c5c82
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
@@ -21,23 +22,24 @@ EBUILD mysql-5.1.58-r1.ebuild 8718 RMD160 7f1869a8efa6e9b5e8691e529d2eac4e9f00b8
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
+EBUILD mysql-5.5.15.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-MISC ChangeLog 7269 RMD160 f257f77b6053da0fd00cddfc2b94ab078cbaf42f SHA1 61bcf0eac484195cf572e9ff430b7b2b48155b41 SHA256 98e2cc9922e66368152dcdd833d84d9e642469cc39a47e3851ecb98b2a4f128f
+MISC ChangeLog 7436 RMD160 854c902ae3f26132efca76f0935443ef41cf6173 SHA1 c2c3c4fb731d32e9a7384bf749152f7bb10658f8 SHA256 9a101cc93a637e329e8027a78ba5ee371279b2aaac42f59e47fb5e1b2f2bf6d0
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOJ7kHAAoJEC8ZTXQF1qEPiD4QANBja0Eg11lPUGACLRxwDp4t
-xPT4h0cxp+EcubP9tI6nBXonKERWA6F3SuhN7mGNAXzWi5VpcCxA8vw+255h9Bzx
-FuAtDbs53IPT6LXyIJkoS1BEmRZhIP6uP0MlqVSZXGF6xmqLGAeTA3OtFpmlv0Np
-3BwvyHJHxQYU4nbpAFR3h42h3OCZVtjvmdkqxcuPuWI0HQJ8kepq7UDxtgQf0Al3
-jzAMAjULHt1R4pi+/b2P6GyeA0RqgKrnnmI1OpE35UvQDzZsZpEHrzW60sIQtaol
-f/mdgtohbuuP+5xo4BL02AV/Fxlb9+NZ0v7vzPJqplR2Pqut4lwo/wFINpUul67P
-7wzstu6NgYHSy2s9zLydyib80DNHPsOLQSbBbBJuL14gFS76xiF/q7f7Doxs8gD4
-enFhNkQi5cz5Hx5ynx0VH/5qsSHmSub6evJk8CkQSu7PO/tITiVT3ZcAk94dqVl9
-WrWJpOrZZeFwbW3wCGNa+n7g0YiGmJg36ZDPVVIGxrIz7JY9EFRfxTDAtPo3NIAB
-Z5v77G7gwpjI7JupHFm8oYRgU6pNA4OiOIA4BHxl5xGsUTfUzIy2D2iAINUuSbz4
-E0RZT6d3vZOta+G3I9L136alK0r+90DQzYWSrKLXqLa0L+3pgWhpzjaJ6eqNFiWt
-/CWkWPn3AA5TZE4JpAoI
-=TssC
+iQIcBAEBAgAGBQJOM3xjAAoJEC8ZTXQF1qEPr80P/0FR8SpDrRP4hauhvpx1799J
+Z+n8otn2Eay7yQ1fU5IvNzVbksu4s3qSgFtOdN5CJ7Bb1JD3Af1bu0fJ2o6fEZ+I
+ESICNMOvQPeDPnTQytIJfcQ1qQhuol5ExN7y5dTMPFQU8hzoBPKFICzEhfdKKFau
+EaS/AXzTO+cWKTiHxC6PF3k3McZdKbjJkRRKhdV5vvHHIOwxnt+B9fxyhhApCgFE
+CXxB8tzcE6KQGNwNJjuk8UnY/Zo/yvl5fY6n6CvQAs0sMMSWwziR1urNGlmAfoOz
+b5ACLdcC6yNpeFQMCY8WlJoyszZ6gNWM2HfnVGsFsr9+Oab/pJQK/rf4ajsz/N2H
+it9Ypl/qq+DmRZmXmCDrg8v7cxDnikPGv8O+i2ZPovEnn1vovF9vrlwLLc0OpR1x
+2tYy0QuwoAQRmfac0Q0Z4smpEg1iPpahz6isnIEk68r3QYzEn5QBKLsn3fpS7iCd
+X225zw5nrQ5psxoy4PUkXY94yyoO7ugKQ78nCjH6UjRAgToGj60vW95vTnInqhSQ
+x0toUOzCpDz06FYA9DSTC4oZOEJO3N50OxH5wG3NXjDnIC65GfHqq3nRzr3pa6/k
+66PdW1JEbjpgw2FDDktxdSIKGhUhyLsnNaUpEwviDC4fakWEBQBRjBpdAoOY1LiN
+UByXUmuW3m6jGXwgWTLi
+=uzJg
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.5.15.ebuild b/dev-db/mysql/mysql-5.5.15.ebuild
new file mode 100644
index 0000000..83eb93b
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.15.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+
+EAPI="2"
+
+MY_EXTRAS_VER="20110713-0702Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-09-22  3:32 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-09-22  3:32 UTC (permalink / raw
  To: gentoo-commits

commit:     520e3eabbc8b9ab3b074e99ad0e7c5c4bf526ded
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 03:32:48 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 03:32:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=520e3eab

Bumped mysql to the 5.1.59 release.

(Portage version: 2.2.0_alpha59/git/Linux x86_64, unsigned Manifest commit)

---
 dev-db/mysql/ChangeLog           |    5 +
 dev-db/mysql/Manifest            |   24 +---
 dev-db/mysql/mysql-5.1.59.ebuild |  261 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 269 insertions(+), 21 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 65a5145..b09219a 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.1.59 (22 Sep 2011)
+
+  22 Sep 2011; <atlantis@gentoo.org> +mysql-5.1.59.ebuild:
+  Bumped mysql to the 5.1.59 release.
+
 *mysql-5.5.15 (30 Jul 2011)
 
   30 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 66aa3f8..3ff7b7d 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
@@ -8,6 +5,7 @@ AUX my.cnf-5.1 4199 RMD160 c12797534dd8273d1640844b4813ec7307911cef SHA1 5845dca
 AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12
 DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 SHA1 10fffc7672a469af4a7fd980922b04d7ba0143ba SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55
 DIST mysql-5.1.58.tar.gz 24333490 RMD160 199729c701c764cd22584c2b952230c07d0f31a6 SHA1 cfd70bee07ad99576eecde01785b7b2a74ec87ab SHA256 3c69562399655fc62d1424437e6ef59ef7c1ed225f940f81558f549b803f3fd7
+DIST mysql-5.1.59.tar.gz 24325443 RMD160 bbc54a2fc0eb3657f297ac097e9374c98e90442e SHA1 1d425a421edc94fba616f1986a16bdc9d0b5c193 SHA256 f87b99b73c0d936ed892326ebd4c90b1d5c7d5d2ac8832fc62f538db99fb04f7
 DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5
 DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
 DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738
@@ -19,27 +17,11 @@ DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a781549
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
 EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
 EBUILD mysql-5.1.58-r1.ebuild 8718 RMD160 7f1869a8efa6e9b5e8691e529d2eac4e9f00b845 SHA1 1b98f9347b294fc5c2aee7d42914854c30a92c47 SHA256 0fc52351fb7e2cfc0ff1c0e1d5ed854ad43a2da5468713f72b5659cbadd5eb12
+EBUILD mysql-5.1.59.ebuild 8718 RMD160 7f1869a8efa6e9b5e8691e529d2eac4e9f00b845 SHA1 1b98f9347b294fc5c2aee7d42914854c30a92c47 SHA256 0fc52351fb7e2cfc0ff1c0e1d5ed854ad43a2da5468713f72b5659cbadd5eb12
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.5.15.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-MISC ChangeLog 7436 RMD160 854c902ae3f26132efca76f0935443ef41cf6173 SHA1 c2c3c4fb731d32e9a7384bf749152f7bb10658f8 SHA256 9a101cc93a637e329e8027a78ba5ee371279b2aaac42f59e47fb5e1b2f2bf6d0
+MISC ChangeLog 7563 RMD160 a3c96486c5f135422d760e8ff0b26fb4e8983253 SHA1 e4196da9b41cb6c9bcba7146ccf58ce794b1a73c SHA256 236a66ce9dfe3f3602bf0e893f641bd13e062e2205f7709fa629aa90d25f4629
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJOM3xjAAoJEC8ZTXQF1qEPr80P/0FR8SpDrRP4hauhvpx1799J
-Z+n8otn2Eay7yQ1fU5IvNzVbksu4s3qSgFtOdN5CJ7Bb1JD3Af1bu0fJ2o6fEZ+I
-ESICNMOvQPeDPnTQytIJfcQ1qQhuol5ExN7y5dTMPFQU8hzoBPKFICzEhfdKKFau
-EaS/AXzTO+cWKTiHxC6PF3k3McZdKbjJkRRKhdV5vvHHIOwxnt+B9fxyhhApCgFE
-CXxB8tzcE6KQGNwNJjuk8UnY/Zo/yvl5fY6n6CvQAs0sMMSWwziR1urNGlmAfoOz
-b5ACLdcC6yNpeFQMCY8WlJoyszZ6gNWM2HfnVGsFsr9+Oab/pJQK/rf4ajsz/N2H
-it9Ypl/qq+DmRZmXmCDrg8v7cxDnikPGv8O+i2ZPovEnn1vovF9vrlwLLc0OpR1x
-2tYy0QuwoAQRmfac0Q0Z4smpEg1iPpahz6isnIEk68r3QYzEn5QBKLsn3fpS7iCd
-X225zw5nrQ5psxoy4PUkXY94yyoO7ugKQ78nCjH6UjRAgToGj60vW95vTnInqhSQ
-x0toUOzCpDz06FYA9DSTC4oZOEJO3N50OxH5wG3NXjDnIC65GfHqq3nRzr3pa6/k
-66PdW1JEbjpgw2FDDktxdSIKGhUhyLsnNaUpEwviDC4fakWEBQBRjBpdAoOY1LiN
-UByXUmuW3m6jGXwgWTLi
-=uzJg
------END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.1.59.ebuild b/dev-db/mysql/mysql-5.1.59.ebuild
new file mode 100644
index 0000000..3db6725
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.59.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
+
+EAPI="2"
+
+MY_EXTRAS_VER="20110721-0450Z"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		# bug 332565
+		if ! use extraengine ; then
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-09-27  2:26 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-09-27  2:26 UTC (permalink / raw
  To: gentoo-commits

commit:     ff50659ea01f50af8965befe18fab2bfd6bfeed6
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 09:43:52 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 09:45:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ff50659e

Bumped mysql to the 5.5.16 release.

(Portage version: 2.2.0_alpha59/git/Linux x86_64, unsigned Manifest commit)

---
 dev-db/mysql/ChangeLog           |    5 ++
 dev-db/mysql/Manifest            |    4 +-
 dev-db/mysql/mysql-5.5.16.ebuild |  120 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 128 insertions(+), 1 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index b09219a..520fb06 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.5.16 (22 Sep 2011)
+
+  22 Sep 2011; <atlantis@gentoo.org> +mysql-5.5.16.ebuild:
+  Bumped mysql to the 5.5.16 release.
+
 *mysql-5.1.59 (22 Sep 2011)
 
   22 Sep 2011; <atlantis@gentoo.org> +mysql-5.1.59.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 3ff7b7d..e32ae2e 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -10,6 +10,7 @@ DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba
 DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
 DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738
 DIST mysql-5.5.15.tar.gz 23774015 RMD160 536bdcc576583b2ca5b937c1db237dab02453237 SHA1 c89be9fe209d74b62a5e5e71e099dad1e0674a87 SHA256 bed15094b15bb89836c164b9d93eb8f3180caeb6017c8312e33a0c71eb9c5c82
+DIST mysql-5.5.16.tar.gz 23816508 RMD160 c1581d56b3bf254077c709375e7ae48a21748be1 SHA1 1a3372f9179bfc21cba0005c339a72f8e1458483 SHA256 38a88d5f3a4e0ab1c6722662a2c858c63fd98f0925691400282cb23f1ea29b70
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
@@ -22,6 +23,7 @@ EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.5.15.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
+EBUILD mysql-5.5.16.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-MISC ChangeLog 7563 RMD160 a3c96486c5f135422d760e8ff0b26fb4e8983253 SHA1 e4196da9b41cb6c9bcba7146ccf58ce794b1a73c SHA256 236a66ce9dfe3f3602bf0e893f641bd13e062e2205f7709fa629aa90d25f4629
+MISC ChangeLog 7690 RMD160 0eae36648ae0642aae2ca4e71fc7f150016a685e SHA1 1792f19484e5a0df27b1864ae8645e67f2a56f1f SHA256 b5b1636f2e87a8456d328a1d763a87ca587def9c6fbadcaa044f3f7956815c9f
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2

diff --git a/dev-db/mysql/mysql-5.5.16.ebuild b/dev-db/mysql/mysql-5.5.16.ebuild
new file mode 100644
index 0000000..83eb93b
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.16.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+
+EAPI="2"
+
+MY_EXTRAS_VER="20110713-0702Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-10-26 19:45 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-10-26 19:45 UTC (permalink / raw
  To: gentoo-commits

commit:     2651e481d51006cf7f3f32e3102825d95efee46d
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 02:28:00 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 02:28:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=2651e481

[dev-db/mysql] Use EAPI-4 to support the new Prefix support of the eclasses.

(Portage version: 2.2.0_alpha69/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 dev-db/mysql/ChangeLog                     |    4 ++++
 dev-db/mysql/Manifest                      |   28 ++++++++++++++++++++++++----
 dev-db/mysql/mysql-5.1.59.ebuild           |    2 +-
 dev-db/mysql/mysql-5.5.16.ebuild           |    2 +-
 dev-db/mysql/mysql-5.6.2_alpha_pre5.ebuild |    2 +-
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 520fb06..086ee78 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.1.59.ebuild, mysql-5.5.16.ebuild, mysql-5.6.2_alpha_pre5.ebuild:
+  [dev-db/mysql] Use EAPI-4 to support the new Prefix support of the eclasses.
+
 *mysql-5.5.16 (22 Sep 2011)
 
   22 Sep 2011; <atlantis@gentoo.org> +mysql-5.5.16.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index e32ae2e..8639128 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
@@ -18,12 +21,29 @@ DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a781549
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
 EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
 EBUILD mysql-5.1.58-r1.ebuild 8718 RMD160 7f1869a8efa6e9b5e8691e529d2eac4e9f00b845 SHA1 1b98f9347b294fc5c2aee7d42914854c30a92c47 SHA256 0fc52351fb7e2cfc0ff1c0e1d5ed854ad43a2da5468713f72b5659cbadd5eb12
-EBUILD mysql-5.1.59.ebuild 8718 RMD160 7f1869a8efa6e9b5e8691e529d2eac4e9f00b845 SHA1 1b98f9347b294fc5c2aee7d42914854c30a92c47 SHA256 0fc52351fb7e2cfc0ff1c0e1d5ed854ad43a2da5468713f72b5659cbadd5eb12
+EBUILD mysql-5.1.59.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a2755e52f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a57512c78a110e00d205f6548859d53e790b994257494f5f1a9e6951
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.5.15.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
-EBUILD mysql-5.5.16.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
-EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
-MISC ChangeLog 7690 RMD160 0eae36648ae0642aae2ca4e71fc7f150016a685e SHA1 1792f19484e5a0df27b1864ae8645e67f2a56f1f SHA256 b5b1636f2e87a8456d328a1d763a87ca587def9c6fbadcaa044f3f7956815c9f
+EBUILD mysql-5.5.16.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
+EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
+MISC ChangeLog 7912 RMD160 55bc4f7534224965a016a5812957fb92d1d83cb1 SHA1 360e2a096e96ae511c30c146bc342a611c6ddd52 SHA256 f2e0994b4d902addf3f95ab4c1d7d6861dcca0af728ec1ea42a7e70a31b06afd
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOph6wAAoJEC8ZTXQF1qEPspcQAKmCwZMGB2WdgnfgmldjI/he
+WuqaYYWFnXdi73RWJUdR1nb2JZix5dZ99QFBh+J1WD9/Tc7v/QYlm/zSUTyZQYhD
+vrKMR9OEKg3VL14IMKPIDc0gtP3QYrGw9PUSWa56wRLP3FKQSKg/j3RJMpzspqrz
+nuEzALlwHGqUmzYh6w4i88RDH/37kBh/x0oMVHhLU2Rm0uC1zX9Io2qZAM1wCaOl
+z7LqYucgYs9l4CS7TUWfvO7bSyto54ag0+/rigrhRvI0Um6EJRVb343rFWGtvgjN
+dBDSTv2HRfx+y7aRj09gY1nrs9CHVlWQHMTzCZh75cYbX8V9fO+sDehRi8CUj+hI
+FcB2H2pBkjss1PVeJnyMGePq2dEpmJgjGrB++HnpcReytqUpe9f77LqTz9sINMxi
+RW1Ichp8P9WwZ/JGULO22pPNqcKpHNqe557EtecWOQ8WNbNscb0ck+1UuZs8hBPy
+xMKXskJCfVLPNgS8wjyXutPkX5bmZWWgd55RvawNhXOIKiP376kbKsL0pe3a+cP4
+w97u6bid5XeRPJVAlKu4/klRp8LjvOKv7xsnGda3vxpYCktUeApCNZfHzXm6lWpF
+03H2lsLVvveUXY/eeZOUEzyMHQtDF9LXG10VflHGEiT2ZFP89472yM/XZTiH1t/6
+Ly/bfxsqBsBQEVfzxQoR
+=GZmZ
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.1.59.ebuild b/dev-db/mysql/mysql-5.1.59.ebuild
index 3db6725..3cbd44c 100644
--- a/dev-db/mysql/mysql-5.1.59.ebuild
+++ b/dev-db/mysql/mysql-5.1.59.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
 
-EAPI="2"
+EAPI="4"
 
 MY_EXTRAS_VER="20110721-0450Z"
 # PBXT

diff --git a/dev-db/mysql/mysql-5.5.16.ebuild b/dev-db/mysql/mysql-5.5.16.ebuild
index 83eb93b..9bb1440 100644
--- a/dev-db/mysql/mysql-5.5.16.ebuild
+++ b/dev-db/mysql/mysql-5.5.16.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
 
-EAPI="2"
+EAPI="4"
 
 MY_EXTRAS_VER="20110713-0702Z"
 MY_PV="${PV//_alpha_pre/-m}"

diff --git a/dev-db/mysql/mysql-5.6.2_alpha_pre5.ebuild b/dev-db/mysql/mysql-5.6.2_alpha_pre5.ebuild
index 2fa37b6..610aa95 100644
--- a/dev-db/mysql/mysql-5.6.2_alpha_pre5.ebuild
+++ b/dev-db/mysql/mysql-5.6.2_alpha_pre5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
 
-EAPI="2"
+EAPI="4"
 
 MY_EXTRAS_VER="live"
 MY_PV="${PV//_alpha_pre/-m}"



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-10-26 19:45 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-10-26 19:45 UTC (permalink / raw
  To: gentoo-commits

commit:     39658373f6977db52b3e8c68558b405835757a65
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 19:43:45 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 19:43:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=39658373

[dev-db/mysql] Bumped to the 5.5.17 version.

(Portage version: 2.2.0_alpha69/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 dev-db/mysql/ChangeLog           |    6 ++
 dev-db/mysql/Manifest            |   30 +++++-----
 dev-db/mysql/mysql-5.5.17.ebuild |  120 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 142 insertions(+), 14 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 086ee78..c2bf7c6 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.5.17 (26 Oct 2011)
+
+  26 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +mysql-5.5.17.ebuild:
+  [dev-db/mysql] Bumped to the 5.5.17 version.
+
   25 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   mysql-5.1.59.ebuild, mysql-5.5.16.ebuild, mysql-5.6.2_alpha_pre5.ebuild:
   [dev-db/mysql] Use EAPI-4 to support the new Prefix support of the eclasses.

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 8639128..a1a4326 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -14,6 +14,7 @@ DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da
 DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738
 DIST mysql-5.5.15.tar.gz 23774015 RMD160 536bdcc576583b2ca5b937c1db237dab02453237 SHA1 c89be9fe209d74b62a5e5e71e099dad1e0674a87 SHA256 bed15094b15bb89836c164b9d93eb8f3180caeb6017c8312e33a0c71eb9c5c82
 DIST mysql-5.5.16.tar.gz 23816508 RMD160 c1581d56b3bf254077c709375e7ae48a21748be1 SHA1 1a3372f9179bfc21cba0005c339a72f8e1458483 SHA256 38a88d5f3a4e0ab1c6722662a2c858c63fd98f0925691400282cb23f1ea29b70
+DIST mysql-5.5.17.tar.gz 24213337 RMD160 6bf00da1df03e869e3cc6c18cd03d5634838688e SHA1 de32ea3c3bb1b9cce49230425c27e12a78f80533 SHA256 8b3c66d7ddb2c5b5fcda28964c1fcd83128d1d48efd7fb2b23338819a50911f1
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
@@ -27,23 +28,24 @@ EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.5.15.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.5.16.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
+EBUILD mysql-5.5.17.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
-MISC ChangeLog 7912 RMD160 55bc4f7534224965a016a5812957fb92d1d83cb1 SHA1 360e2a096e96ae511c30c146bc342a611c6ddd52 SHA256 f2e0994b4d902addf3f95ab4c1d7d6861dcca0af728ec1ea42a7e70a31b06afd
+MISC ChangeLog 8080 RMD160 b84fec5ea42171cbf4c209c0d2253431bec266e6 SHA1 ae568fffa47ccb137a734d9412dd287027789b64 SHA256 402571497cc83abb35b2072aeacf55071fffde8d4327ad879e05329a2c81664d
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOph6wAAoJEC8ZTXQF1qEPspcQAKmCwZMGB2WdgnfgmldjI/he
-WuqaYYWFnXdi73RWJUdR1nb2JZix5dZ99QFBh+J1WD9/Tc7v/QYlm/zSUTyZQYhD
-vrKMR9OEKg3VL14IMKPIDc0gtP3QYrGw9PUSWa56wRLP3FKQSKg/j3RJMpzspqrz
-nuEzALlwHGqUmzYh6w4i88RDH/37kBh/x0oMVHhLU2Rm0uC1zX9Io2qZAM1wCaOl
-z7LqYucgYs9l4CS7TUWfvO7bSyto54ag0+/rigrhRvI0Um6EJRVb343rFWGtvgjN
-dBDSTv2HRfx+y7aRj09gY1nrs9CHVlWQHMTzCZh75cYbX8V9fO+sDehRi8CUj+hI
-FcB2H2pBkjss1PVeJnyMGePq2dEpmJgjGrB++HnpcReytqUpe9f77LqTz9sINMxi
-RW1Ichp8P9WwZ/JGULO22pPNqcKpHNqe557EtecWOQ8WNbNscb0ck+1UuZs8hBPy
-xMKXskJCfVLPNgS8wjyXutPkX5bmZWWgd55RvawNhXOIKiP376kbKsL0pe3a+cP4
-w97u6bid5XeRPJVAlKu4/klRp8LjvOKv7xsnGda3vxpYCktUeApCNZfHzXm6lWpF
-03H2lsLVvveUXY/eeZOUEzyMHQtDF9LXG10VflHGEiT2ZFP89472yM/XZTiH1t/6
-Ly/bfxsqBsBQEVfzxQoR
-=GZmZ
+iQIcBAEBAgAGBQJOqGLxAAoJEC8ZTXQF1qEPkkIP/0sdIEDLQHiUnzFsMvyENLFB
+tZALrC1WtZ5xCIE/iwGzmH/t5F4LBIKhEKR0AQ2RvWqD2pPodWOSgPalQ/vI6bpj
+yJU242GOXwfdVJMIRr8vKrerjrswwY17gMavxgn+8/P8BkNfEqAbusD09f5pf4+X
+RXXqmGIMtpyzRQOnGabTogzJfC0SvgPVG8T9e/tyGzxPJqpmQeB/0wyNt2z0vc2n
+9o9ehtdz8afEJPyNHTygzx+OIZ32J48y7GnIpTB0Eu9DdbTKLX5UtWkWj+eKGr7y
+YCElMz7y+QLf5R5iucx9qNZ7zXPHAos5zVuC9QAX4XHaSxkbhU0Ssbe/mSjog1y9
+a/zr2Z6mXKboB6smYIw02Vcqbx/yw/aQeZTS+pOKjO9EaE5ukfPEimQCoWEdXhEE
+G98TTVQJgRclBHywNXDmo7UAUOx/VPEhjDJzGtlKAmhsfiElWUZgH7hW/UPN9fH4
+8G7/ujPx5Zlod1A6ztCwyInDxJXQzITyqBBVgDQc/D00/ObVqTaOmzVMCZfEIHlb
+zNjM9x51qblQ0X7hJ3BHuuiJF8B2eiSgzBFXLY1WyKMwi0LWOv2WRDSJ4nwoClcb
+7dbqVpelEN/qL1oVo3yspek38JJzO/ZeD4qdReAVTH43fNNkVhpOd3BSxNYgosi8
+22+66dUafuwW2uZJ2IuX
+=JeWS
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.5.17.ebuild b/dev-db/mysql/mysql-5.5.17.ebuild
new file mode 100644
index 0000000..9bb1440
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.17.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20110713-0702Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-11-19  0:47 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2011-11-19  0:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f2f1d834febae58a5aaa3feff2ad36fb79352743
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Sat Nov 19 00:47:08 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 00:47:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f2f1d834

Version bump.

(Portage version: 2.2.0_alpha74/git/Linux x86_64, unsigned Manifest commit)

---
 dev-db/mysql/ChangeLog           |    5 +
 dev-db/mysql/Manifest            |   25 +---
 dev-db/mysql/mysql-5.1.60.ebuild |  261 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 270 insertions(+), 21 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index c2bf7c6..9053c76 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.1.60 (19 Nov 2011)
+
+  19 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.60.ebuild:
+  Version bump.
+
 *mysql-5.5.17 (26 Oct 2011)
 
   26 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index a1a4326..19b1f34 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
@@ -9,6 +6,7 @@ AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f
 DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 SHA1 10fffc7672a469af4a7fd980922b04d7ba0143ba SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55
 DIST mysql-5.1.58.tar.gz 24333490 RMD160 199729c701c764cd22584c2b952230c07d0f31a6 SHA1 cfd70bee07ad99576eecde01785b7b2a74ec87ab SHA256 3c69562399655fc62d1424437e6ef59ef7c1ed225f940f81558f549b803f3fd7
 DIST mysql-5.1.59.tar.gz 24325443 RMD160 bbc54a2fc0eb3657f297ac097e9374c98e90442e SHA1 1d425a421edc94fba616f1986a16bdc9d0b5c193 SHA256 f87b99b73c0d936ed892326ebd4c90b1d5c7d5d2ac8832fc62f538db99fb04f7
+DIST mysql-5.1.60.tar.gz 24408313 RMD160 7bbfce4fecc2a8e1ca081169e70c1a298ab1b75a SHA1 26ae4d2f7e7066644eb343ab519cbef1626069c2 SHA256 2829fcb7393bac85925090b286b1f9c3cd3fbbf8e7f35796ef4131322509aa53
 DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5
 DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
 DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738
@@ -18,11 +16,13 @@ DIST mysql-5.5.17.tar.gz 24213337 RMD160 6bf00da1df03e869e3cc6c18cd03d5634838688
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
+DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
 EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
 EBUILD mysql-5.1.58-r1.ebuild 8718 RMD160 7f1869a8efa6e9b5e8691e529d2eac4e9f00b845 SHA1 1b98f9347b294fc5c2aee7d42914854c30a92c47 SHA256 0fc52351fb7e2cfc0ff1c0e1d5ed854ad43a2da5468713f72b5659cbadd5eb12
 EBUILD mysql-5.1.59.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a2755e52f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a57512c78a110e00d205f6548859d53e790b994257494f5f1a9e6951
+EBUILD mysql-5.1.60.ebuild 8718 RMD160 b93a58ca719553e9e644394a102f1db34d277d22 SHA1 67ec0ef859b7671f1bfd023efecd3332d943e21d SHA256 878303790f45832461209587a16a249e86062485e81edb8bf1e8e2e082ac77ff
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 be21bf4d77fd21dca965794d899c04f83607cfe7 SHA1 dcd690b860a3b6a8e06f8327af92c22cd90fc5b7 SHA256 0dbb68e63c8b7ecfeb24449030b38076df495bc3e3878674c5f6f9fe5a7e254b
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
@@ -30,22 +30,5 @@ EBUILD mysql-5.5.15.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f
 EBUILD mysql-5.5.16.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.5.17.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
-MISC ChangeLog 8080 RMD160 b84fec5ea42171cbf4c209c0d2253431bec266e6 SHA1 ae568fffa47ccb137a734d9412dd287027789b64 SHA256 402571497cc83abb35b2072aeacf55071fffde8d4327ad879e05329a2c81664d
+MISC ChangeLog 8201 RMD160 3978469716f52a7e9e7264364d2169c78c58342f SHA1 594d3a51d9471b786e6933e7c9fd2584788643a5 SHA256 c4cfa668cc8e570010bd7c965c722a1318a583ae02390af9c7db1fb9173de155
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBAgAGBQJOqGLxAAoJEC8ZTXQF1qEPkkIP/0sdIEDLQHiUnzFsMvyENLFB
-tZALrC1WtZ5xCIE/iwGzmH/t5F4LBIKhEKR0AQ2RvWqD2pPodWOSgPalQ/vI6bpj
-yJU242GOXwfdVJMIRr8vKrerjrswwY17gMavxgn+8/P8BkNfEqAbusD09f5pf4+X
-RXXqmGIMtpyzRQOnGabTogzJfC0SvgPVG8T9e/tyGzxPJqpmQeB/0wyNt2z0vc2n
-9o9ehtdz8afEJPyNHTygzx+OIZ32J48y7GnIpTB0Eu9DdbTKLX5UtWkWj+eKGr7y
-YCElMz7y+QLf5R5iucx9qNZ7zXPHAos5zVuC9QAX4XHaSxkbhU0Ssbe/mSjog1y9
-a/zr2Z6mXKboB6smYIw02Vcqbx/yw/aQeZTS+pOKjO9EaE5ukfPEimQCoWEdXhEE
-G98TTVQJgRclBHywNXDmo7UAUOx/VPEhjDJzGtlKAmhsfiElWUZgH7hW/UPN9fH4
-8G7/ujPx5Zlod1A6ztCwyInDxJXQzITyqBBVgDQc/D00/ObVqTaOmzVMCZfEIHlb
-zNjM9x51qblQ0X7hJ3BHuuiJF8B2eiSgzBFXLY1WyKMwi0LWOv2WRDSJ4nwoClcb
-7dbqVpelEN/qL1oVo3yspek38JJzO/ZeD4qdReAVTH43fNNkVhpOd3BSxNYgosi8
-22+66dUafuwW2uZJ2IuX
-=JeWS
------END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.1.60.ebuild b/dev-db/mysql/mysql-5.1.60.ebuild
new file mode 100644
index 0000000..c640e0d
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.60.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20111118-2347Z"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		# bug 332565
+		if ! use extraengine ; then
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-11-20  0:27 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2011-11-20  0:27 UTC (permalink / raw
  To: gentoo-commits

commit:     55b26b13507390320fef2cc00c69890a2abb7789
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Sun Nov 20 00:27:46 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 00:27:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=55b26b13

Version bump.

(Portage version: 2.2.0_alpha74/git/Linux x86_64, unsigned Manifest commit)

---
 dev-db/mysql/ChangeLog           |    5 ++
 dev-db/mysql/Manifest            |    4 +-
 dev-db/mysql/mysql-5.5.18.ebuild |  120 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 128 insertions(+), 1 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 9053c76..d1d9240 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.5.18 (20 Nov 2011)
+
+  20 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.5.18.ebuild:
+  Version bump.
+
 *mysql-5.1.60 (19 Nov 2011)
 
   19 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.60.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 19b1f34..f7f88e1 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -13,6 +13,7 @@ DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c
 DIST mysql-5.5.15.tar.gz 23774015 RMD160 536bdcc576583b2ca5b937c1db237dab02453237 SHA1 c89be9fe209d74b62a5e5e71e099dad1e0674a87 SHA256 bed15094b15bb89836c164b9d93eb8f3180caeb6017c8312e33a0c71eb9c5c82
 DIST mysql-5.5.16.tar.gz 23816508 RMD160 c1581d56b3bf254077c709375e7ae48a21748be1 SHA1 1a3372f9179bfc21cba0005c339a72f8e1458483 SHA256 38a88d5f3a4e0ab1c6722662a2c858c63fd98f0925691400282cb23f1ea29b70
 DIST mysql-5.5.17.tar.gz 24213337 RMD160 6bf00da1df03e869e3cc6c18cd03d5634838688e SHA1 de32ea3c3bb1b9cce49230425c27e12a78f80533 SHA256 8b3c66d7ddb2c5b5fcda28964c1fcd83128d1d48efd7fb2b23338819a50911f1
+DIST mysql-5.5.18.tar.gz 24264064 RMD160 5a10dac0d875cf23e6990e46965f547299c0d6cb SHA1 c85f4c082026f88f9354e47e6dc35a505cc89d18 SHA256 874bc84df5602a6d2af013b97deda63376cb0c7b1ad98169087e979d0320f9db
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
@@ -29,6 +30,7 @@ EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f
 EBUILD mysql-5.5.15.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.5.16.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.5.17.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
+EBUILD mysql-5.5.18.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
-MISC ChangeLog 8201 RMD160 3978469716f52a7e9e7264364d2169c78c58342f SHA1 594d3a51d9471b786e6933e7c9fd2584788643a5 SHA256 c4cfa668cc8e570010bd7c965c722a1318a583ae02390af9c7db1fb9173de155
+MISC ChangeLog 8322 RMD160 946cac6c3c96d484ae7ce578cc8f7d43637267b6 SHA1 b62a0b6ca82d6237b206676b998214e366b1ad9d SHA256 b97b798bdbb527c482da48c933d6eb2a7fcdd3d380c57ec6ce64c349d9b79771
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2

diff --git a/dev-db/mysql/mysql-5.5.18.ebuild b/dev-db/mysql/mysql-5.5.18.ebuild
new file mode 100644
index 0000000..9bb1440
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.18.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20110713-0702Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2011-12-27  7:15 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2011-12-27  7:15 UTC (permalink / raw
  To: gentoo-commits

commit:     134509b12b21e08137cead741ea34f4342ec5558
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 21:25:20 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 21:25:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=134509b1

Bump.

(Portage version: 2.2.0_alpha79/git/Linux x86_64, unsigned Manifest commit)

---
 dev-db/mysql/Manifest            |    2 +
 dev-db/mysql/mysql-5.5.19.ebuild |  129 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+), 0 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index f7f88e1..cc2dcb4 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -14,6 +14,7 @@ DIST mysql-5.5.15.tar.gz 23774015 RMD160 536bdcc576583b2ca5b937c1db237dab0245323
 DIST mysql-5.5.16.tar.gz 23816508 RMD160 c1581d56b3bf254077c709375e7ae48a21748be1 SHA1 1a3372f9179bfc21cba0005c339a72f8e1458483 SHA256 38a88d5f3a4e0ab1c6722662a2c858c63fd98f0925691400282cb23f1ea29b70
 DIST mysql-5.5.17.tar.gz 24213337 RMD160 6bf00da1df03e869e3cc6c18cd03d5634838688e SHA1 de32ea3c3bb1b9cce49230425c27e12a78f80533 SHA256 8b3c66d7ddb2c5b5fcda28964c1fcd83128d1d48efd7fb2b23338819a50911f1
 DIST mysql-5.5.18.tar.gz 24264064 RMD160 5a10dac0d875cf23e6990e46965f547299c0d6cb SHA1 c85f4c082026f88f9354e47e6dc35a505cc89d18 SHA256 874bc84df5602a6d2af013b97deda63376cb0c7b1ad98169087e979d0320f9db
+DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411375c285ae SHA1 f6a3b5fb5a10f8110fd85463e1a25fb314e60c24 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
@@ -31,6 +32,7 @@ EBUILD mysql-5.5.15.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f
 EBUILD mysql-5.5.16.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.5.17.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.5.18.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
+EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f68baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
 MISC ChangeLog 8322 RMD160 946cac6c3c96d484ae7ce578cc8f7d43637267b6 SHA1 b62a0b6ca82d6237b206676b998214e366b1ad9d SHA256 b97b798bdbb527c482da48c933d6eb2a7fcdd3d380c57ec6ce64c349d9b79771
 MISC metadata.xml 1144 RMD160 2e8b432149e8467becaf1e52884437a80d31673d SHA1 b516bc717f95725fe9e6486b6101f42e42007909 SHA256 e84ceb0d15ac0384c33c6a6451ccf4902f7c2aa9d227b931c12c25695e4b62a2

diff --git a/dev-db/mysql/mysql-5.5.19.ebuild b/dev-db/mysql/mysql-5.5.19.ebuild
new file mode 100644
index 0000000..896d901
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.19.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20110713-0702Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-01-31  9:29 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2012-01-31  9:29 UTC (permalink / raw
  To: gentoo-commits

commit:     6793ce9e3a9a78606d98f6c0972243a4feb19acc
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 09:29:20 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 09:29:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6793ce9e

Version bump, passes all tests.

(Portage version: 2.2.0_alpha84/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 dev-db/mysql/ChangeLog           |    9 +-
 dev-db/mysql/Manifest            |    4 +
 dev-db/mysql/mysql-5.1.61.ebuild |  261 ++++++++++++++++++++++++++++++++++++++
 dev-db/mysql/mysql-5.5.20.ebuild |  129 +++++++++++++++++++
 4 files changed, 402 insertions(+), 1 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 5e8cd83..1a52010 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for dev-db/mysql
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.1.61 (31 Jan 2012)
+*mysql-5.5.20 (31 Jan 2012)
+
+  31 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.61.ebuild,
+  +mysql-5.5.20.ebuild:
+  Version bump, passes all tests.
+
   20 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   mysql-5.1.58-r1.ebuild, mysql-5.5.10.ebuild, mysql-5.5.12.ebuild,
   mysql-5.5.14.ebuild, mysql-5.5.15.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index d995128..bd02b12 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -7,6 +7,7 @@ DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef0
 DIST mysql-5.1.58.tar.gz 24333490 RMD160 199729c701c764cd22584c2b952230c07d0f31a6 SHA1 cfd70bee07ad99576eecde01785b7b2a74ec87ab SHA256 3c69562399655fc62d1424437e6ef59ef7c1ed225f940f81558f549b803f3fd7
 DIST mysql-5.1.59.tar.gz 24325443 RMD160 bbc54a2fc0eb3657f297ac097e9374c98e90442e SHA1 1d425a421edc94fba616f1986a16bdc9d0b5c193 SHA256 f87b99b73c0d936ed892326ebd4c90b1d5c7d5d2ac8832fc62f538db99fb04f7
 DIST mysql-5.1.60.tar.gz 24408313 RMD160 7bbfce4fecc2a8e1ca081169e70c1a298ab1b75a SHA1 26ae4d2f7e7066644eb343ab519cbef1626069c2 SHA256 2829fcb7393bac85925090b286b1f9c3cd3fbbf8e7f35796ef4131322509aa53
+DIST mysql-5.1.61.tar.gz 24462261 RMD160 392b7394a0f7821134f177a3ba4580a29d60e3f4 SHA1 a528cf822af84601dd95d3e1cb3277815685ac65 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918
 DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5
 DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
 DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738
@@ -15,6 +16,7 @@ DIST mysql-5.5.16.tar.gz 23816508 RMD160 c1581d56b3bf254077c709375e7ae48a21748be
 DIST mysql-5.5.17.tar.gz 24213337 RMD160 6bf00da1df03e869e3cc6c18cd03d5634838688e SHA1 de32ea3c3bb1b9cce49230425c27e12a78f80533 SHA256 8b3c66d7ddb2c5b5fcda28964c1fcd83128d1d48efd7fb2b23338819a50911f1
 DIST mysql-5.5.18.tar.gz 24264064 RMD160 5a10dac0d875cf23e6990e46965f547299c0d6cb SHA1 c85f4c082026f88f9354e47e6dc35a505cc89d18 SHA256 874bc84df5602a6d2af013b97deda63376cb0c7b1ad98169087e979d0320f9db
 DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411375c285ae SHA1 f6a3b5fb5a10f8110fd85463e1a25fb314e60c24 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f
+DIST mysql-5.5.20.tar.gz 24305842 RMD160 2bdecbe6f61497f3d8c9255610d713f6f4e1164b SHA1 d5066327c41ac5a338ca0bb748e50bc4e1902442 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
@@ -25,6 +27,7 @@ EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65
 EBUILD mysql-5.1.58-r1.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a2755e52f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a57512c78a110e00d205f6548859d53e790b994257494f5f1a9e6951
 EBUILD mysql-5.1.59.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a2755e52f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a57512c78a110e00d205f6548859d53e790b994257494f5f1a9e6951
 EBUILD mysql-5.1.60.ebuild 8718 RMD160 b93a58ca719553e9e644394a102f1db34d277d22 SHA1 67ec0ef859b7671f1bfd023efecd3332d943e21d SHA256 878303790f45832461209587a16a249e86062485e81edb8bf1e8e2e082ac77ff
+EBUILD mysql-5.1.61.ebuild 8718 RMD160 b93a58ca719553e9e644394a102f1db34d277d22 SHA1 67ec0ef859b7671f1bfd023efecd3332d943e21d SHA256 878303790f45832461209587a16a249e86062485e81edb8bf1e8e2e082ac77ff
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
@@ -33,6 +36,7 @@ EBUILD mysql-5.5.16.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46
 EBUILD mysql-5.5.17.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.5.18.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f68baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01
+EBUILD mysql-5.5.20.ebuild 4234 RMD160 26eaee55ff2e336fdad5de7a8833b845c7448bec SHA1 b1450bb0baa3064d8a442b240a2f63e9703254d7 SHA256 39d742b618f84374097279fc3ce11017b0a2dd613046ba262c5dbe07b65cd2dc
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
 MISC ChangeLog 8557 RMD160 bb446dda1050e319c96c6a38ce32308345429b71 SHA1 4f5721841f563f980e0eda3a1e57163daad52de8 SHA256 07b9af8932bb03c3412e353086da17c11c8a271347ec89264466303857bb78d9
 MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 SHA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503

diff --git a/dev-db/mysql/mysql-5.1.61.ebuild b/dev-db/mysql/mysql-5.1.61.ebuild
new file mode 100644
index 0000000..0c85a89
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.61.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20111118-2347Z"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		# bug 332565
+		if ! use extraengine ; then
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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/mysql/mysql-5.5.20.ebuild b/dev-db/mysql/mysql-5.5.20.ebuild
new file mode 100644
index 0000000..18ef035
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.20.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20111118-2347Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-02-02  2:50 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2012-02-02  2:50 UTC (permalink / raw
  To: gentoo-commits

commit:     29ff3c75779d22026f09dd5912689727ff95b43c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 02:46:15 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 02:46:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=29ff3c75

Port test disable from main tree back.

(Portage version: 2.2.0_alpha84/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 dev-db/mysql/Manifest            |    6 +++---
 dev-db/mysql/mysql-5.1.61.ebuild |   10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index bd02b12..e63be05 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -27,7 +27,7 @@ EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65
 EBUILD mysql-5.1.58-r1.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a2755e52f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a57512c78a110e00d205f6548859d53e790b994257494f5f1a9e6951
 EBUILD mysql-5.1.59.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a2755e52f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a57512c78a110e00d205f6548859d53e790b994257494f5f1a9e6951
 EBUILD mysql-5.1.60.ebuild 8718 RMD160 b93a58ca719553e9e644394a102f1db34d277d22 SHA1 67ec0ef859b7671f1bfd023efecd3332d943e21d SHA256 878303790f45832461209587a16a249e86062485e81edb8bf1e8e2e082ac77ff
-EBUILD mysql-5.1.61.ebuild 8718 RMD160 b93a58ca719553e9e644394a102f1db34d277d22 SHA1 67ec0ef859b7671f1bfd023efecd3332d943e21d SHA256 878303790f45832461209587a16a249e86062485e81edb8bf1e8e2e082ac77ff
+EBUILD mysql-5.1.61.ebuild 8888 RMD160 418f097cc87e03c678872dd95ecdc2b44a2140b2 SHA1 abfaf4fa5bb10551db7b742e792e0f6c2d118c88 SHA256 0ea0d451bdd94314896fa8dbe167e38a37aafc7462807c6ede137c5b5e938708
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
@@ -36,7 +36,7 @@ EBUILD mysql-5.5.16.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46
 EBUILD mysql-5.5.17.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.5.18.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f68baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01
-EBUILD mysql-5.5.20.ebuild 4234 RMD160 26eaee55ff2e336fdad5de7a8833b845c7448bec SHA1 b1450bb0baa3064d8a442b240a2f63e9703254d7 SHA256 39d742b618f84374097279fc3ce11017b0a2dd613046ba262c5dbe07b65cd2dc
+EBUILD mysql-5.5.20.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
-MISC ChangeLog 8557 RMD160 bb446dda1050e319c96c6a38ce32308345429b71 SHA1 4f5721841f563f980e0eda3a1e57163daad52de8 SHA256 07b9af8932bb03c3412e353086da17c11c8a271347ec89264466303857bb78d9
+MISC ChangeLog 8748 RMD160 299e76c4a6ddd0066591c986231656da131eb51e SHA1 c12dd278dd8d9115384d9d9f8af76bf33bc1b1e8 SHA256 edc9a4c24a4930e75b06e8fd0fe0ba9d3ca4110738d57bbcbeb9e42f2a707c36
 MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 SHA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503

diff --git a/dev-db/mysql/mysql-5.1.61.ebuild b/dev-db/mysql/mysql-5.1.61.ebuild
index 0c85a89..9cdf8c2 100644
--- a/dev-db/mysql/mysql-5.1.61.ebuild
+++ b/dev-db/mysql/mysql-5.1.61.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.61.ebuild,v 1.2 2012/01/31 20:23:03 robbat2 Exp $
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 # This is often broken still
@@ -217,11 +217,15 @@ src_test() {
 			done
 		fi
 
-		# bug 332565
 		if ! use extraengine ; then
+			# bug 332565
 			for t in main.range ; do
 				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
 			done
+			# bug 401673
+			for t in federated.federated_plugin ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+			done
 		fi
 
 		# create directories because mysqladmin might make out of order



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-02-02  2:50 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2012-02-02  2:50 UTC (permalink / raw
  To: gentoo-commits

commit:     75d291c8451ffe55970938bd6698550ef0c4f07f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 02:47:47 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 02:47:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=75d291c8

Clean up old versions.

(Portage version: 2.2.0_alpha84/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 dev-db/mysql/Manifest               |   21 ---
 dev-db/mysql/mysql-5.1.58-r1.ebuild |  261 -----------------------------------
 dev-db/mysql/mysql-5.1.59.ebuild    |  261 -----------------------------------
 dev-db/mysql/mysql-5.1.60.ebuild    |  261 -----------------------------------
 dev-db/mysql/mysql-5.5.10.ebuild    |  119 ----------------
 dev-db/mysql/mysql-5.5.12.ebuild    |  119 ----------------
 dev-db/mysql/mysql-5.5.14.ebuild    |  120 ----------------
 dev-db/mysql/mysql-5.5.15.ebuild    |  120 ----------------
 dev-db/mysql/mysql-5.5.16.ebuild    |  120 ----------------
 dev-db/mysql/mysql-5.5.17.ebuild    |  120 ----------------
 dev-db/mysql/mysql-5.5.18.ebuild    |  120 ----------------
 11 files changed, 0 insertions(+), 1642 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index e63be05..8281a69 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -4,37 +4,16 @@ AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc799
 AUX my.cnf-5.1 4199 RMD160 c12797534dd8273d1640844b4813ec7307911cef SHA1 5845dcaf469bd95d918cc07b1ffc80e2bd4c5a68 SHA256 c50e38004c901d4921d00a5f458bcd191852262a93f3d9fbfb6b040186b1ec45
 AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12
 DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 SHA1 10fffc7672a469af4a7fd980922b04d7ba0143ba SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55
-DIST mysql-5.1.58.tar.gz 24333490 RMD160 199729c701c764cd22584c2b952230c07d0f31a6 SHA1 cfd70bee07ad99576eecde01785b7b2a74ec87ab SHA256 3c69562399655fc62d1424437e6ef59ef7c1ed225f940f81558f549b803f3fd7
-DIST mysql-5.1.59.tar.gz 24325443 RMD160 bbc54a2fc0eb3657f297ac097e9374c98e90442e SHA1 1d425a421edc94fba616f1986a16bdc9d0b5c193 SHA256 f87b99b73c0d936ed892326ebd4c90b1d5c7d5d2ac8832fc62f538db99fb04f7
-DIST mysql-5.1.60.tar.gz 24408313 RMD160 7bbfce4fecc2a8e1ca081169e70c1a298ab1b75a SHA1 26ae4d2f7e7066644eb343ab519cbef1626069c2 SHA256 2829fcb7393bac85925090b286b1f9c3cd3fbbf8e7f35796ef4131322509aa53
 DIST mysql-5.1.61.tar.gz 24462261 RMD160 392b7394a0f7821134f177a3ba4580a29d60e3f4 SHA1 a528cf822af84601dd95d3e1cb3277815685ac65 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918
-DIST mysql-5.5.10.tar.gz 23877968 RMD160 7f190513e38bbbcac21291e226de87b3b95a1ba4 SHA1 7e0b426d7a9ef0eaa6e2b2ea3e5fef1e1a078c5d SHA256 f4a0dae6d2626705ccede5126f2a3d45700195cb2568537c8b18bf1b604315a5
-DIST mysql-5.5.12.tar.gz 23681636 RMD160 e36d6a29e4f92eecfbbdac47d9f0d9a427446da3 SHA1 8a4f4c2b762676140722d414d694cddd9c1e3397 SHA256 ed99dee5893f8502c909dfc4f55447f0ab9b7ae23fd6df53e31067d25f5088fc
-DIST mysql-5.5.14.tar.gz 23772997 RMD160 1c84fc3967691e9eedd1b90df780a9d738a709c4 SHA1 3b17e20be4e8bcc0f94392fb444f4a09f80de2e4 SHA256 c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738
-DIST mysql-5.5.15.tar.gz 23774015 RMD160 536bdcc576583b2ca5b937c1db237dab02453237 SHA1 c89be9fe209d74b62a5e5e71e099dad1e0674a87 SHA256 bed15094b15bb89836c164b9d93eb8f3180caeb6017c8312e33a0c71eb9c5c82
-DIST mysql-5.5.16.tar.gz 23816508 RMD160 c1581d56b3bf254077c709375e7ae48a21748be1 SHA1 1a3372f9179bfc21cba0005c339a72f8e1458483 SHA256 38a88d5f3a4e0ab1c6722662a2c858c63fd98f0925691400282cb23f1ea29b70
-DIST mysql-5.5.17.tar.gz 24213337 RMD160 6bf00da1df03e869e3cc6c18cd03d5634838688e SHA1 de32ea3c3bb1b9cce49230425c27e12a78f80533 SHA256 8b3c66d7ddb2c5b5fcda28964c1fcd83128d1d48efd7fb2b23338819a50911f1
-DIST mysql-5.5.18.tar.gz 24264064 RMD160 5a10dac0d875cf23e6990e46965f547299c0d6cb SHA1 c85f4c082026f88f9354e47e6dc35a505cc89d18 SHA256 874bc84df5602a6d2af013b97deda63376cb0c7b1ad98169087e979d0320f9db
 DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411375c285ae SHA1 f6a3b5fb5a10f8110fd85463e1a25fb314e60c24 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f
 DIST mysql-5.5.20.tar.gz 24305842 RMD160 2bdecbe6f61497f3d8c9255610d713f6f4e1164b SHA1 d5066327c41ac5a338ca0bb748e50bc4e1902442 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
-DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
 EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
-EBUILD mysql-5.1.58-r1.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a2755e52f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a57512c78a110e00d205f6548859d53e790b994257494f5f1a9e6951
-EBUILD mysql-5.1.59.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a2755e52f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a57512c78a110e00d205f6548859d53e790b994257494f5f1a9e6951
-EBUILD mysql-5.1.60.ebuild 8718 RMD160 b93a58ca719553e9e644394a102f1db34d277d22 SHA1 67ec0ef859b7671f1bfd023efecd3332d943e21d SHA256 878303790f45832461209587a16a249e86062485e81edb8bf1e8e2e082ac77ff
 EBUILD mysql-5.1.61.ebuild 8888 RMD160 418f097cc87e03c678872dd95ecdc2b44a2140b2 SHA1 abfaf4fa5bb10551db7b742e792e0f6c2d118c88 SHA256 0ea0d451bdd94314896fa8dbe167e38a37aafc7462807c6ede137c5b5e938708
-EBUILD mysql-5.5.10.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
-EBUILD mysql-5.5.12.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
-EBUILD mysql-5.5.14.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
-EBUILD mysql-5.5.15.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
-EBUILD mysql-5.5.16.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
-EBUILD mysql-5.5.17.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
-EBUILD mysql-5.5.18.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f68baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01
 EBUILD mysql-5.5.20.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd

diff --git a/dev-db/mysql/mysql-5.1.58-r1.ebuild b/dev-db/mysql/mysql-5.1.58-r1.ebuild
deleted file mode 100644
index 3cbd44c..0000000
--- a/dev-db/mysql/mysql-5.1.58-r1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20110721-0450Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# bug 332565
-		if ! use extraengine ; then
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.59.ebuild b/dev-db/mysql/mysql-5.1.59.ebuild
deleted file mode 100644
index 3cbd44c..0000000
--- a/dev-db/mysql/mysql-5.1.59.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20110721-0450Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# bug 332565
-		if ! use extraengine ; then
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.60.ebuild b/dev-db/mysql/mysql-5.1.60.ebuild
deleted file mode 100644
index c640e0d..0000000
--- a/dev-db/mysql/mysql-5.1.60.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20111118-2347Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		# bug 332565
-		if ! use extraengine ; then
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.5.10.ebuild b/dev-db/mysql/mysql-5.5.10.ebuild
deleted file mode 100644
index 610aa95..0000000
--- a/dev-db/mysql/mysql-5.5.10.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.12.ebuild b/dev-db/mysql/mysql-5.5.12.ebuild
deleted file mode 100644
index 610aa95..0000000
--- a/dev-db/mysql/mysql-5.5.12.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.14.ebuild b/dev-db/mysql/mysql-5.5.14.ebuild
deleted file mode 100644
index 9bb1440..0000000
--- a/dev-db/mysql/mysql-5.5.14.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20110713-0702Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.15.ebuild b/dev-db/mysql/mysql-5.5.15.ebuild
deleted file mode 100644
index 9bb1440..0000000
--- a/dev-db/mysql/mysql-5.5.15.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20110713-0702Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.16.ebuild b/dev-db/mysql/mysql-5.5.16.ebuild
deleted file mode 100644
index 9bb1440..0000000
--- a/dev-db/mysql/mysql-5.5.16.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20110713-0702Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.17.ebuild b/dev-db/mysql/mysql-5.5.17.ebuild
deleted file mode 100644
index 9bb1440..0000000
--- a/dev-db/mysql/mysql-5.5.17.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20110713-0702Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.18.ebuild b/dev-db/mysql/mysql-5.5.18.ebuild
deleted file mode 100644
index 9bb1440..0000000
--- a/dev-db/mysql/mysql-5.5.18.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20110713-0702Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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
-}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-03-23 22:02 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2012-03-23 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     cdc52ab4b75d65ae2352a1b44af69d09c8a2dda1
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Tue Feb 21 09:20:25 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 09:20:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=cdc52ab4

Version bump.

(Portage version: 2.2.0_alpha87/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 dev-db/mysql/Manifest            |    2 +
 dev-db/mysql/mysql-5.5.21.ebuild |  129 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+), 0 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 3d74d57..87a4150 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -7,6 +7,7 @@ DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef0
 DIST mysql-5.1.61.tar.gz 24462261 RMD160 392b7394a0f7821134f177a3ba4580a29d60e3f4 SHA1 a528cf822af84601dd95d3e1cb3277815685ac65 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918
 DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411375c285ae SHA1 f6a3b5fb5a10f8110fd85463e1a25fb314e60c24 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f
 DIST mysql-5.5.20.tar.gz 24305842 RMD160 2bdecbe6f61497f3d8c9255610d713f6f4e1164b SHA1 d5066327c41ac5a338ca0bb748e50bc4e1902442 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e
+DIST mysql-5.5.21.tar.gz 24341768 RMD160 d31c1be22ac80f1c95e8f28c41ec1c82cba995cd SHA1 682e9f82566fa9dc25b0f32d979f102445a52f38 SHA256 2471fedc42bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5
@@ -16,6 +17,7 @@ EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65
 EBUILD mysql-5.1.61.ebuild 8888 RMD160 418f097cc87e03c678872dd95ecdc2b44a2140b2 SHA1 abfaf4fa5bb10551db7b742e792e0f6c2d118c88 SHA256 0ea0d451bdd94314896fa8dbe167e38a37aafc7462807c6ede137c5b5e938708
 EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f68baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01
 EBUILD mysql-5.5.20.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
+EBUILD mysql-5.5.21.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
 MISC ChangeLog 8999 RMD160 02f15cba6ce1bfad393db1fff1f8d13eb0f98631 SHA1 93793fe6994fdd1c8757e0ba902ec55f07db9cfc SHA256 e7489f2f6162f63da24f07d1883736148d3ab3692a4b4c42f0483de3a37ddea3
 MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 SHA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503

diff --git a/dev-db/mysql/mysql-5.5.21.ebuild b/dev-db/mysql/mysql-5.5.21.ebuild
new file mode 100644
index 0000000..18ef035
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.21.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20111118-2347Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-03-23 22:03 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2012-03-23 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     b3fa119f1d0fe74cf27a2736bb9e7db4d86862a7
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Fri Mar 23 22:03:33 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 23 22:03:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b3fa119f

Bump, needs test runs still.

(Portage version: 2.2.0_alpha93/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 dev-db/mysql/Manifest            |    2 +
 dev-db/mysql/mysql-5.5.22.ebuild |  129 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+), 0 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 87a4150..4b7d280 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -8,6 +8,7 @@ DIST mysql-5.1.61.tar.gz 24462261 RMD160 392b7394a0f7821134f177a3ba4580a29d60e3f
 DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411375c285ae SHA1 f6a3b5fb5a10f8110fd85463e1a25fb314e60c24 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f
 DIST mysql-5.5.20.tar.gz 24305842 RMD160 2bdecbe6f61497f3d8c9255610d713f6f4e1164b SHA1 d5066327c41ac5a338ca0bb748e50bc4e1902442 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e
 DIST mysql-5.5.21.tar.gz 24341768 RMD160 d31c1be22ac80f1c95e8f28c41ec1c82cba995cd SHA1 682e9f82566fa9dc25b0f32d979f102445a52f38 SHA256 2471fedc42bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd
+DIST mysql-5.5.22.tar.gz 24475686 RMD160 1404660a07a9eac4f6a4f25d7e8836edcaaee70e SHA1 31d232dd72279ae69cd192a5355a8599b55944c7 SHA256 f3333ffbe13e586471225fcb521f6ce511fa4374010901813ac35e0f5909dcdd
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5
@@ -18,6 +19,7 @@ EBUILD mysql-5.1.61.ebuild 8888 RMD160 418f097cc87e03c678872dd95ecdc2b44a2140b2
 EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f68baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01
 EBUILD mysql-5.5.20.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
 EBUILD mysql-5.5.21.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
+EBUILD mysql-5.5.22.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
 MISC ChangeLog 8999 RMD160 02f15cba6ce1bfad393db1fff1f8d13eb0f98631 SHA1 93793fe6994fdd1c8757e0ba902ec55f07db9cfc SHA256 e7489f2f6162f63da24f07d1883736148d3ab3692a4b4c42f0483de3a37ddea3
 MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 SHA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503

diff --git a/dev-db/mysql/mysql-5.5.22.ebuild b/dev-db/mysql/mysql-5.5.22.ebuild
new file mode 100644
index 0000000..18ef035
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.22.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20111118-2347Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-04-02  0:21 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2012-04-02  0:21 UTC (permalink / raw
  To: gentoo-commits

commit:     fd950345d9b322507c93bd7223b16af5ccd5e28e
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Sun Apr  1 21:47:44 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr  1 21:47:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=fd950345

Updated versions, with patchsets, and pass tests (5.0.96 is a upgrade-path release only, many tests were disabled. Should not be used in production).

(Portage version: 2.2.0_alpha93/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 dev-db/mysql/Manifest                              |    9 +-
 dev-db/mysql/mysql-5.0.92.ebuild                   |    8 +-
 .../{mysql-5.0.92.ebuild => mysql-5.0.96.ebuild}   |   31 ++++-
 .../{mysql-5.0.92.ebuild => mysql-5.1.62.ebuild}   |  137 +++++++++++++++-----
 dev-db/mysql/mysql-5.5.22.ebuild                   |    2 +-
 5 files changed, 137 insertions(+), 50 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 4b7d280..5afc44a 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -4,7 +4,9 @@ AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc799
 AUX my.cnf-5.1 4308 RMD160 9f833986c42b9879881f3b6f233e7ffc8f16d6ec SHA1 80b86608e508dfc348ec7976f6d42a2331c7b150 SHA256 3718047d2e07b63668fd0ea90eea8e3284b7a2621c054c6d999a9745b119ff97
 AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12
 DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 SHA1 10fffc7672a469af4a7fd980922b04d7ba0143ba SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55
+DIST mysql-5.0.96.tar.gz 22686667 RMD160 b7c500f5aa82ab7189acc3c184db25616645e3ec SHA1 b28a82dccaa8a9d708f49ec5d0d0c3762d4010c8 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84
 DIST mysql-5.1.61.tar.gz 24462261 RMD160 392b7394a0f7821134f177a3ba4580a29d60e3f4 SHA1 a528cf822af84601dd95d3e1cb3277815685ac65 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918
+DIST mysql-5.1.62.tar.gz 24503313 RMD160 c5720deee2b04a40a20f56a3b305b37fecb343fe SHA1 06c7b3742f21fee6faf46224de2221230f943f63 SHA256 97c07b2478e25892fe915b2c46e99083973f541ecdf06672241f0c22f79fead3
 DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411375c285ae SHA1 f6a3b5fb5a10f8110fd85463e1a25fb314e60c24 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f
 DIST mysql-5.5.20.tar.gz 24305842 RMD160 2bdecbe6f61497f3d8c9255610d713f6f4e1164b SHA1 d5066327c41ac5a338ca0bb748e50bc4e1902442 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e
 DIST mysql-5.5.21.tar.gz 24341768 RMD160 d31c1be22ac80f1c95e8f28c41ec1c82cba995cd SHA1 682e9f82566fa9dc25b0f32d979f102445a52f38 SHA256 2471fedc42bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd
@@ -12,14 +14,17 @@ DIST mysql-5.5.22.tar.gz 24475686 RMD160 1404660a07a9eac4f6a4f25d7e8836edcaaee70
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5
+DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 RMD160 99b71ba2d567aef06fceda962d5d8d3ae8150b61 SHA1 91c28858bd3585ff7e1b3a5f199fdf2b28729d5b SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
-EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65 SHA1 7a7d895df18909e8c5a2e293edd44ebe540ded29 SHA256 316ed800c11ea60ddaa3339cdd4db28101e8b35551f7bee63c32c8f9c9b15947
+EBUILD mysql-5.0.92.ebuild 6498 RMD160 c4c093dcab2b00c754069e3bd5f931056a4d055a SHA1 bc066addd75e3df51e972a93f08c83f5fd9c6535 SHA256 ff447b9379cbdfbe0310cff1248cfd9eb829c325fd6b3d54da8caae0d0be4d0d
+EBUILD mysql-5.0.96.ebuild 7192 RMD160 87650fdb019e313dcdcff83eb064c100f811bf95 SHA1 6211a192ca7a12189bc6a4b1671142436b93e740 SHA256 16bd83cacc711ebc91dbc041db0a8b87692764c83d5d54ddc3cb1d0a99874ed2
 EBUILD mysql-5.1.61.ebuild 8888 RMD160 418f097cc87e03c678872dd95ecdc2b44a2140b2 SHA1 abfaf4fa5bb10551db7b742e792e0f6c2d118c88 SHA256 0ea0d451bdd94314896fa8dbe167e38a37aafc7462807c6ede137c5b5e938708
+EBUILD mysql-5.1.62.ebuild 8888 RMD160 5f35028da02dddcba36f9e7a22ad508b38192a85 SHA1 7605b7e82df44e9790a9c643a5f221cc2730adc6 SHA256 01421f2f6a9ee7c0ea80c520cc9d207f0021fcdf8adb0141cfeb96cf69fb07c0
 EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f68baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01
 EBUILD mysql-5.5.20.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
 EBUILD mysql-5.5.21.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
-EBUILD mysql-5.5.22.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
+EBUILD mysql-5.5.22.ebuild 4234 RMD160 1c839260104afb85ea60a731802aaa9eff56f33c SHA1 bf8a2e7566399b13204d121f6bf87c7d8510d1a2 SHA256 f07d9403b4267b6d5a379a141771e237baf027e99d2cbb600e10167b2e58d634
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
 MISC ChangeLog 8999 RMD160 02f15cba6ce1bfad393db1fff1f8d13eb0f98631 SHA1 93793fe6994fdd1c8757e0ba902ec55f07db9cfc SHA256 e7489f2f6162f63da24f07d1883736148d3ab3692a4b4c42f0483de3a37ddea3
 MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 SHA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503

diff --git a/dev-db/mysql/mysql-5.0.92.ebuild b/dev-db/mysql/mysql-5.0.92.ebuild
index 7906c6c..d252f9e 100644
--- a/dev-db/mysql/mysql-5.0.92.ebuild
+++ b/dev-db/mysql/mysql-5.0.92.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.90-r1.ebuild,v 1.1 2010/01/31 06:20:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.92.ebuild,v 1.2 2012/01/08 23:40:20 jmbsvicetto Exp $
 
 MY_EXTRAS_VER="live"
-EAPI=2
-# 5.0.91 tarball has wrong version number in the directory.
-#MY_SOURCEDIR='mysql-5.0.90'
+EAPI="4"
 
 inherit toolchain-funcs mysql
 # only to make repoman happy. it is really set in the eclass

diff --git a/dev-db/mysql/mysql-5.0.92.ebuild b/dev-db/mysql/mysql-5.0.96.ebuild
similarity index 87%
copy from dev-db/mysql/mysql-5.0.92.ebuild
copy to dev-db/mysql/mysql-5.0.96.ebuild
index 7906c6c..ff19fe3 100644
--- a/dev-db/mysql/mysql-5.0.92.ebuild
+++ b/dev-db/mysql/mysql-5.0.96.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.90-r1.ebuild,v 1.1 2010/01/31 06:20:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.92.ebuild,v 1.2 2012/01/08 23:40:20 jmbsvicetto Exp $
 
-MY_EXTRAS_VER="live"
-EAPI=2
-# 5.0.91 tarball has wrong version number in the directory.
-#MY_SOURCEDIR='mysql-5.0.90'
+MY_EXTRAS_VER="20120401-2131Z"
+EAPI="4"
 
 inherit toolchain-funcs mysql
 # only to make repoman happy. it is really set in the eclass
@@ -164,11 +162,30 @@ src_test() {
 			for t in archive archive_gis archive-big \
 				federated_archive mysqldump-max \
 				; do
-					mysql_disable_test $t "Broken in 5.0.91"
+					mysql_disable_test $t "Broken in $PV"
+				done
+			;;
+			5.0.96)
+				for t in \
+					client_xml compress connect ctype_recoding drop \
+					federated grant information_schema \
+					information_schema_db innodb lowercase_table \
+					lowercase_utf8 mysql-bug41486 mysql-bug45236 mysql \
+					mysqlcheck mysqldump-max mysqldump mysqldump_restore \
+					mysqlshow ps ps_1general rename rpl000009 rpl_ddl \
+					rpl_delete_all rpl_drop_db rpl_dual_pos_advance \
+					rpl_error_ignored_table rpl_filter_tables_not_exist \
+					rpl_replicate_do rpl_trigger_not_windows select \
+					show_check sp system_mysql_db system_mysql_db_fix30020 \
+					system_mysql_db_fix40123 view \
+				; do
+					mysql_disable_test $t "Broken in $PV"
 				done
 			;;
 		esac
 
+
+
 		# create directories because mysqladmin might make out of order
 		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
 

diff --git a/dev-db/mysql/mysql-5.0.92.ebuild b/dev-db/mysql/mysql-5.1.62.ebuild
similarity index 58%
copy from dev-db/mysql/mysql-5.0.92.ebuild
copy to dev-db/mysql/mysql-5.1.62.ebuild
index 7906c6c..90ca29a 100644
--- a/dev-db/mysql/mysql-5.0.92.ebuild
+++ b/dev-db/mysql/mysql-5.1.62.ebuild
@@ -1,28 +1,44 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.90-r1.ebuild,v 1.1 2010/01/31 06:20:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.61.ebuild,v 1.2 2012/01/31 20:23:03 robbat2 Exp $
 
-MY_EXTRAS_VER="live"
-EAPI=2
-# 5.0.91 tarball has wrong version number in the directory.
-#MY_SOURCEDIR='mysql-5.0.90'
+EAPI="4"
+
+MY_EXTRAS_VER="20120401-2131Z"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
 
-inherit toolchain-funcs mysql
 # only to make repoman happy. it is really set in the eclass
 IUSE="$IUSE"
 
 # 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-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
 EPATCH_EXCLUDE=''
 
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND=""
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
 
 # Official test instructions:
 # USE='berkdb -cluster embedded extraengine perl ssl community' \
@@ -42,6 +58,7 @@ src_test() {
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
 		cd "${S}"
 		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
 		local retstatus_ns
 		local retstatus_ps
 		local t
@@ -54,12 +71,12 @@ src_test() {
 		# USE=extraengines case
 		case ${PV} in
 			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
 			;;
 
 			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
 			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"archive_gis" \
 				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
 			;;
@@ -69,7 +86,7 @@ src_test() {
 		# was fixed.
 		case ${PV} in
 			5.0.54|5.0.51*)
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"read_only" \
 				"Broken in 5.0.51-54, output in wrong order"
 			;;
@@ -77,14 +94,14 @@ src_test() {
 
 		# Ditto to read_only
 		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"view" \
 				"Broken in 5.0.51, output in wrong order"
 
 		# x86-specific, OOM issue with some subselects on low memory servers
 		[ "${PV}" == "5.0.54" ] && \
 			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"subselect" \
 				"Testcase needs tuning on x86 for oom condition"
 
@@ -92,7 +109,7 @@ src_test() {
 		[ "${PV}" == "5.0.56" ] && \
 			for t in openssl_1 rpl_openssl rpl_ssl ssl \
 				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
+				mysql-v2_disable_test \
 					"$t" \
 					"OpenSSL tests broken on 5.0.56"
 			done
@@ -101,7 +118,7 @@ src_test() {
 		# Upstream bug 41066
 		# http://bugs.mysql.com/bug.php?id=41066
 		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
+			mysql-v2_disable_test \
 				"status2" \
 				"Broken in 5.0.72, new test is broken, upstream bug #41066"
 
@@ -121,58 +138,104 @@ src_test() {
 		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
 		# expired/invalid.
 		case ${PV} in
-			5.0.*|5.1.*)
+			5.0.*|5.1.*|5.4.*|5.5.*)
 				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect ; do \
-					mysql_disable_test \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
 						"$t" \
 						"These OpenSSL tests break due to expired certificates"
 				done
 			;;
 		esac
 
-		# These are also failing in MySQL 5.0 for now, and are believed to be
+		# These are also failing in MySQL 5.1 for now, and are believed to be
 		# false positives:
 		#
-		# main.mysql_comment, main.mysql_upgrade:
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
 		# fails due to USE=-latin1 / utf8 default
 		#
 		# main.mysql_client_test:
 		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
 		case ${PV} in
-			5.0.*)
-			for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
 			done
 			;;
 		esac
 
 		use profiling && use community \
-		|| mysql_disable_test main.profiling \
+		|| mysql-v2_disable_test main.profiling \
 			"Profiling test needs profiling support"
 
 		if [ "${PN}" == "mariadb" ]; then
 			for t in \
 				parts.part_supported_sql_func_ndb \
 				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
 			done
 		fi
 
-		case $PV in
-			5.0.91)
-			for t in archive archive_gis archive-big \
-				federated_archive mysqldump-max \
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
 				; do
-					mysql_disable_test $t "Broken in 5.0.91"
-				done
-			;;
-		esac
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		if ! use extraengine ; then
+			# bug 332565
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+			# bug 401673
+			for t in federated.federated_plugin ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
 
 		# create directories because mysqladmin might make out of order
 		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
 
 		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
 		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
 		retstatus_ns=$?
 		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
@@ -183,10 +246,14 @@ src_test() {
 		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
 
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
 		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
 		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"

diff --git a/dev-db/mysql/mysql-5.5.22.ebuild b/dev-db/mysql/mysql-5.5.22.ebuild
index 18ef035..1dad757 100644
--- a/dev-db/mysql/mysql-5.5.22.ebuild
+++ b/dev-db/mysql/mysql-5.5.22.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-MY_EXTRAS_VER="20111118-2347Z"
+MY_EXTRAS_VER="20120401-2131Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-05-22 12:09 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-05-22 12:09 UTC (permalink / raw
  To: gentoo-commits

commit:     49a19bb19e2c0b50d07a526915d6d1ab19ecb58a
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 11:40:22 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue May 22 11:40:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=49a19bb1

Move EAPI assignment to the top.
Whitespace.

(Portage version: 2.2.0_alpha107/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key BB0E6E98)

---
 dev-db/mysql/ChangeLog           |    5 +++++
 dev-db/mysql/Manifest            |   26 +++++++++++++++++++++++---
 dev-db/mysql/mysql-5.0.92.ebuild |    4 ++--
 dev-db/mysql/mysql-5.0.96.ebuild |    6 ++----
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 777d211..93c6d16 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 May 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mysql-5.0.92.ebuild, mysql-5.0.96.ebuild:
+  Move EAPI assignment to the top.
+  Whitespace.
+
   15 Feb 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   files/my.cnf-5.1:
   Update table_cache to table_open_cache variable for mysql-5.1 my.cnf file.

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5afc44a..4009cfb 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
@@ -17,8 +20,8 @@ DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 RMD160 99b71ba2d567aef06fceda962d5d8d3ae8150b61 SHA1 91c28858bd3585ff7e1b3a5f199fdf2b28729d5b SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
-EBUILD mysql-5.0.92.ebuild 6498 RMD160 c4c093dcab2b00c754069e3bd5f931056a4d055a SHA1 bc066addd75e3df51e972a93f08c83f5fd9c6535 SHA256 ff447b9379cbdfbe0310cff1248cfd9eb829c325fd6b3d54da8caae0d0be4d0d
-EBUILD mysql-5.0.96.ebuild 7192 RMD160 87650fdb019e313dcdcff83eb064c100f811bf95 SHA1 6211a192ca7a12189bc6a4b1671142436b93e740 SHA256 16bd83cacc711ebc91dbc041db0a8b87692764c83d5d54ddc3cb1d0a99874ed2
+EBUILD mysql-5.0.92.ebuild 6399 RMD160 462db30231cd6fe79ac6f56e8a560316c569bd17 SHA1 7a2339666ee8ab44d473564e30940c5cb4c5e6f1 SHA256 7e5ad5e44fe4c4202e919b6ae192f29ac21815e10555a943c8fc7239ac185ef7
+EBUILD mysql-5.0.96.ebuild 7091 RMD160 a7f6dba0ffbbabbb73dd9b0a0ab55fca775a7d06 SHA1 e80411b32f9b26378c50b1ce436b97acc9a64f74 SHA256 47984596e306c7ee8ef0f77d63212f2ecacf08e1a090fb99943183c48eb958f7
 EBUILD mysql-5.1.61.ebuild 8888 RMD160 418f097cc87e03c678872dd95ecdc2b44a2140b2 SHA1 abfaf4fa5bb10551db7b742e792e0f6c2d118c88 SHA256 0ea0d451bdd94314896fa8dbe167e38a37aafc7462807c6ede137c5b5e938708
 EBUILD mysql-5.1.62.ebuild 8888 RMD160 5f35028da02dddcba36f9e7a22ad508b38192a85 SHA1 7605b7e82df44e9790a9c643a5f221cc2730adc6 SHA256 01421f2f6a9ee7c0ea80c520cc9d207f0021fcdf8adb0141cfeb96cf69fb07c0
 EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f68baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01
@@ -26,5 +29,22 @@ EBUILD mysql-5.5.20.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5
 EBUILD mysql-5.5.21.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
 EBUILD mysql-5.5.22.ebuild 4234 RMD160 1c839260104afb85ea60a731802aaa9eff56f33c SHA1 bf8a2e7566399b13204d121f6bf87c7d8510d1a2 SHA256 f07d9403b4267b6d5a379a141771e237baf027e99d2cbb600e10167b2e58d634
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
-MISC ChangeLog 8999 RMD160 02f15cba6ce1bfad393db1fff1f8d13eb0f98631 SHA1 93793fe6994fdd1c8757e0ba902ec55f07db9cfc SHA256 e7489f2f6162f63da24f07d1883736148d3ab3692a4b4c42f0483de3a37ddea3
+MISC ChangeLog 9160 RMD160 cb9b0050f4dc7016ccbb73267a257cfd77e16612 SHA1 ebc23cd6260f59db8da6e575b00068f0b03e700f SHA256 2587b6bd9ed3a2adeff8ec3349fdab5f45a75460092c765a4e124ad3b2e2a9e0
 MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 SHA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPu3smAAoJEC8ZTXQF1qEPSWQQALaWhcvGEs8EPnRvysbc7ID3
+yttqF65YLyQv+4xFA16k6tsWsxOqifW8HwGLKQ5uOK2gz2ajVgtSzJRUrbHff7SG
+ebTpAEjTZ8qyrwSKvh4tFrpseCvvutxOnZ08SeXNAorUyKePuJc7R120kNhtaVvU
+ebmEDeaWPsjiaTXiwSiqT/YIQ/fDJLERzAaL2yqaxJpyy0OwbyEIgZiqFxZS0Ptw
+DaUWTliFDHkY6w5MduMoxD/GsFbNFp6CVpJsmFi9HI6Tf2NTuG20pMFOTCzg4Oma
+mFE4ORqSAlt+sy6StQzkIqYn3FyrqpmGlaR4AvOguTQcpu42HRGwQ0e9KGFzNsFX
+Wjw8TWNZq8ktUMC9krap6H0HACh9jMjohE7cQBLL4i1yx/IbUaZBLiXZye/NvC2Q
+Vpu5Gy5UYWw7DD3oxwODxdFG/ITbaXwAHB9ljK3i203QY6kIzEL3kDkD6dvYcwi0
+fPrtYg6/tQ69ChW0X0J4LUmRnPUNoU4s23E2IOWCaY4LPtwjzwCHNf42wvIvqoaX
+fkrKiqQSl3TAMtKH0FjRFVEEoW2NdOS5Eer1tWTZakt659a6V6BFX71d7ppf3Nbt
+fFIgm4RqH7M7ftvqg503N6x+LifATDwVeCFokMY1p0sDDe49TEkz+wJyJ9dAt2hF
+ALVxxNIuZPvKjiKD+cvm
+=pX5h
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.0.92.ebuild b/dev-db/mysql/mysql-5.0.92.ebuild
index d252f9e..311ddbf 100644
--- a/dev-db/mysql/mysql-5.0.92.ebuild
+++ b/dev-db/mysql/mysql-5.0.92.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.92.ebuild,v 1.2 2012/01/08 23:40:20 jmbsvicetto Exp $
+# $Header: $
 
-MY_EXTRAS_VER="live"
 EAPI="4"
+MY_EXTRAS_VER="live"
 
 inherit toolchain-funcs mysql
 # only to make repoman happy. it is really set in the eclass

diff --git a/dev-db/mysql/mysql-5.0.96.ebuild b/dev-db/mysql/mysql-5.0.96.ebuild
index ff19fe3..6aa84a8 100644
--- a/dev-db/mysql/mysql-5.0.96.ebuild
+++ b/dev-db/mysql/mysql-5.0.96.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.92.ebuild,v 1.2 2012/01/08 23:40:20 jmbsvicetto Exp $
+# $Header: $
 
-MY_EXTRAS_VER="20120401-2131Z"
 EAPI="4"
+MY_EXTRAS_VER="20120401-2131Z"
 
 inherit toolchain-funcs mysql
 # only to make repoman happy. it is really set in the eclass
@@ -184,8 +184,6 @@ src_test() {
 			;;
 		esac
 
-
-
 		# create directories because mysqladmin might make out of order
 		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
 



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-07-07 23:55 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-07-07 23:55 UTC (permalink / raw
  To: gentoo-commits

commit:     2958ceaece100aedd97a3249a3408364d040aea4
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  7 23:55:07 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Jul  7 23:55:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=2958ceae

[dev-db/mysql-5.5.25a] Version bump.

---
 dev-db/mysql/ChangeLog            |    5 ++
 dev-db/mysql/Manifest             |   24 +------
 dev-db/mysql/mysql-5.5.25a.ebuild |  129 +++++++++++++++++++++++++++++++++++++
 3 files changed, 137 insertions(+), 21 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 93c6d16..b3757f1 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.5.25a (07 Jul 2012)
+
+  07 Jul 2012; <atlantis@gentoo.org> +mysql-5.5.25a.ebuild:
+  [dev-db/mysql-5.5.25a] Version bump.
+
   22 May 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   mysql-5.0.92.ebuild, mysql-5.0.96.ebuild:
   Move EAPI assignment to the top.

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 4009cfb..aa269b1 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
@@ -14,6 +11,7 @@ DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411375c285a
 DIST mysql-5.5.20.tar.gz 24305842 RMD160 2bdecbe6f61497f3d8c9255610d713f6f4e1164b SHA1 d5066327c41ac5a338ca0bb748e50bc4e1902442 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e
 DIST mysql-5.5.21.tar.gz 24341768 RMD160 d31c1be22ac80f1c95e8f28c41ec1c82cba995cd SHA1 682e9f82566fa9dc25b0f32d979f102445a52f38 SHA256 2471fedc42bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd
 DIST mysql-5.5.22.tar.gz 24475686 RMD160 1404660a07a9eac4f6a4f25d7e8836edcaaee70e SHA1 31d232dd72279ae69cd192a5355a8599b55944c7 SHA256 f3333ffbe13e586471225fcb521f6ce511fa4374010901813ac35e0f5909dcdd
+DIST mysql-5.5.25a.tar.gz 24660795 RMD160 bbdd89629b5214e474c2cbd9ec50f320dcd1c767 SHA1 85dfea413a7d5d2733a40f9dd79cf2320302979f SHA256 d199fd9a3e0865226b9b2d5a870314c23a06afe7fac37e385708119e78168fda
 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5
@@ -28,23 +26,7 @@ EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f
 EBUILD mysql-5.5.20.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
 EBUILD mysql-5.5.21.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
 EBUILD mysql-5.5.22.ebuild 4234 RMD160 1c839260104afb85ea60a731802aaa9eff56f33c SHA1 bf8a2e7566399b13204d121f6bf87c7d8510d1a2 SHA256 f07d9403b4267b6d5a379a141771e237baf027e99d2cbb600e10167b2e58d634
+EBUILD mysql-5.5.25a.ebuild 4234 RMD160 1c839260104afb85ea60a731802aaa9eff56f33c SHA1 bf8a2e7566399b13204d121f6bf87c7d8510d1a2 SHA256 f07d9403b4267b6d5a379a141771e237baf027e99d2cbb600e10167b2e58d634
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
-MISC ChangeLog 9160 RMD160 cb9b0050f4dc7016ccbb73267a257cfd77e16612 SHA1 ebc23cd6260f59db8da6e575b00068f0b03e700f SHA256 2587b6bd9ed3a2adeff8ec3349fdab5f45a75460092c765a4e124ad3b2e2a9e0
+MISC ChangeLog 9290 RMD160 008fe55938a3640c1a2ce711939e3d5575fb58d8 SHA1 9752e15cf249e0c00bb084cac4bb01eff105b8ad SHA256 f50ffa783955a8c44b531ad6db834032f5050789efeeba019afdc3a603c5810e
 MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 SHA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPu3smAAoJEC8ZTXQF1qEPSWQQALaWhcvGEs8EPnRvysbc7ID3
-yttqF65YLyQv+4xFA16k6tsWsxOqifW8HwGLKQ5uOK2gz2ajVgtSzJRUrbHff7SG
-ebTpAEjTZ8qyrwSKvh4tFrpseCvvutxOnZ08SeXNAorUyKePuJc7R120kNhtaVvU
-ebmEDeaWPsjiaTXiwSiqT/YIQ/fDJLERzAaL2yqaxJpyy0OwbyEIgZiqFxZS0Ptw
-DaUWTliFDHkY6w5MduMoxD/GsFbNFp6CVpJsmFi9HI6Tf2NTuG20pMFOTCzg4Oma
-mFE4ORqSAlt+sy6StQzkIqYn3FyrqpmGlaR4AvOguTQcpu42HRGwQ0e9KGFzNsFX
-Wjw8TWNZq8ktUMC9krap6H0HACh9jMjohE7cQBLL4i1yx/IbUaZBLiXZye/NvC2Q
-Vpu5Gy5UYWw7DD3oxwODxdFG/ITbaXwAHB9ljK3i203QY6kIzEL3kDkD6dvYcwi0
-fPrtYg6/tQ69ChW0X0J4LUmRnPUNoU4s23E2IOWCaY4LPtwjzwCHNf42wvIvqoaX
-fkrKiqQSl3TAMtKH0FjRFVEEoW2NdOS5Eer1tWTZakt659a6V6BFX71d7ppf3Nbt
-fFIgm4RqH7M7ftvqg503N6x+LifATDwVeCFokMY1p0sDDe49TEkz+wJyJ9dAt2hF
-ALVxxNIuZPvKjiKD+cvm
-=pX5h
------END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.5.25a.ebuild b/dev-db/mysql/mysql-5.5.25a.ebuild
new file mode 100644
index 0000000..1dad757
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.25a.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20120401-2131Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}



^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-07-27 16:09 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2012-07-27 16:09 UTC (permalink / raw
  To: gentoo-commits

commit:     d29457cfec0597442ac3dc4a22a825dbbe3efbe4
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 27 16:08:42 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 27 16:08:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d29457cf

Regen with thin manifests.

(Portage version: 2.2.0_alpha120/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 dev-db/mysql/Manifest |   47 +++++++++++++++--------------------------------
 1 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index aa269b1..87c0cb4 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,32 +1,15 @@
-AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
-AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
-AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
-AUX my.cnf-5.1 4308 RMD160 9f833986c42b9879881f3b6f233e7ffc8f16d6ec SHA1 80b86608e508dfc348ec7976f6d42a2331c7b150 SHA256 3718047d2e07b63668fd0ea90eea8e3284b7a2621c054c6d999a9745b119ff97
-AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12
-DIST mysql-5.0.92.tar.gz 22440590 RMD160 24a373a1b124acf39d0c0726e5cb6f47dc1bef08 SHA1 10fffc7672a469af4a7fd980922b04d7ba0143ba SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55
-DIST mysql-5.0.96.tar.gz 22686667 RMD160 b7c500f5aa82ab7189acc3c184db25616645e3ec SHA1 b28a82dccaa8a9d708f49ec5d0d0c3762d4010c8 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84
-DIST mysql-5.1.61.tar.gz 24462261 RMD160 392b7394a0f7821134f177a3ba4580a29d60e3f4 SHA1 a528cf822af84601dd95d3e1cb3277815685ac65 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918
-DIST mysql-5.1.62.tar.gz 24503313 RMD160 c5720deee2b04a40a20f56a3b305b37fecb343fe SHA1 06c7b3742f21fee6faf46224de2221230f943f63 SHA256 97c07b2478e25892fe915b2c46e99083973f541ecdf06672241f0c22f79fead3
-DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411375c285ae SHA1 f6a3b5fb5a10f8110fd85463e1a25fb314e60c24 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f
-DIST mysql-5.5.20.tar.gz 24305842 RMD160 2bdecbe6f61497f3d8c9255610d713f6f4e1164b SHA1 d5066327c41ac5a338ca0bb748e50bc4e1902442 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e
-DIST mysql-5.5.21.tar.gz 24341768 RMD160 d31c1be22ac80f1c95e8f28c41ec1c82cba995cd SHA1 682e9f82566fa9dc25b0f32d979f102445a52f38 SHA256 2471fedc42bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd
-DIST mysql-5.5.22.tar.gz 24475686 RMD160 1404660a07a9eac4f6a4f25d7e8836edcaaee70e SHA1 31d232dd72279ae69cd192a5355a8599b55944c7 SHA256 f3333ffbe13e586471225fcb521f6ce511fa4374010901813ac35e0f5909dcdd
-DIST mysql-5.5.25a.tar.gz 24660795 RMD160 bbdd89629b5214e474c2cbd9ec50f320dcd1c767 SHA1 85dfea413a7d5d2733a40f9dd79cf2320302979f SHA256 d199fd9a3e0865226b9b2d5a870314c23a06afe7fac37e385708119e78168fda
-DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
-DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
-DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5
-DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 RMD160 99b71ba2d567aef06fceda962d5d8d3ae8150b61 SHA1 91c28858bd3585ff7e1b3a5f199fdf2b28729d5b SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495
-DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
-DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
-EBUILD mysql-5.0.92.ebuild 6399 RMD160 462db30231cd6fe79ac6f56e8a560316c569bd17 SHA1 7a2339666ee8ab44d473564e30940c5cb4c5e6f1 SHA256 7e5ad5e44fe4c4202e919b6ae192f29ac21815e10555a943c8fc7239ac185ef7
-EBUILD mysql-5.0.96.ebuild 7091 RMD160 a7f6dba0ffbbabbb73dd9b0a0ab55fca775a7d06 SHA1 e80411b32f9b26378c50b1ce436b97acc9a64f74 SHA256 47984596e306c7ee8ef0f77d63212f2ecacf08e1a090fb99943183c48eb958f7
-EBUILD mysql-5.1.61.ebuild 8888 RMD160 418f097cc87e03c678872dd95ecdc2b44a2140b2 SHA1 abfaf4fa5bb10551db7b742e792e0f6c2d118c88 SHA256 0ea0d451bdd94314896fa8dbe167e38a37aafc7462807c6ede137c5b5e938708
-EBUILD mysql-5.1.62.ebuild 8888 RMD160 5f35028da02dddcba36f9e7a22ad508b38192a85 SHA1 7605b7e82df44e9790a9c643a5f221cc2730adc6 SHA256 01421f2f6a9ee7c0ea80c520cc9d207f0021fcdf8adb0141cfeb96cf69fb07c0
-EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f68baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01
-EBUILD mysql-5.5.20.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
-EBUILD mysql-5.5.21.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
-EBUILD mysql-5.5.22.ebuild 4234 RMD160 1c839260104afb85ea60a731802aaa9eff56f33c SHA1 bf8a2e7566399b13204d121f6bf87c7d8510d1a2 SHA256 f07d9403b4267b6d5a379a141771e237baf027e99d2cbb600e10167b2e58d634
-EBUILD mysql-5.5.25a.ebuild 4234 RMD160 1c839260104afb85ea60a731802aaa9eff56f33c SHA1 bf8a2e7566399b13204d121f6bf87c7d8510d1a2 SHA256 f07d9403b4267b6d5a379a141771e237baf027e99d2cbb600e10167b2e58d634
-EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
-MISC ChangeLog 9290 RMD160 008fe55938a3640c1a2ce711939e3d5575fb58d8 SHA1 9752e15cf249e0c00bb084cac4bb01eff105b8ad SHA256 f50ffa783955a8c44b531ad6db834032f5050789efeeba019afdc3a603c5810e
-MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 SHA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503
+DIST mysql-5.0.92.tar.gz 22440590 SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55 SHA512 8fdc609761be56f64c71d5334611c1744f5496cef3adb68bbc52f5249d34174373e7b3fb15e6592d138cfd77d1b46d23bc9991ff49fd0d2636abe71304493fe2 WHIRLPOOL 58fb2dc8fabd376000418f5a7fd0aecda6b824704ebff2f3f2ca0776458f1e0e28e2fcfe7194253dd7437f6c14c8cc6625d19b59714ba421379f3b8f0f08a579
+DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
+DIST mysql-5.1.61.tar.gz 24462261 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918 SHA512 62c623c32d9b79ccccc0fecd921d06cb40de91d1a92daf8b325ca7e8f17bc17bd35ab56fa524b40235ca933aabd71b3900f0c60901f8907da86a860dd93fc26a WHIRLPOOL 92b84e006147781c50f27600ed8cfd9c8e527d8e4a032d8560f20dd48080cf0b3d1d6008beaacf317af92ddd37fe9b2882e1b152db57763179d9f1b62eabe612
+DIST mysql-5.1.62.tar.gz 24503313 SHA256 97c07b2478e25892fe915b2c46e99083973f541ecdf06672241f0c22f79fead3 SHA512 9dc9ae3035ccbad0b537ec5257cc9b4c3b0715136cdc67ed82bb3dfced04584d165716c485be65929d31dc98569d0d2e0b5162b95ff2da8f291d1dab352c98c0 WHIRLPOOL 73158dc457d9f7deac6945d54074cf3dba6367ea52e00297110779c6ed6208283030955a0abbf5c6b594d2e692f047147eb6e8a4cfa4c1da504335093896fd23
+DIST mysql-5.5.19.tar.gz 24296942 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f SHA512 02f741df70c0b8058babb2cb6b9469856641413eb334e76ffeec91f21ab71440f1ee644cc58471e86f03ca850cf789869d48b68788ea346b0b3dfc5b509a5bd1 WHIRLPOOL 8b119fd8be0d2191d0b4df49de8abde5b0382b5eb0fab4bafea83dcd54fabf9751f4ab3d008f860828bd6e9667696e831a0c7f88dcc648f372efec39cae1552d
+DIST mysql-5.5.20.tar.gz 24305842 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e SHA512 df433cf831f1aef6c143d70e0b447268f6ebd3a7bf2573b6269aea3309ef0cfed881beb917a7c6d6f2d0a8fe96b05c36a3c9d10e3763b56fc7a2eb6bb721100f WHIRLPOOL 84423528dac7b781b1ef267b830bef8b21e4ae98b9f356fa891d55cc601dd3bd867964182772f54b3cad1a076f3f5a3c511e7f025316bd9c101868ebfee9afa7
+DIST mysql-5.5.21.tar.gz 24341768 SHA256 2471fedc42bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd SHA512 183ffc9b742c8910ec9c97ad82845f0be35a7da764c2c8a6a5269cc7251c0443b2641a5d5f4302ab4afdcd908099af1d3ae4abba5c43f534ac65f931e2672377 WHIRLPOOL 710e9ce0fddbb0ae4f495d04ba3667a8c44bdfedd9087795ef4b57c59357a50654248427c5ca3751c462f9b744adf0391ae709d42e00eb1530a550972c5f9f55
+DIST mysql-5.5.22.tar.gz 24475686 SHA256 f3333ffbe13e586471225fcb521f6ce511fa4374010901813ac35e0f5909dcdd SHA512 729621d2755bf80b8d4d98ac3ec883cdd0711da3fcdd13d8eb478fac25ea2744d743192cd800d4b028b9341fc11d7293863561e6c2ad34830ec2ced7c6806042 WHIRLPOOL 05bfe1da714c38ac3347d2f4d139c63a42b8159742cea11fab5237196c9b640865b645a790e5d08de6fb61d8493cae52b8f61ac3fa87e393e048dbdac51d9b04
+DIST mysql-5.5.25a.tar.gz 24660795 SHA256 d199fd9a3e0865226b9b2d5a870314c23a06afe7fac37e385708119e78168fda
+DIST mysql-5.6.2-m5.tar.gz 26137314 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f SHA512 b78903d40afe09951a3674f96d71014e1b4ab76c259c32e328d4791188161051f89e66143f0ebd5b99c35b0470d92c6bf0a82e6cce199ee033cb1f1c33ae2474 WHIRLPOOL 6105540cd8837958b84782c184942e70089088fb531d16cd9291293b555ad9d98033fa9455025b4139fa7ea51aa944b331b6940ebdc07620a0604adce196a4be
+DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 SHA512 87d7b80d2df8f5e52bff2abd070eb8ed73d6bf19a32fcf82167a74d0f4600e62bc17cb09076b82bc643ed37279a7e4c402f1da8db25a06955c037b7173810a7f WHIRLPOOL a959ec13bd06c96988691b2458cf8ceb510f99aba20dd1f6e9c90f9c5f7bf9fe0c811badfd056ffe66c1c14cb2c9d3c29cd47481ac445a2df2fc22aa0b8a1324
+DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5 SHA512 bf0e4a88d6b981aff0ae25a1294a808b12414aed591634dc6aaf7f5b1b2e31a401c622b7f60408dd85c3f71d79eedb7c9118a25eafb2cd739278266edadd75c1 WHIRLPOOL 8a5790ce2a94378e594afb662c0e465db045e720e026ba98aafa8289c861af71e25ed4a10fce6061ec4ba683952a92f3bbc484937bb4e5de0617026f95bdc28b
+DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
+DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
+DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-08-03 19:56 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2012-08-03 19:56 UTC (permalink / raw
  To: gentoo-commits

commit:     f1535cc984cedd75328a266ff138f20b3fd62283
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  3 19:33:17 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Aug  3 19:33:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f1535cc9

Version bump, pending keyword requests from arches on dev-util/systemtap, dev-libs/jemalloc, dev-util/google-perftools.

(Portage version: 2.2.0_alpha120/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 dev-db/mysql/Manifest            |    1 +
 dev-db/mysql/mysql-5.5.27.ebuild |  129 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+), 0 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 87c0cb4..cb894cf 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -7,6 +7,7 @@ DIST mysql-5.5.20.tar.gz 24305842 SHA256 d07a84152ad3131ca63c20068be6192b0d21246
 DIST mysql-5.5.21.tar.gz 24341768 SHA256 2471fedc42bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd SHA512 183ffc9b742c8910ec9c97ad82845f0be35a7da764c2c8a6a5269cc7251c0443b2641a5d5f4302ab4afdcd908099af1d3ae4abba5c43f534ac65f931e2672377 WHIRLPOOL 710e9ce0fddbb0ae4f495d04ba3667a8c44bdfedd9087795ef4b57c59357a50654248427c5ca3751c462f9b744adf0391ae709d42e00eb1530a550972c5f9f55
 DIST mysql-5.5.22.tar.gz 24475686 SHA256 f3333ffbe13e586471225fcb521f6ce511fa4374010901813ac35e0f5909dcdd SHA512 729621d2755bf80b8d4d98ac3ec883cdd0711da3fcdd13d8eb478fac25ea2744d743192cd800d4b028b9341fc11d7293863561e6c2ad34830ec2ced7c6806042 WHIRLPOOL 05bfe1da714c38ac3347d2f4d139c63a42b8159742cea11fab5237196c9b640865b645a790e5d08de6fb61d8493cae52b8f61ac3fa87e393e048dbdac51d9b04
 DIST mysql-5.5.25a.tar.gz 24660795 SHA256 d199fd9a3e0865226b9b2d5a870314c23a06afe7fac37e385708119e78168fda
+DIST mysql-5.5.27.tar.gz 24667156 SHA256 51ffafbd82039f8afbe5b3c26f15cc338ed6cd4f67e56d7dd33efaa28c9d99e4 SHA512 0d3f14b2c797b78ba6c1f9b667537ffe1610620007dfdb711ab41d4914e82ceb9818878004da4b39581489c83448bc888aa1cb1ad080676a8d8a7605a8e16adb WHIRLPOOL a74165c34f5a800f4447034cf19533bbb174b79236b9840eb8f20503881140801851aec255fac83389fba48a7c4e87b65052641704c5135d11d90b9f54e48084
 DIST mysql-5.6.2-m5.tar.gz 26137314 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f SHA512 b78903d40afe09951a3674f96d71014e1b4ab76c259c32e328d4791188161051f89e66143f0ebd5b99c35b0470d92c6bf0a82e6cce199ee033cb1f1c33ae2474 WHIRLPOOL 6105540cd8837958b84782c184942e70089088fb531d16cd9291293b555ad9d98033fa9455025b4139fa7ea51aa944b331b6940ebdc07620a0604adce196a4be
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 SHA512 87d7b80d2df8f5e52bff2abd070eb8ed73d6bf19a32fcf82167a74d0f4600e62bc17cb09076b82bc643ed37279a7e4c402f1da8db25a06955c037b7173810a7f WHIRLPOOL a959ec13bd06c96988691b2458cf8ceb510f99aba20dd1f6e9c90f9c5f7bf9fe0c811badfd056ffe66c1c14cb2c9d3c29cd47481ac445a2df2fc22aa0b8a1324
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5 SHA512 bf0e4a88d6b981aff0ae25a1294a808b12414aed591634dc6aaf7f5b1b2e31a401c622b7f60408dd85c3f71d79eedb7c9118a25eafb2cd739278266edadd75c1 WHIRLPOOL 8a5790ce2a94378e594afb662c0e465db045e720e026ba98aafa8289c861af71e25ed4a10fce6061ec4ba683952a92f3bbc484937bb4e5de0617026f95bdc28b

diff --git a/dev-db/mysql/mysql-5.5.27.ebuild b/dev-db/mysql/mysql-5.5.27.ebuild
new file mode 100644
index 0000000..1dad757
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.27.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20120401-2131Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-08-14 10:05 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-08-14 10:05 UTC (permalink / raw
  To: gentoo-commits

commit:     97481cc0cf328fe2a5372221146f08a7443edfbc
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 14 10:05:34 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 10:05:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=97481cc0

[dev-db/mysql] Bump to the 5.1.65 release.

---
 dev-db/mysql/ChangeLog           |    5 +
 dev-db/mysql/Manifest            |    3 +-
 dev-db/mysql/mysql-5.1.65.ebuild |  265 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 272 insertions(+), 1 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index b3757f1..13f9908 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.1.65 (14 Aug 2012)
+
+  14 Aug 2012; <atlantis@gentoo.org> +mysql-5.1.65.ebuild:
+  [dev-db/mysql] Bump to the 5.1.65 release.
+
 *mysql-5.5.25a (07 Jul 2012)
 
   07 Jul 2012; <atlantis@gentoo.org> +mysql-5.5.25a.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index cb894cf..4cc572c 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,11 +2,12 @@ DIST mysql-5.0.92.tar.gz 22440590 SHA256 223530c4cd6d45e2906e6c7d33615c5824816df
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.61.tar.gz 24462261 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918 SHA512 62c623c32d9b79ccccc0fecd921d06cb40de91d1a92daf8b325ca7e8f17bc17bd35ab56fa524b40235ca933aabd71b3900f0c60901f8907da86a860dd93fc26a WHIRLPOOL 92b84e006147781c50f27600ed8cfd9c8e527d8e4a032d8560f20dd48080cf0b3d1d6008beaacf317af92ddd37fe9b2882e1b152db57763179d9f1b62eabe612
 DIST mysql-5.1.62.tar.gz 24503313 SHA256 97c07b2478e25892fe915b2c46e99083973f541ecdf06672241f0c22f79fead3 SHA512 9dc9ae3035ccbad0b537ec5257cc9b4c3b0715136cdc67ed82bb3dfced04584d165716c485be65929d31dc98569d0d2e0b5162b95ff2da8f291d1dab352c98c0 WHIRLPOOL 73158dc457d9f7deac6945d54074cf3dba6367ea52e00297110779c6ed6208283030955a0abbf5c6b594d2e692f047147eb6e8a4cfa4c1da504335093896fd23
+DIST mysql-5.1.65.tar.gz 24673939 SHA256 393c2933b27aeb5d80d4da628e2371d85fee8d4d7fa3e08aa181edb7385a4db9 SHA512 1370a9f63be57829bfdb75bb7512310c7f2a20c367680384b131aeb263d08cae351163d532285f80b519ef1a5b830d59f6729c50808ec6faac64ab57fa9091e8 WHIRLPOOL 53e6539057e0020371ca830bae54a48f4da706e0c6f6c6b5527df52744d5d471ed9f439cab8b7a7b355b78de00e30cb9263b47f7afb23e6b63717ae30a75eeb0
 DIST mysql-5.5.19.tar.gz 24296942 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f SHA512 02f741df70c0b8058babb2cb6b9469856641413eb334e76ffeec91f21ab71440f1ee644cc58471e86f03ca850cf789869d48b68788ea346b0b3dfc5b509a5bd1 WHIRLPOOL 8b119fd8be0d2191d0b4df49de8abde5b0382b5eb0fab4bafea83dcd54fabf9751f4ab3d008f860828bd6e9667696e831a0c7f88dcc648f372efec39cae1552d
 DIST mysql-5.5.20.tar.gz 24305842 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e SHA512 df433cf831f1aef6c143d70e0b447268f6ebd3a7bf2573b6269aea3309ef0cfed881beb917a7c6d6f2d0a8fe96b05c36a3c9d10e3763b56fc7a2eb6bb721100f WHIRLPOOL 84423528dac7b781b1ef267b830bef8b21e4ae98b9f356fa891d55cc601dd3bd867964182772f54b3cad1a076f3f5a3c511e7f025316bd9c101868ebfee9afa7
 DIST mysql-5.5.21.tar.gz 24341768 SHA256 2471fedc42bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd SHA512 183ffc9b742c8910ec9c97ad82845f0be35a7da764c2c8a6a5269cc7251c0443b2641a5d5f4302ab4afdcd908099af1d3ae4abba5c43f534ac65f931e2672377 WHIRLPOOL 710e9ce0fddbb0ae4f495d04ba3667a8c44bdfedd9087795ef4b57c59357a50654248427c5ca3751c462f9b744adf0391ae709d42e00eb1530a550972c5f9f55
 DIST mysql-5.5.22.tar.gz 24475686 SHA256 f3333ffbe13e586471225fcb521f6ce511fa4374010901813ac35e0f5909dcdd SHA512 729621d2755bf80b8d4d98ac3ec883cdd0711da3fcdd13d8eb478fac25ea2744d743192cd800d4b028b9341fc11d7293863561e6c2ad34830ec2ced7c6806042 WHIRLPOOL 05bfe1da714c38ac3347d2f4d139c63a42b8159742cea11fab5237196c9b640865b645a790e5d08de6fb61d8493cae52b8f61ac3fa87e393e048dbdac51d9b04
-DIST mysql-5.5.25a.tar.gz 24660795 SHA256 d199fd9a3e0865226b9b2d5a870314c23a06afe7fac37e385708119e78168fda
+DIST mysql-5.5.25a.tar.gz 24660795 SHA256 d199fd9a3e0865226b9b2d5a870314c23a06afe7fac37e385708119e78168fda SHA512 e7bda31b775ead847ffe391ae67682cad0ddae298215dad7823fac8a5649c1900fc02dab25279f0b11b50ebccc82609e87be1eac93548a71bdb069508fa35fe4 WHIRLPOOL e0dc8d9c02d887a3f06c0b89e8ecfe6c353ae070930a85733828f839388ee88fc6b1aed4a6ecf5be3c37ebf3525f5b005a9bb363afd983a4ead1339172669618
 DIST mysql-5.5.27.tar.gz 24667156 SHA256 51ffafbd82039f8afbe5b3c26f15cc338ed6cd4f67e56d7dd33efaa28c9d99e4 SHA512 0d3f14b2c797b78ba6c1f9b667537ffe1610620007dfdb711ab41d4914e82ceb9818878004da4b39581489c83448bc888aa1cb1ad080676a8d8a7605a8e16adb WHIRLPOOL a74165c34f5a800f4447034cf19533bbb174b79236b9840eb8f20503881140801851aec255fac83389fba48a7c4e87b65052641704c5135d11d90b9f54e48084
 DIST mysql-5.6.2-m5.tar.gz 26137314 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f SHA512 b78903d40afe09951a3674f96d71014e1b4ab76c259c32e328d4791188161051f89e66143f0ebd5b99c35b0470d92c6bf0a82e6cce199ee033cb1f1c33ae2474 WHIRLPOOL 6105540cd8837958b84782c184942e70089088fb531d16cd9291293b555ad9d98033fa9455025b4139fa7ea51aa944b331b6940ebdc07620a0604adce196a4be
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 SHA512 87d7b80d2df8f5e52bff2abd070eb8ed73d6bf19a32fcf82167a74d0f4600e62bc17cb09076b82bc643ed37279a7e4c402f1da8db25a06955c037b7173810a7f WHIRLPOOL a959ec13bd06c96988691b2458cf8ceb510f99aba20dd1f6e9c90f9c5f7bf9fe0c811badfd056ffe66c1c14cb2c9d3c29cd47481ac445a2df2fc22aa0b8a1324

diff --git a/dev-db/mysql/mysql-5.1.65.ebuild b/dev-db/mysql/mysql-5.1.65.ebuild
new file mode 100644
index 0000000..fc7e609
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.65.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.61.ebuild,v 1.2 2012/01/31 20:23:03 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		if ! use extraengine ; then
+			# bug 332565
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+			# bug 401673
+			for t in federated.federated_plugin ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-10-24 18:10 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-10-24 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     f1eccecbc1dc0cecb462024c7ea6db96b086cd4c
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 24 18:03:42 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 18:05:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f1eccecb

[dev-db/mysql] Version bump for 5.5.28.

(Portage version: 2.2.0_alpha125/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 dev-db/mysql/Manifest            |    1 +
 dev-db/mysql/mysql-5.5.28.ebuild |  129 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+), 0 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 4cc572c..88a9d6e 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -9,6 +9,7 @@ DIST mysql-5.5.21.tar.gz 24341768 SHA256 2471fedc42bafb8210f7ff132172f6f57933f97
 DIST mysql-5.5.22.tar.gz 24475686 SHA256 f3333ffbe13e586471225fcb521f6ce511fa4374010901813ac35e0f5909dcdd SHA512 729621d2755bf80b8d4d98ac3ec883cdd0711da3fcdd13d8eb478fac25ea2744d743192cd800d4b028b9341fc11d7293863561e6c2ad34830ec2ced7c6806042 WHIRLPOOL 05bfe1da714c38ac3347d2f4d139c63a42b8159742cea11fab5237196c9b640865b645a790e5d08de6fb61d8493cae52b8f61ac3fa87e393e048dbdac51d9b04
 DIST mysql-5.5.25a.tar.gz 24660795 SHA256 d199fd9a3e0865226b9b2d5a870314c23a06afe7fac37e385708119e78168fda SHA512 e7bda31b775ead847ffe391ae67682cad0ddae298215dad7823fac8a5649c1900fc02dab25279f0b11b50ebccc82609e87be1eac93548a71bdb069508fa35fe4 WHIRLPOOL e0dc8d9c02d887a3f06c0b89e8ecfe6c353ae070930a85733828f839388ee88fc6b1aed4a6ecf5be3c37ebf3525f5b005a9bb363afd983a4ead1339172669618
 DIST mysql-5.5.27.tar.gz 24667156 SHA256 51ffafbd82039f8afbe5b3c26f15cc338ed6cd4f67e56d7dd33efaa28c9d99e4 SHA512 0d3f14b2c797b78ba6c1f9b667537ffe1610620007dfdb711ab41d4914e82ceb9818878004da4b39581489c83448bc888aa1cb1ad080676a8d8a7605a8e16adb WHIRLPOOL a74165c34f5a800f4447034cf19533bbb174b79236b9840eb8f20503881140801851aec255fac83389fba48a7c4e87b65052641704c5135d11d90b9f54e48084
+DIST mysql-5.5.28.tar.gz 24739429 SHA256 f9b2491f1ddd99842a8e75c21958368bebe59c47e84bec778baa915e255cc78f SHA512 61b20e7ae11ef0fc53d199a6a177a34a95e0a7cf17cd574e7ed75d2e51e62da8178184333adb0805b6bbe7649355ae2062ac36c70faa23acfbc419aaa47a7365 WHIRLPOOL 909018977ddbd124b2152372d858a65d85ee0cbebef2f94ea14b04188ebaf90529a576f24f47cc6bc232e9d6ddd5251ed18242eb08ee0d3da081c81a04da9d3b
 DIST mysql-5.6.2-m5.tar.gz 26137314 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f SHA512 b78903d40afe09951a3674f96d71014e1b4ab76c259c32e328d4791188161051f89e66143f0ebd5b99c35b0470d92c6bf0a82e6cce199ee033cb1f1c33ae2474 WHIRLPOOL 6105540cd8837958b84782c184942e70089088fb531d16cd9291293b555ad9d98033fa9455025b4139fa7ea51aa944b331b6940ebdc07620a0604adce196a4be
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 SHA512 87d7b80d2df8f5e52bff2abd070eb8ed73d6bf19a32fcf82167a74d0f4600e62bc17cb09076b82bc643ed37279a7e4c402f1da8db25a06955c037b7173810a7f WHIRLPOOL a959ec13bd06c96988691b2458cf8ceb510f99aba20dd1f6e9c90f9c5f7bf9fe0c811badfd056ffe66c1c14cb2c9d3c29cd47481ac445a2df2fc22aa0b8a1324
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5 SHA512 bf0e4a88d6b981aff0ae25a1294a808b12414aed591634dc6aaf7f5b1b2e31a401c622b7f60408dd85c3f71d79eedb7c9118a25eafb2cd739278266edadd75c1 WHIRLPOOL 8a5790ce2a94378e594afb662c0e465db045e720e026ba98aafa8289c861af71e25ed4a10fce6061ec4ba683952a92f3bbc484937bb4e5de0617026f95bdc28b

diff --git a/dev-db/mysql/mysql-5.5.28.ebuild b/dev-db/mysql/mysql-5.5.28.ebuild
new file mode 100644
index 0000000..1dad757
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.28.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20120401-2131Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-10-25 13:46 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-10-25 13:46 UTC (permalink / raw
  To: gentoo-commits

commit:     ed48a999b7a29e1fee7162f1f13bb363e69813f8
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 25 13:46:01 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Oct 25 13:46:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ed48a999

[dev-db/mysql] 5.1.66 version bump.

(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)

---
 dev-db/mysql/Manifest            |    1 +
 dev-db/mysql/mysql-5.1.66.ebuild |  265 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 266 insertions(+), 0 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 88a9d6e..0a78797 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,6 +3,7 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde1539575
 DIST mysql-5.1.61.tar.gz 24462261 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918 SHA512 62c623c32d9b79ccccc0fecd921d06cb40de91d1a92daf8b325ca7e8f17bc17bd35ab56fa524b40235ca933aabd71b3900f0c60901f8907da86a860dd93fc26a WHIRLPOOL 92b84e006147781c50f27600ed8cfd9c8e527d8e4a032d8560f20dd48080cf0b3d1d6008beaacf317af92ddd37fe9b2882e1b152db57763179d9f1b62eabe612
 DIST mysql-5.1.62.tar.gz 24503313 SHA256 97c07b2478e25892fe915b2c46e99083973f541ecdf06672241f0c22f79fead3 SHA512 9dc9ae3035ccbad0b537ec5257cc9b4c3b0715136cdc67ed82bb3dfced04584d165716c485be65929d31dc98569d0d2e0b5162b95ff2da8f291d1dab352c98c0 WHIRLPOOL 73158dc457d9f7deac6945d54074cf3dba6367ea52e00297110779c6ed6208283030955a0abbf5c6b594d2e692f047147eb6e8a4cfa4c1da504335093896fd23
 DIST mysql-5.1.65.tar.gz 24673939 SHA256 393c2933b27aeb5d80d4da628e2371d85fee8d4d7fa3e08aa181edb7385a4db9 SHA512 1370a9f63be57829bfdb75bb7512310c7f2a20c367680384b131aeb263d08cae351163d532285f80b519ef1a5b830d59f6729c50808ec6faac64ab57fa9091e8 WHIRLPOOL 53e6539057e0020371ca830bae54a48f4da706e0c6f6c6b5527df52744d5d471ed9f439cab8b7a7b355b78de00e30cb9263b47f7afb23e6b63717ae30a75eeb0
+DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907 SHA512 01b7ff0a08362249e04a9a66cf0f255cb517f22d336201ba4ae8759cfc8047cb3dcaff75821796c01f87b35a7e8f5533957152cc7ae905cdf65f40239634e4f0 WHIRLPOOL 384cb0ef805ac70646f834ed7140ec1dd9ee4810692ba8e671eb7f5006ce2f97a401097224ce78316c371860639322164505e9099c1233d1816fa7bbc4fd354b
 DIST mysql-5.5.19.tar.gz 24296942 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f SHA512 02f741df70c0b8058babb2cb6b9469856641413eb334e76ffeec91f21ab71440f1ee644cc58471e86f03ca850cf789869d48b68788ea346b0b3dfc5b509a5bd1 WHIRLPOOL 8b119fd8be0d2191d0b4df49de8abde5b0382b5eb0fab4bafea83dcd54fabf9751f4ab3d008f860828bd6e9667696e831a0c7f88dcc648f372efec39cae1552d
 DIST mysql-5.5.20.tar.gz 24305842 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e SHA512 df433cf831f1aef6c143d70e0b447268f6ebd3a7bf2573b6269aea3309ef0cfed881beb917a7c6d6f2d0a8fe96b05c36a3c9d10e3763b56fc7a2eb6bb721100f WHIRLPOOL 84423528dac7b781b1ef267b830bef8b21e4ae98b9f356fa891d55cc601dd3bd867964182772f54b3cad1a076f3f5a3c511e7f025316bd9c101868ebfee9afa7
 DIST mysql-5.5.21.tar.gz 24341768 SHA256 2471fedc42bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd SHA512 183ffc9b742c8910ec9c97ad82845f0be35a7da764c2c8a6a5269cc7251c0443b2641a5d5f4302ab4afdcd908099af1d3ae4abba5c43f534ac65f931e2672377 WHIRLPOOL 710e9ce0fddbb0ae4f495d04ba3667a8c44bdfedd9087795ef4b57c59357a50654248427c5ca3751c462f9b744adf0391ae709d42e00eb1530a550972c5f9f55

diff --git a/dev-db/mysql/mysql-5.1.66.ebuild b/dev-db/mysql/mysql-5.1.66.ebuild
new file mode 100644
index 0000000..fc7e609
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.66.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.61.ebuild,v 1.2 2012/01/31 20:23:03 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		if ! use extraengine ; then
+			# bug 332565
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+			# bug 401673
+			for t in federated.federated_plugin ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-10-26 14:41 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-10-26 14:41 UTC (permalink / raw
  To: gentoo-commits

commit:     8d0f9dc819297a22a2c10ecc5e5c06ebd0dcd3c0
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 26 14:41:01 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Oct 26 14:41:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8d0f9dc8

[dev-db/mysql] 5.6.7_rc version bump. This version is failing to build.

(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)

---
 dev-db/mysql/Manifest              |    1 +
 dev-db/mysql/mysql-5.6.7_rc.ebuild |  119 ++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+), 0 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 0a78797..b2deced 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -12,6 +12,7 @@ DIST mysql-5.5.25a.tar.gz 24660795 SHA256 d199fd9a3e0865226b9b2d5a870314c23a06af
 DIST mysql-5.5.27.tar.gz 24667156 SHA256 51ffafbd82039f8afbe5b3c26f15cc338ed6cd4f67e56d7dd33efaa28c9d99e4 SHA512 0d3f14b2c797b78ba6c1f9b667537ffe1610620007dfdb711ab41d4914e82ceb9818878004da4b39581489c83448bc888aa1cb1ad080676a8d8a7605a8e16adb WHIRLPOOL a74165c34f5a800f4447034cf19533bbb174b79236b9840eb8f20503881140801851aec255fac83389fba48a7c4e87b65052641704c5135d11d90b9f54e48084
 DIST mysql-5.5.28.tar.gz 24739429 SHA256 f9b2491f1ddd99842a8e75c21958368bebe59c47e84bec778baa915e255cc78f SHA512 61b20e7ae11ef0fc53d199a6a177a34a95e0a7cf17cd574e7ed75d2e51e62da8178184333adb0805b6bbe7649355ae2062ac36c70faa23acfbc419aaa47a7365 WHIRLPOOL 909018977ddbd124b2152372d858a65d85ee0cbebef2f94ea14b04188ebaf90529a576f24f47cc6bc232e9d6ddd5251ed18242eb08ee0d3da081c81a04da9d3b
 DIST mysql-5.6.2-m5.tar.gz 26137314 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f SHA512 b78903d40afe09951a3674f96d71014e1b4ab76c259c32e328d4791188161051f89e66143f0ebd5b99c35b0470d92c6bf0a82e6cce199ee033cb1f1c33ae2474 WHIRLPOOL 6105540cd8837958b84782c184942e70089088fb531d16cd9291293b555ad9d98033fa9455025b4139fa7ea51aa944b331b6940ebdc07620a0604adce196a4be
+DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 SHA512 87d7b80d2df8f5e52bff2abd070eb8ed73d6bf19a32fcf82167a74d0f4600e62bc17cb09076b82bc643ed37279a7e4c402f1da8db25a06955c037b7173810a7f WHIRLPOOL a959ec13bd06c96988691b2458cf8ceb510f99aba20dd1f6e9c90f9c5f7bf9fe0c811badfd056ffe66c1c14cb2c9d3c29cd47481ac445a2df2fc22aa0b8a1324
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5 SHA512 bf0e4a88d6b981aff0ae25a1294a808b12414aed591634dc6aaf7f5b1b2e31a401c622b7f60408dd85c3f71d79eedb7c9118a25eafb2cd739278266edadd75c1 WHIRLPOOL 8a5790ce2a94378e594afb662c0e465db045e720e026ba98aafa8289c861af71e25ed4a10fce6061ec4ba683952a92f3bbc484937bb4e5de0617026f95bdc28b
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213

diff --git a/dev-db/mysql/mysql-5.6.7_rc.ebuild b/dev-db/mysql/mysql-5.6.7_rc.ebuild
new file mode 100644
index 0000000..ea5f7ed
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.7_rc.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin; do
+				mysql_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2012-11-02  0:05 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2012-11-02  0:05 UTC (permalink / raw
  To: gentoo-commits

commit:     69974caf362024643b3f85ba33d564b371fd68f6
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 00:04:03 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 00:04:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=69974caf

Clean up and fix patch versions.

(Portage version: 2.2.0_alpha121/git/Linux x86_64, unsigned Manifest commit)

---
 dev-db/mysql/Manifest            |    2 +-
 dev-db/mysql/metadata.xml        |    5 +
 dev-db/mysql/mysql-5.0.92.ebuild |  196 --------------------------------------
 dev-db/mysql/mysql-5.1.65.ebuild |    2 +-
 dev-db/mysql/mysql-5.1.66.ebuild |    2 +-
 5 files changed, 8 insertions(+), 199 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index b2deced..3cbf597 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,4 +1,3 @@
-DIST mysql-5.0.92.tar.gz 22440590 SHA256 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55 SHA512 8fdc609761be56f64c71d5334611c1744f5496cef3adb68bbc52f5249d34174373e7b3fb15e6592d138cfd77d1b46d23bc9991ff49fd0d2636abe71304493fe2 WHIRLPOOL 58fb2dc8fabd376000418f5a7fd0aecda6b824704ebff2f3f2ca0776458f1e0e28e2fcfe7194253dd7437f6c14c8cc6625d19b59714ba421379f3b8f0f08a579
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.61.tar.gz 24462261 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918 SHA512 62c623c32d9b79ccccc0fecd921d06cb40de91d1a92daf8b325ca7e8f17bc17bd35ab56fa524b40235ca933aabd71b3900f0c60901f8907da86a860dd93fc26a WHIRLPOOL 92b84e006147781c50f27600ed8cfd9c8e527d8e4a032d8560f20dd48080cf0b3d1d6008beaacf317af92ddd37fe9b2882e1b152db57763179d9f1b62eabe612
 DIST mysql-5.1.62.tar.gz 24503313 SHA256 97c07b2478e25892fe915b2c46e99083973f541ecdf06672241f0c22f79fead3 SHA512 9dc9ae3035ccbad0b537ec5257cc9b4c3b0715136cdc67ed82bb3dfced04584d165716c485be65929d31dc98569d0d2e0b5162b95ff2da8f291d1dab352c98c0 WHIRLPOOL 73158dc457d9f7deac6945d54074cf3dba6367ea52e00297110779c6ed6208283030955a0abbf5c6b594d2e692f047147eb6e8a4cfa4c1da504335093896fd23
@@ -16,5 +15,6 @@ DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 SHA512 87d7b80d2df8f5e52bff2abd070eb8ed73d6bf19a32fcf82167a74d0f4600e62bc17cb09076b82bc643ed37279a7e4c402f1da8db25a06955c037b7173810a7f WHIRLPOOL a959ec13bd06c96988691b2458cf8ceb510f99aba20dd1f6e9c90f9c5f7bf9fe0c811badfd056ffe66c1c14cb2c9d3c29cd47481ac445a2df2fc22aa0b8a1324
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5 SHA512 bf0e4a88d6b981aff0ae25a1294a808b12414aed591634dc6aaf7f5b1b2e31a401c622b7f60408dd85c3f71d79eedb7c9118a25eafb2cd739278266edadd75c1 WHIRLPOOL 8a5790ce2a94378e594afb662c0e465db045e720e026ba98aafa8289c861af71e25ed4a10fce6061ec4ba683952a92f3bbc484937bb4e5de0617026f95bdc28b
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
+DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf

diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 3da4f4a..f34987e 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -2,6 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>mysql</herd>
+<!-- 
+Please note that this list is shared between the following packages:
+dev-db/mysql
+dev-db/mariadb
+-->
 <use>
   <flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
   <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>

diff --git a/dev-db/mysql/mysql-5.0.92.ebuild b/dev-db/mysql/mysql-5.0.92.ebuild
deleted file mode 100644
index 311ddbf..0000000
--- a/dev-db/mysql/mysql-5.0.92.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-MY_EXTRAS_VER="live"
-
-inherit toolchain-funcs mysql
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# 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-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-# 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=""
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect ; do \
-					mysql_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.0 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		case ${PV} in
-			5.0.*)
-			for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		case $PV in
-			5.0.91)
-			for t in archive archive_gis archive-big \
-				federated_archive mysqldump-max \
-				; do
-					mysql_disable_test $t "Broken in 5.0.91"
-				done
-			;;
-		esac
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		failures=""
-		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.65.ebuild b/dev-db/mysql/mysql-5.1.65.ebuild
index fc7e609..0a2d724 100644
--- a/dev-db/mysql/mysql-5.1.65.ebuild
+++ b/dev-db/mysql/mysql-5.1.65.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20121101-2319Z"
 # PBXT
 PBXT_VERSION='1.0.11-6-pre-ga'
 # XtraDB

diff --git a/dev-db/mysql/mysql-5.1.66.ebuild b/dev-db/mysql/mysql-5.1.66.ebuild
index fc7e609..0a2d724 100644
--- a/dev-db/mysql/mysql-5.1.66.ebuild
+++ b/dev-db/mysql/mysql-5.1.66.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20121101-2319Z"
 # PBXT
 PBXT_VERSION='1.0.11-6-pre-ga'
 # XtraDB


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-01-20  2:15 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-01-20  2:15 UTC (permalink / raw
  To: gentoo-commits

commit:     4f318a1621138b3087e3178d8687f8efb0e629f2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 18 02:34:14 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 18 02:34:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4f318a16

Bump.

Package-Manager: portage-2.2.0_alpha144

---
 dev-db/mysql/Manifest            |    2 +
 dev-db/mysql/mysql-5.1.67.ebuild |  265 ++++++++++++++++++++++++++++++++++++++
 dev-db/mysql/mysql-5.5.29.ebuild |  129 ++++++++++++++++++
 3 files changed, 396 insertions(+), 0 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 3cbf597..52be9d9 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,6 +3,7 @@ DIST mysql-5.1.61.tar.gz 24462261 SHA256 879c6424282e38eb1ba9b1910db98b378a5574c
 DIST mysql-5.1.62.tar.gz 24503313 SHA256 97c07b2478e25892fe915b2c46e99083973f541ecdf06672241f0c22f79fead3 SHA512 9dc9ae3035ccbad0b537ec5257cc9b4c3b0715136cdc67ed82bb3dfced04584d165716c485be65929d31dc98569d0d2e0b5162b95ff2da8f291d1dab352c98c0 WHIRLPOOL 73158dc457d9f7deac6945d54074cf3dba6367ea52e00297110779c6ed6208283030955a0abbf5c6b594d2e692f047147eb6e8a4cfa4c1da504335093896fd23
 DIST mysql-5.1.65.tar.gz 24673939 SHA256 393c2933b27aeb5d80d4da628e2371d85fee8d4d7fa3e08aa181edb7385a4db9 SHA512 1370a9f63be57829bfdb75bb7512310c7f2a20c367680384b131aeb263d08cae351163d532285f80b519ef1a5b830d59f6729c50808ec6faac64ab57fa9091e8 WHIRLPOOL 53e6539057e0020371ca830bae54a48f4da706e0c6f6c6b5527df52744d5d471ed9f439cab8b7a7b355b78de00e30cb9263b47f7afb23e6b63717ae30a75eeb0
 DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907 SHA512 01b7ff0a08362249e04a9a66cf0f255cb517f22d336201ba4ae8759cfc8047cb3dcaff75821796c01f87b35a7e8f5533957152cc7ae905cdf65f40239634e4f0 WHIRLPOOL 384cb0ef805ac70646f834ed7140ec1dd9ee4810692ba8e671eb7f5006ce2f97a401097224ce78316c371860639322164505e9099c1233d1816fa7bbc4fd354b
+DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d
 DIST mysql-5.5.19.tar.gz 24296942 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f SHA512 02f741df70c0b8058babb2cb6b9469856641413eb334e76ffeec91f21ab71440f1ee644cc58471e86f03ca850cf789869d48b68788ea346b0b3dfc5b509a5bd1 WHIRLPOOL 8b119fd8be0d2191d0b4df49de8abde5b0382b5eb0fab4bafea83dcd54fabf9751f4ab3d008f860828bd6e9667696e831a0c7f88dcc648f372efec39cae1552d
 DIST mysql-5.5.20.tar.gz 24305842 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e SHA512 df433cf831f1aef6c143d70e0b447268f6ebd3a7bf2573b6269aea3309ef0cfed881beb917a7c6d6f2d0a8fe96b05c36a3c9d10e3763b56fc7a2eb6bb721100f WHIRLPOOL 84423528dac7b781b1ef267b830bef8b21e4ae98b9f356fa891d55cc601dd3bd867964182772f54b3cad1a076f3f5a3c511e7f025316bd9c101868ebfee9afa7
 DIST mysql-5.5.21.tar.gz 24341768 SHA256 2471fedc42bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd SHA512 183ffc9b742c8910ec9c97ad82845f0be35a7da764c2c8a6a5269cc7251c0443b2641a5d5f4302ab4afdcd908099af1d3ae4abba5c43f534ac65f931e2672377 WHIRLPOOL 710e9ce0fddbb0ae4f495d04ba3667a8c44bdfedd9087795ef4b57c59357a50654248427c5ca3751c462f9b744adf0391ae709d42e00eb1530a550972c5f9f55
@@ -10,6 +11,7 @@ DIST mysql-5.5.22.tar.gz 24475686 SHA256 f3333ffbe13e586471225fcb521f6ce511fa437
 DIST mysql-5.5.25a.tar.gz 24660795 SHA256 d199fd9a3e0865226b9b2d5a870314c23a06afe7fac37e385708119e78168fda SHA512 e7bda31b775ead847ffe391ae67682cad0ddae298215dad7823fac8a5649c1900fc02dab25279f0b11b50ebccc82609e87be1eac93548a71bdb069508fa35fe4 WHIRLPOOL e0dc8d9c02d887a3f06c0b89e8ecfe6c353ae070930a85733828f839388ee88fc6b1aed4a6ecf5be3c37ebf3525f5b005a9bb363afd983a4ead1339172669618
 DIST mysql-5.5.27.tar.gz 24667156 SHA256 51ffafbd82039f8afbe5b3c26f15cc338ed6cd4f67e56d7dd33efaa28c9d99e4 SHA512 0d3f14b2c797b78ba6c1f9b667537ffe1610620007dfdb711ab41d4914e82ceb9818878004da4b39581489c83448bc888aa1cb1ad080676a8d8a7605a8e16adb WHIRLPOOL a74165c34f5a800f4447034cf19533bbb174b79236b9840eb8f20503881140801851aec255fac83389fba48a7c4e87b65052641704c5135d11d90b9f54e48084
 DIST mysql-5.5.28.tar.gz 24739429 SHA256 f9b2491f1ddd99842a8e75c21958368bebe59c47e84bec778baa915e255cc78f SHA512 61b20e7ae11ef0fc53d199a6a177a34a95e0a7cf17cd574e7ed75d2e51e62da8178184333adb0805b6bbe7649355ae2062ac36c70faa23acfbc419aaa47a7365 WHIRLPOOL 909018977ddbd124b2152372d858a65d85ee0cbebef2f94ea14b04188ebaf90529a576f24f47cc6bc232e9d6ddd5251ed18242eb08ee0d3da081c81a04da9d3b
+DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773
 DIST mysql-5.6.2-m5.tar.gz 26137314 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f SHA512 b78903d40afe09951a3674f96d71014e1b4ab76c259c32e328d4791188161051f89e66143f0ebd5b99c35b0470d92c6bf0a82e6cce199ee033cb1f1c33ae2474 WHIRLPOOL 6105540cd8837958b84782c184942e70089088fb531d16cd9291293b555ad9d98033fa9455025b4139fa7ea51aa944b331b6940ebdc07620a0604adce196a4be
 DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 SHA512 87d7b80d2df8f5e52bff2abd070eb8ed73d6bf19a32fcf82167a74d0f4600e62bc17cb09076b82bc643ed37279a7e4c402f1da8db25a06955c037b7173810a7f WHIRLPOOL a959ec13bd06c96988691b2458cf8ceb510f99aba20dd1f6e9c90f9c5f7bf9fe0c811badfd056ffe66c1c14cb2c9d3c29cd47481ac445a2df2fc22aa0b8a1324

diff --git a/dev-db/mysql/mysql-5.1.67.ebuild b/dev-db/mysql/mysql-5.1.67.ebuild
new file mode 100644
index 0000000..0a2d724
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.67.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.61.ebuild,v 1.2 2012/01/31 20:23:03 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20121101-2319Z"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		if ! use extraengine ; then
+			# bug 332565
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+			# bug 401673
+			for t in federated.federated_plugin ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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/mysql/mysql-5.5.29.ebuild b/dev-db/mysql/mysql-5.5.29.ebuild
new file mode 100644
index 0000000..d7d61ef
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.29.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20121101-2319Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-01-20  2:15 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-01-20  2:15 UTC (permalink / raw
  To: gentoo-commits

commit:     116155ad291185b28edcfa471f60311626eb2067
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 01:15:54 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 01:15:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=116155ad

Copy keywords from gentoo-x86.

Package-Manager: portage-2.2.0_alpha144

---
 dev-db/mysql/mysql-5.1.61.ebuild |    2 +-
 dev-db/mysql/mysql-5.1.62.ebuild |    2 +-
 dev-db/mysql/mysql-5.1.66.ebuild |    2 +-
 dev-db/mysql/mysql-5.5.28.ebuild |    2 +-
 dev-db/mysql/mysql-5.5.29.ebuild |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-db/mysql/mysql-5.1.61.ebuild b/dev-db/mysql/mysql-5.1.61.ebuild
index 9cdf8c2..e8b7c9b 100644
--- a/dev-db/mysql/mysql-5.1.61.ebuild
+++ b/dev-db/mysql/mysql-5.1.61.ebuild
@@ -19,7 +19,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 # This is often broken still

diff --git a/dev-db/mysql/mysql-5.1.62.ebuild b/dev-db/mysql/mysql-5.1.62.ebuild
index 90ca29a..3ac5959 100644
--- a/dev-db/mysql/mysql-5.1.62.ebuild
+++ b/dev-db/mysql/mysql-5.1.62.ebuild
@@ -19,7 +19,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 # This is often broken still

diff --git a/dev-db/mysql/mysql-5.1.66.ebuild b/dev-db/mysql/mysql-5.1.66.ebuild
index 0a2d724..110e24f 100644
--- a/dev-db/mysql/mysql-5.1.66.ebuild
+++ b/dev-db/mysql/mysql-5.1.66.ebuild
@@ -19,7 +19,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 # This is often broken still

diff --git a/dev-db/mysql/mysql-5.5.28.ebuild b/dev-db/mysql/mysql-5.5.28.ebuild
index 1dad757..d89b9ac 100644
--- a/dev-db/mysql/mysql-5.5.28.ebuild
+++ b/dev-db/mysql/mysql-5.5.28.ebuild
@@ -19,7 +19,7 @@ IUSE="$IUSE"
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''

diff --git a/dev-db/mysql/mysql-5.5.29.ebuild b/dev-db/mysql/mysql-5.5.29.ebuild
index e6444e6..13e9843 100644
--- a/dev-db/mysql/mysql-5.5.29.ebuild
+++ b/dev-db/mysql/mysql-5.5.29.ebuild
@@ -19,7 +19,7 @@ IUSE="$IUSE"
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-01-20  2:15 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-01-20  2:15 UTC (permalink / raw
  To: gentoo-commits

commit:     5d66a00bce2a1d4c649d86681bdbe4811c0536fd
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 01:05:57 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 01:05:57 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5d66a00b

Update to latest versions of mysql-extras.

Package-Manager: portage-2.2.0_alpha144
RepoMan-Options: --force

---
 dev-db/mysql/Manifest            |    1 +
 dev-db/mysql/mysql-5.5.29.ebuild |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 52be9d9..7314e5d 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -18,5 +18,6 @@ DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 SHA256 2b0e1ce0bf5a2bcb543e631f
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5 SHA512 bf0e4a88d6b981aff0ae25a1294a808b12414aed591634dc6aaf7f5b1b2e31a401c622b7f60408dd85c3f71d79eedb7c9118a25eafb2cd739278266edadd75c1 WHIRLPOOL 8a5790ce2a94378e594afb662c0e465db045e720e026ba98aafa8289c861af71e25ed4a10fce6061ec4ba683952a92f3bbc484937bb4e5de0617026f95bdc28b
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
+DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf

diff --git a/dev-db/mysql/mysql-5.5.29.ebuild b/dev-db/mysql/mysql-5.5.29.ebuild
index d7d61ef..e6444e6 100644
--- a/dev-db/mysql/mysql-5.5.29.ebuild
+++ b/dev-db/mysql/mysql-5.5.29.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-MY_EXTRAS_VER="20121101-2319Z"
+MY_EXTRAS_VER="20130120-0100Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-01-20  2:15 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-01-20  2:15 UTC (permalink / raw
  To: gentoo-commits

commit:     e0193872ddb064f00925f1867b0263f95f5bc3de
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 01:46:30 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 01:46:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e0193872

Clean up old versions.

Package-Manager: portage-2.2.0_alpha144

---
 dev-db/mysql/Manifest            |    3 -
 dev-db/mysql/mysql-5.1.61.ebuild |  265 --------------------------------------
 dev-db/mysql/mysql-5.1.62.ebuild |  265 --------------------------------------
 dev-db/mysql/mysql-5.1.65.ebuild |  265 --------------------------------------
 4 files changed, 0 insertions(+), 798 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 7314e5d..2567073 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,7 +1,4 @@
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
-DIST mysql-5.1.61.tar.gz 24462261 SHA256 879c6424282e38eb1ba9b1910db98b378a5574ceed431a69e344643a5524f918 SHA512 62c623c32d9b79ccccc0fecd921d06cb40de91d1a92daf8b325ca7e8f17bc17bd35ab56fa524b40235ca933aabd71b3900f0c60901f8907da86a860dd93fc26a WHIRLPOOL 92b84e006147781c50f27600ed8cfd9c8e527d8e4a032d8560f20dd48080cf0b3d1d6008beaacf317af92ddd37fe9b2882e1b152db57763179d9f1b62eabe612
-DIST mysql-5.1.62.tar.gz 24503313 SHA256 97c07b2478e25892fe915b2c46e99083973f541ecdf06672241f0c22f79fead3 SHA512 9dc9ae3035ccbad0b537ec5257cc9b4c3b0715136cdc67ed82bb3dfced04584d165716c485be65929d31dc98569d0d2e0b5162b95ff2da8f291d1dab352c98c0 WHIRLPOOL 73158dc457d9f7deac6945d54074cf3dba6367ea52e00297110779c6ed6208283030955a0abbf5c6b594d2e692f047147eb6e8a4cfa4c1da504335093896fd23
-DIST mysql-5.1.65.tar.gz 24673939 SHA256 393c2933b27aeb5d80d4da628e2371d85fee8d4d7fa3e08aa181edb7385a4db9 SHA512 1370a9f63be57829bfdb75bb7512310c7f2a20c367680384b131aeb263d08cae351163d532285f80b519ef1a5b830d59f6729c50808ec6faac64ab57fa9091e8 WHIRLPOOL 53e6539057e0020371ca830bae54a48f4da706e0c6f6c6b5527df52744d5d471ed9f439cab8b7a7b355b78de00e30cb9263b47f7afb23e6b63717ae30a75eeb0
 DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907 SHA512 01b7ff0a08362249e04a9a66cf0f255cb517f22d336201ba4ae8759cfc8047cb3dcaff75821796c01f87b35a7e8f5533957152cc7ae905cdf65f40239634e4f0 WHIRLPOOL 384cb0ef805ac70646f834ed7140ec1dd9ee4810692ba8e671eb7f5006ce2f97a401097224ce78316c371860639322164505e9099c1233d1816fa7bbc4fd354b
 DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d
 DIST mysql-5.5.19.tar.gz 24296942 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f SHA512 02f741df70c0b8058babb2cb6b9469856641413eb334e76ffeec91f21ab71440f1ee644cc58471e86f03ca850cf789869d48b68788ea346b0b3dfc5b509a5bd1 WHIRLPOOL 8b119fd8be0d2191d0b4df49de8abde5b0382b5eb0fab4bafea83dcd54fabf9751f4ab3d008f860828bd6e9667696e831a0c7f88dcc648f372efec39cae1552d

diff --git a/dev-db/mysql/mysql-5.1.61.ebuild b/dev-db/mysql/mysql-5.1.61.ebuild
deleted file mode 100644
index e8b7c9b..0000000
--- a/dev-db/mysql/mysql-5.1.61.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.61.ebuild,v 1.2 2012/01/31 20:23:03 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20111118-2347Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.62.ebuild b/dev-db/mysql/mysql-5.1.62.ebuild
deleted file mode 100644
index 3ac5959..0000000
--- a/dev-db/mysql/mysql-5.1.62.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.61.ebuild,v 1.2 2012/01/31 20:23:03 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20120401-2131Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.65.ebuild b/dev-db/mysql/mysql-5.1.65.ebuild
deleted file mode 100644
index 0a2d724..0000000
--- a/dev-db/mysql/mysql-5.1.65.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.61.ebuild,v 1.2 2012/01/31 20:23:03 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20121101-2319Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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
-}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-01-20  2:15 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-01-20  2:15 UTC (permalink / raw
  To: gentoo-commits

commit:     6d6fadb3200372f6dc332617e1de64729acf9e81
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 01:52:13 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 01:52:13 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6d6fadb3

Fix {tests} typo.

Package-Manager: portage-2.2.0_alpha144

---
 dev-db/mysql/mysql-5.5.19.ebuild           |    2 +-
 dev-db/mysql/mysql-5.5.20.ebuild           |    2 +-
 dev-db/mysql/mysql-5.5.21.ebuild           |    2 +-
 dev-db/mysql/mysql-5.5.22.ebuild           |    2 +-
 dev-db/mysql/mysql-5.5.25a.ebuild          |    2 +-
 dev-db/mysql/mysql-5.5.27.ebuild           |    2 +-
 dev-db/mysql/mysql-5.5.28.ebuild           |    2 +-
 dev-db/mysql/mysql-5.5.29.ebuild           |    2 +-
 dev-db/mysql/mysql-5.6.2_alpha_pre5.ebuild |    2 +-
 dev-db/mysql/mysql-5.6.7_rc.ebuild         |    2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-db/mysql/mysql-5.5.19.ebuild b/dev-db/mysql/mysql-5.5.19.ebuild
index 896d901..507df42 100644
--- a/dev-db/mysql/mysql-5.5.19.ebuild
+++ b/dev-db/mysql/mysql-5.5.19.ebuild
@@ -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 "${S}"/mysql-test/var-tests{,/log}
 
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:

diff --git a/dev-db/mysql/mysql-5.5.20.ebuild b/dev-db/mysql/mysql-5.5.20.ebuild
index 18ef035..ec29188 100644
--- a/dev-db/mysql/mysql-5.5.20.ebuild
+++ b/dev-db/mysql/mysql-5.5.20.ebuild
@@ -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 "${S}"/mysql-test/var-tests{,/log}
 
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:

diff --git a/dev-db/mysql/mysql-5.5.21.ebuild b/dev-db/mysql/mysql-5.5.21.ebuild
index 18ef035..ec29188 100644
--- a/dev-db/mysql/mysql-5.5.21.ebuild
+++ b/dev-db/mysql/mysql-5.5.21.ebuild
@@ -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 "${S}"/mysql-test/var-tests{,/log}
 
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:

diff --git a/dev-db/mysql/mysql-5.5.22.ebuild b/dev-db/mysql/mysql-5.5.22.ebuild
index 1dad757..96ae72f 100644
--- a/dev-db/mysql/mysql-5.5.22.ebuild
+++ b/dev-db/mysql/mysql-5.5.22.ebuild
@@ -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 "${S}"/mysql-test/var-tests{,/log}
 
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:

diff --git a/dev-db/mysql/mysql-5.5.25a.ebuild b/dev-db/mysql/mysql-5.5.25a.ebuild
index 1dad757..96ae72f 100644
--- a/dev-db/mysql/mysql-5.5.25a.ebuild
+++ b/dev-db/mysql/mysql-5.5.25a.ebuild
@@ -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 "${S}"/mysql-test/var-tests{,/log}
 
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:

diff --git a/dev-db/mysql/mysql-5.5.27.ebuild b/dev-db/mysql/mysql-5.5.27.ebuild
index 1dad757..96ae72f 100644
--- a/dev-db/mysql/mysql-5.5.27.ebuild
+++ b/dev-db/mysql/mysql-5.5.27.ebuild
@@ -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 "${S}"/mysql-test/var-tests{,/log}
 
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:

diff --git a/dev-db/mysql/mysql-5.5.28.ebuild b/dev-db/mysql/mysql-5.5.28.ebuild
index d89b9ac..dddfe0a 100644
--- a/dev-db/mysql/mysql-5.5.28.ebuild
+++ b/dev-db/mysql/mysql-5.5.28.ebuild
@@ -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 "${S}"/mysql-test/var-tests{,/log}
 
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:

diff --git a/dev-db/mysql/mysql-5.5.29.ebuild b/dev-db/mysql/mysql-5.5.29.ebuild
index 13e9843..02beae8 100644
--- a/dev-db/mysql/mysql-5.5.29.ebuild
+++ b/dev-db/mysql/mysql-5.5.29.ebuild
@@ -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 "${S}"/mysql-test/var-tests{,/log}
 
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:

diff --git a/dev-db/mysql/mysql-5.6.2_alpha_pre5.ebuild b/dev-db/mysql/mysql-5.6.2_alpha_pre5.ebuild
index 610aa95..d1bf4a1 100644
--- a/dev-db/mysql/mysql-5.6.2_alpha_pre5.ebuild
+++ b/dev-db/mysql/mysql-5.6.2_alpha_pre5.ebuild
@@ -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 "${S}"/mysql-test/var-tests{,/log}
 
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:

diff --git a/dev-db/mysql/mysql-5.6.7_rc.ebuild b/dev-db/mysql/mysql-5.6.7_rc.ebuild
index ea5f7ed..7eb488e 100644
--- a/dev-db/mysql/mysql-5.6.7_rc.ebuild
+++ b/dev-db/mysql/mysql-5.6.7_rc.ebuild
@@ -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 "${S}"/mysql-test/var-tests{,/log}
 
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-01-20  2:15 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-01-20  2:15 UTC (permalink / raw
  To: gentoo-commits

commit:     07f5229f2fdbd0dc60a55c5eb28610d467f8c316
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 02:12:56 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 02:12:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=07f5229f

Copy keywords from gentoo-x86.

Package-Manager: portage-2.2.0_alpha144

---
 dev-db/mysql/ChangeLog           |    6 ++++--
 dev-db/mysql/mysql-5.0.96.ebuild |    6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 13f9908..f6ee8ec 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for dev-db/mysql
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.96.ebuild:
+  Copy keywords from gentoo-x86.
+
 *mysql-5.1.65 (14 Aug 2012)
 
   14 Aug 2012; <atlantis@gentoo.org> +mysql-5.1.65.ebuild:
@@ -275,4 +278,3 @@
   29 Nov 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   +mysql-5.1.41.ebuild:
   Initial bump to mysql-5.1.41.
-

diff --git a/dev-db/mysql/mysql-5.0.96.ebuild b/dev-db/mysql/mysql-5.0.96.ebuild
index 6aa84a8..f22bc53 100644
--- a/dev-db/mysql/mysql-5.0.96.ebuild
+++ b/dev-db/mysql/mysql-5.0.96.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.96.ebuild,v 1.4 2013/01/20 01:49:23 robbat2 Exp $
 
 EAPI="4"
 MY_EXTRAS_VER="20120401-2131Z"
@@ -10,7 +10,7 @@ inherit toolchain-funcs mysql
 IUSE="$IUSE"
 
 # 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-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-01-28  2:13 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-01-28  2:13 UTC (permalink / raw
  To: gentoo-commits

commit:     82ce290f692f9fa9b2b0d8756fb7705473a02fe5
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 01:02:21 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 01:02:21 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=82ce290f

Sync from gentoo-x86.

Package-Manager: portage-2.2.0_alpha159
RepoMan-Options: --force

---
 dev-db/mysql/ChangeLog           |    6 ++++++
 dev-db/mysql/metadata.xml        |    1 +
 dev-db/mysql/mysql-5.1.66.ebuild |    4 ++--
 dev-db/mysql/mysql-5.1.67.ebuild |    6 +++---
 dev-db/mysql/mysql-5.5.19.ebuild |    4 ++--
 dev-db/mysql/mysql-5.5.20.ebuild |    4 ++--
 dev-db/mysql/mysql-5.5.21.ebuild |    4 ++--
 dev-db/mysql/mysql-5.5.22.ebuild |    4 ++--
 dev-db/mysql/mysql-5.5.28.ebuild |    4 ++--
 dev-db/mysql/mysql-5.5.29.ebuild |    4 ++--
 10 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index f6ee8ec..9ec233e 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
+  mysql-5.1.66.ebuild, mysql-5.1.67.ebuild, mysql-5.5.19.ebuild,
+  mysql-5.5.20.ebuild, mysql-5.5.21.ebuild, mysql-5.5.22.ebuild,
+  mysql-5.5.28.ebuild, mysql-5.5.29.ebuild:
+  Sync from gentoo-x86.
+
   20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.96.ebuild:
   Copy keywords from gentoo-x86.
 

diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index f34987e..9ecd928 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -19,6 +19,7 @@ dev-db/mariadb
   <flag name='minimal'>Install client programs only, no server</flag>
   <flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
   <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
+  <flag name='raid'>Deprecated option, removed in the 5.0 series</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
   <flag name='test'>Install upstream testsuites for end use.</flag>
   <flag name='xtradb'>Add experimental support for Percona's InnoDB replacement: XtraDB</flag>

diff --git a/dev-db/mysql/mysql-5.1.66.ebuild b/dev-db/mysql/mysql-5.1.66.ebuild
index 110e24f..e01f201 100644
--- a/dev-db/mysql/mysql-5.1.66.ebuild
+++ b/dev-db/mysql/mysql-5.1.66.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.61.ebuild,v 1.2 2012/01/31 20:23:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.66.ebuild,v 1.8 2012/12/01 00:52:42 blueness Exp $
 
 EAPI="4"
 

diff --git a/dev-db/mysql/mysql-5.1.67.ebuild b/dev-db/mysql/mysql-5.1.67.ebuild
index 0a2d724..5eee752 100644
--- a/dev-db/mysql/mysql-5.1.67.ebuild
+++ b/dev-db/mysql/mysql-5.1.67.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.61.ebuild,v 1.2 2012/01/31 20:23:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.67.ebuild,v 1.8 2013/01/21 19:29:09 jer Exp $
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 # This is often broken still

diff --git a/dev-db/mysql/mysql-5.5.19.ebuild b/dev-db/mysql/mysql-5.5.19.ebuild
index 507df42..a67be5d 100644
--- a/dev-db/mysql/mysql-5.5.19.ebuild
+++ b/dev-db/mysql/mysql-5.5.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.19.ebuild,v 1.3 2013/01/20 01:00:58 robbat2 Exp $
 
 EAPI="4"
 

diff --git a/dev-db/mysql/mysql-5.5.20.ebuild b/dev-db/mysql/mysql-5.5.20.ebuild
index ec29188..664355a 100644
--- a/dev-db/mysql/mysql-5.5.20.ebuild
+++ b/dev-db/mysql/mysql-5.5.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.20.ebuild,v 1.2 2013/01/20 01:00:58 robbat2 Exp $
 
 EAPI="4"
 

diff --git a/dev-db/mysql/mysql-5.5.21.ebuild b/dev-db/mysql/mysql-5.5.21.ebuild
index ec29188..d33ad2a 100644
--- a/dev-db/mysql/mysql-5.5.21.ebuild
+++ b/dev-db/mysql/mysql-5.5.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.21.ebuild,v 1.2 2013/01/20 01:00:58 robbat2 Exp $
 
 EAPI="4"
 

diff --git a/dev-db/mysql/mysql-5.5.22.ebuild b/dev-db/mysql/mysql-5.5.22.ebuild
index 96ae72f..275fa40 100644
--- a/dev-db/mysql/mysql-5.5.22.ebuild
+++ b/dev-db/mysql/mysql-5.5.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.22.ebuild,v 1.2 2013/01/20 01:00:58 robbat2 Exp $
 
 EAPI="4"
 

diff --git a/dev-db/mysql/mysql-5.5.28.ebuild b/dev-db/mysql/mysql-5.5.28.ebuild
index dddfe0a..0e4b4b7 100644
--- a/dev-db/mysql/mysql-5.5.28.ebuild
+++ b/dev-db/mysql/mysql-5.5.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.28.ebuild,v 1.3 2013/01/20 01:00:58 robbat2 Exp $
 
 EAPI="4"
 

diff --git a/dev-db/mysql/mysql-5.5.29.ebuild b/dev-db/mysql/mysql-5.5.29.ebuild
index 02beae8..485881c 100644
--- a/dev-db/mysql/mysql-5.5.29.ebuild
+++ b/dev-db/mysql/mysql-5.5.29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.29.ebuild,v 1.1 2013/01/20 02:18:30 robbat2 Exp $
 
 EAPI="4"
 


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-01-28  2:13 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-01-28  2:13 UTC (permalink / raw
  To: gentoo-commits

commit:     3ccfcc19ddcb0799a33cda7feaeb185690d1b7d8
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 01:54:01 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 01:54:01 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3ccfcc19

Include PBXT nice fix per bug #374349.

Package-Manager: portage-2.2.0_alpha159
RepoMan-Options: --force

---
 dev-db/mysql/ChangeLog           |    4 ++++
 dev-db/mysql/Manifest            |    2 +-
 dev-db/mysql/mysql-5.1.66.ebuild |    2 +-
 dev-db/mysql/mysql-5.1.67.ebuild |    2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 9ec233e..52803f8 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.66.ebuild,
+  mysql-5.1.67.ebuild:
+  Include PBXT nice fix per bug #374349.
+
   28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
   mysql-5.1.66.ebuild, mysql-5.1.67.ebuild, mysql-5.5.19.ebuild,
   mysql-5.5.20.ebuild, mysql-5.5.21.ebuild, mysql-5.5.22.ebuild,

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 2567073..bfa1b18 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -14,7 +14,7 @@ DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 SHA512 87d7b80d2df8f5e52bff2abd070eb8ed73d6bf19a32fcf82167a74d0f4600e62bc17cb09076b82bc643ed37279a7e4c402f1da8db25a06955c037b7173810a7f WHIRLPOOL a959ec13bd06c96988691b2458cf8ceb510f99aba20dd1f6e9c90f9c5f7bf9fe0c811badfd056ffe66c1c14cb2c9d3c29cd47481ac445a2df2fc22aa0b8a1324
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5 SHA512 bf0e4a88d6b981aff0ae25a1294a808b12414aed591634dc6aaf7f5b1b2e31a401c622b7f60408dd85c3f71d79eedb7c9118a25eafb2cd739278266edadd75c1 WHIRLPOOL 8a5790ce2a94378e594afb662c0e465db045e720e026ba98aafa8289c861af71e25ed4a10fce6061ec4ba683952a92f3bbc484937bb4e5de0617026f95bdc28b
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
-DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
 DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
+DIST mysql-extras-20130128-0054Z.tar.bz2 1900342 SHA256 31d6c5ba55b6640569956bb4558e9e8f63f1947e1b51d4f4537a18f5f5a88893 SHA512 dd35934c145eb7faa237f630f1d4b671a35f5fa0b6a83e60ce647c8a19acf0c974e7b86d92086151f5c11c365529214c659ed1f0b3174277d90e5b4fbe60a362 WHIRLPOOL b15be083feb3896e85d4a1f31cbcea71384a17d0c5fd413e1d95ce416603cd710c754c3f4b705846cedcb8e2de9d77e614c62fd4882b4ec1684e4343d6194e80
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf

diff --git a/dev-db/mysql/mysql-5.1.66.ebuild b/dev-db/mysql/mysql-5.1.66.ebuild
index e01f201..8686d7c 100644
--- a/dev-db/mysql/mysql-5.1.66.ebuild
+++ b/dev-db/mysql/mysql-5.1.66.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-MY_EXTRAS_VER="20121101-2319Z"
+MY_EXTRAS_VER="20130128-0054Z"
 # PBXT
 PBXT_VERSION='1.0.11-6-pre-ga'
 # XtraDB

diff --git a/dev-db/mysql/mysql-5.1.67.ebuild b/dev-db/mysql/mysql-5.1.67.ebuild
index 5eee752..f72d14a 100644
--- a/dev-db/mysql/mysql-5.1.67.ebuild
+++ b/dev-db/mysql/mysql-5.1.67.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-MY_EXTRAS_VER="20121101-2319Z"
+MY_EXTRAS_VER="20130128-0054Z"
 # PBXT
 PBXT_VERSION='1.0.11-6-pre-ga'
 # XtraDB


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-01-28  2:13 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-01-28  2:13 UTC (permalink / raw
  To: gentoo-commits

commit:     97b4e510b23c89f44c639c2ef6dd69c7fe6a13cb
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 02:07:43 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 02:07:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=97b4e510

Trim.

Package-Manager: portage-2.2.0_alpha159
RepoMan-Options: --force

---
 dev-db/mysql/ChangeLog                     |    6 ++
 dev-db/mysql/Manifest                      |   11 +--
 dev-db/mysql/mysql-5.5.19.ebuild           |  129 ----------------------------
 dev-db/mysql/mysql-5.5.20.ebuild           |  129 ----------------------------
 dev-db/mysql/mysql-5.5.21.ebuild           |  129 ----------------------------
 dev-db/mysql/mysql-5.5.22.ebuild           |  129 ----------------------------
 dev-db/mysql/mysql-5.5.25a.ebuild          |  129 ----------------------------
 dev-db/mysql/mysql-5.5.27.ebuild           |  129 ----------------------------
 dev-db/mysql/mysql-5.5.28.ebuild           |  129 ----------------------------
 dev-db/mysql/mysql-5.6.2_alpha_pre5.ebuild |  119 -------------------------
 10 files changed, 7 insertions(+), 1032 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index d7ce08f..599209e 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> -mysql-5.5.19.ebuild,
+  -mysql-5.5.20.ebuild, -mysql-5.5.21.ebuild, -mysql-5.5.22.ebuild,
+  -mysql-5.5.25a.ebuild, -mysql-5.5.27.ebuild, -mysql-5.5.28.ebuild,
+  -mysql-5.6.2_alpha_pre5.ebuild:
+  Trim.
+
 *mysql-5.1.66-r1 (28 Jan 2013)
 *mysql-5.1.67-r1 (28 Jan 2013)
 

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 925fecd..49c0da5 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,21 +1,12 @@
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907 SHA512 01b7ff0a08362249e04a9a66cf0f255cb517f22d336201ba4ae8759cfc8047cb3dcaff75821796c01f87b35a7e8f5533957152cc7ae905cdf65f40239634e4f0 WHIRLPOOL 384cb0ef805ac70646f834ed7140ec1dd9ee4810692ba8e671eb7f5006ce2f97a401097224ce78316c371860639322164505e9099c1233d1816fa7bbc4fd354b
 DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d
-DIST mysql-5.5.19.tar.gz 24296942 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f SHA512 02f741df70c0b8058babb2cb6b9469856641413eb334e76ffeec91f21ab71440f1ee644cc58471e86f03ca850cf789869d48b68788ea346b0b3dfc5b509a5bd1 WHIRLPOOL 8b119fd8be0d2191d0b4df49de8abde5b0382b5eb0fab4bafea83dcd54fabf9751f4ab3d008f860828bd6e9667696e831a0c7f88dcc648f372efec39cae1552d
-DIST mysql-5.5.20.tar.gz 24305842 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e SHA512 df433cf831f1aef6c143d70e0b447268f6ebd3a7bf2573b6269aea3309ef0cfed881beb917a7c6d6f2d0a8fe96b05c36a3c9d10e3763b56fc7a2eb6bb721100f WHIRLPOOL 84423528dac7b781b1ef267b830bef8b21e4ae98b9f356fa891d55cc601dd3bd867964182772f54b3cad1a076f3f5a3c511e7f025316bd9c101868ebfee9afa7
-DIST mysql-5.5.21.tar.gz 24341768 SHA256 2471fedc42bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd SHA512 183ffc9b742c8910ec9c97ad82845f0be35a7da764c2c8a6a5269cc7251c0443b2641a5d5f4302ab4afdcd908099af1d3ae4abba5c43f534ac65f931e2672377 WHIRLPOOL 710e9ce0fddbb0ae4f495d04ba3667a8c44bdfedd9087795ef4b57c59357a50654248427c5ca3751c462f9b744adf0391ae709d42e00eb1530a550972c5f9f55
-DIST mysql-5.5.22.tar.gz 24475686 SHA256 f3333ffbe13e586471225fcb521f6ce511fa4374010901813ac35e0f5909dcdd SHA512 729621d2755bf80b8d4d98ac3ec883cdd0711da3fcdd13d8eb478fac25ea2744d743192cd800d4b028b9341fc11d7293863561e6c2ad34830ec2ced7c6806042 WHIRLPOOL 05bfe1da714c38ac3347d2f4d139c63a42b8159742cea11fab5237196c9b640865b645a790e5d08de6fb61d8493cae52b8f61ac3fa87e393e048dbdac51d9b04
-DIST mysql-5.5.25a.tar.gz 24660795 SHA256 d199fd9a3e0865226b9b2d5a870314c23a06afe7fac37e385708119e78168fda SHA512 e7bda31b775ead847ffe391ae67682cad0ddae298215dad7823fac8a5649c1900fc02dab25279f0b11b50ebccc82609e87be1eac93548a71bdb069508fa35fe4 WHIRLPOOL e0dc8d9c02d887a3f06c0b89e8ecfe6c353ae070930a85733828f839388ee88fc6b1aed4a6ecf5be3c37ebf3525f5b005a9bb363afd983a4ead1339172669618
-DIST mysql-5.5.27.tar.gz 24667156 SHA256 51ffafbd82039f8afbe5b3c26f15cc338ed6cd4f67e56d7dd33efaa28c9d99e4 SHA512 0d3f14b2c797b78ba6c1f9b667537ffe1610620007dfdb711ab41d4914e82ceb9818878004da4b39581489c83448bc888aa1cb1ad080676a8d8a7605a8e16adb WHIRLPOOL a74165c34f5a800f4447034cf19533bbb174b79236b9840eb8f20503881140801851aec255fac83389fba48a7c4e87b65052641704c5135d11d90b9f54e48084
-DIST mysql-5.5.28.tar.gz 24739429 SHA256 f9b2491f1ddd99842a8e75c21958368bebe59c47e84bec778baa915e255cc78f SHA512 61b20e7ae11ef0fc53d199a6a177a34a95e0a7cf17cd574e7ed75d2e51e62da8178184333adb0805b6bbe7649355ae2062ac36c70faa23acfbc419aaa47a7365 WHIRLPOOL 909018977ddbd124b2152372d858a65d85ee0cbebef2f94ea14b04188ebaf90529a576f24f47cc6bc232e9d6ddd5251ed18242eb08ee0d3da081c81a04da9d3b
 DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773
-DIST mysql-5.6.2-m5.tar.gz 26137314 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f SHA512 b78903d40afe09951a3674f96d71014e1b4ab76c259c32e328d4791188161051f89e66143f0ebd5b99c35b0470d92c6bf0a82e6cce199ee033cb1f1c33ae2474 WHIRLPOOL 6105540cd8837958b84782c184942e70089088fb531d16cd9291293b555ad9d98033fa9455025b4139fa7ea51aa944b331b6940ebdc07620a0604adce196a4be
 DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
-DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 SHA512 87d7b80d2df8f5e52bff2abd070eb8ed73d6bf19a32fcf82167a74d0f4600e62bc17cb09076b82bc643ed37279a7e4c402f1da8db25a06955c037b7173810a7f WHIRLPOOL a959ec13bd06c96988691b2458cf8ceb510f99aba20dd1f6e9c90f9c5f7bf9fe0c811badfd056ffe66c1c14cb2c9d3c29cd47481ac445a2df2fc22aa0b8a1324
-DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5 SHA512 bf0e4a88d6b981aff0ae25a1294a808b12414aed591634dc6aaf7f5b1b2e31a401c622b7f60408dd85c3f71d79eedb7c9118a25eafb2cd739278266edadd75c1 WHIRLPOOL 8a5790ce2a94378e594afb662c0e465db045e720e026ba98aafa8289c861af71e25ed4a10fce6061ec4ba683952a92f3bbc484937bb4e5de0617026f95bdc28b
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
 DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
+DIST mysql-extras-20130120-2303Z.tar.bz2 1899548 SHA256 b8d0cf2a9016324796c3c054cd90b7dc4efb9016bdc793dfbaafaf124a072efe SHA512 748bb6577028332e9ca51cbccefd8859dc5cee65d0824da1ba3fee5387dc89b68b8789dd9db81e00ad8307c4de5ea3d84dca97a1cf65a9d988af3fb3246328c9 WHIRLPOOL 5f0931de21a14de5ad57898a8fdd34b5ff9666958f20c7bd8e4277e58fd00c3aa3ad9d15694410e2fd784064f960f264500015e146cdf3f346ea67f7f053e67c
 DIST mysql-extras-20130128-0054Z.tar.bz2 1900342 SHA256 31d6c5ba55b6640569956bb4558e9e8f63f1947e1b51d4f4537a18f5f5a88893 SHA512 dd35934c145eb7faa237f630f1d4b671a35f5fa0b6a83e60ce647c8a19acf0c974e7b86d92086151f5c11c365529214c659ed1f0b3174277d90e5b4fbe60a362 WHIRLPOOL b15be083feb3896e85d4a1f31cbcea71384a17d0c5fd413e1d95ce416603cd710c754c3f4b705846cedcb8e2de9d77e614c62fd4882b4ec1684e4343d6194e80
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf

diff --git a/dev-db/mysql/mysql-5.5.19.ebuild b/dev-db/mysql/mysql-5.5.19.ebuild
deleted file mode 100644
index a67be5d..0000000
--- a/dev-db/mysql/mysql-5.5.19.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.19.ebuild,v 1.3 2013/01/20 01:00:58 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20110713-0702Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.20.ebuild b/dev-db/mysql/mysql-5.5.20.ebuild
deleted file mode 100644
index 664355a..0000000
--- a/dev-db/mysql/mysql-5.5.20.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.20.ebuild,v 1.2 2013/01/20 01:00:58 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20111118-2347Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.21.ebuild b/dev-db/mysql/mysql-5.5.21.ebuild
deleted file mode 100644
index d33ad2a..0000000
--- a/dev-db/mysql/mysql-5.5.21.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.21.ebuild,v 1.2 2013/01/20 01:00:58 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20111118-2347Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.22.ebuild b/dev-db/mysql/mysql-5.5.22.ebuild
deleted file mode 100644
index 275fa40..0000000
--- a/dev-db/mysql/mysql-5.5.22.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.22.ebuild,v 1.2 2013/01/20 01:00:58 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20120401-2131Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.25a.ebuild b/dev-db/mysql/mysql-5.5.25a.ebuild
deleted file mode 100644
index 96ae72f..0000000
--- a/dev-db/mysql/mysql-5.5.25a.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20120401-2131Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.27.ebuild b/dev-db/mysql/mysql-5.5.27.ebuild
deleted file mode 100644
index 96ae72f..0000000
--- a/dev-db/mysql/mysql-5.5.27.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20120401-2131Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.28.ebuild b/dev-db/mysql/mysql-5.5.28.ebuild
deleted file mode 100644
index 0e4b4b7..0000000
--- a/dev-db/mysql/mysql-5.5.28.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.28.ebuild,v 1.3 2013/01/20 01:00:58 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20120401-2131Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.6.2_alpha_pre5.ebuild b/dev-db/mysql/mysql-5.6.2_alpha_pre5.ebuild
deleted file mode 100644
index d1bf4a1..0000000
--- a/dev-db/mysql/mysql-5.6.2_alpha_pre5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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
-}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-01-28  2:13 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-01-28  2:13 UTC (permalink / raw
  To: gentoo-commits

commit:     9f328200d97d68b7b20e103a392a15b194f799da
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 02:01:45 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 02:01:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=9f328200

Actually move PBXT fix to revbump.

Package-Manager: portage-2.2.0_alpha159
RepoMan-Options: --force

---
 dev-db/mysql/ChangeLog                             |    7 +++++++
 dev-db/mysql/Manifest                              |    1 +
 ...{mysql-5.1.66.ebuild => mysql-5.1.66-r1.ebuild} |    2 +-
 dev-db/mysql/mysql-5.1.66.ebuild                   |    2 +-
 ...{mysql-5.1.67.ebuild => mysql-5.1.67-r1.ebuild} |    2 +-
 dev-db/mysql/mysql-5.1.67.ebuild                   |    2 +-
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 52803f8..d7ce08f 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.1.66-r1 (28 Jan 2013)
+*mysql-5.1.67-r1 (28 Jan 2013)
+
+  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.66-r1.ebuild,
+  +mysql-5.1.67-r1.ebuild, mysql-5.1.66.ebuild, mysql-5.1.67.ebuild:
+  Actually move PBXT fix to revbump.
+
   28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.66.ebuild,
   mysql-5.1.67.ebuild:
   Include PBXT nice fix per bug #374349.

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index bfa1b18..925fecd 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -14,6 +14,7 @@ DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329f
 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605 SHA512 87d7b80d2df8f5e52bff2abd070eb8ed73d6bf19a32fcf82167a74d0f4600e62bc17cb09076b82bc643ed37279a7e4c402f1da8db25a06955c037b7173810a7f WHIRLPOOL a959ec13bd06c96988691b2458cf8ceb510f99aba20dd1f6e9c90f9c5f7bf9fe0c811badfd056ffe66c1c14cb2c9d3c29cd47481ac445a2df2fc22aa0b8a1324
 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5 SHA512 bf0e4a88d6b981aff0ae25a1294a808b12414aed591634dc6aaf7f5b1b2e31a401c622b7f60408dd85c3f71d79eedb7c9118a25eafb2cd739278266edadd75c1 WHIRLPOOL 8a5790ce2a94378e594afb662c0e465db045e720e026ba98aafa8289c861af71e25ed4a10fce6061ec4ba683952a92f3bbc484937bb4e5de0617026f95bdc28b
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
+DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
 DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
 DIST mysql-extras-20130128-0054Z.tar.bz2 1900342 SHA256 31d6c5ba55b6640569956bb4558e9e8f63f1947e1b51d4f4537a18f5f5a88893 SHA512 dd35934c145eb7faa237f630f1d4b671a35f5fa0b6a83e60ce647c8a19acf0c974e7b86d92086151f5c11c365529214c659ed1f0b3174277d90e5b4fbe60a362 WHIRLPOOL b15be083feb3896e85d4a1f31cbcea71384a17d0c5fd413e1d95ce416603cd710c754c3f4b705846cedcb8e2de9d77e614c62fd4882b4ec1684e4343d6194e80
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962

diff --git a/dev-db/mysql/mysql-5.1.66.ebuild b/dev-db/mysql/mysql-5.1.66-r1.ebuild
similarity index 98%
copy from dev-db/mysql/mysql-5.1.66.ebuild
copy to dev-db/mysql/mysql-5.1.66-r1.ebuild
index 8686d7c..fba838e 100644
--- a/dev-db/mysql/mysql-5.1.66.ebuild
+++ b/dev-db/mysql/mysql-5.1.66-r1.ebuild
@@ -19,7 +19,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 # This is often broken still

diff --git a/dev-db/mysql/mysql-5.1.66.ebuild b/dev-db/mysql/mysql-5.1.66.ebuild
index 8686d7c..e01f201 100644
--- a/dev-db/mysql/mysql-5.1.66.ebuild
+++ b/dev-db/mysql/mysql-5.1.66.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-MY_EXTRAS_VER="20130128-0054Z"
+MY_EXTRAS_VER="20121101-2319Z"
 # PBXT
 PBXT_VERSION='1.0.11-6-pre-ga'
 # XtraDB

diff --git a/dev-db/mysql/mysql-5.1.67.ebuild b/dev-db/mysql/mysql-5.1.67-r1.ebuild
similarity index 98%
copy from dev-db/mysql/mysql-5.1.67.ebuild
copy to dev-db/mysql/mysql-5.1.67-r1.ebuild
index f72d14a..c1f2f15 100644
--- a/dev-db/mysql/mysql-5.1.67.ebuild
+++ b/dev-db/mysql/mysql-5.1.67-r1.ebuild
@@ -19,7 +19,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 # This is often broken still

diff --git a/dev-db/mysql/mysql-5.1.67.ebuild b/dev-db/mysql/mysql-5.1.67.ebuild
index f72d14a..5eee752 100644
--- a/dev-db/mysql/mysql-5.1.67.ebuild
+++ b/dev-db/mysql/mysql-5.1.67.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-MY_EXTRAS_VER="20130128-0054Z"
+MY_EXTRAS_VER="20121101-2319Z"
 # PBXT
 PBXT_VERSION='1.0.11-6-pre-ga'
 # XtraDB


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-01-28  2:13 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-01-28  2:13 UTC (permalink / raw
  To: gentoo-commits

commit:     f1675d9494901d3cf36361da9617749617f4b9d2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 02:06:47 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 02:06:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f1675d94

Sync from gentoo-x86.

---
 dev-db/mysql/mysql-5.5.29-r1.ebuild |  129 +++++++++++++++++++++++++++++++++++
 1 files changed, 129 insertions(+), 0 deletions(-)

diff --git a/dev-db/mysql/mysql-5.5.29-r1.ebuild b/dev-db/mysql/mysql-5.5.29-r1.ebuild
new file mode 100644
index 0000000..42bc387
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.29-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.29-r1.ebuild,v 1.1 2013/01/20 23:05:14 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20130120-2303Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-01-28 18:58 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-01-28 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     a572c7dbff1b33f0d4a7059f6c864c0c69dee7f7
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 18:58:14 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 18:58:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a572c7db

Add still-broken 5.6 for development. As a problem with as-needed link order still.

Package-Manager: portage-2.2.0_alpha159
RepoMan-Options: --force

---
 dev-db/mysql/ChangeLog             |    6 ++
 dev-db/mysql/Manifest              |    1 +
 dev-db/mysql/mysql-5.6.9_rc.ebuild |  119 ++++++++++++++++++++++++++++++++++++
 3 files changed, 126 insertions(+), 0 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 0473c77..2ec6bb7 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.6.9_rc (28 Jan 2013)
+
+  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.6.9_rc.ebuild:
+  Add still-broken 5.6 for development. As a problem with as-needed link order
+  still.
+
   28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> files/my.cnf-4.0,
   files/my.cnf-5.1, files/my.cnf-5.5, mysql-5.1.66-r1.ebuild,
   mysql-5.1.66.ebuild, mysql-5.1.67-r1.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 49c0da5..87a0ac8 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,6 +3,7 @@ DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f472
 DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d
 DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773
 DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
+DIST mysql-5.6.9-rc.tar.gz 35444739 SHA256 f815b9a98ae2e65f9efed7ea24d489aa182917d9504a8ff041f9cb1fb02f48ff SHA512 2c615d96867bab78751d54ef163001cbcfa0676ac4a8c34b8f5c93cf256b94b4beb60fc2d8ded8d4272bd61a53119328a6e1c3db61ea5fbe4de4409ff804ff75 WHIRLPOOL 0577bc5297d034202ab0d3b08d24c979fdb62e078e8b99bded67b1f4f5e144ed0e1d602c6b03cc2e0941ad79fd179dcbc0e9bad0b7dd9a57356403a90776f15f
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
 DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e

diff --git a/dev-db/mysql/mysql-5.6.9_rc.ebuild b/dev-db/mysql/mysql-5.6.9_rc.ebuild
new file mode 100644
index 0000000..496dc33
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.9_rc.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin; do
+				mysql_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-03-08  7:49 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-03-08  7:49 UTC (permalink / raw
  To: gentoo-commits

commit:     04f563aad0a52102f9303ad5aad0d2c3cfa1b479
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  8 07:35:30 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 07:35:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=04f563aa

Bump.

Package-Manager: portage-2.2.0_alpha166

---
 dev-db/mysql/ChangeLog           |    5 ++
 dev-db/mysql/Manifest            |    1 +
 dev-db/mysql/mysql-5.5.30.ebuild |  129 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 135 insertions(+), 0 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 28ca257..0d0ffd3 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.5.30 (08 Mar 2013)
+
+  08 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.5.30.ebuild:
+  Bump.
+
   04 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.66.ebuild,
   mysql-5.1.67.ebuild:
   Update headers and keywords.

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 6671950..e899d60 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,6 +2,7 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde1539575
 DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907 SHA512 01b7ff0a08362249e04a9a66cf0f255cb517f22d336201ba4ae8759cfc8047cb3dcaff75821796c01f87b35a7e8f5533957152cc7ae905cdf65f40239634e4f0 WHIRLPOOL 384cb0ef805ac70646f834ed7140ec1dd9ee4810692ba8e671eb7f5006ce2f97a401097224ce78316c371860639322164505e9099c1233d1816fa7bbc4fd354b
 DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d
 DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773
+DIST mysql-5.5.30.tar.gz 24499036 SHA256 909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053 SHA512 f494fdf3f8132606ce45c4a1461d3670228e87f98d2a7269edd124c6afe37a22b7e7db5c83c14c0ddc5f68063ac5e7aec7243880dd9ba011010a049ba008bb08 WHIRLPOOL 29526df3d5b86dc7f48956ecb30e013e938d68299c87a3f34e94e42bb0a1dabd44e7d56879a51aac61d41ca728af9d3d78b7e712db6231338a95feb5a256d86b
 DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
 DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
 DIST mysql-5.6.9-rc.tar.gz 35444739 SHA256 f815b9a98ae2e65f9efed7ea24d489aa182917d9504a8ff041f9cb1fb02f48ff SHA512 2c615d96867bab78751d54ef163001cbcfa0676ac4a8c34b8f5c93cf256b94b4beb60fc2d8ded8d4272bd61a53119328a6e1c3db61ea5fbe4de4409ff804ff75 WHIRLPOOL 0577bc5297d034202ab0d3b08d24c979fdb62e078e8b99bded67b1f4f5e144ed0e1d602c6b03cc2e0941ad79fd179dcbc0e9bad0b7dd9a57356403a90776f15f

diff --git a/dev-db/mysql/mysql-5.5.30.ebuild b/dev-db/mysql/mysql-5.5.30.ebuild
new file mode 100644
index 0000000..42bc387
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.30.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.29-r1.ebuild,v 1.1 2013/01/20 23:05:14 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20130120-2303Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-04-29 21:34 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-04-29 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     7c470f06aa6ea32ef532c8fc2d1d8b4ef51fcb48
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 21:30:24 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 21:30:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7c470f06

[dev-db/mysql] Add mysql-5.7.1_alpha_pre11. This still needs more work.

---
 dev-db/mysql/Manifest                       |    1 +
 dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild |  120 +++++++++++++++++++++++++++
 2 files changed, 121 insertions(+), 0 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index e899d60..5981797 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -6,6 +6,7 @@ DIST mysql-5.5.30.tar.gz 24499036 SHA256 909fe596e0044082a02d2757b742a33b8a3ff39
 DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
 DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
 DIST mysql-5.6.9-rc.tar.gz 35444739 SHA256 f815b9a98ae2e65f9efed7ea24d489aa182917d9504a8ff041f9cb1fb02f48ff SHA512 2c615d96867bab78751d54ef163001cbcfa0676ac4a8c34b8f5c93cf256b94b4beb60fc2d8ded8d4272bd61a53119328a6e1c3db61ea5fbe4de4409ff804ff75 WHIRLPOOL 0577bc5297d034202ab0d3b08d24c979fdb62e078e8b99bded67b1f4f5e144ed0e1d602c6b03cc2e0941ad79fd179dcbc0e9bad0b7dd9a57356403a90776f15f
+DIST mysql-5.7.1-m11.tar.gz 36605947 SHA256 00630164b2f61c1ed08e8484c75fea81acff33137c94f7da4d49fa352df2f489 SHA512 dabd1fde56d297ee2296d06b0a3190210450ca01d3c6d46634af643e2f0d83b14ef5f5bd79f09c96def840fe153a9cdd9b17baa3c75bf408bc95445f8c0afcf1 WHIRLPOOL 229e3020bf4b610336bbd83049e6a4faa39d9fb91ec5bd4702aa3610d06f1d41c7003ff80c7faf45ebfe151fd3a1bc3bef7118cb89b9fd61fc5132892b0b7589
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
 DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e

diff --git a/dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild b/dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild
new file mode 100644
index 0000000..24700fe
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+EGIT_REPO_URI="file:///home/gentoo-scm/mysql-extras"
+
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin; do
+				mysql_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-04-30 11:37 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-04-30 11:37 UTC (permalink / raw
  To: gentoo-commits

commit:     3e9be325c75d4c9ef49626d34b55d823865a3d0e
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 11:37:16 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 11:37:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3e9be325

[dev-db/mysql] Fix mysql_extras URI for 5.7.1_alpha_pre11.

---
 dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild b/dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild
index 24700fe..496dc33 100644
--- a/dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild
+++ b/dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild
@@ -16,8 +16,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # Define the mysql-extras source
-#EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-EGIT_REPO_URI="file:///home/gentoo-scm/mysql-extras"
+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"


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-05-28 21:51 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-05-28 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     c76d6347770f5550ff3f77c98b18c41964c8685e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 21:50:17 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue May 28 21:51:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c76d6347

Bump, please see bug #471632 for test failures.

Package-Manager: portage-2.2.0_alpha177

---
 dev-db/mysql/ChangeLog           |   5 +
 dev-db/mysql/Manifest            |   1 +
 dev-db/mysql/mysql-5.1.69.ebuild | 266 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 272 insertions(+)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 0d0ffd3..86fc580 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.1.69 (28 May 2013)
+
+  28 May 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.69.ebuild:
+  Bump, please see bug #471632 for test failures.
+
 *mysql-5.5.30 (08 Mar 2013)
 
   08 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.5.30.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5981797..45f0686 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,7 @@
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907 SHA512 01b7ff0a08362249e04a9a66cf0f255cb517f22d336201ba4ae8759cfc8047cb3dcaff75821796c01f87b35a7e8f5533957152cc7ae905cdf65f40239634e4f0 WHIRLPOOL 384cb0ef805ac70646f834ed7140ec1dd9ee4810692ba8e671eb7f5006ce2f97a401097224ce78316c371860639322164505e9099c1233d1816fa7bbc4fd354b
 DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d
+DIST mysql-5.1.69.tar.gz 23947181 SHA256 17a5a8a468a6e58cb3be6a16241246fdfd6248d8b5229e46fdb5ffcc070de929 SHA512 ff569f090f8fc0a7dc2fb787124da8ce5d153a2965c3f6b33007d452304b080d491f1a2dc19e0ed218c1ce319fa9c245380ef1a23d05d656641fe76dabbbd63f WHIRLPOOL ac7fb02169229b065c1f38cd99f95a5f92eebc71f753a22fa85420f699cbffe3dc5b5495f81446902d272072f677b06e57ebe9bcb58e53cbe510eb4e929d4e5f
 DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773
 DIST mysql-5.5.30.tar.gz 24499036 SHA256 909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053 SHA512 f494fdf3f8132606ce45c4a1461d3670228e87f98d2a7269edd124c6afe37a22b7e7db5c83c14c0ddc5f68063ac5e7aec7243880dd9ba011010a049ba008bb08 WHIRLPOOL 29526df3d5b86dc7f48956ecb30e013e938d68299c87a3f34e94e42bb0a1dabd44e7d56879a51aac61d41ca728af9d3d78b7e712db6231338a95feb5a256d86b
 DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4

diff --git a/dev-db/mysql/mysql-5.1.69.ebuild b/dev-db/mysql/mysql-5.1.69.ebuild
new file mode 100644
index 0000000..4572194
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.69.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.67-r1.ebuild,v 1.1 2013/01/28 02:10:49 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20130128-0054Z"
+MY_EXTRAS_VER="live"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		if ! use extraengine ; then
+			# bug 332565
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+			# bug 401673
+			for t in federated.federated_plugin ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-06-06 20:32 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-06-06 20:32 UTC (permalink / raw
  To: gentoo-commits

commit:     0471c0f4c0bb82e1e56e171bc20a74ceeb29ea9e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 15:49:09 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 15:49:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0471c0f4

Bump.

Package-Manager: portage-2.2.0_alpha177

---
 dev-db/mysql/ChangeLog           |   6 ++
 dev-db/mysql/Manifest            |   2 +
 dev-db/mysql/mysql-5.1.69.ebuild |   3 +-
 dev-db/mysql/mysql-5.5.31.ebuild | 129 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 138 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 86fc580..2f8b6cf 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.5.31 (03 Jun 2013)
+
+  03 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.5.31.ebuild,
+  mysql-5.1.69.ebuild:
+  Bump.
+
 *mysql-5.1.69 (28 May 2013)
 
   28 May 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.1.69.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 45f0686..89e9740 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -4,6 +4,7 @@ DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5
 DIST mysql-5.1.69.tar.gz 23947181 SHA256 17a5a8a468a6e58cb3be6a16241246fdfd6248d8b5229e46fdb5ffcc070de929 SHA512 ff569f090f8fc0a7dc2fb787124da8ce5d153a2965c3f6b33007d452304b080d491f1a2dc19e0ed218c1ce319fa9c245380ef1a23d05d656641fe76dabbbd63f WHIRLPOOL ac7fb02169229b065c1f38cd99f95a5f92eebc71f753a22fa85420f699cbffe3dc5b5495f81446902d272072f677b06e57ebe9bcb58e53cbe510eb4e929d4e5f
 DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773
 DIST mysql-5.5.30.tar.gz 24499036 SHA256 909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053 SHA512 f494fdf3f8132606ce45c4a1461d3670228e87f98d2a7269edd124c6afe37a22b7e7db5c83c14c0ddc5f68063ac5e7aec7243880dd9ba011010a049ba008bb08 WHIRLPOOL 29526df3d5b86dc7f48956ecb30e013e938d68299c87a3f34e94e42bb0a1dabd44e7d56879a51aac61d41ca728af9d3d78b7e712db6231338a95feb5a256d86b
+DIST mysql-5.5.31.tar.gz 24608323 SHA256 9cdd650b47e3ea864ab40d4ab23fa4a9fdfabc7fd018bf5c9cce30722c0abcea SHA512 2384e08cf78891718aaa8b962666f81c06d1762faff3facb1c0d59c476714416f86ff5186a8e443a78cd8654583241bb8e857cd5a9fb483e77cbb58ca9f7eae6 WHIRLPOOL 2ad859ef4119c8e7afc27075d5849b947a0ecbf1d506f0a47af145e32cfe50e6a0b4c157576e290da435591f0d488260d252f3aa8e42dc7d2761dd951b972657
 DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
 DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
 DIST mysql-5.6.9-rc.tar.gz 35444739 SHA256 f815b9a98ae2e65f9efed7ea24d489aa182917d9504a8ff041f9cb1fb02f48ff SHA512 2c615d96867bab78751d54ef163001cbcfa0676ac4a8c34b8f5c93cf256b94b4beb60fc2d8ded8d4272bd61a53119328a6e1c3db61ea5fbe4de4409ff804ff75 WHIRLPOOL 0577bc5297d034202ab0d3b08d24c979fdb62e078e8b99bded67b1f4f5e144ed0e1d602c6b03cc2e0941ad79fd179dcbc0e9bad0b7dd9a57356403a90776f15f
@@ -13,5 +14,6 @@ DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005eb
 DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
 DIST mysql-extras-20130120-2303Z.tar.bz2 1899548 SHA256 b8d0cf2a9016324796c3c054cd90b7dc4efb9016bdc793dfbaafaf124a072efe SHA512 748bb6577028332e9ca51cbccefd8859dc5cee65d0824da1ba3fee5387dc89b68b8789dd9db81e00ad8307c4de5ea3d84dca97a1cf65a9d988af3fb3246328c9 WHIRLPOOL 5f0931de21a14de5ad57898a8fdd34b5ff9666958f20c7bd8e4277e58fd00c3aa3ad9d15694410e2fd784064f960f264500015e146cdf3f346ea67f7f053e67c
 DIST mysql-extras-20130128-0054Z.tar.bz2 1900342 SHA256 31d6c5ba55b6640569956bb4558e9e8f63f1947e1b51d4f4537a18f5f5a88893 SHA512 dd35934c145eb7faa237f630f1d4b671a35f5fa0b6a83e60ce647c8a19acf0c974e7b86d92086151f5c11c365529214c659ed1f0b3174277d90e5b4fbe60a362 WHIRLPOOL b15be083feb3896e85d4a1f31cbcea71384a17d0c5fd413e1d95ce416603cd710c754c3f4b705846cedcb8e2de9d77e614c62fd4882b4ec1684e4343d6194e80
+DIST mysql-extras-20130602-1946Z.tar.bz2 1478373 SHA256 843465190319464fdb035f4ddcf8a84ad3161780e3a81c1269c8f498b1524aab SHA512 95fc28f84618e11eeb2de22c12796eca5f8eff7b69ccc44d329d8f81aba4b015c834bad965a909f4e1e90a7f6012db98092ca21f31388ff5ab88268c8c1b60f3 WHIRLPOOL c04b1554663934969ab6b7773c96a5bd2388971dbea1eef138620014ef1e023904b5df326ff3e36538920be7bc50a2962e8f7a33435e42c1b5bdf5787ed2eb3a
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf

diff --git a/dev-db/mysql/mysql-5.1.69.ebuild b/dev-db/mysql/mysql-5.1.69.ebuild
index 4572194..1432faf 100644
--- a/dev-db/mysql/mysql-5.1.69.ebuild
+++ b/dev-db/mysql/mysql-5.1.69.ebuild
@@ -4,8 +4,7 @@
 
 EAPI="4"
 
-MY_EXTRAS_VER="20130128-0054Z"
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20130602-1946Z"
 # PBXT
 PBXT_VERSION='1.0.11-6-pre-ga'
 # XtraDB

diff --git a/dev-db/mysql/mysql-5.5.31.ebuild b/dev-db/mysql/mysql-5.5.31.ebuild
new file mode 100644
index 0000000..4543052
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.31.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.29-r1.ebuild,v 1.1 2013/01/20 23:05:14 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20130602-1946Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-06-06 20:32 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-06-06 20:32 UTC (permalink / raw
  To: gentoo-commits

commit:     813d93a04a255d7c2d2fb563bcadf31cca3ec825
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 19:00:38 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 19:00:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=813d93a0

Bump. Fails tests: rpl.rpl_spec_variables (mix,stmt), binlog.binlog_mysqlbinlog_filter (stmt), perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt, funcs_1.is_columns_mysql, funcs_1.is_tables_mysql, funcs_1.is_triggers, sys_vars.table_definition_cache_basic, sys_vars.table_open_cache_basic.

Package-Manager: portage-2.2.0_alpha177

---
 dev-db/mysql/ChangeLog                                      | 11 +++++++++++
 dev-db/mysql/Manifest                                       |  2 ++
 dev-db/mysql/mysql-5.6.10.ebuild                            |  2 +-
 dev-db/mysql/{mysql-5.6.9_rc.ebuild => mysql-5.6.12.ebuild} |  6 ++++--
 dev-db/mysql/mysql-5.6.7_rc.ebuild                          |  4 ++--
 dev-db/mysql/mysql-5.6.9_rc.ebuild                          |  2 +-
 dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild                 |  2 +-
 7 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 9d775d6..0ac5602 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.6.12 (06 Jun 2013)
+
+  06 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.6.12.ebuild,
+  mysql-5.6.10.ebuild, mysql-5.6.7_rc.ebuild, mysql-5.6.9_rc.ebuild,
+  mysql-5.7.1_alpha_pre11.ebuild:
+  Bump. Fails tests: rpl.rpl_spec_variables (mix,stmt),
+  binlog.binlog_mysqlbinlog_filter (stmt), perfschema.binlog_edge_mix,
+  perfschema.binlog_edge_stmt, funcs_1.is_columns_mysql,
+  funcs_1.is_tables_mysql, funcs_1.is_triggers,
+  sys_vars.table_definition_cache_basic, sys_vars.table_open_cache_basic.
+
 *mysql-4.0.27-r1 (06 Jun 2013)
 *mysql-4.1.22-r1 (06 Jun 2013)
 *mysql-5.1.68 (06 Jun 2013)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 59f9d12..078fc69 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -10,6 +10,7 @@ DIST mysql-5.5.30.tar.gz 24499036 SHA256 909fe596e0044082a02d2757b742a33b8a3ff39
 DIST mysql-5.5.31.tar.gz 24608323 SHA256 9cdd650b47e3ea864ab40d4ab23fa4a9fdfabc7fd018bf5c9cce30722c0abcea SHA512 2384e08cf78891718aaa8b962666f81c06d1762faff3facb1c0d59c476714416f86ff5186a8e443a78cd8654583241bb8e857cd5a9fb483e77cbb58ca9f7eae6 WHIRLPOOL 2ad859ef4119c8e7afc27075d5849b947a0ecbf1d506f0a47af145e32cfe50e6a0b4c157576e290da435591f0d488260d252f3aa8e42dc7d2761dd951b972657
 DIST mysql-5.5.32.tar.gz 24625029 SHA256 20930c3d934937f3863073af0a54cb014a4c6469e5460a81e2ff75062755377e SHA512 a286d57878c30d8c7ebe5879f7d67795f603952af2dfcfe16ac9caba510e4488d89c4fd9d33caa28dbb26076256f339cbc67bbd597cd386beb3cff63433c3e6b WHIRLPOOL 3329ef8d229f0a136231aacab2fd4ef4696c6eae7fb76e5a3ac37889fe6fe80a48517ce32aa85e5dbc2dba1d887d25438f5f3a7819b8ea426844b30cb9925f99
 DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
+DIST mysql-5.6.12.tar.gz 35876046 SHA256 1153c1e0ae94116c150be5f173c336a80471b5ed4642a682b8462d36d54d5817 SHA512 a94141c2ba1cb1bf606d25a8ede2dd919b2ad0e039211b4527829343282a09d25204bb66bf48a248d9ae2397b5b464f6e1c67d49250c34100297f4050dd3db8a WHIRLPOOL 642d3831c7a8f807b7ea44f1ea447b83dacc6a3b0ec51ec0e1e9990d8c2b1cccae7d92449bc90d3dabc0cdadcb8a122cc6d3cb4a3c22717cf9aa0540a26f1b5c
 DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
 DIST mysql-5.6.9-rc.tar.gz 35444739 SHA256 f815b9a98ae2e65f9efed7ea24d489aa182917d9504a8ff041f9cb1fb02f48ff SHA512 2c615d96867bab78751d54ef163001cbcfa0676ac4a8c34b8f5c93cf256b94b4beb60fc2d8ded8d4272bd61a53119328a6e1c3db61ea5fbe4de4409ff804ff75 WHIRLPOOL 0577bc5297d034202ab0d3b08d24c979fdb62e078e8b99bded67b1f4f5e144ed0e1d602c6b03cc2e0941ad79fd179dcbc0e9bad0b7dd9a57356403a90776f15f
 DIST mysql-5.7.1-m11.tar.gz 36605947 SHA256 00630164b2f61c1ed08e8484c75fea81acff33137c94f7da4d49fa352df2f489 SHA512 dabd1fde56d297ee2296d06b0a3190210450ca01d3c6d46634af643e2f0d83b14ef5f5bd79f09c96def840fe153a9cdd9b17baa3c75bf408bc95445f8c0afcf1 WHIRLPOOL 229e3020bf4b610336bbd83049e6a4faa39d9fb91ec5bd4702aa3610d06f1d41c7003ff80c7faf45ebfe151fd3a1bc3bef7118cb89b9fd61fc5132892b0b7589
@@ -21,5 +22,6 @@ DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb0
 DIST mysql-extras-20130120-2303Z.tar.bz2 1899548 SHA256 b8d0cf2a9016324796c3c054cd90b7dc4efb9016bdc793dfbaafaf124a072efe SHA512 748bb6577028332e9ca51cbccefd8859dc5cee65d0824da1ba3fee5387dc89b68b8789dd9db81e00ad8307c4de5ea3d84dca97a1cf65a9d988af3fb3246328c9 WHIRLPOOL 5f0931de21a14de5ad57898a8fdd34b5ff9666958f20c7bd8e4277e58fd00c3aa3ad9d15694410e2fd784064f960f264500015e146cdf3f346ea67f7f053e67c
 DIST mysql-extras-20130128-0054Z.tar.bz2 1900342 SHA256 31d6c5ba55b6640569956bb4558e9e8f63f1947e1b51d4f4537a18f5f5a88893 SHA512 dd35934c145eb7faa237f630f1d4b671a35f5fa0b6a83e60ce647c8a19acf0c974e7b86d92086151f5c11c365529214c659ed1f0b3174277d90e5b4fbe60a362 WHIRLPOOL b15be083feb3896e85d4a1f31cbcea71384a17d0c5fd413e1d95ce416603cd710c754c3f4b705846cedcb8e2de9d77e614c62fd4882b4ec1684e4343d6194e80
 DIST mysql-extras-20130602-1946Z.tar.bz2 1478373 SHA256 843465190319464fdb035f4ddcf8a84ad3161780e3a81c1269c8f498b1524aab SHA512 95fc28f84618e11eeb2de22c12796eca5f8eff7b69ccc44d329d8f81aba4b015c834bad965a909f4e1e90a7f6012db98092ca21f31388ff5ab88268c8c1b60f3 WHIRLPOOL c04b1554663934969ab6b7773c96a5bd2388971dbea1eef138620014ef1e023904b5df326ff3e36538920be7bc50a2962e8f7a33435e42c1b5bdf5787ed2eb3a
+DIST mysql-extras-20130606-1725Z.tar.bz2 1478541 SHA256 001d93992cda2067942209f9fccfdccd8a8a4b92486779c3b777580f9c85eb71 SHA512 312db9d5cf80a1e474c0e9069d5b97082cf5955974aceed75b6cfbeded944180d01a1343b0b84d6dd1ec73b9458aa58eeced5b2c5e324ac72512dcb480130acd WHIRLPOOL 8103f10fe9103aaa6cd424f71d2f67daf8b79d8fc1a3a6a13748929f6a263f6a19125a5b6e1d09c8ef2c07d01136b99e38d40c281a7a3cd7a1cd110a0fb4b67f
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf

diff --git a/dev-db/mysql/mysql-5.6.10.ebuild b/dev-db/mysql/mysql-5.6.10.ebuild
index 496dc33..ddba830 100644
--- a/dev-db/mysql/mysql-5.6.10.ebuild
+++ b/dev-db/mysql/mysql-5.6.10.ebuild
@@ -86,7 +86,7 @@ src_test() {
 		for t in main.mysql_client_test \
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwin; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		# Run mysql tests

diff --git a/dev-db/mysql/mysql-5.6.9_rc.ebuild b/dev-db/mysql/mysql-5.6.12.ebuild
similarity index 96%
copy from dev-db/mysql/mysql-5.6.9_rc.ebuild
copy to dev-db/mysql/mysql-5.6.12.ebuild
index 496dc33..2497387 100644
--- a/dev-db/mysql/mysql-5.6.9_rc.ebuild
+++ b/dev-db/mysql/mysql-5.6.12.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20130606-1725Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 
@@ -86,7 +86,7 @@ src_test() {
 		for t in main.mysql_client_test \
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwin; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		# Run mysql tests
@@ -112,6 +112,8 @@ src_test() {
 		[[ -z "$failures" ]] || die "Test failures: $failures"
 		einfo "Tests successfully completed"
 
+		# Need to clean up slightly
+		find "${TESTDIR}" -type s -delete
 	else
 
 		einfo "Skipping server tests due to minimal build."

diff --git a/dev-db/mysql/mysql-5.6.7_rc.ebuild b/dev-db/mysql/mysql-5.6.7_rc.ebuild
index 7eb488e..9fec557 100644
--- a/dev-db/mysql/mysql-5.6.7_rc.ebuild
+++ b/dev-db/mysql/mysql-5.6.7_rc.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
 
@@ -86,7 +86,7 @@ src_test() {
 		for t in main.mysql_client_test \
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwin; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		# Run mysql tests

diff --git a/dev-db/mysql/mysql-5.6.9_rc.ebuild b/dev-db/mysql/mysql-5.6.9_rc.ebuild
index 496dc33..ddba830 100644
--- a/dev-db/mysql/mysql-5.6.9_rc.ebuild
+++ b/dev-db/mysql/mysql-5.6.9_rc.ebuild
@@ -86,7 +86,7 @@ src_test() {
 		for t in main.mysql_client_test \
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwin; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		# Run mysql tests

diff --git a/dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild b/dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild
index 496dc33..ddba830 100644
--- a/dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild
+++ b/dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild
@@ -86,7 +86,7 @@ src_test() {
 		for t in main.mysql_client_test \
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwin; do
-				mysql_disable_test  "$t" "False positives in Gentoo"
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		# Run mysql tests


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-06-06 20:32 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2013-06-06 20:32 UTC (permalink / raw
  To: gentoo-commits

commit:     93057123fdb8f4f0e9e628ce4dcf1b8677a1149b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 17:15:02 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 17:15:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=93057123

Bump.

Package-Manager: portage-2.2.0_alpha177
RepoMan-Options: --force

---
 dev-db/mysql/ChangeLog                             | 11 ++++++
 dev-db/mysql/Manifest                              |  6 +++
 dev-db/mysql/mysql-4.0.27-r1.ebuild                | 35 +++++++++++++++++
 dev-db/mysql/mysql-4.1.22-r1.ebuild                | 44 ++++++++++++++++++++++
 .../{mysql-5.1.69.ebuild => mysql-5.1.68.ebuild}   |  4 +-
 dev-db/mysql/mysql-5.1.69.ebuild                   |  2 +-
 dev-db/mysql/mysql-5.5.30.ebuild                   |  2 +-
 dev-db/mysql/mysql-5.5.31.ebuild                   |  2 +-
 .../{mysql-5.5.31.ebuild => mysql-5.5.32.ebuild}   |  2 +-
 9 files changed, 102 insertions(+), 6 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 2f8b6cf..9d775d6 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-4.0.27-r1 (06 Jun 2013)
+*mysql-4.1.22-r1 (06 Jun 2013)
+*mysql-5.1.68 (06 Jun 2013)
+*mysql-5.5.32 (06 Jun 2013)
+
+  06 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-4.0.27-r1.ebuild,
+  +mysql-4.1.22-r1.ebuild, +mysql-5.1.68.ebuild, +mysql-5.5.32.ebuild,
+  mysql-5.1.66.ebuild, mysql-5.1.69.ebuild, mysql-5.5.30.ebuild,
+  mysql-5.5.31.ebuild:
+  Bump.
+
 *mysql-5.5.31 (03 Jun 2013)
 
   03 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.5.31.ebuild,

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 89e9740..59f9d12 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,14 +1,20 @@
+DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
+DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907 SHA512 01b7ff0a08362249e04a9a66cf0f255cb517f22d336201ba4ae8759cfc8047cb3dcaff75821796c01f87b35a7e8f5533957152cc7ae905cdf65f40239634e4f0 WHIRLPOOL 384cb0ef805ac70646f834ed7140ec1dd9ee4810692ba8e671eb7f5006ce2f97a401097224ce78316c371860639322164505e9099c1233d1816fa7bbc4fd354b
 DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d
+DIST mysql-5.1.68.tar.gz 24655564 SHA256 25f02868dded24a46aeda7863008bcd9639c08fb5a31a137e19534629c65b517 SHA512 f5e68205f0f747c55e2a981055392e8403fcaae8b7470d1306f58653ad480b09fdabaa26ad2fb61a391276fe7fc77b3a17e6bfab07da91d19510cde17ee4d55a WHIRLPOOL 33eda1e6ef734a63799d4d1431281c371d5369b9dbfbfee275d3096a292224d240e7f9fb38ddff4dc3972c905ca10835a7ec4768cabf7331fa5d42f0f3d5c200
 DIST mysql-5.1.69.tar.gz 23947181 SHA256 17a5a8a468a6e58cb3be6a16241246fdfd6248d8b5229e46fdb5ffcc070de929 SHA512 ff569f090f8fc0a7dc2fb787124da8ce5d153a2965c3f6b33007d452304b080d491f1a2dc19e0ed218c1ce319fa9c245380ef1a23d05d656641fe76dabbbd63f WHIRLPOOL ac7fb02169229b065c1f38cd99f95a5f92eebc71f753a22fa85420f699cbffe3dc5b5495f81446902d272072f677b06e57ebe9bcb58e53cbe510eb4e929d4e5f
 DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773
 DIST mysql-5.5.30.tar.gz 24499036 SHA256 909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053 SHA512 f494fdf3f8132606ce45c4a1461d3670228e87f98d2a7269edd124c6afe37a22b7e7db5c83c14c0ddc5f68063ac5e7aec7243880dd9ba011010a049ba008bb08 WHIRLPOOL 29526df3d5b86dc7f48956ecb30e013e938d68299c87a3f34e94e42bb0a1dabd44e7d56879a51aac61d41ca728af9d3d78b7e712db6231338a95feb5a256d86b
 DIST mysql-5.5.31.tar.gz 24608323 SHA256 9cdd650b47e3ea864ab40d4ab23fa4a9fdfabc7fd018bf5c9cce30722c0abcea SHA512 2384e08cf78891718aaa8b962666f81c06d1762faff3facb1c0d59c476714416f86ff5186a8e443a78cd8654583241bb8e857cd5a9fb483e77cbb58ca9f7eae6 WHIRLPOOL 2ad859ef4119c8e7afc27075d5849b947a0ecbf1d506f0a47af145e32cfe50e6a0b4c157576e290da435591f0d488260d252f3aa8e42dc7d2761dd951b972657
+DIST mysql-5.5.32.tar.gz 24625029 SHA256 20930c3d934937f3863073af0a54cb014a4c6469e5460a81e2ff75062755377e SHA512 a286d57878c30d8c7ebe5879f7d67795f603952af2dfcfe16ac9caba510e4488d89c4fd9d33caa28dbb26076256f339cbc67bbd597cd386beb3cff63433c3e6b WHIRLPOOL 3329ef8d229f0a136231aacab2fd4ef4696c6eae7fb76e5a3ac37889fe6fe80a48517ce32aa85e5dbc2dba1d887d25438f5f3a7819b8ea426844b30cb9925f99
 DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
 DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
 DIST mysql-5.6.9-rc.tar.gz 35444739 SHA256 f815b9a98ae2e65f9efed7ea24d489aa182917d9504a8ff041f9cb1fb02f48ff SHA512 2c615d96867bab78751d54ef163001cbcfa0676ac4a8c34b8f5c93cf256b94b4beb60fc2d8ded8d4272bd61a53119328a6e1c3db61ea5fbe4de4409ff804ff75 WHIRLPOOL 0577bc5297d034202ab0d3b08d24c979fdb62e078e8b99bded67b1f4f5e144ed0e1d602c6b03cc2e0941ad79fd179dcbc0e9bad0b7dd9a57356403a90776f15f
 DIST mysql-5.7.1-m11.tar.gz 36605947 SHA256 00630164b2f61c1ed08e8484c75fea81acff33137c94f7da4d49fa352df2f489 SHA512 dabd1fde56d297ee2296d06b0a3190210450ca01d3c6d46634af643e2f0d83b14ef5f5bd79f09c96def840fe153a9cdd9b17baa3c75bf408bc95445f8c0afcf1 WHIRLPOOL 229e3020bf4b610336bbd83049e6a4faa39d9fb91ec5bd4702aa3610d06f1d41c7003ff80c7faf45ebfe151fd3a1bc3bef7118cb89b9fd61fc5132892b0b7589
+DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
+DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
 DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e

diff --git a/dev-db/mysql/mysql-4.0.27-r1.ebuild b/dev-db/mysql/mysql-4.0.27-r1.ebuild
new file mode 100644
index 0000000..dc82246
--- /dev/null
+++ b/dev-db/mysql/mysql-4.0.27-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.27-r1.ebuild,v 1.6 2008/12/14 20:17:13 klausman Exp $
+
+MY_EXTRAS_VER="20070105"
+SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
+
+inherit mysql
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! use "minimal" ; then
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		cd mysql-test
+		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
+		./mysql-test-run
+		retstatus=$?
+
+		# Just to be sure ;)
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		[[ $retstatus -eq 0 ]] || die "make test failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}

diff --git a/dev-db/mysql/mysql-4.1.22-r1.ebuild b/dev-db/mysql/mysql-4.1.22-r1.ebuild
new file mode 100644
index 0000000..d5fa1b6
--- /dev/null
+++ b/dev-db/mysql/mysql-4.1.22-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.22-r1.ebuild,v 1.8 2011/07/08 10:05:34 ssuominen Exp $
+
+MY_EXTRAS_VER="20090228-2228Z"
+SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
+
+inherit mysql
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! use "minimal" ; then
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		local testopts="--force"
+
+		# sandbox makes ndbd zombie
+		has "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb"
+
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		cd mysql-test
+		sed -i -e "s|3306|3307|g" mysql-test-run.pl
+
+		# from Makefile.am:
+		retstatus=1
+		./mysql-test-run.pl ${testopts} \
+		&& ./mysql-test-run.pl ${testopts} --ps-protocol \
+		&& retstatus=0
+
+		# Just to be sure ;)
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		[[ $retstatus -eq 0 ]] || die "test failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}

diff --git a/dev-db/mysql/mysql-5.1.69.ebuild b/dev-db/mysql/mysql-5.1.68.ebuild
similarity index 98%
copy from dev-db/mysql/mysql-5.1.69.ebuild
copy to dev-db/mysql/mysql-5.1.68.ebuild
index 1432faf..aabfe2a 100644
--- a/dev-db/mysql/mysql-5.1.69.ebuild
+++ b/dev-db/mysql/mysql-5.1.68.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.67-r1.ebuild,v 1.1 2013/01/28 02:10:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.68.ebuild,v 1.1 2013/06/02 19:48:56 robbat2 Exp $
 
 EAPI="4"
 
-MY_EXTRAS_VER="20130602-1946Z"
+MY_EXTRAS_VER="20130128-0054Z"
 # PBXT
 PBXT_VERSION='1.0.11-6-pre-ga'
 # XtraDB

diff --git a/dev-db/mysql/mysql-5.1.69.ebuild b/dev-db/mysql/mysql-5.1.69.ebuild
index 1432faf..ac86329 100644
--- a/dev-db/mysql/mysql-5.1.69.ebuild
+++ b/dev-db/mysql/mysql-5.1.69.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.67-r1.ebuild,v 1.1 2013/01/28 02:10:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.69.ebuild,v 1.1 2013/06/02 19:48:56 robbat2 Exp $
 
 EAPI="4"
 

diff --git a/dev-db/mysql/mysql-5.5.30.ebuild b/dev-db/mysql/mysql-5.5.30.ebuild
index 42bc387..0c8a3c7 100644
--- a/dev-db/mysql/mysql-5.5.30.ebuild
+++ b/dev-db/mysql/mysql-5.5.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.29-r1.ebuild,v 1.1 2013/01/20 23:05:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.30.ebuild,v 1.1 2013/03/14 01:03:14 robbat2 Exp $
 
 EAPI="4"
 

diff --git a/dev-db/mysql/mysql-5.5.31.ebuild b/dev-db/mysql/mysql-5.5.31.ebuild
index 4543052..ecbc89b 100644
--- a/dev-db/mysql/mysql-5.5.31.ebuild
+++ b/dev-db/mysql/mysql-5.5.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.29-r1.ebuild,v 1.1 2013/01/20 23:05:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.31.ebuild,v 1.1 2013/06/03 15:56:10 robbat2 Exp $
 
 EAPI="4"
 

diff --git a/dev-db/mysql/mysql-5.5.31.ebuild b/dev-db/mysql/mysql-5.5.32.ebuild
similarity index 97%
copy from dev-db/mysql/mysql-5.5.31.ebuild
copy to dev-db/mysql/mysql-5.5.32.ebuild
index 4543052..c8ba059 100644
--- a/dev-db/mysql/mysql-5.5.31.ebuild
+++ b/dev-db/mysql/mysql-5.5.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.29-r1.ebuild,v 1.1 2013/01/20 23:05:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.1 2013/06/06 17:06:28 robbat2 Exp $
 
 EAPI="4"
 


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-06-25 17:38 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-06-25 17:38 UTC (permalink / raw
  To: gentoo-commits

commit:     719b3d54777657cdca237ec9581f7f805ff3d9fe
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 17:35:46 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 17:35:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=719b3d54

[dev-db/mysql] Version bump to 5.1.70.
Need to update ebuild after doing a new release of mysql-extras.

---
 dev-db/mysql/Manifest            |   1 +
 dev-db/mysql/mysql-5.1.70.ebuild | 266 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 267 insertions(+)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 078fc69..3fa2672 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,6 +5,7 @@ DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f472
 DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d
 DIST mysql-5.1.68.tar.gz 24655564 SHA256 25f02868dded24a46aeda7863008bcd9639c08fb5a31a137e19534629c65b517 SHA512 f5e68205f0f747c55e2a981055392e8403fcaae8b7470d1306f58653ad480b09fdabaa26ad2fb61a391276fe7fc77b3a17e6bfab07da91d19510cde17ee4d55a WHIRLPOOL 33eda1e6ef734a63799d4d1431281c371d5369b9dbfbfee275d3096a292224d240e7f9fb38ddff4dc3972c905ca10835a7ec4768cabf7331fa5d42f0f3d5c200
 DIST mysql-5.1.69.tar.gz 23947181 SHA256 17a5a8a468a6e58cb3be6a16241246fdfd6248d8b5229e46fdb5ffcc070de929 SHA512 ff569f090f8fc0a7dc2fb787124da8ce5d153a2965c3f6b33007d452304b080d491f1a2dc19e0ed218c1ce319fa9c245380ef1a23d05d656641fe76dabbbd63f WHIRLPOOL ac7fb02169229b065c1f38cd99f95a5f92eebc71f753a22fa85420f699cbffe3dc5b5495f81446902d272072f677b06e57ebe9bcb58e53cbe510eb4e929d4e5f
+DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
 DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773
 DIST mysql-5.5.30.tar.gz 24499036 SHA256 909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053 SHA512 f494fdf3f8132606ce45c4a1461d3670228e87f98d2a7269edd124c6afe37a22b7e7db5c83c14c0ddc5f68063ac5e7aec7243880dd9ba011010a049ba008bb08 WHIRLPOOL 29526df3d5b86dc7f48956ecb30e013e938d68299c87a3f34e94e42bb0a1dabd44e7d56879a51aac61d41ca728af9d3d78b7e712db6231338a95feb5a256d86b
 DIST mysql-5.5.31.tar.gz 24608323 SHA256 9cdd650b47e3ea864ab40d4ab23fa4a9fdfabc7fd018bf5c9cce30722c0abcea SHA512 2384e08cf78891718aaa8b962666f81c06d1762faff3facb1c0d59c476714416f86ff5186a8e443a78cd8654583241bb8e857cd5a9fb483e77cbb58ca9f7eae6 WHIRLPOOL 2ad859ef4119c8e7afc27075d5849b947a0ecbf1d506f0a47af145e32cfe50e6a0b4c157576e290da435591f0d488260d252f3aa8e42dc7d2761dd951b972657

diff --git a/dev-db/mysql/mysql-5.1.70.ebuild b/dev-db/mysql/mysql-5.1.70.ebuild
new file mode 100644
index 0000000..75ff5c7
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.70.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.69.ebuild,v 1.1 2013/06/02 19:48:56 robbat2 Exp $
+
+EAPI="4"
+
+#MY_EXTRAS_VER="20130602-1946Z"
+MY_EXTRAS_VER="live"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		if ! use extraengine ; then
+			# bug 332565
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+			# bug 401673
+			for t in federated.federated_plugin ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-06-26  1:57 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-06-26  1:57 UTC (permalink / raw
  To: gentoo-commits

commit:     25c1f6743e20420f97d8cce77f3012982eceb511
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 26 01:56:37 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 01:56:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=25c1f674

[dev-db/msyql] Update 5.1.70 to use a new mysql-extras.

---
 dev-db/mysql/Manifest            | 3 ++-
 dev-db/mysql/mysql-5.1.70.ebuild | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 3fa2672..fcc1129 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -9,7 +9,7 @@ DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1
 DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773
 DIST mysql-5.5.30.tar.gz 24499036 SHA256 909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053 SHA512 f494fdf3f8132606ce45c4a1461d3670228e87f98d2a7269edd124c6afe37a22b7e7db5c83c14c0ddc5f68063ac5e7aec7243880dd9ba011010a049ba008bb08 WHIRLPOOL 29526df3d5b86dc7f48956ecb30e013e938d68299c87a3f34e94e42bb0a1dabd44e7d56879a51aac61d41ca728af9d3d78b7e712db6231338a95feb5a256d86b
 DIST mysql-5.5.31.tar.gz 24608323 SHA256 9cdd650b47e3ea864ab40d4ab23fa4a9fdfabc7fd018bf5c9cce30722c0abcea SHA512 2384e08cf78891718aaa8b962666f81c06d1762faff3facb1c0d59c476714416f86ff5186a8e443a78cd8654583241bb8e857cd5a9fb483e77cbb58ca9f7eae6 WHIRLPOOL 2ad859ef4119c8e7afc27075d5849b947a0ecbf1d506f0a47af145e32cfe50e6a0b4c157576e290da435591f0d488260d252f3aa8e42dc7d2761dd951b972657
-DIST mysql-5.5.32.tar.gz 24625029 SHA256 20930c3d934937f3863073af0a54cb014a4c6469e5460a81e2ff75062755377e SHA512 a286d57878c30d8c7ebe5879f7d67795f603952af2dfcfe16ac9caba510e4488d89c4fd9d33caa28dbb26076256f339cbc67bbd597cd386beb3cff63433c3e6b WHIRLPOOL 3329ef8d229f0a136231aacab2fd4ef4696c6eae7fb76e5a3ac37889fe6fe80a48517ce32aa85e5dbc2dba1d887d25438f5f3a7819b8ea426844b30cb9925f99
+DIST mysql-5.5.32.tar.gz 24589274 SHA256 babb19a1e58f6b285ff75e876f550a798d37fb72b5a548ffb411e8a4a51f6890 SHA512 78e9f0f47b3732e83e1261e8c021002288c0555b3aed7a51359511b038084eb9c7314a3960aa225eab46868fc4700f0f7a6301d1a0068c0f9ba038d41a5b7488 WHIRLPOOL fcf7291524fd8709eccdcef3deb32d132e9db0182aeb39c70b59f7086f49e09526d1bb055b3771915eb19271d7f2b86c0d0f65101dbd7a9d998fe95605cabdd3
 DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
 DIST mysql-5.6.12.tar.gz 35876046 SHA256 1153c1e0ae94116c150be5f173c336a80471b5ed4642a682b8462d36d54d5817 SHA512 a94141c2ba1cb1bf606d25a8ede2dd919b2ad0e039211b4527829343282a09d25204bb66bf48a248d9ae2397b5b464f6e1c67d49250c34100297f4050dd3db8a WHIRLPOOL 642d3831c7a8f807b7ea44f1ea447b83dacc6a3b0ec51ec0e1e9990d8c2b1cccae7d92449bc90d3dabc0cdadcb8a122cc6d3cb4a3c22717cf9aa0540a26f1b5c
 DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
@@ -24,5 +24,6 @@ DIST mysql-extras-20130120-2303Z.tar.bz2 1899548 SHA256 b8d0cf2a9016324796c3c054
 DIST mysql-extras-20130128-0054Z.tar.bz2 1900342 SHA256 31d6c5ba55b6640569956bb4558e9e8f63f1947e1b51d4f4537a18f5f5a88893 SHA512 dd35934c145eb7faa237f630f1d4b671a35f5fa0b6a83e60ce647c8a19acf0c974e7b86d92086151f5c11c365529214c659ed1f0b3174277d90e5b4fbe60a362 WHIRLPOOL b15be083feb3896e85d4a1f31cbcea71384a17d0c5fd413e1d95ce416603cd710c754c3f4b705846cedcb8e2de9d77e614c62fd4882b4ec1684e4343d6194e80
 DIST mysql-extras-20130602-1946Z.tar.bz2 1478373 SHA256 843465190319464fdb035f4ddcf8a84ad3161780e3a81c1269c8f498b1524aab SHA512 95fc28f84618e11eeb2de22c12796eca5f8eff7b69ccc44d329d8f81aba4b015c834bad965a909f4e1e90a7f6012db98092ca21f31388ff5ab88268c8c1b60f3 WHIRLPOOL c04b1554663934969ab6b7773c96a5bd2388971dbea1eef138620014ef1e023904b5df326ff3e36538920be7bc50a2962e8f7a33435e42c1b5bdf5787ed2eb3a
 DIST mysql-extras-20130606-1725Z.tar.bz2 1478541 SHA256 001d93992cda2067942209f9fccfdccd8a8a4b92486779c3b777580f9c85eb71 SHA512 312db9d5cf80a1e474c0e9069d5b97082cf5955974aceed75b6cfbeded944180d01a1343b0b84d6dd1ec73b9458aa58eeced5b2c5e324ac72512dcb480130acd WHIRLPOOL 8103f10fe9103aaa6cd424f71d2f67daf8b79d8fc1a3a6a13748929f6a263f6a19125a5b6e1d09c8ef2c07d01136b99e38d40c281a7a3cd7a1cd110a0fb4b67f
+DIST mysql-extras-20130626-0127Z.tar.bz2 1476503 SHA256 a3c791b7b95fe170c4071feed11699146fc8f9de6a9f2ffa67214c2e50644b4f SHA512 4ee19cb5960ba24f2db16e7c5b647d1b7bb9fadbc73bbd8125bbac7e926c569a9a585a4d1d92b851ea6653d9c15eeb00f1592880f104520dc040e5af19943ac7 WHIRLPOOL 739f5762fa24b0feb40848ddb83f2ed95fb650933920b3d9e55c5e90f907d4ac74dfb00e4b9189cda8f9af4317478f3132daf789d7c91196827f645dd3e37d61
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf

diff --git a/dev-db/mysql/mysql-5.1.70.ebuild b/dev-db/mysql/mysql-5.1.70.ebuild
index 75ff5c7..06c804b 100644
--- a/dev-db/mysql/mysql-5.1.70.ebuild
+++ b/dev-db/mysql/mysql-5.1.70.ebuild
@@ -4,8 +4,7 @@
 
 EAPI="4"
 
-#MY_EXTRAS_VER="20130602-1946Z"
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20130626-0127Z"
 # PBXT
 PBXT_VERSION='1.0.11-6-pre-ga'
 # XtraDB


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-08-16 16:28 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2013-08-16 16:28 UTC (permalink / raw
  To: gentoo-commits

commit:     6f7595f5b8d3f377513380b0fcb6662dfe636f17
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Aug 16 16:26:29 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Aug 16 16:26:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=6f7595f5

Version bump w/ failing tests
Failing test(s): rpl.rpl_deadlock_innodb main.plugin_auth main.mysqladmin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam

Package-Manager: portage-2.1.12.2

---
 dev-db/mysql/ChangeLog           |   7 +++
 dev-db/mysql/Manifest            |   1 +
 dev-db/mysql/mysql-5.5.33.ebuild | 129 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 137 insertions(+)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 0ac5602..24f372b 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.5.33 (16 Aug 2013)
+
+  16 Aug 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.5.33.ebuild:
+  Version bump w/ failing tests Failing test(s): rpl.rpl_deadlock_innodb
+  main.plugin_auth main.mysqladmin main.mysqlhotcopy_archive
+  main.mysqlhotcopy_myisam
+
 *mysql-5.6.12 (06 Jun 2013)
 
   06 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.6.12.ebuild,

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index fcc1129..8859800 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -10,6 +10,7 @@ DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d9731
 DIST mysql-5.5.30.tar.gz 24499036 SHA256 909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053 SHA512 f494fdf3f8132606ce45c4a1461d3670228e87f98d2a7269edd124c6afe37a22b7e7db5c83c14c0ddc5f68063ac5e7aec7243880dd9ba011010a049ba008bb08 WHIRLPOOL 29526df3d5b86dc7f48956ecb30e013e938d68299c87a3f34e94e42bb0a1dabd44e7d56879a51aac61d41ca728af9d3d78b7e712db6231338a95feb5a256d86b
 DIST mysql-5.5.31.tar.gz 24608323 SHA256 9cdd650b47e3ea864ab40d4ab23fa4a9fdfabc7fd018bf5c9cce30722c0abcea SHA512 2384e08cf78891718aaa8b962666f81c06d1762faff3facb1c0d59c476714416f86ff5186a8e443a78cd8654583241bb8e857cd5a9fb483e77cbb58ca9f7eae6 WHIRLPOOL 2ad859ef4119c8e7afc27075d5849b947a0ecbf1d506f0a47af145e32cfe50e6a0b4c157576e290da435591f0d488260d252f3aa8e42dc7d2761dd951b972657
 DIST mysql-5.5.32.tar.gz 24589274 SHA256 babb19a1e58f6b285ff75e876f550a798d37fb72b5a548ffb411e8a4a51f6890 SHA512 78e9f0f47b3732e83e1261e8c021002288c0555b3aed7a51359511b038084eb9c7314a3960aa225eab46868fc4700f0f7a6301d1a0068c0f9ba038d41a5b7488 WHIRLPOOL fcf7291524fd8709eccdcef3deb32d132e9db0182aeb39c70b59f7086f49e09526d1bb055b3771915eb19271d7f2b86c0d0f65101dbd7a9d998fe95605cabdd3
+DIST mysql-5.5.33.tar.gz 24680463 SHA256 6ad9af38de1f3595c5fb81bc24bdb62fa39b2ce1c690d87ac7d7a21ca71fceba SHA512 c0d24249113abe5c61a47c96938b49db715d1daf2c27aedbead1b6a69b2cb6c1dd5a96412055182a28d3703ffa808c6032dc2ad608abbcec850f1fc80c552b39 WHIRLPOOL 964974a93a718010cf1c6631b9d0c7c483e66271caeca0b986ae564656fb5cf1e172d15631729ecb02fb07f9bc5e1d491855c23fa4ef4a0af4dcce363b5079f2
 DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
 DIST mysql-5.6.12.tar.gz 35876046 SHA256 1153c1e0ae94116c150be5f173c336a80471b5ed4642a682b8462d36d54d5817 SHA512 a94141c2ba1cb1bf606d25a8ede2dd919b2ad0e039211b4527829343282a09d25204bb66bf48a248d9ae2397b5b464f6e1c67d49250c34100297f4050dd3db8a WHIRLPOOL 642d3831c7a8f807b7ea44f1ea447b83dacc6a3b0ec51ec0e1e9990d8c2b1cccae7d92449bc90d3dabc0cdadcb8a122cc6d3cb4a3c22717cf9aa0540a26f1b5c
 DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79

diff --git a/dev-db/mysql/mysql-5.5.33.ebuild b/dev-db/mysql/mysql-5.5.33.ebuild
new file mode 100644
index 0000000..c8ba059
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.33.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.1 2013/06/06 17:06:28 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20130602-1946Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-08-26 12:46 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2013-08-26 12:46 UTC (permalink / raw
  To: gentoo-commits

commit:     a01d0c7485649dd8c2883ed01f44fa12d104619a
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Mon Aug 26 12:42:11 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Aug 26 12:42:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a01d0c74

[dev-db/mysql] Version bump to 5.6.13.  Failing test(s): rpl.rpl_spec_variables similar to bug 473002

Package-Manager: portage-2.1.12.2

---
 dev-db/mysql/ChangeLog           |   6 ++
 dev-db/mysql/Manifest            |   1 +
 dev-db/mysql/mysql-5.6.13.ebuild | 120 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 127 insertions(+)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 24f372b..3c25cf2 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.6.13 (26 Aug 2013)
+
+  26 Aug 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.6.13.ebuild:
+  [dev-db/mysql] Version bump to 5.6.13.  Failing test(s):
+  rpl.rpl_spec_variables similar to bug 473002
+
 *mysql-5.5.33 (16 Aug 2013)
 
   16 Aug 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.5.33.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 8859800..1448669 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -13,6 +13,7 @@ DIST mysql-5.5.32.tar.gz 24589274 SHA256 babb19a1e58f6b285ff75e876f550a798d37fb7
 DIST mysql-5.5.33.tar.gz 24680463 SHA256 6ad9af38de1f3595c5fb81bc24bdb62fa39b2ce1c690d87ac7d7a21ca71fceba SHA512 c0d24249113abe5c61a47c96938b49db715d1daf2c27aedbead1b6a69b2cb6c1dd5a96412055182a28d3703ffa808c6032dc2ad608abbcec850f1fc80c552b39 WHIRLPOOL 964974a93a718010cf1c6631b9d0c7c483e66271caeca0b986ae564656fb5cf1e172d15631729ecb02fb07f9bc5e1d491855c23fa4ef4a0af4dcce363b5079f2
 DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
 DIST mysql-5.6.12.tar.gz 35876046 SHA256 1153c1e0ae94116c150be5f173c336a80471b5ed4642a682b8462d36d54d5817 SHA512 a94141c2ba1cb1bf606d25a8ede2dd919b2ad0e039211b4527829343282a09d25204bb66bf48a248d9ae2397b5b464f6e1c67d49250c34100297f4050dd3db8a WHIRLPOOL 642d3831c7a8f807b7ea44f1ea447b83dacc6a3b0ec51ec0e1e9990d8c2b1cccae7d92449bc90d3dabc0cdadcb8a122cc6d3cb4a3c22717cf9aa0540a26f1b5c
+DIST mysql-5.6.13.tar.gz 35951160 SHA256 5d1b230c3ce896fbea47a69b14b9efb122621a19f32c1102d388d8e7fa442d7e SHA512 56d3aa84c0ed69fcdb7706117398d555aaec0c20fe09364cd6d4a6b3e3af8644825d7cb886dbfd3fe630bfd318306090359f04f2558cf499915a9f1648520a82 WHIRLPOOL e9c701b8923071136e3baaabffae5f38e76ae7f8cf237aa0109614940a365bf2589d05d2c31b1523a92ad4ad0cc7dbff4eb15711b09c0cb3223e73e88456b290
 DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
 DIST mysql-5.6.9-rc.tar.gz 35444739 SHA256 f815b9a98ae2e65f9efed7ea24d489aa182917d9504a8ff041f9cb1fb02f48ff SHA512 2c615d96867bab78751d54ef163001cbcfa0676ac4a8c34b8f5c93cf256b94b4beb60fc2d8ded8d4272bd61a53119328a6e1c3db61ea5fbe4de4409ff804ff75 WHIRLPOOL 0577bc5297d034202ab0d3b08d24c979fdb62e078e8b99bded67b1f4f5e144ed0e1d602c6b03cc2e0941ad79fd179dcbc0e9bad0b7dd9a57356403a90776f15f
 DIST mysql-5.7.1-m11.tar.gz 36605947 SHA256 00630164b2f61c1ed08e8484c75fea81acff33137c94f7da4d49fa352df2f489 SHA512 dabd1fde56d297ee2296d06b0a3190210450ca01d3c6d46634af643e2f0d83b14ef5f5bd79f09c96def840fe153a9cdd9b17baa3c75bf408bc95445f8c0afcf1 WHIRLPOOL 229e3020bf4b610336bbd83049e6a4faa39d9fb91ec5bd4702aa3610d06f1d41c7003ff80c7faf45ebfe151fd3a1bc3bef7118cb89b9fd61fc5132892b0b7589

diff --git a/dev-db/mysql/mysql-5.6.13.ebuild b/dev-db/mysql/mysql-5.6.13.ebuild
new file mode 100644
index 0000000..b47f90c
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.13.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+EGIT_REPO_URI="/home/grknight/mysql-extras"
+
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-08-29 18:04 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2013-08-29 18:04 UTC (permalink / raw
  To: gentoo-commits

commit:     2c31b17affcacec46a99f1a9b91ab8edf00d0882
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Thu Aug 29 18:01:00 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Aug 29 18:01:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=2c31b17a

[dev-db/mysql] Trim old

Package-Manager: portage-2.2.1

---
 dev-db/mysql/ChangeLog              |   7 +
 dev-db/mysql/Manifest               |  13 --
 dev-db/mysql/mysql-5.1.66-r1.ebuild | 265 ------------------------------------
 dev-db/mysql/mysql-5.1.66.ebuild    | 265 ------------------------------------
 dev-db/mysql/mysql-5.1.67-r1.ebuild | 265 ------------------------------------
 dev-db/mysql/mysql-5.1.67.ebuild    | 265 ------------------------------------
 dev-db/mysql/mysql-5.1.68.ebuild    | 265 ------------------------------------
 dev-db/mysql/mysql-5.1.69.ebuild    | 265 ------------------------------------
 dev-db/mysql/mysql-5.5.29-r1.ebuild | 129 ------------------
 dev-db/mysql/mysql-5.5.29.ebuild    | 129 ------------------
 dev-db/mysql/mysql-5.5.30.ebuild    | 129 ------------------
 dev-db/mysql/mysql-5.5.31.ebuild    | 129 ------------------
 dev-db/mysql/mysql-5.6.7_rc.ebuild  | 119 ----------------
 dev-db/mysql/mysql-5.6.9_rc.ebuild  | 119 ----------------
 14 files changed, 7 insertions(+), 2357 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 3c25cf2..040597a 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Aug 2013; Brian Evans <grknight@tuffmail.com> -mysql-5.1.66-r1.ebuild,
+  -mysql-5.1.66.ebuild, -mysql-5.1.67-r1.ebuild, -mysql-5.1.67.ebuild,
+  -mysql-5.1.68.ebuild, -mysql-5.1.69.ebuild, -mysql-5.5.29-r1.ebuild,
+  -mysql-5.5.29.ebuild, -mysql-5.5.30.ebuild, -mysql-5.5.31.ebuild,
+  -mysql-5.6.7_rc.ebuild, -mysql-5.6.9_rc.ebuild:
+  [dev-db/mysql] Trim old
+
 *mysql-5.6.13 (26 Aug 2013)
 
   26 Aug 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.6.13.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 1448669..d7450d6 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,29 +1,16 @@
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
-DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907 SHA512 01b7ff0a08362249e04a9a66cf0f255cb517f22d336201ba4ae8759cfc8047cb3dcaff75821796c01f87b35a7e8f5533957152cc7ae905cdf65f40239634e4f0 WHIRLPOOL 384cb0ef805ac70646f834ed7140ec1dd9ee4810692ba8e671eb7f5006ce2f97a401097224ce78316c371860639322164505e9099c1233d1816fa7bbc4fd354b
-DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d
-DIST mysql-5.1.68.tar.gz 24655564 SHA256 25f02868dded24a46aeda7863008bcd9639c08fb5a31a137e19534629c65b517 SHA512 f5e68205f0f747c55e2a981055392e8403fcaae8b7470d1306f58653ad480b09fdabaa26ad2fb61a391276fe7fc77b3a17e6bfab07da91d19510cde17ee4d55a WHIRLPOOL 33eda1e6ef734a63799d4d1431281c371d5369b9dbfbfee275d3096a292224d240e7f9fb38ddff4dc3972c905ca10835a7ec4768cabf7331fa5d42f0f3d5c200
-DIST mysql-5.1.69.tar.gz 23947181 SHA256 17a5a8a468a6e58cb3be6a16241246fdfd6248d8b5229e46fdb5ffcc070de929 SHA512 ff569f090f8fc0a7dc2fb787124da8ce5d153a2965c3f6b33007d452304b080d491f1a2dc19e0ed218c1ce319fa9c245380ef1a23d05d656641fe76dabbbd63f WHIRLPOOL ac7fb02169229b065c1f38cd99f95a5f92eebc71f753a22fa85420f699cbffe3dc5b5495f81446902d272072f677b06e57ebe9bcb58e53cbe510eb4e929d4e5f
 DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
-DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773
-DIST mysql-5.5.30.tar.gz 24499036 SHA256 909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053 SHA512 f494fdf3f8132606ce45c4a1461d3670228e87f98d2a7269edd124c6afe37a22b7e7db5c83c14c0ddc5f68063ac5e7aec7243880dd9ba011010a049ba008bb08 WHIRLPOOL 29526df3d5b86dc7f48956ecb30e013e938d68299c87a3f34e94e42bb0a1dabd44e7d56879a51aac61d41ca728af9d3d78b7e712db6231338a95feb5a256d86b
-DIST mysql-5.5.31.tar.gz 24608323 SHA256 9cdd650b47e3ea864ab40d4ab23fa4a9fdfabc7fd018bf5c9cce30722c0abcea SHA512 2384e08cf78891718aaa8b962666f81c06d1762faff3facb1c0d59c476714416f86ff5186a8e443a78cd8654583241bb8e857cd5a9fb483e77cbb58ca9f7eae6 WHIRLPOOL 2ad859ef4119c8e7afc27075d5849b947a0ecbf1d506f0a47af145e32cfe50e6a0b4c157576e290da435591f0d488260d252f3aa8e42dc7d2761dd951b972657
 DIST mysql-5.5.32.tar.gz 24589274 SHA256 babb19a1e58f6b285ff75e876f550a798d37fb72b5a548ffb411e8a4a51f6890 SHA512 78e9f0f47b3732e83e1261e8c021002288c0555b3aed7a51359511b038084eb9c7314a3960aa225eab46868fc4700f0f7a6301d1a0068c0f9ba038d41a5b7488 WHIRLPOOL fcf7291524fd8709eccdcef3deb32d132e9db0182aeb39c70b59f7086f49e09526d1bb055b3771915eb19271d7f2b86c0d0f65101dbd7a9d998fe95605cabdd3
 DIST mysql-5.5.33.tar.gz 24680463 SHA256 6ad9af38de1f3595c5fb81bc24bdb62fa39b2ce1c690d87ac7d7a21ca71fceba SHA512 c0d24249113abe5c61a47c96938b49db715d1daf2c27aedbead1b6a69b2cb6c1dd5a96412055182a28d3703ffa808c6032dc2ad608abbcec850f1fc80c552b39 WHIRLPOOL 964974a93a718010cf1c6631b9d0c7c483e66271caeca0b986ae564656fb5cf1e172d15631729ecb02fb07f9bc5e1d491855c23fa4ef4a0af4dcce363b5079f2
 DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
 DIST mysql-5.6.12.tar.gz 35876046 SHA256 1153c1e0ae94116c150be5f173c336a80471b5ed4642a682b8462d36d54d5817 SHA512 a94141c2ba1cb1bf606d25a8ede2dd919b2ad0e039211b4527829343282a09d25204bb66bf48a248d9ae2397b5b464f6e1c67d49250c34100297f4050dd3db8a WHIRLPOOL 642d3831c7a8f807b7ea44f1ea447b83dacc6a3b0ec51ec0e1e9990d8c2b1cccae7d92449bc90d3dabc0cdadcb8a122cc6d3cb4a3c22717cf9aa0540a26f1b5c
 DIST mysql-5.6.13.tar.gz 35951160 SHA256 5d1b230c3ce896fbea47a69b14b9efb122621a19f32c1102d388d8e7fa442d7e SHA512 56d3aa84c0ed69fcdb7706117398d555aaec0c20fe09364cd6d4a6b3e3af8644825d7cb886dbfd3fe630bfd318306090359f04f2558cf499915a9f1648520a82 WHIRLPOOL e9c701b8923071136e3baaabffae5f38e76ae7f8cf237aa0109614940a365bf2589d05d2c31b1523a92ad4ad0cc7dbff4eb15711b09c0cb3223e73e88456b290
-DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79
-DIST mysql-5.6.9-rc.tar.gz 35444739 SHA256 f815b9a98ae2e65f9efed7ea24d489aa182917d9504a8ff041f9cb1fb02f48ff SHA512 2c615d96867bab78751d54ef163001cbcfa0676ac4a8c34b8f5c93cf256b94b4beb60fc2d8ded8d4272bd61a53119328a6e1c3db61ea5fbe4de4409ff804ff75 WHIRLPOOL 0577bc5297d034202ab0d3b08d24c979fdb62e078e8b99bded67b1f4f5e144ed0e1d602c6b03cc2e0941ad79fd179dcbc0e9bad0b7dd9a57356403a90776f15f
 DIST mysql-5.7.1-m11.tar.gz 36605947 SHA256 00630164b2f61c1ed08e8484c75fea81acff33137c94f7da4d49fa352df2f489 SHA512 dabd1fde56d297ee2296d06b0a3190210450ca01d3c6d46634af643e2f0d83b14ef5f5bd79f09c96def840fe153a9cdd9b17baa3c75bf408bc95445f8c0afcf1 WHIRLPOOL 229e3020bf4b610336bbd83049e6a4faa39d9fb91ec5bd4702aa3610d06f1d41c7003ff80c7faf45ebfe151fd3a1bc3bef7118cb89b9fd61fc5132892b0b7589
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
-DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
-DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
-DIST mysql-extras-20130120-2303Z.tar.bz2 1899548 SHA256 b8d0cf2a9016324796c3c054cd90b7dc4efb9016bdc793dfbaafaf124a072efe SHA512 748bb6577028332e9ca51cbccefd8859dc5cee65d0824da1ba3fee5387dc89b68b8789dd9db81e00ad8307c4de5ea3d84dca97a1cf65a9d988af3fb3246328c9 WHIRLPOOL 5f0931de21a14de5ad57898a8fdd34b5ff9666958f20c7bd8e4277e58fd00c3aa3ad9d15694410e2fd784064f960f264500015e146cdf3f346ea67f7f053e67c
-DIST mysql-extras-20130128-0054Z.tar.bz2 1900342 SHA256 31d6c5ba55b6640569956bb4558e9e8f63f1947e1b51d4f4537a18f5f5a88893 SHA512 dd35934c145eb7faa237f630f1d4b671a35f5fa0b6a83e60ce647c8a19acf0c974e7b86d92086151f5c11c365529214c659ed1f0b3174277d90e5b4fbe60a362 WHIRLPOOL b15be083feb3896e85d4a1f31cbcea71384a17d0c5fd413e1d95ce416603cd710c754c3f4b705846cedcb8e2de9d77e614c62fd4882b4ec1684e4343d6194e80
 DIST mysql-extras-20130602-1946Z.tar.bz2 1478373 SHA256 843465190319464fdb035f4ddcf8a84ad3161780e3a81c1269c8f498b1524aab SHA512 95fc28f84618e11eeb2de22c12796eca5f8eff7b69ccc44d329d8f81aba4b015c834bad965a909f4e1e90a7f6012db98092ca21f31388ff5ab88268c8c1b60f3 WHIRLPOOL c04b1554663934969ab6b7773c96a5bd2388971dbea1eef138620014ef1e023904b5df326ff3e36538920be7bc50a2962e8f7a33435e42c1b5bdf5787ed2eb3a
 DIST mysql-extras-20130606-1725Z.tar.bz2 1478541 SHA256 001d93992cda2067942209f9fccfdccd8a8a4b92486779c3b777580f9c85eb71 SHA512 312db9d5cf80a1e474c0e9069d5b97082cf5955974aceed75b6cfbeded944180d01a1343b0b84d6dd1ec73b9458aa58eeced5b2c5e324ac72512dcb480130acd WHIRLPOOL 8103f10fe9103aaa6cd424f71d2f67daf8b79d8fc1a3a6a13748929f6a263f6a19125a5b6e1d09c8ef2c07d01136b99e38d40c281a7a3cd7a1cd110a0fb4b67f
 DIST mysql-extras-20130626-0127Z.tar.bz2 1476503 SHA256 a3c791b7b95fe170c4071feed11699146fc8f9de6a9f2ffa67214c2e50644b4f SHA512 4ee19cb5960ba24f2db16e7c5b647d1b7bb9fadbc73bbd8125bbac7e926c569a9a585a4d1d92b851ea6653d9c15eeb00f1592880f104520dc040e5af19943ac7 WHIRLPOOL 739f5762fa24b0feb40848ddb83f2ed95fb650933920b3d9e55c5e90f907d4ac74dfb00e4b9189cda8f9af4317478f3132daf789d7c91196827f645dd3e37d61

diff --git a/dev-db/mysql/mysql-5.1.66-r1.ebuild b/dev-db/mysql/mysql-5.1.66-r1.ebuild
deleted file mode 100644
index e4a31ea..0000000
--- a/dev-db/mysql/mysql-5.1.66-r1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.66-r1.ebuild,v 1.1 2013/01/28 02:10:49 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130128-0054Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.66.ebuild b/dev-db/mysql/mysql-5.1.66.ebuild
deleted file mode 100644
index e01f201..0000000
--- a/dev-db/mysql/mysql-5.1.66.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.66.ebuild,v 1.8 2012/12/01 00:52:42 blueness Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20121101-2319Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.67-r1.ebuild b/dev-db/mysql/mysql-5.1.67-r1.ebuild
deleted file mode 100644
index 1917077..0000000
--- a/dev-db/mysql/mysql-5.1.67-r1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.67-r1.ebuild,v 1.1 2013/01/28 02:10:49 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130128-0054Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.67.ebuild b/dev-db/mysql/mysql-5.1.67.ebuild
deleted file mode 100644
index 2c57149..0000000
--- a/dev-db/mysql/mysql-5.1.67.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.67.ebuild,v 1.11 2013/02/08 16:44:59 ago Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20121101-2319Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.68.ebuild b/dev-db/mysql/mysql-5.1.68.ebuild
deleted file mode 100644
index aabfe2a..0000000
--- a/dev-db/mysql/mysql-5.1.68.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.68.ebuild,v 1.1 2013/06/02 19:48:56 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130128-0054Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.1.69.ebuild b/dev-db/mysql/mysql-5.1.69.ebuild
deleted file mode 100644
index ac86329..0000000
--- a/dev-db/mysql/mysql-5.1.69.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.69.ebuild,v 1.1 2013/06/02 19:48:56 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130602-1946Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.5.29-r1.ebuild b/dev-db/mysql/mysql-5.5.29-r1.ebuild
deleted file mode 100644
index 42bc387..0000000
--- a/dev-db/mysql/mysql-5.5.29-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.29-r1.ebuild,v 1.1 2013/01/20 23:05:14 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130120-2303Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.29.ebuild b/dev-db/mysql/mysql-5.5.29.ebuild
deleted file mode 100644
index 485881c..0000000
--- a/dev-db/mysql/mysql-5.5.29.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.29.ebuild,v 1.1 2013/01/20 02:18:30 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130120-0100Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.30.ebuild b/dev-db/mysql/mysql-5.5.30.ebuild
deleted file mode 100644
index 0c8a3c7..0000000
--- a/dev-db/mysql/mysql-5.5.30.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.30.ebuild,v 1.1 2013/03/14 01:03:14 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130120-2303Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.31.ebuild b/dev-db/mysql/mysql-5.5.31.ebuild
deleted file mode 100644
index ecbc89b..0000000
--- a/dev-db/mysql/mysql-5.5.31.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.31.ebuild,v 1.1 2013/06/03 15:56:10 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130602-1946Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.6.7_rc.ebuild b/dev-db/mysql/mysql-5.6.7_rc.ebuild
deleted file mode 100644
index 9fec557..0000000
--- a/dev-db/mysql/mysql-5.6.7_rc.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.6.9_rc.ebuild b/dev-db/mysql/mysql-5.6.9_rc.ebuild
deleted file mode 100644
index ddba830..0000000
--- a/dev-db/mysql/mysql-5.6.9_rc.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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
-}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-08-30 20:27 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2013-08-30 20:27 UTC (permalink / raw
  To: gentoo-commits

commit:     8611d5ea2e49e55d345eced90cee21ccb9d4a877
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Fri Aug 30 20:27:33 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Aug 30 20:27:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8611d5ea

[dev-db/mysql] Remove testing repo from 5.6.13

---
 dev-db/mysql/mysql-5.6.13.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-db/mysql/mysql-5.6.13.ebuild b/dev-db/mysql/mysql-5.6.13.ebuild
index b47f90c..ddba830 100644
--- a/dev-db/mysql/mysql-5.6.13.ebuild
+++ b/dev-db/mysql/mysql-5.6.13.ebuild
@@ -16,8 +16,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # Define the mysql-extras source
-#EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-EGIT_REPO_URI="/home/grknight/mysql-extras"
+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"


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-10-14 17:49 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2013-10-14 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     7b47bc0e91515b1f7d2498bdea833447adbef5a3
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Mon Oct 14 17:45:37 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Oct 14 17:45:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7b47bc0e

[mysql] Version bump for 5.5 and 5.6 series
5.5.34 fails test rpl.rpl_deadlock_innodb same as bug 473002
5.6.14 fails test rpl.rpl.rpl_spec_variables in a simliar manner to bug 473002

---
 dev-db/mysql/Manifest            |   2 +
 dev-db/mysql/mysql-5.5.34.ebuild | 129 +++++++++++++++++++++++++++++++++++++++
 dev-db/mysql/mysql-5.6.14.ebuild | 119 ++++++++++++++++++++++++++++++++++++
 3 files changed, 250 insertions(+)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index d7450d6..ae24250 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -4,9 +4,11 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde1539575
 DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
 DIST mysql-5.5.32.tar.gz 24589274 SHA256 babb19a1e58f6b285ff75e876f550a798d37fb72b5a548ffb411e8a4a51f6890 SHA512 78e9f0f47b3732e83e1261e8c021002288c0555b3aed7a51359511b038084eb9c7314a3960aa225eab46868fc4700f0f7a6301d1a0068c0f9ba038d41a5b7488 WHIRLPOOL fcf7291524fd8709eccdcef3deb32d132e9db0182aeb39c70b59f7086f49e09526d1bb055b3771915eb19271d7f2b86c0d0f65101dbd7a9d998fe95605cabdd3
 DIST mysql-5.5.33.tar.gz 24680463 SHA256 6ad9af38de1f3595c5fb81bc24bdb62fa39b2ce1c690d87ac7d7a21ca71fceba SHA512 c0d24249113abe5c61a47c96938b49db715d1daf2c27aedbead1b6a69b2cb6c1dd5a96412055182a28d3703ffa808c6032dc2ad608abbcec850f1fc80c552b39 WHIRLPOOL 964974a93a718010cf1c6631b9d0c7c483e66271caeca0b986ae564656fb5cf1e172d15631729ecb02fb07f9bc5e1d491855c23fa4ef4a0af4dcce363b5079f2
+DIST mysql-5.5.34.tar.gz 24699724 SHA256 b0602b492d519602b7fa8e4cc87df998d9794fbc955819beec586a268fe06485 SHA512 dc2ea7e8a7fa0f2124f53d1c23d39a183b1b641069356baff6900fa7a03770c44bb924effd957f33f511fc28c4aa3913b8abc550d8104d54604bf1841b426144 WHIRLPOOL 91bc26610771c550707cb7f1f088a0a5503d95eea449701a5abbc12a98f3e5b02a47686eb15929b7981e4495f4561618abb749db03bdefbe3be98e8d9fdcb4ac
 DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
 DIST mysql-5.6.12.tar.gz 35876046 SHA256 1153c1e0ae94116c150be5f173c336a80471b5ed4642a682b8462d36d54d5817 SHA512 a94141c2ba1cb1bf606d25a8ede2dd919b2ad0e039211b4527829343282a09d25204bb66bf48a248d9ae2397b5b464f6e1c67d49250c34100297f4050dd3db8a WHIRLPOOL 642d3831c7a8f807b7ea44f1ea447b83dacc6a3b0ec51ec0e1e9990d8c2b1cccae7d92449bc90d3dabc0cdadcb8a122cc6d3cb4a3c22717cf9aa0540a26f1b5c
 DIST mysql-5.6.13.tar.gz 35951160 SHA256 5d1b230c3ce896fbea47a69b14b9efb122621a19f32c1102d388d8e7fa442d7e SHA512 56d3aa84c0ed69fcdb7706117398d555aaec0c20fe09364cd6d4a6b3e3af8644825d7cb886dbfd3fe630bfd318306090359f04f2558cf499915a9f1648520a82 WHIRLPOOL e9c701b8923071136e3baaabffae5f38e76ae7f8cf237aa0109614940a365bf2589d05d2c31b1523a92ad4ad0cc7dbff4eb15711b09c0cb3223e73e88456b290
+DIST mysql-5.6.14.tar.gz 36005278 SHA256 7136963e07726abfb543b618cf368c8bb9480b5113327ca4a8f94c86f24b22c7 SHA512 655e88d9150d32b10b3fad360d36d7ff94c670be9dd1378cef4b9c8ea5c38d74e61eaacd9dbaf3d1aad743c11a2ccc1173b6e1f15d93af866884ef867895f141 WHIRLPOOL d3c2c79da1f3817fe5a0f3d83ba6c40741e73294a82cf8bab38db16755d2379aad7d4c3280c8927d5c391f5fc3f50a399cffce5027685413cec48616e569ba82
 DIST mysql-5.7.1-m11.tar.gz 36605947 SHA256 00630164b2f61c1ed08e8484c75fea81acff33137c94f7da4d49fa352df2f489 SHA512 dabd1fde56d297ee2296d06b0a3190210450ca01d3c6d46634af643e2f0d83b14ef5f5bd79f09c96def840fe153a9cdd9b17baa3c75bf408bc95445f8c0afcf1 WHIRLPOOL 229e3020bf4b610336bbd83049e6a4faa39d9fb91ec5bd4702aa3610d06f1d41c7003ff80c7faf45ebfe151fd3a1bc3bef7118cb89b9fd61fc5132892b0b7589
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551

diff --git a/dev-db/mysql/mysql-5.5.34.ebuild b/dev-db/mysql/mysql-5.5.34.ebuild
new file mode 100644
index 0000000..c8ba059
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.34.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.1 2013/06/06 17:06:28 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="20130602-1946Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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/mysql/mysql-5.6.14.ebuild b/dev-db/mysql/mysql-5.6.14.ebuild
new file mode 100644
index 0000000..ddba830
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.14.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-12-10 14:39 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2013-12-10 14:39 UTC (permalink / raw
  To: gentoo-commits

commit:     608d803c55d99b8f919680a4bfc5da447e42a323
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Dec 10 14:30:17 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Dec 10 14:30:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=608d803c

[mysql] Version bumps for 5.5 and 5.6 series

Package-Manager: portage-2.2.7

---
 dev-db/mysql/ChangeLog                                   |  7 +++++++
 dev-db/mysql/Manifest                                    |  3 ++-
 .../mysql/{mysql-5.6.10.ebuild => mysql-5.5.35.ebuild}   | 16 +++++++++++++---
 .../mysql/{mysql-5.6.10.ebuild => mysql-5.6.15.ebuild}   | 10 ++++++++--
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 040597a..a73afab 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.5.35 (10 Dec 2013)
+*mysql-5.6.15 (10 Dec 2013)
+
+  10 Dec 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.5.35.ebuild,
+  +mysql-5.6.15.ebuild, -mysql-5.6.10.ebuild:
+  [mysql] Version bumps for 5.5 and 5.6 series
+
   29 Aug 2013; Brian Evans <grknight@tuffmail.com> -mysql-5.1.66-r1.ebuild,
   -mysql-5.1.66.ebuild, -mysql-5.1.67-r1.ebuild, -mysql-5.1.67.ebuild,
   -mysql-5.1.68.ebuild, -mysql-5.1.69.ebuild, -mysql-5.5.29-r1.ebuild,

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index ae24250..3c8a5c7 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,10 +5,11 @@ DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1
 DIST mysql-5.5.32.tar.gz 24589274 SHA256 babb19a1e58f6b285ff75e876f550a798d37fb72b5a548ffb411e8a4a51f6890 SHA512 78e9f0f47b3732e83e1261e8c021002288c0555b3aed7a51359511b038084eb9c7314a3960aa225eab46868fc4700f0f7a6301d1a0068c0f9ba038d41a5b7488 WHIRLPOOL fcf7291524fd8709eccdcef3deb32d132e9db0182aeb39c70b59f7086f49e09526d1bb055b3771915eb19271d7f2b86c0d0f65101dbd7a9d998fe95605cabdd3
 DIST mysql-5.5.33.tar.gz 24680463 SHA256 6ad9af38de1f3595c5fb81bc24bdb62fa39b2ce1c690d87ac7d7a21ca71fceba SHA512 c0d24249113abe5c61a47c96938b49db715d1daf2c27aedbead1b6a69b2cb6c1dd5a96412055182a28d3703ffa808c6032dc2ad608abbcec850f1fc80c552b39 WHIRLPOOL 964974a93a718010cf1c6631b9d0c7c483e66271caeca0b986ae564656fb5cf1e172d15631729ecb02fb07f9bc5e1d491855c23fa4ef4a0af4dcce363b5079f2
 DIST mysql-5.5.34.tar.gz 24699724 SHA256 b0602b492d519602b7fa8e4cc87df998d9794fbc955819beec586a268fe06485 SHA512 dc2ea7e8a7fa0f2124f53d1c23d39a183b1b641069356baff6900fa7a03770c44bb924effd957f33f511fc28c4aa3913b8abc550d8104d54604bf1841b426144 WHIRLPOOL 91bc26610771c550707cb7f1f088a0a5503d95eea449701a5abbc12a98f3e5b02a47686eb15929b7981e4495f4561618abb749db03bdefbe3be98e8d9fdcb4ac
-DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4
+DIST mysql-5.5.35.tar.gz 21707804 SHA256 46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512 ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede WHIRLPOOL 800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
 DIST mysql-5.6.12.tar.gz 35876046 SHA256 1153c1e0ae94116c150be5f173c336a80471b5ed4642a682b8462d36d54d5817 SHA512 a94141c2ba1cb1bf606d25a8ede2dd919b2ad0e039211b4527829343282a09d25204bb66bf48a248d9ae2397b5b464f6e1c67d49250c34100297f4050dd3db8a WHIRLPOOL 642d3831c7a8f807b7ea44f1ea447b83dacc6a3b0ec51ec0e1e9990d8c2b1cccae7d92449bc90d3dabc0cdadcb8a122cc6d3cb4a3c22717cf9aa0540a26f1b5c
 DIST mysql-5.6.13.tar.gz 35951160 SHA256 5d1b230c3ce896fbea47a69b14b9efb122621a19f32c1102d388d8e7fa442d7e SHA512 56d3aa84c0ed69fcdb7706117398d555aaec0c20fe09364cd6d4a6b3e3af8644825d7cb886dbfd3fe630bfd318306090359f04f2558cf499915a9f1648520a82 WHIRLPOOL e9c701b8923071136e3baaabffae5f38e76ae7f8cf237aa0109614940a365bf2589d05d2c31b1523a92ad4ad0cc7dbff4eb15711b09c0cb3223e73e88456b290
 DIST mysql-5.6.14.tar.gz 36005278 SHA256 7136963e07726abfb543b618cf368c8bb9480b5113327ca4a8f94c86f24b22c7 SHA512 655e88d9150d32b10b3fad360d36d7ff94c670be9dd1378cef4b9c8ea5c38d74e61eaacd9dbaf3d1aad743c11a2ccc1173b6e1f15d93af866884ef867895f141 WHIRLPOOL d3c2c79da1f3817fe5a0f3d83ba6c40741e73294a82cf8bab38db16755d2379aad7d4c3280c8927d5c391f5fc3f50a399cffce5027685413cec48616e569ba82
+DIST mysql-5.6.15.tar.gz 32794954 SHA256 f0ed95faf51670eb9d57ae901e03b0cda79f6c5899f0494b9ec867b1686fe4c7 SHA512 4a9a9bdd251ffe2d40fb69bd62ae66e5421afa9193cd824341976c62f8d6c9374d6c11a23f277ec44d3ad0ede9c190f88ba0f290ae7868ed3b16f66830fbfe9d WHIRLPOOL 8fef93c989a9959bf9f2af23b9601005293f86d9c4380fb68edcd6e78bc0aab9ff84c05e50ea955e25571be2eb4cc058fec6a869bff7536ba033a45a2186abf0
 DIST mysql-5.7.1-m11.tar.gz 36605947 SHA256 00630164b2f61c1ed08e8484c75fea81acff33137c94f7da4d49fa352df2f489 SHA512 dabd1fde56d297ee2296d06b0a3190210450ca01d3c6d46634af643e2f0d83b14ef5f5bd79f09c96def840fe153a9cdd9b17baa3c75bf408bc95445f8c0afcf1 WHIRLPOOL 229e3020bf4b610336bbd83049e6a4faa39d9fb91ec5bd4702aa3610d06f1d41c7003ff80c7faf45ebfe151fd3a1bc3bef7118cb89b9fd61fc5132892b0b7589
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551

diff --git a/dev-db/mysql/mysql-5.6.10.ebuild b/dev-db/mysql/mysql-5.5.35.ebuild
similarity index 87%
copy from dev-db/mysql/mysql-5.6.10.ebuild
copy to dev-db/mysql/mysql-5.5.35.ebuild
index ddba830..c8ba059 100644
--- a/dev-db/mysql/mysql-5.6.10.ebuild
+++ b/dev-db/mysql/mysql-5.5.35.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.1 2013/06/06 17:06:28 robbat2 Exp $
 
 EAPI="4"
 
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20130602-1946Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 
@@ -83,9 +83,19 @@ src_test() {
 		#
 		# main.flush_read_lock_kill
 		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
 		for t in main.mysql_client_test \
 			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin; do
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
 				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 

diff --git a/dev-db/mysql/mysql-5.6.10.ebuild b/dev-db/mysql/mysql-5.6.15.ebuild
similarity index 89%
rename from dev-db/mysql/mysql-5.6.10.ebuild
rename to dev-db/mysql/mysql-5.6.15.ebuild
index ddba830..0a0607d 100644
--- a/dev-db/mysql/mysql-5.6.10.ebuild
+++ b/dev-db/mysql/mysql-5.6.15.ebuild
@@ -71,7 +71,10 @@ src_test() {
 		# false positives:
 		#
 		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
+		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+		# mysqld--help-notwin
 		# fails due to USE=-latin1 / utf8 default
 		#
 		# main.mysql_client_test:
@@ -85,7 +88,10 @@ src_test() {
 		# fails because of unknown system variable 'DEBUG_SYNC'
 		for t in main.mysql_client_test \
 			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin; do
+			main.mysqld--help-notwinfuncs_1.is_triggers funcs_1.is_tables_mysql \
+			funcs_1.is_columns_mysql binlog.binlog_mysqlbinlog_filter \
+			perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
+			mysqld--help-notwin; do
 				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2013-12-12 17:28 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2013-12-12 17:28 UTC (permalink / raw
  To: gentoo-commits

commit:     ecf602805f5cd1a7915e63085305ae704388bcf9
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Thu Dec 12 17:28:17 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Thu Dec 12 17:28:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ecf60280

[mysql] Bump 5.1 series

Package-Manager: portage-2.2.7

---
 dev-db/mysql/ChangeLog           |   5 +
 dev-db/mysql/Manifest            |   1 +
 dev-db/mysql/mysql-5.1.73.ebuild | 265 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 271 insertions(+)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index a73afab..202fea8 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.1.73 (12 Dec 2013)
+
+  12 Dec 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.1.73.ebuild:
+  [mysql] Bump 5.1 series
+
 *mysql-5.5.35 (10 Dec 2013)
 *mysql-5.6.15 (10 Dec 2013)
 

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 3c8a5c7..a34f486 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,6 +2,7 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
+DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.32.tar.gz 24589274 SHA256 babb19a1e58f6b285ff75e876f550a798d37fb72b5a548ffb411e8a4a51f6890 SHA512 78e9f0f47b3732e83e1261e8c021002288c0555b3aed7a51359511b038084eb9c7314a3960aa225eab46868fc4700f0f7a6301d1a0068c0f9ba038d41a5b7488 WHIRLPOOL fcf7291524fd8709eccdcef3deb32d132e9db0182aeb39c70b59f7086f49e09526d1bb055b3771915eb19271d7f2b86c0d0f65101dbd7a9d998fe95605cabdd3
 DIST mysql-5.5.33.tar.gz 24680463 SHA256 6ad9af38de1f3595c5fb81bc24bdb62fa39b2ce1c690d87ac7d7a21ca71fceba SHA512 c0d24249113abe5c61a47c96938b49db715d1daf2c27aedbead1b6a69b2cb6c1dd5a96412055182a28d3703ffa808c6032dc2ad608abbcec850f1fc80c552b39 WHIRLPOOL 964974a93a718010cf1c6631b9d0c7c483e66271caeca0b986ae564656fb5cf1e172d15631729ecb02fb07f9bc5e1d491855c23fa4ef4a0af4dcce363b5079f2
 DIST mysql-5.5.34.tar.gz 24699724 SHA256 b0602b492d519602b7fa8e4cc87df998d9794fbc955819beec586a268fe06485 SHA512 dc2ea7e8a7fa0f2124f53d1c23d39a183b1b641069356baff6900fa7a03770c44bb924effd957f33f511fc28c4aa3913b8abc550d8104d54604bf1841b426144 WHIRLPOOL 91bc26610771c550707cb7f1f088a0a5503d95eea449701a5abbc12a98f3e5b02a47686eb15929b7981e4495f4561618abb749db03bdefbe3be98e8d9fdcb4ac

diff --git a/dev-db/mysql/mysql-5.1.73.ebuild b/dev-db/mysql/mysql-5.1.73.ebuild
new file mode 100644
index 0000000..721099e
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.73.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.69.ebuild,v 1.1 2013/06/02 19:48:56 robbat2 Exp $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+# PBXT
+PBXT_VERSION='1.0.11-6-pre-ga'
+# XtraDB
+PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
+
+# Build type
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+EPATCH_EXCLUDE=''
+
+# Most of these are in the eclass
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+		>=sys-devel/libtool-2.2.10"
+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
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# 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"
+
+	emake check || die "make check failed"
+	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"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# archive_gis really sucks a lot, but it's only relevant for the
+		# USE=extraengines case
+		case ${PV} in
+			5.0.42)
+			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
+			;;
+
+			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
+			[ "$(tc-endian)" == "big" ] && \
+			mysql-v2_disable_test \
+				"archive_gis" \
+				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
+			;;
+		esac
+
+		# This was a slight testcase breakage when the read_only security issue
+		# was fixed.
+		case ${PV} in
+			5.0.54|5.0.51*)
+			mysql-v2_disable_test \
+				"read_only" \
+				"Broken in 5.0.51-54, output in wrong order"
+			;;
+		esac
+
+		# Ditto to read_only
+		[ "${PV}" == "5.0.51a" ] && \
+			mysql-v2_disable_test \
+				"view" \
+				"Broken in 5.0.51, output in wrong order"
+
+		# x86-specific, OOM issue with some subselects on low memory servers
+		[ "${PV}" == "5.0.54" ] && \
+			[ "${ARCH/x86}" != "${ARCH}" ] && \
+			mysql-v2_disable_test \
+				"subselect" \
+				"Testcase needs tuning on x86 for oom condition"
+
+		# Broke with the YaSSL security issue that didn't affect Gentoo.
+		[ "${PV}" == "5.0.56" ] && \
+			for t in openssl_1 rpl_openssl rpl_ssl ssl \
+				ssl_8k_key ssl_compress ssl_connect ; do \
+				mysql-v2_disable_test \
+					"$t" \
+					"OpenSSL tests broken on 5.0.56"
+			done
+
+		# New test was broken in first time
+		# Upstream bug 41066
+		# http://bugs.mysql.com/bug.php?id=41066
+		[ "${PV}" == "5.0.72" ] && \
+			mysql-v2_disable_test \
+				"status2" \
+				"Broken in 5.0.72, new test is broken, upstream bug #41066"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.0.*|5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# This fail with XtraDB in place of normal InnoDB
+		# TODO: test if they are broken with the rest of the Percona patches
+		if xtradb_patch_available && use xtradb ; then
+			for t in main.innodb innodb.innodb_bug51378 \
+				main.information_schema_db main.mysqlshow \
+				main.innodb-autoinc main.innodb_bug21704 \
+				main.innodb_bug44369 main.innodb_bug46000 \
+				main.index_merge_innodb \
+				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
+				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
+				innodb.innodb_bug21704 innodb.innodb_bug44369 \
+				innodb.innodb_bug46000 innodb.innodb_bug48024 \
+				innodb.innodb_bug49164 innodb.innodb_bug51920 \
+				innodb.innodb_bug54044 \
+				; do
+					mysql-v2_disable_test $t "tests broken in xtradb"
+			done
+		fi
+
+		if ! use extraengine ; then
+			# bug 332565
+			for t in main.range ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
+			done
+			# bug 401673
+			for t in federated.federated_plugin ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-01-24 13:47 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-01-24 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     24309f896d292a065184840d7af621c12cc14447
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Fri Jan 24 13:47:48 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Jan 24 13:47:48 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=24309f89

[mysql] Increase suite timeout and open files for tests

---
 dev-db/mysql/mysql-5.6.15.ebuild            | 6 +++++-
 dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql/mysql-5.6.15.ebuild b/dev-db/mysql/mysql-5.6.15.ebuild
index 0a0607d..d23c26a 100644
--- a/dev-db/mysql/mysql-5.6.15.ebuild
+++ b/dev-db/mysql/mysql-5.6.15.ebuild
@@ -98,8 +98,12 @@ src_test() {
 		# Run mysql tests
 		pushd "${TESTDIR}"
 
+		# Set file limits higher so tests run
+		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="${S}/mysql-test/var-tests" \
+			--suite-timeout=5000
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"

diff --git a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild b/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
index 7f2d236..9277e7a 100644
--- a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
+++ b/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
@@ -98,8 +98,12 @@ src_test() {
 		# Run mysql tests
 		pushd "${TESTDIR}"
 
+		# Set file limits higher so tests run
+		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="${S}/mysql-test/var-tests" \
+			--suite-timeout=5000
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-02-01  2:10 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2014-02-01  2:10 UTC (permalink / raw
  To: gentoo-commits

commit:     3ef414614a5676f950a60c6a081387d7b101b90a
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  1 02:10:32 2014 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Feb  1 02:10:32 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3ef41461

Clean-up mysql versions.

---
 dev-db/mysql/mysql-5.5.32.ebuild            | 129 ----------------------------
 dev-db/mysql/mysql-5.5.33.ebuild            | 129 ----------------------------
 dev-db/mysql/mysql-5.5.34.ebuild            | 129 ----------------------------
 dev-db/mysql/mysql-5.6.12.ebuild            | 121 --------------------------
 dev-db/mysql/mysql-5.6.13.ebuild            | 119 -------------------------
 dev-db/mysql/mysql-5.6.14.ebuild            | 119 -------------------------
 dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild | 119 -------------------------
 7 files changed, 865 deletions(-)

diff --git a/dev-db/mysql/mysql-5.5.32.ebuild b/dev-db/mysql/mysql-5.5.32.ebuild
deleted file mode 100644
index c8ba059..0000000
--- a/dev-db/mysql/mysql-5.5.32.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.1 2013/06/06 17:06:28 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130602-1946Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.33.ebuild b/dev-db/mysql/mysql-5.5.33.ebuild
deleted file mode 100644
index c8ba059..0000000
--- a/dev-db/mysql/mysql-5.5.33.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.1 2013/06/06 17:06:28 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130602-1946Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.5.34.ebuild b/dev-db/mysql/mysql-5.5.34.ebuild
deleted file mode 100644
index c8ba059..0000000
--- a/dev-db/mysql/mysql-5.5.34.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.1 2013/06/06 17:06:28 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130602-1946Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.6.12.ebuild b/dev-db/mysql/mysql-5.6.12.ebuild
deleted file mode 100644
index 2497387..0000000
--- a/dev-db/mysql/mysql-5.6.12.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130606-1725Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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"
-
-		# Need to clean up slightly
-		find "${TESTDIR}" -type s -delete
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}

diff --git a/dev-db/mysql/mysql-5.6.13.ebuild b/dev-db/mysql/mysql-5.6.13.ebuild
deleted file mode 100644
index ddba830..0000000
--- a/dev-db/mysql/mysql-5.6.13.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.6.14.ebuild b/dev-db/mysql/mysql-5.6.14.ebuild
deleted file mode 100644
index ddba830..0000000
--- a/dev-db/mysql/mysql-5.6.14.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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/mysql/mysql-5.7.1_alpha_pre11.ebuild b/dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild
deleted file mode 100644
index ddba830..0000000
--- a/dev-db/mysql/mysql-5.7.1_alpha_pre11.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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
-}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-02-24 17:26 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-02-24 17:26 UTC (permalink / raw
  To: gentoo-commits

commit:     a301a3d855c25fc0b16d0b2c9f66f06f1964dc5a
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Feb 24 17:26:43 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Feb 24 17:26:43 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a301a3d8

[mysql] Bump to mysql 5.5.36. Tests pass

---
 dev-db/mysql/Manifest            |  10 +--
 dev-db/mysql/mysql-5.5.36.ebuild | 129 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+), 9 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index b744fe4..89e8bd6 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,21 +3,13 @@ DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434ac
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.32.tar.gz 24589274 SHA256 babb19a1e58f6b285ff75e876f550a798d37fb72b5a548ffb411e8a4a51f6890 SHA512 78e9f0f47b3732e83e1261e8c021002288c0555b3aed7a51359511b038084eb9c7314a3960aa225eab46868fc4700f0f7a6301d1a0068c0f9ba038d41a5b7488 WHIRLPOOL fcf7291524fd8709eccdcef3deb32d132e9db0182aeb39c70b59f7086f49e09526d1bb055b3771915eb19271d7f2b86c0d0f65101dbd7a9d998fe95605cabdd3
-DIST mysql-5.5.33.tar.gz 24680463 SHA256 6ad9af38de1f3595c5fb81bc24bdb62fa39b2ce1c690d87ac7d7a21ca71fceba SHA512 c0d24249113abe5c61a47c96938b49db715d1daf2c27aedbead1b6a69b2cb6c1dd5a96412055182a28d3703ffa808c6032dc2ad608abbcec850f1fc80c552b39 WHIRLPOOL 964974a93a718010cf1c6631b9d0c7c483e66271caeca0b986ae564656fb5cf1e172d15631729ecb02fb07f9bc5e1d491855c23fa4ef4a0af4dcce363b5079f2
-DIST mysql-5.5.34.tar.gz 24699724 SHA256 b0602b492d519602b7fa8e4cc87df998d9794fbc955819beec586a268fe06485 SHA512 dc2ea7e8a7fa0f2124f53d1c23d39a183b1b641069356baff6900fa7a03770c44bb924effd957f33f511fc28c4aa3913b8abc550d8104d54604bf1841b426144 WHIRLPOOL 91bc26610771c550707cb7f1f088a0a5503d95eea449701a5abbc12a98f3e5b02a47686eb15929b7981e4495f4561618abb749db03bdefbe3be98e8d9fdcb4ac
 DIST mysql-5.5.35.tar.gz 21707804 SHA256 46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512 ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede WHIRLPOOL 800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
-DIST mysql-5.6.12.tar.gz 35876046 SHA256 1153c1e0ae94116c150be5f173c336a80471b5ed4642a682b8462d36d54d5817 SHA512 a94141c2ba1cb1bf606d25a8ede2dd919b2ad0e039211b4527829343282a09d25204bb66bf48a248d9ae2397b5b464f6e1c67d49250c34100297f4050dd3db8a WHIRLPOOL 642d3831c7a8f807b7ea44f1ea447b83dacc6a3b0ec51ec0e1e9990d8c2b1cccae7d92449bc90d3dabc0cdadcb8a122cc6d3cb4a3c22717cf9aa0540a26f1b5c
-DIST mysql-5.6.13.tar.gz 35951160 SHA256 5d1b230c3ce896fbea47a69b14b9efb122621a19f32c1102d388d8e7fa442d7e SHA512 56d3aa84c0ed69fcdb7706117398d555aaec0c20fe09364cd6d4a6b3e3af8644825d7cb886dbfd3fe630bfd318306090359f04f2558cf499915a9f1648520a82 WHIRLPOOL e9c701b8923071136e3baaabffae5f38e76ae7f8cf237aa0109614940a365bf2589d05d2c31b1523a92ad4ad0cc7dbff4eb15711b09c0cb3223e73e88456b290
-DIST mysql-5.6.14.tar.gz 36005278 SHA256 7136963e07726abfb543b618cf368c8bb9480b5113327ca4a8f94c86f24b22c7 SHA512 655e88d9150d32b10b3fad360d36d7ff94c670be9dd1378cef4b9c8ea5c38d74e61eaacd9dbaf3d1aad743c11a2ccc1173b6e1f15d93af866884ef867895f141 WHIRLPOOL d3c2c79da1f3817fe5a0f3d83ba6c40741e73294a82cf8bab38db16755d2379aad7d4c3280c8927d5c391f5fc3f50a399cffce5027685413cec48616e569ba82
+DIST mysql-5.5.36.tar.gz 21723910 SHA256 30f2cde5bf854cf1ef74ecd1ae2f6e5e9ec7d11eb5b50643e1aa91c911c75897 SHA512 594644e13fa68d96b6081bff488574e5926a449c86274d0045fe4f211200f7a7c80c1b06c7c64bbe9df4753ac6de11cb9de0eb05c0ff40d7508b4eff87ea9684 WHIRLPOOL 6b9db2023975cd7341b32e5c2dab52d84269b3f0e0898d0d38646993ce7fc9004e148f9564792345748a4e7f7d8ea7974d3fa179cb2bac35c3fbd153c63e68ec
 DIST mysql-5.6.15.tar.gz 32794954 SHA256 f0ed95faf51670eb9d57ae901e03b0cda79f6c5899f0494b9ec867b1686fe4c7 SHA512 4a9a9bdd251ffe2d40fb69bd62ae66e5421afa9193cd824341976c62f8d6c9374d6c11a23f277ec44d3ad0ede9c190f88ba0f290ae7868ed3b16f66830fbfe9d WHIRLPOOL 8fef93c989a9959bf9f2af23b9601005293f86d9c4380fb68edcd6e78bc0aab9ff84c05e50ea955e25571be2eb4cc058fec6a869bff7536ba033a45a2186abf0
-DIST mysql-5.7.1-m11.tar.gz 36605947 SHA256 00630164b2f61c1ed08e8484c75fea81acff33137c94f7da4d49fa352df2f489 SHA512 dabd1fde56d297ee2296d06b0a3190210450ca01d3c6d46634af643e2f0d83b14ef5f5bd79f09c96def840fe153a9cdd9b17baa3c75bf408bc95445f8c0afcf1 WHIRLPOOL 229e3020bf4b610336bbd83049e6a4faa39d9fb91ec5bd4702aa3610d06f1d41c7003ff80c7faf45ebfe151fd3a1bc3bef7118cb89b9fd61fc5132892b0b7589
 DIST mysql-5.7.3-m13.tar.gz 43134145 SHA256 04a4f36c2e33b23a2f1c12274dbbd6aa45fcb36f9919e14c4d8b6bdcd2f4bf0a SHA512 34e9230f0ec55d1cb10362ebc9780c0c59b208ccdabf05d7fe62b0e3cc412616c81361a1a1e8d92f13025fc87d1ca639f1c2e3af3087ba5a7d1d783f53b828da WHIRLPOOL aa8a618759d62769582ea338306326bfd4d00cbd1c309faf8114683a6a4db0def7716d7eb267777d7bf6e4a3edda80ce7e052afdb0b17a7b382719775e919de2
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
-DIST mysql-extras-20130602-1946Z.tar.bz2 1478373 SHA256 843465190319464fdb035f4ddcf8a84ad3161780e3a81c1269c8f498b1524aab SHA512 95fc28f84618e11eeb2de22c12796eca5f8eff7b69ccc44d329d8f81aba4b015c834bad965a909f4e1e90a7f6012db98092ca21f31388ff5ab88268c8c1b60f3 WHIRLPOOL c04b1554663934969ab6b7773c96a5bd2388971dbea1eef138620014ef1e023904b5df326ff3e36538920be7bc50a2962e8f7a33435e42c1b5bdf5787ed2eb3a
-DIST mysql-extras-20130606-1725Z.tar.bz2 1478541 SHA256 001d93992cda2067942209f9fccfdccd8a8a4b92486779c3b777580f9c85eb71 SHA512 312db9d5cf80a1e474c0e9069d5b97082cf5955974aceed75b6cfbeded944180d01a1343b0b84d6dd1ec73b9458aa58eeced5b2c5e324ac72512dcb480130acd WHIRLPOOL 8103f10fe9103aaa6cd424f71d2f67daf8b79d8fc1a3a6a13748929f6a263f6a19125a5b6e1d09c8ef2c07d01136b99e38d40c281a7a3cd7a1cd110a0fb4b67f
 DIST mysql-extras-20130626-0127Z.tar.bz2 1476503 SHA256 a3c791b7b95fe170c4071feed11699146fc8f9de6a9f2ffa67214c2e50644b4f SHA512 4ee19cb5960ba24f2db16e7c5b647d1b7bb9fadbc73bbd8125bbac7e926c569a9a585a4d1d92b851ea6653d9c15eeb00f1592880f104520dc040e5af19943ac7 WHIRLPOOL 739f5762fa24b0feb40848ddb83f2ed95fb650933920b3d9e55c5e90f907d4ac74dfb00e4b9189cda8f9af4317478f3132daf789d7c91196827f645dd3e37d61
 DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962

diff --git a/dev-db/mysql/mysql-5.5.36.ebuild b/dev-db/mysql/mysql-5.5.36.ebuild
new file mode 100644
index 0000000..f9de4fa
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.36.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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"
+
+# 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='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-03-11 20:07 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-03-11 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     5f56e297a49d472f2dc5ac61e6e6836e534fed99
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Mar 11 20:06:24 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Mar 11 20:06:24 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5f56e297

[mysql] Version bump 5.6 series

---
 dev-db/mysql/Manifest                                     | 2 +-
 dev-db/mysql/{mysql-5.6.15.ebuild => mysql-5.6.16.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 89e8bd6..5fa8d7f 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,7 +5,7 @@ DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.35.tar.gz 21707804 SHA256 46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512 ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede WHIRLPOOL 800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
 DIST mysql-5.5.36.tar.gz 21723910 SHA256 30f2cde5bf854cf1ef74ecd1ae2f6e5e9ec7d11eb5b50643e1aa91c911c75897 SHA512 594644e13fa68d96b6081bff488574e5926a449c86274d0045fe4f211200f7a7c80c1b06c7c64bbe9df4753ac6de11cb9de0eb05c0ff40d7508b4eff87ea9684 WHIRLPOOL 6b9db2023975cd7341b32e5c2dab52d84269b3f0e0898d0d38646993ce7fc9004e148f9564792345748a4e7f7d8ea7974d3fa179cb2bac35c3fbd153c63e68ec
-DIST mysql-5.6.15.tar.gz 32794954 SHA256 f0ed95faf51670eb9d57ae901e03b0cda79f6c5899f0494b9ec867b1686fe4c7 SHA512 4a9a9bdd251ffe2d40fb69bd62ae66e5421afa9193cd824341976c62f8d6c9374d6c11a23f277ec44d3ad0ede9c190f88ba0f290ae7868ed3b16f66830fbfe9d WHIRLPOOL 8fef93c989a9959bf9f2af23b9601005293f86d9c4380fb68edcd6e78bc0aab9ff84c05e50ea955e25571be2eb4cc058fec6a869bff7536ba033a45a2186abf0
+DIST mysql-5.6.16.tar.gz 32821451 SHA256 70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0 SHA512 e54de791954e46bef295045ee98c0d7b9b5ec85ed7917e1a424f20d234d9fc47083fa44ae6439c6ab2198ab3016ce93ae621328b442084ba52c84c296113c60d WHIRLPOOL 2e5035e703b54511d808c89e59d924d49918d1ec9ce4707b0ee33d422db7e84273776a8891b6eec6e4942652e1b23690145ca92b11481f6d96d3cb7835fd0ed2
 DIST mysql-5.7.3-m13.tar.gz 43134145 SHA256 04a4f36c2e33b23a2f1c12274dbbd6aa45fcb36f9919e14c4d8b6bdcd2f4bf0a SHA512 34e9230f0ec55d1cb10362ebc9780c0c59b208ccdabf05d7fe62b0e3cc412616c81361a1a1e8d92f13025fc87d1ca639f1c2e3af3087ba5a7d1d783f53b828da WHIRLPOOL aa8a618759d62769582ea338306326bfd4d00cbd1c309faf8114683a6a4db0def7716d7eb267777d7bf6e4a3edda80ce7e052afdb0b17a7b382719775e919de2
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551

diff --git a/dev-db/mysql/mysql-5.6.15.ebuild b/dev-db/mysql/mysql-5.6.16.ebuild
similarity index 100%
rename from dev-db/mysql/mysql-5.6.15.ebuild
rename to dev-db/mysql/mysql-5.6.16.ebuild


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-03-28 16:47 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-03-28 16:47 UTC (permalink / raw
  To: gentoo-commits

commit:     b3b87f4899f632c548354a91bd62b9192af46f74
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Fri Mar 28 16:47:01 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Mar 28 16:47:01 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b3b87f48

[mysql] Version bump for 5.5 series

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

---
 dev-db/mysql/Manifest                                     |  2 +-
 dev-db/mysql/{mysql-5.5.36.ebuild => mysql-5.5.37.ebuild} | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5fa8d7f..204705c 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -4,7 +4,7 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde1539575
 DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.35.tar.gz 21707804 SHA256 46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512 ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede WHIRLPOOL 800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
-DIST mysql-5.5.36.tar.gz 21723910 SHA256 30f2cde5bf854cf1ef74ecd1ae2f6e5e9ec7d11eb5b50643e1aa91c911c75897 SHA512 594644e13fa68d96b6081bff488574e5926a449c86274d0045fe4f211200f7a7c80c1b06c7c64bbe9df4753ac6de11cb9de0eb05c0ff40d7508b4eff87ea9684 WHIRLPOOL 6b9db2023975cd7341b32e5c2dab52d84269b3f0e0898d0d38646993ce7fc9004e148f9564792345748a4e7f7d8ea7974d3fa179cb2bac35c3fbd153c63e68ec
+DIST mysql-5.5.37.tar.gz 21718944 SHA256 da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512 858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad WHIRLPOOL 13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
 DIST mysql-5.6.16.tar.gz 32821451 SHA256 70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0 SHA512 e54de791954e46bef295045ee98c0d7b9b5ec85ed7917e1a424f20d234d9fc47083fa44ae6439c6ab2198ab3016ce93ae621328b442084ba52c84c296113c60d WHIRLPOOL 2e5035e703b54511d808c89e59d924d49918d1ec9ce4707b0ee33d422db7e84273776a8891b6eec6e4942652e1b23690145ca92b11481f6d96d3cb7835fd0ed2
 DIST mysql-5.7.3-m13.tar.gz 43134145 SHA256 04a4f36c2e33b23a2f1c12274dbbd6aa45fcb36f9919e14c4d8b6bdcd2f4bf0a SHA512 34e9230f0ec55d1cb10362ebc9780c0c59b208ccdabf05d7fe62b0e3cc412616c81361a1a1e8d92f13025fc87d1ca639f1c2e3af3087ba5a7d1d783f53b828da WHIRLPOOL aa8a618759d62769582ea338306326bfd4d00cbd1c309faf8114683a6a4db0def7716d7eb267777d7bf6e4a3edda80ce7e052afdb0b17a7b382719775e919de2
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec

diff --git a/dev-db/mysql/mysql-5.5.36.ebuild b/dev-db/mysql/mysql-5.5.37.ebuild
similarity index 91%
rename from dev-db/mysql/mysql-5.5.36.ebuild
rename to dev-db/mysql/mysql-5.5.37.ebuild
index 3f679a3..ebb6824 100644
--- a/dev-db/mysql/mysql-5.5.36.ebuild
+++ b/dev-db/mysql/mysql-5.5.37.ebuild
@@ -67,6 +67,9 @@ src_test() {
 		# create directories because mysqladmin might right out of order
 		mkdir -p "${S}"/mysql-test/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/"
+
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:
 		#
@@ -91,11 +94,14 @@ src_test() {
 		# +mysqltest: Could not open connection 'default': 2026 SSL connection
 		#  error: error:00000001:lib(0):func(0):reason(1)
 		#
+                # main.mysql_tzinfo_to_sql_symlink
+                # fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
+                #
 
 		for t in main.mysql_client_test \
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
+			sys_vars.plugin_dir_basic main.openssl_1 mysql_tzinfo_to_sql_symlink ; do
 				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 
@@ -103,7 +109,8 @@ 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="${S}/mysql-test/var-tests" \
+			--testcase-timeout=30
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-04-01 17:51 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-04-01 17:51 UTC (permalink / raw
  To: gentoo-commits

commit:     520e5ed361dc0b2925d8a4fd30f3a8ec96360338
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Apr  1 17:44:23 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Apr  1 17:50:55 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=520e5ed3

[mysql] Version bump for 5.6 series. perfschema.aggregate test failed, retries succeed

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

---
 dev-db/mysql/Manifest                                     |  2 +-
 dev-db/mysql/{mysql-5.6.16.ebuild => mysql-5.6.17.ebuild} | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 204705c..491f5c0 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,7 +5,7 @@ DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.35.tar.gz 21707804 SHA256 46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512 ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede WHIRLPOOL 800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
 DIST mysql-5.5.37.tar.gz 21718944 SHA256 da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512 858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad WHIRLPOOL 13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
-DIST mysql-5.6.16.tar.gz 32821451 SHA256 70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0 SHA512 e54de791954e46bef295045ee98c0d7b9b5ec85ed7917e1a424f20d234d9fc47083fa44ae6439c6ab2198ab3016ce93ae621328b442084ba52c84c296113c60d WHIRLPOOL 2e5035e703b54511d808c89e59d924d49918d1ec9ce4707b0ee33d422db7e84273776a8891b6eec6e4942652e1b23690145ca92b11481f6d96d3cb7835fd0ed2
+DIST mysql-5.6.17.tar.gz 32862539 SHA256 f8ed0a1abd60ed9152b71a027446825d8686c48e99def6e74e0d12d24e9a1d9b SHA512 36b9c9456f2ccc0efd26fb4b4ce4280849e9915f06c19183700345aa39a72cf94d940ef98b113c14de0bfea27e3f4135e6f163635c8a14629a9f58c8c12845d7 WHIRLPOOL 47f86e99ad5d192d2a82e48e174dbe0fbd8f941b6b1494ab6a9621967aac77bb0579b2bb2e11c432d2856df7ab34d4cde9a4266923a0499577e035ac699bbc9f
 DIST mysql-5.7.3-m13.tar.gz 43134145 SHA256 04a4f36c2e33b23a2f1c12274dbbd6aa45fcb36f9919e14c4d8b6bdcd2f4bf0a SHA512 34e9230f0ec55d1cb10362ebc9780c0c59b208ccdabf05d7fe62b0e3cc412616c81361a1a1e8d92f13025fc87d1ca639f1c2e3af3087ba5a7d1d783f53b828da WHIRLPOOL aa8a618759d62769582ea338306326bfd4d00cbd1c309faf8114683a6a4db0def7716d7eb267777d7bf6e4a3edda80ce7e052afdb0b17a7b382719775e919de2
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551

diff --git a/dev-db/mysql/mysql-5.6.16.ebuild b/dev-db/mysql/mysql-5.6.17.ebuild
similarity index 93%
rename from dev-db/mysql/mysql-5.6.16.ebuild
rename to dev-db/mysql/mysql-5.6.17.ebuild
index 25e76e0..3de9afc 100644
--- a/dev-db/mysql/mysql-5.6.16.ebuild
+++ b/dev-db/mysql/mysql-5.6.17.ebuild
@@ -67,6 +67,9 @@ src_test() {
 		# create directories because mysqladmin might right out of order
 		mkdir -p "${S}"/mysql-test/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/"
+
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:
 		#
@@ -80,18 +83,15 @@ src_test() {
 		# main.mysql_client_test:
 		# segfaults at random under Portage only, suspect resource limits.
 		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
+		# main.mysql_tzinfo_to_sql_symlink
+		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
 		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
 		for t in main.mysql_client_test \
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwinfuncs_1.is_triggers funcs_1.is_tables_mysql \
 			funcs_1.is_columns_mysql binlog.binlog_mysqlbinlog_filter \
 			perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
-			mysqld--help-notwin; do
+			mysqld--help-notwin main.mysql_tzinfo_to_sql_symlink; do
 				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-04-02 12:59 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-04-02 12:59 UTC (permalink / raw
  To: gentoo-commits

commit:     ed77a974ae5947be8d33e207d0e974492e1b6e9d
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Wed Apr  2 12:58:52 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Apr  2 12:58:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ed77a974

[mysql] Version bump for 5.7 rpl.rpl_typeconv test fails due to timeout.  resources?

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

---
 dev-db/mysql/Manifest                                    |  2 +-
 ...alpha_pre13.ebuild => mysql-5.7.4_alpha_pre14.ebuild} | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 491f5c0..a9d6217 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -6,7 +6,7 @@ DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c30
 DIST mysql-5.5.35.tar.gz 21707804 SHA256 46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512 ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede WHIRLPOOL 800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
 DIST mysql-5.5.37.tar.gz 21718944 SHA256 da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512 858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad WHIRLPOOL 13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
 DIST mysql-5.6.17.tar.gz 32862539 SHA256 f8ed0a1abd60ed9152b71a027446825d8686c48e99def6e74e0d12d24e9a1d9b SHA512 36b9c9456f2ccc0efd26fb4b4ce4280849e9915f06c19183700345aa39a72cf94d940ef98b113c14de0bfea27e3f4135e6f163635c8a14629a9f58c8c12845d7 WHIRLPOOL 47f86e99ad5d192d2a82e48e174dbe0fbd8f941b6b1494ab6a9621967aac77bb0579b2bb2e11c432d2856df7ab34d4cde9a4266923a0499577e035ac699bbc9f
-DIST mysql-5.7.3-m13.tar.gz 43134145 SHA256 04a4f36c2e33b23a2f1c12274dbbd6aa45fcb36f9919e14c4d8b6bdcd2f4bf0a SHA512 34e9230f0ec55d1cb10362ebc9780c0c59b208ccdabf05d7fe62b0e3cc412616c81361a1a1e8d92f13025fc87d1ca639f1c2e3af3087ba5a7d1d783f53b828da WHIRLPOOL aa8a618759d62769582ea338306326bfd4d00cbd1c309faf8114683a6a4db0def7716d7eb267777d7bf6e4a3edda80ce7e052afdb0b17a7b382719775e919de2
+DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213

diff --git a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild b/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
similarity index 90%
rename from dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
rename to dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
index a650318..9026213 100644
--- a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
+++ b/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
@@ -67,6 +67,9 @@ src_test() {
 		# create directories because mysqladmin might right out of order
 		mkdir -p "${S}"/mysql-test/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/"
+
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:
 		#
@@ -80,18 +83,15 @@ src_test() {
 		# main.mysql_client_test:
 		# segfaults at random under Portage only, suspect resource limits.
 		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
+                # main.mysql_tzinfo_to_sql_symlink
+                # fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
+                #
 		for t in main.mysql_client_test \
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwin funcs_1.is_columns_mysql \
 			funcs_1.is_tables_mysql funcs_1.is_triggers \
 			binlog.binlog_mysqlbinlog_filter perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt; do
+			perfschema.binlog_edge_stmt main.mysql_tzinfo_to_sql_symlink ; do
 				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 
@@ -103,7 +103,7 @@ src_test() {
 
 		# run mysql-test tests
 		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--suite-timeout=5000
+			--suite-timeout=5000 --testcase-timeout=30
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-04-24 11:07 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 124+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2014-04-24 11:07 UTC (permalink / raw
  To: gentoo-commits

commit:     c2a8256060ad63a99e8a23fbe6c904051bfd536b
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 24 11:04:52 2014 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Apr 24 11:04:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c2a82560

Use a mysql-extras release. Fix copyright year. Whitespace.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

---
 dev-db/mysql/Manifest                       | 1 +
 dev-db/mysql/mysql-5.1.73.ebuild            | 4 ++--
 dev-db/mysql/mysql-5.5.37.ebuild            | 7 +++----
 dev-db/mysql/mysql-5.6.17.ebuild            | 4 ++--
 dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index a9d6217..f02a92b 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -12,5 +12,6 @@ DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20130626-0127Z.tar.bz2 1476503 SHA256 a3c791b7b95fe170c4071feed11699146fc8f9de6a9f2ffa67214c2e50644b4f SHA512 4ee19cb5960ba24f2db16e7c5b647d1b7bb9fadbc73bbd8125bbac7e926c569a9a585a4d1d92b851ea6653d9c15eeb00f1592880f104520dc040e5af19943ac7 WHIRLPOOL 739f5762fa24b0feb40848ddb83f2ed95fb650933920b3d9e55c5e90f907d4ac74dfb00e4b9189cda8f9af4317478f3132daf789d7c91196827f645dd3e37d61
 DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a
+DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256 75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512 d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a WHIRLPOOL 2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf

diff --git a/dev-db/mysql/mysql-5.1.73.ebuild b/dev-db/mysql/mysql-5.1.73.ebuild
index 721099e..5f56565 100644
--- a/dev-db/mysql/mysql-5.1.73.ebuild
+++ b/dev-db/mysql/mysql-5.1.73.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.1.69.ebuild,v 1.1 2013/06/02 19:48:56 robbat2 Exp $
 
 EAPI="4"
 
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20140424-1043Z"
 # PBXT
 PBXT_VERSION='1.0.11-6-pre-ga'
 # XtraDB

diff --git a/dev-db/mysql/mysql-5.5.37.ebuild b/dev-db/mysql/mysql-5.5.37.ebuild
index ebb6824..588b399 100644
--- a/dev-db/mysql/mysql-5.5.37.ebuild
+++ b/dev-db/mysql/mysql-5.5.37.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20140424-1043Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 
@@ -94,9 +94,8 @@ src_test() {
 		# +mysqltest: Could not open connection 'default': 2026 SSL connection
 		#  error: error:00000001:lib(0):func(0):reason(1)
 		#
-                # main.mysql_tzinfo_to_sql_symlink
-                # fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-                #
+		# main.mysql_tzinfo_to_sql_symlink
+		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
 
 		for t in main.mysql_client_test \
 			binlog.binlog_statement_insert_delayed main.information_schema \

diff --git a/dev-db/mysql/mysql-5.6.17.ebuild b/dev-db/mysql/mysql-5.6.17.ebuild
index 3de9afc..31cdc81 100644
--- a/dev-db/mysql/mysql-5.6.17.ebuild
+++ b/dev-db/mysql/mysql-5.6.17.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
 
 EAPI="4"
 
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20140424-1043Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 

diff --git a/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild b/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
index 9026213..0f5f3f0 100644
--- a/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
+++ b/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20140424-1043Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 
@@ -83,9 +83,9 @@ src_test() {
 		# main.mysql_client_test:
 		# segfaults at random under Portage only, suspect resource limits.
 		#
-                # main.mysql_tzinfo_to_sql_symlink
-                # fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-                #
+		# main.mysql_tzinfo_to_sql_symlink
+		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
+
 		for t in main.mysql_client_test \
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwin funcs_1.is_columns_mysql \


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-04-26 19:10 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-04-26 19:10 UTC (permalink / raw
  To: gentoo-commits

commit:     624a43abfdb96d04ab29e097b8a126be3282a42f
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Fri Apr 25 01:58:12 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Sat Apr 26 19:10:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=624a43ab

[mysql] Drop old

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

---
 dev-db/mysql/mysql-5.1.70.ebuild | 265 ---------------------------------------
 dev-db/mysql/mysql-5.5.35.ebuild | 129 -------------------
 2 files changed, 394 deletions(-)

diff --git a/dev-db/mysql/mysql-5.1.70.ebuild b/dev-db/mysql/mysql-5.1.70.ebuild
deleted file mode 100644
index 06c804b..0000000
--- a/dev-db/mysql/mysql-5.1.70.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.69.ebuild,v 1.1 2013/06/02 19:48:56 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20130626-0127Z"
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-# Build type
-BUILD="autotools"
-
-inherit toolchain-funcs mysql-v2
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-EPATCH_EXCLUDE=''
-
-# Most of these are in the eclass
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-		>=sys-devel/libtool-2.2.10"
-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
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
-
-# Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	# 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"
-
-	emake check || die "make check failed"
-	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"
-		cd "${S}"
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus_unit
-		local retstatus_ns
-		local retstatus_ps
-		local t
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# archive_gis really sucks a lot, but it's only relevant for the
-		# USE=extraengines case
-		case ${PV} in
-			5.0.42)
-			mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42"
-			;;
-
-			5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
-			[ "$(tc-endian)" == "big" ] && \
-			mysql-v2_disable_test \
-				"archive_gis" \
-				"Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only"
-			;;
-		esac
-
-		# This was a slight testcase breakage when the read_only security issue
-		# was fixed.
-		case ${PV} in
-			5.0.54|5.0.51*)
-			mysql-v2_disable_test \
-				"read_only" \
-				"Broken in 5.0.51-54, output in wrong order"
-			;;
-		esac
-
-		# Ditto to read_only
-		[ "${PV}" == "5.0.51a" ] && \
-			mysql-v2_disable_test \
-				"view" \
-				"Broken in 5.0.51, output in wrong order"
-
-		# x86-specific, OOM issue with some subselects on low memory servers
-		[ "${PV}" == "5.0.54" ] && \
-			[ "${ARCH/x86}" != "${ARCH}" ] && \
-			mysql-v2_disable_test \
-				"subselect" \
-				"Testcase needs tuning on x86 for oom condition"
-
-		# Broke with the YaSSL security issue that didn't affect Gentoo.
-		[ "${PV}" == "5.0.56" ] && \
-			for t in openssl_1 rpl_openssl rpl_ssl ssl \
-				ssl_8k_key ssl_compress ssl_connect ; do \
-				mysql-v2_disable_test \
-					"$t" \
-					"OpenSSL tests broken on 5.0.56"
-			done
-
-		# New test was broken in first time
-		# Upstream bug 41066
-		# http://bugs.mysql.com/bug.php?id=41066
-		[ "${PV}" == "5.0.72" ] && \
-			mysql-v2_disable_test \
-				"status2" \
-				"Broken in 5.0.72, new test is broken, upstream bug #41066"
-
-		# The entire 5.0 series has pre-generated SSL certificates, they have
-		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
-		# The certs really SHOULD be generated for the tests, so that they are
-		# not expiring like this. We cannot do so ourselves as the tests look
-		# closely as the cert path data, and we do not have the CA key to regen
-		# ourselves. Alternatively, upstream should generate them with at least
-		# 50-year validity.
-		#
-		# Known expiry points:
-		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
-		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
-		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
-		#
-		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
-		# expired/invalid.
-		case ${PV} in
-			5.0.*|5.1.*|5.4.*|5.5.*)
-				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
-					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
-					mysql-v2_disable_test \
-						"$t" \
-						"These OpenSSL tests break due to expired certificates"
-				done
-			;;
-		esac
-
-		# These are also failing in MySQL 5.1 for now, and are believed to be
-		# false positives:
-		#
-		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
-		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.not_partition:
-		# Failure reason unknown at this time, must resolve before package.mask
-		# removal FIXME
-		case ${PV} in
-			5.1.*|5.4.*|5.5.*)
-			for t in main.mysql_client_test main.mysql_comments \
-				main.mysql_upgrade  \
-				main.information_schema \
-				main.not_partition funcs_1.is_columns_mysql \
-				funcs_1.is_tables_mysql funcs_1.is_triggers; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-			done
-			;;
-		esac
-
-		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
-		# These tests are picking up a 'connect-timeout' config from somewhere,
-		# which is not valid, and since it does not have 'loose-' in front of
-		# it, it's causing a failure
-		case ${PV} in
-			5.1.5*|5.4.*|5.5.*|6*)
-			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
-				mysql-v2_disable_test  "$t" \
-					"False positives in Gentoo: connect-timeout"
-			done
-			;;
-		esac
-
-		use profiling && use community \
-		|| mysql-v2_disable_test main.profiling \
-			"Profiling test needs profiling support"
-
-		if [ "${PN}" == "mariadb" ]; then
-			for t in \
-				parts.part_supported_sql_func_ndb \
-				parts.partition_auto_increment_ndb ; do
-					mysql-v2_disable_test $t "ndb not supported in mariadb"
-			done
-		fi
-
-		# This fail with XtraDB in place of normal InnoDB
-		# TODO: test if they are broken with the rest of the Percona patches
-		if xtradb_patch_available && use xtradb ; then
-			for t in main.innodb innodb.innodb_bug51378 \
-				main.information_schema_db main.mysqlshow \
-				main.innodb-autoinc main.innodb_bug21704 \
-				main.innodb_bug44369 main.innodb_bug46000 \
-				main.index_merge_innodb \
-				innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \
-				innodb.innodb-autoinc innodb.innodb-autoinc-44030 \
-				innodb.innodb_bug21704 innodb.innodb_bug44369 \
-				innodb.innodb_bug46000 innodb.innodb_bug48024 \
-				innodb.innodb_bug49164 innodb.innodb_bug51920 \
-				innodb.innodb_bug54044 \
-				; do
-					mysql-v2_disable_test $t "tests broken in xtradb"
-			done
-		fi
-
-		if ! use extraengine ; then
-			# bug 332565
-			for t in main.range ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
-			done
-			# bug 401673
-			for t in federated.federated_plugin ; do
-				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# create directories because mysqladmin might make out of order
-		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
-		# We run the test protocols seperately
-		emake test-unit
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
-		retstatus_ns=$?
-		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
-		retstatus_ps=$?
-		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		# TODO:
-		# When upstream enables the pr and nr testsuites, we need those as well.
-
-		# 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_ns -eq 0 ]] || failures="${failures} test-ns"
-		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
-		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/mysql/mysql-5.5.35.ebuild b/dev-db/mysql/mysql-5.5.35.ebuild
deleted file mode 100644
index 2df1496..0000000
--- a/dev-db/mysql/mysql-5.5.35.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.32.ebuild,v 1.1 2013/06/06 17:06:28 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20140121-1138Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
-		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
-}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-05-14  2:31 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-05-14  2:31 UTC (permalink / raw
  To: gentoo-commits

commit:     10756484ab65af0f215a58903ba9ef8208675521
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed May 14 01:53:00 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed May 14 02:30:57 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=10756484

[mysql] Revision bump to fix bug 510078

---
 dev-db/mysql/Manifest                                        | 5 +----
 dev-db/mysql/{mysql-5.1.73.ebuild => mysql-5.1.73-r1.ebuild} | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 405e6bb..5c4a1f0 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,18 +1,15 @@
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
-DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.35.tar.gz 21707804 SHA256 46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512 ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede WHIRLPOOL 800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
 DIST mysql-5.5.37.tar.gz 21718944 SHA256 da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512 858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad WHIRLPOOL 13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
 DIST mysql-5.6.17.tar.gz 32862539 SHA256 f8ed0a1abd60ed9152b71a027446825d8686c48e99def6e74e0d12d24e9a1d9b SHA512 36b9c9456f2ccc0efd26fb4b4ce4280849e9915f06c19183700345aa39a72cf94d940ef98b113c14de0bfea27e3f4135e6f163635c8a14629a9f58c8c12845d7 WHIRLPOOL 47f86e99ad5d192d2a82e48e174dbe0fbd8f941b6b1494ab6a9621967aac77bb0579b2bb2e11c432d2856df7ab34d4cde9a4266923a0499577e035ac699bbc9f
 DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
-DIST mysql-extras-20130626-0127Z.tar.bz2 1476503 SHA256 a3c791b7b95fe170c4071feed11699146fc8f9de6a9f2ffa67214c2e50644b4f SHA512 4ee19cb5960ba24f2db16e7c5b647d1b7bb9fadbc73bbd8125bbac7e926c569a9a585a4d1d92b851ea6653d9c15eeb00f1592880f104520dc040e5af19943ac7 WHIRLPOOL 739f5762fa24b0feb40848ddb83f2ed95fb650933920b3d9e55c5e90f907d4ac74dfb00e4b9189cda8f9af4317478f3132daf789d7c91196827f645dd3e37d61
-DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a
 DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256 75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512 d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a WHIRLPOOL 2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
 DIST mysql-extras-20140426-0232Z.tar.bz2 1493717 SHA256 84002593102ba35383a7f30c7c03af95750edc7a1bfd0ac6219bdfb4771725e0 SHA512 a7c1d603a5aba7996746ee59699091d30f7422e825815b8198ca4a1068df8e0814cf3de3f8608c034d4b1c145bc3dbc93f73cc8a22ae68a0e1bce5eef9afc3bc WHIRLPOOL 241ba3d4f6c9a2a6f7ca672b1902c5829939fe643f192f7ec41e1ffd9134e137ad6729504300034bad310d21ef60366df9451757250be83900783d9cfca010d7
+DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf

diff --git a/dev-db/mysql/mysql-5.1.73.ebuild b/dev-db/mysql/mysql-5.1.73-r1.ebuild
similarity index 98%
rename from dev-db/mysql/mysql-5.1.73.ebuild
rename to dev-db/mysql/mysql-5.1.73-r1.ebuild
index 5f56565..ec4cc0b 100644
--- a/dev-db/mysql/mysql-5.1.73.ebuild
+++ b/dev-db/mysql/mysql-5.1.73-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.1.69.ebuild,v 1.1 2013/06/02 19:48:56 robbat2 Exp $
+# $Header: $
 
 EAPI="4"
 
-MY_EXTRAS_VER="20140424-1043Z"
+MY_EXTRAS_VER="20140514-0124Z"
 # PBXT
 PBXT_VERSION='1.0.11-6-pre-ga'
 # XtraDB


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-06-08 20:08 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-06-08 20:08 UTC (permalink / raw
  To: gentoo-commits

commit:     444a0473fe52f76304ebe4b4a8c3b889057d58cc
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  8 20:08:13 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Sun Jun  8 20:08:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=444a0473

[mysql] Version bump on 5.5 and 5.6 series

---
 dev-db/mysql/Manifest                              |   4 +-
 ...{mysql-5.5.37-r1.ebuild => mysql-5.5.38.ebuild} |   2 +-
 dev-db/mysql/mysql-5.6.17.ebuild                   | 129 ---------------------
 ...{mysql-5.6.17-r1.ebuild => mysql-5.6.19.ebuild} |   4 +-
 4 files changed, 5 insertions(+), 134 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5c4a1f0..fcfce95 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,8 +2,8 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.37.tar.gz 21718944 SHA256 da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512 858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad WHIRLPOOL 13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
-DIST mysql-5.6.17.tar.gz 32862539 SHA256 f8ed0a1abd60ed9152b71a027446825d8686c48e99def6e74e0d12d24e9a1d9b SHA512 36b9c9456f2ccc0efd26fb4b4ce4280849e9915f06c19183700345aa39a72cf94d940ef98b113c14de0bfea27e3f4135e6f163635c8a14629a9f58c8c12845d7 WHIRLPOOL 47f86e99ad5d192d2a82e48e174dbe0fbd8f941b6b1494ab6a9621967aac77bb0579b2bb2e11c432d2856df7ab34d4cde9a4266923a0499577e035ac699bbc9f
+DIST mysql-5.5.38.tar.gz 21739681 SHA256 61869633924ab243a3f676cf6b8feb66b672e3c07566a7190f0f1bb8c9b2fc81 SHA512 7abaac21028d984a72b7f6a43e82fab38833094b6271fa6faadae09c6be23eba0df2151f32f8d94345d6b0bb172325995acab0185a9a85af8fd475bef4cee231 WHIRLPOOL b1cb459790446423f510ab3ee18d39d178e438e03020faf0de1a7574d99c2648915f2c0e7503aa0288e128395880706a010fecc534a08cfd50cd49ecf7f67205
+DIST mysql-5.6.19.tar.gz 32879525 SHA256 80ef3aae048866539380e7e330d9f1034f0ee50ddfb9c662570132492678b09f SHA512 1c60c7eaa2975d9812492a1e46f550a820c62f818a60adcbd3fc7b500799d28825e8ca17d678696ae0dcdf4df4e447fd93c64d2788dac97a6a40f3258e7d86b3 WHIRLPOOL b2b353b65c84734c58f51063a4b4d5e6af33759f12bf169571d2ba6ed686d3fd37cc9018594839ca74f3180fc3982aebf2bbbdf599904e9a3cd9605c9d93b9f4
 DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551

diff --git a/dev-db/mysql/mysql-5.5.37-r1.ebuild b/dev-db/mysql/mysql-5.5.38.ebuild
similarity index 99%
rename from dev-db/mysql/mysql-5.5.37-r1.ebuild
rename to dev-db/mysql/mysql-5.5.38.ebuild
index d694efa..34db4b5 100644
--- a/dev-db/mysql/mysql-5.5.37-r1.ebuild
+++ b/dev-db/mysql/mysql-5.5.38.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 
 MY_EXTRAS_VER="20140426-0232Z"
 MY_PV="${PV//_alpha_pre/-m}"

diff --git a/dev-db/mysql/mysql-5.6.17.ebuild b/dev-db/mysql/mysql-5.6.17.ebuild
deleted file mode 100644
index 31cdc81..0000000
--- a/dev-db/mysql/mysql-5.6.17.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20140424-1043Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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"
-
-# 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 mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/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/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.mysql_tzinfo_to_sql_symlink
-		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-		#
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwinfuncs_1.is_triggers funcs_1.is_tables_mysql \
-			funcs_1.is_columns_mysql binlog.binlog_mysqlbinlog_filter \
-			perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
-			mysqld--help-notwin main.mysql_tzinfo_to_sql_symlink; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--suite-timeout=5000
-		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/mysql/mysql-5.6.17-r1.ebuild b/dev-db/mysql/mysql-5.6.19.ebuild
similarity index 97%
rename from dev-db/mysql/mysql-5.6.17-r1.ebuild
rename to dev-db/mysql/mysql-5.6.19.ebuild
index 2248ed0..41d9120 100644
--- a/dev-db/mysql/mysql-5.6.17-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.19.ebuild
@@ -1,8 +1,8 @@
 # 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.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+# $Header: $
 
-EAPI="4"
+EAPI="5"
 
 MY_EXTRAS_VER="live"
 MY_PV="${PV//_alpha_pre/-m}"


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-07-29 20:24 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2014-07-29 20:24 UTC (permalink / raw
  To: gentoo-commits

commit:     59765152379c53eca4d1e318b190db25a3b6bfa0
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Tue Jul 29 18:03:00 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 29 18:03:00 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=59765152

Sync ebuilds from tree.

Package-Manager: portage-2.2.10

---
 dev-db/mysql/ChangeLog              | 6 +++++-
 dev-db/mysql/mysql-4.0.27-r1.ebuild | 2 +-
 dev-db/mysql/mysql-4.1.22-r1.ebuild | 2 +-
 dev-db/mysql/mysql-5.1.73-r1.ebuild | 2 +-
 dev-db/mysql/mysql-5.5.38-r1.ebuild | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 202fea8..598c858 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for dev-db/mysql
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.27-r1.ebuild,
+  mysql-4.1.22-r1.ebuild, mysql-5.1.73-r1.ebuild, mysql-5.5.38-r1.ebuild:
+  Sync ebuilds from tree.
+
 *mysql-5.1.73 (12 Dec 2013)
 
   12 Dec 2013; Brian Evans <grknight@tuffmail.com> +mysql-5.1.73.ebuild:

diff --git a/dev-db/mysql/mysql-4.0.27-r1.ebuild b/dev-db/mysql/mysql-4.0.27-r1.ebuild
index dc82246..3f25929 100644
--- a/dev-db/mysql/mysql-4.0.27-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.27-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-4.0.27-r1.ebuild,v 1.6 2008/12/14 20:17:13 klausman Exp $
 

diff --git a/dev-db/mysql/mysql-4.1.22-r1.ebuild b/dev-db/mysql/mysql-4.1.22-r1.ebuild
index d5fa1b6..1e09a21 100644
--- a/dev-db/mysql/mysql-4.1.22-r1.ebuild
+++ b/dev-db/mysql/mysql-4.1.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-4.1.22-r1.ebuild,v 1.8 2011/07/08 10:05:34 ssuominen Exp $
 

diff --git a/dev-db/mysql/mysql-5.1.73-r1.ebuild b/dev-db/mysql/mysql-5.1.73-r1.ebuild
index ec4cc0b..1789b29 100644
--- a/dev-db/mysql/mysql-5.1.73-r1.ebuild
+++ b/dev-db/mysql/mysql-5.1.73-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.73-r1.ebuild,v 1.1 2014/05/14 01:47:05 grknight Exp $
 
 EAPI="4"
 

diff --git a/dev-db/mysql/mysql-5.5.38-r1.ebuild b/dev-db/mysql/mysql-5.5.38-r1.ebuild
index f6b0ad2..cbfa27f 100644
--- a/dev-db/mysql/mysql-5.5.38-r1.ebuild
+++ b/dev-db/mysql/mysql-5.5.38-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.38-r1.ebuild,v 1.1 2014/07/29 03:24:47 grknight Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ IUSE="$IUSE"
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-08-01 19:57 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-08-01 19:57 UTC (permalink / raw
  To: gentoo-commits

commit:     506f94556eac3a2df533f4c29f63d5b1f8437e0f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  1 19:57:18 2014 +0000
Commit:     Brian Evans <grknight <AT> tuffmail <DOT> com>
CommitDate: Fri Aug  1 19:57:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=506f9455

[mysql] Version bumps.  5.6.20 needs tests run first before commit to tree

---
 dev-db/mysql/Manifest                                        | 7 +++----
 dev-db/mysql/{mysql-5.5.38-r1.ebuild => mysql-5.5.39.ebuild} | 4 ++--
 dev-db/mysql/{mysql-5.6.19.ebuild => mysql-5.6.20.ebuild}    | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index f8ccd2b..d8678fb 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,15 +2,14 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.38.tar.gz 21739681 SHA256 61869633924ab243a3f676cf6b8feb66b672e3c07566a7190f0f1bb8c9b2fc81 SHA512 7abaac21028d984a72b7f6a43e82fab38833094b6271fa6faadae09c6be23eba0df2151f32f8d94345d6b0bb172325995acab0185a9a85af8fd475bef4cee231 WHIRLPOOL b1cb459790446423f510ab3ee18d39d178e438e03020faf0de1a7574d99c2648915f2c0e7503aa0288e128395880706a010fecc534a08cfd50cd49ecf7f67205
-DIST mysql-5.6.19.tar.gz 32879525 SHA256 80ef3aae048866539380e7e330d9f1034f0ee50ddfb9c662570132492678b09f SHA512 1c60c7eaa2975d9812492a1e46f550a820c62f818a60adcbd3fc7b500799d28825e8ca17d678696ae0dcdf4df4e447fd93c64d2788dac97a6a40f3258e7d86b3 WHIRLPOOL b2b353b65c84734c58f51063a4b4d5e6af33759f12bf169571d2ba6ed686d3fd37cc9018594839ca74f3180fc3982aebf2bbbdf599904e9a3cd9605c9d93b9f4
+DIST mysql-5.5.39.tar.gz 21713567 SHA256 1893a00b034da6ff4159b81348388dc65eca6c3ae12962bd446e9b3d105b4862 SHA512 1da29663720d94cc5cf5d76f7bc1534c638ed66f78533f9eac167575acd772498d409b931a9dffd7f863a0c2e4659fc4d4687ae363ca427ad49b8558c8747aa8 WHIRLPOOL be884564757bfe579cdd39161732d42abe041102162d2edd6c441214df2f3928a3e58d8e9acd7d06b96cb59be0fa28e05d8ae7cab0a6de4779ae9c79912f4d59
+DIST mysql-5.6.20.tar.gz 32979820 SHA256 4fc33b1a3ddb75fbc1cc30d0aba1af3d94c4fbe608048d46e34f39a8281a064d SHA512 c4bcc2a209616a38c04a4679cc7a76b354f0d7d3dda860b82b9cdb4746f897aa5c8204a440e1c65f55d81b2ac526b205dd0ba28786ba21778cc068efd71403ac WHIRLPOOL 09cd264b098401cdde9e57fd1dcf90387cb6e5f24b874c220914c6afcc4f03bccec9cb4e83a9694e740ac0ea4e5cf37297fab60fdf4d6342df71b7e4f75590f8
 DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256 75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512 d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a WHIRLPOOL 2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
-DIST mysql-extras-20140729-0112Z.tar.bz2 1494826 SHA256 a6963f853ae168ba04a2fea18bda6e44d6691c4be328496ba9f6818638f7cccf SHA512 72506cb13b8b0880b9bf8846b0f6e95f22a69760d5c4d48b6d346b2ed1b2c98c718c8833222457dbf832455846d6829e4e66f582b5c29fb3f6226df62086fad6 WHIRLPOOL 40245685a26acfddb882318813c689db28f4dc67e905c3e3b06e8e37c76d2d2aaa28a57cf5f147f1744bbc780731344e0e4c4ecc3069beb210f232eaab01f714
-DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256 28363c7ba1893677911451e7f05402a31afc0ed0a48ea1b7cf1915ae1be81e20 SHA512 d90e104b3e73af5589eb32ddbcf9098ad9d69898b55d4d662ebc9578f0281e87fef6b5adb6cdc33fa19a04bf066e01121ead2e6a2bffa0d44ffc10b895392a1c WHIRLPOOL 531a9e08f9231bfcd758bbe8d5b6d5968bd2cfce9c70bc8c15517f497606322da7cffbecd77a0cabd837c3c0ba4f2381a569d583f2fa5ecb14e95a367a93ee11
+DIST mysql-extras-20140801-1950Z.tar.bz2 1494288 SHA256 a656486a7383d656ed33e279f41bb4384feba082cad3af48376ce9e1f395fe0b SHA512 b2c29c3d7c1ddacfa170125c9df0aaf65eac9f6112244b1deea97a46a3a2f2bd3eb069808e7b2ee3261d609b32046363830ba4ebcc7e74f449189a91145a6f9c WHIRLPOOL 41befc03a7382516849ecaecc1d02be7d00c47be489b97ce68c320c3aa8979c8f941525efe230d97ad2d1a85936a1e4d6c93d96a3f45930991a938e5f0fdab87
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf

diff --git a/dev-db/mysql/mysql-5.5.38-r1.ebuild b/dev-db/mysql/mysql-5.5.39.ebuild
similarity index 96%
rename from dev-db/mysql/mysql-5.5.38-r1.ebuild
rename to dev-db/mysql/mysql-5.5.39.ebuild
index cbfa27f..e2b912c 100644
--- a/dev-db/mysql/mysql-5.5.38-r1.ebuild
+++ b/dev-db/mysql/mysql-5.5.39.ebuild
@@ -1,10 +1,10 @@
 # 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.38-r1.ebuild,v 1.1 2014/07/29 03:24:47 grknight Exp $
+# $Header: $
 
 EAPI="5"
 
-MY_EXTRAS_VER="20140729-0112Z"
+MY_EXTRAS_VER="20140801-1950Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 

diff --git a/dev-db/mysql/mysql-5.6.19.ebuild b/dev-db/mysql/mysql-5.6.20.ebuild
similarity index 99%
rename from dev-db/mysql/mysql-5.6.19.ebuild
rename to dev-db/mysql/mysql-5.6.20.ebuild
index 48fa53c..eda0822 100644
--- a/dev-db/mysql/mysql-5.6.19.ebuild
+++ b/dev-db/mysql/mysql-5.6.20.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-MY_EXTRAS_VER="20140729-2200Z"
+MY_EXTRAS_VER="20140801-1950Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-08-02  1:12 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-08-02  1:12 UTC (permalink / raw
  To: gentoo-commits

commit:     fb1789f121355b607f0674d159f21bfd073ae7d3
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  2 01:11:54 2014 +0000
Commit:     Brian Evans <grknight <AT> tuffmail <DOT> com>
CommitDate: Sat Aug  2 01:11:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=fb1789f1

[mysql] sync ebuild headers and keywords

---
 dev-db/mysql/mysql-5.5.39.ebuild |  2 +-
 dev-db/mysql/mysql-5.6.20.ebuild | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-db/mysql/mysql-5.5.39.ebuild b/dev-db/mysql/mysql-5.5.39.ebuild
index e2b912c..3503ffe 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: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.1 2014/08/02 00:23:41 grknight Exp $
 
 EAPI="5"
 

diff --git a/dev-db/mysql/mysql-5.6.20.ebuild b/dev-db/mysql/mysql-5.6.20.ebuild
index eda0822..b7dcee4 100644
--- a/dev-db/mysql/mysql-5.6.20.ebuild
+++ b/dev-db/mysql/mysql-5.6.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.20.ebuild,v 1.1 2014/08/02 00:23:41 grknight Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ IUSE="$IUSE"
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
@@ -83,15 +83,15 @@ src_test() {
 		# main.mysql_client_test:
 		# segfaults at random under Portage only, suspect resource limits.
 		#
-		# main.mysql_tzinfo_to_sql_symlink
-		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-		#
+		# rpl.rpl_plugin_load
+		# fails due to included file not listed in expected result
+		# appears to be poor planning
 		for t in main.mysql_client_test \
 			binlog.binlog_statement_insert_delayed main.information_schema \
 			main.mysqld--help-notwinfuncs_1.is_triggers funcs_1.is_tables_mysql \
 			funcs_1.is_columns_mysql binlog.binlog_mysqlbinlog_filter \
 			perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
-			mysqld--help-notwin main.mysql_tzinfo_to_sql_symlink \
+			mysqld--help-notwin rpl.rpl_plugin_load \
 			funcs_1.is_triggers ; do
 				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-08-03 21:43 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2014-08-03 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     b422a11caac72b43bab5a87af88c31af049fb818
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Sun Aug  3 21:38:13 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Aug  3 21:38:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b422a11c

Sync.

Package-Manager: portage-2.2.10

---
 dev-db/mysql/ChangeLog           | 3 +++
 dev-db/mysql/mysql-5.6.20.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index fe4986a..2c5a6df 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   03 Aug 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-5.6.20.ebuild:
+  Sync.
+
+  03 Aug 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-5.6.20.ebuild:
   Missed test while merging.
 
   29 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.27-r1.ebuild,

diff --git a/dev-db/mysql/mysql-5.6.20.ebuild b/dev-db/mysql/mysql-5.6.20.ebuild
index f94a606..fb27ea6 100644
--- a/dev-db/mysql/mysql-5.6.20.ebuild
+++ b/dev-db/mysql/mysql-5.6.20.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.20.ebuild,v 1.2 2014/08/03 20:54:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.20.ebuild,v 1.3 2014/08/03 21:01:05 robbat2 Exp $
 
 EAPI="5"
 


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-08-03 21:43 Robin H. Johnson
  0 siblings, 0 replies; 124+ messages in thread
From: Robin H. Johnson @ 2014-08-03 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     8e3008eb9f3574d8c7013f5dccd5b9e24938ce0b
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Sun Aug  3 21:00:08 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Aug  3 21:00:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8e3008eb

Missed test while merging.

Package-Manager: portage-2.2.10

---
 dev-db/mysql/ChangeLog           | 3 +++
 dev-db/mysql/mysql-5.6.20.ebuild | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 598c858..fe4986a 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Aug 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-5.6.20.ebuild:
+  Missed test while merging.
+
   29 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.27-r1.ebuild,
   mysql-4.1.22-r1.ebuild, mysql-5.1.73-r1.ebuild, mysql-5.5.38-r1.ebuild:
   Sync ebuilds from tree.

diff --git a/dev-db/mysql/mysql-5.6.20.ebuild b/dev-db/mysql/mysql-5.6.20.ebuild
index edb543a..f94a606 100644
--- a/dev-db/mysql/mysql-5.6.20.ebuild
+++ b/dev-db/mysql/mysql-5.6.20.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.20.ebuild,v 1.1 2014/08/02 00:23:41 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.20.ebuild,v 1.2 2014/08/03 20:54:08 robbat2 Exp $
 
 EAPI="5"
 
@@ -87,6 +87,9 @@ src_test() {
 		# main.mysql_tzinfo_to_sql_symlink
 		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
 		#
+		# rpl.rpl_plugin_load
+		# fails due to included file not listed in expected result
+		# appears to be poor planning
 		for t in \
 			binlog.binlog_mysqlbinlog_filter \
 			binlog.binlog_statement_insert_delayed \
@@ -94,12 +97,13 @@ src_test() {
 			funcs_1.is_tables_mysql \
 			funcs_1.is_triggers \
 			main.information_schema \
-			main.mysqld--help-notwinfuncs_1.is_triggers \
 			main.mysql_client_test \
+			main.mysqld--help-notwinfuncs_1.is_triggers \
 			main.mysql_tzinfo_to_sql_symlink \
 			mysqld--help-notwin \
 			perfschema.binlog_edge_mix \
 			perfschema.binlog_edge_stmt \
+			rpl.rpl_plugin_load \
 		; do
 				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-09-24  3:24 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-09-24  3:24 UTC (permalink / raw
  To: gentoo-commits

commit:     8336087376f5c453ecacb9891ec47e096e73707c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 24 03:24:08 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Sep 24 03:24:08 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=83360873

[mysql] Version bumps for 5.5.40 and 5.6.21

---
 dev-db/mysql/Manifest                              |  2 +
 .../{mysql-5.6.20.ebuild => mysql-5.5.40.ebuild}   | 45 ++++++----------------
 .../{mysql-5.6.20.ebuild => mysql-5.6.21.ebuild}   | 32 ++++++++-------
 3 files changed, 29 insertions(+), 50 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index d8678fb..9bc9cc4 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,7 +3,9 @@ DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434ac
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.39.tar.gz 21713567 SHA256 1893a00b034da6ff4159b81348388dc65eca6c3ae12962bd446e9b3d105b4862 SHA512 1da29663720d94cc5cf5d76f7bc1534c638ed66f78533f9eac167575acd772498d409b931a9dffd7f863a0c2e4659fc4d4687ae363ca427ad49b8558c8747aa8 WHIRLPOOL be884564757bfe579cdd39161732d42abe041102162d2edd6c441214df2f3928a3e58d8e9acd7d06b96cb59be0fa28e05d8ae7cab0a6de4779ae9c79912f4d59
+DIST mysql-5.5.40.tar.gz 21727672 SHA256 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960 SHA512 9adc3c0ace48a84ee87fb7e1f36b2f3d3e5cd95d50ca3012828c7fb33b723cfbfdf85760a30ea38c719a90cc449613747e974768b7f0b070dc346e05a5c418b3 WHIRLPOOL e8a5e8c6e4b816d935fd5368a9f38eaea23b1269c39e6ceed54c13bfaa85586ea81d1c4386f4f3d520cdb3d16b023afa3dab763629e388bc0759389e0eddec43
 DIST mysql-5.6.20.tar.gz 32979820 SHA256 4fc33b1a3ddb75fbc1cc30d0aba1af3d94c4fbe608048d46e34f39a8281a064d SHA512 c4bcc2a209616a38c04a4679cc7a76b354f0d7d3dda860b82b9cdb4746f897aa5c8204a440e1c65f55d81b2ac526b205dd0ba28786ba21778cc068efd71403ac WHIRLPOOL 09cd264b098401cdde9e57fd1dcf90387cb6e5f24b874c220914c6afcc4f03bccec9cb4e83a9694e740ac0ea4e5cf37297fab60fdf4d6342df71b7e4f75590f8
+DIST mysql-5.6.21.tar.gz 33009070 SHA256 ea4daf6a8f4b1a9c62e416249a08fbdcbf686667d738004ef82044def96feb7c SHA512 0a15c30d17324eb123d7953a2564fea43a3d288dfe098dc419096c40101f8ee2fe201dab1a4860158b72a259040cab7a45073576a1a24879b1e1dc9990c190bd WHIRLPOOL 8a00b0fe04df901aece356f979e29b47c4361fa5e14ec76c36e0bc43da4049de265b547f9a27b6c948d5989c04a784c6dca547e86cc380bbb57d477b614f8e31
 DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551

diff --git a/dev-db/mysql/mysql-5.6.20.ebuild b/dev-db/mysql/mysql-5.5.40.ebuild
similarity index 72%
copy from dev-db/mysql/mysql-5.6.20.ebuild
copy to dev-db/mysql/mysql-5.5.40.ebuild
index fb27ea6..f31e03c 100644
--- a/dev-db/mysql/mysql-5.6.20.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.6.20.ebuild,v 1.3 2014/08/03 21:01:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.1 2014/09/24 02:36:50 grknight Exp $
 
 EAPI="5"
 
@@ -63,6 +63,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}
@@ -70,53 +74,28 @@ src_test() {
 		# create symlink for the tests to find mysql_tzinfo_to_sql
 		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
 
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
+		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:
 		#
 		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
+		# main.mysqld--help-notwin
 		# fails due to USE=-latin1 / utf8 default
 		#
 		# main.mysql_client_test:
 		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.mysql_tzinfo_to_sql_symlink
-		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwinfuncs_1.is_triggers \
-			main.mysql_tzinfo_to_sql_symlink \
-			mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-		; do
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin ; do
 				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		# Run mysql tests
 		pushd "${TESTDIR}"
 
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
 		# run mysql-test tests
 		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--suite-timeout=5000 --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"

diff --git a/dev-db/mysql/mysql-5.6.20.ebuild b/dev-db/mysql/mysql-5.6.21.ebuild
similarity index 86%
rename from dev-db/mysql/mysql-5.6.20.ebuild
rename to dev-db/mysql/mysql-5.6.21.ebuild
index fb27ea6..a5b45fa 100644
--- a/dev-db/mysql/mysql-5.6.20.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.20.ebuild,v 1.3 2014/08/03 21:01:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.21.ebuild,v 1.1 2014/09/24 03:20:19 grknight Exp $
 
 EAPI="5"
 
@@ -8,16 +8,10 @@ MY_EXTRAS_VER="20140801-1950Z"
 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-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
@@ -36,7 +30,12 @@ RDEPEND="${RDEPEND}"
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mysql-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 +62,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}
@@ -74,7 +77,7 @@ src_test() {
 		# false positives:
 		#
 		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
+		# funcs_1.is_triggers funcs_1.is_tables_mysql,
 		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
 		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
 		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
@@ -84,9 +87,6 @@ src_test() {
 		# main.mysql_client_test:
 		# segfaults at random under Portage only, suspect resource limits.
 		#
-		# main.mysql_tzinfo_to_sql_symlink
-		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-		#
 		# rpl.rpl_plugin_load
 		# fails due to included file not listed in expected result
 		# appears to be poor planning
@@ -99,13 +99,11 @@ src_test() {
 			main.information_schema \
 			main.mysql_client_test \
 			main.mysqld--help-notwinfuncs_1.is_triggers \
-			main.mysql_tzinfo_to_sql_symlink \
-			mysqld--help-notwin \
 			perfschema.binlog_edge_mix \
 			perfschema.binlog_edge_stmt \
 			rpl.rpl_plugin_load \
 		; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		# Run mysql tests
@@ -116,7 +114,7 @@ src_test() {
 
 		# run mysql-test tests
 		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--suite-timeout=5000 --parallel=auto
+			--suite-timeout=5000
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-12-03 21:40 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-12-03 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     c52240e89a1d7af2bf3c086747fe32f17c9f433a
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  3 21:40:03 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Dec  3 21:40:03 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c52240e8

[mysql] Version bump.  Needs testing before committing to gx86

---
 dev-db/mysql/Manifest                              |   8 +-
 dev-db/mysql/mysql-5.5.39.ebuild                   | 135 --------------------
 .../{mysql-5.5.40.ebuild => mysql-5.5.41.ebuild}   |   6 +-
 dev-db/mysql/mysql-5.6.21.ebuild                   | 140 ---------------------
 ...{mysql-5.6.21-r1.ebuild => mysql-5.6.22.ebuild} |  17 ++-
 5 files changed, 18 insertions(+), 288 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 0f53d49..9bb6c27 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,9 +2,8 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.39.tar.gz 21713567 SHA256 1893a00b034da6ff4159b81348388dc65eca6c3ae12962bd446e9b3d105b4862 SHA512 1da29663720d94cc5cf5d76f7bc1534c638ed66f78533f9eac167575acd772498d409b931a9dffd7f863a0c2e4659fc4d4687ae363ca427ad49b8558c8747aa8 WHIRLPOOL be884564757bfe579cdd39161732d42abe041102162d2edd6c441214df2f3928a3e58d8e9acd7d06b96cb59be0fa28e05d8ae7cab0a6de4779ae9c79912f4d59
-DIST mysql-5.5.40.tar.gz 21727672 SHA256 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960 SHA512 9adc3c0ace48a84ee87fb7e1f36b2f3d3e5cd95d50ca3012828c7fb33b723cfbfdf85760a30ea38c719a90cc449613747e974768b7f0b070dc346e05a5c418b3 WHIRLPOOL e8a5e8c6e4b816d935fd5368a9f38eaea23b1269c39e6ceed54c13bfaa85586ea81d1c4386f4f3d520cdb3d16b023afa3dab763629e388bc0759389e0eddec43
-DIST mysql-5.6.21.tar.gz 33009070 SHA256 ea4daf6a8f4b1a9c62e416249a08fbdcbf686667d738004ef82044def96feb7c SHA512 0a15c30d17324eb123d7953a2564fea43a3d288dfe098dc419096c40101f8ee2fe201dab1a4860158b72a259040cab7a45073576a1a24879b1e1dc9990c190bd WHIRLPOOL 8a00b0fe04df901aece356f979e29b47c4361fa5e14ec76c36e0bc43da4049de265b547f9a27b6c948d5989c04a784c6dca547e86cc380bbb57d477b614f8e31
+DIST mysql-5.5.41.tar.gz 21768300 SHA256 ec642fc5be5ea03b24a0c5189204675fb3794dee772314ace650623c1c994844 SHA512 4c4e9658175e1f5de218527045d7d43f880a16c0069725e6c9f9873538b5ede39e4024fc9983e42c04d59a7bece7a3505d154eabbaa230c0dd456c46ff4982b8 WHIRLPOOL 37ef2709b489db62beb745d3b39bf6e6ebe97e98ea6f5630fa4a74cf865d048a222b19995eff71c6146b15cb28f4dd7edf1567ddf6dbef606f964149dad37ccc
+DIST mysql-5.6.22.tar.gz 33115516 SHA256 c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6 SHA512 11b4a1b34ff4bb63d7cdbc1134947772b2c30715b1e3d3fba2ed9c5102f0bde14a708561b2d463014eca64f5fb415a54a0e1656d48f118b403e66d83b98f5b82 WHIRLPOOL a85db903ce1bc542ac87d832d2d0d84cd4c8a75f5feae435d0a9c5ce26f792b7d30c0113764315e8df0e74a899ee2c02233e3b193b42a98daf46ed52b5ccc9cd
 DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
 DIST mysql-5.7.5-m15.tar.gz 46527024 SHA256 8f45d0a66952101a2c8490e833024f758aa4c6dce9ebc125ab8b472a72edc781 SHA512 301398a73d0c30afb2fe5628bde0e01d83daaacc2a0bedd323a4860680ae412f36fdd6a7146a78aeb0b0fa1d4394f5c5557ea2c891833c18179fb2490a35c339 WHIRLPOOL 32e181732b7c7a37fd830b9df92736e669decab681f6e9dbf0c6894d9b925dd09538cba4ddf3754e9e3c10baf0840aca9bf57332cdf15751555edbaff573027d
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
@@ -12,7 +11,6 @@ DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256 75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512 d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a WHIRLPOOL 2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
-DIST mysql-extras-20140801-1950Z.tar.bz2 1494288 SHA256 a656486a7383d656ed33e279f41bb4384feba082cad3af48376ce9e1f395fe0b SHA512 b2c29c3d7c1ddacfa170125c9df0aaf65eac9f6112244b1deea97a46a3a2f2bd3eb069808e7b2ee3261d609b32046363830ba4ebcc7e74f449189a91145a6f9c WHIRLPOOL 41befc03a7382516849ecaecc1d02be7d00c47be489b97ce68c320c3aa8979c8f941525efe230d97ad2d1a85936a1e4d6c93d96a3f45930991a938e5f0fdab87
-DIST mysql-extras-20141019-1948Z.tar.bz2 1494569 SHA256 9a2ced701ef613e2a41c9a1fc550d9004d04f52cbfc06bb634ba9284d7a1c0ea SHA512 c9e3f3a447f010be0563b9d9ee2937d32c5334b04a883218eb6c14af41f9de635c3c0c44128959793e8a12ca3b26b2415777a13aced7c3812ab2c6d21ade6799 WHIRLPOOL bc0c73ca86d59d18a76a047a920fc2f64d2b3246e6b64838127d26c5c55cb3fc1ce8833656f5eadba72ef651e1f6c3e75700f776a1205ab33ab6ee0064851b86
+DIST mysql-extras-20141203-2105Z.tar.bz2 1494317 SHA256 cec9fe6873563840e9520ec9f02d06e1262748847be45a9aeaaa841f7ed4b4dc SHA512 958b410d7905d7911a69288ba9a9ebb1d80ff38281506e18400652b15895eb3926d9679fd245a54f4f7cdb688ed9940f21b1b4634239dbc1a1db19ac3918921a WHIRLPOOL baf70684826f393723bd3877813d9415c15b847ffd71757535a12106bff4fcf343cca37e166d45be06eca0425d249dc600bc752ab5e27e02ead3897952ceb169
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf

diff --git a/dev-db/mysql/mysql-5.5.39.ebuild b/dev-db/mysql/mysql-5.5.39.ebuild
deleted file mode 100644
index 0158c94..0000000
--- a/dev-db/mysql/mysql-5.5.39.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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.12 2014/10/06 17:35:01 grknight Exp $
-
-EAPI="5"
-
-MY_EXTRAS_VER="20140801-1950Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# 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-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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 mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		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/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-		# main.mysql_tzinfo_to_sql_symlink
-		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 mysql_tzinfo_to_sql_symlink ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30
-		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/mysql/mysql-5.5.40.ebuild b/dev-db/mysql/mysql-5.5.41.ebuild
similarity index 91%
rename from dev-db/mysql/mysql-5.5.40.ebuild
rename to dev-db/mysql/mysql-5.5.41.ebuild
index aee682a..8503727 100644
--- a/dev-db/mysql/mysql-5.5.40.ebuild
+++ b/dev-db/mysql/mysql-5.5.41.ebuild
@@ -1,10 +1,10 @@
 # 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.12 2014/10/18 14:09:03 ago Exp $
+# $Header: $
 
 EAPI="5"
 
-MY_EXTRAS_VER="20140801-1950Z"
+MY_EXTRAS_VER="20141203-2105Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 
@@ -19,7 +19,7 @@ IUSE="$IUSE"
 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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''

diff --git a/dev-db/mysql/mysql-5.6.21.ebuild b/dev-db/mysql/mysql-5.6.21.ebuild
deleted file mode 100644
index 8607c75..0000000
--- a/dev-db/mysql/mysql-5.6.21.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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.3 2014/10/06 17:35:01 grknight Exp $
-
-EAPI="5"
-
-MY_EXTRAS_VER="20140801-1950Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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 mysql-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="${CMAKE_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}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwinfuncs_1.is_triggers \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000
-		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/mysql/mysql-5.6.21-r1.ebuild b/dev-db/mysql/mysql-5.6.22.ebuild
similarity index 92%
rename from dev-db/mysql/mysql-5.6.21-r1.ebuild
rename to dev-db/mysql/mysql-5.6.22.ebuild
index 6cfa933..ebf4d7d 100644
--- a/dev-db/mysql/mysql-5.6.21-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.22.ebuild
@@ -1,10 +1,10 @@
 # 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-r1.ebuild,v 1.1 2014/10/19 20:27:12 grknight Exp $
+# $Header: $
 
 EAPI="5"
 
-MY_EXTRAS_VER="20141019-1948Z"
+MY_EXTRAS_VER="20141203-2105Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 
@@ -37,7 +37,7 @@ multilib_src_test() {
 		return 0;
 	fi
 
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local TESTDIR="${BUILD_DIR}/mysql-test"
 	local retstatus_unit
 	local retstatus_tests
 
@@ -71,7 +71,7 @@ multilib_src_test() {
 		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/"
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
 
 		# These are failing in MySQL 5.5/5.6 for now and are believed to be
 		# false positives:
@@ -98,7 +98,7 @@ multilib_src_test() {
 			funcs_1.is_triggers \
 			main.information_schema \
 			main.mysql_client_test \
-			main.mysqld--help-notwinfuncs_1.is_triggers \
+			main.mysqld--help-notwin \
 			perfschema.binlog_edge_mix \
 			perfschema.binlog_edge_stmt \
 			rpl.rpl_plugin_load \
@@ -106,6 +106,13 @@ multilib_src_test() {
 				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
 		done
 
+		if ! use extraengine ; then
+			# bug 401673, 530766
+			for t in federated.federated_plugin ; do
+				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
 		# Run mysql tests
 		pushd "${TESTDIR}"
 


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2014-12-04  1:29 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2014-12-04  1:29 UTC (permalink / raw
  To: gentoo-commits

commit:     e838686ed9ec89d4824129d967a70048744dab94
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  4 01:29:25 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Dec  4 01:29:25 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e838686e

Sync from tree

---
 dev-db/mysql/mysql-5.5.41.ebuild | 6 +++---
 dev-db/mysql/mysql-5.6.22.ebuild | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-db/mysql/mysql-5.5.41.ebuild b/dev-db/mysql/mysql-5.5.41.ebuild
index 8503727..8cd0996 100644
--- a/dev-db/mysql/mysql-5.5.41.ebuild
+++ b/dev-db/mysql/mysql-5.5.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.41.ebuild,v 1.1 2014/12/04 01:27:44 grknight Exp $
 
 EAPI="5"
 
@@ -38,7 +38,7 @@ RDEPEND="${RDEPEND}"
 # digest clean package
 src_test() {
 
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local TESTDIR="${BUILD_DIR}/mysql-test"
 	local retstatus_unit
 	local retstatus_tests
 
@@ -72,7 +72,7 @@ src_test() {
 		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/"
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
 
 		# These are failing in MySQL 5.5 for now and are believed to be
 		# false positives:

diff --git a/dev-db/mysql/mysql-5.6.22.ebuild b/dev-db/mysql/mysql-5.6.22.ebuild
index ebf4d7d..515f0c1 100644
--- a/dev-db/mysql/mysql-5.6.22.ebuild
+++ b/dev-db/mysql/mysql-5.6.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.22.ebuild,v 1.1 2014/12/04 01:27:44 grknight Exp $
 
 EAPI="5"
 


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2015-02-06 14:10 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2015-02-06 14:10 UTC (permalink / raw
  To: gentoo-commits

commit:     f64d76047a9c1d9fae42861540ce7769bd09b45f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  4 18:31:56 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Feb  4 18:31:56 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f64d7604

Version bump

---
 dev-db/mysql/Manifest            |   2 +
 dev-db/mysql/mysql-5.6.23.ebuild | 153 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 155 insertions(+)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 9bb6c27..2a6873e 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -4,6 +4,7 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde1539575
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.41.tar.gz 21768300 SHA256 ec642fc5be5ea03b24a0c5189204675fb3794dee772314ace650623c1c994844 SHA512 4c4e9658175e1f5de218527045d7d43f880a16c0069725e6c9f9873538b5ede39e4024fc9983e42c04d59a7bece7a3505d154eabbaa230c0dd456c46ff4982b8 WHIRLPOOL 37ef2709b489db62beb745d3b39bf6e6ebe97e98ea6f5630fa4a74cf865d048a222b19995eff71c6146b15cb28f4dd7edf1567ddf6dbef606f964149dad37ccc
 DIST mysql-5.6.22.tar.gz 33115516 SHA256 c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6 SHA512 11b4a1b34ff4bb63d7cdbc1134947772b2c30715b1e3d3fba2ed9c5102f0bde14a708561b2d463014eca64f5fb415a54a0e1656d48f118b403e66d83b98f5b82 WHIRLPOOL a85db903ce1bc542ac87d832d2d0d84cd4c8a75f5feae435d0a9c5ce26f792b7d30c0113764315e8df0e74a899ee2c02233e3b193b42a98daf46ed52b5ccc9cd
+DIST mysql-5.6.23.tar.gz 33115859 SHA256 3bd21af06a9304e372daba41fa5612bb54ac1bc05a4349b3160d0cda972ac098 SHA512 ac648550934ac6ddcb0cbc93731c2d913288dff53ada665f161d14c46e16f2a8ad8d09106a2718e8412f859ea9cf038d04e4c6f5fbea6e4424f9373ddccf4da3 WHIRLPOOL ae315cc7a60408cc050a7941b3c16cf169554b5a67fe4ce23a9b183cb551168f2ec3817e28cf0aa24b619ddc1b638bd926cfcf9c2e0755b2acbf1b82548b2581
 DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
 DIST mysql-5.7.5-m15.tar.gz 46527024 SHA256 8f45d0a66952101a2c8490e833024f758aa4c6dce9ebc125ab8b472a72edc781 SHA512 301398a73d0c30afb2fe5628bde0e01d83daaacc2a0bedd323a4860680ae412f36fdd6a7146a78aeb0b0fa1d4394f5c5557ea2c891833c18179fb2490a35c339 WHIRLPOOL 32e181732b7c7a37fd830b9df92736e669decab681f6e9dbf0c6894d9b925dd09538cba4ddf3754e9e3c10baf0840aca9bf57332cdf15751555edbaff573027d
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
@@ -12,5 +13,6 @@ DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b07
 DIST mysql-extras-20140424-1043Z.tar.bz2 1493352 SHA256 75b8de752f11559e3900fd96c3ca6113bd083a69b08bd66b2c24bacfb9b8b88c SHA512 d1324efd88be8b9e7b6ef61cfaf497b51a02e0825a8cb240ee6869b0875f4f18170d9952567c995f73f9a57b98a91f6e91878bc9efe87f99e0b20053ce5a376a WHIRLPOOL 2982ca88af7926f7fbcf68e0f3f289c0b33e8c929de3db1679c4debf8fa1f74e809361e968ac94949dce405d4a4e494ebdf447e9208eb9cfc39c5677454ed77e
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
 DIST mysql-extras-20141203-2105Z.tar.bz2 1494317 SHA256 cec9fe6873563840e9520ec9f02d06e1262748847be45a9aeaaa841f7ed4b4dc SHA512 958b410d7905d7911a69288ba9a9ebb1d80ff38281506e18400652b15895eb3926d9679fd245a54f4f7cdb688ed9940f21b1b4634239dbc1a1db19ac3918921a WHIRLPOOL baf70684826f393723bd3877813d9415c15b847ffd71757535a12106bff4fcf343cca37e166d45be06eca0425d249dc600bc752ab5e27e02ead3897952ceb169
+DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf

diff --git a/dev-db/mysql/mysql-5.6.23.ebuild b/dev-db/mysql/mysql-5.6.23.ebuild
new file mode 100644
index 0000000..f2e172e
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.23.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.23.ebuild,v 1.1 2015/02/04 18:30:31 grknight Exp $
+
+EAPI="5"
+
+MY_EXTRAS_VER="20150127-1351Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# 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 mysql-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}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5/5.6 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# funcs_1.is_triggers funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
+		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# rpl.rpl_plugin_load
+		# fails due to included file not listed in expected result
+		# appears to be poor planning
+		#
+		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_statement_insert_delayed \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			main.information_schema \
+			main.mysql_client_test \
+			main.mysqld--help-notwin \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+			rpl.rpl_plugin_load \
+			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+		; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		if ! use extraengine ; then
+			# bug 401673, 530766
+			for t in federated.federated_plugin ; do
+				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# Set file limits higher so tests run
+		ulimit -n 3000
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--suite-timeout=5000
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2015-02-06 14:10 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2015-02-06 14:10 UTC (permalink / raw
  To: gentoo-commits

commit:     00c6b716805aad678411fd8c279a54bd79d44386
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  6 14:10:26 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Feb  6 14:10:26 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=00c6b716

[mysql] Version bump

---
 dev-db/mysql/Manifest            |   1 +
 dev-db/mysql/mysql-5.5.42.ebuild | 126 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 2a6873e..4358e3f 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,6 +3,7 @@ DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434ac
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.41.tar.gz 21768300 SHA256 ec642fc5be5ea03b24a0c5189204675fb3794dee772314ace650623c1c994844 SHA512 4c4e9658175e1f5de218527045d7d43f880a16c0069725e6c9f9873538b5ede39e4024fc9983e42c04d59a7bece7a3505d154eabbaa230c0dd456c46ff4982b8 WHIRLPOOL 37ef2709b489db62beb745d3b39bf6e6ebe97e98ea6f5630fa4a74cf865d048a222b19995eff71c6146b15cb28f4dd7edf1567ddf6dbef606f964149dad37ccc
+DIST mysql-5.5.42.tar.gz 21795431 SHA256 887b12676be4893fa833e4a585c6c8b0c0f18dee30ba7d22cfe860cd85bfc74a SHA512 d02ea8d5a3f0309c2bd17241c9feca81ef35acc2595bfcb134fe436cd6a3d9ddbac5daa71ac75d953518ec2dc5791f953663648f52727bb37cb378d6663f2e0a WHIRLPOOL 43accca23246c353d0ce4e8d0807c4f4f80ba00e2a1d08a97fec5e59abed1278c34c2cda010894af9f98e866aee2a33614c8bf4fe4b840d45ff1d88993a1ff9e
 DIST mysql-5.6.22.tar.gz 33115516 SHA256 c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6 SHA512 11b4a1b34ff4bb63d7cdbc1134947772b2c30715b1e3d3fba2ed9c5102f0bde14a708561b2d463014eca64f5fb415a54a0e1656d48f118b403e66d83b98f5b82 WHIRLPOOL a85db903ce1bc542ac87d832d2d0d84cd4c8a75f5feae435d0a9c5ce26f792b7d30c0113764315e8df0e74a899ee2c02233e3b193b42a98daf46ed52b5ccc9cd
 DIST mysql-5.6.23.tar.gz 33115859 SHA256 3bd21af06a9304e372daba41fa5612bb54ac1bc05a4349b3160d0cda972ac098 SHA512 ac648550934ac6ddcb0cbc93731c2d913288dff53ada665f161d14c46e16f2a8ad8d09106a2718e8412f859ea9cf038d04e4c6f5fbea6e4424f9373ddccf4da3 WHIRLPOOL ae315cc7a60408cc050a7941b3c16cf169554b5a67fe4ce23a9b183cb551168f2ec3817e28cf0aa24b619ddc1b638bd926cfcf9c2e0755b2acbf1b82548b2581
 DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c

diff --git a/dev-db/mysql/mysql-5.5.42.ebuild b/dev-db/mysql/mysql-5.5.42.ebuild
new file mode 100644
index 0000000..9240420
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.42.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.42.ebuild,v 1.1 2015/02/05 16:03:20 grknight Exp $
+
+EAPI="5"
+
+MY_EXTRAS_VER="20150127-1351Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# 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 mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	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}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--testcase-timeout=30
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2015-03-10 20:52 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2015-03-10 20:52 UTC (permalink / raw
  To: gentoo-commits

commit:     96c075487969c09e980447c71173c611e78b9b71
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 10 20:52:33 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Mar 10 20:52:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=96c07548

[dev-db/mysql] Version bump for 5.7.6;  Needs more testing

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

 dev-db/mysql/ChangeLog                      |   8 +-
 dev-db/mysql/Manifest                       |  22 ++++-
 dev-db/mysql/mysql-5.7.6_alpha_pre16.ebuild | 126 ++++++++++++++++++++++++++++
 3 files changed, 154 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 2c5a6df..f42c1ed 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-db/mysql
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-5.7.6_alpha_pre16 (10 Mar 2015)
+
+  10 Mar 2015; Brian Evans <grknight@gentoo.org>
+  +mysql-5.7.6_alpha_pre16.ebuild:
+  [dev-db/mysql] Version bump for 5.7.6;  Needs more testing
+
   03 Aug 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-5.6.20.ebuild:
   Sync.
 

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 4358e3f..1c29916 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,13 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.41.tar.gz 21768300 SHA256 ec642fc5be5ea03b24a0c5189204675fb3794dee772314ace650623c1c994844 SHA512 4c4e9658175e1f5de218527045d7d43f880a16c0069725e6c9f9873538b5ede39e4024fc9983e42c04d59a7bece7a3505d154eabbaa230c0dd456c46ff4982b8 WHIRLPOOL 37ef2709b489db62beb745d3b39bf6e6ebe97e98ea6f5630fa4a74cf865d048a222b19995eff71c6146b15cb28f4dd7edf1567ddf6dbef606f964149dad37ccc
 DIST mysql-5.5.42.tar.gz 21795431 SHA256 887b12676be4893fa833e4a585c6c8b0c0f18dee30ba7d22cfe860cd85bfc74a SHA512 d02ea8d5a3f0309c2bd17241c9feca81ef35acc2595bfcb134fe436cd6a3d9ddbac5daa71ac75d953518ec2dc5791f953663648f52727bb37cb378d6663f2e0a WHIRLPOOL 43accca23246c353d0ce4e8d0807c4f4f80ba00e2a1d08a97fec5e59abed1278c34c2cda010894af9f98e866aee2a33614c8bf4fe4b840d45ff1d88993a1ff9e
 DIST mysql-5.6.22.tar.gz 33115516 SHA256 c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6 SHA512 11b4a1b34ff4bb63d7cdbc1134947772b2c30715b1e3d3fba2ed9c5102f0bde14a708561b2d463014eca64f5fb415a54a0e1656d48f118b403e66d83b98f5b82 WHIRLPOOL a85db903ce1bc542ac87d832d2d0d84cd4c8a75f5feae435d0a9c5ce26f792b7d30c0113764315e8df0e74a899ee2c02233e3b193b42a98daf46ed52b5ccc9cd
 DIST mysql-5.6.23.tar.gz 33115859 SHA256 3bd21af06a9304e372daba41fa5612bb54ac1bc05a4349b3160d0cda972ac098 SHA512 ac648550934ac6ddcb0cbc93731c2d913288dff53ada665f161d14c46e16f2a8ad8d09106a2718e8412f859ea9cf038d04e4c6f5fbea6e4424f9373ddccf4da3 WHIRLPOOL ae315cc7a60408cc050a7941b3c16cf169554b5a67fe4ce23a9b183cb551168f2ec3817e28cf0aa24b619ddc1b638bd926cfcf9c2e0755b2acbf1b82548b2581
 DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
 DIST mysql-5.7.5-m15.tar.gz 46527024 SHA256 8f45d0a66952101a2c8490e833024f758aa4c6dce9ebc125ab8b472a72edc781 SHA512 301398a73d0c30afb2fe5628bde0e01d83daaacc2a0bedd323a4860680ae412f36fdd6a7146a78aeb0b0fa1d4394f5c5557ea2c891833c18179fb2490a35c339 WHIRLPOOL 32e181732b7c7a37fd830b9df92736e669decab681f6e9dbf0c6894d9b925dd09538cba4ddf3754e9e3c10baf0840aca9bf57332cdf15751555edbaff573027d
+DIST mysql-5.7.6-m16.tar.gz 47330399 SHA256 bba884fba916eea6cdaa3880af826c6f3b516f80319f35b1be6d4d3ea9c9d42d SHA512 1b5cfedc4e18dcc6ca722e6339f593e5d26131c3e582b9b3bc8905bb9e005feb9f5af620e85cf6e57bead07ee306fe490a2d04e7c8e2fa349d947c718776c57e WHIRLPOOL 48a804191825ad2927f99c540d477a71d5882f65e14fafa94cfaffc320a752f81e613ff2b05ebc61a16474e3466b037d79f0ddf57b7ba2afc3a5d9ae7ad345cc
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
@@ -17,3 +20,20 @@ DIST mysql-extras-20141203-2105Z.tar.bz2 1494317 SHA256 cec9fe6873563840e9520ec9
 DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQIcBAEBCAAGBQJU/1mQAAoJENH3ge/59KO2nAcP/ipr5WdCofzAFus/4J0f+zt9
+W6t1edy9qmVKf/wH3p3dweh4MNhYI7Jx1zL5adsUZUUISST1ALuKtZklmFeyZiQB
+Z0MY297vJaAhyQ6bhPzHTaDlrJCUR4N4IHYvctOPUxtEF4NfSrUc/40ox2xeCSU5
+b+VWyLJLN1TLwDWKj80o79ccQeabvx1uETlgmLJCgN52Pzl1lFGWTlisxEx/jW2j
+z1oheDSdEo4/1Qn2BnfsbLEg1oKwBMjX5qq9ZsgVXyfoH7UPEiqSRXGqWWBiS4kh
+Hj/uWZvm0jBW0XpMA1VlqfW3yBhDgNSltnkfu0y5f32YP0wQdHFb0nNzOP9O2N3C
+7cix8M/pnPWDhCAnwtfkFRHo2vDs30Lx5hIytWpdzSu3mLqSGpBZeZx52PitPsMh
+/5UjX70aQ3KuUUG5oDkyK67oQTN8Z4oa2IxcfZGfqyZY69Liyn6Drb3YuxZiM1pH
+lw+jQxMVe//f+zGNhNAANb0DjZnb9k0jG9UxdLDM6wEwkl4b7u66V6acF9TAn1Ee
+7Cibstx/oIDYjD3HeL0Iw9Rz7LUGeBfa0ql96jMwhWZSYs/isabCaqL2Noyfv2WC
+60UBMV6VHQhJIfReFj+DxaOwYXGWu+IOV5Scvah+j9ygGGh9B11axZJSXyNgtqz6
+/D11L5VNFUbFxmFwJkHa
+=DuCC
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.7.6_alpha_pre16.ebuild b/dev-db/mysql/mysql-5.7.6_alpha_pre16.ebuild
new file mode 100644
index 0000000..6d930d2
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.6_alpha_pre16.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+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"
+
+# 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 mysql-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	local TESTDIR="${CMAKE_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))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/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/"
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin, funcs_1.is_columns_mysql, 
+		# funcs_1.is_tables_mysql, funcs_1.is_triggers,
+		# binlog.binlog_mysqlbinlog_filter, perfschema.binlog_edge_mix,
+		# perfschema.binlog_edge_stmt
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.mysql_tzinfo_to_sql_symlink
+		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql funcs_1.is_triggers \
+			binlog.binlog_mysqlbinlog_filter perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt main.mysql_tzinfo_to_sql_symlink ; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# Set file limits higher so tests run
+		ulimit -n 3000
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
+			--suite-timeout=5000 --testcase-timeout=30
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2015-05-29 18:05 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2015-05-29 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     ff84938e4e476983c09c2ab26585e0752fc7bb63
Author:     layman <layman <AT> localhost>
AuthorDate: Fri May 29 18:07:13 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri May 29 18:07:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ff84938e

Version bump; needs test run

 dev-db/mysql/Manifest                              |   5 +-
 .../{mysql-5.5.42.ebuild => mysql-5.5.44.ebuild}   |   2 +-
 dev-db/mysql/mysql-5.6.22.ebuild                   | 153 ---------------------
 dev-db/mysql/mysql-5.6.23.ebuild                   | 153 ---------------------
 4 files changed, 2 insertions(+), 311 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index a119e74..b000248 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,10 +2,8 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.42.tar.gz 21795431 SHA256 887b12676be4893fa833e4a585c6c8b0c0f18dee30ba7d22cfe860cd85bfc74a SHA512 d02ea8d5a3f0309c2bd17241c9feca81ef35acc2595bfcb134fe436cd6a3d9ddbac5daa71ac75d953518ec2dc5791f953663648f52727bb37cb378d6663f2e0a WHIRLPOOL 43accca23246c353d0ce4e8d0807c4f4f80ba00e2a1d08a97fec5e59abed1278c34c2cda010894af9f98e866aee2a33614c8bf4fe4b840d45ff1d88993a1ff9e
 DIST mysql-5.5.43.tar.gz 21784417 SHA256 43d3df79e5c839a2749deb6e056a4589e49c903e09034c18653ec56e6e4774cd SHA512 b14506ac45fa4c69a6b7bbf64b2c3e59516b1fca3e0cce97e9712c09abecbf50071a60fc09f3e009d8591bf0d7352f28479cd8cb5445008ee146735897878b52 WHIRLPOOL 93e77045f4c4b188db38912ec6709bfee1ee0e0b7bf4cadfbeede8aef701d1f0cbf238e02d82013ceabe13df952e4f08c75bd3ad7504790677dc5a5ec4844fea
-DIST mysql-5.6.22.tar.gz 33115516 SHA256 c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6 SHA512 11b4a1b34ff4bb63d7cdbc1134947772b2c30715b1e3d3fba2ed9c5102f0bde14a708561b2d463014eca64f5fb415a54a0e1656d48f118b403e66d83b98f5b82 WHIRLPOOL a85db903ce1bc542ac87d832d2d0d84cd4c8a75f5feae435d0a9c5ce26f792b7d30c0113764315e8df0e74a899ee2c02233e3b193b42a98daf46ed52b5ccc9cd
-DIST mysql-5.6.23.tar.gz 33115859 SHA256 3bd21af06a9304e372daba41fa5612bb54ac1bc05a4349b3160d0cda972ac098 SHA512 ac648550934ac6ddcb0cbc93731c2d913288dff53ada665f161d14c46e16f2a8ad8d09106a2718e8412f859ea9cf038d04e4c6f5fbea6e4424f9373ddccf4da3 WHIRLPOOL ae315cc7a60408cc050a7941b3c16cf169554b5a67fe4ce23a9b183cb551168f2ec3817e28cf0aa24b619ddc1b638bd926cfcf9c2e0755b2acbf1b82548b2581
+DIST mysql-5.5.44.tar.gz 21789766 SHA256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de SHA512 05707b96c3e0d39ca103d965640aa1a9461a513f788fc7f2acce4b3933ec578b3d66df53955b0dff1b6c9e5acd98441cfe1df5b3154a1058293babc39c26dad5 WHIRLPOOL 870d9728c78f6732fcd6f95e62833a769c937c96298a39bb023b33a9138552e254d2a3f6285d8f4f0b740de9d7397fa1a0987234a0a4dfa13c787fc068053d78
 DIST mysql-5.6.24.tar.gz 33178592 SHA256 37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb SHA512 cb4c27f67aad02e2120edb9dfaffa623d8ddb5861ee77055553c50cce76cbfe0a1e473e01cef3cf86b6362c719e1db18e69808a0e4e457f879a37297f14b9fd7 WHIRLPOOL 26e51a1c48d04c2f24f8914beb84bcd8122ecc569b922d001c05271c3b7dc3339652272e27169001c762356c6fffa9ba88a6ccd8b2235e41063b5948e1dd2011
 DIST mysql-5.7.6-m16.tar.gz 47330399 SHA256 bba884fba916eea6cdaa3880af826c6f3b516f80319f35b1be6d4d3ea9c9d42d SHA512 1b5cfedc4e18dcc6ca722e6339f593e5d26131c3e582b9b3bc8905bb9e005feb9f5af620e85cf6e57bead07ee306fe490a2d04e7c8e2fa349d947c718776c57e WHIRLPOOL 48a804191825ad2927f99c540d477a71d5882f65e14fafa94cfaffc320a752f81e613ff2b05ebc61a16474e3466b037d79f0ddf57b7ba2afc3a5d9ae7ad345cc
 DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c WHIRLPOOL 29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5
@@ -13,7 +11,6 @@ DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd3
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
-DIST mysql-extras-20141203-2105Z.tar.bz2 1494317 SHA256 cec9fe6873563840e9520ec9f02d06e1262748847be45a9aeaaa841f7ed4b4dc SHA512 958b410d7905d7911a69288ba9a9ebb1d80ff38281506e18400652b15895eb3926d9679fd245a54f4f7cdb688ed9940f21b1b4634239dbc1a1db19ac3918921a WHIRLPOOL baf70684826f393723bd3877813d9415c15b847ffd71757535a12106bff4fcf343cca37e166d45be06eca0425d249dc600bc752ab5e27e02ead3897952ceb169
 DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
 DIST mysql-extras-20150410-1944Z.tar.bz2 1493690 SHA256 e327adf02be4c2bce5121f01d6b139309c72814b8c50a29559dfddee12a0b4e2 SHA512 e2e5345290134e597734514041e413f0633b8078bfddb8b8e7695468ce7341735b732d5bb602ab7aa9a4045d71571b73aac01a5d96687d4fbd380736f5ed650c WHIRLPOOL f65f294905fd1d04e2be79a803b658ed432338501665a75cbe0cc5b3af8abf0615f1f808465c3ca3c7e850b9277f451f5c77b518977f4bee8dc77d6089ff88fb
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962

diff --git a/dev-db/mysql/mysql-5.5.42.ebuild b/dev-db/mysql/mysql-5.5.44.ebuild
similarity index 97%
rename from dev-db/mysql/mysql-5.5.42.ebuild
rename to dev-db/mysql/mysql-5.5.44.ebuild
index 9240420..c1359cb 100644
--- a/dev-db/mysql/mysql-5.5.42.ebuild
+++ b/dev-db/mysql/mysql-5.5.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.42.ebuild,v 1.1 2015/02/05 16:03:20 grknight Exp $
+# $Header: $
 
 EAPI="5"
 

diff --git a/dev-db/mysql/mysql-5.6.22.ebuild b/dev-db/mysql/mysql-5.6.22.ebuild
deleted file mode 100644
index e3fd130..0000000
--- a/dev-db/mysql/mysql-5.6.22.ebuild
+++ /dev/null
@@ -1,153 +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/mysql/mysql-5.6.22.ebuild,v 1.11 2015/02/16 10:27:41 ago Exp $
-
-EAPI="5"
-
-MY_EXTRAS_VER="20141203-2105Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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 mysql-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}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		if ! use extraengine ; then
-			# bug 401673, 530766
-			for t in federated.federated_plugin ; do
-				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000
-		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/mysql/mysql-5.6.23.ebuild b/dev-db/mysql/mysql-5.6.23.ebuild
deleted file mode 100644
index f2e172e..0000000
--- a/dev-db/mysql/mysql-5.6.23.ebuild
+++ /dev/null
@@ -1,153 +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/mysql/mysql-5.6.23.ebuild,v 1.1 2015/02/04 18:30:31 grknight Exp $
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150127-1351Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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 mysql-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}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		if ! use extraengine ; then
-			# bug 401673, 530766
-			for t in federated.federated_plugin ; do
-				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000
-		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
-}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2015-05-30  1:23 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2015-05-30  1:23 UTC (permalink / raw
  To: gentoo-commits

commit:     af151b000809fd3c4072f71cafe33e4a551a140f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat May 30 01:23:14 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat May 30 01:23:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=af151b00

Sync with portage headers

 dev-db/mysql/mysql-5.5.44.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-db/mysql/mysql-5.5.44.ebuild b/dev-db/mysql/mysql-5.5.44.ebuild
index c1359cb..37dc732 100644
--- a/dev-db/mysql/mysql-5.5.44.ebuild
+++ b/dev-db/mysql/mysql-5.5.44.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/mysql/mysql-5.5.44.ebuild,v 1.1 2015/05/30 00:49:59 grknight Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
@@ -32,7 +32,7 @@ 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 mysql-X.X.XX.ebuild \
 # digest clean package


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2015-06-03 17:18 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2015-06-03 17:18 UTC (permalink / raw
  To: gentoo-commits

commit:     19d929a863f776b07bdfd3157cf3df3ab3757a22
Author:     layman <layman <AT> localhost>
AuthorDate: Wed Jun  3 17:19:42 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jun  3 17:19:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=19d929a8

Version bump for mysql-5.6.25

 dev-db/mysql/Manifest            |   1 +
 dev-db/mysql/mysql-5.6.25.ebuild | 153 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 154 insertions(+)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index b000248..2033863 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,6 +5,7 @@ DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c30
 DIST mysql-5.5.43.tar.gz 21784417 SHA256 43d3df79e5c839a2749deb6e056a4589e49c903e09034c18653ec56e6e4774cd SHA512 b14506ac45fa4c69a6b7bbf64b2c3e59516b1fca3e0cce97e9712c09abecbf50071a60fc09f3e009d8591bf0d7352f28479cd8cb5445008ee146735897878b52 WHIRLPOOL 93e77045f4c4b188db38912ec6709bfee1ee0e0b7bf4cadfbeede8aef701d1f0cbf238e02d82013ceabe13df952e4f08c75bd3ad7504790677dc5a5ec4844fea
 DIST mysql-5.5.44.tar.gz 21789766 SHA256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de SHA512 05707b96c3e0d39ca103d965640aa1a9461a513f788fc7f2acce4b3933ec578b3d66df53955b0dff1b6c9e5acd98441cfe1df5b3154a1058293babc39c26dad5 WHIRLPOOL 870d9728c78f6732fcd6f95e62833a769c937c96298a39bb023b33a9138552e254d2a3f6285d8f4f0b740de9d7397fa1a0987234a0a4dfa13c787fc068053d78
 DIST mysql-5.6.24.tar.gz 33178592 SHA256 37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb SHA512 cb4c27f67aad02e2120edb9dfaffa623d8ddb5861ee77055553c50cce76cbfe0a1e473e01cef3cf86b6362c719e1db18e69808a0e4e457f879a37297f14b9fd7 WHIRLPOOL 26e51a1c48d04c2f24f8914beb84bcd8122ecc569b922d001c05271c3b7dc3339652272e27169001c762356c6fffa9ba88a6ccd8b2235e41063b5948e1dd2011
+DIST mysql-5.6.25.tar.gz 33203321 SHA256 15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd SHA512 cd15180281b015a29d5a9f12bafd5878ecb8ca68ada2e0d016916d77f606592b4b9a8e4a3728fc0d90326bcdda26fdd371fc731ca524f06bd06cc3b19ae93243 WHIRLPOOL 68932bcbec0e58aade1c00fe00651ecac1003e80e5cd29298c23a79190df76390c7f16a29fcb5bff9ad63e721f53978d5d727a0ae9c5df0eb97a002a4c3e4194
 DIST mysql-5.7.6-m16.tar.gz 47330399 SHA256 bba884fba916eea6cdaa3880af826c6f3b516f80319f35b1be6d4d3ea9c9d42d SHA512 1b5cfedc4e18dcc6ca722e6339f593e5d26131c3e582b9b3bc8905bb9e005feb9f5af620e85cf6e57bead07ee306fe490a2d04e7c8e2fa349d947c718776c57e WHIRLPOOL 48a804191825ad2927f99c540d477a71d5882f65e14fafa94cfaffc320a752f81e613ff2b05ebc61a16474e3466b037d79f0ddf57b7ba2afc3a5d9ae7ad345cc
 DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c WHIRLPOOL 29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec

diff --git a/dev-db/mysql/mysql-5.6.25.ebuild b/dev-db/mysql/mysql-5.6.25.ebuild
new file mode 100644
index 0000000..731106a
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.25.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.25.ebuild,v 1.1 2015/06/01 16:18:23 grknight Exp $
+
+EAPI="5"
+
+MY_EXTRAS_VER="20150410-1944Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# 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 mysql-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}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5/5.6 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# funcs_1.is_triggers funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
+		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# rpl.rpl_plugin_load
+		# fails due to included file not listed in expected result
+		# appears to be poor planning
+		#
+		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_statement_insert_delayed \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			main.information_schema \
+			main.mysql_client_test \
+			main.mysqld--help-notwin \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+			rpl.rpl_plugin_load \
+			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+		; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		if ! use extraengine ; then
+			# bug 401673, 530766
+			for t in federated.federated_plugin ; do
+				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# Set file limits higher so tests run
+		ulimit -n 3000
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--suite-timeout=5000
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2015-07-29 19:02 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2015-07-29 19:02 UTC (permalink / raw
  To: gentoo-commits

commit:     7bd56a5d442876cf0e7de3c7c7f258a87a2fd245
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 19:06:07 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 19:06:07 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=7bd56a5d

Version bump for 5.5 series

 dev-db/mysql/Manifest                                     |  3 ++-
 dev-db/mysql/{mysql-5.5.43.ebuild => mysql-5.5.45.ebuild} | 10 +++++-----
 dev-db/mysql/mysql-5.6.25-r1.ebuild                       |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 6fa4fba..8f2737c 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,8 +2,8 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.43.tar.gz 21784417 SHA256 43d3df79e5c839a2749deb6e056a4589e49c903e09034c18653ec56e6e4774cd SHA512 b14506ac45fa4c69a6b7bbf64b2c3e59516b1fca3e0cce97e9712c09abecbf50071a60fc09f3e009d8591bf0d7352f28479cd8cb5445008ee146735897878b52 WHIRLPOOL 93e77045f4c4b188db38912ec6709bfee1ee0e0b7bf4cadfbeede8aef701d1f0cbf238e02d82013ceabe13df952e4f08c75bd3ad7504790677dc5a5ec4844fea
 DIST mysql-5.5.44.tar.gz 21789766 SHA256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de SHA512 05707b96c3e0d39ca103d965640aa1a9461a513f788fc7f2acce4b3933ec578b3d66df53955b0dff1b6c9e5acd98441cfe1df5b3154a1058293babc39c26dad5 WHIRLPOOL 870d9728c78f6732fcd6f95e62833a769c937c96298a39bb023b33a9138552e254d2a3f6285d8f4f0b740de9d7397fa1a0987234a0a4dfa13c787fc068053d78
+DIST mysql-5.5.45.tar.gz 21832364 SHA256 744efd3c39265b5fdeebd25f58ecb34a6eb06e02d9ec2febd3164942f2c89332 SHA512 1c8ddf294232b106562537d6e9b4a3956dd1a290562f313d311f2bbe09f1cb95c28e7e9a4c92a1fcc91a394514bc1190d185b1134003a9f6183ecc2a06d618e8 WHIRLPOOL 3daed09edfc1ca7a0ae379b876e061c2318755fdd14be9630b7c5311985e91ea46cf0e0b1eab98c758cc2809d5d562fcfd2f22022100051746343e147f3d4ebc
 DIST mysql-5.6.24.tar.gz 33178592 SHA256 37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb SHA512 cb4c27f67aad02e2120edb9dfaffa623d8ddb5861ee77055553c50cce76cbfe0a1e473e01cef3cf86b6362c719e1db18e69808a0e4e457f879a37297f14b9fd7 WHIRLPOOL 26e51a1c48d04c2f24f8914beb84bcd8122ecc569b922d001c05271c3b7dc3339652272e27169001c762356c6fffa9ba88a6ccd8b2235e41063b5948e1dd2011
 DIST mysql-5.6.25.tar.gz 33203321 SHA256 15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd SHA512 cd15180281b015a29d5a9f12bafd5878ecb8ca68ada2e0d016916d77f606592b4b9a8e4a3728fc0d90326bcdda26fdd371fc731ca524f06bd06cc3b19ae93243 WHIRLPOOL 68932bcbec0e58aade1c00fe00651ecac1003e80e5cd29298c23a79190df76390c7f16a29fcb5bff9ad63e721f53978d5d727a0ae9c5df0eb97a002a4c3e4194
 DIST mysql-5.7.6-m16.tar.gz 47330399 SHA256 bba884fba916eea6cdaa3880af826c6f3b516f80319f35b1be6d4d3ea9c9d42d SHA512 1b5cfedc4e18dcc6ca722e6339f593e5d26131c3e582b9b3bc8905bb9e005feb9f5af620e85cf6e57bead07ee306fe490a2d04e7c8e2fa349d947c718776c57e WHIRLPOOL 48a804191825ad2927f99c540d477a71d5882f65e14fafa94cfaffc320a752f81e613ff2b05ebc61a16474e3466b037d79f0ddf57b7ba2afc3a5d9ae7ad345cc
@@ -15,5 +15,6 @@ DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a
 DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
 DIST mysql-extras-20150410-1944Z.tar.bz2 1493690 SHA256 e327adf02be4c2bce5121f01d6b139309c72814b8c50a29559dfddee12a0b4e2 SHA512 e2e5345290134e597734514041e413f0633b8078bfddb8b8e7695468ce7341735b732d5bb602ab7aa9a4045d71571b73aac01a5d96687d4fbd380736f5ed650c WHIRLPOOL f65f294905fd1d04e2be79a803b658ed432338501665a75cbe0cc5b3af8abf0615f1f808465c3ca3c7e850b9277f451f5c77b518977f4bee8dc77d6089ff88fb
 DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
+DIST mysql-extras-20150729-1849Z.tar.bz2 1491783 SHA256 18c3fadae04f1729169e587083135353680d7c59478cdb6ec0784b238ae8d34a SHA512 555156a00305732093173f83dd22dfa545ef0a3215d7cf419298b7f5be0f9bb8a527ae9c03f58d845223b40543e3dbd054ea103a105f282892cdbce67a864308 WHIRLPOOL 56a61fcd4af096b69318d9d158bf012944dc104aff01b2a55d20ae4a53dc462e9d7c67afb4a6643f93eef8da1f150f613b87880044fc244b040cbbc080c96034
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf

diff --git a/dev-db/mysql/mysql-5.5.43.ebuild b/dev-db/mysql/mysql-5.5.45.ebuild
similarity index 93%
rename from dev-db/mysql/mysql-5.5.43.ebuild
rename to dev-db/mysql/mysql-5.5.45.ebuild
index c1359cb..d5ceeaa 100644
--- a/dev-db/mysql/mysql-5.5.43.ebuild
+++ b/dev-db/mysql/mysql-5.5.45.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.45.ebuild,v 1.1 2015/07/29 19:01:43 grknight Exp $
 
 EAPI="5"
 
-MY_EXTRAS_VER="20150127-1351Z"
+MY_EXTRAS_VER="20150729-1849Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 
@@ -16,7 +16,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
@@ -32,7 +32,7 @@ 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 mysql-X.X.XX.ebuild \
 # digest clean package
@@ -100,7 +100,7 @@ src_test() {
 
 		# run mysql-test tests
 		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30
+			--testcase-timeout=30 --reorder
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"

diff --git a/dev-db/mysql/mysql-5.6.25-r1.ebuild b/dev-db/mysql/mysql-5.6.25-r1.ebuild
index 5a3d31c..b0ce8d0 100644
--- a/dev-db/mysql/mysql-5.6.25-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Heaher: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.25-r1.ebuild,v 1.1 2015/07/28 02:26:58 grknight Exp $
 
 EAPI="5"
 


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2015-08-13 13:50 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2015-08-13 13:50 UTC (permalink / raw
  To: gentoo-commits

commit:     568e50ce43e10ca013bc1cf0776ca77d6d503787
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 13:51:52 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 13:51:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=568e50ce

dev-db/mysql: Version bump

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

 dev-db/mysql/ChangeLog                             |  6 ++++++
 dev-db/mysql/Manifest                              | 24 +++++++++++++++++++++-
 ....6_alpha_pre16.ebuild => mysql-5.7.8_rc.ebuild} |  3 ++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 34a431d..907d2c9 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*mysql-5.7.8_rc (13 Aug 2015)
+
+  13 Aug 2015; Brian Evans <grknight@gentoo.org> +mysql-5.7.8_rc.ebuild,
+  -mysql-5.7.6_alpha_pre16.ebuild:
+  dev-db/mysql: Version bump
+
 *mysql-5.7.7_rc (14 Apr 2015)
 *mysql-5.6.24 (14 Apr 2015)
 *mysql-5.5.43 (14 Apr 2015)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 692f7a5..d49ebf5 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
@@ -7,8 +10,8 @@ DIST mysql-5.5.45.tar.gz 21832364 SHA256 744efd3c39265b5fdeebd25f58ecb34a6eb06e0
 DIST mysql-5.6.24.tar.gz 33178592 SHA256 37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb SHA512 cb4c27f67aad02e2120edb9dfaffa623d8ddb5861ee77055553c50cce76cbfe0a1e473e01cef3cf86b6362c719e1db18e69808a0e4e457f879a37297f14b9fd7 WHIRLPOOL 26e51a1c48d04c2f24f8914beb84bcd8122ecc569b922d001c05271c3b7dc3339652272e27169001c762356c6fffa9ba88a6ccd8b2235e41063b5948e1dd2011
 DIST mysql-5.6.25.tar.gz 33203321 SHA256 15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd SHA512 cd15180281b015a29d5a9f12bafd5878ecb8ca68ada2e0d016916d77f606592b4b9a8e4a3728fc0d90326bcdda26fdd371fc731ca524f06bd06cc3b19ae93243 WHIRLPOOL 68932bcbec0e58aade1c00fe00651ecac1003e80e5cd29298c23a79190df76390c7f16a29fcb5bff9ad63e721f53978d5d727a0ae9c5df0eb97a002a4c3e4194
 DIST mysql-5.6.26.tar.gz 33278710 SHA256 b44c6ce5f95172c56c73edfa8b710b39242ec7af0ab182c040208c41866e5070 SHA512 455bf66e1c63e3368a3dd53f80a3393e33a20605cde320ee0bb61339d0853c2187d4947812405b85ea93a7da722787e958515fc69807c3fab131878fe9604f62 WHIRLPOOL e5fe46e4f1c8a20d955b5921c6773823cb1c01bd78319485528c478f213a37dc8ce8a1bc5c61904595e8931dec1376d471387a3f85119a0791cb8f6d9303eb6f
-DIST mysql-5.7.6-m16.tar.gz 47330399 SHA256 bba884fba916eea6cdaa3880af826c6f3b516f80319f35b1be6d4d3ea9c9d42d SHA512 1b5cfedc4e18dcc6ca722e6339f593e5d26131c3e582b9b3bc8905bb9e005feb9f5af620e85cf6e57bead07ee306fe490a2d04e7c8e2fa349d947c718776c57e WHIRLPOOL 48a804191825ad2927f99c540d477a71d5882f65e14fafa94cfaffc320a752f81e613ff2b05ebc61a16474e3466b037d79f0ddf57b7ba2afc3a5d9ae7ad345cc
 DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c WHIRLPOOL 29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5
+DIST mysql-5.7.8-rc.tar.gz 49762480 SHA256 9da4bff6e0840d260b2fef2dac0138e6f0fa05f2a95cf3f6cb1014a0fd46269b SHA512 97f77c2e3fc3fe2a1fbc4c9008f6ed75bfd64a309f066237de8a28c242cead98ad1700c133e21101545e9d7780f6e30aad0620ea6abe6dd40c0f63a20aaed44b WHIRLPOOL e63fda54bf90d883f90fdc3f9591914fc867a5dd0945cf6480396c2ac5c33add644edae0ca344c3c0c1c9c74ad04b39482c48eff1eeb91b4dced0e6b201e5e32
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
@@ -19,3 +22,22 @@ DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d
 DIST mysql-extras-20150729-1849Z.tar.bz2 1491783 SHA256 18c3fadae04f1729169e587083135353680d7c59478cdb6ec0784b238ae8d34a SHA512 555156a00305732093173f83dd22dfa545ef0a3215d7cf419298b7f5be0f9bb8a527ae9c03f58d845223b40543e3dbd054ea103a105f282892cdbce67a864308 WHIRLPOOL 56a61fcd4af096b69318d9d158bf012944dc104aff01b2a55d20ae4a53dc462e9d7c67afb4a6643f93eef8da1f150f613b87880044fc244b040cbbc080c96034
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1
+
+iQJ8BAEBCABmBQJVzKD0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2VqEP/3g+6GHzL0hB5EDNOf8ivdlx
+C84i0x56sAv8xyhh0xPk7fFiQvkkh2/Z49xOdV7Um1gb9iC8Pnj2QhX6F5KXCNgM
+Ex38IBSwofqLubRtGfIr+BZr55h+jvWnpXp7lU85InDYLcLA9a1bhU/0uJwFiK/b
+/JKMPLbcuSaHzbBrwNCVhmxPeJgKuaIVS2IphcI54UYchNh7DyWCtagIvc7oWLYo
+xBkvjPS5pWY8y6GYK57crvgio7+jDKTMQjZ3fVpEltwDXTdBLy3BKb62RRUYF2VJ
+S3B8kcJnqwzITKF1MXzKg1SG+RNtJfAgLgNa3FpjkRSahWbj6G8eNVC8N2OFCybI
+CWgHVtScdWGXuL0NSXPJikqd8EdvHY/ouMU+bfEB1wjJ2938hCjIAS/fCvjy3PCo
+rMaSKAyUVg/s3xfqvbipvj/pQJ3NpHKlWOMVERa8KKKKCG/Akyxl2sRERKyPfXJt
+W6qx4knw/cP1lA9IfB+zal49g4rrHUSODp0pifOfD3vcqFRTyFxwzUY5t1ywchhC
+CgHF0reDO+Nb3Xt6GP6IaPzcMN8hNv8qQjjNCj4VvKMekK+a8RtKKgSW7YJQXD9H
+j6kSbq5yf+udFGO9JUm29/mdloNJBD/4o8hvRk70f8Vj/YQK4xfKaEzdwfr20hLP
+MQl/z/tzqJ96bpizWVl2
+=4icq
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.7.6_alpha_pre16.ebuild b/dev-db/mysql/mysql-5.7.8_rc.ebuild
similarity index 98%
rename from dev-db/mysql/mysql-5.7.6_alpha_pre16.ebuild
rename to dev-db/mysql/mysql-5.7.8_rc.ebuild
index 5f6e312..baa9e6c 100644
--- a/dev-db/mysql/mysql-5.7.6_alpha_pre16.ebuild
+++ b/dev-db/mysql/mysql-5.7.8_rc.ebuild
@@ -7,13 +7,14 @@ EAPI=5
 MY_EXTRAS_VER="live"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
+SUBSLOT="20"
 
 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"
+EGIT_REPO_URI="git://anongit.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"


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2015-08-19 18:33 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2015-08-19 18:33 UTC (permalink / raw
  To: gentoo-commits

commit:     9374d77dea58b300b724c751da3ca8d2a2f39e11
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 18:36:22 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 18:36:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=9374d77d

dev-db/mysql: Drop keywords ~hppa ~ppc ~sparc ~sparc-fbsd

MySQL 5.7 requires native GCC atomics and these platforms do not provide it.
Need to patch or leave unkeyworded.

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

 dev-db/mysql/ChangeLog             | 6 ++++++
 dev-db/mysql/mysql-5.7.7_rc.ebuild | 2 +-
 dev-db/mysql/mysql-5.7.8_rc.ebuild | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 907d2c9..3256438 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  19 Aug 2015; Brian Evans <grknight@gentoo.org> mysql-5.7.7_rc.ebuild,
+  mysql-5.7.8_rc.ebuild:
+  dev-db/mysql: Drop keywords ~hppa ~ppc ~sparc ~sparc-fbsd  MySQL 5.7 requires
+  native GCC atomics and these platforms do not provide it. Need to patch or
+  leave unkeyworded.
+
 *mysql-5.7.8_rc (13 Aug 2015)
 
   13 Aug 2015; Brian Evans <grknight@gentoo.org> +mysql-5.7.8_rc.ebuild,

diff --git a/dev-db/mysql/mysql-5.7.7_rc.ebuild b/dev-db/mysql/mysql-5.7.7_rc.ebuild
index 8943a26..3d70597 100644
--- a/dev-db/mysql/mysql-5.7.7_rc.ebuild
+++ b/dev-db/mysql/mysql-5.7.7_rc.ebuild
@@ -17,7 +17,7 @@ IUSE="$IUSE"
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-linux"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''

diff --git a/dev-db/mysql/mysql-5.7.8_rc.ebuild b/dev-db/mysql/mysql-5.7.8_rc.ebuild
index baa9e6c..a335105 100644
--- a/dev-db/mysql/mysql-5.7.8_rc.ebuild
+++ b/dev-db/mysql/mysql-5.7.8_rc.ebuild
@@ -17,7 +17,7 @@ IUSE="$IUSE"
 EGIT_REPO_URI="git://anongit.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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-linux"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2015-10-01 15:15 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2015-10-01 15:15 UTC (permalink / raw
  To: gentoo-commits

commit:     ecf56d1cf8aa9006465dd2130aa9b16042530336
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  1 15:15:10 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Oct  1 15:15:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ecf56d1c

dev-db/mysql: Version bump; drop old

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-db/mysql/Manifest                              |  26 +---
 dev-db/mysql/mysql-5.6.24.ebuild                   | 153 --------------------
 dev-db/mysql/mysql-5.6.25.ebuild                   | 154 ---------------------
 ...sql-5.6.26-r1.ebuild => mysql-5.6.27-r1.ebuild} |   0
 .../{mysql-5.6.26.ebuild => mysql-5.6.27.ebuild}   |   0
 5 files changed, 1 insertion(+), 332 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index d49ebf5..405fac5 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,15 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.44.tar.gz 21789766 SHA256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de SHA512 05707b96c3e0d39ca103d965640aa1a9461a513f788fc7f2acce4b3933ec578b3d66df53955b0dff1b6c9e5acd98441cfe1df5b3154a1058293babc39c26dad5 WHIRLPOOL 870d9728c78f6732fcd6f95e62833a769c937c96298a39bb023b33a9138552e254d2a3f6285d8f4f0b740de9d7397fa1a0987234a0a4dfa13c787fc068053d78
 DIST mysql-5.5.45.tar.gz 21832364 SHA256 744efd3c39265b5fdeebd25f58ecb34a6eb06e02d9ec2febd3164942f2c89332 SHA512 1c8ddf294232b106562537d6e9b4a3956dd1a290562f313d311f2bbe09f1cb95c28e7e9a4c92a1fcc91a394514bc1190d185b1134003a9f6183ecc2a06d618e8 WHIRLPOOL 3daed09edfc1ca7a0ae379b876e061c2318755fdd14be9630b7c5311985e91ea46cf0e0b1eab98c758cc2809d5d562fcfd2f22022100051746343e147f3d4ebc
-DIST mysql-5.6.24.tar.gz 33178592 SHA256 37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb SHA512 cb4c27f67aad02e2120edb9dfaffa623d8ddb5861ee77055553c50cce76cbfe0a1e473e01cef3cf86b6362c719e1db18e69808a0e4e457f879a37297f14b9fd7 WHIRLPOOL 26e51a1c48d04c2f24f8914beb84bcd8122ecc569b922d001c05271c3b7dc3339652272e27169001c762356c6fffa9ba88a6ccd8b2235e41063b5948e1dd2011
-DIST mysql-5.6.25.tar.gz 33203321 SHA256 15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd SHA512 cd15180281b015a29d5a9f12bafd5878ecb8ca68ada2e0d016916d77f606592b4b9a8e4a3728fc0d90326bcdda26fdd371fc731ca524f06bd06cc3b19ae93243 WHIRLPOOL 68932bcbec0e58aade1c00fe00651ecac1003e80e5cd29298c23a79190df76390c7f16a29fcb5bff9ad63e721f53978d5d727a0ae9c5df0eb97a002a4c3e4194
-DIST mysql-5.6.26.tar.gz 33278710 SHA256 b44c6ce5f95172c56c73edfa8b710b39242ec7af0ab182c040208c41866e5070 SHA512 455bf66e1c63e3368a3dd53f80a3393e33a20605cde320ee0bb61339d0853c2187d4947812405b85ea93a7da722787e958515fc69807c3fab131878fe9604f62 WHIRLPOOL e5fe46e4f1c8a20d955b5921c6773823cb1c01bd78319485528c478f213a37dc8ce8a1bc5c61904595e8931dec1376d471387a3f85119a0791cb8f6d9303eb6f
+DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7
 DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c WHIRLPOOL 29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5
 DIST mysql-5.7.8-rc.tar.gz 49762480 SHA256 9da4bff6e0840d260b2fef2dac0138e6f0fa05f2a95cf3f6cb1014a0fd46269b SHA512 97f77c2e3fc3fe2a1fbc4c9008f6ed75bfd64a309f066237de8a28c242cead98ad1700c133e21101545e9d7780f6e30aad0620ea6abe6dd40c0f63a20aaed44b WHIRLPOOL e63fda54bf90d883f90fdc3f9591914fc867a5dd0945cf6480396c2ac5c33add644edae0ca344c3c0c1c9c74ad04b39482c48eff1eeb91b4dced0e6b201e5e32
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
@@ -22,22 +17,3 @@ DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d
 DIST mysql-extras-20150729-1849Z.tar.bz2 1491783 SHA256 18c3fadae04f1729169e587083135353680d7c59478cdb6ec0784b238ae8d34a SHA512 555156a00305732093173f83dd22dfa545ef0a3215d7cf419298b7f5be0f9bb8a527ae9c03f58d845223b40543e3dbd054ea103a105f282892cdbce67a864308 WHIRLPOOL 56a61fcd4af096b69318d9d158bf012944dc104aff01b2a55d20ae4a53dc462e9d7c67afb4a6643f93eef8da1f150f613b87880044fc244b040cbbc080c96034
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
-
-iQJ8BAEBCABmBQJVzKD0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2VqEP/3g+6GHzL0hB5EDNOf8ivdlx
-C84i0x56sAv8xyhh0xPk7fFiQvkkh2/Z49xOdV7Um1gb9iC8Pnj2QhX6F5KXCNgM
-Ex38IBSwofqLubRtGfIr+BZr55h+jvWnpXp7lU85InDYLcLA9a1bhU/0uJwFiK/b
-/JKMPLbcuSaHzbBrwNCVhmxPeJgKuaIVS2IphcI54UYchNh7DyWCtagIvc7oWLYo
-xBkvjPS5pWY8y6GYK57crvgio7+jDKTMQjZ3fVpEltwDXTdBLy3BKb62RRUYF2VJ
-S3B8kcJnqwzITKF1MXzKg1SG+RNtJfAgLgNa3FpjkRSahWbj6G8eNVC8N2OFCybI
-CWgHVtScdWGXuL0NSXPJikqd8EdvHY/ouMU+bfEB1wjJ2938hCjIAS/fCvjy3PCo
-rMaSKAyUVg/s3xfqvbipvj/pQJ3NpHKlWOMVERa8KKKKCG/Akyxl2sRERKyPfXJt
-W6qx4knw/cP1lA9IfB+zal49g4rrHUSODp0pifOfD3vcqFRTyFxwzUY5t1ywchhC
-CgHF0reDO+Nb3Xt6GP6IaPzcMN8hNv8qQjjNCj4VvKMekK+a8RtKKgSW7YJQXD9H
-j6kSbq5yf+udFGO9JUm29/mdloNJBD/4o8hvRk70f8Vj/YQK4xfKaEzdwfr20hLP
-MQl/z/tzqJ96bpizWVl2
-=4icq
------END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.6.24.ebuild b/dev-db/mysql/mysql-5.6.24.ebuild
deleted file mode 100644
index 0240d41..0000000
--- a/dev-db/mysql/mysql-5.6.24.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150410-1944Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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 mysql-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}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		if ! use extraengine ; then
-			# bug 401673, 530766
-			for t in federated.federated_plugin ; do
-				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000
-		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/mysql/mysql-5.6.25.ebuild b/dev-db/mysql/mysql-5.6.25.ebuild
deleted file mode 100644
index cd8d0a7..0000000
--- a/dev-db/mysql/mysql-5.6.25.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150410-1944Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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 mysql-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}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		if ! use extraengine ; then
-			# bug 401673, 530766
-			for t in federated.federated_plugin ; do
-				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000
-		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/mysql/mysql-5.6.26-r1.ebuild b/dev-db/mysql/mysql-5.6.27-r1.ebuild
similarity index 100%
rename from dev-db/mysql/mysql-5.6.26-r1.ebuild
rename to dev-db/mysql/mysql-5.6.27-r1.ebuild

diff --git a/dev-db/mysql/mysql-5.6.26.ebuild b/dev-db/mysql/mysql-5.6.27.ebuild
similarity index 100%
rename from dev-db/mysql/mysql-5.6.26.ebuild
rename to dev-db/mysql/mysql-5.6.27.ebuild


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2015-10-12 18:37 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2015-10-12 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     3a09c372a14afccdc982bb6c5193c8ccda6c4ffe
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 14:16:37 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 14:16:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=3a09c372

dev-db/mysql: Version bump for 5.5 series

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-db/mysql/Manifest                              |   4 +-
 dev-db/mysql/mysql-5.5.44.ebuild                   | 126 ---------------------
 .../{mysql-5.5.45.ebuild => mysql-5.5.46.ebuild}   |   2 +-
 3 files changed, 2 insertions(+), 130 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 405fac5..4b58fed 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,8 +2,7 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.44.tar.gz 21789766 SHA256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de SHA512 05707b96c3e0d39ca103d965640aa1a9461a513f788fc7f2acce4b3933ec578b3d66df53955b0dff1b6c9e5acd98441cfe1df5b3154a1058293babc39c26dad5 WHIRLPOOL 870d9728c78f6732fcd6f95e62833a769c937c96298a39bb023b33a9138552e254d2a3f6285d8f4f0b740de9d7397fa1a0987234a0a4dfa13c787fc068053d78
-DIST mysql-5.5.45.tar.gz 21832364 SHA256 744efd3c39265b5fdeebd25f58ecb34a6eb06e02d9ec2febd3164942f2c89332 SHA512 1c8ddf294232b106562537d6e9b4a3956dd1a290562f313d311f2bbe09f1cb95c28e7e9a4c92a1fcc91a394514bc1190d185b1134003a9f6183ecc2a06d618e8 WHIRLPOOL 3daed09edfc1ca7a0ae379b876e061c2318755fdd14be9630b7c5311985e91ea46cf0e0b1eab98c758cc2809d5d562fcfd2f22022100051746343e147f3d4ebc
+DIST mysql-5.5.46.tar.gz 21838374 SHA256 93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e SHA512 c2db730318d4c16793d62dbd937c1ff739fffabab6d1689b94252f5501ff36917ddf80a8144583492c05220b3ae33f29ecbcec10f6d8ae0a0b10142be719fc27 WHIRLPOOL 355260ae0e7385c7d00b289e37af09374bc8320f69a55d7ee0469283382f197fd430be32019668b1f29cda69f9d76965d4ee749cb93f1e8263799673e4f0f535
 DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7
 DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c WHIRLPOOL 29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5
 DIST mysql-5.7.8-rc.tar.gz 49762480 SHA256 9da4bff6e0840d260b2fef2dac0138e6f0fa05f2a95cf3f6cb1014a0fd46269b SHA512 97f77c2e3fc3fe2a1fbc4c9008f6ed75bfd64a309f066237de8a28c242cead98ad1700c133e21101545e9d7780f6e30aad0620ea6abe6dd40c0f63a20aaed44b WHIRLPOOL e63fda54bf90d883f90fdc3f9591914fc867a5dd0945cf6480396c2ac5c33add644edae0ca344c3c0c1c9c74ad04b39482c48eff1eeb91b4dced0e6b201e5e32
@@ -11,7 +10,6 @@ DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd3
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
-DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
 DIST mysql-extras-20150410-1944Z.tar.bz2 1493690 SHA256 e327adf02be4c2bce5121f01d6b139309c72814b8c50a29559dfddee12a0b4e2 SHA512 e2e5345290134e597734514041e413f0633b8078bfddb8b8e7695468ce7341735b732d5bb602ab7aa9a4045d71571b73aac01a5d96687d4fbd380736f5ed650c WHIRLPOOL f65f294905fd1d04e2be79a803b658ed432338501665a75cbe0cc5b3af8abf0615f1f808465c3ca3c7e850b9277f451f5c77b518977f4bee8dc77d6089ff88fb
 DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
 DIST mysql-extras-20150729-1849Z.tar.bz2 1491783 SHA256 18c3fadae04f1729169e587083135353680d7c59478cdb6ec0784b238ae8d34a SHA512 555156a00305732093173f83dd22dfa545ef0a3215d7cf419298b7f5be0f9bb8a527ae9c03f58d845223b40543e3dbd054ea103a105f282892cdbce67a864308 WHIRLPOOL 56a61fcd4af096b69318d9d158bf012944dc104aff01b2a55d20ae4a53dc462e9d7c67afb4a6643f93eef8da1f150f613b87880044fc244b040cbbc080c96034

diff --git a/dev-db/mysql/mysql-5.5.44.ebuild b/dev-db/mysql/mysql-5.5.44.ebuild
deleted file mode 100644
index 9cd6470..0000000
--- a/dev-db/mysql/mysql-5.5.44.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150127-1351Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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 mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	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}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30
-		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/mysql/mysql-5.5.45.ebuild b/dev-db/mysql/mysql-5.5.46.ebuild
similarity index 98%
rename from dev-db/mysql/mysql-5.5.45.ebuild
rename to dev-db/mysql/mysql-5.5.46.ebuild
index 45c467c..e312d8f 100644
--- a/dev-db/mysql/mysql-5.5.45.ebuild
+++ b/dev-db/mysql/mysql-5.5.46.ebuild
@@ -22,7 +22,7 @@ EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
+EPATCH_EXCLUDE='20019_all_mysql-5.5-mtr-perl-deprecation.patch'
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
 RDEPEND="${RDEPEND}"


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2015-10-19 18:13 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2015-10-19 18:13 UTC (permalink / raw
  To: gentoo-commits

commit:     043dee4ade0478b996a33822060afb344449be67
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 18:10:29 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 18:10:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=043dee4a

dev-db/mysql: patch cmake file for libressl version check

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-db/mysql/mysql-5.6.27-r1.ebuild | 8 ++++++++
 dev-db/mysql/mysql-5.6.27.ebuild    | 8 ++++++++
 dev-db/mysql/mysql-5.7.7_rc.ebuild  | 8 ++++++++
 dev-db/mysql/mysql-5.7.8_rc.ebuild  | 8 ++++++++
 4 files changed, 32 insertions(+)

diff --git a/dev-db/mysql/mysql-5.6.27-r1.ebuild b/dev-db/mysql/mysql-5.6.27-r1.ebuild
index 365c7de..4ff5c0d 100644
--- a/dev-db/mysql/mysql-5.6.27-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.27-r1.ebuild
@@ -31,6 +31,14 @@ RDEPEND="${RDEPEND}"
 # disable until we see what happens with it
 MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1"
 
+src_prepare() {
+	mysql-multilib_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+}
+
 # Official test instructions:
 # USE='server embedded extraengine perl ssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \

diff --git a/dev-db/mysql/mysql-5.6.27.ebuild b/dev-db/mysql/mysql-5.6.27.ebuild
index e10fde2..98a209a 100644
--- a/dev-db/mysql/mysql-5.6.27.ebuild
+++ b/dev-db/mysql/mysql-5.6.27.ebuild
@@ -30,6 +30,14 @@ RDEPEND="${RDEPEND}"
 # disable until we see what happens with it
 MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1"
 
+src_prepare() {
+	mysql-multilib_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+}
+
 # Official test instructions:
 # USE='embedded extraengine perl ssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \

diff --git a/dev-db/mysql/mysql-5.7.7_rc.ebuild b/dev-db/mysql/mysql-5.7.7_rc.ebuild
index 3d70597..9239998 100644
--- a/dev-db/mysql/mysql-5.7.7_rc.ebuild
+++ b/dev-db/mysql/mysql-5.7.7_rc.ebuild
@@ -29,6 +29,14 @@ RDEPEND="${RDEPEND}"
 # 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
 
+src_prepare() {
+	mysql-multilib_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+}
+
 # Official test instructions:
 # USE='-cluster embedded extraengine perl ssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \

diff --git a/dev-db/mysql/mysql-5.7.8_rc.ebuild b/dev-db/mysql/mysql-5.7.8_rc.ebuild
index a335105..d0111cd 100644
--- a/dev-db/mysql/mysql-5.7.8_rc.ebuild
+++ b/dev-db/mysql/mysql-5.7.8_rc.ebuild
@@ -29,6 +29,14 @@ RDEPEND="${RDEPEND}"
 # 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
 
+src_prepare() {
+	mysql-multilib_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+}
+
 # Official test instructions:
 # USE='-cluster embedded extraengine perl ssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2015-10-19 18:13 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2015-10-19 18:13 UTC (permalink / raw
  To: gentoo-commits

commit:     43a82dd161e6558ec91ceb6c68391fee83cba21d
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 17:55:20 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 17:55:20 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=43a82dd1

dev-db/mysql: Update patches on 5.5.46

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-db/mysql/mysql-5.5.46.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql/mysql-5.5.46.ebuild b/dev-db/mysql/mysql-5.5.46.ebuild
index e312d8f..9a964d7 100644
--- a/dev-db/mysql/mysql-5.5.46.ebuild
+++ b/dev-db/mysql/mysql-5.5.46.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-MY_EXTRAS_VER="20150729-1849Z"
+MY_EXTRAS_VER="20150127-1351Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 
@@ -22,7 +22,7 @@ EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE='20019_all_mysql-5.5-mtr-perl-deprecation.patch'
+EPATCH_EXCLUDE=''
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
 RDEPEND="${RDEPEND}"


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2016-01-21 21:15 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2016-01-21 21:15 UTC (permalink / raw
  To: gentoo-commits

commit:     aa974fcb99a7d4ee243e9c519bc25cd9ad74860f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 21:15:25 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 21:15:25 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=aa974fcb

dev-db/mysql: Add new 5.7 version.  Needs more testing

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

 dev-db/mysql/ChangeLog           |   7 +-
 dev-db/mysql/Manifest            |  24 ++++++
 dev-db/mysql/mysql-5.7.10.ebuild | 172 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 202 insertions(+), 1 deletion(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 3256438..bf66231 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-db/mysql
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*mysql-5.7.10 (21 Jan 2016)
+
+  21 Jan 2016; Brian Evans <grknight@gentoo.org> +mysql-5.7.10.ebuild:
+  dev-db/mysql: Add new 5.7 version.  Needs more testing
+
   19 Aug 2015; Brian Evans <grknight@gentoo.org> mysql-5.7.7_rc.ebuild,
   mysql-5.7.8_rc.ebuild:
   dev-db/mysql: Drop keywords ~hppa ~ppc ~sparc ~sparc-fbsd  MySQL 5.7 requires

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index ca2d123..a74bdc9 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
@@ -5,6 +8,7 @@ DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c30
 DIST mysql-5.5.46.tar.gz 21838374 SHA256 93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e SHA512 c2db730318d4c16793d62dbd937c1ff739fffabab6d1689b94252f5501ff36917ddf80a8144583492c05220b3ae33f29ecbcec10f6d8ae0a0b10142be719fc27 WHIRLPOOL 355260ae0e7385c7d00b289e37af09374bc8320f69a55d7ee0469283382f197fd430be32019668b1f29cda69f9d76965d4ee749cb93f1e8263799673e4f0f535
 DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7
 DIST mysql-5.6.28.tar.gz 32182980 SHA256 217cd96921abdd709b9b4ff3ce2af4cbd237de43679cf19385d19df03a037b21 SHA512 f02f91586567cb240ec882108ed5cc9e49a4e96545738cf00d43ba6c1fbe8d08b3726dccbe6f7b2412136a1bd50098543975d68ed2322f4cdeb7cd9572d48fcc WHIRLPOOL 039bb2af811d13c573d1a62cd9c8c043b03fba9a369a6afd30336dcc5ba999e90e2e86f1d1b5d4e5944d76eed1c2893e515705aa384cec98e24e2e8a8f7437c2
+DIST mysql-5.7.10.tar.gz 48919371 SHA256 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 SHA512 4434cf651b9607ed2fffbfc8e190bcc2109c8e4b3f8d4e504199721e69332b137b37eab3ab1e91dc08420641a342e99f8d8ae8dfdea60f37f89d94a15bdbd75c WHIRLPOOL 323a41d5b9996145c9769076d636cf293ae5073e3ea3c582752d72727c1538e0cc08076b69f481b921cd06bd6505e84fb6c28ba4ffa2190e4e8204aca96c7b9f
 DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c WHIRLPOOL 29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5
 DIST mysql-5.7.8-rc.tar.gz 49762480 SHA256 9da4bff6e0840d260b2fef2dac0138e6f0fa05f2a95cf3f6cb1014a0fd46269b SHA512 97f77c2e3fc3fe2a1fbc4c9008f6ed75bfd64a309f066237de8a28c242cead98ad1700c133e21101545e9d7780f6e30aad0620ea6abe6dd40c0f63a20aaed44b WHIRLPOOL e63fda54bf90d883f90fdc3f9591914fc867a5dd0945cf6480396c2ac5c33add644edae0ca344c3c0c1c9c74ad04b39482c48eff1eeb91b4dced0e6b201e5e32
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
@@ -14,5 +18,25 @@ DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a
 DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
 DIST mysql-extras-20150410-1944Z.tar.bz2 1493690 SHA256 e327adf02be4c2bce5121f01d6b139309c72814b8c50a29559dfddee12a0b4e2 SHA512 e2e5345290134e597734514041e413f0633b8078bfddb8b8e7695468ce7341735b732d5bb602ab7aa9a4045d71571b73aac01a5d96687d4fbd380736f5ed650c WHIRLPOOL f65f294905fd1d04e2be79a803b658ed432338501665a75cbe0cc5b3af8abf0615f1f808465c3ca3c7e850b9277f451f5c77b518977f4bee8dc77d6089ff88fb
 DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
+DIST mysql-extras-20151105-2051Z.tar.bz2 1490187 SHA256 129d79c2064b08b0afad69e04e27991bf4103c20ccea39c133239b1dd822a49f SHA512 af34a44275b06c1626eb5952b3643b5663b8a1fb1d9ff18a67d51c02daaa51c4476df407d38ab607cc41842b47e5dd7b4cef8ae380a41eb80923df8052b9e521 WHIRLPOOL 01702ca4e2033fbc70db3ab2dd166b2e31072ea0f6bdd42d00c27ae0c0afab5c8451c4dcc90cce6d46f9ea056017e273f7c719e1cfabf969293bdcd15241f5b3
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1
+
+iQJ8BAEBCABmBQJWoUpsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2M3MP/14XtNAYn+FJYfEm76YOLaip
+4slZVearAXh8HTpLDKEntCK3svunXfscQHTzUBcUJqMCQ0mURZHhXPSJIiOSKRdT
+h9ywt7YUzK4W8UdlbSna3CfNXLzJc3BPqGKGGRKydtRAIQUCRBOAtt4PfWFRQT2W
+ocU/YG5R9y8Tp2vFzFUmWF/N7MNgm9d2cx4GAop1CTk85gz2Y1LHe0zoToJdsvaU
+nzRCiZrq9ialbEYJ6A1FzANBM5KlTu2P/epXIjwCDDYYxkMgJHaao5dWVngA+aMa
+vSa7q3gdbTfyISPGjztsbIur3knvDmWw7QFKcLiCLJOEwkMi+cmS+heb7UAB1Gmw
+xFJiwFKPlql+Qb4UrVEGW/173zQfCAPj2QJa8wm0R3nMK9j/gQY65LcmB7+qspts
++O0jusv+eY3XS+rQViQHbnBP2SfKCBfQ6sPN5xai2Y6HI+HSjo26BVG2ZSfdlxl6
+2B7RsPrfm5jAXoYwIZFr1FK39xtyAgKgNKCjez4I3YzYVN1DDbo9CQGd6Ly55UvS
+2CT82VRUilJiU0rLRdBnO1kETCnankX8NcHAaV3Z2yYF8DmzJWPihj4YkK4MgaOF
+ZEUvalqNTaPZC1ZNwwkrxSprWcBU/PFc1zPWtvrxLwyNECvFc3dGOQAnov0cQpAc
+2l/eDf/T4py/n+W7wiCs
+=jXao
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.7.10.ebuild b/dev-db/mysql/mysql-5.7.10.ebuild
new file mode 100644
index 0000000..95cb913
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.10.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+HAS_TOOLS_PATCH="1"
+SUBSLOT="20"
+
+inherit mysql-multilib-r1
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# 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 )
+	>=dev-libs/boost-1.59:=
+	app-arch/lz4:="
+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
+
+src_prepare() {
+	mysql-multilib-r1_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+}
+
+src_configure() {
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+		-DWITH_LZ4=system
+		-DWITH_NUMA=OFF
+	)
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='server embedded extraengine perl openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-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 symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5/5.6 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# funcs_1.is_triggers funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
+		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# rpl.rpl_plugin_load
+		# fails due to included file not listed in expected result
+		# appears to be poor planning
+		#
+		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_statement_insert_delayed \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			main.information_schema \
+			main.mysql_client_test \
+			main.mysqld--help-notwin \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+			rpl.rpl_plugin_load \
+			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+		; do
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		if ! use extraengine ; then
+			# bug 401673, 530766
+			for t in federated.federated_plugin ; do
+				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# Set file limits higher so tests run
+		ulimit -n 3000
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--suite-timeout=5000 --reorder
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2016-02-10  2:59 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2016-02-10  2:59 UTC (permalink / raw
  To: gentoo-commits

commit:     123d17a4419a6379e986d3545e347f770cd346fe
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 02:18:35 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 02:18:35 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=123d17a4

dev-db/mysql: Version bump for 5.7.11

 dev-db/mysql/Manifest            |  23 +-----
 dev-db/mysql/mysql-5.7.11.ebuild | 172 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+), 22 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index a74bdc9..8e0e37e 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
@@ -9,6 +6,7 @@ DIST mysql-5.5.46.tar.gz 21838374 SHA256 93e0d91f1b380508edcecdd102cbec79a609d6b
 DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7
 DIST mysql-5.6.28.tar.gz 32182980 SHA256 217cd96921abdd709b9b4ff3ce2af4cbd237de43679cf19385d19df03a037b21 SHA512 f02f91586567cb240ec882108ed5cc9e49a4e96545738cf00d43ba6c1fbe8d08b3726dccbe6f7b2412136a1bd50098543975d68ed2322f4cdeb7cd9572d48fcc WHIRLPOOL 039bb2af811d13c573d1a62cd9c8c043b03fba9a369a6afd30336dcc5ba999e90e2e86f1d1b5d4e5944d76eed1c2893e515705aa384cec98e24e2e8a8f7437c2
 DIST mysql-5.7.10.tar.gz 48919371 SHA256 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 SHA512 4434cf651b9607ed2fffbfc8e190bcc2109c8e4b3f8d4e504199721e69332b137b37eab3ab1e91dc08420641a342e99f8d8ae8dfdea60f37f89d94a15bdbd75c WHIRLPOOL 323a41d5b9996145c9769076d636cf293ae5073e3ea3c582752d72727c1538e0cc08076b69f481b921cd06bd6505e84fb6c28ba4ffa2190e4e8204aca96c7b9f
+DIST mysql-5.7.11.tar.gz 49195786 SHA256 54f8c7af87d3d8084419bde2b9f0d8970b3dada0757b015981b02f35a3681f0e SHA512 b07587ff4fae6cc0e6d2511235c8e2052e50f1d8e819475f1b9fc377ad3166ff0274a683728adead61329c3213d1cd29b911808ca819e15ec4019b9747fbeae7 WHIRLPOOL 5b3abbbc25b490f345cb9fe292e784cd1f37d3da728c889c2d150c9f631de0f1c0d373fb2e22afeaa8bfa82b7b3c069e02ef81c9b1d869f69379bf2e40e5af53
 DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c WHIRLPOOL 29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5
 DIST mysql-5.7.8-rc.tar.gz 49762480 SHA256 9da4bff6e0840d260b2fef2dac0138e6f0fa05f2a95cf3f6cb1014a0fd46269b SHA512 97f77c2e3fc3fe2a1fbc4c9008f6ed75bfd64a309f066237de8a28c242cead98ad1700c133e21101545e9d7780f6e30aad0620ea6abe6dd40c0f63a20aaed44b WHIRLPOOL e63fda54bf90d883f90fdc3f9591914fc867a5dd0945cf6480396c2ac5c33add644edae0ca344c3c0c1c9c74ad04b39482c48eff1eeb91b4dced0e6b201e5e32
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
@@ -21,22 +19,3 @@ DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d
 DIST mysql-extras-20151105-2051Z.tar.bz2 1490187 SHA256 129d79c2064b08b0afad69e04e27991bf4103c20ccea39c133239b1dd822a49f SHA512 af34a44275b06c1626eb5952b3643b5663b8a1fb1d9ff18a67d51c02daaa51c4476df407d38ab607cc41842b47e5dd7b4cef8ae380a41eb80923df8052b9e521 WHIRLPOOL 01702ca4e2033fbc70db3ab2dd166b2e31072ea0f6bdd42d00c27ae0c0afab5c8451c4dcc90cce6d46f9ea056017e273f7c719e1cfabf969293bdcd15241f5b3
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
-
-iQJ8BAEBCABmBQJWoUpsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2M3MP/14XtNAYn+FJYfEm76YOLaip
-4slZVearAXh8HTpLDKEntCK3svunXfscQHTzUBcUJqMCQ0mURZHhXPSJIiOSKRdT
-h9ywt7YUzK4W8UdlbSna3CfNXLzJc3BPqGKGGRKydtRAIQUCRBOAtt4PfWFRQT2W
-ocU/YG5R9y8Tp2vFzFUmWF/N7MNgm9d2cx4GAop1CTk85gz2Y1LHe0zoToJdsvaU
-nzRCiZrq9ialbEYJ6A1FzANBM5KlTu2P/epXIjwCDDYYxkMgJHaao5dWVngA+aMa
-vSa7q3gdbTfyISPGjztsbIur3knvDmWw7QFKcLiCLJOEwkMi+cmS+heb7UAB1Gmw
-xFJiwFKPlql+Qb4UrVEGW/173zQfCAPj2QJa8wm0R3nMK9j/gQY65LcmB7+qspts
-+O0jusv+eY3XS+rQViQHbnBP2SfKCBfQ6sPN5xai2Y6HI+HSjo26BVG2ZSfdlxl6
-2B7RsPrfm5jAXoYwIZFr1FK39xtyAgKgNKCjez4I3YzYVN1DDbo9CQGd6Ly55UvS
-2CT82VRUilJiU0rLRdBnO1kETCnankX8NcHAaV3Z2yYF8DmzJWPihj4YkK4MgaOF
-ZEUvalqNTaPZC1ZNwwkrxSprWcBU/PFc1zPWtvrxLwyNECvFc3dGOQAnov0cQpAc
-2l/eDf/T4py/n+W7wiCs
-=jXao
------END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.7.11.ebuild b/dev-db/mysql/mysql-5.7.11.ebuild
new file mode 100644
index 0000000..d56e2bb
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.11.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+HAS_TOOLS_PATCH="1"
+SUBSLOT="20"
+
+inherit mysql-multilib-r1
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# 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 )
+	>=dev-libs/boost-1.59:=
+	>=app-arch/lz4-0_p131:="
+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
+
+src_prepare() {
+	mysql-multilib-r1_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+}
+
+src_configure() {
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+		-DWITH_LZ4=system
+		-DWITH_NUMA=OFF
+	)
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='server embedded extraengine perl openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-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 symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5/5.6 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# funcs_1.is_triggers funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
+		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# rpl.rpl_plugin_load
+		# fails due to included file not listed in expected result
+		# appears to be poor planning
+		#
+		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_statement_insert_delayed \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			main.information_schema \
+			main.mysql_client_test \
+			main.mysqld--help-notwin \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+			rpl.rpl_plugin_load \
+			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+		; do
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		if ! use extraengine ; then
+			# bug 401673, 530766
+			for t in federated.federated_plugin ; do
+				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# Set file limits higher so tests run
+#		ulimit -n 3000
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--suite-timeout=5000 --reorder
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2016-02-10  2:59 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2016-02-10  2:59 UTC (permalink / raw
  To: gentoo-commits

commit:     93034bc1a740087e1d83e088e2b946405337ec44
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 02:19:06 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 02:19:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=93034bc1

dev-db/mysql: Fix minimum app-arch/lz4 version

 dev-db/mysql/mysql-5.7.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql/mysql-5.7.10.ebuild b/dev-db/mysql/mysql-5.7.10.ebuild
index 95cb913..b248815 100644
--- a/dev-db/mysql/mysql-5.7.10.ebuild
+++ b/dev-db/mysql/mysql-5.7.10.ebuild
@@ -22,7 +22,7 @@ EPATCH_EXCLUDE=''
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
 	>=dev-libs/boost-1.59:=
-	app-arch/lz4:="
+	>=app-arch/lz4-0_p131:="
 RDEPEND="${RDEPEND}"
 
 # Please do not add a naive src_unpack to this ebuild


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2016-02-12  3:30 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2016-02-12  3:30 UTC (permalink / raw
  To: gentoo-commits

commit:     a4179373f12c2c6a4e5a29f1f415454eb066dfb4
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 03:04:11 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 03:04:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=a4179373

dev-db/mysql: Remove old USE flag descriptions for client-libs and tools

Package-Manager: portage-2.2.27
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

 dev-db/mysql/ChangeLog    | 3 +++
 dev-db/mysql/metadata.xml | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index c27b21f..ce753ad 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  12 Feb 2016; Brian Evans <grknight@gentoo.org> metadata.xml:
+  dev-db/mysql: Remove old USE flag descriptions for client-libs and tools
+
   12 Feb 2016; Brian Evans <grknight@gentoo.org> -mysql-5.5.46.ebuild,
   -mysql-5.6.27-r1.ebuild, -mysql-5.6.27.ebuild, -mysql-5.6.28.ebuild,
   -mysql-5.7.7_rc.ebuild, -mysql-5.7.8_rc.ebuild:

diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 1fe1437..634bbe2 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -16,7 +16,6 @@ dev-db/mariadb
 -->
 <use>
   <flag name="big-tables">Make tables contain up to 1.844E+19 rows</flag>
-  <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>
@@ -33,7 +32,6 @@ dev-db/mariadb
   <flag name="server">Build the server program</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
   <flag name="test">Install upstream testsuites for end use.</flag>
-  <flag name="tools">Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
   <flag name="xtradb">Add experimental support for Percona's InnoDB replacement: XtraDB</flag>
   <flag name="yassl">Enable SSL connections and crypto functions using the bundled yaSSL</flag>
 </use>


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2016-02-12  3:30 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2016-02-12  3:30 UTC (permalink / raw
  To: gentoo-commits

commit:     075f578f7e61defe8901cb54491ec0f696c44eaa
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 01:46:51 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 01:46:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=075f578f

dev-db/mysql: Version bump for 5.5.48

Package-Manager: portage-2.2.27
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

 dev-db/mysql/ChangeLog           |   5 ++
 dev-db/mysql/Manifest            |  17 ++++++
 dev-db/mysql/mysql-5.5.48.ebuild | 126 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 148 insertions(+)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index bf66231..dc32610 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*mysql-5.5.48 (12 Feb 2016)
+
+  12 Feb 2016; Brian Evans <grknight@gentoo.org> +mysql-5.5.48.ebuild:
+  dev-db/mysql: Version bump for 5.5.48
+
 *mysql-5.7.10 (21 Jan 2016)
 
   21 Jan 2016; Brian Evans <grknight@gentoo.org> +mysql-5.7.10.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 8e0e37e..103d170 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.46.tar.gz 21838374 SHA256 93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e SHA512 c2db730318d4c16793d62dbd937c1ff739fffabab6d1689b94252f5501ff36917ddf80a8144583492c05220b3ae33f29ecbcec10f6d8ae0a0b10142be719fc27 WHIRLPOOL 355260ae0e7385c7d00b289e37af09374bc8320f69a55d7ee0469283382f197fd430be32019668b1f29cda69f9d76965d4ee749cb93f1e8263799673e4f0f535
+DIST mysql-5.5.48.tar.gz 21201193 SHA256 cc3f8745879eee0508de1a70fc2d267a2d06b7433faa8bb07a787768dcfed781 SHA512 ac13cdfd89dea70f9ffb443affd5b9abf9984c5ea126b58d7833568e985478a667b73b1c9a4c8c80d80ce8da53168ee720191829ed035cff3f9482f58b5510e4 WHIRLPOOL d4d53f00e370c8c54ac42e30bafc2a4e37a24bba16b7f8d000836c50dfded358371c363bee51dd6bea60cbf4eb1cbcf2f32f61c70e908e344fc1dbcf299c0e84
 DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7
 DIST mysql-5.6.28.tar.gz 32182980 SHA256 217cd96921abdd709b9b4ff3ce2af4cbd237de43679cf19385d19df03a037b21 SHA512 f02f91586567cb240ec882108ed5cc9e49a4e96545738cf00d43ba6c1fbe8d08b3726dccbe6f7b2412136a1bd50098543975d68ed2322f4cdeb7cd9572d48fcc WHIRLPOOL 039bb2af811d13c573d1a62cd9c8c043b03fba9a369a6afd30336dcc5ba999e90e2e86f1d1b5d4e5944d76eed1c2893e515705aa384cec98e24e2e8a8f7437c2
 DIST mysql-5.7.10.tar.gz 48919371 SHA256 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 SHA512 4434cf651b9607ed2fffbfc8e190bcc2109c8e4b3f8d4e504199721e69332b137b37eab3ab1e91dc08420641a342e99f8d8ae8dfdea60f37f89d94a15bdbd75c WHIRLPOOL 323a41d5b9996145c9769076d636cf293ae5073e3ea3c582752d72727c1538e0cc08076b69f481b921cd06bd6505e84fb6c28ba4ffa2190e4e8204aca96c7b9f
@@ -19,3 +23,16 @@ DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d
 DIST mysql-extras-20151105-2051Z.tar.bz2 1490187 SHA256 129d79c2064b08b0afad69e04e27991bf4103c20ccea39c133239b1dd822a49f SHA512 af34a44275b06c1626eb5952b3643b5663b8a1fb1d9ff18a67d51c02daaa51c4476df407d38ab607cc41842b47e5dd7b4cef8ae380a41eb80923df8052b9e521 WHIRLPOOL 01702ca4e2033fbc70db3ab2dd166b2e31072ea0f6bdd42d00c27ae0c0afab5c8451c4dcc90cce6d46f9ea056017e273f7c719e1cfabf969293bdcd15241f5b3
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQF8BAEBCABmBQJWvTmLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0
+RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44d70AIAIzqngH+couKqvUGqPhEMqb1
+9bWnv43J5I04IFFEWAYRMvIWdFF87AXn25DRMLHONc5kjbz4sriR6OnzpIU1gK0n
+/oIJnF9yl6ZkDHkSEq1GiwtGXFhNYwlpjsJpW3uXnEVmBO4VRMuar+nqnssTJC4a
+S0OIGrl2H47z+k33h0skw6itDdDGMWL4vI/+jAP2bBrcWxb/vyJHI+2vUzxJSn2f
+r1LiaAVFpia4SH8c2MA7plhejdyhb1FTgjznQvpT/n4UKjkSs2SBseuP6dX/IZ7b
+ni7HpYqxAOTOaPY6ghDOYKzlQcbxaj+ESnQ47+PHV6K9IQKUtPenGrxIg8mvpLM=
+=RyGA
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.5.48.ebuild b/dev-db/mysql/mysql-5.5.48.ebuild
new file mode 100644
index 0000000..dbc9696
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.48.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_EXTRAS_VER="20150127-1351Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# 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 mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	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}
+
+		# create symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--testcase-timeout=30 --reorder
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2016-02-12  3:30 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2016-02-12  3:30 UTC (permalink / raw
  To: gentoo-commits

commit:     1a5b9130c050a6f4b2aedc2f9bf3c58c4c83248c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 02:59:29 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 02:59:29 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=1a5b9130

Version bump for 5.6.29

 dev-db/mysql/Manifest            |  18 +----
 dev-db/mysql/mysql-5.6.29.ebuild | 166 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 168 insertions(+), 16 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 103d170..e7e3aa0 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
@@ -9,6 +6,7 @@ DIST mysql-5.5.46.tar.gz 21838374 SHA256 93e0d91f1b380508edcecdd102cbec79a609d6b
 DIST mysql-5.5.48.tar.gz 21201193 SHA256 cc3f8745879eee0508de1a70fc2d267a2d06b7433faa8bb07a787768dcfed781 SHA512 ac13cdfd89dea70f9ffb443affd5b9abf9984c5ea126b58d7833568e985478a667b73b1c9a4c8c80d80ce8da53168ee720191829ed035cff3f9482f58b5510e4 WHIRLPOOL d4d53f00e370c8c54ac42e30bafc2a4e37a24bba16b7f8d000836c50dfded358371c363bee51dd6bea60cbf4eb1cbcf2f32f61c70e908e344fc1dbcf299c0e84
 DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7
 DIST mysql-5.6.28.tar.gz 32182980 SHA256 217cd96921abdd709b9b4ff3ce2af4cbd237de43679cf19385d19df03a037b21 SHA512 f02f91586567cb240ec882108ed5cc9e49a4e96545738cf00d43ba6c1fbe8d08b3726dccbe6f7b2412136a1bd50098543975d68ed2322f4cdeb7cd9572d48fcc WHIRLPOOL 039bb2af811d13c573d1a62cd9c8c043b03fba9a369a6afd30336dcc5ba999e90e2e86f1d1b5d4e5944d76eed1c2893e515705aa384cec98e24e2e8a8f7437c2
+DIST mysql-5.6.29.tar.gz 32220131 SHA256 6ac85b75b2dfa8c232725dda25469df37bf4e48b408cc0978d0dfc34c25a817f SHA512 d0efb3a03274639e3e585d8af338f8907094643dfeeee457de99d5cd7feabb6d69a8b884ccf9625b10df7531a76bc36df25a3e8713dcb657b578fac991ade8c5 WHIRLPOOL 808c3beaf3873e5e8a4a50bf94f511e2327daee39dad675f87370174dda51604e46a2d4f09e16e0c651092600165bcb65fba650f835d93a5983bb2fcb19b9c94
 DIST mysql-5.7.10.tar.gz 48919371 SHA256 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 SHA512 4434cf651b9607ed2fffbfc8e190bcc2109c8e4b3f8d4e504199721e69332b137b37eab3ab1e91dc08420641a342e99f8d8ae8dfdea60f37f89d94a15bdbd75c WHIRLPOOL 323a41d5b9996145c9769076d636cf293ae5073e3ea3c582752d72727c1538e0cc08076b69f481b921cd06bd6505e84fb6c28ba4ffa2190e4e8204aca96c7b9f
 DIST mysql-5.7.11.tar.gz 49195786 SHA256 54f8c7af87d3d8084419bde2b9f0d8970b3dada0757b015981b02f35a3681f0e SHA512 b07587ff4fae6cc0e6d2511235c8e2052e50f1d8e819475f1b9fc377ad3166ff0274a683728adead61329c3213d1cd29b911808ca819e15ec4019b9747fbeae7 WHIRLPOOL 5b3abbbc25b490f345cb9fe292e784cd1f37d3da728c889c2d150c9f631de0f1c0d373fb2e22afeaa8bfa82b7b3c069e02ef81c9b1d869f69379bf2e40e5af53
 DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c WHIRLPOOL 29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5
@@ -21,18 +19,6 @@ DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a
 DIST mysql-extras-20150410-1944Z.tar.bz2 1493690 SHA256 e327adf02be4c2bce5121f01d6b139309c72814b8c50a29559dfddee12a0b4e2 SHA512 e2e5345290134e597734514041e413f0633b8078bfddb8b8e7695468ce7341735b732d5bb602ab7aa9a4045d71571b73aac01a5d96687d4fbd380736f5ed650c WHIRLPOOL f65f294905fd1d04e2be79a803b658ed432338501665a75cbe0cc5b3af8abf0615f1f808465c3ca3c7e850b9277f451f5c77b518977f4bee8dc77d6089ff88fb
 DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
 DIST mysql-extras-20151105-2051Z.tar.bz2 1490187 SHA256 129d79c2064b08b0afad69e04e27991bf4103c20ccea39c133239b1dd822a49f SHA512 af34a44275b06c1626eb5952b3643b5663b8a1fb1d9ff18a67d51c02daaa51c4476df407d38ab607cc41842b47e5dd7b4cef8ae380a41eb80923df8052b9e521 WHIRLPOOL 01702ca4e2033fbc70db3ab2dd166b2e31072ea0f6bdd42d00c27ae0c0afab5c8451c4dcc90cce6d46f9ea056017e273f7c719e1cfabf969293bdcd15241f5b3
+DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQF8BAEBCABmBQJWvTmLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0
-RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44d70AIAIzqngH+couKqvUGqPhEMqb1
-9bWnv43J5I04IFFEWAYRMvIWdFF87AXn25DRMLHONc5kjbz4sriR6OnzpIU1gK0n
-/oIJnF9yl6ZkDHkSEq1GiwtGXFhNYwlpjsJpW3uXnEVmBO4VRMuar+nqnssTJC4a
-S0OIGrl2H47z+k33h0skw6itDdDGMWL4vI/+jAP2bBrcWxb/vyJHI+2vUzxJSn2f
-r1LiaAVFpia4SH8c2MA7plhejdyhb1FTgjznQvpT/n4UKjkSs2SBseuP6dX/IZ7b
-ni7HpYqxAOTOaPY6ghDOYKzlQcbxaj+ESnQ47+PHV6K9IQKUtPenGrxIg8mvpLM=
-=RyGA
------END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.6.29.ebuild b/dev-db/mysql/mysql-5.6.29.ebuild
new file mode 100644
index 0000000..7537cf9
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.29.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_EXTRAS_VER="20160212-0233Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+HAS_TOOLS_PATCH="1"
+SUBSLOT="18"
+
+inherit mysql-multilib-r1
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# 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
+
+# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
+# disable until we see what happens with it
+MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 )
+
+src_prepare() {
+	mysql-multilib-r1_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+}
+
+# Official test instructions:
+# USE='server embedded extraengine perl openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-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 symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5/5.6 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# funcs_1.is_triggers funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
+		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# rpl.rpl_plugin_load
+		# fails due to included file not listed in expected result
+		# appears to be poor planning
+		#
+		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_statement_insert_delayed \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			main.information_schema \
+			main.mysql_client_test \
+			main.mysqld--help-notwin \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+			rpl.rpl_plugin_load \
+			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+		; do
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		if ! use extraengine ; then
+			# bug 401673, 530766
+			for t in federated.federated_plugin ; do
+				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# Set file limits higher so tests run
+		ulimit -n 3000
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--suite-timeout=5000 --reorder
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2016-02-12  3:30 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2016-02-12  3:30 UTC (permalink / raw
  To: gentoo-commits

commit:     e43554a47fe59f7eb9127afcaa1cd5058e3e54bc
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 03:02:20 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 03:02:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=e43554a4

dev-db/mysql: Drop old version

Package-Manager: portage-2.2.27
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

 dev-db/mysql/ChangeLog              |   5 ++
 dev-db/mysql/Manifest               |  24 +++--
 dev-db/mysql/mysql-5.5.46.ebuild    | 126 --------------------------
 dev-db/mysql/mysql-5.6.27-r1.ebuild | 173 ------------------------------------
 dev-db/mysql/mysql-5.6.27.ebuild    | 166 ----------------------------------
 dev-db/mysql/mysql-5.6.28.ebuild    | 166 ----------------------------------
 dev-db/mysql/mysql-5.7.7_rc.ebuild  | 135 ----------------------------
 dev-db/mysql/mysql-5.7.8_rc.ebuild  | 135 ----------------------------
 8 files changed, 21 insertions(+), 909 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index dc32610..c27b21f 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  12 Feb 2016; Brian Evans <grknight@gentoo.org> -mysql-5.5.46.ebuild,
+  -mysql-5.6.27-r1.ebuild, -mysql-5.6.27.ebuild, -mysql-5.6.28.ebuild,
+  -mysql-5.7.7_rc.ebuild, -mysql-5.7.8_rc.ebuild:
+  dev-db/mysql: Drop old version
+
 *mysql-5.5.48 (12 Feb 2016)
 
   12 Feb 2016; Brian Evans <grknight@gentoo.org> +mysql-5.5.48.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index e7e3aa0..30511ab 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,24 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.46.tar.gz 21838374 SHA256 93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e SHA512 c2db730318d4c16793d62dbd937c1ff739fffabab6d1689b94252f5501ff36917ddf80a8144583492c05220b3ae33f29ecbcec10f6d8ae0a0b10142be719fc27 WHIRLPOOL 355260ae0e7385c7d00b289e37af09374bc8320f69a55d7ee0469283382f197fd430be32019668b1f29cda69f9d76965d4ee749cb93f1e8263799673e4f0f535
 DIST mysql-5.5.48.tar.gz 21201193 SHA256 cc3f8745879eee0508de1a70fc2d267a2d06b7433faa8bb07a787768dcfed781 SHA512 ac13cdfd89dea70f9ffb443affd5b9abf9984c5ea126b58d7833568e985478a667b73b1c9a4c8c80d80ce8da53168ee720191829ed035cff3f9482f58b5510e4 WHIRLPOOL d4d53f00e370c8c54ac42e30bafc2a4e37a24bba16b7f8d000836c50dfded358371c363bee51dd6bea60cbf4eb1cbcf2f32f61c70e908e344fc1dbcf299c0e84
-DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7
-DIST mysql-5.6.28.tar.gz 32182980 SHA256 217cd96921abdd709b9b4ff3ce2af4cbd237de43679cf19385d19df03a037b21 SHA512 f02f91586567cb240ec882108ed5cc9e49a4e96545738cf00d43ba6c1fbe8d08b3726dccbe6f7b2412136a1bd50098543975d68ed2322f4cdeb7cd9572d48fcc WHIRLPOOL 039bb2af811d13c573d1a62cd9c8c043b03fba9a369a6afd30336dcc5ba999e90e2e86f1d1b5d4e5944d76eed1c2893e515705aa384cec98e24e2e8a8f7437c2
 DIST mysql-5.6.29.tar.gz 32220131 SHA256 6ac85b75b2dfa8c232725dda25469df37bf4e48b408cc0978d0dfc34c25a817f SHA512 d0efb3a03274639e3e585d8af338f8907094643dfeeee457de99d5cd7feabb6d69a8b884ccf9625b10df7531a76bc36df25a3e8713dcb657b578fac991ade8c5 WHIRLPOOL 808c3beaf3873e5e8a4a50bf94f511e2327daee39dad675f87370174dda51604e46a2d4f09e16e0c651092600165bcb65fba650f835d93a5983bb2fcb19b9c94
 DIST mysql-5.7.10.tar.gz 48919371 SHA256 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 SHA512 4434cf651b9607ed2fffbfc8e190bcc2109c8e4b3f8d4e504199721e69332b137b37eab3ab1e91dc08420641a342e99f8d8ae8dfdea60f37f89d94a15bdbd75c WHIRLPOOL 323a41d5b9996145c9769076d636cf293ae5073e3ea3c582752d72727c1538e0cc08076b69f481b921cd06bd6505e84fb6c28ba4ffa2190e4e8204aca96c7b9f
 DIST mysql-5.7.11.tar.gz 49195786 SHA256 54f8c7af87d3d8084419bde2b9f0d8970b3dada0757b015981b02f35a3681f0e SHA512 b07587ff4fae6cc0e6d2511235c8e2052e50f1d8e819475f1b9fc377ad3166ff0274a683728adead61329c3213d1cd29b911808ca819e15ec4019b9747fbeae7 WHIRLPOOL 5b3abbbc25b490f345cb9fe292e784cd1f37d3da728c889c2d150c9f631de0f1c0d373fb2e22afeaa8bfa82b7b3c069e02ef81c9b1d869f69379bf2e40e5af53
-DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c WHIRLPOOL 29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5
-DIST mysql-5.7.8-rc.tar.gz 49762480 SHA256 9da4bff6e0840d260b2fef2dac0138e6f0fa05f2a95cf3f6cb1014a0fd46269b SHA512 97f77c2e3fc3fe2a1fbc4c9008f6ed75bfd64a309f066237de8a28c242cead98ad1700c133e21101545e9d7780f6e30aad0620ea6abe6dd40c0f63a20aaed44b WHIRLPOOL e63fda54bf90d883f90fdc3f9591914fc867a5dd0945cf6480396c2ac5c33add644edae0ca344c3c0c1c9c74ad04b39482c48eff1eeb91b4dced0e6b201e5e32
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
 DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
-DIST mysql-extras-20150410-1944Z.tar.bz2 1493690 SHA256 e327adf02be4c2bce5121f01d6b139309c72814b8c50a29559dfddee12a0b4e2 SHA512 e2e5345290134e597734514041e413f0633b8078bfddb8b8e7695468ce7341735b732d5bb602ab7aa9a4045d71571b73aac01a5d96687d4fbd380736f5ed650c WHIRLPOOL f65f294905fd1d04e2be79a803b658ed432338501665a75cbe0cc5b3af8abf0615f1f808465c3ca3c7e850b9277f451f5c77b518977f4bee8dc77d6089ff88fb
-DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
-DIST mysql-extras-20151105-2051Z.tar.bz2 1490187 SHA256 129d79c2064b08b0afad69e04e27991bf4103c20ccea39c133239b1dd822a49f SHA512 af34a44275b06c1626eb5952b3643b5663b8a1fb1d9ff18a67d51c02daaa51c4476df407d38ab607cc41842b47e5dd7b4cef8ae380a41eb80923df8052b9e521 WHIRLPOOL 01702ca4e2033fbc70db3ab2dd166b2e31072ea0f6bdd42d00c27ae0c0afab5c8451c4dcc90cce6d46f9ea056017e273f7c719e1cfabf969293bdcd15241f5b3
 DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQF8BAEBCABmBQJWvUs8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0
+RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44d0zoH/jPrfnVz07UhkMTBUtKBEB5T
+6jmwFtKxxtn6SJRC67e4nRof7djlDv9OYOpIjxUSXMB0ZyY1T+MHIixoeThhSIXT
+aUjoiAOUZif4ihqP29FzhTfrxvbc8kyGFMCrNHSMHnpSO3Y7y0Rfj3JZ2kV/Ee7R
+ETZma+P5kge0Il/LHhN4o1Q4LIp6M0Wk8967r3wq/Au4wMqU6VOxmTMUNn/a65dG
+6XUFecbAYeP1lmpw1fcDPxR/DCoi/iDyvAyEZswGiV3J5TZO3D6h71n02POViCbI
+Cz9b93mmrl6IIvC9BojR+ihQkCe/9X+0UOjO1LdXwDfUDFQglc2n6fBT9IeSoxk=
+=C4A4
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.5.46.ebuild b/dev-db/mysql/mysql-5.5.46.ebuild
deleted file mode 100644
index 9a964d7..0000000
--- a/dev-db/mysql/mysql-5.5.46.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150127-1351Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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 mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	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}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30 --reorder
-		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/mysql/mysql-5.6.27-r1.ebuild b/dev-db/mysql/mysql-5.6.27-r1.ebuild
deleted file mode 100644
index 92edb90..0000000
--- a/dev-db/mysql/mysql-5.6.27-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150717-1707Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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
-
-# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
-# disable until we see what happens with it
-MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1"
-
-src_prepare() {
-	mysql-multilib_src_prepare
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-}
-
-# Official test instructions:
-# USE='server embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-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"
-
-		# 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
-
-		# 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 symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		if ! use extraengine ; then
-			# bug 401673, 530766
-			for t in federated.federated_plugin ; do
-				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000 --reorder
-		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/mysql/mysql-5.6.27.ebuild b/dev-db/mysql/mysql-5.6.27.ebuild
deleted file mode 100644
index 1232657..0000000
--- a/dev-db/mysql/mysql-5.6.27.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150410-1944Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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
-
-# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
-# disable until we see what happens with it
-MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1"
-
-src_prepare() {
-	mysql-multilib_src_prepare
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-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}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		if ! use extraengine ; then
-			# bug 401673, 530766
-			for t in federated.federated_plugin ; do
-				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000 --reorder
-		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/mysql/mysql-5.6.28.ebuild b/dev-db/mysql/mysql-5.6.28.ebuild
deleted file mode 100644
index ee4c1e8..0000000
--- a/dev-db/mysql/mysql-5.6.28.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_EXTRAS_VER="20151105-2051Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-HAS_TOOLS_PATCH="1"
-SUBSLOT="18"
-
-inherit mysql-multilib-r1
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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
-
-# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
-# disable until we see what happens with it
-MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 )
-
-src_prepare() {
-	mysql-multilib-r1_src_prepare
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-}
-
-# Official test instructions:
-# USE='server embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-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 symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-		; do
-				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		if ! use extraengine ; then
-			# bug 401673, 530766
-			for t in federated.federated_plugin ; do
-				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000 --reorder
-		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/mysql/mysql-5.7.7_rc.ebuild b/dev-db/mysql/mysql-5.7.7_rc.ebuild
deleted file mode 100644
index 9425c5c..0000000
--- a/dev-db/mysql/mysql-5.7.7_rc.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-SUBSLOT="20"
-
-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 ~ia64 ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-linux"
-
-# 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
-
-src_prepare() {
-	mysql-multilib_src_prepare
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-}
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/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/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, funcs_1.is_columns_mysql, 
-		# funcs_1.is_tables_mysql, funcs_1.is_triggers,
-		# binlog.binlog_mysqlbinlog_filter, perfschema.binlog_edge_mix,
-		# perfschema.binlog_edge_stmt
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.mysql_tzinfo_to_sql_symlink
-		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql funcs_1.is_triggers \
-			binlog.binlog_mysqlbinlog_filter perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt main.mysql_tzinfo_to_sql_symlink ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--suite-timeout=5000 --testcase-timeout=30
-		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/mysql/mysql-5.7.8_rc.ebuild b/dev-db/mysql/mysql-5.7.8_rc.ebuild
deleted file mode 100644
index 2ac4f45..0000000
--- a/dev-db/mysql/mysql-5.7.8_rc.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-SUBSLOT="20"
-
-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://anongit.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-linux"
-
-# 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
-
-src_prepare() {
-	mysql-multilib_src_prepare
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-}
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	local TESTDIR="${CMAKE_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))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${S}"/mysql-test/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/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, funcs_1.is_columns_mysql, 
-		# funcs_1.is_tables_mysql, funcs_1.is_triggers,
-		# binlog.binlog_mysqlbinlog_filter, perfschema.binlog_edge_mix,
-		# perfschema.binlog_edge_stmt
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.mysql_tzinfo_to_sql_symlink
-		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql funcs_1.is_triggers \
-			binlog.binlog_mysqlbinlog_filter perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt main.mysql_tzinfo_to_sql_symlink ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--suite-timeout=5000 --testcase-timeout=30
-		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
-}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2016-04-12 18:23 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2016-04-12 18:23 UTC (permalink / raw
  To: gentoo-commits

commit:     54aa6ce214266df8c2be74ef567b4782cce4a7a9
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 18:23:19 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 18:23:19 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=54aa6ce2

dev-db/mysql: Version bump for 5.5.49 and 5.6.30

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

 dev-db/mysql/ChangeLog                             |  7 +++++
 dev-db/mysql/Manifest                              | 30 +++++++++++++---------
 .../{mysql-5.5.48.ebuild => mysql-5.5.49.ebuild}   |  0
 .../{mysql-5.6.29.ebuild => mysql-5.6.30.ebuild}   |  0
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index ce753ad..399c25f 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*mysql-5.5.49 (12 Apr 2016)
+*mysql-5.6.30 (12 Apr 2016)
+
+  12 Apr 2016; Brian Evans <grknight@gentoo.org> +mysql-5.5.49.ebuild,
+  +mysql-5.6.30.ebuild, -mysql-5.5.48.ebuild, -mysql-5.6.29.ebuild:
+  dev-db/mysql: Version bump for 5.5.49 and 5.6.30
+
   12 Feb 2016; Brian Evans <grknight@gentoo.org> metadata.xml:
   dev-db/mysql: Remove old USE flag descriptions for client-libs and tools
 

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 30511ab..5b7ac8b 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,8 +5,8 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.48.tar.gz 21201193 SHA256 cc3f8745879eee0508de1a70fc2d267a2d06b7433faa8bb07a787768dcfed781 SHA512 ac13cdfd89dea70f9ffb443affd5b9abf9984c5ea126b58d7833568e985478a667b73b1c9a4c8c80d80ce8da53168ee720191829ed035cff3f9482f58b5510e4 WHIRLPOOL d4d53f00e370c8c54ac42e30bafc2a4e37a24bba16b7f8d000836c50dfded358371c363bee51dd6bea60cbf4eb1cbcf2f32f61c70e908e344fc1dbcf299c0e84
-DIST mysql-5.6.29.tar.gz 32220131 SHA256 6ac85b75b2dfa8c232725dda25469df37bf4e48b408cc0978d0dfc34c25a817f SHA512 d0efb3a03274639e3e585d8af338f8907094643dfeeee457de99d5cd7feabb6d69a8b884ccf9625b10df7531a76bc36df25a3e8713dcb657b578fac991ade8c5 WHIRLPOOL 808c3beaf3873e5e8a4a50bf94f511e2327daee39dad675f87370174dda51604e46a2d4f09e16e0c651092600165bcb65fba650f835d93a5983bb2fcb19b9c94
+DIST mysql-5.5.49.tar.gz 21202609 SHA256 cd9ca49b01a76bca635f2888b9d4d30fa6583dd198994d407cdd0dd7170e9e1f SHA512 2c4db3003718cf0c8b02986e7daff00653cf1cba57cdc6b157189050f1d4c41c04c4c43f81e4121a9730b1d28e27af81651bc9dc379fa2e049f49bab7dee1fab WHIRLPOOL 8eefce7f4b6d36156184eadf2289a7386566318dd0bf028e5725904bdd77054c2fe422973e4c50438666ab0fe1dfef388dd7e9c06fab7cbc662f88c8ef5c55f2
+DIST mysql-5.6.30.tar.gz 32223818 SHA256 48464df00aad9b9dfc26c903529ddad944a7562aa28e66e98e4f3f0c35179deb SHA512 b9f5b22a0557fbdd765fd3c379395584dd35bbec2d7504eb132f734129c0d95d24dc538c9b64524870bbecb92fa2f1e95b49ccfe22531ed17ec1e754f08d491b WHIRLPOOL f56d4e9d2ac801605bb941d1a8ba4b876d838a5e3bdac2e644477e87f2e5d439594c28d0e1c1d0c45ebb38fbf4183c429dc8c53bd7aa76aeea95acd1774ca71e
 DIST mysql-5.7.10.tar.gz 48919371 SHA256 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 SHA512 4434cf651b9607ed2fffbfc8e190bcc2109c8e4b3f8d4e504199721e69332b137b37eab3ab1e91dc08420641a342e99f8d8ae8dfdea60f37f89d94a15bdbd75c WHIRLPOOL 323a41d5b9996145c9769076d636cf293ae5073e3ea3c582752d72727c1538e0cc08076b69f481b921cd06bd6505e84fb6c28ba4ffa2190e4e8204aca96c7b9f
 DIST mysql-5.7.11.tar.gz 49195786 SHA256 54f8c7af87d3d8084419bde2b9f0d8970b3dada0757b015981b02f35a3681f0e SHA512 b07587ff4fae6cc0e6d2511235c8e2052e50f1d8e819475f1b9fc377ad3166ff0274a683728adead61329c3213d1cd29b911808ca819e15ec4019b9747fbeae7 WHIRLPOOL 5b3abbbc25b490f345cb9fe292e784cd1f37d3da728c889c2d150c9f631de0f1c0d373fb2e22afeaa8bfa82b7b3c069e02ef81c9b1d869f69379bf2e40e5af53
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
@@ -18,15 +18,21 @@ DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQF8BAEBCABmBQJWvUs8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0
-RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44d0zoH/jPrfnVz07UhkMTBUtKBEB5T
-6jmwFtKxxtn6SJRC67e4nRof7djlDv9OYOpIjxUSXMB0ZyY1T+MHIixoeThhSIXT
-aUjoiAOUZif4ihqP29FzhTfrxvbc8kyGFMCrNHSMHnpSO3Y7y0Rfj3JZ2kV/Ee7R
-ETZma+P5kge0Il/LHhN4o1Q4LIp6M0Wk8967r3wq/Au4wMqU6VOxmTMUNn/a65dG
-6XUFecbAYeP1lmpw1fcDPxR/DCoi/iDyvAyEZswGiV3J5TZO3D6h71n02POViCbI
-Cz9b93mmrl6IIvC9BojR+ihQkCe/9X+0UOjO1LdXwDfUDFQglc2n6fBT9IeSoxk=
-=C4A4
+iQJ8BAEBCABmBQJXDT0TXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2xNIQAOREg/YzgD1AVW1pyx2oEeIN
+DBlULjMa9UfEUO18UJRniSGmwMMvS1uP0DPI6V9M+2RkjxQxiYFX/83ExvLzZ/Mw
+OUeWldkz2SOSh4cRadcYoadknxGOfhu+oqpV8B6h0S3s/TRm8+uOIuQeErWQ6Oqt
+hlSDgYZzYutVBL+H4CV4F7felgHxzP5ts2f4UXweTH4gDnDUjv7xXA/29xUlreWl
+rZViW/Rm3jozryrdUYl/NySmxwDrUAjf1z/cmZjNiSO1N5St+lCnn4wR6sGQHaX2
+lxVoPeY+s0x7CZnRzSY3XnSLfbpfanuyGMTrG2U3M5iH3PH9mNCpqWM6tXdavE+U
+CKxKtad8SoblHLLtTEhgzJvcYm09uwcZY3cjy0pwvtNn98Q94vueglDUpik8Q+Io
+waKMDdJn5Nm5oOgejWocww79WPAC/AxbeWlk8mZZCKdse35urW/8uNRou06tvAiE
+fQf5+GMrXWtWRgbSfuc5Uo7lafCKvfVfKnrWFGoZMsLh7KntaWU6rAwwqnRRyR9J
+VdWKknKMHdNgsEwQOrSzLAeSGZiC2PYE02lQ1CrXrXDPIKD/X5e70K3qU5yjaYCE
+uKAp42KkNL8yDbGPIdZ7X/Yo+niT0WctBgf5o9jJOYtNI+PP8/yUPFJ91uzmSE+T
+/z32vbLkcBtObNKmhSWc
+=SlmU
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.5.48.ebuild b/dev-db/mysql/mysql-5.5.49.ebuild
similarity index 100%
rename from dev-db/mysql/mysql-5.5.48.ebuild
rename to dev-db/mysql/mysql-5.5.49.ebuild

diff --git a/dev-db/mysql/mysql-5.6.29.ebuild b/dev-db/mysql/mysql-5.6.30.ebuild
similarity index 100%
rename from dev-db/mysql/mysql-5.6.29.ebuild
rename to dev-db/mysql/mysql-5.6.30.ebuild


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2016-04-29 19:52 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2016-04-29 19:52 UTC (permalink / raw
  To: gentoo-commits

commit:     2f31b06fc03eb05e3aa3089c7e5cf3c01a107ae0
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 19:52:38 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 19:52:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=2f31b06f

dev-db/mysql: Force a download of boost-1.59 and use it in the build.  Only a portion is actually used

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

 dev-db/mysql/ChangeLog           |  4 ++++
 dev-db/mysql/Manifest            | 23 +----------------------
 dev-db/mysql/mysql-5.7.12.ebuild |  8 +++-----
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 52551b5..d98dac7 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  29 Apr 2016; Brian Evans <grknight@gentoo.org> mysql-5.7.12.ebuild:
+  dev-db/mysql: Force a download of boost-1.59 and use it in the build.  Only a
+  portion is actually used
+
 *mysql-5.7.12 (27 Apr 2016)
 
   27 Apr 2016; Brian Evans <grknight@gentoo.org> +files/5.7.12-boost.cmake,

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index a07e6cc..5ee3cdf 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+DIST boost_1_59_0.tar.bz2 70389425 SHA256 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca SHA512 8139e1ae997a86974071c5714ad3307e3d8fd15ef702b81a953410dd4d424b932135f53a0ef4891d9b9b747a38e539e66d6a803388fe0cc98e5166be872d682a WHIRLPOOL ab26f6b770c32320e71806d7f7856b3841917dcc59e0c5ee588fc77d77f11855dda66bfb808dbe0f3f89859b958211439c271401a5b1ad2ea98aa5d377934510
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
@@ -18,22 +16,3 @@ DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a
 DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
-
-iQJ8BAEBCABmBQJXIQsDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2gVUP/3IBPwZuxtL7bx6SFzWzYePU
-B6Lfu6OmLOzRAQohiQtQuAkw98eWf1abv2t2aT4qcagakgjmJAKKH+UIcypwQh9f
-0QMasfkjeBSw0ioQT0BlnbP2Jb1P5k6he+wOkftyOTKGGA2m6sqwPM7QUyiXglG9
-lTdbatyANEwosiG6Q9i6fOcDb1JeT6y0kFvPErN50i7xxzSwd/Cj3imTw+3XqwDc
-65S/CcJYzswB+xovaLJGmELOkFre+gHCKx1dClkBhHF6SbA1kIk1yeMKRfp82czk
-173epqJt6PS+tIOajCusrQ7wFlLPswcmum7rhYRMiEeDoyHl8p8ZusLCp7WfKuHQ
-ITFFyphfcrdubloXynUXJ0dB4PWhSiWY8IQgVEc1nCRCr5ni7kqrUl0f6u0IMHEg
-VVa0MXt0bFSkEhtS2rkUEHQVIS4k6PuO53RIZzjp1+lOU+zInnV6qZ90wK4n9Y6f
-SxRgnjUeZdV8+yx9ZUpkkFYkEttnBgq7eFmiMZsvEpJtcfCRtZFT0QZl+KxvdvEl
-+Ni/C3bOPzARoNNDj/S8yeEwiof/dvNk7JvJ+wIuYY7XsU1mOibbVvQvPQrO8ghD
-4U+jaf0dakZU+Qq9+fzMWiAyQ2UjdAGq8Cvo3BjDyCgXV7zefav7dELl+trZgoOE
-sgbCr8Zz+Oco2VQcMZvl
-=EyUG
------END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.7.12.ebuild b/dev-db/mysql/mysql-5.7.12.ebuild
index 73543de..9d6adf2 100644
--- a/dev-db/mysql/mysql-5.7.12.ebuild
+++ b/dev-db/mysql/mysql-5.7.12.ebuild
@@ -10,6 +10,8 @@ MY_PV="${MY_PV//_/-}"
 SUBSLOT="20"
 
 inherit mysql-multilib-r1
+SRC_URI+="mirror://sourceforge/boost/boost_1_59_0.tar.bz2"
+
 # only to make repoman happy. it is really set in the eclass
 IUSE="$IUSE"
 
@@ -20,7 +22,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 EPATCH_EXCLUDE=''
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	>=dev-libs/boost-1.60:=
 	>=app-arch/lz4-0_p131:="
 RDEPEND="${RDEPEND}"
 
@@ -46,16 +47,13 @@ src_prepare() {
 		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
 			"${S}/cmake/ssl.cmake" || die
 	fi
-	# Oracle's boost detection does not fit well with Gentoo
-	# It includes download and build on the fly and hard depending on a single version
-	# Replace it with a stripped down version
-	cp "${FILESDIR}/5.7.12-boost.cmake" "${S}/cmake/boost.cmake" || die
 }
 
 src_configure() {
 	local MYSQL_CMAKE_NATIVE_DEFINES=(
 		-DWITH_LZ4=system
 		-DWITH_NUMA=OFF
+		-DWITH_BOOST="${WORKDIR}/boost_1_59_0"
 	)
 	mysql-multilib-r1_src_configure
 }


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
       [not found] <1483479079.1e70022facc519de2f3b12c26191f0a021faa862.grknight@gentoo>
@ 2017-01-03 21:37 ` Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2017-01-03 21:37 UTC (permalink / raw
  To: gentoo-commits

commit:     1e70022facc519de2f3b12c26191f0a021faa862
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 21:31:19 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 21:31:19 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=1e70022f

dev-db/mysql: Version bump in 5.7 series.

Just about done but needs major tree work to be included

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/ChangeLog           |   8 +-
 dev-db/mysql/Manifest            |  23 +++++
 dev-db/mysql/mysql-5.7.17.ebuild | 210 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 240 insertions(+), 1 deletion(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index d98dac7..e290fc0 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-db/mysql
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*mysql-5.7.17 (03 Jan 2017)
+
+  03 Jan 2017; Brian Evans <grknight@gentoo.org> +mysql-5.7.17.ebuild:
+  dev-db/mysql: Version bump in 5.7 series.  Just about done but needs major
+  tree work to be included
+
   29 Apr 2016; Brian Evans <grknight@gentoo.org> mysql-5.7.12.ebuild:
   dev-db/mysql: Force a download of boost-1.59 and use it in the build.  Only a
   portion is actually used

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5ee3cdf..1703e16 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST boost_1_59_0.tar.bz2 70389425 SHA256 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca SHA512 8139e1ae997a86974071c5714ad3307e3d8fd15ef702b81a953410dd4d424b932135f53a0ef4891d9b9b747a38e539e66d6a803388fe0cc98e5166be872d682a WHIRLPOOL ab26f6b770c32320e71806d7f7856b3841917dcc59e0c5ee588fc77d77f11855dda66bfb808dbe0f3f89859b958211439c271401a5b1ad2ea98aa5d377934510
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
@@ -8,6 +11,7 @@ DIST mysql-5.6.30.tar.gz 32223818 SHA256 48464df00aad9b9dfc26c903529ddad944a7562
 DIST mysql-5.7.10.tar.gz 48919371 SHA256 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 SHA512 4434cf651b9607ed2fffbfc8e190bcc2109c8e4b3f8d4e504199721e69332b137b37eab3ab1e91dc08420641a342e99f8d8ae8dfdea60f37f89d94a15bdbd75c WHIRLPOOL 323a41d5b9996145c9769076d636cf293ae5073e3ea3c582752d72727c1538e0cc08076b69f481b921cd06bd6505e84fb6c28ba4ffa2190e4e8204aca96c7b9f
 DIST mysql-5.7.11.tar.gz 49195786 SHA256 54f8c7af87d3d8084419bde2b9f0d8970b3dada0757b015981b02f35a3681f0e SHA512 b07587ff4fae6cc0e6d2511235c8e2052e50f1d8e819475f1b9fc377ad3166ff0274a683728adead61329c3213d1cd29b911808ca819e15ec4019b9747fbeae7 WHIRLPOOL 5b3abbbc25b490f345cb9fe292e784cd1f37d3da728c889c2d150c9f631de0f1c0d373fb2e22afeaa8bfa82b7b3c069e02ef81c9b1d869f69379bf2e40e5af53
 DIST mysql-5.7.12.tar.gz 50571897 SHA256 32843cb6d22ab22cd2340262b53c0d6009b5bd41b1fa4102beda19635a5c1c87 SHA512 a36013f3af9a15f8e9abec7673485ca1dd5532afcc0e2570659f510da1a1763af8de478231c5723d2395f635a6956d1500652999fedf344f7d8970265860eea5 WHIRLPOOL 9d0486ae3b8ab404f5e03829d12a477f8a990a959e32286d4920fd8bdf18689e693249be3a9f0e93e61c6a6e953846e1546620ecdeb834c4e69c45bf676a2670
+DIST mysql-boost-5.7.17.tar.gz 61480982 SHA256 b75bba87199ef6a6ccc5dfbcaf70949009dc12089eafad8c5254afc9002aa903 SHA512 a1512abeba307fd21687677d2ee4bf20ced373312824de034e9b340d97e67eb4fcc5caa4ad7d9f58d6c0ddf57f6f6c0b0978e7b01c46f397ac661da843e3dfa6 WHIRLPOOL c9c078afdb1f8eb4405593611c179552493265c50b1eb1bac8cecadbac07103a11a05daf8c26d3d751526d5a69f14a8b6fce40b1aaaac7b9b4680679bf61bc4f
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
@@ -16,3 +20,22 @@ DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a
 DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlhsGCdfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
+QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
+o7ZbuxAAxTdP9YqM+Iv9cWrH3RVWP1RZpxCtDUIirM5c3PE88V1cZo9Aalujp7rC
+A4aOMcUQa4f2kJcgt4sDDEnn1eWTdlKHd4FNb0v8NF0Gk0JyO5i0Jx6YH4Aez1UP
++f2wb3IA82H/GEJgp33F03+fzMjkscMZpEafARDwyrAWNjgEe58guOD39jnLgCR+
+RjifAD8isQ1Cv+FSrWZ4hIflBVaQbE6YqKxMqRlvpwK636dmpH+mvUhzljaX3+7A
+FzihMfKMKMhaYy8kXbZYVnHzZPlu4EAq1pZ7QCxv5qX3IoCiU8hsCzpNzhy8JiRO
+ETnW/c0gKjHdp+10chcQfcSohrP+9HWjSYi79JwnA4FEs8H1kGR7UsTQTO/+Hs0G
+WV++yR91slnV8TQhUVV6gU+3FZcEeSqzAtAhdxl7umUAV57ArekxqM1ezKUvvCF1
+UDAEk3fCFWSpCh75Oq2dq2jyYSqvTKrbmanDjiUAsx7yGsPNnIlkiKLydRns9N/7
+PoeejdQvzsb9qCmGiy270opLaB+2BpcJT0yFwikQvKvPyQe36jbQLdAjGxnUKbr5
+XUVRtahN4bK62bzFGwL2PXUuHK9gAUHLT0A0hUnFgs1ZixihNuDMrbjDq77xUSOb
+ZEect3ybZNxb436eFyGqGUxPTOmA8LBZe7B5lSowquf9OGtDXAE=
+=OCNp
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.7.17.ebuild b/dev-db/mysql/mysql-5.7.17.ebuild
new file mode 100644
index 0000000..8a6a1f9
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.17.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+MY_EXTRAS_VER="live"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+SUBSLOT="20"
+
+SERVER_URI="http://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${MY_PV}.tar.gz"
+MY_SOURCEDIR="${PN}-${MY_PV}"
+inherit mysql-multilib-r1
+
+IUSE="cjk"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# 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 )
+	>=app-arch/lz4-0_p131:=
+	cjk? ( app-text/mecab )"
+RDEPEND="${RDEPEND}"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras"
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
+	"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.7.patch
+	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.7.patch
+	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
+	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.7.6.patch
+	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7-without-clientlibs-tools.patch
+)
+
+# 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
+
+src_prepare() {
+	mysql-multilib-r1_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+	# Remove dozens of test only plugins by deleting them
+	if ! use test ; then
+		rm -r "${S}"/plugin/{test_service_sql_api,test_services,udf_services} || die
+	fi
+	# Remove CJK Fulltext plugin
+	if ! use cjk ; then
+		rm -r "${S}"/plugin/fulltext || die
+	fi
+}
+
+src_configure() {
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+		-DWITH_LZ4=system
+		-DWITH_NUMA=OFF
+		-DWITH_BOOST="${S}/boost/boost_1_59_0"
+	)
+	# This is the CJK fulltext plugin, not related to the complete fulltext indexing
+	if use cjk ; then
+		MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITH_MECAB=system  )
+	else
+		MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITHOUT_FULLTEXT=1  )
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='server embedded extraengine perl openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-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 symlink for the tests to find mysql_tzinfo_to_sql
+		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+		# These are failing in MySQL 5.5/5.6 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# funcs_1.is_triggers funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
+		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# rpl.rpl_plugin_load
+		# fails due to included file not listed in expected result
+		# appears to be poor planning
+		#
+		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+		#
+		# main.events2
+		# Event creation is in the past and automatically dropped
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_statement_insert_delayed \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			main.information_schema \
+			main.mysql_client_test \
+			main.mysqld--help-notwin \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+			rpl.rpl_plugin_load \
+			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+			main.events_2 \
+		; do
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		if ! use extraengine ; then
+			# bug 401673, 530766
+			for t in federated.federated_plugin ; do
+				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
+			done
+		fi
+
+		if ! use cjk ; then
+			for t in innodb_fts.ngram_2 innodb_fts.ngram_1 innodb_fts.ngram ; do
+				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=cjk"
+			done
+		fi
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# Set file limits higher so tests run
+#		ulimit -n 3000
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--suite-timeout=5000 --reorder
+		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
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2017-01-09 16:27 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2017-01-09 16:27 UTC (permalink / raw
  To: gentoo-commits

commit:     24a391e387cb62906982972a5c9775cb021dfcba
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 16:27:07 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 16:27:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=24a391e3

dev-db/mysql: Add Protobuf DEPEND

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/ChangeLog           | 3 +++
 dev-db/mysql/mysql-5.7.17.ebuild | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index e290fc0..4834b26 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  09 Jan 2017; Brian Evans <grknight@gentoo.org> mysql-5.7.17.ebuild:
+  dev-db/mysql: Add Protobuf DEPEND
+
 *mysql-5.7.17 (03 Jan 2017)
 
   03 Jan 2017; Brian Evans <grknight@gentoo.org> +mysql-5.7.17.ebuild:

diff --git a/dev-db/mysql/mysql-5.7.17.ebuild b/dev-db/mysql/mysql-5.7.17.ebuild
index 8a6a1f9..cf2ad9e 100644
--- a/dev-db/mysql/mysql-5.7.17.ebuild
+++ b/dev-db/mysql/mysql-5.7.17.ebuild
@@ -23,6 +23,7 @@ EPATCH_EXCLUDE=''
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
 	>=app-arch/lz4-0_p131:=
+	>=dev-libs/protobuf-2.5.0:=
 	cjk? ( app-text/mecab )"
 RDEPEND="${RDEPEND}"
 
@@ -63,6 +64,7 @@ src_configure() {
 		-DWITH_LZ4=system
 		-DWITH_NUMA=OFF
 		-DWITH_BOOST="${S}/boost/boost_1_59_0"
+		-DWITH_PROTOBUF=system
 	)
 	# This is the CJK fulltext plugin, not related to the complete fulltext indexing
 	if use cjk ; then


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2017-03-02 14:30 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2017-03-02 14:30 UTC (permalink / raw
  To: gentoo-commits

commit:     ba7a034253b62d509fc69c085d292a52024fe31f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  2 14:14:48 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar  2 14:14:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ba7a0342

dev-db/mysql: Drop defunct x86-freebsd arch

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/ChangeLog              |   6 ++
 dev-db/mysql/Manifest               |  28 ++++----
 dev-db/mysql/mysql-4.0.27-r1.ebuild |   2 +-
 dev-db/mysql/mysql-4.1.22-r1.ebuild |   2 +-
 dev-db/mysql/mysql-5.0.96.ebuild    |   4 +-
 dev-db/mysql/mysql-5.1.73-r1.ebuild |   2 +-
 dev-db/mysql/mysql-5.5.49.ebuild    | 126 ------------------------------------
 dev-db/mysql/mysql-5.6.30.ebuild    |   4 +-
 dev-db/mysql/mysql-5.7.10.ebuild    |   4 +-
 dev-db/mysql/mysql-5.7.11.ebuild    |   4 +-
 dev-db/mysql/mysql-5.7.12.ebuild    |   4 +-
 dev-db/mysql/mysql-5.7.17.ebuild    |   2 +-
 12 files changed, 33 insertions(+), 155 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 4834b26..37668d1 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  02 Mar 2017; Brian Evans <grknight@gentoo.org> -mysql-5.5.49.ebuild,
+  mysql-4.0.27-r1.ebuild, mysql-4.1.22-r1.ebuild, mysql-5.0.96.ebuild,
+  mysql-5.1.73-r1.ebuild, mysql-5.6.30.ebuild, mysql-5.7.10.ebuild,
+  mysql-5.7.11.ebuild, mysql-5.7.12.ebuild, mysql-5.7.17.ebuild:
+  dev-db/mysql: Drop defunct x86-freebsd arch
+
   09 Jan 2017; Brian Evans <grknight@gentoo.org> mysql-5.7.17.ebuild:
   dev-db/mysql: Add Protobuf DEPEND
 

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 1703e16..39fbe3e 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -6,7 +6,6 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.49.tar.gz 21202609 SHA256 cd9ca49b01a76bca635f2888b9d4d30fa6583dd198994d407cdd0dd7170e9e1f SHA512 2c4db3003718cf0c8b02986e7daff00653cf1cba57cdc6b157189050f1d4c41c04c4c43f81e4121a9730b1d28e27af81651bc9dc379fa2e049f49bab7dee1fab WHIRLPOOL 8eefce7f4b6d36156184eadf2289a7386566318dd0bf028e5725904bdd77054c2fe422973e4c50438666ab0fe1dfef388dd7e9c06fab7cbc662f88c8ef5c55f2
 DIST mysql-5.6.30.tar.gz 32223818 SHA256 48464df00aad9b9dfc26c903529ddad944a7562aa28e66e98e4f3f0c35179deb SHA512 b9f5b22a0557fbdd765fd3c379395584dd35bbec2d7504eb132f734129c0d95d24dc538c9b64524870bbecb92fa2f1e95b49ccfe22531ed17ec1e754f08d491b WHIRLPOOL f56d4e9d2ac801605bb941d1a8ba4b876d838a5e3bdac2e644477e87f2e5d439594c28d0e1c1d0c45ebb38fbf4183c429dc8c53bd7aa76aeea95acd1774ca71e
 DIST mysql-5.7.10.tar.gz 48919371 SHA256 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 SHA512 4434cf651b9607ed2fffbfc8e190bcc2109c8e4b3f8d4e504199721e69332b137b37eab3ab1e91dc08420641a342e99f8d8ae8dfdea60f37f89d94a15bdbd75c WHIRLPOOL 323a41d5b9996145c9769076d636cf293ae5073e3ea3c582752d72727c1538e0cc08076b69f481b921cd06bd6505e84fb6c28ba4ffa2190e4e8204aca96c7b9f
 DIST mysql-5.7.11.tar.gz 49195786 SHA256 54f8c7af87d3d8084419bde2b9f0d8970b3dada0757b015981b02f35a3681f0e SHA512 b07587ff4fae6cc0e6d2511235c8e2052e50f1d8e819475f1b9fc377ad3166ff0274a683728adead61329c3213d1cd29b911808ca819e15ec4019b9747fbeae7 WHIRLPOOL 5b3abbbc25b490f345cb9fe292e784cd1f37d3da728c889c2d150c9f631de0f1c0d373fb2e22afeaa8bfa82b7b3c069e02ef81c9b1d869f69379bf2e40e5af53
@@ -16,26 +15,25 @@ DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd3
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
-DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
 DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlhsGCdfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAli4KNhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
 QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7ZbuxAAxTdP9YqM+Iv9cWrH3RVWP1RZpxCtDUIirM5c3PE88V1cZo9Aalujp7rC
-A4aOMcUQa4f2kJcgt4sDDEnn1eWTdlKHd4FNb0v8NF0Gk0JyO5i0Jx6YH4Aez1UP
-+f2wb3IA82H/GEJgp33F03+fzMjkscMZpEafARDwyrAWNjgEe58guOD39jnLgCR+
-RjifAD8isQ1Cv+FSrWZ4hIflBVaQbE6YqKxMqRlvpwK636dmpH+mvUhzljaX3+7A
-FzihMfKMKMhaYy8kXbZYVnHzZPlu4EAq1pZ7QCxv5qX3IoCiU8hsCzpNzhy8JiRO
-ETnW/c0gKjHdp+10chcQfcSohrP+9HWjSYi79JwnA4FEs8H1kGR7UsTQTO/+Hs0G
-WV++yR91slnV8TQhUVV6gU+3FZcEeSqzAtAhdxl7umUAV57ArekxqM1ezKUvvCF1
-UDAEk3fCFWSpCh75Oq2dq2jyYSqvTKrbmanDjiUAsx7yGsPNnIlkiKLydRns9N/7
-PoeejdQvzsb9qCmGiy270opLaB+2BpcJT0yFwikQvKvPyQe36jbQLdAjGxnUKbr5
-XUVRtahN4bK62bzFGwL2PXUuHK9gAUHLT0A0hUnFgs1ZixihNuDMrbjDq77xUSOb
-ZEect3ybZNxb436eFyGqGUxPTOmA8LBZe7B5lSowquf9OGtDXAE=
-=OCNp
+o7Z12Q//c49xPA7EITDVjrLejRCCXgeN577aeZJyjzvgKZJ1kvguPehBP/ZLsVR+
+6hSV/EClz5XY9lfTVAb+tvfkoJce16a1oWpE8NFM+Xp6GvbjeBHwOoTxGXNyFmAt
+klFSdB9BhdTNKkRPgntgZexZTKg87KfJeyiE0SoSw9t6rSk6FuL34Fqvm1oHi/7q
+Djsw1v0OGsMroI8tu86tqKto49mMZfORUmhnjKCf//A6ckJGe8zV92cGU+csdlR1
+m87xerh3GgrBMpaCEiUnGm1KRHHCz81EcQ7VPxaIHHO/hK/xnNbDmTdjh/BP/NjK
+kmAkgh8eLV3fDs0PGJ6b9hFGMoKXJdocKxqhuc4sfKrUIcgcjX2RWSOGdIxD7mZN
+mT5aIpoV/NV1YTWcx8iU0kB/d38Edo5jrsmWsQOjIidZtJIyezmBYZeMbidADdkp
+ostkxbbhDPMUhS+cZe22gF+AoDQDH1cQ0NUg6lU0tG88M9hXC0jSmp4Z2v0fNGyi
+ejnkibUPpUrn4p1ewrcAms9Qf1QB4RSsY0gJvAShfJfLKqey8osdeGrJWRTLoPn3
+3gBu0vQKHDdRRwcyZjExQMcx89tm8xII7NoanRLN1ywiQnUd73p8TOu53Q78eVXI
+IBR3AGwiZegURKCzllHy445hIL+7lmEfMrazpA1rkjCqSeoVht8=
+=T6lX
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-4.0.27-r1.ebuild b/dev-db/mysql/mysql-4.0.27-r1.ebuild
index 3d0abab..122a0f7 100644
--- a/dev-db/mysql/mysql-4.0.27-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.27-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/dev-db/mysql/mysql-4.1.22-r1.ebuild b/dev-db/mysql/mysql-4.1.22-r1.ebuild
index ccd3a60..0cd9167 100644
--- a/dev-db/mysql/mysql-4.1.22-r1.ebuild
+++ b/dev-db/mysql/mysql-4.1.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/dev-db/mysql/mysql-5.0.96.ebuild b/dev-db/mysql/mysql-5.0.96.ebuild
index 214558a..0dd3e3f 100644
--- a/dev-db/mysql/mysql-5.0.96.ebuild
+++ b/dev-db/mysql/mysql-5.0.96.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ inherit toolchain-funcs mysql
 IUSE="$IUSE"
 
 # 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-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''

diff --git a/dev-db/mysql/mysql-5.1.73-r1.ebuild b/dev-db/mysql/mysql-5.1.73-r1.ebuild
index 7024946..c4f4b3c 100644
--- a/dev-db/mysql/mysql-5.1.73-r1.ebuild
+++ b/dev-db/mysql/mysql-5.1.73-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/dev-db/mysql/mysql-5.5.49.ebuild b/dev-db/mysql/mysql-5.5.49.ebuild
deleted file mode 100644
index dbc9696..0000000
--- a/dev-db/mysql/mysql-5.5.49.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_EXTRAS_VER="20150127-1351Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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 mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	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}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30 --reorder
-		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/mysql/mysql-5.6.30.ebuild b/dev-db/mysql/mysql-5.6.30.ebuild
index 7537cf9..eeb5403 100644
--- a/dev-db/mysql/mysql-5.6.30.ebuild
+++ b/dev-db/mysql/mysql-5.6.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''

diff --git a/dev-db/mysql/mysql-5.7.10.ebuild b/dev-db/mysql/mysql-5.7.10.ebuild
index b248815..37cebf3 100644
--- a/dev-db/mysql/mysql-5.7.10.ebuild
+++ b/dev-db/mysql/mysql-5.7.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''

diff --git a/dev-db/mysql/mysql-5.7.11.ebuild b/dev-db/mysql/mysql-5.7.11.ebuild
index d56e2bb..80e6e76 100644
--- a/dev-db/mysql/mysql-5.7.11.ebuild
+++ b/dev-db/mysql/mysql-5.7.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''

diff --git a/dev-db/mysql/mysql-5.7.12.ebuild b/dev-db/mysql/mysql-5.7.12.ebuild
index 9d6adf2..801c745 100644
--- a/dev-db/mysql/mysql-5.7.12.ebuild
+++ b/dev-db/mysql/mysql-5.7.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ SRC_URI+="mirror://sourceforge/boost/boost_1_59_0.tar.bz2"
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''

diff --git a/dev-db/mysql/mysql-5.7.17.ebuild b/dev-db/mysql/mysql-5.7.17.ebuild
index cf2ad9e..e12b9ff 100644
--- a/dev-db/mysql/mysql-5.7.17.ebuild
+++ b/dev-db/mysql/mysql-5.7.17.ebuild
@@ -16,7 +16,7 @@ inherit mysql-multilib-r1
 IUSE="cjk"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2017-03-02 14:30 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2017-03-02 14:30 UTC (permalink / raw
  To: gentoo-commits

commit:     bf78bb2970192bcd5ad2915dbe8819760432a9c3
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  2 14:17:06 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar  2 14:17:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=bf78bb29

dev-db/mysql: Drop $Id$ headers

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/ChangeLog              | 6 ++++++
 dev-db/mysql/mysql-4.0.27-r1.ebuild | 1 -
 dev-db/mysql/mysql-4.1.22-r1.ebuild | 1 -
 dev-db/mysql/mysql-5.0.96.ebuild    | 1 -
 dev-db/mysql/mysql-5.1.73-r1.ebuild | 1 -
 dev-db/mysql/mysql-5.6.30.ebuild    | 1 -
 dev-db/mysql/mysql-5.7.10.ebuild    | 1 -
 dev-db/mysql/mysql-5.7.11.ebuild    | 1 -
 dev-db/mysql/mysql-5.7.12.ebuild    | 1 -
 dev-db/mysql/mysql-5.7.17.ebuild    | 1 -
 10 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 37668d1..fe767e8 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  02 Mar 2017; Brian Evans <grknight@gentoo.org> mysql-4.0.27-r1.ebuild,
+  mysql-4.1.22-r1.ebuild, mysql-5.0.96.ebuild, mysql-5.1.73-r1.ebuild,
+  mysql-5.6.30.ebuild, mysql-5.7.10.ebuild, mysql-5.7.11.ebuild,
+  mysql-5.7.12.ebuild, mysql-5.7.17.ebuild:
+  dev-db/mysql: Drop $Id$ headers
+
   02 Mar 2017; Brian Evans <grknight@gentoo.org> -mysql-5.5.49.ebuild,
   mysql-4.0.27-r1.ebuild, mysql-4.1.22-r1.ebuild, mysql-5.0.96.ebuild,
   mysql-5.1.73-r1.ebuild, mysql-5.6.30.ebuild, mysql-5.7.10.ebuild,

diff --git a/dev-db/mysql/mysql-4.0.27-r1.ebuild b/dev-db/mysql/mysql-4.0.27-r1.ebuild
index 122a0f7..0704dfc 100644
--- a/dev-db/mysql/mysql-4.0.27-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.27-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 MY_EXTRAS_VER="20070105"
 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"

diff --git a/dev-db/mysql/mysql-4.1.22-r1.ebuild b/dev-db/mysql/mysql-4.1.22-r1.ebuild
index 0cd9167..6c1da2e 100644
--- a/dev-db/mysql/mysql-4.1.22-r1.ebuild
+++ b/dev-db/mysql/mysql-4.1.22-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 MY_EXTRAS_VER="20090228-2228Z"
 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"

diff --git a/dev-db/mysql/mysql-5.0.96.ebuild b/dev-db/mysql/mysql-5.0.96.ebuild
index 0dd3e3f..f388576 100644
--- a/dev-db/mysql/mysql-5.0.96.ebuild
+++ b/dev-db/mysql/mysql-5.0.96.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="4"
 MY_EXTRAS_VER="20120401-2131Z"

diff --git a/dev-db/mysql/mysql-5.1.73-r1.ebuild b/dev-db/mysql/mysql-5.1.73-r1.ebuild
index c4f4b3c..dbcfcc5 100644
--- a/dev-db/mysql/mysql-5.1.73-r1.ebuild
+++ b/dev-db/mysql/mysql-5.1.73-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="4"
 

diff --git a/dev-db/mysql/mysql-5.6.30.ebuild b/dev-db/mysql/mysql-5.6.30.ebuild
index eeb5403..835e176 100644
--- a/dev-db/mysql/mysql-5.6.30.ebuild
+++ b/dev-db/mysql/mysql-5.6.30.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 

diff --git a/dev-db/mysql/mysql-5.7.10.ebuild b/dev-db/mysql/mysql-5.7.10.ebuild
index 37cebf3..31e0d4c 100644
--- a/dev-db/mysql/mysql-5.7.10.ebuild
+++ b/dev-db/mysql/mysql-5.7.10.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 

diff --git a/dev-db/mysql/mysql-5.7.11.ebuild b/dev-db/mysql/mysql-5.7.11.ebuild
index 80e6e76..02629aa 100644
--- a/dev-db/mysql/mysql-5.7.11.ebuild
+++ b/dev-db/mysql/mysql-5.7.11.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 

diff --git a/dev-db/mysql/mysql-5.7.12.ebuild b/dev-db/mysql/mysql-5.7.12.ebuild
index 801c745..723f990 100644
--- a/dev-db/mysql/mysql-5.7.12.ebuild
+++ b/dev-db/mysql/mysql-5.7.12.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="6"
 

diff --git a/dev-db/mysql/mysql-5.7.17.ebuild b/dev-db/mysql/mysql-5.7.17.ebuild
index e12b9ff..6921679 100644
--- a/dev-db/mysql/mysql-5.7.17.ebuild
+++ b/dev-db/mysql/mysql-5.7.17.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="6"
 


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2018-03-12 13:20 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2018-03-12 13:20 UTC (permalink / raw
  To: gentoo-commits

commit:     53213d6d4eba484d1bcc8d9a11040eb9012cb480
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 13:20:16 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 13:20:16 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=53213d6d

dev-db/mysql: Remove sparc-fbsd

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/mysql-5.0.96.ebuild    | 4 ++--
 dev-db/mysql/mysql-5.1.73-r1.ebuild | 4 ++--
 dev-db/mysql/mysql-5.6.30.ebuild    | 4 ++--
 dev-db/mysql/mysql-5.7.17.ebuild    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-db/mysql/mysql-5.0.96.ebuild b/dev-db/mysql/mysql-5.0.96.ebuild
index f388576..744c13d 100644
--- a/dev-db/mysql/mysql-5.0.96.ebuild
+++ b/dev-db/mysql/mysql-5.0.96.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -9,7 +9,7 @@ inherit toolchain-funcs mysql
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''

diff --git a/dev-db/mysql/mysql-5.1.73-r1.ebuild b/dev-db/mysql/mysql-5.1.73-r1.ebuild
index dbcfcc5..22b72ba 100644
--- a/dev-db/mysql/mysql-5.1.73-r1.ebuild
+++ b/dev-db/mysql/mysql-5.1.73-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -18,7 +18,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 # This is often broken still

diff --git a/dev-db/mysql/mysql-5.6.30.ebuild b/dev-db/mysql/mysql-5.6.30.ebuild
index 835e176..5979eb8 100644
--- a/dev-db/mysql/mysql-5.6.30.ebuild
+++ b/dev-db/mysql/mysql-5.6.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''

diff --git a/dev-db/mysql/mysql-5.7.17.ebuild b/dev-db/mysql/mysql-5.7.17.ebuild
index d3f3efb..ef830b3 100644
--- a/dev-db/mysql/mysql-5.7.17.ebuild
+++ b/dev-db/mysql/mysql-5.7.17.ebuild
@@ -14,7 +14,7 @@ inherit mysql-multilib-r1
 IUSE="cjk"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2018-03-12 13:20 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2018-03-12 13:20 UTC (permalink / raw
  To: gentoo-commits

commit:     224938cdb0cf026b9af0f9110950fb5e2aec7988
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 13:12:26 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 13:12:26 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=224938cd

dev-db/mysql: Fix Manifest, metadata; drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --force
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/Manifest            |  32 ++++---
 dev-db/mysql/metadata.xml        |  14 ++-
 dev-db/mysql/mysql-5.7.10.ebuild | 171 ------------------------------------
 dev-db/mysql/mysql-5.7.11.ebuild | 171 ------------------------------------
 dev-db/mysql/mysql-5.7.12.ebuild | 184 ---------------------------------------
 dev-db/mysql/mysql-5.7.17.ebuild |   5 +-
 6 files changed, 22 insertions(+), 555 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 39fbe3e..35a9450 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,39 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST boost_1_59_0.tar.bz2 70389425 SHA256 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca SHA512 8139e1ae997a86974071c5714ad3307e3d8fd15ef702b81a953410dd4d424b932135f53a0ef4891d9b9b747a38e539e66d6a803388fe0cc98e5166be872d682a WHIRLPOOL ab26f6b770c32320e71806d7f7856b3841917dcc59e0c5ee588fc77d77f11855dda66bfb808dbe0f3f89859b958211439c271401a5b1ad2ea98aa5d377934510
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.6.30.tar.gz 32223818 SHA256 48464df00aad9b9dfc26c903529ddad944a7562aa28e66e98e4f3f0c35179deb SHA512 b9f5b22a0557fbdd765fd3c379395584dd35bbec2d7504eb132f734129c0d95d24dc538c9b64524870bbecb92fa2f1e95b49ccfe22531ed17ec1e754f08d491b WHIRLPOOL f56d4e9d2ac801605bb941d1a8ba4b876d838a5e3bdac2e644477e87f2e5d439594c28d0e1c1d0c45ebb38fbf4183c429dc8c53bd7aa76aeea95acd1774ca71e
-DIST mysql-5.7.10.tar.gz 48919371 SHA256 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 SHA512 4434cf651b9607ed2fffbfc8e190bcc2109c8e4b3f8d4e504199721e69332b137b37eab3ab1e91dc08420641a342e99f8d8ae8dfdea60f37f89d94a15bdbd75c WHIRLPOOL 323a41d5b9996145c9769076d636cf293ae5073e3ea3c582752d72727c1538e0cc08076b69f481b921cd06bd6505e84fb6c28ba4ffa2190e4e8204aca96c7b9f
-DIST mysql-5.7.11.tar.gz 49195786 SHA256 54f8c7af87d3d8084419bde2b9f0d8970b3dada0757b015981b02f35a3681f0e SHA512 b07587ff4fae6cc0e6d2511235c8e2052e50f1d8e819475f1b9fc377ad3166ff0274a683728adead61329c3213d1cd29b911808ca819e15ec4019b9747fbeae7 WHIRLPOOL 5b3abbbc25b490f345cb9fe292e784cd1f37d3da728c889c2d150c9f631de0f1c0d373fb2e22afeaa8bfa82b7b3c069e02ef81c9b1d869f69379bf2e40e5af53
-DIST mysql-5.7.12.tar.gz 50571897 SHA256 32843cb6d22ab22cd2340262b53c0d6009b5bd41b1fa4102beda19635a5c1c87 SHA512 a36013f3af9a15f8e9abec7673485ca1dd5532afcc0e2570659f510da1a1763af8de478231c5723d2395f635a6956d1500652999fedf344f7d8970265860eea5 WHIRLPOOL 9d0486ae3b8ab404f5e03829d12a477f8a990a959e32286d4920fd8bdf18689e693249be3a9f0e93e61c6a6e953846e1546620ecdeb834c4e69c45bf676a2670
 DIST mysql-boost-5.7.17.tar.gz 61480982 SHA256 b75bba87199ef6a6ccc5dfbcaf70949009dc12089eafad8c5254afc9002aa903 SHA512 a1512abeba307fd21687677d2ee4bf20ced373312824de034e9b340d97e67eb4fcc5caa4ad7d9f58d6c0ddf57f6f6c0b0978e7b01c46f397ac661da843e3dfa6 WHIRLPOOL c9c078afdb1f8eb4405593611c179552493265c50b1eb1bac8cecadbac07103a11a05daf8c26d3d751526d5a69f14a8b6fce40b1aaaac7b9b4680679bf61bc4f
+DIST mysql-boost-5.7.21.tar.gz 48931457 SHA256 ad29ecb6fb3c3571394fe231633a2d1d188d49e9eb749daa4e8799b7630daa09 SHA512 29a1bfa1f5d5e354b66ca8c9fdaf7ee88de3d57bee3c6368861b46ab6d992affb7604577c06f241df542b96ab088c055473fd76584376dd149956ae1dd8726f3 WHIRLPOOL 0a86c9e088c870e5e8bf90b15ba53cd61e126143c5147adcbf5273c5dd8018bfe23fbbfd1b5055b9e9ece0a2b1fab21409eaa9bd939ec248410a92d4fe0052ab
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
 DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
+DIST mysql-extras-20180308-1938Z.tar.bz2 318238 SHA256 d4545caff9bf9efb9578cacbb0435a68fe5d84a9f35b642f0c589aa088c67c27 SHA512 12e39c97ebb23e8ae3db5f4a344779fe47f59e32d7e39258f1d8f527ef5ab7470cd6dda0b2980f67472ae4a10a21249aed87eeac18e7fea58c22aebd7f838d2c WHIRLPOOL a8e5d0d390d642114ff63ae0ef1f4ff896d151186066a67cb918e0923d87a69ea2fd7ecbe22d5c9824c44d92c612a3165cffd6f2ca1fb5fccfd66d3c3f46ac07
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAli4KNhfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlqmfLJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
 QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7Z12Q//c49xPA7EITDVjrLejRCCXgeN577aeZJyjzvgKZJ1kvguPehBP/ZLsVR+
-6hSV/EClz5XY9lfTVAb+tvfkoJce16a1oWpE8NFM+Xp6GvbjeBHwOoTxGXNyFmAt
-klFSdB9BhdTNKkRPgntgZexZTKg87KfJeyiE0SoSw9t6rSk6FuL34Fqvm1oHi/7q
-Djsw1v0OGsMroI8tu86tqKto49mMZfORUmhnjKCf//A6ckJGe8zV92cGU+csdlR1
-m87xerh3GgrBMpaCEiUnGm1KRHHCz81EcQ7VPxaIHHO/hK/xnNbDmTdjh/BP/NjK
-kmAkgh8eLV3fDs0PGJ6b9hFGMoKXJdocKxqhuc4sfKrUIcgcjX2RWSOGdIxD7mZN
-mT5aIpoV/NV1YTWcx8iU0kB/d38Edo5jrsmWsQOjIidZtJIyezmBYZeMbidADdkp
-ostkxbbhDPMUhS+cZe22gF+AoDQDH1cQ0NUg6lU0tG88M9hXC0jSmp4Z2v0fNGyi
-ejnkibUPpUrn4p1ewrcAms9Qf1QB4RSsY0gJvAShfJfLKqey8osdeGrJWRTLoPn3
-3gBu0vQKHDdRRwcyZjExQMcx89tm8xII7NoanRLN1ywiQnUd73p8TOu53Q78eVXI
-IBR3AGwiZegURKCzllHy445hIL+7lmEfMrazpA1rkjCqSeoVht8=
-=T6lX
+o7aiQQ//cdhAxZAmpHf6hGttdAJNFJeVRBW6RssniKDmf6iShXQJxs9Q7zcJOPge
+rw+RwOzIitT6NhKiYKGRRbTVjBWGceaex3TL0F1Hs0umH0si2I55c6VbrivkzIn+
+nzYdqTy9k/92CISHIAUamI4AZN4y2xQ39PeyVytHTMFCjBOakK4o4amDvWoEUsB7
+cs99cIY7p7mgyJohyjV9nqDiK9B1Dx9PKTSIBPH9WE6OUFEhAEmnRLEcP6hkNWoK
+RajNhVTl4/ja/ElYG3QqhmylP21rXnGP0ph1E6ROp03EK1GEn2EPMYUCR26fKYtx
+6G5E6uwtfcfN2eoZ8GYZhL+bf1YettIQCgYPTVmtYnMa5/I+DUWpx46SvXYVYg3d
+npWfC83FIq3GDO+h4gvZF2iz98evyOwzalXweemq2ofps1tbnJshPoHTmreBKtMx
+c4W3VVBk3+g3Uq/MzB3Poe4qZ5eqSjN1crSrFB0QGgR8hEf7jTYSTxaIT2ufY18L
+J4wyofyVblJJiNd6MiBolgibsxmr4nrCRwqe+49oKZZXuAQ7BCxKoB1huuISnf8I
+z5G2chfOi7aaiBFtuGiss2vUHIRTnVtLYD1N4VbjlDnx5KTiAmlwPVyeDp44VvC7
+9HkjiceozloXBOhAS0oVSyhVZLiHqY99ICBSGLNJ2+JKQwNe9Sk=
+=qsUI
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 5571643..9c8a620 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -5,27 +5,23 @@
     <email>mysql-bugs@gentoo.org</email>
     <name>MySQL</name>
   </maintainer>
-  <maintainer type="person">
-    <email>hasufell@gentoo.org</email>
-    <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else.</description>
-  </maintainer>
-<!-- 
-Please note that this list is shared between the following packages:
-dev-db/mysql
-dev-db/mariadb
--->
 <use>
   <flag name="big-tables">Make tables contain up to 1.844E+19 rows</flag>
+  <flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages</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>
   <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
+  <flag name="innodb-lz4">Enables lz4 compression methods for InnoDB/XtraDB</flag>
+  <flag name="innodb-lzo">Enables lzo compression methods for InnoDB/XtraDB</flag>
+  <flag name="innodb-snappy">Enables snappy compression methods for InnoDB/XtraDB using <pkg>app-arch/snappy</pkg></flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
   <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
   <flag name="max-idx-128">Raise the max index per table limit from 64 to 128</flag>
   <flag name="minimal">Install client programs only, no server</flag>
+  <flag name="numa">Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)</flag>
   <flag name="pbxt">Add experimental support for PBXT storage engine</flag>
   <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
   <flag name="raid">Deprecated option, removed in the 5.0 series</flag>

diff --git a/dev-db/mysql/mysql-5.7.10.ebuild b/dev-db/mysql/mysql-5.7.10.ebuild
deleted file mode 100644
index 31e0d4c..0000000
--- a/dev-db/mysql/mysql-5.7.10.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-HAS_TOOLS_PATCH="1"
-SUBSLOT="20"
-
-inherit mysql-multilib-r1
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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 )
-	>=dev-libs/boost-1.59:=
-	>=app-arch/lz4-0_p131:="
-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
-
-src_prepare() {
-	mysql-multilib-r1_src_prepare
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-}
-
-src_configure() {
-	local MYSQL_CMAKE_NATIVE_DEFINES=(
-		-DWITH_LZ4=system
-		-DWITH_NUMA=OFF
-	)
-	mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='server embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-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 symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-		; do
-				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		if ! use extraengine ; then
-			# bug 401673, 530766
-			for t in federated.federated_plugin ; do
-				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000 --reorder
-		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/mysql/mysql-5.7.11.ebuild b/dev-db/mysql/mysql-5.7.11.ebuild
deleted file mode 100644
index 02629aa..0000000
--- a/dev-db/mysql/mysql-5.7.11.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-HAS_TOOLS_PATCH="1"
-SUBSLOT="20"
-
-inherit mysql-multilib-r1
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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 )
-	>=dev-libs/boost-1.59:=
-	>=app-arch/lz4-0_p131:="
-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
-
-src_prepare() {
-	mysql-multilib-r1_src_prepare
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-}
-
-src_configure() {
-	local MYSQL_CMAKE_NATIVE_DEFINES=(
-		-DWITH_LZ4=system
-		-DWITH_NUMA=OFF
-	)
-	mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='server embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-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 symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-		; do
-				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		if ! use extraengine ; then
-			# bug 401673, 530766
-			for t in federated.federated_plugin ; do
-				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-#		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000 --reorder
-		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/mysql/mysql-5.7.12.ebuild b/dev-db/mysql/mysql-5.7.12.ebuild
deleted file mode 100644
index 723f990..0000000
--- a/dev-db/mysql/mysql-5.7.12.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-SUBSLOT="20"
-
-inherit mysql-multilib-r1
-SRC_URI+="mirror://sourceforge/boost/boost_1_59_0.tar.bz2"
-
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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 )
-	>=app-arch/lz4-0_p131:="
-RDEPEND="${RDEPEND}"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras"
-
-PATCHES=(
-	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
-	"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.7.patch
-	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.7.patch
-	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
-	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.7.6.patch
-	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.7-without-clientlibs-tools.patch
-)
-
-# 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
-
-src_prepare() {
-	mysql-multilib-r1_src_prepare
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-}
-
-src_configure() {
-	local MYSQL_CMAKE_NATIVE_DEFINES=(
-		-DWITH_LZ4=system
-		-DWITH_NUMA=OFF
-		-DWITH_BOOST="${WORKDIR}/boost_1_59_0"
-	)
-	mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='server embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-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 symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-		; do
-				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		if ! use extraengine ; then
-			# bug 401673, 530766
-			for t in federated.federated_plugin ; do
-				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-#		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000 --reorder
-		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/mysql/mysql-5.7.17.ebuild b/dev-db/mysql/mysql-5.7.17.ebuild
index 6921679..d3f3efb 100644
--- a/dev-db/mysql/mysql-5.7.17.ebuild
+++ b/dev-db/mysql/mysql-5.7.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,8 +7,7 @@ MY_EXTRAS_VER="live"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 SUBSLOT="20"
-
-SERVER_URI="http://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${MY_PV}.tar.gz"
+SERVER_URI="https://cdn.mysql.com/archives/${PN}-5.7/${PN}-boost-${MY_PV}.tar.gz"
 MY_SOURCEDIR="${PN}-${MY_PV}"
 inherit mysql-multilib-r1
 


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2018-03-12 20:32 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2018-03-12 20:32 UTC (permalink / raw
  To: gentoo-commits

commit:     59aa47dce06b28cc4a7cb7eb2ba1b389d910f51f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 20:26:16 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 20:26:16 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=59aa47dc

dev-db/mysql: Final version of 5.7.21

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/Manifest            | 28 ++++++------
 dev-db/mysql/metadata.xml        |  3 --
 dev-db/mysql/mysql-5.7.21.ebuild | 94 ++++++++++------------------------------
 3 files changed, 37 insertions(+), 88 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 35a9450..33b27be 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -13,25 +13,25 @@ DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
 DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
-DIST mysql-extras-20180308-1938Z.tar.bz2 318238 SHA256 d4545caff9bf9efb9578cacbb0435a68fe5d84a9f35b642f0c589aa088c67c27 SHA512 12e39c97ebb23e8ae3db5f4a344779fe47f59e32d7e39258f1d8f527ef5ab7470cd6dda0b2980f67472ae4a10a21249aed87eeac18e7fea58c22aebd7f838d2c WHIRLPOOL a8e5d0d390d642114ff63ae0ef1f4ff896d151186066a67cb918e0923d87a69ea2fd7ecbe22d5c9824c44d92c612a3165cffd6f2ca1fb5fccfd66d3c3f46ac07
+DIST mysql-extras-20180312-2011Z.tar.bz2 319047 SHA256 5d83747593b2276ecaf253b193814df2bfe170de57ceb7565e3d9f215df92254 SHA512 b0aa9fc8fbc050451ef147cee99b00cf10d34a71641837821e78655241f7d79a94fe2efb4cef9a23fe9741e08ada2fc0b58ef3b3663752bc567babfbcaa547c8 WHIRLPOOL 29085d38c285e62fa5925e70e01fda98ce5582e660b84fa09992049b5c222d1c14e73b94c63cb754bd94df00ce154b24ea5d4ee472de1766b6941cb05503c493
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlqmfLJfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlqm4mdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
 QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7aiQQ//cdhAxZAmpHf6hGttdAJNFJeVRBW6RssniKDmf6iShXQJxs9Q7zcJOPge
-rw+RwOzIitT6NhKiYKGRRbTVjBWGceaex3TL0F1Hs0umH0si2I55c6VbrivkzIn+
-nzYdqTy9k/92CISHIAUamI4AZN4y2xQ39PeyVytHTMFCjBOakK4o4amDvWoEUsB7
-cs99cIY7p7mgyJohyjV9nqDiK9B1Dx9PKTSIBPH9WE6OUFEhAEmnRLEcP6hkNWoK
-RajNhVTl4/ja/ElYG3QqhmylP21rXnGP0ph1E6ROp03EK1GEn2EPMYUCR26fKYtx
-6G5E6uwtfcfN2eoZ8GYZhL+bf1YettIQCgYPTVmtYnMa5/I+DUWpx46SvXYVYg3d
-npWfC83FIq3GDO+h4gvZF2iz98evyOwzalXweemq2ofps1tbnJshPoHTmreBKtMx
-c4W3VVBk3+g3Uq/MzB3Poe4qZ5eqSjN1crSrFB0QGgR8hEf7jTYSTxaIT2ufY18L
-J4wyofyVblJJiNd6MiBolgibsxmr4nrCRwqe+49oKZZXuAQ7BCxKoB1huuISnf8I
-z5G2chfOi7aaiBFtuGiss2vUHIRTnVtLYD1N4VbjlDnx5KTiAmlwPVyeDp44VvC7
-9HkjiceozloXBOhAS0oVSyhVZLiHqY99ICBSGLNJ2+JKQwNe9Sk=
-=qsUI
+o7ad7Q//RtIMkOS207JdXNF9CIwO7CneIsjI/Vft1P6eucBHVGJsd35bD4i4Q6om
+VNqhfStQAY1c8dnsCEsJIUE65jR03YXQKgowsxCZYYgo+QnIL7FUM4ISAKVtWzrJ
+dOYmpSu/qpdMjP8nowkju4+uGGhLNMFIKwyxBJHxigRabn1ZF/f/OskRzKqFOWnY
+ULeFcCR6NByphZ9G9Qmj59AwLs85ND3Vd9meoRW07pkqjlQBCr36DY4/6SkuUnoY
+7cGpsii09BIDEXhZg5Egy3EsY3LfAVdVjewkFcNHNTnCsjvrVewKMPc+akHdOx3R
+FeVQHPLSSXRvJEPGUihL6dLgVWjdpPdZBWDBzRMNbrrlq/JfL8+JTN3PdKTg1wDy
+IIkZgiNydz7gT+oYrd6k+yIWI2TeOFTjDEEwZsxQg8M73Rf77UrzKNEFYgs8mBfa
+CNSdezlbXwwNS2CKFt3MK46Eu3YjvTqSDztkbHcqMblWwJWjEMcQrrPBq48GL9Lw
+byrxAcoEs+rsfQn2ucULMeM/nYQk43izavauR5J9AKByXqBUEUt5SA9gYP32d+QR
+VznQEIwky+Bk/zT/BPepCmH+k829Ap7izpWm425Ue9B8titpa+ATr7Nz1CLH3Jh0
+nOeglQVAnRk/lx63U9dlx8ORhO4jonz9RwdrgxM+tJfIKt9kFe0=
+=xvZh
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 9c8a620..c89ecc4 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -12,9 +12,6 @@
   <flag name="community">Enables the community features from upstream.</flag>
   <flag name="embedded">Build embedded server (libmysqld)</flag>
   <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
-  <flag name="innodb-lz4">Enables lz4 compression methods for InnoDB/XtraDB</flag>
-  <flag name="innodb-lzo">Enables lzo compression methods for InnoDB/XtraDB</flag>
-  <flag name="innodb-snappy">Enables snappy compression methods for InnoDB/XtraDB using <pkg>app-arch/snappy</pkg></flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
   <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>

diff --git a/dev-db/mysql/mysql-5.7.21.ebuild b/dev-db/mysql/mysql-5.7.21.ebuild
index dc87677..b82d76e 100644
--- a/dev-db/mysql/mysql-5.7.21.ebuild
+++ b/dev-db/mysql/mysql-5.7.21.ebuild
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20180308-1938Z"
-SUBSLOT="18"
+MY_EXTRAS_VER="20180312-2011Z"
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
 # Keeping eutils in EAPI=6 for emktemp in pkg_config
 
-inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+inherit eutils flag-o-matic prefix toolchain-funcs \
 	user cmake-utils multilib-minimal
 
 SRC_URI="http://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${PV}.tar.gz
+	https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${PV}.tar.gz
 	http://downloads.mysql.com/archives/MySQL-5.7/${PN}-boost-${PV}.tar.gz"
 
 # Gentoo patches to MySQL
@@ -28,19 +28,14 @@ fi
 HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:-0}"
-IUSE="client-libs cracklib debug extraengine innodb-lz4
-	innodb-lzo innodb-snappy jemalloc kerberos latin1 libressl
-	numa odbc pam +perl profiling selinux +server static
-	static-libs systemd systemtap tcmalloc test xml yassl"
+SLOT="0/20"
+IUSE="client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux
+	+server static static-libs systemtap tcmalloc test yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
 RESTRICT="libressl? ( test )"
 
-REQUIRED_USE="
-	!server? ( !extraengine )
-	?? ( tcmalloc jemalloc )
-	static? ( yassl !pam )"
+REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
 
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
@@ -63,7 +58,7 @@ PATCHES=(
 	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
 #	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.7.6.patch
 	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.7-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
 )
 
 # Be warned, *DEPEND are version-dependant
@@ -74,6 +69,7 @@ COMMON_DEPEND="
 		sys-process/procps:0=
 		dev-libs/libaio:0=
 	)
+	net-misc/curl
 	>=sys-apps/sed-4
 	>=sys-apps/texinfo-4.7-r1
 	jemalloc? ( dev-libs/jemalloc:0= )
@@ -89,26 +85,14 @@ COMMON_DEPEND="
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)
-	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-		kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	)
-	!client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) )
+	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] )
+	!client-libs? ( >=sys-libs/zlib-1.2.3:0= )
 	sys-libs/ncurses:0=
 	server? (
 		>=app-arch/lz4-0_p131:=
 		>=dev-libs/boost-1.65.0:=
-		cracklib? ( sys-libs/cracklib:0= )
-		extraengine? (
-			odbc? ( dev-db/unixODBC:0= )
-			xml? ( dev-libs/libxml2:2= )
-		)
-		innodb-lzo? ( dev-libs/lzo )
-		innodb-snappy? ( app-arch/snappy )
 		numa? ( sys-process/numactl )
-		pam? ( virtual/pam:0= )
-		systemd? ( sys-apps/systemd:= )
 	)
-	>=dev-libs/libpcre-8.41-r1:3=
 "
 DEPEND="virtual/yacc
 	static? ( sys-libs/ncurses[static-libs] )
@@ -126,8 +110,8 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 # xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )
-	 server? ( ~virtual/mysql-5.6[static=] )"
+	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
+	 server? ( ~virtual/mysql-5.6 )"
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]] ; then
@@ -156,7 +140,7 @@ pkg_preinst() {
 	# Here we need to see if the implementation switched client libraries
 	# We check if this is a new instance of the package and a client library already exists
 	local SHOW_ABI_MESSAGE libpath
-	if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+	if use client-libs && [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
 		libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
 		elog "Due to ABI changes when switching between different client libraries,"
 		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
@@ -173,14 +157,6 @@ pkg_postinst() {
 	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
 
 	if use server ; then
-		if use pam; then
-			einfo
-			elog "This install includes the PAM authentication plugin."
-			elog "To activate and configure the PAM plugin, please read:"
-			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
-			einfo
-		fi
-
 		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
 			einfo
 			elog "You might want to run:"
@@ -284,28 +260,22 @@ multilib_src_configure() {
 		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
 		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		### TODO: make this system but issues with UTF-8 prevent it
 		-DWITH_EDITLINE=bundled
 		-DWITH_ZLIB=system
-		-DWITHOUT_LIBWRAP=1
+		-DWITH_LIBWRAP=0
 		-DENABLED_LOCAL_INFILE=1
 		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
-		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
-		-DENABLE_STATIC_LIBS=$(usex static-libs ON OFF)
 		# The build forces this to be defined when cross-compiling.  We pass it
 		# all the time for simplicity and to make sure it is actually correct.
 		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
-#		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-#		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
-		-DWITH_EXTERNAL_ZLIB=YES
-		-DSUFFIX_INSTALL_DIR=""
-		-DWITH_UNITTEST=OFF
+		-DWITH_RAPID=OFF
+		-DWITH_LIBEVENT=NO
+		-DWITH_CURL=system
 	)
 	if use test ; then
 		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
@@ -339,26 +309,9 @@ multilib_src_configure() {
 
 	if multilib_is_native_abi && use server ; then
 
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			mycmakeargs+=( -DWITH_FEDERATED_STORAGE_ENGINE=NO )
-		fi
-
 		mycmakeargs+=(
 			-DWITH_BOOST="${S}/boost"
 			-DWITH_LZ4=system
-			-DWITH_JEMALLOC=$(usex jemalloc system)
-			-DWITH_PCRE=system
-#			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
-#			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-#			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
-			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-#			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-			-DINSTALL_SQLBENCHDIR=share/mysql
-			# systemd is only linked to for server notification
-			-DWITH_SYSTEMD=$(usex systemd yes no)
 			-DWITH_NUMA=$(usex numa ON OFF)
 		)
 
@@ -385,11 +338,10 @@ multilib_src_configure() {
 		fi
 		mycmakeargs+=(
 			-DEXTRA_CHARSETS=all
-			-DMYSQL_USER=mysql
 			-DDISABLE_SHARED=$(usex static YES NO)
 			-DWITH_DEBUG=$(usex debug)
 			-DWITH_EMBEDDED_SERVER=OFF
-			-DWITH_PROFILING=$(usex profiling)
+			-DENABLED_PROFILING=$(usex profiling)
 		)
 
 		if use static; then
@@ -402,6 +354,7 @@ multilib_src_configure() {
 
 		# Storage engines
 		mycmakeargs+=(
+			-DWITH_EXAMPLE_STORAGE_ENGINE=0
 			-DWITH_ARCHIVE_STORAGE_ENGINE=1
 			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
 			-DWITH_CSV_STORAGE_ENGINE=1
@@ -410,6 +363,7 @@ multilib_src_configure() {
 			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
 			-DWITH_MYISAM_STORAGE_ENGINE=1
 			-DWITH_PARTITION_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
 		)
 
 	else
@@ -417,8 +371,6 @@ multilib_src_configure() {
 			-DWITHOUT_SERVER=1
 			-DWITH_EMBEDDED_SERVER=OFF
 			-DEXTRA_CHARSETS=none
-			-DINSTALL_SQLBENCHDIR=
-			-DWITH_SYSTEMD=no
 		)
 	fi
 
@@ -535,7 +487,7 @@ multilib_src_install_all() {
 }
 
 # Official test instructions:
-# USE='extraengine perl server static-libs' \
+# USE='perl server static-libs' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mysql-X.X.XX.ebuild \
 # digest clean package


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2018-03-12 20:47 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2018-03-12 20:47 UTC (permalink / raw
  To: gentoo-commits

commit:     6aa58d08691f8939311823ab8521982b32be0a2b
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 20:47:26 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 20:47:26 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=6aa58d08

dev-db/mysql: Remove virtual/mysql as a test

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/mysql-5.7.21.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev-db/mysql/mysql-5.7.21.ebuild b/dev-db/mysql/mysql-5.7.21.ebuild
index a7c32dc..6eede53 100644
--- a/dev-db/mysql/mysql-5.7.21.ebuild
+++ b/dev-db/mysql/mysql-5.7.21.ebuild
@@ -103,15 +103,12 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
 	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
 	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	!<virtual/mysql-5.6-r9
 	${COMMON_DEPEND}
 "
 # For other stuff to bring us in
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
-	 server? ( ~virtual/mysql-5.6 )"
+	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )"
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]] ; then


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2018-03-27 18:26 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2018-03-27 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     d80f15f48b4cf21696b4a7d3a4bf6700bdd1fdcc
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 18:26:23 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 18:26:23 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=d80f15f4

dev-db/mysql: Consistently use mysqld section in pkg_config

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/mysql-5.7.21.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-db/mysql/mysql-5.7.21.ebuild b/dev-db/mysql/mysql-5.7.21.ebuild
index 6eede53..1d1eaac 100644
--- a/dev-db/mysql/mysql-5.7.21.ebuild
+++ b/dev-db/mysql/mysql-5.7.21.ebuild
@@ -707,11 +707,11 @@ pkg_config() {
 
 		unset tmp_mysqld_password_source
 	fi
-	MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)"
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
 	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)"
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
 	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(_getoptval '--mysqld' log-bin)"
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
 	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
 
 	if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2018-03-29 12:46 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2018-03-29 12:46 UTC (permalink / raw
  To: gentoo-commits

commit:     bbb055a0129aadb278c78b3d096dadcae943c0ac
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 12:46:36 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 12:46:36 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=bbb055a0

dev-db/mysql: Fix pkg_config for 5.7.21

Package-Manager: Portage-2.3.26, Repoman-2.3.7
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/mysql-5.7.21.ebuild | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/dev-db/mysql/mysql-5.7.21.ebuild b/dev-db/mysql/mysql-5.7.21.ebuild
index 1d1eaac..681748a 100644
--- a/dev-db/mysql/mysql-5.7.21.ebuild
+++ b/dev-db/mysql/mysql-5.7.21.ebuild
@@ -791,8 +791,9 @@ pkg_config() {
 	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
 	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
 
-	local cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
-	[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+	# --initialize-insecure will not set root password
+	# --initialize would set a random one in the log which we don't need as we set it ourselves
+	local cmd=( "${EROOT}usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
 	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
@@ -811,6 +812,7 @@ pkg_config() {
 	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
 	local mysqld="${EROOT}/usr/sbin/mysqld \
 		${options} \
+		$(use prefix || echo --user=mysql) \
 		--log-warnings=0 \
 		--basedir=${EROOT}/usr \
 		--datadir=${ROOT}/${MY_DATADIR} \
@@ -844,19 +846,6 @@ pkg_config() {
 		-e "${sql}"
 	eend $?
 
-	if [[ -n "${sqltmp}" ]] ; then
-		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
-		"${EROOT}/usr/bin/mysql" \
-			"--socket=${socket}" \
-			-hlocalhost \
-			-uroot \
-			--password="${MYSQL_ROOT_PASSWORD}" \
-			mysql < "${sqltmp}"
-		rc=$?
-		eend $?
-		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-	fi
-
 	# Stop the server and cleanup
 	einfo "Stopping the server ..."
 	kill $(< "${pidfile}" )


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2018-06-28  2:10 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2018-06-28  2:10 UTC (permalink / raw
  To: gentoo-commits

commit:     f9f891f6413c6faa997ed654440888c899eca502
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 02:07:34 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 02:07:34 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f9f891f6

dev-db/mysql: client-libs version of 5.5.60

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

 dev-db/mysql/Manifest               |  28 +-
 dev-db/mysql/mysql-5.5.60-r1.ebuild | 780 ++++++++++++++++++++++++++++++++++++
 2 files changed, 795 insertions(+), 13 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 33b27be..7fecb3a 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,6 +5,7 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
+DIST mysql-5.5.60.tar.gz 21025041 SHA256 a34112e1748823f6dfd0d129fe29a629cf35b8702f9dfaf1f24caf89ab523d1c SHA512 734395f3ce2c12e7703fe48d5bb2ce85ff8d7f04ae51cbe2d04a46b72b9689f804e5b498ae0b4722b0c098e2eed43d4f93b622964059525e6d9d14a47d55f775 WHIRLPOOL cf00fad25570cc991c4f4666667cb35a7fdec3831e233f2647c99761c1bcec665fc9a425608b40111095ffe8fddd37bf2a184880c7e698337999c5022e746abf
 DIST mysql-5.6.30.tar.gz 32223818 SHA256 48464df00aad9b9dfc26c903529ddad944a7562aa28e66e98e4f3f0c35179deb SHA512 b9f5b22a0557fbdd765fd3c379395584dd35bbec2d7504eb132f734129c0d95d24dc538c9b64524870bbecb92fa2f1e95b49ccfe22531ed17ec1e754f08d491b WHIRLPOOL f56d4e9d2ac801605bb941d1a8ba4b876d838a5e3bdac2e644477e87f2e5d439594c28d0e1c1d0c45ebb38fbf4183c429dc8c53bd7aa76aeea95acd1774ca71e
 DIST mysql-boost-5.7.17.tar.gz 61480982 SHA256 b75bba87199ef6a6ccc5dfbcaf70949009dc12089eafad8c5254afc9002aa903 SHA512 a1512abeba307fd21687677d2ee4bf20ced373312824de034e9b340d97e67eb4fcc5caa4ad7d9f58d6c0ddf57f6f6c0b0978e7b01c46f397ac661da843e3dfa6 WHIRLPOOL c9c078afdb1f8eb4405593611c179552493265c50b1eb1bac8cecadbac07103a11a05daf8c26d3d751526d5a69f14a8b6fce40b1aaaac7b9b4680679bf61bc4f
 DIST mysql-boost-5.7.21.tar.gz 48931457 SHA256 ad29ecb6fb3c3571394fe231633a2d1d188d49e9eb749daa4e8799b7630daa09 SHA512 29a1bfa1f5d5e354b66ca8c9fdaf7ee88de3d57bee3c6368861b46ab6d992affb7604577c06f241df542b96ab088c055473fd76584376dd149956ae1dd8726f3 WHIRLPOOL 0a86c9e088c870e5e8bf90b15ba53cd61e126143c5147adcbf5273c5dd8018bfe23fbbfd1b5055b9e9ece0a2b1fab21409eaa9bd939ec248410a92d4fe0052ab
@@ -14,24 +15,25 @@ DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b07
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
 DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
 DIST mysql-extras-20180312-2011Z.tar.bz2 319047 SHA256 5d83747593b2276ecaf253b193814df2bfe170de57ceb7565e3d9f215df92254 SHA512 b0aa9fc8fbc050451ef147cee99b00cf10d34a71641837821e78655241f7d79a94fe2efb4cef9a23fe9741e08ada2fc0b58ef3b3663752bc567babfbcaa547c8 WHIRLPOOL 29085d38c285e62fa5925e70e01fda98ce5582e660b84fa09992049b5c222d1c14e73b94c63cb754bd94df00ce154b24ea5d4ee472de1766b6941cb05503c493
+DIST mysql-extras-20180628-0201Z.tar.bz2 322141 SHA256 8317028fa98cc4abd819d11191fb82026eb9c4d23490b7c1d42590731fbc834d SHA512 71a3800ec091b41e41d25536199149eb714c0bbfc0f6fc478e8e4dcaf4cf87a7e4d49c513da3c9badc0de810d7d78c05ad91dd898e45005b42136346237de42a WHIRLPOOL 71a5d8d09ede40a2d7adad6d57e1b546fabb34610c92ede6e0b472c0d84ad016e39ec7fcb038c708723535542dfd9caace22f2b8dd822951ba8c0ee2778c462b
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlqm4mdfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAls0QuJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
 QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7ad7Q//RtIMkOS207JdXNF9CIwO7CneIsjI/Vft1P6eucBHVGJsd35bD4i4Q6om
-VNqhfStQAY1c8dnsCEsJIUE65jR03YXQKgowsxCZYYgo+QnIL7FUM4ISAKVtWzrJ
-dOYmpSu/qpdMjP8nowkju4+uGGhLNMFIKwyxBJHxigRabn1ZF/f/OskRzKqFOWnY
-ULeFcCR6NByphZ9G9Qmj59AwLs85ND3Vd9meoRW07pkqjlQBCr36DY4/6SkuUnoY
-7cGpsii09BIDEXhZg5Egy3EsY3LfAVdVjewkFcNHNTnCsjvrVewKMPc+akHdOx3R
-FeVQHPLSSXRvJEPGUihL6dLgVWjdpPdZBWDBzRMNbrrlq/JfL8+JTN3PdKTg1wDy
-IIkZgiNydz7gT+oYrd6k+yIWI2TeOFTjDEEwZsxQg8M73Rf77UrzKNEFYgs8mBfa
-CNSdezlbXwwNS2CKFt3MK46Eu3YjvTqSDztkbHcqMblWwJWjEMcQrrPBq48GL9Lw
-byrxAcoEs+rsfQn2ucULMeM/nYQk43izavauR5J9AKByXqBUEUt5SA9gYP32d+QR
-VznQEIwky+Bk/zT/BPepCmH+k829Ap7izpWm425Ue9B8titpa+ATr7Nz1CLH3Jh0
-nOeglQVAnRk/lx63U9dlx8ORhO4jonz9RwdrgxM+tJfIKt9kFe0=
-=xvZh
+o7aEDBAAwu7ePI/lr3+FdeSrm3ILruqBTy+aOOAUorP5xbsJT9tksVo2XlTQiW9f
+8gdocGWMbEQ1FueGF6UgRMoExy52DufUn6xpH44kwV5xXmw08FwAHbeTUmH87ctH
+DKt2i+92Mfk81GKNh5cpn3El7mhN80dnhQ3H8D2UoxzGz7SEQph7dTqLQZcdc04z
+DOX6SZQg1qveeWpk3LaILYpYQidSaKdNbHOZOgRXnwjnxOIqdSlqo89ha14q0yln
+2Wd9RtCcJphQd0oQbyILn4J8H3pll/K6w4NU13uXajizPESiBokaRo8kOTL2g+/j
+YVKDRidiUBQgB+ZTuzTZMlRqAn+VoedPMyl0QBJ5ZIw+YjEX/77hIe1/jlnRwcYc
+8DstwUGJJOPBVx6+ORaHRPdjvC3PVUkrlzGr7+DHfyMfIVW2vUEL7UoCkWj8lN8D
+WLgRaM8/iWTFt9FCfQ+WtCEVbdkpzqNdzmEDSCN0yWovIIkMtVUpoMczAhBNBrvC
+2vth9nXv04C04V0jneir/auCYCpu23VQcIB2cAJDYWNA417WwcelHswommp8LLJ1
+gA4MHriS15m+QDSD+0FS1paHmB+hao0yP452uwEdlbzQL/qKArDNBvdhgERO08dQ
+oxQ1dfWZ8rRWY4VWmlu2pDwjzFip3FfEMsnCsPkCKt91YSlNAAE=
+=+755
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.5.60-r1.ebuild b/dev-db/mysql/mysql-5.5.60-r1.ebuild
new file mode 100644
index 0000000..6b499b3
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.60-r1.ebuild
@@ -0,0 +1,780 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180628-0201Z"
+SUBSLOT="18"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils flag-o-matic prefix toolchain-funcs user cmake-utils multilib-build
+
+SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.5/${P}.tar.gz
+ https://downloads.mysql.com/archives/MySQL-5.5/${P}.tar.gz"
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+	SRC_URI="${SRC_URI}
+		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+HOMEPAGE="https://mysql.com/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl
+	+perl profiling selinux +server	static static-libs systemtap tcmalloc
+	test yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )
+	static? ( yassl )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
+	EGIT_CLONE_TYPE=shallow
+else
+	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+	"${MY_PATCH_DIR}/01050_all_mysql_config_cleanup-5.5.patch"
+	"${MY_PATCH_DIR}/02040_all_embedded-library-shared-5.5.10.patch"
+	"${MY_PATCH_DIR}/20001_all_fix-minimal-build-cmake-mysql-5.5.41.patch"
+	"${MY_PATCH_DIR}/20002_all_mysql-va-list.patch"
+	"${MY_PATCH_DIR}/20006_all_cmake_elib-mysql-5.5.53.patch"
+	"${MY_PATCH_DIR}/20007_all_cmake-debug-werror-5.6.22.patch"
+	"${MY_PATCH_DIR}/20008_all_mysql-tzinfo-symlink-5.6.37.patch"
+	"${MY_PATCH_DIR}/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch"
+	"${MY_PATCH_DIR}/20018_all_mysql-5.5.60-without-clientlibs-tools.patch"
+	"${MY_PATCH_DIR}/20027_all_mysql-5.5-perl5.26-includes.patch"
+	"${MY_PATCH_DIR}/20030_all_mysql-5.5-fix-client-mysql-type.patch"
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	!yassl? (
+		!libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	>=sys-libs/zlib-1.2.3:0=
+	sys-libs/ncurses:0=
+	!bindist? (
+		>=sys-libs/readline-4.1:0=
+	)
+	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
+"
+DEPEND="virtual/yacc
+	static? ( sys-libs/ncurses[static-libs] )
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+	${COMMON_DEPEND}
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+	fi
+	if has test ${FEATURES} && \
+		use server && ! has userpriv ${FEATURES} ; then
+			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+
+	# This should come after all of the die statements
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	if use server ; then
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		einfo
+		elog "Be sure to edit the my.cnf file to activate your cluster settings."
+		elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+		elog "The first time the cluster is activated, you should add"
+		elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+		elog "This option should then be removed for subsequent starts."
+		einfo
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
+
+	mv -f "${WORKDIR%/}/${P}" "${S}" || die
+}
+
+src_prepare() {
+	_disable_engine() {
+		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	_disable_plugin() {
+		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+	}
+
+	if use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
+	fi
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
+	fi
+
+	local plugin
+	local server_plugins=( semisync )
+	local test_plugins=( audit_null daemon_example fulltext )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	# Don't build example
+	_disable_engine example
+
+	cmake-utils_src_prepare
+}
+
+src_configure(){
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_ZLIB=system
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DWITHOUT_CLIENTLIBS=YES
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	if use server ; then
+
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+				-DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DINSTALL_SQLBENCHDIR=share/mysql
+			-DEXTRA_CHARSETS=all
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DENABLED_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED%/}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED%/}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED%/}/usr/data" ]] ; then
+		rm -Rf "${ED%/}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D%/}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
+	local mycnf_src="my.cnf-5.5"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR%/}/${mycnf_src}" \
+		> "${TMPDIR%/}/my.cnf.ok" || die
+	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8|latin1|g" \
+			"${TMPDIR%/}/my.cnf.ok" || die
+	fi
+	eprefixify "${TMPDIR%/}/my.cnf.ok"
+	newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+	if use server ; then
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S%/}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S%/}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+	fi
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED%/}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED%/}/usr/bin/mytop"
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# 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 [[ $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 && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+
+	# 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 run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	# Run mysql tests
+	pushd "${TESTDIR}" > /dev/null || die
+
+	touch "${T}/disabled.def"
+	# These are failing in MySQL 5.5 for now and are believed to be
+	# false positives:
+	#
+	# main.mysql_client_test, main.mysql_client_test_nonblock
+	# main.mysql_client_test_comp:
+	# segfaults at random under Portage only, suspect resource limits.
+
+	local t
+	for t in main.mysql_client_test main.mysql_client_test_nonblock \
+		main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam \
+		main.mysqlhotcopy_archive main.mysqlhotcopy_myisam main.openssl_1 \
+		rpl.rpl_semi_sync_uninstall_plugin ; do
+			_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	if ! use client-libs ; then
+		_disable_test main.plugin_auth "Needs client libraries built"
+	fi
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd > /dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1`
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_config() {
+	_getoptval() {
+		local mypd="${EROOT}"/usr/bin/my_print_defaults
+		local section="$1"
+		local flag="--${2}="
+		local extra_options="${3}"
+		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+	}
+	local old_MY_DATADIR="${MY_DATADIR}"
+	local old_HOME="${HOME}"
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	export HOME=${EPREFIX}/root
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+			else
+				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+				|| die "Moving MY_DATADIR failed"
+			fi
+		else
+			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Attempting to use ${MY_DATADIR_s}"
+			else
+				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+			fi
+		fi
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=15
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
+	fi
+	if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
+	fi
+	if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
+	fi
+
+	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "(${ROOT}/${MY_DATADIR}/*)"
+		ewarn "Please rename or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	# 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 [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+		einfo "Please provide a password for the mysql 'root' user now"
+		einfo "or through the ${HOME}/.my.cnf file."
+		ewarn "Avoid [\"'\\_%] characters in the password"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same"
+		fi
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+	fi
+
+	local options
+	local sqltmp="$(emktemp)"
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+	for opt in grant-tables host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+		; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+	done
+
+	einfo "Creating the mysql database and setting proper permissions on it ..."
+
+	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+	PID_DIR="${EROOT}/var/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]]; then
+		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
+	fi
+
+	pushd "${TMPDIR}" &>/dev/null || die
+
+	# Filling timezones, see
+	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+	local cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
+	[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
+	einfo "Command: ${cmd[*]}"
+	su -s /bin/sh -c "${cmd[*]}" mysql \
+		>"${TMPDIR}"/mysql_install_db.log 2>&1
+	if [ $? -ne 0 ]; then
+		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+	fi
+	popd &>/dev/null || die
+	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+	|| die "MySQL databases not installed"
+
+	use prefix || options="${options} --user=mysql"
+
+	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT}/usr/sbin/mysqld \
+		${options} \
+		--log-warnings=0 \
+		--basedir=${EROOT}/usr \
+		--datadir=${ROOT}/${MY_DATADIR} \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--socket=${socket} \
+		--pid-file=${pidfile}
+		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+	#einfo "About to start mysqld: ${mysqld}"
+	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
+	${mysqld} &
+	rc=$?
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+	eend $rc
+
+	if ! [[ -S "${socket}" ]]; then
+		die "Completely failed to start up mysqld with: ${mysqld}"
+	fi
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
+	"${EROOT}/usr/bin/mysql" \
+		"--socket=${socket}" \
+		-hlocalhost \
+		-e "${sql}"
+	eend $?
+
+	if [[ -n "${sqltmp}" ]] ; then
+		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
+		"${EROOT}/usr/bin/mysql" \
+			"--socket=${socket}" \
+			-hlocalhost \
+			-uroot \
+			--password="${MYSQL_ROOT_PASSWORD}" \
+			mysql < "${sqltmp}"
+		rc=$?
+		eend $?
+		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+	fi
+
+	# Stop the server and cleanup
+	einfo "Stopping the server ..."
+	kill $(< "${pidfile}" )
+	rm -f "${sqltmp}"
+	wait %1
+	einfo "Done"
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2018-06-28 16:11 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2018-06-28 16:11 UTC (permalink / raw
  To: gentoo-commits

commit:     eb37416f9a8b014095948bfb5f77a7d6a37919dc
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 16:06:32 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 16:06:32 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=eb37416f

dev-db/mysql: Add client-libs for 5.6.40

Package-Manager: Portage-2.3.41, Repoman-2.3.9
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/Manifest               |  27 +-
 dev-db/mysql/mysql-5.6.40-r1.ebuild | 790 ++++++++++++++++++++++++++++++++++++
 2 files changed, 804 insertions(+), 13 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 7fecb3a..888caa3 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -7,6 +7,7 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde1539575
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.60.tar.gz 21025041 SHA256 a34112e1748823f6dfd0d129fe29a629cf35b8702f9dfaf1f24caf89ab523d1c SHA512 734395f3ce2c12e7703fe48d5bb2ce85ff8d7f04ae51cbe2d04a46b72b9689f804e5b498ae0b4722b0c098e2eed43d4f93b622964059525e6d9d14a47d55f775 WHIRLPOOL cf00fad25570cc991c4f4666667cb35a7fdec3831e233f2647c99761c1bcec665fc9a425608b40111095ffe8fddd37bf2a184880c7e698337999c5022e746abf
 DIST mysql-5.6.30.tar.gz 32223818 SHA256 48464df00aad9b9dfc26c903529ddad944a7562aa28e66e98e4f3f0c35179deb SHA512 b9f5b22a0557fbdd765fd3c379395584dd35bbec2d7504eb132f734129c0d95d24dc538c9b64524870bbecb92fa2f1e95b49ccfe22531ed17ec1e754f08d491b WHIRLPOOL f56d4e9d2ac801605bb941d1a8ba4b876d838a5e3bdac2e644477e87f2e5d439594c28d0e1c1d0c45ebb38fbf4183c429dc8c53bd7aa76aeea95acd1774ca71e
+DIST mysql-5.6.40.tar.gz 32083035 SHA256 1048a7abedba851efa62868e4d28d0be8828162b53903cd68e4f29546418d92d SHA512 c8e458b4cd34cae87f1b088ed2188bd00de8cdc42709d5964e82fa2e4aaecfc12a75ae006c54ffa0d3d286fbdef9704d0cbb83436437d5705fb8921d960e758c WHIRLPOOL a962d9223fbd66f47d7859458b82793c6a74e81c0dce69b222a274b92823245eb121302af10f9a476e88bc88edfdccddaa681efd3357b23f4880da05e3fbfb98
 DIST mysql-boost-5.7.17.tar.gz 61480982 SHA256 b75bba87199ef6a6ccc5dfbcaf70949009dc12089eafad8c5254afc9002aa903 SHA512 a1512abeba307fd21687677d2ee4bf20ced373312824de034e9b340d97e67eb4fcc5caa4ad7d9f58d6c0ddf57f6f6c0b0978e7b01c46f397ac661da843e3dfa6 WHIRLPOOL c9c078afdb1f8eb4405593611c179552493265c50b1eb1bac8cecadbac07103a11a05daf8c26d3d751526d5a69f14a8b6fce40b1aaaac7b9b4680679bf61bc4f
 DIST mysql-boost-5.7.21.tar.gz 48931457 SHA256 ad29ecb6fb3c3571394fe231633a2d1d188d49e9eb749daa4e8799b7630daa09 SHA512 29a1bfa1f5d5e354b66ca8c9fdaf7ee88de3d57bee3c6368861b46ab6d992affb7604577c06f241df542b96ab088c055473fd76584376dd149956ae1dd8726f3 WHIRLPOOL 0a86c9e088c870e5e8bf90b15ba53cd61e126143c5147adcbf5273c5dd8018bfe23fbbfd1b5055b9e9ece0a2b1fab21409eaa9bd939ec248410a92d4fe0052ab
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
@@ -21,19 +22,19 @@ DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAls0QuJfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAls1B4VfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
 QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7aEDBAAwu7ePI/lr3+FdeSrm3ILruqBTy+aOOAUorP5xbsJT9tksVo2XlTQiW9f
-8gdocGWMbEQ1FueGF6UgRMoExy52DufUn6xpH44kwV5xXmw08FwAHbeTUmH87ctH
-DKt2i+92Mfk81GKNh5cpn3El7mhN80dnhQ3H8D2UoxzGz7SEQph7dTqLQZcdc04z
-DOX6SZQg1qveeWpk3LaILYpYQidSaKdNbHOZOgRXnwjnxOIqdSlqo89ha14q0yln
-2Wd9RtCcJphQd0oQbyILn4J8H3pll/K6w4NU13uXajizPESiBokaRo8kOTL2g+/j
-YVKDRidiUBQgB+ZTuzTZMlRqAn+VoedPMyl0QBJ5ZIw+YjEX/77hIe1/jlnRwcYc
-8DstwUGJJOPBVx6+ORaHRPdjvC3PVUkrlzGr7+DHfyMfIVW2vUEL7UoCkWj8lN8D
-WLgRaM8/iWTFt9FCfQ+WtCEVbdkpzqNdzmEDSCN0yWovIIkMtVUpoMczAhBNBrvC
-2vth9nXv04C04V0jneir/auCYCpu23VQcIB2cAJDYWNA417WwcelHswommp8LLJ1
-gA4MHriS15m+QDSD+0FS1paHmB+hao0yP452uwEdlbzQL/qKArDNBvdhgERO08dQ
-oxQ1dfWZ8rRWY4VWmlu2pDwjzFip3FfEMsnCsPkCKt91YSlNAAE=
-=+755
+o7bBRxAAxFns0rydGSZklsHtzCTL2OQjXpI9NWAEkYGuEHWGH8wCJjYpuJ6td5sP
+HRRnMZ3J3e8vafS0mFNLRBtHtkud2J9Y0XGTlJPm/Vg/tVJQbVJ5mKJ42c2rg1vM
+HGGoOxNNLuKRRmKaZSXqeBkVeGE2jU0Vp7yLxIPwbLVMKpvNbwgFfXmRWP/jX6jx
+IKUgkuWAS9mMyYW/DIBxxA2h9QFpF+B3AFANY94Dyn8rPLqh9mXfD6mAOsbZ67Zu
+GKaiiRFwVbAd+L1CpzEaIARk+lL+lYa5gIUiFvVoP/06PDu1v4TxZm+2hSJbTLDw
+Fn9gVoW/cbeLjB3UoVM8LtkPabSMhl/Vi72sQp8XuaH7Xp60jZ4bJtUoUuwHM1fe
+AzwhYeOzOXFa8rnAGF/Isq9lMYiVRgLDyqKrxpkq7YkJyRxpTSSVP6uSkwejTvs7
+XEH3UBDFBXxbVm14owHRP36jZl2jbFUQp03TLhHqrZ3g8luSb56goOkMe+pOwybr
+N5z0acTr6NVkcxAjQqpfHztBYxv/s/MAPXZRIajKjoNEgwbid8o+sE3Wqr5/nys7
++igUKAZPrVCF72L+8Hnjl8Jj/soO0r1IP/o1VuOCKq+4FEJ1FDcLFjlcTwohTQig
+5ZsgIdo98euNytaGvGM0xO/ja7x5kkoCld+QReTiHsJbjBVpNBk=
+=wFYx
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.6.40-r1.ebuild b/dev-db/mysql/mysql-5.6.40-r1.ebuild
new file mode 100644
index 0000000..b26f7d2
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.40-r1.ebuild
@@ -0,0 +1,790 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180628-0201Z"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils flag-o-matic prefix toolchain-funcs \
+	user cmake-utils multilib-build
+
+SRC_URI="http://cdn.mysql.com/Downloads/MySQL-5.6/${P}.tar.gz
+	https://cdn.mysql.com/archives/mysql-5.6/${P}.tar.gz
+	http://downloads.mysql.com/archives/MySQL-5.6/${P}.tar.gz"
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+	SRC_URI="${SRC_URI}
+		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+HOMEPAGE="https://www.mysql.com/"
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+LICENSE="GPL-2"
+SLOT="0/18"
+IUSE="client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux
+	+server static static-libs systemtap tcmalloc test yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="libressl? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/mysql-extras"
+	EGIT_CLONE_TYPE=shallow
+	MY_PATCH_DIR="${WORKDIR}/mysql-extras"
+else
+	MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
+	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
+	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.6.35.patch
+	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
+	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch
+	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
+	"${MY_PATCH_DIR}"/20028_all_mysql-5.6-gcc7.patch
+	"${MY_PATCH_DIR}"/20031_all_mysql-5.6-fix-monitor.test.patch
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	net-misc/curl
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	!yassl? (
+		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	>=sys-libs/zlib-1.2.3:0=
+	sys-libs/ncurses:0=
+	server? (
+		numa? ( sys-process/numactl )
+	)
+	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
+"
+DEPEND="virtual/yacc
+	static? ( sys-libs/ncurses[static-libs] )
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+	${COMMON_DEPEND}
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+	fi
+	if has test ${FEATURES} && \
+		use server && ! has userpriv ${FEATURES} ; then
+			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+
+	# This should come after all of the die statements
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+pkg_preinst() {
+	# Here we need to see if the implementation switched client libraries
+	# We check if this is a new instance of the package and a client library already exists
+	local SHOW_ABI_MESSAGE libpath
+	if use client-libs && [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+		libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
+		elog "Due to ABI changes when switching between different client libraries,"
+		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+		elog "Please run: revdep-rebuild --library ${libpath}"
+		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+	fi
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	if use server ; then
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of mysql reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/${PN}.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropitate section headers, i.e. [mysqld]."
+	einfo
+}
+
+src_unpack() {
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
+
+	mv -f "${WORKDIR}/${P}" "${S}" || die
+}
+
+src_prepare() {
+	_disable_engine() {
+		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	_disable_plugin() {
+		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+	if use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+
+	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
+
+	local plugin
+	local server_plugins=( semisync )
+	local test_plugins=( audit_null daemon_example fulltext )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	# Don't build example
+	_disable_engine example
+	_disable_engine ndb
+	_disable_plugin innodb_memcached
+
+	cmake-utils_src_prepare
+}
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		### TODO: make this system but issues with UTF-8 prevent it
+		-DWITH_EDITLINE=bundled
+		-DWITH_ZLIB=system
+		-DWITH_LIBWRAP=0
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DWITH_LIBEVENT=NO
+		-DWITHOUT_CLIENTLIBS=YES
+		-DENABLE_DTRACE=$(usex systemtap)
+		-DWITH_SSL=$(usex yassl bundled system)
+		-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mysql/mysql-test' '')
+		-DWITHOUT_VALIDATE_PASSWORD=1
+	)
+
+	if use server ; then
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DWITH_NUMA=$(usex numa ON OFF)
+			-DEXTRA_CHARSETS=all
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DENABLED_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_EXAMPLE_STORAGE_ENGINE=0
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
+		)
+
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
+	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+	fi
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+}
+
+# Official test instructions:
+# USE='perl server static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# 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 [[ $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 && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+
+	# 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 run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	# Run mysql tests
+	pushd "${TESTDIR}" > /dev/null || die
+
+	touch "${T}/disabled.def"
+	# These are failing in MySQL 5.7 for now and are believed to be
+	# false positives:
+	#
+	local t
+
+	for t in auth_sec.keyring_udf federated.federated_plugin ; do
+			_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd > /dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1`
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_config() {
+	_getoptval() {
+		local mypd="${EROOT%/}"/usr/bin/my_print_defaults
+		local section="$1"
+		local flag="--${2}="
+		local extra_options="${3}"
+		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+	}
+	local old_MY_DATADIR="${MY_DATADIR}"
+	local old_HOME="${HOME}"
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	export HOME=${EPREFIX%/}/root
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+	if [[ ! -x "${EROOT%/}/usr/sbin/mysqld" ]] ; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+		local MY_DATADIR_s="${ROOT%/}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT%/}/${old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+			else
+				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+				|| die "Moving MY_DATADIR failed"
+			fi
+		else
+			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Attempting to use ${MY_DATADIR_s}"
+			else
+				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+			fi
+		fi
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=15
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${EROOT%/}/$MYSQL_TMPDIR" ]]; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_TMPDIR"
+	fi
+	if [[ ! -d "${EROOT%/}/$MYSQL_LOG_BIN" ]]; then
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_LOG_BIN"
+	fi
+	if [[ ! -d "${EROOT%/}/$MYSQL_RELAY_LOG" ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_RELAY_LOG"
+	fi
+
+	if [[ -d "${ROOT%/}/${MY_DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "(${ROOT%/}/${MY_DATADIR}/*)"
+		ewarn "Please rename or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	# 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 [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+		einfo "Please provide a password for the mysql 'root' user now"
+		einfo "or through the ${HOME}/.my.cnf file."
+		ewarn "Avoid [\"'\\_%] characters in the password"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same"
+		fi
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+	fi
+
+	local options
+	local sqltmp="$(emktemp)"
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR%/}/mysqld-help"
+	"${EROOT%/}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+		; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+	done
+
+	einfo "Creating the mysql database and setting proper permissions on it ..."
+
+	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+	PID_DIR="${EROOT%/}/var/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]]; then
+		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
+	fi
+
+	pushd "${TMPDIR}" &>/dev/null || die
+
+	# Filling timezones, see
+	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	echo "USE mysql;" >"${sqltmp}"
+	"${EROOT%/}/usr/bin/mysql_tzinfo_to_sql" "${EROOT%/}/usr/share/zoneinfo" >> "${sqltmp}" 2>/dev/null
+	chown mysql "${sqltmp}" || die
+
+	# --initialize-insecure will not set root password
+	# --initialize would set a random one in the log which we don't need as we set it ourselves
+	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
+	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	einfo "Command: ${cmd[*]}"
+	su -s /bin/sh -c "${cmd[*]}" mysql \
+		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
+	if [ $? -ne 0 ]; then
+		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
+		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+	fi
+	popd &>/dev/null || die
+	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
+	|| die "MySQL databases not installed"
+
+	use prefix || options="${options} --user=mysql"
+
+	local socket="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT%/}/usr/sbin/mysqld \
+		${options} \
+		$(use prefix || echo --user=mysql) \
+		--log-warnings=0 \
+		--basedir=${EROOT%/}/usr \
+		--datadir=${ROOT%/}/${MY_DATADIR} \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--socket=${socket} \
+		--pid-file=${pidfile}
+		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+	#einfo "About to start mysqld: ${mysqld}"
+	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
+	${mysqld} &
+	rc=$?
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+	eend $rc
+
+	if ! [[ -S "${socket}" ]]; then
+		die "Completely failed to start up mysqld with: ${mysqld}"
+	fi
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'"
+	"${EROOT%/}/usr/bin/mysql" \
+		--no-defaults \
+		"--socket=${socket}" \
+		-hlocalhost \
+		-e "${sql}"
+	eend $?
+
+	# Stop the server and cleanup
+	einfo "Stopping the server ..."
+	kill $(< "${pidfile}" )
+	rm -f "${sqltmp}"
+	wait %1
+	einfo "Done"
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2018-06-28 16:11 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2018-06-28 16:11 UTC (permalink / raw
  To: gentoo-commits

commit:     f9fcab9d2daaedb9623afc335e37028f24d91bcc
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 16:11:47 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 16:11:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f9fcab9d

dev-db/mysql: Fix up warnings and errors

Restore libressl sed on 5.5
Fix whitespace on 5.5
Remove unused option from 5.6

Package-Manager: Portage-2.3.41, Repoman-2.3.9
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/mysql-5.5.60-r1.ebuild | 13 ++++++++++++-
 dev-db/mysql/mysql-5.6.40-r1.ebuild |  1 -
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql/mysql-5.5.60-r1.ebuild b/dev-db/mysql/mysql-5.5.60-r1.ebuild
index 6b499b3..36a1e5f 100644
--- a/dev-db/mysql/mysql-5.5.60-r1.ebuild
+++ b/dev-db/mysql/mysql-5.5.60-r1.ebuild
@@ -10,7 +10,7 @@ SUBSLOT="18"
 inherit eutils flag-o-matic prefix toolchain-funcs user cmake-utils multilib-build
 
 SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.5/${P}.tar.gz
- https://downloads.mysql.com/archives/MySQL-5.5/${P}.tar.gz"
+	https://downloads.mysql.com/archives/MySQL-5.5/${P}.tar.gz"
 # Gentoo patches to MySQL
 if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
 	SRC_URI="${SRC_URI}
@@ -189,6 +189,16 @@ src_prepare() {
 		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
 	fi
 
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+
 	local plugin
 	local server_plugins=( semisync )
 	local test_plugins=( audit_null daemon_example fulltext )
@@ -206,6 +216,7 @@ src_prepare() {
 
 	# Don't build example
 	_disable_engine example
+	_disable_engine ndb
 
 	cmake-utils_src_prepare
 }

diff --git a/dev-db/mysql/mysql-5.6.40-r1.ebuild b/dev-db/mysql/mysql-5.6.40-r1.ebuild
index b26f7d2..f91b13d 100644
--- a/dev-db/mysql/mysql-5.6.40-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.40-r1.ebuild
@@ -326,7 +326,6 @@ src_configure(){
 
 		# Storage engines
 		mycmakeargs+=(
-			-DWITH_EXAMPLE_STORAGE_ENGINE=0
 			-DWITH_ARCHIVE_STORAGE_ENGINE=1
 			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
 			-DWITH_CSV_STORAGE_ENGINE=1


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2018-06-28 18:28 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2018-06-28 18:28 UTC (permalink / raw
  To: gentoo-commits

commit:     33b99abf2a667e3f9d1ed0b67a718862347ccc21
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 18:28:25 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 18:28:25 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=33b99abf

dev-db/mysql: Revert config change on 5.6.40-r1

Package-Manager: Portage-2.3.41, Repoman-2.3.9
Manifest-Sign-Key: D1F781EFF9F4A3B6

 dev-db/mysql/mysql-5.6.40-r1.ebuild | 47 ++++++++++---------------------------
 1 file changed, 13 insertions(+), 34 deletions(-)

diff --git a/dev-db/mysql/mysql-5.6.40-r1.ebuild b/dev-db/mysql/mysql-5.6.40-r1.ebuild
index f91b13d..3851573 100644
--- a/dev-db/mysql/mysql-5.6.40-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.40-r1.ebuild
@@ -164,16 +164,6 @@ pkg_postinst() {
 			einfo
 		fi
 	fi
-
-	# Note about configuration change
-	einfo
-	elog "This version of mysql reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/${PN}.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropitate section headers, i.e. [mysqld]."
-	einfo
 }
 
 src_unpack() {
@@ -381,32 +371,21 @@ src_install() {
 	# Configuration stuff
 	einfo "Building default configuration ..."
 	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
-	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
+	[[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
+	local mycnf_src="my.cnf-5.6"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR%/}/${mycnf_src}" \
+		> "${TMPDIR%/}/my.cnf.ok" || die
+	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8|latin1|g" \
+			"${TMPDIR%/}/my.cnf.ok" || die
+	fi
+	eprefixify "${TMPDIR%/}/my.cnf.ok"
+	newins "${TMPDIR}/my.cnf.ok" my.cnf
 
 	if use server ; then
-		mycnf_src="my.cnf.distro-server"
-		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-			"${FILESDIR}/${mycnf_src}" \
-			> "${TMPDIR}/my.cnf.ok" || die
-		if use prefix ; then
-			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-		if use latin1 ; then
-			sed -i \
-				-e "/character-set/s|utf8|latin1|g" \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-		eprefixify "${TMPDIR}/my.cnf.ok"
-		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
 		einfo "Including support files and sample configurations"
 		docinto "support-files"
 		local script


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2019-07-31 13:57 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2019-07-31 13:57 UTC (permalink / raw
  To: gentoo-commits

commit:     b9182e17ea734829f956c24015804dba4099c248
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 13:37:40 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 13:37:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=b9182e17

dev-db/mysql: Add final 5.5 version - 5.5.62

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-db/mysql/Manifest            |  24 +-
 dev-db/mysql/mysql-5.5.62.ebuild | 797 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 799 insertions(+), 22 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 888caa3..d5672e5 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
 DIST mysql-5.5.60.tar.gz 21025041 SHA256 a34112e1748823f6dfd0d129fe29a629cf35b8702f9dfaf1f24caf89ab523d1c SHA512 734395f3ce2c12e7703fe48d5bb2ce85ff8d7f04ae51cbe2d04a46b72b9689f804e5b498ae0b4722b0c098e2eed43d4f93b622964059525e6d9d14a47d55f775 WHIRLPOOL cf00fad25570cc991c4f4666667cb35a7fdec3831e233f2647c99761c1bcec665fc9a425608b40111095ffe8fddd37bf2a184880c7e698337999c5022e746abf
+DIST mysql-5.5.62.tar.gz 21111902 SHA256 b1e7853bc1f04aabf6771e0ad947f35ac8d237f4b35d0706d1095c9526ff99d7 SHA512 1080a3989c20bbbfe98739f99dacd183f2087ceee5147845852144240386808568af4c908ecdbccdcb6114000ab760ed7257492834d50018eff9520260fd91ce WHIRLPOOL f55b30e0839025180945d9d8244613b46f0b635bb75d4a409a82bdda0262374f2df1e9124f3abdad58e0a603fc8c3b2b34e235037f6613923385a903bfb9945b
 DIST mysql-5.6.30.tar.gz 32223818 SHA256 48464df00aad9b9dfc26c903529ddad944a7562aa28e66e98e4f3f0c35179deb SHA512 b9f5b22a0557fbdd765fd3c379395584dd35bbec2d7504eb132f734129c0d95d24dc538c9b64524870bbecb92fa2f1e95b49ccfe22531ed17ec1e754f08d491b WHIRLPOOL f56d4e9d2ac801605bb941d1a8ba4b876d838a5e3bdac2e644477e87f2e5d439594c28d0e1c1d0c45ebb38fbf4183c429dc8c53bd7aa76aeea95acd1774ca71e
 DIST mysql-5.6.40.tar.gz 32083035 SHA256 1048a7abedba851efa62868e4d28d0be8828162b53903cd68e4f29546418d92d SHA512 c8e458b4cd34cae87f1b088ed2188bd00de8cdc42709d5964e82fa2e4aaecfc12a75ae006c54ffa0d3d286fbdef9704d0cbb83436437d5705fb8921d960e758c WHIRLPOOL a962d9223fbd66f47d7859458b82793c6a74e81c0dce69b222a274b92823245eb121302af10f9a476e88bc88edfdccddaa681efd3357b23f4880da05e3fbfb98
 DIST mysql-boost-5.7.17.tar.gz 61480982 SHA256 b75bba87199ef6a6ccc5dfbcaf70949009dc12089eafad8c5254afc9002aa903 SHA512 a1512abeba307fd21687677d2ee4bf20ced373312824de034e9b340d97e67eb4fcc5caa4ad7d9f58d6c0ddf57f6f6c0b0978e7b01c46f397ac661da843e3dfa6 WHIRLPOOL c9c078afdb1f8eb4405593611c179552493265c50b1eb1bac8cecadbac07103a11a05daf8c26d3d751526d5a69f14a8b6fce40b1aaaac7b9b4680679bf61bc4f
@@ -17,24 +15,6 @@ DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a
 DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
 DIST mysql-extras-20180312-2011Z.tar.bz2 319047 SHA256 5d83747593b2276ecaf253b193814df2bfe170de57ceb7565e3d9f215df92254 SHA512 b0aa9fc8fbc050451ef147cee99b00cf10d34a71641837821e78655241f7d79a94fe2efb4cef9a23fe9741e08ada2fc0b58ef3b3663752bc567babfbcaa547c8 WHIRLPOOL 29085d38c285e62fa5925e70e01fda98ce5582e660b84fa09992049b5c222d1c14e73b94c63cb754bd94df00ce154b24ea5d4ee472de1766b6941cb05503c493
 DIST mysql-extras-20180628-0201Z.tar.bz2 322141 SHA256 8317028fa98cc4abd819d11191fb82026eb9c4d23490b7c1d42590731fbc834d SHA512 71a3800ec091b41e41d25536199149eb714c0bbfc0f6fc478e8e4dcaf4cf87a7e4d49c513da3c9badc0de810d7d78c05ad91dd898e45005b42136346237de42a WHIRLPOOL 71a5d8d09ede40a2d7adad6d57e1b546fabb34610c92ede6e0b472c0d84ad016e39ec7fcb038c708723535542dfd9caace22f2b8dd822951ba8c0ee2778c462b
+DIST mysql-extras-20180804-2323Z.tar.bz2 322215 SHA256 fa962215d2dba8f781f25351a1f8f70c79d4ab92eef438ec14824aadf12a9b34 SHA512 efd9d416f394cc61b977ab76f05ab3acc5803ff8bdee8e1dbc65cc5b3f07e4f9742140d9586c028908b10fcc44f21c98ebffdebcc5c3578acbe05b07526bcb3d WHIRLPOOL 175407174870609128c502a9843d2c3f3f40acdd24d3263bbe98b30d6b0586821f642ba57c0519ae5e795a883bf7eb736a4da6de5a6590407a3db560105d5140
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAls1B4VfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
-QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7bBRxAAxFns0rydGSZklsHtzCTL2OQjXpI9NWAEkYGuEHWGH8wCJjYpuJ6td5sP
-HRRnMZ3J3e8vafS0mFNLRBtHtkud2J9Y0XGTlJPm/Vg/tVJQbVJ5mKJ42c2rg1vM
-HGGoOxNNLuKRRmKaZSXqeBkVeGE2jU0Vp7yLxIPwbLVMKpvNbwgFfXmRWP/jX6jx
-IKUgkuWAS9mMyYW/DIBxxA2h9QFpF+B3AFANY94Dyn8rPLqh9mXfD6mAOsbZ67Zu
-GKaiiRFwVbAd+L1CpzEaIARk+lL+lYa5gIUiFvVoP/06PDu1v4TxZm+2hSJbTLDw
-Fn9gVoW/cbeLjB3UoVM8LtkPabSMhl/Vi72sQp8XuaH7Xp60jZ4bJtUoUuwHM1fe
-AzwhYeOzOXFa8rnAGF/Isq9lMYiVRgLDyqKrxpkq7YkJyRxpTSSVP6uSkwejTvs7
-XEH3UBDFBXxbVm14owHRP36jZl2jbFUQp03TLhHqrZ3g8luSb56goOkMe+pOwybr
-N5z0acTr6NVkcxAjQqpfHztBYxv/s/MAPXZRIajKjoNEgwbid8o+sE3Wqr5/nys7
-+igUKAZPrVCF72L+8Hnjl8Jj/soO0r1IP/o1VuOCKq+4FEJ1FDcLFjlcTwohTQig
-5ZsgIdo98euNytaGvGM0xO/ja7x5kkoCld+QReTiHsJbjBVpNBk=
-=wFYx
------END PGP SIGNATURE-----

diff --git a/dev-db/mysql/mysql-5.5.62.ebuild b/dev-db/mysql/mysql-5.5.62.ebuild
new file mode 100644
index 0000000..cb22969
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.62.ebuild
@@ -0,0 +1,797 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180804-2323Z"
+SUBSLOT="18"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils flag-o-matic prefix toolchain-funcs user cmake-utils multilib-build
+
+SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.5/${P}.tar.gz
+	https://downloads.mysql.com/archives/MySQL-5.5/${P}.tar.gz"
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+	SRC_URI="${SRC_URI}
+		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
+fi
+
+HOMEPAGE="https://mysql.com/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl
+	+perl profiling selinux +server	static static-libs systemtap tcmalloc
+	test yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )
+	static? ( yassl )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
+	EGIT_CLONE_TYPE=shallow
+else
+	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+	"${MY_PATCH_DIR}/01050_all_mysql_config_cleanup-5.5.patch"
+	"${MY_PATCH_DIR}/02040_all_embedded-library-shared-5.5.10.patch"
+	"${MY_PATCH_DIR}/20001_all_fix-minimal-build-cmake-mysql-5.5.41.patch"
+	"${MY_PATCH_DIR}/20002_all_mysql-va-list.patch"
+	"${MY_PATCH_DIR}/20006_all_cmake_elib-mysql-5.5.53.patch"
+	"${MY_PATCH_DIR}/20007_all_cmake-debug-werror-5.6.22.patch"
+	"${MY_PATCH_DIR}/20008_all_mysql-tzinfo-symlink-5.6.37.patch"
+	"${MY_PATCH_DIR}/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch"
+	"${MY_PATCH_DIR}/20018_all_mysql-5.5.60-without-clientlibs-tools.patch"
+	"${MY_PATCH_DIR}/20027_all_mysql-5.5-perl5.26-includes.patch"
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	!yassl? (
+		!libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	>=sys-libs/zlib-1.2.3:0=
+	sys-libs/ncurses:0=
+	!bindist? (
+		>=sys-libs/readline-4.1:0=
+	)
+	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
+"
+DEPEND="virtual/yacc
+	static? ( sys-libs/ncurses[static-libs] )
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+	${COMMON_DEPEND}
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+	fi
+	if has test ${FEATURES} && \
+		use server && ! has userpriv ${FEATURES} ; then
+			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+
+	# This should come after all of the die statements
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	if use server ; then
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		einfo
+		elog "Be sure to edit the my.cnf file to activate your cluster settings."
+		elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+		elog "The first time the cluster is activated, you should add"
+		elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+		elog "This option should then be removed for subsequent starts."
+		einfo
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
+
+	mv -f "${WORKDIR%/}/${P}" "${S}" || die
+}
+
+src_prepare() {
+	_disable_engine() {
+		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	_disable_plugin() {
+		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+	}
+
+	if use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
+	fi
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
+	fi
+
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+
+	local plugin
+	local server_plugins=( semisync )
+	local test_plugins=( audit_null daemon_example fulltext )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	# Don't build example
+	_disable_engine example
+	_disable_engine ndb
+
+	cmake-utils_src_prepare
+}
+
+src_configure(){
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_ZLIB=system
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DWITHOUT_CLIENTLIBS=YES
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	if use server ; then
+
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+				-DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DINSTALL_SQLBENCHDIR=share/mysql
+			-DEXTRA_CHARSETS=all
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_EMBEDDED_SERVER=OFF
+		)
+
+		if use profiling ; then
+			# Setting to OFF doesn't work: Once set, profiling options will be added
+			# to `mysqld --help` output via sql/sys_vars.cc causing
+			# "main.mysqld--help-notwin" test to fail
+			mycmakeargs+=( -DENABLED_PROFILING=ON )
+		fi
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED%/}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED%/}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED%/}/usr/data" ]] ; then
+		rm -Rf "${ED%/}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D%/}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
+	local mycnf_src="my.cnf-5.5"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR%/}/${mycnf_src}" \
+		> "${TMPDIR%/}/my.cnf.ok" || die
+	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8|latin1|g" \
+			"${TMPDIR%/}/my.cnf.ok" || die
+	fi
+	eprefixify "${TMPDIR%/}/my.cnf.ok"
+	newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+	if use server ; then
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S%/}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S%/}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+	fi
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED%/}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED%/}/usr/bin/mytop"
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# 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 [[ $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 && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+
+	# 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 run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	# Run mysql tests
+	pushd "${TESTDIR}" > /dev/null || die
+
+	touch "${T}/disabled.def"
+	# These are failing in MySQL 5.5 for now and are believed to be
+	# false positives:
+	#
+	# main.mysql_client_test, main.mysql_client_test_nonblock
+	# main.mysql_client_test_comp:
+	# segfaults at random under Portage only, suspect resource limits.
+
+	local t
+	for t in federated.federated_plugin \
+		main.mysql_client_test main.mysql_client_test_nonblock \
+		main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam \
+		main.mysqlhotcopy_archive main.mysqlhotcopy_myisam main.openssl_1 \
+		rpl.rpl_semi_sync_uninstall_plugin ; do
+			_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	if ! use client-libs ; then
+		_disable_test main.plugin_auth "Needs client libraries built"
+	fi
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd > /dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1`
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1`
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_config() {
+	_getoptval() {
+		local mypd="${EROOT}"/usr/bin/my_print_defaults
+		local section="$1"
+		local flag="--${2}="
+		local extra_options="${3}"
+		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
+	}
+	local old_MY_DATADIR="${MY_DATADIR}"
+	local old_HOME="${HOME}"
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	export HOME=${EPREFIX}/root
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
+		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+		MY_DATADIR_s="${MY_DATADIR_s%%/}"
+		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
+				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
+			else
+				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+				|| die "Moving MY_DATADIR failed"
+			fi
+		else
+			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
+			if [[ -d "${MY_DATADIR_s}" ]]; then
+				ewarn "Attempting to use ${MY_DATADIR_s}"
+			else
+				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
+				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
+			fi
+		fi
+	fi
+
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=15
+
+	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
+	fi
+	if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
+		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
+	fi
+	if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
+		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
+	fi
+
+	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+		ewarn "You have already a MySQL database in place."
+		ewarn "(${ROOT}/${MY_DATADIR}/*)"
+		ewarn "Please rename or delete it if you wish to replace it."
+		die "MySQL database already exists!"
+	fi
+
+	# 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 [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+
+		einfo "Please provide a password for the mysql 'root' user now"
+		einfo "or through the ${HOME}/.my.cnf file."
+		ewarn "Avoid [\"'\\_%] characters in the password"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same"
+		fi
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+	fi
+
+	local options
+	local sqltmp="$(emktemp)"
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+	for opt in grant-tables host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+		; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
+	done
+
+	einfo "Creating the mysql database and setting proper permissions on it ..."
+
+	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
+	PID_DIR="${EROOT}/var/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]]; then
+		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]]; then
+		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
+	fi
+
+	pushd "${TMPDIR}" &>/dev/null || die
+
+	# Filling timezones, see
+	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+
+	local cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
+	[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
+	einfo "Command: ${cmd[*]}"
+	su -s /bin/sh -c "${cmd[*]}" mysql \
+		>"${TMPDIR}"/mysql_install_db.log 2>&1
+	if [ $? -ne 0 ]; then
+		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+	fi
+	popd &>/dev/null || die
+	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+	|| die "MySQL databases not installed"
+
+	use prefix || options="${options} --user=mysql"
+
+	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT}/usr/sbin/mysqld \
+		${options} \
+		--log-warnings=0 \
+		--basedir=${EROOT}/usr \
+		--datadir=${ROOT}/${MY_DATADIR} \
+		--max_allowed_packet=8M \
+		--net_buffer_length=16K \
+		--socket=${socket} \
+		--pid-file=${pidfile} \
+		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+	#einfo "About to start mysqld: ${mysqld}"
+	ebegin "Starting mysqld"
+	einfo "Command ${mysqld}"
+	${mysqld} &
+	rc=$?
+	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+	eend $rc
+
+	if ! [[ -S "${socket}" ]]; then
+		die "Completely failed to start up mysqld with: ${mysqld}"
+	fi
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
+	"${EROOT}/usr/bin/mysql" \
+		"--socket=${socket}" \
+		-hlocalhost \
+		-e "${sql}"
+	eend $?
+
+	if [[ -n "${sqltmp}" ]] ; then
+		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
+		"${EROOT}/usr/bin/mysql" \
+			"--socket=${socket}" \
+			-hlocalhost \
+			-uroot \
+			--password="${MYSQL_ROOT_PASSWORD}" \
+			mysql < "${sqltmp}"
+		rc=$?
+		eend $?
+		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+	fi
+
+	# Stop the server and cleanup
+	einfo "Stopping the server ..."
+	kill $(< "${pidfile}" )
+	rm -f "${sqltmp}"
+	wait %1
+	einfo "Done"
+}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

* [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
@ 2019-07-31 13:57 Brian Evans
  0 siblings, 0 replies; 124+ messages in thread
From: Brian Evans @ 2019-07-31 13:57 UTC (permalink / raw
  To: gentoo-commits

commit:     41a7f01c3469a9eb7795c06805772a748ee0580f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 13:56:55 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 13:56:55 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=41a7f01c

dev-db/mysql: Drop old versions

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Manifest-Sign-Key: D1F781EFF9F4A3B6
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-db/mysql/Manifest               |  28 +-
 dev-db/mysql/metadata.xml           |   1 -
 dev-db/mysql/mysql-5.5.60-r1.ebuild | 791 ------------------------------------
 dev-db/mysql/mysql-5.6.30.ebuild    | 165 --------
 dev-db/mysql/mysql-5.6.40-r1.ebuild | 768 ----------------------------------
 dev-db/mysql/mysql-5.7.17.ebuild    | 210 ----------
 6 files changed, 22 insertions(+), 1941 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index d5672e5..4ab2b64 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,20 +1,36 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.60.tar.gz 21025041 SHA256 a34112e1748823f6dfd0d129fe29a629cf35b8702f9dfaf1f24caf89ab523d1c SHA512 734395f3ce2c12e7703fe48d5bb2ce85ff8d7f04ae51cbe2d04a46b72b9689f804e5b498ae0b4722b0c098e2eed43d4f93b622964059525e6d9d14a47d55f775 WHIRLPOOL cf00fad25570cc991c4f4666667cb35a7fdec3831e233f2647c99761c1bcec665fc9a425608b40111095ffe8fddd37bf2a184880c7e698337999c5022e746abf
 DIST mysql-5.5.62.tar.gz 21111902 SHA256 b1e7853bc1f04aabf6771e0ad947f35ac8d237f4b35d0706d1095c9526ff99d7 SHA512 1080a3989c20bbbfe98739f99dacd183f2087ceee5147845852144240386808568af4c908ecdbccdcb6114000ab760ed7257492834d50018eff9520260fd91ce WHIRLPOOL f55b30e0839025180945d9d8244613b46f0b635bb75d4a409a82bdda0262374f2df1e9124f3abdad58e0a603fc8c3b2b34e235037f6613923385a903bfb9945b
-DIST mysql-5.6.30.tar.gz 32223818 SHA256 48464df00aad9b9dfc26c903529ddad944a7562aa28e66e98e4f3f0c35179deb SHA512 b9f5b22a0557fbdd765fd3c379395584dd35bbec2d7504eb132f734129c0d95d24dc538c9b64524870bbecb92fa2f1e95b49ccfe22531ed17ec1e754f08d491b WHIRLPOOL f56d4e9d2ac801605bb941d1a8ba4b876d838a5e3bdac2e644477e87f2e5d439594c28d0e1c1d0c45ebb38fbf4183c429dc8c53bd7aa76aeea95acd1774ca71e
-DIST mysql-5.6.40.tar.gz 32083035 SHA256 1048a7abedba851efa62868e4d28d0be8828162b53903cd68e4f29546418d92d SHA512 c8e458b4cd34cae87f1b088ed2188bd00de8cdc42709d5964e82fa2e4aaecfc12a75ae006c54ffa0d3d286fbdef9704d0cbb83436437d5705fb8921d960e758c WHIRLPOOL a962d9223fbd66f47d7859458b82793c6a74e81c0dce69b222a274b92823245eb121302af10f9a476e88bc88edfdccddaa681efd3357b23f4880da05e3fbfb98
-DIST mysql-boost-5.7.17.tar.gz 61480982 SHA256 b75bba87199ef6a6ccc5dfbcaf70949009dc12089eafad8c5254afc9002aa903 SHA512 a1512abeba307fd21687677d2ee4bf20ced373312824de034e9b340d97e67eb4fcc5caa4ad7d9f58d6c0ddf57f6f6c0b0978e7b01c46f397ac661da843e3dfa6 WHIRLPOOL c9c078afdb1f8eb4405593611c179552493265c50b1eb1bac8cecadbac07103a11a05daf8c26d3d751526d5a69f14a8b6fce40b1aaaac7b9b4680679bf61bc4f
 DIST mysql-boost-5.7.21.tar.gz 48931457 SHA256 ad29ecb6fb3c3571394fe231633a2d1d188d49e9eb749daa4e8799b7630daa09 SHA512 29a1bfa1f5d5e354b66ca8c9fdaf7ee88de3d57bee3c6368861b46ab6d992affb7604577c06f241df542b96ab088c055473fd76584376dd149956ae1dd8726f3 WHIRLPOOL 0a86c9e088c870e5e8bf90b15ba53cd61e126143c5147adcbf5273c5dd8018bfe23fbbfd1b5055b9e9ece0a2b1fab21409eaa9bd939ec248410a92d4fe0052ab
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
-DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
 DIST mysql-extras-20180312-2011Z.tar.bz2 319047 SHA256 5d83747593b2276ecaf253b193814df2bfe170de57ceb7565e3d9f215df92254 SHA512 b0aa9fc8fbc050451ef147cee99b00cf10d34a71641837821e78655241f7d79a94fe2efb4cef9a23fe9741e08ada2fc0b58ef3b3663752bc567babfbcaa547c8 WHIRLPOOL 29085d38c285e62fa5925e70e01fda98ce5582e660b84fa09992049b5c222d1c14e73b94c63cb754bd94df00ce154b24ea5d4ee472de1766b6941cb05503c493
-DIST mysql-extras-20180628-0201Z.tar.bz2 322141 SHA256 8317028fa98cc4abd819d11191fb82026eb9c4d23490b7c1d42590731fbc834d SHA512 71a3800ec091b41e41d25536199149eb714c0bbfc0f6fc478e8e4dcaf4cf87a7e4d49c513da3c9badc0de810d7d78c05ad91dd898e45005b42136346237de42a WHIRLPOOL 71a5d8d09ede40a2d7adad6d57e1b546fabb34610c92ede6e0b472c0d84ad016e39ec7fcb038c708723535542dfd9caace22f2b8dd822951ba8c0ee2778c462b
 DIST mysql-extras-20180804-2323Z.tar.bz2 322215 SHA256 fa962215d2dba8f781f25351a1f8f70c79d4ab92eef438ec14824aadf12a9b34 SHA512 efd9d416f394cc61b977ab76f05ab3acc5803ff8bdee8e1dbc65cc5b3f07e4f9742140d9586c028908b10fcc44f21c98ebffdebcc5c3578acbe05b07526bcb3d WHIRLPOOL 175407174870609128c502a9843d2c3f3f40acdd24d3263bbe98b30d6b0586821f642ba57c0519ae5e795a883bf7eb736a4da6de5a6590407a3db560105d5140
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAl1BniZfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
+QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
+o7ahww//auRw72e8YFZr47EKU5QgBPF09Sno4320t9rtSpRPoAVLdfkhnsmwxiA7
+sqV/5hT0NkWtNVee5RsxzVkW4s45I8Q0gGjqD+WGc5qP4iNKYflUgSiXXLlQ1MY8
+IsIkofRPit6XmjG1QAdjftwiZREZH8c1hlHPZB0UHwOMoZMH0GWUljhS02kK4gK6
+8WK5WUYCN29i8SvTGE7rCQOp3hdIcwRApM4fciERbNK3bqUsmLb8R7qRj1CvqrXL
+B971GLypt1PNFuBMQPd/iU/sasrZY2ncU3rO0wOcvAoUSmc3qIx/SjUA/e9CdJNN
+uXw4tCXRptC+a8Z0hvTGtlN9SWHr5hxSlv9au3GgfGPSFnVDXiZuKbObRzvkzeLs
+YuWhULl6IZMOd5hhhyjI3Ct7M14+yIvxj4DsU+sXni3qrHT82/9hWVZrBydRF0tJ
+5wp0B4vaf78cekw+NKmevxa3BXAGAlpRRfRnu4Cx4TDv2O9kLzG7/oPEIWHhStYw
+sDyaxH6qM1CTroIcYOT9NQfdtZU4RjdL5Lcf15zB+ZcYHzmupZbd6JIczXqggl4g
+MGwr+O8axkwzRoiHr0q2WQNHUIMrtFrbunkxzvhNKkSsBE361SLO6r+9Qp57Sy3w
+mb/ulSHGYEGmICbh03Z/oHalpw7BE78xCB/7IhA8s1MR9NR1xcA=
+=Jr+Z
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index c89ecc4..59b0429 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -15,7 +15,6 @@
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
   <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
-  <flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
   <flag name="max-idx-128">Raise the max index per table limit from 64 to 128</flag>
   <flag name="minimal">Install client programs only, no server</flag>
   <flag name="numa">Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)</flag>

diff --git a/dev-db/mysql/mysql-5.5.60-r1.ebuild b/dev-db/mysql/mysql-5.5.60-r1.ebuild
deleted file mode 100644
index 36a1e5f..0000000
--- a/dev-db/mysql/mysql-5.5.60-r1.ebuild
+++ /dev/null
@@ -1,791 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20180628-0201Z"
-SUBSLOT="18"
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils flag-o-matic prefix toolchain-funcs user cmake-utils multilib-build
-
-SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.5/${P}.tar.gz
-	https://downloads.mysql.com/archives/MySQL-5.5/${P}.tar.gz"
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-HOMEPAGE="https://mysql.com/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:-0}"
-IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl
-	+perl profiling selinux +server	static static-libs systemtap tcmalloc
-	test yassl"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc )
-	static? ( yassl )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
-	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
-	EGIT_CLONE_TYPE=shallow
-else
-	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
-	"${MY_PATCH_DIR}/01050_all_mysql_config_cleanup-5.5.patch"
-	"${MY_PATCH_DIR}/02040_all_embedded-library-shared-5.5.10.patch"
-	"${MY_PATCH_DIR}/20001_all_fix-minimal-build-cmake-mysql-5.5.41.patch"
-	"${MY_PATCH_DIR}/20002_all_mysql-va-list.patch"
-	"${MY_PATCH_DIR}/20006_all_cmake_elib-mysql-5.5.53.patch"
-	"${MY_PATCH_DIR}/20007_all_cmake-debug-werror-5.6.22.patch"
-	"${MY_PATCH_DIR}/20008_all_mysql-tzinfo-symlink-5.6.37.patch"
-	"${MY_PATCH_DIR}/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch"
-	"${MY_PATCH_DIR}/20018_all_mysql-5.5.60-without-clientlibs-tools.patch"
-	"${MY_PATCH_DIR}/20027_all_mysql-5.5-perl5.26-includes.patch"
-	"${MY_PATCH_DIR}/20030_all_mysql-5.5-fix-client-mysql-type.patch"
-)
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	kernel_linux? (
-		sys-process/procps:0=
-		dev-libs/libaio:0=
-	)
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	jemalloc? ( dev-libs/jemalloc:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	!yassl? (
-		!libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	>=sys-libs/zlib-1.2.3:0=
-	sys-libs/ncurses:0=
-	!bindist? (
-		>=sys-libs/readline-4.1:0=
-	)
-	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
-"
-DEPEND="virtual/yacc
-	static? ( sys-libs/ncurses[static-libs] )
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
-	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
-	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	${COMMON_DEPEND}
-	perl? ( !dev-db/mytop
-		virtual/perl-Getopt-Long
-		dev-perl/TermReadKey
-		virtual/perl-Term-ANSIColor
-		virtual/perl-Time-HiRes )
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		local GCC_MAJOR_SET=$(gcc-major-version)
-		local GCC_MINOR_SET=$(gcc-minor-version)
-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
-		# non x86{,_64} arches
-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-	fi
-	if has test ${FEATURES} && \
-		use server && ! has userpriv ${FEATURES} ; then
-			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	if use server ; then
-		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-			einfo
-			elog "You might want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
-			elog "if this is a new install."
-			elog
-			elog "If you are switching server implentations, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		else
-			einfo
-			elog "If you are upgrading major versions, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		fi
-
-		einfo
-		elog "Be sure to edit the my.cnf file to activate your cluster settings."
-		elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
-		elog "The first time the cluster is activated, you should add"
-		elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
-		elog "This option should then be removed for subsequent starts."
-		einfo
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
-
-	mv -f "${WORKDIR%/}/${P}" "${S}" || die
-}
-
-src_prepare() {
-	_disable_engine() {
-		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
-	}
-
-	_disable_plugin() {
-		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
-	}
-
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
-	fi
-
-	if use jemalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
-	fi
-
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
-	local plugin
-	local server_plugins=( semisync )
-	local test_plugins=( audit_null daemon_example fulltext )
-	if ! use server; then # These plugins are for the server
-		for plugin in "${server_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	if ! use test; then # These plugins are only used during testing
-		for plugin in "${test_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	# Don't build example
-	_disable_engine example
-	_disable_engine ndb
-
-	cmake-utils_src_prepare
-}
-
-src_configure(){
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		-DWITH_ZLIB=system
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		# The build forces this to be defined when cross-compiling.  We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DWITHOUT_CLIENTLIBS=YES
-		-DWITH_READLINE=$(usex bindist 1 0)
-		-DENABLE_DTRACE=$(usex systemtap)
-	)
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	if ! use yassl ; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
-	if use server ; then
-
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			mycmakeargs+=(
-				-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-				-DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 )
-		fi
-
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8
-				-DDEFAULT_COLLATION=utf8_general_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-		mycmakeargs+=(
-			-DINSTALL_SQLBENCHDIR=share/mysql
-			-DEXTRA_CHARSETS=all
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DENABLED_PROFILING=$(usex profiling)
-		)
-
-		if use static; then
-			mycmakeargs+=( -DWITH_PIC=1 )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_PARTITION_STORAGE_ENGINE=1
-		)
-
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DEXTRA_CHARSETS=none
-			-DINSTALL_SQLBENCHDIR=
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-	if [[ -f "${ED%/}/usr/include/mysql/server/private/config.h" ]] ; then
-		rm "${ED%/}/usr/include/mysql/server/private/config.h" || die
-	fi
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED%/}/usr/data" ]] ; then
-		rm -Rf "${ED%/}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D%/}/${MY_SHAREDSTATEDIR}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
-	local mycnf_src="my.cnf-5.5"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR%/}/${mycnf_src}" \
-		> "${TMPDIR%/}/my.cnf.ok" || die
-	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8|latin1|g" \
-			"${TMPDIR%/}/my.cnf.ok" || die
-	fi
-	eprefixify "${TMPDIR%/}/my.cnf.ok"
-	newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-	if use server ; then
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		local script
-		for script in \
-			"${S%/}"/support-files/magic
-		do
-			[[ -f "$script" ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S%/}"/scripts/mysql* ; do
-			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
-		done
-	fi
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED%/}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED%/}/usr/bin/mytop"
-}
-
-# Official test instructions:
-# USE='extraengine perl server' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	_disable_test() {
-		local rawtestname reason
-		rawtestname="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}'"
-		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# 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 [[ $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 && ewarn "Some tests may fail with FEATURES=usersandbox"
-
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-
-	# 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 run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" > /dev/null || die
-
-	touch "${T}/disabled.def"
-	# These are failing in MySQL 5.5 for now and are believed to be
-	# false positives:
-	#
-	# main.mysql_client_test, main.mysql_client_test_nonblock
-	# main.mysql_client_test_comp:
-	# segfaults at random under Portage only, suspect resource limits.
-
-	local t
-	for t in main.mysql_client_test main.mysql_client_test_nonblock \
-		main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam \
-		main.mysqlhotcopy_archive main.mysqlhotcopy_myisam main.openssl_1 \
-		rpl.rpl_semi_sync_uninstall_plugin ; do
-			_disable_test  "$t" "False positives in Gentoo"
-	done
-
-	if ! use client-libs ; then
-		_disable_test main.plugin_auth "Needs client libraries built"
-	fi
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd > /dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || die "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
-
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_config() {
-	_getoptval() {
-		local mypd="${EROOT}"/usr/bin/my_print_defaults
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
-	}
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX}/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
-	fi
-	if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
-	fi
-	if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
-	fi
-
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# 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 [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now"
-		einfo "or through the ${HOME}/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options
-	local sqltmp="$(emktemp)"
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in grant-tables host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-
-	einfo "Creating the mysql database and setting proper permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]]; then
-		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
-	fi
-
-	pushd "${TMPDIR}" &>/dev/null || die
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
-	local cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
-	[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
-	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
-	einfo "Command: ${cmd[*]}"
-	su -s /bin/sh -c "${cmd[*]}" mysql \
-		>"${TMPDIR}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-	fi
-	popd &>/dev/null || die
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-
-	use prefix || options="${options} --user=mysql"
-
-	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT}/usr/sbin/mysqld \
-		${options} \
-		--log-warnings=0 \
-		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--socket=${socket} \
-		--pid-file=${pidfile}
-		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
-	"${EROOT}/usr/bin/mysql" \
-		"--socket=${socket}" \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	if [[ -n "${sqltmp}" ]] ; then
-		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
-		"${EROOT}/usr/bin/mysql" \
-			"--socket=${socket}" \
-			-hlocalhost \
-			-uroot \
-			--password="${MYSQL_ROOT_PASSWORD}" \
-			mysql < "${sqltmp}"
-		rc=$?
-		eend $?
-		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-	fi
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}

diff --git a/dev-db/mysql/mysql-5.6.30.ebuild b/dev-db/mysql/mysql-5.6.30.ebuild
deleted file mode 100644
index 5979eb8..0000000
--- a/dev-db/mysql/mysql-5.6.30.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_EXTRAS_VER="20160212-0233Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-HAS_TOOLS_PATCH="1"
-SUBSLOT="18"
-
-inherit mysql-multilib-r1
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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
-
-# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
-# disable until we see what happens with it
-MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 )
-
-src_prepare() {
-	mysql-multilib-r1_src_prepare
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-}
-
-# Official test instructions:
-# USE='server embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-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 symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-		; do
-				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		if ! use extraengine ; then
-			# bug 401673, 530766
-			for t in federated.federated_plugin ; do
-				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000 --reorder
-		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/mysql/mysql-5.6.40-r1.ebuild b/dev-db/mysql/mysql-5.6.40-r1.ebuild
deleted file mode 100644
index 3851573..0000000
--- a/dev-db/mysql/mysql-5.6.40-r1.ebuild
+++ /dev/null
@@ -1,768 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20180628-0201Z"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils flag-o-matic prefix toolchain-funcs \
-	user cmake-utils multilib-build
-
-SRC_URI="http://cdn.mysql.com/Downloads/MySQL-5.6/${P}.tar.gz
-	https://cdn.mysql.com/archives/mysql-5.6/${P}.tar.gz
-	http://downloads.mysql.com/archives/MySQL-5.6/${P}.tar.gz"
-
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-HOMEPAGE="https://www.mysql.com/"
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-LICENSE="GPL-2"
-SLOT="0/18"
-IUSE="client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux
-	+server static static-libs systemtap tcmalloc test yassl"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/mysql-extras"
-	EGIT_CLONE_TYPE=shallow
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras"
-else
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
-	"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
-	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
-	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.6.35.patch
-	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
-	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch
-	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
-	"${MY_PATCH_DIR}"/20028_all_mysql-5.6-gcc7.patch
-	"${MY_PATCH_DIR}"/20031_all_mysql-5.6-fix-monitor.test.patch
-)
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	kernel_linux? (
-		sys-process/procps:0=
-		dev-libs/libaio:0=
-	)
-	net-misc/curl
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	jemalloc? ( dev-libs/jemalloc:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	>=sys-libs/zlib-1.2.3:0=
-	sys-libs/ncurses:0=
-	server? (
-		numa? ( sys-process/numactl )
-	)
-	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
-"
-DEPEND="virtual/yacc
-	static? ( sys-libs/ncurses[static-libs] )
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
-	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
-	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	${COMMON_DEPEND}
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		local GCC_MAJOR_SET=$(gcc-major-version)
-		local GCC_MINOR_SET=$(gcc-minor-version)
-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
-		# non x86{,_64} arches
-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-	fi
-	if has test ${FEATURES} && \
-		use server && ! has userpriv ${FEATURES} ; then
-			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-pkg_preinst() {
-	# Here we need to see if the implementation switched client libraries
-	# We check if this is a new instance of the package and a client library already exists
-	local SHOW_ABI_MESSAGE libpath
-	if use client-libs && [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
-		libpath=$(readlink "${EROOT}usr/$(get_libdir)/libmysqlclient.so")
-		elog "Due to ABI changes when switching between different client libraries,"
-		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
-		elog "Please run: revdep-rebuild --library ${libpath}"
-		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
-	fi
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	if use server ; then
-		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-			einfo
-			elog "You might want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
-			elog "if this is a new install."
-			elog
-			elog "If you are switching server implentations, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		else
-			einfo
-			elog "If you are upgrading major versions, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
-
-	mv -f "${WORKDIR}/${P}" "${S}" || die
-}
-
-src_prepare() {
-	_disable_engine() {
-		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
-	}
-
-	_disable_plugin() {
-		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
-	}
-
-	if use jemalloc ; then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
-	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
-
-	local plugin
-	local server_plugins=( semisync )
-	local test_plugins=( audit_null daemon_example fulltext )
-	if ! use server; then # These plugins are for the server
-		for plugin in "${server_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	if ! use test; then # These plugins are only used during testing
-		for plugin in "${test_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	# Don't build example
-	_disable_engine example
-	_disable_engine ndb
-	_disable_plugin innodb_memcached
-
-	cmake-utils_src_prepare
-}
-
-src_configure(){
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		### TODO: make this system but issues with UTF-8 prevent it
-		-DWITH_EDITLINE=bundled
-		-DWITH_ZLIB=system
-		-DWITH_LIBWRAP=0
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
-		# The build forces this to be defined when cross-compiling.  We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DWITH_LIBEVENT=NO
-		-DWITHOUT_CLIENTLIBS=YES
-		-DENABLE_DTRACE=$(usex systemtap)
-		-DWITH_SSL=$(usex yassl bundled system)
-		-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mysql/mysql-test' '')
-		-DWITHOUT_VALIDATE_PASSWORD=1
-	)
-
-	if use server ; then
-
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8
-				-DDEFAULT_COLLATION=utf8_general_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-		mycmakeargs+=(
-			-DWITH_NUMA=$(usex numa ON OFF)
-			-DEXTRA_CHARSETS=all
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DENABLED_PROFILING=$(usex profiling)
-		)
-
-		if use static; then
-			mycmakeargs+=( -DWITH_PIC=1 )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_PARTITION_STORAGE_ENGINE=1
-			-DWITH_INNODB_MEMCACHED=0
-		)
-
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DEXTRA_CHARSETS=none
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
-	local mycnf_src="my.cnf-5.6"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR%/}/${mycnf_src}" \
-		> "${TMPDIR%/}/my.cnf.ok" || die
-	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8|latin1|g" \
-			"${TMPDIR%/}/my.cnf.ok" || die
-	fi
-	eprefixify "${TMPDIR%/}/my.cnf.ok"
-	newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-	if use server ; then
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		local script
-		for script in \
-			"${S}"/support-files/magic
-		do
-			[[ -f "$script" ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
-		done
-	fi
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-}
-
-# Official test instructions:
-# USE='perl server static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	_disable_test() {
-		local rawtestname reason
-		rawtestname="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}'"
-		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# 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 [[ $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 && ewarn "Some tests may fail with FEATURES=usersandbox"
-
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-
-	# 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 run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" > /dev/null || die
-
-	touch "${T}/disabled.def"
-	# These are failing in MySQL 5.7 for now and are believed to be
-	# false positives:
-	#
-	local t
-
-	for t in auth_sec.keyring_udf federated.federated_plugin ; do
-			_disable_test  "$t" "False positives in Gentoo"
-	done
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd > /dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || die "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
-
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_config() {
-	_getoptval() {
-		local mypd="${EROOT%/}"/usr/bin/my_print_defaults
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
-	}
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-	if [[ ! -x "${EROOT%/}/usr/sbin/mysqld" ]] ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT%/}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT%/}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${EROOT%/}/$MYSQL_TMPDIR" ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_TMPDIR"
-	fi
-	if [[ ! -d "${EROOT%/}/$MYSQL_LOG_BIN" ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_LOG_BIN"
-	fi
-	if [[ ! -d "${EROOT%/}/$MYSQL_RELAY_LOG" ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_RELAY_LOG"
-	fi
-
-	if [[ -d "${ROOT%/}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT%/}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# 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 [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now"
-		einfo "or through the ${HOME}/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options
-	local sqltmp="$(emktemp)"
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR%/}/mysqld-help"
-	"${EROOT%/}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-
-	einfo "Creating the mysql database and setting proper permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT%/}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]]; then
-		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
-	fi
-
-	pushd "${TMPDIR}" &>/dev/null || die
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	echo "USE mysql;" >"${sqltmp}"
-	"${EROOT%/}/usr/bin/mysql_tzinfo_to_sql" "${EROOT%/}/usr/share/zoneinfo" >> "${sqltmp}" 2>/dev/null
-	chown mysql "${sqltmp}" || die
-
-	# --initialize-insecure will not set root password
-	# --initialize would set a random one in the log which we don't need as we set it ourselves
-	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
-	einfo "Command: ${cmd[*]}"
-	su -s /bin/sh -c "${cmd[*]}" mysql \
-		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
-	fi
-	popd &>/dev/null || die
-	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-
-	use prefix || options="${options} --user=mysql"
-
-	local socket="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT%/}/usr/sbin/mysqld \
-		${options} \
-		$(use prefix || echo --user=mysql) \
-		--log-warnings=0 \
-		--basedir=${EROOT%/}/usr \
-		--datadir=${ROOT%/}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--socket=${socket} \
-		--pid-file=${pidfile}
-		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'"
-	"${EROOT%/}/usr/bin/mysql" \
-		--no-defaults \
-		"--socket=${socket}" \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}

diff --git a/dev-db/mysql/mysql-5.7.17.ebuild b/dev-db/mysql/mysql-5.7.17.ebuild
deleted file mode 100644
index ef830b3..0000000
--- a/dev-db/mysql/mysql-5.7.17.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_EXTRAS_VER="live"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-SUBSLOT="20"
-SERVER_URI="https://cdn.mysql.com/archives/${PN}-5.7/${PN}-boost-${MY_PV}.tar.gz"
-MY_SOURCEDIR="${PN}-${MY_PV}"
-inherit mysql-multilib-r1
-
-IUSE="cjk"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# 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 )
-	>=app-arch/lz4-0_p131:=
-	>=dev-libs/protobuf-2.5.0:=
-	cjk? ( app-text/mecab )"
-RDEPEND="${RDEPEND}"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras"
-
-PATCHES=(
-	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
-	"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.7.patch
-	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.7.patch
-	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
-	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.7.6.patch
-	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.7-without-clientlibs-tools.patch
-)
-
-# 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
-
-src_prepare() {
-	mysql-multilib-r1_src_prepare
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-	# Remove dozens of test only plugins by deleting them
-	if ! use test ; then
-		rm -r "${S}"/plugin/{test_service_sql_api,test_services,udf_services} || die
-	fi
-	# Remove CJK Fulltext plugin
-	if ! use cjk ; then
-		rm -r "${S}"/plugin/fulltext || die
-	fi
-}
-
-src_configure() {
-	local MYSQL_CMAKE_NATIVE_DEFINES=(
-		-DWITH_LZ4=system
-		-DWITH_NUMA=OFF
-		-DWITH_BOOST="${S}/boost/boost_1_59_0"
-		-DWITH_PROTOBUF=system
-	)
-	# This is the CJK fulltext plugin, not related to the complete fulltext indexing
-	if use cjk ; then
-		MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITH_MECAB=system  )
-	else
-		MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITHOUT_FULLTEXT=1  )
-	fi
-	mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='server embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-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 symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# rpl.rpl_plugin_load
-		# fails due to included file not listed in expected result
-		# appears to be poor planning
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-		#
-		# main.events2
-		# Event creation is in the past and automatically dropped
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-			main.events_2 \
-		; do
-				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		if ! use extraengine ; then
-			# bug 401673, 530766
-			for t in federated.federated_plugin ; do
-				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
-			done
-		fi
-
-		if ! use cjk ; then
-			for t in innodb_fts.ngram_2 innodb_fts.ngram_1 innodb_fts.ngram ; do
-				mysql-multilib-r1_disable_test  "$t" "Test $t requires USE=cjk"
-			done
-		fi
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-#		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000 --reorder
-		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
-}


^ permalink raw reply related	[flat|nested] 124+ messages in thread

end of thread, other threads:[~2019-07-31 13:57 UTC | newest]

Thread overview: 124+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-28  2:13 [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/ Robin H. Johnson
  -- strict thread matches above, loose matches on Subject: below --
2019-07-31 13:57 Brian Evans
2019-07-31 13:57 Brian Evans
2018-06-28 18:28 Brian Evans
2018-06-28 16:11 Brian Evans
2018-06-28 16:11 Brian Evans
2018-06-28  2:10 Brian Evans
2018-03-29 12:46 Brian Evans
2018-03-27 18:26 Brian Evans
2018-03-12 20:47 Brian Evans
2018-03-12 20:32 Brian Evans
2018-03-12 13:20 Brian Evans
2018-03-12 13:20 Brian Evans
2017-03-02 14:30 Brian Evans
2017-03-02 14:30 Brian Evans
2017-01-09 16:27 Brian Evans
     [not found] <1483479079.1e70022facc519de2f3b12c26191f0a021faa862.grknight@gentoo>
2017-01-03 21:37 ` Brian Evans
2016-04-29 19:52 Brian Evans
2016-04-12 18:23 Brian Evans
2016-02-12  3:30 Brian Evans
2016-02-12  3:30 Brian Evans
2016-02-12  3:30 Brian Evans
2016-02-12  3:30 Brian Evans
2016-02-10  2:59 Brian Evans
2016-02-10  2:59 Brian Evans
2016-01-21 21:15 Brian Evans
2015-10-19 18:13 Brian Evans
2015-10-19 18:13 Brian Evans
2015-10-12 18:37 Brian Evans
2015-10-01 15:15 Brian Evans
2015-08-19 18:33 Brian Evans
2015-08-13 13:50 Brian Evans
2015-07-29 19:02 Brian Evans
2015-06-03 17:18 Brian Evans
2015-05-30  1:23 Brian Evans
2015-05-29 18:05 Brian Evans
2015-03-10 20:52 Brian Evans
2015-02-06 14:10 Brian Evans
2015-02-06 14:10 Brian Evans
2014-12-04  1:29 Brian Evans
2014-12-03 21:40 Brian Evans
2014-09-24  3:24 Brian Evans
2014-08-03 21:43 Robin H. Johnson
2014-08-03 21:43 Robin H. Johnson
2014-08-02  1:12 Brian Evans
2014-08-01 19:57 Brian Evans
2014-07-29 20:24 Robin H. Johnson
2014-06-08 20:08 Brian Evans
2014-05-14  2:31 Brian Evans
2014-04-26 19:10 Brian Evans
2014-04-24 11:07 Jorge Manuel B. S. Vicetto
2014-04-02 12:59 Brian Evans
2014-04-01 17:51 Brian Evans
2014-03-28 16:47 Brian Evans
2014-03-11 20:07 Brian Evans
2014-02-24 17:26 Brian Evans
2014-02-01  2:10 Jorge Manuel B. S. Vicetto
2014-01-24 13:47 Brian Evans
2013-12-12 17:28 Brian Evans
2013-12-10 14:39 Brian Evans
2013-10-14 17:49 Brian Evans
2013-08-30 20:27 Brian Evans
2013-08-29 18:04 Brian Evans
2013-08-26 12:46 Brian Evans
2013-08-16 16:28 Brian Evans
2013-06-26  1:57 Jorge Manuel B. S. Vicetto
2013-06-25 17:38 Jorge Manuel B. S. Vicetto
2013-06-06 20:32 Robin H. Johnson
2013-06-06 20:32 Robin H. Johnson
2013-06-06 20:32 Robin H. Johnson
2013-05-28 21:51 Robin H. Johnson
2013-04-30 11:37 Jorge Manuel B. S. Vicetto
2013-04-29 21:34 Jorge Manuel B. S. Vicetto
2013-03-08  7:49 Robin H. Johnson
2013-01-28 18:58 Robin H. Johnson
2013-01-28  2:13 Robin H. Johnson
2013-01-28  2:13 Robin H. Johnson
2013-01-28  2:13 Robin H. Johnson
2013-01-28  2:13 Robin H. Johnson
2013-01-20  2:15 Robin H. Johnson
2013-01-20  2:15 Robin H. Johnson
2013-01-20  2:15 Robin H. Johnson
2013-01-20  2:15 Robin H. Johnson
2013-01-20  2:15 Robin H. Johnson
2013-01-20  2:15 Robin H. Johnson
2012-11-02  0:05 Robin H. Johnson
2012-10-26 14:41 Jorge Manuel B. S. Vicetto
2012-10-25 13:46 Jorge Manuel B. S. Vicetto
2012-10-24 18:10 Jorge Manuel B. S. Vicetto
2012-08-14 10:05 Jorge Manuel B. S. Vicetto
2012-08-03 19:56 Robin H. Johnson
2012-07-27 16:09 Robin H. Johnson
2012-07-07 23:55 Jorge Manuel B. S. Vicetto
2012-05-22 12:09 Jorge Manuel B. S. Vicetto
2012-04-02  0:21 Robin H. Johnson
2012-03-23 22:03 Robin H. Johnson
2012-03-23 22:02 Robin H. Johnson
2012-02-02  2:50 Robin H. Johnson
2012-02-02  2:50 Robin H. Johnson
2012-01-31  9:29 Robin H. Johnson
2011-12-27  7:15 Robin H. Johnson
2011-11-20  0:27 Robin H. Johnson
2011-11-19  0:47 Robin H. Johnson
2011-10-26 19:45 Jorge Manuel B. S. Vicetto
2011-10-26 19:45 Jorge Manuel B. S. Vicetto
2011-09-27  2:26 Jorge Manuel B. S. Vicetto
2011-09-22  3:32 Jorge Manuel B. S. Vicetto
2011-07-30  3:37 Jorge Manuel B. S. Vicetto
2011-07-21  5:39 Jorge Manuel B. S. Vicetto
2011-07-21  5:39 Jorge Manuel B. S. Vicetto
2011-07-14  4:05 Jorge Manuel B. S. Vicetto
2011-07-14  4:05 Jorge Manuel B. S. Vicetto
2011-07-13  7:43 Robin H. Johnson
2011-07-13  7:43 Robin H. Johnson
2011-07-13  3:15 Jorge Manuel B. S. Vicetto
2011-07-13  2:14 Jorge Manuel B. S. Vicetto
2011-07-13  2:14 Jorge Manuel B. S. Vicetto
2011-05-18 19:28 Jorge Manuel B. S. Vicetto
2011-05-16 15:35 Jorge Manuel B. S. Vicetto
2011-05-16  2:14 Jorge Manuel B. S. Vicetto
2011-05-15 23:07 Jorge Manuel B. S. Vicetto
2011-05-11  2:30 Jorge Manuel B. S. Vicetto
2011-04-21 12:14 Robin H. Johnson
2011-02-17  3:15 Jorge Manuel B. S. Vicetto

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox