[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/

["Brian Evans" <grknight@gentoo.org>]

commit:     e43fb65f83758f9e120a569369f3012ae8a2791c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 18:37:57 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat May  9 18:37:57 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=e43fb65f

Version bump; drop old

 dev-db/mariadb/Manifest                            |   3 +-
 dev-db/mariadb/mariadb-10.0.18.ebuild              | 115 ---------------------
 ...riadb-10.0.17.ebuild => mariadb-10.0.19.ebuild} |   8 +-
 3 files changed, 5 insertions(+), 121 deletions(-)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 0a90346..ae063e3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,5 @@
 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-10.0.18.tar.gz 56238153 SHA256 686fee90aaa04a112256d1581336fee734f2d1068784be57a27683ca421a9af5 SHA512 64a093f2d0d9809d77b77cdd067132a8f54e53c5f069bc06340c0b2bcc5938c9c95fcf8e01c3d5140e31455b9c6e2dcbc06e11cc2ae43abd648f811f1ade86eb WHIRLPOOL b1677e5e65bcf8c22b83664b4491e40b31c13c788fa207734c4b3f2808737fa78ccf0d7a70edf1a2f81038dfaed96ab1d2a86912534e457f616e0dd01788b017
+DIST mariadb-10.0.19.tar.gz 56224123 SHA256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512 bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3 WHIRLPOOL d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
 DIST mariadb-10.1.3.tar.gz 52935207 SHA256 565e350b609c9b832f10baa33006aafc6c874990dacc81a185422c0e6599b5a6 SHA512 c5188ec73e9bc732757d681692cb3d089c10d80bb8e0a382f2a0be850e46321773556459d16c894f539f743c822e6697a11c9977a32e709874b9242de7ba8cae WHIRLPOOL 08371eb964dfe47b7e49b71a9ae7e0a7a823c85372c55a610afda70a5b7f064a84405360ce0a93dddf04ee2a63694fd134d902642cd16ce3fe8bbc663435aebb
 DIST mariadb-10.1.4.tar.gz 53358393 SHA256 14cc92414b2c3822923977a6fb544593498dbb5005044db33c193511757d411c SHA512 c8072cde370fe2f62e310dc0634fff2c177a4f5403461022e396a6a3f207334d4519e66c1f244713807e7cf1d47b0ce18e2f25a9ddc67b899aa5c24cc2a41d91 WHIRLPOOL d2943df0a9acf65652b52147d9d11f75176469720cfb7f29a42909b152adecd814814aeee4f764a972b8e3da77c3a15c3817b738184299f3ef9f3fa2bab5d706
 DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff

diff --git a/dev-db/mariadb/mariadb-10.0.18.ebuild b/dev-db/mariadb/mariadb-10.0.18.ebuild
deleted file mode 100644
index 0ec6ec8..0000000
--- a/dev-db/mariadb/mariadb-10.0.18.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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.2 2015/03/25 18:22:33 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='-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
-}

diff --git a/dev-db/mariadb/mariadb-10.0.17.ebuild b/dev-db/mariadb/mariadb-10.0.19.ebuild
similarity index 94%
rename from dev-db/mariadb/mariadb-10.0.17.ebuild
rename to dev-db/mariadb/mariadb-10.0.19.ebuild
index 0ec6ec8..50df7e1 100644
--- a/dev-db/mariadb/mariadb-10.0.17.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.19.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2015/03/25 18:22:33 grknight Exp $
+# $Header: $
 
 EAPI="5"
 MY_EXTRAS_VER="20141215-0144Z"
@@ -19,7 +19,7 @@ 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' \
+# USE='embedded extraengine perl ssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mariadb-X.X.XX.ebuild \
 # digest clean package
@@ -68,7 +68,7 @@ multilib_src_test() {
 		#
 		# 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
+		# funcs_1.is_columns_mysql main.bootstrap
 		# fails due to USE=-latin1 / utf8 default
 		#
 		# main.mysql_client_test, main.mysql_client_test_nonblock
@@ -79,7 +79,7 @@ multilib_src_test() {
 		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.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