commit: 43935eb67f906ea2fd12f54b3923b04561be3604
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 2 13:16:19 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Jul 2 13:16:19 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=43935eb6
Experiment with placing MariaDB 10.0.X and 10.1.X into virutal 5.6. This is
the compatible versions as stated by upstream
---
eclass/mysql-multilib.eclass | 7 +++++++
eclass/mysql-v2.eclass | 14 +++++++++++---
virtual/mysql/mysql-10.0.ebuild | 20 --------------------
virtual/mysql/mysql-5.6.ebuild | 11 +++++++----
4 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 1c352aa..870ba79 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -69,6 +69,13 @@ if [[ "${PN}" == "mysql-cluster" ]]; then
esac
fi
+# MariaDB has left the numbering schema but keeping compatibility
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
+ case ${PV} in
+ 10.0*|10.1*) MYSQL_PV_MAJOR="5.6" ;;
+ esac
+fi
+
# @ECLASS-VARIABLE: MYSQL_VERSION_ID
# @DESCRIPTION:
# MYSQL_VERSION_ID will be:
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 6df339a..bbbc150 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -83,10 +83,18 @@ fi
MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
# Cluster is a special case...
-if [[ "${PN}" == "mysql-cluster" ]]; then
- case $PV in
+if [[ ${PN} == "mysql-cluster" ]]; then
+ case ${PV} in
6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
- 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
+
+# MariaDB has left the numbering schema but keeping compatibility
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
+ case ${PV} in
+ 10.0*|10.1*) MYSQL_PV_MAJOR="5.6" ;;
esac
fi
diff --git a/virtual/mysql/mysql-10.0.ebuild b/virtual/mysql/mysql-10.0.ebuild
deleted file mode 100644
index 8e28056..0000000
--- a/virtual/mysql/mysql-10.0.ebuild
+++ /dev/null
@@ -1,20 +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.2
2010/03/23 14:48:06 darkside Exp $
-
-EAPI="2"
-
-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=]
-)"
diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6.ebuild
index 36f49c1..d69911b 100644
--- a/virtual/mysql/mysql-5.6.ebuild
+++ b/virtual/mysql/mysql-5.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.2
2010/03/23 14:48:06 darkside Exp $
+# $Header: $
-EAPI="2"
+EAPI="5"
DESCRIPTION="Virtual for MySQL client or database"
HOMEPAGE=""
@@ -14,8 +14,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86
IUSE="embedded minimal static static-libs"
DEPEND=""
-# TODO: add Drizzle and MariaDB here
RDEPEND="|| (
+ =dev-db/mariadb-10.1*[embedded=,minimal=,static=,static-libs=]
+ =dev-db/mariadb-10.0*[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=]
)"
