10 files changed, 32 insertions, 27 deletions
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 8267e73fa1d5..0288bb6cb8bd 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/mysql/Manifest b/virtual/mysql/Manifest
index f8749991c048..833bd99a2b79 100644
--- a/virtual/mysql/Manifest
+++ b/virtual/mysql/Manifest
@@ -1,4 +1,3 @@
 EBUILD mysql-5.5-r1.ebuild 611 BLAKE2B b2cd08cc8368c43c80d86803fac7bd5ab1cb7a57113f6268d2c658475c4526e828568595d8e8800b7593add848ff6369b824fc0afd2e8a71f812330c88bf5dea SHA512 8e7523d8d90cbfd11638d4ef354324ce83a6e388693e082fd366e1ad0b1cae6c7f5b5743d69521256296f0943e777523fc72378714ca7cdb64a5c4969a8c527d
 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-r6.ebuild b/virtual/mysql/mysql-5.6-r6.ebuild
deleted file mode 100644
index abe12a790156..000000000000
--- a/virtual/mysql/mysql-5.6-r6.ebuild
+++ /dev/null
@@ -1,22 +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}]
-	|| (
-		>=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/os-headers/Manifest b/virtual/os-headers/Manifest
index bdf39f797169..368395d445a2 100644
--- a/virtual/os-headers/Manifest
+++ b/virtual/os-headers/Manifest
@@ -1,3 +1,3 @@
-EBUILD os-headers-0-r1.ebuild 729 BLAKE2B 8137887b197dde0ab61002b2bf2327178f1e47a420bb5b7c2a5db634ffc1a6944eada3db4df11a7160a641721557772d242d3833696d93dbb0cb82de87aeb4b8 SHA512 6ea5b897a99fb18385bf28efe0eb0a8e3411b060b50790b66acce1f1217eacf8cac92923a7cec0f72ff0a40ea03a810678696dbc141d8066d2c0b903da28b89f
+EBUILD os-headers-0-r1.ebuild 753 BLAKE2B e1e9e1e36294b6c1f15cb1953e748829d6f05e0110d40a79beea3d1aa7b4107fe3d42a6d72b39293bf9b33810583267bff7ac3630151ce5a52e8f678c5c2abdd SHA512 ddfa5b1a8d89318e363171d35c303f2005a1620bc0c80d83e69bc6722f8cb70538cdf1f493a968113bcddcf573ad3febe41cf4731ed149255f61d07b2a2a7792
 EBUILD os-headers-0.ebuild 649 BLAKE2B 5f28d3539549e8ae66ea967280175eccbcd62765a9dc58fd4824a752eb2f94fe0fc0060846b1c729d82e0e026e0061d3e5a5295b9c00bbaaad34590330843d7b SHA512 0d8a2399d57757013ad5b0c29156844712fd6bab5f69b0cc2e0d32e59b5ca8266f921ca1a5d8b9178d27cab207e604eb85e88c6251738aab6b04d9bb362b5c14
 MISC metadata.xml 356 BLAKE2B dfdbe957c17aa00de768e659f3406001e0ea7a2e20dcfdc3b737f591fa489737224ac04444060e2993e64981b039ebceff9c1083ed3ed1b9597c253cd2b3a872 SHA512 8771efbd53a5bce7d929691b5e0954eddbf9cdc0aa51922efef0ea7fdedb7aa1197def3a65c8603906b36ed7664f55ea05f99e874a37cd522d1ebf4753db2ed0
diff --git a/virtual/os-headers/os-headers-0-r1.ebuild b/virtual/os-headers/os-headers-0-r1.ebuild
index 2275804ebdbd..66f93241d411 100644
--- a/virtual/os-headers/os-headers-0-r1.ebuild
+++ b/virtual/os-headers/os-headers-0-r1.ebuild
@@ -11,7 +11,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 # sets a different SLOT for cross-building
 RDEPEND="
 	|| (
-		kernel_linux? ( sys-kernel/linux-headers:0 )
+		kernel_linux? (
+			!prefix-guest? ( sys-kernel/linux-headers:0 )
+		)
 		kernel_Winnt? (
 			elibc_mingw? ( dev-util/mingw64-runtime )
 		)
diff --git a/virtual/python-unittest-mock/Manifest b/virtual/python-unittest-mock/Manifest
new file mode 100644
index 000000000000..130ae427fb06
--- /dev/null
+++ b/virtual/python-unittest-mock/Manifest
@@ -0,0 +1,2 @@
+EBUILD python-unittest-mock-1.ebuild 527 BLAKE2B 51a5992b0d90e4cec0b57f7e81a9cfae1e755ef1e092733a668b4b016f327a4431eb7a61487647b93291c0990d44a80ca3de64f28c1791714ac5fe98d3271117 SHA512 f062e06e156815ce7c73506441d8eb7125a58a2f5feaca91448e24d360c16b6fc9dc3f3f8c860657b8da36def97bd5f2a7fbcdf7dd88b6f7d67253b94ac37903
+MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-unittest-mock/metadata.xml b/virtual/python-unittest-mock/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/virtual/python-unittest-mock/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/virtual/python-unittest-mock/python-unittest-mock-1.ebuild b/virtual/python-unittest-mock/python-unittest-mock-1.ebuild
new file mode 100644
index 000000000000..c64bda9d189f
--- /dev/null
+++ b/virtual/python-unittest-mock/python-unittest-mock-1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit python-r1
+
+DESCRIPTION="A virtual for unittest.mock with mock fallback"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)"
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 26fc708b8288..c1743185aa88 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,3 +1,3 @@
-EBUILD rust-1.25.0.ebuild 316 BLAKE2B 7ca846bfa06c9b0cdddf101c95f42151fb2fbd2510f50347183325bc47f3a31d113f0b442bf5f4af5d5e827eea0ae2a6f0e9ae8781c161a41c20dfbdfc78a198 SHA512 7cbcb8ab9a76658c80648d97e931a78f125e48b71084d87c124b3586b5870c18bd20ac60110d3219e88d62c814b752885a551f59015b1f6de18477fda963e5ab
+EBUILD rust-1.25.0.ebuild 315 BLAKE2B 9b8dc0635a5f3616c6aae90b9d9deebfda2e410f5bdf14560305d5e8f732e40e4f19dca8fb9ddd024403aba02269ea572f9534a66a79b01a63cdd8ae73711e7a SHA512 e1788d6d3877f1b04ce08ad35668673e3e52f2d1243fe167e1fb38c7dbb816f1c70cb778d839a96aea2130bc672e8026bf6f0f8608bb0ca328c14fce4157d96a
 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.25.0.ebuild b/virtual/rust/rust-1.25.0.ebuild
index 3c26485f1928..7cc0e2e73fb0 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}* )"