Bump.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64

3 files changed, 138 insertions, 2 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 36e276858d83..aff22416ea26 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.649 2013/06/02 19:48:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.650 2013/06/03 15:56:10 robbat2 Exp $
+
+*mysql-5.5.31 (03 Jun 2013)
+
+  03 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> +mysql-5.5.31.ebuild:
+  Bump.
 
 *mysql-5.1.69 (02 Jun 2013)
 *mysql-5.1.68 (02 Jun 2013)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 26830c9959ba..636cd75fa986 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -13,6 +13,7 @@ DIST mysql-5.1.68.tar.gz 24655564 SHA256 25f02868dded24a46aeda7863008bcd9639c08f
 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-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
@@ -35,6 +36,7 @@ EBUILD mysql-5.1.69.ebuild 8888 SHA256 4521757182e10371ae23e2a3b732ef903771ba769
 EBUILD mysql-5.5.29-r1.ebuild 4242 SHA256 3050cce87771178e6b0e1be0486542068ca58266477882a017a9d900be284251 SHA512 c6f8ef37f7aa200fcd2a93d13b4617500a5b128b33d3fc3a319c60442968090e61b0d89cb3f0854aacdc203f8a4118650421cd87a5f741cf9236d8848d58b8f1 WHIRLPOOL 7a204932d5b42ba51296de982878f47f45c83afd174b8f67094fc8dbb2405b7296cc50005fbdc8e270a3ae45378fa67fccfba56332a634ad04742acc9786dd71
 EBUILD mysql-5.5.29.ebuild 4239 SHA256 e0698d4254ffb43527ebc76d12b032cf2bb44bb98cc84c8d35c6506e92df425e SHA512 07b378685d411bfcc9ea623f9889496ac918117db255520c772fa771af5004b834e7f2aa8d906cfbc622462c5d624fcec7150e742a1e0655fbbc90252a881d08 WHIRLPOOL ccfd8507c5e08e8151b59ad594090807c39b0eef147069fa7e9874cc5010cee796ccd1a10ccba978cfdafc5236d94c467c5ad08be42f482e6cdd74a10511eff2
 EBUILD mysql-5.5.30.ebuild 4239 SHA256 2ca5a738aa3f23eb2884d3330422aac64cc114abc5068087ad2de95618a07fcf SHA512 005c04567b7b90218931fb4b63710f99462b87be76fe5a3394a833f8f0da40b7daea5cf464f1d6d1e365ccee218c5164c0e468553099f38dc10852112366a778 WHIRLPOOL f7bfead5fd62a9a24936cf94758da3aa5601acf74d0afd5dfee57daf3cb739397b6cc2105488c05ad3f629a89fa031ef6ebdd4256d02e20829144d306cf74114
-MISC ChangeLog 14220 SHA256 66886af767b577fd5669a1713c5a2c18aab35984dfd0dc77b343736f7153a4af SHA512 8c7107e902ba8bd942eab2adeb7945bb8342a9045ed4abcf1586f2df7a06693f053980cf4e5a2444f3266c81c37d5c38b0a9cd5f78ea54a8ee4d27ada755a3d3 WHIRLPOOL 494c4973968a9c40e0608e05107789d1c1ed173a6a66758d0f01fe92657bfa31e304a7a193c2cb5cb949b5572a2c8f37ae78af508da3cbe3152bf40f2446af45
+EBUILD mysql-5.5.31.ebuild 4239 SHA256 5965807f9b00a08f5f0ab9a854991fc93d27097461b33dad6b18811aa0977a20 SHA512 7d7adb808d136143d58956fc327a4777e12125b0b1c5ffe5918ef336cd3f83bd0ab523c158c08b12e7c61772c9cd5941548ba3ccd62a9326e3deeae6cd7baf36 WHIRLPOOL bc194a189f62336b31897d5fe0b712f7ddea24f19dfa617a783d48e521fd1af31ea5740f98df5015814939f7b618f5eb606afc7d6f16dae48654b141a8b426f8
+MISC ChangeLog 14333 SHA256 774fcfe1af721b20256bd1971a503e8fb06f277a19534ae2e23f5cbe15e1cebd SHA512 9866db9d1ad8c4aa0a5316db72575249edbae3b8735b5040deacd5f6b8666d58d43e3129979f8e810d2f250f9566a795ae8f7019224d6334f539fe38644ec708 WHIRLPOOL 7c8f9f40619a1befc5201455d17f71946cd8f69a40a4440faa0d98eb653aba8a10355cb560f37ecaeaeedc753a7fd8d19dfe5737bc0c866e1f8873bbd64b0a1c
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC metadata.xml 1512 SHA256 2aa7aa3c625242463dcc8fbd52f0c33558507f375dd64c80412372e5d8456b70 SHA512 b9a09711b821ce7a962dcb23a4e249bfa83fd5605a45bc9416e4721a643e8fc740df4e22a7aba8d7245612361f6f3d779647f32c9469662fc2a2598030a2499e WHIRLPOOL 9d553da0a5501afbb99566ba46664f50e871e90a6ae839626f2aea9b7f28e9eadd1b8360483bed9a397082f59518009d1f70fef128399370c4bb1d6e85c2b5dd
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 000000000000..ecbc89b0efd6
--- /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.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
+}