Version bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

3 files changed, 140 insertions, 16 deletions

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 3f63f9865c1e..715d1eb240e2 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.110 2015/06/02 05:03:29 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.111 2015/06/20 01:04:32 grknight Exp $
+
+*mariadb-10.0.20 (20 Jun 2015)
+
+  20 Jun 2015; Brian Evans <grknight@gentoo.org> +mariadb-10.0.20.ebuild:
+  Version bump
 
   02 Jun 2015; Jack Morgan <jmorgan@gentoo.org> mariadb-10.0.19.ebuild:
   sparc stable wrt bug #546724
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 8d3612aedfe9..745d42e268f3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,28 +6,32 @@ AUX my.cnf-5.5 4916 SHA256 b579073c015719b9623e2e00a985587947bb3562958f6e6f55530
 AUX my.cnf-5.6 4687 SHA256 dc94a99e91d082b47c0ceb10badbf12a44c5ab7f60710bcc2e5f136328856d05 SHA512 8e568f6002a1bef3be73e6e0811fd2479c0611fe8f55175e114d622860801429ebfafd6fcff7c9f38679185fc660b100d24fe599b0424cc73e776bf5c0aeb3a3 WHIRLPOOL b5800fb149a99582f4866079946ba744efda79abbffcea2db495566daab03e6a55f7df1adf63f11c43c240ba5c1df64fea233f60481d27430729011563afe209
 DIST mariadb-10.0.16.tar.gz 55656968 SHA256 44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4 SHA512 8da873ff604d8cb247057a626b26e4086690bb97ef1243bf3dde81b1de4f39c80aded5e045920f8176554dc162c5adb7501fe9403c3ed44992be13fe4c63a2b3 WHIRLPOOL 916af6fbd50dba19d9fe74fdf206d6417d676852e59332a0c0e2da44d7cf7be58770adaa9e707e4177729a10d6145c57235df4af0bb8fc4dc72fb442f853e2cf
 DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
+DIST mariadb-10.0.20.tar.gz 56241178 SHA256 3a4f6963c794977af5d5fd9ec06a337a2ad556b3a287196fddbd2243c1388b7b SHA512 40214e29ec3fd6402b6e075644ab3fc3acd080e9e0d6e77db83c14d928f69a9af366c5df715d3d52692b90259c6b6d28160376a4d6e05811ed9973741a3ba445 WHIRLPOOL 5a5dfa7a53254a22fc4540aa78a6ac3704e17e90b22d1bae32f40bddd906e6e9409161c973e9229d48af27419df410c7214859bd979137221ba394d37cf1bbbb
 DIST mariadb-5.5.43.tar.gz 45651398 SHA256 a0709997140549154edb87c9dfab564cd4755b238251acbf42369118f9bb4d01 SHA512 fa9b463843ebf70e3a462ee5fdfa34aedd35194f3593f7ec1fc5f17663e798610ade46925b31f9f96e06503508ae840bfed54ae7b6661affa4d5b630d475f1db WHIRLPOOL 4d9b219263e75dd6530a24fe2d34df370cde0cfc7b13b5a820567d84cc4da22864e1fbb0d3413a23f2b9ce12c7fccd32c09aad391e690b510b2c7a788f7fa88e
 DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
 DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
 EBUILD mariadb-10.0.16.ebuild 4219 SHA256 8d0b967ac975033b04069dfa545870364e2a7cc426e3ba22afd7fc1dc41d36e2 SHA512 954e8ba9171201a9c625314a2f8feff9475a6ef16a03ffe3a4af9025048b1aa073eab2d46a1226a59350c6e3aadfd4a3651b652598a2612908d8eaf9d6e9d2ad WHIRLPOOL 341f4c708fe3294b69b9c4e42ec560fe8c8d08e15167e17619d883b22fa496eaf9e80146b95bf08b81c89066e6172efde5c3004d592fe0ee95130b62d09bc1d0
 EBUILD mariadb-10.0.19.ebuild 3981 SHA256 cdc2a0f153908ffda2ce1cc6f162d8e2bc8f0a9f0ee1060150223750e526098e SHA512 37aeacfe59d03a4710922a4b3250fceb97258dc620859d4bbd5edb89a8dcb838a8ceab05dc436f189ee3516745a43b68a6fb94d5b01a12727aa566e4e77400e8 WHIRLPOOL 7f7a9bc8b342c6bcb11c62ebcbc482c95e2e4c2bb6879723b04cd0b75753de9cbf213bae745b4ae7df5426930a1b1f038ed250ebc739b93f025172777bbe91f2
+EBUILD mariadb-10.0.20.ebuild 3989 SHA256 add94f125cf35e5b725140c14a1c3c3e98dac4c7c8ee966f21f1aba226d625ca SHA512 5dd35988222ef73bcb9086a8a84a4681d3a21e4ab9a80e9881315d7a71989d4bd1d7d4884486551335e5409e0cfb6856a051c8d5fcfc598d916f7513f4d96ebd WHIRLPOOL 4d8fc61d8f9ad161cd6128fb90447a31b1ee158f22abb9f5da4935a2454e9408f0206fc2ad2c93d2a58f2fb55a2d8be0100f439187bf6759d3f9c51228384607
 EBUILD mariadb-5.5.43-r1.ebuild 4124 SHA256 24cfbd4e0fd532c44f3c62a51fe8f829dc37e77b8a3390fa1159a1bc4d969341 SHA512 60b58452feaedf650f763651ff994ddfcb7c46302f6fdb8607c2b68bb579a83394a2bada83d9b03e5a58c1f40f32f8c19184c4752c20c81137f497dbfbb65e01 WHIRLPOOL f87b2b849cefaf0617fb78e331bb7ed3c5b784c61e71e760d8debf3fecb46b52e6d328af93303fabb2068757b3d3458201f8399f9a1cc40cdddb5df5f07f2dd5
-MISC ChangeLog 17473 SHA256 7812fa86c74486b26646302f17931f5805b8be0c231de6f24bc0986b7f77e7be SHA512 e2a55bcfa5c39b4811e79c33773953a2ebab8a54699fa0df2b4823f9651eda8ee55fa6d058fd427740ea3a91e144e09a9d77a3b1ee334b2b16e81e6e0c98a18b WHIRLPOOL a9d94ba20db0ab71788ac0ba06d23ea55cc61ad7cd3a2ddd2d9e01604b7be2988ef4cc6c1b19d7ef93fd6f193284bc3fe167505962392b925cfb2d1a77a4dd22
+MISC ChangeLog 17596 SHA256 759a541772d255a971dbceeb0689e54b653d34dceca4ce5b209af539d279edd1 SHA512 dc22c6e53623429835d104a29fb5cdd5734858c056accc48fdf1de08569a87538052f313ce6c759ccf553f77ffce8b50ca0e5a4b0cedfadce63507cc78803ac9 WHIRLPOOL 30acf0fcd735e7d7dfe53ed15fbd5b4d86fa8ac0ba342022cd307ac47343b25eabdf92f5429a97c803647412b345747b8a3dd218a0d35a12ccda0e548860d947
 MISC metadata.xml 1415 SHA256 430ec7d576a92391d07ab1da50ded0e5f1344398b883bfc9e1ff5c49697d7bba SHA512 2e6623f94ec3be8458b6404d2e7c3908e654bef176ee56f8fe99dd0367e97890023dc4912179cb04bb4f7d69ad738f0946c6ef7830b6a6b2f6d449244332380d WHIRLPOOL 05ae047384acaee2245dbd39a4d810172e89e4fefd1276c0db1022154eb4c1273d24d1e8f773928f21a29bbdaa86fcc86e27de4a24f7692f917156290f322b35
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVbTkPAAoJENNAYYQy1of14EcP/RTbdCEEEM59INtffaLpVwS0
-wERKDkTk90USN3W8qNHjUCPNezk7ELAEep46CALnNIKl1n782G3Z6oJKFoXjgmcw
-RNeFnKeVjIqD0HR4V+3fLaHi/I6/A/Rl2LCNfVcYaegDESseTOhj03zHhMPFOgDb
-AHzIywIPcuVo+29enVIr1clbPGF/JYaw88uynV7ji6GYt8p1X4wpb9fORUMDxNZN
-LDMJre0zSQvsj/416G78ALWluNpoxhYGCtE+MmYaKUEbMenIOp3bENkcEdK0WKtG
-FiAiMigA1BtUrPXVhy1kfFJXcy8hEQ9BFLc8ossNADbIFGrRLcsNqtMyPoaZbqNJ
-IowRnqwEYN/A7RzJ8CqC37cjG1Gh5R5UcN/yaakApuB+M5i+lqpmdyPg19HnBazj
-/mqyLSDfPD1VPquC66wJiIfz5ABpVuRq/QqnNAzEZ1SENUbtTBa+y9GYuYchQG5i
-zc6mH4MfSkX2cUENBr9rpJorwJ90ov+VbRbipWLIKAa02ynUEnFKssLUPCDXvSHc
-bj+pkZ24NG6QCK1JX4JGkxRNzLLzuXEx3sdTXf6xrITWzBzUY2L0yycD1kQ3xOuJ
-M6fjtsrQzWNG+mfDwpHJTBPXi7mJ/Iud/MHhkBqNvY1RbnY7RJVTCiQmr9MT5BYK
-776k8wO0mKzSfoct4AvJ
-=wF6E
+iQJ8BAEBCABmBQJVhLwlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2auQQALk6QxRG2DVDF0PgpwDomYPq
+SWvi+KmR5Z+taq4AiX6bOWpEcy2xbrxziSwNXBNGbsziFhP45UiLZcpD982HQilx
+9P44cN6Cj3EuLhf40Bt0nFXGKPga0mFSHcAgmJaxRv87IWqZyISD/7o1kY5eHBXb
+xD7ohdbfQn6MwxAYsccXKTZ2imG0/TpZdYMI55o+u191nmvtonh2HJQN+ym62+OI
+IEcdrniD3TRCztfKYKR3cNAF0SvoVapkxXKh5qrGymo9Gosy4nX+aIjmm3ujxj79
+L2HVABD5lGQyEn1kKUMahYgWOjzXFwXi3M/MB5+mWuo8jlxplJ1BL4wMNS5V+c0S
+5S5OEDxxrPMA/5f12kvVqhaill7gQpmxj7aLAwMTzgrrlGmzmGnJaLs3HWO0Uqaw
+6w9ZrNkyDdsw0bsPeo5DKMT03k+pQrWrwiXwifjVUWVLK1ftSiBG16d1oRgltfXh
+TKgMpEnw8FfRT5Rvxhggz9et5ivtXzIsMDKqlVbAU99J/u0RFnY00nJq/9CT1T3R
+NdhC1TYXPSjYKABOxD4BjMNnO+uwCDx7hA/GRmOat4NvUDJGUcs/HEKeNN63Iv6v
+1sf9M5j7nKQ1tGBtI1DMBkKZBgSVCNM2iGbhQvynZTySkGD3QGPxQ36GFULSLAfU
+O1WvLfsJlqOM35QZrOTt
+=YpBu
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.0.20.ebuild b/dev-db/mariadb/mariadb-10.0.20.ebuild
new file mode 100644
index 000000000000..0fd88bd7dac5
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.20.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.20.ebuild,v 1.1 2015/06/20 01:04:32 grknight Exp $
+
+EAPI="5"
+MY_EXTRAS_VER="20141215-0144Z"
+
+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 ~arm64 ~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}"
+
+# Official test instructions:
+# USE='embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-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}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql main.bootstrap
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			main.mysql_client_test_comp \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help main.bootstrap \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-multilib_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"
+
+		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
+}