gentoo resync : 17.08.2021

14 files changed, 25 insertions, 190 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c590bef5b4a8..f2e25185c747 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/firecracker-bin/Manifest b/app-emulation/firecracker-bin/Manifest
index 486ac4afb5f7..52607181661a 100644
--- a/app-emulation/firecracker-bin/Manifest
+++ b/app-emulation/firecracker-bin/Manifest
@@ -1,13 +1,7 @@
-DIST firecracker-v0.24.1-aarch64.tgz 1427360 BLAKE2B 17d85c6843dfa90bf871d5ff7dc5f5286c7bd11559cb9a507f57fafaba7d5abbf1019239ea39529e29a8bb4fa32b9a8a44f096f1379dc2d3d801502890690024 SHA512 cbedc62e5b98cdfd6dfb565bc1b977d84fcd0fa28eb36e18922ec56c3c2dfa34c84c549c7a4e23aee9d16c53b212ef87128d42e68f1a6b9997cbec42e613a82d
-DIST firecracker-v0.24.1-x86_64.tgz 1434986 BLAKE2B a6b206042fe4dfa873cfa1da4f591242f0224d2c98b367635534497d2bf82e218c409e473be618bd2902594ea24a8c710c853f2f1a00ac96f917a100e80aec0b SHA512 b719520464e3d5c9ff072c73639af71895bfcca9ac4964f2a255ed2d8d3b264a92566f7b87078c163c0f1ce21b9d5bd11cb38eb7cb784c5e18581ee531a0bcaf
-DIST firecracker-v0.24.2-aarch64.tgz 1429004 BLAKE2B 8d5624f6f6f154678ffab945bbb293e3ab53c75fa324273d9cd99366d78230aef1ce0a23c0b8efdca9fd87edabc0e196dda0cacabf7ebb33ec86edf7c46dd92e SHA512 9bd83d278c3f4f294c4391aac1bd82712bde7190ad706e1b84a0ec9ad489c09f5fa77bd448a25a08b932230b38e44b3dbcdcc37b2ccacfd87d37c7ee65e6c1c6
-DIST firecracker-v0.24.2-x86_64.tgz 1434481 BLAKE2B d2b81e2b3341317f296c63f14b2699dbf207e2e3a83871e38ef1666c105112788308c773afad61a85f7c6f4009f2373c80f12a52549120d92a42bae54891bf59 SHA512 2a574276296685117acf4e1d425ca75ecb8ad06680ae81e183d73853ff57cbca2f4cf4f42cb013d8d88d18146c0d84d2b098829ca5f6e9402213fecdf539a283
-DIST firecracker-v0.24.4-aarch64.tgz 1427501 BLAKE2B 98a9725cfa6fca607081a5c2461980b02417400a58ddce872a45c09b14559b41998dc6707de280c399535262d29dbd5120d5e2eff1b8403f84d66625e97700aa SHA512 fe2d8441a790310f0fecd82fc316e214d9d03f182f3837ac4d5464101954053c5a98976b7178ffe7e6c1e0fbc4a7e7203ccd92e4f8bc74fbccfd889adc7e43cc
-DIST firecracker-v0.24.4-x86_64.tgz 1435102 BLAKE2B 893d1c8392f76cc45668cc8823daae2895f675cbcdffb3431fe51495964611f61263caeaa7a149c5dd0f29122e8a6f8705e66166b1c6a192c9c97d49b7f915c8 SHA512 42f316de6bf1444cc7163b02dedd1492c21d0583da1a2a5193e3941cc1d6a59c3c79d275df3d903914f30d021a3e6c7d8f7338c12c088426adf22045750b7db3
 DIST firecracker-v0.24.5-aarch64.tgz 1426237 BLAKE2B 11e260d4afcd5f5ebabeb5c773060250a9205a8110ea4f0915d1b8b3eb7fc448a2a99159d73d2bfaa9b1e9ea88258996de73e296b9916c533f9b7eac8c77fc15 SHA512 518f122f277a293b54bd870bb166847e4d7fa87574e47d3cd606d35e260ebd7359806922e09fb86cf16fb2ee3969bbf68b40538150e7064c866710c1803fada8
 DIST firecracker-v0.24.5-x86_64.tgz 1432963 BLAKE2B 70e16dc651ae1071b9f223f0a21eaba6a8ad515d75847698cbf67ac73053cb8c52d67cd46a315e5681dadbab92ecc4d0d43ecbba9928dc2f52a5168c0a889a97 SHA512 746f1af7a37b2ecdd86faee75ee0cacf01aa80aa6f060cc75761f930df0da9a6f6597fea4235035ba10f6198909b5b2f7a834571c52d73e647611f9be8fa0967
-EBUILD firecracker-bin-0.24.1.ebuild 2472 BLAKE2B c861aa7b0ec6df2acfad0aea68d3cec2b51b60bf2443a8e30ba0721a9ffc8294ef935037d02837d7944a77e4addf0a575409606dc4ee7d22d9dd23b9c882580c SHA512 bd9eac40684cae9d08954088f8d6e801397a976d6babc923ecb263179fb2e7635092469cb980a9ef8bf95613bcd5d3dbf44a3c5de607ee21a3d5de61ad2ffe4e
-EBUILD firecracker-bin-0.24.2.ebuild 2442 BLAKE2B d8ff1267cc871f8878867c9dde0841c46f6898c562fe0170fae71c49083ca3716c2025e594c6ce1955240af99b3a7067b562e7e6e1aabb27ad2ebb91c337a248 SHA512 b8ea078a51f85b419bd5b567cb9e59d18a952f19f230f2bc0db05028d407bd1d05b1b7b0a057cd731b026a7cc25242c94e5c551ce1e728948151e0f8612c59cf
-EBUILD firecracker-bin-0.24.4.ebuild 2472 BLAKE2B c861aa7b0ec6df2acfad0aea68d3cec2b51b60bf2443a8e30ba0721a9ffc8294ef935037d02837d7944a77e4addf0a575409606dc4ee7d22d9dd23b9c882580c SHA512 bd9eac40684cae9d08954088f8d6e801397a976d6babc923ecb263179fb2e7635092469cb980a9ef8bf95613bcd5d3dbf44a3c5de607ee21a3d5de61ad2ffe4e
+DIST firecracker-v0.25.0-aarch64.tgz 1747986 BLAKE2B cbfbe04326f78491fccbde69ae28552db255ef88b1da4a6d3ba62fd8aac34e935677e7fc8d71d8efa56f87f764dfd17b3da6ff688fd0602f0b414060a402c0d2 SHA512 2cc1882782e26492979c06fef06f162d4f1d20a8e1cacc2680b3ea54d6f028b951c6a14f1a3d4169079cd407f9e6e77c49e64b8dbebd4e329b683a1f38f90298
+DIST firecracker-v0.25.0-x86_64.tgz 1773525 BLAKE2B e870c7d021f6c5b960c52883ab659fc33fec3b39314ec1ca5448f02b9596e88192831639c6817048b97954d28866eaa7b94b50821a6c991def345bce3b47b9bb SHA512 ffd3e9dfe7e2b29ce6c9ef61504056844d7081850dfe484ddb207d7339242819adf6d7a43e9c812c032fcf606daca8d10c125071d11dd5cfe431de41eb557c0f
 EBUILD firecracker-bin-0.24.5.ebuild 2472 BLAKE2B 21f2b037baf114eaa0e8593efd48669db00742919a5bc8f102f9de0d5d67fde010ff8eb9b78751d963ce92754f87d87bc253ac1b7b903bd55ddf6e130cc49283 SHA512 5127b2ba73fae49b8f8a4e3fc4163ef1253a4b41323df9c149b0be8dccb8bba30b13470c0894a254fec20820bc31382a23a5cd2d22adee44486822781e8b8b1c
+EBUILD firecracker-bin-0.25.0.ebuild 2472 BLAKE2B 21f2b037baf114eaa0e8593efd48669db00742919a5bc8f102f9de0d5d67fde010ff8eb9b78751d963ce92754f87d87bc253ac1b7b903bd55ddf6e130cc49283 SHA512 5127b2ba73fae49b8f8a4e3fc4163ef1253a4b41323df9c149b0be8dccb8bba30b13470c0894a254fec20820bc31382a23a5cd2d22adee44486822781e8b8b1c
 MISC metadata.xml 415 BLAKE2B 2e3287fc3b97cbe52c6ae404b2bf3c691e162a8f44ff75f720a56679e52327c0817860251d01e3bac8971cfafb7e9536f3c277fa77316547892361c6e669b8a4 SHA512 9762208fed64d628db75d544de99085643aa2fe1cb44c09bf93a2d3224932abeef7351d1332709e9851ab2346224d573d607171db64086c08cb56bfe0e25425d
diff --git a/app-emulation/firecracker-bin/firecracker-bin-0.24.2.ebuild b/app-emulation/firecracker-bin/firecracker-bin-0.24.2.ebuild
deleted file mode 100644
index a5c7b379e5d3..000000000000
--- a/app-emulation/firecracker-bin/firecracker-bin-0.24.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="Secure and fast microVMs for serverless computing (static build)"
-HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
-SRC_URI="
-	amd64? (
-		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-x86_64.tgz
-	)
-	arm64? (
-		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-aarch64.tgz
-	)"
-
-LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RESTRICT="test strip"
-
-RDEPEND="!app-emulation/firecracker
-	acct-group/kvm"
-
-QA_PREBUILT="/usr/bin/firecracker
-	/usr/bin/jailer"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 4 14; then
-		eerror "Firecracker requires a host kernel of 4.14 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 ~VHOST_VSOCK"
-			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"
-			ERROR_TUN+=" virtual network devices."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			ERROR_VHOST_VSOCK="To use AF_VSOCK sockets for communication"
-			ERROR_VHOST_VSOCK+=" between host and guest, you will need to enable"
-			ERROR_VHOST_VSOCK+=" the vhost virtio-vsock driver in your kernel."
-
-			if use amd64 || use amd64-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
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	if use amd64; then
-		my_arch=x86_64
-	elif use arm64; then
-		my_arch=aarch64
-	fi
-
-	newbin "firecracker-v${PV}-${my_arch}" firecracker
-	newbin "jailer-v${PV}-${my_arch}" jailer
-}
diff --git a/app-emulation/firecracker-bin/firecracker-bin-0.24.4.ebuild b/app-emulation/firecracker-bin/firecracker-bin-0.24.4.ebuild
deleted file mode 100644
index c957b4a10f3a..000000000000
--- a/app-emulation/firecracker-bin/firecracker-bin-0.24.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="Secure and fast microVMs for serverless computing (static build)"
-HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
-SRC_URI="
-	amd64? (
-		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-x86_64.tgz
-	)
-	arm64? (
-		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-aarch64.tgz
-	)"
-
-LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RESTRICT="test strip"
-
-RDEPEND="!app-emulation/firecracker
-	acct-group/kvm"
-
-QA_PREBUILT="/usr/bin/firecracker
-	/usr/bin/jailer"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 4 14; then
-		eerror "Firecracker requires a host kernel of 4.14 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 ~VHOST_VSOCK"
-			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"
-			ERROR_TUN+=" virtual network devices."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			ERROR_VHOST_VSOCK="To use AF_VSOCK sockets for communication"
-			ERROR_VHOST_VSOCK+=" between host and guest, you will need to enable"
-			ERROR_VHOST_VSOCK+=" the vhost virtio-vsock driver in your kernel."
-
-			if use amd64 || use amd64-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
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	if use amd64; then
-		my_arch=x86_64
-	elif use arm64; then
-		my_arch=aarch64
-	fi
-
-	newbin "release-v${PV}/firecracker-v${PV}-${my_arch}" firecracker
-	newbin "release-v${PV}/jailer-v${PV}-${my_arch}" jailer
-}
diff --git a/app-emulation/firecracker-bin/firecracker-bin-0.24.1.ebuild b/app-emulation/firecracker-bin/firecracker-bin-0.25.0.ebuild
index c957b4a10f3a..23b5841d8c5e 100644
--- a/app-emulation/firecracker-bin/firecracker-bin-0.24.1.ebuild
+++ b/app-emulation/firecracker-bin/firecracker-bin-0.25.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit linux-info
 
diff --git a/app-emulation/podman/Manifest b/app-emulation/podman/Manifest
index f1c8a7da4c38..7f6c303bb688 100644
--- a/app-emulation/podman/Manifest
+++ b/app-emulation/podman/Manifest
@@ -3,6 +3,6 @@ AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 DIST podman-3.1.2.tar.gz 10488539 BLAKE2B 8536f6856e436467541f7714e75d5055545e1514604d6541671894117e752609a9e791355c162ef8fcdbc0cbd992823ecab8a3ab760bab3a469d9768b6b008e4 SHA512 fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d
 DIST podman-3.2.1.tar.gz 10754823 BLAKE2B 6c4e7292ba30969ef8632ad514a87650131a05baafab65d49fe182bddaa1b106de5766ec6677b73d0a2e5166c56f1439de6c800ca7de8ac59e026de1286bf2d4 SHA512 8fa4e2a72d1e655c600fa4dc7ad2366975314a154ff9fa7496622da6042e54c6fe93aca0344e6615e2ce3d400c1bc5de7d8462df45f950a119c3303b3ae520e4
-EBUILD podman-3.1.2.ebuild 4661 BLAKE2B a25841f4d359ab35df46876e4da44105a9226d21d36449d204f768ba3ab1cfe83267910954ba0791df8f9ec56ae68d2419ca52e620fb0f3e3a5070cac45663c2 SHA512 da4715f8e4ff516cd1c0663fe24b17aabd4bc72c9fa1183153f8cb5e42181ce6f314e17bb5337d2d71ecb558b7d43088aa5643ccce1e93201f8237ecb7b91a67
-EBUILD podman-3.2.1.ebuild 4668 BLAKE2B 0cefb7b4aef11ed843d5bf87e04ef6d1b18055df05f663d221ed75dd386f5fa01869ff5ab6a2eeb1ced1dc0cd27f6f0a12e017043ab0d74626348a9be888561c SHA512 5df56298b58a569f2739babfa38597f78fcca05fdabbd80ce3bfbddd26bf2164cb9741ed96ff4e00385dac6395d47044d391d0d50ca8ea25d6ad3b42d7703a1e
+EBUILD podman-3.1.2-r1.ebuild 4701 BLAKE2B d6f52c64327f9d7a965e7eb6128642ed9320b7936041a767b6cf7fbb2b5ec9964ec20881d42d7e79dc819ff7a95d6349ba57deddea61f185e4f7038caa8f2fb1 SHA512 f4a551673e2e2814f912229ff4d79b5f4ceba7ec2569c37db3e26e9ad7f05cbc7d371bdb95848a15ec504722bd938ec0a931fa0b01fcb55668519777befca9a7
+EBUILD podman-3.2.1-r1.ebuild 4708 BLAKE2B 90840547fa6bdafdfc30a7ae71b0f5be3957a2eb55f35e10db91fb5b9d004965a01ddfa4070630f189a57539a5806b2fdbde60a9bdab3cf526b5199876305619 SHA512 6f40c8c41821f0637aba52daba9a986ef148c4f239edad660bcca406040308d0a84a5f9b1d18c87f5247329ec896d54adc8def0c24a677b7fa73ccb0e50c577f
 MISC metadata.xml 1160 BLAKE2B d56944aa9a0b3793aa581ea68233ec7b29c7caec3042aae9985d1b228e5ba205a7a631c61d31cef923e38714c934fbaf3202d5a8cf260b78f78fafe81730870e SHA512 0b1e63e5cad075899045c876d6dc93638eb36afd01fb7acef59b59c6795d767f250926cf77789f159481a7efdde09848d2a63fb7452d28ff250146d16a289064
diff --git a/app-emulation/podman/podman-3.1.2.ebuild b/app-emulation/podman/podman-3.1.2-r1.ebuild
index 1ab7287d3c70..ce8fb2e74712 100644
--- a/app-emulation/podman/podman-3.1.2.ebuild
+++ b/app-emulation/podman/podman-3.1.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 EGIT_COMMIT="51b8ddbc22cf5b10dd76dd9243924aa66ad7db39"
 
-inherit bash-completion-r1 flag-o-matic go-module
+inherit bash-completion-r1 flag-o-matic go-module tmpfiles
 
 DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
 HOMEPAGE="https://github.com/containers/podman/"
@@ -140,6 +140,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	tmpfiles_process podman.conf
+
 	local want_newline=false
 	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
 		elog "You need to create the following config files:"
diff --git a/app-emulation/podman/podman-3.2.1.ebuild b/app-emulation/podman/podman-3.2.1-r1.ebuild
index 26de438a63d5..090d5367af64 100644
--- a/app-emulation/podman/podman-3.2.1.ebuild
+++ b/app-emulation/podman/podman-3.2.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 EGIT_COMMIT="152952fe6b18581615c3efd1fafef2d8142738e8"
 
-inherit bash-completion-r1 flag-o-matic go-module
+inherit bash-completion-r1 flag-o-matic go-module tmpfiles
 
 DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
 HOMEPAGE="https://github.com/containers/podman/"
@@ -140,6 +140,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	tmpfiles_process podman.conf
+
 	local want_newline=false
 	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
 		elog "You need to create the following config files:"
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 56e5290afcea..3c3f0706ca1e 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,16 +1,16 @@
 AUX wine-staging-6.12-winegcc-equals-args.patch 666 BLAKE2B 1546e146a5942c46c01e72d06693e0875dc84483159a404d1a13824b29e2539f2abe95f2086509de049ef0477a0846be7149e82949f5c55aa5c8da925679773f SHA512 6377b3f86966a19c1129c75da6e2bfdbee2c2ee7d7c38460778239adc01fd56328a20b74b9c73d5b757f0d53abc91bc498d71f988eba316267bb508234a98a8f
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
-DIST wine-6.11.tar.xz 24599644 BLAKE2B 47b8eefadd59e649ac331ee236b90dfffd86ea812699f3d804bd3a7d939d099c88c4b19cf8d8e0bbe2463298abe398528c132443350f3d5eba0d23e7a3a2889c SHA512 d041ad99b6311f99df6ef40a64bc393acdc77ad4bf5f28111ebb88c133c3d338aff18f129fb30ae38cca24bf579834d4e6c7d252d5391f35b1ee81a91cc70c21
 DIST wine-6.12.tar.xz 24666960 BLAKE2B d8f33ac0d15977c1e0c206662c370feac351c7399c91cf5669fce50e60684ad85b40244925b4d304b540f5a78edc19b4ee32fe362250f8c390347d71320a09d8 SHA512 6d5646c44e656a88eb25174ce16038a8b0e1495c3deed8e959825cb26059fdda6e6519afeaeb28e4070fc5e05d7a3e1e5812ef09c31875f14f9233ba6a52f14c
 DIST wine-6.13.tar.xz 24704408 BLAKE2B abd79fd0d2a364fd6b7c2713924ad9883cf62e0febd7653984ce7520f41eaad71c06e0874ff46343ac7c253abb7d5e026b878dcf40235918f075e2bf7da0b8da SHA512 7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee
 DIST wine-6.14.tar.xz 24721316 BLAKE2B 3965d4071006a54f595baf329c1b238c4faa506d60597cfb5f8ccb127b9881d34d66e89cbdeff0d05a5e4a203a541edea8953565e2edf464ce4d2bfbf5e7a437 SHA512 261858dcf11604a6078b39faf64bd05288194647f8397efe03abcda1934ec5452e18f85dbb269e728ef532ac8ad39af5bbf5d8603f3598a20e2ef16f60405581
-DIST wine-staging-6.11.tar.gz 9672754 BLAKE2B a2d77fcfe198f9c474bb754b02c3e279faec73a30678b899aeaab53cba38b74bf43724d5b1f3d46dfa7a502b0ce637d5908dea09b386009acb937d1033445d99 SHA512 b9b6f206d7a37699887a9bd65c30b9d2fc333b507461dbd532fe17db881db1e79ef5620ce2421cdde8548411924fabba0f98123342f30c8d93a019b3a2125303
+DIST wine-6.15.tar.xz 24751680 BLAKE2B f1e8df4f6a65f5776b260edf5a12a48810b24ea668be5ef8b405b64a057a16329a30d0b295eefb8f79d378faa243c20884de543e96213ed5ee22b6c752dab028 SHA512 bb4420a6fb0455aaab2f45354ea470acba9feeaea07b6c2cbf8afd49a6ef97bfc794cee330ecb12fb2098994738227d149cd5685d29310bb6cd0ed25d5fdc8bf
 DIST wine-staging-6.12.1.tar.gz 9658943 BLAKE2B 9ea46ef75f2fd42790da35631893d63471980794238862fab23f06433ecb6adbdd204de49b61f33e7600020d9b3156889709bcd58810f2f332ee890cbb17bd03 SHA512 d92f4e8e3cc81e9ede21135f35679d1b2de07bf75f4fd3878551cae74cdf5165c62573fd9e143458535565e21e8888f7f61cc413fdcef24f8958ac2de366a10a
 DIST wine-staging-6.13.tar.gz 9658122 BLAKE2B cce777895de69df8c659f010e432ee1d1f1e13c79d5453f4460e63e2572aaa7a9c92786170707c5616a8d182138822c0c6e27897706f919daf5597f6b595e478 SHA512 83a40b5a344db334541d94d58d287a1b8ff616114051129db20ac6b0365004a8753ec8d77a16da54ac26400eaa3e2d147d50a5ac8e17203898eb61cb06ff1f0c
 DIST wine-staging-6.14.tar.gz 9658088 BLAKE2B d64bc0476b3d46b9ba812c956bb1eab1e4c3ec0dbd2145ae1f38c95ebd9b7151222e375690c1bd601f3416f362e50ea3f670e9940977005dc67623de22e82485 SHA512 5b4db5c1af316c8e18e2e318152a44e45521dd939e3a341dd533e819263109237c4fd0e25ee2b23bb7cc75f4c4afd7d8900b23d83f955e4ff56ee5fe7aa84fd0
-EBUILD wine-staging-6.11.ebuild 22003 BLAKE2B f325adbe8b0047c01bfce27cafd46a31adbc9b73193f8b1276758a21ff15fd6bccc875a9b41365b3ff0cead2d9999de958de12eeb9edb37a263bfbdede2fe07a SHA512 b57148c1628c8cc4d2a911bc2585e64011c2269bac1f5a2e21a729102811fb75439cf5d902311ea014594efd9651a0d1dd2dcac15eaa4938601c171f984e7624
+DIST wine-staging-6.15.tar.gz 9654539 BLAKE2B 943cebf79bfe906a9dde42cfae13443059d89cd8996a2d25fad685796605a3a45b05f960c9dfb05d968ed919a23b273ecc56aa4fcd98cc38dcc45c22813d830e SHA512 652e8319e4a06f64b7e4c05a139194b6b7189777632d26d79a3160447339cc5a93b42d810d8379eb7821485ccbbe8cd8e16e09e5223886027fae2f7737b8a115
 EBUILD wine-staging-6.12.ebuild 21999 BLAKE2B a55e122e3137af8e2a6d1869aadeec0991d6b92f00f38f89a21c0234a1759247050632a86fe92ff971f3e0c15a454bb8591089887d89c011cc6136b987f4aac9 SHA512 8dc858b772310f205c7f7f3f8e0d971a45b09b4ecb78429f1da4c2379c9acbb7da7415718f82d18284d3ec4462255e0fa8fa560ec5873652c8eea81d438e2243
 EBUILD wine-staging-6.13.ebuild 21995 BLAKE2B f68471e5f6caca5bcb33a0119fd149f107c92b2d7950b9b0b28d07ee1ab077eede74662bc79a59d222ebd6e255b7c9be90471797d455ce2f0bd0937720cd42ff SHA512 160a3b7bc2e04c68b6b1c4b7a5c5e26e38ac2795f021628c05c8aa625373426fdaff23ee4843cbb10bf126ac71f1641212cf65cea1262224d3bfd921458f4a31
 EBUILD wine-staging-6.14.ebuild 21926 BLAKE2B 8c37ab954d9b015068d617ad9a22ba8025ef3a7f30c78335b782da14e707f5032dd1f9ea55c4cc7582ffdcecf367dce5924626b4df1e1afbf9ff3ab496b59abb SHA512 57a2eb3cb33bdb360c6dae8ba258b3d5c308c9262df68a87db36f5430f682ad54e3946d6286cfb592ac37ae761cad9065c458687a5100ee01b24d2f75fe86689
-EBUILD wine-staging-9999.ebuild 21926 BLAKE2B 8c37ab954d9b015068d617ad9a22ba8025ef3a7f30c78335b782da14e707f5032dd1f9ea55c4cc7582ffdcecf367dce5924626b4df1e1afbf9ff3ab496b59abb SHA512 57a2eb3cb33bdb360c6dae8ba258b3d5c308c9262df68a87db36f5430f682ad54e3946d6286cfb592ac37ae761cad9065c458687a5100ee01b24d2f75fe86689
+EBUILD wine-staging-6.15.ebuild 21892 BLAKE2B 7a7deaa07c9207e478a9d0456fb4394e64ebb80a7178c7f6438dc15296e78f44f4501b4cd89e069838d2902922d08540581028808deaed381824924cef286943 SHA512 d5e0e08ffcc02605a2ddbe9fae1bc395222b4f0dc9b00f55a5f4d8de809c674ac97fd6fca11fd1a61f2bbf10e4babf7a0106a8ff849e30da21c27833a33db8e6
+EBUILD wine-staging-9999.ebuild 21892 BLAKE2B 7a7deaa07c9207e478a9d0456fb4394e64ebb80a7178c7f6438dc15296e78f44f4501b4cd89e069838d2902922d08540581028808deaed381824924cef286943 SHA512 d5e0e08ffcc02605a2ddbe9fae1bc395222b4f0dc9b00f55a5f4d8de809c674ac97fd6fca11fd1a61f2bbf10e4babf7a0106a8ff849e30da21c27833a33db8e6
 MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033
diff --git a/app-emulation/wine-staging/wine-staging-6.11.ebuild b/app-emulation/wine-staging/wine-staging-6.15.ebuild
index b8f90b4648c5..1b3a52f79703 100644
--- a/app-emulation/wine-staging/wine-staging-6.11.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.15.ebuild
@@ -96,7 +96,6 @@ COMMON_DEPEND="
 	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}] )
@@ -134,7 +133,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:6.2.0 )
+	mono? ( app-emulation/wine-mono:6.3.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -528,10 +527,9 @@ multilib_src_configure() {
 		$(use_with vaapi va)
 	)
 
-	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
@@ -572,7 +570,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name *.la -delete || die
 
 	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} \
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 99423da3b703..1b3a52f79703 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -96,7 +96,6 @@ COMMON_DEPEND="
 	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}] )
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 6b0e27f50db4..7057ba1e0a11 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,15 +2,15 @@ AUX wine-vanilla-6.12-winegcc-equals-args.patch 666 BLAKE2B 1546e146a5942c46c01e
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST wine-6.0.1.tar.xz 24210540 BLAKE2B 2075e59024e75594e0be0851db33981ebfcc57477bb9864055a938db0e39b8480f3c501b1d1fc39a9eee52303ad71ef71d24a0fb546697eecf3bb098f13317f1 SHA512 06b720d6adbbb7e2f15b963e4f3f1ff06e6d0d3973064d866ae720e6380bab8881fd1ebf16665435f5f7976b2c6dc72fd20631678a28e9d4d7b068c30cd22bb0
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
-DIST wine-6.11.tar.xz 24599644 BLAKE2B 47b8eefadd59e649ac331ee236b90dfffd86ea812699f3d804bd3a7d939d099c88c4b19cf8d8e0bbe2463298abe398528c132443350f3d5eba0d23e7a3a2889c SHA512 d041ad99b6311f99df6ef40a64bc393acdc77ad4bf5f28111ebb88c133c3d338aff18f129fb30ae38cca24bf579834d4e6c7d252d5391f35b1ee81a91cc70c21
 DIST wine-6.12.tar.xz 24666960 BLAKE2B d8f33ac0d15977c1e0c206662c370feac351c7399c91cf5669fce50e60684ad85b40244925b4d304b540f5a78edc19b4ee32fe362250f8c390347d71320a09d8 SHA512 6d5646c44e656a88eb25174ce16038a8b0e1495c3deed8e959825cb26059fdda6e6519afeaeb28e4070fc5e05d7a3e1e5812ef09c31875f14f9233ba6a52f14c
 DIST wine-6.13.tar.xz 24704408 BLAKE2B abd79fd0d2a364fd6b7c2713924ad9883cf62e0febd7653984ce7520f41eaad71c06e0874ff46343ac7c253abb7d5e026b878dcf40235918f075e2bf7da0b8da SHA512 7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee
 DIST wine-6.14.tar.xz 24721316 BLAKE2B 3965d4071006a54f595baf329c1b238c4faa506d60597cfb5f8ccb127b9881d34d66e89cbdeff0d05a5e4a203a541edea8953565e2edf464ce4d2bfbf5e7a437 SHA512 261858dcf11604a6078b39faf64bd05288194647f8397efe03abcda1934ec5452e18f85dbb269e728ef532ac8ad39af5bbf5d8603f3598a20e2ef16f60405581
+DIST wine-6.15.tar.xz 24751680 BLAKE2B f1e8df4f6a65f5776b260edf5a12a48810b24ea668be5ef8b405b64a057a16329a30d0b295eefb8f79d378faa243c20884de543e96213ed5ee22b6c752dab028 SHA512 bb4420a6fb0455aaab2f45354ea470acba9feeaea07b6c2cbf8afd49a6ef97bfc794cee330ecb12fb2098994738227d149cd5685d29310bb6cd0ed25d5fdc8bf
 EBUILD wine-vanilla-6.0.1.ebuild 18929 BLAKE2B 18385f9f90c7b1bfe05c2a497438cdf972a20cf1c4cd0ac13d38bada90cb6edd0ccaca9474e0ec70ca330afef3774165d0f6e9444e54275921503820bb6798fb SHA512 a252c8d5ae1d26924194ca75ae154be97aab1cf4dab4600c7d4992766ec4a2a98e5a403d8c9b55e7d0b91f9fa24e34729e8b5ce7859d3dbf9ca3eca58c7bdaa3
 EBUILD wine-vanilla-6.0.ebuild 18930 BLAKE2B 8aae443e03983edc1f972805d62af4e131fec25163f478851587bbf106d366cd6b64f8b789cc3c12d66d74072b70a38706f1a2045c8dcf526f63e16473af944c SHA512 f155ff81b2a51bc570f6d126b7052b862284463e375346b787a580e663319598424d33e48fd7ab5ac7116675e09a30fa96ae6976ced7890c01fefbf114830239
-EBUILD wine-vanilla-6.11.ebuild 18899 BLAKE2B 18e25525d7ac893717e1107ce765369795d1a0afec1e479c498255d9980ae7b5455efe192e695a3f44fbcd2e14a0afa76ab40e6cb2b7af6b48053cee8883f4aa SHA512 c82e0f327ab194444b3487574eb17a5e398cb7d272054317095949a2b3935fb99d2255ad9b2ef9def11c3ff1dd5656588b66bf4101013e1b641183ce2a2e8b2c
 EBUILD wine-vanilla-6.12.ebuild 18966 BLAKE2B ff96fc3b65e63a4435dfdc855660196374491bff091da0cdb953ebf050c5fa50e1056537d87b40f0c75ee9680f8ceaabbd74d29d87a0187cf03e368ba85ca82b SHA512 17b6509df64baaad62fc917cc2191ef0a65345eadf62fc813e09a121de2ca19751f454ac1e90d88d3b3d3f3409423097f30f3a7ed9b4f45ded386b5fbd147e85
 EBUILD wine-vanilla-6.13.ebuild 18966 BLAKE2B ff96fc3b65e63a4435dfdc855660196374491bff091da0cdb953ebf050c5fa50e1056537d87b40f0c75ee9680f8ceaabbd74d29d87a0187cf03e368ba85ca82b SHA512 17b6509df64baaad62fc917cc2191ef0a65345eadf62fc813e09a121de2ca19751f454ac1e90d88d3b3d3f3409423097f30f3a7ed9b4f45ded386b5fbd147e85
 EBUILD wine-vanilla-6.14.ebuild 18897 BLAKE2B 39847117b0a7d36dc30292780af1b5633ecbd617961a3991a950f0a3f440270c2811df7476bb125edc5465e81a250869d7680e3d5f8225efc9ebef460bf4b446 SHA512 f58436347505b474e01b827c5c3d0565bea1716c9b2a2cd767cfc82327d36a7837eced155d6db164cbb4922ac66287c74b808f3cb14e7b2ad5c34cca1a64f53e
-EBUILD wine-vanilla-9999.ebuild 18897 BLAKE2B 39847117b0a7d36dc30292780af1b5633ecbd617961a3991a950f0a3f440270c2811df7476bb125edc5465e81a250869d7680e3d5f8225efc9ebef460bf4b446 SHA512 f58436347505b474e01b827c5c3d0565bea1716c9b2a2cd767cfc82327d36a7837eced155d6db164cbb4922ac66287c74b808f3cb14e7b2ad5c34cca1a64f53e
+EBUILD wine-vanilla-6.15.ebuild 18863 BLAKE2B c790d8ca48bda51cffed0cb2ae0f2884f6c2196dc8b0f04fbad9c77c607a1b78cd78ad385e6d196ecaec6a0085ce6ddb1f55695d16f35d9eb0a940c71916dc66 SHA512 9e6fd1d980a2d39ad2ed55e6b9e179776391b2dc0e8d5d9749158d78894d44c75354a28ccec9a3ecec015c2ebce49d939421547c42fa11e41020650a882edef3
+EBUILD wine-vanilla-9999.ebuild 18863 BLAKE2B c790d8ca48bda51cffed0cb2ae0f2884f6c2196dc8b0f04fbad9c77c607a1b78cd78ad385e6d196ecaec6a0085ce6ddb1f55695d16f35d9eb0a940c71916dc66 SHA512 9e6fd1d980a2d39ad2ed55e6b9e179776391b2dc0e8d5d9749158d78894d44c75354a28ccec9a3ecec015c2ebce49d939421547c42fa11e41020650a882edef3
 MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.15.ebuild
index 834f66e2ec07..7b3156ca675a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.15.ebuild
@@ -79,7 +79,6 @@ COMMON_DEPEND="
 	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}] )
@@ -110,7 +109,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:6.2.0 )
+	mono? ( app-emulation/wine-mono:6.3.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -492,7 +491,7 @@ multilib_src_install_all() {
 	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name *.la -delete || die
 
 	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} \
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 6f3f1c572f47..7b3156ca675a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -79,7 +79,6 @@ COMMON_DEPEND="
 	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}] )