commit: a5280aa28a3173dd2792a241d1f15ec0016792a8
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 17 14:14:49 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 14:14:49 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a5280aa2
Sync with tree
---
.../mariadb-galera/mariadb-galera-10.0.14.ebuild | 123 --------------------
.../mariadb-galera/mariadb-galera-10.0.15.ebuild | 125 ---------------------
dev-db/mariadb/mariadb-10.0.15.ebuild | 115 -------------------
dev-db/mariadb/mariadb-10.0.16.ebuild | 4 +-
dev-db/mariadb/mariadb-5.5.39.ebuild | 114 -------------------
...iadb-5.5.40-r1.ebuild => mariadb-5.5.41.ebuild} | 12 +-
dev-db/mysql/mysql-5.5.41.ebuild | 121 --------------------
dev-db/mysql/mysql-5.6.22.ebuild | 12 +-
....1.ebuild => percona-server-5.6.22.72.0.ebuild} | 6 +-
eclass/mysql-multilib.eclass | 5 +-
eclass/mysql-v2.eclass | 8 +-
.../{mysql-5.6-r1.ebuild => mysql-5.5-r1.ebuild} | 12 +-
virtual/mysql/mysql-5.5.ebuild | 23 ----
virtual/mysql/mysql-5.6-r2.ebuild | 6 +-
14 files changed, 35 insertions(+), 651 deletions(-)
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.14.ebuild
b/dev-db/mariadb-galera/mariadb-galera-10.0.14.ebuild
deleted file mode 100644
index 8524a94..0000000
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.14.ebuild
+++ /dev/null
@@ -1,123 +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/mariadb-galera/mariadb-galera-10.0.14.ebuild,v
1.1 2014/10/20 23:54:49 grknight Exp $
-
-EAPI="5"
-MY_EXTRAS_VER="20141019-1948Z"
-WSREP_REVISION="25"
-
-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="~amd64 ~x86"
-
-# 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 mariadb-galera-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))"
- # 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
- # mina.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource
limits.
- #
- # wsrep.variables:
- # Expects the sys-cluster/galera library to be installed and
configured
- #
- # wsrep.foreign_key:
- # Issues a configuration deprecation warning which does not
affect data
- #
-
- 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 wsrep.variables wsrep.foreign_key \
- 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-galera/mariadb-galera-10.0.15.ebuild
b/dev-db/mariadb-galera/mariadb-galera-10.0.15.ebuild
deleted file mode 100644
index c2db7bb..0000000
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.15.ebuild
+++ /dev/null
@@ -1,125 +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-galera/mariadb-galera-10.0.15.ebuild,v
1.1 2014/12/16 02:02:07 grknight Exp $
-
-EAPI="5"
-MY_EXTRAS_VER="20141215-0144Z"
-WSREP_REVISION="25"
-
-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="~amd64 ~x86"
-
-# 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 mariadb-galera-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))"
- # 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
- # mina.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource
limits.
- #
- # wsrep.variables:
- # Expects the sys-cluster/galera library to be installed and
configured
- #
- # wsrep.foreign_key:
- # Issues a configuration deprecation warning which does not
affect data
- #
-
- 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 wsrep.variables wsrep.foreign_key \
- 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
- # The PATH addition is required for the galera suite to find
the sst scripts
- PATH="${BUILD_DIR}/scripts:${PATH}" \
- 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.15.ebuild
b/dev-db/mariadb/mariadb-10.0.15.ebuild
deleted file mode 100644
index b7a198d..0000000
--- a/dev-db/mariadb/mariadb-10.0.15.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-MY_EXTRAS_VER="20141125-1930Z"
-
-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 ~ia64 ~hppa ~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.16.ebuild
b/dev-db/mariadb/mariadb-10.0.16.ebuild
index 692ab85..8106427 100644
--- a/dev-db/mariadb/mariadb-10.0.16.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.16.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.16.ebuild,v 1.2
2015/02/08 20:35:57 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.16.ebuild,v 1.8
2015/02/16 10:27:50 ago Exp $
EAPI="5"
MY_EXTRAS_VER="20141215-0144Z"
@@ -10,7 +10,7 @@ inherit toolchain-funcs mysql-multilib
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+KEYWORDS="alpha amd64 ~arm 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=''
diff --git a/dev-db/mariadb/mariadb-5.5.39.ebuild
b/dev-db/mariadb/mariadb-5.5.39.ebuild
deleted file mode 100644
index 951db81..0000000
--- a/dev-db/mariadb/mariadb-5.5.39.ebuild
+++ /dev/null
@@ -1,114 +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/mariadb/mariadb-5.5.39.ebuild,v 1.9
2014/10/06 17:28:40 grknight Exp $
-
-EAPI="5"
-MY_EXTRAS_VER="20140817-2320Z"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs 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="alpha amd64 ~arm 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}"
-
-# 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 mariadb-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}
-
- # 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 MariaDB 5.5 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:
- # segfaults at random under Portage only, suspect resource
limits.
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock
\
- 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-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" \
- --testcase-timeout=30
- 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-5.5.40-r1.ebuild
b/dev-db/mariadb/mariadb-5.5.41.ebuild
similarity index 87%
rename from dev-db/mariadb/mariadb-5.5.40-r1.ebuild
rename to dev-db/mariadb/mariadb-5.5.41.ebuild
index 42476ee..853b356 100644
--- a/dev-db/mariadb/mariadb-5.5.40-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.41.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.40-r1.ebuild,v
1.3 2014/10/18 14:09:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.41.ebuild,v 1.1
2014/12/22 00:55:03 grknight Exp $
EAPI="5"
-MY_EXTRAS_VER="20141017-1419Z"
+MY_EXTRAS_VER="20141215-0144Z"
# Build system
BUILD="cmake"
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 ~arm 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"
+KEYWORDS="~alpha ~amd64 ~arm ~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=''
@@ -32,7 +32,7 @@ RDEPEND="${RDEPEND}"
# digest clean package
src_test() {
- local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+ local TESTDIR="${BUILD_DIR}/mysql-test"
local retstatus_unit
local retstatus_tests
@@ -65,8 +65,8 @@ src_test() {
# create directories because mysqladmin might right out of order
mkdir -p "${T}"/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/"
+ # create symlink for the tests to find the replace util
+ ln -s "${BUILD_DIR}/extra/replace" "${BUILD_DIR}/client/"
# These are failing in MariaDB 5.5 for now and are believed to
be
# false positives:
diff --git a/dev-db/mysql/mysql-5.5.41.ebuild b/dev-db/mysql/mysql-5.5.41.ebuild
deleted file mode 100644
index 8cd0996..0000000
--- a/dev-db/mysql/mysql-5.5.41.ebuild
+++ /dev/null
@@ -1,121 +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.41.ebuild,v 1.1
2014/12/04 01:27:44 grknight Exp $
-
-EAPI="5"
-
-MY_EXTRAS_VER="20141203-2105Z"
-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 ~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}"
-
-# 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="${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}
-
- # create symlink for the tests to find mysql_tzinfo_to_sql
- ln -s "${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
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource
limits.
-
- for t in main.mysql_client_test \
- binlog.binlog_statement_insert_delayed
main.information_schema \
- main.mysqld--help-notwin ; 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" \
- --testcase-timeout=30
- 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.22.ebuild b/dev-db/mysql/mysql-5.6.22.ebuild
index 515f0c1..e3fd130 100644
--- a/dev-db/mysql/mysql-5.6.22.ebuild
+++ b/dev-db/mysql/mysql-5.6.22.ebuild
@@ -1,6 +1,6 @@
-# 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/mysql-5.6.22.ebuild,v 1.1
2014/12/04 01:27:44 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.22.ebuild,v 1.11
2015/02/16 10:27:41 ago Exp $
EAPI="5"
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-multilib
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+KEYWORDS="alpha amd64 arm 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=''
@@ -90,6 +90,11 @@ multilib_src_test() {
# rpl.rpl_plugin_load
# fails due to included file not listed in expected result
# appears to be poor planning
+ #
+ # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+ # fails due to bad cleanup of previous tests when run in
parallel
+ # The tool is deprecated anyway
+ # Bug 532288
for t in \
binlog.binlog_mysqlbinlog_filter \
binlog.binlog_statement_insert_delayed \
@@ -102,6 +107,7 @@ multilib_src_test() {
perfschema.binlog_edge_mix \
perfschema.binlog_edge_stmt \
rpl.rpl_plugin_load \
+ main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
; do
mysql-multilib_disable_test "$t" "False
positives in Gentoo"
done
diff --git a/dev-db/percona-server/percona-server-5.6.21.70.1.ebuild
b/dev-db/percona-server/percona-server-5.6.22.72.0.ebuild
similarity index 97%
rename from dev-db/percona-server/percona-server-5.6.21.70.1.ebuild
rename to dev-db/percona-server/percona-server-5.6.22.72.0.ebuild
index e4ea008..e293999 100644
--- a/dev-db/percona-server/percona-server-5.6.21.70.1.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.22.72.0.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/percona-server/percona-server-5.6.21.70.0.ebuild,v
1.1 2014/11/05 14:14:42 grknight Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-db/percona-server/percona-server-5.6.22.72.0.ebuild,v
1.1 2015/02/09 20:06:49 grknight Exp $
EAPI="5"
-MY_EXTRAS_VER="20141021-1750Z"
+MY_EXTRAS_VER="20150113-1853Z"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 5312dd2..fc82bc6 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -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/eclass/mysql-multilib.eclass,v 1.14
2015/02/10 18:14:23 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.15
2015/02/16 17:25:14 grknight Exp $
# @ECLASS: mysql-multilib.eclass
# @MAINTAINER:
@@ -66,7 +66,8 @@ MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
# Cluster is a special case...
if [[ "${PN}" == "mysql-cluster" ]]; then
case $PV in
- 7.2*|7.3*) MYSQL_PV_MAJOR=5.5 ;;
+ 7.2*) MYSQL_PV_MAJOR=5.5 ;;
+ 7.3*) MYSQL_PV_MAJOR=5.6 ;;
esac
fi
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index f4a772b..04741ca 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.35 2014/08/10
05:47:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.36 2015/02/16
14:37:50 grknight Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@@ -266,7 +266,7 @@ REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster
!extraengine !embedded ) stati
# Be warned, *DEPEND are version-dependant
# These are used for both runtime and compiletime
DEPEND="
- ssl? ( >=dev-libs/openssl-0.9.6d )
+ ssl? ( >=dev-libs/openssl-0.9.6d:0 )
kernel_linux? ( sys-process/procps )
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1
@@ -284,9 +284,9 @@ elif [[ ${PN} == "mysql-cluster" ]] &&
mysql_version_is_at_least "7.3"; then
DEPEND="${DEPEND} dev-libs/libedit"
else
if mysql_version_is_at_least "5.5" ; then
- DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1 )"
+ DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0 )"
else
- DEPEND="${DEPEND} >=sys-libs/readline-4.1"
+ DEPEND="${DEPEND} >=sys-libs/readline-4.1:0"
fi
fi
diff --git a/virtual/mysql/mysql-5.6-r1.ebuild
b/virtual/mysql/mysql-5.5-r1.ebuild
similarity index 53%
rename from virtual/mysql/mysql-5.6-r1.ebuild
rename to virtual/mysql/mysql-5.5-r1.ebuild
index 5b2d2a9..88a75da 100644
--- a/virtual/mysql/mysql-5.6-r1.ebuild
+++ b/virtual/mysql/mysql-5.5-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/virtual/mysql/mysql-5.6-r1.ebuild,v 1.1
2014/08/14 14:26:59 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5-r1.ebuild,v 1.1
2015/02/16 18:04:36 grknight Exp $
EAPI="5"
@@ -9,15 +9,13 @@ HOMEPAGE=""
SRC_URI=""
LICENSE=""
-SLOT="0/18"
+SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~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"
IUSE="embedded minimal static static-libs"
DEPEND=""
RDEPEND="|| (
- =dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=]
+ =dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]
=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
- =dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]
- =dev-db/mariadb-galera-10.0*[embedded=,minimal=,static=,static-libs=]
- =dev-db/mysql-cluster-7.3*[embedded=,minimal=,static=,static-libs=]
+ =dev-db/mysql-cluster-7.2*[embedded=,minimal=,static=,static-libs=]
)"
diff --git a/virtual/mysql/mysql-5.5.ebuild b/virtual/mysql/mysql-5.5.ebuild
deleted file mode 100644
index bd97372..0000000
--- a/virtual/mysql/mysql-5.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.16
2014/08/13 15:25:36 maekke Exp $
-
-EAPI="4"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm 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"
-IUSE="embedded minimal static static-libs"
-
-DEPEND=""
-# TODO: add Drizzle here
-RDEPEND="|| (
- =dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]
- =dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
- =dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]
- =dev-db/mariadb-galera-${PV}*[embedded=,minimal=,static=,static-libs=]
-)"
diff --git a/virtual/mysql/mysql-5.6-r2.ebuild
b/virtual/mysql/mysql-5.6-r2.ebuild
index d5dc5b2..19bf77c 100644
--- a/virtual/mysql/mysql-5.6-r2.ebuild
+++ b/virtual/mysql/mysql-5.6-r2.ebuild
@@ -1,6 +1,6 @@
-# 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/virtual/mysql/mysql-5.6-r2.ebuild,v 1.1
2014/08/31 21:44:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.6-r2.ebuild,v 1.10
2015/02/16 10:27:37 ago Exp $
EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE=""
SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+KEYWORDS="alpha amd64 arm 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"
IUSE="embedded minimal static static-libs"
DEPEND=""
