gentoo resync : 31.12.2018

27 files changed, 466 insertions, 178 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e5ca778b74f9..f04b2b2e2a54 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 8024fc376b1b..b36563f9dc89 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -8,8 +8,6 @@ DIST docker-compose-1.23.2.tar.gz 302950 BLAKE2B b96db2e718bd6b05f6a358297495703
 EBUILD docker-compose-1.19.0.ebuild 2421 BLAKE2B a65d845d78d53347d4c863d522f87a29b2e26bd8309c2f5e10d4e1c119aba85e92a63dfd3340183509046822d28e70c45e0e2d7f284fd4e9d12ba89847f7284a SHA512 5e993e855076b450709e1c30958b2cb7710624b880e6b0d86d38c5de14a216cf9960f883c6c1ccab7c892d503b2ee9fac58a1c17e754e4ee55e167f8efb76771
 EBUILD docker-compose-1.21.2-r1.ebuild 2425 BLAKE2B f843c549ec46b148b41640834e838f979fa6f3233ff0da9452bd1ff496802cbc42bd90fdb20dbf8a335505616e0f9fdd7358d34a056d3bfaf96caa1ac879dfb1 SHA512 6b252def3e8afc17d0e9d5a86a7afe118f58f3f207bcf194f2ecf1d91c00495f38b10808a2b538034f8be95944d8904894fdbe1976425ddeba6b26fe97c207ba
 EBUILD docker-compose-1.22.0-r1.ebuild 2239 BLAKE2B fb97dda41ee3054ff833db3cf44ed5ae59b89a5868e94d3648c9e960c2c0f912a2efa885ec7a002b50a7872df574a24c76feaa9057fb053e8c4e5c6a6e534650 SHA512 fb3e0dd948b90a94d86cbab84a69aae411ba28f7f716edca10ae3d798a38a4803b27e73e46899e02cdbf33b54745754dc9e091c6a5a3b6f4c3920409a6314454
-EBUILD docker-compose-1.22.0.ebuild 2663 BLAKE2B 9a248b369b945b8153cdf21d8eb4a1980dfed4e9575a688a5313436d21494efe5d03dc619cff66b5ca768d7177d6ce3f83dba349f80488c1685321111a35e90a SHA512 b295eb70ebe8f5f315426763baf7156866fbff61a23fbf22b0a9428f5020e9b0bf902596d74d6704489803c6e03b67e631fb0ad07bc03963fb04f9cc90ff1dfc
 EBUILD docker-compose-1.23.1-r1.ebuild 2242 BLAKE2B ae7b79572dc26ac32fa073ed4c6abec2aad688ce8505197c40a0aeecce1d145fa3414a6a61506b95270728c31bcb952a99b2f0fbe162bf78c9e75821cd661ede SHA512 628ebae7001febfe6f1d548897744aa965da9744a6ab5e29e6d503592d5f6018d337d7adb8994d47c000fc6cb8efa76108036040154d6f59f303462e0a4f03a9
-EBUILD docker-compose-1.23.1.ebuild 2287 BLAKE2B f8587452e6300356dad5f5776a7fd0cfb8eace7ca22f908e9636c0c798603b0241fe25184912f04121b0ae73b97dcc321f5fb447ef6965571b5764444215000f SHA512 ac5b509ef5d89bcb167db451380fe62cdcf66d1498b5ead7af89ff4c58eb84d52ff82185aada914c36f7e120a0e9685d7fba99c6e1cc2859e737ff28dee69e01
 EBUILD docker-compose-1.23.2.ebuild 2284 BLAKE2B d399d8545163d88cbbfa378f33df764affc6651f53c689abaaeb892c1615db263df372a42169837f235ade2c40859b5e3da4185861a1b2aa193a3c69d78b670d SHA512 a98133c5dbb6d8287af63cd905279cd68ad43e70a7c2746e1617590628c0a40bfbd46078393255d2c454c3ce8faed2387571c108d772dd13e2b0025796045e84
 MISC metadata.xml 324 BLAKE2B 3ce39fdfe98f2c15cb17f46998dcf6a48a87368d0d71563ccd3325e305f88778531dcf21d0cbd335b1a9fc0e780d0ebcc5b51100b95a82223ee5436569753a8e SHA512 d8d5f8f462a459745a4b8a540b0fd648687b442df46c5f50413fa81df2a7d78ad27e7a615e2a77b96f5880840a942a69c350a375ed6ad4ea3a1f3fb4eb3ca7df
diff --git a/app-emulation/docker-compose/docker-compose-1.22.0.ebuild b/app-emulation/docker-compose/docker-compose-1.22.0.ebuild
deleted file mode 100644
index 762d474a0435..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.22.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/cached-property-2[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.4.1[${PYTHON_USEDEP}]
-	<dev-python/docker-py-3.5[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	<dev-python/requests-2.19[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	<dev-python/texttable-0.10[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
-	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
-	eapply_user
-}
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
diff --git a/app-emulation/docker-compose/docker-compose-1.23.1.ebuild b/app-emulation/docker-compose/docker-compose-1.23.1.ebuild
deleted file mode 100644
index 02d47b991348..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.23.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.23.0-setup-py.patch
-)
-
-src_prepare() {
-	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
-	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
-	default
-}
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest
index 2cecc4c4014f..bdfc1b099dc8 100644
--- a/app-emulation/img/Manifest
+++ b/app-emulation/img/Manifest
@@ -3,9 +3,11 @@ DIST img-0.4.9.tar.gz 4654821 BLAKE2B b3cd419aeb64ec8c2e8ee0fd523d387fd5b1a340ad
 DIST img-0.5.1.tar.gz 6394095 BLAKE2B 5c26487f721ef7157c8dc47c5abc2f4f296efe4ddf3b4e1e0513e4a2a71c96287e92c2332b340d583f0687ff7c3b1f10aea107f9ab1527b3f6760f1f359de867 SHA512 66f812da0b77882a610f4de849eaf473a0a6e964fff7cc0b596b46411aa33d625a376d3e829b8eb438e26d09624146c18b83a2289ddf2785024e3f8a6fee6cf9
 DIST img-0.5.2.tar.gz 3426613 BLAKE2B 75da804bee0960c195f3f5af6f10276d3d9a93dfcf08c784b831da2dd4e27714f0c8c24b24d2683b1b75276362b47a2bbc251e032b5b1b87c081922cee4f90f4 SHA512 cbae3fab61005238c939ad5fa5b785b07ee10f964a686962bdaec7170297840ebda188b93a1e3b89c6041db455a085d537005f8b1dc8753cd4e77f3e699f40e4
 DIST img-0.5.4.tar.gz 3429272 BLAKE2B 3426dc6503693ad00c4c9f13c3813a6cf71826987aa2bb8351f695ffebed78fd79383b548040ef880b55984852f32fcb33ae5f1d1dcc4f9f6250498fbd64ebf0 SHA512 db51862aff5e0bb7280f17597f8d7231dd9aa741126b41c0af922b1f136d2ac4e0f08e51ab583ed098b194b58df29808c42cfd5381a217113f6b4bbf0dad06c8
+DIST img-0.5.6.tar.gz 3429213 BLAKE2B a1525d4aa09e11d122b41b54da8b90557dac3d0bfed5ea93dd6dad31269b7095d58d6d44dcd92dad9d56436132493d7ec8f1517b32eaa2bfb608bfb1fef639ec SHA512 e1a4469717df66f167f859cbf82ce54dd877e3e9c2f2d723f4424480c0429ac6ad99a13718c103bed3a823a91bef2f3ee3ac6c17e6f951f74f2f1b3ed0021785
 EBUILD img-0.4.8.ebuild 921 BLAKE2B 050b449fa9c34e4171573810ccb204ae2eba7e0ad9a50da5e3c0673f0b9c74b81e611d9a6e07506b560e4570fc2ee5ffc7455d95ba071ab6e23aef9abdf413cf SHA512 9871ad935ed3382eddc90a3955ce68462a6e34a0f8c4299fec30ff0791924c7bd6ab75e02767afd36a2283aa705636d7c28683fea53b1ecc19352319ac0792a1
 EBUILD img-0.4.9.ebuild 921 BLAKE2B 43a0c49430a0b1c4696cbe41353fa53a2d2bbe6f0de7602d2338c48a1a86335c1cfdb548b569829bcb51591adc626c9088937cb7121d61a2de79ed775d9c48ca SHA512 14ece586610cc8b76a42b39c79b2f41bd36d8f80d10398ae3f147fda6d512276eb5bc8aba6700c122f34b28426be6dabee2048a634f29b62657b287fdc145c92
 EBUILD img-0.5.1.ebuild 918 BLAKE2B e79cd947781d1779f954a07a414bf5412fb84ae273a196aa21f12b26aa029d083f029657c6e2adb21d80267181f31ec84ef5b861526c338a260ed1c556a55013 SHA512 e93d152e84429e3044c760264e61fc8210f0f7f45c9322ede18266f88fb4f9539631aa1999ef9e3a73afae90819b769939a802c772c3d1233187d87edc821ee8
 EBUILD img-0.5.2.ebuild 918 BLAKE2B 9e982b5fb1fda4aa0c85ecd066499329848d2308b0b621d718319c9bf6fb09bbe5154afedcfa91cb7b30102590f4b96a01d588ae4e56ba03460366490dc2e25a SHA512 c01b3768cc67cb5f2263f06fe1f4c64b6194370367e642cc5463777c30c89faa2962fdb7077b476d2a8256b2807e3ce3a73180ea267564da6b3b64eb72e4cd7b
 EBUILD img-0.5.4.ebuild 918 BLAKE2B 406e7afcc01bd601aceea21dae8170989474c534100ff24dcb2270b53857a6c12f0415867ccbc0186aa8f801df6649b23467ce6517ef568b04eff9370faaaf1f SHA512 791fe47bdd4397cd5218aa47fa4f6eb8c7ccf60a70834d23a3164e8b04cefdfb60bcf48718b478a5c2dab3409f69d87a8140418e473506cfc19357e728ff049f
+EBUILD img-0.5.6.ebuild 918 BLAKE2B 4585d6c42446ba7c649791d5d4fdfd3c916457b26e40827d785900384f74ec5d888422e752538a195070858692405173f5f7cbe932cacd30087c8c7939fabf70 SHA512 fbd4cfd7778ea358f7ce43305bb52a9213269b7307e005cc0cbd053ce081087e1924069f001b105c163f87ed3caa1ecfe442980c965f4fd0a4895a51687796d4
 MISC metadata.xml 326 BLAKE2B bade1307a8d5bd0a9945fbb417b8506b7aaa4b66d5a502e18af1f7b008e325b5514e0fc018932396aba1116b5a3c11b12b89c43d925f7e97c8a75efcd9ef4f3d SHA512 a75050de970991e19edf7b7560ca46d27c959b9a91dcf87d40d31532c85c7af24ab29743d7295c731a3153774d33b03afa5c92470ca0c0c572d50c6ec65e5692
diff --git a/app-emulation/img/img-0.5.6.ebuild b/app-emulation/img/img-0.5.6.ebuild
new file mode 100644
index 000000000000..acb7de2fa244
--- /dev/null
+++ b/app-emulation/img/img-0.5.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/genuinetools/img"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="d08b52517b4f2ec47e621541b8799de82c1a31f6"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
+HOMEPAGE="https://github.com/genuinetools/img"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE="seccomp"
+
+RESTRICT="test"
+
+src_compile() {
+	local TAGS=$(usex seccomp 'seccomp' '')
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r src/${EGO_PN}/README.md
+}
diff --git a/app-emulation/libvirt-glib/Manifest b/app-emulation/libvirt-glib/Manifest
index e6b05f20453f..e6851ab52073 100644
--- a/app-emulation/libvirt-glib/Manifest
+++ b/app-emulation/libvirt-glib/Manifest
@@ -2,5 +2,5 @@ DIST libvirt-glib-1.0.0.tar.gz 860450 BLAKE2B 417a3bd0df41787fbec456f301af744a04
 DIST libvirt-glib-2.0.0.tar.gz 868946 BLAKE2B 1ff4695b25766d6caa603826dcc63e64aa3ce022e6623eb31017fb67a490baeb546a9bc67e16fc16c7b86040db971748b1ef4303a21b5dec098cf732f77c92ec SHA512 6ead4c37c314eb5670c5aa282ce039a0182a71a20b349a5d9c78367381eb674fad0f2ca0f2e20e1e89ff7df2ac9f1640f20fdfa63d599d8a2538fb4c0fba4c3f
 EBUILD libvirt-glib-1.0.0-r1.ebuild 1014 BLAKE2B 7e26b59844df689ae0cf1c791ebc61d046eb45afdc014708ae3283a771a537bfc2aa0025cb2379d5bdaa20e4147385cda057a93d7423d7b26a11973878e1d4cb SHA512 fbb757c3e5fe6dc894be136fde13e177704c7fbc1bc5f46dd5a5f64708966fb0919e187ca501335fb3a736e37df26936a22b286a9176f8d6368a44ab6a55b6c7
 EBUILD libvirt-glib-1.0.0.ebuild 1234 BLAKE2B b6429e7d6151f44ac3af8db66a43984be934dc01de02cdaf45fce08721a12f63bbd84177bf1a2b847e22ea4c4c5ab800cc308d481dd09a97c68b05365bea4148 SHA512 71973f3d5429257a7434977aece98e2041f0bdada1466324c08c1453a597d0df72249f070e90aeaf987e56a5a18c2f7f3c62cd05a0d19c60602213882f10ed49
-EBUILD libvirt-glib-2.0.0.ebuild 1013 BLAKE2B a8fbfcf90d2537f31b6d3321b494ae00c49851466c9e41e2f1ca9e60de7a34eca97e22643b942f35afc67422b7be20417f381a6772a212fbd84e05707e81a368 SHA512 ba2d418411627ee69950b77d143a14334df0321767f14e2445cf2fb042d1154db9f10b9ebee6c70a259f66e984db78a40f162914031fb0a534c5c80211fa2882
+EBUILD libvirt-glib-2.0.0.ebuild 1012 BLAKE2B cf177b1d292bd293417b31db5f34ab752e6a1dc7d647de99ea9ff2e0279658d219c13e9d1a71597d511530ae01e65dffd961af408a552214131e16ad9b36a2c2 SHA512 2e665f25ce1d935c4cfe217cd108fcb07a0d3d7566c0353b92bcc67c3881f1ef0a2454c1a47d9aa0a99dfdc1b9fef067e760d22d1db472707e4cd4c464af0592
 MISC metadata.xml 353 BLAKE2B 84d64fcb26b450371bcdd9ce737aeb5b0337a23d8cd5401094793fc73e63610cda3c04853a6ea98a8d352d990a5067515bff049b86c305d48ed2828e98765e4a SHA512 b32b362e0267da5954557ffde2722311523b93bd84b0f8023671cf12ccd178577007b900e745671ec1aec5cb3c7bf8f538803669efb44865380a0d5010ee8d74
diff --git a/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild b/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
index 6b7cab7e2d11..8c47ef3bf8df 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+introspection nls +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 34a0867e0dcc..b771c93edc58 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,6 +1,7 @@
 AUX README.gentoo-r2 2094 BLAKE2B ccfad63217f7778e97d8de49e20002dffefff32562f560b23c777c5f2f20407493b4288fc67516c7b45cf2c1868340673c7ba92ea1774a22d59524c6a626b59a SHA512 595ede7bb574c7f244a15e430b70f828bc4574b409d4cc37261bf38bfb30cdb31edb6091ff63f6517b281cc11a34eee960ea0330a6ea285dd48fe2288dd67196
 AUX libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch 641 BLAKE2B e796f4e32f00e8970eabf723520601b26c7fa5f7579d538299538632ba036dafbb2dc64ad40d10152c0637043b2a649e1dc08468d1f250e00ee0af095d94a093 SHA512 df9960b80c7dda852e38d992ab31181d79091bd6e1ba88c0b0c1af8a2f2d1445ee95c957df38ab27b452cd2de01d36b88164e665a867ad69c15ca15c18b1d588
 AUX libvirt-3.10.0-r2-fix_paths_for_apparmor.patch 2730 BLAKE2B ae92a37cdfb929862bd58d1cd208e3f8a3aab10dae98ec8e51d6c3ab579295e3f59ff091970499c6c57b625edec77b98421502df625b1d10c1c3d0be3dfbe489 SHA512 751b971fd0f109f3a4147feea8481adb9c868313ea57d293a89ee548661514f124318324823d9380839a7a5c8ae7c1e3ae8c4c6e62027587f163c8856e353a6a
+AUX libvirt-4.10.0-fix_apparmor_rules.patch 665 BLAKE2B ce9a9715eda077ee8fd2cae37bb0e2b2339dfdfbc2f389287d11be43bdb098bb8304270c739507a57895cf02f5081b4b9e2a94518d81925c072725a09502170e SHA512 00007b29a5843cd6f272cc9d876cc4e4cdf2fee1cbf29009ff9a4c36c5758434052cff201dd0f3cc5c4c25782bc04ecdd84d89412b5370eb615cb1fcb06344f7
 AUX libvirt-4.5.0-do_not_use_sysconf.patch 7417 BLAKE2B b1e6471a7b6a923a3ca4b630df3ddf31994d3492837e842fd0eb43f79757f2a39652345711719fd2b189116d533472d4e4298520b81838706264d371537d6947 SHA512 1362feb1d2ff3dbb1d5550152453c2fe7fbc4645356a866195601eb17a280af0106753d873285b307267b2c941c18d8db2b5a24d7916a49dfd6af3515217bfcc
 AUX libvirt-4.5.0-fix_typo_in_apparmor_rule.patch 556 BLAKE2B 78d99d6d1ae811e202ffdeb0f34e4b20d76d3b0ed90bdcb35fd79a1133e8cc88e237bbf22c5260cc6aecc7521470ad14807eaadcdf97ed38c0d77fc630d61d38 SHA512 d02a121c069c1661c2f3b5084e1ea260e6611ab9b209fc6575dcb08f68bf36175ab9d9ebb7d1cd2eb4cd707165fd8c4357ce5c036f4835df2d4af4c88964f934
 AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
@@ -12,9 +13,11 @@ AUX libvirtd.service.conf 401 BLAKE2B edd74238f9639ead1d776142e6231d87f39cb6670e
 AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47abf4088167484f1f3149a4998840cf1aba745621851d7e2653df5c7f7268d8d61be3a3731ea053a88f35c13b SHA512 2b1c3c64dd6fa03d8c2ae24e7ce4aa7d754913214542a68a4e99f10fbc251fd23ee26e297a957d7b4b70eec8ef028c41fc915da3a85fbbd16143bb92d1de3aed
 AUX virtlockd.init-r1 570 BLAKE2B 734d582d867b79649f863504fcd7c87fe3c59569b56b0996a6229d6eebadc9d4c356c10bbcf5637483fbc930d0c50233da4fffa357d423029b3828b7a3be56de SHA512 65a05d406200da9a534df5caa1b9cb2af97f0b03f64e6b4157322975fa754f59ae74fff9ec8301a6c0510e4b75e2b72a78cddf004a76109e18c375e83527cee5
 AUX virtlogd.init-r1 569 BLAKE2B 20df60c23cee575577592d41d1a9913923255633d12de789c036e6085f9e7b4360e017155c61e3688332b493a0e96ffca55753bcc67a33bb877539b80eef81fe SHA512 0a3e083e742f9e0d8206ab9a48c63bbd395bdc24e5551e2cbeddffa3fb576a817b73dbafe646c392a35c354d6b65426a9b6f3ce3dcafc30077715e90684968c1
+DIST libvirt-4.10.0.tar.xz 14841188 BLAKE2B b52f2ed1c4c65930339a6b6fc9e7b034c7661edc0defdd78642f305b97332c33247bfc552efc43aa75a8d360c0d721d1a58a22fa7a016e7cf14ee2219d70a762 SHA512 a4f97aed6299c7954518ab88738ab781cee0755bfd64094a44468f77f99cac5eb2bc74ecd6aec90177317606ebd073292f5b5d0056054d1d94973fa938589fbd
 DIST libvirt-4.5.0.tar.xz 14743956 BLAKE2B 930852765104b1b22744df0ec4f1c74d89bc0fda80852978f7c857943858cc45eed9b74a3d42668f872540be2637f26c4d9d7859594847e58e6fb4cd33350130 SHA512 26710c7e5219f007524e9f93a642e55e4e8ea197afa6b2ca6a4b67b7028313f4b0d82924ee9a1e91ff688a4d2b53f89f3655fbeef0fa99a34f8418f37d787984
 DIST libvirt-4.9.0.tar.xz 14744184 BLAKE2B 03ddefc8f505c8688ad506b81ea9b37ee085e4c9c429834c6b6f338981bfc3c6034a5455a79feca604fb36e658de766ee6104aeed690c682ae596d10eb5632a9 SHA512 3cfada940f9de6cc4b0504e089f41aa03d9986f0163344dd3b3ab8e6c4eb556a56996dc8f24bca913b036862c75b256628ea9ab7674ef0a57b87f47c58689e90
+EBUILD libvirt-4.10.0.ebuild 9664 BLAKE2B 917ab8653ce95ed8321c30aa0ba55db9a1b35eea19fef22f3720d978549328c66ebe706188ab76535a93fbee28374c159670d1e21759af7ef68e1e2119b74231 SHA512 2197606640c27deaa98a5eed7436a18cdf0969b96455d3a5104fbbe3b31c0740878efb33d3f882d2fcc6f046d50536b2fe788c516308d71e2ff72d5388ec7321
 EBUILD libvirt-4.5.0-r1.ebuild 9654 BLAKE2B 68f875b79a4e7af8674b87fd47dc7081b31c0d617444bfca5d0ebe1b0b10fa4ddfef1305110f3689591a6a5ef32ace833a28e854126369ea2896b3d894b9d230 SHA512 05ba73308bdcabcf8a3c179814519331bc3ac2e557ec383ce9beaa3f8657436a9358461d5e03271811d56ef570e80eaf8a781d54b9b583381a418429934053c5
-EBUILD libvirt-4.9.0.ebuild 9598 BLAKE2B bdebac5787d42beacf8ef9fdf2820d521258dc5cbfe3abc2d315b93d607d2fa65b83fb2d7bc96ac0eccb90bdc51f0dcb6e5d07e7cb6504d69ca0d35090e74d8f SHA512 0822f2601cc3dc4fc2d6172799d7219b046a331c296e8d0754e49b5e0c6e5afaf165c96bacb987eb7cc351f6faea0f6cea9256cad47ffc04e0d0976efcfe7d57
+EBUILD libvirt-4.9.0.ebuild 9600 BLAKE2B e26074068e69f108ea18dc6053fccb52ed0a541c09cc2d79ee33ca2a1f443c79b7734bd4a6dc76ef880a949439c53d09b0f3dce6f6f2abdb9242238a0d9bfc11 SHA512 00f8083e929ba16afb6626c62c779a0e91cd6fa11177b68f78de9c46e01a22be078a52e63307c934f968d3e9f4ab7eddf31fa48ebefd5fac771acab5273a27a2
 EBUILD libvirt-9999.ebuild 9553 BLAKE2B 55124688e59d3ef79f15e68c8acad6e44044e8500e4cbd29c8511307245e42ae071c421f058511f09f4e7b4ee3de94fa78d073f4c9467331bc4390642b1a334f SHA512 ac815c90d698438878bebb091343e2cca19756e4dc2b6de8a79f37f2cbccf5136fe4c153192ceb9633228b3c8264d24ee60ad0dc1a732a5ae0153a3a384eb2aa
 MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed
diff --git a/app-emulation/libvirt/files/libvirt-4.10.0-fix_apparmor_rules.patch b/app-emulation/libvirt/files/libvirt-4.10.0-fix_apparmor_rules.patch
new file mode 100644
index 000000000000..e561bf42451f
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-4.10.0-fix_apparmor_rules.patch
@@ -0,0 +1,14 @@
+diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+index de94368..5fbae27 100644
+--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
++++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+@@ -39,6 +39,9 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
+   /etc/apparmor.d/libvirt/* r,
+   /etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw,
+ 
++  # Gentoo specific path for uefi firmware
++  /usr/share/edk2-ovmf/* r,
++
+   # for backingstore -- allow access to non-hidden files in @{HOME} as well
+   # as storage pools
+   audit deny @{HOME}/.* mrwkl,
diff --git a/app-emulation/libvirt/libvirt-4.10.0.ebuild b/app-emulation/libvirt/libvirt-4.10.0.ebuild
new file mode 100644
index 000000000000..4ee860eb76cc
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-4.10.0.ebuild
@@ -0,0 +1,387 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	# Versions with 4 numbers are stable updates:
+	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+		SRC_URI="https://libvirt.org/sources/stable_updates/${P}.tar.xz"
+	else
+		SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="
+	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
+	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
+	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
+	wireshark-plugins xen zeroconf zfs
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	policykit? ( dbus )
+	qemu? ( libvirtd )
+	uml? ( libvirtd )
+	vepa? ( macvtap )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	app-misc/scrub
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	|| (
+		>=net-analyzer/gnu-netcat-0.7.1-r3
+		>=net-analyzer/netcat-110-r9
+		>=net-analyzer/netcat6-1.0-r2
+		>=net-analyzer/openbsd-netcat-1.105-r1
+	)
+	>=net-libs/gnutls-1.0.25:0=
+	net-libs/libssh2
+	net-libs/libtirpc
+	net-libs/rpcsvc-proto
+	>=net-misc/curl-7.18.0
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dbus? ( sys-apps/dbus )
+	firewalld? ( net-firewall/firewalld )
+	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	libssh? ( net-libs/libssh )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[-device-mapper-only(-)]
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-1.5.0
+		dev-libs/yajl
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		>=app-emulation/xen-4.6.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/udev
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+	zfs? ( sys-fs/zfs )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.0-do_not_use_sysconf.patch
+	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-4.10.0-fix_apparmor_rules.patch
+)
+
+pkg_setup() {
+	if use qemu; then
+		enewgroup qemu 77
+		enewuser qemu 77 -1 -1 "qemu,kvm"
+	fi
+
+	use policykit && enewgroup libvirt
+
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use macvtap && CONFIG_CHECK+="
+		~MACVTAP"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	if kernel_is ge 3 6; then
+		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+	fi
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	default
+
+	if [[ ${PV} = *9999* ]]; then
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
+		-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
+		-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with apparmor)
+		$(use_with apparmor apparmor-profiles)
+		$(use_with audit)
+		$(use_with caps capng)
+		$(use_with dbus)
+		$(use_with firewalld)
+		$(use_with fuse)
+		$(use_with glusterfs)
+		$(use_with glusterfs storage-gluster)
+		$(use_with iscsi storage-iscsi)
+		$(use_with libvirtd)
+		$(use_with libssh)
+		$(use_with lvm storage-lvm)
+		$(use_with lvm storage-mpath)
+		$(use_with lxc)
+		$(use_with macvtap)
+		$(use_enable nls)
+		$(use_with numa numactl)
+		$(use_with numa numad)
+		$(use_with openvz)
+		$(use_with parted storage-disk)
+		$(use_with pcap libpcap)
+		$(use_with phyp)
+		$(use_with policykit polkit)
+		$(use_with qemu)
+		$(use_with qemu yajl)
+		$(use_with rbd storage-rbd)
+		$(use_with sasl)
+		$(use_with selinux)
+		$(use_with udev)
+		$(use_with uml)
+		$(use_with vepa virtualport)
+		$(use_with virt-network network)
+		$(use_with wireshark-plugins wireshark-dissector)
+		$(use_with xen libxl)
+		$(use_with zeroconf avahi)
+		$(use_with zfs storage-zfs)
+
+		--without-hal
+		--without-netcf
+		--without-sanlock
+
+		--with-esx
+		--with-init-script=systemd
+		--with-qemu-group=$(usex caps qemu root)
+		--with-qemu-user=$(usex caps qemu root)
+		--with-remote
+		--with-storage-fs
+		--with-vmware
+
+		--disable-static
+		--disable-werror
+
+		--with-html-subdir=${PF}/html
+		--localstatedir=/var
+	)
+
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+	else
+		myeconfargs+=( $(use_with virtualbox vbox) )
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"
+
+	# remove problematic tests, bug #591416, bug #591418
+	sed -i -e 's#commandtest$(EXEEXT) # #' \
+		-e 's#virfirewalltest$(EXEEXT) # #' \
+		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+		tests/Makefile
+
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newinitd "${FILESDIR}/libvirt-guests.init-r3" libvirt-guests || die
+	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+	newbashcomp "${S}/tools/bash-completion/vsh" vsh
+	bashcomp_alias vsh virsh virt-admin
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-4.9.0.ebuild b/app-emulation/libvirt/libvirt-4.9.0.ebuild
index 7d7a7e166fc5..1a8756f5974d 100644
--- a/app-emulation/libvirt/libvirt-4.9.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.9.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="x86"
 	SLOT="0"
 else
 	# Versions with 4 numbers are stable updates:
@@ -20,7 +20,7 @@ else
 	else
 		SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 x86"
 	SLOT="0/${PV}"
 fi
 
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 0b4416a19638..38358470eb11 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -10,6 +10,6 @@ DIST qemu-2.12.1-patches-r1.tar.xz 3648 BLAKE2B 07908004d0b56e60274cb59d41637702
 DIST qemu-2.12.1.tar.bz2 41192583 BLAKE2B ff903a5850e406ab542ad1a84300852599fa9c199e0f3290e4d6ddad5284192577351278a18dd5706463b08e817b49340989a35987a04672f7cede2097d1d18d SHA512 4c85e6180bf7ec61c0bdddb20e104a7c93fe6b1de27f6aa50d75633eb78491cb844798a9e3f536245eff7b4ebe9a6227f5f66b418ced44095b8e59c5cb33d4cd
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 EBUILD qemu-2.12.1.ebuild 24048 BLAKE2B b820aac5d165b1fc474d182909b9fc0e865791439914cfc216ea5aaff99d0077968b4709049f154dc77ba831fefee33c0ee803b7f6903267cad07c8ee290e6d5 SHA512 3ae064edb8998a080941852400971d6a26f70e21ee8c7664ff5b1833cb58f598f2018a491f22d601992083247a199121083536ca1370b726eac51fb4606ac6cd
-EBUILD qemu-3.1.0.ebuild 23756 BLAKE2B 6ae50783d19fd846e8febb30b086b346c07c4f2e8ac8204e39d4a56be1748eb8a422bf49807a3ab26efbea56d41a2082413061728ba39254240f274b86fa8779 SHA512 cec02d589bf6bb90a08f320427f17d9099aa69acf9a36b91e2389e3bb81a8a73a1e95ad3f1342b26aec3ca7b5c4020de6a340da0b92dc580100dca7b6a887f19
-EBUILD qemu-9999.ebuild 23576 BLAKE2B 7caadb4e115a11f9ea42c7336f35b388519ce35007bf7a095e35f6a694bec7709429a11144bfca523fbba5d6f2aef717f5e6bfbc2ce9c340b6e9d6ef438313e4 SHA512 7f1167ad3d5de9320e83a58f7eef87af370d0e722504767a7862a81966c3e0a3b0c2e824becf4bf79524f30cb8040866e168485a6919ee0b06452dab0bee49ce
+EBUILD qemu-3.1.0.ebuild 23787 BLAKE2B 902054fb146802b497e70c80d60d713f60e41be59366d5338c6b532eacd21600cace729739cbb3ed47630cdc26fd80f7b78d87276638b030cb19abd57ede927d SHA512 059cd89df8150c965fc93449f04b4c7520551b34cb88af82f2e84a44d15cf52d89c19c2f26a5a83c3a29681345195153bd01a8bd2b854d8f9fc13d19cde12db8
+EBUILD qemu-9999.ebuild 23578 BLAKE2B d1ef631a6d51721b2ce528f3f6a4a58200ffbeaa7a277cd14fd942a8ade581541bee3514760e1b8b04093ad8e49ba31535fe5fd618c2db495cefa6b29320b472 SHA512 0e94523e40ea50664a7ab9dd1451811b03feb26e67a35f2271aa060d58f1e04e50750f61580a6612fcc12d440b77b458a466ff70049bd514aacecbeaeb28686d
 MISC metadata.xml 4014 BLAKE2B e3ef3f3da149b756119932e7796ba2daf3327a841776dc64476730f33345e6a10abd45d8a52a45f1881f052d43902c0a6de0f3df02219ab9f8b5ce1fec12b635 SHA512 fd582b65e3eecacef5447b787fb465565fceb84a7fda9cd7079e5ae5b2ef4183ff7cd3187a5e751900bea6877fdda8e8357c792eef5431e76c4d672eb631481b
diff --git a/app-emulation/qemu/qemu-3.1.0.ebuild b/app-emulation/qemu/qemu-3.1.0.ebuild
index 9534354a753c..0e8b2a654e2a 100644
--- a/app-emulation/qemu/qemu-3.1.0.ebuild
+++ b/app-emulation/qemu/qemu-3.1.0.ebuild
@@ -94,7 +94,7 @@ SOFTMMU_TOOLS_DEPEND="
 	aio? ( dev-libs/libaio[static-libs(+)] )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone )
+	capstone? ( dev-libs/capstone:= )
 	caps? ( sys-libs/libcap-ng[static-libs(+)] )
 	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
 	fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] )
@@ -676,7 +676,10 @@ src_install() {
 		emake DESTDIR="${ED}" install
 
 		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dohtml check-report.html
+		if [[ -e check-report.html ]]; then
+			docinto html
+			dodoc check-report.html
+		fi
 
 		if use kernel_linux; then
 			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 8d6db73b9c7b..00f5573703e1 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -91,7 +91,7 @@ SOFTMMU_TOOLS_DEPEND="
 	aio? ( dev-libs/libaio[static-libs(+)] )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone )
+	capstone? ( dev-libs/capstone:= )
 	caps? ( sys-libs/libcap-ng[static-libs(+)] )
 	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
 	fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] )
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 958bc2294a3e..65427adf638f 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -2,5 +2,5 @@ AUX vagrant.in 1872 BLAKE2B a129780601946f3c53b1cb84dfce33d6cc912069dd784cb49e97
 DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238
 DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957
 EBUILD vagrant-2.1.5.ebuild 2278 BLAKE2B 0f9a9e8cbab0928c7ee1042577dc83efc00d4ec50114bdf93185483e21da24f99fe575da0b2e5844a7e5a343fe99ef3c43886ad0256221feecf60a8c49ba6878 SHA512 79b2752ec86feae5c21453a021ffe90c3734a1bcb4e313512a2fc89161d85e60d7b629818468df270c0cba43049b202535c6b4a9eed45659d64ab94d31a3203c
-EBUILD vagrant-2.2.2-r1.ebuild 2493 BLAKE2B 9d49d4d5fef45f55a218d031558c239d471845fcd6914cc36dda211b2e438e51408c70a4924c780fc734d8954c8b18c2de36884578bbb88881d1f2547735a032 SHA512 1f8c3b2f5de3505b134c37f1f631ab33b4c3c13d07ed6b30f25b29f4db2d6d29e517827107c5273a73e3bbadddd3e74cfe56a2946231b3fb3cebbe3ea799d9b9
+EBUILD vagrant-2.2.2-r2.ebuild 2453 BLAKE2B ced3f18626e649bf56e91b3deff46acc8d5cda0aeaefb5bd89357e688aae7fe5d7d339233a7e04e76c6d6e8a569741162d7b2b0bf6cf9bd266e397e39fb15b3e SHA512 8bbf87b8ddefffb6035caafa174e72942cc93277a4a57e42ee618914cebf1b1a1160bc9631057e3af28c14c0839f8d6ba57150f472d0196f5b04518dec828617
 MISC metadata.xml 413 BLAKE2B 1b57ae29cf2bcdf4bd7d97071e081818e114104bd5a22438e0fe47bd4bce9b2fc1b831c544579cc8b652860c9637caa9134e6f1a4abcb21216e39e62fa058862 SHA512 417deb9af12420ac037b15b526d77ea3fdad12d047c4ea9ede5465ea9ea772fe96ee1625714e74e6dbad6ee224916e9b9304c38293aec4c5e2a52555e1c9f4e8
diff --git a/app-emulation/vagrant/vagrant-2.2.2-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild
index e8e2b858ed09..a2515b615840 100644
--- a/app-emulation/vagrant/vagrant-2.2.2-r1.ebuild
+++ b/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild
@@ -32,9 +32,9 @@ ruby_add_rdepend "
 	>=dev-ruby/ed25519-1.2.4
 	>=dev-ruby/erubis-2.7.0
 	>=dev-ruby/hashicorp-checkpoint-0.1.5
-	>=dev-ruby/i18n-1.1.1:* <dev-ruby/i18n-1.2.0:*
+	>=dev-ruby/i18n-1.1.1:1
 	>=dev-ruby/listen-3.1.5
-	>=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
+	<dev-ruby/log4r-1.1.11
 	<dev-ruby/mime-types-3:*
 	>=dev-ruby/net-ssh-5.0.0:*
 	>=dev-ruby/net-sftp-2.1
@@ -58,7 +58,7 @@ all_ruby_prepare() {
 	rm Gemfile || die
 
 	# loosen dependencies
-	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
+	sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
 		-e '/ruby_dep/s/<=/>=/' \
 		-i ${PN}.gemspec || die
 
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index aab12f12d193..01bfe32dead3 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -3,6 +3,6 @@ DIST virt-manager-1.5.1.tar.gz 2796831 BLAKE2B 0fc8b266e7dd2ac3f337e3f95f4328ece
 DIST virt-manager-2.0.0.tar.gz 2629465 BLAKE2B 8795985afb8805fdb4f1ee94c7344361a7d09d3e62e361f3126859c4d1b1077286b720de7629fd876e5bff10500cc6cea6f1d4afbba5c2c83fd61b137c40a3a7 SHA512 5d0eb65dceb5c913973edaa52414b1665d1ed9cd3f226e28a592decddec2acd8fdb589f60736edf9b7d95830893812f9aecca2cbdd715033ca7ea53a95472876
 EBUILD virt-manager-1.4.3-r1.ebuild 2385 BLAKE2B 1361cdbb0b185ff6dd6430e94c2416a9981ce360cbcd6330cde5f519989af3f9f85b98d194a23c2d6fe0f9fd9ccb701bf09f1fbae32d1906d1fa22ed30250bd3 SHA512 3a864d2802a1f61b3153c84c0cd1c91241d9003331aa749035133a06d21c06fbd094a9c7a5058b69f9a560961069611465b9054cfd57b7ce64299c83cf0fb183
 EBUILD virt-manager-1.5.1-r1.ebuild 2403 BLAKE2B 2e30a3cb3debac21490fb97a3bbc02bd7f24d5ebabe989340fe94ecc2dfbe30d9f7774fab428ca9d237e554f18863466359a6ab2f7c9e82f2dfa6a9dbf7f4e1c SHA512 952a3bb8d6f4e239b933e2b011db72dcb2d23ea34da193fcc58b755e44cb9acebaa3caceffff565c8db752188abba8d677858e96b76bdd801c8cdf54bedbb3d9
-EBUILD virt-manager-2.0.0.ebuild 2296 BLAKE2B 6b02ea89367841b5a0114f7be85c16d61d51e5eac4e4dac80cb305a572857a191a16a8e6dc339c5388a6731962bd32a8898e04f493a429c15e93e7913861f25a SHA512 8707da9edff501b7cbf77e58cbf337e56902d053e9be5de6a4dc3949a17ad9d150802193a152b9e23cdfb46f681ec71c7c0566576a57066b64032968daa8c0b3
+EBUILD virt-manager-2.0.0.ebuild 2295 BLAKE2B d23dbc779c0d242a4559c30cc3c041c322d8176ceb2de3dbd96f049c40b71a0c7fad368849caa86ca22e72388ced1b97d82d962d7350dbca9a31bf308d579fed SHA512 e609cacd83c8b2f7f48d37e7b621064e5541ec68c379b52c90a23e62e2339fa325223363375c08df6e1d4408934b1fd027fe566982c4e8fc30b09b830bfe5fc9
 EBUILD virt-manager-9999.ebuild 2287 BLAKE2B 0f3b49f424a7ee6b1170e13d72ccd842653aa6ab0df119b8dd4530b4202f9e38c6c8cb8f8a369ffd10955fddae38594b8c7181f836b2127913480b200f56549f SHA512 4f3b298579077ff216dccd348440260c003d6f82c60284d83637e91a48ebee7cb365955dcbd926b44c03b4e38c14da0b317b5350a36ac548427be9b9a7fba90f
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-2.0.0.ebuild b/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
index c3d12ddccba8..b99319a5ac52 100644
--- a/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
 else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index b4ea25cb91f2..21763ef2627f 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -15,5 +15,5 @@ EBUILD wine-any-3.18.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f79545
 EBUILD wine-any-3.19.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
 EBUILD wine-any-3.20.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
 EBUILD wine-any-3.21.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
-EBUILD wine-any-9999.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
+EBUILD wine-any-9999.ebuild 21156 BLAKE2B 96bf1d9d463525d93cbf4c2ef6c392666ec95f37dddd25cecce79532bbf902a8f8c702f6724cc6ecf929bebda5645e5f2017ea312e98cc430f986abc88c3dd70 SHA512 fc81a3d8642ae5b088ebe8157a48c5d252612d2d4ef06a3d473ff40fa6728c875bff0b9c5d644753dc385615c3c2ed116d4197ba773d0784903beea0a88ef1e1
 MISC metadata.xml 3844 BLAKE2B 95bb006c1635ae34e88097f588585809785bbe45b333eb618baa7ee71b64ada59b13c7d16bf138395e1e72ddecb430c07a75b3edbf4bd74948e97415a375fe78 SHA512 43160447d94163a67d9e356ad9fa887e35f2a27e8b496e034a3e8fb2b047b1cf1deda9596f6d7ea9b5f52cc7005ffd2e7fb37983d6ddd33fb699fab5fe6d50b2
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild
index 24ab26fa3a3c..ca707f87befe 100644
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
 inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git https://github.com/wine-mirror/wine.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index ec36f844f5c5..3b9dd28fc998 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -11,5 +11,5 @@ EBUILD wine-d3d9-3.18.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3
 EBUILD wine-d3d9-3.19.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
 EBUILD wine-d3d9-3.20.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
 EBUILD wine-d3d9-3.21.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
-EBUILD wine-d3d9-9999.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
+EBUILD wine-d3d9-9999.ebuild 18681 BLAKE2B bc9336a634dc6f216b1c10a4b7c0a692b48ad0501e6b854e18775840d1fb9a7707aa5493f764511b2a68ef42a6bac5d2af49352fd742f54f3fd2b82a78a5dc11 SHA512 0fe85ce775eb69a1197e71ec7b7f40bd0bedaf8657809b9aabb147099593672bc9e7805b77373926cc99ea58c5573653981ccd5ee10255272844a8ff4d2c19b4
 MISC metadata.xml 3451 BLAKE2B 83f6906b20cb3effb9c37152cc36c2d2853d3c313707151e5f1962ea51fbbf5983300edfb7282c367e393ef2ba09534277a4349ef6bdd630802fda04b4861357 SHA512 9c7fa199e699e6df3728c7f9e522a1bd64526198d0a96274d14da00627587c357f6d5ee9678770e2e150065b1246e1803c3a39f0fb6f01182a896a563f8205d6
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
index fb4d194b4fbe..3ebab9ae1cb4 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git https://github.com/wine-mirror/wine.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 47e52e43fab1..17d53b2af76e 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -11,5 +11,5 @@ EBUILD wine-staging-3.18.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d7
 EBUILD wine-staging-3.19.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d73c34a3f20a667490d4ad5b45011464aed7ea2eb1b06ace2133f7920192accb099c256dacd6223c74ee0bafcfbcf717 SHA512 adf71cb35a4108c2010fb3f64f3837913ea2af1489a81ccd3ae903f1173232bfb97e0bc655076085e4f595ea91d851260798cc33a79f8c58a67d99c6ba0920bf
 EBUILD wine-staging-3.20.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d73c34a3f20a667490d4ad5b45011464aed7ea2eb1b06ace2133f7920192accb099c256dacd6223c74ee0bafcfbcf717 SHA512 adf71cb35a4108c2010fb3f64f3837913ea2af1489a81ccd3ae903f1173232bfb97e0bc655076085e4f595ea91d851260798cc33a79f8c58a67d99c6ba0920bf
 EBUILD wine-staging-3.21.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d73c34a3f20a667490d4ad5b45011464aed7ea2eb1b06ace2133f7920192accb099c256dacd6223c74ee0bafcfbcf717 SHA512 adf71cb35a4108c2010fb3f64f3837913ea2af1489a81ccd3ae903f1173232bfb97e0bc655076085e4f595ea91d851260798cc33a79f8c58a67d99c6ba0920bf
-EBUILD wine-staging-9999.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d73c34a3f20a667490d4ad5b45011464aed7ea2eb1b06ace2133f7920192accb099c256dacd6223c74ee0bafcfbcf717 SHA512 adf71cb35a4108c2010fb3f64f3837913ea2af1489a81ccd3ae903f1173232bfb97e0bc655076085e4f595ea91d851260798cc33a79f8c58a67d99c6ba0920bf
+EBUILD wine-staging-9999.ebuild 20088 BLAKE2B 7b45850fd943ab529ff442187bd04edc4ebef9092b20400586306ccb54b588b2346e41239b058a608f905fab4c7653eb6d056b31c63dbaf2e655ab2c409b144e SHA512 bc7152915add222360f2684494ff62ff8fcb0289654a8a83e53764c4eb6ad35f5dc10a17bbd790e6f3369b3b2d109b0e8ac09b5c89c158e83f86069a7b7255b0
 MISC metadata.xml 3610 BLAKE2B 6840ad896b4efc5cf532bbbb56c3610182b62b3063321378d16e418514ea372da30341e173975a2cc17b81774c0ecdfb11b52d12de6b4875cbac638a9f5a6a78 SHA512 b6372bfcb02b7917ac1d79a26639e9ca6440d373bfbd5688012d48344b4ad6966c23436853517fbe2236a720d77de71433edea1ddd6cb612f0fec65016ef91b2
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 17d7b7dd2b8a..4e3948ed97ff 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git https://github.com/wine-mirror/wine.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index e4cd7dd09728..3f6dad97fdc4 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -11,5 +11,5 @@ EBUILD wine-vanilla-3.18.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4
 EBUILD wine-vanilla-3.19.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
 EBUILD wine-vanilla-3.20.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
 EBUILD wine-vanilla-3.21.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
-EBUILD wine-vanilla-9999.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
+EBUILD wine-vanilla-9999.ebuild 17348 BLAKE2B fb54a9a4fce1edfec32205a1d2ece604ac389debd6aed82807cec12b2fd4c958f44dabd1fa5b47177dc9ff43fc7ec1e424f84fc5a85a8c5f251f3b7fd7efcfe6 SHA512 0110604461c0ca846f96eb5271c7b9766d4d9f6083551793b13dcb5e283f5a7ca27ad3917f5cffcf2d6f113dd26d42d66b8bc063c5931749fe7d5fd3e42d035c
 MISC metadata.xml 3157 BLAKE2B 917ac49661429459c488ba4e4e83a0fb558dab3068635d2ac307eabd9e1576c9034fe53ec80bd71023be925d184aca442d8c61eb5ab788a947e22a0d2aa0882b SHA512 2709187f3765e00e14c19049fa81f920a8f8ef60dc4b36db17faccf26df8b04edd017368d820fce91c65836662ba21d29a104b6ac0ac17164047f29bb7c85d91
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 04acfab00725..7a4be4853fbb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git https://github.com/wine-mirror/wine.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""