[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

["Robin H. Johnson" <robbat2@gentoo.org>]

commit:     c248da7bd6b43092a2a3497c1a0a04313a183486
Author:     Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net>
AuthorDate: Wed Jul 30 06:33:06 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jul 30 06:33:06 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c248da7b

Sync from main tree.

Package-Manager: portage-2.2.10

---
 virtual/mysql/ChangeLog        | 3 +++
 virtual/mysql/mysql-5.6.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
index ccfbce7..8ee9903 100644
--- a/virtual/mysql/ChangeLog
+++ b/virtual/mysql/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-5.6.ebuild:
+  Sync from main tree.
+
   29 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> mysql-5.5.ebuild:
   Bump EAPI per main tree.
 

diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6.ebuild
index d69911b..a9f63ab 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: $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.6.ebuild,v 1.2 2014/07/30 06:30:25 robbat2 Exp $
 
 EAPI="5"
 
@@ -15,8 +15,8 @@ IUSE="embedded minimal static static-libs"
 
 DEPEND=""
 RDEPEND="|| (
-	=dev-db/mariadb-10.1*[embedded=,minimal=,static=,static-libs=]
 	=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=]