gentoo resync : 08.05.2018

6 files changed, 9 insertions, 88 deletions

diff --git a/virtual/mysql/Manifest b/virtual/mysql/Manifest
index c6c6e3d65ce8..ae4ab087c6eb 100644
--- a/virtual/mysql/Manifest
+++ b/virtual/mysql/Manifest
@@ -1,7 +1,4 @@
 EBUILD mysql-5.5-r1.ebuild 611 BLAKE2B b2cd08cc8368c43c80d86803fac7bd5ab1cb7a57113f6268d2c658475c4526e828568595d8e8800b7593add848ff6369b824fc0afd2e8a71f812330c88bf5dea SHA512 8e7523d8d90cbfd11638d4ef354324ce83a6e388693e082fd366e1ad0b1cae6c7f5b5743d69521256296f0943e777523fc72378714ca7cdb64a5c4969a8c527d
-EBUILD mysql-5.6-r10.ebuild 867 BLAKE2B 9feb6d3b7b6c9d2aef92a154c70ba96ae8d4bb9642c35102c3215c3a80c57cec31fb41b5d6698774667a40949fa422b0f73ff6c10a157f6d332840c3e0aefe19 SHA512 63b2b6425926b89a394bb17d12001d921f0cfb7b3bccd816040876e5978037c240b995feefcdf877e2e9e0c5e8d6211b90287bc593f63855b31aa700c7f950ab
-EBUILD mysql-5.6-r11.ebuild 921 BLAKE2B 951e08b8d3709ee1f39e6eebf2b635a5d1d919551b4e0f17ca4c0e64476bb73436b79d9921793315294e2c8ba36cf24e36a66e44f62621faec4abef374e4762a SHA512 9cae27d78dab3a6acd7db7d31c42b82148eba17c0bfc3ae4c521930d09bd9724b672155abbe0dca52fc09b266d6dc1961192a5a950c79159fc9467b9961b9d0c
-EBUILD mysql-5.6-r12.ebuild 693 BLAKE2B 183e1bdaa07b4705fdd05c6b1c7d128cca54864f185e15b02b5dc779b39bb140f04fbff78eff174f352a79d502802449360254048aae438a2717d4b2c47e4ee9 SHA512 a1a8e9fc1039de5dae276b9c635008028393ea09c00a025868c5f8125211ca142dca6faa70460282dda85ebe245821c5baa15d39e4827df9abcaf2076bead766
-EBUILD mysql-5.6-r6.ebuild 1185 BLAKE2B 51bc2072ef39ac1fd4c92a2078e2b8878e9bfb9b2d6ed4a06b12fadad53f1f8d80d1ac0a3912f4b766aa0c4224fa9eee873823a852dcc01b9cce44111f563f74 SHA512 ad8525120cabc4ab3fe8feb52784eed4abcfc288c4df43a1dd3ab920a6154d4e02d29a56c14fee4253c4fbd4d08c0aa223f102b87cca06b2587bdc19fea12e0b
-EBUILD mysql-5.6-r9.ebuild 778 BLAKE2B 76fefc1c28f88ced91da09cd0ce872145120020a655470f86a8b362144cf41e644133a9515e6c76e3e80c88d393e6267702b2251394f76e6fb77a412b09be388 SHA512 4b1837d9a422d306d7de884e078ad71fe43aa8794f349d69649f6543312775e94ad0b2a74fb8cef744fd450c019e5c51ecf2e7d47a70cffbaafa71abfb0fa332
+EBUILD mysql-5.6-r12.ebuild 684 BLAKE2B e79bdd5c74ec6f237118dc7ae3eaa6d996bd27ae0a5cfedd5fd5736db822e030bf8d0555ce4c7cb7dc2dae805bdf04bfad69dcc559b9278da4bcdd8c7871dfd4 SHA512 1101d273939d99875e29d47755f5d9ae641e2596658dca69da7df4205ce5153dd3629070a355ddcacad7fe2024d10eeac984094624d9b772aeceb34496033e00
+EBUILD mysql-5.6-r6.ebuild 737 BLAKE2B 4be9e99ddfcab83cfdcae07c315e92d3c19b75ff79bc67939a2daf7909288adc5cb43c3f076b5dedef59752f740f2f76ca3455d85fb9f81ece48614c5aeb0200 SHA512 d71026d51c903888bdbf5efc34231e5ea1ad25dfbd8038043c425174c8b34cb6b3a693fcdc487dbefe541e4b8ccc7dfb046cd46984bd5c028f6aaa26873b1132
 MISC metadata.xml 386 BLAKE2B cc1e000793240edd0df36c1b83d13c8806ac631fc5d476d574aad80d347b5d37f3e5c46be124ee6ab9b6061e05bf78340625ddf75857c9ea4d32019334c23405 SHA512 76ecdfbd7f00cc8ec96d0c8d98bf88b843bc51b77a12869dbbc778517d1d4dd95ae01cfe56718a0fdef74a111ff20d64154d53470cfae836493215c031504451
diff --git a/virtual/mysql/mysql-5.6-r10.ebuild b/virtual/mysql/mysql-5.6-r10.ebuild
deleted file mode 100644
index 7a5b6320d955..000000000000
--- a/virtual/mysql/mysql-5.6-r10.ebuild
+++ /dev/null
@@ -1,21 +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 +server static"
-
-RDEPEND="|| (
-		=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-r11.ebuild b/virtual/mysql/mysql-5.6-r11.ebuild
deleted file mode 100644
index 3451d708ee60..000000000000
--- a/virtual/mysql/mysql-5.6-r11.ebuild
+++ /dev/null
@@ -1,22 +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 +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-r12.ebuild b/virtual/mysql/mysql-5.6-r12.ebuild
index 4be92d636d5a..6913a689ed5d 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 c0766fda8bf5..5b04dd40fcb5 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?]
 	)
 "
diff --git a/virtual/mysql/mysql-5.6-r9.ebuild b/virtual/mysql/mysql-5.6-r9.ebuild
deleted file mode 100644
index 4a0674dc8887..000000000000
--- a/virtual/mysql/mysql-5.6-r9.ebuild
+++ /dev/null
@@ -1,20 +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 +server static"
-
-RDEPEND="|| (
-		=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.3*[embedded?,server?,static?]
-	)
-"