commit: c7b022dab5c4a26904aa4226af30e944b89c7ee7
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 2 00:47:47 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Jul 2 00:47:47 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c7b022da
[mysql-cluster] Bump to 7.3.3 and fix eclasses for bug 516008
---
dev-db/mysql-cluster/Manifest | 5 +-
dev-db/mysql-cluster/files/my.cnf-5.5 | 149 ++++++++++++++
dev-db/mysql-cluster/metadata.xml | 3 -
dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild | 229 ---------------------
...ter-7.3.0.ebuild => mysql-cluster-7.3.3.ebuild} | 4 +-
eclass/mysql-cmake.eclass | 2 +-
eclass/mysql-v2.eclass | 17 +-
7 files changed, 167 insertions(+), 242 deletions(-)
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 2dd4ef9..033febf 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -1,5 +1,2 @@
-DIST mysql-cluster-gpl-7.0.37.tar.gz 26875310 SHA256
4711275321aa4b1e5565327323320b95d89f07fd7f076d10a5a7f51653a50754 SHA512
d84cb77bce86a6438697a0d0caed517a8e1537c56d1af23575338c789dd5e9305b3684f37fd237d6a39cc64f6d1df7fe1180e3906eecff04581d3a2962d0d870
WHIRLPOOL
f7a6de3046090236dc8c28d418b3bb00f32c326c388a8a3fdcf088ee3eea8fe06366a2732f210ff1904d05fd28edd825f23adf0c87e60c7be5bc16000fba110e
DIST mysql-cluster-gpl-7.2.13.tar.gz 28571637 SHA256
3ea1061617bf2421fc7020c48e39b7539d04580171a663c778f98aa9c0176e85 SHA512
3dbc2ae8c9827b86bc88e89e07d26f1dd72cf3de88929dc9ae520f749a435b06202cdeb026689e8ced696d7440e23b86cf89e24cb0dd9084a8fb2c307ac02cee
WHIRLPOOL
c5f7b7b0951acc005b0f8b08ddbdb979b94fbe17353203a83b364a6d8c41de0d95caf621eb28c96627e6318240ba1ef604517993645a5878a78734d5f5ab137d
-DIST mysql-cluster-gpl-7.3.0.tar.gz 28623955 SHA256
ef0a8474e7debd7d4e2e900e60a08651d0c47d6d395d402061e100dc0fabcc03 SHA512
8c4eeb0d4d422bcffec0ab32286967d5fac8c54b4965f688f79794acfb90b7f477d86a8e980b62d47c68a468ff254c97569db34d2306eb6403a43a0afca64eee
WHIRLPOOL
605ad60b6fa1f5948613f86568a94e21031ed7f611f3a621ae67a0ab3a387e0331c48cf2490ab4308a9ebac49e3bf0e25a7b084a4366f756a28dba3d59bcfcb3
-DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256
71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512
fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c
WHIRLPOOL
05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
-DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256
e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512
72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3
WHIRLPOOL
a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
+DIST mysql-cluster-gpl-7.3.3.tar.gz 41812287 SHA256
50352757d52853d1d35ecce9951839fbf43df31324136b5d764689853b696e03 SHA512
20f6793c02ad5349522c3dda1a19b2239c778cdbdac3560108e00c4255bd3d7f876f4f068cf3d0e5ee24fb2c343ba28c3fbb99b0272313f56a46b203713f8cb6
WHIRLPOOL
05f8109d1f80410c3293200e8745f057f5a56e83d5a5eb3952f8079c4ea3e56690f1423b9d4ae13f521540e1904462ec27c8919c5fa66986265c08aa7d2bbdc0
diff --git a/dev-db/mysql-cluster/files/my.cnf-5.5
b/dev-db/mysql-cluster/files/my.cnf-5.5
new file mode 100644
index 0000000..eb4f859
--- /dev/null
+++ b/dev-db/mysql-cluster/files/my.cnf-5.5
@@ -0,0 +1,149 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration
file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.2
2013/01/20 02:40:02 robbat2 Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password = your_password
+port = 3306
+socket =
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log =
@GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server = utf8
+user = mysql
+port = 3306
+socket =
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file =
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error =
@GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir = @GENTOO_PORTAGE_EPREFIX@/usr
+datadir = @DATADIR@
+skip-external-locking
+key_buffer_size = 16M
+max_allowed_packet = 1M
+table_open_cache = 64
+sort_buffer_size = 512K
+net_buffer_length = 8K
+read_buffer_size = 256K
+read_rnd_buffer_size = 512K
+myisam_sort_buffer_size = 8M
+lc_messages_dir =
@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
+#Set this to your desired error message language
+lc_messages = en_US
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address = 127.0.0.1
+
+log-bin
+server-id = 1
+
+# point the following paths to different dedicated disks
+tmpdir =
@GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update =
@GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
@GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log =
@GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
+#gdb
+#debug = d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# the following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 16M
+# this is the default, increase it if you have lots of tables
+innodb_additional_mem_pool_size = 2M
+#
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is
seen as a database :-(
+# and upstream wants things to be under
@GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to
(1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 5M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+[mysqldump]
+quick
+max_allowed_packet = 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer_size = 20M
+sort_buffer_size = 20M
+read_buffer = 2M
+write_buffer = 2M
+
+[myisamchk]
+key_buffer_size = 20M
+sort_buffer_size = 20M
+read_buffer_size = 2M
+write_buffer_size = 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
diff --git a/dev-db/mysql-cluster/metadata.xml
b/dev-db/mysql-cluster/metadata.xml
index 22c35e3..0fd723f 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>mysql</herd>
<use>
- <flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
<flag name='cluster'>Add support for NDB clustering</flag>
<flag name='community'>Enables the community features from upstream.</flag>
<flag name='embedded'>Build embedded server (libmysqld)</flag>
@@ -12,10 +11,8 @@
<flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
<flag name='max-idx-128'>Raise the max index per table limit from 64 to
128</flag>
<flag name='minimal'>Install client programs only, no server</flag>
- <flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
<flag name='profiling'>Add support for statement profiling (requires
USE=community).</flag>
<flag name="systemtap">Build support for profiling and tracing using
<pkg>dev-util/systemtap</pkg></flag>
<flag name='test'>Install upstream testsuites for end use.</flag>
- <flag name='xtradb'>Add experimental support for Percona's InnoDB
replacement: XtraDB</flag>
</use>
</pkgmetadata>
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild
b/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild
deleted file mode 100644
index b944856..0000000
--- a/dev-db/mysql-cluster/mysql-cluster-7.0.37.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-MY_EXTRAS_VER="live"
-BUILD="autotools"
-
-# PBXT
-PBXT_VERSION='1.0.11-6-pre-ga'
-# XtraDB
-PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10'
-
-inherit toolchain-funcs 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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
~sparc-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
-
-# 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='berkdb -cluster embedded extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
- # 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"
-
- emake check || die "make check failed"
- 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"
- cd "${S}"
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- local retstatus_unit
- local retstatus_ns
- local retstatus_ps
- local t
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
- # archive_gis really sucks a lot, but it's only relevant for the
- # USE=extraengines case
- case ${PV} in
- 5.0.42)
- mysql_disable_test "archive_gis" "Totally broken in
5.0.42"
- ;;
-
- 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87)
- [ "$(tc-endian)" == "big" ] && \
- mysql_disable_test \
- "archive_gis" \
- "Broken in 5.0.43-70 and 5.0.87 on big-endian
boxes only"
- ;;
- esac
-
- # This was a slight testcase breakage when the read_only
security issue
- # was fixed.
- case ${PV} in
- 5.0.54|5.0.51*)
- mysql_disable_test \
- "read_only" \
- "Broken in 5.0.51-54, output in wrong order"
- ;;
- esac
-
- # Ditto to read_only
- [ "${PV}" == "5.0.51a" ] && \
- mysql_disable_test \
- "view" \
- "Broken in 5.0.51, output in wrong order"
-
- # x86-specific, OOM issue with some subselects on low memory
servers
- [ "${PV}" == "5.0.54" ] && \
- [ "${ARCH/x86}" != "${ARCH}" ] && \
- mysql_disable_test \
- "subselect" \
- "Testcase needs tuning on x86 for oom condition"
-
- # Broke with the YaSSL security issue that didn't affect Gentoo.
- [ "${PV}" == "5.0.56" ] && \
- for t in openssl_1 rpl_openssl rpl_ssl ssl \
- ssl_8k_key ssl_compress ssl_connect ; do \
- mysql_disable_test \
- "$t" \
- "OpenSSL tests broken on 5.0.56"
- done
-
- # New test was broken in first time
- # Upstream bug 41066
- # http://bugs.mysql.com/bug.php?id=41066
- [ "${PV}" == "5.0.72" ] && \
- mysql_disable_test \
- "status2" \
- "Broken in 5.0.72, new test is broken, upstream
bug #41066"
-
- # The entire 5.0 series has pre-generated SSL certificates,
they have
- # mostly expired now. ${S}/mysql-tests/std-data/*.pem
- # The certs really SHOULD be generated for the tests, so that
they are
- # not expiring like this. We cannot do so ourselves as the
tests look
- # closely as the cert path data, and we do not have the CA key
to regen
- # ourselves. Alternatively, upstream should generate them with
at least
- # 50-year validity.
- #
- # Known expiry points:
- # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
- # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
- # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
- #
- # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
- # expired/invalid.
- case ${PV} in
- 5.0.*|5.1.*|5.4.*|5.5.*)
- for t in openssl_1 rpl_openssl rpl.rpl_ssl
rpl.rpl_ssl1 ssl ssl_8k_key \
- ssl_compress ssl_connect
rpl.rpl_heartbeat_ssl ; do \
- mysql_disable_test \
- "$t" \
- "These OpenSSL tests break due
to expired certificates"
- done
- ;;
- esac
-
- # These are also failing in MySQL 5.1 for now, and are believed
to be
- # false positives:
- #
- # main.mysql_comment, main.mysql_upgrade,
main.information_schema,
- # funcs_1.is_columns_mysql funcs_1.is_tables_mysql
funcs_1.is_triggers:
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource
limits.
- #
- # main.not_partition:
- # Failure reason unknown at this time, must resolve before
package.mask
- # removal FIXME
- case ${PV} in
- 5.1.*|5.4.*|5.5.*)
- for t in main.mysql_client_test main.mysql_comments \
- main.mysql_upgrade \
- main.information_schema \
- main.not_partition funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql funcs_1.is_triggers; do
- mysql_disable_test "$t" "False positives in
Gentoo"
- done
- ;;
- esac
-
- use profiling && use community \
- || mysql_disable_test main.profiling \
- "Profiling test needs profiling support"
-
- if [ "${PN}" == "mariadb" ]; then
- for t in \
- parts.part_supported_sql_func_ndb \
- parts.partition_auto_increment_ndb ; do
- mysql_disable_test $t "ndb not
supported in mariadb"
- done
- fi
-
- # This fail with XtraDB in place of normal InnoDB
- # TODO: test if they are broken with the rest of the Percona
patches
- if xtradb_patch_available && use xtradb ; then
- for t in main.innodb innodb.innodb_bug51378 \
- main.information_schema_db main.mysqlshow \
- main.innodb-autoinc main.innodb_bug21704 \
- main.innodb_bug44369 main.innodb_bug46000 \
- main.index_merge_innodb \
- innodb.innodb innodb.innodb_misc1
innodb.innodb_bug52663 \
- innodb.innodb-autoinc
innodb.innodb-autoinc-44030 \
- innodb.innodb_bug21704 innodb.innodb_bug44369 \
- innodb.innodb_bug46000 innodb.innodb_bug48024 \
- innodb.innodb_bug49164 \
- ; do
- mysql_disable_test $t "tests broken in
xtradb"
- done
- fi
-
- # create directories because mysqladmin might make out of order
- mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
-
- # We run the test protocols seperately
- emake test-unit
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
- retstatus_ns=$?
- [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with
FEATURES=usersandbox"
-
- emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
- retstatus_ps=$?
- [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with
FEATURES=usersandbox"
-
- # TODO:
- # When upstream enables the pr and nr testsuites, we need those
as well.
-
- # 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_ns -eq 0 ]] || failures="${failures} test-ns"
- [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
- 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.0.ebuild
b/dev-db/mysql-cluster/mysql-cluster-7.3.3.ebuild
similarity index 97%
rename from dev-db/mysql-cluster/mysql-cluster-7.3.0.ebuild
rename to dev-db/mysql-cluster/mysql-cluster-7.3.3.ebuild
index afe0df0..1f3a525 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.0.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -20,7 +20,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~spar
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
# This is often broken still
-EPATCH_EXCLUDE='02040_all_embedded-library-shared-5.1.43.patch '
+#EPATCH_EXCLUDE='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]"
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 4578020..be564c5 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.20 2014/05/15
03:18:47 grknight Exp $
# @ECLASS: mysql-cmake.eclass
# @MAINTAINER:
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index fa28364..6df339a 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: $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.30 2014/06/04
01:17:11 grknight Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@@ -209,8 +209,15 @@ esac
# Common IUSE
IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling"
+# This probably could be simplified, but the syntax would have to be just right
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \
- mysql_version_is_at_least "5.5" || mysql_check_version_range "5.5.37 to
5.6.11.99" ; then
+ mysql_version_is_at_least "5.5" ; then
+ IUSE="bindist ${IUSE}"
+elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \
+ mysql_check_version_range "5.5.37 to 5.6.11.99" ; then
+ IUSE="bindist ${IUSE}"
+elif [[ ${PN} == "mysql-cluster" ]] && \
+ mysql_check_version_range "7.2 to 7.2.99.99" ; then
IUSE="bindist ${IUSE}"
fi
@@ -260,7 +267,11 @@ DEPEND="
# !dev-db/mariadb-native-client[mysqlcompat]
# dev-db/mysql-5.6.12+ only works with dev-libs/libedit
-if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] &&
mysql_version_is_at_least "5.6.12" ; then
+# This probably could be simplified
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \
+ mysql_version_is_at_least "5.6.12" ; then
+ DEPEND="${DEPEND} dev-libs/libedit"
+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
