commit: f6bdc6875d0c2445a403f0283493b8b01ef8c903
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 14 15:34:16 2014 +0000
Commit: Brian Evans <grknight <AT> tuffmail <DOT> com>
CommitDate: Thu Aug 14 15:34:16 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f6bdc687
Move mariadb-10.1* to the 5.7 virtual
---
eclass/mysql-multilib.eclass | 3 ++-
virtual/mysql/{mysql-5.6.ebuild => mysql-5.6-r1.ebuild} | 5 ++---
virtual/mysql/mysql-5.7.ebuild | 5 +++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 58aba05..41312a8 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -73,7 +73,8 @@ 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" ;;
+ 10.0*) MYSQL_PV_MAJOR="5.6" ;;
+ 10.1*) MYSQL_PV_MAJOR="5.7" ;;
esac
fi
diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6-r1.ebuild
similarity index 81%
rename from virtual/mysql/mysql-5.6.ebuild
rename to virtual/mysql/mysql-5.6-r1.ebuild
index a9f63ab..5b2d2a9 100644
--- a/virtual/mysql/mysql-5.6.ebuild
+++ b/virtual/mysql/mysql-5.6-r1.ebuild
@@ -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/virtual/mysql/mysql-5.6.ebuild,v 1.2
2014/07/30 06:30:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.6-r1.ebuild,v 1.1
2014/08/14 14:26:59 grknight Exp $
EAPI="5"
@@ -9,14 +9,13 @@ HOMEPAGE=""
SRC_URI=""
LICENSE=""
-SLOT="0"
+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"
IUSE="embedded minimal static static-libs"
DEPEND=""
RDEPEND="|| (
=dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=]
- =dev-db/mariadb-10.1*[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=]
diff --git a/virtual/mysql/mysql-5.7.ebuild b/virtual/mysql/mysql-5.7.ebuild
index eeec7d1..87ccee7 100644
--- a/virtual/mysql/mysql-5.7.ebuild
+++ b/virtual/mysql/mysql-5.7.ebuild
@@ -2,18 +2,19 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI="5"
DESCRIPTION="Virtual for MySQL client or database"
HOMEPAGE=""
SRC_URI=""
LICENSE=""
-SLOT="0"
+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"
IUSE="embedded minimal static static-libs"
DEPEND=""
RDEPEND="|| (
+ =dev-db/mariadb-10.1*[embedded=,minimal=,static=,static-libs=]
=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
)"
