Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 560936
Collapse All | Expand All

(-)a/dev-db/mariadb-galera/mariadb-galera-10.0.21-r1.ebuild (+137 lines)
Line 0 Link Here
1
# Copyright 1999-2015 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Id$
4
5
EAPI="5"
6
MY_EXTRAS_VER="20150717-1707Z"
7
WSREP_REVISION="25"
8
HAS_TOOLS_PATCH="1"
9
SUBSLOT="18"
10
11
inherit toolchain-funcs mysql-multilib
12
# only to make repoman happy. it is really set in the eclass
13
IUSE="$IUSE"
14
15
# REMEMBER: also update eclass/mysql*.eclass before committing!
16
KEYWORDS="~amd64 ~x86"
17
18
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
19
EPATCH_EXCLUDE=''
20
21
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
22
RDEPEND="${RDEPEND}"
23
24
# Please do not add a naive src_unpack to this ebuild
25
# If you want to add a single patch, copy the ebuild to an overlay
26
# and create your own mysql-extras tarball, looking at 000_index.txt
27
28
# Official test instructions:
29
# USE='client-libs community embedded extraengine perl server ssl static-libs tools' \
30
# FEATURES='test userpriv -usersandbox' \
31
# ebuild mariadb-galera-X.X.XX.ebuild \
32
# digest clean package
33
multilib_src_test() {
34
35
	if ! multilib_is_native_abi ; then
36
		einfo "Server tests not available on non-native abi".
37
		return 0;
38
	fi
39
40
	local TESTDIR="${BUILD_DIR}/mysql-test"
41
	local retstatus_unit
42
	local retstatus_tests
43
44
	# Bug #213475 - MySQL _will_ object strenously if your machine is named
45
	# localhost. Also causes weird failures.
46
	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
47
48
	if use server ; then
49
50
		if [[ $UID -eq 0 ]]; then
51
			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
52
		fi
53
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
54
55
		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
56
		addpredict /this-dir-does-not-exist/t9.MYI
57
58
		# Run CTest (test-units)
59
		cmake-utils_src_test
60
		retstatus_unit=$?
61
		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
62
63
		# Ensure that parallel runs don't die
64
		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
65
		# Enable parallel testing, auto will try to detect number of cores
66
		# You may set this by hand.
67
		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
68
		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
69
70
		# create directories because mysqladmin might right out of order
71
		mkdir -p "${T}"/var-tests{,/log}
72
73
		# Create a symlink to provided binaries so the tests can find them when client-libs is off
74
		if ! use client-libs ; then
75
			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
76
			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
77
			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
78
		fi
79
80
		# These are failing in MariaDB 10.0 for now and are believed to be
81
		# false positives:
82
		#
83
		# main.information_schema, binlog.binlog_statement_insert_delayed,
84
		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
85
		# funcs_1.is_columns_mysql, main.bootstrap
86
		# fails due to USE=-latin1 / utf8 default
87
		#
88
		# main.mysql_client_test, main.mysql_client_test_nonblock
89
		# main.mysql_client_test_comp:
90
		# segfaults at random under Portage only, suspect resource limits.
91
		#
92
		# wsrep.variables:
93
		# Expects the sys-cluster/galera library to be installed and configured
94
		#
95
		# wsrep.foreign_key:
96
		# Issues a configuration deprecation warning which does not affect data
97
		#
98
99
		for t in main.mysql_client_test main.mysql_client_test_nonblock \
100
			main.mysql_client_test_comp main.bootstrap \
101
			binlog.binlog_statement_insert_delayed main.information_schema \
102
			main.mysqld--help wsrep.variables wsrep.foreign_key \
103
			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
104
				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
105
		done
106
107
		# Run mysql tests
108
		pushd "${TESTDIR}"
109
110
		# run mysql-test tests
111
		# The PATH addition is required for the galera suite to find the sst scripts
112
		# Skipping galera tests for now until MDEV-7544 is resovled
113
		WSREP_LOG_DIR="${T}/var-tests/wsrep" \
114
		PATH="${BUILD_DIR}/scripts:${PATH}" \
115
		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --skip-test=galera
116
		retstatus_tests=$?
117
		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
118
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
119
120
		popd
121
122
		# Cleanup is important for these testcases.
123
		pkill -9 -f "${S}/ndb" 2>/dev/null
124
		pkill -9 -f "${S}/sql" 2>/dev/null
125
126
		failures=""
127
		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
128
		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
129
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
130
131
		[[ -z "$failures" ]] || die "Test failures: $failures"
132
		einfo "Tests successfully completed"
133
	else
134
135
		einfo "Skipping server tests due to minimal build."
136
	fi
137
}
(-)a/dev-db/mariadb/mariadb-10.1.7_rc-r1.ebuild (+127 lines)
Line 0 Link Here
1
# Copyright 1999-2015 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Id$
4
5
EAPI="5"
6
MY_EXTRAS_VER="20150914-1946Z"
7
WSREP_REVISION="25"
8
SUBSLOT="18"
9
HAS_TOOLS_PATCH="yes"
10
11
inherit toolchain-funcs mysql-multilib
12
# only to make repoman happy. it is really set in the eclass
13
IUSE="$IUSE mroonga"
14
15
# REMEMBER: also update eclass/mysql*.eclass before committing!
16
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
17
18
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
19
#EPATCH_EXCLUDE='20014_all_mariadb-innodb-compression.patch'
20
21
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
22
	mroonga? ( app-text/groonga-normalizer-mysql )"
23
RDEPEND="${RDEPEND}"
24
25
# Official test instructions:
26
# USE='client-libs community embedded extraengine perl server ssl static-libs tools' \
27
# FEATURES='test userpriv -usersandbox' \
28
# ebuild mariadb-X.X.XX.ebuild \
29
# digest clean package
30
multilib_src_test() {
31
32
	if ! multilib_is_native_abi ; then
33
		einfo "Server tests not available on non-native abi".
34
		return 0;
35
	fi
36
37
	local TESTDIR="${BUILD_DIR}/mysql-test"
38
	local retstatus_unit
39
	local retstatus_tests
40
41
	if use server ; then
42
43
		# Bug #213475 - MySQL _will_ object strenously if your machine is named
44
		# localhost. Also causes weird failures.
45
		[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
46
47
		if [[ $UID -eq 0 ]]; then
48
			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
49
		fi
50
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
51
52
		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
53
		addpredict /this-dir-does-not-exist/t9.MYI
54
55
		# Run CTest (test-units)
56
		cmake-utils_src_test
57
		retstatus_unit=$?
58
		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
59
60
		# Create a symlink to provided binaries so the tests can find them when client-libs is off
61
		if ! use client-libs ; then
62
			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
63
			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
64
			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
65
		fi
66
67
		# Ensure that parallel runs don't die
68
		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
69
		# Enable parallel testing, auto will try to detect number of cores
70
		# You may set this by hand.
71
		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
72
		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
73
74
		# create directories because mysqladmin might run out of order
75
		mkdir -p "${T}"/var-tests{,/log}
76
77
		# These are failing in MariaDB 10.0 for now and are believed to be
78
		# false positives:
79
		#
80
		# main.information_schema, binlog.binlog_statement_insert_delayed,
81
		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
82
		# funcs_1.is_columns_mysql main.bootstrap
83
		# fails due to USE=-latin1 / utf8 default
84
		#
85
		# main.mysql_client_test, main.mysql_client_test_nonblock
86
		# main.mysql_client_test_comp:
87
		# segfaults at random under Portage only, suspect resource limits.
88
		#
89
		# plugins.cracklib_password_check
90
		# Can randomly fail due to cracklib return message
91
92
		for t in main.mysql_client_test main.mysql_client_test_nonblock \
93
			main.mysql_client_test_comp main.bootstrap \
94
			binlog.binlog_statement_insert_delayed main.information_schema \
95
			main.mysqld--help plugins.cracklib_password_check \
96
			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
97
				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
98
		done
99
100
		# Run mysql tests
101
		pushd "${TESTDIR}"
102
103
		# run mysql-test tests
104
		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
105
106
		retstatus_tests=$?
107
		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
108
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
109
110
		popd
111
112
		# Cleanup is important for these testcases.
113
		pkill -9 -f "${S}/ndb" 2>/dev/null
114
		pkill -9 -f "${S}/sql" 2>/dev/null
115
116
		failures=""
117
		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
118
		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
119
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
120
121
		[[ -z "$failures" ]] || die "Test failures: $failures"
122
		einfo "Tests successfully completed"
123
124
	else
125
		einfo "Skipping server tests due to minimal build."
126
	fi
127
}
(-)a/dev-db/mysql-cluster/mysql-cluster-7.3.9-r2.ebuild (+135 lines)
Line 0 Link Here
1
# Copyright 1999-2015 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Id$
4
5
EAPI=5
6
MY_EXTRAS_VER="20150710-1911Z"
7
SUBSLOT="18"
8
9
inherit toolchain-funcs java-pkg-opt-2 mysql-multilib
10
# only to make repoman happy. it is really set in the eclass
11
IUSE="$IUSE"
12
13
# REMEMBER: also update eclass/mysql*.eclass before committing!
14
KEYWORDS="~amd64 ~x86"
15
16
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
17
# This is often broken still
18
#EPATCH_EXCLUDE=''
19
20
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
21
RDEPEND="!media-sound/amarok[embedded]"
22
23
# Please do not add a naive src_unpack to this ebuild
24
# If you want to add a single patch, copy the ebuild to an overlay
25
# and create your own mysql-extras tarball, looking at 000_index.txt
26
27
# Official test instructions:
28
# USE='cluster extraengine perl ssl community' \
29
# FEATURES='test userpriv -usersandbox' \
30
# ebuild mysql-cluster-X.X.XX.ebuild \
31
# digest clean package
32
multilib_src_test() {
33
34
	if ! multilib_is_native_abi ; then
35
		einfo "Server tests not available on non-native abi".
36
		return 0;
37
	fi
38
39
	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
40
	local retstatus_unit
41
	local retstatus_tests
42
43
	# Bug #213475 - MySQL _will_ object strenously if your machine is named
44
	# localhost. Also causes weird failures.
45
	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
46
47
	if ! use "minimal" ; then
48
49
		if [[ $UID -eq 0 ]]; then
50
			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
51
		fi
52
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
53
54
		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
55
		addpredict /this-dir-does-not-exist/t9.MYI
56
57
		# Run CTest (test-units)
58
		cmake-utils_src_test
59
		retstatus_unit=$?
60
		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
61
62
		# Ensure that parallel runs don't die
63
		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
64
		# Enable parallel testing, auto will try to detect number of cores
65
		# You may set this by hand.
66
		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
67
		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
68
69
		# create directories because mysqladmin might right out of order
70
		mkdir -p "${T}"/var-tests{,/log}
71
72
		# These are failing in MySQL 5.5/5.6 for now and are believed to be
73
		# false positives:
74
		#
75
		# main.information_schema, binlog.binlog_statement_insert_delayed,
76
		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
77
		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
78
		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
79
		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
80
		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
81
		# fails due to USE=-latin1 / utf8 default
82
		#
83
		# main.mysql_client_test:
84
		# segfaults at random under Portage only, suspect resource limits.
85
		#
86
		for t in \
87
			binlog.binlog_mysqlbinlog_filter \
88
			binlog.binlog_statement_insert_delayed \
89
			funcs_1.is_columns_mysql \
90
			funcs_1.is_tables_mysql \
91
			funcs_1.is_triggers \
92
			main.information_schema \
93
			main.mysqld--help-notwinfuncs_1.is_triggers \
94
			main.mysql_client_test \
95
			mysqld--help-notwin \
96
			perfschema.binlog_edge_mix \
97
			perfschema.binlog_edge_stmt \
98
		; do
99
				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
100
		done
101
		# ndb.ndbinfo, ndb_binlog.ndb_binlog_index: latin1/utf8
102
		for t in \
103
			ndb.ndbinfo \
104
			ndb_binlog.ndb_binlog_index ; do
105
				mysql-multilib_disable_test  "$t" "False positives in Gentoo (NDB)"
106
		done
107
108
		# Run mysql tests
109
		pushd "${TESTDIR}"
110
111
		# run mysql-test tests
112
		perl mysql-test-run.pl --force --vardir="${T}/var-tests"
113
		retstatus_tests=$?
114
		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
115
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
116
117
		popd
118
119
		# Cleanup is important for these testcases.
120
		pkill -9 -f "${S}/ndb" 2>/dev/null
121
		pkill -9 -f "${S}/sql" 2>/dev/null
122
123
		failures=""
124
		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
125
		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
126
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
127
128
		[[ -z "$failures" ]] || die "Test failures: $failures"
129
		einfo "Tests successfully completed"
130
131
	else
132
133
		einfo "Skipping server tests due to minimal build."
134
	fi
135
}
(-)a/dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r3.ebuild (+83 lines)
Line 0 Link Here
1
# Copyright 1999-2015 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Id$
4
5
EAPI=5
6
CMAKE_MIN_VERSION="2.8.12"
7
8
inherit cmake-multilib eutils multilib
9
10
MULTILIB_WRAPPED_HEADERS+=(
11
	/usr/include/mysql/my_config.h
12
)
13
14
# wrap the config script
15
MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
16
17
DESCRIPTION="C client library for MariaDB/MySQL"
18
HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
19
LICENSE="GPL-2"
20
21
SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz"
22
S="${WORKDIR}/${P}-src"
23
KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
24
25
SUBSLOT="18"
26
SLOT="0/${SUBSLOT}"
27
IUSE="libressl +ssl static-libs"
28
29
CDEPEND="
30
	sys-libs/zlib:=[${MULTILIB_USEDEP}]
31
	ssl? (
32
		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
33
		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
34
	)
35
	"
36
RDEPEND="${CDEPEND}
37
	!dev-db/mysql[client-libs(+)]
38
	!dev-db/mysql-cluster[client-libs(+)]
39
	!dev-db/mariadb[client-libs(+)]
40
	!dev-db/mariadb-connector-c[mysqlcompat]
41
	!dev-db/mariadb-galera[client-libs(+)]
42
	!dev-db/percona-server[client-libs(+)]
43
	"
44
DEPEND="${CDEPEND}"
45
46
DOCS=( README Docs/ChangeLog )
47
48
src_prepare() {
49
	epatch "${FILESDIR}/openssl-cmake-detection.patch" \
50
		"${FILESDIR}/conn-c-includes.patch" \
51
		"${FILESDIR}/mysql_com.patch"
52
	epatch_user
53
}
54
55
multilib_src_configure() {
56
	mycmakeargs+=(
57
		-DINSTALL_LAYOUT=RPM
58
		-DINSTALL_LIBDIR=$(get_libdir)
59
		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
60
		-DWITH_DEFAULT_FEATURE_SET=OFF
61
		-DENABLED_LOCAL_INFILE=ON
62
		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
63
		-DWITH_ZLIB=system
64
		-DENABLE_DTRACE=OFF
65
		-DWITH_SSL=$(usex ssl system bundled)
66
	)
67
	cmake-utils_src_configure
68
}
69
70
multilib_src_install_all() {
71
	if ! use static-libs ; then
72
		find "${ED}" -name "*.a" -delete || die
73
	fi
74
}
75
76
pkg_preinst() {
77
	if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
78
		elog "Due to ABI changes when switching between different client libraries,"
79
		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
80
		elog "Please run: revdep-rebuild --library libmysqlclient.so.${SUBSLOT}"
81
		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
82
	fi
83
}
(-)a/dev-db/mysql/mysql-5.5.45-r1.ebuild (+126 lines)
Line 0 Link Here
1
# Copyright 1999-2015 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Id$
4
5
EAPI="5"
6
7
MY_EXTRAS_VER="20150729-1849Z"
8
MY_PV="${PV//_alpha_pre/-m}"
9
MY_PV="${MY_PV//_/-}"
10
11
# Build type
12
BUILD="cmake"
13
14
inherit toolchain-funcs mysql-v2
15
# only to make repoman happy. it is really set in the eclass
16
IUSE="$IUSE"
17
18
# Define the mysql-extras source
19
EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
20
21
# REMEMBER: also update eclass/mysql*.eclass before committing!
22
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"
23
24
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
25
EPATCH_EXCLUDE=''
26
27
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
28
RDEPEND="${RDEPEND}"
29
30
# Please do not add a naive src_unpack to this ebuild
31
# If you want to add a single patch, copy the ebuild to an overlay
32
# and create your own mysql-extras tarball, looking at 000_index.txt
33
34
# Official test instructions:
35
# USE='embedded extraengine perl ssl static-libs community' \
36
# FEATURES='test userpriv -usersandbox' \
37
# ebuild mysql-X.X.XX.ebuild \
38
# digest clean package
39
src_test() {
40
41
	local TESTDIR="${BUILD_DIR}/mysql-test"
42
	local retstatus_unit
43
	local retstatus_tests
44
45
	# Bug #213475 - MySQL _will_ object strenously if your machine is named
46
	# localhost. Also causes weird failures.
47
	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
48
49
	if ! use "minimal" ; then
50
51
		if [[ $UID -eq 0 ]]; then
52
			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
53
		fi
54
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
55
56
		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
57
		addpredict /this-dir-does-not-exist/t9.MYI
58
59
		# Run CTest (test-units)
60
		cmake-utils_src_test
61
		retstatus_unit=$?
62
		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
63
64
		# Ensure that parallel runs don't die
65
		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
66
		# Enable parallel testing, auto will try to detect number of cores
67
		# You may set this by hand.
68
		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
69
		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
70
71
		# create directories because mysqladmin might right out of order
72
		mkdir -p "${T}"/var-tests{,/log}
73
74
		# create symlink for the tests to find mysql_tzinfo_to_sql
75
		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
76
77
		# These are failing in MySQL 5.5 for now and are believed to be
78
		# false positives:
79
		#
80
		# main.information_schema, binlog.binlog_statement_insert_delayed,
81
		# main.mysqld--help-notwin
82
		# fails due to USE=-latin1 / utf8 default
83
		#
84
		# main.mysql_client_test:
85
		# segfaults at random under Portage only, suspect resource limits.
86
		#
87
		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
88
		# fails due to bad cleanup of previous tests when run in parallel
89
		# The tool is deprecated anyway
90
		# Bug 532288
91
92
		for t in main.mysql_client_test \
93
			binlog.binlog_statement_insert_delayed main.information_schema \
94
			main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
95
				mysql-v2_disable_test  "$t" "False positives in Gentoo"
96
		done
97
98
		# Run mysql tests
99
		pushd "${TESTDIR}"
100
101
		# run mysql-test tests
102
		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
103
			--testcase-timeout=30 --reorder
104
		retstatus_tests=$?
105
		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
106
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
107
108
		popd
109
110
		# Cleanup is important for these testcases.
111
		pkill -9 -f "${S}/ndb" 2>/dev/null
112
		pkill -9 -f "${S}/sql" 2>/dev/null
113
114
		failures=""
115
		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
116
		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
117
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
118
119
		[[ -z "$failures" ]] || die "Test failures: $failures"
120
		einfo "Tests successfully completed"
121
122
	else
123
124
		einfo "Skipping server tests due to minimal build."
125
	fi
126
}
(-)a/dev-db/mysql/mysql-5.6.26-r2.ebuild (+165 lines)
Line 0 Link Here
1
# Copyright 1999-2015 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Id$
4
5
EAPI="5"
6
7
MY_EXTRAS_VER="20150717-1707Z"
8
MY_PV="${PV//_alpha_pre/-m}"
9
MY_PV="${MY_PV//_/-}"
10
HAS_TOOLS_PATCH="1"
11
SUBSLOT="18"
12
13
inherit toolchain-funcs mysql-multilib
14
# only to make repoman happy. it is really set in the eclass
15
IUSE="$IUSE"
16
17
# REMEMBER: also update eclass/mysql*.eclass before committing!
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"
19
20
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
21
EPATCH_EXCLUDE=''
22
23
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
24
RDEPEND="${RDEPEND}"
25
26
# Please do not add a naive src_unpack to this ebuild
27
# If you want to add a single patch, copy the ebuild to an overlay
28
# and create your own mysql-extras tarball, looking at 000_index.txt
29
30
# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
31
# disable until we see what happens with it
32
MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1"
33
34
# Official test instructions:
35
# USE='server embedded extraengine perl ssl static-libs community' \
36
# FEATURES='test userpriv -usersandbox' \
37
# ebuild mysql-X.X.XX.ebuild \
38
# digest clean package
39
multilib_src_test() {
40
41
	if ! multilib_is_native_abi ; then
42
		einfo "Server tests not available on non-native abi".
43
		return 0;
44
	fi
45
46
	local TESTDIR="${BUILD_DIR}/mysql-test"
47
	local retstatus_unit
48
	local retstatus_tests
49
50
	# Bug #213475 - MySQL _will_ object strenously if your machine is named
51
	# localhost. Also causes weird failures.
52
	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
53
54
	if use server ; then
55
56
		if [[ $UID -eq 0 ]]; then
57
			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
58
		fi
59
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
60
61
		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
62
		addpredict /this-dir-does-not-exist/t9.MYI
63
64
		# Run CTest (test-units)
65
		cmake-utils_src_test
66
		retstatus_unit=$?
67
		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
68
69
		# Create a symlink to provided binaries so the tests can find them when client-libs is off
70
		if ! use client-libs ; then
71
			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
72
			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
73
			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
74
		fi
75
76
		# Ensure that parallel runs don't die
77
		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
78
		# Enable parallel testing, auto will try to detect number of cores
79
		# You may set this by hand.
80
		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
81
		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
82
83
		# create directories because mysqladmin might right out of order
84
		mkdir -p "${T}"/var-tests{,/log}
85
86
		# create symlink for the tests to find mysql_tzinfo_to_sql
87
		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
88
89
		# These are failing in MySQL 5.5/5.6 for now and are believed to be
90
		# false positives:
91
		#
92
		# main.information_schema, binlog.binlog_statement_insert_delayed,
93
		# funcs_1.is_triggers funcs_1.is_tables_mysql,
94
		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
95
		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
96
		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
97
		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
98
		# fails due to USE=-latin1 / utf8 default
99
		#
100
		# main.mysql_client_test:
101
		# segfaults at random under Portage only, suspect resource limits.
102
		#
103
		# rpl.rpl_plugin_load
104
		# fails due to included file not listed in expected result
105
		# appears to be poor planning
106
		#
107
		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
108
		# fails due to bad cleanup of previous tests when run in parallel
109
		# The tool is deprecated anyway
110
		# Bug 532288
111
		for t in \
112
			binlog.binlog_mysqlbinlog_filter \
113
			binlog.binlog_statement_insert_delayed \
114
			funcs_1.is_columns_mysql \
115
			funcs_1.is_tables_mysql \
116
			funcs_1.is_triggers \
117
			main.information_schema \
118
			main.mysql_client_test \
119
			main.mysqld--help-notwin \
120
			perfschema.binlog_edge_mix \
121
			perfschema.binlog_edge_stmt \
122
			rpl.rpl_plugin_load \
123
			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
124
		; do
125
				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
126
		done
127
128
		if ! use extraengine ; then
129
			# bug 401673, 530766
130
			for t in federated.federated_plugin ; do
131
				mysql-multilib_disable_test  "$t" "Test $t requires USE=extraengine (Need federated engine)"
132
			done
133
		fi
134
135
		# Run mysql tests
136
		pushd "${TESTDIR}"
137
138
		# Set file limits higher so tests run
139
		ulimit -n 3000
140
141
		# run mysql-test tests
142
		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
143
			--suite-timeout=5000 --reorder
144
		retstatus_tests=$?
145
		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
146
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
147
148
		popd
149
150
		# Cleanup is important for these testcases.
151
		pkill -9 -f "${S}/ndb" 2>/dev/null
152
		pkill -9 -f "${S}/sql" 2>/dev/null
153
154
		failures=""
155
		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
156
		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
157
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
158
159
		[[ -z "$failures" ]] || die "Test failures: $failures"
160
		einfo "Tests successfully completed"
161
162
	else
163
		einfo "Skipping server tests due to minimal build."
164
	fi
165
}
(-)a/dev-db/percona-server/percona-server-5.6.26.74.0-r1.ebuild (+166 lines)
Line 0 Link Here
1
# Copyright 1999-2015 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Id$
4
5
EAPI="5"
6
MY_EXTRAS_VER="20150717-1707Z"
7
HAS_TOOLS_PATCH="1"
8
SUBSLOT="18"
9
10
inherit toolchain-funcs mysql-multilib
11
# only to make repoman happy. it is really set in the eclass
12
IUSE="$IUSE tokudb tokudb-backup-plugin"
13
14
# REMEMBER: also update eclass/mysql*.eclass before committing!
15
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
16
17
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
18
EPATCH_EXCLUDE=''
19
20
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
21
	tokudb? ( app-arch/snappy )
22
	tokudb-backup-plugin? ( dev-util/valgrind )"
23
RDEPEND="${RDEPEND}"
24
25
REQUIRED_USE="tokudb? ( jemalloc ) tokudb-backup-plugin? ( tokudb )"
26
27
# Please do not add a naive src_unpack to this ebuild
28
# If you want to add a single patch, copy the ebuild to an overlay
29
# and create your own mysql-extras tarball, looking at 000_index.txt
30
31
# Official test instructions:
32
# USE='extraengine perl ssl static-libs community' \
33
# FEATURES='test userpriv -usersandbox' \
34
# ebuild percona-server-X.X.XX.ebuild \
35
# digest clean package
36
multilib_src_test() {
37
38
	if ! multilib_is_native_abi ; then
39
		einfo "Server tests not available on non-native abi".
40
		return 0;
41
	fi
42
43
	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
44
	local retstatus_unit
45
	local retstatus_tests
46
47
	# Bug #213475 - MySQL _will_ object strenously if your machine is named
48
	# localhost. Also causes weird failures.
49
	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
50
51
	if use server ; then
52
53
		if [[ $UID -eq 0 ]]; then
54
			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
55
		fi
56
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
57
58
		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
59
		addpredict /this-dir-does-not-exist/t9.MYI
60
61
		# Run CTest (test-units)
62
		cmake-utils_src_test
63
		retstatus_unit=$?
64
		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
65
66
		# Ensure that parallel runs don't die
67
		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
68
		# Enable parallel testing, auto will try to detect number of cores
69
		# You may set this by hand.
70
		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
71
		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
72
73
		# create directories because mysqladmin might right out of order
74
		mkdir -p "${T}"/var-tests{,/log}
75
76
		# Create a symlink to provided binaries so the tests can find them when client-libs is off
77
		if ! use client-libs ; then
78
			ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
79
			ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
80
			mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
81
		fi
82
83
		# These are failing in Percona 5.6 for now and are believed to be
84
		# false positives:
85
		#
86
		# main.information_schema, binlog.binlog_statement_insert_delayed,
87
		# main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter
88
		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt
89
		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers
90
		# engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate
91
		# engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8
92
		# engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate
93
		# fails due to USE=-latin1 / utf8 default
94
		#
95
		# main.mysql_client_test:
96
		# segfaults at random under Portage only, suspect resource limits.
97
		#
98
		# main.percona_bug1289599
99
		# Looks to be a syntax error in the test file itself
100
		#
101
		# main.variables main.myisam main.merge_recover
102
		# fails due to ulimit not able to open enough files (needs 5000)
103
		#
104
		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
105
		# Called with bad parameters should be reported upstream
106
		#
107
		# innodb_stress.innodb_stress
108
		# innodb_stress.innodb_stress_blob innodb_stress.innodb_stress_blob_nocompress
109
		# innodb_stress.innodb_stress_crash innodb_stress.innodb_stress_crash_blob
110
		# innodb_stress.innodb_stress_crash_blob_nocompress innodb_stress.innodb_stress_crash_nocompress
111
		# innodb_stress.innodb_stress_nocompress
112
		# Dependent on python2 being the system python
113
114
		for t in main.mysql_client_test \
115
			binlog.binlog_statement_insert_delayed main.information_schema \
116
			main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \
117
			perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
118
			funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
119
			main.variables main.myisam main.merge_recover \
120
			engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \
121
			engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
122
			engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
123
			main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
124
				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
125
		done
126
127
		for t in innodb_stress.innodb_stress \
128
			innodb_stress.innodb_stress_blob innodb_stress.innodb_stress_blob_nocompress \
129
			innodb_stress.innodb_stress_crash innodb_stress.innodb_stress_crash_blob \
130
			innodb_stress.innodb_stress_crash_blob_nocompress innodb_stress.innodb_stress_crash_nocompress \
131
			innodb_stress.innodb_stress_nocompress ; do
132
				mysql-multilib_disable_test "$t" "False positives due to python exception syntax"
133
		done
134
135
		# Run mysql tests
136
		pushd "${TESTDIR}"
137
138
		# Set file limits higher so tests run
139
		ulimit -n 3000
140
141
		# run mysql-test tests
142
		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
143
			--testcase-timeout=30 --reorder
144
		retstatus_tests=$?
145
		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
146
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
147
148
		popd
149
150
		# Cleanup is important for these testcases.
151
		pkill -9 -f "${S}/ndb" 2>/dev/null
152
		pkill -9 -f "${S}/sql" 2>/dev/null
153
154
		failures=""
155
		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
156
		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
157
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
158
159
		[[ -z "$failures" ]] || die "Test failures: $failures"
160
		einfo "Tests successfully completed"
161
162
	else
163
164
		einfo "Skipping server tests due to minimal build."
165
	fi
166
}
(-)a/eclass/mysql-multilib.eclass (-5 / +17 lines)
Lines 192-198 fi Link Here
192
LICENSE="GPL-2"
192
LICENSE="GPL-2"
193
SLOT="0/${SUBSLOT:-0}"
193
SLOT="0/${SUBSLOT:-0}"
194
194
195
IUSE="+community cluster debug embedded extraengine jemalloc latin1
195
IUSE="+community cluster debug embedded extraengine jemalloc latin1 libressl
196
	+perl profiling selinux ssl systemtap static static-libs tcmalloc test"
196
	+perl profiling selinux ssl systemtap static static-libs tcmalloc test"
197
197
198
### Begin readline/libedit
198
### Begin readline/libedit
Lines 271-277 REQUIRED_USE=" Link Here
271
# These are used for both runtime and compiletime
271
# These are used for both runtime and compiletime
272
# MULTILIB_USEDEP only set for libraries used by the client library
272
# MULTILIB_USEDEP only set for libraries used by the client library
273
DEPEND="
273
DEPEND="
274
	ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
274
	ssl? (
275
		!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
276
		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP},static-libs?] )
277
	)
275
	kernel_linux? (
278
	kernel_linux? (
276
		sys-process/procps:0=
279
		sys-process/procps:0=
277
		dev-libs/libaio:0=
280
		dev-libs/libaio:0=
Lines 287-304 DEPEND=" Link Here
287
if [[ ${HAS_TOOLS_PATCH} ]] ; then
290
if [[ ${HAS_TOOLS_PATCH} ]] ; then
288
	DEPEND+="
291
	DEPEND+="
289
		client-libs? (
292
		client-libs? (
290
			ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
293
			ssl? (
294
				!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
295
				libressl? ( dev-libs/libressl[${MULTILIB_USEDEP},static-libs?] )
296
			)
291
			>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
297
			>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
292
		)
298
		)
293
		!client-libs? (
299
		!client-libs? (
294
			ssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?] )
300
			ssl? (
301
				!libressl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?] )
302
				libressl? ( dev-libs/libressl[static-libs?] )
303
			)
295
			>=sys-libs/zlib-1.2.3:0=[static-libs?]
304
			>=sys-libs/zlib-1.2.3:0=[static-libs?]
296
		)
305
		)
297
		tools? ( sys-libs/ncurses:0= ) embedded? ( sys-libs/ncurses:0= )
306
		tools? ( sys-libs/ncurses:0= ) embedded? ( sys-libs/ncurses:0= )
298
	"
307
	"
299
else
308
else
300
	DEPEND+="
309
	DEPEND+="
301
		ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
310
		ssl? (
311
			!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
312
			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP},static-libs?] )
313
		)
302
		>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
314
		>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
303
		sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
315
		sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
304
	"
316
	"
(-)a/eclass/mysql-v2.eclass (-4 / +10 lines)
Lines 208-217 SLOT="0" Link Here
208
208
209
case "${BUILD}" in
209
case "${BUILD}" in
210
	"autotools")
210
	"autotools")
211
		IUSE="big-tables debug embedded minimal +perl selinux ssl static test"
211
		IUSE="big-tables debug embedded libressl minimal +perl selinux ssl static test"
212
		;;
212
		;;
213
	"cmake")
213
	"cmake")
214
		IUSE="debug embedded minimal +perl selinux ssl static static-libs test"
214
		IUSE="debug embedded libressl minimal +perl selinux ssl static static-libs test"
215
		;;
215
		;;
216
esac
216
esac
217
217
Lines 269-275 REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) stati Link Here
269
# Be warned, *DEPEND are version-dependant
269
# Be warned, *DEPEND are version-dependant
270
# These are used for both runtime and compiletime
270
# These are used for both runtime and compiletime
271
DEPEND="
271
DEPEND="
272
	ssl? ( >=dev-libs/openssl-0.9.6d:0 )
272
	ssl? (
273
		!libressl? ( >=dev-libs/openssl-0.9.6d:0 )
274
		libressl? ( dev-libs/libressl )
275
	)
273
	kernel_linux? ( sys-process/procps )
276
	kernel_linux? ( sys-process/procps )
274
	>=sys-apps/sed-4
277
	>=sys-apps/sed-4
275
	>=sys-apps/texinfo-4.7-r1
278
	>=sys-apps/texinfo-4.7-r1
Lines 322-328 if mysql_version_is_at_least "5.5.7" ; then Link Here
322
		jemalloc? ( dev-libs/jemalloc[static-libs?] )
325
		jemalloc? ( dev-libs/jemalloc[static-libs?] )
323
		tcmalloc? ( dev-util/google-perftools )
326
		tcmalloc? ( dev-util/google-perftools )
324
		>=sys-libs/zlib-1.2.3[static-libs?]
327
		>=sys-libs/zlib-1.2.3[static-libs?]
325
		ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] )
328
		ssl? (
329
			!libressl? ( >=dev-libs/openssl-0.9.6d:0[static-libs?] )
330
			libressl? ( dev-libs/libressl[static-libs?] )
331
		)
326
		systemtap? ( >=dev-util/systemtap-1.3 )
332
		systemtap? ( >=dev-util/systemtap-1.3 )
327
		kernel_linux? ( dev-libs/libaio )
333
		kernel_linux? ( dev-libs/libaio )
328
	"
334
	"
(-)a/profiles/base/package.use.stable.mask (+6 lines)
Lines 5-10 Link Here
5
# This file requires eapi 5 or later. New entries go on top.
5
# This file requires eapi 5 or later. New entries go on top.
6
# Please use the same syntax as in package.use.mask
6
# Please use the same syntax as in package.use.mask
7
7
8
# Julian Ospald <hasufell@gentoo.org> (20 sep 2015)
9
# dev-libs/libressl is not in stable arch yet,
10
# remove this entry once it is!
11
dev-db/mariadb libressl
12
dev-db/mysql libressl
13
8
# Johannes Huber <johu@gentoo.org> (27 Aug 2015)
14
# Johannes Huber <johu@gentoo.org> (27 Aug 2015)
9
# Needs KF 5 stable, bug #558460
15
# Needs KF 5 stable, bug #558460
10
net-irc/quassel qt5
16
net-irc/quassel qt5
(-)a/virtual/libmysqlclient/libmysqlclient-18-r1.ebuild (+27 lines)
Line 0 Link Here
1
# Copyright 1999-2015 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Id$
4
5
EAPI="5"
6
7
inherit multilib-build
8
9
DESCRIPTION="Virtual for MySQL client libraries"
10
HOMEPAGE=""
11
SRC_URI=""
12
13
LICENSE=""
14
SLOT="0/18"
15
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
16
IUSE="libressl static-libs"
17
18
DEPEND=""
19
RDEPEND="
20
	|| (
21
		dev-db/mysql-connector-c:${SLOT}[libressl=,static-libs?,${MULTILIB_USEDEP}]
22
		dev-db/mariadb:${SLOT}[client-libs(+),libressl=,static-libs?,${MULTILIB_USEDEP}]
23
		dev-db/mysql:${SLOT}[client-libs(+),libressl=,static-libs?,${MULTILIB_USEDEP}]
24
		dev-db/percona-server:${SLOT}[client-libs(+),libressl=,static-libs?,${MULTILIB_USEDEP}]
25
		dev-db/mariadb-galera:${SLOT}[client-libs(+),libressl=,static-libs?,${MULTILIB_USEDEP}]
26
		dev-db/mysql-cluster:${SLOT}[client-libs(+),libressl=,static-libs?,${MULTILIB_USEDEP}]
27
	)"
(-)a/virtual/mysql/mysql-5.6-r7.ebuild (-1 / +41 lines)
Line 0 Link Here
0
- 
1
# Copyright 1999-2015 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Id$
4
5
EAPI="5"
6
7
inherit multilib-build
8
9
DESCRIPTION="Virtual for MySQL database server"
10
HOMEPAGE=""
11
SRC_URI=""
12
13
LICENSE=""
14
SLOT="0/18"
15
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
16
IUSE="embedded libressl static static-libs"
17
18
DEPEND=""
19
RDEPEND="
20
	virtual/libmysqlclient[static-libs?,${MULTILIB_USEDEP}]
21
	embedded? (
22
		|| (
23
			=dev-db/mariadb-10.1*[client-libs(+),embedded,libressl=,static=]
24
			=dev-db/mariadb-10.0*[client-libs(+),embedded,libressl=,static=]
25
			=dev-db/mysql-${PV}*[client-libs(+),embedded,libressl=,static=]
26
			=dev-db/percona-server-${PV}*[client-libs(+),embedded,libressl=,static=]
27
			=dev-db/mariadb-galera-10.0*[client-libs(+),embedded,libressl=,static=]
28
			=dev-db/mysql-cluster-7.3*[client-libs(+),embedded,libressl=,static=]
29
		)
30
	)
31
	!embedded? (
32
		|| (
33
			=dev-db/mariadb-10.1*[-embedded,libressl=,static=]
34
			=dev-db/mariadb-10.0*[-embedded,libressl=,static=]
35
			=dev-db/mysql-${PV}*[-embedded,libressl=,static=]
36
			=dev-db/percona-server-${PV}*[-embedded,libressl=,static=]
37
			=dev-db/mariadb-galera-10.0*[-embedded,libressl=,static=]
38
			=dev-db/mysql-cluster-7.3*[-embedded,libressl=,static=]
39
		)
40
	)
41
"

Return to bug 560936