Bump.

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

9 files changed, 493 insertions, 3 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.68.ebuild b/dev-db/mysql/mysql-5.1.68.ebuild
new file mode 100644
index 0000000..aabfe2a
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.68.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.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
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.32.ebuild b/dev-db/mysql/mysql-5.5.32.ebuild
new file mode 100644
index 0000000..c8ba059
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.32.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
+}