gentoo resync : 31.05.2021

29 files changed, 202 insertions, 109 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index cf9e36932073..7f0b898fe376 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index b1007a33a52d..17c327f35e38 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,3 +1,5 @@
 DIST buildah-1.20.1.tar.gz 11522195 BLAKE2B 2fe2aa9ad5c2212b98be5bced24b6aee39a43ab2c1b28c2c1729cce2b8cfe5920ecb64f013c28d870c6b8c9b369630f83e27dc7698eb66b3e368ef0bff4cb3ed SHA512 22495d9f0da1d6061ddb41e4cecfdb2108c152262798d6c959fc524870160f15ee486bcc37e262e571c64dc732e852f05e6c4b9331bbdef4150bd56997fefa83
+DIST buildah-1.21.0.tar.gz 11693220 BLAKE2B 1f281830ca348e55e9cc2e55dd92e8372174f736c6e8a7ae4de1f5c3279bc272036cf65a2946a143df6e1f282461d347f26c361894b83399854cf900e9f2cc71 SHA512 2ce6afceadec37f54f7f80562969cc382267dabc4fa5a89a09a211326e403376d209d89162333337af8602cb5c551eb446d3c9fac26f516fb8d354a7b5b77472
 EBUILD buildah-1.20.1.ebuild 1142 BLAKE2B 66e377badc4f4ab69dc41f0c04a88a92c7114f5a0171359898f3c8061dc04bca813f627cdf88390a89900d07f7ea8d89adca952a0434a0321cfc824534a6da46 SHA512 5beeba858d55b381e7de141256c6a3f07d4bad59367b3957977871b27105f455a4535a9152909a72c6bc11bc121cff5c5eef901a26ad6c5fa2f4497352f4bf84
+EBUILD buildah-1.21.0.ebuild 1178 BLAKE2B 9e6bb617764112b169d3c7ca3e40dc277954a55add0b04fbfe3856dd07ee7b19c9f00b0b5110a1d44b2b67e744080675413c5b9391ba0827c934a909ae72e05d SHA512 3ebbef12e29c24a2c30f5225cce157dbd5fe3d007f99855ffea5ab739ff005241f35fe5f3ca0834b5bf7bff75367523d56e859e4ec88bac9a28adf75d3992f49
 MISC metadata.xml 327 BLAKE2B cd14ee5c563ac21da34ce7728d2d12b797374bc43c50f4a9923d773ae4e010d4930793a0f0ecf610bb798fb3f1b7cd567944cf9895258e9244c3852969ac2406 SHA512 bed26d87edba20ed9385633b70b8bc23fc046ed95aa9b608400933ed4199594f6d0461854060a68b42d33a9b7be0d1b61f52e22e0d3b6d2c2248f58442094711
diff --git a/app-emulation/buildah/buildah-1.21.0.ebuild b/app-emulation/buildah/buildah-1.21.0.ebuild
new file mode 100644
index 000000000000..851a28962c8a
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.21.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=5e3515c5
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="selinux"
+
+RDEPEND="app-crypt/gpgme:=
+	app-emulation/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+	sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
+}
+
+src_compile() {
+	emake GIT_COMMIT=${GIT_COMMIT} all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin bin/{${PN},imgtype}
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index d2b026dd47ba..4bdc7cae272e 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -2,7 +2,7 @@ AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037
 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
 DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
 DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e SHA512 f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070
-EBUILD containerd-1.3.7.ebuild 1958 BLAKE2B bc1157830c72a3b592bbca0bf059cbc799d56773c3339c891d65b916d5a12d0a845a632329572a6b6806b342263d5f8a09fa518772b0faf1fa80949c170ba8f8 SHA512 8b97b3a417b03b0f6a343a90cbcdd50b623c903ec545626e3c433cc62bf3ad4595dbc936a2de1f26237891fb13132e8b7c504b685902ce062609b1a7c3d98cc9
-EBUILD containerd-1.3.9.ebuild 1925 BLAKE2B d934c46fa35d50cdbe3c91857733def0504b867a800dab0f9b60353726786db2c2b87b98fdfd9bfbaab25d00802dc181c55cd45bec27cd210c61c964e1bf5d68 SHA512 4b62ffc53a2cc143b8551ac56b1bcc9af5c808f4727aa662da301654963eccbed5b50269e01b862e6fa07793c9c576775fff297fae8c63efe4c4304624bbae03
-EBUILD containerd-1.4.4.ebuild 1788 BLAKE2B d6a1e413b8c8c31c083928147e0887a2f31d7dbdaaf3b36b6a71e1e769b4c320ea5fe55fbf2efc74a1b1707ade20dc031b2a1ef72b597255cc2054b258fc39fe SHA512 8540d2c35455becee67b991f3b34675c24e107188b352acd3f3b38525053589f37a9e0f02d154b80aa8dbbc2cf956d779c659b5af3ffe1e90745c2818f2dfc5e
+EBUILD containerd-1.3.7.ebuild 2060 BLAKE2B 17a524d749ab4c93a10b611809f63b951093f70f3b54bbcfb7ab37b3bbbb16bfbc4663f38dce3b4a358a7226ac7c93501d5de35595a5b864fb8917eb970553ca SHA512 fd421d1d9c0ed3fda728591611f9c691bcdfa58d8daa185c1a4cd244d9206f3e9c2a71d56742ce850f84aa61266ccc9f6172fda20b31b67e14c8800ff9cf367c
+EBUILD containerd-1.3.9.ebuild 2027 BLAKE2B 5147229fede581c46fcf29583b7b06e56586a06e9a29fa27b984ec00e87abab743565befea28a08e722bd97aa160ba98654bcfd95ed852a35b619b8e66184120 SHA512 f686aebab6556ac6694aae474894f054cb13c0076258de179e75b735a9685360778491bb233148185cfc1bea346cb6aebeeed5b7e903185a451812467cd54985
+EBUILD containerd-1.4.4.ebuild 1890 BLAKE2B ceb56a42ce8c8447bcb2daa7ca9b9cbd2c2142cb926f94f106314261e53db675295afb8786cb7405bb695ddd9d80e9d8483f890ef507ca523438efa0d877fddb SHA512 e3d9bec60e941dae7d3d8398eb8c8ef5e006e3557563cca1e50a3577d30424ed4d22c87f25b6c82874c74851a086d1d61ae32f6eb0aec0eeba131e10ff39c498
 MISC metadata.xml 1073 BLAKE2B 5f1a667e9b8812a71e24318d51353b010f9a3662c608627c68cdd13431a6d8380b51b8b8619b2a98fd9dece381a391f18a35458156ef7743b10825aee4c58e8f SHA512 46e110750ad8da48d741b612c8c1f030d493636c0255f1944134660eddb5693488c1093df47252d09589bf90565d525819a82a0594ce8f727165f1a822acb537
diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild b/app-emulation/containerd/containerd-1.3.7.ebuild
index bd5fea0fe6c9..b78f87e7f3d6 100644
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -66,7 +66,9 @@ src_compile() {
 
 	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
 	export GOFLAGS="-v -x -mod=vendor"
-	emake "${myemakeargs[@]}" all man
+	# race condition in man target https://bugs.gentoo.org/765100
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
 }
 
 src_install() {
diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild b/app-emulation/containerd/containerd-1.3.9.ebuild
index c494ec626927..2e7c01ad5a79 100644
--- a/app-emulation/containerd/containerd-1.3.9.ebuild
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild
@@ -66,7 +66,9 @@ src_compile() {
 
 	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
 	export GOFLAGS="-v -x -mod=vendor"
-	emake "${myemakeargs[@]}" all man
+	# race condition in man target https://bugs.gentoo.org/765100
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
 }
 
 src_install() {
diff --git a/app-emulation/containerd/containerd-1.4.4.ebuild b/app-emulation/containerd/containerd-1.4.4.ebuild
index d4d947ad8f15..f63187003559 100644
--- a/app-emulation/containerd/containerd-1.4.4.ebuild
+++ b/app-emulation/containerd/containerd-1.4.4.ebuild
@@ -63,7 +63,9 @@ src_compile() {
 
 	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
 	export GOFLAGS="-v -x -mod=vendor"
-	emake "${myemakeargs[@]}" all man
+	# race condition in man target https://bugs.gentoo.org/765100
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
 }
 
 src_install() {
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 98f185bb89d8..2c91dda82eea 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -3,7 +3,9 @@ AUX free42-2.5.3-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5
 DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b
 DIST free42-nologo-2.5.25.tgz 7423321 BLAKE2B 23d69045df8e7a96669a14e5760da4e1f8578b050ff6ddb19b000c8254b04883449c38e78c5af93a9341485363ae52ce41e6398b9954a6eac61aae6276e20488 SHA512 cedc05ad60cf56b4634e0b1525ef75fac8ad16ce14ae80752fda12a6373cc2cf42d4b696e99c121b1dc42087e477ca2d948f173c9128acc91d5bc266259b2836
 DIST free42-nologo-3.0.1.tgz 7438742 BLAKE2B 1cbfe038d63a5cc77e20e8ae257f7edfb891a109d8e49e79a149942d318788879df0b61f037caf9609a36766648fd34909fa3f41f439fb2ac2d4e14837b1bdd2 SHA512 73fd32289a191a40f3fd5cbef1f85f28ca6da62c38eeb2c1adc5e58b5cd620985f5f78ce110ff90156e5986a5e1e067aa265bbabdffd6f250440a9d766f214c2
+DIST free42-nologo-3.0.3.tgz 7443713 BLAKE2B dd9db670aa463343387e66a2ad56f212463c0b02135cb489e8937eb434fa0431228f6120ade8000f357f92a384f5f5bdf53d07fe1d14eb0ad2f81be269a075b8 SHA512 fc5c9520c04eabd5978cc4e8a9e237107605775cf94a4bc3877fedf19d3b94c0c4ee59db9a6a423cf1747ab3e63e479860f3da5968606414824df5b986eba3a1
 EBUILD free42-2.5.24.ebuild 988 BLAKE2B 018e42a0d178fddad32220fb80a8052b883341ed595aeacb8c62189167b92354df147821701c496010a2d41d4492b9c8f9591e3dc3726277fca9032f22877b7b SHA512 558ca798068bb404d040e4f95ef2a404f8184d23f1b91c03801dd29599b2615f8bbaef509edac11d958a641ba103e2871cc7d5e4f1e2b7be47f6cfdc22d3cdac
 EBUILD free42-2.5.25.ebuild 990 BLAKE2B 313b1f02771b0172bcd9486729715afc0c4e6f9871ad4e1b43bd66aae50d65e8c405e841089729d3b4266814e676533f2b68d77df3aa99bab2407a00ffb77d0f SHA512 c512648cc35589d9602b8135492bfad8c0c9b2af7b83b15cb494a3444029ae68dcdc021d5bd297dd5f4d1768bbe86d3c69d3aba808977aab9e580ec4cd35a304
 EBUILD free42-3.0.1.ebuild 990 BLAKE2B 313b1f02771b0172bcd9486729715afc0c4e6f9871ad4e1b43bd66aae50d65e8c405e841089729d3b4266814e676533f2b68d77df3aa99bab2407a00ffb77d0f SHA512 c512648cc35589d9602b8135492bfad8c0c9b2af7b83b15cb494a3444029ae68dcdc021d5bd297dd5f4d1768bbe86d3c69d3aba808977aab9e580ec4cd35a304
+EBUILD free42-3.0.3.ebuild 990 BLAKE2B 313b1f02771b0172bcd9486729715afc0c4e6f9871ad4e1b43bd66aae50d65e8c405e841089729d3b4266814e676533f2b68d77df3aa99bab2407a00ffb77d0f SHA512 c512648cc35589d9602b8135492bfad8c0c9b2af7b83b15cb494a3444029ae68dcdc021d5bd297dd5f4d1768bbe86d3c69d3aba808977aab9e580ec4cd35a304
 MISC metadata.xml 345 BLAKE2B 2693f9fd6f59806e57f9691b8b77ec0979e3ee819866bc1d9e3b3f311995a0b1fb7ae00a23b50f603064e1d35215fdd8fa6eb715fc83cd613eb828fd87f78eb2 SHA512 afbf038baa3610520f7d9b63b54acc98552b16241bf3f7efebe4048b572bf65098c74896647eed4611c29444f7d16914233744f08069468eededf34ba7a5d758
diff --git a/app-emulation/free42/free42-3.0.3.ebuild b/app-emulation/free42/free42-3.0.3.ebuild
new file mode 100644
index 000000000000..d25a89b2d1c4
--- /dev/null
+++ b/app-emulation/free42/free42-3.0.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/free42/"
+SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.16-fix-makefile.patch"
+	"${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+	emake -C gtk clean
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+	default
+	dobin gtk/free42bin gtk/free42dec
+}
diff --git a/app-emulation/fuse-utils/Manifest b/app-emulation/fuse-utils/Manifest
index 757c3250160f..971a4646db71 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-r1.ebuild 926 BLAKE2B afe7ad8f5fb60a8350835acf5d7710991d28b25f01bb9082a653759053d16815d9479cc956a62f2ac76755c0e604819a8c55792c8f44efe215b9292b6152ec4a SHA512 5b0bb4157d32d7916e75ef2f3f792d5dcb0e10f3aba71fbc96112d0a732baba6cbb2d3a1b4f4bb6540327ec2c8910869543256bc926dfa8497d0a044a3c960d5
+EBUILD fuse-utils-1.4.3-r1.ebuild 958 BLAKE2B 50b8eccc84b3fa29e199ba86d1de861df854391d747f2742ef35034a0eadf3833e809a56e605605c92d61c4d7cf0d7975fc937409a49711a2e0e4d9adca5490f SHA512 0c71c7666df4348ed76dfddb5aa96efc23a0b3eb886690e65b70c2a0d8c344ae0ef5ed98f5178d70e5e481ce7098087823b73d753095959b8dde1cac6d869575
 MISC metadata.xml 468 BLAKE2B d1653b29114c8a61280253b82ad6de47e100362a9a6113706648a25d3803e95eba5438c042b1af91c49e570eedef17598f4ce0987d3d01e76e6b3f4a908d7892 SHA512 b2a1360187920f5cb8516f9377cc1bec1732b84b83038a17ba33347b2bea403cdbfeb09a0abeb8e55157445f4cff13e803369bc125fc0a531aaa509b3aafe9e2
diff --git a/app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild b/app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild
index cc6f021a658a..ed13eca91e09 100644
--- a/app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild
+++ b/app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild
@@ -16,6 +16,7 @@ IUSE="audiofile gcrypt jpeg png zlib"
 
 RDEPEND=">=app-emulation/libspectrum-1.4.4[audiofile?,gcrypt?,zlib?]
 	audiofile? ( >=media-libs/audiofile-0.3.6 )
+	gcrypt? ( dev-libs/libgcrypt )
 	jpeg? ( virtual/jpeg:0 )
 	png? ( media-libs/libpng:0 )
 	zlib? ( sys-libs/zlib )"
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index dc86d4503f94..45e361d17f0f 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,7 +1,6 @@
-AUX protontricks-1.4.3_no-setuptools-scm.patch 1174 BLAKE2B 16ad14073457431d388e295d5004874a8b7bc74aa5762c3f4a950c35ad485d9dc60312acaa511541ff4f2d2e826c31e5c74d1f51d80721bb5ffaa23903714283 SHA512 99349a830eba3e248db3f67f5cd842764700fff51788db1fc649ba9dbef3f356c6ec4a66e4608a74eb67b919d53700b5c501e55a98f78e67e9c63e6f851aa18d
 AUX protontricks-1.5.0_no-setuptools-scm.patch 1321 BLAKE2B d96472bf9b0827cbc6bb9debf6c8da9f27773da4587d5b5c663180913ef4595fe21c5edd4798a8e98ee0a00dad75acec41dd0776e3dfaa6ff0aa186167e70c6b SHA512 9fce0b3ddd34801b7af8adcce2990c875ce68ed9289717f08f1f1653d447887b67b65d5c35de14a126dfbd4d1143fdef8fb8399f55aa59c498a68b0bc0480bad
-DIST protontricks-1.4.3.tar.gz 43573 BLAKE2B 3a3050ba6e940182d81d98498a5558433ceaa4282f5a23fb93b3cfc299699381493eb2912c5f03bb6a8092be5c50b94bf7181208cda3d4c0f4c90c0f438f7f1b SHA512 7ca8c7c273d92f7c4526caaa8c9db6988c642913c33c6b6188d285d5cfbe30924533a9f024135865cdc1a25bd867ac00bd915b0a61417d17fe0e5ee451417e64
 DIST protontricks-1.5.0.tar.gz 46957 BLAKE2B 622affd9a1bfff3a5cd76fa8e279f25b5c91a6f040b6cc4e5f42e58be08a232fad2be179a47e063b45b1b1bb11b6ae9ce26cce499f4c1dae460be0bb8247e619 SHA512 6df3e0dd638684e70a8d40b7440e2340765109e31dd47fa5e33e4959bc34d3ff4cfa70c8689cafdcce82f1d97ba6d25de724ca7439e5d1ffd634b729ab222716
-EBUILD protontricks-1.4.3.ebuild 1442 BLAKE2B a1656810ec6810c0899349e7a03835a45a92183799d0a39e4257c551208a4a589211127e6b3087d4a7c68024eebd6a54be841a13e6c25c1b0a51e0b755a1e90e SHA512 9b9a9d1de030e9e7e2574295e3ed054c90a36237c462024e2a8996082e088a903a535d27a8f45742345bba6edc84ee476d0639ff60e1411045ef165dfc4c6374
-EBUILD protontricks-1.5.0.ebuild 1444 BLAKE2B cdb33ec0c2fa7d1c941f478f2613f54da28aac8b075deb185f3e96c294e88f1010f97d4f024fa36954371be55481c88ab4c274c222b1454778c50eeb528ce845 SHA512 d3e7c95a8f9869ce7722514b361f5e663092c5994a14a3e39345bd1b6dc5e13ebe31042767441ec32569cd43ed9129a99231cae52cb280b550817a5f6084018f
+DIST protontricks-1.5.1.tar.gz 48111 BLAKE2B df7feaefd2ec1c058fa7190ec9c981bd480e5d36cf7a3e15868aa8e052857e69dc573559e35faf74d9d2f4a5549471cb0e8fc0be58ed2431890e37751c88cab8 SHA512 4b8d5d17a4bce8bd987c032f5a5ae689d1dcca4694463778398bb62b983afe6eee666aed891c810e852a9f873233b1822d21878464b25f07f8ab92e1777f3ff1
+EBUILD protontricks-1.5.0.ebuild 1443 BLAKE2B a64ee0e8679859aa818b2c34e42dadfe9eb194c6f97d526cbc4dec8ff0121598f8fcb9e9a006d694318cfffa4f8040f25dd664c576bdcc7383669c5eb7d71dd4 SHA512 382d6f5fd98f523cf954763c5cb61bc39668af84eff511e38fe867d50d10b1971dbeb047137ecc5ed44f0a0a94eb62db78f38d86841bbb430dc7c657acce5ca2
+EBUILD protontricks-1.5.1.ebuild 1444 BLAKE2B cdb33ec0c2fa7d1c941f478f2613f54da28aac8b075deb185f3e96c294e88f1010f97d4f024fa36954371be55481c88ab4c274c222b1454778c50eeb528ce845 SHA512 d3e7c95a8f9869ce7722514b361f5e663092c5994a14a3e39345bd1b6dc5e13ebe31042767441ec32569cd43ed9129a99231cae52cb280b550817a5f6084018f
 MISC metadata.xml 808 BLAKE2B 9abbb6d1689e04026c239dc2bde4a2d975bb260473178e68c0ec3e37a3e4c3e6db701ece9e8551d5ba071db14effc7e59a15a5e13c2049a6cd9d0709562bf709 SHA512 21452c10fe698d461aa814bc1bddb6350fcd8f60b7c84d8949f1eb8a1932ae3f9214c123451334ac2108f6ad930d5e6f5b522eac477ed6f6af1c916326254c32
diff --git a/app-emulation/protontricks/files/protontricks-1.4.3_no-setuptools-scm.patch b/app-emulation/protontricks/files/protontricks-1.4.3_no-setuptools-scm.patch
deleted file mode 100644
index e8c6d75036b8..000000000000
--- a/app-emulation/protontricks/files/protontricks-1.4.3_no-setuptools-scm.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Since version 1.4.1 upstream has used setuptools-scm to determine the
-current version number. Unfortunately the package in question does not
-support GitHub release archives, using GitHub VCS snapshots would require
-retrieving and updating commit hashes corresponding to release tags, and
-PyPI tarballs do not contain tests. setuptools_scm_git_archive does not
-help because it requires extra files to be included in the repository,
-which upstream has not done.
-
-Seeing as we already know the version number, bypass setuptools_scm
-altogether and create the version file ourselves. For obvious reasons the
-latter has to be done in ebuilds themselves.
-
---- a/setup.py
-+++ b/setup.py
-@@ -16,9 +16,6 @@
- 
- setup(
-     name="protontricks",
--    use_scm_version={
--        "write_to": "src/protontricks/_version.py"
--    },
-     description=DESCRIPTION,
-     long_description=LONG_DESCRIPTION,
-     author=AUTHOR,
-@@ -28,7 +25,6 @@
-     packages=["protontricks"],
-     package_data={"": ["LICENSE"]},
-     package_dir={"protontricks": "src/protontricks"},
--    setup_requires=["setuptools_scm"],
-     install_requires=["vdf>=3.2"],
-     entry_points={
-         "console_scripts": [
diff --git a/app-emulation/protontricks/protontricks-1.5.0.ebuild b/app-emulation/protontricks/protontricks-1.5.0.ebuild
index 06e0a22ded68..9db87c7635ec 100644
--- a/app-emulation/protontricks/protontricks-1.5.0.ebuild
+++ b/app-emulation/protontricks/protontricks-1.5.0.ebuild
@@ -15,7 +15,7 @@ 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"
 
 RDEPEND="app-emulation/winetricks
diff --git a/app-emulation/protontricks/protontricks-1.4.3.ebuild b/app-emulation/protontricks/protontricks-1.5.1.ebuild
index b09334a725c5..06e0a22ded68 100644
--- a/app-emulation/protontricks/protontricks-1.4.3.ebuild
+++ b/app-emulation/protontricks/protontricks-1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -15,7 +15,7 @@ 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"
 
 RDEPEND="app-emulation/winetricks
@@ -30,7 +30,7 @@ RDEPEND="app-emulation/winetricks
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.3_no-setuptools-scm.patch
+	"${FILESDIR}"/${PN}-1.5.0_no-setuptools-scm.patch
 )
 
 DOCS=( CHANGELOG.md README.md )
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 62997d796a3c..65cf40b4ef25 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -10,5 +10,5 @@ DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8
 DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
 EBUILD qemu-guest-agent-4.2.0-r1.ebuild 1775 BLAKE2B 36cde83af7db9939d3a588056b8ca450a8ed3e7e85f229acee3a444c95bb0142c5df8f1b36cfa4c01781bf86f53a1fb4e79a5772ae506a1555cd53287bda402f SHA512 2fff0bb4118da1a168bc5ae4810f37b226be6a83d376fb6a91acb2c45b652a20705d2fab8678f18fce4c53717ac700bd03dfdfaec6a6893fac995fc61203eb63
 EBUILD qemu-guest-agent-5.0.0.ebuild 1775 BLAKE2B 36cde83af7db9939d3a588056b8ca450a8ed3e7e85f229acee3a444c95bb0142c5df8f1b36cfa4c01781bf86f53a1fb4e79a5772ae506a1555cd53287bda402f SHA512 2fff0bb4118da1a168bc5ae4810f37b226be6a83d376fb6a91acb2c45b652a20705d2fab8678f18fce4c53717ac700bd03dfdfaec6a6893fac995fc61203eb63
-EBUILD qemu-guest-agent-6.0.0.ebuild 1630 BLAKE2B 0b94559db4bca99f38efcad6c7ec7e7036853ab919cc2aa7935fd58892ef28ab361f2f1211b19426ff6edcdee5583588e00736eedbd9948adbf8ba932962d140 SHA512 f9291e2d76644a4a93409faf4e9bf78cc0d9ddfdd738039293e52ff89fbcd03afd78ced4efc244cd043ade6b486bbcf177ef4054143e68cd236f8f60dc965e81
+EBUILD qemu-guest-agent-6.0.0.ebuild 1632 BLAKE2B d22c852a172ea7f7dcb8677f7f8167d472018b8e8f222e401b7f33bf8e3734df78e2134876c8a6826236ee35785585352c159439a58b5d340596f57532a8b528 SHA512 14f9dc3138e93fb0216714b83b333dbacf98d76432ca951bb9351880dad52458f08443aa58eb23fd5d36f3120baaad323a83c6f510595e05060bc0b1de323b08
 MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
index ade6439209c3..69eb43088388 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit systemd toolchain-funcs udev python-any-r1
 
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 0d8d64185b85..7440efc85a6c 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -8,7 +8,6 @@ AUX qemu-5.2.0-disable-keymap.patch 884 BLAKE2B dbbe245a52615f8894cbac1c94ce3fee
 AUX qemu-5.2.0-fix-firmware-path.patch 596 BLAKE2B f46890eaa22ac7f94725f5dec86ccabe78f002ef6e4ce6b8f3323362203783ae65f77442634520863abc7a5ed91639c6284ccb53f0ed4f87523c7e45e4a0f186 SHA512 9fe5ed5b72098b0c5b9f9b6ae371ac745de9e269f3713b47ac2bd13d2f03f0827128d43757876f83eeb770dbeeade32db5f10bc9f58d02ed929a45caa5f558ac
 AUX qemu-5.2.0-no-pie-ld.patch 2929 BLAKE2B 07126013ba465c30fe9ddc8e690e1906d5fa187cf47adcfe94177fe46e6a0365622e938090b23b5517df9e78aa211f4b014939e50503ba8bc09afca5794479ca SHA512 d6cecad4d98fad469dd8514e02372053a99d8077aa4348a36609cf459d7dffa962df937fe0350540ecae4beb274dc1b3c72bce34145474491156ff564104532f
 AUX qemu-5.2.0-strings.patch 799 BLAKE2B 8f249a647714a4a677d1aca5d8d5c19b27a0e1933877a286017928e01ec23d82e41dc1d196a50ba38bcf4ec8b71fd89c89e41b7c9673faf13935188eebaf4a56 SHA512 481917c8ec9c5089c210f80e719f5a65af1193323ccda4d68bec6afaab0d0e6407cee1d05cd1f3b1bfbd7b7a5f9d2cdb42dd12123813f2c3c51116e999c09288
-AUX qemu-6.0.0-sphinx-4.patch 1177 BLAKE2B 8628ec8e3c16b9c4bdcfaf8a1e9432b516ce6e9ada3b53cb0e31f6895835bd14e69e81b2a7c0385d0e3f725785fd9a649ee70d9ba4943cdc7f46b969bd8c0268 SHA512 a40d748da23e30be40cb17df2fa10d828dd0545de4a2005cf9bda43403338f92a8bdc4342bd238ff553d743d34ada292861e2e73ba1ed3a8c587e11a5c7061cf
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
@@ -16,6 +15,6 @@ DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd
 EBUILD qemu-5.2.0-r2.ebuild 25479 BLAKE2B c53c242253d3571ba7d5484ff30773e16aa51c4c14be99c7c50326657220c3ddfe5e84074b0e99268582d8c735b6ce71a179ab5ce5d88cdda33dcd0f0cc3aef4 SHA512 88f55bba87bec4393f3e4e1706ad5352a7b2f1f531b2f4c74370beeab7e4318428113040861b0dd37ed6ce3524caadfb957ab15a329fc52cf13ea1cbbd70c86e
 EBUILD qemu-5.2.0-r3.ebuild 25639 BLAKE2B d23bdb53da967696bd56afd27ef58b4653b7954d170c6957a9956aca3f6b0d23c72a3e3f786826110652838bcebd4b765fcdd679b50754fe35d04e160bf44dd4 SHA512 4860b1b80237fa6c15fd798bd94327b3b573738365a768bb1c18ecb055bd30c8a762bbfa6df3b83c8293407e2029af05de4766c9310a64eb5382076865dfd70a
 EBUILD qemu-5.2.0-r50.ebuild 25747 BLAKE2B d3e246fe9e046bcdd7b8e6d0210f0189dc399a1fe01146467f0106e92b7a91b963fcecc990266aece5aa3fcfdc79f27d84d41bf9a9dd54d7d73d2fde7ce7876f SHA512 b7c010506d72909a01dfe01cd0118a67f274322aeb12adac700631dba7198c26d3c465bd38af9fcc0bd3d46890f7dc43b45897188b41ae1bfca27e1bf68eaa22
-EBUILD qemu-6.0.0.ebuild 25612 BLAKE2B 690f0c8c291ecfe08ddbaaa4bf8edf97f75466ddcc8a6ed7d981d0b4e919b07d18a51a6776f316153e36bb037ce66a618989d29bb17e0ecdc2baab870eb512a5 SHA512 485802867e888e54a7ded12c5a700bb4502d322ad683ab7645b179aa7d375b9c1ee919480a1c7ff988dfbff49c788f08beb5b6e59271412ecb208d310f44e42f
+EBUILD qemu-6.0.0.ebuild 25570 BLAKE2B 11df2d2670ed91c92b86d58e7db91bcd10b946875d6091aa83a31c90cdd28d3fa9bd749a591cc86e428ee085f914ab2b0fc4a42896ca3e3fb662c8bfdf0004a2 SHA512 b13919ebf371043cd1de8bac1e7acd6f157c94ce80f3d99beff68f4a5466ecfe42d1532508a3b87b7fd0dbc6618b17539c019546db4fef2b6fd9756d56367603
 EBUILD qemu-9999.ebuild 25570 BLAKE2B 11df2d2670ed91c92b86d58e7db91bcd10b946875d6091aa83a31c90cdd28d3fa9bd749a591cc86e428ee085f914ab2b0fc4a42896ca3e3fb662c8bfdf0004a2 SHA512 b13919ebf371043cd1de8bac1e7acd6f157c94ce80f3d99beff68f4a5466ecfe42d1532508a3b87b7fd0dbc6618b17539c019546db4fef2b6fd9756d56367603
 MISC metadata.xml 4347 BLAKE2B c82480d51523c9f3c1d78a1eb4bfda0319b1f7e4c1576df7588fe87d7746554dc585e86ecc04d58b5f41e72f9233bfbccbc62bab20171202dabf308a2ca200d5 SHA512 a317c1a529336c0dee2e06709654d7aeb283e27d6bec1a335b3bda151ca255e5a2e5d25a940bee9aadbe0ee1c15cd9ac07248552b6156f4f3c31f06354d0e05d
diff --git a/app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch b/app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch
deleted file mode 100644
index 2a1e6f9f5f43..000000000000
--- a/app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://patchew.org/QEMU/20210503161422.15028-1-dgouttegattat@incenp.org/
-https://gitlab.com/qemu-project/qemu/-/issues/256
-https://bugs.gentoo.org/789561
-
-From c1155afabf1a3e093049975ba1748cf39734aa52 Mon Sep 17 00:00:00 2001
-From: Damien Goutte-Gattat via <qemu-devel@nongnu.org>
-Date: Mon, 3 May 2021 17:14:22 +0100
-Subject: [PATCH] docs: Fix installation of man pages with Sphinx 4.x
-
-The 4.x branch of Sphinx introduces a breaking change, as generated man
-pages are now written to subdirectories corresponding to the manual
-section they belong to. This results in `make install` erroring out when
-attempting to install the man pages, because they are not where it
-expects to find them.
-
-This patch restores the behavior of Sphinx 3.x regarding man pages.
-
-Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
----
- docs/conf.py | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -269,6 +269,7 @@
-      ['Stefan Hajnoczi <stefanha@redhat.com>',
-       'Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>'], 1),
- ]
-+man_make_section_directory = False
- 
- # -- Options for Texinfo output -------------------------------------------
- 
--- 
-2.31.1
-
diff --git a/app-emulation/qemu/qemu-6.0.0.ebuild b/app-emulation/qemu/qemu-6.0.0.ebuild
index ddc491992357..b3bbda4c9b82 100644
--- a/app-emulation/qemu/qemu-6.0.0.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0.ebuild
@@ -274,7 +274,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
 	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
 	"${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
-	"${FILESDIR}"/${PN}-6.0.0-sphinx-4.patch
 )
 
 QA_PREBUILT="
diff --git a/app-emulation/sen/Manifest b/app-emulation/sen/Manifest
index 2c99214c9dcb..39fdbf05eaf2 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
+EBUILD sen-0.6.1_p20200905.ebuild 816 BLAKE2B 4d32bf2bf174c865a858edb80c24df35dcce0a06d88b0a326449065590baf6c7ef3091235dcf77074c5bca639b864f3b1405486c8ee02da5b2a64371d9325718 SHA512 ab34f6207aae486de511fe852d908de6aa25766c9f1b5a2489149f657b45a84ae297a558fbe6527a8cd87dde461d82bbef5db152dbd2cb3f591af8f41500b852
 MISC metadata.xml 628 BLAKE2B 14b4762b2dd4aaa480e7f6d61d32647167fda51f0dc7453c8979c93ede078897a4cce702cc976324aa054642860bd08218be4d5764f49072024bfc8f60b2e8cb SHA512 b074d1f60979acad4716907fdb84ca4835fc5c771569658c6476d14683e83b11fb70e907d7a44d7ecb060f6ed695470959a549653a850818e15f01d82628f1c0
diff --git a/app-emulation/sen/sen-0.6.1_p20200905.ebuild b/app-emulation/sen/sen-0.6.1_p20200905.ebuild
index 0ce4e0dc2ae1..fe1a19b03c8f 100644
--- a/app-emulation/sen/sen-0.6.1_p20200905.ebuild
+++ b/app-emulation/sen/sen-0.6.1_p20200905.ebuild
@@ -1,11 +1,9 @@
-# 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} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 COMMIT="02e5872ee2905861e1da06ab5174e1a3f41f0e0b"
@@ -18,25 +16,24 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]
 	dev-python/urwidtrees[${PYTHON_USEDEP}]
 	dev-python/docker-py[${PYTHON_USEDEP}]
 	"
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/flexmock[${PYTHON_USEDEP}]
 	)
 	"
 
+distutils_enable_tests pytest
+
 python_install_all() {
 	distutils-r1_python_install_all
 	dodoc -r docs
 }
 
 python_test() {
-	pytest -vv tests || die "pytest failed"
+	epytest tests
 }
diff --git a/app-emulation/vendor-reset/Manifest b/app-emulation/vendor-reset/Manifest
index 1c9f429a1f86..fd65e8cc6755 100644
--- a/app-emulation/vendor-reset/Manifest
+++ b/app-emulation/vendor-reset/Manifest
@@ -1,5 +1,6 @@
+AUX Fix-5.11-build.patch 1687 BLAKE2B 04ec945f071a3eca4d4a257340c82e635a1421696dbe538bf4864829ff0e8a7878989fceb63617ffa5b472bfce66ff06b20e57186c79b5477312a2b5c71f6fbb SHA512 5768890607d321a6b23cc13e79f54733d518fc319e1a2953b986113bd79bfeb4076053c8b87bcd9415b889e686945007e30fbd3ce4cc421c9ed30fddc7f4791f
 AUX modload.conf 13 BLAKE2B 1e774873c1bf09ca1f3ec2c006b1938e3aa07187dd5a7f926369d6d1bc2c21bfe52f2cbb632f64174485896c8691ac4cbd10e988b7db7a2a9ada7fdccda1a22d SHA512 7a4bf9c95af41bf11e5a720f6258d62822f553c6f349dbe93cf23743b851d830340d268954252d6f058ea2fa823006a63afd45875e7b9108d5d2a6a1a316ff6d
 DIST vendor-reset-0.1.0.tar.gz 12718324 BLAKE2B 762ec8bc289b572ab8f8ecc3fa233e3c78c48c48a261c58ce1be9c10356a55957e0bd8fd01e3143443be74236bf9ed540b84d332788c67aa949599ccc5a564d3 SHA512 ed4dcb1a71fa8901732e729d37b501ac105cc2c93d0666e44c08e311d99a244027339d5709a9305ff992ca2acb2f337793cdb1f9369197911985cd20d6f3139f
-EBUILD vendor-reset-0.1.0.ebuild 938 BLAKE2B b813812d660f5d8a8e3bf338df26b19c11e7a2c8f107a96ed2711a165309a9476c04b74fb196a620e77907e6bed52bedb02a40cbfbf1e01dc0e17556316ba270 SHA512 b87a8e5c4ff7ec4a6fb0629d898b51e82f55bf748c3fc6bb4897c20add7d0e6024195404b9973d601a7c8d6b45425367e0ffe0d5084377f968f0941f5751e0d3
+EBUILD vendor-reset-0.1.0.ebuild 986 BLAKE2B e50771efbbd910627b44206c3c41bf334da12110eb2ebf3649744ec0d0cb427a475b75e816392a5a578026b106e25cd299ac5cb574fac550a1ca22ae798e7a9a SHA512 93ee4bc3e1f435f5a1816180163fcf7c3a2e69534d1130621bb0fc6f418e73bb7440ac51d2fef3d97cc523cef04e339c87682a2d126116ea608f25c97f877fbb
 EBUILD vendor-reset-9999.ebuild 938 BLAKE2B b813812d660f5d8a8e3bf338df26b19c11e7a2c8f107a96ed2711a165309a9476c04b74fb196a620e77907e6bed52bedb02a40cbfbf1e01dc0e17556316ba270 SHA512 b87a8e5c4ff7ec4a6fb0629d898b51e82f55bf748c3fc6bb4897c20add7d0e6024195404b9973d601a7c8d6b45425367e0ffe0d5084377f968f0941f5751e0d3
 MISC metadata.xml 326 BLAKE2B eb99500232f3d17e81b626f037ab585c48b49eab4d14616296af7b2c35507265e7aad497b28c25f5e89b4fdb56d9ab3242e51641f87b6580e85944af25a0bc9c SHA512 bcb6dbff6d69f20509d440a3c1b9aa2d4d9d0206fc2daca744acf29e9fceb8458a4d58b70ad77654bfcaf1094cbc20da5b43318059a3dee30913cacde1918a69
diff --git a/app-emulation/vendor-reset/files/Fix-5.11-build.patch b/app-emulation/vendor-reset/files/Fix-5.11-build.patch
new file mode 100644
index 000000000000..845ea08afc54
--- /dev/null
+++ b/app-emulation/vendor-reset/files/Fix-5.11-build.patch
@@ -0,0 +1,52 @@
+From 225a49a40941e350899e456366265cf82b87ad25 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?T=C3=A9rence=20Clastres?= <t.clastres@gmail.com>
+Date: Sun, 31 Jan 2021 20:22:00 +0100
+Subject: [PATCH] [core] add support for linux 5.11
+
+This approach maintains compatibility with previous kernel versions.
+
+Thanks to @justinkb for finding the commit that broke it (torvalds/linux@d19ad07).
+---
+ dkms.conf    | 2 +-
+ src/ftrace.c | 8 ++++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/dkms.conf b/dkms.conf
+index 396abd3..09fbcf0 100644
+--- a/dkms.conf
++++ b/dkms.conf
+@@ -1,5 +1,5 @@
+ PACKAGE_NAME="vendor-reset"
+-PACKAGE_VERSION="0.1.0"
++PACKAGE_VERSION="0.1.1"
+ BUILT_MODULE_NAME[0]="${PACKAGE_NAME}"
+ MAKE[0]="make KDIR=${kernel_source_dir}"
+ CLEAN="make KDIR=${kernel_source_dir} clean"
+diff --git a/src/ftrace.c b/src/ftrace.c
+index 80bb4aa..7eed223 100644
+--- a/src/ftrace.c
++++ b/src/ftrace.c
+@@ -22,6 +22,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
+ #include <linux/ftrace.h>
+ #include <linux/kprobes.h>
+ #include <linux/pci.h>
++#include <linux/version.h>
+ 
+ #include "ftrace.h"
+ 
+@@ -48,8 +49,15 @@ static int resolve_hook_address(struct ftrace_hook *hook)
+   return 0;
+ }
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ static void notrace fh_trace_thunk(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct pt_regs *regs)
+ {
++#else
++static void notrace fh_trace_thunk(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct ftrace_regs *fregs)
++{
++  struct pt_regs *regs;
++  regs = ftrace_get_regs(fregs);
++#endif
+   struct ftrace_hook *hook = to_ftrace_hook(ops);
+ 
+   if (!within_module(parent_ip, THIS_MODULE))
diff --git a/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild b/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
index c772c4558764..192727933e8a 100644
--- a/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
+++ b/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
@@ -22,6 +22,8 @@ SLOT="0"
 DEPEND=""
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/Fix-5.11-build.patch" )
+
 pkg_setup() {
 	local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER"
 	linux-mod_pkg_setup
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index ec6834dbd53e..2bfbe4a22b76 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
-DIST wine-6.5.tar.xz 24375196 BLAKE2B c30f606d268bf39f9424dd2e65f98f75b3538c82df6a931ea4955040a625ff07a2272f7d83f4343f8997ac2660a934528279ff31555ef062c81487e897c429f9 SHA512 11f9d2bb515c63429d397b97ecc1f13d0dbb717780d674229b851b819d707e0fd6fbf8bbae9a41dbf7b2ceb3729c4f5643d1ec5e414d6694d192072081f96fe4
 DIST wine-6.6.tar.xz 24400568 BLAKE2B 37ec581686a2145a84cd40a1c29c313cf253f96c86fd16fac0402afb02aa15687b86e2de850b86c9a132b8898ab93b639f431711f3c6220a566537768612f97a SHA512 a5caabc5ff91a830fbdcd25a85ee32b6df98315325a929a3124521cd10cc873e5a585359b03eb0293bb2474e39a179cbe179c0611acda6a228861e06068c091e
 DIST wine-6.7.tar.xz 24449368 BLAKE2B 002bd6e74205217d4517c8697ddb212d8bcb8ba66ac1594996e24e2d5e771119e73e65a0b42608133ebaab699a31cd6567a0ab954e8d4e1f94492ebb929d0ffb SHA512 42920921eaff5a483859fba2b9e866c6afad25427d030f971efe2136f9619b675d5eb1ddfffd54bba8caa172c3e91eb347d673cb16f45560f0ab40a184a34758
 DIST wine-6.8.tar.xz 24481304 BLAKE2B 37643eb75b29a646f23620df4084809aa15ac9d390e34e2e1ffb9e0c5211df9e7595dd0d877ede61f914f4a4373a450c50f4f2da5f7a0fa880881404cd918c88 SHA512 784863e3aa11f692cee2ab3b3d99cc896c1eb41cfab8cc6b52b5a31671d82fc7f6783bae72c65d8806a8c4096000401cbd0a1a7f1a88fd980685fae67fa9bd91
-DIST wine-staging-6.5.tar.gz 9743825 BLAKE2B 606377c33a789e092f044bb610746e54fba77a9af0e3da674d16c8ce0f51c59d82f78f0e63c5915fb6f1ab10d6ee91d7b95a7634f1177a6455de6e0c0517ef01 SHA512 bb5199419a22a4536ff95fb0e6257d7c870fe79f40346d56101579edae5c44086fac0db975e04452fcc1d7cda0d5392ff703e1c39504ec4ee63610e2e89fd1e1
+DIST wine-6.9.tar.xz 24526724 BLAKE2B 9e39bbc84380f7f40a9f41e1dbd1728ae8833eab4fe977eaf9386a92b9f089cf63147e35093b084d3a61e5c7209b405caea9cee2a4bebb294b77c65fc3551d66 SHA512 e9dc4da8cd6553db4227f09b5734513939d7e361449f52472a1f51ae569377a2931a0ab6f402aef751587ff1fa50f10f222b4479aba44f862db320931eeff363
 DIST wine-staging-6.6.tar.gz 9756871 BLAKE2B 45e49f7cd2820e027cf9788e7257a3fdaeb97d711d8ae4b466026316f331c2ad84aa0f8446cbeacb98c280e21bd1666d23054bcbc7702533e4974148e684be91 SHA512 65e90c4a0965f2db499edcff5171552b8e95716ff9b2a4ed272d022bc0b1f99547ca1d7b09ced2a267cdf3dfbaf552f9cbb2cc8bbd34636eb3882406ab5985d2
 DIST wine-staging-6.7.tar.gz 9722531 BLAKE2B 1df164ea23808f40baddbbe30ed92125563c3c952e13817ddea124cf780a397237e70aa48532d5b49c8b80919122a09e579f1928a13b6d17329d51f0ba03da74 SHA512 74805846e2e6e5d751c25f4b98ac671f8507d3a9b13d572e166b1885e397a6bb74bd3ea4b456d46298306d632499a4b88f97eb6d53ff049c2495cf055347611d
 DIST wine-staging-6.8.tar.gz 9709006 BLAKE2B 48a100f43cedc4217c083421d4391e5f052faf354483990552d271a5820b654b4dd4db0b3d2d1478cbdf8414da56c86e7bce05ebdb70c347d81ce0b6df811498 SHA512 a2dfe74b07b687af147b61f235ea2843ff38a563f37ed2ed68dce1cc0ff3d50dbd7c9596836c6e236e368e7a55cbe1ba881dac11bb0966e61a76a7376f92bdcc
-EBUILD wine-staging-6.5.ebuild 21990 BLAKE2B 5ad75ba1a2119ab1ac2737adeabcc5e15b42b78058e62e213a77674ca15c5b13a1c7652bc00d426ef37a7d146773c58cfebececc5c5741d56e402e8f2218a32e SHA512 83ba4f7786890f168d6393741653a03f8491e925d5da8ed9b27484976caf6697b5744676c4fe386f62cc2550971bacd17dce5effecd209adf6971ab55b3717fe
+DIST wine-staging-6.9.tar.gz 9687986 BLAKE2B 72cf53616a619638fdc91d7501c8fcc2bb9c102a1a445a9c58dd23fbb5bccc27fcf2f9635ec65b23d93839514d8aa9ede29d84d6737e49776a1d99b716295ea4 SHA512 09732ce6fe5e5460ef5f30ab3dd5581c94b27e1d2c228bc395b1defd32fc5e908ab32eb2a56e489b154e1d0f638ad792c80a64d82d90a33c943102b379bef937
 EBUILD wine-staging-6.6.ebuild 21990 BLAKE2B 798aa83526eb1a02233461cb05735ef1c31a75356ea86fa67a864e2d50e157a2c8dfcb12c9c00e8fca050b73154eab9ff6930468252009655292001dc64c3866 SHA512 5f0a96f4974f99df2d291d917f56572823f1c57b5047b715c1c97a11437a2e01564e418c556e7a0e7e52507fd5cdda7aff250cd33691d00eaa17833d93ce74f4
 EBUILD wine-staging-6.7.ebuild 21990 BLAKE2B 798aa83526eb1a02233461cb05735ef1c31a75356ea86fa67a864e2d50e157a2c8dfcb12c9c00e8fca050b73154eab9ff6930468252009655292001dc64c3866 SHA512 5f0a96f4974f99df2d291d917f56572823f1c57b5047b715c1c97a11437a2e01564e418c556e7a0e7e52507fd5cdda7aff250cd33691d00eaa17833d93ce74f4
 EBUILD wine-staging-6.8.ebuild 21988 BLAKE2B f5a28faf8cc1870415423634ac55b1dfb9a6d8aaccdb93022db27604a63d868311dc89168f039192fbb7633ff9693346ec6a2e29970e23be4ef9cfa72767f8a9 SHA512 056996aa864b9c9c42d7e8ec46463915882c474097c4be4e98ec6872153ca1476ea75cc89ee407dd71c6fffb44bb1b7556d5d8102f1c5a0b2d4cf59d4a89830b
+EBUILD wine-staging-6.9.ebuild 21988 BLAKE2B f5a28faf8cc1870415423634ac55b1dfb9a6d8aaccdb93022db27604a63d868311dc89168f039192fbb7633ff9693346ec6a2e29970e23be4ef9cfa72767f8a9 SHA512 056996aa864b9c9c42d7e8ec46463915882c474097c4be4e98ec6872153ca1476ea75cc89ee407dd71c6fffb44bb1b7556d5d8102f1c5a0b2d4cf59d4a89830b
 EBUILD wine-staging-9999.ebuild 21990 BLAKE2B 798aa83526eb1a02233461cb05735ef1c31a75356ea86fa67a864e2d50e157a2c8dfcb12c9c00e8fca050b73154eab9ff6930468252009655292001dc64c3866 SHA512 5f0a96f4974f99df2d291d917f56572823f1c57b5047b715c1c97a11437a2e01564e418c556e7a0e7e52507fd5cdda7aff250cd33691d00eaa17833d93ce74f4
 MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033
diff --git a/app-emulation/wine-staging/wine-staging-6.5.ebuild b/app-emulation/wine-staging/wine-staging-6.9.ebuild
index 88e527150d91..20eb02bc907b 100644
--- a/app-emulation/wine-staging/wine-staging-6.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.9.ebuild
@@ -134,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:6.0.0 )
+	mono? ( app-emulation/wine-mono:6.1.1 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -373,7 +373,7 @@ src_unpack() {
 
 src_prepare() {
 
-	eapply_bin() {
+	eapply_bin(){
 		local patch
 		for patch in ${PATCHES_BIN[@]}; do
 			patchbin --nogit < "${patch}" || die
@@ -436,7 +436,7 @@ src_prepare() {
 \164\2/' loader/Makefile.in || die
 	fi
 
-	rm_man_file() {
+	rm_man_file(){
 		local file="${1}"
 		loc=${2}
 		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 0b69a6ef1623..6a1d27a9171d 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,13 +1,13 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
-DIST wine-6.5.tar.xz 24375196 BLAKE2B c30f606d268bf39f9424dd2e65f98f75b3538c82df6a931ea4955040a625ff07a2272f7d83f4343f8997ac2660a934528279ff31555ef062c81487e897c429f9 SHA512 11f9d2bb515c63429d397b97ecc1f13d0dbb717780d674229b851b819d707e0fd6fbf8bbae9a41dbf7b2ceb3729c4f5643d1ec5e414d6694d192072081f96fe4
 DIST wine-6.6.tar.xz 24400568 BLAKE2B 37ec581686a2145a84cd40a1c29c313cf253f96c86fd16fac0402afb02aa15687b86e2de850b86c9a132b8898ab93b639f431711f3c6220a566537768612f97a SHA512 a5caabc5ff91a830fbdcd25a85ee32b6df98315325a929a3124521cd10cc873e5a585359b03eb0293bb2474e39a179cbe179c0611acda6a228861e06068c091e
 DIST wine-6.7.tar.xz 24449368 BLAKE2B 002bd6e74205217d4517c8697ddb212d8bcb8ba66ac1594996e24e2d5e771119e73e65a0b42608133ebaab699a31cd6567a0ab954e8d4e1f94492ebb929d0ffb SHA512 42920921eaff5a483859fba2b9e866c6afad25427d030f971efe2136f9619b675d5eb1ddfffd54bba8caa172c3e91eb347d673cb16f45560f0ab40a184a34758
 DIST wine-6.8.tar.xz 24481304 BLAKE2B 37643eb75b29a646f23620df4084809aa15ac9d390e34e2e1ffb9e0c5211df9e7595dd0d877ede61f914f4a4373a450c50f4f2da5f7a0fa880881404cd918c88 SHA512 784863e3aa11f692cee2ab3b3d99cc896c1eb41cfab8cc6b52b5a31671d82fc7f6783bae72c65d8806a8c4096000401cbd0a1a7f1a88fd980685fae67fa9bd91
+DIST wine-6.9.tar.xz 24526724 BLAKE2B 9e39bbc84380f7f40a9f41e1dbd1728ae8833eab4fe977eaf9386a92b9f089cf63147e35093b084d3a61e5c7209b405caea9cee2a4bebb294b77c65fc3551d66 SHA512 e9dc4da8cd6553db4227f09b5734513939d7e361449f52472a1f51ae569377a2931a0ab6f402aef751587ff1fa50f10f222b4479aba44f862db320931eeff363
 EBUILD wine-vanilla-6.0.ebuild 18915 BLAKE2B 62da21f599f1b17670630aebf24e9d05c0372567cca2708d40ec3d3da2f5db7c96c5888fd7f8c61e0cca151e31a46d9f538da5468bad06672f57e63d81c7b49d SHA512 4bb50445f5d5e6c21171fa87fc5c098e5993e3e65519726ad5bf84b50cd0b4d0096ace5ac31073f231bc65bfb8d78924f6892f801c2a977e1b82488b2293a282
-EBUILD wine-vanilla-6.5.ebuild 18886 BLAKE2B 51346684ac002b7430e01fdbd2d799bbc0aa346846004b93d2c89a961915eddf085fe7fdbfacd7acc01998d8a748203cb4d5a98c74c93aa915a664754619b515 SHA512 15b2af2e20c2d080a462276b9325c35ad04c53f083f4ffda786e425e02975db9a88c788e257677bb829054c44fabc261cdef5f4d01c32c701faddccb8f68a20b
 EBUILD wine-vanilla-6.6.ebuild 18886 BLAKE2B 0a2ab276c8b73ae795ca5081c7688bf3c663aaa5d96021c821cc845c832d0a522d79c903cc36640275d3e5f2f0f32db05ac3a40b6054a5e53514009d8422fa1a SHA512 a2cb3cfb9e66ee3fe49b923b32b062b7710fbb69d5445aba3ff812132887950028de0d8ffafd8bbf0feac2ab927a77d6f8f12211b9ed974d35b9ec4de64d2751
 EBUILD wine-vanilla-6.7.ebuild 18886 BLAKE2B 0a2ab276c8b73ae795ca5081c7688bf3c663aaa5d96021c821cc845c832d0a522d79c903cc36640275d3e5f2f0f32db05ac3a40b6054a5e53514009d8422fa1a SHA512 a2cb3cfb9e66ee3fe49b923b32b062b7710fbb69d5445aba3ff812132887950028de0d8ffafd8bbf0feac2ab927a77d6f8f12211b9ed974d35b9ec4de64d2751
 EBUILD wine-vanilla-6.8.ebuild 18884 BLAKE2B 11d1d163e671255a3f89cdbf4f3c2e45d6adbc56bb136a85c1151510f57e1fcf125c76301eafa7857451558402a885f391dae569de5a7f23017007f7ce841811 SHA512 720a41d5e9ff35f6bc9cf5f103352f645505b14e3c872faa5f7e9093d7de83a1a8f4062bc34b8bc1542f5b3324e912e15a14c476670f037070bd3a98f365eda1
+EBUILD wine-vanilla-6.9.ebuild 18884 BLAKE2B 11d1d163e671255a3f89cdbf4f3c2e45d6adbc56bb136a85c1151510f57e1fcf125c76301eafa7857451558402a885f391dae569de5a7f23017007f7ce841811 SHA512 720a41d5e9ff35f6bc9cf5f103352f645505b14e3c872faa5f7e9093d7de83a1a8f4062bc34b8bc1542f5b3324e912e15a14c476670f037070bd3a98f365eda1
 EBUILD wine-vanilla-9999.ebuild 18886 BLAKE2B 0a2ab276c8b73ae795ca5081c7688bf3c663aaa5d96021c821cc845c832d0a522d79c903cc36640275d3e5f2f0f32db05ac3a40b6054a5e53514009d8422fa1a SHA512 a2cb3cfb9e66ee3fe49b923b32b062b7710fbb69d5445aba3ff812132887950028de0d8ffafd8bbf0feac2ab927a77d6f8f12211b9ed974d35b9ec4de64d2751
 MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild
index 58304136185f..32fbb98391a5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild
@@ -110,7 +110,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.0.0 )
+	mono? ( app-emulation/wine-mono:6.1.1 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -318,7 +318,7 @@ src_unpack() {
 
 src_prepare() {
 
-	eapply_bin() {
+	eapply_bin(){
 		local patch
 		for patch in ${PATCHES_BIN[@]}; do
 			patchbin --nogit < "${patch}" || die
@@ -364,7 +364,7 @@ src_prepare() {
 \164\2/' loader/Makefile.in || die
 	fi
 
-	rm_man_file() {
+	rm_man_file(){
 		local file="${1}"
 		loc=${2}
 		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die