summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2014-07-30 06:30:25 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2014-07-30 06:30:25 +0000
commit15abc840749c6a0fad3c76228a7937c0f920e6ad (patch)
treea17a89a225bf777f813c10f11e2ab6d881636e86 /virtual
parentBring MariaDB-Galera from the overlay into the tree. Thanks to the great work... (diff)
downloadgentoo-2-15abc840749c6a0fad3c76228a7937c0f920e6ad.tar.gz
gentoo-2-15abc840749c6a0fad3c76228a7937c0f920e6ad.tar.bz2
gentoo-2-15abc840749c6a0fad3c76228a7937c0f920e6ad.zip
mariadb-galera in the tree now, and mysql-cluster following soon.
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'virtual')
-rw-r--r--virtual/mysql/ChangeLog5
-rw-r--r--virtual/mysql/mysql-5.6.ebuild9
2 files changed, 8 insertions, 6 deletions
diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
index 49b2e4990304..8522c76a66d0 100644
--- a/virtual/mysql/ChangeLog
+++ b/virtual/mysql/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for virtual/mysql
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/ChangeLog,v 1.33 2014/07/29 22:49:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/ChangeLog,v 1.34 2014/07/30 06:30:25 robbat2 Exp $
+
+ 30 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-5.6.ebuild:
+ mariadb-galera in the tree now, and mysql-cluster following soon.
*mysql-5.6 (29 Jul 2014)
diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6.ebuild
index 61f9af5cd594..a9f63abcdbfc 100644
--- a/virtual/mysql/mysql-5.6.ebuild
+++ b/virtual/mysql/mysql-5.6.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.1 2014/07/29 22:49:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.6.ebuild,v 1.2 2014/07/30 06:30:25 robbat2 Exp $
EAPI="5"
@@ -16,10 +16,9 @@ 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=]
+ =dev-db/mysql-cluster-7.3*[embedded=,minimal=,static=,static-libs=]
)"
-# Not quite yet
-#=dev-db/mariadb-10.1*[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=]