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

["Brian Evans" <grknight@lavabit.com>]

commit:     444a0473fe52f76304ebe4b4a8c3b889057d58cc
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  8 20:08:13 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Sun Jun  8 20:08:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=444a0473

[mysql] Version bump on 5.5 and 5.6 series

---
 dev-db/mysql/Manifest                              |   4 +-
 ...{mysql-5.5.37-r1.ebuild => mysql-5.5.38.ebuild} |   2 +-
 dev-db/mysql/mysql-5.6.17.ebuild                   | 129 ---------------------
 ...{mysql-5.6.17-r1.ebuild => mysql-5.6.19.ebuild} |   4 +-
 4 files changed, 5 insertions(+), 134 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5c4a1f0..fcfce95 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,8 +2,8 @@ DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.37.tar.gz 21718944 SHA256 da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512 858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad WHIRLPOOL 13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
-DIST mysql-5.6.17.tar.gz 32862539 SHA256 f8ed0a1abd60ed9152b71a027446825d8686c48e99def6e74e0d12d24e9a1d9b SHA512 36b9c9456f2ccc0efd26fb4b4ce4280849e9915f06c19183700345aa39a72cf94d940ef98b113c14de0bfea27e3f4135e6f163635c8a14629a9f58c8c12845d7 WHIRLPOOL 47f86e99ad5d192d2a82e48e174dbe0fbd8f941b6b1494ab6a9621967aac77bb0579b2bb2e11c432d2856df7ab34d4cde9a4266923a0499577e035ac699bbc9f
+DIST mysql-5.5.38.tar.gz 21739681 SHA256 61869633924ab243a3f676cf6b8feb66b672e3c07566a7190f0f1bb8c9b2fc81 SHA512 7abaac21028d984a72b7f6a43e82fab38833094b6271fa6faadae09c6be23eba0df2151f32f8d94345d6b0bb172325995acab0185a9a85af8fd475bef4cee231 WHIRLPOOL b1cb459790446423f510ab3ee18d39d178e438e03020faf0de1a7574d99c2648915f2c0e7503aa0288e128395880706a010fecc534a08cfd50cd49ecf7f67205
+DIST mysql-5.6.19.tar.gz 32879525 SHA256 80ef3aae048866539380e7e330d9f1034f0ee50ddfb9c662570132492678b09f SHA512 1c60c7eaa2975d9812492a1e46f550a820c62f818a60adcbd3fc7b500799d28825e8ca17d678696ae0dcdf4df4e447fd93c64d2788dac97a6a40f3258e7d86b3 WHIRLPOOL b2b353b65c84734c58f51063a4b4d5e6af33759f12bf169571d2ba6ed686d3fd37cc9018594839ca74f3180fc3982aebf2bbbdf599904e9a3cd9605c9d93b9f4
 DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
 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

diff --git a/dev-db/mysql/mysql-5.5.37-r1.ebuild b/dev-db/mysql/mysql-5.5.38.ebuild
similarity index 99%
rename from dev-db/mysql/mysql-5.5.37-r1.ebuild
rename to dev-db/mysql/mysql-5.5.38.ebuild
index d694efa..34db4b5 100644
--- a/dev-db/mysql/mysql-5.5.37-r1.ebuild
+++ b/dev-db/mysql/mysql-5.5.38.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 
 MY_EXTRAS_VER="20140426-0232Z"
 MY_PV="${PV//_alpha_pre/-m}"

diff --git a/dev-db/mysql/mysql-5.6.17.ebuild b/dev-db/mysql/mysql-5.6.17.ebuild
deleted file mode 100644
index 31cdc81..0000000
--- a/dev-db/mysql/mysql-5.6.17.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
-
-EAPI="4"
-
-MY_EXTRAS_VER="20140424-1043Z"
-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='-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))"
-
-		# 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, funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.mysql_tzinfo_to_sql_symlink
-		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-		#
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwinfuncs_1.is_triggers funcs_1.is_tables_mysql \
-			funcs_1.is_columns_mysql binlog.binlog_mysqlbinlog_filter \
-			perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
-			mysqld--help-notwin main.mysql_tzinfo_to_sql_symlink; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# Set file limits higher so tests run
-		ulimit -n 3000
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--suite-timeout=5000
-		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/mysql/mysql-5.6.17-r1.ebuild b/dev-db/mysql/mysql-5.6.19.ebuild
similarity index 97%
rename from dev-db/mysql/mysql-5.6.17-r1.ebuild
rename to dev-db/mysql/mysql-5.6.19.ebuild
index 2248ed0..41d9120 100644
--- a/dev-db/mysql/mysql-5.6.17-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.19.ebuild
@@ -1,8 +1,8 @@
 # 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.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $
+# $Header: $
 
-EAPI="4"
+EAPI="5"
 
 MY_EXTRAS_VER="live"
 MY_PV="${PV//_alpha_pre/-m}"