Version bump for 5.5.40

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

3 files changed, 137 insertions, 9 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 80fb8d6b7799..d775b41caa1f 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.689 2014/08/30 00:53:55 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.690 2014/09/24 02:36:50 grknight Exp $
+
+*mysql-5.5.40 (24 Sep 2014)
+
+  24 Sep 2014; Brian Evans <grknight@gentoo.org> +mysql-5.5.40.ebuild:
+  Version bump for 5.5.40
 
 *mysql-5.6.20-r1 (30 Aug 2014)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index d6084490ff5c..9a09ff2e26bd 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -6,6 +6,7 @@ AUX my.cnf-5.5 4903 SHA256 5dea40a071aa24d34485788fcf5a852885f362f69dfa1e479d813
 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.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-extras-20130626-0127Z.tar.bz2 1476503 SHA256 a3c791b7b95fe170c4071feed11699146fc8f9de6a9f2ffa67214c2e50644b4f SHA512 4ee19cb5960ba24f2db16e7c5b647d1b7bb9fadbc73bbd8125bbac7e926c569a9a585a4d1d92b851ea6653d9c15eeb00f1592880f104520dc040e5af19943ac7 WHIRLPOOL 739f5762fa24b0feb40848ddb83f2ed95fb650933920b3d9e55c5e90f907d4ac74dfb00e4b9189cda8f9af4317478f3132daf789d7c91196827f645dd3e37d61
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
@@ -15,19 +16,20 @@ DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae
 EBUILD mysql-5.1.70.ebuild 8874 SHA256 abd74f2cf58e5c8d4544c2dee89c8b30174b038aba91f3b45138cc299d8013b7 SHA512 303ee2ff791852dcab8d72a73e06b7f5e1fe0bd48b6e71730013c601eba412cebacb09cc76d06075f4e63b0eae80947a2bf9eb42da24d412b5c66d69d9aeb4c4 WHIRLPOOL 20d542a938589b3fefc738e64f5d9f9596faa1f1dad0175b144adc096d7354390eb6c4aed873dec9687e08483cba47fac56c786829c2ffbbb22e04ecea2b867a
 EBUILD mysql-5.1.73-r1.ebuild 8892 SHA256 a3f57db069a9d7eab793820178c0367ddeb912b604560db3a55553c9787cf230 SHA512 ebf6f4f196362b7623c6ee9b336e23ca94a67a32da4f389e4f49c9f44c1dc2b1c6e482de90e3afe1cfbf1edbcfbba02331ea4506cc5bc66fc2fed2624b9defd8 WHIRLPOOL c917e39875832571fdcdd5c37c58548c4bc25434b313b0dcbe569d0551b265ec3d2cf1811fbcbbac62213faa1de4855284769a2add53dc889e6998e76464e736
 EBUILD mysql-5.5.39.ebuild 4615 SHA256 f44dd9ebc5bfee7073fdef344903bb0fad67a411e52841506ea4c9ff515f45ad SHA512 a7fee9a6955b2f42d7206dc244b45e5b97dd3f936fdb664b0a55a38de1b221bfe998f30d23ebfa5445e839cf1026ee27fa0acde1c34b3d41be78963a00c35c0d WHIRLPOOL 6e57229545d685ed60a837d0c90e6706e8b7f28ba594479fea9e59a2c4d27a7ec1d7e6123d441563e7218872d9d571adc0e8857801e9f07ca77636c81e2f1794
+EBUILD mysql-5.5.40.ebuild 4099 SHA256 11c30d35f2992a341c9b8f6201a67e091a2c3fd18889a67ab6efa5034e6132a9 SHA512 80d63e3dbbbe9f9c848e1bf31bc11da3b2bf0a843d79d1f208d88f0ea8cacb07ed2fc55c9e4e0cf2711cf7f7d2cfe1f4e8253a070fe8b1d5731c40fdcd6fa3f0 WHIRLPOOL 04aca930b7dd00133f59ff8c967e785600570d12acc0bd3b00ce40663a7806eb3a21c6b5a0a49b507d48bcdcf549a75016844db5782021cd3530c8ab05e042ff
 EBUILD mysql-5.6.20-r1.ebuild 4914 SHA256 a70fec415472a4c9bb5cbaa3efbda8e9f10426ea637f6e74506aee0086e6a0f6 SHA512 3925f899d4e0543e4f94235a6e62da577d715d5301958ad73fa2423876a5134ef159b2e530db29dd51015345d310330661a665fded87e3982f94d36fcacb65f2 WHIRLPOOL c6bb47f17345e77dcd818a2f7a7934c53c42bb40c6a042dcf649cdf41e30a2e8072d1fd2e6f19e7ab5bd232c74a701fc8271015ac2a655110b09d568a714e045
 EBUILD mysql-5.6.20.ebuild 4870 SHA256 3f648054cc738d223de0049f263040d9dd8fa0c57dba91059897cf8320686543 SHA512 841dde413652326c55c32581b4b94703f598e259e148b50767f2bff3c317650d757e4377c9e051e1ed324df01b6360916df9a84e1d39dd57a2d4e060baed55e1 WHIRLPOOL 88274cfd5530cc204304715e71b58503895655b6b201028d517cb89341a78fb3624c1b30cbf5db73ca18126ce1089db654c1950214416e4a397d34d3fabd41e6
-MISC ChangeLog 19741 SHA256 c58174e44db56ecf0685dd3169cd66cf512ead71fef6fc688d8c0c717a0c58f9 SHA512 6d8d31b2dd278019726bde5c71d94a2f77d80412a6b3c7cfeff9f19340193c790cb8ce12435efd9e724acd5bfbd47a1d1e26892fa3008be8331124ad92648f29 WHIRLPOOL f7083a3da8979975ba9c8b537d159779519c59b07a9701e6473169cc1033dc4ec52880c74ae70da7d10c22ccb102010a6714e32fbb6de6116f6a6f0e3e4e7ca3
+MISC ChangeLog 19868 SHA256 c10b9f2a7a747a456f4a69cc620cfc6abde3b00a6b18ff6b035824e36bd7ac8f SHA512 c8c74b41385c6dcbace2e79bd41f10dc82b9336baff009f8f74835500bc54350ee7b9248dea4526beed29052a6e7689303348708af28d78c3f085f713796a1cd WHIRLPOOL ef2d57e8f3f1681f8e8c3598c12c974ad065c0c8babf32fcafa73994b12f456e9cd9aaa774a7514c479afa9d4b7d895eaec6e4fed3d200f563ed32794686708a
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC metadata.xml 1440 SHA256 57b1430c744bb21c4f99b885b92c1ca27efec6757e06f51bc043e25737a226b5 SHA512 0a8f4cc67b3dee66b95c16edcb0c1dd70b95b199f7cd46ba4b509a9f52dbb7d45ed2da4280ed8ba93d96521f66fc80d486de91f0a23ff3e0baee48795e5151fa WHIRLPOOL d747dccd7d8ae91fd60c5c074a3d1f0ab64a96f8ec09658a36e42546d17cbd9644de45527ed1bc6babeb7329c666ecc01cea7283dc4640268ed5cd2ca045172b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUASCtAAoJEE4V4vFnx44d6dYH/A4/4edXJO/0ur8s+AyIZ8bN
-WwfMYfoQAcB5yxWcS68fpwGmJfwZ8zNQZ3anuSqc0bjZBw8sYvj6doc+XlYSVvWV
-eSEz32lwZe8/SKtqDsg6TNiCQk959Wpe1uIHzdRgXJD1Uit4ZXqr8ukSMmEe1Xsi
-KEdMzzr48Vcc7Kuz95xWbqN6Owt7tp8tmEapPfqrymJlRNBV0kzkHEpyhDNU6dpu
-Ssf0KXacanOOTOsi9piH2eVcKpkDYZf78Dis+qrLfxQSgws2fYZndhSX2flwJyPE
-QhSBYcgG/hyODSnoYYUgpwKfc+dtnl2S3/a+/xDcC1uQJ9Nn7BZvcHwOMB+1GME=
-=CjD3
+iQEcBAEBCAAGBQJUIi5HAAoJEE4V4vFnx44dFeoH/2NxN/QW5luEetL4MzPpwUJ9
+mo2MImBrOaTh+ZJukzBsVBH+bUDCRYJGzaGNpNwcri3f4e1/ygyXcyMDcLPIh4Dp
+CnNolei0YlZr/ggo0vPJKDkVOZ/6B+UwGHFTaCDd7Yr2btoK+SEnUUK6xwzcE60S
+ZdlckFn3HUHnlOUy1kdLURrAYKlltOriDzggACe0hmlQ1xXwcxZ2oNy2VVpI0RtN
++edI+y2wlF0GcbzspUxh8cqmzi/ckK16C+OOrIRtwC/sAwbVCX28vAmE/IWvltf3
+na08sVC9kOditHBMLSCNVArmWMuQvbiFlaFVRP4A7JyZeIs+7xM748cWzyEnns8=
+=Clgc
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-5.5.40.ebuild b/dev-db/mysql/mysql-5.5.40.ebuild
new file mode 100644
index 000000000000..f31e03c0d67b
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.40.ebuild
@@ -0,0 +1,121 @@
+# 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.1 2014/09/24 02:36:50 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))"
+		# 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}
+
+		# 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.
+
+		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" \
+			--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
+}