gentoo resync : 20.03.2021

101 files changed, 416 insertions, 2736 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 32c9093f4600..f011662d95a9 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
index bdafcae634e4..16616485d24c 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,5 +1,7 @@
 DIST conmon-2.0.22.tar.gz 103371 BLAKE2B f509ba800c847886ec2350e141d2b965ff1cc09822467718fb0d94acdabdc86c6f40dff9428679e4c4171ac6a522b3ba7622d66ebd8108be1a68cbf7418d5c09 SHA512 819e1d9279c1a22388220d710b975cdeb3c0b56413afb177afe1c96b649e2dce496d5f51fe4094f572111f771102ccd0ae86f1776e99fedb2e76e6e9130c2d5c
 DIST conmon-2.0.26.tar.gz 104681 BLAKE2B fc8369258a414d3a169b64019199c604d1d8bded70d5a38230f243053dcf09c6f9aee931b328913e6cbbe3c495aab4894647897f40f537a79eb587ecee58517a SHA512 5cbb66053fb48b514f93b3be4d4ac428f9eea8a3e1452b4df232250e9cd01202ecb7477c05e1e4dfb21595f2d1881be35cdea9b23f43c02bb7c0e67a3161396e
+DIST conmon-2.0.27.tar.gz 106647 BLAKE2B f242b1be4f86b18ca94dade3d1f5522d1ae1951f4b7abf7e563e1a93472c2a673cd48a136fdff12b410ebaa46694b70ffbf173fc37a3bbefb03891452c22dfae SHA512 2bc389fa3963cbb612669ec1d288adc888d7ac1de2b9bf483f18e0f62220775327ebcb771bfa7236815ef7247adb8fc6b8ae38748f7a383ec9590e3ee5769b65
 EBUILD conmon-2.0.22.ebuild 1184 BLAKE2B 75c40011ce14d692ab11310ba9e32a9bece265c4f636680bec93186fc9d751e916ef2ad4b9e6cf9f7ebcb6a6d38ff7d37f6f7ba68a50a73cc17564ad1b9a6b73 SHA512 22244dd45ac55b9231b685f0fdd7dcb62d9f4f08f7aea114cc2eb161e3911435f7042d47a7464130d240fe065871694c46f6caace4b6876dd3598dafbe154d6a
 EBUILD conmon-2.0.26.ebuild 1184 BLAKE2B efa932a65151a81d7163adce779affaa458f61a7afee968352af3703189660c5051d3de0b09dc17e1a26057e63a8f5e7b54503fb8b3d103650fdcab60e6a8b43 SHA512 91eb9099ee247b638a8cc5d256278e4dc23c7e40b3053e91d7b724f1ab6658f690e5e8cda79b0176a976319fbe1006ac095b81bec3f1a0646a5c22f20aeb8061
+EBUILD conmon-2.0.27.ebuild 1076 BLAKE2B 3fd2ee929a340c2f6e05df50db97503e579c6ff3196f9aeef264cdc0d8ea0e12aea91719f5c2f0f168922f0d533febcf23797ba5fee2eb9f4b38c29f7d5dceb6 SHA512 9bfebc9ef6ad08f09d85539d9141ef562e73d37bd10c144acfed8f0e3bd25636b4ebeed8f2d130cb4fad4fb025b011249b19a1199eafa3ba948209f62e736cdc
 MISC metadata.xml 326 BLAKE2B 88e40bbfd92c360f7ed559dc1f3ebe8d35a4905c413de8208a72e255e531d32f61dea3ad710b3a2743df01b29f3f5426440beff3ffcd59139d6f5ce118c17557 SHA512 0709bf7dd7300225974bbf974a3c90c27a368ae6862e080c95f0fb30f314b94c0502258773649fe2cdeba22ad9f5c0d29d000f95e8f7d961e9cdfbea108b4775
diff --git a/app-emulation/conmon/conmon-2.0.27.ebuild b/app-emulation/conmon/conmon-2.0.27.ebuild
new file mode 100644
index 000000000000..8922d84fc488
--- /dev/null
+++ b/app-emulation/conmon/conmon-2.0.27.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="systemd"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:=
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}
+	dev-go/go-md2man"
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
+			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
+			-i Makefile || die
+	fi
+	sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die
+	sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake GIT_COMMIT="v${PV}" \
+		all
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="/usr" \
+		install
+	dodir /usr/libexec/podman
+	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
+	dodoc README.md
+}
diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest
index bb168bf65c38..e48273149b69 100644
--- a/app-emulation/crun/Manifest
+++ b/app-emulation/crun/Manifest
@@ -2,4 +2,4 @@ DIST crun-0.16.tar.gz 1370194 BLAKE2B c2a2450518226421b43d93597b38da80ca330cb3d8
 DIST crun-0.17.tar.gz 1385658 BLAKE2B 3d4c30989b9e79d02bf9a6c298daa8d0b5b6b8bfcfaca8ae9e27ad865762a32b6af2c8806586bba2ab94271446a93c34e8f2d465cc008c41bbe69e565556a1b1 SHA512 b095a3c4fca8ae683553805de468594e8dd891cc9911b56e8be7c429584e71fb40a364cf55a6a829950078a539d35308310f53f57b8fb40d483d394e91b20b01
 EBUILD crun-0.16.ebuild 1393 BLAKE2B 4405a9825f15c2c29471a8d104b66a1a412c41aed3ef23d73ebac347eabc7afc8883795a8022aac520f1e5a47405d4247a96efa09e8a56a3b992872c6c407183 SHA512 8015aff83762d3b359d5d8ea4c8c20dc3693212659bb173101abfb01a6a617a102f4168736d74f4435ce01782964c03d63cee58db21b9cc2d6d82d0dc84fc55b
 EBUILD crun-0.17.ebuild 1393 BLAKE2B 202766c3cd321d12f35214d28cb7dde3c7bd5ba916106ec7523923e54d5f6070d66a7486e198f137a2808684ee9ad2f3acc2c25434ed445a4255519ff04adebf SHA512 db0ffd3ae2a3b9a725c25694095b6c5ee6cc7f96eaff1324f3209dd6d5fdf3e200c0072531bc537a063a5dddcfb1cdb6bcfdc9ef5e58c74204de2f624b4d7113
-MISC metadata.xml 1269 BLAKE2B 3c486216614d2758ad8dc7d01ca46babb33375fad75b959361d792a818d0515f1b2a4c913252eb2f006ecd962e281556137ded3eebe96f5e62f3caa5994c5bb4 SHA512 d1999558dfa98c2006e095589a15d2c2e61ac302b520759921c4eae5c94a245e25b0d7b23eb5754d5a324006d447ab3275bb188e8387110c9c3ec81f724efc87
+MISC metadata.xml 1299 BLAKE2B cfa5ced999f15c2aabb6633865fb8bc2f2dc7c2d2b4fa61780de40f975c8a00ad87d7c1251517f7a50b01c3413d2afbe8bca2114ce9eb74d0437285ee6d19d91 SHA512 0f2109b828550df8807736022598f3fa36128ff5224aa61cbb4001689c344b670c124bb85805cdedf8b2e7173b4cc6bc29d7d46ef95f7c9f03c4a9b6e1c93493
diff --git a/app-emulation/crun/metadata.xml b/app-emulation/crun/metadata.xml
index 11d539113887..d62ebff73e5c 100644
--- a/app-emulation/crun/metadata.xml
+++ b/app-emulation/crun/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>robert@gnzler.io</email>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/distrobuilder/Manifest b/app-emulation/distrobuilder/Manifest
index 2b6b09991744..0eb68abd869a 100644
--- a/app-emulation/distrobuilder/Manifest
+++ b/app-emulation/distrobuilder/Manifest
@@ -1,3 +1,3 @@
 DIST distrobuilder-1.1.tar.gz 17339508 BLAKE2B 5dc023520783301bfaaee9dbdb7f6707a565b6b7cde18afe53051c47cf4ec243be4f279846753f4fdab75f8aa3333fc4e74d90376390073e36edcb57a1d22815 SHA512 4638cb7ad34032a4ab6d6d85a07b92b7ee3ebc6fe34672d148b0574d487ca2a572fbcc700f829865faa77ec07f78e47555246cb8a2455c713d5051f19cbf8426
 EBUILD distrobuilder-1.1.ebuild 759 BLAKE2B e6df503b7a2bce89b37da161b374880119722daac5af6afc09475a8c90475b073451e14eea2dc9182f49e16f45c78a99d93b768673e6157e58ab1bd98c9142bf SHA512 ef4b60e7406e759a71abad1f4f866669cdb87e1601b2380b835641915ab30f05ecbb7316ebeb894cd5437b659bb2385ea74ada60e5eda4098209593c4877ae0a
-MISC metadata.xml 489 BLAKE2B edf4553e951d14b1fd58ee9130f754749fc3104a61a1940280d53343f7499bbddf15198ab74c4531578c1abf87412aba8171d0e8c72d0c08f0b41360dddc3ce3 SHA512 06a94d8c75555bbef6abb3d59accd2d941c81e2d87747990ac253f67aad94b7e9967420eea8f650aff0e3b3f7bc567c2c1aa88009be14ff78183210beb892720
+MISC metadata.xml 503 BLAKE2B f42bbe0993502d3d1969100dd5086b7ac1ff52d6aedb65d6bbab72c4b63a2f66eb1c6c91d54ac65a02349dbb5040a5dd2c0a433dc5730cb9ec0af0d9bee9fec5 SHA512 e0f9ea85b0986a2a0c55c576cc96746f0e392544e1396c89c583316d4186ee885ec37c28a0e7959bae8ef36083f4f71a0dac1df782761501b94372b2b458de9a
diff --git a/app-emulation/distrobuilder/metadata.xml b/app-emulation/distrobuilder/metadata.xml
index b495e2e1bb0b..64ac1ae46534 100644
--- a/app-emulation/distrobuilder/metadata.xml
+++ b/app-emulation/distrobuilder/metadata.xml
@@ -5,7 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>posting@vodacomm.ca</email>
 		<name>Stephen Bosch</name>
 	</maintainer>
diff --git a/app-emulation/docker-credential-helpers/Manifest b/app-emulation/docker-credential-helpers/Manifest
index 0253fcb42d02..24db9c1f716c 100644
--- a/app-emulation/docker-credential-helpers/Manifest
+++ b/app-emulation/docker-credential-helpers/Manifest
@@ -1,3 +1,3 @@
 DIST docker-credential-helpers-0.6.3.tar.gz 28971 BLAKE2B b50e4de0f3b126e0118f24f845a94be5e932975ab54ad6e0a52129a56109ecafb021f14986569295242cb0af4ea109d8786b8a5ca8481cc48daad14671841432 SHA512 2d15be8df134bff08eef9461348f07cd57c70c15a0ab044de2e69296c400b8c0e16198c90fd064d5ce83037d0bad57520e7524b0832b7a00e69397203dc90d10
 EBUILD docker-credential-helpers-0.6.3.ebuild 1245 BLAKE2B 7151fc66ed32fa3c43e1c8df41f18431c15f843dd88985fd25a0864a0c99eed0c31ed168d3e8ed4d6460286a919140658e45a0f87630a443b7ceea6b9ef9071a SHA512 7f3a855a1c78a5f36f7bcd784cbb01dfd34d6796cf91376bb949ff98e1cf66b056a8cdb5755cc252392d827a352c30a813da0fb3556c62ba3ab8d3eb1361ead1
-MISC metadata.xml 847 BLAKE2B 7fff76aa67ee9868506860bb8a6812d0412cc9d5e8e6b4ef2906af3a761133fc299f5deb6ac48a5258a0d1b250611770042627f1dc667acab3a974960a2e1ca7 SHA512 f4cfd994d789f493ac2dba0699370fad8253121028ea4f25f882e406d7d6846cbea505149fff090cc6d898b5d4634472e4afe6ccb6f1177a5a23e7ba5136470f
+MISC metadata.xml 877 BLAKE2B 5411cc175644103cddc23decc424aa517f71296362ea3859cc969fc50ffec41b4fd325e98f681e9798e196f6da3f30dc86a4af0ca797d2d83684920b58550cc0 SHA512 e7f7a33a2fb1bbf308606d713691153304b2989de19a8a6f618471b252889d12af8d0737f53379a90da628dea2f7ea6fa61222e4d57c91297731b4b7f52cb793
diff --git a/app-emulation/docker-credential-helpers/metadata.xml b/app-emulation/docker-credential-helpers/metadata.xml
index 196e66de1e6e..d5dcc7f1c72d 100644
--- a/app-emulation/docker-credential-helpers/metadata.xml
+++ b/app-emulation/docker-credential-helpers/metadata.xml
@@ -7,11 +7,11 @@
 		D-Bus secret service APIs, and docker-credential-pass to use the
 		pass framework.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>rkitover@gmail.com</email>
 		<name>Rafael Kitover</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/firecracker-bin/Manifest b/app-emulation/firecracker-bin/Manifest
index 4498450449eb..f9401d8e056a 100644
--- a/app-emulation/firecracker-bin/Manifest
+++ b/app-emulation/firecracker-bin/Manifest
@@ -4,4 +4,4 @@ DIST firecracker-v0.24.2-aarch64.tgz 1429004 BLAKE2B 8d5624f6f6f154678ffab945bbb
 DIST firecracker-v0.24.2-x86_64.tgz 1434481 BLAKE2B d2b81e2b3341317f296c63f14b2699dbf207e2e3a83871e38ef1666c105112788308c773afad61a85f7c6f4009f2373c80f12a52549120d92a42bae54891bf59 SHA512 2a574276296685117acf4e1d425ca75ecb8ad06680ae81e183d73853ff57cbca2f4cf4f42cb013d8d88d18146c0d84d2b098829ca5f6e9402213fecdf539a283
 EBUILD firecracker-bin-0.24.1.ebuild 2465 BLAKE2B 7e2fd7232b1d7409f10ea156e0813fa39da049858a71ff079fd14bf410141c63d5a9f87491befbd830bf3f323c5495ab7a8a945feecf741f5fa5a03d1985f4aa SHA512 9b910ba0af4ea9410dc573338e09396ea85d5850c957888b14c0bc92d7e4d78980335e252d8379eef3e2ee3bea5dead28b43890f7448df4bfef1bd9e57a23437
 EBUILD firecracker-bin-0.24.2.ebuild 2435 BLAKE2B 8622b836b146cbb96990dc0a65f8fc581eb8ded2fa281da6682a5bfc5fc91b65200b91ce8dd8642255eb0122d47f9318e22147f07fa89b5b24764caf34aa0fea SHA512 26d9df41a0be4785ef4b31bdf4160743c163ebae758d5241b7553469643449d943facbd8442778bc281736ca2fa4c9256360aec5b30b5252b5b664c5d52b6b39
-MISC metadata.xml 385 BLAKE2B 5637756b0993be1ae2695067acc7fdbeaae6c0d5e5cac29563a15bd54815d9b9e2c21d516754e95214f2007846c7b477ad7f70f3f42007d70552313e12e57942 SHA512 83790f17e3b5da6bea49d28a82b7eeb8caba881042450f63570cac4d3bd5d64c326ccc053b5b2f225b9fc68a8379707a77d2a484e51d9ce93399bab25058a123
+MISC metadata.xml 415 BLAKE2B 2e3287fc3b97cbe52c6ae404b2bf3c691e162a8f44ff75f720a56679e52327c0817860251d01e3bac8971cfafb7e9536f3c277fa77316547892361c6e669b8a4 SHA512 9762208fed64d628db75d544de99085643aa2fe1cb44c09bf93a2d3224932abeef7351d1332709e9851ab2346224d573d607171db64086c08cb56bfe0e25425d
diff --git a/app-emulation/firecracker-bin/metadata.xml b/app-emulation/firecracker-bin/metadata.xml
index 7f6b797d9b1f..866b948059f9 100644
--- a/app-emulation/firecracker-bin/metadata.xml
+++ b/app-emulation/firecracker-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo-bugs@ares-macrotechnology.com</email>
 		<name>Sebastian Hamann</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/fuse-utils/Manifest b/app-emulation/fuse-utils/Manifest
index 83f4c9c32b3c..757c3250160f 100644
--- a/app-emulation/fuse-utils/Manifest
+++ b/app-emulation/fuse-utils/Manifest
@@ -1,4 +1,4 @@
 AUX remove-local-prefix.patch 841 BLAKE2B c29e10ed335d431c0cbd88a26028c03599c32d9ded001fa1f61f805589bd1c52352b52ac8f99c147af315ee91d65681d1c0aa355567108f92767f36fa6f6dee1 SHA512 c15ac87af402e06296d76459a13b5817be7393839ca1566c6f0eefaa3055f7f3f0dc7589f762d9caa0e0bd356790bbb1aca5c3ee6166155577bf3520f25ed125
 DIST fuse-utils-1.4.3.tar.gz 501006 BLAKE2B 0637fe05b71416e89eb61e3618ff45bd71250201924fb3741a4c5b9898d09b30acecba9957baeaa864c2c9cfe1bcb9cb38a2af83368bc5729221cec36a1eda47 SHA512 13404d1be81a2de9262cd79cce9dd8dc3f17238fdbb75da8a724b76b0976c03f34da9978af36b808103fedcf3f5d5da4bb10f251c5510127d59ca8de5607b99e
-EBUILD fuse-utils-1.4.3.ebuild 906 BLAKE2B 5d0e2325e3256617e87a1a147626cfa74b3e77638dc0218a45952e469cdf046ca76e97f61667f41bd63965795fbdc69ec3adf0689f6f7464795608dca71415bd SHA512 0d64435c04cfeb91259f0969aeb99b2d84128861772f9c2baa344bb4956b18c9d14e0d8e7251c9491b7a0fabd6fb82d8e590ef210263c6e5050b2dd11724b347
-MISC metadata.xml 389 BLAKE2B 3dbdab50b92657766b2c72e4123275c5b2b58e032ef5f944b2e771d985a6a6c84058c1e28287be157a01c36203b8278e2c091b491725124460d9caf51004059d SHA512 822ec5f3821519739d0e1bba1f66ac3e14925f00c9ffe1557867dece79c3832e2c48c4e3091b8fa79dbf09101dcc6de35d3bb4610467f849ae731de86b1ee247
+EBUILD fuse-utils-1.4.3-r1.ebuild 926 BLAKE2B afe7ad8f5fb60a8350835acf5d7710991d28b25f01bb9082a653759053d16815d9479cc956a62f2ac76755c0e604819a8c55792c8f44efe215b9292b6152ec4a SHA512 5b0bb4157d32d7916e75ef2f3f792d5dcb0e10f3aba71fbc96112d0a732baba6cbb2d3a1b4f4bb6540327ec2c8910869543256bc926dfa8497d0a044a3c960d5
+MISC metadata.xml 468 BLAKE2B d1653b29114c8a61280253b82ad6de47e100362a9a6113706648a25d3803e95eba5438c042b1af91c49e570eedef17598f4ce0987d3d01e76e6b3f4a908d7892 SHA512 b2a1360187920f5cb8516f9377cc1bec1732b84b83038a17ba33347b2bea403cdbfeb09a0abeb8e55157445f4cff13e803369bc125fc0a531aaa509b3aafe9e2
diff --git a/app-emulation/fuse-utils/fuse-utils-1.4.3.ebuild b/app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild
index 8e44998a4a6a..cc6f021a658a 100644
--- a/app-emulation/fuse-utils/fuse-utils-1.4.3.ebuild
+++ b/app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -14,13 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="audiofile gcrypt jpeg png zlib"
 
-RDEPEND=">=app-emulation/libspectrum-1.4.4[gcrypt?,zlib?]
+RDEPEND=">=app-emulation/libspectrum-1.4.4[audiofile?,gcrypt?,zlib?]
 	audiofile? ( >=media-libs/audiofile-0.3.6 )
 	jpeg? ( virtual/jpeg:0 )
 	png? ( media-libs/libpng:0 )
 	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/remove-local-prefix.patch
diff --git a/app-emulation/fuse-utils/metadata.xml b/app-emulation/fuse-utils/metadata.xml
index a335d4fddda0..0436766ec0ff 100644
--- a/app-emulation/fuse-utils/metadata.xml
+++ b/app-emulation/fuse-utils/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<use>
 		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto of some
 		features, including logfiles.</flag>
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index b1a80def7fba..90b0236ec58a 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,5 +1,7 @@
 AUX multiple-definition.patch 508 BLAKE2B 9568d9f736d838ba4506e9bf6fc3f514952d086e1b412e19f56cc0646564a99411086e6a3a9ba106d741c727078a286c49a932d151f93222bbfd5c1f32221c70 SHA512 544a012a352f68e843c796a8ba2a2cf7b4586e3c99b059ef387fc7f343cf42c66de11c17bf9c15f92a819ec3e32fe3588a02bc7095996db7b13f536e66555795
 AUX remove-local-prefix.patch 745 BLAKE2B 752dc9df4ad9b33a84493e4939d9c30687a730ecc628301a4bbc16f46410d73c8f7b64376788721f04c06404685ef300c2dc423c1843258748c377c6d61232a4 SHA512 25771be029e61654398bb1c36b1c31bc44f136e7e369c72faa3869f94807558c0d1b324ac803d79a898410fd14661d02a8286cda19dc25c79ebca6c387b817a3
 DIST fuse-1.5.7.tar.gz 1634568 BLAKE2B 9d2f3c310132dc57336995c31adeb37d727506719d1089b2009a2f44cbfa59fc9c4e9252aeff64cdd22b7326328518b5da33af51be687f321b891b9d1dd2b646 SHA512 ac11e03fc203f98433253fb72d7700cf6285ad8662147f318bb4ceda3888bc865b80d85473a3b2bda9e0971989b1579fc928f41ddabbf01d58358362066be13d
+DIST fuse-1.6.0.tar.gz 1686171 BLAKE2B d1e6b166f2f649f408349b16a5eb40dd414750ed7a805eb6505b6c81be6ed7bcaa4e6f0b14057645172add1b1a77881f90b64767390fe1a64a486168f452d29d SHA512 5096b24b5b3d812942a7ad401b886b6a99f5493686912cb4aff18ede65404ae97a9bcafa6337aaed4378382f2a170918797d7d4570bb809476be5aa9fc625b8b
 EBUILD fuse-1.5.7.ebuild 1913 BLAKE2B e3cbe4591bf23d091555ec8d50cfce8ea5cc4ea42dd21788f29445d36c05802875fe01801401591f06d836c9009b403e09bba4bdf2e1b06930ea380db195abb8 SHA512 483ec51bdd5a493dfcb9fa66b576b5ad67e6fca9b00d81639127a19833344b99b9107e0c4f8d75d923ca825c10e76113461e26489a0f2acf7c545269523f0d1b
-MISC metadata.xml 588 BLAKE2B 4a3aeb05e4788fbd18b8d6f2d741e00f1b6f7a849fa0179afb9aa1d7e6f44f29c3ecaa4a527d280b940e7a5dd2ac7e4557184ffabdfc41f743389847dae71c83 SHA512 8c3695d6e28639e0741888eb51487b898e9452c560f486577d4ba412802a3a33630ef72f9ce8df928aa1a8a80ae238df7a7e49c2f945e43ebe7f5db5936c7163
+EBUILD fuse-1.6.0.ebuild 2916 BLAKE2B 0af606e43136c69fec26f7056225ff7ee2e0ed2ded6c83244a53a9e898b59568a37967507ae0d4537ec695a27c7844a2ee75b2d8e0c6254a3fdc7cc35ec3123d SHA512 1dc13be98ee7b8550836e77ce03acd775c129dee8135ddd99abcc2d3ee6486eb3b14f551de16b6ff4dd0b9198cc8d0b0e0ff4027b8fc662911dafc6c224082d7
+MISC metadata.xml 728 BLAKE2B 53fd75cce07e995581475b414394c05e5acadf5e49b3a6c9fcc4e8f5f34b14209f2628fb2ccee98d1018266888aa76778e63b87124a87a14f179601891153869 SHA512 0ec242e0640d786ed5e82c3e0553e4c054b4e493a7851aa47b1ed817f6826014aa2d1a91f8a398baefe76a5aa2535fb260003386f695a53c9c807b10994926b9
diff --git a/app-emulation/fuse/fuse-1.6.0.ebuild b/app-emulation/fuse/fuse-1.6.0.ebuild
new file mode 100644
index 000000000000..ddec66d72acc
--- /dev/null
+++ b/app-emulation/fuse/fuse-1.6.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
+HOMEPAGE="http://fuse-emulator.sourceforge.net"
+SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa ao backend-X backend-fbcon +backend-gtk3 backend-sdl backend-svga gpm joystick memlimit png -pulseaudio +xml +zlib"
+
+# TODO:
+# - allow using sdl audio driver without using for the UI
+# - allow using sdl joystick support with gtk3 or X UI in place of libjsw
+# - when using sdl for one of the above but not the UI, allow using sdl2 instead
+
+# At most one audio driver and at most one UI back-end can be enabled at a time
+REQUIRED_USE="?? ( alsa ao backend-sdl pulseaudio )
+	?? ( backend-X backend-fbcon backend-gtk3 backend-sdl backend-svga )"
+
+RDEPEND="
+	>=app-emulation/libspectrum-1.5.0[zlib?]
+	dev-libs/glib:2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	backend-X? ( x11-libs/libX11 x11-libs/libXext )
+	backend-gtk3? ( x11-libs/gtk+:3 )
+	backend-sdl? ( media-libs/libsdl[joystick,sound] )
+	backend-svga? ( media-libs/svgalib )
+	gpm? ( backend-fbcon? ( sys-libs/gpm ) )
+	joystick? ( !backend-sdl? ( media-libs/libjsw ) )
+	png? ( media-libs/libpng:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	backend-fbcon? ( virtual/linux-sources )"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/remove-local-prefix.patch
+)
+
+_fuse_audio_driver() {
+	if use alsa; then
+		echo "alsa"
+	elif use ao; then
+		echo "libao"
+	elif use backend-sdl; then
+		echo "sdl"
+	elif use pulseaudio; then
+		echo "pulseaudio"
+	else
+		echo "null"
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--enable-desktop-integration
+		--without-win32
+		--with-audio-driver="$(_fuse_audio_driver)"
+		$(use_with gpm)
+		$(use_with joystick)
+		$(use_enable memlimit smallmem)
+		$(use_with png)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+	)
+
+	# The pure-X UI hasn't got its own configure argument, instead it is
+	# what is used under Linux if all other back-ends have been disabled
+	# - and all except the Gtk+ one are off by default.
+	if use backend-X; then
+		myconf+=("--without-gtk")
+	elif use backend-fbcon; then
+		myconf+=("--with-fb")
+	elif use backend-gtk3; then
+		myconf+=("--with-gtk")
+	elif use backend-sdl; then
+		myconf+=("--with-sdl")
+	elif use backend-svga; then
+		myconf+=("--with-svgalib")
+	else
+		myconf+=("--with-null-ui")
+	fi
+
+	if use joystick; then
+		myconf+=( $(use_enable backend-sdl ui-joystick) )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	emake test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if use pulseaudio; then
+		ewarn "The PulseAudio driver in ${PN} is experimental"
+	fi
+}
diff --git a/app-emulation/fuse/metadata.xml b/app-emulation/fuse/metadata.xml
index 04bb5c6c82aa..f6bb92e4f4f6 100644
--- a/app-emulation/fuse/metadata.xml
+++ b/app-emulation/fuse/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fuse-emulator</remote-id>
 	</upstream>
 	<use>
 		<flag name="backend-fbcon">Use framebuffer rendering backend</flag>
+		<flag name="backend-gtk3">Use Gtk+ rendering backend</flag>
 		<flag name="backend-sdl">Use SDL rendering backend</flag>
 		<flag name="backend-svga">Use svgalib rendering backend</flag>
 		<flag name="backend-X">Use X11 rendering backend</flag>
diff --git a/app-emulation/ganeti-os-noop/Manifest b/app-emulation/ganeti-os-noop/Manifest
index 9f08e26a4ec1..4cd71c15d06b 100644
--- a/app-emulation/ganeti-os-noop/Manifest
+++ b/app-emulation/ganeti-os-noop/Manifest
@@ -1,3 +1,3 @@
 DIST ganeti-os-noop-0.2.tar.gz 2247 BLAKE2B ea0d9c4e884aba81895e48b8bb86a28f90432ec768feeef5f561b13041279578c5730783c12a7207b330fe9190c0b41a44fdf154f8685bb8f4d3721f37d797f9 SHA512 ae121759ef775a5fee552ef2f939bb01126ff5fee3deeadae234a6f6f66b2589be1a6cc686d564d3a77406f5839f1cf914a3492c3ea9cc803427967fb75e3c5b
 EBUILD ganeti-os-noop-0.2.ebuild 564 BLAKE2B 2eb3a0dc82eae30ac81c13a28670242bad7f8cb0a5a5494b121bd6b31d4bfc9e464c5fe918de5d4005934063ee7572a76680c6c3c6b4c67e042c3fca068fbae6 SHA512 24d3b53a43f6aade1a075519285f64fc285c4b27ccd83a9442fa1035506480ea9979fcf18e72e831109056abfe38372eccd6cb78c0e907942dbcd93261d70c36
-MISC metadata.xml 335 BLAKE2B 29dac66049297ba00c1a8c850ed7dcd9748b49c232033d4a0ce2ffe92ccd3160d8b25dd15ea989ade9508422f210f9ce6ad3438e79e6b9d04085ece9cc83bdc0 SHA512 4caaca34dae159ff71972cb9e91c8c8ab1743c3626873d0e7e21d184b88d3a86be2510fb14219adaaa1f4ff7b6f7459146e6eb98145c7af46fdd8ee2cdc11f7a
+MISC metadata.xml 335 BLAKE2B a8af2ad6ddbe571ed1149714127a467e89fcfe07c1aac006689fa18e92af3afbde7dd7bac29322d2cce3d7ebf8ed2855ab319b413aa832f693df1871a95afb80 SHA512 044a7f76eceb533617b7ce0e901434a38c77fe419537cbf4f1c11fb2c9836fd6894cbdc456270aaf1e57ae4cde476937c7b929599b0dd530bd86a42bbde04fba
diff --git a/app-emulation/ganeti-os-noop/metadata.xml b/app-emulation/ganeti-os-noop/metadata.xml
index 0be915a90eff..b18a6a1b928d 100644
--- a/app-emulation/ganeti-os-noop/metadata.xml
+++ b/app-emulation/ganeti-os-noop/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest
index 907f8fd31d60..a392df24c8fe 100644
--- a/app-emulation/genymotion-bin/Manifest
+++ b/app-emulation/genymotion-bin/Manifest
@@ -1,3 +1,3 @@
 DIST genymotion-3.2.0-linux_x64.bin 48173545 BLAKE2B 3b921dfe01d56989d8f8998f6555fceabbfeacd3e87969dcc226d354e1ad5173e37682127d3158bbb280fa72386fd67adbcc3e64b2c5325c8144f106a8fd4469 SHA512 934047a4ced3dcc97c4be4f9767b885d79451701d974471e55b338ffb6bdb255654933678b6a8ba5a732b95ad0992b049effe2bcb8d05957526093b246d5deb6
 EBUILD genymotion-bin-3.2.0.ebuild 3513 BLAKE2B b6aec93ad7fbe91e6e9a52b03e31b6e7f62d53e1aa6fc34b7a0a31d813cfc5bb36053b28db18e13b943aabc790bb5fcbac5ae6f275a5cbc5ba0ce3c909f85c05 SHA512 b6a215f0928577b96ae2222aa9c60ea971990242895c2a7cdbecf517fed7ed7ec1393bb263a446c67636a9843c5c884cf3b5204e9afe993ee2435d0f0913fdcf
-MISC metadata.xml 371 BLAKE2B d19be76b4ad2e2001f890c52fa894b50dd3fb63de95eb8b1a36666efe3e087c4c66d33a4d9d369f1ef3bbbc9be59648d91859448da8cca1397da8dcaf8efc1fc SHA512 5ffa59cea45522f04e42a63fb486e8584f30d07ce5ab9c9d875cc7342d1ff99665db25585d924b3f5e25eff42e54c55a3e970cd9b88b32a1112066d9a8c214d8
+MISC metadata.xml 401 BLAKE2B 931e25a3d3febffc304151165b7573a1d3d6d1977ffb842dc25142083106f21e025ab8006757e97382e0287ee1240842e66ebbd44e6543382d08497559a6dd05 SHA512 4d7350199a900f6658f00ab900ba282cca1369248b03099ce0bce113bd33028893e7894605e035446d4c0d62f7231f05734fe19b6ebcf120d9e8ec6245053148
diff --git a/app-emulation/genymotion-bin/metadata.xml b/app-emulation/genymotion-bin/metadata.xml
index cc2aa77ecc42..a4f3061c46d6 100644
--- a/app-emulation/genymotion-bin/metadata.xml
+++ b/app-emulation/genymotion-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>fedeliallalinea@gmail.com</email>
 		<name>Marco Genasci</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/gxemul/Manifest b/app-emulation/gxemul/Manifest
index 7b487db67bdc..6deb75774a55 100644
--- a/app-emulation/gxemul/Manifest
+++ b/app-emulation/gxemul/Manifest
@@ -1,9 +1,5 @@
-AUX gxemul-0.6.0-fix-mkstemp-test.patch 384 BLAKE2B 35dd0ac35c1084f0abbff566ddf3233fd9b9fcb0c1224c5e70fc3df780102e5a1de3978893ed34ffc336d9d0e7eeacf590a9229d25c65fe257174adc706e42de SHA512 100c394683bfe340360a9c660aeccb39c40eba8c80511ef9929d0342fc7425a2bc1d8e001d8d9da5a16c439ad766fb7166c04662828e485520d501545c38bd54
-AUX gxemul-0.6.0-fix-mymkstemp.patch 253 BLAKE2B f25e1cace6f1c810b902f1d64a37bab72f6a108c6b5e9b1b49e200b6a4b454b5f42a4673e3544124b791036718bcb90e6da56d487b4f8c3cb81bd525b1afc26e SHA512 1f9093e61a0902651e67c1e6144191ca4eb33f28edccafb8f83f12b5a702aa56711165ac19c8e45192a47f393facfa60bcbfdd0014e911722d80953c16e83f7c
 AUX gxemul-0.6.0-gcc46.patch 418 BLAKE2B e098bc1d64a911e9f9c67dda43bf4a1249ac450d88217f92938b9662b72d5f33b75f419ad12630bb9c8638b6e6aed5bdb487eb9e861f9d6563ed3a2d0d98f6a6 SHA512 0652b82645c75a56b24ed88e3cd9d68bdbbd927e64819aae22d61614db520dcb4fa8b9eab06b2ccd5c01f78d20008c587f3245c520b9bde0cafbc5cfdf3083c1
 AUX gxemul-0.6.0-no-doxygen.patch 516 BLAKE2B 31a6fd2037bb2d69be439adbb6a907bc143f39cb682c33d355f5a43ab77e5636ab6c534ae06e303463166099ef22747e2cb54dc74ddef2a1b0876236571c84bd SHA512 f8672505817e9634dc574ed9eb5bfe738c3ada0e86d29b67dd03ba0458b49f7af9d10511882e5473713ec77e43b94c3c55ac4962e7335179ffb3e567ba41681c
-DIST gxemul-0.6.0.tar.gz 3598795 BLAKE2B 01bab252b8497379cc819899d9030fd267cf7679a90a421f435c6cb9ce84fedbdbd0ff23a11e0c91a17e41e166488562b4e173b3793cdbc2dd53b70701351429 SHA512 38108c7e4f1332bf80046a63e4a7c5e0fbce7f83a62fdeaa4518ef02947d7de83aac20b0307d286b7eb5d9c721b8400d449d4f244b2bc9358a2502fa21f56b73
 DIST gxemul-0.6.2.tar.gz 5897883 BLAKE2B 9f5b76d955dc3e1a5b1623aaf491f18376456f33cfaa6a4c1633480980c35bb99172075135cfc1ca942ae3b0f34c4eb11c4aec4bc00272da8bb905176ddcea4a SHA512 4f389c509f9ecf39603ceed50e899e2bee285d3fefac9b3214076115ee71b5a7a68d1d92690b6debc8de5cf5f0303da83b3cc921a5c0b5eb4c7ad89baa730b59
-EBUILD gxemul-0.6.0-r1.ebuild 1078 BLAKE2B b136ac099a9a890b406f79234ab7899f567f2f0170cd377716323f3bd26a84ef422b7310df8495934143ab80af29992dc586f03c868727a265a4aa98fbab64be SHA512 a71fdf46aaa05a4727a374806a0f851b499bd41a7a2ca8a38fb31f57445dccd1acdaf7064b1f3d0d6935b8a1f5fb915ce0a9754d06da956b4cf0ff6077793495
 EBUILD gxemul-0.6.2.ebuild 969 BLAKE2B 4e47fea1b32b6c22e9b32e3ce03bfac77ae50db7b791c70b43c5b2d5c4bda7d7f5d24f95b0236cc3912676fd81c410255e1fc31ac95c653d67206f74e1a85db7 SHA512 4be52a5a04d8824dfb12e5e962a2c3c9d46417460d7c747f9417fec8ba284ebf654d343ff61d1206e17aef70bc09f7b6322eef70b078a251580187c323bfd38f
 MISC metadata.xml 422 BLAKE2B fafd4fe4407522b0d25cdd546c636eba02a245ccb86ec2affa49f479c069cd73aa677f524fd73e41c441f10fd759d96c82157b9a1f8d7fc3ff715fe35e1dc637 SHA512 78942cda34c7b5fe85d937f517846730a76c2b52688a871c683630c122db7fb4ae8db2fbc8a03fa06218e2c3d18ffc406692f81b021ae5613a818feefa54513a
diff --git a/app-emulation/gxemul/files/gxemul-0.6.0-fix-mkstemp-test.patch b/app-emulation/gxemul/files/gxemul-0.6.0-fix-mkstemp-test.patch
deleted file mode 100644
index cf8b18379cd4..000000000000
--- a/app-emulation/gxemul/files/gxemul-0.6.0-fix-mkstemp-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure	2012-11-03 09:08:09.373041529 +0000
-+++ b/configure	2012-11-03 09:08:31.999585979 +0000
-@@ -705,6 +705,7 @@
- #  mkstemp missing?
- printf "checking for mkstemp... "
- printf "#include <unistd.h>
-+#include <stdlib.h>
- int main(int argc, char *argv[]) { int x; char *y = \"abc\";
- x = mkstemp(y); return 0;}\n" > _tests.cc
- $CXX $CXXFLAGS _tests.cc -o _tests 2> /dev/null
diff --git a/app-emulation/gxemul/files/gxemul-0.6.0-fix-mymkstemp.patch b/app-emulation/gxemul/files/gxemul-0.6.0-fix-mymkstemp.patch
deleted file mode 100644
index c9e21bcc4b33..000000000000
--- a/app-emulation/gxemul/files/gxemul-0.6.0-fix-mymkstemp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/old_main/misc.cc	2012-11-03 08:47:34.309732354 +0000
-+++ b/src/old_main/misc.cc	2012-11-03 08:47:02.096573614 +0000
-@@ -122,7 +122,7 @@
- 		p++;
- 	}
- 
--	h = open(templ, O_RDWR, 0600);
-+	h = open(templ, O_CREAT | O_RDWR, 0600);
- 	return h;
- }
- 
diff --git a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild b/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
deleted file mode 100644
index 2dd8d8087fa6..000000000000
--- a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Machine Emulator, Mainly emulates MIPS, but supports other CPU types"
-HOMEPAGE="http://gxemul.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/gxemul/GXemul/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-IUSE="debug X"
-
-RDEPEND="X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.0-gcc46.patch
-	"${FILESDIR}"/${P}-fix-mymkstemp.patch # Bug 441558
-	"${FILESDIR}"/${P}-fix-mkstemp-test.patch # Bug 441558
-	"${FILESDIR}"/${PN}-0.6.0-no-doxygen.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i configure -e 's|-O3||g' || die "sed configure"
-	tc-export CC CXX
-}
-
-src_configure() {
-	# no autotools
-	./configure \
-		--disable-valgrind \
-		$(use debug && echo --debug) \
-		$(use X || echo --disable-x) \
-	|| die "configure failed"
-}
-
-src_install() {
-	dobin gxemul
-	doman man/gxemul.1
-	dodoc HISTORY README
-	docinto html
-	dodoc -r doc/.
-}
diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest
index cac8678977d5..14177ed13a55 100644
--- a/app-emulation/img/Manifest
+++ b/app-emulation/img/Manifest
@@ -1,3 +1,3 @@
 DIST img-0.5.7.tar.gz 3875988 BLAKE2B dd8f13f6861eadc3a4c3d2d07ac826e53a8f3b83d66974717e9312c579967e0c9b57657c8fe6e86f03bb91fd7a82bc6d8d7d87a70be4dd85da10800d8909a51d SHA512 a42247c2ceac0ccfcc2cfd6a561a058855869f0219994cd8fa2bdd5092be17803057e4cb48a2d5277fdfded74dd06eb7c3c3db590fbde91502aebcaf593ddef7
 EBUILD img-0.5.7-r1.ebuild 866 BLAKE2B 10d5041a3b379840b8675490a7abf54e5dc9c437e5d9424e4f3dab670fc5df138f1f768afb18391e2ee6ae966134f05ad5c956a917337b01f305e9aa93f7a946 SHA512 e5f07e98f8bced65cdecebc1a0b827c47ddeecbcf45963202638ac71b7b13a28ded8b3c2b31d19a87395f37e5a1cb406185d3d313959601c817052b836a3f6e1
-MISC metadata.xml 442 BLAKE2B 9eabfb5043d4b0c579254b497e4fe9252068eef479dc238307a1b69fb395491c7802d9792325f38876ef3ec280d7879a7a06dd1523635c9873565576b1a8edb7 SHA512 3f8d4c2c15806151513d588239dfd365fa1857fd8eb296e460fbc78d31aa2c3488b4da1cfeb32d91fa1a20bc957506954db632142d99b0382b1883d23f7cd492
+MISC metadata.xml 472 BLAKE2B ccd549b95101a4b10d02707afc8b6bee66c948632ee71b0dd9bbe35f3c3271e52bd84490e9e026f136d48695bd289648fb6c34b0cb5740a1f567fb6861adf47a SHA512 64b113d79de20d1088e16e6bc4997cfcc907ee5329e7821101b9ffcd001b5174392398e83094eeb23bef8bb4fe6b8a7bdb960f58de48fa433bda21280ca22c99
diff --git a/app-emulation/img/metadata.xml b/app-emulation/img/metadata.xml
index 236a80be46df..f4763669e4da 100644
--- a/app-emulation/img/metadata.xml
+++ b/app-emulation/img/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>email@linxon.ru</email>
 		<name>Yury Martynov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 794338aef128..46d899231f5b 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -1,20 +1,5 @@
-AUX 1.28/0000_bug_499150.patch 406 BLAKE2B 99ecdc6e98e9153f9939ea0318d7afc9cf852e8a575e5ff6731e2be272574510bdef1225303d131c099df5b39702b6cd7f141ec5ddcbeb2722c9cb7b6b63e080 SHA512 a131e49f9e9d3cf6080e0f3ad27805572a1e05a01f348a1ffad62b75d24cb72526bf68035b9a600fb1ae3864e813768a971c6b7d6f31f4a8467b4a6839ebb568
-AUX 1.28/0001_add_gentoo_names_to_configure.patch 262 BLAKE2B 13851f2abc4c979c337120d604e325a8a4bee77ebfb720456fb6e38255ccbca81f11b783d9aa9433842d44c4d1a6811310fd72c58ad99aeb79fdbd3a970c138f SHA512 9e6ef0c0475c5b180bc0ca7ded197901e25383e0359c429514e9c0217b7059d5f900a19d30d7d864a386279be0fd45bd9d41c56062b48c11dff31a8f92c5b789
-AUX 1.28/0002_add_gentooway_to_remove_la_files.patch 555 BLAKE2B 067ac24e6aa1a8b0df80378054f420660938cb9a2bbdc1cf3c00e9c74ba36f0add71e8c7b95776b2d965aa06c5feabd0ce4115c5ffeff3f5a78828f2ecb162ab SHA512 5dd8f7a8eeed6e2e4e842cd9fb5fde5104ab47bfddcbe218107e181c3891350eb425648667c4d70becb437bbf52506035b20778ea3a7954f020e4a2be76f959b
-AUX 1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch 508 BLAKE2B fd04c471a1eae62c0e3151ecb96dc540cae744e3eee85daf2eaeaa18515b6fead7f087757bfc46ab293865c6af73e745ab57e16934979c6ece95f4178ef74e48 SHA512 9801326dfd2fd39202f8bd0765b954c3947e829d9568bda9a50c14388b9e7d6855c2fd38976fe98cd1183163d220b3795ec1105becb49a9de34459bb2ea74112
-AUX 1.28/0103_disable_php_bindings_makefile.patch 231 BLAKE2B b86d1fb1d8b3fa45f9b2470f72e04737c105108ab8bbcb0be00437aee05931ee229228573a4d1f7388d1d754bb4c50d61c13c08f7876a9f52fc63f7803499667 SHA512 b359cd29ab9cb6edec5a4cab1d84b022ae6ff42c3adae75051ab0d8c87dda39fff17e02ada3a863177e3dd979dffd4958cbc3c71cdca89196c74f1ebd14a8da3
-AUX 1.36/0001-Update-libtool-initialization.patch 984 BLAKE2B afe8906c51c300493deec5a423b85634787e8dfe47841bd8d0c31eface0e40ac55698ca269f373381623ddd8d414241bc8775164ba43607a48cef1abed4d156d SHA512 c1d72b214d2ae5d1ecebc9333e1926d475d84c992af22379d3eb94f1ce5dbd0444b4f24d757de038d0b941d3f720d13e53837b0655019cb82c136622bca7496c
-AUX 1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch 725 BLAKE2B da5d03d8ba09577e30a954212a56ba1c182956cea00a290c380240e91aedf9c8b224d461c14b23d85eacc557b7c4600deb8dfd6cdc72355bd947087e2996c8ad SHA512 89f4375aef8f025b4cc1271f92d33a58927a13d05167c14c02fa48849bbe7283af684ea0e63632c7f7b8b04c9be463d29c07e65ca52b606283c1e0270c4db167
-AUX 1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch 1069 BLAKE2B 40838bbaa344984558de1f7281057f26905e3715ef4675e168c85afe5d0f9161547f1816c543bcd37a2e586e3390bfe2950b0e087a8ca1312e543e454cf001f8 SHA512 850df31f977a242bf9b314c7daef9481fa1f886389087b724de1643b57c70c6ec36296a141d3d63858bcd8602370c874d301d71a8e46920c6f7f809bdd26e6f9
-AUX 1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch 1168 BLAKE2B 50cf3ece759e8089d90f95e233c4a1a52ffd20f32a75e24e239e441163fc4d5ef852be3b347575e3285d5969ef7eed98f67340c190f423c2ec356d52a7c60629 SHA512 8c45fb951ceecfc67bcbb426a1bd37bfd31981bde2b8235c1508ccf4eb3a1a44627beffc824a3cff333a40a425da17ef77962b5ea9c1a875acb6adf0d47e8931
-AUX 1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2B 8062f548097fbcdb1c2cba45553eb22d315e618379d3fab8b87ee9c269c6e8de849de81511c6e9ed0aa1023a9ff31131b2ba507a0b1602e7485e192398fa3151 SHA512 a7cf03794c01b4386f7b78762381d17a37bf0abcf65800751126093b335f2e2dbde95f5016c9fc6813d8465370a96018c4aab6f9613104430d04b94a39b78ced
 AUX 1.38/0001-Fix-install-failure-when-not-built-with-OCaml-suppor.patch 1149 BLAKE2B 7b9f870370a3ff32cb9ae7ca75cad885c442d322b695349efa238dd27709e890d98bc1c4a093446a4ad3eacf6e1ac55057a4a4b757a5e5520d2df315bbac3a8d SHA512 83cee02636508ce674688584095954d90e1830d85d869a9c9bea73bbf5193da980116313ebc8726dce7708d464bca0f647c3738b36197d5e78adf398b2608d57
 AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2B b73cba74867f37ee3e640311a885ab46ae952fa9322469cb636a27da23e69762800f7d867273d1c9b439444d759c386877044bbc3ceb42dde96de9ffc942fcb5 SHA512 331e724a8978af2a608eb86fbf3744d0d97208a73c43ab919286369ade836b9d1f571b8990a1b92b68ebe01d6c9040e2293426a1c49de4e6a11ab1c60013de23
-DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb
-DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7
 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
-EBUILD libguestfs-1.36.13-r2.ebuild 4068 BLAKE2B e1ed4bed7e91b15ef764e02b9ea0b57f4445a15b42acb61c40e6713e2eca18159cfee126969089afd02d945564d778e3cdb4d94f50bd41d252073ee07159a79b SHA512 045a24d92a43ff064c70f7050264ff7187c838912da4852fe717edcfec820e864529cb1e0b81f5f5362b31604c1516d8665051a8070f34ce74f7bc9a97ab1f30
-EBUILD libguestfs-1.36.15-r2.ebuild 4272 BLAKE2B 4faaff876e59c79077f9222d3560f60443e11599c0862f25fdcada21a2e6ea6342a93b8cf8a228bf8f8bfdc9de0387724baa4ab8c2755f3690892331866dea71 SHA512 a04d6cc9d2a8c66979fae3e73ab292a9e3c5d0b958f3856411d57ed7928393acda8320faf3306a7a1bebd83231fab303cef67b9ead14ea8fb7782e17f1ef0559
-EBUILD libguestfs-1.38.6-r1.ebuild 3984 BLAKE2B 613029ed271bc50e83c1e25c7045ff433cdc1332d2f9ed09b191352b43268597955d6392245bb25dded3955c2e900b19c4526f0070baa70cc62bdb7bd1666d38 SHA512 00a7bea64c8e628b154c5d746f95c9d5830e23ea4709a4767758518e07192b66aaef5112a350769973c0d11992f38e18731f22464d7efc829d7f5983eddf7749
-EBUILD libguestfs-1.38.6-r102.ebuild 4259 BLAKE2B a3d079eb6f7669ffecfbfaeee4dc82ed7e4bcf3bd7f98185fb89696f076f1d2ae45a9fd6bd61edcc0939d417ca7e57172ac4c469d18addeb44f4eee60043977c SHA512 30af5d7d291555455b7a56061521a66e6cdbd6d011f030e0cc72ff7c6eea409517c711892a75284061eec1afc9913809c1bf5b7826a55718f5d22d2ea2aab5e1
+EBUILD libguestfs-1.38.6-r103.ebuild 4500 BLAKE2B fd0a456bee5c143ff2e05208f5cfa4e9816bdc06ca93527c3ddfa43140c532067056c5800f1a1db397f9c29b16aaac07a3e16fe04c647fe6e7066aac52aae148 SHA512 3c4fa805e1e55dda3e53db238c08e8bb509b655d7542be7617258bb3ad5f8214659317860454925da1a2b8d2db3682a29fb8efe46c455881c55e1611d957257b
 MISC metadata.xml 775 BLAKE2B a07bce73924d205f7c34b2951453745eb9dc022e9fe05729fcb7a2f2a30bcc298172cc5839479e78421427e40ad61b7c47586f4113933bf99edd59edcd23c7e5 SHA512 38f7c789ecedcb40c34f64ba9231a5706506b1ac52acb35757b3f51f954ce768b8958525d4343520e0c1b6560fc4cb9ac4a898010598c149cc661e1f5f151964
diff --git a/app-emulation/libguestfs/files/1.28/0000_bug_499150.patch b/app-emulation/libguestfs/files/1.28/0000_bug_499150.patch
deleted file mode 100644
index 1e0f1a32185e..000000000000
--- a/app-emulation/libguestfs/files/1.28/0000_bug_499150.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac	2014-01-24 19:04:05.633056872 +0100
-+++ b/configure.ac	2014-01-24 19:04:34.685691757 +0100
-@@ -24,6 +24,7 @@
- 
- AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
- AC_CONFIG_AUX_DIR([build-aux])
-+AM_GNU_GETTEXT_VERSION(0.18.3)
- 
- dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
- dnl gives an error if it sees this, but for automake >= 1.13
diff --git a/app-emulation/libguestfs/files/1.28/0001_add_gentoo_names_to_configure.patch b/app-emulation/libguestfs/files/1.28/0001_add_gentoo_names_to_configure.patch
deleted file mode 100644
index 9d209ff53584..000000000000
--- a/app-emulation/libguestfs/files/1.28/0001_add_gentoo_names_to_configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -482,6 +482,11 @@
-         DISTRO=UBUNTU
-     fi
- fi
-+
-+if test -f /etc/gentoo-release; then
-+    DISTRO=GENTOO
-+fi
-+
- if test -f /etc/arch-release; then
-     DISTRO=ARCHLINUX
- fi
diff --git a/app-emulation/libguestfs/files/1.28/0002_add_gentooway_to_remove_la_files.patch b/app-emulation/libguestfs/files/1.28/0002_add_gentooway_to_remove_la_files.patch
deleted file mode 100644
index 38a591b811ed..000000000000
--- a/app-emulation/libguestfs/files/1.28/0002_add_gentooway_to_remove_la_files.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -1487,8 +1487,10 @@
- 
- dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
- dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
--LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
--AC_SUBST([LIBTOOL])
-+dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
-+dnl AC_SUBST([LIBTOOL])
-+LT_INIT
-+
- 
- dnl Produce output files.
- AC_CONFIG_HEADERS([config.h])
diff --git a/app-emulation/libguestfs/files/1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch b/app-emulation/libguestfs/files/1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
deleted file mode 100644
index 69b3ae6d0d2d..000000000000
--- a/app-emulation/libguestfs/files/1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -1491,11 +1491,12 @@
- ])
- 
- # check for gtk-doc
--m4_ifdef([GTK_DOC_CHECK], [
--    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
--],[
--    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
--])
-+#m4_ifdef([GTK_DOC_CHECK], [
-+#    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-+#],[
-+#    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
-+#])
-+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
- 
- dnl Library versioning.
- MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
diff --git a/app-emulation/libguestfs/files/1.28/0103_disable_php_bindings_makefile.patch b/app-emulation/libguestfs/files/1.28/0103_disable_php_bindings_makefile.patch
deleted file mode 100644
index 34ab42d27903..000000000000
--- a/app-emulation/libguestfs/files/1.28/0103_disable_php_bindings_makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -88,9 +88,6 @@
- if HAVE_HASKELL
- SUBDIRS += haskell
- endif
--if HAVE_PHP
--SUBDIRS += php
--endif
- if HAVE_ERLANG
- SUBDIRS += erlang erlang/examples
- endif
diff --git a/app-emulation/libguestfs/files/1.36/0001-Update-libtool-initialization.patch b/app-emulation/libguestfs/files/1.36/0001-Update-libtool-initialization.patch
deleted file mode 100644
index 24da76fbab5e..000000000000
--- a/app-emulation/libguestfs/files/1.36/0001-Update-libtool-initialization.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a5fd133e001bb62d13c47ebc392fbb696a513640 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
-Date: Wed, 30 Aug 2017 11:30:56 +0200
-Subject: [PATCH 1/3] Update libtool initialization
-
-Use the recommanded macro post libtool-2 release.
----
- m4/guestfs_misc.m4 | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/m4/guestfs_misc.m4 b/m4/guestfs_misc.m4
-index 5dce207d7..a2bb39c0d 100644
---- a/m4/guestfs_misc.m4
-+++ b/m4/guestfs_misc.m4
-@@ -17,10 +17,7 @@
- 
- dnl Miscellaneous configuration that doesn't fit anywhere else.
- 
--dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
--dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
--LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
--AC_SUBST([LIBTOOL])
-+LT_INIT
- 
- dnl Only build boot-analysis program on x86-64 and aarch64.  It
- dnl requires custom work to port to each architecture.
--- 
-2.14.1
-
diff --git a/app-emulation/libguestfs/files/1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch b/app-emulation/libguestfs/files/1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch
deleted file mode 100644
index bf265f718c73..000000000000
--- a/app-emulation/libguestfs/files/1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9c423cd2d24b6de924afc6e0d715594bb056288d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
-Date: Wed, 30 Aug 2017 11:27:50 +0200
-Subject: [PATCH 2/3] Add support for Gentoo in distribution detection
-
----
- m4/guestfs_appliance.m4 | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/m4/guestfs_appliance.m4 b/m4/guestfs_appliance.m4
-index 890b1999c..9b79e1a41 100644
---- a/m4/guestfs_appliance.m4
-+++ b/m4/guestfs_appliance.m4
-@@ -114,6 +114,8 @@ elif test -f /etc/frugalware-release; then
-     DISTRO=FRUGALWARE
- elif test -f /etc/mageia-release; then
-     DISTRO=MAGEIA
-+elif test -f /etc/gentoo-release; then
-+    DISTRO=GENTOO
- else
- dnl fallback option
-     DISTRO=REDHAT
--- 
-2.14.1
-
diff --git a/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch b/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch
deleted file mode 100644
index 093a53f11632..000000000000
--- a/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From dc35ce2ba774a9284360bfd6532acb527a2f73d7 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 7 Dec 2018 11:21:25 +0100
-Subject: [PATCH 3/4] Fix install failure when not built with OCaml support
-
-Makefile rules in po/ require builder/index-parse.c to be generated to
-allow translation utilities to work on it, however builder/ is
-completely masked behind OCaml conditional build even if some tools do
-not require it and proper guards are in place already.
-
-Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1614502
----
- Makefile.am | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 7eefacbeb..c0a68151f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -155,7 +155,6 @@ if HAVE_OCAML
- SUBDIRS += \
- 	mllib \
- 	customize \
--	builder builder/templates \
- 	get-kernel \
- 	resize \
- 	sparsify \
-@@ -169,6 +168,9 @@ SUBDIRS += dib
- endif
- endif
- 
-+# Tools mixed with more OCAML based tools
-+SUBDIRS += builder builder/templates
-+
- # Perl tools.
- if HAVE_TOOLS
- SUBDIRS += tools
--- 
-2.19.2
-
diff --git a/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch b/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch
deleted file mode 100644
index 087708db396a..000000000000
--- a/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9bfa78095f6090c377fb40970653d1105a343cb7 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
-Date: Wed, 30 Aug 2017 11:33:58 +0200
-Subject: [PATCH 3/3] Workaround autotools-utils detection of gtk-doc
-
----
- configure.ac          | 3 +++
- m4/guestfs_gobject.m4 | 7 -------
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 268e6a182..65f4231bc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -121,6 +121,9 @@ m4_include([m4/guestfs_lua.m4])
- m4_include([m4/guestfs_golang.m4])
- m4_include([m4/guestfs_gobject.m4])
- 
-+dnl check for gtk-doc
-+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-+
- dnl Bash completion.
- m4_include([m4/guestfs_bash_completion.m4])
- 
-diff --git a/m4/guestfs_gobject.m4 b/m4/guestfs_gobject.m4
-index 4b4eab80d..4304f7b00 100644
---- a/m4/guestfs_gobject.m4
-+++ b/m4/guestfs_gobject.m4
-@@ -59,10 +59,3 @@ m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [
- ],[
-     AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
- ])
--
--# check for gtk-doc
--m4_ifdef([GTK_DOC_CHECK], [
--    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
--],[
--    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
--])
--- 
-2.14.1
-
diff --git a/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch b/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch
deleted file mode 100644
index 9bce9b05b051..000000000000
--- a/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1f51b8ef921ad804022fc39b7465f9f731cbb6be Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 7 Dec 2018 12:14:15 +0100
-Subject: [PATCH 4/5] Loosen build time requirement on bash-completion
-
-Distributions might avoid pulling bash-completion during build as it is
-an optional feature and would only make sense at runtime anyway. Since
-this setting is well-known across a given distribution, allow them to
-provide the value and avoid the dependency.
----
- m4/guestfs_bash_completion.m4 | 21 ++++++++++-----------
- 1 file changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/m4/guestfs_bash_completion.m4 b/m4/guestfs_bash_completion.m4
-index 1f171b79d..9e877f6ab 100644
---- a/m4/guestfs_bash_completion.m4
-+++ b/m4/guestfs_bash_completion.m4
-@@ -16,14 +16,13 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
- dnl Bash completion.
--PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [
--    bash_completion=yes
--    AC_MSG_CHECKING([for bash-completions directory])
--    BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`"
--    AC_MSG_RESULT([$BASH_COMPLETIONS_DIR])
--    AC_SUBST([BASH_COMPLETIONS_DIR])
--],[
--    bash_completion=no
--    AC_MSG_WARN([bash-completion not installed])
--])
--AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"])
-+AC_ARG_WITH([bashcompletiondir],
-+        AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]),
-+        [],
-+        [AS_IF([$($PKG_CONFIG --exists bash-completion)], [
-+                with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)
-+        ] , [
-+                with_bashcompletiondir=${datadir}/bash-completion/completions
-+        ])])
-+AC_SUBST([BASH_COMPLETIONS_DIR], [$with_bashcompletiondir])
-+AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test -n "$with_bashcompletiondir"])
--- 
-2.19.2
-
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild
deleted file mode 100644
index da60a79915f1..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools linux-info perl-functions versionator
-
-MY_PV_1="$(get_version_component_range 1-2)"
-MY_PV_2="$(get_version_component_range 2)"
-[[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/"${MY_PV_1}""
-
-KEYWORDS="~amd64"
-IUSE="bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl ruby selinux static-libs systemtap test"
-RESTRICT="!test? ( test )"
-
-# Failures - doc
-# Failures - bash-completion, see GBZ #486306
-
-# FIXME: selinux support is automagic
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
-	app-arch/cpio
-	dev-lang/perl:=
-	app-cdr/cdrtools
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	app-emulation/libvirt
-	dev-libs/libxml2:2=
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.0.0
-	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
-	perl? (
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		virtual/perl-Getopt-Long
-		virtual/perl-Data-Dumper
-		dev-perl/libintl-perl
-		>=app-misc/hivex-1.3.1[perl?]
-		dev-perl/String-ShellQuote
-	)
-	fuse? ( sys-fs/fuse:= )
-	introspection? (
-		>=dev-libs/glib-2.26:2
-		>=dev-libs/gobject-introspection-1.30.0:=
-		dev-libs/gjs
-	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? (
-		>=dev-lang/ocaml-4.02:=[ocamlopt]
-		dev-ml/findlib[ocamlopt]
-		|| (
-			<dev-ml/ocaml-gettext-0.4.2
-			dev-ml/ocaml-gettext-stub[ocamlopt]
-		)
-		>=dev-ml/ounit-2[ocamlopt]
-	)
-	erlang? ( dev-lang/erlang )
-	inspect-icons? (
-		media-libs/netpbm
-		media-gfx/icoutils
-	)
-	virtual/acl
-	sys-libs/libcap
-	lua? ( dev-lang/lua:0= )
-	>=app-shells/bash-completion-2.0
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
-	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	doc? ( app-text/po4a )
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-	"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-pkg_setup() {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${MY_PV_1}/0001-Update-libtool-initialization.patch
-	eapply "${FILESDIR}"/${MY_PV_1}/0002-Add-support-for-Gentoo-in-distribution-detection.patch
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	econf \
-		--with-libvirt \
-		--with-default-backend=libvirt \
-		--disable-appliance \
-		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		--disable-python \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
-		--disable-haskell \
-		--disable-golang \
-		$(use_enable introspection gobject) \
-		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable systemtap probes) \
-		$(use_enable lua) \
-		--with-gtk=$(usex gtk 3 no) \
-		$(usex doc '' PO4A=no)
-}
-
-src_install() {
-	strip-linguas -i po
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-
-	use perl && perl_delete_localpod
-}
-
-pkg_postinst() {
-	if ! use gtk ; then
-		einfo "virt-p2v NOT installed"
-	fi
-	if ! use ocaml ; then
-		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
-	fi
-	if ! use perl ; then
-		einfo "Perl based tools NOT build"
-	fi
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
deleted file mode 100644
index ed267915f05c..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions xdg-utils
-
-MY_PV_1="$(ver_cut 1-2)"
-MY_PV_2="$(ver_cut 2)"
-[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/"${MY_PV_1}""
-
-KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
-RESTRICT="!test? ( test )"
-
-# Failures - doc
-
-# FIXME: selinux support is automagic
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
-	app-arch/cpio
-	dev-lang/perl:=
-	app-cdr/cdrtools
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	libvirt? ( app-emulation/libvirt )
-	dev-libs/libxml2:2=
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.0.0
-	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
-	perl? (
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		virtual/perl-Getopt-Long
-		virtual/perl-Data-Dumper
-		dev-perl/libintl-perl
-		>=app-misc/hivex-1.3.1[perl?]
-		dev-perl/String-ShellQuote
-	)
-	fuse? ( sys-fs/fuse:= )
-	introspection? (
-		>=dev-libs/glib-2.26:2
-		>=dev-libs/gobject-introspection-1.30.0:=
-	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? (
-		>=dev-lang/ocaml-4.02:=[ocamlopt]
-		dev-ml/findlib[ocamlopt]
-		|| (
-			<dev-ml/ocaml-gettext-0.4.2
-			dev-ml/ocaml-gettext-stub[ocamlopt]
-		)
-		>=dev-ml/ounit-2[ocamlopt]
-	)
-	erlang? ( dev-lang/erlang )
-	inspect-icons? (
-		media-libs/netpbm
-		media-gfx/icoutils
-	)
-	virtual/acl
-	sys-libs/libcap
-	lua? ( dev-lang/lua:0= )
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
-	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	doc? ( app-text/po4a )
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	test? ( introspection? ( dev-libs/gjs ) )
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-	"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${MY_PV_1}/0001-Update-libtool-initialization.patch
-	"${FILESDIR}"/${MY_PV_1}/0002-Add-support-for-Gentoo-in-distribution-detection.patch
-	"${FILESDIR}"/${MY_PV_1}/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch
-	"${FILESDIR}"/${MY_PV_1}/0004-Loosen-build-time-requirement-on-bash-completion.patch
-)
-
-pkg_setup() {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	eautoreconf
-}
-
-src_configure() {
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	econf \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		$(use_with libvirt) \
-		--disable-appliance \
-		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		--disable-python \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
-		--disable-haskell \
-		--disable-golang \
-		$(use_enable introspection gobject) \
-		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap probes) \
-		$(use_enable lua) \
-		--with-gtk=$(usex gtk 3 no) \
-		$(usex doc '' PO4A=no)
-}
-
-src_install() {
-	strip-linguas -i po
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-	find "${ED}" -name '*.la' -delete || die
-	use perl && perl_delete_localpod
-}
-
-pkg_postinst() {
-	if ! use gtk ; then
-		einfo "virt-p2v NOT installed"
-	fi
-	if ! use ocaml ; then
-		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
-	fi
-	if ! use perl ; then
-		einfo "Perl based tools NOT build"
-	fi
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
deleted file mode 100644
index b522fb1d4797..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions xdg-utils
-
-MY_PV_1="$(ver_cut 1-2)"
-MY_PV_2="$(ver_cut 2)"
-[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/"${MY_PV_1}""
-
-KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
-RESTRICT="!test? ( test )"
-
-# Failures - doc
-
-# FIXME: selinux support is automagic
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
-	app-arch/cpio
-	dev-lang/perl:=
-	app-cdr/cdrtools
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	libvirt? ( app-emulation/libvirt )
-	dev-libs/libxml2:2=
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.8.0
-	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
-	perl? (
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		virtual/perl-Getopt-Long
-		virtual/perl-Data-Dumper
-		dev-perl/libintl-perl
-		>=app-misc/hivex-1.3.1[perl?]
-		dev-perl/String-ShellQuote
-	)
-	fuse? ( sys-fs/fuse:= )
-	introspection? (
-		>=dev-libs/glib-2.26:2
-		>=dev-libs/gobject-introspection-1.30.0:=
-	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
-	erlang? ( dev-lang/erlang )
-	inspect-icons? (
-		media-libs/netpbm
-		media-gfx/icoutils
-	)
-	virtual/acl
-	sys-libs/libcap
-	lua? ( dev-lang/lua:0= )
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
-	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	>=dev-lang/ocaml-4.03[ocamlopt]
-	dev-ml/findlib[ocamlopt]
-	|| (
-		<dev-ml/ocaml-gettext-0.4.2
-		dev-ml/ocaml-gettext-stub
-	)
-	>=dev-ml/ounit-2
-	doc? ( app-text/po4a )
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	test? ( introspection? ( dev-libs/gjs ) )
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-	"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${MY_PV_1}/
-)
-
-pkg_setup() {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	eautoreconf
-}
-
-src_configure() {
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	econf \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		$(use_with libvirt) \
-		--disable-appliance \
-		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		--disable-python \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
-		--disable-haskell \
-		--disable-golang \
-		$(use_enable introspection gobject) \
-		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap probes) \
-		$(use_enable lua) \
-		--with-gtk=$(usex gtk 3 no) \
-		$(usex doc '' PO4A=no)
-}
-
-src_install() {
-	strip-linguas -i po
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-	find "${ED}" -name '*.la' -delete || die
-	use perl && perl_delete_localpod
-}
-
-pkg_postinst() {
-	if ! use gtk ; then
-		einfo "virt-p2v NOT installed"
-	fi
-	if ! use ocaml ; then
-		einfo "Ocaml based tools and bindings (sysprep, ...) NOT installed"
-	fi
-	if ! use perl ; then
-		einfo "Perl based tools NOT build"
-	fi
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
index 9e213a0a9410..718edf8e60d5 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
@@ -4,8 +4,9 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions xdg-utils
+inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions python-single-r1 xdg-utils flag-o-matic
 
 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
@@ -19,10 +20,11 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 
 KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
+IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 # Failures - doc
 
@@ -59,6 +61,7 @@ COMMON_DEPEND="
 		>=app-misc/hivex-1.3.1[perl?]
 		dev-perl/String-ShellQuote
 	)
+	python? ( ${PYTHON_DEPS} )
 	fuse? ( sys-fs/fuse:= )
 	introspection? (
 		>=dev-libs/glib-2.26:2
@@ -94,7 +97,7 @@ DEPEND="${COMMON_DEPEND}
 		<dev-ml/ocaml-gettext-0.4.2
 		dev-ml/ocaml-gettext-stub[ocamlopt]
 	)
-	>=dev-ml/ounit-2[ocamlopt]
+	dev-ml/ounit2[ocamlopt]
 	doc? ( app-text/po4a )
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
 	test? ( introspection? ( dev-libs/gjs ) )
@@ -117,6 +120,7 @@ pkg_setup() {
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
 
 		use lua && lua-single_pkg_setup
+		use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -134,6 +138,9 @@ src_configure() {
 	# configured kernel.
 	export vmchannel_test=no
 
+	# bug #703118
+	append-ldflags "-L/usr/$(get_libdir)/xcrypt"
+
 	econf \
 		--with-bashcompletiondir="$(get_bashcompdir)" \
 		$(use_with libvirt) \
@@ -142,7 +149,7 @@ src_configure() {
 		--with-extra="-gentoo" \
 		--with-readline \
 		--disable-php \
-		--disable-python \
+		$(use_enable python) \
 		--without-java \
 		$(use_enable perl) \
 		$(use_enable fuse) \
diff --git a/app-emulation/libspectrum/Manifest b/app-emulation/libspectrum/Manifest
index 848028824255..211443d31413 100644
--- a/app-emulation/libspectrum/Manifest
+++ b/app-emulation/libspectrum/Manifest
@@ -1,4 +1,6 @@
 AUX remove-local-prefix.patch 851 BLAKE2B 1e1b787c10499bfbeafca43b08f4cbd8c7525841c641a3fa1211822a7ec3e98b11c9925b1bd9cc8ac3b14e5d0625c34727a330e00f0e3aaf5aba1871a8810647 SHA512 bae42eec33ff2ae00547d8c649b8164fd5665b70e95b07f95cdcce41e342702de559c4b63d6ce95a97407d2e8012c7fe0142b923603c1c1d25b8978f29aaf7a3
 DIST libspectrum-1.4.4.tar.gz 568684 BLAKE2B b6ab4fc4173e7de9a7c3b14fda03420a56f02c5c590770158443bc37bee99a55dd3bdf6864f8ca33adb5ed59f4abd5c5b97736456ba2e6e6aaa2b49e07097cc4 SHA512 83bb9242010d49898531bb62e0d4d55439b0b6a548b57a7932f074429aca70cf252dfb195e9751384510b08c98bd6bc8eefd8cb3f82b0c8d07fa245ba66e9fe2
+DIST libspectrum-1.5.0.tar.gz 602354 BLAKE2B fc62437ececfe2c86b475efa512bf7aa7c5af182e16a00f75f77f78656fca01d46a71ac90b38008ff46e5fd0710b1c671b283d65544b5556d98e8c5b66525c35 SHA512 55f4cf623bc6c469a0fd80751ada694259d834c19d98400ba244aabf2ac21fed7cdd6de069d9ed7326e099bd3bd62c42cfb8a669b64ae002f90a52563fa2dcd1
 EBUILD libspectrum-1.4.4.ebuild 1040 BLAKE2B c66daea0426b3fbfc816255e49501a9e4162a25436c2dc35519b09e213980f75f3d691b198cc90574d319403f03477efb2ff256a9c9bef7290b65564ed7daa29 SHA512 cc20f0cb9bbfb3d34ba04c4d9a94a58cc14d53363b2a4f8536c0e1368066d3e5970e9a7cafc3f9d564f071b577e3df7e1c008a64168b98912f12208ce6ca9e99
-MISC metadata.xml 728 BLAKE2B 82be49422307c4d16f84303d43ad0f16af9c1b67380e7a5c79d8691acbb2af6f25a4be300f8753abc92d833723b1f65d88cec9471136f663067cc7ec90576fc6 SHA512 d1d2634e9b72b06ec8eef16451969e24b0291bad4ec1cc9368881bc28dca0f2afc3fe555dfd8c0fb41ab86c16e3dcf5ffcd45d2619d983e11604d2fed4fc1545
+EBUILD libspectrum-1.5.0.ebuild 1049 BLAKE2B 4cfc6b4d94b6bc7a403a95c4be47b5f6980f9b1f87721492f7af2a1378f90655559c2ca49fdbc6a4e6282e51c5c04655ad1578fac5ad712329e00fe13fbef837 SHA512 27e3724b0301efb057ea9ac166d873c78e2c739d590aca5d58c11ff9dcbc5935629d319ab3c1c1ccd34ff26b5d1eed318080c24004905acbbaa2f979d93dfcc0
+MISC metadata.xml 807 BLAKE2B b7480d37223342e7c77327d2dc33bf7debb5436ed2ef5a4633a28e9eb2c8def8b5b44c8c66117297de34129f44d8e43870c625839c02b8684f2801d4ca1b59a3 SHA512 95fed51c49f34cab69fafbc0d814aaa63c302d3443bf9bfefd18bc6bd57d337f0329de1eef0f5656dcf5741d7046b6eb64d780dea1a8d24a9c131dc05dd51503
diff --git a/app-emulation/libspectrum/libspectrum-1.5.0.ebuild b/app-emulation/libspectrum/libspectrum-1.5.0.ebuild
new file mode 100644
index 000000000000..aec492d2edec
--- /dev/null
+++ b/app-emulation/libspectrum/libspectrum-1.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Spectrum emulation library"
+HOMEPAGE="http://fuse-emulator.sourceforge.net/libspectrum.php"
+SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="audiofile bzip2 gcrypt zlib"
+
+RDEPEND="dev-libs/glib:2
+	audiofile? ( >=media-libs/audiofile-0.3.6 )
+	bzip2? ( >=app-arch/bzip2-1.0 )
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/remove-local-prefix.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_with audiofile libaudiofile)
+		$(use_with bzip2)
+		$(use_with gcrypt libgcrypt)
+		$(use_with zlib)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# check only builds test executable but doesn't run it
+	emake check
+	./test/test || die
+}
+
+src_install() {
+	default
+	dodoc doc/*.txt *.txt
+}
diff --git a/app-emulation/libspectrum/metadata.xml b/app-emulation/libspectrum/metadata.xml
index b24f12aa4850..b019c6b4ecf0 100644
--- a/app-emulation/libspectrum/metadata.xml
+++ b/app-emulation/libspectrum/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<longdescription>
 libspectrum is a library designed to make the input and output of some ZX
 Spectrum emulator files slightly easier. It is intended to be usable on Unix
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 62f679022013..105a06dcef1e 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -18,5 +18,5 @@ DIST libvirt-7.1.0.tar.xz 8645944 BLAKE2B 97a76091616b427fc64a6a3caf5d9b04d7b9ae
 EBUILD libvirt-6.8.0-r2.ebuild 8761 BLAKE2B dad229775b97a350f98e2aa20b99abf8032c89c61f464cc40f4470f89889365cab242befe4d5283f3788400b31176e444d52957d638e4e6a3ce0e9003b6b08f5 SHA512 d4d8d79508871a4ba632d134d71e49e15c069d1f249abc695ac398b0bed46331cd0253c41910773904c5d0ea854505c47bd1733a11fde15516776cf0e2757886
 EBUILD libvirt-7.0.0-r1.ebuild 8445 BLAKE2B 9ac249908c83fcfb03b370999afa4c95f83188cf759bf53f55ae7232930348d7174fd93af3ea957426ba44c59b93131c1a3e9f710e69b14473ea6fcc4994fdc5 SHA512 54ffce4674c9a22db3be9878073ba3695ff99cb3c6a9f68540832c9d1f2df2a81ee3e8c89a1805f79cc58b317c8c1496a91ab9f2875bd280967135ec0b131d88
 EBUILD libvirt-7.1.0.ebuild 8197 BLAKE2B a97c4c71f59730b6c145cae14bf546278d988b8b8b13dd130cebd3c0ec64f80c1247a6caa7e80bf4366f703febc2400fffda0e5593478cd83dc2f4a806407377 SHA512 a8bdb21b844f34450e96c2eaeedcb6c87ded9d43f7cceab623dfc64b747e2c74778e6a4ee3cfe8b62cf8f5fefd90384e0746a4a8384791b4b001a94fe9b0b6a7
-EBUILD libvirt-9999.ebuild 8260 BLAKE2B 8fc76c116b738f49b96880260a1b94662a3420ae138e48394d2c62700bddfa49f5817695d7456d25ba7e2823ac2e9a6af1db7fe5087c2e779bcf5f2b3c63db29 SHA512 e4ea3e8096f8052ce6edff1255005ce10251272d953c0aca1157af88e5582382e351c0457a5f5f2271b850e356137ffe8b7643c29cc872c9d55f58950f6b2058
+EBUILD libvirt-9999.ebuild 8262 BLAKE2B 9069a015ca49de444ddc06384c16834115488f6cbb40edb591dbcc7fbc63e30b101d9579a54616dd570f0d44e2b93702fef3b56f8382eff5dba84aa4b2753e4a SHA512 a06affe00355c1bdd0db8f7506636c927654817d622ed51196f253ab155bf3a29f6983accdd6f8654201b1f708e116308758765469ecec8097759bdf419c420f
 MISC metadata.xml 3568 BLAKE2B ea4e03121fbc3aca8af2d8e12b42fefc9954e8e38fd83b1014353dd83bceeae4e1ba65329b42fb19fc0d6a9aae7c9d16cf88817d4ea7cfe767c7ef5734b291f6 SHA512 4d691fecee1ddd161a67e3b18a6071d1f0f6e1dcc6ae8deb1a63d73ca9c6d86f5a879d8ab9e43397b7988d66a7df9be6f556a52ebfe8d886b1f03e89614cf073
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index d5252cac3d86..767580ad5f76 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -128,7 +128,6 @@ DEPEND="${BDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-6.7.0-doc-path.patch
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
 )
 
@@ -276,6 +275,7 @@ src_configure() {
 
 		--localstatedir="${EPREFIX}/var"
 		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 	)
 
 	meson_src_configure
diff --git a/app-emulation/metadata.xml b/app-emulation/metadata.xml
index 4b1893efa085..3fc882857e23 100644
--- a/app-emulation/metadata.xml
+++ b/app-emulation/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria app-emulation zawiera programy służące do emulacji.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index 34b8cffd7029..00aad1804837 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,6 +1,6 @@
 AUX protontricks-1.4.3_no-setuptools-scm.patch 1174 BLAKE2B 16ad14073457431d388e295d5004874a8b7bc74aa5762c3f4a950c35ad485d9dc60312acaa511541ff4f2d2e826c31e5c74d1f51d80721bb5ffaa23903714283 SHA512 99349a830eba3e248db3f67f5cd842764700fff51788db1fc649ba9dbef3f356c6ec4a66e4608a74eb67b919d53700b5c501e55a98f78e67e9c63e6f851aa18d
-DIST protontricks-1.4.1.tar.gz 31838 BLAKE2B b8c94a1b96fa7df14eaf1cc6d11cb96e43ae4e8c7bd232687a50cae9c79cf2d0e7864b1af0e1dc4cc20086952e1fcefeb16cb71a9c3a977f6feafad1b17d6857 SHA512 7635c9830afa3c64617514cd86edc7d7f9f33e6e81a1da995ec8bee70adc1cf8b5d9de92036c372134e408d735615b267b46a9afc9246f14ff161cb2ee1fc8f9
 DIST protontricks-1.4.3.tar.gz 43573 BLAKE2B 3a3050ba6e940182d81d98498a5558433ceaa4282f5a23fb93b3cfc299699381493eb2912c5f03bb6a8092be5c50b94bf7181208cda3d4c0f4c90c0f438f7f1b SHA512 7ca8c7c273d92f7c4526caaa8c9db6988c642913c33c6b6188d285d5cfbe30924533a9f024135865cdc1a25bd867ac00bd915b0a61417d17fe0e5ee451417e64
-EBUILD protontricks-1.4.1.ebuild 1413 BLAKE2B 95ebee3c6b4b1b68b72b5ba0eb3daf7b49baae9eb3c7c2f1f8de0781f17dfbb9b190c4c4751cf98520401e93529fe5b43734a76515138592cdc77f922e50bc8c SHA512 2c0d1a4b403313e4a14158319cf90ce4056d03685e082169452fb4424e1eca025305112c647a5b118ba2168ca035b9b0a53221e3a1a0411176c8c1d569e24ed3
+DIST protontricks-1.4.4.tar.gz 45204 BLAKE2B 3fc66acae79a39e8dc7a5d507e4abcdad24da13a03e10954b667769a801ac42addb55980e3de413e71ad5395e773b065f8f1dca2e694c835a07b8993b4fb5f0e SHA512 4c61da27e97f1b46150f2808c27d1fcf7394f2cc4f272eada54abc4fdd9229443405f7466d3a1ba5603e3c40a025dbbd8fde512334c6007a64687867625abc4c
 EBUILD protontricks-1.4.3.ebuild 1442 BLAKE2B a1656810ec6810c0899349e7a03835a45a92183799d0a39e4257c551208a4a589211127e6b3087d4a7c68024eebd6a54be841a13e6c25c1b0a51e0b755a1e90e SHA512 9b9a9d1de030e9e7e2574295e3ed054c90a36237c462024e2a8996082e088a903a535d27a8f45742345bba6edc84ee476d0639ff60e1411045ef165dfc4c6374
-MISC metadata.xml 784 BLAKE2B 37e795944e32ef3f17022efa4ad352e3ee2d1819f3e7ee4ccf02f2366156c999290b4b309c924f54dfde4a5ffc017628c36ead987da2101d2eb38c1eaa767e3e SHA512 6bccb95acbe4cf3b64b4734f98dc4495bd20df294efa0b628f08f4c2ee6bb6c5d103bd323ac29dddb02d2a7ff4ac88ccccdce8a8c01b856aef051eaae6cdb0ae
+EBUILD protontricks-1.4.4.ebuild 1443 BLAKE2B 8e618ffbeb08d2eacd054c034a7b56f4c737fca62bd9957cb8b25d052f3c1cc384e95923990f49a5aca2a7dbadf246cc393f4fc006af7a0d4d888f3eb303d58a SHA512 3c985a558ac8d63bf32a3d5754f78e207029e19a2d99fc7c5c09ebe272116338ec492d40e84df721f906a2a3798aeef4bae7ccdab794b4ddb6856e1276449728
+MISC metadata.xml 808 BLAKE2B 9abbb6d1689e04026c239dc2bde4a2d975bb260473178e68c0ec3e37a3e4c3e6db701ece9e8551d5ba071db14effc7e59a15a5e13c2049a6cd9d0709562bf709 SHA512 21452c10fe698d461aa814bc1bddb6350fcd8f60b7c84d8949f1eb8a1932ae3f9214c123451334ac2108f6ad930d5e6f5b522eac477ed6f6af1c916326254c32
diff --git a/app-emulation/protontricks/metadata.xml b/app-emulation/protontricks/metadata.xml
index e18d1ed94ac5..2e0c5e0f0e30 100644
--- a/app-emulation/protontricks/metadata.xml
+++ b/app-emulation/protontricks/metadata.xml
@@ -5,6 +5,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		A simple wrapper script that allows you to easily run Winetricks commands for Steam Play/Proton
 		games. This is often useful when a game requires closed-source runtime libraries that are not
diff --git a/app-emulation/protontricks/protontricks-1.4.1.ebuild b/app-emulation/protontricks/protontricks-1.4.4.ebuild
index 51ae82b968a3..8aa78e9acad1 100644
--- a/app-emulation/protontricks/protontricks-1.4.1.ebuild
+++ b/app-emulation/protontricks/protontricks-1.4.4.ebuild
@@ -1,31 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
-
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
+
 inherit distutils-r1
 
 DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
 HOMEPAGE="https://github.com/Matoking/protontricks"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/Matoking/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="+gui"
 
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	')"
-RDEPEND="${PYTHON_DEPS}
-	app-emulation/winetricks
+RDEPEND="app-emulation/winetricks
 	$(python_gen_cond_dep '
-		dev-python/vdf[${PYTHON_MULTI_USEDEP}]
+		dev-python/vdf[${PYTHON_USEDEP}]
 	')
 	gui? ( gnome-extra/zenity
 		|| (
@@ -34,11 +29,18 @@ RDEPEND="${PYTHON_DEPS}
 		)
 	)"
 
-# Tarballs from PyPI do not contain tests, and we cannot use GitHub releases
-# any more because they are incompatible with setuptools_scm.
-RESTRICT="test"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.3_no-setuptools-scm.patch
+)
 
-DOCS=(CHANGELOG.md README.md)
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	echo "version = '${PV}'" > "${S}"/src/${PN}/_version.py || die "Failed to generate the version file"
+}
 
 pkg_postinst() {
 	elog
diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest
index 51aa7d637170..491e38f9845f 100644
--- a/app-emulation/punes/Manifest
+++ b/app-emulation/punes/Manifest
@@ -1,4 +1,4 @@
 AUX punes-0.107_ffmpeg-configure.patch 798 BLAKE2B da041283394db3a436478025fe3c8f5919f368bf00a5947fc688110d86691e987a52653e21215e05aab9d9861e7346fb526031c560da363570e6aeba11e4255c SHA512 443ad57c8659597f1beab1e5bb0a560f053986a6021785e24107463aa2351c1d6e26ee760cb1ec4a9913d8e01002a31f41d21a0b878e8925a66f02a858cebaa6
 DIST punes-0.107.tar.gz 44024138 BLAKE2B 048df5bc9b019bafcd4eec75dc027de7cde9f8aa0d484ef96e5c41b091ba55c13b84ef7c7c36987b53206b1b7027758534479d0cc9fde63d89a48092c3f9d26d SHA512 eb3b7aa1c18765402e1e57e23dd4b019255320b795c0f578a4d5ae9f4e0c163613da07280e2a5abed80b9ba90e74c80b53b5fdd80e405103f0063ca55d0ee7bd
 EBUILD punes-0.107.ebuild 1241 BLAKE2B 5df5b93a315a152425c1bbeeb612b3a173d8682350d5b2f13740699752efeb9d96b99e57b578103e78b13edc3929344962dee8585a337fe5bc95bcdc036a39cc SHA512 149e4797185ae7d906ec4ef5ec29314eee21084829272379fdbf79d29519715d7e329174ef0485ab1a6448943e72781a2b6314b096a200ead2237e5a5138c2df
-MISC metadata.xml 529 BLAKE2B 41ca9104473edaf94faa28749d5705ccd3f0b0eae2ce6e421652ca025d6cf21e1094a9a36c9f787e1556f23ecb73d48c5f3b7784cffc082016307403136ce905 SHA512 6a4892f8f0ff213d87d98db48612b067a131dd6c59b0c4bbf78c098f9a33592ebbee8ef78674a812ef2b35d233c9dea52752aaca315ea0065c472a4c5c9732b1
+MISC metadata.xml 559 BLAKE2B 0bee86baa61da9ccf3c1abe82f11dd3a5d42c4b89e58513d240d28cc5e6ec10dda0b491333073bebb3892109208201fba75b068e6729b3712c23d693fc9fe7f1 SHA512 f20421313854d8df943cadae6621860eb58bec5506b3143fe714d7128191ed4316ce99d05ce00a3f0022832bac3ef92ddc66e0996b026ed70c78d8e3dd7fdc60
diff --git a/app-emulation/punes/metadata.xml b/app-emulation/punes/metadata.xml
index 23b1c9a0b21e..c02689e290f6 100644
--- a/app-emulation/punes/metadata.xml
+++ b/app-emulation/punes/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>azamat.hackimov@gmail.com</email>
 		<name>Azamat H. Hackimov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index c4cb90780387..90a84c8daffe 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -2,11 +2,6 @@ AUX 65-kvm.rules-r1 120 BLAKE2B a0d95f60e48f80e5f00b3a7ef3b520861fb781868844aff7
 AUX 65-kvm.rules-r2 204 BLAKE2B 71d062c1d4d0b619220da360b644a0961fc5adb619da379e80d84892ece9f365801dfc16bd358342557f32f18e2f47c507dd510c20bdbfcd5ae40b83b9def5a3 SHA512 0930e5fce6870eb20f48bde114d0b48ec87f80afa6a005f7e9c0ea84d3960f12d00b92f55c1304ffcc0c63a125c40af08d038cd179a76d6afe6e88e4d057724a
 AUX bridge.conf 454 BLAKE2B 2f3e828a001ac77de96c8a11e3fc462149e1c16972c28b8367659c2896b7c3dd147e978ef6401b280fc3474bc959bee50f65d7525bee8bc04c19bc657ba7e22f SHA512 a907ee86b81a1b61033bb7621ded65112504131ef7b698c53e4014b958ee6fc79e66f63069015a01e41362cb70a7d0ed26dd9a03033cf776f4846f0e1f8f1533
 AUX qemu-2.11.1-capstone_include_path.patch 264 BLAKE2B 955b498c0ea2657ee4c9d0054a32693ac2096232ae8358848fa8518bcb87c1cce5d9145ccf560320ba53d60ae8ed85f6be801b72707a964b247e8f1f1844f9cd SHA512 ebf1d6450b7c499a8e490b19f87a3b4f8bbc50ea44edaac8c12b0993947513a8b616af2d4cf6240c8e265824a44463f917333ffa510e6ffedf379921e28fc3ab
-AUX qemu-4.0.0-mkdir_systemtap.patch 333 BLAKE2B e7e35e7fe510e7e1a86005f3d51384a81d1de7705f3b856656ec71cc0a2a29626e94918b3cc23b32e47c8073b77b62b498e71c3e956549e25ee5f4da1a8ac9cf SHA512 de48a7d663bd78051ed8a1f62d8b0b8e3bfe58d8a0001daf12518dbd087be3154e766be11c607485e7dd851b08d5675c4fb2a2fe5cf18f3b900164a4d93eab10
-AUX qemu-4.2.0-cflags.patch 508 BLAKE2B 86724caca22a4bd2b21db306d04d8c0f6a542a15b82bb4e340f3ddb8471f47e854276ff33adee7bd5682ecb797efdb048e9d028d954a064712d1e817e1eb6e26 SHA512 5bfb8f0e739d7bb260b5b5b0a2d28f30b97833b8037227c511f55c9bd9502241c891e7e3780e750598ccfd7fb01615254f1c7f6634787fec67539a61a217e18d
-AUX qemu-5.1.0-pixman-for-vhost-user-gpu.patch 1788 BLAKE2B 9eddc15909cac5eb3357eb4e16921b8b51ba1107eaf272ce48e6f89705fa246ad3a8cd02abc534329671de3849f83a8515d22c39437961b5de25459f697d4600 SHA512 8df97af001e9d5c671da7ba1d651fae7ddca2f16337741ffa551227ae86bc627b6cbf37332beb0a6c9ee2444b7f40474804c4a7b79140d3e2b1dfe310a0b2502
-AUX qemu-5.1.0-usb-host-workaround-libusb-bug.patch 2625 BLAKE2B 273ba203e765866d91c592388eee695163c947b4b2f077354985e0ce18206ce018e3c223cc0eee5d02b8867e5615817979854039d472da958da2dd9df3e6bbe7 SHA512 b2143cf0c62db0462ceb0d2e5e9210706f27ac9216e2ee7e0a96ec66818e5a425e68463b3a0d167128b10e5bb4f04b16576c4ae050520690bda268de295b74f0
-AUX qemu-5.1.0-usb-oob-CVE-2020-14364.patch 3210 BLAKE2B f812f4bb18e540ebafeb9bf7e95423b48696b639c26525244e7d783eb5ef46453b263831b325b78b90bbb86a585e4f90a3b8ee9c379d52051a2c051891566363 SHA512 08f6fedba9e30eb00a31a0b73a6a7fe11dd215692064330bed5f5701479e1ef63a374460d04b843175b216aee0ca9fc25d8f52987f0680f244583dd8ad75b538
 AUX qemu-5.2.0-cleaner-werror.patch 884 BLAKE2B 95404f78f5559f5725c1978e7ef619675817bbe308cd636d6cd9fc43c5ed7440d826c4cb89165fbb275dae3840026b6391e8040b0d21d65120c34b7e41f844e7 SHA512 bdaf7c433c0f10a3666b4f06b680122e4a9bcf41382e50b3f3cb7b236134860ce91864d305282707068763f1521d61d47277579acdf778d6bd4312884eb04d43
 AUX qemu-5.2.0-disable-keymap.patch 884 BLAKE2B dbbe245a52615f8894cbac1c94ce3fee2051b1c54def32ec6ad43dedfe8190d02937c28ce93d93eeb13fe82f2ac2df52bec375501e83af53624d8292f8208fe3 SHA512 f84c6f37ce742201b63b308bef5fdaf1dc50e77e0dcf164e85284e338ed7bd861fc0e147fb88668b056ab0f15b4e6cbefbfb2cd2bafeb002c281ae88d08f9703
 AUX qemu-5.2.0-fix-firmware-path.patch 596 BLAKE2B f46890eaa22ac7f94725f5dec86ccabe78f002ef6e4ce6b8f3323362203783ae65f77442634520863abc7a5ed91639c6284ccb53f0ed4f87523c7e45e4a0f186 SHA512 9fe5ed5b72098b0c5b9f9b6ae371ac745de9e269f3713b47ac2bd13d2f03f0827128d43757876f83eeb770dbeeade32db5f10bc9f58d02ed929a45caa5f558ac
@@ -15,11 +10,9 @@ AUX qemu-5.2.0-strings.patch 799 BLAKE2B 8f249a647714a4a677d1aca5d8d5c19b27a0e19
 AUX qemu-9999-fix-firmware-path.patch 672 BLAKE2B 68849de377ed0134269b89fb3cb896fa42da75aa99aecfed75283b78073fed43dfbafb8bd9c3c0545ebcd943fe86410171f9933965646bb0f2ed901a0720bc6d SHA512 604e6865d206536287f7690179bf7c369e83646742feb9af2a1b46be809c19754e22c2bec430f35cf2e3ef0fc4929541e140d15ddff4a9579db5cf18a3bab1f7
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
-DIST qemu-5.1.0.tar.xz 62911540 BLAKE2B 6a3ecbda2d9274f2736ffbc88d2006be31f153e7687e1425c1a297975f0e828cd2eafc11d11b589991acda87a489dd256ccf5a8947f91bb9431e515e979d8f29 SHA512 e213edb71d93d5167ddce7546220ecb7b52a7778586a4f476f65bd1e510c9cfc6d1876238a7b501d9cc3fd31cc2ae4b7fb9e753bc3f12cc17cd16dfce2a96ba3
 DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
-EBUILD qemu-5.1.0-r3.ebuild 25432 BLAKE2B f12769a35b050372341beb39b8ec82c9ce7527c54d570ef612af433fbc7e75f9adacca8d6ab42aca68ff5abb58a67b3dea5f2d2204a78c4fb6052c1df897e9b6 SHA512 268ea9f2be68b022b93177e795f4ef7b6955f9cacd6185a9730e76ee2ef771902316d659f73c3de5bace9290c7e75f7fe9933f12e06d779f58c54883a5c94d06
 EBUILD qemu-5.2.0-r1.ebuild 25165 BLAKE2B 719c716e10dab3e845e15497eaace296318d29987efd8f6f8eb1f1ece9d82138c442c1bbb600516f8aaab2886c52caad69006d06bdff39cc90fe772810a9a9c7 SHA512 5be5db0d809ded76014ddd863915ccfb5d8dec0154c1bea2720d8e06a007f882cc6fdc451b18ce2db39b58dd8e3f3e501bd074edb4690a47c3c17bb3a070a46e
 EBUILD qemu-5.2.0-r2.ebuild 25346 BLAKE2B f24ae658c04435b88982aa96445ea6037c337125ddc8dcd1067f6bd5c142d5b6cc9c4035d9c62e849abbe9135115d53ad53f1c1ce23bb1b2c82e00ca19ebd253 SHA512 0f4b343844aee4942a491efc18893a5bc63545fad04c8c0583b51256fbd0be4b3a0f16281ab45877fe98f57cc77935fa8e6714bfc67928d5c583125569072ac9
 EBUILD qemu-5.2.0-r3.ebuild 25349 BLAKE2B 6e5d1270efbb846cab4b21aea6bc864ad9aa19059bb4a60e7ab120c9243b9db6ebd7e26364054f875438d511ef3ebb68e5f7c1bc6dcf5f9d302f374344a4af52 SHA512 64004e9efc5afc945f96f21ecb05241da109ee89bd265f54977f2fe3f3a9bba9c429eeaf5696ffc51201f07086cdaaa8ae1bc74886d80bd5a76baf3c55124b65
 EBUILD qemu-9999.ebuild 25305 BLAKE2B 1c4bda060af3bca672dc7df26b9deef8078217878e14cbe943224f1b52289a4091fe055af6eddcf5a810656af5f51efc1cc7a804313b30ffda5546840bc0b3ef SHA512 282ee0b547ce3c6d077ae32d23b02319f88650defbcfa92445c6d102d3c6e7e65880443b6334d7e32db8ec455f8c4100e52b39cdf640ded3baaece5090b632d8
-MISC metadata.xml 4458 BLAKE2B 522818589e668292cbb756008eba7c9f6e0fac36c8d777f0490a1f66cecf576760947a8d94cf03e22af9c9da1d57e25b533c62ee73e9a4fb6da01a6d25c5db03 SHA512 3e054a17a0c86b4ddec0407d44967954170bbb030cea20de6c6841c057bd7e5c2b1b9013e3c0951db9ee570edbd9e7c433e5e3893f7bd762d44b35f9a1fae7db
+MISC metadata.xml 4347 BLAKE2B c82480d51523c9f3c1d78a1eb4bfda0319b1f7e4c1576df7588fe87d7746554dc585e86ecc04d58b5f41e72f9233bfbccbc62bab20171202dabf308a2ca200d5 SHA512 a317c1a529336c0dee2e06709654d7aeb283e27d6bec1a335b3bda151ca255e5a2e5d25a940bee9aadbe0ee1c15cd9ac07248552b6156f4f3c31f06354d0e05d
diff --git a/app-emulation/qemu/files/qemu-4.0.0-mkdir_systemtap.patch b/app-emulation/qemu/files/qemu-4.0.0-mkdir_systemtap.patch
deleted file mode 100644
index 95ccdd7a4b1c..000000000000
--- a/app-emulation/qemu/files/qemu-4.0.0-mkdir_systemtap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 04a0d450..e0013a59 100644
---- a/Makefile
-+++ b/Makefile
-@@ -803,6 +802,7 @@
- 	$(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir))
- endif
- ifdef CONFIG_TRACE_SYSTEMTAP
-+	mkdir -p $(DESTDIR)$(bindir)
- 	$(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
- endif
- ifneq ($(BLOBS),)
diff --git a/app-emulation/qemu/files/qemu-4.2.0-cflags.patch b/app-emulation/qemu/files/qemu-4.2.0-cflags.patch
deleted file mode 100644
index 101926589a61..000000000000
--- a/app-emulation/qemu/files/qemu-4.2.0-cflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git i/configure w/configure
-index a72a5def57..546d757603 100755
---- i/configure
-+++ w/configure
-@@ -6093,10 +6093,6 @@ write_c_skeleton
- if test "$gcov" = "yes" ; then
-   QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
-   QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
--elif test "$fortify_source" = "yes" ; then
--  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
--elif test "$debug" = "no"; then
--  CFLAGS="-O2 $CFLAGS"
- fi
- 
- if test "$have_asan" = "yes"; then
-
diff --git a/app-emulation/qemu/files/qemu-5.1.0-pixman-for-vhost-user-gpu.patch b/app-emulation/qemu/files/qemu-5.1.0-pixman-for-vhost-user-gpu.patch
deleted file mode 100644
index 4eb644fde543..000000000000
--- a/app-emulation/qemu/files/qemu-5.1.0-pixman-for-vhost-user-gpu.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/735146
-
-From 4fd46e6cdd976f4aecdc3fbbad728e00a7bc4ee0 Mon Sep 17 00:00:00 2001
-From: Rafael Kitover <rkitover@gmail.com>
-Date: Thu, 13 Aug 2020 20:19:24 +0000
-Subject: [PATCH] configure: Require pixman for vhost-user-gpu.
-
-Use the test from Makefile to check if vhost-user-gpu is being built,
-and if so require pixman.
-
-Signed-off-by: Rafael Kitover <rkitover@gmail.com>
----
- configure | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
---- a/configure
-+++ b/configure
-@@ -4062,20 +4062,6 @@ if test "$modules" = yes; then
-     fi
- fi
- 
--##########################################
--# pixman support probe
--
--if test "$softmmu" = "no"; then
--  pixman_cflags=
--  pixman_libs=
--elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then
--  pixman_cflags=$($pkg_config --cflags pixman-1)
--  pixman_libs=$($pkg_config --libs pixman-1)
--else
--  error_exit "pixman >= 0.21.8 not present." \
--      "Please install the pixman devel package."
--fi
--
- ##########################################
- # libmpathpersist probe
- 
-@@ -4491,6 +4477,20 @@ if test "$opengl" = "yes" && test "$have_x11" = "yes"; then
-   done
- fi
- 
-+##########################################
-+# pixman support probe
-+
-+if test "$softmmu" = "no" && ! test "${linux} ${virglrenderer} ${gbm} ${want_tools}" = "yes yes yes yes";  then
-+  pixman_cflags=
-+  pixman_libs=
-+elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then
-+  pixman_cflags=$($pkg_config --cflags pixman-1)
-+  pixman_libs=$($pkg_config --libs pixman-1)
-+else
-+  error_exit "pixman >= 0.21.8 not present." \
-+      "Please install the pixman devel package."
-+fi
-+
- ##########################################
- # libxml2 probe
- if test "$libxml2" != "no" ; then
--- 
-2.28.0
-
diff --git a/app-emulation/qemu/files/qemu-5.1.0-usb-host-workaround-libusb-bug.patch b/app-emulation/qemu/files/qemu-5.1.0-usb-host-workaround-libusb-bug.patch
deleted file mode 100644
index 34a50a9bfb58..000000000000
--- a/app-emulation/qemu/files/qemu-5.1.0-usb-host-workaround-libusb-bug.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 202d69a715a4b1824dcd7ec1683d027ed2bae6d3 Mon Sep 17 00:00:00 2001
-Message-Id: <202d69a715a4b1824dcd7ec1683d027ed2bae6d3.1606202550.git.mprivozn@redhat.com>
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Mon, 24 Aug 2020 13:00:57 +0200
-Subject: [PATCH] usb-host: workaround libusb bug
-
-libusb_get_device_speed() does not work for
-libusb_wrap_sys_device() devices in v1.0.23.
-
-Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1871090
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Message-id: 20200824110057.32089-1-kraxel@redhat.com
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- hw/usb/host-libusb.c | 37 ++++++++++++++++++++++++++++++++++++-
- 1 file changed, 36 insertions(+), 1 deletion(-)
-
-diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
-index c474551d84..08604f787f 100644
---- a/hw/usb/host-libusb.c
-+++ b/hw/usb/host-libusb.c
-@@ -39,6 +39,11 @@
- #endif
- #include <libusb.h>
- 
-+#ifdef CONFIG_LINUX
-+#include <sys/ioctl.h>
-+#include <linux/usbdevice_fs.h>
-+#endif
-+
- #include "qapi/error.h"
- #include "migration/vmstate.h"
- #include "monitor/monitor.h"
-@@ -885,6 +890,7 @@ static void usb_host_ep_update(USBHostDevice *s)
- static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)
- {
-     USBDevice *udev = USB_DEVICE(s);
-+    int libusb_speed;
-     int bus_num = 0;
-     int addr = 0;
-     int rc;
-@@ -935,7 +941,36 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)
-     usb_ep_init(udev);
-     usb_host_ep_update(s);
- 
--    udev->speed     = speed_map[libusb_get_device_speed(dev)];
-+    libusb_speed = libusb_get_device_speed(dev);
-+#ifdef CONFIG_LINUX
-+    if (hostfd && libusb_speed == 0) {
-+        /*
-+         * Workaround libusb bug: libusb_get_device_speed() does not
-+         * work for libusb_wrap_sys_device() devices in v1.0.23.
-+         *
-+         * Speeds are defined in linux/usb/ch9.h, file not included
-+         * due to name conflicts.
-+         */
-+        int rc = ioctl(hostfd, USBDEVFS_GET_SPEED, NULL);
-+        switch (rc) {
-+        case 1: /* low */
-+            libusb_speed = LIBUSB_SPEED_LOW;
-+            break;
-+        case 2: /* full */
-+            libusb_speed = LIBUSB_SPEED_FULL;
-+            break;
-+        case 3: /* high */
-+        case 4: /* wireless */
-+            libusb_speed = LIBUSB_SPEED_HIGH;
-+            break;
-+        case 5: /* super */
-+        case 6: /* super plus */
-+            libusb_speed = LIBUSB_SPEED_SUPER;
-+            break;
-+        }
-+    }
-+#endif
-+    udev->speed = speed_map[libusb_speed];
-     usb_host_speed_compat(s);
- 
-     if (s->ddesc.iProduct) {
--- 
-2.26.2
-
diff --git a/app-emulation/qemu/files/qemu-5.1.0-usb-oob-CVE-2020-14364.patch b/app-emulation/qemu/files/qemu-5.1.0-usb-oob-CVE-2020-14364.patch
deleted file mode 100644
index d1d23ec6f0e5..000000000000
--- a/app-emulation/qemu/files/qemu-5.1.0-usb-oob-CVE-2020-14364.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://bugs.gentoo.org/743649
-
-From b946434f2659a182afc17e155be6791ebfb302eb Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Tue, 25 Aug 2020 07:36:36 +0200
-Subject: [PATCH] usb: fix setup_len init (CVE-2020-14364)
-
-Store calculated setup_len in a local variable, verify it, and only
-write it to the struct (USBDevice->setup_len) in case it passed the
-sanity checks.
-
-This prevents other code (do_token_{in,out} functions specifically)
-from working with invalid USBDevice->setup_len values and overrunning
-the USBDevice->setup_buf[] buffer.
-
-Fixes: CVE-2020-14364
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Tested-by: Gonglei <arei.gonglei@huawei.com>
-Reviewed-by: Li Qiang <liq3ea@gmail.com>
-Message-id: 20200825053636.29648-1-kraxel@redhat.com
----
- hw/usb/core.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/hw/usb/core.c b/hw/usb/core.c
-index 5abd128b6b..5234dcc73f 100644
---- a/hw/usb/core.c
-+++ b/hw/usb/core.c
-@@ -129,6 +129,7 @@ void usb_wakeup(USBEndpoint *ep, unsigned int stream)
- static void do_token_setup(USBDevice *s, USBPacket *p)
- {
-     int request, value, index;
-+    unsigned int setup_len;
- 
-     if (p->iov.size != 8) {
-         p->status = USB_RET_STALL;
-@@ -138,14 +139,15 @@ static void do_token_setup(USBDevice *s, USBPacket *p)
-     usb_packet_copy(p, s->setup_buf, p->iov.size);
-     s->setup_index = 0;
-     p->actual_length = 0;
--    s->setup_len   = (s->setup_buf[7] << 8) | s->setup_buf[6];
--    if (s->setup_len > sizeof(s->data_buf)) {
-+    setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6];
-+    if (setup_len > sizeof(s->data_buf)) {
-         fprintf(stderr,
-                 "usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n",
--                s->setup_len, sizeof(s->data_buf));
-+                setup_len, sizeof(s->data_buf));
-         p->status = USB_RET_STALL;
-         return;
-     }
-+    s->setup_len = setup_len;
- 
-     request = (s->setup_buf[0] << 8) | s->setup_buf[1];
-     value   = (s->setup_buf[3] << 8) | s->setup_buf[2];
-@@ -259,26 +261,28 @@ static void do_token_out(USBDevice *s, USBPacket *p)
- static void do_parameter(USBDevice *s, USBPacket *p)
- {
-     int i, request, value, index;
-+    unsigned int setup_len;
- 
-     for (i = 0; i < 8; i++) {
-         s->setup_buf[i] = p->parameter >> (i*8);
-     }
- 
-     s->setup_state = SETUP_STATE_PARAM;
--    s->setup_len   = (s->setup_buf[7] << 8) | s->setup_buf[6];
-     s->setup_index = 0;
- 
-     request = (s->setup_buf[0] << 8) | s->setup_buf[1];
-     value   = (s->setup_buf[3] << 8) | s->setup_buf[2];
-     index   = (s->setup_buf[5] << 8) | s->setup_buf[4];
- 
--    if (s->setup_len > sizeof(s->data_buf)) {
-+    setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6];
-+    if (setup_len > sizeof(s->data_buf)) {
-         fprintf(stderr,
-                 "usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n",
--                s->setup_len, sizeof(s->data_buf));
-+                setup_len, sizeof(s->data_buf));
-         p->status = USB_RET_STALL;
-         return;
-     }
-+    s->setup_len = setup_len;
- 
-     if (p->pid == USB_TOKEN_OUT) {
-         usb_packet_copy(p, s->data_buf, s->setup_len);
--- 
-2.28.0
-
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 0016d14bf2d9..ec3f45a06391 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -64,6 +64,5 @@
 		<flag name="xen">Enables support for Xen backends</flag>
 		<flag name="xfs">Support xfsctl() notification and syncing for XFS backed
 		virtual disks.</flag>
-		<flag name="xkb">Depend on x11-libs/libxkbcommon to build qemu-keymap tool for converting xkb keymaps</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/qemu/qemu-5.1.0-r3.ebuild b/app-emulation/qemu/qemu-5.1.0-r3.ebuild
deleted file mode 100644
index a8bb8832c8ef..000000000000
--- a/app-emulation/qemu/qemu-5.1.0-r3.ebuild
+++ /dev/null
@@ -1,860 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="ncurses,readline"
-
-PLOCALES="bg de_DE fr_FR hu it sv tr zh_CN"
-
-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
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
-	EGIT_SUBMODULES=(
-		tests/fp/berkeley-{test,soft}float-3
-		ui/keycodemapdb
-	)
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
-	+fdt glusterfs gnutls gtk infiniband iscsi io-uring
-	jack jemalloc +jpeg kernel_linux
-	kernel_FreeBSD lzo multipath
-	ncurses nfs nls numa opengl +oss +pin-upstream-blobs
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-	+slirp
-	smartcard snappy spice ssh static static-user systemtap test usb
-	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
-	xfs +xkb zstd"
-
-COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
-	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
-	sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
-	avr lm32 moxie rx tricore unicore32"
-IUSE_USER_TARGETS="${COMMON_TARGETS}
-	aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
-	tilegx"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_mips64el? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_riscv32? ( fdt )
-	qemu_softmmu_targets_riscv64? ( fdt )
-	static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
-	static-user? ( !plugins )
-	virtfs? ( caps xattr )
-	vte? ( gtk )
-	plugins? ( !static !static-user )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-	>=dev-libs/glib-2.0[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-util/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	dev-libs/libxml2[static-libs(+)]
-	xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone:= )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		dev-libs/nettle:=[static-libs(+)]
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		vte? ( x11-libs/vte:2.91 )
-	)
-	infiniband? (
-		sys-fabric/libibumad:=[static-libs(+)]
-		sys-fabric/libibverbs:=[static-libs(+)]
-		sys-fabric/librdmacm:=[static-libs(+)]
-	)
-	iscsi? ( net-libs/libiscsi )
-	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	multipath? ( sys-fs/multipath-tools )
-	ncurses? (
-		sys-libs/ncurses:0=[unicode]
-		sys-libs/ncurses:0=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl,gbm]
-	)
-	png? ( media-libs/libpng:0=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/libsdl2[static-libs(+)]
-	)
-	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	slirp? ( net-libs/libslirp[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:= )
-	spice? (
-		>=app-emulation/spice-protocol-0.12.3
-		>=app-emulation/spice-0.12.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )
-	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-201905[binary]
-		~sys-firmware/ipxe-1.0.0_p20190728[binary,qemu]
-		~sys-firmware/seabios-1.12.0[binary,seavgabios]
-		~sys-firmware/sgabios-0.1_pre8[binary]
-	)
-	!pin-upstream-blobs? (
-		sys-firmware/edk2-ovmf
-		sys-firmware/ipxe[qemu]
-		>=sys-firmware/seabios-1.10.2[seavgabios]
-		sys-firmware/sgabios
-	)"
-PPC64_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-1.12.0[binary,seavgabios]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/seabios-1.10.2[seavgabios]
-	)
-"
-
-BDEPEND="
-	$(python_gen_impl_dep)
-	dev-lang/perl
-	sys-apps/texinfo
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	gtk? ( nls? ( sys-devel/gettext ) )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)
-"
-CDEPEND="
-	!static? (
-		${ALL_DEPEND//\[static-libs(+)]}
-		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	)
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? (
-		${ALL_DEPEND}
-		${SOFTMMU_TOOLS_DEPEND}
-	)
-	static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
-	acct-group/kvm
-	selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-	"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
-	"${FILESDIR}"/${PN}-4.2.0-cflags.patch
-	"${FILESDIR}"/${PN}-5.1.0-pixman-for-vhost-user-gpu.patch
-	"${FILESDIR}"/${PN}-5.1.0-usb-oob-CVE-2020-14364.patch #743649
-	"${FILESDIR}"/${PN}-5.1.0-usb-host-workaround-libusb-bug.patch #753305
-)
-
-QA_PREBUILT="
-	usr/share/qemu/hppa-firmware.img
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/default-configs >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-handle_locales() {
-	# Make sure locale list is kept up-to-date.
-	local detected sorted
-	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
-	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "PLOCALES: ${sorted}"
-		eerror " po/*.po: ${detected}"
-		die "sync PLOCALES"
-	fi
-
-	# Deal with selective install of locales.
-	if use nls ; then
-		# Delete locales the user does not want. #577814
-		rm_loc() { rm po/$1.po || die; }
-		l10n_for_each_disabled_locale_do rm_loc
-	else
-		# Cheap hack to disable gettext .mo generation.
-		rm -f po/*.po
-	fi
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	default
-
-	# Use correct toolchain to fix cross-compiling
-	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB
-	export WINDRES=${CHOST}-windres
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Run after we've applied all patches.
-	handle_locales
-
-	# Remove bundled copy of libfdt
-	rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}"
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--bindir=/usr/bin
-		--libdir=/usr/$(get_libdir)
-		--datadir=/usr/share
-		--docdir=/usr/share/doc/${PF}/html
-		--mandir=/usr/share/man
-		--with-confsuffix=/qemu
-		--localstatedir=/var
-		--disable-bsd-user
-		--disable-containers # bug #732972
-		--disable-guest-agent
-		--disable-strip
-
-		# bug #746752: TCG interpreter has a few limitations:
-		# - it does not support FPU
-		# - it's generally slower on non-self-modifying code
-		# It's advantage is support for host architectures
-		# where native codegeneration is not implemented.
-		# Gentoo has qemu keyworded only on targets with
-		# native code generation available. Avoid the interpreter.
-		--disable-tcg-interpreter
-
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		$(use_enable doc docs)
-		$(use_enable plugins)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_notuser bzip2)
-		$(conf_notuser capstone)
-		$(conf_notuser caps cap-ng)
-		$(conf_notuser curl)
-		$(conf_notuser fdt)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser io-uring linux-io-uring)
-		$(conf_notuser jemalloc jemalloc)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser lzo)
-		$(conf_notuser multipath mpath)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser png vnc-png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_notuser sdl-image)
-		$(conf_notuser seccomp)
-		$(conf_notuser slirp slirp system)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser vhost-user-fs)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_notuser virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		$(conf_notuser xfs xfsctl)
-		$(conf_notuser xkb xkbcommon)
-		$(conf_notuser zstd)
-	)
-
-	if [[ ${buildtype} == "user" ]] ; then
-		conf_opts+=( --disable-libxml2 )
-	else
-		conf_opts+=( --enable-libxml2 )
-	fi
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts=(
-			# Note: backend order matters here: #716202
-			# We iterate from higher-level to lower level.
-			$(usex pulseaudio pa "")
-			$(usev jack)
-			$(usev sdl)
-			$(usev alsa)
-			$(usev oss)
-		)
-		conf_opts+=(
-			--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
-		)
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-blobs
-			--disable-tools
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-		)
-		local static_flag="static"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--disable-blobs
-			--enable-tools
-		)
-		local static_flag="static"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	# Plumb through equivalent of EXTRA_ECONF to allow experiments
-	# like bug #747928.
-	conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-
-	# FreeBSD's kernel does not support QEMU assigning/grabbing
-	# host USB devices yet
-	use kernel_FreeBSD && \
-		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-
-	cd "${S}/tools-build"
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		pax-mark m */qemu-system-* #515550
-		emake check
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/python/qemu"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		# we use 'printf' here to be portable across 'sh'
-		# implementations: #679168
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dodoc check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build"
-	emake DESTDIR="${ED}" install
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	# Disallow stripping of prebuilt firmware files.
-	dostrip -x ${QA_PREBUILT}
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		rm "${ED}/usr/share/qemu/bios.bin"
-		rm "${ED}/usr/share/qemu/bios-256k.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		# PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		rm "${ED}/usr/share/qemu/sgabios.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		rm "${ED}"/usr/share/qemu/pxe-*.rom
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	xdg_icon_cache_update
-
-	[[ -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
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/seabios)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/edk2-ovmf)"
-	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version 'sys-firmware/seabios[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-emulation/sen/Manifest b/app-emulation/sen/Manifest
index e72918d41836..2c99214c9dcb 100644
--- a/app-emulation/sen/Manifest
+++ b/app-emulation/sen/Manifest
@@ -1,3 +1,3 @@
 DIST sen-0.6.1_p20200905.tar.gz 1913978 BLAKE2B 189bff583770265de29ca3e54cad1283051c05eccab4fc98160801e50b31376188c52e49b43972292fe231b376ba42879fb34d7b1ae70c2246d676a6e25f670b SHA512 cd1899c1b4c5c7cf7f1f2f5e557bd609a7d7619dbc3fc6457f5ef5ce5c9ab43d92a6fbfa228c43d543d4f46c7928d74dbed9ab8346cabc772c8e7c63a7c07bfe
 EBUILD sen-0.6.1_p20200905.ebuild 930 BLAKE2B 4d5c2bb3eac1a04f1edf68715402b3c1063f14b134a9664cdde6bbb1cf3840027fa1975886ea20806d7c9e2e95064cc93a52f6189404423399a7813fe5bc4565 SHA512 884a86533f966b1296cc311e91e7f4415d399362e443e62b3abcc016a5866bab40aaae002c8654a001cc89f26cf05ce1818b9deae5864525aa9aceff812c1362
-MISC metadata.xml 598 BLAKE2B 56052c4b881e934c97af30666df9f8364a2fad98fb855122fe22dda5f7b722c642d71440db2a483ee1b0f6afdb20ded677fb3b82ac6e88c8c2f66651e1db2298 SHA512 71e37148c40ccfce6fa1fa80632dd1143eb0462971b7758b724924ffd9739f81c7b341388b22b7b5f0862b266b83bb4adf6ceb95f0997efc4f7f3bd4a8f92910
+MISC metadata.xml 628 BLAKE2B 14b4762b2dd4aaa480e7f6d61d32647167fda51f0dc7453c8979c93ede078897a4cce702cc976324aa054642860bd08218be4d5764f49072024bfc8f60b2e8cb SHA512 b074d1f60979acad4716907fdb84ca4835fc5c771569658c6476d14683e83b11fb70e907d7a44d7ecb060f6ed695470959a549653a850818e15f01d82628f1c0
diff --git a/app-emulation/sen/metadata.xml b/app-emulation/sen/metadata.xml
index 75bfa9b4d173..b6ab49948eb6 100644
--- a/app-emulation/sen/metadata.xml
+++ b/app-emulation/sen/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nelo@wallus.de</email>
 		<name>Nelo-Thara Wallus</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
index 911a943f0caf..b93bd10470d9 100644
--- a/app-emulation/ski/Manifest
+++ b/app-emulation/ski/Manifest
@@ -13,4 +13,4 @@ AUX ski-1.3.2-syscall-linux-includes.patch 397 BLAKE2B dfb72fef3be8110ab5acacb8f
 AUX ski-1.3.2-uselib.patch 582 BLAKE2B b0d91fed1a01c6d4c2db464a1dbe6c4855a0302eacb21367865a3510b081a95756f1b09f79a015a1e20b3cb87d31e08785a5abed4a661203aec82a4a311538bf SHA512 f119e1a18ef08f40758fa1ddde61a88533b432c75111bba38ffc134edfee66f28ee01336509ed106461bddfc438d1eac48213ab4940e82f5128b924e584b974e
 DIST ski-1.3.2.tar.gz 2715791 BLAKE2B 5e6b237ea21bf410e44dbaa88150d980f2af66728effeab4e8bcef02f27c24069c4bcaf42d3814ad15c3bd759819d468f163b6c64a89408c09d1ffbdc9302c0f SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0
 EBUILD ski-1.3.2-r4.ebuild 1558 BLAKE2B cc28e4ba990db883074b505a50ad823d9104e7fb6f8746fa14e4de1f707556a6bd1bf7ab5c0b33f99b3e2b949c5c4220ed72258c2aca1ad282332842cc357a02 SHA512 cc7eccadc7ddd10c247afc8b5ff840fcf93d9452396c553cc3401040a58b2c6e03ab8692a0cf99fd33d92c0f0b2b937e5ddd11bc42008531f37ec301e72a6ed9
-MISC metadata.xml 445 BLAKE2B c044a6cef20657adc98ec1e0d38b14393b04cbba0b71ec4efae3763c8de2a676bfc17569cf9f92d67306dbaf0cc058ef042cb3b0b54631f0f21458d3afacc6e9 SHA512 bfde8716ac8ae245b21561f97a6e4ad69617d9ddc994ec89e032b9a2d512be61f05c8aa94e2ada7dfb93cd24d45f49fb7ea6d0b934367bb9e256fb3f18f1e0c2
+MISC metadata.xml 445 BLAKE2B 9ed57ae50b2327c0fc3bf69bf2ced1dfa2b069abda5da550bd82d04cdf834fe9e5f2a5089a9e5788c45bdc4312127654d482a9b6edc7a39adb05844705e36099 SHA512 6e91887d446a1d2fec5ab934df8d3cbd629bd905541db8300751f624d19061f8d78ccc632d4d36a8505f2f4e29137a20fb2feb0aad061379ea6e39783bdbef58
diff --git a/app-emulation/ski/metadata.xml b/app-emulation/ski/metadata.xml
index ab1c2fb53a4b..bdbbdb76bcb8 100644
--- a/app-emulation/ski/metadata.xml
+++ b/app-emulation/ski/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Sergei Trofimovich</name>
 	</maintainer>
 	<use>
-		<flag name='debug'>enable extra binary emulation debugging via <pkg>sys-libs/binutils-libs</pkg></flag>
+		<flag name="debug">enable extra binary emulation debugging via <pkg>sys-libs/binutils-libs</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">ski</remote-id>
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index 95fd74682d65..479535c16849 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -2,4 +2,4 @@ DIST slirp4netns-1.1.8.tar.gz 58022 BLAKE2B cb65af6a5298411c158dd3da8160f8e4999c
 DIST slirp4netns-1.1.9.tar.gz 58951 BLAKE2B e4fde408b3cd55dec0cca495c58936ec32c6201a0fe63c1a9fc9502ac41da615f92271d5fb365475f6864dd3c195097c81f01268b1b8d10d0f888c4e154cac34 SHA512 6471bf2b2eff9bd3ef037de986ab612f20bfce7a52bfd2b1b434d0606a3d2e6170b3fc43b168c8cc6f56ffb82f8361f21a26522ac1092c71f6e694a9588d5854
 EBUILD slirp4netns-1.1.8.ebuild 949 BLAKE2B 386ac222a7ddb0ed2d4ab6f90674904d0e97ad548034a73dae4a5e695378968bab976675cf910bcdcd26c2fdec28bb297eb3a408a06b3d3c1e0f266e6a815eff SHA512 5404cd12a3bdbc88a23ccd5f5769345f70e40f9fd68ca4c44278447eb35c0d5eab8307c0f70cd33e2b94fd43553fe0f3f181ba0ebc213970a06497595a7202b9
 EBUILD slirp4netns-1.1.9.ebuild 949 BLAKE2B 7f34e0533cab1e88ea7c2db9de6dc9b2a58f60e18fcf19ebaebdf8a0f88727c4ecd5c35d8951e3cd55fd1adec5ab07ea2af6c682afe864ff0bc82804dd7e7748 SHA512 c14162894ae957d060bf20d83195c083b65f5a2ba8c8fa5efb09fec0a00157469afc6c98b32e642639b020da5d1ce81cd9600e7d6359fb48e46bba1b8a43bde0
-MISC metadata.xml 459 BLAKE2B e33a3af85acb845c8dde439efb0cc6cc87f5fb04e17d67af393a06f8b4b44242c434f3fae231118d2233c45ad733dcbeed3ed273fd4f66ff70292c39e5ad11ef SHA512 012156833690e44656fae463045a5559e564959904436adcac0af92bae8867c71bb7c24fa0fc416da890b0bad4d53e29a9b6d354b81e673e16d8b1956e9a0d04
+MISC metadata.xml 473 BLAKE2B cdcb7fe8dc296fc873a407cc8602d33da759a89406c6c4c118def05ea2a8ad9233f6ead5d2146db8ad063c0daa8eaba9e3f3a73677a17ce622adb99173b5361f SHA512 bd2c4d8e74a7b711ae34fda72f66990ad79ebbf5f0d2ff0b5e8ece78eb2cdd43bf059eb94a8f4175ab554fd46d83e2c21e1aeb289bb72a0a76e82d25f41c4976
diff --git a/app-emulation/slirp4netns/metadata.xml b/app-emulation/slirp4netns/metadata.xml
index e7dbf873de1f..1a395700b09e 100644
--- a/app-emulation/slirp4netns/metadata.xml
+++ b/app-emulation/slirp4netns/metadata.xml
@@ -5,7 +5,7 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>g.braeunlich@disroot.org</email>
 		<name>Gerhard Bräunlich</name>
 	</maintainer>
diff --git a/app-emulation/virtio-win/Manifest b/app-emulation/virtio-win/Manifest
index c1c2cc4efb07..4d19cf3fe57e 100644
--- a/app-emulation/virtio-win/Manifest
+++ b/app-emulation/virtio-win/Manifest
@@ -1,9 +1,3 @@
-DIST virtio-win-0.1.173.iso 393902080 BLAKE2B a90da9d4e23a95c4cf9f02cc010664d87c987d7a9b82a90b534ec69041f763d73d7b37b1378078a162e7ef4f06b9d4cd6c5b7c4b98d77ff75bcd0d06a8ede8a2 SHA512 49cba35d74a3f480f6d23a57b68217f5732e8bcfb7657a4a87f16b286ad2c6ffd2509f034d0b4f363a389ce50d4d0e80e241f7ddff3e93b5dc315dad1713f08a
-DIST virtio-win-0.1.185.iso 413564928 BLAKE2B 84aa2d0ce16292b95431044618538f6dc176ff834f5e01b245414e27a74775a0e202c7b9262495de9d5f54476fe4dfa5e853f30b994e301080fee1a1c840f823 SHA512 62992baafce1f2eb52c23ba62291765c535c513e2598910083a8519eff58e8c57366d46add702e791fb07ec96c0fb65c9cff03b57e8f32b4357799c86b46c198
-DIST virtio-win-0.1.187.iso 433235968 BLAKE2B 0df10aa5f46cd70f7530f6d677b882df364a0b1a859d7e9fe777817136213d4f856116cf73b8521e8720c203bca3321b9a7bdae057f867e655764a8b7d5dc0b2 SHA512 db9938f1f17b723a994d1bd5bb0e0ffce47ae2bbfa96f9bdf1d895750502600f9a71f0486a97af9301659e05ebd5365d1f08dc0e062d1f9e4c3acaac8b7f0bf5
 DIST virtio-win-0.1.190.iso 501745664 BLAKE2B f9f2bc4dc371ff412dfd0b65228e0984c30a1fe1b30307d3894f2b238a8993e96fda75f931080aeff06a29467a678ca02174a876b9f339a4c8d199fd9c8a9917 SHA512 dfdaddb99c92d633368eb243801425abbcb09e4693be658efe531c33a47600b165e598ddac594239402d2c578f24f5400b5e7b643f17e7db4ebba2d4d99cf0fd
-EBUILD virtio-win-0.1.173.9.ebuild 630 BLAKE2B 5d5d9ddedd33ca2ad52c1b213edd46f7fbf2b3c310e2cbc176398bcdd29dd576bb542d1ba280720c8e717aa2f37e8aa88aa22f92c04cf42d520e45e99cb9a46c SHA512 7adef1a78a2173de5c41cb2bb2b0325a3163800c0089f6936dd21fa56d7aa8f94889c7b9da7c2a387342c27623e7e6ff55fb55ff5cd15a08025d89dec6b7a96b
-EBUILD virtio-win-0.1.185.1.ebuild 697 BLAKE2B 107141d59a78989c5cc47a712ace77c3c40be624a50fe76d0a576ed9581249701ba2edda868a5cab56f863978824817273e516137d62ee469e6dc4f816183de7 SHA512 37872fc77a00eb0c0ea43be87e53fce6743a249511861c8b357c489bc656664c4d0101ae1aac6d5875c93179965f17ed2b8c8fd626d964acc8f541ae7b2f74ba
-EBUILD virtio-win-0.1.187.1.ebuild 697 BLAKE2B 107141d59a78989c5cc47a712ace77c3c40be624a50fe76d0a576ed9581249701ba2edda868a5cab56f863978824817273e516137d62ee469e6dc4f816183de7 SHA512 37872fc77a00eb0c0ea43be87e53fce6743a249511861c8b357c489bc656664c4d0101ae1aac6d5875c93179965f17ed2b8c8fd626d964acc8f541ae7b2f74ba
 EBUILD virtio-win-0.1.190.1.ebuild 697 BLAKE2B 3755b24495c2bbc9bb4e630dabec6013809fcfd8a2f682c17c4b464aa15d04def9067dd16902f1e3a0bb7fb821fd71b4d9cea1dceab787e62e16dc73057e3bc1 SHA512 f2ab671652ef92efc65315c4e0fd3889a51c1f990ebc1dadcac0d609579d754ace0a04df870f50423bceb52face1ff2c4f0ca19c6b79db25823dfe053e25c1ae
-MISC metadata.xml 359 BLAKE2B 6a34261ec10702f5bec40975ab7723eee34e015afa5a4544146834c43a9a3b040d9ead5d5a617da0b8253e9e9a7e05fe9efae38588b02b8fa16f653d9bfc5340 SHA512 43bdd93da8962e2ca6d852356e206511754f1e5f0bda721ac6458c54abab89367fc137f686583dd9df6d83be82bad66f9858efc52ed1e5a002d6b3bacd8fdbb4
+MISC metadata.xml 389 BLAKE2B befa3d0c24a5ffd3581f2725406d9580b8b155499b0487b467b7d50f6be32f5334787989046a92a42ef20fdc1d836cdaeafd46add0e5561646a169bda95d3385 SHA512 a86291be6a9b0cec3538ab06843f3a06c9c3b996cb27a0fc589f444c83b95b70b5d8abad3c16b75f8a4495041d180257bcd8ddf7a11b5259be4d9a1e72ebc6dc
diff --git a/app-emulation/virtio-win/metadata.xml b/app-emulation/virtio-win/metadata.xml
index d155fdbc0406..48fb9a962bbc 100644
--- a/app-emulation/virtio-win/metadata.xml
+++ b/app-emulation/virtio-win/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/virtio-win/virtio-win-0.1.173.9.ebuild b/app-emulation/virtio-win/virtio-win-0.1.173.9.ebuild
deleted file mode 100644
index 8f43008b5179..000000000000
--- a/app-emulation/virtio-win/virtio-win-0.1.173.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=$(ver_cut 1-3)
-MY_DW=$(ver_rs 3 -)
-
-DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
-HOMEPAGE="https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"
-SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/${PN}-${MY_DW}/${PN}-${MY_PV}.iso"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/drivers/windows
-	doins "${DISTDIR}/${PN}-${MY_PV}.iso"
-}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.185.1.ebuild b/app-emulation/virtio-win/virtio-win-0.1.185.1.ebuild
deleted file mode 100644
index 317b5b926c06..000000000000
--- a/app-emulation/virtio-win/virtio-win-0.1.185.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=$(ver_cut 1-3)
-MY_DW=$(ver_rs 3 -)
-
-DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
-HOMEPAGE="https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"
-SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/${PN}-${MY_DW}/${PN}-${MY_PV}.iso"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/drivers/windows
-	doins "${DISTDIR}/${PN}-${MY_PV}.iso"
-	dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso"
-}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.187.1.ebuild b/app-emulation/virtio-win/virtio-win-0.1.187.1.ebuild
deleted file mode 100644
index 317b5b926c06..000000000000
--- a/app-emulation/virtio-win/virtio-win-0.1.187.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=$(ver_cut 1-3)
-MY_DW=$(ver_rs 3 -)
-
-DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
-HOMEPAGE="https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"
-SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/${PN}-${MY_DW}/${PN}-${MY_PV}.iso"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/drivers/windows
-	doins "${DISTDIR}/${PN}-${MY_PV}.iso"
-	dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso"
-}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 5653bd9a682f..09c1fb67fb11 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -2,4 +2,4 @@ DIST VBoxGuestAdditions_6.1.16.iso 60987392 BLAKE2B d4452f43c72ab8c49633f717f7a4
 DIST VBoxGuestAdditions_6.1.18.iso 61157376 BLAKE2B e022cfbc70fa45889c1db7592f30814faf88d7614c30ebd3fccd0127732d7fec51423904a160797ac199315dcbe4791f025e2dc4754141bfef0862b11510626c SHA512 07be8be75feb2d7d9bfc984ce34b955339d391580192817c2eb216b7577576a003dde310cc09f18c6b6bcf2e30ad548e1ee8bde0af420e4d1d43a3486861cf19
 EBUILD virtualbox-additions-6.1.16-r1.ebuild 777 BLAKE2B ef241fa299288ab813b6a6acfddb7910b3a8bd454527fd75143e8b3f404049374662c500aa17ce83a6edb080af267ed1710e09240058c877957e24272c782556 SHA512 53bddb2a887429730a34ea27a0859541c4c47a11a010ff33715314119500e337ed5849a8f76af106ab414dfcafbbe269ce2a282fb5137a324bac676dceb6080c
 EBUILD virtualbox-additions-6.1.18.ebuild 777 BLAKE2B ef241fa299288ab813b6a6acfddb7910b3a8bd454527fd75143e8b3f404049374662c500aa17ce83a6edb080af267ed1710e09240058c877957e24272c782556 SHA512 53bddb2a887429730a34ea27a0859541c4c47a11a010ff33715314119500e337ed5849a8f76af106ab414dfcafbbe269ce2a282fb5137a324bac676dceb6080c
-MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
+MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-additions/metadata.xml b/app-emulation/virtualbox-additions/metadata.xml
index 8dafc466cde2..08c15383606c 100644
--- a/app-emulation/virtualbox-additions/metadata.xml
+++ b/app-emulation/virtualbox-additions/metadata.xml
@@ -6,4 +6,3 @@
     <name>Lars Wendler</name>
   </maintainer>
   </pkgmetadata>
-
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 338dd3fddc52..d03fc29662cf 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -2,4 +2,4 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.16-140961.tar.gz 11145670 BLAKE2B 8
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.18-142142.tar.gz 11157510 BLAKE2B d9ee20abac79ed5de03c39d1e6af3a5f18c5416149e9e64ebe9dfc4a937bd72b6590a2daaccc820e3ee6c6efcfd0c1c8e29bf3844cbbb929f13052415e16f2bb SHA512 3686b1c5dbdc5b28c172b4885c30ca9a444bc10dc7984df14a17e1dcc571456b06e80ad38e1409de8692c483c56f397162a53bd3dc6956d9ca91875fda0bda4e
 EBUILD virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild 1083 BLAKE2B 088e4a97b7fb82fdbbe2206c79bf4296ca886d008df1c5cf1d789c0bbaced88b83fd8b5cee42f5aa6a5c9246c07ad9c8d2b7363a4a0f09cc687b3fbd6a64331e SHA512 e674994322cdcf4f0151f488c28324c786a72039ad32147dca57f84774ab39100f5534506e1ff5e6adeda75314ba3ef071b032c39ab4b6754b3469ccb79707ae
 EBUILD virtualbox-extpack-oracle-6.1.18.142142.ebuild 1083 BLAKE2B 088e4a97b7fb82fdbbe2206c79bf4296ca886d008df1c5cf1d789c0bbaced88b83fd8b5cee42f5aa6a5c9246c07ad9c8d2b7363a4a0f09cc687b3fbd6a64331e SHA512 e674994322cdcf4f0151f488c28324c786a72039ad32147dca57f84774ab39100f5534506e1ff5e6adeda75314ba3ef071b032c39ab4b6754b3469ccb79707ae
-MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
+MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-extpack-oracle/metadata.xml b/app-emulation/virtualbox-extpack-oracle/metadata.xml
index 8dafc466cde2..08c15383606c 100644
--- a/app-emulation/virtualbox-extpack-oracle/metadata.xml
+++ b/app-emulation/virtualbox-extpack-oracle/metadata.xml
@@ -6,4 +6,3 @@
     <name>Lars Wendler</name>
   </maintainer>
   </pkgmetadata>
-
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index e62d70840c20..aa923037ca68 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -9,4 +9,4 @@ DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-guest-additions-6.1.16-r1.ebuild 6202 BLAKE2B b6e2fed23a8749deb6136ceef602dc2af84466940ec8c35caf6ffd08f582e8dda92b6a2ffec26dde62a678be94d6ac8b7623365f0c27dacb3b1ca2a1ff5b72cb SHA512 5dbf2a06b0dbed7a9640fd1b9cf50d7ea9af3344f0fadaad90e34b55e864056ac4aa9100bd04293553db1ef7851120844f55f4b634118842272413b112dbda77
 EBUILD virtualbox-guest-additions-6.1.18.ebuild 6202 BLAKE2B b6e2fed23a8749deb6136ceef602dc2af84466940ec8c35caf6ffd08f582e8dda92b6a2ffec26dde62a678be94d6ac8b7623365f0c27dacb3b1ca2a1ff5b72cb SHA512 5dbf2a06b0dbed7a9640fd1b9cf50d7ea9af3344f0fadaad90e34b55e864056ac4aa9100bd04293553db1ef7851120844f55f4b634118842272413b112dbda77
-MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
+MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-guest-additions/metadata.xml b/app-emulation/virtualbox-guest-additions/metadata.xml
index 8dafc466cde2..08c15383606c 100644
--- a/app-emulation/virtualbox-guest-additions/metadata.xml
+++ b/app-emulation/virtualbox-guest-additions/metadata.xml
@@ -6,4 +6,3 @@
     <name>Lars Wendler</name>
   </maintainer>
   </pkgmetadata>
-
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 452ec3a55fb5..1dea71402e93 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -9,4 +9,4 @@ DIST vbox-kernel-module-src-6.1.16.tar.xz 671736 BLAKE2B 8b2153874ee7a63f88679a5
 DIST vbox-kernel-module-src-6.1.18.tar.xz 672004 BLAKE2B 7199ba2a5020e5ab51d82735df16aee78ece74db232733b932c380f90dffd589a72613120bbd5c580381ab6f6308abb8d12f69855b9c0a8345bfb8587d022019 SHA512 49b54898b2701774fdeec0cd99dd51a1dd71ffd9be38e125fde73f0c64a697138d13bddbb0ed0e9582d354fa0394608084effb68bd35b266c87f6e3b44c6f342
 EBUILD virtualbox-modules-6.1.16-r1.ebuild 1511 BLAKE2B 5da8447d01281777c51b21469b44397ab585659a36ade0407d74b32da4d0078ca5329479785cd2924d8c3f61fb066f84a64b4a92514454fe7368b9b54dfbebc4 SHA512 fb606c28048f9e4ce050b73de3eb7a80e5546d18ce52d13aa2a00abb42530052dd61523f5a800ed1cfb06541b272017cfc1b403a2260fe43b779238bd08a46d2
 EBUILD virtualbox-modules-6.1.18.ebuild 1531 BLAKE2B bc820f78c75b9057944568dd06b06a544f887c7aa8bf026e1907e9b898a7c10638069aa95a38e701ae0422d541d9aa045b109a40faeac1ddef7365f850acbeb5 SHA512 a4f08b633a6e4a5c22dbd7cd088c509e7e5c8658bc3b9604b4ebf77bb2edc70491ebc3eabfa414ae4bd174de36579aaab10226810f7df525691115ecbccaa042
-MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
+MISC metadata.xml 352 BLAKE2B b3f8d24dd3e805ed233d105374d7c7d85b136b0260229daac917bec19bee0aa7dd9c2e19fdc036b576905152c3dad31aa5a6162c28812ca471f37b7297a77356 SHA512 98dcffafad310b4ceb74194af6de0e3e6c443167f53c41068ed0098c2f70916c88315739afb8bf917c1328886d063ca8a54e9dd9aeec3a41a911d34dbba5f10c
diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index b55a81b4e004..a4c013c40067 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -9,4 +9,3 @@
     <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
   </use>
 </pkgmetadata>
-
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 34973bb80a34..43bf6a60d6a3 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -12,4 +12,4 @@ DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-6.1.16-r1.ebuild 14557 BLAKE2B 0e02fb478f8284108c737e5c2cb8ae3319fe2d5ff8f0729a1c1e71b8a44bc47471a446191afa233d912fc71e7a0b8c3adfea8dc8644ad781d5b9fd41ab77d483 SHA512 19e2b276d6f7aa731a9f0130ae68f853bf90de6e347ad76692b083980bcac7e41fa89ddbe63a0ca3739b1a757e34f01eaf9e66cbe5a710a8aa423d6522c565b3
 EBUILD virtualbox-6.1.18.ebuild 14557 BLAKE2B 0e02fb478f8284108c737e5c2cb8ae3319fe2d5ff8f0729a1c1e71b8a44bc47471a446191afa233d912fc71e7a0b8c3adfea8dc8644ad781d5b9fd41ab77d483 SHA512 19e2b276d6f7aa731a9f0130ae68f853bf90de6e347ad76692b083980bcac7e41fa89ddbe63a0ca3739b1a757e34f01eaf9e66cbe5a710a8aa423d6522c565b3
-MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
+MISC metadata.xml 773 BLAKE2B dade5d0d6cb8e4d8f92b865368af2e577d26e883b53e4d2274fb2b59e2ea92bdc8ee0af6a4cbca64384f9820779e44397825b3f1707d87631f1202bdc7164dac SHA512 c4718b4455eecd2669d47881af12257c1187c5f4aa3dd2fca8745df565f55a7b0e018da4ad3c5f38bd03b510bdfaaefa8a235d09fae3d8a99a55f263c995c74d
diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index 3a2ea79813a6..95eb9062a15f 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -15,4 +15,3 @@
   <flag name="vboxwebsrv">Build and install the VirtualBox webservice</flag>
 </use>
 </pkgmetadata>
-
diff --git a/app-emulation/wine-desktop-common/Manifest b/app-emulation/wine-desktop-common/Manifest
index 0c28d8acb701..74cd300e56db 100644
--- a/app-emulation/wine-desktop-common/Manifest
+++ b/app-emulation/wine-desktop-common/Manifest
@@ -1,3 +1,3 @@
 DIST wine-desktop-common-20150204.tar.gz 99491 BLAKE2B 7427c08d00a7ec11319908c908c5833e1a3fc297ec2ebfd942ccdf2adb9e657d1fd751da74bd67e7efb3d4b8ad769a11b1aa5e1a56e33e181f149f4f6245fac3 SHA512 1f3d7022c5cff87ed3b8fd3b7cd14397c6f23b98fe6a7c583ac0d2f439ff29d943f57375f23687aa6519ff1d84ff07624a9a712d6f19fa207fd26d01edcb6688
 EBUILD wine-desktop-common-20150204-r1.ebuild 957 BLAKE2B 7fc9059805ae68d1da70b13144808641035719a0b64184dfedc8352b0cf328d01b54e11b82577a8dd0b7fd636f664f51a2f63b88969a36e413dc7e75b28d259d SHA512 98932bfe14ee4a20b54d80744b959df25a6d635dedba80f1eec4e6014f34edeb197a3f77672e58c2df95469fcc52a748c72585b430dc53820936971828c24722
-MISC metadata.xml 439 BLAKE2B 5748ff1f9d8a97a6c0496f66672ba2131d46db6391003fdb2090b2627561e62519580c1ad78138857111963ec9ea56ff2491b56b63c0bf321ab7de88a3c2f445 SHA512 c9bb03bc6753c6c40c280d477ef343b1cc4bf79f49f0dcd83aab6c5c1f4770e93c65c33a51628453e326618b44fe2a18610667d7177e503366dbfdc882fa471d
+MISC metadata.xml 439 BLAKE2B bff337f2c333a31513cc2859e72aeb5f57a06cc6a25905973c713d1b6b312ae7f4c4071afcfcdb4cae7d494d7ebd1fd4b4a9e7fcc808065fc1289ab6e81c7d45 SHA512 6edd6afb236786be8e48e06733d0274ddf3431ff01872e61a3d37ca1004a325b1cf734158b5f59541a1a10b6ca7f8a577dbf8bddc7b779ffc76879805a47205f
diff --git a/app-emulation/wine-desktop-common/metadata.xml b/app-emulation/wine-desktop-common/metadata.xml
index 751c88a7bada..2b2167344616 100644
--- a/app-emulation/wine-desktop-common/metadata.xml
+++ b/app-emulation/wine-desktop-common/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index ad37eb1886b7..af1b289dd657 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,16 +1,16 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST gentoo-wine-patches-20210302.tar.xz 60112 BLAKE2B 993cc671da00e5f44022af14f7b14f41155db4f2a02a971d17e7d40c3aece59e6b0dcd2793157c91bfe1f240a4b9e59a731f07dcb3314688f978e2f79e8062f1 SHA512 623cfa1420350d76d4b3897310bb81ce86740306a16ec974762cae886ae6717194b726cb4bfa588ea451414b399c50cca72125020738cdc3e13f6cc84983f858
-DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
 DIST wine-6.1.tar.xz 24227160 BLAKE2B 968405fb8a4060732a6070687e28aecc9169692bf18e058d358e859a2626281b5adb67b94d849628ecbfa87ad772a367f62fd3c5f45aecdf7d0a7e7aa8167c33 SHA512 49ee77c41e2fb1c4f22417117b26f8a467ec6c99583fca66f147003f776fcaf5ca42227153c7ca3325dfe70141ae9bfb88e3eb6e4cf25dd31a5ba5115d2685d0
 DIST wine-6.2.tar.xz 24270924 BLAKE2B b83e7ff097d8f48cc46588a672515e8c1eafeafd592d4ced6a8347eaa33c31f9c5a2603958a10ce02463993c8ca5db77b227d0fbce452c1e3a637e5ea42cf635 SHA512 d28870ba58fc4ed9dc083f843d7f4ee8921722bb33e0b84c89f281fc27e5f827c0998ad629eb21c92f860dade77194d3c8a0f5b4c6ae3407fe7acef245cfa9a4
 DIST wine-6.3.tar.xz 24301496 BLAKE2B d36e46e369abc619d351dd3209c0c86c5e5924509fe98a9e158fd10b9ca57650b9bc20e64dc801ec1b09315ed77fd81b549ebce7f383a3f772717a2031878588 SHA512 20108ea5036d612e8dd61fe9254d67cad02d757ede87174ed27774e4e3537e0d1f4d67156fd430f1d01d5c68b899cb0c7b4be298d897a1ce823913efef822242
-DIST wine-staging-6.0.tar.gz 9863425 BLAKE2B b51e0c3dc426c637de4ee89ee7d519847edcb04b1fb160f5f196e5560ce570ced682165ac74958433de79e104765d4811f004d323f357b753cf56108b9a631bb SHA512 33845e398e9c3d4bacbd9cd369983e72517fd648747433eabd933b446f9d86f1d61660959ff4e05cb661cf4038550b3df3384f588f3f5504b1f8056196ca3c38
+DIST wine-6.4.tar.xz 24340220 BLAKE2B b09ea9237b71856184a03e64ef8cf7aa30591ebd6534a550e9365ea9ab773d81283520ca6b0efc8aa69063cdeae8da35fc22e08a40c73c6268db4d57b0442ad2 SHA512 f190e1b97defb4620e33d1a4e2afffd475f6b3998153c67c6d06840b4f3b93a50f88c6844de15e7f54ca712330f6fea857310861a78b961feb7f64a4869f3fe1
 DIST wine-staging-6.1.tar.gz 9855125 BLAKE2B e5bd41294b7f17cd283d4ab90cce4f362740c2b3de2a867ef50c44639f5472392b3c11e199a66da63018f18df2f2a99579b50f27d6dd0163bd989efe1e7983e2 SHA512 50bf3f07cf8008731cee131852cbce43c5ec44219e8e96fb70a0fc82954b0a2a9d25ee8b25b7c62b47abd131591ca8fe0461214287601465edccda80be6d598f
 DIST wine-staging-6.2.tar.gz 9820682 BLAKE2B 3de0c0ecbdabc1ffb965e6d5ebf5689fbeaf24ee33aaa2ff078db39d1542aa935b6d4d940fef570f1c60260748f4ef52b9789625b840f73e70ed3482995d505d SHA512 558c46250babaacda92885c35c438797baff7b8eb45cb3cdf7f7572c35e6412e621182061a3a4e31444cc7580f99a61de6bd433bf2bb2b8139cdd718afd9cd2e
 DIST wine-staging-6.3.tar.gz 9796930 BLAKE2B b24e5ec57435a0d797e4d913b027226b3c891477d9df5d098be52348dff4eb704275c7c59d09f6cbdf7f86940a0e6c96bf28f94bd703fd32d6770a31426043fc SHA512 ed9b3b03c466de03941d7fec00c73ff77df863c3f4ba201e7f920810675ff416995557cb62b6701dcec6928f2ab9e4d608f17b79eda0267094e506a5e66f47f2
-EBUILD wine-staging-6.0.ebuild 22026 BLAKE2B 3ceadbcd50c6da5d2080c4a90561dbba6714c6977843adaf8a7a82fdf5d9d3c0d10a7160df77ef6db7020295e6de7586aaa513029b90d9d7a2b8b3a81f942cbc SHA512 737e1a65fdb3431f296cf5960fe764ce4e84392c4b986d640e0e16c697359f211bfeed49874b293609922a6cc20e5c4fb35642c34d91547046a4e6ba349fe8bb
+DIST wine-staging-6.4.tar.gz 9778866 BLAKE2B 9fe69f359dd70433118695881c5254223f4e2ef0b78868fc87df6a8a5789004fa5173987a04f4c3f8b51ab70d0c4b573c2ce867765b7009346790dcca6824347 SHA512 9229ff6f56120c64cf79d2b817ce2e1f43f1f02e77356f7d371104a4d8a6455a090555ad80b0efd18f69edd019a2caac7bdf59aaba097ac01d311dac927e48b5
 EBUILD wine-staging-6.1.ebuild 22026 BLAKE2B 3ceadbcd50c6da5d2080c4a90561dbba6714c6977843adaf8a7a82fdf5d9d3c0d10a7160df77ef6db7020295e6de7586aaa513029b90d9d7a2b8b3a81f942cbc SHA512 737e1a65fdb3431f296cf5960fe764ce4e84392c4b986d640e0e16c697359f211bfeed49874b293609922a6cc20e5c4fb35642c34d91547046a4e6ba349fe8bb
 EBUILD wine-staging-6.2.ebuild 22026 BLAKE2B 2075bf50fda8783844b39bebff31a150c5cf6884a9f271f5e85143c5d26174d72c8ff238c919b09f9bd241f2e9beb93d0daf5625b98a832c9d5e8ce017863225 SHA512 17bc30704da90555b7c322f30e36603dbc4b3f865d07c5250250f2c035f1514c5c35f133c04ccd1143eb7a822bf0c45f52eda4973a02ee38e66a197b2d750560
 EBUILD wine-staging-6.3-r1.ebuild 22091 BLAKE2B 484991abcc53c6f006b2c21001c74fb42e1549ec4989d8dffee44598728296efa5e5abd0e2863f48bbce2701ee286fefa384f7c5dd1face7c2c52255b8dafe44 SHA512 b9290680fe60c73bdbc7b95a10ff9621516170b0ffd4c91805018e596a1adedac270a1477406c6c79a68115c935b982a692bdc914022cc1dc7cbf330d14c8a46
+EBUILD wine-staging-6.4.ebuild 22040 BLAKE2B fdc028150b9949d82c64910ff6ede3f16b23477f5a0769359fe274373d6ca97be354293a2171dcf329b29f4aa04a5f4c5680867714fb3750f45e86f72affd94f SHA512 9de89cd3f7ddbb2a036a5c4ddcdb9f81baebc40a88a23f5aba3e2f24b10899c24f7eeb9aa30a32cb5a92272549142e2caeddf587f5653ad9620e8fd6e6d42f25
 EBUILD wine-staging-9999.ebuild 22026 BLAKE2B 2075bf50fda8783844b39bebff31a150c5cf6884a9f271f5e85143c5d26174d72c8ff238c919b09f9bd241f2e9beb93d0daf5625b98a832c9d5e8ce017863225 SHA512 17bc30704da90555b7c322f30e36603dbc4b3f865d07c5250250f2c035f1514c5c35f133c04ccd1143eb7a822bf0c45f52eda4973a02ee38e66a197b2d750560
 MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033
diff --git a/app-emulation/wine-staging/wine-staging-6.0.ebuild b/app-emulation/wine-staging/wine-staging-6.4.ebuild
index 954abe1eca77..9bb1565d0057 100644
--- a/app-emulation/wine-staging/wine-staging-6.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.4.ebuild
@@ -16,6 +16,7 @@ if [[ ${MY_PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
+	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
@@ -133,7 +134,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:5.1.1 )
+	mono? ( app-emulation/wine-mono:6.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index e846af697956..f86d4e3bd69d 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,17 +1,14 @@
-DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST gentoo-wine-patches-20210302.tar.xz 60112 BLAKE2B 993cc671da00e5f44022af14f7b14f41155db4f2a02a971d17e7d40c3aece59e6b0dcd2793157c91bfe1f240a4b9e59a731f07dcb3314688f978e2f79e8062f1 SHA512 623cfa1420350d76d4b3897310bb81ce86740306a16ec974762cae886ae6717194b726cb4bfa588ea451414b399c50cca72125020738cdc3e13f6cc84983f858
-DIST wine-5.0.2.tar.xz 22484932 BLAKE2B 93253a86605b32dc8f7c79a16336643e6f84937094f8c96ea336289c2076a4d9f759fc1ad128f7b1a009da5eb2ed25cdc893da99e338093608bf5fc0ef1a85fc SHA512 9ff902ff929d9ac8c81843eea141c96446d26b14f70781a40a3ea1fdef5f412ca4c87374a5a3af9b42b52236159645e55d6e54f8b06178a4d210a72fb1d5358e
-DIST wine-5.0.3.tar.xz 22495496 BLAKE2B 459399b940111fb573d3060e74c17423ff43b510a196d70eadb5d57e7d57b44c990f8c9bb69eb258a76515c2d50fb756f82229a1a7cd391a32c407bedc1e9f14 SHA512 3217cc8a91e898e15130314fb7ebc2cdd93e2a4e88a46d3778ff4790a635b28e951ba974b83a56414d387b710da21a998e519f1df0cde636ff5fffdceff7f652
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
 DIST wine-6.1.tar.xz 24227160 BLAKE2B 968405fb8a4060732a6070687e28aecc9169692bf18e058d358e859a2626281b5adb67b94d849628ecbfa87ad772a367f62fd3c5f45aecdf7d0a7e7aa8167c33 SHA512 49ee77c41e2fb1c4f22417117b26f8a467ec6c99583fca66f147003f776fcaf5ca42227153c7ca3325dfe70141ae9bfb88e3eb6e4cf25dd31a5ba5115d2685d0
 DIST wine-6.2.tar.xz 24270924 BLAKE2B b83e7ff097d8f48cc46588a672515e8c1eafeafd592d4ced6a8347eaa33c31f9c5a2603958a10ce02463993c8ca5db77b227d0fbce452c1e3a637e5ea42cf635 SHA512 d28870ba58fc4ed9dc083f843d7f4ee8921722bb33e0b84c89f281fc27e5f827c0998ad629eb21c92f860dade77194d3c8a0f5b4c6ae3407fe7acef245cfa9a4
 DIST wine-6.3.tar.xz 24301496 BLAKE2B d36e46e369abc619d351dd3209c0c86c5e5924509fe98a9e158fd10b9ca57650b9bc20e64dc801ec1b09315ed77fd81b549ebce7f383a3f772717a2031878588 SHA512 20108ea5036d612e8dd61fe9254d67cad02d757ede87174ed27774e4e3537e0d1f4d67156fd430f1d01d5c68b899cb0c7b4be298d897a1ce823913efef822242
-EBUILD wine-vanilla-5.0.2.ebuild 17538 BLAKE2B c7112948be20ca6f68de5053bd0cc1171eb7ebf06807ec97c1aa392c4cc756d18782805a9f501307da418298eeb8f129830e85e507613233a478bd3c452b047f SHA512 16bc462660abe1eb8dca1d5c90fb02d71ed8e98a121d4290e501f7807c72eaae6a1b2eb65867b90c79d827ac9eb9b2502b6ca4e597155eda6b74509b00a3ac55
-EBUILD wine-vanilla-5.0.3-r1.ebuild 17621 BLAKE2B ab9f9766ef5f30b3fcae5d92a4cc7237deb015fed6cec868e0360fa676f85c5f96579bbb81afd793efa21fe0c65403e747a3b08fd00b69699985298acba08853 SHA512 833096373edf13aada27e0a574097dfb2ced4589bc8f1fa5e7d93ddfdf827c9b1920ce351e66e60c435cbf831879b90b05f3da8ea7670773f364ecf39b48927f
+DIST wine-6.4.tar.xz 24340220 BLAKE2B b09ea9237b71856184a03e64ef8cf7aa30591ebd6534a550e9365ea9ab773d81283520ca6b0efc8aa69063cdeae8da35fc22e08a40c73c6268db4d57b0442ad2 SHA512 f190e1b97defb4620e33d1a4e2afffd475f6b3998153c67c6d06840b4f3b93a50f88c6844de15e7f54ca712330f6fea857310861a78b961feb7f64a4869f3fe1
 EBUILD wine-vanilla-6.0.ebuild 18908 BLAKE2B 3940b795b6b9ccf31f286a8efb99fa2a754da45a5201f5afad80c2dfae227d1aa07ab5bdadd7079eb5ad2f31f7f268f79ff65c8f6e18851032dec58fd3a1ceaa SHA512 64fe38e8318eaeef5ec6676629b2d45415a1effc8a95011c5db115259a515792cca4efd16adce48f750e68ff2483b68b5796788c3b79d880288c9fdbf2357dc6
 EBUILD wine-vanilla-6.1.ebuild 18910 BLAKE2B 7f8a28cfdf2b0ffbc5196ae3aa7c6b9ead6f9a9cc05e1786723149e0c6d943fcd8080362c8c3c32e9f6a06af114e749a5b460515c82d875140e4b54c24355d03 SHA512 20837bb56938d1cb5fb828b540971621f21044e495e4e2461015cdcaa5c1b14efac011741a4403f3a6e3cb99ee6402c7003ea137acfad070b18911c6a8390285
 EBUILD wine-vanilla-6.2.ebuild 18910 BLAKE2B 46e6c295e091969cd9b00580c9944f991d7556db445aa97a677014724f055b881ef09240e65e62b04dc06ffcf6625f90b1d37d6feaa39ba9d1b8d2177526c7b5 SHA512 1bf603fc84638c3f01941c27a5b78bbe07175bcfd3a58d9036b29f18b8e70919618581ccf947976f610cd9575c11eaf8bd21f52f98d2ba8716835e3e7ab6f38d
 EBUILD wine-vanilla-6.3-r1.ebuild 18975 BLAKE2B 0d00607ee6c7faaf3396aab0fbfade31f681195faf593d453702b11da214ba78b7596472d54cbd625f0e6a3c1425b4069107f1939f7e66db02af472da1a715c9 SHA512 d2e7e68d564f1d27fba83225e039f231718ea3db574b86a37364cb4f0be2faa5d91dc2dbe7fdd893ee44cf05769bc9de45f65d6b4e9244390a48db5b6600290c
+EBUILD wine-vanilla-6.4.ebuild 18924 BLAKE2B 9ea7ac06e415635987999388a87f16ab3805a6d4f1ab1e7b05009db8f328f3d19a19b57e859ab751220ee60dfc9f2625a495e37fac0e7aab04b7e43015a830c4 SHA512 2fb10b28c4b126f7101c4e993021a6485162292912e0058bb4815a558b950a7f1609eb5c7bea2aa8bc98ea597b9d08df625e89220c92d6ab7890fb9e836b6f53
 EBUILD wine-vanilla-9999.ebuild 18910 BLAKE2B 46e6c295e091969cd9b00580c9944f991d7556db445aa97a677014724f055b881ef09240e65e62b04dc06ffcf6625f90b1d37d6feaa39ba9d1b8d2177526c7b5 SHA512 1bf603fc84638c3f01941c27a5b78bbe07175bcfd3a58d9036b29f18b8e70919618581ccf947976f610cd9575c11eaf8bd21f52f98d2ba8716835e3e7ab6f38d
 MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
deleted file mode 100644
index 2efdd7b61d9b..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
+++ /dev/null
@@ -1,537 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* amd64 x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20191222"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.4 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "EGIT_OVERRIDE_COMMIT_WINE"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	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
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# 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 "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
index 625841699e98..045e3bfde6b8 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
@@ -16,14 +16,15 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
+	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20191222"
+GWP_V="20200523"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -34,7 +35,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -72,7 +73,6 @@ COMMON_DEPEND="
 	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
 	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
 	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
 	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
 	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
 	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
@@ -93,8 +93,9 @@ COMMON_DEPEND="
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
 	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
@@ -108,8 +109,8 @@ RDEPEND="${COMMON_DEPEND}
 	>app-eselect/eselect-wine-0.3
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.4 )
+	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:6.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -141,8 +142,8 @@ usr/share/applications/wine-winecfg.desktop"
 PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
 )
 PATCHES_BIN=()
 
@@ -260,6 +261,34 @@ pkg_pretend() {
 			die
 		fi
 	fi
+
+	if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
+		eerror
+		eerror "USE=\"mingw\" is currently experimental, and requires the"
+		eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+		eerror
+		eerror "These can be installed by using 'sys-devel/crossdev':"
+		eerror
+		eerror "crossdev --target i686-w64-mingw32"
+		eerror
+		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+		eerror
+		die "MinGW build was enabled, but no compiler to support it was found."
+	fi
+
+	if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+		eerror
+		eerror "USE=\"mingw\" is currently experimental, and requires the"
+		eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+		eerror
+		eerror "These can be installed by using 'sys-devel/crossdev':"
+		eerror
+		eerror "crossdev --target x86_64-w64-mingw32"
+		eerror
+		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+		eerror
+		die "MinGW build was enabled, but no compiler to support it was found."
+	fi
 }
 
 pkg_setup() {
@@ -353,6 +382,9 @@ src_configure() {
 
 	export LDCONFIG=/bin/true
 	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
 
 	multilib-minimal_src_configure
 }
@@ -373,7 +405,6 @@ multilib_src_configure() {
 		$(use_with capi)
 		$(use_with lcms cms)
 		$(use_with cups)
-		$(use_with ncurses curses)
 		$(use_with udisks dbus)
 		$(use_with faudio)
 		$(use_with fontconfig)
@@ -387,7 +418,8 @@ multilib_src_configure() {
 		$(use_with jpeg)
 		$(use_with kerberos krb5)
 		$(use_with ldap)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
+		# TODO: Will bug 685172 still need special handling?
+		$(use_with mingw)
 		$(use_enable mono mscoree)
 		$(use_with mp3 mpg123)
 		$(use_with netapi)
@@ -407,6 +439,7 @@ multilib_src_configure() {
 		$(use_with truetype freetype)
 		$(use_with udev)
 		$(use_with unwind)
+		$(use_with usb)
 		$(use_with v4l v4l2)
 		$(use_with vkd3d)
 		$(use_with vulkan)
@@ -418,10 +451,9 @@ multilib_src_configure() {
 		$(use_with xml xslt)
 	)
 
-	local PKG_CONFIG AR RANLIB
+	local PKG_CONFIG
 	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
+	tc-export PKG_CONFIG
 
 	if use amd64; then
 		if [[ ${ABI} == amd64 ]]; then
@@ -470,12 +502,20 @@ multilib_src_install_all() {
 	fi
 
 	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
+	if ! use X; then
 		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
 		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
+
+		if ! use mingw; then
+			rm_wineconsole() {
+				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
+			}
+		else
+			rm_wineconsole() {
+				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
+			}
+		fi
+
 		multilib_foreach_abi rm_wineconsole
 	fi
 
diff --git a/app-emulation/xe-guest-utilities/Manifest b/app-emulation/xe-guest-utilities/Manifest
index 44626c9ced34..f8f348340dd6 100644
--- a/app-emulation/xe-guest-utilities/Manifest
+++ b/app-emulation/xe-guest-utilities/Manifest
@@ -3,4 +3,4 @@ AUX xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch 4599 BLAKE2B 6bcbd37c9
 AUX xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch 2146 BLAKE2B 6875bf6ff48acd48cee2e590402cc546dd53df8a0861a6941b2de0d8c8caeb509f107d2b24c4e5c5d665890c15972c84c80c299eab718ec81131dc0594b6a5ec SHA512 93f5c1445b7ee449fedaed3c73a3f21b6adc0fad67d90e3bb35213749ae659ffae85dec3ddf43d4b5df21500e8b651651dd7496a2ffb8fa2d9091dd246c839de
 DIST xe-guest-utilities-6.2.0-1120.src.rpm 566881 BLAKE2B b2c727c551996f218c021d509ba1841baa07c70cbaf7660c0ec9cbeae696c4e77921d8ca12e8dfdf934a6894058c62ee6bf4e86bd1918e304cc76ee28d396fad SHA512 b945b3bf8175816b41b3a07a7dd8f0d9d2fdb1a7144448a5bb7fb4b6729736c67cea88fd45031df41abdd99416addb17fa1ee9cfe1fc76acf610cde3b3213880
 EBUILD xe-guest-utilities-6.2.0_p1120.ebuild 1503 BLAKE2B ad1bfc862229957baa6f3253cc534bfcea7e98b84c11af707445691d59070ecec3ed64323ef198353f21cb30065a7b471844537f04e65b63e0e61387aeca1489 SHA512 dfeffca4ae4c29234163d461efd1c1d20c20f9ff1545283e6966878f2a4edeaffabde845b7f040be0b535f200bfab05fadd51a89115a6dfdb72d77aa4201ca59
-MISC metadata.xml 776 BLAKE2B 549a89776c54711d874588740a6f6e425ee80f53aab06143337acfe1627b012aa6090b798875ea16c17f312596b01a6a6129e914b28de7b0cfcc23b032099e9f SHA512 de26a707e9e20f25c2a4115f6c1b960bf9c7a228ceec45ce112d06b622c5bcbf6cd84599357e836b5daa91156e10a6af24f2fb93ced24c25c89f9ad7a4579b60
+MISC metadata.xml 790 BLAKE2B 2db7ced6efa6b95f61ab92c00184ecc237367960dbe22ee98c6714762debc925c25ea20d3286fc29ed1b167f1be7a5565b7e8fe35241a01b0c2eb4b173994a4c SHA512 6706021aaa671e9f41d467b35a26f38be09620968e61f1055799f56fff49b902785de29e58c9d14ac8a8a7926d10a6f6da94bd8c486f4f629402fa78abee118b
diff --git a/app-emulation/xe-guest-utilities/metadata.xml b/app-emulation/xe-guest-utilities/metadata.xml
index b1dc4728a9d2..3ff5694597b3 100644
--- a/app-emulation/xe-guest-utilities/metadata.xml
+++ b/app-emulation/xe-guest-utilities/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>chicago@blkid.net</email>
 	<name>Chicago</name>
 </maintainer>
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index eb2dcee1ae92..7b3e58ffc5a8 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -9,6 +9,6 @@ DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c9
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
 DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
-EBUILD xen-pvgrub-4.13.2.ebuild 4527 BLAKE2B d15b849b72dc8758ee7253c2a12e24c43faad900047051cee89b6c1c51933a571430d7d9b2b50d7828f6425db16a0e1878939943f74d79f407667aed4650abe5 SHA512 2006e7c6c574cd0ba09a0c460f4469f9a3379488aaf9f54672bf67c1b6159aaeb752f06af9c57af7b69fa02b20b28fff9bc6a0688cc0d23ce1a3a8116ba5ca44
-EBUILD xen-pvgrub-4.14.1.ebuild 4530 BLAKE2B ef74a5ed5ffe009f105e48b1b19193a8ae6f115ffe665940fa9e0de29d46465675b242b6154945a10dbb5d0a89c0266adaf9f577ad74e42cad58eeff25a17b6c SHA512 44f97e79d3e13e6860f1b3ae8d504a76cdcbba744b20159592bd6721266d0d4325a88f9fb5d506f91b6c2ddee94b5f10198e18c65078f24b395f51cccdfb456e
-MISC metadata.xml 477 BLAKE2B 663101aa83713fa70e98a41985f3ec3d4c78765b862fb9df1f35ed31d1b32640bc093a0d680252d7b0116eca7f758145bb6337618ac4fea8a0ed108df83ca57a SHA512 907e17ebf2262b71644a8b2d863f5d4cdaee775026eb1a9da736a4ef003a45e8c6eaa2439184865706e57aea0afdf5f3f363e98dc63762ea8706ffad640c9046
+EBUILD xen-pvgrub-4.13.2.ebuild 4534 BLAKE2B cf49a1dca1498e54e5ee83bb1c2adfaa6ae6e2d1f620b2b0106879a47fe83dad7de8cc00defa73201dff6d24a2f2583164439a519c3b9f19f9802958ecb1d556 SHA512 9fc46f79063d73174457939efb03b08ff47546d5052b047a9424a5f8f6dfde2930aa27f7e7aa813ff6e2f5380e18d0f7fda2eceebb5aceaab7f376b116f4fb4d
+EBUILD xen-pvgrub-4.14.1.ebuild 4537 BLAKE2B 626ef6e6c219b486e50482f03399983b14266409f9287764166ae5f1eb175d5813ad3d4b33c634b652897b84c411b331886eb22dcebe984de35ea570ec000a2a SHA512 46a49ef2d89b16cb045f9070e4d3e6a7c47d1da152c7ef2c888b20078c5463b21a2d57119c9721ff57c65352304de5a601d9ba26da368f2c69170d8b4319c554
+MISC metadata.xml 507 BLAKE2B 8b88290087f82d49524b825bff3b88bb3296b752a8aaa29281918754eed27a75d9213a648e6d0b7abc1f253d2259913449c497fa40aae93e1fdfa53d6105422c SHA512 d019d0c6553ebe58679dc42634e6327ced58e73a0cbe7d5b3cd70f20b689f3042b337700cb57f2ee5a5326b6195d5cca7e5a5d48c297888f226cd8b3e7dae79c
diff --git a/app-emulation/xen-pvgrub/metadata.xml b/app-emulation/xen-pvgrub/metadata.xml
index fd12a2726425..d1684666642f 100644
--- a/app-emulation/xen-pvgrub/metadata.xml
+++ b/app-emulation/xen-pvgrub/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild
index 3eb5e78f04c0..2d85b41833fc 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ MY_PV=${PV/_/-}
 
 XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
 LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
-GRUB_URL=mirror://gnu-alpha/grub
+GRUB_URL=https://alpha.gnu.org/gnu/grub
 
 UPSTREAM_VER=
 [[ -n ${UPSTREAM_VER} ]] && \
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild
index c3980e0437ec..5b25c3a3ccee 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ MY_PV=${PV/_/-}
 
 XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
 LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
-GRUB_URL=mirror://gnu-alpha/grub
+GRUB_URL=https://alpha.gnu.org/gnu/grub
 
 UPSTREAM_VER=
 [[ -n ${UPSTREAM_VER} ]] && \
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 2f12969e548b..86053003d91d 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -28,4 +28,4 @@ DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B e0da49b39fbc6b689db47e40a4fbb4f6
 DIST xen-security-patches-29.tar.xz 1536 BLAKE2B 7723e9d971a2385f7a4a85dd63412afc41ba20991d15732423f03d0c5455c504ecccec08102edbec0db47ed019c88cc86f4146e080075d829aff03ccded362bc SHA512 eff572fed812c38bc3c014d47b951d3614bfb1255d41a2d35ddcbe9228cf9550aaf867adde0f2365f49d0d4e5229c19a78aa538eb64de7cd3d1ef5f7f0c4a079
 EBUILD xen-tools-4.13.2-r2.ebuild 16589 BLAKE2B e0dcea110a807bd7c565b41c0d3a016a04b684dfecfa01870951ea606759fa067a3f7a78d655a5decda409f54663c722c499cd98753ba8b3210f5b87efd39731 SHA512 9673f9fa78c6860688213fd21fb015111b6c23f355f89f8f63d0076adde5e87c749f7a44d53323d2fa4894644b04cc069cfd3a949265efe82e0276ddf1abc609
 EBUILD xen-tools-4.14.1.ebuild 16587 BLAKE2B 91b60db2a81fcdc88d2523bbfbf8a6125df1d66d2c12016bb48b71486946186ada12b2567f5c1d2b0f2576b3ea30bc8b439c7e7338ee15a1b482420103dac87d SHA512 237b5271694e0aa408f024de90d3672d24224d1a9e12fb779d7a820c1762579bb023543ffe3bcd27890edd71eb987a0f7b188ff2a16da2f10837261ff0ba56ff
-MISC metadata.xml 1596 BLAKE2B 049149106eb740b3ca38008d18431001f4cf27ef8ab4223cb78ba97e301292a13f39ea51c6064fb1e116404d9c52a61c0d42b921416d0a5fff0f7749e2ab4f59 SHA512 76830a62f4fe0d93df26372c67c2f1aca143e85227d86246e2c2e2aade6c0f64b62f7d7f7229612e65b5da82dd0401822317fe2607e14565a2eb9386c760fc80
+MISC metadata.xml 1626 BLAKE2B 64ae7edd26ed6c4fc3777d042dc16b7848b52d5915ce6fc024cbd3b773301ff308b364e993750153bbcd8bb92d11d3d3fbbcc923f71464924e2fddcbbb7081b9 SHA512 d703b590e650ea9e8c2d70fd118c0c1420b2a90d799669ebe32f94e552888e9f9fbda7a0a06f158fe83615e0251559ebb1c3bb475f80efd11f5ba1d50e635299
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
index 71d5db7e3eba..497a921a1ecd 100644
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 16683baeded4..3fbe3456621f 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,11 +1,11 @@
 AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3f1c0d4bf9733189808f5e1c47f1d90d1784f17fa52ca1626972c81d20c5e1ee3d42d082cdefcf67eb8dc SHA512 17208dc107f4ae4c5ec226c2ac05126817134fb6084cd8923204dc1b014e645e12c34cd11296319127e595ccbf17747931e9df78218bf49814f66e3cc6a789fd
 AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0
-DIST xen-4.13.2-upstream-patches-3.tar.xz 63660 BLAKE2B 80abc9529ff49e782b64d4b5032f724e7d95fd255c2a06b7065c693d5765e1db1df44ebd5ce00c5a1e1ff24e1e5d344b0c2e459c68282e58fa20963e208272d2 SHA512 35288a1feac1316c33586dad55685e2c6a30100795e31852f78455003ce3dd6906074bea023655ee545a97fe4a0a8ad9a05ab91fd83186e61e5b57d10aa6b155
 DIST xen-4.13.2-upstream-patches-4.tar.xz 65324 BLAKE2B 0e71e4600fffcf1341a52103a6318485c1da54101ec59dbdb9824be5a5ed1f977135a9c3e4ce48cf14922aa0a2e3ff5097dc870286e3b142d060c22d78079cb3 SHA512 3f0e41b685655c7753204862ea6b8e502ff4b4f76e4788ca07ab93a4bb3c636d24ad933c578f7c6e4c866cfb0d6b7b7234124da7c2fed0a4b34f2fbe401c56e1
+DIST xen-4.13.2-upstream-patches-5.tar.xz 76580 BLAKE2B 8eeab100c14d769174e7d935d4e081ffc2d72b771f8022ce5c31b89d860ddba5381baf55b87443dc3bc555b404595492d30bc7f2a103c77762004acfce70446e SHA512 5dd5c63267e9542626315efec94642901cff55f4a1f8148c58f86677254381242fce3d6c5c0ae72665b452441c54647d0b9a132a2a18ffb4ff7eaad86ef227de
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
-DIST xen-4.14.1-upstream-patches-1.tar.xz 11676 BLAKE2B 0d593b34e3b1b95b57c54ccc96666eb5bf36d63ba742dd9d6e6f5facdf57be62e1f8375beb23926967e6ea23c1e4fa459bb5087652716d7e45b2309440f81b0d SHA512 e530883d17738b4821fa36fd39a7597bdb42810e40740c7a3363c22945d71af80312340f6d33b18f5999498e59036f22033b7babe217bac7700702d007d5d881
+DIST xen-4.14.1-upstream-patches-2.tar.xz 22920 BLAKE2B 890cd9bcc3c72b4ed192476a913de0377d50ddeb180e0d6dc4720e86662387a699ad74b263adf2b867b2421fcf3efdcacaa17bf581643afc50c9dc7e8a3dfc60 SHA512 ca0e53f40fe23d9a6c6374b460fcc0c8063e511f03ca86c02291fcb73bf9f91594de6fd615609997e0aac2e9c59ccc8512e4151a1d2646a70f3b5bacd95ad325
 DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
-EBUILD xen-4.13.2-r4.ebuild 4443 BLAKE2B 2df57309d69ec69f73e83715e1aaf0f3a273f2adfc756d87a0939b42d1c2c2688fcc755ffd5609a7281648ba9e3ba63114503d4647cc93111bd93c925f5b75f8 SHA512 8b121636cfa76c024b7dd92a0757714133502d143d42587cec19a39514356bd75a2d0b82cb4547ac7ec06370acda9dcd27991f09fd722a79d537aaf9fdaba16a
 EBUILD xen-4.13.2-r5.ebuild 4460 BLAKE2B 8d0dda6a6c205410d844b8360d2f87de162613882c76f94ea0fde3ca39d30dd75d57b1e18963d22203f19138d3ceb1bf13a6281e8c40e213f1f749374bf73314 SHA512 4789c3808a7631c17df0194435da037ed26d48a68b179aef1638809e793d2ef761cdcc7c4d46f8186273cc9813da3f36090722fc619579affeec16ccf7871ba0
-EBUILD xen-4.14.1-r1.ebuild 4461 BLAKE2B 9f3674fcb933e69643d915a1a1954b2b43b6f99b1e38f79142733d8627b254e52c74b20455b735300719d995f2905a193883ba459bd30c9a4443ca1f880495ed SHA512 c1a2c4126a2544ea1db06d07127ef8c713c0e7be5d6c99352bb276f1e99baa5bd0fad14d2c0e3e00b0a682600be8d18e6165fa98b2fd72f3365a643efaeb63a1
-MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
+EBUILD xen-4.13.2-r6.ebuild 4461 BLAKE2B 51ec4190284c97258c5eee7769b0bd049fb63be964dc1077010a432b922ec484659e09864006a4186b0b177c9933da0bfc9e3c82cd018107ff46db5631710bcb SHA512 fc3dc7a4e67118f1d744d197111fdc8d9f74832a27d0142282fbc59f7a064421ec7e4913a179ffa293987434ac6b7d30e917c0fedb6d9c0a8f547d050c5c9bdd
+EBUILD xen-4.14.1-r2.ebuild 4461 BLAKE2B dba0b2e36c540adcef17e9ad611b15937f139cdea43732397f1825b8a2d5b03bf3c30d7b86e335cadbabf3dd4993e8a911e90789898d0900f0664e872c41c1d2 SHA512 32d97681abf3a0a9e17825e088a7221b577ec7902060c3b7a420de388c6ae48657350ec214886802479591a5111f1c6aece6430b38b5afa20e91ed07e272bf17
+MISC metadata.xml 675 BLAKE2B aee4c4775c388078e51a97212be21fee3ddd4771121a129b7ddf0e2454dc3bd91f4fa1a2ce2a2057c655a0d32ae9631c9fd29a77a247601867949be4aa79de26 SHA512 f77204ce3cffb9c453c779de4cb7e41591972c5b59567a88d02ba079bd6f827d4aec23d9ce7c28b3affcadd370858cb1e66f6448b32e0dfb795af6a1be8598d2
diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml
index 574d6261f8e3..b5a2ab082b14 100644
--- a/app-emulation/xen/metadata.xml
+++ b/app-emulation/xen/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-emulation/xen/xen-4.13.2-r4.ebuild b/app-emulation/xen/xen-4.13.2-r6.ebuild
index 4c38268d9b14..43eeeb028b8e 100644
--- a/app-emulation/xen/xen-4.13.2-r4.ebuild
+++ b/app-emulation/xen/xen-4.13.2-r6.ebuild
@@ -15,8 +15,8 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~arm -x86"
-	UPSTREAM_VER=3
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=5
 	SECURITY_VER=
 	GENTOO_VER=
 
@@ -138,7 +138,7 @@ src_install() {
 		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
 	fi
 
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+	emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
 
 	# make install likes to throw in some extra EFI bits if it built
 	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
diff --git a/app-emulation/xen/xen-4.14.1-r1.ebuild b/app-emulation/xen/xen-4.14.1-r2.ebuild
index 92af1429434d..fb4f1614c207 100644
--- a/app-emulation/xen/xen-4.14.1-r1.ebuild
+++ b/app-emulation/xen/xen-4.14.1-r2.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=1
+	UPSTREAM_VER=2
 	SECURITY_VER=
 	GENTOO_VER=