commit:     979d55dc2be044eb5c42c43630ee635496364251
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 31 22:30:02 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Aug 31 22:30:02 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=979d55dc

Add multilib version of mysql-cluster

---
 dev-db/mysql-cluster/Manifest                      |   1 +
 dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild | 134 +++++++++++++++++++++
 2 files changed, 135 insertions(+)

diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 8cba333..f94d5ed 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild 
b/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild
new file mode 100644
index 0000000..5b579f5
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild
@@ -0,0 +1,134 @@
+# 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-r1.ebuild,v 
1.1 2014/08/31 20:59:52 grknight Exp $
+
+EAPI=5
+MY_EXTRAS_VER="20140801-1950Z"
+
+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='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
+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 "${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.
+               #
+               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 \
+                       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="${S}/mysql-test/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