12 files changed, 9 insertions, 57 deletions
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 4f948867c8e7..8267e73fa1d5 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/libmysqlclient/Manifest b/virtual/libmysqlclient/Manifest
index 0f38a400f183..8f753ee894b9 100644
--- a/virtual/libmysqlclient/Manifest
+++ b/virtual/libmysqlclient/Manifest
@@ -1,2 +1,2 @@
-EBUILD libmysqlclient-18.ebuild 867 BLAKE2B baedcdb7f5e833ccd255ee42406f95c685bc68572983ada145e04c7e3e275170e58858c8cfc23111aac8ead839b00d2696f69f54844b510dd37b5d667e92589a SHA512 368303ccfb944b259e18182f2d5bd4e57b9389107760415f8e6e817d8c8b5829bd79846dd7403a8eaa85d589492c6164cee445bb270e84960707d7ca1fc00b46
+EBUILD libmysqlclient-18.ebuild 869 BLAKE2B a99776d5adacd32a5a92e4b98b0044c117064d46ff691c03f63409d01a493efa38a9b00d4e5c6cc8b31bc20c65a6acb365073d512d9292ea780c4d8a584f1285 SHA512 693e4f34a092adedb6e74b8c1682a96f247aad642a3ba05a704c2924ec10947694cc340907801227656e4d92afbe1338ab0ad758c3ae81632172d2ef076fa80f
 MISC metadata.xml 249 BLAKE2B 7ecbba6fdffd276328b798bcb6efb0a7444e1e5b70f14364c229d989853afdf0665cf804143ba732ff84f6f97216e8cec5ed2ee83cb0e1231c176e0c98662280 SHA512 916effd7bd6976c7ca956f9262ed7921a9fbeac0be2f60b80c3f8cf78f16b12cefb8e06ced95d693e4682d4c5c71eba87c832da9a21c4804e1e1c7d35028918c
diff --git a/virtual/libmysqlclient/libmysqlclient-18.ebuild b/virtual/libmysqlclient/libmysqlclient-18.ebuild
index e07d45bc89a8..8c5fb8114cbf 100644
--- a/virtual/libmysqlclient/libmysqlclient-18.ebuild
+++ b/virtual/libmysqlclient/libmysqlclient-18.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for MySQL client libraries"
 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="static-libs"
 
 RDEPEND="
diff --git a/virtual/mysql/Manifest b/virtual/mysql/Manifest
index ae4ab087c6eb..f8749991c048 100644
--- a/virtual/mysql/Manifest
+++ b/virtual/mysql/Manifest
@@ -1,4 +1,4 @@
 EBUILD mysql-5.5-r1.ebuild 611 BLAKE2B b2cd08cc8368c43c80d86803fac7bd5ab1cb7a57113f6268d2c658475c4526e828568595d8e8800b7593add848ff6369b824fc0afd2e8a71f812330c88bf5dea SHA512 8e7523d8d90cbfd11638d4ef354324ce83a6e388693e082fd366e1ad0b1cae6c7f5b5743d69521256296f0943e777523fc72378714ca7cdb64a5c4969a8c527d
-EBUILD mysql-5.6-r12.ebuild 684 BLAKE2B e79bdd5c74ec6f237118dc7ae3eaa6d996bd27ae0a5cfedd5fd5736db822e030bf8d0555ce4c7cb7dc2dae805bdf04bfad69dcc559b9278da4bcdd8c7871dfd4 SHA512 1101d273939d99875e29d47755f5d9ae641e2596658dca69da7df4205ce5153dd3629070a355ddcacad7fe2024d10eeac984094624d9b772aeceb34496033e00
-EBUILD mysql-5.6-r6.ebuild 737 BLAKE2B 4be9e99ddfcab83cfdcae07c315e92d3c19b75ff79bc67939a2daf7909288adc5cb43c3f076b5dedef59752f740f2f76ca3455d85fb9f81ece48614c5aeb0200 SHA512 d71026d51c903888bdbf5efc34231e5ea1ad25dfbd8038043c425174c8b34cb6b3a693fcdc487dbefe541e4b8ccc7dfb046cd46984bd5c028f6aaa26873b1132
+EBUILD mysql-5.6-r12.ebuild 686 BLAKE2B ac45829ce66905177bb67489a659f3d84e110e4cfec3ba5b02873f6ce481b2a5d6d799fb2cca6b8c5a5746358e8e6f01862eb188e5349e37b78b8d607fa91ad1 SHA512 d905b6d7f5d60b75c2b4eee3ad36e3f880dcd773540e79b7843f62ccab89ddea90581665e879af22a2962fc1a5b14ae6d7205321cf0e147dc7afbe1f1336aeeb
+EBUILD mysql-5.6-r6.ebuild 739 BLAKE2B bcb61c1270393ebb2b19b662dfb785c580f777d47052175a4c5cbe9dd8ba6b3c47e7323bb1cf854a7e58f27ebdab090fc41e54d17a963028a74dd40322c01de1 SHA512 d46ee9dff09306cb181a709c1e35c4665f5d724b248f68598be5dc379ed847eab41b19fb25159c2d27e147c841f069c9260644ec101c1a52aad070c59a58b554
 MISC metadata.xml 386 BLAKE2B cc1e000793240edd0df36c1b83d13c8806ac631fc5d476d574aad80d347b5d37f3e5c46be124ee6ab9b6061e05bf78340625ddf75857c9ea4d32019334c23405 SHA512 76ecdfbd7f00cc8ec96d0c8d98bf88b843bc51b77a12869dbbc778517d1d4dd95ae01cfe56718a0fdef74a111ff20d64154d53470cfae836493215c031504451
diff --git a/virtual/mysql/mysql-5.6-r12.ebuild b/virtual/mysql/mysql-5.6-r12.ebuild
index 6913a689ed5d..a8bceb62b0cc 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 5b04dd40fcb5..abe12a790156 100644
--- a/virtual/mysql/mysql-5.6-r6.ebuild
+++ b/virtual/mysql/mysql-5.6-r6.ebuild
@@ -7,7 +7,7 @@ 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"
+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="
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 8beb6c6e3aa6..26fc708b8288 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,6 +1,3 @@
-EBUILD rust-1.15.1.ebuild 310 BLAKE2B 8c473ae8fd74fd3e13b5406987dfe7b15694d5d120b9b90797fad03ce201860f65283aa316ee0136548b5169e8b868a0f5983b848a407b52ca3be7c385896d1c SHA512 95b9b80ce83cc91bac05c63c41db9d684117cb545f9b2a75edfc76168c0266a84001cab682fdf3a50d334363e5a57cf51a1d5a5009c3f0002da3999491f9dbac
-EBUILD rust-1.16.0.ebuild 310 BLAKE2B 8c473ae8fd74fd3e13b5406987dfe7b15694d5d120b9b90797fad03ce201860f65283aa316ee0136548b5169e8b868a0f5983b848a407b52ca3be7c385896d1c SHA512 95b9b80ce83cc91bac05c63c41db9d684117cb545f9b2a75edfc76168c0266a84001cab682fdf3a50d334363e5a57cf51a1d5a5009c3f0002da3999491f9dbac
-EBUILD rust-1.19.0.ebuild 310 BLAKE2B 8c473ae8fd74fd3e13b5406987dfe7b15694d5d120b9b90797fad03ce201860f65283aa316ee0136548b5169e8b868a0f5983b848a407b52ca3be7c385896d1c SHA512 95b9b80ce83cc91bac05c63c41db9d684117cb545f9b2a75edfc76168c0266a84001cab682fdf3a50d334363e5a57cf51a1d5a5009c3f0002da3999491f9dbac
-EBUILD rust-1.23.0.ebuild 317 BLAKE2B b724b229130ca619bdcd4777df139b4dbb26ddf5678d5a385cefd3f9fdac0fc8bd7781bd9e83bc9e53f54d2f5e825ff0e3b453d60742008967cdbe747f092370 SHA512 b3a5d397453562e72a9ba6ed097b6e4470f80c8e2abcf9399ae6b712ac6a6a5c0e0d8568b68383797b9ff224d6f45bf9fa07482ebe8a0a1df34a2be1593941ec
-EBUILD rust-1.25.0.ebuild 317 BLAKE2B b724b229130ca619bdcd4777df139b4dbb26ddf5678d5a385cefd3f9fdac0fc8bd7781bd9e83bc9e53f54d2f5e825ff0e3b453d60742008967cdbe747f092370 SHA512 b3a5d397453562e72a9ba6ed097b6e4470f80c8e2abcf9399ae6b712ac6a6a5c0e0d8568b68383797b9ff224d6f45bf9fa07482ebe8a0a1df34a2be1593941ec
+EBUILD rust-1.25.0.ebuild 316 BLAKE2B 7ca846bfa06c9b0cdddf101c95f42151fb2fbd2510f50347183325bc47f3a31d113f0b442bf5f4af5d5e827eea0ae2a6f0e9ae8781c161a41c20dfbdfc78a198 SHA512 7cbcb8ab9a76658c80648d97e931a78f125e48b71084d87c124b3586b5870c18bd20ac60110d3219e88d62c814b752885a551f59015b1f6de18477fda963e5ab
+EBUILD rust-1.26.0.ebuild 317 BLAKE2B b724b229130ca619bdcd4777df139b4dbb26ddf5678d5a385cefd3f9fdac0fc8bd7781bd9e83bc9e53f54d2f5e825ff0e3b453d60742008967cdbe747f092370 SHA512 b3a5d397453562e72a9ba6ed097b6e4470f80c8e2abcf9399ae6b712ac6a6a5c0e0d8568b68383797b9ff224d6f45bf9fa07482ebe8a0a1df34a2be1593941ec
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.15.1.ebuild b/virtual/rust/rust-1.15.1.ebuild
deleted file mode 100644
index 4c56dd441f48..000000000000
--- a/virtual/rust/rust-1.15.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.16.0.ebuild b/virtual/rust/rust-1.16.0.ebuild
deleted file mode 100644
index 4c56dd441f48..000000000000
--- a/virtual/rust/rust-1.16.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.19.0.ebuild b/virtual/rust/rust-1.19.0.ebuild
deleted file mode 100644
index 4c56dd441f48..000000000000
--- a/virtual/rust/rust-1.19.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.25.0.ebuild b/virtual/rust/rust-1.25.0.ebuild
index 26f2a40c5934..3c26485f1928 100644
--- a/virtual/rust/rust-1.25.0.ebuild
+++ b/virtual/rust/rust-1.25.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 
 DEPEND=""
 RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.23.0.ebuild b/virtual/rust/rust-1.26.0.ebuild
index 26f2a40c5934..26f2a40c5934 100644
--- a/virtual/rust/rust-1.23.0.ebuild
+++ b/virtual/rust/rust-1.26.0.ebuild