gentoo resync : 15.09.2018

8 files changed, 20 insertions, 20 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 604262ac1be6..325f63195b23 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/cargo/Manifest b/virtual/cargo/Manifest
index fa6880f4876d..0979ffde11fc 100644
--- a/virtual/cargo/Manifest
+++ b/virtual/cargo/Manifest
@@ -1,3 +1,3 @@
 EBUILD cargo-1.27.1.ebuild 355 BLAKE2B 59652dc58344b9f387fb0947ee0cfeb5fde367d1b204de0da374997e549a068d0dd57e2ac294c820cd07268c01d73edf80b6e067edd1ff65baf286c69aafe11a SHA512 c1b7badec7baca2b55597ca2c30bff7173060147eecfa81c5e5e9338cb9163ee8da790bf57175d8d2f4a204fe1bb1321335dab9ad2f5cf6b8dd5eca919f2e4ca
-EBUILD cargo-1.28.0.ebuild 411 BLAKE2B 899395d81f0be64fa30bbcc216bcd9da6ff36830e89f2e57ed4132bf861bcefba4edc2e047e8b99ad38694bcf154c5fa03482c433aec6e40a30a850e24b0edb7 SHA512 330ecbb23d04521f0e066f70a61af5cae1529f43a57406de21abca3e3325a1696bc52fcab00bd94246c6ac400ee979b2ae216d7f20218ba4812d898eccd8f2e4
+EBUILD cargo-1.28.0.ebuild 410 BLAKE2B 5d5bedd3d9c198cd8322ff6376294f88a6f3fd002d39a716b015d848e198d79879272cb730f035be1bfd5d7410dffb39bd147833ccd843f68f2afacb0c8a9bff SHA512 0a57a376867a408f3b24f3ed49cdfd5d4232ef623f0d9bb64ee0aca5bd0294ac36a1a28cb9bccfc2bca85bb50321f319ad4f6a72eac95d7cce8d592e617b3d52
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/cargo/cargo-1.28.0.ebuild b/virtual/cargo/cargo-1.28.0.ebuild
index e05ec4b31305..58d8d61dc885 100644
--- a/virtual/cargo/cargo-1.28.0.ebuild
+++ b/virtual/cargo/cargo-1.28.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 CARGO_DEPEND_VERSION="0.$(($(ver_cut 2) + 1)).0"
 
diff --git a/virtual/mysql/Manifest b/virtual/mysql/Manifest
index e35917f5a5a6..511c2c010eb2 100644
--- a/virtual/mysql/Manifest
+++ b/virtual/mysql/Manifest
@@ -1,3 +1,3 @@
-EBUILD mysql-5.5-r1.ebuild 611 BLAKE2B b2cd08cc8368c43c80d86803fac7bd5ab1cb7a57113f6268d2c658475c4526e828568595d8e8800b7593add848ff6369b824fc0afd2e8a71f812330c88bf5dea SHA512 8e7523d8d90cbfd11638d4ef354324ce83a6e388693e082fd366e1ad0b1cae6c7f5b5743d69521256296f0943e777523fc72378714ca7cdb64a5c4969a8c527d
+EBUILD mysql-5.5-r2.ebuild 536 BLAKE2B 0d6bd742634dbcba6f7825273b4ae7848723f8b9a90d8ac19f2743cd9931efaa0349ecffb7956d4a6af3ce79f402a8727cc1d307e10b84742312d982e994cc33 SHA512 7df07d22c63ae95bfadc74d18c0715d4965d2ec1e7282d6fe7012afc8a703b6e21b56578d259ec4c714cb70efb389c76854dece5b5784fc321065f794549ac64
 EBUILD mysql-5.6-r12.ebuild 685 BLAKE2B f53e0b21f76a02e5e9638aaa8883e647fd1b6390ee9e393641252e1ff733624934c856110840e92a7612ae8414c01a1fd260b80a1b51e2f5d23125f39432f50d SHA512 a42435974dc3ca5dac3b6a51a4a403961673e935af8c5ef9de45a0b681c1db9c01a1488e634d79b2ce18167ba664a0d41aea138ac0e739f8d7465b7bab498e82
 MISC metadata.xml 386 BLAKE2B cc1e000793240edd0df36c1b83d13c8806ac631fc5d476d574aad80d347b5d37f3e5c46be124ee6ab9b6061e05bf78340625ddf75857c9ea4d32019334c23405 SHA512 76ecdfbd7f00cc8ec96d0c8d98bf88b843bc51b77a12869dbbc778517d1d4dd95ae01cfe56718a0fdef74a111ff20d64154d53470cfae836493215c031504451
diff --git a/virtual/mysql/mysql-5.5-r1.ebuild b/virtual/mysql/mysql-5.5-r1.ebuild
deleted file mode 100644
index 254d8a3c3b4c..000000000000
--- a/virtual/mysql/mysql-5.5-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Virtual for MySQL client or database"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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 minimal static static-libs"
-
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
-	=dev-db/mysql-cluster-7.2*[embedded=,minimal=,static=,static-libs=]
-)"
diff --git a/virtual/mysql/mysql-5.5-r2.ebuild b/virtual/mysql/mysql-5.5-r2.ebuild
new file mode 100644
index 000000000000..a8cc6dd6bc61
--- /dev/null
+++ b/virtual/mysql/mysql-5.5-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Virtual for MySQL client or database"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="static static-libs"
+
+RDEPEND="|| (
+	=dev-db/mariadb-${PV}*[static?,static-libs(-)?]
+	=dev-db/mysql-${PV}*[static?,static-libs(-)?]
+	=dev-db/mysql-cluster-7.2*[static?,static-libs(-)?]
+)"
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 1f10241dbec6..3b71c651eab9 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,5 +1,5 @@
 EBUILD rust-1.25.0.ebuild 315 BLAKE2B 9b8dc0635a5f3616c6aae90b9d9deebfda2e410f5bdf14560305d5e8f732e40e4f19dca8fb9ddd024403aba02269ea572f9534a66a79b01a63cdd8ae73711e7a SHA512 e1788d6d3877f1b04ce08ad35668673e3e52f2d1243fe167e1fb38c7dbb816f1c70cb778d839a96aea2130bc672e8026bf6f0f8608bb0ca328c14fce4157d96a
 EBUILD rust-1.26.2.ebuild 317 BLAKE2B b724b229130ca619bdcd4777df139b4dbb26ddf5678d5a385cefd3f9fdac0fc8bd7781bd9e83bc9e53f54d2f5e825ff0e3b453d60742008967cdbe747f092370 SHA512 b3a5d397453562e72a9ba6ed097b6e4470f80c8e2abcf9399ae6b712ac6a6a5c0e0d8568b68383797b9ff224d6f45bf9fa07482ebe8a0a1df34a2be1593941ec
 EBUILD rust-1.27.1.ebuild 316 BLAKE2B 42011cc292fb034308820d2daf342120b736834151bd05ccb12378551862a8fc5dba286401872c8af6a71741018cd5f709d0e7401cb92dcb295d36f23d91d28b SHA512 1083147da3fa25ba69f561eae232f1a60e8bb967205bb483dde126e3e3e69f83cbe02a8179d46849d3ef70aada88cb8d8ed1af4aa0ff1eacc558b141a28deb4e
-EBUILD rust-1.28.0.ebuild 316 BLAKE2B 42011cc292fb034308820d2daf342120b736834151bd05ccb12378551862a8fc5dba286401872c8af6a71741018cd5f709d0e7401cb92dcb295d36f23d91d28b SHA512 1083147da3fa25ba69f561eae232f1a60e8bb967205bb483dde126e3e3e69f83cbe02a8179d46849d3ef70aada88cb8d8ed1af4aa0ff1eacc558b141a28deb4e
+EBUILD rust-1.28.0.ebuild 315 BLAKE2B d930ce879f0c355eb27e9499c4080f5044553b2fcd9432f28b4f29c6c4b53294d0c36c0d1ac589c245dafbc4f3ab0c69b456fa903db72837d2347fb5bbbd2b57 SHA512 0f9d7135ac168d829e90b66ee9dc7cb5969b8015fc5840a794f8bfea44180aacdaa716c3465b9c9bd8b833d66b7b0dab523a64ad9b545fee68931acda3f40089
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.28.0.ebuild b/virtual/rust/rust-1.28.0.ebuild
index fa78c78a3e78..529febdafe20 100644
--- a/virtual/rust/rust-1.28.0.ebuild
+++ b/virtual/rust/rust-1.28.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 BDEPEND=""
 RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"