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

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

commit:     4e50077062bd9915a8530fb76754c2cf2aef5a74
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 10 18:38:55 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Feb 10 18:38:55 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4e500770

Version bump; drop old

Package-Manager: portage-2.2.15
Manifest-Sign-Key: D1F781EFF9F4A3B6

---
 dev-db/mysql-cluster/ChangeLog                     |  10 +-
 dev-db/mysql-cluster/Manifest                      |  26 +++-
 ...r-7.2.17.ebuild => mysql-cluster-7.2.19.ebuild} |  11 +-
 dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild    | 138 ---------------------
 ...-7.3.6-r1.ebuild => mysql-cluster-7.3.8.ebuild} |   8 +-
 5 files changed, 39 insertions(+), 154 deletions(-)

diff --git a/dev-db/mysql-cluster/ChangeLog b/dev-db/mysql-cluster/ChangeLog
index ea31e05..41b1f81 100644
--- a/dev-db/mysql-cluster/ChangeLog
+++ b/dev-db/mysql-cluster/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for dev-db/mysql-cluster
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mysql-cluster-7.2.19 (10 Feb 2015)
+*mysql-cluster-7.3.8 (10 Feb 2015)
+
+  10 Feb 2015; Brian Evans <grknight@gentoo.org> +mysql-cluster-7.2.19.ebuild,
+  +mysql-cluster-7.3.8.ebuild, -mysql-cluster-7.2.17.ebuild,
+  -mysql-cluster-7.3.6-r1.ebuild, -mysql-cluster-7.3.6.ebuild:
+  Version bump; drop old
+
 *mysql-cluster-7.0.37 (03 Jul 2013)
 
   03 Jul 2013; Brian Evans <grknight@lavabit.com> +mysql-cluster-7.0.37.ebuild,

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index f94d5ed..e30a2b4 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,3 +1,23 @@
-DIST mysql-cluster-gpl-7.2.17.tar.gz 25882680 SHA256 d5bbf0fa7eda8056d01f564a9f50cba65794eefb07cb3c7b6b8819a86a66927b SHA512 ade82886867d897b23a6487c4efbbecef6842129a2b96df2a6097da73f4715e4e5ec4858f357d1e3f7eab5e1b4dc86bb89cd1ffe560ce17388ce26b06c5abd96 WHIRLPOOL cdf34ba72f971328a5ef10650df4a4ef482bfe6800543835fe5ea818f0fc8e8b57fda9c0608486fcada3590d84413c8e6c68db892ce1b36777c5bdce902e466b
-DIST mysql-cluster-gpl-7.3.6.tar.gz 42119293 SHA256 7f5405485ce05c88bd907269a75f161826ec92d763b46717a24880c378fd6dd4 SHA512 044a8854f61c7e4cb23343f84bf5c734244bbba8adc12a8a2c72d9febab4c1dbb404a7680aa0315de0df5459433eb578bc04f9ec169f0c2492e13e28aec6729d WHIRLPOOL 49b3eb455bad577d2a2d9d67c2fe78fef15ef184e7b56080d54f0a683f9a6596836108b727ed892a43dc0dc135ee65ab9293ddf0ad5f1587e41d31609090c8b6
-DIST mysql-extras-20140801-1950Z.tar.bz2 1494288 SHA256 a656486a7383d656ed33e279f41bb4384feba082cad3af48376ce9e1f395fe0b SHA512 b2c29c3d7c1ddacfa170125c9df0aaf65eac9f6112244b1deea97a46a3a2f2bd3eb069808e7b2ee3261d609b32046363830ba4ebcc7e74f449189a91145a6f9c WHIRLPOOL 41befc03a7382516849ecaecc1d02be7d00c47be489b97ce68c320c3aa8979c8f941525efe230d97ad2d1a85936a1e4d6c93d96a3f45930991a938e5f0fdab87
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mysql-cluster-gpl-7.2.19.tar.gz 25959966 SHA256 f4d8772108bbe30852129602f1d4106dc42adbe14d4bbc45065cb6e7314803b4 SHA512 2a30d6bdb82ff9b4c3bcdc2b44ed0707c2292efc45137ada62635b41424ecd4286b18718542fe2120e57636f998b38ac3768d4f9f6b018e65a82ef76d81a310e WHIRLPOOL 21cec46fdfcd3509f4dd01864976c19aefa2adc53212a0724e9b30bf0fa6d63be7d4395b68be13de942b1c399a174e8cfd3f65594921b70b7e6cec0d7dc95183
+DIST mysql-cluster-gpl-7.3.8.tar.gz 42400435 SHA256 eddcc2954ff7fbbc72b1266bd64a9548e9b9d7a4115d42b54c13257c226248ca SHA512 4118449bc9bd2c88caff1585ebfa6b2e2a85b960fa12bc50a00245d1a6d42b3411ee0b2e32b2b10afd46b97e01e5b4fad924dbed852b2ab49b43c123c649a2d3 WHIRLPOOL fc1c6cd68e1f1b0f0430c0374b24c41ba7df83f43897d71e023706228c63024dc10ad6a5eef1696a24a6898be4387a1e4cf47309cabf7abaebc1767ae66da773
+DIST mysql-extras-20150210-1758Z.tar.bz2 1494128 SHA256 1d82bc96e294b5479491fe2d8cf83f25f6b4d34c0033238848afde7cc7592e2c SHA512 0256cfe8af6f7c198d3e1aa15b6ac14363d4392422a379f24465e3e16dea75f3779bfe727fd74c404b126041bde2396ff521479c164b5d6c44a7340cad9fce33 WHIRLPOOL bde91051187f4f6f39a52d80d2a9648f9c05187ce200eea89c496cb9e99c70fe049f9f0b490ccfaaecd43081e6988841d94c3ede9fa4e9fb8773580f20047fbb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQIcBAEBCAAGBQJU2lA/AAoJENH3ge/59KO2aDYQAJpBVUoCr+TwsbvFkx+Ar4Gf
+XVBnLSMqIo5RyRKjXGa4MdpzSn82Rrz9omCewkojbwjqpPFhnreqDpGSGoD12DcM
++HKW1ygKK7X1rx0Y9w0AC/e+n1Nn/jht6u1YBCks7tp8WrNp3DxXGffc/dC5mcPa
+SxL622ElqQ7dQhEskx6fsg5pASa/18oxTwOz+3emSt29uVjJXJMnjp330M452tGw
+tTQE0bVmcpGZyuDES93j+Z3KqRjkJqdeI2X/ttCwKQH8xLV1hIhRTUUqp9Re8j4B
+HXNIGzxtEz1vXbn7rTAQM7mGJkKH74cJi2GOmiJlymad5pJdKPSQsFzKpEOSTPe0
+/qvk6aJELGukbEKvPE8Lso4QUud8achwtgamkUTHKp6aNcH/KpDtUArBevfz1a82
+fA0HU1/n5hPgNgjEO5tGltPbvjij9yc95bWbqEitm6tIMBza5hvbq2QlCjorhXaF
+wcE6Aar3KzObrngHCsf8nBQV1CaNrug1BrGBbEcMhbOwaHfs8Ne7WBzXOPP636tA
+DDgRKqb4jxvev/C8LqZ+7J287VnsPEIb1W0jRPAX7bYNkQY0aZLqED3xqFSCJhig
+Vp2BkWaK2H1yaudpCpmZy3DfI5nHMtnNDg+9urHwlSoUkHLnJhlIuQ7Fyi907EAX
+yiNcKpsXoVbtTIJ9/hw1
+=2/Xi
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild
similarity index 94%
rename from dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild
rename to dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild
index 79d6d2c..68c7c9d 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild
@@ -1,16 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild,v 1.4 2014/10/06 17:37:46 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.2.19.ebuild,v 1.1 2015/02/10 18:15:07 grknight Exp $
 
 EAPI=4
-MY_EXTRAS_VER="none"
+MY_EXTRAS_VER="20150210-1758Z"
 BUILD="cmake"
 
-# PBXT
-#PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-#PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
 inherit toolchain-funcs java-pkg-opt-2 mysql-v2
 # only to make repoman happy. it is really set in the eclass
 IUSE="$IUSE"

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild
deleted file mode 100644
index 1eaba79..0000000
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild
+++ /dev/null
@@ -1,138 +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-cluster/mysql-cluster-7.3.6.ebuild,v 1.3 2014/10/02 02:38:28 grknight Exp $
-
-EAPI=4
-MY_EXTRAS_VER="none"
-BUILD="cmake"
-
-# PBXT
-#PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-#PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-#EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch '
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# 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 extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-cluster-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}
-
-		# These are failing in MySQL 5.5/5.6 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, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# 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 \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysqld--help-notwinfuncs_1.is_triggers \
-			main.mysql_client_test \
-			main.mysql_tzinfo_to_sql_symlink \
-			mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-		; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-		# ndb.ndbinfo, ndb_binlog.ndb_binlog_index: latin1/utf8
-		for t in \
-			ndb.ndbinfo \
-			ndb_binlog.ndb_binlog_index ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo (NDB)"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--parallel=auto
-		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"
-
-		# Cleanup data files after tests
-		rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild
similarity index 95%
rename from dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild
rename to dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild
index b6e4555..367a72a 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild,v 1.3 2014/10/06 17:37:46 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.8.ebuild,v 1.1 2015/02/10 18:15:07 grknight Exp $
 
 EAPI=5
-MY_EXTRAS_VER="20140801-1950Z"
+MY_EXTRAS_VER="20150210-1758Z"
 
 inherit toolchain-funcs java-pkg-opt-2 mysql-multilib
 # only to make repoman happy. it is really set in the eclass
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 # This is often broken still
-#EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch '
+#EPATCH_EXCLUDE=''
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
 RDEPEND="!media-sound/amarok[embedded]"