commit:     c44021af9abb7a871ff65789ccb2c4de20821882
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 14:44:51 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 14:44:51 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44021af

dev-db/mysql-cluster: Version bumps

Package-Manager: portage-2.2.25

 dev-db/mysql-cluster/Manifest                    |   3 +
 dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild | 125 ++++++++++++++++++++
 dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild | 144 +++++++++++++++++++++++
 3 files changed, 272 insertions(+)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index b433e0d..65d8903 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,6 +1,9 @@
 DIST mysql-cluster-gpl-7.2.19.tar.gz 25959966 SHA256 
f4d8772108bbe30852129602f1d4106dc42adbe14d4bbc45065cb6e7314803b4 SHA512 
2a30d6bdb82ff9b4c3bcdc2b44ed0707c2292efc45137ada62635b41424ecd4286b18718542fe2120e57636f998b38ac3768d4f9f6b018e65a82ef76d81a310e
 WHIRLPOOL 
21cec46fdfcd3509f4dd01864976c19aefa2adc53212a0724e9b30bf0fa6d63be7d4395b68be13de942b1c399a174e8cfd3f65594921b70b7e6cec0d7dc95183
 DIST mysql-cluster-gpl-7.2.20.tar.gz 25999156 SHA256 
60ca80b10680b5048cd358ae543ad16e8e8c31395aaa69163bde923b22085874 SHA512 
62fac1db476e08109885660d2e2728bb0c2c8144acb602fdb679d802bcdc459254349eb914ae600f51dca33f42cd9dfa0db9a21b07edb0d0c316497a62e1fc6f
 WHIRLPOOL 
8f8787151648f34f3cfd64d05da793e40e8fe3d053f5cff72ecff7b799a536bf56ead2e19fd72620fda967b6903bc5ec01fec171144f581f32c4e0f0426573b5
+DIST mysql-cluster-gpl-7.2.22.tar.gz 26075142 SHA256 
404b80192c488791cedf6251e64bb01310b20f13fcdb28721e108e92985ae999 SHA512 
b3370725f17a5b6577c9822097b6c39e4375bdabca2a403bd45dfeb9fd5920c0e213c894eed33dadba69d9c066427ab5065c587869d82bf2e3438d3bdeb1aa8e
 WHIRLPOOL 
1275fc2a181011c5ea2ac392c94027f399a5ce4fd499ff23790bfad142b1c7d67bc421e7c6a4e64e6bb409f04016196417535d5704d21165c1120bf46ab68544
+DIST mysql-cluster-gpl-7.3.11.tar.gz 42806929 SHA256 
6c8cfc99ccbf47cd4304996559de6fb330e9cdf754bec37ff7347be72e50c646 SHA512 
89e5b6e845b71ed6945529b7f515d3af96ec6daf79c0085f1d0ea6e4426f61eb3626b688e5edda668be4615df1b8cec4e71acdf0d21150fa2775c79ea09563e5
 WHIRLPOOL 
f03d3b62da793becd6aab775293e5963697f9b4147bf6d662274f689b1a48692b1f4de0ad196e74cb02a07ce2a69b608a4d420ad5dc153b20888ba69dc361dc4
 DIST mysql-cluster-gpl-7.3.8.tar.gz 42400435 SHA256 
eddcc2954ff7fbbc72b1266bd64a9548e9b9d7a4115d42b54c13257c226248ca SHA512 
4118449bc9bd2c88caff1585ebfa6b2e2a85b960fa12bc50a00245d1a6d42b3411ee0b2e32b2b10afd46b97e01e5b4fad924dbed852b2ab49b43c123c649a2d3
 WHIRLPOOL 
fc1c6cd68e1f1b0f0430c0374b24c41ba7df83f43897d71e023706228c63024dc10ad6a5eef1696a24a6898be4387a1e4cf47309cabf7abaebc1767ae66da773
 DIST mysql-cluster-gpl-7.3.9.tar.gz 42489084 SHA256 
eba6e37313608514aa41b7f948ccaef3153bf46270f0153b0246492573621b78 SHA512 
d7897b5b16ae9179c3ac93e078e55597b89cacaeb4c9ca4477eb8230eb6dbdddf220b55df9dc91b5600e43adcd0d9a1ab470bcc970c20eaa78cd8300ef9ee80e
 WHIRLPOOL 
cdfd11a78a52c6b69add0b468a3e87304fdacddb1eb856bdf4e64d28337b7530288fdc1c0a1e25523081bce42fada8a161cd186d20e765a793d4e7160a2b013b
 DIST mysql-extras-20150210-1758Z.tar.bz2 1494128 SHA256 
1d82bc96e294b5479491fe2d8cf83f25f6b4d34c0033238848afde7cc7592e2c SHA512 
0256cfe8af6f7c198d3e1aa15b6ac14363d4392422a379f24465e3e16dea75f3779bfe727fd74c404b126041bde2396ff521479c164b5d6c44a7340cad9fce33
 WHIRLPOOL 
bde91051187f4f6f39a52d80d2a9648f9c05187ce200eea89c496cb9e99c70fe049f9f0b490ccfaaecd43081e6988841d94c3ede9fa4e9fb8773580f20047fbb
 DIST mysql-extras-20150710-1911Z.tar.bz2 1494443 SHA256 
9a4755dce3c5b7dfebda87c2fd73eb7b94786be43a9bd97451a8134dc95e6983 SHA512 
9a42616dafba562dad5485ea16d8a2b7521668323414329052a64e32da606860af9c0d8a1bdc634afc0e55d1d2329297488c90ff712eac0eb74d8843ca9081aa
 WHIRLPOOL 
33ee7e5cc90a26722fa4f6ff7f8604ac1a1396a867a5ca45b81510cb26638fa57dc3f0e8f2471a8c05c26f5341765c2c370989fcb1602b30e7c05bc00b247e34
+DIST mysql-extras-20151117-2040Z.tar.bz2 294183 SHA256 
2ca16597e869fb0fac4f6e48b779892569698ce83c898df3afaee63131f71833 SHA512 
8edbc6a3812d17a2f1a827459867c0747387ff72be86b12fe0e790afca5e4b70e4f23c4098bdb61afa20ef292e2c3b154f16577d5c11999a3e2eec9e43b8d09a
 WHIRLPOOL 
f0df653216857527ffa3d31f07ab1c470614b53350f5dbd965ba3bdc398f36f37b506537f1070b03a54203a3847f6557a2ae6757327ce852833fa026de7b518d

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild
new file mode 100644
index 0000000..b0939d6
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MY_EXTRAS_VER="20151117-2040Z"
+BUILD="cmake"
+
+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=''
+
+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 "${T}"/var-tests{,/log}
+
+               # 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, ndb.ndbinfo, 
ndb_binlog.ndb_binlog_index
+               # fails due to USE=-latin1 / utf8 default
+               #
+               # main.mysql_client_test:
+               # segfaults at random under Portage only, suspect resource 
limits.
+               #
+               # sys_vars.plugin_dir_basic
+               # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+               # instead of MYSQL_LIBDIR/plugin
+               #
+               # main.flush_read_lock_kill
+               # fails because of unknown system variable 'DEBUG_SYNC'
+               #
+               # main.openssl_1
+               # error message changing
+               # -mysqltest: Could not open connection 'default': 2026 SSL 
connection
+               #  error: ASN: bad other signature confirmation
+               # +mysqltest: Could not open connection 'default': 2026 SSL 
connection
+               #  error: error:00000001:lib(0):func(0):reason(1)
+               #
+
+               for t in main.mysql_client_test \
+                       binlog.binlog_statement_insert_delayed 
main.information_schema \
+                       main.mysqld--help-notwin main.flush_read_lock_kill \
+                       sys_vars.plugin_dir_basic main.openssl_1 \
+                       main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+                       ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
+                               mysql-v2_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" \
+                       --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"
+
+       else
+
+               einfo "Skipping server tests due to minimal build."
+       fi
+}

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild
new file mode 100644
index 0000000..764d7b9
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MY_EXTRAS_VER="20151117-2040Z"
+SUBSLOT="18"
+
+inherit toolchain-funcs java-pkg-opt-2 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="~amd64 ~x86"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+#EPATCH_EXCLUDE=''
+
+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
+
+src_prepare() {
+       mysql-multilib_src_prepare
+       if use libressl ; then
+               sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL 
"1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+                       "${S}/cmake/ssl.cmake" || die
+       fi
+}
+
+# Official test instructions:
+# USE='extraengine perl openssl' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-cluster-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="${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))"
+               # 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 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.
+               #
+               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 \
+                       mysqld--help-notwin \
+                       main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+                       perfschema.binlog_edge_mix \
+                       perfschema.binlog_edge_stmt \
+               ; do
+                               mysql-multilib_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-multilib_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="${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
+}

Reply via email to