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

[Brian Evans]

commit:     e2de611c1f4e304a4ec370f5f34ccc6f6747b24a
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 15:53:11 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 16:24:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2de611c

virtual/mysql: Revbump to include mariadb 10.3; drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 virtual/mysql/mysql-5.6-r11.ebuild | 22 ++++++++++++++++++++++
 virtual/mysql/mysql-5.6-r6.ebuild  | 35 -----------------------------------
 virtual/mysql/mysql-5.6-r7.ebuild  | 35 -----------------------------------
 virtual/mysql/mysql-5.6-r8.ebuild  | 19 -------------------
 4 files changed, 22 insertions(+), 89 deletions(-)

diff --git a/virtual/mysql/mysql-5.6-r11.ebuild b/virtual/mysql/mysql-5.6-r11.ebuild
new file mode 100644
index 00000000000..3451d708ee6
--- /dev/null
+++ b/virtual/mysql/mysql-5.6-r11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+IUSE="embedded +server static"
+
+RDEPEND="|| (
+		=dev-db/mariadb-10.3*[embedded(-)?,server?,static?]
+		=dev-db/mariadb-10.2*[embedded(-)?,server?,static?]
+		=dev-db/mariadb-10.1*[embedded(-)?,server?,static?]
+		=dev-db/mariadb-10.0*[embedded(-)?,server?,static?]
+		=dev-db/mysql-${PV}*[embedded(-)?,server?,static?]
+		=dev-db/percona-server-${PV}*[embedded(-)?,server?,static?]
+		=dev-db/mariadb-galera-10.0*[embedded(-)?,server?,static?]
+		=dev-db/mysql-cluster-7.4*[embedded(-)?,server?,static?]
+		=dev-db/mysql-cluster-7.3*[embedded(-)?,server?,static?]
+	)
+"

diff --git a/virtual/mysql/mysql-5.6-r6.ebuild b/virtual/mysql/mysql-5.6-r6.ebuild
deleted file mode 100644
index c0766fda8bf..00000000000
--- a/virtual/mysql/mysql-5.6-r6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib-build
-
-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"
-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=]
-		)
-	)
-"

diff --git a/virtual/mysql/mysql-5.6-r7.ebuild b/virtual/mysql/mysql-5.6-r7.ebuild
deleted file mode 100644
index 4291f5e0790..00000000000
--- a/virtual/mysql/mysql-5.6-r7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib-build
-
-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"
-IUSE="embedded static static-libs"
-
-PDEPEND="virtual/libmysqlclient[static-libs?,${MULTILIB_USEDEP}]"
-RDEPEND="
-	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=]
-		)
-	)
-"

diff --git a/virtual/mysql/mysql-5.6-r8.ebuild b/virtual/mysql/mysql-5.6-r8.ebuild
deleted file mode 100644
index f18b5d48afb..00000000000
--- a/virtual/mysql/mysql-5.6-r8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-IUSE="embedded static"
-
-RDEPEND="|| (
-		=dev-db/mariadb-10.1*[embedded?,server,static?]
-		=dev-db/mariadb-10.0*[embedded?,server,static?]
-		=dev-db/mysql-${PV}*[embedded?,server,static?]
-		=dev-db/percona-server-${PV}*[embedded?,server,static?]
-		=dev-db/mariadb-galera-10.0*[embedded?,server,static?]
-		=dev-db/mysql-cluster-7.3*[embedded?,server,static?]
-	)
-"