From 518a1367a6d0b766da9d0118ed50daf132a69375 Mon Sep 17 00:00:00 2001
From: Brian Evans <grknight@gentoo.org>
Date: Sun, 1 Mar 2015 01:23:13 +0000
Subject: [PATCH] Version bump

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
---
 dev-db/mariadb/ChangeLog              |   7 +-
 dev-db/mariadb/Manifest               |  32 +++----
 dev-db/mariadb/mariadb-10.0.17.ebuild | 115 ++++++++++++++++++++++++++
 3 files changed, 139 insertions(+), 15 deletions(-)
 create mode 100644 dev-db/mariadb/mariadb-10.0.17.ebuild

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index f3d30b0e743a..c25db80f1ba7 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.98 2015/02/24 17:16:10 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.99 2015/03/01 01:23:04 grknight Exp $
+
+*mariadb-10.0.17 (01 Mar 2015)
+
+  01 Mar 2015; Brian Evans <grknight@gentoo.org> +mariadb-10.0.17.ebuild:
+  Version bump
 
 *mariadb-5.5.42 (24 Feb 2015)
 
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 5277321f8914..d17920b1c67f 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,28 +5,32 @@ AUX my.cnf-5.1 4829 SHA256 109d4db271860f646df0a1317a2812ffe4b51785aca423bf539e9
 AUX my.cnf-5.5 4916 SHA256 b579073c015719b9623e2e00a985587947bb3562958f6e6f555306021b56d1e6 SHA512 93a79e4807d7fc6cb196445fa885c334ca86981513a0b716bf39f3bca76a7cdfeb62044bae7c44943c683e698a5fc4afe9a8d92fd1d03fce57531abd1947fb68 WHIRLPOOL 05dbc74ade9943d3752e2123449802ec8f5f743aaf0280325c8512f85aca0c3e70acae2eef0f4d1edfb5fde2891a58cf58e6deb3d1f9b0adc1e0c7597ee98607
 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.17.tar.gz 55989700 SHA256 9cd394e99942c3700b13f2bf126895fe587e668bfcaffcfd81f0cd878fc19311 SHA512 6bcba66373abeecbd50098e9047cce91a388f336bc178c8767ddff0bc7885480677d347a929507b49ba2277746440515b2b3a90465497f475c95e3cd8b15b4f8 WHIRLPOOL feaabbe75c27f054f5e184737d95047fd508133fe655e2680261ac1599b23c71e6f58b3b63a6a3df0c675a345c201db266be31e43a096af916e71cb5e82ebafc
 DIST mariadb-5.5.41.tar.gz 45526003 SHA256 a16dc62e4bcabecd5c483f2f8b657483a8c51934e7be5ad4ab21b8baea1f5332 SHA512 727ce6994966a42602ea8f735f34b1b3c342d08b9dae2667e465805bff36e68bf69b582ec0b844b25fb7024f9b25a39280160c2935f639491a1c3654d3166953 WHIRLPOOL 229b17e8acf34f7820548d5fcf43cf0af5f52977a7254a799eb2b28b0a239c0b2f2d3177751f9fdde112c6d336f4580aa93a0be663b15967ccf94a3ee7f4151c
 DIST mariadb-5.5.42.tar.gz 45586372 SHA256 3c868e768f4c24b4aa2f8f1725460d15a5485ed75e17b0755c6e604520e34439 SHA512 8fd9916e7ad225ea47936c34a14d37d0e4c9ac182b8791d46d158aa86151cbfe45e54e0b680d281223f175d492765aeadd7565e2a706d86b69696a51761e9769 WHIRLPOOL 9adaa1006ddb736fce0bdcc6d8bbc8012f083d443cced67088efe5b7107082f3c6ce1e4ee1d40558ea90501c69a7db456723ad7cb6345affece3adbdddfccd29
 DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
 EBUILD mariadb-10.0.16.ebuild 4211 SHA256 b552e9a6f45b93dde44be3242c3eb5042e26043a2eeba93ac7803e89453d2334 SHA512 5ef6a43366ecd203dc1d3f07fa1be08e5da5796e25da3895ae9475b5b407a4b258892095aabd93c26a3e6c17b2c7f108a0a0a38ebbab6057da95762ce7a4518e WHIRLPOOL 79327d8c375e5f15d068b7c9659320f9acfec8a92aa9d1d5eb66784a872e19a543aba80d6a46501aabbf3b3755e66673b805b5d0f870ba361655ec1bc218769f
+EBUILD mariadb-10.0.17.ebuild 3961 SHA256 e72ae4fd998fa39bf98c3b7278cd307808a39f3bd0eda88aea4477d00716a728 SHA512 0e8134e5258f2c9cbaf2dd70124ee7bb84e3518541f255c769ae0b43d5968a49ae23838b1099567f688274ed49333264a2467bdbbc7868ae79f7d63657b2b6a1 WHIRLPOOL e32de3457cd6a274d7b6546aebb420468eb46987a26c9d425d2c597571ec3d542a76ea2c17badbf7762f3bfc0ee7876f39057e3968da8787e9553c68097b095a
 EBUILD mariadb-5.5.41.ebuild 4130 SHA256 cb318bcab467cec93c0ccfcdd18cf94b00168174a6d4a9a7ee7e3ecaa3e39207 SHA512 1f4d897ff8673c278a06fcb02a145b395d9afcb34c253f8fe7ac4d19b699478dfedf0115c5bbf90d036a1c133973d5aed6e461858c8dce5415df4b7d1b7e255f WHIRLPOOL 0e35591160dd19105e3a58c42ab3f14bd8e94676ac35356431f55d3cdce2c57697345e58688fedd05afa3724558c7b45d51f7f0bcb6fdc4e5c827711b2ee9a27
 EBUILD mariadb-5.5.42.ebuild 4130 SHA256 ea14b8e345cbb20fb3bb8ae9544e6033d4e458a5254c0fb02ba6a885c34036b6 SHA512 c5c13d540570f724a559d8c77f54e6e013590099d12d9dea244df6f0e610ad0a1ba222bb3c9ce1e878b08ef1b063d6de85a93c04bab1001ad9b004acc645b163 WHIRLPOOL 0b36afabd9f2668b918d2d4875a69d634e406d4ae5fd83aa1ae60bca845a8a36cea6cfbd4ce3ab2409412287a0a946576adc5b0371291b8549f8d22e45fc4d82
-MISC ChangeLog 15744 SHA256 b8dbbe281d9e93d584e14b8e7a2a24f774f52a8b57344985bd27ffeefd5ae56d SHA512 3b9616d772d7a93c68d4f141a09c6e076d4f3dc64ee4c37a9315082f913c967b6016fc4413616289a045e5a367c82210650e53b2ab113ca3be9ed206a644229e WHIRLPOOL 6d509f967c5e95fdee1ab91a43c46064d75dd7624cdba43594477a2efba466af69dc2db9917e7224ffe6c945b49b0a35ab336373c66d157a7d2723c0017f54a3
+MISC ChangeLog 15866 SHA256 3bf59d53b017e87dc44be3558e9e164818611342ba34ad35527e3e289c831977 SHA512 b4c93504fd445b1f9e0f8bafc5702884bcc32e8c2c1ff41566f3ec9e40363f7520e043692fcd32672e7d63d62cc0843cb9375e4c856c0d3913d34a2148b80334 WHIRLPOOL 28312fc01c53d99d480e9d4078a1b5db8526d3cf4315f582e73cacbc5c9db376c471167eca158ae5d8e8f61cc8877730ee14f4b8c563c12afcb34d011d41a710
 MISC metadata.xml 1415 SHA256 430ec7d576a92391d07ab1da50ded0e5f1344398b883bfc9e1ff5c49697d7bba SHA512 2e6623f94ec3be8458b6404d2e7c3908e654bef176ee56f8fe99dd0367e97890023dc4912179cb04bb4f7d69ad738f0946c6ef7830b6a6b2f6d449244332380d WHIRLPOOL 05ae047384acaee2245dbd39a4d810172e89e4fefd1276c0db1022154eb4c1273d24d1e8f773928f21a29bbdaa86fcc86e27de4a24f7692f917156290f322b35
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU7LHiAAoJENH3ge/59KO2JngP/1Djiixuhn0HNllpeIW32O5p
-iGItuSIFLjAgY7S5oyROsGgXoyDFTqBFyzf8lp097b093tU49STCpNEiVpEPhDa/
-CA7lMWpdMetFaq4N7XfYogV+iVtImpyBrqjPd84K/Kd5qJ1DM0LZufU2LpGl55i3
-4mJ/2+byh9ET2cAeNBxo2LSMNsSwaiTPf1daLq5Wd4xmkR6x4AeUQ+WAvLuPx4pZ
-xJO+qVagjkkQ/A8fpOTVVTVv74TnWQU/hHmHzsvdI+wGqU4Jsm+vQjnCSCKcmA8B
-3uuBwWOiLjwx9IlT2nU77ktKPcgnPCkMN32veqNtx+paQ8srxDz4PPEN8oOcGPcy
-SMZH2KZEjLLqakdezsYNeMV8XxTN7I+62GWEKhkeNKldKH9SMERxv4peMfdCeeNm
-EgeGHbhrhZLO4GAorQhb/vnyKpYvRDBpJ1M8GwKhrWeWcNWUJwTYY28E4YZA7jLw
-hI8K2MASaOCsOI0qB9OKQflEwoQYo7hMrI1Lo+dnrrikuzUze+0H2bH5/kA7RJF9
-Lj+XALzhlEXcaPPhDLeoMevV1xVjgs9qqaJsOzUFotUzOiu8jxbDUg2f8AuugFqa
-RdgYiK+o2q5sFhf7gtFRwQHF37TDzETACbAgyITcCAT7RJIAHY3zt50vzTkqDr5P
-q/nEPcXbL6ekfxcZ7/aU
-=AxR1
+iQJ8BAEBCABmBQJU8mn9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2PUwQAI5ZZFkTAsfaQ5NEJZxWjA/Z
+DlnYjLWrNvXySau1oERtXIxUcQjNuiO5gzc1CFCxul7ny3O/N+HeQtqo7dlu3JW5
+nJ09DC/flbOp0CjVjhLk3J+Egvx9sFiirO4Fn2ed47cMrcSOI/pBU5AWLiyCZzYI
+E2kz/YYAl8lWtxlVgoINcRSvPWT+RXu794LoIsLibrKGgxM+0zNjlCGWH6WnaNlY
+/3mdyi0EP6+NqZ8htGsnc21rBTS068b0OO4jYlpdKM6Dla8vCAYmcDF6JAw0AeZw
+oC7EiHP1ossSn0NON7+R7zI5VPcCK5TZAAHzKp+XguD7KaxCsxVN3kFWRs7KUaig
+yGwUjSncBMeZANLaVVp8b3A9seNSRbHxFCpHF72iEE6nOTO30taW+SpbK2zIBE0T
+NcWeWQNCkguUNF+04n5gblmL9Fn9BD5wIjz4HwP6ttKnXNuyCjLUK0q2rnOaTRdh
+UpbH1pPudOPl6QnFGoNH3vjaerD5xDrACZvLukwvDlER/SkHX3WI/Z7yZkXAFkzP
+KWKCPgFPbE0QTyTJtiCmEG2ZvCZBaBB2SLOVZzJXVBpMeHiPOa5Nu3ieHnpcsk+G
+ME+YhySYjDMUNQxgmyIBJ9chMnoQgKbi8IbIIqZaxZuNYEu/Wln2+SN8SEC0vS10
+n5R6PDIbbW3dPlP87Qyg
+=sUS5
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.0.17.ebuild b/dev-db/mariadb/mariadb-10.0.17.ebuild
new file mode 100644
index 000000000000..4d97caac5fd7
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.17.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.17.ebuild,v 1.1 2015/03/01 01:23:04 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 ~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='-cluster 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
+		# 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 \
+			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
+}
-- 
2.26.2