gentoo resync : 03.07.2021

20 files changed, 123 insertions, 36 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 1cb18222cd2a..31ce24681cab 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 eb5d2f11c420..d045e1dd4b37 100644
--- a/app-emulation/firecracker-bin/Manifest
+++ b/app-emulation/firecracker-bin/Manifest
@@ -2,6 +2,9 @@ DIST firecracker-v0.24.1-aarch64.tgz 1427360 BLAKE2B 17d85c6843dfa90bf871d5ff7dc
 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
 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
 MISC metadata.xml 415 BLAKE2B 2e3287fc3b97cbe52c6ae404b2bf3c691e162a8f44ff75f720a56679e52327c0817860251d01e3bac8971cfafb7e9536f3c277fa77316547892361c6e669b8a4 SHA512 9762208fed64d628db75d544de99085643aa2fe1cb44c09bf93a2d3224932abeef7351d1332709e9851ab2346224d573d607171db64086c08cb56bfe0e25425d
diff --git a/app-emulation/firecracker-bin/firecracker-bin-0.24.4.ebuild b/app-emulation/firecracker-bin/firecracker-bin-0.24.4.ebuild
new file mode 100644
index 000000000000..c957b4a10f3a
--- /dev/null
+++ b/app-emulation/firecracker-bin/firecracker-bin-0.24.4.ebuild
@@ -0,0 +1,79 @@
+# 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/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 6435edffa532..5b95a596910e 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -3,6 +3,6 @@ AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1697 BLAKE2
 AUX 1.44/0001-Check-for-caml_alloc_initialized_string-existence-ev.patch 991 BLAKE2B 213bea03f22a03f6cd7a82d310fcd106c1b06493e744a7bfb95b7820fe7813208e343170cf9d4322180528ea9e05ab94d54b1ba601bd0550388a33b1bf222211 SHA512 344729229c35e66d21911ae040b4a15ce9a5b37de0f1965272de1c85f21d3293182bbb7953cdd99bb8fe7909754ae462c5d7e973d369ff6d0b64c590fc1d2ee8
 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
 DIST libguestfs-1.44.1.tar.gz 23798268 BLAKE2B a2266d28e611204f03fc88c7a51331b49eb9fb908a318024bbc98af6a283ef4ba80be9caa0fb7e10f4d8bf67be5aaddae73d213828956e59f3233ab280a0185b SHA512 db6eab7350d9318a5ad5f968b24ed77ab411c9be3476b62b2b8448cf06db2462af1e3c9d8b02b54011d43651c281d74db7cb8023426a3f09667aa5b3597c7c33
-EBUILD libguestfs-1.38.6-r103.ebuild 4669 BLAKE2B cd7f749698ce04bec407f7da051d82a7a724b5d6278867cdf2cea079ce221aa5b08b62307afe3f0ed2e0feac3859a5c65d13d3131ab7a873d53b8ecf07fa99fb SHA512 ce6ab577f099a6db077d2c361fe3b542e06e35bbeeef2de9894e3752cd1cda8d6296f192cdee49bc5ce6c9f598ac497fc1b60ab4fd19306f1bf4f9541d71ba20
-EBUILD libguestfs-1.44.1.ebuild 5000 BLAKE2B ff08f89a0d825e1d80e355fc7fd6bce3da902e0b3a94d075757d26b9fce411a17e731e82daedbd9545bed05b6f6067241a958fbaf078dd2f5e3f7d434641170d SHA512 6619471eae5e040e778bb3ae61414f97cf35bcfd2d5c6f03c298bd7c8794bf8b834624c417a825c4e70a528a90f0c7abd323fb0daa927d255744729157a85ead
+EBUILD libguestfs-1.38.6-r103.ebuild 4678 BLAKE2B 5814cea0363f5da8073e999453ecaae15d757b2226d7ad649af381dc98a816514ba9b37ad6ab959d317c879dea0ab378285b8af371eb894dd28e522327b5da3b SHA512 f309897cfbaab4ec2e60d75a6c22710601fa49c9ba195ce8a4d3cc365a16a1dcf458d9fb390cbd7373fe8c5c0c8a9bba15154c2341ba05a5c65f394bd83c7408
+EBUILD libguestfs-1.44.1.ebuild 5009 BLAKE2B 18bc69f5f5226e0ff42b40a053ba927773daba0b1a0d706db02046850878f3252367acfbc58d157d5c2eb20f9aeabac701269746883e649cc1d8dadae845e118 SHA512 23ba4651454afe1bdcc2b92937473b5fca78958228b9a06fcd6ab807efa1ec7a22459c25bf8ac0f30ba41ccc48ce4c1fa54d169a5835ae682fb7e28242aeeede
 MISC metadata.xml 775 BLAKE2B a07bce73924d205f7c34b2951453745eb9dc022e9fe05729fcb7a2f2a30bcc298172cc5839479e78421427e40ad61b7c47586f4113933bf99edd59edcd23c7e5 SHA512 38f7c789ecedcb40c34f64ba9231a5706506b1ac52acb35757b3f51f954ce768b8958525d4343520e0c1b6560fc4cb9ac4a898010598c149cc661e1f5f151964
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
index 13ce7ab088ae..12a00b8b9477 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-1 )
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions python-single-r1 xdg-utils flag-o-matic
+inherit autotools bash-completion-r1 linux-info lua-single perl-functions python-single-r1 strip-linguas xdg-utils flag-o-matic
 
 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
diff --git a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild b/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
index a82e43a0ab06..a7311dc74bb0 100644
--- a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-1 )
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions python-single-r1 toolchain-funcs xdg-utils flag-o-matic
+inherit autotools bash-completion-r1 linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs xdg-utils flag-o-matic
 
 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 1ee658b3b27d..4a5686903739 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -9,5 +9,5 @@ DIST lxd-4.0.5.tar.gz.asc 833 BLAKE2B f5b2ead748973831ec7ba7be00c34d26b16a6b168f
 DIST lxd-4.0.6.tar.gz 15353779 BLAKE2B f699e91c53b407e5a0e47fe40b133d6216754b1e5c5829ee68993468565f2080c12cbcbf8373d6da16ca94a3648ec51b874e66ff589be09dc95f2382d18f3e12 SHA512 58efaac50dbcbb3cf0e7aa1b3b43085beae4546dfcd081720b049c2b88bf120b9a74e7db1238bbdd8cc2449e039b076ece3734e8f46f3ddbdc70aaae8b326963
 DIST lxd-4.0.6.tar.gz.asc 833 BLAKE2B 6d1756b130a944a98e62d809c45129178bfc39158c71e09319cdaff7461b14bda467e44a781bb5c15d40afdae4d3ec86f98919738a8c169d3fff910d8e9fe58a SHA512 6c59bd8ec9bf0d9bd90c8ab2970cf6928c0bef3736631ea2a56ebc464f33940366d35925ddfc4104c13fa0fd4e1bea42796e0a2eb82a8bf395957829f938c7db
 EBUILD lxd-4.0.5.ebuild 3744 BLAKE2B 4034a472a91e650d7ac141f650db6fa8d78060491db95baa6bce4f246f1f1c34681d5e292ab31ea914bb5b7717b6ea820a2870f85391cd1e8270066b611b918a SHA512 c28ece030f7a3c4919e156585f031ff653851857029d3a0164fa4b095ecf0f61faeb3b44b49f350cf0985fe35295fad727b5c457cf7aeed87d5a096ae2add31e
-EBUILD lxd-4.0.6.ebuild 3891 BLAKE2B 43de02b0015d305d0cfad83c012dc1f439df32c659a55a909dda2033dc9926a052cf2b3164cb683ead6f93056f5280a2e07702f89ca71616c0039ebc217998ea SHA512 a8c46c4ea1bb21c499a308ac80714146d9299a2cc8fd9d356d0216f578088510867aeef4d9b5fc80fa22d3b66eb3841f23cbe77120d7ce3bf9ab24215813eb31
+EBUILD lxd-4.0.6.ebuild 4115 BLAKE2B 019c8b4793dfae2500beac746d648f8aa6da361f1a2f07cf299c98d9be009cc9e1265e606b4ca675e26fe2ea0609dbeab1f51b7452c8da219774454703a892cc SHA512 da9d4fd73386998075dcfda89c6bb522250a7c1836cb708f0163a9cf9d2dead08c2875f50558b0001494b6d8dd455e23e8ba46a6a6c1c38d3a004317f5ceeb54
 MISC metadata.xml 776 BLAKE2B 5f8e6d2639982bf6564567a9775e55b777d4bd9cb01818770b5089071262ceda815e5d94e853b7c08a470234729c08e313685610b3da457a23bb7edbf5b3ff52 SHA512 050d500629b4331f2f8bd2fa5cbcabadc988d737c891edb66ad8b2ee2fd378690b2fee4c70e0b380c2579cb9a39453768242d7acbead4c5390c7f01131b939c0
diff --git a/app-emulation/lxd/lxd-4.0.6.ebuild b/app-emulation/lxd/lxd-4.0.6.ebuild
index e701c89b199a..92c4ad7891d6 100644
--- a/app-emulation/lxd/lxd-4.0.6.ebuild
+++ b/app-emulation/lxd/lxd-4.0.6.ebuild
@@ -82,6 +82,11 @@ src_prepare() {
 		doc/environment.md \
 		lxd/apparmor/instance_qemu.go \
 		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
+
+	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
+	sed -i \
+		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
+		lxd/device/disk.go || die "Failed to fix virtfs-proxy-helper path."
 }
 
 src_configure() { :; }
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 7c1add1dee00..98081d943f6a 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -12,4 +12,4 @@ DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd
 EBUILD qemu-6.0.0-r50.ebuild 25767 BLAKE2B aa2063bd3742c0d62ffc356e0855020b42357ce0edc1d91b0cea7b81569d3ff62380b0df483e4fd44ad5693141ad0e90e0f6d9eb261015287f8286cbc2a44d80 SHA512 e55a2565292cd7e2d7c1d9d7709a3616775d33064df193575294cdc6cbbf0ba44e5e2bdc3631590a140c031764da7cfceda6d873440c5c21b8a525863831176a
 EBUILD qemu-6.0.0.ebuild 25699 BLAKE2B ae9dc97e809db469c425fee9d9d5dc6281531418940f573b9c792321f5d32a7b04e61817c6540742ce56e7e1b9b5e1361fd3e69b3310cb918b8171d85032d84a SHA512 ee6e126893dfd754a895448c7dc72c5b920d4fa0fbbbe813f23e0c8ac9a32674b2463c92f601dc554e558eaa94a8f519f2038ccfd453ce6f8407c3564d31c7b3
 EBUILD qemu-9999.ebuild 25729 BLAKE2B 0dc32e60845860ad37b637a8e7aaded53aee3154b310bd5769b3da99346b3febc610c5efc1df27d12c15cffc2255947e4b9140ade2a2ab43943bbd4584201702 SHA512 8f387b6e5e1ca7e17f33b9941e2ac64a70d7b2cdb3b4384c5077e5207cf77d143ecb967e6707d7d0ce2db7e65310297a055f06f91d16f064e752a9c1451dfb84
-MISC metadata.xml 4407 BLAKE2B 5eb8d6f825df8c79c1c77e5a605387cfaf8b984c56e1c4e055de70e795e9b12e63f16c63b84a8ccc98770b132b704342c2d85a495e9ef7f22027f1495fcc435c SHA512 346645f736716698385f90e74dd2ae6d3ecf44e4496249b7646f6a69e6e1807303f96a8ce739e1dfe74cfae0a169250353341df3aacb55cfc9397a341de1079d
+MISC metadata.xml 4403 BLAKE2B d8794248d1fc44363d107d2a0148a14d27de016fd4b311fa7feaf9125e35678c390f2ff07d35a48d3c224fe56ab467eb2c4a8cae4fc65f8c2aad98c62205a645 SHA512 f2b8daaa06e80b7f19915c794d3c010122d8578061d471564b1fd73df3a567bb4937b733058205346441a7d487a7f8eb03c3238a22d60a48b5e9cd02569d7e9e
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 37324afea376..4245f6d17a21 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Matthias Maier</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>virtualization@gentoo.org</email>
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 427a7b270220..1ea8e81548dd 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -7,7 +7,7 @@ AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636
 DIST vbox-kernel-module-src-6.1.18.tar.xz 672004 BLAKE2B 7199ba2a5020e5ab51d82735df16aee78ece74db232733b932c380f90dffd589a72613120bbd5c580381ab6f6308abb8d12f69855b9c0a8345bfb8587d022019 SHA512 49b54898b2701774fdeec0cd99dd51a1dd71ffd9be38e125fde73f0c64a697138d13bddbb0ed0e9582d354fa0394608084effb68bd35b266c87f6e3b44c6f342
 DIST vbox-kernel-module-src-6.1.20.tar.xz 672188 BLAKE2B 0b2ef1e02ce6f55211703946dc53df0fe949a94bac2caf050d31a78e674c2934d5cfaf788da2246000d1dc99218a572cb02272a1a92f4df913fcf7635b65a98b SHA512 4fdc16258ec03c720c81b62c680addcbde8257a58a94b3bca8eefd378c126833d84f7f4fa7bb76fcd7c761983f8626d121b2d31d761f608ca7cce6a689ec0469
 DIST vbox-kernel-module-src-6.1.22.tar.xz 672348 BLAKE2B 331f81c370c24487f4966c745a72329065df2cc22918d03edefdf546d8e4ff0a36404ce98f1012faaacc301cd2c507b055db69b9125f91ad87fa5fde14d3abe0 SHA512 b50d7699db8909ea4e9126715152336a2c46e06f9fc24b5ef0624e7d26de1c83b2a57b0387dab0a46a9e50f9906126cfdcae4f290599de88a980adaff7fba180
-EBUILD virtualbox-modules-6.1.18.ebuild 1531 BLAKE2B bc820f78c75b9057944568dd06b06a544f887c7aa8bf026e1907e9b898a7c10638069aa95a38e701ae0422d541d9aa045b109a40faeac1ddef7365f850acbeb5 SHA512 a4f08b633a6e4a5c22dbd7cd088c509e7e5c8658bc3b9604b4ebf77bb2edc70491ebc3eabfa414ae4bd174de36579aaab10226810f7df525691115ecbccaa042
-EBUILD virtualbox-modules-6.1.20.ebuild 1433 BLAKE2B de4e7905f0df62d31e498763d0db42710f19140d16cb0aec7eee034e6a0d43e44bf883d7da60e73336ca17d68470683a831d2c09f156c4a87e481718b8713214 SHA512 daa7d3ca6970272c9605fbd11c85e1730244788871398d16aab73093baca1b26bea7f99382ffdb754040ca3bd560cc09b839802e96b438e076e25df1e21c6980
-EBUILD virtualbox-modules-6.1.22.ebuild 1434 BLAKE2B 03065d413b537988bc71baacf3911c38a52589120fcd2f64528d091c37ccf2e4837358fa876f1cb0a46b15f44a8e10571afb1b76e392a11535f75c24df899365 SHA512 ddf073d44d9434c92103970b398034d282083a861091aa7d4a5d7a0a0697847741ab56ae35c9ea75bb0662a5d20f032293d159082f32c97166dece25c380b137
-MISC metadata.xml 352 BLAKE2B b3f8d24dd3e805ed233d105374d7c7d85b136b0260229daac917bec19bee0aa7dd9c2e19fdc036b576905152c3dad31aa5a6162c28812ca471f37b7297a77356 SHA512 98dcffafad310b4ceb74194af6de0e3e6c443167f53c41068ed0098c2f70916c88315739afb8bf917c1328886d063ca8a54e9dd9aeec3a41a911d34dbba5f10c
+EBUILD virtualbox-modules-6.1.18.ebuild 1531 BLAKE2B 62f3f2198aae186e8a0206a9e7521bb42f7bf9936e9020f94c89ba70b7f6407c4fe76f6357c7e7739636b2bf0464ada470b08b21aafb6d6d7d41586146b4543a SHA512 70b57918797c9287cc23988bd84be82a86713344364124f1ce7bcbe5f24e1844ba038ef8919c02e4f31902e184723905da12ae006153b5f75e6c33326c0f2b22
+EBUILD virtualbox-modules-6.1.20.ebuild 1433 BLAKE2B c37f4ebb63aed96ba78b0135688f576a703fd2dcf2b677c64ead9b89dd1b0c4e40bff9076f433034c1330739c295c015a61e949118410c0c59ec609155d8f535 SHA512 31ab9638f1a2c89b9abf6cab996a345ffd9b72a57ed95046cea436aea25e12709018f1d3504cb4b0d1254a4ec8f2756612c682d5d84b2630dff9301bec24ef90
+EBUILD virtualbox-modules-6.1.22.ebuild 1434 BLAKE2B f799d32f49be7d6d343ab002f2b6d1f6d6ce17ca1f4973d5b375499b4f42dba23b8f467f807f6edc27bf534db2bbb671ab6984d32fdb9a0e42d9b7345491410a SHA512 c075093ff44a6d31d049a3182131ad084066b657cd4cbd15af9d4948944543231e9c67a12f96ae760b2fab953498c3bfe2cd5761a0292e2be3fa5dedd8187d18
+MISC metadata.xml 352 BLAKE2B c8715abe9ff5c699ae15dd0906ac10eb7f750cb00092994d174a2a6a3315aff2601781a5392058087706dcf744614fa32cd950c7fa19dd896f7617f735089a0f SHA512 4e57c8aee47fe806315d0d138c81ac919197ed0a6dbf4273994228ceae32e06791e1951e9599bdfbdb6e2f329f74cbb08ce9d69ad3e6264668872dca3e4371f9
diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index a4c013c40067..78e437e7a221 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -6,6 +6,6 @@
     <name>Lars Wendler</name>
   </maintainer>
   <use>
-    <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
+    <flag name="pax-kernel">Apply patch needed for pax enabled kernels</flag>
   </use>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
index 17dbf76a1d40..9e446e585c66 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64"
-IUSE="pax_kernel"
+IUSE="pax-kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
 
@@ -40,7 +40,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+	if use pax-kernel && kernel_is -ge 3 0 0 ; then
 		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
 	fi
 
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild
index a884e1456d03..ac30ee8cc037 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64"
-IUSE="pax_kernel"
+IUSE="pax-kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
 
@@ -35,7 +35,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+	if use pax-kernel && kernel_is -ge 3 0 0 ; then
 		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
 	fi
 
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild
index e179b43d5370..0a6e70d58259 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64"
-IUSE="pax_kernel"
+IUSE="pax-kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
 
@@ -35,7 +35,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+	if use pax-kernel && kernel_is -ge 3 0 0 ; then
 		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
 	fi
 
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index a133c0bb2067..0e3e1167f213 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -12,7 +12,7 @@ DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b
 DIST VirtualBox-6.1.20.tar.bz2 165569564 BLAKE2B cf8c110e78e7d7bef3e3243a8966f4d816dacc8dad6cc44737023a13f1b89dfb50661f6dabc742f328e5c03556ec82e7a22f5c1b97cfef774652ec901e733e5d SHA512 b5af4e04e1a52c85b20226a274fac93712b79d426c0268cce3f2a337616a03161a55522ecddd13844bfc24a6808ba3d651366e74ce657cc6f8fd64c34ae745a4
 DIST VirtualBox-6.1.22.tar.bz2 165560989 BLAKE2B 871c2189827174561a2abce4d52056db892e596bcff76274770b43157cca93d2be9a3458ad3d41cca81d73d95f1db37e2d15fdbc192f4d5a59e3cc9b6365d3f6 SHA512 ab0fc7cea455f74598d5da18528404405221e9c96a34f0355a39187524240596db4b54e1b1af5f152d5329b8e7977218819c0605f0d0ba0d83a1fb8f8487548d
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
-EBUILD virtualbox-6.1.18.ebuild 14498 BLAKE2B b5a1200ff60007815c69078c70e3bd82852ab2ca64a85be5f9c970516324131b18aa435306c3ae489913bd79fa6e8b1b264d62b0dbf140d0c6843cf9fa87b9cd SHA512 d4974d81abcc78d411dac1ec50b7051ec35b35f52bb82890fb23c285e2daa32bafadff8d45ebdda7ff7a3d213ea2fe00c5901632792f3f95b660ac21c27d10d1
-EBUILD virtualbox-6.1.20-r1.ebuild 14423 BLAKE2B c617f9d0ea37bc7e67f165c820298b6bd4869f1e49fb8c9098b8ca6ae6d0edab336a2643f78a07c9d9bce7323f7404a047167b6578deb1a34cacbb85dd0f4ea8 SHA512 95a98166c0ec6ab0d0808aedb80771e2d20163e7d4116f287b4a6c46f2fa699ebb86531745edc62c2349f2c81e8db489977baa5f63689bd961ee811bb954c7c0
-EBUILD virtualbox-6.1.22.ebuild 14363 BLAKE2B 88bec92b0bc9f6c699abc48dfba212abb336def1ed5022386f398b0b36db303bf7b6ce26a787bdf0b2248ea73b723f063c034bd992847247a96f9d5fa4218ff5 SHA512 3318273192f15ddf00b29e0e1dc6b2945a48a625df1308af4a85c3d0dcd043b380e1d9418b9e70ce1c2064c05ab2508dc2dc3db499da4efe2500b38e0539a6f4
-MISC metadata.xml 773 BLAKE2B dade5d0d6cb8e4d8f92b865368af2e577d26e883b53e4d2274fb2b59e2ea92bdc8ee0af6a4cbca64384f9820779e44397825b3f1707d87631f1202bdc7164dac SHA512 c4718b4455eecd2669d47881af12257c1187c5f4aa3dd2fca8745df565f55a7b0e018da4ad3c5f38bd03b510bdfaaefa8a235d09fae3d8a99a55f263c995c74d
+EBUILD virtualbox-6.1.18.ebuild 14498 BLAKE2B 3b747913519f4125ca902cc409015751929384cf12e4a07cf20700abc57a35e93a8d59429136dde18c62bcaca8c575c52b01a5818bf49f9042f77e22aa6ea5c6 SHA512 69a281c9930bd8241f495fda76bea675087525bc9b50c0f5a8884ea658e264daae18a084511df1d8f371f4029f0e9bbaefa579ab2e8b1b11b51b7bf243f921ea
+EBUILD virtualbox-6.1.20-r1.ebuild 14423 BLAKE2B 5e9602cc0f0738f1fddad0e3a664abc36459c8732765f3ef60af59eb4ec93a8f12a2b7ab455d57b718d1d6e003acac1f26183a8414a720d4a8cf54a7f128c737 SHA512 38da2bf9f762e7f40ba7986ca594a61e4ecbcd1b9ebaef67354c4939d268bb390411d629b0bae29f994f58569a17685c4109583660e7589cd36aac107e69cfe1
+EBUILD virtualbox-6.1.22.ebuild 14363 BLAKE2B c0f9760a9b272fae7fd7bbc0b3879f0869be119773f64ee0a0efb48f3b0d5d478fdcbabf50f56084e613f8717f7c46ed9af6ce8d37e4d38e2cb04b31e797770b SHA512 724ee41630dd9d7247d682bddcfc278219048a9574a4afa9eb61a93ea8a2d21b60e3486b44378dd0bc1d086a5980886735b501fb2305ad2ac618a6adfab3d955
+MISC metadata.xml 773 BLAKE2B 52e55a63efff63886bedad4ac72e8b31088834ee55f3ac257f874afd77cf7763c5343ebce6defa399c55f8045dd1b17bfbd3ca3669adbfbe51585a59aa62bf0b SHA512 212e94588bc598d27ab46c3955b1e9963c38a7fee58502b13ce56bb14f241fe37961cd2f57150f96943f893314c2668a67afbb5b3b7e7db4354436965b7c66e3
diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index 95eb9062a15f..c04761ae2e7e 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -9,7 +9,7 @@
   <flag name="dtrace">Install dtrace Extension Pack</flag>
   <flag name="headless">Build without any graphic frontend</flag>
   <flag name="lvm">Build VBoxVolInfo that needs devicemapper from <pkg>sys-fs/lvm2</pkg>.</flag>
-  <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
+  <flag name="pax-kernel">Apply patch needed for pax enabled kernels.</flag>
   <flag name="sdk">Enable building of SDK</flag>
   <flag name="udev">Controls installation of special USB udev rules.</flag>
   <flag name="vboxwebsrv">Build and install the VirtualBox webservice</flag>
diff --git a/app-emulation/virtualbox/virtualbox-6.1.18.ebuild b/app-emulation/virtualbox/virtualbox-6.1.18.ebuild
index c106cf14fe04..f504873a619e 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.18.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.18.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64"
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 CDEPEND="
 	${PYTHON_DEPS}
@@ -68,7 +68,7 @@ DEPEND="
 		opengl? ( virtual/opengl )
 	)
 	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
+	pax-kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
@@ -206,8 +206,8 @@ src_prepare() {
 		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
 	fi
 
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 
diff --git a/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild
index 653e36a99976..29d68e769cd2 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64"
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 CDEPEND="
 	${PYTHON_DEPS}
@@ -68,7 +68,7 @@ DEPEND="
 		opengl? ( virtual/opengl )
 	)
 	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
+	pax-kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
@@ -210,8 +210,8 @@ src_prepare() {
 		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
 	fi
 
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 
diff --git a/app-emulation/virtualbox/virtualbox-6.1.22.ebuild b/app-emulation/virtualbox/virtualbox-6.1.22.ebuild
index f6ba09856a75..0749d1ebaa9f 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.22.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.22.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64"
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 CDEPEND="
 	${PYTHON_DEPS}
@@ -68,7 +68,7 @@ DEPEND="
 		opengl? ( virtual/opengl )
 	)
 	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
+	pax-kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
@@ -206,8 +206,8 @@ src_prepare() {
 		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
 	fi
 
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi