| 1 |
commit: 43935eb67f906ea2fd12f54b3923b04561be3604 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 2 13:16:19 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
| 5 |
CommitDate: Wed Jul 2 13:16:19 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=43935eb6 |
| 7 |
|
| 8 |
Experiment with placing MariaDB 10.0.X and 10.1.X into virutal 5.6. This is the compatible versions as stated by upstream |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql-multilib.eclass | 7 +++++++ |
| 12 |
eclass/mysql-v2.eclass | 14 +++++++++++--- |
| 13 |
virtual/mysql/mysql-10.0.ebuild | 20 -------------------- |
| 14 |
virtual/mysql/mysql-5.6.ebuild | 11 +++++++---- |
| 15 |
4 files changed, 25 insertions(+), 27 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 18 |
index 1c352aa..870ba79 100644 |
| 19 |
--- a/eclass/mysql-multilib.eclass |
| 20 |
+++ b/eclass/mysql-multilib.eclass |
| 21 |
@@ -69,6 +69,13 @@ if [[ "${PN}" == "mysql-cluster" ]]; then |
| 22 |
esac |
| 23 |
fi |
| 24 |
|
| 25 |
+# MariaDB has left the numbering schema but keeping compatibility |
| 26 |
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then |
| 27 |
+ case ${PV} in |
| 28 |
+ 10.0*|10.1*) MYSQL_PV_MAJOR="5.6" ;; |
| 29 |
+ esac |
| 30 |
+fi |
| 31 |
+ |
| 32 |
# @ECLASS-VARIABLE: MYSQL_VERSION_ID |
| 33 |
# @DESCRIPTION: |
| 34 |
# MYSQL_VERSION_ID will be: |
| 35 |
|
| 36 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
| 37 |
index 6df339a..bbbc150 100644 |
| 38 |
--- a/eclass/mysql-v2.eclass |
| 39 |
+++ b/eclass/mysql-v2.eclass |
| 40 |
@@ -83,10 +83,18 @@ fi |
| 41 |
MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})" |
| 42 |
|
| 43 |
# Cluster is a special case... |
| 44 |
-if [[ "${PN}" == "mysql-cluster" ]]; then |
| 45 |
- case $PV in |
| 46 |
+if [[ ${PN} == "mysql-cluster" ]]; then |
| 47 |
+ case ${PV} in |
| 48 |
6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;; |
| 49 |
- 7.2*|7.3*) MYSQL_PV_MAJOR=5.5 ;; |
| 50 |
+ 7.2*) MYSQL_PV_MAJOR=5.5 ;; |
| 51 |
+ 7.3*) MYSQL_PV_MAJOR=5.6 ;; |
| 52 |
+ esac |
| 53 |
+fi |
| 54 |
+ |
| 55 |
+# MariaDB has left the numbering schema but keeping compatibility |
| 56 |
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then |
| 57 |
+ case ${PV} in |
| 58 |
+ 10.0*|10.1*) MYSQL_PV_MAJOR="5.6" ;; |
| 59 |
esac |
| 60 |
fi |
| 61 |
|
| 62 |
|
| 63 |
diff --git a/virtual/mysql/mysql-10.0.ebuild b/virtual/mysql/mysql-10.0.ebuild |
| 64 |
deleted file mode 100644 |
| 65 |
index 8e28056..0000000 |
| 66 |
--- a/virtual/mysql/mysql-10.0.ebuild |
| 67 |
+++ /dev/null |
| 68 |
@@ -1,20 +0,0 @@ |
| 69 |
-# Copyright 1999-2014 Gentoo Foundation |
| 70 |
-# Distributed under the terms of the GNU General Public License v2 |
| 71 |
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.2 2010/03/23 14:48:06 darkside Exp $ |
| 72 |
- |
| 73 |
-EAPI="2" |
| 74 |
- |
| 75 |
-DESCRIPTION="Virtual for MySQL client or database" |
| 76 |
-HOMEPAGE="" |
| 77 |
-SRC_URI="" |
| 78 |
- |
| 79 |
-LICENSE="" |
| 80 |
-SLOT="0" |
| 81 |
-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" |
| 82 |
-IUSE="embedded minimal static static-libs" |
| 83 |
- |
| 84 |
-DEPEND="" |
| 85 |
-# TODO: add Drizzle here |
| 86 |
-RDEPEND="|| ( |
| 87 |
- =dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=] |
| 88 |
-)" |
| 89 |
|
| 90 |
diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6.ebuild |
| 91 |
index 36f49c1..d69911b 100644 |
| 92 |
--- a/virtual/mysql/mysql-5.6.ebuild |
| 93 |
+++ b/virtual/mysql/mysql-5.6.ebuild |
| 94 |
@@ -1,8 +1,8 @@ |
| 95 |
-# Copyright 1999-2011 Gentoo Foundation |
| 96 |
+# Copyright 1999-2014 Gentoo Foundation |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.2 2010/03/23 14:48:06 darkside Exp $ |
| 99 |
+# $Header: $ |
| 100 |
|
| 101 |
-EAPI="2" |
| 102 |
+EAPI="5" |
| 103 |
|
| 104 |
DESCRIPTION="Virtual for MySQL client or database" |
| 105 |
HOMEPAGE="" |
| 106 |
@@ -14,8 +14,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 |
| 107 |
IUSE="embedded minimal static static-libs" |
| 108 |
|
| 109 |
DEPEND="" |
| 110 |
-# TODO: add Drizzle and MariaDB here |
| 111 |
RDEPEND="|| ( |
| 112 |
+ =dev-db/mariadb-10.1*[embedded=,minimal=,static=,static-libs=] |
| 113 |
+ =dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=] |
| 114 |
=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=] |
| 115 |
=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=] |
| 116 |
+ =dev-db/mariadb-galera-10.0*[embedded=,minimal=,static=,static-libs=] |
| 117 |
+ =dev-db/mysql-cluster-7.3*[embedded=,minimal=,static=,static-libs=] |
| 118 |
)" |
Archives