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

[Brian Evans]

commit:     ac1fa80153d62708a0806491afb5c09c6c73311a
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon May  7 20:33:43 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon May  7 20:37:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1fa801

virtual/mysql: Mark 5.6-r12 stable; fix deps on 5.6-r6

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 virtual/mysql/mysql-5.6-r12.ebuild |  2 +-
 virtual/mysql/mysql-5.6-r6.ebuild  | 25 ++++++-------------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/virtual/mysql/mysql-5.6-r12.ebuild b/virtual/mysql/mysql-5.6-r12.ebuild
index 4be92d636d5..6913a689ed5 100644
--- a/virtual/mysql/mysql-5.6-r12.ebuild
+++ b/virtual/mysql/mysql-5.6-r12.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 DESCRIPTION="Virtual for MySQL database server"
 SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="embedded +server static"
 
 RDEPEND="|| (

diff --git a/virtual/mysql/mysql-5.6-r6.ebuild b/virtual/mysql/mysql-5.6-r6.ebuild
index c0766fda8bf..5b04dd40fcb 100644
--- a/virtual/mysql/mysql-5.6-r6.ebuild
+++ b/virtual/mysql/mysql-5.6-r6.ebuild
@@ -12,24 +12,11 @@ IUSE="embedded static static-libs"
 
 RDEPEND="
 	virtual/libmysqlclient[static-libs?,${MULTILIB_USEDEP}]
-	embedded? (
-		|| (
-			=dev-db/mariadb-10.1*[client-libs(+),embedded,static=]
-			=dev-db/mariadb-10.0*[client-libs(+),embedded,static=]
-			=dev-db/mysql-${PV}*[client-libs(+),embedded,static=]
-			=dev-db/percona-server-${PV}*[client-libs(+),embedded,static=]
-			=dev-db/mariadb-galera-10.0*[client-libs(+),embedded,static=]
-			=dev-db/mysql-cluster-7.3*[client-libs(+),embedded,static=]
-		)
-	)
-	!embedded? (
-		|| (
-			=dev-db/mariadb-10.1*[-embedded,static=]
-			=dev-db/mariadb-10.0*[-embedded,static=]
-			=dev-db/mysql-${PV}*[-embedded,static=]
-			=dev-db/percona-server-${PV}*[-embedded,static=]
-			=dev-db/mariadb-galera-10.0*[-embedded,static=]
-			=dev-db/mysql-cluster-7.3*[-embedded,static=]
-		)
+	|| (
+		>=dev-db/mariadb-10.0[embedded(-)?,static?]
+		>=dev-db/mysql-${PV}[embedded(-)?,static?]
+		>=dev-db/percona-server-${PV}[embedded(-)?,static?]
+		>=dev-db/mariadb-galera-10.0[embedded(-),static?]
+		>=dev-db/mysql-cluster-7.3[embedded(-)?,static?]
 	)
 "