gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /app-emulation
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
81 files changed, 874 insertions, 264 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7755bef2f095..b99e890765f7 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 38564a1d701e..533cef5d53e0 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -2,9 +2,11 @@ DIST buildah-1.11.5.tar.gz 10594213 BLAKE2B 421d4ea78ad84fbae42086b8d49fec26db8e
 DIST buildah-1.11.6.tar.gz 10600477 BLAKE2B b70849ca0121e32cd66da3da282a443688c15a783a1be7d5d3650bf1122c865e9674d0790fb599f6da4c04072a19360aa224ccc76d516e8a8e71061c903dd0e1 SHA512 419d51d0b430dbc38862bad218cf0bb9a698472dd3932e69fa6bcfb2023b9cd10cf03916f2333892cdcc051ce799664619c62941965a59420d81ba4706e9d7be
 DIST buildah-1.12.0.tar.gz 10717080 BLAKE2B 67107684d625ef23166d666dba50244861e6903f46315d8bae4d313d3585da154b7ee5f87ae8ab69ca717fdf68b914dee0cbcf2e1e95c34ebfccee4739db1d62 SHA512 ed7d77dfe88f613ef4f756455d889d707707ad16f8f6a9b514a8fbaabb56fef58db54ceb2344954a9311bcc6f1f000b21ac461f9b612b8534ae6a4594ad7a16d
 DIST buildah-1.13.1.tar.gz 10928426 BLAKE2B 7f790e2e6499543f6ddae5582f03e4e8a2429783512bf53ffa48d010b1338c4e232117e8b175057205c75ee839981564358239d08d48dbdef8cae80bbacc6554 SHA512 89c02f3c485408f16d6334bb4621accbb7de5f8d3d4458eb4c925468da1f6c14a18132e8f643e965d3054f05a90ada3c4911e539541f9ca045ca606c9ce1bed9
+DIST buildah-1.14.0.tar.gz 10895764 BLAKE2B afc99c12737651997785ce96793afbff24e514a89e445ec5e176940940335b5966cf6e05e3d418d2aad2308d604e05879874eb5d5c07182dc0484e43411628e7 SHA512 c2fe27ccff81cc22dcb398f6d57f618015a1f534510888966483002d552c5f233b8899f639dac15d0f299c6c618e6f1d9889e65c745ce4709e7abd9498258a86
 DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
 EBUILD buildah-1.11.5-r1.ebuild 1584 BLAKE2B 2435e6136bbd7b261aa25cf1a1bd8cc83e417900c0bb2bdda0fa2de0ea39e67240770b0f0d25141a303892a931acf72a412c600f349342cf89528be227a1c9f9 SHA512 ae2f57cbdf97f30dc56d0eedecd7480cc7a3f5b88c1b1d3d25fe155249db8160466a2a606b32530e2607a3ecc952f3855d2ca16a98a117767d0494dda31e0477
 EBUILD buildah-1.11.6.ebuild 1584 BLAKE2B 7ffcafe3e88de41edb8d0b8b8433c451c40ec42ccc51789cf0b6f24b566bda4fd57c54559a44f8e305bf9f56b55d0c4695be2a38ce2063964f369e0edeb0b1a5 SHA512 c385003b323de4cd79aad24f7a12c57c61c55a9a2e0245ad1bf1cc21cfdd1e2745e464a79c835192f19356dabbdaaeddf0df8a709d2ce1de6ffb7c7c3401cce8
 EBUILD buildah-1.12.0.ebuild 1208 BLAKE2B e9195ea67dfddb0e592f7d0de2a4809e575b87a343d4cb6380950aca7031be06e87b83bab22ea33ccc5986f9764440b4311cff707aa206dff621c7f7b1b9a2bc SHA512 5cc5b01169134a55a930033bb0aa5ded2869d47a7e674afeffebd5b8d88e989c1f5b4f98d62ad4b0fd7ed46af100c380432b949ce5f219620b69b8224dd80d5b
 EBUILD buildah-1.13.1.ebuild 1208 BLAKE2B 4ad98c84dafee7a8def81f6065eefe3751b5c63c623a96fe2c61762fe477346b955bce15c58f4c0c70ecf1f9917a1c84b44643de7e46aae7650d7c73bcdad75b SHA512 60bf145750f0089e63133394fd44a2fb446a9cba41f6842d4cfcc86d1753e4b79950b7b8b0330ea991201c72602d25ababed8150183a45e04ba1e6578289f3d8
+EBUILD buildah-1.14.0.ebuild 1208 BLAKE2B 83e6645cbfcadeece94da5b0a5ef8ad8efadcacea0e14723946b94e727bc75b2bfbe88645c88525ba7f6bbfb3f19c4a5d9db80d45cafea4d4e26702126d12c3c SHA512 38400d4fbd7aa24ba9efcdc673d9673bc19cf804cdf9a78d8406d264b8b543b1df44f095e15811a13c01ac0b627190424028a9e82ddb65a23d87daf291011a74
 MISC metadata.xml 327 BLAKE2B cd14ee5c563ac21da34ce7728d2d12b797374bc43c50f4a9923d773ae4e010d4930793a0f0ecf610bb798fb3f1b7cd567944cf9895258e9244c3852969ac2406 SHA512 bed26d87edba20ed9385633b70b8bc23fc046ed95aa9b608400933ed4199594f6d0461854060a68b42d33a9b7be0d1b61f52e22e0d3b6d2c2248f58442094711
diff --git a/app-emulation/buildah/buildah-1.14.0.ebuild b/app-emulation/buildah/buildah-1.14.0.ebuild
new file mode 100644
index 000000000000..eb7c61b39ef6
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.14.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="selinux"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="5965d9a"
+SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="app-crypt/gpgme:=
+	app-emulation/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	emake all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin ${PN} imgtype
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index d12ea32f8e42..b96de59bac28 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,11 +1,13 @@
 AUX containerd.initd 733 BLAKE2B dee4f7bad7250a1c8ca87b3b862d73f9150d73dd2b719bf8d7420dde704174f237a9023a9546cfcb2a122bb74ef583119c9668b453f11612eed26aca55044132 SHA512 d0193e784c62070004e43a7d8b8834bbcd2eba51faa7f8505cea04e06740f5e4950e5c036aa32edf3f592c02f3dd9e65214a6adba8579bdf9c79ae556af94462
 DIST containerd-1.2.10.tar.gz 4923354 BLAKE2B 6727fde9949ca96f351964df3c0c7481cb5274895aa3b31552258d57cc5958bd2d3006cfe4d87088d24ac53de1c391b6029b3f800363ee743f08e1937f0d0fec SHA512 14d4f1cad1a68414915c1e98b64dfb6f3f29a0e86e18570d6cc138f4db14b56499b978135954198fe9e2a1363383694eed530b301a9dc699d28c305d4dbf3cd8
+DIST containerd-1.2.12.tar.gz 4990623 BLAKE2B 640ff03f74e94dd3f919d3c26015cebae1f316c910442db881cd999c92991b7011131f05501648e9f08b6e34d38e2aa6ee1065ae31550de88ad79d9cafa5687e SHA512 bcb4f94aea984c804e34137cab6aad252c01dc75d5e33ade5d1e533e4266fd0af67d2bf8aa85f0e6eba4e43756e84f884f1dec4c9febd66f8a3e3bc8cd3ac775
 DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 202e19cffbe2b5335558dc1db28ea28a05dcc9e9b3aad864e090d86f7590df9e67ae685c9fc6ab2b8abdd1762d001fa9b298b1d311c080449bc86087b6af8c36 SHA512 287b064cb3e57369e34f6debb434526d6bd4857e337e489c56e4ca484c66e161bbda911b4fc29cb49808a756f6ec7af5629e46d693644500e3bf2d9e45e87e73
 DIST containerd-1.2.7.tar.gz 4877757 BLAKE2B 6cf98e370547d3ca5158f546e72e3ff5fdccc08c2e9f390988d080222195f95512dbf6f7dc042b7a966283a040000b7b8777b3fbeb4c5b861caae4f6209c59c5 SHA512 b96ca236d28933c1bf309fc7204af7d2c356e19af394d5c2274a178c8f15298faf6ca9bb8e7d04acb7c3c9c41035446643a8df0103017f7ed0320bfc37cb8ca9
 DIST containerd-1.3.0.tar.gz 5697153 BLAKE2B c334cfd2aa11dd430c74bc9f3fe6f31d83faf752b9794da26021033bb6af492c48ed1665fc76ddfe5b858f04d45e9b77505f331e3c3da556af2d75e3cca3bb12 SHA512 cff9f0189b9fdc2b5492c92129af284aa8cd099e48de94cafd90aed191e2d20060c96008111b05fe081de0d4fc41d35f8cba5a3dc2d8cc0a5c37f695fd3cedc1
 DIST containerd-1.3.1.tar.gz 5703741 BLAKE2B 6eae3fe9714128e7a5378484115378629baf6c4f7ef4b795e625cc1fbc05323a123c2337c5b203a2c3c3b34486c81f7e5b3ad200c000c961931fc99347ef4513 SHA512 4991286d1a8a221dad24121c5e6cd31a00685d91e652546d0d97745624486450bc05ff4f889f2975c178c4c175fedd7b15f89121a7ce4e6687919aabd04501b4
 DIST containerd-1.3.2.tar.gz 5704320 BLAKE2B 32ea22ff445cc66f4c8db8abdbaaa7fa0c8c620b294bda54f2319045af1925398057ba1a5cb5c265cfc73bcff5b49943013b517ecb3bd05f4504920c4a8d6f29 SHA512 768a19eb0829e196a61ddedaa11b0d6691caf8f9cc590a3e47ac77c1acad62e64b7a55017a1a6cccfcb87785a083d5ce131048b0e39e48c65e6cd5922382fc3c
 EBUILD containerd-1.2.10.ebuild 1436 BLAKE2B 2ee522bab38cd81a9ac23bd8f7a2021abde9ba2dfa972a57c35f67700b44b2f946a312cee5512ae62bae4cc43aebdc469e366d4280c287018db88074b0c24553 SHA512 07fde13f2d1809fc7f5bcc57e39c425bc4f61d18f7cef4acca7ebec45c9c758742a27ec8343235fc23a887092aa782bb3662528faffdf23a93aac255f413c096
+EBUILD containerd-1.2.12.ebuild 1435 BLAKE2B 13a3717ffa8cc95ba8af26428925949d44223040b497ec30da9105d2c144b57ac8344ce265ef1bf07ce527b09fea10302cf1fdd9d88901fa2880bc5be6d3d648 SHA512 a81597467ad007308d96f36446dc838e4afcd37148c81ec40c955958d8a863d260a899474c3e373486c05254f7b7dbf8b94fca01f854279209af89fda2c64d08
 EBUILD containerd-1.2.6.ebuild 1436 BLAKE2B 15ec996c1e39e5907c80e161d64f0854e99bfd33d7ec0f91d53afcca3964fef23c52b89db1b42c99d976b0aca513c759038e2fa913b085f19c5ccad69e1c3e34 SHA512 1e43851c799501c712b5be468bb3469c89177e856dd4bea40c2b130cbcd3b2fb5acc1722285f1839562e837d7cd0243b0138fa418eda293843d4626e34b390a3
 EBUILD containerd-1.2.7.ebuild 1437 BLAKE2B 5483fceb26472d3b98e88d9d507b11b2ebb8cef7a8b254cfe106384cdb79975b3bd9804f63876e2b3f5b08d0ab96beeb50210ff850046bc98f13ee6781a38376 SHA512 e676267b0e4ca108735f16c1d3bee9d1edb3a4287a0b0e1ffd4a11005055162f76b11a0dad1e4d22ba57b48b2bbc7e862005d58c4861011c5d8f6047bddca47c
 EBUILD containerd-1.3.0.ebuild 1437 BLAKE2B 1d1303203e48395437fc53cc232571093de834e0b5b9dc7fa02c7864372adaa7340906cfac7c1c56e645a8d4d18a39d5a7e32e9f547c8a3905fee4fc019a681a SHA512 6689ab82a9b3d73764d7149e094781670148815e2b255ffbaa31887a3a0153ebe4930c49c2bcf73befb02410aea2ad023f33e26c4ab6a605e8097a84de76c36a
diff --git a/app-emulation/containerd/containerd-1.2.12.ebuild b/app-emulation/containerd/containerd-1.2.12.ebuild
new file mode 100644
index 000000000000..d2c5c94985c2
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.12.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT=35bd7a5f69c13e1563af8a93431411cd9ecf5021
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor +btrfs +cri hardened +seccomp"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )"
+RDEPEND=">=app-emulation/runc-1.0.0_rc8
+	seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			-e "s/-s -w//" \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/lib/containerd
+	dobin bin/*
+}
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index f0d245aa8ec6..b523992ed056 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -21,28 +21,28 @@ DIST install-crossover-17.5.1.bin 198278549 BLAKE2B e53504177eb4a4030a31ae73baf2
 DIST install-crossover-18.0.0.bin 206792916 BLAKE2B d1784ddd2dc568d2b6f1fe60b7fad149e6128e61d2315b2179f4d87b7d49bc0166851df3fb3e39b911bfbbba6366f8c98f63e47e18abb173a1129f11795454c7 SHA512 3ad7393714a43e7323ad6e81ea8f165df9253dfdfff20fc68f5091e77b288b86c3a3e11883732dc73ec5c89e500005b6451899b7e43fc4900c6bd40445739281
 DIST install-crossover-18.1.0.bin 206784995 BLAKE2B 4e8ae8330373b505b2ed361e314bcdaf3564a0b846484d2708e64e94d3fe856c35e1d235fa474d4a079a8c0e88dade02bb1e93f0608d1ec99dca2a3a74f7865c SHA512 a679f0a801a6c2045a724ae5935745457689ae73ea4246daa1fc89a387f42c55ba0431db8fcdf48ba7253f616613adb51ca0402fe19480c0254f614fcb6884d8
 DIST install-crossover-18.5.0.bin 224996342 BLAKE2B 300141bcf7c54ab1ce8229c6930df783454d450aee7b1be3cc3a193d1501320dee3e6fdfb3f37c56ae76e97f83f1b45838f1d5b7ed9793888a51df0203fe6dfe SHA512 ce44d7f79280adb36ecbcbdee3fa743dcca47b629fd1cb0ae2afbca56514df96e78e1103f09f5059aaf971a3a561f992158104ffa30bdd28925b14e58bd96855
-EBUILD crossover-bin-12.5.0-r2.ebuild 3831 BLAKE2B 417c21afef0d423da3ac0081de40dd1f406b832ee9bbe9de78672c47d6ade15b3cae312a795ee66112cb6879419e65f8f092ba32a7f46e207430bfd0516c87c3 SHA512 1d4c46b5710a16e50203c215eb0e76162a870702fbe58452c76eb1de1c407f08f54f477f6e7894bb8831ff1b601bcea220ec7bea15c97cb0151f55ea4fc45f6a
-EBUILD crossover-bin-12.5.1-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-13.0.0-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-13.0.1-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-13.1.0-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-13.1.2-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-13.1.3-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-13.2.0-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-14.0.3-r1.ebuild 4207 BLAKE2B 5b9a6b2e5a2507661ded1a422de8eec241c52c72c9572d797e17dd5b7a60d1f901d1953af6a2fa7a231a5d4438511c12337db27783a9098f2d29f420842ac5c2 SHA512 616dde819ae73718e13ece9623ff51127beba851b929b6ff4a03d3c31a3da33f355293e0c6ecd154afe40ab51efa0288946a7b486c184d0fa252ee1c4456beef
-EBUILD crossover-bin-14.1.4-r1.ebuild 4208 BLAKE2B d1c7cad342ade2a42770d614838118b55f91756f77aaa9bca1fa7dc4fdd401d027022dfa1bf255e103a1336c21639289e0d4173a5a56c90902ea2b6b6ad67797 SHA512 42b5169b27c8d882997386eb50d446d5b35ae949306c2d435fbada834ae44bad03491d80fc6c8459d03560ec963be24f4cfb271cb09fe5d46770fa61f8bf0fb5
-EBUILD crossover-bin-15.0.0.ebuild 4538 BLAKE2B 30ae6ff406a8d2e2d4622d04e21246fe7475589f9f5f89022d6b6f04c6950845dd5142e7cce2e7a3b11e0e8b81e7ac1d684c40495e00fca41889a36318e09b86 SHA512 4b2de97c09a0e5f10206a37e0432b93b9380b405f0015332c57328335c5838ecdeaf8c69a347f789afb8e8196016e20b5febac6e86dfa9b8933e8f4d6ba1f235
-EBUILD crossover-bin-15.0.1.ebuild 4710 BLAKE2B 8e15a2d9d70f1b5e571a3bd1486dd59289b87fb087826f6aba692b0ca71f31adac43d3cee37f68b31ee5bf6085c50a11619132b0ca504ef8be1bdedb35f4197a SHA512 e0b2776b1f91f6c42175db3350fd3426f1dbe056a6a2965358f039daedf0fff89598bbd675232b82333fd7e3b078befc259e267c41520b0e8cf79349d53e62ad
-EBUILD crossover-bin-15.1.0.ebuild 4710 BLAKE2B 8e15a2d9d70f1b5e571a3bd1486dd59289b87fb087826f6aba692b0ca71f31adac43d3cee37f68b31ee5bf6085c50a11619132b0ca504ef8be1bdedb35f4197a SHA512 e0b2776b1f91f6c42175db3350fd3426f1dbe056a6a2965358f039daedf0fff89598bbd675232b82333fd7e3b078befc259e267c41520b0e8cf79349d53e62ad
-EBUILD crossover-bin-15.2.0.ebuild 4885 BLAKE2B 8e26cb3add2ee735ee071bb75415167627db681f3937e4e8b934de912ca8252d3486915c0978a52ecf452aedccc104c263ab7bcc9ddb53516ee0f051824baa17 SHA512 98f6b32f0bb9701716104c9523424e6843b42363dc4f7dcbab34f8a460ba06a11ea1e7043c8b20d0b31f8efccf499a3a29f11d8b40339e947b8ebc7fdcce475a
-EBUILD crossover-bin-15.3.0.ebuild 4882 BLAKE2B c09b3073970195dedc5692d2ea4272fd761ccfdd18885238da599cfa9172dee72839aa127988845c8f540b5149993930d4ddd2a0fc38c338e58000be7fbbe014 SHA512 aa206405ff57361b3bcdd4af3e3a0ae78a083a992c0aa9ed8443d45b288fa3f6b98c479f84b9c42578c3760c3689fc62c5325037e690ffba08319d408d8327e3
-EBUILD crossover-bin-15.3.1.ebuild 4882 BLAKE2B c09b3073970195dedc5692d2ea4272fd761ccfdd18885238da599cfa9172dee72839aa127988845c8f540b5149993930d4ddd2a0fc38c338e58000be7fbbe014 SHA512 aa206405ff57361b3bcdd4af3e3a0ae78a083a992c0aa9ed8443d45b288fa3f6b98c479f84b9c42578c3760c3689fc62c5325037e690ffba08319d408d8327e3
-EBUILD crossover-bin-16.0.0.ebuild 4882 BLAKE2B c09b3073970195dedc5692d2ea4272fd761ccfdd18885238da599cfa9172dee72839aa127988845c8f540b5149993930d4ddd2a0fc38c338e58000be7fbbe014 SHA512 aa206405ff57361b3bcdd4af3e3a0ae78a083a992c0aa9ed8443d45b288fa3f6b98c479f84b9c42578c3760c3689fc62c5325037e690ffba08319d408d8327e3
-EBUILD crossover-bin-16.2.5.ebuild 4882 BLAKE2B c09b3073970195dedc5692d2ea4272fd761ccfdd18885238da599cfa9172dee72839aa127988845c8f540b5149993930d4ddd2a0fc38c338e58000be7fbbe014 SHA512 aa206405ff57361b3bcdd4af3e3a0ae78a083a992c0aa9ed8443d45b288fa3f6b98c479f84b9c42578c3760c3689fc62c5325037e690ffba08319d408d8327e3
-EBUILD crossover-bin-17.5.0-r1.ebuild 4758 BLAKE2B 49d065f71467fb68b2815bfa6bd2fe5d94ae8393735eef7cd152252f370f281eccc48c288a05ddc56c83785327e8c7fee45e2b3c1fa87ae4aeb12b3c14e74397 SHA512 80413aa52bf1301547d3a43db2ded483808c4e64eb5a6bb4cfe397bc38bf964cbb1468b30d37f5017d0ad62129d75ea5d4f7a02e6f73237a868b1f3159d0e507
-EBUILD crossover-bin-17.5.0.ebuild 4724 BLAKE2B 62d1ff8c293a921f9bbf9d2cdd34b11a1916a22f660884ab29c5ce987082fabc2766368be7d4c3956767229a621350158fb1282128e393dcf9d90b16e7488b03 SHA512 d59a7752b81d24b118d1f1494ab4e08acfa68f1268c75a0bdd19d7377db9ab5f9121c263a96408f64968fb508bda8a1e03938ebb97deb68ddf2175e37b625b94
-EBUILD crossover-bin-17.5.1.ebuild 5272 BLAKE2B 8926ff071b5895551c91b594688c2ef26a542795271458cb75a3075a990a8164013d7e701e54552a6a1cbed1b68570716bb6677ddf48fb444791ad7e8ac0cbde SHA512 0bf118e7a94166c645d0c3441fc1030c6f43e9435604d2af9bc3ba0abd817aaeb84bac7e84dc294853928cbd8e01ef694a5dc749e277428e882a189f834f8711
-EBUILD crossover-bin-18.0.0.ebuild 5496 BLAKE2B 2b1bd7bdecbda88184060410a2f08e3fa0d870e12faf97fb0d7245afd9141434269c25ecf5f15a9271f6cd7ba0472d3292ba8e9b1b0f6ca68de4c5ba3fa3ee9b SHA512 308ac99409c0e13ba9a3356919870565ae2b4d97f68dbd838e4d884f335c066eb00a0de318efa10e7088f1ac017b31a9a3595a4b6807d3cc0e4844833f95be45
-EBUILD crossover-bin-18.1.0.ebuild 5496 BLAKE2B 2b1bd7bdecbda88184060410a2f08e3fa0d870e12faf97fb0d7245afd9141434269c25ecf5f15a9271f6cd7ba0472d3292ba8e9b1b0f6ca68de4c5ba3fa3ee9b SHA512 308ac99409c0e13ba9a3356919870565ae2b4d97f68dbd838e4d884f335c066eb00a0de318efa10e7088f1ac017b31a9a3595a4b6807d3cc0e4844833f95be45
-EBUILD crossover-bin-18.5.0.ebuild 5496 BLAKE2B 2b1bd7bdecbda88184060410a2f08e3fa0d870e12faf97fb0d7245afd9141434269c25ecf5f15a9271f6cd7ba0472d3292ba8e9b1b0f6ca68de4c5ba3fa3ee9b SHA512 308ac99409c0e13ba9a3356919870565ae2b4d97f68dbd838e4d884f335c066eb00a0de318efa10e7088f1ac017b31a9a3595a4b6807d3cc0e4844833f95be45
+EBUILD crossover-bin-12.5.0-r2.ebuild 3874 BLAKE2B e8617f6fc4da436e9dfc5c4429210c0fc49879d1b50ce22325ad86259c859f3a4ef8bfe71fae6a73d3cc37a6981809d1fd0a98790f74aa1dc039c6f44b681485 SHA512 0fd826845aef6878a00be0733b778b18aaa4813125d6d652e4e508e8399bc2554c7d3ba2420e47b72aec3df8f0821c64260aed65d26923fc568441c2bfbe10ad
+EBUILD crossover-bin-12.5.1-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-13.0.0-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-13.0.1-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-13.1.0-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-13.1.2-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-13.1.3-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-13.2.0-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-14.0.3-r1.ebuild 4250 BLAKE2B 5ba671b023732d87d880744ec61735620553079c5e7c227ead81fd020b9826db8a8c65f4b702e2626845f9e2609e196a091fad0c6592539b7447feaa7f68a5c5 SHA512 3dd72bf59db3ba1ab8437c323c0a37c91250e7b728350961cce1e0c866120ecd7451b87e8d05c303946b2ee36e86a83ee99f4e4924d95ca671fe3e225a9178e1
+EBUILD crossover-bin-14.1.4-r1.ebuild 4251 BLAKE2B bc35e256c22a584b83bf7777c1638db8eb3dc80879a9ba02aee17241052f406ff89c81fe1c3e2b52a33ccc86d1c3ae205c3ae2a43fb88e11a1fd0afd143bd423 SHA512 26eaf71bacc1e102aa7fd6cac605dd1603c4479068d620394d1a9916f6a69b6b887d5e699a3e64316ed11565c46ceeab83af56079c6d560c285a3f99b046eeef
+EBUILD crossover-bin-15.0.0.ebuild 4581 BLAKE2B abd895ab70c16ce31aa0772937556439b368a159fd9d7c919a7286b7cc2215619a3efc433147b3472156974c014299386083ff8c6169f58b2c3bc97b78e64bad SHA512 2a3c45a4c9110b591156b16bcaaecff36fab44868b5155174ee93c0d17e9e816d08030bf3581c20c4d7bd9e23f5080e825d88fdb166737192140844436634ae6
+EBUILD crossover-bin-15.0.1.ebuild 4753 BLAKE2B 33444ddd659cb923903c33f2189598a47f8d16a709bfcc0a74d9a0694f2057deff60a62480d6fb6dae5614a724edbffeb17f99c0e970082576d9ab71c422279f SHA512 2c3bd78577d9783451de7a171557b3ca3bd9c080f8b748f700259ef9c27860ba836c0ef5f97c2d1245f21f8a61757b6292580a9c485d5e6b1bced0303b7a822f
+EBUILD crossover-bin-15.1.0.ebuild 4753 BLAKE2B 33444ddd659cb923903c33f2189598a47f8d16a709bfcc0a74d9a0694f2057deff60a62480d6fb6dae5614a724edbffeb17f99c0e970082576d9ab71c422279f SHA512 2c3bd78577d9783451de7a171557b3ca3bd9c080f8b748f700259ef9c27860ba836c0ef5f97c2d1245f21f8a61757b6292580a9c485d5e6b1bced0303b7a822f
+EBUILD crossover-bin-15.2.0.ebuild 4928 BLAKE2B 51fe78f65173665f9e18d8bf25b7022fc3934191101b2fe72bf9f9ec5d4c4c89582bd9dd3a1b0726b0ce36eaf655ba28d406a8f4b5fdd3bb73c82503d9443140 SHA512 45abaea9496c4c76e61b19d3469546e68b0ee430278b294bf682227649dd1ba3b1d56a7bddbc6f28021fee68cad28255a2d77f10801165c0e54a57f9a4dfeb25
+EBUILD crossover-bin-15.3.0.ebuild 4925 BLAKE2B 2828ee2da88c8f709764048b45a8067a4a88ca8834f63c379c438364bfb20e28ea9550f9b49048a6794cd8e605f99b9078e498d385a85be8d57bdc97c895674f SHA512 6bbddd5d73717abd76ac6ecd9b53e39436e58f32041199ab1fe4de961c6b0ec8a5bee102bb912b033787b934403c3e1a8a8de016f8fc21e30dbcb16526c8c519
+EBUILD crossover-bin-15.3.1.ebuild 4925 BLAKE2B 2828ee2da88c8f709764048b45a8067a4a88ca8834f63c379c438364bfb20e28ea9550f9b49048a6794cd8e605f99b9078e498d385a85be8d57bdc97c895674f SHA512 6bbddd5d73717abd76ac6ecd9b53e39436e58f32041199ab1fe4de961c6b0ec8a5bee102bb912b033787b934403c3e1a8a8de016f8fc21e30dbcb16526c8c519
+EBUILD crossover-bin-16.0.0.ebuild 4925 BLAKE2B 2828ee2da88c8f709764048b45a8067a4a88ca8834f63c379c438364bfb20e28ea9550f9b49048a6794cd8e605f99b9078e498d385a85be8d57bdc97c895674f SHA512 6bbddd5d73717abd76ac6ecd9b53e39436e58f32041199ab1fe4de961c6b0ec8a5bee102bb912b033787b934403c3e1a8a8de016f8fc21e30dbcb16526c8c519
+EBUILD crossover-bin-16.2.5.ebuild 4925 BLAKE2B 2828ee2da88c8f709764048b45a8067a4a88ca8834f63c379c438364bfb20e28ea9550f9b49048a6794cd8e605f99b9078e498d385a85be8d57bdc97c895674f SHA512 6bbddd5d73717abd76ac6ecd9b53e39436e58f32041199ab1fe4de961c6b0ec8a5bee102bb912b033787b934403c3e1a8a8de016f8fc21e30dbcb16526c8c519
+EBUILD crossover-bin-17.5.0-r1.ebuild 4801 BLAKE2B 8269c5fea9dfaba93ab03a3da7470385afef34ac1a132da76b385365e3bdaa6f9bec56a97cc2ab4dcac9f0ada2061a397375064e45af7013e21ef7f7cee40150 SHA512 af3d6aec254edd49cd057a8e741e38856dc9af86681ef44d8100d4addf72337aab97169fe1d62167c41566830162706c1bce34fcdbb8301f65a7a026e1032e79
+EBUILD crossover-bin-17.5.0.ebuild 4767 BLAKE2B 371b22e6af826da7eb67f12949aa4fbce816033224eb0670c36bd0957ab9a265939ea37b1d047a6a84fb1290983068f54a8eb3cd4d4225b2e5aed180d6e36b19 SHA512 1a660015123602db39efc766189bcd502fad6d0ffe497032db27241c04a11d48a87c0d53939a87440f7c137827ad9ba779aabb68d0728c05aa61d38e4b9b60cd
+EBUILD crossover-bin-17.5.1.ebuild 5315 BLAKE2B 55b93a199734ddc6ef85069d1889ac92202e39a8293bc4f018dd3ffe8c2ee94b5deb207fe81206f619c1fdc34be5a7be5d43b1759d7b351ae248bf3c61bd6851 SHA512 47e7090c299d605bf52c8ef2614e6ac7e6c50c667455e84ba74a904d160354d5d4017350bb6be717a3850d65319841e258e5b9a3c86927001f3996aaf7223ca9
+EBUILD crossover-bin-18.0.0.ebuild 5539 BLAKE2B 646d073e0c2b4cb0748ce536e74261ecb8fa6671935ddc91295c900f207883888e226017f1fed5c564d8591ba9769f8da5bbcb73074613de1402664a4470d856 SHA512 d091e40901b338ddda288a7780c00e0425717481115083f8e947d13a7badc8b5f178056defbc9b3c81a37cfde2f88bd07b5ec99bfd05261ce0dd44725fc2cbe9
+EBUILD crossover-bin-18.1.0.ebuild 5539 BLAKE2B 646d073e0c2b4cb0748ce536e74261ecb8fa6671935ddc91295c900f207883888e226017f1fed5c564d8591ba9769f8da5bbcb73074613de1402664a4470d856 SHA512 d091e40901b338ddda288a7780c00e0425717481115083f8e947d13a7badc8b5f178056defbc9b3c81a37cfde2f88bd07b5ec99bfd05261ce0dd44725fc2cbe9
+EBUILD crossover-bin-18.5.0-r1.ebuild 5539 BLAKE2B 646d073e0c2b4cb0748ce536e74261ecb8fa6671935ddc91295c900f207883888e226017f1fed5c564d8591ba9769f8da5bbcb73074613de1402664a4470d856 SHA512 d091e40901b338ddda288a7780c00e0425717481115083f8e947d13a7badc8b5f178056defbc9b3c81a37cfde2f88bd07b5ec99bfd05261ce0dd44725fc2cbe9
 MISC metadata.xml 364 BLAKE2B 9978c9532a9bd1adcfa22f00db6a8fd80fda155a6adc69ee0c0693093e7a7ac0a0eba1ef5a0657e6dff5aabdb7e6259c883aceffbba89b495a25b0d3e26e5174 SHA512 68f361d337b167c549eafab8e45dcb33548ac67a206ead2f7118330a77888c6e2ba4dbe7755ca23c81a5e619458f25359e3f2d8eee4f6d0e359b5c3a28475096
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
index 15750dd80789..78d5be269b3e 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
index ba03accfe227..c96c8632eb57 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
index cf4b4f10d80d..7b3f30280c50 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
index c8154f99883d..f5a9ee2ded65 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
index bdb0de9d05d2..71dba5bd4ed3 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
index bdb0de9d05d2..71dba5bd4ed3 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
index 79500b6a3914..35a162c94cac 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
index b3537aa9c934..b70ac3a77fd0 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
index b3537aa9c934..b70ac3a77fd0 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
index b3537aa9c934..b70ac3a77fd0 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
index b3537aa9c934..b70ac3a77fd0 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
index 00827f7ddb60..d3cb1e980327 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
index a160f02ad3ea..5096405e6199 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
index 006df8e97168..96a7c42364fe 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
index f2e4d02eaa7d..170b56d9e884 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,8 +48,10 @@ BDEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
index f2e4d02eaa7d..170b56d9e884 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,8 +48,10 @@ BDEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
index f2e4d02eaa7d..170b56d9e884 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,8 +48,10 @@ BDEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index deb1aec81cdf..8948aeff3056 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -1,7 +1,9 @@
 AUX faudio.pc 245 BLAKE2B 8231bb42f6d90dd814eabd12d4d582d74ea0f154d6913fa710814d1bd75168d667463fd430d827ac7854aaa76bc07d16e5ccb3f6455e990ae0e2bc21bc633291 SHA512 bbdce2d90fcf848b8ef6a7a47a5bdf535d261aa833d6821de21907be05cca8693fede48c0e4161ae8087522297a2ec5af8c5ff5ed42efb814bbbc195ff963059
 DIST FAudio-19.06.tar.gz 899089 BLAKE2B a59ad9613bcfa71e1fc8be1f2d389f56b8f96430c354b7c7148d1e1e084102b6d8559cd258f3ab6969a4ac93e55ea2397b18dc417857e9ee0f022ea0dae65c0e SHA512 ba3ee18b47d8d85dc39e777c420522349f9873cf1528dd6c266f7254fe27cdb5bb6ab5bcbeab870938b509bfd006590d2380908b7d1e3fd679d2a434ce82eca6
 DIST FAudio-19.09.tar.gz 901659 BLAKE2B 8bb99c67b6da2660e71c7a8a70f83130738a07e7f4ddd2001fb857c81a593935506a8c1fe6d24bfd064537ea4a5a603973c32d839228d7b3f45c9c300ba15147 SHA512 127f975c68e2b449fa7cadae0723925f35ca7a2841ea3fd85037febe964331de4b2e3031ab09c292ee5f40d90902dcf78c75cc3fe7fbe4d6f37a822b4d9eb966
-EBUILD faudio-19.06.ebuild 2450 BLAKE2B 5da500f87ff5de76daf26967b333974af357656e2c9a36c8a0a27ddfe32f120dac884461731850fadc8e8309c7836d31e87b87a6c41aac3343f0144964ee2c7c SHA512 e7708fa8ec279e2f59fef965d0552058d67a5bd67c378054aaee6ed1319394c190881162749b1704fac8098ee74e2ab7b358e973c63a412a8ecd65810d78283f
-EBUILD faudio-19.09.ebuild 2450 BLAKE2B 5da500f87ff5de76daf26967b333974af357656e2c9a36c8a0a27ddfe32f120dac884461731850fadc8e8309c7836d31e87b87a6c41aac3343f0144964ee2c7c SHA512 e7708fa8ec279e2f59fef965d0552058d67a5bd67c378054aaee6ed1319394c190881162749b1704fac8098ee74e2ab7b358e973c63a412a8ecd65810d78283f
-EBUILD faudio-9999.ebuild 2450 BLAKE2B 5da500f87ff5de76daf26967b333974af357656e2c9a36c8a0a27ddfe32f120dac884461731850fadc8e8309c7836d31e87b87a6c41aac3343f0144964ee2c7c SHA512 e7708fa8ec279e2f59fef965d0552058d67a5bd67c378054aaee6ed1319394c190881162749b1704fac8098ee74e2ab7b358e973c63a412a8ecd65810d78283f
-MISC metadata.xml 1341 BLAKE2B a5fe79fca0c7f184466254e5f251c6248c20415795933b8797a4bd899535735ed93b54754937ed1003103cbbe3d5d6c5ffc5848c255cfd759cb06fb973065003 SHA512 8ad14c2ae094ff4ffd013458db62263b97cc5e616885cb229ef57ff8a4ab0dd943c2ab3840d086a81a4a10962c0d7411741ac6a8daaefb5167fe988a1dd8122a
+DIST FAudio-20.02.tar.gz 908051 BLAKE2B 7f9323e7528949680b39469b3549adbef9acafe6f293c643676117648fd6871639fa8c7a47fdc0e1232c0533c0af9e89953415a0935fa4ad7b831aa8a8243f30 SHA512 69995fa1fb9ea41182e47f8143252db517adf4e9dc4a0556c9032af5c867259cc7edc81196b10ef043e6118a2e3687b34368f3ac8ffe9294398c5143b9928476
+EBUILD faudio-19.06.ebuild 2404 BLAKE2B daa675da55fbd28eec56780e6a7ff7a535b35a43b2f08ed8507178d6b23c316f8c4c31741cf0b0b87b8f5b65dc8a665c67b2095208e3b96e095a93f9cde2393c SHA512 5aa4b4cfef73d4f5e1c3308dd8773d39338f28b121f46fc47fa0bea55261f6a8aabd723fe6fe1946beacdde6321b4d0de973684909ebc94fd30b0450eb1298d8
+EBUILD faudio-19.09.ebuild 2404 BLAKE2B daa675da55fbd28eec56780e6a7ff7a535b35a43b2f08ed8507178d6b23c316f8c4c31741cf0b0b87b8f5b65dc8a665c67b2095208e3b96e095a93f9cde2393c SHA512 5aa4b4cfef73d4f5e1c3308dd8773d39338f28b121f46fc47fa0bea55261f6a8aabd723fe6fe1946beacdde6321b4d0de973684909ebc94fd30b0450eb1298d8
+EBUILD faudio-20.02.ebuild 2508 BLAKE2B 5eeaec2d55bdfb58f1e272b8d25561e55127c757e800c41eb39c1be65a00735838d09a66123ca56789c5462fbda0d1779a75716820f4b69836ef79844877c4a7 SHA512 a3e2698446f1402c2d58391801aa3e28bf0b569fa587b7a70e6c6391e8e2d5d355587b01d52f6fbfe326d4445d11e1222b22e9cc26ac365824402ca9a5aebbf3
+EBUILD faudio-9999.ebuild 2404 BLAKE2B daa675da55fbd28eec56780e6a7ff7a535b35a43b2f08ed8507178d6b23c316f8c4c31741cf0b0b87b8f5b65dc8a665c67b2095208e3b96e095a93f9cde2393c SHA512 5aa4b4cfef73d4f5e1c3308dd8773d39338f28b121f46fc47fa0bea55261f6a8aabd723fe6fe1946beacdde6321b4d0de973684909ebc94fd30b0450eb1298d8
+MISC metadata.xml 1485 BLAKE2B 2be9f299ab02a56e964c19978b78e201ff03e06bc870f8b7703ab6f7ff2f4ec8ce567433ecf3deb6736b96d1bc411ab147fc84c68a28b4c3f2afcd159e813a8b SHA512 b9df5b457ef4139f8be77d92c2f6992452ed1d69dd654743742e1421f4893997a190be6746ac850aae54510ddea398834e3de937a198e3aea54731b10668f178
diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild
index b776945034dd..bc47b4154131 100644
--- a/app-emulation/faudio/faudio-19.06.ebuild
+++ b/app-emulation/faudio/faudio-19.06.ebuild
@@ -44,7 +44,6 @@ multilib_src_configure() {
 		"-DCMAKE_INSTALL_BINDIR=bin"
 		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
 		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
 		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
 		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
 		"-DBUILD_TESTS=$(usex test ON OFF)"
@@ -53,7 +52,7 @@ multilib_src_configure() {
 		"-DXNASONG=$(usex xnasong ON OFF)"
 	)
 	if use ffmpeg; then
-		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)"  )
 	fi
 	cmake-utils_src_configure
 }
diff --git a/app-emulation/faudio/faudio-19.09.ebuild b/app-emulation/faudio/faudio-19.09.ebuild
index b776945034dd..bc47b4154131 100644
--- a/app-emulation/faudio/faudio-19.09.ebuild
+++ b/app-emulation/faudio/faudio-19.09.ebuild
@@ -44,7 +44,6 @@ multilib_src_configure() {
 		"-DCMAKE_INSTALL_BINDIR=bin"
 		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
 		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
 		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
 		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
 		"-DBUILD_TESTS=$(usex test ON OFF)"
@@ -53,7 +52,7 @@ multilib_src_configure() {
 		"-DXNASONG=$(usex xnasong ON OFF)"
 	)
 	if use ffmpeg; then
-		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)"  )
 	fi
 	cmake-utils_src_configure
 }
diff --git a/app-emulation/faudio/faudio-20.02.ebuild b/app-emulation/faudio/faudio-20.02.ebuild
new file mode 100644
index 000000000000..3b8290fd8804
--- /dev/null
+++ b/app-emulation/faudio/faudio-20.02.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# shellcheck disable=SC2034
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-multilib virtualx
+
+FAUDIO_PN="FAudio"
+FAUDIO_PV="${PV}"
+FAUDIO_P="${FAUDIO_PN}-${FAUDIO_PV}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git"
+else
+	SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86"
+	S="${WORKDIR}/${FAUDIO_P}"
+fi
+
+DESCRIPTION="FAudio - Accuracy-focused XAudio reimplementation for open platforms"
+HOMEPAGE="https://fna-xna.github.io/"
+LICENSE="ZLIB"
+SLOT="0"
+
+IUSE="+abi_x86_32 +abi_x86_64 debug dumpvoices ffmpeg xnasong test utils"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
+
+COMMON_DEPEND="
+	>=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}]
+	ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+"
+DEPEND="${COMMON_DEPEND}
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_INSTALL_BINDIR=bin"
+		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
+		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
+		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
+		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
+		"-DBUILD_TESTS=$(usex test ON OFF)"
+		"-DBUILD_UTILS=$(usex utils ON OFF)"
+		"-DDUMP_VOICES=$(usex dumpvoices ON OFF)"
+		"-DFFMPEG=$(usex ffmpeg ON OFF)"
+		"-DXNASONG=$(usex xnasong ON OFF)"
+	)
+	if use ffmpeg; then
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)"  )
+	fi
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	cmake-multilib_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_make
+	emake -C "${BUILD_DIR}" all
+}
+
+multilib_src_install() {
+	# FIXME: do we want to install the FAudio tools?
+	cmake-utils_src_install
+
+	sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
+		"${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \
+		|| die "sed failed"
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins "${T}/faudio.pc"
+
+	if use test; then
+		mkdir -p "${T}/$(get_libdir)" || die
+		cp "${BUILD_DIR}/faudio_tests" "${T}/$(get_libdir)/" || die "cp failed"
+	fi
+}
+
+faudio_test() {
+	XDG_RUNTIME_DIR="/run/user/0" virtx "${T}/$(get_libdir)/faudio_tests"
+}
+
+pkg_postinst() {
+	use test || return
+
+	# FIXME: FAudio tests are broken and also don't appear to work
+	# in the Portage sandbox.
+	multilib_foreach_abi faudio_test
+}
diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild
index b776945034dd..bc47b4154131 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-9999.ebuild
@@ -44,7 +44,6 @@ multilib_src_configure() {
 		"-DCMAKE_INSTALL_BINDIR=bin"
 		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
 		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
 		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
 		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
 		"-DBUILD_TESTS=$(usex test ON OFF)"
@@ -53,7 +52,7 @@ multilib_src_configure() {
 		"-DXNASONG=$(usex xnasong ON OFF)"
 	)
 	if use ffmpeg; then
-		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)"  )
 	fi
 	cmake-utils_src_configure
 }
diff --git a/app-emulation/faudio/metadata.xml b/app-emulation/faudio/metadata.xml
index 5b153131eaad..02b4abecea6c 100644
--- a/app-emulation/faudio/metadata.xml
+++ b/app-emulation/faudio/metadata.xml
@@ -16,6 +16,7 @@ for the FNA project, including XAudio2, X3DAudio, XAPO, and XACT3.
 Project Website: http://fna-xna.github.io/
 	</longdescription>
 	<use>
+		<flag name="dumpvoices">FAudio dumps buffer data to individual files with RIFF/XWMA headers, usable with players like ffplay/testxwma.</flag>
 		<flag name="ffmpeg">FAudio has optional support for decoding xWMA resources using FFmpeg, requiring:
 			<pkg>media-video/ffmpeg</pkg> (note: this feature is not supported by <pkg>media-video/libav</pkg>).</flag>
 		<flag name="xnasong">Build support for optional XNG_SONG component (note: this not required by
diff --git a/app-emulation/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest
index 30dbdd04f4e1..f9760a0d3174 100644
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -1,5 +1,5 @@
 AUX fs-uae-launcher-2.8.3-QApplication.patch 457 BLAKE2B 814c7d04240bb3e90f18e0b4d1a8041b985fe6f3241e098b0d26f2d8b096ba79c33e04f0c938a3af2a12b55d080f831fbc9da404e8d62751b16021e3f229a530 SHA512 e1892b9a7f440ea373e7a7c8313d56328395fa054918cf402b9a8b5e96c15f48a3bee901aef4297774a79b5eb1d4f909ff4843da16a0f1a6f8a6343afe104162
 AUX fs-uae-launcher-3.0.0-ROMs.patch 626 BLAKE2B 2662476f496345e6dc2f169b8c3e6e579ba68c3c7c1d9c782ce2dff39394520bde6dc1a52d9d43f562bddec9dc28daa3d0e7e1e93f1da48a0a932e1415ad40ea SHA512 8b607f64cd1c66601f7fccf5332377a85e905a6d9ba9fadb9a7234d5f36c350590011141602e093ee7a30dce4c9c6c0e9928b8b7a0be716eeaa15aeff1eacce0
 DIST fs-uae-launcher-3.0.2.tar.gz 9633002 BLAKE2B 81e5a9cbdb4f094735fdbffa291c86bea74e3306ea1bc8365ba215daf970665ab45515c82dd180bfc965f5a2ff83c29a9cd8b21b343e6e6c7ebb4d95dbafd8d0 SHA512 6e9d5588b4cee79b7d5468b7d5e3d6c82e54957fcb0b05d3e9d1da8710336f0af82821fea37ee4cf4e0dc12ead6096183fe488afe860ce11573fd828718ba3d3
-EBUILD fs-uae-launcher-3.0.2.ebuild 2092 BLAKE2B 3b13c4587659152279784229a3d4d9fe602901439e1711896b1d3e5b674f8134a0feae3dbe5f72f2f2eb89ddae04a4cd886a1624f777c7f66d282753175811b4 SHA512 8498556f86faf9f21e2854d680699d2b646fa53219ef03eeb081d2f9256189e1b876eaab979cc989cc41729f688accc717577f55205774d1321585919b6b0065
+EBUILD fs-uae-launcher-3.0.2-r1.ebuild 2149 BLAKE2B 0bd1c672d991dac0f221a3a72b1c2121310b7f02b3ab240cbac2dd2a41f7abe530189bb0ee37eafd262961ba3e2312f98c9d1e08954a2555620321ea83790513 SHA512 f85014e4bd3dbbe9e25ded2fc7013770a1fee22f4d4cc6e4b41297b673fb8a99753b63f9bb8d3caaeeddd107f0391cddcad3d5db64e881e5850af571a85bd337
 MISC metadata.xml 408 BLAKE2B 8722a14caea4642a007f5baf0988f2a2463243b7a019b845ccf6c6a000aa0971fe92011e7b46a013980ef264986889d83a309914cb2465561812775c69461533 SHA512 1ff8604bcb75d5a36f10b0770d5b0983f2ce0674098d21464fc269d47784a261eec7d134b721be3fb49cdba0c01cb668a7b55046e46e67e6325b2cd70b8ffaf3
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2-r1.ebuild
index 627ca1b130d8..834209e132d5 100644
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2-r1.ebuild
@@ -18,10 +18,12 @@ IUSE="lha"
 
 RDEPEND="
 	app-emulation/fs-uae
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,gui,network,opengl,widgets]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	lha? ( dev-python/python-lhafile[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,gui,network,opengl,widgets]
+		dev-python/pyopengl[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		lha? ( dev-python/python-lhafile[${PYTHON_MULTI_USEDEP}] )
+	')
 "
 
 DEPEND="
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 5800c89b9cfe..12495750e7c4 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -35,7 +35,7 @@ DIST ganeti-2.15_2.15.2-11.debian.tar.xz 67652 BLAKE2B d10f83a59a1c2d05fa6704dfd
 DIST ganeti-2.16.0~rc1.tar.gz 4794934 BLAKE2B 867d7d48e98d4490db8279b83b44006e0afc1a421592d523db2d04b4b04636090686773ef890c89df41f0311cbf3c4d5a2c314c39c4429f50b07a7a6d1a9616f SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be
 DIST ganeti-2.17.0~beta1.tar.gz 4880091 BLAKE2B bd094ac421b8b49abcd7643641aa4c2d62aa2f8a4ab55289711cef8c47cc32634bf06b99adbf9383de3945766112a1838d2191dfb51013dc4fba81676e264e64 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e
 DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4d312c23392f428e1e0452f17f48140b6df5193447dd0fa1b5185d6866cfe48c8eb3dd6d22f01f930499471eab7044ca9b7268 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af
-EBUILD ganeti-2.15.2-r8.ebuild 12087 BLAKE2B cbb379c5f4c623d29abb52c8d1d6c886c2acc1737846f100e1832293bfd4043feaf7832baf3ff0e1de8d30e32f8b81de16146500f2b20c8ad9131d26a657f85e SHA512 cb6f2e13214938cb249d32545e81fe98c79db597523205950ba94da317863bd96981ff8acfec6afbf41f6bb80820221f9ff5a43ecabb9d7c66564179afb6738d
-EBUILD ganeti-2.16.0_rc1.ebuild 10488 BLAKE2B 73c9dd53f4b4c2450aabf3b89c54c90aadb81b325194b4adfee83b19c63f8a50eeddd61f492ec4e0a4ba88567b30b61f2cd6af51ff7ac5970581279ad51aa755 SHA512 24f0b88d8540f3c0b96e89540c60f80896a4891c29c0e6e2c786046f30a3b6220529b0c212fef89b3a7e9754e0db18ee08a8232696fb6159a3bb4c61cdff1f6b
-EBUILD ganeti-2.17.0_beta1.ebuild 10515 BLAKE2B d528f54fa7cd81c2831b6f20d3aa9a89b8f5398417fe930fbca0bd04e51bf1c57e40a04b65dc3e1d3f6deb8de83a5abbc87c6de0525bc8af8935548c30898e4a SHA512 ac17b3840f87b2e8261579a2075f705c1ceb0bf6ea39758e027d9d1725352ab5f81852db51532ffe9bb55b45c83db36a7f5589aead7adef965eb198d9d0a9490
+EBUILD ganeti-2.15.2-r9.ebuild 12222 BLAKE2B 05bf32512bc8261a86ef357a16493f38f25b463e2fc4751d07cd20e6d37fddef79adb0bebdd73665f78ac6878ee6ab43709e3aaacbfe3b41b034b945e276c843 SHA512 1b5174a41ecbd7f52026b5fab64ff5b338bab3691fea07b6f823575289f05f1a785f3f335bf904c2f1b522e1a493c647c7a6f236218dcb38479df5a7fefed00e
+EBUILD ganeti-2.16.0_rc1.ebuild 10623 BLAKE2B 141bc6d06afa93fc44de1c3f2fad3c538c983786193b2457852f5402dd887e70931f3260643b77309679c203cb45a4b9416b011d04e6508d5564ee4c88535d8c SHA512 da33566e49297207c19080a2486c3d076ed2e16618138e7661ed4523d476d55d0f49a74ced36a8e0650743d83843e65792e22c80648a579be4e182ff46324ae4
+EBUILD ganeti-2.17.0_beta1.ebuild 10650 BLAKE2B c87f05fbff7aa682244da70599678c0d807fe0ebe5947c9a752962cd6754bf721e9e4ccc8bfbbd3a33c9923a6a688927eb653431e34a9a629bf27d39cc353bfd SHA512 3fe4477b1c650670ceedbe0a8ce9df9c13f051541acc76eb692750a810e001932055eaa1e1367ec0f0fb9347b01d9353c8eb43ec1ef36671a6070e4e73f041e9
 MISC metadata.xml 1961 BLAKE2B 1c7cc03a3dd655f75b8f9249c3b0b70a738af06a9a0529afb7c73abf6344b112e5daf610f6f6780acf0c3b14e916590c20c6f8837bb333e7da0cad6df7ba8520 SHA512 547dcaaf4392b13c5629e5555d17ba2d4e504b6ce0e043fdf440fce3d857477009aeab0af52cb92cc494ecb3e6e1a7e026fabbe6e24b9323fe47c2fc15175896
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
index 6e00659d3fde..2f365cb6ab41 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -68,16 +68,18 @@ GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
 
 DEPEND="
 	dev-libs/openssl:0
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/bitarray[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/fdsend[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyparsing[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/bitarray[${PYTHON_MULTI_USEDEP}]
+		dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+		dev-python/fdsend[${PYTHON_MULTI_USEDEP}]
+	')
 	|| (
 		net-misc/iputils[arping]
 		net-analyzer/arping
@@ -157,7 +159,9 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	sys-devel/m4
 	app-text/pandoc
-	dev-python/sphinx[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+	')
 	media-fonts/urw-fonts
 	media-gfx/graphviz
 	>=dev-haskell/test-framework-0.6:0=
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index bd24dd3fff74..94c05841d25e 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,16 +53,18 @@ GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
 
 DEPEND="
 	dev-libs/openssl:0
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/bitarray[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/fdsend[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyparsing[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/bitarray[${PYTHON_MULTI_USEDEP}]
+		dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+		dev-python/fdsend[${PYTHON_MULTI_USEDEP}]
+	')
 	|| (
 		net-misc/iputils[arping]
 		net-analyzer/arping
@@ -140,7 +142,9 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	sys-devel/m4
 	app-text/pandoc
-	dev-python/sphinx[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+	')
 	media-fonts/urw-fonts
 	media-gfx/graphviz
 	>=dev-haskell/test-framework-0.6:0=
diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
index d4baca0d24bf..061cb74ba0f5 100644
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,16 +53,18 @@ GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
 
 DEPEND="
 	dev-libs/openssl:0
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/bitarray[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/fdsend[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyparsing[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/bitarray[${PYTHON_MULTI_USEDEP}]
+		dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+		dev-python/fdsend[${PYTHON_MULTI_USEDEP}]
+	')
 	|| (
 		net-misc/iputils[arping]
 		net-analyzer/arping
@@ -140,7 +142,9 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	sys-devel/m4
 	app-text/pandoc
-	<=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		<=dev-python/sphinx-1.3.5[${PYTHON_MULTI_USEDEP}]
+	')
 	media-fonts/urw-fonts
 	media-gfx/graphviz
 	>=dev-haskell/test-framework-0.6:0=
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 327514b39584..36e6c3afecb1 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -13,7 +13,7 @@ AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2
 DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb
 DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7
 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
-EBUILD libguestfs-1.36.13.ebuild 4175 BLAKE2B 0d02204f325a84b857ad151055f17e9e5b9f707fdad67d0d427125a2d0eb570128ebcc4b5739a4fe8bfc7928ed530c91e960a689ba3f7ad6a7c3e9b8e22443dd SHA512 f138aa4a70f62ad732377d8f183ce0780112f836785d9b77729df18b3f3d612b5a8303507fd57de4c3ded0e0a922b0a12f82d38b9776d7bb60626663b3c0ac7b
-EBUILD libguestfs-1.36.15.ebuild 4379 BLAKE2B 68a4d5096a0a0fe2c4ad0b9f3c7ae933a0fa32841aae4182c1f04171c173963e40019d149dff166fbef50570dd1d3ceb2ce14926b7c52ee58e5a4b30379b49b4 SHA512 593b67970f6a129362a861bfa3cba8a29e8d62b6b2a7428baa8c746d2b348a701ddec8b816461734457e9544d19e0ce409225d862b35ce0a1613852649a909e5
-EBUILD libguestfs-1.38.6.ebuild 4114 BLAKE2B 41ee6c4578ec6ccbaa83e33617299415e0ecf305868c6e0a195ab80062ed6e8efcc751dedc9fff1d1504e5d2adc52f322d8f07a197af08ce6b6d1a13b4fc179e SHA512 3ff985a95f25e32cd6ccb0c8364731c118f7990d095a73ed49f049f990b6eeb642f3b8153702e6068f87a369ba06672fd85361070f1f09c0bc9b83035fa3add1
+EBUILD libguestfs-1.36.13.ebuild 4169 BLAKE2B 0beace01217cbe610f4018cbd88ae7b55da9d0e67217f22e52695be080a730bdf1bdbe6af913f04fd2958acdca54c60c6eef2669b40bfe0d74d93517bbde78dd SHA512 7743da4e565b47b8fbfc317c6189cd3c368315213c3529e32808851d005112b1cc9e585925e85dc7971febe0dd88e3a58bfa7681a528603c41119390d2fdab76
+EBUILD libguestfs-1.36.15.ebuild 4373 BLAKE2B e149a05f78899eb86d9200668820b4c7dce20e5d56327bc3986c7daaf9dc1e498dffa5c950a0517a6ec35f8f49690bc182d0c129ac37da289492d2973a964b7c SHA512 ae00236a7f20d04f1ac9a010f18b793277017ce8ea672c52fc9fb3007d0abed0a9e6ee5250ced86e1c782805afed6e94eb84555648ca50e03b19d5d8b981907b
+EBUILD libguestfs-1.38.6.ebuild 4108 BLAKE2B cf8ae8d305eed812a8d094404960c7cdd52612855a237d75a31464f6b282f2a5a46310fd481d1ded957fb055835d7338ed768ef8372ecd88afb88a5c83a16821 SHA512 6a52cc778558e71575e157e32da0495e6fb5b20fd22b3dd0bfb6c3515419bf26bc10a954afdd1fe700993ec6174cf5ee62e1294dbcf7bcc2532d151208651b85
 MISC metadata.xml 979 BLAKE2B f21c4edfd2b5664034d663e74a201903519fe9602f7709011b3e2518656a3e15e2284533be3795d58aa5a17dbc515c46aa0cfd661dda03b42fe3f39e645384f4 SHA512 c4621ee60b018e690cfeee7342245f8345baaff9bc6c628cd7cb4f2d5ffc2fa34b5ccda51ea35c8620c8b30ec9ebacd054c996fe5dfc53168493bc96e21b5ca6
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
index 467048a112cf..e15a24c93533 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils autotools linux-info perl-functions python-single-r1 versionator
 
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
index 7962ae1e6b23..904393423c05 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils
 
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
index 530cdc1130dd..dd447616b780 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils
 
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 441840288151..fb25482a02de 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -3,6 +3,8 @@ AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690ca
 DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
 DIST libpod-1.6.4.tar.gz 8340370 BLAKE2B f68f0e846a442aa0717d4918f24260560ee77c8abdecd5af3dec06ee95ab899d623b8797962ac416bf498f22643d45de5c6d86049eead9d5c93073957c3fd9bf SHA512 69322551ab196cd3859e03988178c59a47df6f00ef0768a56e40d785f6b2130df03ff0ea76d101e21e748ea9260ede144d31f3ec21922ffd70eb2969a77d4194
 DIST libpod-1.7.0.tar.gz 8679022 BLAKE2B 8a8037b75deae9f94461ab697b2a7cf095254c68d8436655c37a40375e3dd1a2b621672643e430acc8a656fcd516fa5a542e7104d6cfdbee3d213aca6228d410 SHA512 986ec7123127d3ffb26cecc39a2ae3d8a6dd3d147327449fc4e9d17f6e6606bde278f13920d0aef59410262801251e7b4cfe099cb5caafe9773533e8476848fe
+DIST libpod-1.8.0.tar.gz 8992983 BLAKE2B a3b12dbfbdb0fe01ef8791de2c938cbf21c01ac0b36314d2a170c593d22eea08d912f8547861b239bb982db6acc9d2426adb97ffda4603739321cff0fb9ff1d8 SHA512 8e46633742e7dda1b9f6b641051009485331a3a95fcc8ff4c59c46a66f86ce1b79c832c5775d825aa54b885edaf533be2f864257137277a5265509026d0a8b87
 EBUILD libpod-1.6.4.ebuild 4073 BLAKE2B f0b50d64b5df8ecd7079d744fc26fab7c236d30b50a2ee855db64171ef112d95aa86a9defd71bf4d0ab348b59301e7814543d40ba5bf80a6ea012121a332697c SHA512 c4c99e465743ca0f97351e691edf91c535a734b4e9ac499724904341352dbffb9f5f5772df61bab87ac47bc45e9ff5a72d79eebf4de34c3046a9d458a75a146f
 EBUILD libpod-1.7.0.ebuild 3740 BLAKE2B 3de42be1182622ed7b050bd15b442b791f2b4ad53472276d46b5cf730d0d179f35c13b621ea210c3395480e7a4353ff93a9749ed13b957e14cbfb7ae20bd456c SHA512 3799b940413f1c02df27133dd93289dd8d9776c84838292dafbd424ffc8fa25ace3f440fb06e579f1d0d11f33d868af643a15cbf96f61e9ff726794f24e28bdc
+EBUILD libpod-1.8.0.ebuild 3740 BLAKE2B a14d6f736f790cdcc3d2235e447c10f62a072c958d77381a487aa26486830bf5e7dff558ebceff9697c5add3bbc383dfe905baf1e4f0dddd209f9331cae438ca SHA512 fd2396a399f7290a157abe6f39aff044fb69da5d0790b94af7c19614f308bc8c5a6fb795242794f7a530e84e77ea0399f025407ebc516a0a92492607c7a43c1d
 MISC metadata.xml 879 BLAKE2B 71e5ad7ed29e426919198aafd97805d704938cf938db4c6ce72e6e490753ed1c7a61e63209e855fddea0598f7c869dc1dde42cd5152f94377763d7163455ca53 SHA512 6a1a84612a4aa99a10d6f9b64168c748e2d19ea26e938938e1581e5f09bfac3d972382dfe7ea78e446d326743e8adf872a2010742d256cb04093c6d3fef36a31
diff --git a/app-emulation/libpod/libpod-1.8.0.ebuild b/app-emulation/libpod/libpod-1.8.0.ebuild
new file mode 100644
index 000000000000..502e3dde382a
--- /dev/null
+++ b/app-emulation/libpod/libpod-1.8.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="2ced9094d4728dd09f60a177faa32339a8d0f721"
+
+inherit bash-completion-r1 flag-o-matic go-module
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/libpod/"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs +rootless selinux"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	>=app-emulation/conmon-2.0.0
+	|| ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	rootless? ( app-emulation/slirp4netns )
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	sed -e '/^GIT_.*/d' \
+		-e 's:GO111MODULE=off:GO111MODULE=on:' \
+		-e 's/$(GO) build/$(GO) build -v -work -x/' \
+		-e 's/^\(install:.*\) install\.python$/\1/' \
+		-i Makefile || die
+
+	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
+		-i hack/get_release_info.sh || die
+}
+
+src_compile() {
+	# Filter unsupported linker flags
+	filter-flags '-Wl,*'
+
+	[[ -f hack/apparmor_tag.sh ]] || die
+	if use apparmor; then
+		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+	fi
+
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	if use btrfs; then
+		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+			hack/btrfs_installed_tag.sh || die
+	fi
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	if use selinux; then
+		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+	fi
+
+	export -n GOCACHE GOPATH XDG_CACHE_HOME
+	GOBIN="${S}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${EGIT_COMMIT}" \
+			GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	insinto /etc/containers
+	newins test/registries.conf registries.conf.example
+	newins test/policy.json policy.json.example
+
+	insinto /usr/share/containers
+	doins seccomp.json
+
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	dobashcomp completions/bash/*
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	LIBPOD_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	local want_newline=false
+	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+		elog "You need to create the following config files:"
+		elog "/etc/containers/registries.conf"
+		elog "/etc/containers/policy.json"
+		elog "To copy over default examples, use:"
+		elog "cp /etc/containers/registries.conf{.example,}"
+		elog "cp /etc/containers/policy.json{.example,}"
+		want_newline=true
+	fi
+	if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 332f5ac47325..d79a3f24929a 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -6,6 +6,7 @@ AUX libvirt-5.2.0-md-clear.patch 1268 BLAKE2B f2609a957025a59a1c5daf0faf408fdcc3
 AUX libvirt-5.6.0-do-not-use-sysconf.patch 6243 BLAKE2B 9cd8e5654f980369310e381cf6867776afadf4a8e4466b18f89b9698923c558de88ca05dfc007d52b621a35ef81fc0ffdf673a48246bd7d062d9f90fdd1e0ebd SHA512 7347e8aaacdcb01d9982b2d9e6579e89597ebbb497bd0f78d1169fd688e045789432151c1e60eb1ff9ed7eb85304c229d8193cf77e6cab525ca093814ad15493
 AUX libvirt-5.7.0-do-not-use-sysconf.patch 6015 BLAKE2B 6b8d7a4ee9c28d777ad3aa39b030ecd12af3585dc14676ff97bc2a6960408a173af02b8832ce3ebc347a43d030af712089afa17cd3907dec7a619358ca82aa6b SHA512 a3776b94a9a8ffdeac5f5cce98da15fb265baddf4c394ebb3a52c4fa1f7e893962755b3bf7343eb001f1d2ea9c630ddf968fee917b2d0b92d93270c080431af5
 AUX libvirt-6.0.0-do-not-use-sysconf.patch 5166 BLAKE2B d458e7b70320b7fb5d52f7a745b8dd4bc3e1906c57141935575ab586c5c8434634c3444ab5042d1796ef6ac6631553939ae110ed83b3f7b426724f8c2acfc23e SHA512 0d920a0b633dcf60fc41b7cff8c9903c40cdb157c5145da72a3d3090b6b174a344d4067b2436320726d5cfc5cf939ee0a2339196763069332db2733deab04577
+AUX libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch 1281 BLAKE2B 631f813ad29db29a6eb537ecd7b9d12aed097c5e0e01c07161adac1dec8a6f129bc098172fe6de4e78a2fbe5e67052005a7c5d1d17cbbb63ad27025662b9fa34 SHA512 dc80c9fc459207dd1ff77548054ea5a51c41a2d36e1b8917eca5f69293a86168af3da47466d8ff954a8b2e0ead9f28ed7d6c2c3671cf67d0ebb4039003a0dde2
 AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
 AUX libvirt-guests.init-r3 5530 BLAKE2B 5de3e8577ded1401f6dca551c6098418e596287d43b1b90e133859bb9b74dff20b8518bc09853ccff7141e6baa52fc12c9b8d3e8f60b868b72b1993254fac5d9 SHA512 7aa4eac8c293c3063d9435a4ad1ea855f9fdd84eb0ed8cbf0779935f152aab380e2ee7eb9129b2f07147bfa4dd1eae4b836ccae295c35b63dbc767208dd11b0c
 AUX libvirt-guests.init-r4 5591 BLAKE2B e745692a7ea706c8367cdb7ee2114565770bda5be5675ba3a541555659d17875f7996ff7028bf415224d095b49b71205a3d77f420464d5579ccc189def5e434d SHA512 ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0
@@ -22,11 +23,11 @@ DIST libvirt-5.5.0.tar.xz 12930224 BLAKE2B 4add0b727e4754bd1b2b4e9020942b1787253
 DIST libvirt-5.6.0.tar.xz 13147976 BLAKE2B dbfc997123f43fcf9d635b59fffa00d96826e673c4037105151bde2c4a0fb3015a0e458e8e67969b5513a4ddbf41d062feb91e6a86054ddcc1d661f0554fd1f7 SHA512 95fe931394fb31288faf73349bb298f08f63cf062f851b9935303145f8166f69128be9360757f0e1845256c14f4d7672843dba0dc6c086b1c3c8bfc035cc8986
 DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B ff49b0b6dca86f35c68edfb880677c88e0aed8021ed01ebd145922821914edd70c355ca777fe470e2b0e4baf36f2813c1100be9377344f81c9df374068307da1 SHA512 73d18fdf307b8029921a9f1a0c84ca31c50c662a3c0339e3850d6d2f31574168807a6f34943b286ed86a44031decbbc1339f27366da7269e29d38c7094503113
 DIST libvirt-6.0.0.tar.xz 8686092 BLAKE2B 669054aa3bb3e4f2cf0be2e9ea796b820786661f65495597322e178d7c7e42355b0e3752c8a847cb2fc4405928a30a00544829647aa84cc2e71bc0cb8ce9af5f SHA512 64259c0cffa9fc01192c5474f69d88a61ed0bae0a100379fed6112723a37eff1865ccfc85a19d6b8cd39ed504f04998bb3f6390aaafff797bb41ef65b6ec413c
-EBUILD libvirt-5.10.0.ebuild 9494 BLAKE2B 61964b9784a9586ab22b4dc62dae067d1e5fde8b60ab30abb0a22df73bad7a902fb53c90eb61bd955fe0e20813e42a670ba13318f21e45caa8f77542acc5287a SHA512 b49136c96ddc024fb3e9a92cb74c7091449586035d1a37f181efd8379a011950cf0696ba528f89ec6dca65ba2b51a26d19e2f530988b5cc7deea70a00405f6a1
+EBUILD libvirt-5.10.0.ebuild 9496 BLAKE2B 96dbdd33a23d862b6f500684606226e4178fc83322d64cff145600397dc44cbacf70716dd78d85b160b6cd1d5259f8b8973e20eae942277b87d525ad71059ac8 SHA512 c39c3704812f1f9ecca30a078fadb6140ea6b4fc8554b299770df2f0b9768a3d33cbe2499a79a5ac2fe2529e023e854be03ac1951200574e7cff895c2da10182
 EBUILD libvirt-5.2.0-r2.ebuild 9682 BLAKE2B d68df5a0be03ddd508743fa28effcf52bcbd94bbda19600c00d48c1a6f65da45f159b8bb34f7d22b03d9a5c3a22f612b719abc50694e0cace00508dace70ffc9 SHA512 f39f90fdb888c427f742da2eaede0236809e7d5c885882b3dc40bfb5995759269d0c09e4ddfa50582c17e4fcb598aee74936711392b98484beafb78a0e34d92e
 EBUILD libvirt-5.5.0-r1.ebuild 9415 BLAKE2B ed2ad664a6d310f65f4b7d291e6eed20a340371164c97a2620d42b52b180336f2d7bd88e43444fd53cfb18f1a0b682f4b4243a003e752be83306c4c8d806a800 SHA512 4d3d90cf63042e79abe913b49dedaac56d8e66af3b310a2c409053a6c213e1637352ab41e1a01fac9ad8cf8557cc1c9f732d7aa0789a111da920680799e153ed
 EBUILD libvirt-5.6.0.ebuild 9408 BLAKE2B 5f2b2d8e838f389493dfa5a41f5d1ac897e35ec3b62012b491be844d6ec58dbfdddd25d252610bfb3ea37da3b88b6b66775540107dcd80358976b12f31b034ea SHA512 146f7932a4457960adf39339541e95f221903039a9b53b991a00d6136a07a4da52071df44f37c9d24a88df1bf474232160fd7073a7db22093846e6f0f72e2737
 EBUILD libvirt-5.8.0.ebuild 9563 BLAKE2B 6beeebfbd545d86df7ab7a9a545e4538b3e5b992fff426a542b5eb26935502e3472a7f0674785b00b481197c21c044094b251657086bba6bc6ddf6a606fdfcf1 SHA512 b52e1a56e158f8adf330637d6ab9df52a361e5e9f506fc9c920722242d820b6fd28a9c657b7eead1ccb1fdae96cb419f683232d2b3b1b64d4ec607e9e5a8be3a
-EBUILD libvirt-6.0.0.ebuild 9487 BLAKE2B a2f53b85757cd1223096333f77b3941d0d761053a21a8bbd2deda6b647da0ba75fe2378e16cd61f46d640bd63ad80bf8f65358f9ed9d59f22aa0372e2f58b906 SHA512 22137147b84371d21cd1f18c943467906ea50bae7f2b4acd97be407befb852f0852e1474bef853466f9e3c49d08f4b1b90a5921e93b062879666efafabf1ef87
-EBUILD libvirt-9999.ebuild 9487 BLAKE2B 60bb733b4e36351fadacaa4cf6d42998d575f238d2cf31a2dc319fd0b202679f3664e91b5334b98ef79d340e888806f75868a87d95179a6d25b7e0906b1f8b26 SHA512 bebfc9c1ea0bdfbc6ad38fad71fb965306389ea2f5bf2355e9085100a1cd9269394aa2c653efb6ba80e1dbbef78160f1bf7fcaa7eca12a6e83184a70b493670e
+EBUILD libvirt-6.0.0-r1.ebuild 8893 BLAKE2B ff084289960360eab21e70fd6e296d3342b96ec0c1984c704e8123be4b5e1ab793f012111c0903969326c95d9fac8260ecbaaea1ba13fa3cabeff18438102f15 SHA512 894ef2a41add1c44037b3f3fbfa2aacf147bbb3f47bf0382a876f27c173b2d81aa2076deefc3eaf53260ee15365cb0e5e6903cb6e5fdf2f719c1865770b68ce9
+EBUILD libvirt-9999.ebuild 8812 BLAKE2B 7b574cba50afc386431be7d1feeaf55afcefc17ff3a335aac7dff34a36a404555eda567bf2469b17e8add7c9aeb14b3bdb8d2d622158264a1ec70a04842a3ea2 SHA512 420d5e8b7192a125ca5dd39b00dfdaa126d31378d01e5a3c62b146100eec5deef78d30dadc2a4a1501021eef164e73e5e13c1e9a9bccb13a1da8d9709f1ace06
 MISC metadata.xml 3791 BLAKE2B 1371e5d5c24af397dbfc9df32bd9b11cd32e49a72e3aba48e586660570bfe98f0b8f9d71d2c8e624b0e4ac470c275fbf87a2e49635b85560009aaedb25780933 SHA512 2ed3df24aecc0c419b6d6c512025b80c5efb9743843664ebd54fae15113f6625333b00c9e9b1e0aab7a5f1918ae194b71e8d59be6fa3e26964a0c677b1fcafd2
diff --git a/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch b/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch
new file mode 100644
index 000000000000..bf7a328f7759
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch
@@ -0,0 +1,35 @@
+From e97700d867ffa949c97f8a635a76b9ce510e806f Mon Sep 17 00:00:00 2001
+Message-Id: <e97700d867ffa949c97f8a635a76b9ce510e806f.1580460243.git.mprivozn@redhat.com>
+In-Reply-To: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com>
+References: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Fri, 31 Jan 2020 09:42:14 +0100
+Subject: [PATCH 2/3] Fix paths in libvirt-guests.sh.in
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ tools/libvirt-guests.sh.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
+index a881f6266e..79d38b3e9a 100644
+--- a/tools/libvirt-guests.sh.in
++++ b/tools/libvirt-guests.sh.in
+@@ -39,11 +39,11 @@ START_DELAY=0
+ BYPASS_CACHE=0
+ SYNC_TIME=0
+ 
+-test -f "$sysconfdir"/sysconfig/libvirt-guests &&
+-    . "$sysconfdir"/sysconfig/libvirt-guests
++test -f "$sysconfdir"/libvirt/libvirt-guests.conf &&
++    . "$sysconfdir"/libvirt/libvirt-guests.conf
+ 
+ LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
+-VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
++VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests
+ 
+ RETVAL=0
+ 
+-- 
+2.24.1
+
diff --git a/app-emulation/libvirt/libvirt-5.10.0.ebuild b/app-emulation/libvirt/libvirt-5.10.0.ebuild
index 48231c0552d2..6caad4d83cdc 100644
--- a/app-emulation/libvirt/libvirt-5.10.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.10.0.ebuild
@@ -309,7 +309,7 @@ my_src_configure() {
 	if [[ ${PV} = *9999* ]]; then
 		# Restore gnulib's config.sub and config.guess
 		# bug #377279
-		(cd ${S}/.gnulib && git reset --hard > /dev/null)
+		(cd "${S}"/.gnulib && git reset --hard > /dev/null)
 	fi
 }
 
diff --git a/app-emulation/libvirt/libvirt-6.0.0.ebuild b/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild
index 49389592822d..477f8f977c06 100644
--- a/app-emulation/libvirt/libvirt-6.0.0.ebuild
+++ b/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild
@@ -121,6 +121,7 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-libs/libxslt
 	dev-perl/XML-XPath
+	dev-python/docutils
 	virtual/pkgconfig"
 
 PATCHES=(
@@ -217,20 +218,6 @@ src_prepare() {
 
 	default
 
-	if [[ ${PV} = *9999* ]]; then
-		# Reinitialize submodules as this is required for gnulib's bootstrap
-		git submodule init
-		# 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 .gnulib | awk '{ print $1 }'
-		    git hash-object bootstrap.conf
-		    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
-		) >.git-module-status
-	fi
-
 	# Tweak the init script:
 	cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
 	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
@@ -295,6 +282,7 @@ my_src_configure() {
 		--disable-werror
 
 		--localstatedir=/var
+		--with-runstatedir=/run
 		--enable-dependency-tracking
 	)
 
@@ -305,12 +293,6 @@ my_src_configure() {
 	fi
 
 	econf "${myeconfargs[@]}"
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd ${S}/.gnulib && git reset --hard > /dev/null)
-	fi
 }
 
 my_src_test() {
@@ -335,6 +317,7 @@ my_src_install() {
 	# libvirtd is able to create them on demand
 	rm -rf "${D}"/etc/sysconfig
 	rm -rf "${D}"/var
+	rm -rf "${D}"/run
 
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 817ad9999f62..c2205b44c10b 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -25,7 +25,7 @@ LICENSE="LGPL-2.1"
 IUSE="
 	apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
 	iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
-	parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa
+	parted pcap policykit +qemu rbd sasl selinux +udev +vepa
 	virtualbox virt-network wireshark-plugins xen zfs
 "
 
@@ -121,12 +121,12 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-libs/libxslt
 	dev-perl/XML-XPath
+	dev-python/docutils
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.7.0-do-not-use-sysconf.patch
-	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch
+	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
 )
 
 pkg_setup() {
@@ -217,20 +217,6 @@ src_prepare() {
 
 	default
 
-	if [[ ${PV} = *9999* ]]; then
-		# Reinitialize submodules as this is required for gnulib's bootstrap
-		git submodule init
-		# 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 .gnulib | awk '{ print $1 }'
-		    git hash-object bootstrap.conf
-		    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
-		) >.git-module-status
-	fi
-
 	# Tweak the init script:
 	cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
 	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
@@ -265,7 +251,6 @@ my_src_configure() {
 		$(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)
@@ -295,6 +280,7 @@ my_src_configure() {
 		--disable-werror
 
 		--localstatedir=/var
+		--with-runstatedir=/run
 		--enable-dependency-tracking
 	)
 
@@ -305,12 +291,6 @@ my_src_configure() {
 	fi
 
 	econf "${myeconfargs[@]}"
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd ${S}/.gnulib && git reset --hard > /dev/null)
-	fi
 }
 
 my_src_test() {
@@ -335,6 +315,7 @@ my_src_install() {
 	# libvirtd is able to create them on demand
 	rm -rf "${D}"/etc/sysconfig
 	rm -rf "${D}"/var
+	rm -rf "${D}"/run
 
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
diff --git a/app-emulation/playonlinux/Manifest b/app-emulation/playonlinux/Manifest
index 6fd94528a160..8e9824388fca 100644
--- a/app-emulation/playonlinux/Manifest
+++ b/app-emulation/playonlinux/Manifest
@@ -5,6 +5,6 @@ AUX playonlinux-pkg.1 643 BLAKE2B 80c5381aad102d81eebaa81d3ed83ed0fb16aa29b7f4a2
 AUX playonlinux.1 886 BLAKE2B 903f21600540798a765ae209832c4f111380340f4c6305ca333b29e6508579e13b3df8c3d44bc56284cdce290b319d40294eaee7476630190c9b7fd24ece2e76 SHA512 44ba1a04a7e8dbf3d85d81bbcf92917b6fe7bd68478bbcfecfe0c30619b834cc6c973fc6dd7d637d7debc7ede2a206248feaca1a017834ba95f076fd16679c2d
 DIST PlayOnLinux_4.2.12.tar.gz 3204230 BLAKE2B 80ef0e5763448da4a37263c64d408e8263771694666a7c704b5900dfe0e52cc18405c34d609d8c49a0d05a383fca2d035e956e3bbe9a9a0c92a4e43b319ed7ba SHA512 f4ededc8fe0117c66fd5672e136e19b9b48a41acdd3e1b1b3dd7fae2c354e77795f0a4f8286b09b7d1813363aee50fa0811c04c3194aaf745963a2e6115b3909
 DIST PlayOnLinux_4.3.4.tar.gz 3101890 BLAKE2B d724cbd90a0f1bbc94c6365fcf6511d39ea0e8e9de32f42716111324f69091874ab19d3fa88a6bd9f77ed6308bc03ca708406fdc24faa60bf662e6a4f5d15d86 SHA512 7f2089d37379adee01424777e9c3b7ec16dd56ba2f4b834b4f0447832c050b2df3218a7361e8e735d5cc359aec6a000fea88e11632c9434232e4f749bb21c173
-EBUILD playonlinux-4.2.12.ebuild 2803 BLAKE2B 9afb81dc55bf5055d974c474a35a20b810fd226144831f76e73f347ae6d2d9e953aab4e0678dfcc9a884bd9ecac3f33fd525666580eacf0d3110f50c20e02d01 SHA512 6f94a99949b5503a486edf1df40d8b85b6af5a6fd4fa90742a6c886ee943deb4bc72c3c166d92d94df5076c168574defc2cb8f9e2f5244e652695ea88a701d07
-EBUILD playonlinux-4.3.4.ebuild 2723 BLAKE2B 4ca0028850cc0ad5d219a8845276701daf7eb0897d60b32d03e504ca078bfd9238d8b4b0aa28e22ae7dd94b654913b5505a842859e1adbd5bd0c638b415505f2 SHA512 7c70363bf0fcd6a247e399814d0efa493799c91e31e2eeccb5e9a3965179928f770718fd9e21e58422c1f799ed1ed9454fa72990de69e9954160ae8bc835cf39
+EBUILD playonlinux-4.2.12.ebuild 2836 BLAKE2B 8149f52d8d711776adf59df9bcfc3f6b97c5c42d88113d99281cc0a02b0f4e8d2beb423ac354ca117958b4f4aa7faaf2a224e9c9e74ccafe636392ea6abeca3b SHA512 d324dd4a5517367d50320b098cf64355fcea026c6dc6e359f2d56c20c43677122c342f2994217506ab496e185b56990a327663f0c732ba4fb9fb38078fb95700
+EBUILD playonlinux-4.3.4-r1.ebuild 2759 BLAKE2B 11ad80f54bf368ff8b30319998b94f7840ec807c66c02642c0cc51ba6c6e0c4427ba56e1418c8b89ae1d4798b6ffa721e19fd22b78b840f3bbacda96fa0c5ca1 SHA512 d893b3f4dcedc86d71d0ecf3159641d4278043d75eb0148e2b77940f243114aadffb4c1d0615a86087f647a3519dd23142a0a41ca3fb9d67e44b9c7d4a1ddf18
 MISC metadata.xml 433 BLAKE2B 6ba322414d75d581231afedbb791ce71aff799da09be4e08aab6f4e7e2e88d19b6e8701e36599bd1760e7076558c733edfe19f603f7f9541d0197cf4f1d59e4a SHA512 1e1dbfa93723297b63288436eaa1ce87183de71847c0ce61767381f668f6ad0bf69119570f7c7e395866f15e176f7412378c09386f8ddb271f7b2ec39da2d295
diff --git a/app-emulation/playonlinux/playonlinux-4.2.12.ebuild b/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
index d7c477f4bd80..fcb7847aa4e8 100644
--- a/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -25,7 +25,9 @@ RDEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	app-crypt/gnupg
 	virtual/wine
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+	')
 	net-misc/wget
 	x11-apps/mesa-progs
 	x11-terms/xterm
diff --git a/app-emulation/playonlinux/playonlinux-4.3.4.ebuild b/app-emulation/playonlinux/playonlinux-4.3.4-r1.ebuild
index f2a319b7bbeb..a1e610f9b4f0 100644
--- a/app-emulation/playonlinux/playonlinux-4.3.4.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,9 @@ RDEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	app-crypt/gnupg
 	app-misc/jq
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+	')
 	media-gfx/icoutils
 	|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
 	net-misc/wget
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index e4c6c77e96e3..263e40a928b0 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,3 +1,3 @@
 DIST protontricks-1.3.1.tar.gz 57784 BLAKE2B ed013367a2cc2384e4340379e2c23999a556ed26920ad59dfd7a8f773e490ee76e253a5fe3216e651cdcdb3e225a2e394255500c611d24f6bf9029582d55bb1f SHA512 4e33334e219db2e6679b430ee42408529478834c80c7da3b9bece4756eb27b9331d49a6a884de8a7ced5ec29d78ce831fee4cfbf6d5adcd750666b7e7a1e5607
-EBUILD protontricks-1.3.1.ebuild 1165 BLAKE2B b25d9cba69e98b330a32331cdc22931682da7de171c518967b007a9ad29fb316f6294aa1e6bb32e9869d5f0f69028e572a63be005ff1a210167ca9fddb663cd1 SHA512 a8f5a346f99154c5bea0c1d3493e17dc8d49dad0290c215ff678ee833db0bec47b1b3bee5663250660c6fde75b2a7da2b9fb77097c158706b28eeba78d9888b9
+EBUILD protontricks-1.3.1-r1.ebuild 1201 BLAKE2B 46996c07e30d7ecac4887ef23478f665e1e450497448cc4ee082ff88516260fcb4ec5a43bac5c8bfa3a2eb8600d90589837a44387f739bc29fd52bbc3e6ee758 SHA512 f7f6903a34e1ffdb6633fa156b1efadd7f18e7c50fdaf484a80f36d1b512804c797c11371e83213d0bd191764317ecc3fb463c39bc6d628b8a7a1e215c2562af
 MISC metadata.xml 784 BLAKE2B 37e795944e32ef3f17022efa4ad352e3ee2d1819f3e7ee4ccf02f2366156c999290b4b309c924f54dfde4a5ffc017628c36ead987da2101d2eb38c1eaa767e3e SHA512 6bccb95acbe4cf3b64b4734f98dc4495bd20df294efa0b628f08f4c2ee6bb6c5d103bd323ac29dddb02d2a7ff4ac88ccccdce8a8c01b856aef051eaae6cdb0ae
diff --git a/app-emulation/protontricks/protontricks-1.3.1.ebuild b/app-emulation/protontricks/protontricks-1.3.1-r1.ebuild
index 0b0e576d39a3..69b87925ea07 100644
--- a/app-emulation/protontricks/protontricks-1.3.1.ebuild
+++ b/app-emulation/protontricks/protontricks-1.3.1-r1.ebuild
@@ -19,7 +19,9 @@ IUSE="+gui"
 
 RDEPEND="${PYTHON_DEPS}
 	app-emulation/winetricks
-	dev-python/vdf[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/vdf[${PYTHON_MULTI_USEDEP}]
+	')
 	gui? ( gnome-extra/zenity
 		|| (
 			app-emulation/winetricks[gtk]
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 441afa2efc60..fbcc0c05b47e 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -6,6 +6,6 @@ AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a
 AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d47bd40447003f151d7f9421d1338d66663af390d69af6a8f9233eab66a69b7d38868e9735a19eefd16dd65f42853e4919ed27046 SHA512 a608a3d96f03c54fcccb7bcb354f0deec4bcb570f03b8ac9044ca5c6ee7a6252ae7cac05fb142d7c95feecfbb17e0499bbc1d6935c3e3e9ea7db319c4c11f6ad
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
-EBUILD qemu-guest-agent-3.1.0.ebuild 1707 BLAKE2B 8e15dd890ed4b5ea809b65688b3ce2d604536c498137388ed15f06126a96e270fb46f040a5bc8d9ed87a38cec9c4d3763ff3850a46e314bfc5106d573f1f5a0a SHA512 aaf6b0df2f239b0f24c051885c5ad69cf503b370c1983c1998313d5985822b3e8ec80470ecb7cdd001454331ddc58605a24c9d3a0e037bb234fa5f26067da8ef
-EBUILD qemu-guest-agent-4.0.0.ebuild 1707 BLAKE2B 8e15dd890ed4b5ea809b65688b3ce2d604536c498137388ed15f06126a96e270fb46f040a5bc8d9ed87a38cec9c4d3763ff3850a46e314bfc5106d573f1f5a0a SHA512 aaf6b0df2f239b0f24c051885c5ad69cf503b370c1983c1998313d5985822b3e8ec80470ecb7cdd001454331ddc58605a24c9d3a0e037bb234fa5f26067da8ef
+EBUILD qemu-guest-agent-3.1.0.ebuild 1701 BLAKE2B 77ae7dbe1ac967db685260110c6a63d475ede00642cfdbf62e64207370c51d4aa8258063365d2b68593722ef8994b5ae2cc62d441b2b7e002fd0c3c065552ed4 SHA512 51070dbb65c2270f6c054d344e311156c710d502ddbb56622e6b386ed52ac9eae2857348504f61e774fd8d100cd8771394524dfd0a659630a6bebf8037ea6397
+EBUILD qemu-guest-agent-4.0.0.ebuild 1701 BLAKE2B 77ae7dbe1ac967db685260110c6a63d475ede00642cfdbf62e64207370c51d4aa8258063365d2b68593722ef8994b5ae2cc62d441b2b7e002fd0c3c065552ed4 SHA512 51070dbb65c2270f6c054d344e311156c710d502ddbb56622e6b386ed52ac9eae2857348504f61e774fd8d100cd8771394524dfd0a659630a6bebf8037ea6397
 MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
index a92c61c35a3b..a60e60f9d00e 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils systemd udev python-any-r1
 
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
index a92c61c35a3b..a60e60f9d00e 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils systemd udev python-any-r1
 
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 3c557741c1c4..1df3baa4f374 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -10,6 +10,7 @@ AUX qemu-4.0.0-mkdir_systemtap.patch 333 BLAKE2B e7e35e7fe510e7e1a86005f3d51384a
 AUX qemu-4.0.0-pc-q35-4.0.patch 5020 BLAKE2B ec3ad8fbf9ee1ce54109a81e913b97daebf347b2fc2217585e68741c3f77cae1272d7b721b59d7595b51d99eadbe7e26c47bcd46c96361a7f0df345fe5d6bcfb SHA512 3621525724a587f9aa1899b7b5c2130c27fca1b9a0e907e3fe1927a79a5d59f7597491538d6079822c52dd7bed41dd3cf6233a1be8472f3ed487e43447a74c7d
 AUX qemu-4.0.0-sanitize-interp_info.patch 930 BLAKE2B d555dedc493cfa1cf888cfa7ce2a4a7811f3fd12615fa5177f82c421ddd82c2d7ffcf2e5c28ca383aac1fff35d03cae6b4b6c5129c694d9b3986819aa1e12962 SHA512 7783acf1172c4fd935c2b8f5bd76e97cea6bbb3ee33a21b23a17f23933f6053b3a933f378c6eae184c2362cb090b6b2c1966f79f1f130cf7344205ef3df0178d
 AUX qemu-4.0.0-xkbcommon.patch 1107 BLAKE2B 865f6578677199b7a78fb285548982c47b1ab624eed28a474d9eb66af3bb266748f045389fdacf945f40ce58352f5041bcaa3ec1966e3f39591d2138455c6435 SHA512 0048751b6883e206b5c486c418e0b2b71f09dfe8dd156b9ac7b331bce1ac5ef9cd7d2e605da144c3983b7a74a8b2f1bb2c9eef991197ee4bfea014af53f54427
+AUX qemu-4.2.0-cflags.patch 508 BLAKE2B 86724caca22a4bd2b21db306d04d8c0f6a542a15b82bb4e340f3ddb8471f47e854276ff33adee7bd5682ecb797efdb048e9d028d954a064712d1e817e1eb6e26 SHA512 5bfb8f0e739d7bb260b5b5b0a2d28f30b97833b8037227c511f55c9bd9502241c891e7e3780e750598ccfd7fb01615254f1c7f6634787fec67539a61a217e18d
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
@@ -18,5 +19,5 @@ DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f
 EBUILD qemu-4.0.0-r50.ebuild 24060 BLAKE2B 262941105b0a6a0a64e58eb0e12cca4ee400a2d5a0f7ed2a1d0dc0c85ee3632fd4be3db947f243e3ae0360a334dfe71613c8612b14006260793a4e4ef62daf0f SHA512 87653c43f31b7ce092b67cb4f24dc9367e53280011fb87dcc82a00dc09884cc24ca4c7f251a59d2ea0163a76202e06ebb69a3f1052536420dac11d083837097f
 EBUILD qemu-4.1.0-r1.ebuild 24157 BLAKE2B 8ecf6d6b5a230de2b79f7464bf46b6cd27352f949156be3056e28bf02a508c8ef21603354e9f080491bce143ee73297eb631d0f33571a2b7a0819804f0590d5f SHA512 9fa83117ee2f5d7ba3d64d8e8b63afdf41c10f50ad2cb20031024a14741cb66226945230d36af218048023cb8fbbb845b3472812bf25bba4073f935ec1f900d7
 EBUILD qemu-4.2.0-r1.ebuild 24262 BLAKE2B f2e8128f876c71cc7c15eb032f8b383bdc49cc0e0ad816806b0cda43958415b349b8156c84b9018b7a50e22182374b97088b0fb1d722bfffa1cc2691265a0cb0 SHA512 f2aaee829c36c8ec4e06b94a56c795d18944deb449f020aa1b6ea7f8154f1c76c9859a3bee090631f5aafcd48532e9585c612989da12d922e25b7116bf2d4c30
-EBUILD qemu-9999.ebuild 24192 BLAKE2B 778901f0285515aac742e49f8b394400020bbe3e792c7ace6a4fffd9bd435debeec325a3b71b83eef3560499a1382eb551f01b76c0da9977fd92ec68ae90204c SHA512 b687a7738e93fe8fb39009c7bc1f982ef188822b583334fa61bee454532f8eacd861e350061ca4a98bf9f95556c13dca70af8c01bbece1901c833892579d8932
+EBUILD qemu-9999.ebuild 24149 BLAKE2B 476fe07ecc810c84f29d94efa7c7a2413347ef46c0987e3f0938f84da6ba46dd2970cb2cf8fb4bd6e53761053e1402cc11ea9e6387434608ba2b2222917e1834 SHA512 2d4de00304473b10ff37c06e81189c6d385876404a45b47733f46f12d8f08b4e7c29664540d7a5d0bec0a107dc7bea1177028889ada31b45049007f57b7873ab
 MISC metadata.xml 4319 BLAKE2B aea03446434b66be757704de0bac113c91fc7c66343103777091ee7038531990017b24e4fe48209cd168b8383df92e9421ec78c88b74e40bd8769f505b2892fa SHA512 bf80056f3dde8b3708859f7d0f7f12e83933ef81d00ba02a437de424b2d98a030aaceb886ccd44992357200d5eb9d0b704e36c7f51b4a6aa044ef04df4f1d76d
diff --git a/app-emulation/qemu/files/qemu-4.2.0-cflags.patch b/app-emulation/qemu/files/qemu-4.2.0-cflags.patch
new file mode 100644
index 000000000000..101926589a61
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-4.2.0-cflags.patch
@@ -0,0 +1,16 @@
+diff --git i/configure w/configure
+index a72a5def57..546d757603 100755
+--- i/configure
++++ w/configure
+@@ -6093,10 +6093,6 @@ write_c_skeleton
+ if test "$gcov" = "yes" ; then
+   QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
+   QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
+-elif test "$fortify_source" = "yes" ; then
+-  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
+-elif test "$debug" = "no"; then
+-  CFLAGS="-O2 $CFLAGS"
+ fi
+ 
+ if test "$have_asan" = "yes"; then
+
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 0d029214a5d6..f872a6e7422e 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -212,10 +212,9 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-qemu )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
 	"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
+	"${FILESDIR}"/${PN}-4.2.0-cflags.patch
 )
 
 QA_PREBUILT="
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index a69618972fef..52fa06206d73 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,5 +1,7 @@
+DIST runc-1.0.0_rc10.tar.gz 1929802 BLAKE2B 8399c3d62726bbb6256efef7e15b7496a7172bf25170b12beb60be498967dec4fde2aebd073de4265e132ff864bafc4d2499ab677390a4f7c0a1605d83ae55e5 SHA512 598221071ef07d18bf34bf5d5c68b8ad78ee71716177fc3ce5b6909cd841d5aed93f17ebf1f3d134707d29eef1f54a4ddc21e79621a9bd957df28a8d2e028ab7
 DIST runc-1.0.0_rc8.tar.gz 1665924 BLAKE2B 542cbdefaaa1ef89d2abf8e31ca8116f26cddbfc3fb94dc8c7e94c51750b179ed557bee857ec80ede7280856c66c01c7961a26dc7e6202276baca46c691a3903 SHA512 f213b6a7fa96597d2ba1068f77752bccc0a1d62e0aac02ec8d2a2552dc3c1140fd4e52b2daeb0ac8fc09c48abe4521834450baae01ad4165308813eee7654a2b
 DIST runc-1.0.0_rc9.tar.gz 1885161 BLAKE2B 638f00b857f43204cdc2b4e65927d6280e48b075d8363570e9da166ec35febaa749c733478d5c190c0119e0d95418e3295adcc129b68afbc5fec20ca3d9e9b59 SHA512 56c46fbe4d637a83d67e0aabf2549ba687d8b1e357fdecfffca343c8b166edf4158830aa0a4419edd6994c589b874bb8504eb3969ed3430cda6e233940d34194
+EBUILD runc-1.0.0_rc10.ebuild 1531 BLAKE2B ce41c356f31fa8f0e4247dc1a8e3cf991f5d7a9a321a3ca151a6a8c711ce7b5b967a8be420ce3d294a92163710baf2556cef1ddd270f0c573001e78bf11807da SHA512 61389d46aa058aa6ef54dbc2850465e0e44a52bc6039870065ce5a15793af9e91f93f8886f0258e63c70d93c1549aecfcfd34dbf42b0f9f86006dce61f72ee58
 EBUILD runc-1.0.0_rc8.ebuild 1487 BLAKE2B 5a3ad59b6d6f8582f8f86d3f5887294bbacc9db973e0f3b0090a085dacb07b993a68a5f6da40824c99312534d033da03ec3e1e7230bf1d459f9025bbfd691d6d SHA512 41e23944c8bce42d7043d0fd4a6ea01096431c73d5636bd1f0b6a68452cb70aea7aa69d91588be7091d103a227375ca1dec3f4e10e96d8108f4591494cb6f816
 EBUILD runc-1.0.0_rc9.ebuild 1487 BLAKE2B 99a37b4281c595242104484419ff679963e590bb841f08ae84386e0fde31ae8e97c0ff95b879d8e8b0616e0b8a3ebb9ef9b4fb1dbaf2e93a09fc22cf411fa533 SHA512 af7591ad892b998ff8154b2d8329958fd82aed8897d673efb8e5ba131206e0ab9afb2e5ade0b51776fb8e0c2f6f110272f7718905d0ef2f63a54e4ab8d11deaa
 MISC metadata.xml 764 BLAKE2B a3132f8c72aaaac64caf15319068c94a3a849092ddf4d8ed83ef2b964ce714a12fc8f7c35ec85072fab02dbe5b650c23ba185372d7eb835d5a4bb30e1a88c784 SHA512 980f2d052132f8a72f218d6f0538fafac32e2af3b72e2aa4db0d3bd6ea120ec426ca16e5eeac721682a24200c5ea6f4d91f574926849d549fcff478872ff038b
diff --git a/app-emulation/runc/runc-1.0.0_rc10.ebuild b/app-emulation/runc/runc-1.0.0_rc10.ebuild
new file mode 100644
index 000000000000..a9c3e510c9e1
--- /dev/null
+++ b/app-emulation/runc/runc-1.0.0_rc10.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit linux-info
+
+CONFIG_CHECK="~USER_NS"
+EGO_PN="github.com/opencontainers/${PN}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-build golang-vcs
+else
+	MY_PV="${PV/_/-}"
+	# Change this when you update the ebuild
+	RUNC_COMMIT=dc9208a3303feef5b3839f4323d9beb36df0a9dd
+	SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-build golang-vcs-snapshot
+fi
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://runc.io"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ambient apparmor hardened +kmem +seccomp"
+
+RDEPEND="
+	apparmor? ( sys-libs/libapparmor )
+	seccomp? ( sys-libs/libseccomp )
+	!app-emulation/docker-runc
+"
+
+src_prepare() {
+	pushd src/${EGO_PN}
+	default
+	sed -i -e "/^GIT_BRANCH/d"\
+		-e "/^GIT_BRANCH_CLEAN/d"\
+		-e "/^COMMIT_NO/d"\
+		-e "s/COMMIT :=.*/COMMIT := ${RUNC_COMMIT}/"\
+		Makefile || die
+	popd || die
+}
+
+src_compile() {
+	# Taken from app-emulation/docker-1.7.0-r1
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
+		-L${ROOT}/usr/$(get_libdir)"
+
+	# build up optional flags
+	local options=(
+		$(usex ambient 'ambient' '')
+		$(usex apparmor 'apparmor' '')
+		$(usex seccomp 'seccomp' '')
+		$(usex kmem '' 'nokmem')
+	)
+
+	GOPATH="${S}" emake BUILDTAGS="${options[*]}" -C src/${EGO_PN}
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin runc
+	dodoc README.md PRINCIPLES.md
+	popd || die
+}
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index e33ac3519aef..252b44a9f510 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -1,6 +1,8 @@
 DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
 DIST skopeo-0.1.39.tar.gz 3850036 BLAKE2B e635be475f22cc25ab98e446424f4a6b0babe34f827a73f9c9c1533db782490e9af94e759ac78fbeeec1c0e1fa42eef9d09fb4e7ff1f4df654f65fe4c1a9f7b0 SHA512 c4aadc40f9d637c628cd96c204b3e9bc3a928c145521bed2e5046508fc936ff99442dda8b4a4cdd85c4d04e64a9ccee5ea8d563c6ebf4e6020d50d96b921716c
 DIST skopeo-0.1.40.tar.gz 3907911 BLAKE2B 0a9ebcc9662036b1595149f0d19a46c0565b115d37b22c6410041eef3e6755b20561439596f1033dd6ce2c78a4948e358b2518003729873d5ab8ce9a7bec082c SHA512 161edb8afa961e48e314cf70a4fcebd971a45a50fc11eab6ec751ba4eb05a8be011d16b83c4ed1fa9d6336846da5f518da006d4476ee4e29a160c629820773d3
+DIST skopeo-0.1.41.tar.gz 4692408 BLAKE2B d5e99be0cb478065f1478beda355abc11c8f13ad8446251048502da1b1af38d407ec46d284e59d2018af5d1ca6a953ad6156a306e9bc1acbdb22b447fe17a59f SHA512 924af178eb9621395cfffcf51aa072886dc8c20746bce1599a503df8c54794e34184a1fc6fd9582b889c7c8efecf8cf192797bc8e208b90c71cca31bb970d8e9
 EBUILD skopeo-0.1.39.ebuild 1451 BLAKE2B 9652f26926ef19838041dbb50d355aaaddb975e4a8896fc35b90cfb145b75411f8964222d10229d8df1c9f2b80821746573e4485e5df79493b7bfb07025e519e SHA512 3f91ec57eac22a82c9a5a7e9eb755d0933476554ccf9a223a40b01452c3d57c5996a6e1b204f58ca7189c3260cec5a31971775778ddbbe32f8c920068c8bbe9d
 EBUILD skopeo-0.1.40-r1.ebuild 1734 BLAKE2B 3ad25540278b444c94b7bbdda5684f74118afef56989e439efb8451217248b1a3062945c1b5a6d40844162b2ccb8e8981405df250a25e7c8475c020214adc816 SHA512 b4b45ae2bda0f877828edc0cdf6befd900d9d232f7416eff57724163401ca04f95ebec6a13d7c0d54810a5a7f994794d69be78a1528a7f36c5032ee2996e29ed
+EBUILD skopeo-0.1.41.ebuild 1330 BLAKE2B d17e46533d449b957b0829d2bd7790610fa3f1f314500b9a830d2710eeef33c6b0c8125bd803125245b361aae351e241bd8754683d0d28a6f63746d2cabd58a6 SHA512 c907e07d0587e652f425ac91be2dd5648820622864fea7845558db2f6df1f3c21ccd029f24b9be8edccf3e51679290fde22526590dcd55558227909ae520878f
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/skopeo/skopeo-0.1.41.ebuild b/app-emulation/skopeo/skopeo-0.1.41.ebuild
new file mode 100644
index 000000000000..cc09b12134e3
--- /dev/null
+++ b/app-emulation/skopeo/skopeo-0.1.41.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+COMMIT=7d080ca
+inherit go-module bash-completion-r1
+
+DESCRIPTION="Command line utility foroperations on container images and image repositories"
+HOMEPAGE="https://github.com/containers/skopeo"
+SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
+	>=dev-libs/libassuan-2.4.3:=
+	dev-libs/libgpg-error:=
+	>=sys-fs/btrfs-progs-4.0.1
+	>=sys-fs/lvm2-2.02.145:="
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT="test"
+
+src_compile() {
+	local BUILDTAGS="containers_image_ostree_stub"
+	set -- env -u GOCACHE -u XDG_CACHE_HOME \
+		go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
+		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
+		-o skopeo ./cmd/skopeo
+	echo "$@"
+	"$@" || die
+	cd docs || die
+	for f in *.1.md; do
+		go-md2man -in ${f} -out ${f%%.md} || die
+	done
+}
+
+src_install() {
+	dobin skopeo
+	doman docs/*.1
+	dobashcomp completions/bash/skopeo
+	insinto /etc/containers
+	newins default-policy.json policy.json
+	insinto /etc/containers/registries.d
+	doins default.yaml
+	keepdir /var/lib/atomic/sigstore
+	einstalldocs
+}
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index e4db03bf5d8c..bf6237c461fa 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,7 +1,9 @@
 DIST slirp4netns-0.3.3.tar.gz 162154 BLAKE2B b4a477ca94ee17e14ae0d255eb1f22713388d32cee1faff308e902a8134bc52e08cfa92537c19fbfc9869d936637c1196fee462d9699c1b5f97a0d0138dc4792 SHA512 9cccbfd30348d895c8c3f6a80ebe7991131c5a5f4907733ec65df5ce70b63427e5f666bf7c4dcb08e8dd50f1769aff0f6642c23c29eb6b9921a2d10f62d46f63
 DIST slirp4netns-0.4.1.tar.gz 168785 BLAKE2B 90e2510121177771fb77d5e48baa8a1acb95f9778e72add244b2df10d92c9cc6ef284bfbeef699bd8e58724b50254a4eb6fa485a58c7c8e6cca8469cf722e1f2 SHA512 bb2a0946f4e360eb08efb46e097d21ab1bf05d199d1e3d381e065617eb9ba15434bccb5d1e76ac27664f23c8da79349383095b4d28d2a1a8ddc0fb9675aebf34
 DIST slirp4netns-0.4.2.tar.gz 169120 BLAKE2B bbb809da871c885e910be771f3a6e90f7d18880d82ddeb0e569a1db33e38c80cbb1a7279341c0efcd514d88fa2874920ae89365f9fa97a38e3fb09f0eb8e5642 SHA512 87dd032afe6862fc8f7f5c3770a1d939832c29c2f55fa3579a4eac717979442e1b081aa886cc94c5638ec1339ccebe73ed1844af37a479fed2d5826bc761fc05
+DIST slirp4netns-0.4.3.tar.gz 169895 BLAKE2B a8919ced6d9d68823c79396bc8914d32d157c2da566735a495d68c995c5cfafafba7eb1f761cbe9f82c3291afeae4ac55d00de4c094d5f48e2268d540dfca9e6 SHA512 a3415529486f11cf12c799cabc889dca30fbf64d08818359a285ac67c15fc7926d61105291cd8f2652174747e641e159b5b805a8954fd82f7eb9e35058b23265
 EBUILD slirp4netns-0.3.3.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
 EBUILD slirp4netns-0.4.1-r1.ebuild 762 BLAKE2B bf04b7ace6f29e4d5f3172b49a5b38f1f438de246a1c53c2164f950885b92cb58d89a73da69e877f62f18ae686f5fd3078801537962da2d2e2b73491520b97a9 SHA512 f90e0500618de2cc8059fc33d8261f6050d43c95abd17806df46362b55730ecbc138f41c9895e8278f5daefa62de77e033df4db6ceccb311da361246abb466a4
 EBUILD slirp4netns-0.4.2.ebuild 762 BLAKE2B bf04b7ace6f29e4d5f3172b49a5b38f1f438de246a1c53c2164f950885b92cb58d89a73da69e877f62f18ae686f5fd3078801537962da2d2e2b73491520b97a9 SHA512 f90e0500618de2cc8059fc33d8261f6050d43c95abd17806df46362b55730ecbc138f41c9895e8278f5daefa62de77e033df4db6ceccb311da361246abb466a4
+EBUILD slirp4netns-0.4.3.ebuild 762 BLAKE2B 307a4916c666b3a368b4268ab556c044eb34d754f5b5a0f2b50b7057a4b2663b574c73c9a2c8f54925312f72e2ef66a281d4bfd26b80b4542aa288ed392b0891 SHA512 45fcd96f5f700044f84739b6ed0ef5ab61fd07a860fd8542c88e74a413b3d72e762280441ae3b65fdb6568b43e0d6b40354a8e816ff736cb1563ae5219f840e6
 MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.3.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.3.ebuild
new file mode 100644
index 000000000000..632654ce2a10
--- /dev/null
+++ b/app-emulation/slirp4netns/slirp4netns-0.4.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="User-mode networking for unprivileged network namespaces"
+HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
+SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2=
+	dev-libs/libpcre:=
+	sys-libs/libseccomp:=
+	sys-libs/libcap:="
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RESTRICT="test"
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You need to have the tun kernel module loaded in order to have"
+		elog "slirp4netns working"
+	fi
+}
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index f402c727648e..baaa8274be8c 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -4,7 +4,7 @@ AUX spice-0.14.0-libressl_fix.patch 530 BLAKE2B 136e0b87931d487a018cdf0be4acfc0b
 AUX spice-0.14.0-openssl1.1_fix.patch 614 BLAKE2B fb7b39e73d37bc6ab27035c7d7a742fa648afb62777bcbd9dbdd7480b5b5461da6147b4f3368e04aaf04f8ef5780aeab1e7679f4fcf7aa1005df7d28a4fca7a1 SHA512 1b0b83b7222af0f60bdb5a3469881a4e84f8df824d2741710da04b8bdec95e691f97137f2ee67ad71065918b329285d215aa086d5f46dc83b18334eb17ef6dc8
 DIST spice-0.14.0.tar.bz2 1330195 BLAKE2B 08f93e8ddeb79adb4feac0557a854cc41fd096a9dfefc0baaca176803c2a03ef9286c4f61a135d62ad22e3ac3f4bb31ffd1614c8ddeaec7ae8c01eca34da1750 SHA512 84532146aa628ca6ca459a82afb89d6391892e063668fd4a68023c92cee7ca868b6c82e31dd9886819b76ea745ebdae0d0030e1f608d8f58f51c00f0b09bae1f
 DIST spice-0.14.2.tar.bz2 1406009 BLAKE2B e6c57bedd8c8ec0444da194be7279b895bf348dfa9b427d20301cc223627bcd65b7037280bc2a3d0b531b0cdcd8cb62d34ee132c549ac3dc8f6e5a2959339ce2 SHA512 1093b618ea4a7ff31944429ce2903abecfc8d20c35f2d9c8c837a6e053ee429c0115e40665542637a717869209523ac05d15cdb5e77563102d5d3915e4aaaf76
-EBUILD spice-0.14.0-r2.ebuild 2495 BLAKE2B 73564493c254b38ae370bcf96d76deaa841aba335a40c1e915bd6fe0fa79467700e67fd4c8be443841412b423e2c18efc053af63146a046af6de042501682004 SHA512 af271757fbdf79a0f8f24b561b2f4784c8bce485a004124718bc414d2327d1c3127bf4ad360920ee2c7a597ea1bd05b8efd2a21b0f810e15b554f2dd6ad63d0f
+EBUILD spice-0.14.0-r2.ebuild 2491 BLAKE2B 99a415733fa66136e796c4185d9369400e2bc27efbd04b60bc27f08a42adc8fe2ea0c33ad032c9a3280ccf10b2022b5ca00490e0f2ee417abc71d27dcf393f7f SHA512 62b6520e710622e2eb5e8ae4dbf9a712902319fcae6e1a65f3549fe2f826e6b2c8e4932ae5b1592e411eb6439ef0600dc19f6efd121de9d02dc7f013bc8db0bb
 EBUILD spice-0.14.2.ebuild 2448 BLAKE2B d502a0f890ab488c561ccf5555d84c4c2c101f78a87e3eae1e415ff37a97c5bb76bddd69950702800251fe152f563fb530380bdd40304a538cf6d6d37c20c93d SHA512 3fb6b35e2d6890bef4237716920b29ba07721f8588c342c890800981134ab9c4cfcba9e9eb0e356a14f2637f9817963b7784e25b93c82939dbc8607af4e7b7cd
 EBUILD spice-9999.ebuild 2512 BLAKE2B fbf507da71538f102eb3ae355e734c4aa98a0463ca7d4108dbd8f9c0676717381b432e9f9aad895f7b0d727b0e360d3e126f540773bd6a2911a0a4600144faa6 SHA512 e00318a2d27987baff045b2129f10fc2e43f74be0156c1b8360bd230a87d2f7d2266b4019e8cd92644d6ba61e109b4422987f42d695f493debe6d6c3fdd24494
 MISC metadata.xml 385 BLAKE2B 599bae33d9264b8b3b4474b0d2234d66e6c6f2cd3da1710bfea64f75570264da7f4de712cecb95408a059f70e3dba2de2a421c02f1f728e39c2bf913c2c570a0 SHA512 c75966298d69fb56b3e16c98b0cc7b3b2514d2ad2a6b790777c00493754e678388f0eb17fbabc6f58a667883e87d2a4f19c2a1c34f5c87f81fb13a8948ab85c8
diff --git a/app-emulation/spice/spice-0.14.0-r2.ebuild b/app-emulation/spice/spice-0.14.0-r2.ebuild
index ae61110bb94f..49bf1e178a9a 100644
--- a/app-emulation/spice/spice-0.14.0-r2.ebuild
+++ b/app-emulation/spice/spice-0.14.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit autotools ltprune python-any-r1 readme.gentoo-r1 xdg-utils
 
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 0a84fb19dca0..b80bc476b6ce 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,8 +1,8 @@
 DIST virt-manager-2.0.0.tar.gz 2629465 BLAKE2B 8795985afb8805fdb4f1ee94c7344361a7d09d3e62e361f3126859c4d1b1077286b720de7629fd876e5bff10500cc6cea6f1d4afbba5c2c83fd61b137c40a3a7 SHA512 5d0eb65dceb5c913973edaa52414b1665d1ed9cd3f226e28a592decddec2acd8fdb589f60736edf9b7d95830893812f9aecca2cbdd715033ca7ea53a95472876
 DIST virt-manager-2.2.0.tar.gz 2628726 BLAKE2B d2f6bc7a7bcf8b220109702b7cd65dd9484c197252cf96e4748c27921a45749c476ed9d03eadac6ef3053df01ceb267c4756b0c602fad431ad9de0035d4ed5d5 SHA512 09975f7628ee302687eb6572b5f35797b4710aaae60c17542ee9edd72c65e80e93d7bbc7a2050667a9280effdbab28272886ae155b3ba73c104153ae3c048d99
 DIST virt-manager-2.2.1.tar.gz 2623754 BLAKE2B c81e730f2d685152bd0ef0a0327a74a70c50bff91e80ed0e3de92d0b848183c4bc092be333f2f0785c6a0b39f0b6d6abbd1f38c902f52ba4af7c56d64ee9b026 SHA512 aa97af52b3552c087beab8701762c21e8e6d818c9787d5376ed4e1ae40a34d5e8870c4c00fda9cb17a2340d1dff5b17e853182df720cdd9ea4c91cf01502a33a
-EBUILD virt-manager-2.0.0.ebuild 2332 BLAKE2B 1d0df69a7f19fe3e5a9f0dafea295339b76b92628ca11052036d39691abc2cc142d59d12a02d1dc4821aedf1b103f334f20ec92e1ceedc459b9c5f6f9e301081 SHA512 42c2bc2af0483676b45600db794a97948c12a39ad9fd1b960974a1135cdb721c5a2301ee15dd2fbc1ae959331b0c19dd8782caafc14b0075cb70eb3b7d754ca5
-EBUILD virt-manager-2.2.0.ebuild 2418 BLAKE2B e31a0555870c0aadcb502c26b1f26ba957b450cf9d07f53f2667fbd46347b226a6243e0363c68942d2edbf1e96e3e6ac44233f774c5d3ae6ef1b64c6186951aa SHA512 4459364f3cc1bd2d5e27dba877c92157a978d635de074f75f7433cd1401a62a3a809e9f0e85ba96aa786c6b8685a1105ed23c4e68342c3e9d799add8dcbb6a45
-EBUILD virt-manager-2.2.1.ebuild 2390 BLAKE2B d81eb06a422be03cdff4f0c0b846544f8d2f60fdb0ec52e5eb6fbf3bfa6d9940388ad44b6d4c73e6f72958db241283471b93639004426a0a1bed2b5d3f1b4ac5 SHA512 2e14730052c372c8d55ed274cfe4b90659f16c8c27b874b0e847b249a5c7c3b086b37754c2e374459babda4fe75ae51b6a25b558f6ebb912f44bb1db92f40d7c
-EBUILD virt-manager-9999.ebuild 2425 BLAKE2B 448ad93253a67113e7a760cd8445d80e986b26c6b6e847ea317bdf89d058c17c636842d87810c4a3ddecf842365aad2cf772d6dd197a8dc20a0c03dd04e30f36 SHA512 16f197d5c4c1382da70fc43af701d8517ef69cb8d8541151d06408125b02c4e1f3383f86dbf2470b611d77da06f03bf1b7c2ad2f7c76413998b30cbc07311176
+EBUILD virt-manager-2.0.0.ebuild 2403 BLAKE2B 0ec4d6cd339af7fdbb8659cefd1d014bdef9ad67d46f763ec01cf7d9e99b3d58b3b852097f87cb00a7e37819ed3eda49b2f70d4056107edbd1b3578f10424cdb SHA512 c2c6718e256551ac887a55dad9b47dacc86629aed8ecee1f6b52aa55cd7c3073ef0bba8ceab9d8fd71abf6f27bc1f0f28af3d6f0e7d8afae46cb1c70ad4357a9
+EBUILD virt-manager-2.2.0.ebuild 2489 BLAKE2B 67bf08f5ccc7c0fe7cdbdc4f48fcd9284cfb153f054bc5a9d707ef312a17b7e6fcf052f56e1de4cc941008422bb7d42deeacf9ce4a548cb7ebeb48985403f8ce SHA512 9362827e4d8382f2f9009e8986349035dac21469dcbf934fad9d029a206c233f2131eebf3ddab1cbd333888a76e06e437e7d5b2c11e97aa27803271072c7c7f3
+EBUILD virt-manager-2.2.1-r1.ebuild 2454 BLAKE2B 9b1c32f4bf1bd19c552ebd0b0e01305afe7d6c599ec3f5b5abc6f839cf7b75b63d0e4ab45220a04b63c92b139d48957f80fdb41b3169eb3b6fd943fc709c1de5 SHA512 2c1ae9114d6bd034847ce9fc4a7403f2c19678449f64dae7c702a257703c11106a502ef477219708be95281db3bd3b9314e4cf2273c9a98f0e285c5f1c33d1b4
+EBUILD virt-manager-9999.ebuild 2496 BLAKE2B 3015e786fad6e15fec6c74918877bde64da89c49ec3fe8ca697afdb74b8669c645b3362ab4b72213d5e0eccb2ffd1fa542e17882067898a9e6a8af46db719c63 SHA512 4b38f99e45d565170c88045c366224abf127ab697c4e54f8bd55c9171f93e302fca4b13e5585b3b5d03cc5295ff148d6d0c4a8d6d13e9c4d7e5b081a48d8a53f
 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 0dedfe355424..05fb004334b4 100644
--- a/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
@@ -29,12 +29,14 @@ RDEPEND="!app-emulation/virtinst
 	${PYTHON_DEPS}
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/argcomplete[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
 		gnome-base/dconf
diff --git a/app-emulation/virt-manager/virt-manager-2.2.0.ebuild b/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
index b5b58cd52a7e..ef3ad18879d6 100644
--- a/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
@@ -29,12 +29,14 @@ RDEPEND="!app-emulation/virtinst
 	${PYTHON_DEPS}
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/argcomplete[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
 		gnome-base/dconf
diff --git a/app-emulation/virt-manager/virt-manager-2.2.1.ebuild b/app-emulation/virt-manager/virt-manager-2.2.1-r1.ebuild
index 9730435dcad8..963b5ecd8dab 100644
--- a/app-emulation/virt-manager/virt-manager-2.2.1.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.2.1-r1.ebuild
@@ -29,11 +29,13 @@ RDEPEND="!app-emulation/virtinst
 	${PYTHON_DEPS}
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
 		gnome-base/dconf
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index ca5fdb8b22af..91e2bbc0f7cc 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -29,12 +29,14 @@ RDEPEND="!app-emulation/virtinst
 	${PYTHON_DEPS}
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/argcomplete[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
 		gnome-base/dconf
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index bc4c1f9ee2d7..85ca10735a45 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -30,7 +30,7 @@ DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282
 DIST xen-4.13.0.tar.gz 39005191 BLAKE2B cd85bfe549e20447afb8ec6b2ab33ea1893f45392c08737730d7898706748ebb96b2e842b2ff3e4af8c5d8a705e6d25a2bfb8acf0d7cc771805d0cc97757a949 SHA512 5b2ded9a2fe3f7ddf40eed1fa9858baead06233a01eb6099cc45b3c78b6c3823acfe7b731910733e87125dfa49d08c53f74c215fb1b320a92b44b87a0a105225
 DIST xen-gentoo-patches-18.tar.xz 16840 BLAKE2B 7243b363c78250ae1928d75813cfd6035a87ca03f1605cbe02233e009a19105a0712711d622eef8606f3e7e1a5db5203342e56a1b00496d5ce37ddc4ffb9e4ea SHA512 328d7b1a57ab6bf9c7200b934aeb241f6d4fecccc600130d1c80460540212eb658cb74ae0502c008e040fdb2d95db20c2a3d71a8e73fd1361070d70adeab6e30
 DIST xen-gentoo-patches-19.tar.xz 17460 BLAKE2B 6f25c4c9bb438ba0ceded75d04ba6c05ca74e6319d14cf744ea23ecbed2e8283c3c00275a4609b583402d352216520a10197fd4ab9e056eac1c841b0f79bc6b8 SHA512 586e88eea0f2dcc5bae0eb4691cc1d722a8b1a7ca849fd8992d72c0990b2832b3e78738c936e8e46bc9623aa1c8e8afa341a22608479629ea012474d5ff6b69a
-EBUILD xen-tools-4.11.3.ebuild 13855 BLAKE2B 238160d48c54f0b87a3daac6da01a07c52cedd5baa1ab4f786015eecd15eb584bedfe48f7063f3d59af48919c719f3d7d1f59d790c7a0faa24f8e81449bd0344 SHA512 1a39d72ab79563e7097aa349d09376e15b64fc4f40a96639735cc734db2f48797d472c7b9ebb88709871c7d4145a5a9926cbc7d4f0875eaa59cce621b977977b
-EBUILD xen-tools-4.12.1-r1.ebuild 14581 BLAKE2B 2f1635d7037e9b099340c707231bfaca085dcd06b2d6da54683ecb4e8b5fd6580013cc748d650a1617f0af45e84bce7052992d46b6ecfc814acd6916dfd9ab89 SHA512 61a2a47a702d48508036c9e67815d366b4bd4eba897779d2e99fc6c3d474043566dc0156345dcc5cb85ba1330146b80e256553755c13529ff540b787423deabd
-EBUILD xen-tools-4.13.0.ebuild 15279 BLAKE2B c7d5925f3e0c382f6f857ae2057e8c052c2fdb0d9734f789549039cec4ec627c501b14941e6be73ca9f2cbdd3284ae16bba5addfa5a121859cedc2abe162dccb SHA512 fe96947c7d49ac216df25fd1bd419e64bd5a204c740e8ece769ee7cf1cb546beb9719d7c72e5dcd4c08a6b844e296df7018c338cd6246fe52bb44051df3fc503
+EBUILD xen-tools-4.11.3-r1.ebuild 13936 BLAKE2B d6a916f69d2cb3bf1c73361ddc89f8d241ee3e1411a48346b57a7a0b9d27799c01d57979d3a124e0101126c434c21ae5354af932f635a4e66c3b3dcc659fb989 SHA512 e1c04b9c7c01b5ef5c2b8c9a6967b4476930c424da101bab322bcb2188eec9c688c116e1398d422642e084dea2dea3c98cbdce051cdc9b59487f393bcaa08063
+EBUILD xen-tools-4.12.1-r2.ebuild 14662 BLAKE2B a3857abf9c1379eb2a402ea1c2cd4136ec5bb016f6bed34f514f87e94f17b01d5db3ddbb871ffcdb8dd57b390bc3a7e3240d92cfcdeb3a14674f9ee1221f412e SHA512 019819109ba8ddc1ceac050c4319e91122dacbfa4101b8dc0120b5e2a09eb33e00f9b10c47cdb0e92ec3172559d2021487c0aa56cb17c322d8cd23c8e2e065d8
+EBUILD xen-tools-4.13.0.ebuild 15360 BLAKE2B 967d3da94c2755ee8ec070777dddaedddfa5301f7941058562d226ad262edce8502b359c85f9627b07bac6fa26cad9aac844266c4c2aec138cf9babdf43ff6a6 SHA512 e3cbbe4e6a1e7164c423432442cdd5249a81c2b75dfb5e32e5bb810aec7cac5f01ce0d22aa7ce81be7fbfb7b09942862dbed47c2bac13f5bf4fc389cceae2810
 MISC metadata.xml 1707 BLAKE2B becd24142b3d885f0a26c1444e5191c3906c260ba57755257d04eee76be5a21aede5741ca0bea12a77e9c0c872cd5f8436fc5c11fec3f3f5f543f4fda75fb5be SHA512 137f36f883e4476f1820e630fa1f5feb52244cad235885bff09c838755feba1df8428f631e255de25b29ce7dac8aa62e0df37517875cce3a26e5114dee7a70f7
diff --git a/app-emulation/xen-tools/xen-tools-4.11.3.ebuild b/app-emulation/xen-tools/xen-tools-4.11.3-r1.ebuild
index a089de2905e2..72913356f070 100644
--- a/app-emulation/xen-tools/xen-tools-4.11.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -81,11 +81,13 @@ COMMON_DEPEND="
 
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-4.11
-	dev-python/lxml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
 	x86? ( sys-devel/dev86
 		sys-firmware/ipxe[qemu]
 		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
 	api? ( dev-libs/libxml2
 		net-misc/curl )
 	ovmf? (
@@ -103,7 +105,9 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		app-text/ghostscript-gpl
 		app-text/pandoc
-		dev-python/markdown[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
 		dev-texlive/texlive-latexextra
 		media-gfx/transfig
 	)
diff --git a/app-emulation/xen-tools/xen-tools-4.12.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.12.1-r2.ebuild
index 83c7552e06e4..86248c171f5c 100644
--- a/app-emulation/xen-tools/xen-tools-4.12.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -87,11 +87,13 @@ COMMON_DEPEND="
 
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-4.11
-	dev-python/lxml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
 	x86? ( sys-devel/dev86
 		system-ipxe? ( sys-firmware/ipxe[qemu] )
 		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
 	api? ( dev-libs/libxml2
 		net-misc/curl )
 	ovmf? (
@@ -108,7 +110,9 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		app-text/ghostscript-gpl
 		app-text/pandoc
-		dev-python/markdown[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
 		dev-texlive/texlive-latexextra
 		media-gfx/transfig
 	)
diff --git a/app-emulation/xen-tools/xen-tools-4.13.0.ebuild b/app-emulation/xen-tools/xen-tools-4.13.0.ebuild
index 0b4a116929ca..47d3fb3608e2 100644
--- a/app-emulation/xen-tools/xen-tools-4.13.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -91,11 +91,13 @@ COMMON_DEPEND="
 
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-4.11
-	dev-python/lxml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
 	x86? ( sys-devel/dev86
 		system-ipxe? ( sys-firmware/ipxe[qemu] )
 		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
 	api? ( dev-libs/libxml2
 		net-misc/curl )
 
@@ -113,7 +115,9 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		app-text/ghostscript-gpl
 		app-text/pandoc
-		dev-python/markdown[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
 		dev-texlive/texlive-latexextra
 		media-gfx/transfig
 	)
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /app-emulation
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)