gentoo resync : 18.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
commit: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree: 326613a08f25851c388715e205576a2e7d25dc4f /app-emulation
parent: b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
76 files changed, 252 insertions, 1104 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 1641fe45d174..3197fd594751 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 151b2e15031c..0549b48ffe9b 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,9 +1,9 @@
-DIST buildah-1.8.3.tar.gz 5114332 BLAKE2B 55ef5e10e8a2a2b95ef8f8cd28a3ccdb3e734fc3ef64a890900e20a5b8994f92571e2cdec875813203fc4e98a8c4f09656d16bc4c6242194131a25713e054492 SHA512 f875c448f81ef272ad0b7be9c1579d6650983fed4e471095cd645ae1126b49d91ec15b55a072e722205154b681eefc0fb32f5a452d827e875eb0c4779f5d712b
+DIST buildah-1.10.0.tar.gz 9362108 BLAKE2B 691b5273056f9eb3e1f1dabf22c299ae281af8db13e680351bc0f4e0b6560b0ac20def5a1b3a039d14b97bb35a935a34ae83eeadc6272ad4d68a494439cc5f57 SHA512 33d33bb622e69512a2e11592455d654f6478994e78894bd0f73e03cc01e12c7e30b1fc25bbd6b44a3ce83b9e261ffb47c3d08a99bf523f4fe0e3ff00d93861a8
+DIST buildah-1.10.1.tar.gz 9378648 BLAKE2B ea563d1a52634aa4e0172f05caf04b511bd9962cec012ed35830ceb5848dae1c14020167d61d44e11d0dcdcd6d5440c216505a11987f6806bac1336dd12152c9 SHA512 0651ed1ec6015b437ed0a786bef20c6a88fedfa4d318edc081d257720b1cc2c8d380a8cde5125ab5894bf0b4a6df90034b689097f7cc05630401e8e7700fca6a
 DIST buildah-1.8.4.tar.gz 5122400 BLAKE2B b02a1cac77f5f16ab6cec3a74f11ee94675c717ead21fd791feb4cfbd08dcfb4313a1ee3134d3b9f9d20218935db35e28dab406a9f706ff2f46a2beb1abaa56b SHA512 a316e5e2bea7cded1db089bbc7831c9af69242caa6108c78d63864c012053bda3dc3da5bf70248b2742b2be1ad66aeb59c844558022c20f79236f5b1292d6366
-DIST buildah-1.9.0.tar.gz 5123317 BLAKE2B d38c36c2407b3a77a5f738e00ae08c4312945d5c2a4bb930e116e32171ea22c20e0a78e56cce7977844ff0d60306f5446a9c1a117d790ea83cc53e1e83e63417 SHA512 8defe72b267790a6d777eed2a68f89721184eab8df972ef59287e69e1719d1174cb120d6a0c254f8a3963721d34414ec614fb5d3e52fb85a6940c659ee720686
 DIST buildah-1.9.2.tar.gz 9505091 BLAKE2B 886e1ae5804f005f5782d011ed8440a8ac5eb09b2cf7917ac04ed1ab3e08f8cce6ef9b8efaf3392d60ed46b5bdb2efcec8b44c0448f970210cd613837a5d8f1f SHA512 1add432491fcae3b22dac2768ba71be2a47f42f3d9fae14cc5ff54220b3b7b96a48a95cb10b249de98f9c3067d463bbeca75c7c52783c111a9b5ed0ba03eb30f
-EBUILD buildah-1.8.3.ebuild 1446 BLAKE2B 9ddb64e07413b5affd6a4d6c0e8f59b96308fe9d3041228177b95de23070ee487dfb8b1a4ac70235f986c7542d06ba2dc38a1868d2c2ae913df52f0a1d9a5665 SHA512 e6b6bb15847ee1174e2299767fba88b504965ef1ef55bf9c8c7129959921c6b5f2b0e56d074a50def15d4b22abbef139b7c90bf1340c84703464e318525f123b
+EBUILD buildah-1.10.0.ebuild 1446 BLAKE2B 6fd24b1e8f98f2db900fdc3840e7448cb61fa1023783e22d384a0ecff4da5d8398c9c8cd1c096c6bb6cbef297517e009fbc818aed03716b05c9f4716b237ce71 SHA512 a743db9feccc105c90b0180e4151d62d4e8bb400b8f3324702896821560bdc8d08e9545c738863e4985d7fd9a264fd7cb7166446167dbeb51348d499cf47017b
+EBUILD buildah-1.10.1.ebuild 1446 BLAKE2B 0d5351236e5fce90665bc9b30e134d9a33ad4ed0cc9d6fb4f4977243946fa3dcaa94e7c156b7db58aabdbdb12c2bbe4f10b54d7eae644734b68584b30970ab85 SHA512 956d1447f322af82f0f8f88c483d980b4409e5cecb6d01980ad31b16844f46722497cd39a760c169461cf2a493fb31bc191df8dee682b02edd038054aae52487
 EBUILD buildah-1.8.4.ebuild 1446 BLAKE2B 12ce28dbbc9cdd9b3dcc9ffb32d31e343645db77c83349b02d114d1fe26d9f3a54208df5fde51760e913ffaaa2ea3b1f8ba5ef7e2bc925767ca41899d38d5688 SHA512 7fe65e02c631a6688d402fd6922b8bfb8cb8ffe9f496ccba5ccf2356fbdc066cb827a759f57f59ad53ab85c6544244fc48f0d5e048010ce7ea23b54512fc16ec
-EBUILD buildah-1.9.0.ebuild 1446 BLAKE2B 93ed9a986eaa335c2b91eb525bf0a773f0d2c30e83b9964a519bf535014adb4120d2ad6487e2ac669ef2b6541498d0d1d4d85904d25c80301b2e17276f2912ef SHA512 0095fd84410e44ef37bdaa4fd3c2942545e789406cc654cdb1fee870f4f3df2b3cb41504a461e11b51eaee7dd1191ee5aa5ff34518836c2060fec6bac08f9e2a
 EBUILD buildah-1.9.2.ebuild 1446 BLAKE2B 5f89e5874d84b1813c39485970832ca13a7ba70add473867d14d36d1252139bc0059ee3a365b0a530297c58dffd046ba55cb88771bdc8faf8313c70ee3adcf40 SHA512 502b062366388451ea0c120b6d05a6d6cc2db7a8b1f986f3b6e72b104b0651dd313032f16f56c5bbb7c519102598d1c94c73ae9f25c2ce6080fbab6cf1948c42
 MISC metadata.xml 430 BLAKE2B 7486f6f62edf735da40a63ee17411e421101908e3e2652584800a3bfe315afbd46b9b6fe6338f8bb6cc7d09eb1bab34c1600e9aa6ae08b8d0326ee896270f2ea SHA512 8f25eca02d11272cc5a479adf3e361fe7f7cd595b0d54d26668b68940e012499d6c447ba93f44773a72f5431dffc346f1286be1f1a984eaa94e9dfc9501eb7b0
diff --git a/app-emulation/buildah/buildah-1.8.3.ebuild b/app-emulation/buildah/buildah-1.10.0.ebuild
index 0b435ee4967a..397b42831fda 100644
--- a/app-emulation/buildah/buildah-1.8.3.ebuild
+++ b/app-emulation/buildah/buildah-1.10.0.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 IUSE="ostree selinux"
 EGO_PN="${HOMEPAGE#*//}"
 EGIT_COMMIT="v${PV}"
-GIT_COMMIT="547bd9a"
+GIT_COMMIT="5a3e9fb"
 SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 RDEPEND="app-crypt/gpgme:=
 	app-emulation/skopeo
diff --git a/app-emulation/buildah/buildah-1.9.0.ebuild b/app-emulation/buildah/buildah-1.10.1.ebuild
index 16d2c1c2eb62..66aa34a76ad1 100644
--- a/app-emulation/buildah/buildah-1.9.0.ebuild
+++ b/app-emulation/buildah/buildah-1.10.1.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 IUSE="ostree selinux"
 EGO_PN="${HOMEPAGE#*//}"
 EGIT_COMMIT="v${PV}"
-GIT_COMMIT="00eb895"
+GIT_COMMIT="8c1c2c5"
 SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 RDEPEND="app-crypt/gpgme:=
 	app-emulation/skopeo
diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest
index b92db9d77788..348fc1064ab1 100644
--- a/app-emulation/containers-storage/Manifest
+++ b/app-emulation/containers-storage/Manifest
@@ -1,8 +1,6 @@
-DIST containers-storage-1.12.10.tar.gz 1593313 BLAKE2B 4b0c412304dc6b3aa79064a6071abfdd325cffd7405c50d57008f3139cfd9afd450a21773e4463650b63720210381e58e11b8c019efcf0297377821c3b76c276 SHA512 83b7e353efe89192e1c956742202395981849f68d53967df14a6952e36c458a2a2adaed4cf7d959e3b73114906deb5056591b8fc3aefbc83b85f9f5dd378f031
-DIST containers-storage-1.12.15.tar.gz 5968064 BLAKE2B 180583da6271c23f828ba5d91e8f1db64ac1aa8f9bb1f308b59e0eb0bdcd7afb94509aa0556bfc86a4e182cbdb6501b9c51b58499a61c2773254b03a6c3bc621 SHA512 523e4d35995fa169701551f91362fafd67f25ad1cbe733a5ae2614a198a4d71c5b5f319a539dd5a6a38e79ca46b8979ed62918a3bd69fb39d8d14d259f197408
-DIST containers-storage-1.12.9.tar.gz 1593286 BLAKE2B f53ef233e3d08dad84cda9154271254f9fe04e951643f20e8ab5bd37456e4eeb7083c1810656072c2b4bdeea0f6188871d4db566363c8363d2c2087ab9a4d3cb SHA512 0b5ad6cb52b4b74da7c574ec6841d74b92ef20f853e8d8fed83e0f9d529a7749692225e26ae4ab89fbd2a6202651c8a3a44a57bc1f42bcbb755fdba26e9cb3fd
+DIST containers-storage-1.12.16.tar.gz 5970004 BLAKE2B 0e9f473c9315acb22b94c9cd17072659afe2270e05d7c7c595d0563bd4d96420b3ecaaaeaf61ce4a10647e40c7177b7483aadf62ce40237dea10c23cb91bba62 SHA512 17a073bb338547c1e64065a1a0013e083565abeb6aa366989160c90dfb6bd6d306ea25fc938194b607b0cc74918b1ff40b12ea274b3df771e2d848b2bbab2b5c
+DIST containers-storage-1.13.1.tar.gz 5983556 BLAKE2B 1d0b6aba0464603fb26c45beecdb9b4afe6566dff4698da980ad6f9736a6d810ec41334f181d5709f78bab986e704c965b1967ed591348cd687d9cb92875321d SHA512 9fa686f44dda3d363f7c623abc9baa0911e26eb5e7dbb7bc60da259fe8d52411cb25fb98e2c8db10a5a80ebf04d07af8390acd48d26706f913900b19e58eac9f
 DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6
-EBUILD containers-storage-1.12.10.ebuild 3684 BLAKE2B 709d1851467a15e468cf51d02014a49189d723953a582011dcf3d728a6cb893a7c849f8d1b276ebab1f0d659feb62dc7ea58e456e6c1ca32527d63f494fd3708 SHA512 72ad508ba85806cf65ca5e316e36d71c2d405d4b1a6faf788a652df9f7a9379c1459ee5305aee85ebfdf12d0cb8b83d4630e5498ac25be56a7442a4ff676810d
-EBUILD containers-storage-1.12.15.ebuild 3684 BLAKE2B 709d1851467a15e468cf51d02014a49189d723953a582011dcf3d728a6cb893a7c849f8d1b276ebab1f0d659feb62dc7ea58e456e6c1ca32527d63f494fd3708 SHA512 72ad508ba85806cf65ca5e316e36d71c2d405d4b1a6faf788a652df9f7a9379c1459ee5305aee85ebfdf12d0cb8b83d4630e5498ac25be56a7442a4ff676810d
-EBUILD containers-storage-1.12.9.ebuild 3684 BLAKE2B 709d1851467a15e468cf51d02014a49189d723953a582011dcf3d728a6cb893a7c849f8d1b276ebab1f0d659feb62dc7ea58e456e6c1ca32527d63f494fd3708 SHA512 72ad508ba85806cf65ca5e316e36d71c2d405d4b1a6faf788a652df9f7a9379c1459ee5305aee85ebfdf12d0cb8b83d4630e5498ac25be56a7442a4ff676810d
+EBUILD containers-storage-1.12.16.ebuild 3668 BLAKE2B bab8635ff0d2e53f1c8d073bc0cc32c4f72b1e349f2aa125f365ccf90e55d078cea879a1da8e8491787233763146735b80ae6fc9d3089f61b6fd3b0f1bce6491 SHA512 739370782be73cd37c51478741ff280df788c26ba6582c3a25bc8e8c9002b96bf3524b97ea02696810014e922802a7693c3779461c31ba5b259245c4d8a9e656
+EBUILD containers-storage-1.13.1.ebuild 3668 BLAKE2B bab8635ff0d2e53f1c8d073bc0cc32c4f72b1e349f2aa125f365ccf90e55d078cea879a1da8e8491787233763146735b80ae6fc9d3089f61b6fd3b0f1bce6491 SHA512 739370782be73cd37c51478741ff280df788c26ba6582c3a25bc8e8c9002b96bf3524b97ea02696810014e922802a7693c3779461c31ba5b259245c4d8a9e656
 MISC metadata.xml 691 BLAKE2B 512255d8e2d91d64a04fcd5da04fa6db20fbaf66c580491f001716a06c0ff81ff572491cb9b4274229f2312c7235abcbe8e32b6de9e2344b418015c253866f26 SHA512 eeb059ee40101e47a81d4ff871a55295c68891c9bb6a5a2f87d7855e3aea36648f2db77317f3660602d338d6f3f8cf1018cc61f2722fcd6cb78f7f32ac62989b
diff --git a/app-emulation/containers-storage/containers-storage-1.12.15.ebuild b/app-emulation/containers-storage/containers-storage-1.12.15.ebuild
deleted file mode 100644
index 312d2cda060a..000000000000
--- a/app-emulation/containers-storage/containers-storage-1.12.15.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_VENDOR=(
-	"github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
-)
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="containers/storage library"
-HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="btrfs +device-mapper ostree test"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-RDEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )
-	ostree? (
-		dev-libs/glib:=
-		dev-util/ostree:=
-	)"
-DEPEND="${RDEPEND}
-	dev-go/go-md2man
-	test? (
-		sys-fs/btrfs-progs
-		sys-fs/lvm2
-		sys-apps/util-linux
-	)"
-RESTRICT="test? ( userpriv ) !test? ( test )"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-}
-
-src_prepare() {
-	default
-
-	[[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
-		"${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
-
-	[[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
-		"${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
-
-	[[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\ntrue" > \
-		"${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
-
-	sed -e 's:TestChrootUntarPath(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
-	sed -e 's:TestTarUntar(:_\0:' \
-		-e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
-		-e 's:TestTarWithOptions(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
-	sed -e 's:TestTarUntarWithXattr(:_\0:' \
-		-e 's:TestTarWithBlockCharFifo(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
-	sed -e 's:TestTarUntarWithXattr(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
-	sed -e 's:TestApplyLayer(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
-	sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
-		-e 's:TestApplyLayerInvalidHardlink(:_\0:' \
-		-e 's:TestApplyLayerInvalidSymlink(:_\0:' \
-		-e 's:TestApplyLayerWhiteouts(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
-	sed -e 's:TestCopyCaseE(:_\0:' \
-		-e 's:TestCopyCaseEFSym(:_\0:' \
-		-e 's:TestCopyCaseG(:_\0:' \
-		-e 's:TestCopyCaseGFSym(:_\0:' \
-		-e 's:TestCopyCaseH(:_\0:' \
-		-e 's:TestCopyCaseHFSym(:_\0:' \
-		-e 's:TestCopyCaseJ(:_\0:' \
-		-e 's:TestCopyCaseJFSym(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
-	sed -e 's:TestMount(:_\0:' \
-		-i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #678856
-	mkdir -p "${S}/src/github.com/pquerna" || die
-	ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
-	mkdir -p "${S}/bin" || die
-	cd "${S}/bin" || die
-	GOPATH="${S}" GOBIN="${S}/bin" \
-		go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
-	GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
-		emake -C "${S}/src/${EGO_PN}" containers-storage docs
-}
-
-src_install() {
-	dobin "${S}/src/${EGO_PN}/${PN}"
-	while read -r -d ''; do
-		mv "${REPLY}" "${REPLY%.1}" || die
-	done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
-	find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
-}
-
-src_test() {
-	GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die
-}
diff --git a/app-emulation/containers-storage/containers-storage-1.12.9.ebuild b/app-emulation/containers-storage/containers-storage-1.12.16.ebuild
index 312d2cda060a..a472e58367b6 100644
--- a/app-emulation/containers-storage/containers-storage-1.12.9.ebuild
+++ b/app-emulation/containers-storage/containers-storage-1.12.16.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 	default
 
 	[[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
+	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
 		"${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
 
 	[[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
diff --git a/app-emulation/containers-storage/containers-storage-1.12.10.ebuild b/app-emulation/containers-storage/containers-storage-1.13.1.ebuild
index 312d2cda060a..a472e58367b6 100644
--- a/app-emulation/containers-storage/containers-storage-1.12.10.ebuild
+++ b/app-emulation/containers-storage/containers-storage-1.13.1.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 	default
 
 	[[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
+	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
 		"${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
 
 	[[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
diff --git a/app-emulation/cri-tools/Manifest b/app-emulation/cri-tools/Manifest
index 110004bc1566..979aa6ea8266 100644
--- a/app-emulation/cri-tools/Manifest
+++ b/app-emulation/cri-tools/Manifest
@@ -1,8 +1,6 @@
-DIST cri-tools-1.12.0.tar.gz 2608498 BLAKE2B 242e689ec69081838afe36b86e3f802e4ff3bfd50461026a8637dd777b8996d9e153fbab103c98fc5ad8bd82c4da52413ab4698f95db8f1c0fa7e825e8dd80f7 SHA512 394269515ac80dd2b995b20220b03e03bad8bbfa25cea8979777ab75830a0523f0945553ba5d3f7a900eabe9ccf67ebf5789627b46640a2fc46193aff101ba20
 DIST cri-tools-1.13.0.tar.gz 2675580 BLAKE2B 4dcac547caf048b546ea0b11401e414e8ab834171b9cf1abd773cc8b05d70e47138dde7c1195ba6e99ad5e7d7632d7cebb4a8c67f7ec9c0ee3a750ac5e591a7f SHA512 df5553913a9e8aa1e0fa896dd1da00184d059bf360080d5c4003ca20ab4b93770847e07887451a44668e588eec5ab0258e7f02ed485d9344701af0afa20d712f
 DIST cri-tools-1.14.0.tar.gz 3647742 BLAKE2B 1a308c87e7be05dd71cf11d79c841a837156529d398f1475323ff9585f9080cd0356a007f8b8c505a02943ff479a7c26869f35288d178ac8187ca6766032c488 SHA512 c8978e4380ebb2dd59ce533ade94486ae1e4091fda7acd8cf5cce662034a1d34a1851c43bf766a723c5ba71c15972733a2e80c6e82fb1c27e5a1dfc2e85476bf
 DIST cri-tools-1.15.0.tar.gz 3672568 BLAKE2B d4e9a0b2ca43efdb61c7626de518801a124fb61991f1df6a7eac106f7516ab59effa70038db7c4cbfddaf1c345c648f359c86d298dae08abb34f4b801b82b2a1 SHA512 43115fad485c2c6603e724f3529371133bcea6de069dc58d36e7880f558fa1696244b6129fe3a96fd669b27a3d9bd07bda1219e89afa348e36a85087992adf7f
-EBUILD cri-tools-1.12.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
 EBUILD cri-tools-1.13.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
 EBUILD cri-tools-1.14.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
 EBUILD cri-tools-1.15.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
diff --git a/app-emulation/cri-tools/cri-tools-1.12.0.ebuild b/app-emulation/cri-tools/cri-tools-1.12.0.ebuild
deleted file mode 100644
index a298fcbf5cbf..000000000000
--- a/app-emulation/cri-tools/cri-tools-1.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes-sigs/cri-tools"
-MY_PV="v${PV/_beta/-beta.}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
-HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	GOPATH="${S}" go test -c -v -ldflags="-X ${EGO_PN}/pkg/version.Version=${MY_PV}" -o bin/critest ${EGO_PN}/cmd/critest || die
-	GOPATH="${S}" go build -v -ldflags="-X ${EGO_PN}/pkg/version.Version=${MY_PV}" -o bin/crictl ${EGO_PN}/cmd/crictl || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index c3a7360bc146..d172e7162759 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -42,7 +42,7 @@ EBUILD crossover-bin-16.2.5.ebuild 4877 BLAKE2B cf3367255b3c70fdb75559e0c04f27df
 EBUILD crossover-bin-17.5.0-r1.ebuild 4753 BLAKE2B 9f563dd81089d4c679da849045c4ef916ea402dcff297c0d23c48d19e9a17e59b7d0b21e6712a8992072850a9e12b56d3613b5799aeee9da037d809bebdc8f6b SHA512 52cbb0f3397ac910bcd6d7323c998db31077f9c32555d3d8d8b0003486be14448d14ce6ef533eb74f0344de2bf12b2c930ca51fbf3b36762a47904d64d0efb82
 EBUILD crossover-bin-17.5.0.ebuild 4719 BLAKE2B 455cda74b397ccfdc4f3c6feab4a45e47aa3c4a2c0297da7496c0e317bd6038878aa6bbf7dabb2af767f9acbd44e7cd8095b64355562fc6d3d47a240ea7e813d SHA512 e1b782674ef33c04a3ffa9d60c663374401af16dae4fef4c083da01fe386b6b5e4acd188f81658d12baf4d09b67892a8ee5ee1ac14ee680ab57fad47b13d5c99
 EBUILD crossover-bin-17.5.1.ebuild 5267 BLAKE2B a950f38197953793d0d2bae5aa36fde557dbcefd16123251c77d31c5ac17c7cf34daf8bff38582e81e221fb06702c34da7909e94fc0c2ea75c216211ca0f78a1 SHA512 48230468afbee95831482c8b5142e512565dc86c8efbd2ed46a41d1327d96eac63ae50c675d49b7977874f8b61bd485bba79304e88a2223eb849a92b0d9d33ce
-EBUILD crossover-bin-18.0.0.ebuild 5490 BLAKE2B 66424f7b2e9ab71739ceba43ee795287c1e030a03ff0f1fca67654644bd95fe4eabde219f7bd038333ecb0c8dfcab4f185735ec46d7bcf3301993db89fd2df4d SHA512 7cdf726a2f6f5c28cb937c9c7285a84ee64ac5acb908442383772c465022636e396d7fd76a4d9cb1af47730b838476dbcaa36d12807713e1783ddb87660dcbb2
-EBUILD crossover-bin-18.1.0.ebuild 5490 BLAKE2B 66424f7b2e9ab71739ceba43ee795287c1e030a03ff0f1fca67654644bd95fe4eabde219f7bd038333ecb0c8dfcab4f185735ec46d7bcf3301993db89fd2df4d SHA512 7cdf726a2f6f5c28cb937c9c7285a84ee64ac5acb908442383772c465022636e396d7fd76a4d9cb1af47730b838476dbcaa36d12807713e1783ddb87660dcbb2
-EBUILD crossover-bin-18.5.0.ebuild 5490 BLAKE2B 66424f7b2e9ab71739ceba43ee795287c1e030a03ff0f1fca67654644bd95fe4eabde219f7bd038333ecb0c8dfcab4f185735ec46d7bcf3301993db89fd2df4d SHA512 7cdf726a2f6f5c28cb937c9c7285a84ee64ac5acb908442383772c465022636e396d7fd76a4d9cb1af47730b838476dbcaa36d12807713e1783ddb87660dcbb2
+EBUILD crossover-bin-18.0.0.ebuild 5491 BLAKE2B ff1a9582219869b460e0da79d7760f9bde7e4d1d3a422ff4548801b160ac2251c00e856c827fb96ba3fbd6c6ad115e6db5d0328f233a960244c99952c932b22b SHA512 6ca9bad5d61b6b82c23046783af86a587eb5a4fa35e72e7e41665242d605543f112bbc41b617d99d6b3e7c68f0dcbc729a946984cffe9f882bb2e783dc3a6c78
+EBUILD crossover-bin-18.1.0.ebuild 5491 BLAKE2B ff1a9582219869b460e0da79d7760f9bde7e4d1d3a422ff4548801b160ac2251c00e856c827fb96ba3fbd6c6ad115e6db5d0328f233a960244c99952c932b22b SHA512 6ca9bad5d61b6b82c23046783af86a587eb5a4fa35e72e7e41665242d605543f112bbc41b617d99d6b3e7c68f0dcbc729a946984cffe9f882bb2e783dc3a6c78
+EBUILD crossover-bin-18.5.0.ebuild 5491 BLAKE2B ff1a9582219869b460e0da79d7760f9bde7e4d1d3a422ff4548801b160ac2251c00e856c827fb96ba3fbd6c6ad115e6db5d0328f233a960244c99952c932b22b SHA512 6ca9bad5d61b6b82c23046783af86a587eb5a4fa35e72e7e41665242d605543f112bbc41b617d99d6b3e7c68f0dcbc729a946984cffe9f882bb2e783dc3a6c78
 MISC metadata.xml 364 BLAKE2B 9978c9532a9bd1adcfa22f00db6a8fd80fda155a6adc69ee0c0693093e7a7ac0a0eba1ef5a0657e6dff5aabdb7e6259c883aceffbba89b495a25b0d3e26e5174 SHA512 68f361d337b167c549eafab8e45dcb33548ac67a206ead2f7118330a77888c6e2ba4dbe7755ca23c81a5e619458f25359e3f2d8eee4f6d0e359b5c3a28475096
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 ca67eab96b62..ff1c9fe1fce1 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
@@ -126,7 +126,7 @@ src_install() {
 
 	# Install files
 	dodir /opt/cxoffice
-	#cp -r ./* "${ED}opt/cxoffice" \
+	#cp -r ./* "${ED}/opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}/opt/cxoffice"
 
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 ca67eab96b62..ff1c9fe1fce1 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
@@ -126,7 +126,7 @@ src_install() {
 
 	# Install files
 	dodir /opt/cxoffice
-	#cp -r ./* "${ED}opt/cxoffice" \
+	#cp -r ./* "${ED}/opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}/opt/cxoffice"
 
diff --git a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
index ca67eab96b62..ff1c9fe1fce1 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
@@ -126,7 +126,7 @@ src_install() {
 
 	# Install files
 	dodir /opt/cxoffice
-	#cp -r ./* "${ED}opt/cxoffice" \
+	#cp -r ./* "${ED}/opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}/opt/cxoffice"
 
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index cabff177e1ac..28e51d847e5f 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,6 +1,4 @@
-DIST diskimage-builder-2.24.0.tar.gz 408702 BLAKE2B 069083aef6214d59d9731a13691c2b48cb354085b698c8f711b3cd93c54d44acb08487510b2b9b038a53c533ea17f41b2521c36eee643c09dc409ea13c21fa6b SHA512 90bf13059f9310f3b45bf7c1a550d837e4d73920efa2af2ae30ec3cd5118d3db223b6953d5209ef0f7029c23f17772de1a36cfba87d7e86bbe8a481aa4ee0639
 DIST diskimage-builder-2.25.0.tar.gz 419297 BLAKE2B 78ac5b1119233080dddef917b05ca4f51f73382bb325cbf228f63837ab79be9ce524351404f2a26cf735440c66a3dc246a1642258b77f217406998650860eb39 SHA512 4afd257b01924a526ef335bf6699f5fbf49ca0c08bb3d288a6823783b842827e3afb51794771994f068332c6ee2ecf6f105fc03112d6a7807932fb5ab1fa4c24
-EBUILD diskimage-builder-2.24.0.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
-EBUILD diskimage-builder-2.25.0.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
+EBUILD diskimage-builder-2.25.0.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
 EBUILD diskimage-builder-9999.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.24.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.24.0.ebuild
deleted file mode 100644
index 20cf3dfed3ae..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.24.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder."
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	<dev-python/networkx-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
-	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools
-	sys-fs/dosfstools
-	sys-apps/gptfdisk
-	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.25.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.25.0.ebuild
index 86d3bb124b34..20cf3dfed3ae 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.25.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.25.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emulation/dlx/Manifest b/app-emulation/dlx/Manifest
index e2cf55bab18b..e7fad12e2edc 100644
--- a/app-emulation/dlx/Manifest
+++ b/app-emulation/dlx/Manifest
@@ -1,3 +1,5 @@
-DIST dlx.tar.gz 112589 BLAKE2B 307785d08fd69e45264471fbc21e3b2bdba99798c0b7144c3d6a92819c29e4ac6449a6db83fdd55ba81d3b2e3f8ca6c991ee6c117ddc490a88ae210e5bc07ab8 SHA512 99297f14f6716ada7a29b204723a0c951002529362a22f695b3647517462f43af563ea55467985dda3e21d79a14d46b84dbc9b22a8c0751fba49257e30f70a7f
-EBUILD dlx-1.0.0.ebuild 377 BLAKE2B 8a1a1a772ec38bbb2aafb68a5e8142064ae8eb2b45837d4ca55b13dee9f6d14f973b8dccdd1f2fa4ed0e5f49c506a3561eb7af8c015d3862fa3b640d0f957cc0 SHA512 e0f022d7469d8be2c3477cfd26f2413f35606578ae3ae14f9c5fcd632687ea6f69d43bf4bd618eedef960863ac6cc2fac8167a5164bb65bae410afb921e9aa58
+DIST dlx-1.0.0.tar.gz 112589 BLAKE2B 307785d08fd69e45264471fbc21e3b2bdba99798c0b7144c3d6a92819c29e4ac6449a6db83fdd55ba81d3b2e3f8ca6c991ee6c117ddc490a88ae210e5bc07ab8 SHA512 99297f14f6716ada7a29b204723a0c951002529362a22f695b3647517462f43af563ea55467985dda3e21d79a14d46b84dbc9b22a8c0751fba49257e30f70a7f
+DIST dlx-1.5.20.zip 137039 BLAKE2B 99dbb2e5bcd89b3e9f3d8edc2fe7e7cc0a59f870f597a40a61a993b95d8b27c4f95b8d0490fdbcbc15693040d6e3abdfb8b0062e109916f5299c3da3c203d755 SHA512 5c832c2a486a82574ae03ec0cb4e30bfec74ef968658a38fbd896a1383dcdc558501baef7cbbdf99df453ba2840622d16c1619f9c5fe34b6cd058a7718bd3790
+EBUILD dlx-1.0.0.ebuild 375 BLAKE2B b9a5b9cfca4eb241491f272abf08bf2fd95935571404274f6df5b07ba044ca143b01d5e2dc25b4f07d289e732a84c45fdbe734fc1ae0eb092ed01b0dcfab3044 SHA512 c65ee800a5658c356972568a4ab7ed986b73cb3647e5ba71e071ed5a73ea5a5d8df3b829b6f07b6150bea9e078b9da7c91108e18dea0f6c95f55949f6559a499
+EBUILD dlx-1.5.20.ebuild 594 BLAKE2B 25a39d4195d1995c58d3206288ee9d73f34010a0dd986b4a91b4dcfa5cb1d9a422c909d1cd1290dc63c2b4ec1b478e85c2dbbf495ac5e0ad8c3c86a25f8a60e8 SHA512 85cfc7920a765d93c13c002ea73b4d4853ab52be99c535892e0231bba339ec813d881339b22394bbb3186a22db8c96db0fed8c19e89fdf951ebc3e7573bce4d5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-emulation/dlx/dlx-1.0.0.ebuild b/app-emulation/dlx/dlx-1.0.0.ebuild
index 77c03ed90c35..07a21a906582 100644
--- a/app-emulation/dlx/dlx-1.0.0.ebuild
+++ b/app-emulation/dlx/dlx-1.0.0.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 S=${WORKDIR}/dlx
 
 DESCRIPTION="DLX Simulator"
-HOMEPAGE="http://www.davidviner.com/dlx.php"
-SRC_URI="http://www.davidviner.com/dlx/dlx.tar.gz"
+HOMEPAGE="https://www.davidviner.com/dlx"
+SRC_URI="mirror://gentoo/dlx.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-emulation/dlx/dlx-1.5.20.ebuild b/app-emulation/dlx/dlx-1.5.20.ebuild
new file mode 100644
index 000000000000..30e768088a51
--- /dev/null
+++ b/app-emulation/dlx/dlx-1.5.20.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="DLX Simulator"
+HOMEPAGE="https://www.davidviner.com/dlx"
+SRC_URI="https://www.davidviner.com/zip/dlx/dlx.zip -> ${P}.zip"
+S=${WORKDIR}/dlx
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+src_compile() {
+	# CXX not used
+	emake CC="$(tc-getCC)" LINK="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin masm mon dasm
+	dodoc README.txt MANUAL.TXT
+}
diff --git a/app-emulation/docker-credential-helpers/Manifest b/app-emulation/docker-credential-helpers/Manifest
index a618470c6d0a..5f7ddd5b0d81 100644
--- a/app-emulation/docker-credential-helpers/Manifest
+++ b/app-emulation/docker-credential-helpers/Manifest
@@ -1,3 +1,5 @@
 DIST docker-credential-helpers-0.6.0.tar.gz 27441 BLAKE2B 6517f069782d5a496d3f140d86e5b1f32f197e9209ed61f75bfb9ba29cf0e1fa509bdbbbce2defc14ad0abe316632683cfad25e7ac9a6a1d70c3289e0ad489f5 SHA512 359e8ec700f423ce0687f13ce02946007f90456abe86659a87c59419ebde5e79adb4d28ee5e6a9762a44cfd65648c247629a5273326abf18a8880bee637e74d8
+DIST docker-credential-helpers-0.6.3.tar.gz 28971 BLAKE2B b50e4de0f3b126e0118f24f845a94be5e932975ab54ad6e0a52129a56109ecafb021f14986569295242cb0af4ea109d8786b8a5ca8481cc48daad14671841432 SHA512 2d15be8df134bff08eef9461348f07cd57c70c15a0ab044de2e69296c400b8c0e16198c90fd064d5ce83037d0bad57520e7524b0832b7a00e69397203dc90d10
 EBUILD docker-credential-helpers-0.6.0.ebuild 1239 BLAKE2B 8d4df763dff3aacfce1f28ce3165e4fc0271babfd4baf2adaabd737c8826b13741cb28e9d55f9507af8de35bb79311e296081919dfa9bf197f1faafbb36a2cb0 SHA512 df28794f01a5af1bf3390fec6bb0050f13ea93c90255800a94d5069ff7b5ea3b69b7d352e40d4a6223df9e5543c2fde8065d159af8ae24d8ddb9a1d2748060f7
+EBUILD docker-credential-helpers-0.6.3.ebuild 1238 BLAKE2B 49c02a4a5e4cb07d1ea9c425b64535d14c07b113d628a0c1db05a9e6efd0d922980a7d9bbc754e77cc649ac78cac52e2bf5ea3b36f1900404e4a69acbc3cd1d8 SHA512 4941ff7d43019d3e3e46e3804c5249e548d316ebff82f4f6bac4a6685d06d465e9fe1d01fbe1cebbcb4b2e454d52d686959868c9087f5fbfc66ff2b6a28a66d0
 MISC metadata.xml 847 BLAKE2B 7fff76aa67ee9868506860bb8a6812d0412cc9d5e8e6b4ef2906af3a761133fc299f5deb6ac48a5258a0d1b250611770042627f1dc667acab3a974960a2e1ca7 SHA512 f4cfd994d789f493ac2dba0699370fad8253121028ea4f25f882e406d7d6846cbea505149fff090cc6d898b5d4634472e4afe6ccb6f1177a5a23e7ba5136470f
diff --git a/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild b/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
new file mode 100644
index 000000000000..3f46440c7bba
--- /dev/null
+++ b/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A suite of programs to use native stores to keep Docker credentials safe"
+HOMEPAGE="https://github.com/docker/docker-credential-helpers"
+EGO_PN=github.com/docker/docker-credential-helpers
+
+LICENSE="MIT"
+SLOT="0"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+IUSE="gnome-keyring pass"
+REQUIRED_USE="|| ( gnome-keyring pass )"
+RESTRICT="test"
+
+DEPEND="gnome-keyring? ( app-crypt/libsecret )"
+
+RDEPEND="(
+	${DEPEND}
+	pass? ( app-admin/pass )
+)
+"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	local -x GOPATH="${WORKDIR}/${P}"
+	use gnome-keyring && emake secretservice
+	use pass && emake pass
+}
+
+src_install() {
+	dobin bin/*
+	dodoc CHANGELOG.md MAINTAINERS README.md
+}
+
+pkg_postinst() {
+	if use gnome-keyring; then
+		elog "For gnome-keyring/kwallet add:\n"
+		elog '		"credStore": "secretservice"'"\n"
+	fi
+	if use pass; then
+		elog "For 'pass' add:\n"
+		elog '		"credStore": "pass"'"\n"
+	fi
+	elog "to your ~/.docker/config.json"
+}
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index 869e78ce8967..a100ea16b16b 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -1,7 +1,7 @@
-AUX faudio.pc 241 BLAKE2B 64fce2341df51cf608407d22953bcfdaac705f9031fe060eef9b9d45cf4eee5f8a5d747be76f0c68bbea5d3bda6aec5ca8fee6568a7355a90f95f04ef47531a2 SHA512 78ade9bf6b45ac0f942485844b023c2bc11dd77e72484da0260ce59a2dce6f9a70443ba4a64004d35b24b79688e03b6406e85fd7ed835e5952e1f50d1a9193ff
+AUX faudio.pc 245 BLAKE2B 8231bb42f6d90dd814eabd12d4d582d74ea0f154d6913fa710814d1bd75168d667463fd430d827ac7854aaa76bc07d16e5ccb3f6455e990ae0e2bc21bc633291 SHA512 bbdce2d90fcf848b8ef6a7a47a5bdf535d261aa833d6821de21907be05cca8693fede48c0e4161ae8087522297a2ec5af8c5ff5ed42efb814bbbc195ff963059
 DIST FAudio-19.03.tar.gz 886621 BLAKE2B 0cf0b60766d48472c72dc2aa9bbdb9a99db27836f38eccacb4be4bd98cf387b6009998018438e46835a9b9616d426b8a2c9f3c200b377bce2dc9bc18e42b0d37 SHA512 94e3e4f3f023879ef821d657e5a73ac25aab55c7be6a0afe77d75cabe644c9da083ae3c6a240b71af542da53a3eb34804e6a3193a0e619f89fcc20ff7d6ef095
 DIST FAudio-19.06.tar.gz 899089 BLAKE2B a59ad9613bcfa71e1fc8be1f2d389f56b8f96430c354b7c7148d1e1e084102b6d8559cd258f3ab6969a4ac93e55ea2397b18dc417857e9ee0f022ea0dae65c0e SHA512 ba3ee18b47d8d85dc39e777c420522349f9873cf1528dd6c266f7254fe27cdb5bb6ab5bcbeab870938b509bfd006590d2380908b7d1e3fd679d2a434ce82eca6
 EBUILD faudio-19.03.ebuild 2399 BLAKE2B 2d8340562b9215a947b77de1af488c63a765ec654e73c5638cf7fab715f28a8067aad98c32bb8e0856d663f6ea9bc04f0af6bf78286b35f9685296bc53411a0c SHA512 b786b10dc4156c815fc1189add4afbbe164458b51fd25889f3730d76bd3ebd0a6dfd12f1166b8ac82f13c451be33582b8ee82c29dd96ba09eeecf57b76f46bed
-EBUILD faudio-19.06.ebuild 2399 BLAKE2B 2d8340562b9215a947b77de1af488c63a765ec654e73c5638cf7fab715f28a8067aad98c32bb8e0856d663f6ea9bc04f0af6bf78286b35f9685296bc53411a0c SHA512 b786b10dc4156c815fc1189add4afbbe164458b51fd25889f3730d76bd3ebd0a6dfd12f1166b8ac82f13c451be33582b8ee82c29dd96ba09eeecf57b76f46bed
+EBUILD faudio-19.06.ebuild 2433 BLAKE2B abec98d564c929b8aee5945ee92d1eac2614bfe91bc1daf394bbe5486761ee4777f69ea67f8f1081341ab7a13f33fe5b421fee2fd7a972dd63d7934102e23cef SHA512 52beb934cc86c94303c44dba96d586e64434beefa7b25674813f2f6df29dfcd2e2cf8bbdcb8a9e149f15421a8b325799945dc69497afad3fa6995ee2a4afbe40
 EBUILD faudio-9999.ebuild 2399 BLAKE2B 2d8340562b9215a947b77de1af488c63a765ec654e73c5638cf7fab715f28a8067aad98c32bb8e0856d663f6ea9bc04f0af6bf78286b35f9685296bc53411a0c SHA512 b786b10dc4156c815fc1189add4afbbe164458b51fd25889f3730d76bd3ebd0a6dfd12f1166b8ac82f13c451be33582b8ee82c29dd96ba09eeecf57b76f46bed
 MISC metadata.xml 1341 BLAKE2B a5fe79fca0c7f184466254e5f251c6248c20415795933b8797a4bd899535735ed93b54754937ed1003103cbbe3d5d6c5ffc5848c255cfd759cb06fb973065003 SHA512 8ad14c2ae094ff4ffd013458db62263b97cc5e616885cb229ef57ff8a4ab0dd943c2ab3840d086a81a4a10962c0d7411741ac6a8daaefb5167fe988a1dd8122a
diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild
index 295da5632494..a8490f1cf230 100644
--- a/app-emulation/faudio/faudio-19.06.ebuild
+++ b/app-emulation/faudio/faudio-19.06.ebuild
@@ -52,7 +52,7 @@ multilib_src_configure() {
 		"-DXNASONG=$(usex xnasong ON OFF)"
 	)
 	if use ffmpeg; then
-		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)"  )
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
 	fi
 	cmake-utils_src_configure
 }
@@ -70,8 +70,8 @@ multilib_src_install() {
 	# FIXME: do we want to install the FAudio tools?
 	cmake-utils_src_install
 
-	sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \
-		> "${T}/faudio.pc" \
+	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"
diff --git a/app-emulation/faudio/files/faudio.pc b/app-emulation/faudio/files/faudio.pc
index c632922c1f66..cdb3bf49e64a 100644
--- a/app-emulation/faudio/files/faudio.pc
+++ b/app-emulation/faudio/files/faudio.pc
@@ -1,4 +1,4 @@
-prefix=/usr
+prefix=%PREFIX%
 exec_prefix=${prefix}
 libdir=${prefix}/%LIB%
 includedir=${prefix}/include/FAudio
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest
index a03766b75ca3..f3c32f6b4ff7 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -2,7 +2,7 @@ AUX 0.3-nine-dll-path.patch 414 BLAKE2B a1747c90521f2fec6ba70ea77c2b7a2adafd705e
 AUX flags.patch 928 BLAKE2B 62f7d6c3e904ad13f39f6e554fb02784b1d68bcea92208c16f0583d41dbd95c1bc52d6b58ee7b88aff54073f9afc078839759f752ee765ebb8059a81fe52dee3 SHA512 e37221abb35a4c170a38db0129a0413b54863952ed00efa36dd0b8af67850cde3949d8b81547bad8c13783ddd7a32407b6eaf33881505cdfe165a29ec9c31c19
 DIST gallium-nine-standalone-0.3.tar.gz 63887 BLAKE2B bd198617a5d3d3830bd5127b63eed2c82bff037141ae72ff9237ad5062fdbe9b6797e233eaf86e06d92153487c53389eb094b0be3b0cbdbf3fe565292a15cbb0 SHA512 80fedca58523fbf318109d2d3d5420e97d26ebf5b89b9f1965165c7a33c9dab9c62a65f14b75569b5126c549f5df91beef372d54e94dc90c608932eeb6a59829
 DIST gallium-nine-standalone-0.4.tar.gz 66820 BLAKE2B 7e7b0028f0c7e7c26fa1ee164e7e867fee39a5f315b750bfc3537e8720e9fbc625ca27fb28a58e8e521af455f8ab347d6fd6ca82786fe5ac9d76e368cd43466e SHA512 6af31e828400c6f711c76d91fb65215f4ba79c31b8d98f3e953b319593d96d1e5e78e07aca96529de37bbb89f3479a4d4db5f58e32ce7b98667284be10a9e532
-EBUILD gallium-nine-standalone-0.3.ebuild 2928 BLAKE2B aec5af41c488c7a0d56b432a6fa103c6f485668f0c068c5aaa85501d4b6c29bd952124799508deb99926822cf58b17e0a86c4ec4e37b79d88aadcb7b690516d1 SHA512 3c93f520498e0b9de4d2f7552fd41944111801f38cf540acda048c61bd83f878e433b273c547c1b21f6945a529881ae94cdaf9c03b27f10908a70a4d16d612c9
-EBUILD gallium-nine-standalone-0.4.ebuild 2782 BLAKE2B 9335c616e56938adce7e7d409f369765936eb58c612601e9feb48714e8313db62b106450ab0d5d63d8880357555b2e2fee7c51c00ae68c0e6c81ef4af3eaae3c SHA512 1a51b7f5a8e68188a0505f1f1467c5b4f35c8ee7dd4135d622dac12a6b756c96a521bf6ce84fb2c655b94f49fd4fea0a01c973a2d4c1fa213b49c42ccb6ff092
-EBUILD gallium-nine-standalone-9999.ebuild 2782 BLAKE2B 9335c616e56938adce7e7d409f369765936eb58c612601e9feb48714e8313db62b106450ab0d5d63d8880357555b2e2fee7c51c00ae68c0e6c81ef4af3eaae3c SHA512 1a51b7f5a8e68188a0505f1f1467c5b4f35c8ee7dd4135d622dac12a6b756c96a521bf6ce84fb2c655b94f49fd4fea0a01c973a2d4c1fa213b49c42ccb6ff092
+EBUILD gallium-nine-standalone-0.3.ebuild 2933 BLAKE2B 442d7846ca83823a7f0149ebfdc45ff4956089c3c474632f8db2bc2ede2d83e17cc18ace983b0c987077d5a8a5ae8ec1ed1b0208b362989d7c8ff9cb1738ad90 SHA512 03e4c024fd647581e83ebd7702a3f79d0438e533c164760cf332075ad4ade69c8baef2f2d4cebfaf7109dcaa7acb20db33d54678b3064eb9e89897b7b6881720
+EBUILD gallium-nine-standalone-0.4.ebuild 2787 BLAKE2B 18a81e313b78b1f5eb85af12620e3e40ed249470a62385ad1ccd90f53f0680803ee7cac7849dee19462f794411e0f206bb44e386fcffb56aece3f3989fad7c6f SHA512 ec186e36f80cd37e403f23d99720f356d6b1da2ec62d3da4e04e0179af0992943cc475112c92396fe82c547a5dd736ef3b0ddfe4cb509357eae2ca0672577c5f
+EBUILD gallium-nine-standalone-9999.ebuild 2787 BLAKE2B 18a81e313b78b1f5eb85af12620e3e40ed249470a62385ad1ccd90f53f0680803ee7cac7849dee19462f794411e0f206bb44e386fcffb56aece3f3989fad7c6f SHA512 ec186e36f80cd37e403f23d99720f356d6b1da2ec62d3da4e04e0179af0992943cc475112c92396fe82c547a5dd736ef3b0ddfe4cb509357eae2ca0672577c5f
 MISC metadata.xml 774 BLAKE2B 8b793ed6e079a800628ed7e59786bc82dd191c05367ef5e1600f903f3ebfd32c9ab0034a1dba1701ec104348cf1b9a8b437b63300e607a65ee92b1887be4800f SHA512 9453d7d767ba7f788291c6980a86388a0f952b893a474aa17e249c4f3b9b77b864108230fdc8f8b94e74eb45443f608a8d9ecde10cbc121234c9b91f59e7b752
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
index 852055dc803a..b71e44053307 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 # Steam's Proton.
 
 RDEPEND="
-	media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
+	media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libxcb[${MULTILIB_USEDEP}]
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild
index 868d83cdbb60..3c025087d82e 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 # Steam's Proton.
 
 RDEPEND="
-	media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
+	media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libxcb[${MULTILIB_USEDEP}]
 "
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
index 868d83cdbb60..3c025087d82e 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 # Steam's Proton.
 
 RDEPEND="
-	media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
+	media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libxcb[${MULTILIB_USEDEP}]
 "
diff --git a/app-emulation/libvirt-snmp/Manifest b/app-emulation/libvirt-snmp/Manifest
index 3840290aebea..69921b45be1d 100644
--- a/app-emulation/libvirt-snmp/Manifest
+++ b/app-emulation/libvirt-snmp/Manifest
@@ -1,5 +1,5 @@
 AUX libvirt-snmp.confd 143 BLAKE2B 0781bbd4a4fc0f9f9f32347ae5b730ee643ccfacbc02ddacafca4fe3ba7af3418acd1a677f5d30547f2816717a29091a8305054c87549d675402fb639f12eb39 SHA512 15037f146e7d2f72c83927133b07477a8f0c79df417dc37f3d5a58081f4a9d5c950b5160f4c4b419b68430192a178cb9b8550106d4870ace264448a74de5862e
 AUX libvirt-snmp.initd-r1 639 BLAKE2B 46cc58e561aa341a27381cf1ff7925758dae2a8a119fb789645d5a602631b52d7d3325549da4b5b256f33c94e9a7d90200e5010d326184eab58a2d83d9bb72da SHA512 90db400497ea1ff10ffb0b8fe1ec9cfbbb066cdec0db9669924080ec64fd9b2e878c063eeb8ba7ffea0c3cd1f154a9074daab0bd6951de34e3d1183518dfdb18
 DIST libvirt-snmp-0.0.4.tar.gz 157859 BLAKE2B e2c8fcdd97ba9b55bd4d318c63f7738024c1360ee10aa4e685c2ea6ca02478206febff30f3e1a82eb1a2dadaa52a377cfbce538e12e33f4ea2fe10b1a089945d SHA512 dbf47e7983f9bd6fcff205fffd1f6006268cca774cf427d39dec84dc7de37b545c0dfcbb2c6f171f55d73487cdec13341097137e24de2dea58ce90494d281162
-EBUILD libvirt-snmp-0.0.4.ebuild 1032 BLAKE2B 9353ae76440b9cb8d4262687063c1dad2f820bc6969dda8b7a72ba0e745298ac514892ebfe87e6bc821d45154327133958fcf41613c038da27cd9a70a10146cb SHA512 06cf2d4d7b6d3819233e5c8e4e1b03237184e1d9640bc345060802196467d697e8c5f7e018fe789ad6d58109557b3c18095d1569365a3b5457131ffc4530362a
+EBUILD libvirt-snmp-0.0.4.ebuild 1027 BLAKE2B 2f67b60d540531b3a6e6a1d05dd811f35c963b20a8ee8704f6fdc489222a8846f95af61a39ed3a1b3a5c5169a2e87bbe163f97e6ccde936e2fd16b348c769aed SHA512 04c43c28a709c383535e0006abd75f25bccd1bba999a98c02c0c921497b4ff708056473df579ada3799fa8ccd23668585e46e207d3ed5dff0c2805a00d545a67
 MISC metadata.xml 256 BLAKE2B 6c2547727deeea210991f6aad9ba6c5c1e409a50652f665d0dcf12e239ce3beab612375e2c6bc75e1ee02026149d11519ced3974e60ae165b225adf0bdbcd260 SHA512 379c849f353da475a34564fec13fd0bb74e2029b0e00cbfbbf35eb37323a46a0d483788917cfeeeacb91a30867de199eeff9e1e280c2dc9ada84f32cf221dc09
diff --git a/app-emulation/libvirt-snmp/libvirt-snmp-0.0.4.ebuild b/app-emulation/libvirt-snmp/libvirt-snmp-0.0.4.ebuild
index f0eb657001f9..8539f42de690 100644
--- a/app-emulation/libvirt-snmp/libvirt-snmp-0.0.4.ebuild
+++ b/app-emulation/libvirt-snmp/libvirt-snmp-0.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.libvirt.org/sources/snmp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 5428e2936f6a..02250b9547ff 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,6 +1,5 @@
 AUX README.gentoo-r2 2093 BLAKE2B 30a5cf13067a6ea11537ac2d532e842180815d7f7a75fa9a8c47077635c38cafe8f0efe0a5b56ed099efab1e5a2e45820485e418c46d8c7a9798f2908f2b937e SHA512 b8ac050161a12744c551f6986841696a4c1c0b915402c42f6b03cc4c2636945c1f63b93e2503e189597f6fb05bc8ab6a043f6f23981f060d567d708c34ddd582
 AUX libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch 641 BLAKE2B e796f4e32f00e8970eabf723520601b26c7fa5f7579d538299538632ba036dafbb2dc64ad40d10152c0637043b2a649e1dc08468d1f250e00ee0af095d94a093 SHA512 df9960b80c7dda852e38d992ab31181d79091bd6e1ba88c0b0c1af8a2f2d1445ee95c957df38ab27b452cd2de01d36b88164e665a867ad69c15ca15c18b1d588
-AUX libvirt-5.0.0-fix-paths-for-apparmor.patch 4372 BLAKE2B ac8c78097b8125932fd89756ca7332665e2080afc5de37e0a31d6f2a84e15f21e01d41b39c7781c26cf514c74a215623c0013e67cffe7543892d5b13d3022642 SHA512 391e78a2ea113c38afb07b9f0c7638748e5bc04fb88ea96be7ff439624c429ff0106024674546b01e750d8b1e1418d13040bc8462653eb8567651378b66d53a5
 AUX libvirt-5.2.0-do-not-use-sysconf.patch 5969 BLAKE2B 965e53b33424b5e62107574bc457ee886c799b247179200cf671485dff331db3e2c453e55b3a38b34a205ba3663ddf2e4fe0ce336f9c262fa886192368ada3f0 SHA512 a1683ca986d006bcce8388d3ee5e8daf699f92c6dac9714a4cce1fdd8ea3a4f745b231e0576bed08eece04acf96872257a8e2890b0a3acefb5cf2657f3223792
 AUX libvirt-5.2.0-fix-paths-for-apparmor.patch 4372 BLAKE2B ac8c78097b8125932fd89756ca7332665e2080afc5de37e0a31d6f2a84e15f21e01d41b39c7781c26cf514c74a215623c0013e67cffe7543892d5b13d3022642 SHA512 391e78a2ea113c38afb07b9f0c7638748e5bc04fb88ea96be7ff439624c429ff0106024674546b01e750d8b1e1418d13040bc8462653eb8567651378b66d53a5
 AUX libvirt-5.2.0-md-clear.patch 1268 BLAKE2B f2609a957025a59a1c5daf0faf408fdcc3c77eebb6dc315cd9ba3d6e8dc441ea6f8124ea3903ef030afe5faea0839bbf118ab22b48a424b3895a7e4b451d797f SHA512 3413ba74f841ecafdbca76496f367d85fe8ac31d637099a0c875a2ea0cab90d277a26918f7a2ffd37fd726cc1ef317a27fbdf2a73a411eb259b26a0fae0f8fd7
@@ -16,11 +15,10 @@ AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47ab
 AUX virtlockd.init-r1 563 BLAKE2B b8e1d2c29570480b477f14c25042f227093474710f1d9d445472e512415f73c574657a1eaddea892d15a838eb7fce2a0f0dc067dadfd393199640185606bff1f SHA512 524f33171cdbee8a36b341938bf5d45da88893452ed83fbe0fbcfd5191ea6127f3364fa36d6222c37dede1e0c3f195c3a68a30809fb6b11b5ce750ca297be629
 AUX virtlogd.init-r1 562 BLAKE2B 52b0dce0d3dd856d6cbffbe37e721d8f053d53a4802ce3a1e83ab78a8e0920d66436d9cf5e6d6e4fde13debb90e0b61355befd9e67d6546967f19f8c26736dbd SHA512 98e705fbd08f0f8342d33762c98786ca0690f617be27ede5ddf2c5053eeae3f441403415f4c961a7f388dc844075d21515a8ffd62d1654d1049e06910bb1c7b9
 DIST libvirt-5.2.0.tar.xz 14992888 BLAKE2B d68aedb634a70063a116e112689f252d3fc2fe5369a4cdde8cacd392e806203bf277406bb10c751bae27f34f27a38355fde84573b6221fc4843393f9ae60ae5c SHA512 378dc1552263cce746117487abc0a1f3411e5be149331717158ba23825734ceae7ca474290264d71de798fdd089ad9672026bcb242fa5b3aef87294284d06f04
-DIST libvirt-5.4.0.tar.xz 12346896 BLAKE2B 28efa8ddc1b3262cf195bb114d3fad8307e7b4b4578a8dca05c03e36c85c7bffb4a4f6c73f89d156fc5b046f8ff7f27950dc5cadfd944e9f3c1b854ad03f328c SHA512 03fa932d041d147cab79eab200bb33f8db72579be72ec7cbff3305f4a8d574835a80f1b99936eddf67f83d21cc5567f45c86e555209de6cd702f43f91197cfd0
 DIST libvirt-5.5.0.tar.xz 12930224 BLAKE2B 4add0b727e4754bd1b2b4e9020942b17872533737e496ddf7976bf86a0fd3bcfbebd83387a8f3bab8dcc9afb05755b245e55682ed17d6094085d3dc96d94eefe SHA512 47923aaca605fb43a53238ac535abc1f88f73435336b8f3e88cb01df277ed205d99c586991e523aa32b50c832a0a7c949ab5f84dc78eb8d18a4951cfc791448d
-EBUILD libvirt-5.2.0-r2.ebuild 9710 BLAKE2B 59dcadcec2d92b8fdd8fb446a1fe506d7f6de45e0f39681f88027f45851ceb2ed9cddaf8f91cf2987601ba5052298d4f3c99d9a6c32e0eef47f0396752529653 SHA512 bf82f0b5e96e32626359a9bbbe6c4e42efa3aebdeb172c221e90fccb6029c947628c6f5d2ef9c89a49cb9d4dd1c1122804e2620ae1151f298ddf507c8f416b2f
-EBUILD libvirt-5.2.0-r3.ebuild 9703 BLAKE2B 2cbfa258df2d127470363b0c937279d0e8656a98fd1e0336a925148bc6880e7c307c3197ec54d6434ef7ef4db4fb004f4ae60d9ead3f9e6a87608a205858b7a1 SHA512 f1d5beea5b2b8b8c4c3f13b12639b01ae5fa868b7000a1d3eadab281a629de5e1a0d6e93d67b6b069df1ff4b2dd5adc197fc6cc1478e2dcf0648ad2692c906d1
-EBUILD libvirt-5.4.0-r1.ebuild 9689 BLAKE2B cb5f766044f8f4f121b94b0e158e32f3f752dd289b530f952938af4ac30f20f2f5ff5fb9ad19ca6266c8b95e6e9fc0aace3924fe680cc63c6cb8b8d0affd5161 SHA512 61307374bda45ca289d67104c8fa8fa83cb61f7b474e061f35d5a8ace885df5aa714bc1d845126236d135ac9ded595a97d103df9a0900d5d019ac0cbed9860e9
-EBUILD libvirt-5.5.0-r1.ebuild 9436 BLAKE2B 32bae6b9dc86e313d212e22b7f8fc819e25dfc20779ba27cf39580bbd59e508ac10b71dfa5acfb21da5ba2b83c02141641c0f14c9bdcfafab276ae62d484a8cc SHA512 d9438688e78e1c953e8bf01421ee2f62f5ee3f88963047117f91ee3c3db44e80a27ceffec6707113f7d0ad58849c5cdcf784b6337c0dcb7707c357fc28054eba
-EBUILD libvirt-9999.ebuild 9436 BLAKE2B ae606e8e0e0bc6e50562fb59e1e47776705710c6c4437cbc21ab894370ad3e5711d950c2ce851b5ba971f25b3e6cd8c661fac43d2724836e31dd23a0d3957356 SHA512 57f1c051503855743df472eeb250bc5e9de221bbd47235605000040f71db2a7d15068b551fc94fdf107a6861a34886e12a4dddff94e7de7a5726cc2e7b1ba2a9
+DIST libvirt-5.6.0.tar.xz 13147976 BLAKE2B dbfc997123f43fcf9d635b59fffa00d96826e673c4037105151bde2c4a0fb3015a0e458e8e67969b5513a4ddbf41d062feb91e6a86054ddcc1d661f0554fd1f7 SHA512 95fe931394fb31288faf73349bb298f08f63cf062f851b9935303145f8166f69128be9360757f0e1845256c14f4d7672843dba0dc6c086b1c3c8bfc035cc8986
+EBUILD libvirt-5.2.0-r2.ebuild 9748 BLAKE2B a193479eb74f656a41a96eb134e05e32e464c85e421b720627318ba78ab0dbe95649941b5ffb03821b52f95010f26977d30cc0154de30f6e7b21fb653e4437ff SHA512 87b84568d861cecdfe106a7b6f31570890c77f6fb58484faf586dad7827f6ef8bb52b0f25f8dd92556cd811aadada99700612d1afaf603d32545d5a41eaa916f
+EBUILD libvirt-5.5.0-r1.ebuild 9481 BLAKE2B ccf8b08a0073e88ef5718cbe48b5bbf256cc25520f55d486c3a79da2f6b0ff5380c4e6cc680eba125a738655d2ecb7d8f24756ad51743990becb5f313aa64bc4 SHA512 84ecf64c0fcdde9cd7a40f745ea8cd69a6c5476acdf4804eb63048d2f31b9b0cd535ea4fb7ed062cd16844c2c8053786e652b9febfa091a93827459b6989ecb3
+EBUILD libvirt-5.6.0.ebuild 9474 BLAKE2B 0ef7d9e54a1005739b18a7a383b91a2067ce0d40450be9c1786f509be0034b019192edf56a31b6f00864f88d5dae944707450f781ebb3991b763ee628934981b SHA512 a70deffb64868dae879ee3282d3426114798a46f4e9c6c64f932a7544d4bc5093638fab914e9b6dd2b867b29a82fa9d2c7724ec5a8052d8477c4bb131d61e32d
+EBUILD libvirt-9999.ebuild 9474 BLAKE2B 0ef7d9e54a1005739b18a7a383b91a2067ce0d40450be9c1786f509be0034b019192edf56a31b6f00864f88d5dae944707450f781ebb3991b763ee628934981b SHA512 a70deffb64868dae879ee3282d3426114798a46f4e9c6c64f932a7544d4bc5093638fab914e9b6dd2b867b29a82fa9d2c7724ec5a8052d8477c4bb131d61e32d
 MISC metadata.xml 3858 BLAKE2B 7f1d686cbc66544ff5ab20db52cd8a77ebb92adb0c4d01c44012c720da2c3de8aa8a2ba0f125ab90e5994f7264a3cea619cb2eb6e56338645f1ba5debd9c4585 SHA512 e97d6beba9f2f6beed28c50d06b34508a841b3e916ebfd535350e2f0c22fed40098891b4d23f041f5935ca51f671f02d3488d9d0c675e2c98640a03ae30ddf88
diff --git a/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch
deleted file mode 100644
index 866c6357b6e4..000000000000
--- a/app-emulation/libvirt/files/libvirt-5.0.0-fix-paths-for-apparmor.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 563706143779166624812b3faf498d869f5dd383 Mon Sep 17 00:00:00 2001
-Message-Id: <563706143779166624812b3faf498d869f5dd383.1547196492.git.mprivozn@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 11 Jan 2019 09:41:06 +0100
-Subject: [PATCH] gentoo: fix paths for apparmor
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/security/Makefile.inc.am                           | 10 +++++-----
- src/security/apparmor/libvirt-qemu                     |  2 ++
- ...bvirt.virt-aa-helper => usr.libexec.virt-aa-helper} |  4 ++--
- src/security/apparmor/usr.sbin.libvirtd                |  6 ++++--
- 4 files changed, 13 insertions(+), 9 deletions(-)
- rename src/security/apparmor/{usr.lib.libvirt.virt-aa-helper => usr.libexec.virt-aa-helper} (93%)
-
-diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am
-index b24cdfd083..ae8e979b84 100644
---- a/src/security/Makefile.inc.am
-+++ b/src/security/Makefile.inc.am
-@@ -36,7 +36,7 @@ EXTRA_DIST += \
- 	security/apparmor/TEMPLATE.lxc \
- 	security/apparmor/libvirt-qemu \
- 	security/apparmor/libvirt-lxc \
--	security/apparmor/usr.lib.libvirt.virt-aa-helper \
-+	security/apparmor/usr.libexec.virt-aa-helper \
- 	security/apparmor/usr.sbin.libvirtd \
- 	$(NULL)
- 
-@@ -90,7 +90,7 @@ endif WITH_SECDRIVER_APPARMOR
- if WITH_APPARMOR_PROFILES
- apparmordir = $(sysconfdir)/apparmor.d/
- apparmor_DATA = \
--	security/apparmor/usr.lib.libvirt.virt-aa-helper \
-+	security/apparmor/usr.libexec.virt-aa-helper \
- 	security/apparmor/usr.sbin.libvirtd \
- 	$(NULL)
- 
-@@ -110,11 +110,11 @@ APPARMOR_LOCAL_DIR = "$(DESTDIR)$(apparmordir)/local"
- install-apparmor-local:
- 	$(MKDIR_P) "$(APPARMOR_LOCAL_DIR)"
- 	echo "# Site-specific additions and overrides for \
--		'usr.lib.libvirt.virt-aa-helper'" \
--		>"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper"
-+		'usr.libexec.virt-aa-helper'" \
-+		>"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper"
- 
- uninstall-apparmor-local:
--	rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper"
-+	rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper"
- 	rmdir "$(APPARMOR_LOCAL_DIR)" || :
- 
- INSTALL_DATA_LOCAL += install-apparmor-local
-diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu
-index eaa5167525..9be50bbbe0 100644
---- a/src/security/apparmor/libvirt-qemu
-+++ b/src/security/apparmor/libvirt-qemu
-@@ -87,6 +87,8 @@
-   /usr/share/AAVMF/** r,
-   /usr/share/qemu-efi/** r,
-   /usr/share/slof/** r,
-+  /usr/share/seavgabios/** r,
-+  /usr/share/edk2-ovmf/** r,
- 
-   # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140)
-   /etc/pki/CA/ r,
-diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper b/src/security/apparmor/usr.libexec.virt-aa-helper
-similarity index 93%
-rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper
-rename to src/security/apparmor/usr.libexec.virt-aa-helper
-index de9436872c..99ab4ea527 100644
---- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ b/src/security/apparmor/usr.libexec.virt-aa-helper
-@@ -1,7 +1,7 @@
- # Last Modified: Mon Apr  5 15:10:27 2010
- #include <tunables/global>
- 
--profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
-+profile virt-aa-helper /usr/libexec/virt-aa-helper {
-   #include <abstractions/base>
- 
-   # needed for searching directories
-@@ -36,7 +36,7 @@
-   deny /dev/mapper/ r,
-   deny /dev/mapper/* r,
- 
--  /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
-+  /usr/libexec/virt-aa-helper mr,
-   /{usr/,}sbin/apparmor_parser Ux,
- 
-   /etc/apparmor.d/libvirt/* r,
-@@ -66,5 +66,5 @@
-   /**.[iI][sS][oO] r,
-   /**/disk{,.*} r,
- 
--  #include <local/usr.lib.libvirt.virt-aa-helper>
-+  #include <local/usr.libexec.virt-aa-helper>
- }
-diff --git a/src/security/apparmor/usr.sbin.libvirtd b/src/security/apparmor/usr.sbin.libvirtd
-index f0ffc53008..8a402bd6ec 100644
---- a/src/security/apparmor/usr.sbin.libvirtd
-+++ b/src/security/apparmor/usr.sbin.libvirtd
-@@ -98,8 +98,10 @@
-   audit deny /sys/kernel/security/apparmor/.* rwxl,
-   /sys/kernel/security/apparmor/profiles r,
-   /usr/{lib,lib64}/libvirt/* PUxr,
--  /usr/{lib,lib64}/libvirt/libvirt_parthelper ix,
--  /usr/{lib,lib64}/libvirt/libvirt_iohelper ix,
-+  /usr/libexec/virt-aa-helper PUxr,
-+  /usr/libexec/libvirt_lxc PUxr,
-+  /usr/libexec/libvirt_parthelper ix,
-+  /usr/libexec/libvirt_iohelper ix,
-   /etc/libvirt/hooks/** rmix,
-   /etc/xen/scripts/** rmix,
- 
--- 
-2.19.2
diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
index 69d15a2c4477..0d00aa14bca9 100644
--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
@@ -60,6 +60,7 @@ RDEPEND="
 	net-libs/rpcsvc-proto
 	>=net-misc/curl-7.18.0
 	sys-apps/dmidecode
+	!sys-apps/systemd[-cgroup-hybrid(+)]
 	>=sys-apps/util-linux-2.17
 	sys-devel/gettext
 	sys-libs/ncurses:0=
@@ -124,7 +125,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.2.0-do-not-use-sysconf.patch
 	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-5.0.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
 	"${FILESDIR}"/${PN}-5.2.0-md-clear.patch
 )
 
diff --git a/app-emulation/libvirt/libvirt-5.2.0-r3.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r3.ebuild
deleted file mode 100644
index 8709e69b6fde..000000000000
--- a/app-emulation/libvirt/libvirt-5.2.0-r3.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
-	SRC_URI=""
-	KEYWORDS=""
-	SLOT="0"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="
-	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct
-	+libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
-	policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network
-	wireshark-plugins xen zeroconf zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	policykit? ( dbus )
-	qemu? ( libvirtd )
-	vepa? ( macvtap )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	acct-user/qemu
-	policykit? ( acct-group/libvirt )
-	app-misc/scrub
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	net-libs/libtirpc
-	net-libs/rpcsvc-proto
-	>=net-misc/curl-7.18.0
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	sys-libs/ncurses:0=
-	sys-libs/readline:=
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dbus? ( sys-apps/dbus )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( net-libs/libssh )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-1.5.0
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	wireshark-plugins? ( net-analyzer/wireshark:= )
-	xen? (
-		>=app-emulation/xen-4.6.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/udev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.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}-5.2.0-md-clear.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use macvtap && CONFIG_CHECK+="
-		~MACVTAP"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	if kernel_is ge 3 6; then
-		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-	fi
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-
-	default
-
-	if [[ ${PV} = *9999* ]]; then
-		# 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-r17" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-		-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-		-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with apparmor)
-		$(use_with apparmor apparmor-profiles)
-		$(use_with audit)
-		$(use_with caps capng)
-		$(use_with dbus)
-		$(use_with firewalld)
-		$(use_with fuse)
-		$(use_with glusterfs)
-		$(use_with glusterfs storage-gluster)
-		$(use_with iscsi storage-iscsi)
-		$(use_with iscsi-direct storage-iscsi-direct)
-		$(use_with libvirtd)
-		$(use_with libssh)
-		$(use_with lvm storage-lvm)
-		$(use_with lvm storage-mpath)
-		$(use_with lxc)
-		$(use_with macvtap)
-		$(use_enable nls)
-		$(use_with numa numactl)
-		$(use_with numa numad)
-		$(use_with openvz)
-		$(use_with parted storage-disk)
-		$(use_with pcap libpcap)
-		$(use_with phyp)
-		$(use_with policykit polkit)
-		$(use_with qemu)
-		$(use_with qemu yajl)
-		$(use_with rbd storage-rbd)
-		$(use_with sasl)
-		$(use_with selinux)
-		$(use_with udev)
-		$(use_with vepa virtualport)
-		$(use_with virt-network network)
-		$(use_with wireshark-plugins wireshark-dissector)
-		$(use_with xen libxl)
-		$(use_with zeroconf avahi)
-		$(use_with zfs storage-zfs)
-
-		--without-hal
-		--without-netcf
-		--without-sanlock
-
-		--with-esx
-		--with-init-script=systemd
-		--with-qemu-group=$(usex caps qemu root)
-		--with-qemu-user=$(usex caps qemu root)
-		--with-remote
-		--with-storage-fs
-		--with-vmware
-
-		--disable-static
-		--disable-werror
-
-		--with-html-subdir=${PF}/html
-		--localstatedir=/var
-	)
-
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-	else
-		myeconfargs+=( $(use_with virtualbox vbox) )
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-
-	# remove problematic tests, bug #591416, bug #591418
-	sed -i -e 's#commandtest$(EXEEXT) # #' \
-		-e 's#virfirewalltest$(EXEEXT) # #' \
-		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-		tests/Makefile
-
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Remove bogus, empty directories. They are either not used, or
-	# libvirtd is able to create them on demand
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	systemd_install_serviced \
-		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newinitd "${FILESDIR}/libvirt-guests.init-r3" libvirt-guests || die
-	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
-	newbashcomp "${S}/tools/bash-completion/vsh" virsh
-	bashcomp_alias virsh virt-admin
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
index 5c4936718f6b..db4043651ccd 100644
--- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
@@ -11,11 +11,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	SLOT="0"
 else
 	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	SLOT="0/${PV}"
 fi
 
@@ -60,6 +60,7 @@ RDEPEND="
 	net-libs/rpcsvc-proto
 	>=net-misc/curl-7.18.0
 	sys-apps/dmidecode
+	!sys-apps/systemd[-cgroup-hybrid(+)]
 	>=sys-apps/util-linux-2.17
 	sys-devel/gettext
 	sys-libs/ncurses:0=
diff --git a/app-emulation/libvirt/libvirt-5.4.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.6.0.ebuild
index ea698db7c73b..11ae2447b09c 100644
--- a/app-emulation/libvirt/libvirt-5.4.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.6.0.ebuild
@@ -26,7 +26,7 @@ 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
-	virtualbox virt-network wireshark-plugins xen zeroconf zfs
+	virtualbox virt-network wireshark-plugins xen zfs
 "
 
 REQUIRED_USE="
@@ -60,6 +60,7 @@ RDEPEND="
 	net-libs/rpcsvc-proto
 	>=net-misc/curl-7.18.0
 	sys-apps/dmidecode
+	!sys-apps/systemd[-cgroup-hybrid(+)]
 	>=sys-apps/util-linux-2.17
 	sys-devel/gettext
 	sys-libs/ncurses:0=
@@ -111,7 +112,6 @@ RDEPEND="
 		virtual/udev
 		>=x11-libs/libpciaccess-0.10.9
 	)
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
 	zfs? ( sys-fs/zfs )"
 
 DEPEND="${RDEPEND}
@@ -123,7 +123,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.0-do-not-use-sysconf.patch
+	"${FILESDIR}"/${PN}-5.6.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
 )
@@ -231,11 +231,8 @@ src_prepare() {
 	fi
 
 	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r17" "${S}/libvirtd.init" || die
+	cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
 	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-		-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-		-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
 		-i "${S}/libvirtd.init" || die "sed failed"
 
 	eautoreconf
@@ -279,7 +276,6 @@ src_configure() {
 		$(use_with virt-network network)
 		$(use_with wireshark-plugins wireshark-dissector)
 		$(use_with xen libxl)
-		$(use_with zeroconf avahi)
 		$(use_with zfs storage-zfs)
 
 		--without-hal
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index f12c9732aa31..11ae2447b09c 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -60,6 +60,7 @@ RDEPEND="
 	net-libs/rpcsvc-proto
 	>=net-misc/curl-7.18.0
 	sys-apps/dmidecode
+	!sys-apps/systemd[-cgroup-hybrid(+)]
 	>=sys-apps/util-linux-2.17
 	sys-devel/gettext
 	sys-libs/ncurses:0=
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 3094501c58c2..39ced4eaadf0 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -7,5 +7,5 @@ AUX vgauthd.service 339 BLAKE2B 8f80d6d2f017623a8594c060e38e319c9406f5cf0008002e
 AUX vmtoolsd.service 244 BLAKE2B 65bf0e80b580c2c29a06a2cbf37f8428dbfe03404cea92d0d62c2d0f4d1ccefea8f1b553ca9cdaf5693f5f1546db5733061218e4c95b953e5f140e602fe68ba2 SHA512 0e29b56eb1495a6a9d3c84862e62aac78f29d9940aa19717d2a15ea88fe9484bf84ac858bbbcf22ed9194ecd141758a4398d5a193dd0d74172fd8fe53df53505
 AUX vmtoolsd.vgauth.service 312 BLAKE2B dba8ddb1b701cea490b117d08c93738a38bd668cf5444501bad8aabc503da4b87e53103a26ca4664247f14582c5546a28f093768833182581a850f0c50bc61e3 SHA512 fce9af2a3b98bf1fd5063af6c0d00bac7eba4ca02456d9266be5b74f2dea168521ffd44c38df1e28b0684f7ce21e4cb44ec2570fcbe01ff2ef432b55ede585f3
 DIST open-vm-tools-10.3.10-12406962.tar.gz 4625419 BLAKE2B 1cc3759740f1384e5ae53d3afb8e49e7546c078914ff8d2da12782cb19bcf513d4cd7a0650179eece6ed17fc29bcfc2fd67f629e1d02edeabaf09d401d7922b9 SHA512 fd35794896c2de5a3b6c7fad0e86558ae0f16c7ab09c791d0d9b8a61cff8052d3d5fcfd19613f793251050f86edda2335b29f49503b3fee41f48495b2ab80a0a
-EBUILD open-vm-tools-10.3.10.ebuild 3333 BLAKE2B aca044d404be4ead46f336fd439cb30595bc0dbe2d00c876efdcc896fd851210deb7586fe4a83c23dca034e4bf3798ce5bb8542404067665f4a24320793bed7d SHA512 d4cb5db10ba86e44430c6fa5417613e4810c1caeda7468b1a6f697f25969a91abff098488448fd4a299ce26ddf76b1dc50436e7938a25471f7af1f2e02fae164
+EBUILD open-vm-tools-10.3.10.ebuild 3354 BLAKE2B 963fa8dc0cdddc543dadbb5acc4577ccb4c476c434ef269898b6631efb3b905520bd915106e0ef46e076a8708230a0931fa376d77806329ee55ae607bfc5317e SHA512 55c84ea65d2be7812d705a71100499f4042271460c056d7716f72761f9055159bb452a3dd28e46f0b71fa9417fb3a51bbc130135292376ff970952cd70da7215
 MISC metadata.xml 1163 BLAKE2B 56cf697217d4b04f9ac436ebe306afdcfd5a57cf0e4c83f3aa942fdb130ca64a4482ec17ecc15f85db70afd3c16d7d3bcdc9097d870234a0816a16ca91d07834 SHA512 c8fb1c1df33be572712943993a4b2b1766c941fcf5d5f91242a9b89ff0ed523cfc37309777b86225f014632692dd994ef935b1544d8376cfa6bb5face76f1631
diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.3.10.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.3.10.ebuild
index e187742303de..bfb651aac5af 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-10.3.10.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-10.3.10.ebuild
@@ -60,6 +60,7 @@ DEPEND="${RDEPEND}
 "
 
 BDEPEND="
+	dev-util/glib-utils
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 475d341072c3..4bc684f02731 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -12,7 +12,7 @@ AUX qemu-4.0.0-sanitize-interp_info.patch 930 BLAKE2B d555dedc493cfa1cf888cfa7ce
 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
-EBUILD qemu-4.0.0-r3.ebuild 23864 BLAKE2B 4d6b6a1054dc73db598b02f27105c59433b44e6d3a32d760da1c21a9374ce68bf05c91c4e1336d358184d361f40bbabb06cff406f88d1156c93adea6a2d721b0 SHA512 c917b48680e15c63a0348fb0e9fe08cd745988eec26d420090f1d2fe4b6bf9661446ef883c5957621e5bc9a45092a16b564a4fbca599b47aa4520dfba27e3810
-EBUILD qemu-4.0.0-r4.ebuild 23961 BLAKE2B 12aeffaa05dde21aa3f88b960fe767932592d25e20417641f64fec702253c914840674d68b8b130ced3dfd58036470bda612ac71b0e9babfdf322c80102ebe44 SHA512 eca056421030717af36094c12def557382524cc1beda45c917f2954e72ba68eeae7a09a89f9762f920f27b65949eb02ab895b46410f4717a51fddffb0750ded0
-EBUILD qemu-9999.ebuild 23705 BLAKE2B 64a1b10fa978e1acd501ffd799685b5b53d8db298fc822223ea91c2f5fbf7c15219ec526a9939c7b51973f6f2dcf261435065a533a6f9d4ab7ebebc40d89f943 SHA512 e545da707433985c49a1d4e115008bf10cfd12a2aa021f8cf22af24afd2206fb1ec1b7d988aeab038ffec8d17708a97b2dbec697b1dcc60a6f8b8aa1e2d12677
+EBUILD qemu-4.0.0-r3.ebuild 23895 BLAKE2B caabaa7ae8d88967be382aafb987be10b63a837fc4ec995bdaf9a262fcac978a9f012f4af78cbdae237393abe27a7485bb5438316669bf92533d53f3d14b3e74 SHA512 16c1153761c0471ff030203b49ffe96621ffd462ee13c5dfdbf14332a4b765bcbe2c8cd05a6bc2488aa12e72d9d9f5e368c56bef2191884895ce3d147611696f
+EBUILD qemu-4.0.0-r50.ebuild 23983 BLAKE2B 6cc40cf140fe87892d92e962d1f56fe006f0bcce0ac4e012aa763f06e5a4d9be05c4a76f46133e7877a333ed86dadaa9a1e40596d368346f8804c63990ad8221 SHA512 7e97431526cf34b72fa6b1b3fe96a504d041fc45e43a44851e16a5897fb9e1fd27bc0b39ec21cbb1c84f96e8210dcb73379ad7c7ba74a027c8f22843446ee5e0
+EBUILD qemu-9999.ebuild 23736 BLAKE2B 97410751fab9e608630e56f54c1944acc2d0f210d578df37f98a89817fd2c99661fc001a1f3ddb744f2cb67b960b5b9bae0062a39f2254460f12cc49c529d063 SHA512 6937f10068ff629485f641c3978e9b224a7e1c69e860d11951201d8de24fd598f313fe8c51618670c2ba1bd789d11847e8c2e006982971390f4800e76737541e
 MISC metadata.xml 3903 BLAKE2B 47538d32d79321c208037c95184ab68dbbcaa2331a561142bbadc01fbc2b7973cc5ae76ac6dfa7faf1c3aa31d1d0b5dfd6a46211e94c17c5a8939b0ae99b227b SHA512 d501ede1f3182e635db02c8bac4381906ac47b8d6db4bb6b0fdeb91b35b440a2a59a5dd23b06462f1d49a6b64ae2f2bcf1f81fd0a898c8f4b67a40ccf2c58341
diff --git a/app-emulation/qemu/qemu-4.0.0-r3.ebuild b/app-emulation/qemu/qemu-4.0.0-r3.ebuild
index 120a36c5685e..0d4fcd42894e 100644
--- a/app-emulation/qemu/qemu-4.0.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r3.ebuild
@@ -763,8 +763,8 @@ pkg_postinst() {
 
 	xdg_icon_cache_update
 
-	[[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
 
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_print_elog
diff --git a/app-emulation/qemu/qemu-4.0.0-r4.ebuild b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
index 81c3c2357646..c7b37f21801b 100644
--- a/app-emulation/qemu/qemu-4.0.0-r4.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ncurses,readline"
 
 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
 
-FIRMWARE_ABI_VERSION="2.11.1-r50"
+FIRMWARE_ABI_VERSION="4.0.0-r50"
 
 inherit eutils linux-info toolchain-funcs multilib python-r1 \
 	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
@@ -148,9 +148,9 @@ SOFTMMU_TOOLS_DEPEND="
 
 X86_FIRMWARE_DEPEND="
 	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-2017_p20180211[binary]
-		~sys-firmware/ipxe-1.0.0_p20180211[binary]
-		~sys-firmware/seabios-1.11.0[binary,seavgabios]
+		~sys-firmware/edk2-ovmf-201905[binary]
+		~sys-firmware/ipxe-1.0.0_p20190728[binary]
+		~sys-firmware/seabios-1.12.0[binary,seavgabios]
 		~sys-firmware/sgabios-0.1_pre8[binary]
 	)
 	!pin-upstream-blobs? (
@@ -161,7 +161,7 @@ X86_FIRMWARE_DEPEND="
 	)"
 PPC64_FIRMWARE_DEPEND="
 	pin-upstream-blobs? (
-		~sys-firmware/seabios-1.11.0[binary,seavgabios]
+		~sys-firmware/seabios-1.12.0[binary,seavgabios]
 	)
 	!pin-upstream-blobs? (
 		>=sys-firmware/seabios-1.10.2[seavgabios]
@@ -765,8 +765,8 @@ pkg_postinst() {
 
 	xdg_icon_cache_update
 
-	[[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
 
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_print_elog
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 33d12d84c6eb..5dada763cbc0 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -760,8 +760,8 @@ pkg_postinst() {
 
 	xdg_icon_cache_update
 
-	[[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
 
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_print_elog
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index e870352bc8ba..5389bfa384b1 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -1,18 +1,8 @@
 AUX skopeo-0.1.22-make-ostree-optional.patch 7351 BLAKE2B dbb8062f8d88bcc4b7d72863434a6d58c4afee8e591ab69ef20b3ce9d349fe80ee48b8e092c82d9326084b82233074fd9b09f056a8fe7eb89060b298e2b181d0 SHA512 c5292c23d144df89dd1d0ac6de2eb68eb2f852c3b0f095906ab1a9c3a29337ae514a0c754f561729d2b8b645e5c5b3fb18c2bffd3903db754c677667bd58e90f
-DIST skopeo-0.1.22.tar.gz 1921286 BLAKE2B 141f78d14cb47494af9e55541eeaa973c9e2065d6dcdc73a6ee296fd160a981b88a4464ebf803df56378f9de7d812721eab877386a4b756e6b914d2c08e44aca SHA512 10ed4e577b07f672540ff86774b5c5b6b7531765fd36313b9e4e6bf974840fee98ede193014977c381b96875cb9147307ee690f4fc8dd4f97d87681d7fa2f4f2
-DIST skopeo-0.1.30.tar.gz 2700275 BLAKE2B d80125e1be32f3b490f5d66caa5b1bd482dc2203d0c37824bd40d06e240c347468f9635623344e6f9badd9dbbeed59383d5ec8ad81a9b8e01284bc48114470f6 SHA512 05ea7c54f1de7ab9676903a973c8039520fa023f295c705e600d01520c0f300d255268e41b9c716dc4a1f01e951d9b73acf24d5a1bc891f694798a3eb085f061
-DIST skopeo-0.1.31.tar.gz 2886364 BLAKE2B 9ef9eb4fdd722216f15e14de6702aa0dfe3331b83acb803221b8f76a36428749b6bc302cb3ea2772dd42aefc336a80ad823cfcda9fc054a01f672cf7464592a1 SHA512 660856d962310f0274f3c2507a9a5cbfd8ceb205a3d2fdf30ebde856602151917492082356f6031e5d041ce02e53e562e83cba58259cdc456363f7af56b2507b
-DIST skopeo-0.1.32.tar.gz 4366298 BLAKE2B b358cb197475d693fa47cdfda738a78f70c9f59c5e3e61e55f3be21ea137640de2e9c61eb6437faca9a8f0e8dd6dda673e1cd645922a23533e6101eb326ef789 SHA512 c52eeee85aa01448c9742d4e415e3ce6f2e0ef4e26a55758202baecb573ad8e3efb94c762d4c303fb21b896998b32e19f919a7382dfd6b17df2a96d66d07267b
-DIST skopeo-0.1.34.tar.gz 2859957 BLAKE2B f36062374b2afa7363a02d6410bd35bbf5ccd0599eea7eb6d68b769e9fbf492dc7843dbd184fccc742250fcd3e573e33bd5454971730bcec2151a52a32b81680 SHA512 3ba99fcbff9f46fa1a4226bfc54961cf640150e0e0ac6b3457e862ef94991fa05a7bd609cbf8c87a0424df6942653fb5492a3893fa5282242c4df6913c4312a2
-DIST skopeo-0.1.35.tar.gz 2723348 BLAKE2B 74a98e43ff2b32ea29b9e57ea6ba20323660b631f4a7541aa1c720e283286809c501d655af18aa794123b3af727ca54bb41686a6b0d79b33c8f82f8642cc6176 SHA512 ec5aeb596aaf51512c049dc55353ce2d076ac30ae0fc3f9e90b8a8a9fb07ec86aafe51111d38e2d34ea5193c0a6f9e74a69536bf5b759fdedfa0c97deb211894
-DIST skopeo-0.1.36.tar.gz 2754977 BLAKE2B 4a25bf092b45084d252f8cf0c50f2389210e06bb8ee4f2939cfc93e1e66764ee340d77ca7ff0e731b55dfc42c48bc69b567e6d43d10da1119f5eeeae34aba291 SHA512 2ee51017a8d768c2a7b264f4c50d4a29d8b99e30049277bca5a5d47ff0ff09bb1c92c54f7f5230d966976b41353f7c8ffb9aa5571da2471f526ec8476cb127b2
 DIST skopeo-0.1.37.tar.gz 2766509 BLAKE2B 59e3f4cf37694b4ae59fe4eca6afd8abe4f7ab1aec3c0cee409be6f0f648fd2929092ee9b5a2b167c5041202dac908cd39f693d8ae8eebf621be47f302bd885c SHA512 e2de3c65f864572fe74ca55ee107703a49855f0da71c440784b06d13ed724456cf7bf30e18a5cb15cf2e136edc688b56321cf7838a2cc66f39c4ea9d9686441e
-EBUILD skopeo-0.1.22.ebuild 1341 BLAKE2B 7ad0f306ac63766a536809f9b895bd8a2a677c152f9806b593355cef618efd6aef8b1e2c8f70f979eeb1f99a8ba365b440dc9252f80cbbf0d4e882cef1840fba SHA512 84e7d05d76f896ef62021a80c093df74a575ccf2c79cab2f80e47b01e4d9ee4f60ee4713738d887579eb617a5e95d68a017c026d899c0a4d2d40b9ee5752a0e4
-EBUILD skopeo-0.1.30.ebuild 1292 BLAKE2B 554710ddbd65d0b3930ac4a0e23ce8cd2336cbc640a04e73afd885bfab1e5c84004b3e27e45ba86b19c40907cc4e28f37806cf6cef5c0e863d47da5a849cc3ea SHA512 708996e9c9bd91b474e6b443874d34c5c5752a64835ec7b279ae0c442ccbe28820bb003a1ab90fae8e23a9b8c534250c7f77f8574eef910dd8a64f5fe2449dec
-EBUILD skopeo-0.1.31.ebuild 1292 BLAKE2B 29f2228680d49b433e5376d230fe55e751d680ec24b9fd5755ba71cf635b2e8e416aef85ef0541e5e691f3ccdde5576bb43e9b7c8835aff8d2ffebc3298d83bb SHA512 11782377ce6d4263dc678e141f4b8ab96e0702e0f6b893ce41ad46f09fbcf837a20066622bd51e6640df3c5a72dd226f7879dacaf660b47d1e4d45771dde27e6
-EBUILD skopeo-0.1.32.ebuild 1280 BLAKE2B 7280ea0f0f7a3040fd2cf42563f7dd8a47d508bdb462c99fff6a41a6f7c7690d1c962a39a6c7dc6f8ad035fea52d6b72b7ca3af9e2be9460d76b40f50835802c SHA512 2a8209228700fc09c416d59e66c8f45b7a1e0b88cfd486b7009bb44419de8e11303ab6ea0bf0022e4e135c9b70f748b5e503ccdece578f1bbbff514081fd98b7
-EBUILD skopeo-0.1.34.ebuild 1335 BLAKE2B c18ebeb72018d0b37f6c1923c4867b528b05465d521e60b23531ba17b233ff17f26e0e7c0d57f9b912655d9bf13be46f875386e523c1b212b11edfcee95e5ed3 SHA512 4da6b6e6288e8f33b321670a363efe482199bc3c953410cfd0c82f386256ce60d9e3e90b5bea570036a257fbc4789e8a8975b1cb438ea31a43e175071bb3d356
-EBUILD skopeo-0.1.35.ebuild 1364 BLAKE2B e6be11dd4ec26eb3015a36daa38eade6aacf12ddbeb315485f8baa094b73348fa734f7b34999f5eb9d74e58169f130e09ded8feb19ee5be463924b6f632f5dfc SHA512 03e52ecb0d6f4769f05fcada7e3aa85bb98c973420cd7c235a9dd8d6d430e7c3ba1c0a4c8b2dbae797d36fada397c302d4689000ab7292fc18fd93af435327a5
-EBUILD skopeo-0.1.36.ebuild 1393 BLAKE2B 191aabe1ba3529bfdfc05d226cd55d2ecc624e8bd8b0d3f65144f68eb4fab4c23f5a482093ccfa1c37ed2c0a75f12db5819b2b0691902ddc3a47434a8bde86f4 SHA512 75ace3514d8ad5cc46f7f378b6a4cdb27494810022d04aa2132da9b5466333d7effd7daf8e9749b05ae6c335e57e49b2415b1dcedeeac564c85650d4eeb87183
+DIST skopeo-0.1.38.tar.gz 2947365 BLAKE2B 1d2d6ea2ed677f2b068ecca9b8dcee9d31280acb3f7acd8e0a59321d178244b506f4124eba8dd0519a3f5b307a6001d05a093cdf93189eccb55cf7c9cc41895b SHA512 83e53eb7632761eb444d4f824b6fee7a2e265e386fd1ba58e2d3194750f794a0e1cdc94a76222d12f589f851c459b165756661a76c09cc9c7dd9b2d6fff2b39f
+DIST skopeo-0.1.39.tar.gz 3850036 BLAKE2B e635be475f22cc25ab98e446424f4a6b0babe34f827a73f9c9c1533db782490e9af94e759ac78fbeeec1c0e1fa42eef9d09fb4e7ff1f4df654f65fe4c1a9f7b0 SHA512 c4aadc40f9d637c628cd96c204b3e9bc3a928c145521bed2e5046508fc936ff99442dda8b4a4cdd85c4d04e64a9ccee5ea8d563c6ebf4e6020d50d96b921716c
 EBUILD skopeo-0.1.37.ebuild 1393 BLAKE2B 0053a48cf9c1f528756796d0ee32c1ad1a1f8e66321da6bfcab723cabc442457d1219cbabd374aa7f7456682fc4ce061ea4a4f9df804152e45f6aa5b50fd7b01 SHA512 720be9abb702fc76e9345c352bfb08f04d789e4347a3343385c23bdd33a0b37844949f0625aa52a1e324127fb7e1dcc82f53cfeee4722eb99a256dc02c533a63
+EBUILD skopeo-0.1.38.ebuild 1393 BLAKE2B fa6abbefdac30118fde931cb2e5bba8ecce43e1ad9b214c95188b98e4016e64424a6a71f05dc6c844ab30738660d3551304f667456dbf2518542c119c9ba6b94 SHA512 9e12e84ba18f521960d15d2818334abae3d3a10c3c3643e40a960a116f2f79cc61e72fa879d1272d3a0294a23f42edbd9a79c2383ba1a8ee3225bdbfd5193799
+EBUILD skopeo-0.1.39.ebuild 1393 BLAKE2B c8fe62afef0b673283ba5e57e24099ff3afc617c80d2ce79c4351ad2af5a1d737bd2f5061b448014b75430ff2f5ecee4f41b2554bda910fe26d6c31d79e34e08 SHA512 277e5518be8abb887fef96e25d3a957c1bbf61e14e3fafa1d2c40eea34fc4a647aba671be14f6e802d4447197099d0660bc240b116df65ab67549288f559e74b
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/skopeo/skopeo-0.1.22.ebuild b/app-emulation/skopeo/skopeo-0.1.22.ebuild
deleted file mode 100644
index 091fb0c410f2..000000000000
--- a/app-emulation/skopeo/skopeo-0.1.22.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/projectatomic/skopeo
-COMMIT=5d24b67
-inherit golang-vcs-snapshot
-
-DESCRIPTION="Command line utility foroperations on container images and image repositories"
-HOMEPAGE="https://github.com/projectatomic/skopeo"
-SRC_URI="https://github.com/projectatomic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3
-	>=sys-fs/btrfs-progs-4.0.1
-	>=sys-fs/lvm2-2.02.145"
-DEPEND="${COMMON_DEPEND}
-dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-make-ostree-optional.patch
-)
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-RESTRICT="test"
-
-src_compile() {
-	local BUILDTAGS="containers_image_ostree_stub"
-	set -- env GOPATH="${WORKDIR}/${P}" \
-		go build -ldflags "-X main.gitCommit=${COMMIT}" \
-		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
-		-o skopeo ./cmd/skopeo
-	echo "$@"
-	"$@" || die
-	cd docs
-	for f in *.1.md; do
-		go-md2man -in ${f} -out ${f%%.md} || die
-	done
-}
-
-src_install() {
-	dobin skopeo
-doman docs/*.1
-	insinto /etc/containers
-	newins default-policy.json policy.json
-	insinto /etc/containers/registries.d
-	doins default.yaml
-	dodir /var/lib/atomic/sigstore
-	einstalldocs
-}
diff --git a/app-emulation/skopeo/skopeo-0.1.30.ebuild b/app-emulation/skopeo/skopeo-0.1.30.ebuild
deleted file mode 100644
index 8fc316e1415f..000000000000
--- a/app-emulation/skopeo/skopeo-0.1.30.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/projectatomic/skopeo
-COMMIT=ca3bff6
-inherit golang-vcs-snapshot
-
-DESCRIPTION="Command line utility foroperations on container images and image repositories"
-HOMEPAGE="https://github.com/projectatomic/skopeo"
-SRC_URI="https://github.com/projectatomic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3
-	>=sys-fs/btrfs-progs-4.0.1
-	>=sys-fs/lvm2-2.02.145"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-RESTRICT="test"
-
-src_compile() {
-	local BUILDTAGS="containers_image_ostree_stub"
-	set -- env GOPATH="${WORKDIR}/${P}" \
-		go build -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
-	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/skopeo/skopeo-0.1.31.ebuild b/app-emulation/skopeo/skopeo-0.1.31.ebuild
deleted file mode 100644
index 435c19e79825..000000000000
--- a/app-emulation/skopeo/skopeo-0.1.31.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/projectatomic/skopeo
-COMMIT=b0b750d
-inherit golang-vcs-snapshot
-
-DESCRIPTION="Command line utility foroperations on container images and image repositories"
-HOMEPAGE="https://github.com/projectatomic/skopeo"
-SRC_URI="https://github.com/projectatomic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3
-	>=sys-fs/btrfs-progs-4.0.1
-	>=sys-fs/lvm2-2.02.145"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-RESTRICT="test"
-
-src_compile() {
-	local BUILDTAGS="containers_image_ostree_stub"
-	set -- env GOPATH="${WORKDIR}/${P}" \
-		go build -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
-	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/skopeo/skopeo-0.1.32.ebuild b/app-emulation/skopeo/skopeo-0.1.32.ebuild
deleted file mode 100644
index 89fb3c794899..000000000000
--- a/app-emulation/skopeo/skopeo-0.1.32.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/containers/skopeo
-COMMIT=e94b4f9
-inherit golang-vcs-snapshot
-
-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"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3
-	>=sys-fs/btrfs-progs-4.0.1
-	>=sys-fs/lvm2-2.02.145"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-RESTRICT="test"
-
-src_compile() {
-	local BUILDTAGS="containers_image_ostree_stub"
-	set -- env GOPATH="${WORKDIR}/${P}" \
-		go build -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
-	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/skopeo/skopeo-0.1.34.ebuild b/app-emulation/skopeo/skopeo-0.1.34.ebuild
deleted file mode 100644
index 2b442d046534..000000000000
--- a/app-emulation/skopeo/skopeo-0.1.34.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/containers/skopeo
-COMMIT=e96a9b0
-inherit golang-vcs-snapshot 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"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3
-	>=sys-fs/btrfs-progs-4.0.1
-	>=sys-fs/lvm2-2.02.145"
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-RESTRICT="test"
-
-src_compile() {
-	local BUILDTAGS="containers_image_ostree_stub"
-	set -- env GOPATH="${WORKDIR}/${P}" \
-		go build -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/skopeo/skopeo-0.1.36.ebuild b/app-emulation/skopeo/skopeo-0.1.38.ebuild
index 8ccfaefb099c..d6afc826266f 100644
--- a/app-emulation/skopeo/skopeo-0.1.36.ebuild
+++ b/app-emulation/skopeo/skopeo-0.1.38.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 EGO_PN=github.com/containers/skopeo
-COMMIT=41991ba
+COMMIT=37f616e
 inherit golang-vcs-snapshot bash-completion-r1
 
 DESCRIPTION="Command line utility foroperations on container images and image repositories"
diff --git a/app-emulation/skopeo/skopeo-0.1.35.ebuild b/app-emulation/skopeo/skopeo-0.1.39.ebuild
index 6a50ae5982c5..49a0b85e5876 100644
--- a/app-emulation/skopeo/skopeo-0.1.35.ebuild
+++ b/app-emulation/skopeo/skopeo-0.1.39.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 EGO_PN=github.com/containers/skopeo
-COMMIT=404c5bd
+COMMIT=1cf1e06
 inherit golang-vcs-snapshot bash-completion-r1
 
 DESCRIPTION="Command line utility foroperations on container images and image repositories"
@@ -16,9 +16,10 @@ KEYWORDS="~amd64"
 IUSE=""
 
 COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3
+	>=dev-libs/libassuan-2.4.3:=
+	dev-libs/libgpg-error:=
 	>=sys-fs/btrfs-progs-4.0.1
-	>=sys-fs/lvm2-2.02.145"
+	>=sys-fs/lvm2-2.02.145:="
 DEPEND="${COMMON_DEPEND}
 	dev-go/go-md2man"
 RDEPEND="${COMMON_DEPEND}"
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index d5215c846722..aeaaf29aff63 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,9 +1,9 @@
-DIST slirp4netns-0.3.0.tar.gz 180149 BLAKE2B b7c552b5660f4be4a95d573ff51bbde1dec1daa7dd0d5a6c49b3d761743561e8211972d16e588519bce41eee0dd378837f7de3e4c7ccb37f13bfab21008ac640 SHA512 85eea233531123297efa5e7225cbda21c10ecb297fe13cd8bf75f8d18052bc8533c2db8ce6c1f7876f42b89e31ed2859eef33a3979cad95326d0c4b19f2871f1
-DIST slirp4netns-0.4.0_beta0.tar.gz 171557 BLAKE2B 0d4d26560807559e1783ab53086236235314b55503245474e34200be2a24541c7adfacfea7cfc91e97a5cf68a0c1c905db5ab4e38d91396e16e2bbed50f35c39 SHA512 5c6d3d55f39cb758f61cb408f5c2f05a7f31ba7d84c47dc3fadd7573122eef30eab643b79f16fdb76074b5ce485f22227390ad6055362d55d9e2352d7d490cc7
-DIST slirp4netns-0.4.0_beta1.tar.gz 171766 BLAKE2B 814151f588c431dce5e02b108051886dd1ba40027eb1b72280e7621529729bdeac8d6f4267a01b3a09f34df528aa42caef517fef5decd854fd20ece608bb3590 SHA512 459ccf75dc5a0e2d768f1553f5ce9f85a23fa7ffcbe3da57205290c2868cf0fb3fe148e59590be5914d215e7727df6f97f2f21d5e33b9463d119d307680c3071
+DIST slirp4netns-0.3.1.tar.gz 180163 BLAKE2B 228331bea2aef527d4feb6f195a2a7db0aefa5a561b0425a7d48bab5fc0bed2231d535904223852284c6789a608f70d8c78923c06b89db6e583248744caf34fd SHA512 d482f6d22e9bb62ddca9d7f05d4aef7e2f365439a0d38d864f71c9dc4af3fbcda8ec259285ed54ebabc7e15fced26c844563944eaa1b2fe295273049e42d7686
+DIST slirp4netns-0.3.2.tar.gz 162136 BLAKE2B bc33c66ecc47e0b566eaa960e1651a0ad0b09010bc9ae3d1eb0692c7b2b67197a078b25df645bc11c50f1e805937b8e0aeeecf2fee6114937ca98eda49f61765 SHA512 b5146a9b165471037542af64618da8fb5f6824a9a4193867f4357b1b7f38082dea00e15930561eb9729fed406dae1bc2ca371035577d0f22cfb9004c13464496
 DIST slirp4netns-0.4.0_beta2.tar.gz 173593 BLAKE2B fd827f92db03eddea86bccf401ff67535343cf759353e3c221fe1d3de494e8cc0c83169ef5cda900e512aeb16cfb7e5ba6181729483fa48d8f3257d70035a41a SHA512 38b6a1fbaceece1fe151477b3bc7db624e79e2b7913f5cca9e826a5f4289e53cfa584cfb90a5a3520e3e342eb803ff8ae090ca9892ea1051fd79ce802328e578
-EBUILD slirp4netns-0.3.0-r1.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
-EBUILD slirp4netns-0.4.0_beta0.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
-EBUILD slirp4netns-0.4.0_beta1.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
+DIST slirp4netns-0.4.0_beta3.tar.gz 167294 BLAKE2B 349cab3199f2d228f0d9ed545d6bd8ddff25e80a57d69c16f5a4a5c8af88cae21c48d98891e844e03ab5c47feb829007c7d6ccfb37510fbe5aaa03d90b0ecea7 SHA512 83ce7eee14ebb9cea481fdde1951d89346a1b741e1232f1b032142b331226193b6869dd6febbca91f1fac1fec7afdcafedeef98f204059a1513c8ab972a411f9
+EBUILD slirp4netns-0.3.1.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
+EBUILD slirp4netns-0.3.2.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
 EBUILD slirp4netns-0.4.0_beta2.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
+EBUILD slirp4netns-0.4.0_beta3.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
 MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd
diff --git a/app-emulation/slirp4netns/slirp4netns-0.3.0-r1.ebuild b/app-emulation/slirp4netns/slirp4netns-0.3.1.ebuild
index a87e63fe9495..a87e63fe9495 100644
--- a/app-emulation/slirp4netns/slirp4netns-0.3.0-r1.ebuild
+++ b/app-emulation/slirp4netns/slirp4netns-0.3.1.ebuild
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta1.ebuild b/app-emulation/slirp4netns/slirp4netns-0.3.2.ebuild
index 87e485ef0571..a87e63fe9495 100644
--- a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta1.ebuild
+++ b/app-emulation/slirp4netns/slirp4netns-0.3.2.ebuild
@@ -5,12 +5,9 @@ EAPI=7
 
 inherit autotools
 
-MY_PV=${PV/_/-}
-MY_PV=${MY_PV/beta/beta.}
-MY_P=${PN}-${MY_PV}
 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${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,7 +18,6 @@ RDEPEND="dev-libs/glib:2=
 	dev-libs/libpcre:="
 DEPEND="${RDEPEND}"
 RESTRICT="test"
-S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	eautoreconf
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta0.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta3.ebuild
index 87e485ef0571..87e485ef0571 100644
--- a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta0.ebuild
+++ b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta3.ebuild
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index 55ce4216204b..800df2ff41f6 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -14,7 +14,7 @@ DIST wine-staging-4.0.tar.gz 9945756 BLAKE2B bfd27d5677d01b4a14c4ef593b741b6fa6e
 DIST wine-staging-4.1.tar.gz 9941329 BLAKE2B e455a411d782dcb52b29ad6150b108a4a9b3fd7cd548e35c1392ee3bce581206d99520df19a153ddb80f135156a8d33f6acbbfe086c28f6bfe404fe9eae96556 SHA512 8f52fdae4f98fe67053b00d03234e0937652a9a9506c9e94b717502244eb741c062990678ede11342dc182a4fe9c066227814ebe394ef5f6aedec73983c08554
 EBUILD wine-any-3.20.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
 EBUILD wine-any-3.21.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
-EBUILD wine-any-4.0.ebuild 21151 BLAKE2B ac9c30146bb7a60d5637d59012a7ebd275504c541c13d4f7bf336b9c45e4c66a1944f3dfdf4827b71179e2b8865a85265d769471e9f66f87e31d3484ceaa79ee SHA512 f3c10f0a9720b7f8f4dc3ff0ec63eb877618759942770daad51e4ac96812d964bf1ee2f81355c456191791bbf4fa38899f979ffef52bd31ae421d7e19976f3e6
+EBUILD wine-any-4.0.ebuild 21144 BLAKE2B 944b2cf5e0b95d98ca4013d04af617a540373f3511f89124bde0150e5342d9937453056902115e805d07ab4196def2f8c73e82bfbb27a96b6e06d7d4b368e6de SHA512 5785e584a489f8fd1df47e7a0d34c516b9390d4b8349004187729e8cffe77180d10a933cceffe9ea717f88da33104f112559018231e983a33c156367c3fe2fb9
 EBUILD wine-any-4.1.ebuild 21120 BLAKE2B c5938e3247808913ae91039d3a8c8697ad61f19f7752bc726159cda9363ad8388a4c5f3db51d0fcf2615a49c937a4e54e815a83f9b6e25efcf6a5b3901437e8f SHA512 30232e794eef9c6fa8121d0130ab5757bf0aeeecfadac44e7e4790da54ea06408272d25cb23ada429bc8995b8302aaf831b396d8bb4965e3bbbdd65a01a70b5b
 EBUILD wine-any-9999.ebuild 21176 BLAKE2B c731221fbe73257d7e2265b2ab0f695290e6db1fca7e190f2dfb4f9e249e31e79f933f01313587ee6ec8fa1d3561527fe0076ab0513e8934a6728cc93c12b301 SHA512 dfa9e6f8e1bb24c36038fc9151f3a703f20dae4db2a60180ba45419fd235155fd3834a465e9db24e1237c273ee6bc6fb1659af5c72492a74dafd3360d0397789
 MISC metadata.xml 3844 BLAKE2B 95bb006c1635ae34e88097f588585809785bbe45b333eb618baa7ee71b64ada59b13c7d16bf138395e1e72ddecb430c07a75b3edbf4bd74948e97415a375fe78 SHA512 43160447d94163a67d9e356ad9fa887e35f2a27e8b496e034a3e8fb2b047b1cf1deda9596f6d7ea9b5f52cc7005ffd2e7fb37983d6ddd33fb699fab5fe6d50b2
diff --git a/app-emulation/wine-any/wine-any-4.0.ebuild b/app-emulation/wine-any/wine-any-4.0.ebuild
index ccf3dac674e2..f732dac7bcb0 100644
--- a/app-emulation/wine-any/wine-any-4.0.ebuild
+++ b/app-emulation/wine-any/wine-any-4.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-        MINOR_V=$(ver_cut 2)
+	MINOR_V=$(ver_cut 2)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index a410d1b63254..1819b702ec2c 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -9,7 +9,7 @@ DIST wine-d3d9-4.0.tar.gz 50535 BLAKE2B a5815c4d1b8ea34a0afac565b01aaaa6af418a7d
 DIST wine-d3d9-4.1.tar.gz 50520 BLAKE2B 53f1c4a7fe077776d648a927e75f11a8fa627d3fa15b01e22c18da7a4489ebc883470901e75afc99e07b85201ec05132be4c357923b8ab2ce6ac5f0beedeadd0 SHA512 2e8e3dca86a919a6e6bbdf87f2ffa67f90febcd4ba11351a20785c8dcf732077e1ae1ec0f34f3a4743cb23bb3d8483fd67d9e746e2887d000dd9f0220404b672
 EBUILD wine-d3d9-3.20.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
 EBUILD wine-d3d9-3.21.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
-EBUILD wine-d3d9-4.0.ebuild 18679 BLAKE2B c764f94c2c018d15f1ca63b2adccd7fc043782ddae604cc5ef0a50b69d3a77de0452a73c363f932d59b76680883e892743a03beaa9d1fa81dffdb75ffec4fade SHA512 ee370f32b52e47c99fe7248e064e9910cd6b98d11dd1c86d458644e1240c100e70e1cd4d3919e1101cf0a882ba906551e3771fd142cbfe4112a9896d417cccdf
+EBUILD wine-d3d9-4.0.ebuild 18672 BLAKE2B 12d701b19f193a56cc9544b23cc4b381804bb5899ee885402fb32ed5c434edecf0cf905512633fd2fae09a562dcf4d87e3ae160a637077df165b52143d94d368 SHA512 932e0aaede2b0fdda05a1476e31ddaf488fd41c80a4c09345d4ce0648ad29566353696a943e44dffc883b9860cd0234207a5e85890dbb635796640f17ae63f74
 EBUILD wine-d3d9-4.1.ebuild 18641 BLAKE2B 66fe7823a307418a85a5f6bd1cf5adbdec4d9b64c381c0b16e89da56b40286e2ea427e83f1f03366263c93a03f7446144a94fd9427c9ed0329f9c27df429d712 SHA512 7e452bbf8f36298487dcda525ad5e2c8f0cfb2cfa6de9c0947764c2e4791f205c7e946f0216dde7a39f1c55a7acdf7344ac71ea56c5cdb92dcdf5cbf3374c23b
 EBUILD wine-d3d9-9999.ebuild 18704 BLAKE2B db8de0d3fcedc8987819dbd39227ad6f6af3430edd6d2edf078760ee1d2fb077439cf453cb589f19cb945c195fd094453fb55bebb5771dfad7c33896b4696685 SHA512 4044502d09b877f856b4687d5017bb2a5e0822bfe07518c5b33d82f2648a39478f8597b32e01748ffeb4cc1a6576e813a5eec73152088d6a5b6a5c241b1ed2d4
 MISC metadata.xml 3451 BLAKE2B 83f6906b20cb3effb9c37152cc36c2d2853d3c313707151e5f1962ea51fbbf5983300edfb7282c367e393ef2ba09534277a4349ef6bdd630802fda04b4861357 SHA512 9c7fa199e699e6df3728c7f9e522a1bd64526198d0a96274d14da00627587c357f6d5ee9678770e2e150065b1246e1803c3a39f0fb6f01182a896a563f8205d6
diff --git a/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild b/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
index cfa8c622172f..7e9256c8ffd0 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-        MINOR_V=$(ver_cut 2)
+	MINOR_V=$(ver_cut 2)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index 7470c4ae2f14..51bccab59e9e 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -7,6 +7,7 @@ DIST wine-mono-4.8.0.msi 86536704 BLAKE2B 24120b57a6b51b47d66b4dcf9765492ad2dce8
 DIST wine-mono-4.8.1.msi 115878912 BLAKE2B 88bd9b35efd89aece2dd0cd9529bc081fcd2a97f3af81806e9901158cbe48e920e5e6ac276da16c9c2d369dd307a7be05d7b8b67acf2733279a5df17696dd154 SHA512 06cbfc66ad82c40975f9d41698c49ba19c7eadf56b5ea87037b7cf0dbe2053de0d5587573798af294eb5ef8c7f2f5ffb7b3c45da83493c71d1923c1abee1bf9b
 DIST wine-mono-4.8.3.msi 116183552 BLAKE2B 5e82c2e6e456311de817b7870e02d60abc3e359a9b5989257cae4a31e24206e7c8289f417dbb5fa2e315537b4e8352f9f1237f576b3c06cb2dbaaa7a5443a4f0 SHA512 5b5c1c147453cc691ceb17c850be66e3701e784d2ed4bd27abd92a815f7070850b5e0fc1778c3a3aa2b84516b4c5e01abe350d6ccc5578037e75cb1afe1dfb6a
 DIST wine-mono-4.9.0.msi 94960640 BLAKE2B b60debd41ea33eee15ab1a546c526858b97cf4d5d896c856cce21f09210e3e10f1abf98dfb723abbe75657dd44011c1c793a08a329e037144d3266001739467c SHA512 76142fa7233aa3f8111df9112927e699cfc39f8bd0f02f0fc4d065eaeb37964f9e2b49bf53c406fa6ec72c247ab85ddba244ac97b4d6a377adeb63d9ae339e24
+DIST wine-mono-4.9.2.msi 94981632 BLAKE2B b70a5177fad3c6ee2b04ef40105c7700a08339786a23d7378ba72005da5b3cb6b3a797f0173ba32224bcfd25a4bb0fa01c92a83b88e005973b33320717f5b31a SHA512 73e46ec57c7a78d8c32ead4698c299fa557bb97739ce22c9405f95f48f55d604743aa01cc64183c9f89f99aec6f04b664bac0ef96e6a436d38ebcd9d7cf3b329
 EBUILD wine-mono-4.6.4.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3
 EBUILD wine-mono-4.7.0.ebuild 493 BLAKE2B 062ba95f20540e8cebca2b2dc1ceea8a49ab9be791d11de595ff300337bcd4d015f21825a0bbbd62837d618ad093ce7b24a95bd87b7eeae4e1e3479542fc034d SHA512 5cf9052ebb4a0cf0f7717be83ed059d2622836edad31f9bdb314afeb51a9f6ab9c65e5c7a9884f802dd0c4f9b47bf4262ecc24ad49c439f8b826e025f988022c
 EBUILD wine-mono-4.7.1.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3
@@ -16,4 +17,5 @@ EBUILD wine-mono-4.8.0.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a21179851
 EBUILD wine-mono-4.8.1.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
 EBUILD wine-mono-4.8.3.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
 EBUILD wine-mono-4.9.0.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
+EBUILD wine-mono-4.9.2.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
 MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c
diff --git a/app-emulation/wine-mono/wine-mono-4.9.2.ebuild b/app-emulation/wine-mono/wine-mono-4.9.2.ebuild
new file mode 100644
index 000000000000..15aab248909e
--- /dev/null
+++ b/app-emulation/wine-mono/wine-mono-4.9.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="!!app-emulation/wine:0"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/wine/mono
+	doins "${DISTDIR}/${P}.msi"
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index af1d3d4f0200..66028acdfae6 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
-DIST wine-4.10.tar.xz 22109948 BLAKE2B 60e627d1e88eaa71c08ab15f093b1b11a8ce619f6b4bde08ccabc6b28bfaa44822f407e14b78c67680e00eec01fa01ba8cd851faa73dd42fb77f394a8556ab7d SHA512 cafc1d268719f723091429d9d8787044719f0936b00d47c6d01cef4d9c141fed7ba5b9776c1c63c68934a0a1071fb74daa0440aa52e77c4e42aca894163d6f54
 DIST wine-4.11.tar.xz 22098508 BLAKE2B dee7ec74808b365cfa9087cadc29721af2f17663da760ae8d3f506e8ebd897aeeba0728eb57d1afa386b181b18f0861538b5c245841f9ce5e43470029ae4ef0b SHA512 df4e636959f6044f92aca16dce9cb392fd6c513ccc5a19585d3de8cd7fe0a9d21b05fcfa538172f94721d0356d9ec1470b7da810fcfa70d3aae9054a48d4700b
 DIST wine-4.12.1.tar.xz 22125544 BLAKE2B 7a3b221e2bf3af91feff529b5af3926956cbcbce020439c7aa4f464f78d8c93ed1686eabdfee080dd0946e378645667ddb19c67a6449f1b171f1660127ecc05d SHA512 5d226aa4f24c59949c88d377d8f3d38839179e473b7e5bbf029af8142dfa23fd046ca919b63c8c8fc7e1a46077a860d3dab9d2e040f0367c85c8d386707222c1
-DIST wine-4.9.tar.xz 22077528 BLAKE2B 98cf186152abc8379275b353e3934efc285cc386f33188a283e3568f803090057bcc90da6dd6c6c1e9d7dbbcf61fbe4a2316107ff129a7d7baa174982f9dcf26 SHA512 bf750af9569b0c564cd9581b9de8c399f6e42227eb6e79338ec6ba70f135fe3388b0792ff013add97341c488ed906227cdf93cc275e362ba232df78afaaab66d
-DIST wine-staging-4.10.tar.gz 9924803 BLAKE2B 91812a8004a96d859c43b2bf00d38e0cae425429070b0892ca7051a6aa07aae3142e6f49086713a1042efa9a7376742a9cff4e50dd050b0dbff28f774b75f4c6 SHA512 f65ed761d9cbfb58aef19ea8a90c049996855a49de747f1858703e765292532dc7bb487ecfe50eb2e7e87c673507a5e287f6f80aa2d50aabe9066314809c1f03
+DIST wine-4.13.tar.xz 22137820 BLAKE2B 6aab4930fd176757e2594a580ba73694cf04b5411eaf26dc332a8aee5efcd1a181781d010610b22aaa6dd91b4f9161502609b8a23928d6848329d773f98c41cd SHA512 b359db3c99d10b489f7f72172b624e7b2e2b826c206e842a524d781ab5947e2b03623a115c2345fc71df22eb508936c2f7667d4c420a2fb6cdc34e3d2ba5e75b
+DIST wine-4.14.tar.xz 22151304 BLAKE2B 04983c21fa58091a36e681c90b92b4f014287ea7edb105bef560ed0505682dd1d3832292a0e2cc72489f0c4a2247ce9c1ec7481f80cf2baa05953e525ce00b1c SHA512 cfbcad1685abf3a3810c5f29c50e47f1340aab2276e54d8d22b9b764df5099ff7ad399a6cca200c7a622be0470992d3aee1c0c64c2e6ea90221fee6d391d911c
 DIST wine-staging-4.11.tar.gz 9919887 BLAKE2B 70e1b07c1d574806f3c74be6a545493e119a3a3a5b6d0f9da0b6dd2135a7e58a60a83dfb3f309cbc9b4a4b0e50bec11f626958817e00e7f3b0a81972f1099f2b SHA512 384866aa5b2636804825ceb36b999bc1d5dd4d4693cef1b3004d9c8252dea393a02c65227d9e7b665021f19fd087025349ad720f4bbf0f061887ba5abcb74b24
 DIST wine-staging-4.12.1.tar.gz 9920469 BLAKE2B e76f1efe205fea913c8ae50e290f271a07f46ae5a9fe4a521d9e96a8834ff7eb70aa0d42a6d308ca081b14628bbb85e1c638dcfe7fa732a5e25a3a20e07b0b67 SHA512 804e99567632326f5ea55fd86c4ed236da3b3636b0aaf5dbf4427694b0786326bd048fbb119b37fc66d4072dacec9ac354b804ad372cad69cbf086360eaedc38
-DIST wine-staging-4.9.tar.gz 9926386 BLAKE2B 17030134343da1971075f0397b56442d4cb459b491f0751c9f21dd4061d5110ab2c5c44cc984d43b8ad3480f735df3e6b9246868aec4984cc1c8be56072c44c1 SHA512 9676f54833a424f965af7591c40aa40cd3fb3b36062484de56585a631dafa68a9a545f00153350c067a0d73146f9f169a678041bb141f7562f9df6e31ec4e2d5
-EBUILD wine-staging-4.10.ebuild 20352 BLAKE2B 9921f23eaf2e7590872f24a432022f53e2d4d9003eb3073eadc1956b28c6024e15dff28ed27766b907a90d28e1ece074c100262891f81700820c1e0997717b9b SHA512 9c22b4ed04fe7eb3ce48a72a91f9ccf456867b6d2114f7692132e0ce6760d33ec8ab9fe90ea75d25ae241a8d5d4efd936d09ad598b1059e71453c04a62cfb36b
+DIST wine-staging-4.13.tar.gz 9913015 BLAKE2B 125b96fbe2de3c6d5c302dc25f0d1ba65fa3deb00a76c30a55e9fe43ad06bc3cb7ea18f542638268c1e854effedca557e837512b54c92905b928d83b33aa6aae SHA512 a5240b3999b1ba605d16148022e57a4574c0e9288763a5c4a259ea06c3a7152af8b136b0e2b8a74b1a40fb6adaf5ce012695160afdd5364fa1b4c7a903fd82b1
+DIST wine-staging-4.14.tar.gz 9910499 BLAKE2B 2e9d2983156a3f309e740503825ff0ebb2461ffc785147e9853122e7d64269409f7e73fea0b5a0fac149a4fb7d27a11cdc8ba0759ca9fc0fb0492d8d3884c503 SHA512 481a50f4ba3f1c445bd5b9754d7b27bdcd0bc386930e3597051a0962778288f8d4649e9f4e8bc188738c6896821a198f3af15b47e9db719f52d0b3db16a407f0
 EBUILD wine-staging-4.11.ebuild 20352 BLAKE2B 9a66ac87c5e8d7cb023ebf07cd9e717218e80110f91470612f6360f03a1c28eea272a5148e4e56480544ebc7b9d2d4f056b239745cca69011d994f562a336898 SHA512 ad4d0bb599d01b0e867a1d373be6c4db817e5956f3b6d3134e77f96a9f3697a2f664a28030d8c2cc559a21a879b53a23d4b7d2c29d3f717b9ebff5db2b0931b6
 EBUILD wine-staging-4.12.1.ebuild 20352 BLAKE2B 9a66ac87c5e8d7cb023ebf07cd9e717218e80110f91470612f6360f03a1c28eea272a5148e4e56480544ebc7b9d2d4f056b239745cca69011d994f562a336898 SHA512 ad4d0bb599d01b0e867a1d373be6c4db817e5956f3b6d3134e77f96a9f3697a2f664a28030d8c2cc559a21a879b53a23d4b7d2c29d3f717b9ebff5db2b0931b6
-EBUILD wine-staging-4.9.ebuild 20347 BLAKE2B 8a0cf4b66164c7131f642b6a92605aec55ceba26589c7b6cdb2130ca7f6b93782d115e45ffe1cde8cf9a9870bdbf22482bb5d1aabc5296127aebdfa5d5bc5d1a SHA512 f0b1fc084f792086c127b48f77420b0d9fb2c3f759a126945c0212237b94de4740aabd7f85649e2680c10e27383095d6a2610ea73676cca79ac61668aba35bfe
-EBUILD wine-staging-9999.ebuild 20202 BLAKE2B 3a396d740c0fbef5461274b043c1d80f14d8d5d4cf0f46cd36b9761c06dfe09d5946e98d1378c2b1ad4561d37a04c33057ebd5bc7305d40261cfd040dddc94b6 SHA512 ea7fcca738893b74b4d6fc4d61e0ecb2c81a00c9a71e2ab8e5d5667b37f2860897a0cc89360446610e5420ce348fe8eed246497c0b965865e47f4e4c3db050e4
+EBUILD wine-staging-4.13.ebuild 20202 BLAKE2B 3a396d740c0fbef5461274b043c1d80f14d8d5d4cf0f46cd36b9761c06dfe09d5946e98d1378c2b1ad4561d37a04c33057ebd5bc7305d40261cfd040dddc94b6 SHA512 ea7fcca738893b74b4d6fc4d61e0ecb2c81a00c9a71e2ab8e5d5667b37f2860897a0cc89360446610e5420ce348fe8eed246497c0b965865e47f4e4c3db050e4
+EBUILD wine-staging-4.14.ebuild 20202 BLAKE2B 76c82fa50a834c98e3abd40903d20737a7aab7e7163007f21954c5ff3813903483d3de7a811dd14416ea575163b6dc2ed84981be8b80aea0a95de97da03c0cad SHA512 f022ef0a56524f34602062e10b9cb764d1d6825cc16fcef5c03988ef89ba4c567ad8dc1331c30c7e1277efe3deede555c6adfc2fc7baaa74225ed85709475a5c
+EBUILD wine-staging-9999.ebuild 20202 BLAKE2B 76c82fa50a834c98e3abd40903d20737a7aab7e7163007f21954c5ff3813903483d3de7a811dd14416ea575163b6dc2ed84981be8b80aea0a95de97da03c0cad SHA512 f022ef0a56524f34602062e10b9cb764d1d6825cc16fcef5c03988ef89ba4c567ad8dc1331c30c7e1277efe3deede555c6adfc2fc7baaa74225ed85709475a5c
 MISC metadata.xml 3712 BLAKE2B e42b36bfa8f6d0f4c9b2538c04bb0b7650c411b621a1be5cba58ca8f6f64a1bc68517eeef385351461ef72e33152b05df14775777de14e848802ee8eb4980909 SHA512 1a904083074cad42013d9a8798ea32898332fa0697f79a1a11e6a0f5b6dcf35cb42dbb52a3b5baaeb3fe2012f80dfbbafbd874df4eef783e8a151b13b98afe77
diff --git a/app-emulation/wine-staging/wine-staging-4.10.ebuild b/app-emulation/wine-staging/wine-staging-4.13.ebuild
index 060b82852b3d..358f66f96ae8 100644
--- a/app-emulation/wine-staging/wine-staging-4.10.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.13.ebuild
@@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.8.3 )
+	mono? ( app-emulation/wine-mono:4.9.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -356,7 +356,6 @@ src_prepare() {
 
 		local STAGING_EXCLUDE=""
 		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-		use faudio && STAGING_EXCLUDE="${STAGING_EXCLUDE} -W xaudio2-revert -W xaudio2_CommitChanges -W xaudio2_7-WMA_support -W xaudio2_7-CreateFX-FXEcho"
 
 		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
 		ebegin "Running Wine-Staging patch installer"
diff --git a/app-emulation/wine-staging/wine-staging-4.9.ebuild b/app-emulation/wine-staging/wine-staging-4.14.ebuild
index fa474a55dcfa..c8cbce356e29 100644
--- a/app-emulation/wine-staging/wine-staging-4.9.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.14.ebuild
@@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.8.3 )
+	mono? ( app-emulation/wine-mono:4.9.2 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -356,7 +356,6 @@ src_prepare() {
 
 		local STAGING_EXCLUDE=""
 		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-		use faudio && STAGING_EXCLUDE="${STAGING_EXCLUDE} -W xaudio2-revert -W xaudio2_CommitChanges -W xaudio2_7-WMA_support -W xaudio2_7-CreateFX-FXEcho"
 
 		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
 		ebegin "Running Wine-Staging patch installer"
@@ -475,7 +474,7 @@ multilib_src_configure() {
 		$(use_enable test tests)
 		$(use_with truetype freetype)
 		$(use_with udev)
-		$(use_with v4l)
+		$(use_with v4l v4l2)
 		$(use_with vkd3d)
 		$(use_with vulkan)
 		$(use_with X x)
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 358f66f96ae8..c8cbce356e29 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.0 )
+	mono? ( app-emulation/wine-mono:4.9.2 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 8e00e0ea26ef..93903b6f67c8 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,15 +2,15 @@ DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a0642
 DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
 DIST wine-4.0.1.tar.xz 21665840 BLAKE2B b33b5ce8b4624dfbbbf473a88ed8c52d5e53855fa98ac3128e9b89dbeee6e92044ed1e662e1dc9669bd8d805424c36f2dd2c836c51bf6a5e4d78350926a13150 SHA512 dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc
 DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
-DIST wine-4.10.tar.xz 22109948 BLAKE2B 60e627d1e88eaa71c08ab15f093b1b11a8ce619f6b4bde08ccabc6b28bfaa44822f407e14b78c67680e00eec01fa01ba8cd851faa73dd42fb77f394a8556ab7d SHA512 cafc1d268719f723091429d9d8787044719f0936b00d47c6d01cef4d9c141fed7ba5b9776c1c63c68934a0a1071fb74daa0440aa52e77c4e42aca894163d6f54
 DIST wine-4.11.tar.xz 22098508 BLAKE2B dee7ec74808b365cfa9087cadc29721af2f17663da760ae8d3f506e8ebd897aeeba0728eb57d1afa386b181b18f0861538b5c245841f9ce5e43470029ae4ef0b SHA512 df4e636959f6044f92aca16dce9cb392fd6c513ccc5a19585d3de8cd7fe0a9d21b05fcfa538172f94721d0356d9ec1470b7da810fcfa70d3aae9054a48d4700b
 DIST wine-4.12.1.tar.xz 22125544 BLAKE2B 7a3b221e2bf3af91feff529b5af3926956cbcbce020439c7aa4f464f78d8c93ed1686eabdfee080dd0946e378645667ddb19c67a6449f1b171f1660127ecc05d SHA512 5d226aa4f24c59949c88d377d8f3d38839179e473b7e5bbf029af8142dfa23fd046ca919b63c8c8fc7e1a46077a860d3dab9d2e040f0367c85c8d386707222c1
-DIST wine-4.9.tar.xz 22077528 BLAKE2B 98cf186152abc8379275b353e3934efc285cc386f33188a283e3568f803090057bcc90da6dd6c6c1e9d7dbbcf61fbe4a2316107ff129a7d7baa174982f9dcf26 SHA512 bf750af9569b0c564cd9581b9de8c399f6e42227eb6e79338ec6ba70f135fe3388b0792ff013add97341c488ed906227cdf93cc275e362ba232df78afaaab66d
-EBUILD wine-vanilla-4.0.1.ebuild 17350 BLAKE2B e73f6ad7af996ce6b0a7f05ffab5464ad807595c0c2bdb514beaf8482bb7025c4aada844ebb804f34f703439f68d9fb6f840a945c1f56b98889292444d01a39b SHA512 1f7d16a03f65a8a7238cd96ee84f662f25757592d1462694f1bb7d58edc93c82dc6de1868466e955252d3a9a63de91b256949ec9b79eab46606f6bceee695c05
+DIST wine-4.13.tar.xz 22137820 BLAKE2B 6aab4930fd176757e2594a580ba73694cf04b5411eaf26dc332a8aee5efcd1a181781d010610b22aaa6dd91b4f9161502609b8a23928d6848329d773f98c41cd SHA512 b359db3c99d10b489f7f72172b624e7b2e2b826c206e842a524d781ab5947e2b03623a115c2345fc71df22eb508936c2f7667d4c420a2fb6cdc34e3d2ba5e75b
+DIST wine-4.14.tar.xz 22151304 BLAKE2B 04983c21fa58091a36e681c90b92b4f014287ea7edb105bef560ed0505682dd1d3832292a0e2cc72489f0c4a2247ce9c1ec7481f80cf2baa05953e525ce00b1c SHA512 cfbcad1685abf3a3810c5f29c50e47f1340aab2276e54d8d22b9b764df5099ff7ad399a6cca200c7a622be0470992d3aee1c0c64c2e6ea90221fee6d391d911c
+EBUILD wine-vanilla-4.0.1.ebuild 17343 BLAKE2B 57e3ea58827294e7719352b84038074a2a2e7a56f1030db21891afc2d275eec4481751a53bbea59d23028e40967dc9f1751f3b170cb36e669e55d3f7152708db SHA512 2b04e442062e88e663b12139ab82d20df992787936987ada9394d62b1c208fa5be6a7bd192456fb027a3d730843a135091155956cc539e8481c916e3dbfe209e
 EBUILD wine-vanilla-4.0.ebuild 17340 BLAKE2B 44d7b71fec5fd62ad3403f881da67b2f6bbd7eb21cfb5e766fd6542967f88aa8dd42e9c4e2760ffb2e209ad45f7e7c64e522cfd0a01101765867f7e8260c9a08 SHA512 fc2eb099e3687cabb2f3a361760c5261f06e858f8046e2298df82c51b9b1541ed4c00a48709ff89674f48ad466ba409fa8e1702d1949d69ea86770079ffcc9cd
-EBUILD wine-vanilla-4.10.ebuild 17462 BLAKE2B 8fa2dfd719b20b255fc04b4fd46bf94bb544aaf17ef4bec28956a27228ed48af7757dfeea484d3645d94f89f8cec8131de029a6563e72b37c80990323d8de4cb SHA512 2cef158b81b101de8cd449b955321d72e6b0e99b5320f0ccdc13858384e4f4c520ade77d08813cf94cfa3b45921d1119eb07187cc5de4c31390ed21cd4ce6d31
 EBUILD wine-vanilla-4.11.ebuild 17462 BLAKE2B cf23d7b119dc4fac1e4e89ffacbf68a046815640687fa10f0b32219eebc6eeb47ec5eb743e947dbcc063f60ebf86820a74a255b1c66dc78c8ada12b70185b4a1 SHA512 f897c430a44dfbf14f539ce3de2140f68076c2c878d42cd178baf07ea5aa31a2fa5eef5afca80ea6f874a6dbc7bc851e869b57b954fbc3529dc8c10a8c6661e0
-EBUILD wine-vanilla-4.12.1.ebuild 17462 BLAKE2B cf23d7b119dc4fac1e4e89ffacbf68a046815640687fa10f0b32219eebc6eeb47ec5eb743e947dbcc063f60ebf86820a74a255b1c66dc78c8ada12b70185b4a1 SHA512 f897c430a44dfbf14f539ce3de2140f68076c2c878d42cd178baf07ea5aa31a2fa5eef5afca80ea6f874a6dbc7bc851e869b57b954fbc3529dc8c10a8c6661e0
-EBUILD wine-vanilla-4.9.ebuild 17457 BLAKE2B fff97c3b2b1e4b34d9cc3f7704d642330a026c8e3a2fa95724a063d4d3ad735c096171b41735c6dc068c26fbdd3f9da2c64fdd6fa68718c73de31c33481cc95f SHA512 3a3b8d73f8467640e236113120eda2e80b45378a6b9b4c9644d6abb320bc6064eece3163ea4c8da6f643adffac9d317518c34e98bc8571fa121fa8b1bdaebe86
-EBUILD wine-vanilla-9999.ebuild 17462 BLAKE2B cf23d7b119dc4fac1e4e89ffacbf68a046815640687fa10f0b32219eebc6eeb47ec5eb743e947dbcc063f60ebf86820a74a255b1c66dc78c8ada12b70185b4a1 SHA512 f897c430a44dfbf14f539ce3de2140f68076c2c878d42cd178baf07ea5aa31a2fa5eef5afca80ea6f874a6dbc7bc851e869b57b954fbc3529dc8c10a8c6661e0
+EBUILD wine-vanilla-4.12.1.ebuild 17562 BLAKE2B adc4845a27faea7d3d46db2dd8488bb3efb5f769b6217936d2734da9e99d412f60890b01d5d666a9d43aef94588ccb21500c209cb1d78ab7071c29744cf211c6 SHA512 d187f0b09ffabe340b49685aa0cc992bf6d425d8f598e07685b609565c4b287e11134a87953f5943c8521ef5894e4885d1ba56327127d6c9552fa9664f5e1b48
+EBUILD wine-vanilla-4.13.ebuild 17562 BLAKE2B adc4845a27faea7d3d46db2dd8488bb3efb5f769b6217936d2734da9e99d412f60890b01d5d666a9d43aef94588ccb21500c209cb1d78ab7071c29744cf211c6 SHA512 d187f0b09ffabe340b49685aa0cc992bf6d425d8f598e07685b609565c4b287e11134a87953f5943c8521ef5894e4885d1ba56327127d6c9552fa9664f5e1b48
+EBUILD wine-vanilla-4.14.ebuild 17462 BLAKE2B 1cf9e046eb5dd1cb48c2398d08622f3671d084813bd95f005a008958d63996f0f784809135c100947e40a3486d7730d5ad388f0c6fbb8db33c252a0e71c9991f SHA512 0db2627836498bdd71609aeb0cf6208b5f9e140a607ed20d64b14cc70f3b0ab31e212e6e7cefdef8b4f91c57d2efc734cb4510a61a82cbac27414bbfe8790ff3
+EBUILD wine-vanilla-9999.ebuild 17462 BLAKE2B 1cf9e046eb5dd1cb48c2398d08622f3671d084813bd95f005a008958d63996f0f784809135c100947e40a3486d7730d5ad388f0c6fbb8db33c252a0e71c9991f SHA512 0db2627836498bdd71609aeb0cf6208b5f9e140a607ed20d64b14cc70f3b0ab31e212e6e7cefdef8b4f91c57d2efc734cb4510a61a82cbac27414bbfe8790ff3
 MISC metadata.xml 3259 BLAKE2B b750a29db90841c9fa04e19ce9e5811945bb1d1d3b6a3b4a071087bf73f9386706ab28b7af29e7e89afcff2e1b68ca79944546e5f68c0d0f248b95fb1a5ac2fc SHA512 84fb94a9a9e4c9e8bf59391c9c1414e55994f80df0b264fdff77f43defa13ef0becdfc24316ef9eb3d824ea8edca5af3aed0586224a96b25fc3e90d7dfc32394
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
index a65f9b99a504..7f17dc2812b4 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-        MINOR_V=$(ver_cut 2)
+	MINOR_V=$(ver_cut 2)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* amd64 x86 ~x86-fbsd"
 fi
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild
index 2c4c919612cd..42d4ca69bfa1 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild
@@ -368,7 +368,7 @@ multilib_src_configure() {
 		--libexecdir="${MY_LIBEXECDIR}"
 		--localstatedir="${MY_LOCALSTATEDIR}"
 		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
+		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
 		$(use_with lcms cms)
@@ -481,6 +481,9 @@ multilib_src_install_all() {
 	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
 	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
 
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
 	if use abi_x86_64 && ! use abi_x86_32; then
 		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
@@ -491,7 +494,7 @@ multilib_src_install_all() {
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 	eshopts_pop
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.9.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild
index 70c9c99fce97..42d4ca69bfa1 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.9.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.8.3 )
+	mono? ( app-emulation/wine-mono:4.9.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -368,7 +368,7 @@ multilib_src_configure() {
 		--libexecdir="${MY_LIBEXECDIR}"
 		--localstatedir="${MY_LOCALSTATEDIR}"
 		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
+		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
 		$(use_with lcms cms)
@@ -406,7 +406,7 @@ multilib_src_configure() {
 		$(use_enable test tests)
 		$(use_with truetype freetype)
 		$(use_with udev)
-		$(use_with v4l)
+		$(use_with v4l v4l2)
 		$(use_with vkd3d)
 		$(use_with vulkan)
 		$(use_with X x)
@@ -481,6 +481,9 @@ multilib_src_install_all() {
 	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
 	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
 
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
 	if use abi_x86_64 && ! use abi_x86_32; then
 		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
@@ -491,7 +494,7 @@ multilib_src_install_all() {
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 	eshopts_pop
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.10.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild
index 4d617da0c058..da7b74680274 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.10.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.8.3 )
+	mono? ( app-emulation/wine-mono:4.9.2 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 2c4c919612cd..da7b74680274 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.0 )
+	mono? ( app-emulation/wine-mono:4.9.2 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 27b11c546e91..ebe85c92d724 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -30,7 +30,7 @@ DIST xen-gentoo-patches-16.tar.xz 36980 BLAKE2B a59fcb221a915e39fbbc463fa8b1ca1e
 DIST xen-gentoo-patches-17.tar.xz 15688 BLAKE2B d5e3bdb15e182c5f0c21adfa5cb5b88e3453e5035659823e3322074646c3ea89b55bf54d0ec6c54966d9739544d156de365a60acf928b799b68978be3380a002 SHA512 f1000ca36166fa21d4b18fb9ecf36f55b1450c312622fbe38545f78aabc150e2d6cce4bd58472c41bd9be8945940a0bc953ba7e470cd5095cf2e7d8a87769b2b
 DIST xen-gentoo-patches-18.tar.xz 16840 BLAKE2B 7243b363c78250ae1928d75813cfd6035a87ca03f1605cbe02233e009a19105a0712711d622eef8606f3e7e1a5db5203342e56a1b00496d5ce37ddc4ffb9e4ea SHA512 328d7b1a57ab6bf9c7200b934aeb241f6d4fecccc600130d1c80460540212eb658cb74ae0502c008e040fdb2d95db20c2a3d71a8e73fd1361070d70adeab6e30
 DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b
-EBUILD xen-tools-4.10.3-r2.ebuild 14270 BLAKE2B 9d3452ce90498bb4db604d8813d6be2ad5989b7a0d9719868cdbe83ff2ea3b79b23bbea316bb2473f52e2d7cc9c14eea78426be02c13f7a1510deba938729516 SHA512 2a795d0296edd20b52d95f96d8c3d0fa5dc8110cf8b106d5d26a2c91c3311b9fa38f08dbf162a6452a21ba2a5530ac9b8b69b59d056d251720b555181a25b960
-EBUILD xen-tools-4.11.1-r5.ebuild 14523 BLAKE2B 88e1e3e2be8e81bb6c3ec861e12395b7c3a0edbff91a2c40883a68b5e473d32625d49ec2317b67c744b1e490451184dcc8d9052a09b3a6c970de60424e2f5a3d SHA512 46dcb33fa4e80a893f28ddf03f3aceb1c05646733e9547a61c4cf89624e5cfd518514baa9193fc3b06ad2c95d8425c2975170f7618b165828e97ea6da162dfeb
-EBUILD xen-tools-4.12.0-r3.ebuild 15249 BLAKE2B 40b475c4453ad02f0531d28d0f2fcf93ca23c47c4403388542579e051c8459eac6079077c17c28ff5e8da71b75feb598d6ac416f7dd7e82fad03a7c37d172672 SHA512 338262410e02698431132a1e110bf00acc44609815dfc20300e5bae301461178188ee76344fc1276dc57cf1711e98d4b7987506f5e0d4a5b8e5c441e9a70d310
+EBUILD xen-tools-4.10.3-r2.ebuild 14271 BLAKE2B 6d5754c5a1e83c5d32cb569d19836e866fbe52ac5db68e0ad85e2a47873af97b457c6fb5709e912aebba72df91efdc28c57c63aab14173993d22eb80af12c478 SHA512 6748ed5b0871043334293561ec588256f079d81059d60fd5e486563d5274aee775cacde2bfc01ed45836fc8b8858f8df8107e118ff89766477832ac00f788dbd
+EBUILD xen-tools-4.11.1-r5.ebuild 14524 BLAKE2B 04c598fec6b8764c5d28584b52798f38f245e92ea890276b15eb6f2ee01b15526bd2789113a70fac5a42dfc57da854c2701bb810d865460e1714f224a053c649 SHA512 c8e7d2a272f4cb12d12557826ee7a0e4ba8c20dc90dec27168a341e3272951bdd291fe3c102bb5a9b7434a1409a93364a75d87d7ddb92d1ccc1a331f8ac6316f
+EBUILD xen-tools-4.12.0-r3.ebuild 15250 BLAKE2B 2b4085469cc0d28bb8eca87c053857e8b3902391b4a8aa54529126f6dbc9ca8b5e64cb43fb22b420797d6844a83dcdef01646f0f09592a2aa816060439100ba7 SHA512 14a58addc05c4a0d90017212ca44ddac1c94cff35ad3ae4e6c2dbd8bf00a99de3d6cdaebb4555f03fa457db26efd766a633931747a11c472da2c412dc1974258
 MISC metadata.xml 1479 BLAKE2B 1b994f8dcaa5cf67f588af6ce9533467816f7c4726e412566640138e631427decaf890856fa255b516580502c97c2e29c21bb84b4888df7603a9491a012381a5 SHA512 d125649737e0b34407fb32b67b741feca60d100454fdbc84b07305849295f134e1b657f5e13b6e74a90d25d7b408880316d470ee94447b7a6f99abd75eb82a83
diff --git a/app-emulation/xen-tools/xen-tools-4.10.3-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.10.3-r2.ebuild
index e5f5d7172109..11abf9ebb62f 100644
--- a/app-emulation/xen-tools/xen-tools-4.10.3-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.10.3-r2.ebuild
@@ -392,13 +392,13 @@ src_install() {
 		XEN_PYTHON_NATIVE_INSTALL=y install-tools
 
 	# Created at runtime
-	rm -rv "${ED%/}/var/run" || die
+	rm -rv "${ED}/var/run" || die
 
 	# Fix the remaining Python shebangs.
 	python_fix_shebang "${D}"
 
 	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
+	rm -rf "${D}"/tmp || die
 
 	if use doc; then
 		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
@@ -428,7 +428,7 @@ src_install() {
 
 	# For -static-libs wrt Bug 384355
 	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
 	fi
 
 	# for xendomains
diff --git a/app-emulation/xen-tools/xen-tools-4.11.1-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.11.1-r5.ebuild
index d481f3025a94..aa27319fb101 100644
--- a/app-emulation/xen-tools/xen-tools-4.11.1-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.1-r5.ebuild
@@ -398,13 +398,13 @@ src_install() {
 		XEN_PYTHON_NATIVE_INSTALL=y install-tools
 
 	# Created at runtime
-	rm -rv "${ED%/}/var/run" || die
+	rm -rv "${ED}/var/run" || die
 
 	# Fix the remaining Python shebangs.
 	python_fix_shebang "${D}"
 
 	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
+	rm -rf "${D}"/tmp || die
 
 	if use doc; then
 		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
@@ -434,7 +434,7 @@ src_install() {
 
 	# For -static-libs wrt Bug 384355
 	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
 	fi
 
 	# for xendomains
diff --git a/app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild
index b0d104e17f79..8a13631173e4 100644
--- a/app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild
@@ -415,13 +415,13 @@ src_install() {
 		XEN_PYTHON_NATIVE_INSTALL=y install-tools
 
 	# Created at runtime
-	rm -rv "${ED%/}/var/run" || die
+	rm -rv "${ED}/var/run" || die
 
 	# Fix the remaining Python shebangs.
 	python_fix_shebang "${D}"
 
 	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
+	rm -rf "${D}"/tmp || die
 
 	if use doc; then
 		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
@@ -451,7 +451,7 @@ src_install() {
 
 	# For -static-libs wrt Bug 384355
 	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
 	fi
 
 	# for xendomains
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
commit	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree	326613a08f25851c388715e205576a2e7d25dc4f /app-emulation
parent	b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)