gentoo resync : 22.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
commit: 908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree: c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /app-emulation
parent: 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
46 files changed, 626 insertions, 227 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e16321271ad7..cf9e36932073 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 4d1ece8267b9..d2b026dd47ba 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 1976 BLAKE2B e3559d3d0377c627707d8556c3ddad741d7987df808c35df00f9971659a2d09f6332961a2d77eb7eea1d5df6a7a0304148244b652af7fa8805397c1f7c657b68 SHA512 f37f918409e9f5b0316e3cba207a773ccf0fc8317cf12fdc91732d6825848eceb8c03886ad652789aa6f88e9478aefe831536f0ecfcd9adc278f2dd11c9b6a3c
-EBUILD containerd-1.3.9.ebuild 1943 BLAKE2B 638d7118f30791a508d0647e2a122e53f513b70513749f10458701bc3971ee48d76134166b1b5405f382c26783f3aef8151a45ed8d3e1da2605de10b6a5b7631 SHA512 73d59882125d5782c6a8bf6bafd87331267d1e2281cf04231f67bb1ed91b2153b11fe8e916176eea89794484481e811e83ef7b4af471c655d016cf8cc290a857
-EBUILD containerd-1.4.4.ebuild 1807 BLAKE2B e8531d4758593f287b6550ffbe1242d8cce81fd287eef34a903a633f4d8d0d1d8e7541edc393a1ecca86b7e7207b48d93e8c75607b5bc5c10408660b1ca76a28 SHA512 da7d6de84281b1e9ec3e5586a867b536f5a651437fb966c01745b6d33b604aa8e10d0286c98923115117bb7c2fc731387a2a176b8c375c5f88ccf23c579480d8
+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
 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 ab62a3500dbd..bd5fea0fe6c9 100644
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,7 +61,6 @@ src_compile() {
 
 	myemakeargs=(
 		BUILDTAGS="${options[*]}"
-		DESTDIR="${ED}"
 		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
 	)
 
diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild b/app-emulation/containerd/containerd-1.3.9.ebuild
index bf487739cac6..c494ec626927 100644
--- a/app-emulation/containerd/containerd-1.3.9.ebuild
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,7 +61,6 @@ src_compile() {
 
 	myemakeargs=(
 		BUILDTAGS="${options[*]}"
-		DESTDIR="${ED}"
 		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
 	)
 
diff --git a/app-emulation/containerd/containerd-1.4.4.ebuild b/app-emulation/containerd/containerd-1.4.4.ebuild
index 3031f34e2242..d4d947ad8f15 100644
--- a/app-emulation/containerd/containerd-1.4.4.ebuild
+++ b/app-emulation/containerd/containerd-1.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="
@@ -58,7 +58,6 @@ src_compile() {
 
 	myemakeargs=(
 		BUILDTAGS="${options[*]}"
-		DESTDIR="${ED}"
 		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
 	)
 
diff --git a/app-emulation/docker-cli/Manifest b/app-emulation/docker-cli/Manifest
index e4f332a83930..65a42444909d 100644
--- a/app-emulation/docker-cli/Manifest
+++ b/app-emulation/docker-cli/Manifest
@@ -8,5 +8,5 @@ EBUILD docker-cli-20.10.3.ebuild 1831 BLAKE2B 6ce9c4347beccedaa824ddb2b37b050768
 EBUILD docker-cli-20.10.4.ebuild 1776 BLAKE2B 53083136fbd4ecf5a2f8fd34e00c7c460d611f3ff66c82fe5ad652a41a8b26aca7f2af430b3d6c67bf2ff0422ed69e0662dc1e86b36ccbf0ab7a13964cfb4ca1 SHA512 946b824ee14b2dac4f1ccfcb320685a150f01337dab5f65dc12eca67d54202378ca5af61d2cd8a47115eff5b48094a7548dfcc1273f1a45678c6f123f77bd65c
 EBUILD docker-cli-20.10.5-r1.ebuild 1819 BLAKE2B 53ab4574fb54a91e16126f43c012f5bfa9292951b24b812d6544bf2565ff4ad3da47b551518723d715cd4a7213e67720456ebd72dba46b8f545f6cead0a67cec SHA512 6653c99c66c64b567ebe7778c8c1c22e2a4c9e0de4af06fc38d42788852f6c8b1c71b012da9223f880665035935c758d25e0a68f863d86d8e80ede18b35ca0a4
 EBUILD docker-cli-20.10.5.ebuild 1776 BLAKE2B b4f504e3714c9938f9432a322dd9653cad6441e7e51d69ee04b29a97611f0c7adab8725decce120a9542d924420b72dac8a96f7da6e3960edfe02b14943e8ca5 SHA512 b780088e6ad3c337bd446819520bb461016be5a24a37b7c56fb9961ab499b4a6c98d340f822fd74b71a4b35f1a1949d875afcb13e7aea80eee5bb508983aadbe
-EBUILD docker-cli-20.10.6.ebuild 1818 BLAKE2B 48048ba75abca171fe32bd08588c847489f2256bbab70879900aa3d7f2fabbda326440d600853acfe1483d8cf61648f2388283d9c276106543131a516f28267d SHA512 96480183b59af7105703af15fc573d3771856d8fc04ba5c5564f18830aaa35ee6d8ddc3fbffec45b26e4666a1dfabb8ecb348862d79aa52d9f3998c8c0ec1795
+EBUILD docker-cli-20.10.6.ebuild 1817 BLAKE2B ce6b7a1baadd330a18651b265a1b838394d14694506c8048dd646fcea4ca24d84dc8a364b4aae7f1c61e2211bf985bb6d0df2d7ecb2851973680b7663bc3acb2 SHA512 122aee9e5d5c6a85a6050d50d196c982f9ba050061ec9f1ad7b9b9e1db551627b70582055374aaaa3a5e86efb93fb2303427f2a1229c3308808f04df6ab23692
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/docker-cli/docker-cli-20.10.6.ebuild b/app-emulation/docker-cli/docker-cli-20.10.6.ebuild
index c5f8175e246a..07dd057d7a55 100644
--- a/app-emulation/docker-cli/docker-cli-20.10.6.ebuild
+++ b/app-emulation/docker-cli/docker-cli-20.10.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="hardened"
 
 RDEPEND="!<app-emulation/docker-20.10.1"
diff --git a/app-emulation/docker-credential-helpers/Manifest b/app-emulation/docker-credential-helpers/Manifest
index 991c575bb877..37e4a6e2df5e 100644
--- a/app-emulation/docker-credential-helpers/Manifest
+++ b/app-emulation/docker-credential-helpers/Manifest
@@ -1,3 +1,3 @@
 DIST docker-credential-helpers-0.6.3.tar.gz 28971 BLAKE2B b50e4de0f3b126e0118f24f845a94be5e932975ab54ad6e0a52129a56109ecafb021f14986569295242cb0af4ea109d8786b8a5ca8481cc48daad14671841432 SHA512 2d15be8df134bff08eef9461348f07cd57c70c15a0ab044de2e69296c400b8c0e16198c90fd064d5ce83037d0bad57520e7524b0832b7a00e69397203dc90d10
-EBUILD docker-credential-helpers-0.6.3.ebuild 1244 BLAKE2B 25fbe23b6fdb260ee8623f91e3df3f0a75e75cdc42f3ddf12ccb179f7e792142956fdc192701fa31c357e9d76fddd6840418d566cccc5110817ab2804ef61b9a SHA512 e5f93230354e429c0f5e84add71971c417e7399ba743eb67b52e7a0969e138034dcac1a17c453ae2b3f369ec0ae63e2f9686868ae1ed5ea3d62a843f4671314d
+EBUILD docker-credential-helpers-0.6.3.ebuild 1243 BLAKE2B 4c9e817cf31635dda11e8964b2a1881122fe59dfc5fa8d275e464222c5e6e7d38a91aeeb4defd3a5a2a63cfc31e74a67e1b81e6b1e11cf88e02b03d77abcbb0d SHA512 8504d5f522c9cce5bb2818455c55954e5f7d6e8948becb37969477fafba639ea866cd88176e92e91a8ce567374f4ce77d30e8078e4247fbe6be9d955a7a4e55a
 MISC metadata.xml 877 BLAKE2B 5411cc175644103cddc23decc424aa517f71296362ea3859cc969fc50ffec41b4fd325e98f681e9798e196f6da3f30dc86a4af0ca797d2d83684920b58550cc0 SHA512 e7f7a33a2fb1bbf308606d713691153304b2989de19a8a6f618471b252889d12af8d0737f53379a90da628dea2f7ea6fa61222e4d57c91297731b4b7f52cb793
diff --git a/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild b/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
index ea5a5b0037df..456a74724b57 100644
--- a/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
+++ b/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 	EGIT_COMMIT="v${PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index 453a102b3806..28b42f28f985 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -3,5 +3,5 @@ DIST docker-proxy-0.8.0_p20201105.tar.gz 3386010 BLAKE2B 414c3d37cfe2f36dbb5cfaf
 DIST docker-proxy-0.8.0_p20201215.tar.gz 3152956 BLAKE2B 7652bbc027d0cc535c227268bf240132f070dad477ac5a8b82f65d3d3ecf7c2a036a45ba66d0f3f0f0a8025fb990e931429d797f4b9f7c6796507ffd2f41e358 SHA512 dd583218fbeba8aeac2e4143369ad55a3e6c15d64f198f73e3656a80d0281a4374fb3be7bc05b01425461bf830762aa2c950da68ed0e3ae5884643e9d178c69e
 EBUILD docker-proxy-0.8.0_p20200617.ebuild 772 BLAKE2B df0bec6f5cb6556af0b2ce0b06b93d2fdd324d746175c897cd21aacd6b4700e9c77690230a107ed6d2b0ac5bad501206269c3ed4c98e75ec3e7945c964617729 SHA512 42a76db8d1205e28db64dd95eab6b6020131c35fe6216be247da9a70c8a3ee28350fda47e310927f85e02e6b9270c18bc79053ba695652c7f79e30d8d745e7d3
 EBUILD docker-proxy-0.8.0_p20201105.ebuild 793 BLAKE2B ef106f02423b5546b7ab2934552197fca9ff3eee9279764aaefbadd2a287a5fd49915a0a695dd0f88b7f526a3f64bac3a4ea918e975722775685545c42a9702f SHA512 ca14b9a7dcb36f21cb1147b6e2178b2c96cd8b91fe7fbebeb41d13500c6591b1602796611306655b537a23bccc85c7748865079ab5fddc124d42d50491092a57
-EBUILD docker-proxy-0.8.0_p20201215.ebuild 818 BLAKE2B 09de94199d6163e6a57239f1074f789746e91a7936f73f4b4bfb190f8c9cd7d54de838f8f7378b71f3baa4746fb5fc2993037b0e509ecdd2c78a81636248fff6 SHA512 17ef23d4ee43cbac80ea604d185d3639234a0c123573748bf030a69182517c27e9318bd71eb133aed1e4a674c22ead7e922016d94de2cf6b21b60311e42a9924
+EBUILD docker-proxy-0.8.0_p20201215.ebuild 817 BLAKE2B 1b9531ff5353a515121c5d48885d9a7a87e896f5c9e7ef21e55b1529f4b60a050bae72c7b891511cc48dfa72154525834a023a1dd52e5d15e676fe7fc435fffd SHA512 3f791b186b8fa2cd49f83ca88307cfa7924fef103f626ba2b2caaef9c6bd11f43101b091be863e0ecf6d8c4263a59c86436bede975588a2d415c71a5a674a131
 MISC metadata.xml 442 BLAKE2B eb43f7702d67bafa12d83006f4b6b72e5cf27e0493a22befa5e58b65e7e4b890034858052e9a7b54a36f60b28290f67e43bf2af236b56e781b51f4cad7a59a8e SHA512 8fbdf6808b9aee1a1443200d31567f818ca0a01e59c202358eaa4bde7382626ffc77da8c09038c74dc24a9c18916cacb217c1e56a9e5c06b468680cc9dcb0054
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201215.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201215.ebuild
index dd2924075632..5bf405d992f6 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201215.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201215.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	EGIT_COMMIT=fa125a3512ee0f6187721c88582bf8c4378bd4d7
 	SRC_URI="https://github.com/docker/libnetwork/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 3c8da7bd13ea..be4d84801129 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -4,5 +4,5 @@ DIST docker-20.10.5.tar.gz 11068359 BLAKE2B 16021065f20b6298e47f7b235f522a81ee1c
 DIST docker-20.10.6.tar.gz 11075291 BLAKE2B 97bc0d52af178d80701e98af7d313d1c97f0ed96d6682665415ce11976f05a5c39c52684963423e81bcf15772341a005c3bcd0ef4ab6a14da0aff1ead8fbdce2 SHA512 ade6307fe31a3b8f144898ab9c4f2db965965294f15e313b0080ce7aa8bf3296f6f34912b45926ac8c5e74eaf475eef869072878123d27aa432e955f594a94ab
 EBUILD docker-19.03.15.ebuild 9214 BLAKE2B 65116e5015532a1ca9e32eb2525d723049a85a1bb95e4ff1739b1eee36799a0e0e9a5197ecabe689e4bd81e95dd45c0c4850e02456d4228a1f0606fcc98039a0 SHA512 693535112741240cfa3563fe9b728f4f7ebf49e10f112d027c4cb32d5d2d711ff500628c89c20ffe54656ad1c52a31a55077cd457a48a06b5fc657c6cdebce7f
 EBUILD docker-20.10.5.ebuild 7667 BLAKE2B 3094e186dda04146a4c8b78eac5b0eed135191117d3c1c3ea69672a97a039b18f397a5b09f1fd4220e162c37055db735fc526e39d70668c3d51b5cd416719cba SHA512 07f3c7f97002e2ebd5cd86b1e0d2254242be44af58ff596b9bb59a1c2478f2aa8af860ad58f1df8fbccea266715acc102a8613ab8b13277e94207104c15d240a
-EBUILD docker-20.10.6-r1.ebuild 7862 BLAKE2B ea625752a46745c89302ad133fb75f7dc79e5f25d1d2416231f7d8a43a2332554db4dd50c6adc407d217bac49bd50415ebd2ad1ab3eef2c6c8f51f2d9bcb8412 SHA512 569bbf0c5989e201a79d707193efb34cd4b0ba9bca3d1044eb617facddaa1d8d8f66c9fb110bcf8774edabcc9f075c25a5eef1b5560fabc9ae5a01e5730e0916
+EBUILD docker-20.10.6-r1.ebuild 7861 BLAKE2B b1f00f80d55b7a3dae6fb68130cf01b9dac5784976bd1b303daff635a3fa9f31d806e2d65537cacec7cfef4e3dd62f59ca6492472bf96a853acf100c7f40b7a2 SHA512 cd42515ea19d61412cde76a35cbecbaa204abda0f2773177fb2e1744f056448dbd708fdf1aa845c1a81dc7223e4a5c2a47a9df05a839646c61c57f1d6a0777a3
 MISC metadata.xml 1730 BLAKE2B 119ca97015c54afc8ea75d64e41d550afbcad5a3a6951f059d005e9a5086b467b26b348f6d29a7af4ff86016ecd8978fd20c9cacad41eb85a18756fc395d8a1b SHA512 c204ff1a267cbf386fa35d08b6a3ed91dae745d6bcadcad6e4cb085a510c53c37bda488ec077cfb9cbe57f2387e52a0fd00c153b7ef8d88225dd3c7d4b26f7e3
diff --git a/app-emulation/docker/docker-20.10.6-r1.ebuild b/app-emulation/docker/docker-20.10.6-r1.ebuild
index 77f660d0dc3b..92bfa48b4046 100644
--- a/app-emulation/docker/docker-20.10.6-r1.ebuild
+++ b/app-emulation/docker/docker-20.10.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp"
 
 DEPEND="
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index 90b0236ec58a..ad30cd6483d4 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,7 +1,4 @@
-AUX multiple-definition.patch 508 BLAKE2B 9568d9f736d838ba4506e9bf6fc3f514952d086e1b412e19f56cc0646564a99411086e6a3a9ba106d741c727078a286c49a932d151f93222bbfd5c1f32221c70 SHA512 544a012a352f68e843c796a8ba2a2cf7b4586e3c99b059ef387fc7f343cf42c66de11c17bf9c15f92a819ec3e32fe3588a02bc7095996db7b13f536e66555795
 AUX remove-local-prefix.patch 745 BLAKE2B 752dc9df4ad9b33a84493e4939d9c30687a730ecc628301a4bbc16f46410d73c8f7b64376788721f04c06404685ef300c2dc423c1843258748c377c6d61232a4 SHA512 25771be029e61654398bb1c36b1c31bc44f136e7e369c72faa3869f94807558c0d1b324ac803d79a898410fd14661d02a8286cda19dc25c79ebca6c387b817a3
-DIST fuse-1.5.7.tar.gz 1634568 BLAKE2B 9d2f3c310132dc57336995c31adeb37d727506719d1089b2009a2f44cbfa59fc9c4e9252aeff64cdd22b7326328518b5da33af51be687f321b891b9d1dd2b646 SHA512 ac11e03fc203f98433253fb72d7700cf6285ad8662147f318bb4ceda3888bc865b80d85473a3b2bda9e0971989b1579fc928f41ddabbf01d58358362066be13d
 DIST fuse-1.6.0.tar.gz 1686171 BLAKE2B d1e6b166f2f649f408349b16a5eb40dd414750ed7a805eb6505b6c81be6ed7bcaa4e6f0b14057645172add1b1a77881f90b64767390fe1a64a486168f452d29d SHA512 5096b24b5b3d812942a7ad401b886b6a99f5493686912cb4aff18ede65404ae97a9bcafa6337aaed4378382f2a170918797d7d4570bb809476be5aa9fc625b8b
-EBUILD fuse-1.5.7.ebuild 1913 BLAKE2B e3cbe4591bf23d091555ec8d50cfce8ea5cc4ea42dd21788f29445d36c05802875fe01801401591f06d836c9009b403e09bba4bdf2e1b06930ea380db195abb8 SHA512 483ec51bdd5a493dfcb9fa66b576b5ad67e6fca9b00d81639127a19833344b99b9107e0c4f8d75d923ca825c10e76113461e26489a0f2acf7c545269523f0d1b
 EBUILD fuse-1.6.0.ebuild 2916 BLAKE2B 0af606e43136c69fec26f7056225ff7ee2e0ed2ded6c83244a53a9e898b59568a37967507ae0d4537ec695a27c7844a2ee75b2d8e0c6254a3fdc7cc35ec3123d SHA512 1dc13be98ee7b8550836e77ce03acd775c129dee8135ddd99abcc2d3ee6486eb3b14f551de16b6ff4dd0b9198cc8d0b0e0ff4027b8fc662911dafc6c224082d7
 MISC metadata.xml 728 BLAKE2B 53fd75cce07e995581475b414394c05e5acadf5e49b3a6c9fcc4e8f5f34b14209f2628fb2ccee98d1018266888aa76778e63b87124a87a14f179601891153869 SHA512 0ec242e0640d786ed5e82c3e0553e4c054b4e493a7851aa47b1ed817f6826014aa2d1a91f8a398baefe76a5aa2535fb260003386f695a53c9c807b10994926b9
diff --git a/app-emulation/fuse/files/multiple-definition.patch b/app-emulation/fuse/files/multiple-definition.patch
deleted file mode 100644
index 8a8e9d7d1758..000000000000
--- a/app-emulation/fuse/files/multiple-definition.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur fuse-1.5.7/ui/widget/widget.c fuse-1.5.7-patched/ui/widget/widget.c
---- fuse-1.5.7/ui/widget/widget.c	2018-08-06 15:36:04.000000000 +0200
-+++ fuse-1.5.7-patched/ui/widget/widget.c	2020-09-20 15:27:42.045382588 +0200
-@@ -90,9 +90,6 @@
- 
- static widget_recurse_t widget_return[10]; /* The stack to recurse on */
- 
--/* The settings used whilst playing with an options dialog box */
--settings_info widget_options_settings;
--
- static int widget_read_font( const char *filename )
- {
-   utils_file file;
diff --git a/app-emulation/fuse/fuse-1.5.7.ebuild b/app-emulation/fuse/fuse-1.5.7.ebuild
deleted file mode 100644
index 063ecf27471a..000000000000
--- a/app-emulation/fuse/fuse-1.5.7.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
-HOMEPAGE="http://fuse-emulator.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa ao backend-fbcon backend-sdl backend-svga backend-X gpm joystick memlimit png xml"
-
-# Only one UI back-end can be enabled at a time
-REQUIRED_USE="?? ( backend-fbcon backend-sdl backend-svga backend-X )"
-
-RDEPEND="
-	>=app-emulation/libspectrum-1.4.4
-	dev-libs/glib:2
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	backend-sdl? ( media-libs/libsdl )
-	backend-svga? ( media-libs/svgalib )
-	backend-X? ( x11-libs/libX11 x11-libs/libXext )
-	!backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) )
-	gpm? ( sys-libs/gpm )
-	joystick? ( !backend-sdl? ( media-libs/libjsw ) )
-	png? ( media-libs/libpng:0= sys-libs/zlib )
-	xml? ( dev-libs/libxml2:2 )"
-DEPEND="${RDEPEND}
-	backend-fbcon? ( virtual/linux-sources )
-	dev-lang/perl
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/multiple-definition.patch
-	"${FILESDIR}"/remove-local-prefix.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--without-win32
-		$(use_with alsa)
-		$(use_with ao libao)
-		$(use_with gpm)
-		$(use_with joystick)
-		$(use_enable memlimit smallmem)
-		$(use_with png)
-		$(use_with xml libxml2)
-	)
-
-	if use backend-sdl; then
-		myconf+=("--with-sdl")
-	elif use backend-X; then
-		myconf+=("--without-gtk")
-	elif use backend-svga; then
-		myconf+=("--with-svgalib")
-	elif use backend-fbcon; then
-		myconf+=("--with-fb")
-	else
-		myconf+=("--with-gtk")
-	fi
-
-	use joystick && myconf+=( $(use_enable backend-sdl ui-joystick) )
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-emulation/libspectrum/Manifest b/app-emulation/libspectrum/Manifest
index 211443d31413..851a0c2be003 100644
--- a/app-emulation/libspectrum/Manifest
+++ b/app-emulation/libspectrum/Manifest
@@ -1,6 +1,4 @@
 AUX remove-local-prefix.patch 851 BLAKE2B 1e1b787c10499bfbeafca43b08f4cbd8c7525841c641a3fa1211822a7ec3e98b11c9925b1bd9cc8ac3b14e5d0625c34727a330e00f0e3aaf5aba1871a8810647 SHA512 bae42eec33ff2ae00547d8c649b8164fd5665b70e95b07f95cdcce41e342702de559c4b63d6ce95a97407d2e8012c7fe0142b923603c1c1d25b8978f29aaf7a3
-DIST libspectrum-1.4.4.tar.gz 568684 BLAKE2B b6ab4fc4173e7de9a7c3b14fda03420a56f02c5c590770158443bc37bee99a55dd3bdf6864f8ca33adb5ed59f4abd5c5b97736456ba2e6e6aaa2b49e07097cc4 SHA512 83bb9242010d49898531bb62e0d4d55439b0b6a548b57a7932f074429aca70cf252dfb195e9751384510b08c98bd6bc8eefd8cb3f82b0c8d07fa245ba66e9fe2
 DIST libspectrum-1.5.0.tar.gz 602354 BLAKE2B fc62437ececfe2c86b475efa512bf7aa7c5af182e16a00f75f77f78656fca01d46a71ac90b38008ff46e5fd0710b1c671b283d65544b5556d98e8c5b66525c35 SHA512 55f4cf623bc6c469a0fd80751ada694259d834c19d98400ba244aabf2ac21fed7cdd6de069d9ed7326e099bd3bd62c42cfb8a669b64ae002f90a52563fa2dcd1
-EBUILD libspectrum-1.4.4.ebuild 1040 BLAKE2B c66daea0426b3fbfc816255e49501a9e4162a25436c2dc35519b09e213980f75f3d691b198cc90574d319403f03477efb2ff256a9c9bef7290b65564ed7daa29 SHA512 cc20f0cb9bbfb3d34ba04c4d9a94a58cc14d53363b2a4f8536c0e1368066d3e5970e9a7cafc3f9d564f071b577e3df7e1c008a64168b98912f12208ce6ca9e99
 EBUILD libspectrum-1.5.0.ebuild 1049 BLAKE2B 4cfc6b4d94b6bc7a403a95c4be47b5f6980f9b1f87721492f7af2a1378f90655559c2ca49fdbc6a4e6282e51c5c04655ad1578fac5ad712329e00fe13fbef837 SHA512 27e3724b0301efb057ea9ac166d873c78e2c739d590aca5d58c11ff9dcbc5935629d319ab3c1c1ccd34ff26b5d1eed318080c24004905acbbaa2f979d93dfcc0
 MISC metadata.xml 807 BLAKE2B b7480d37223342e7c77327d2dc33bf7debb5436ed2ef5a4633a28e9eb2c8def8b5b44c8c66117297de34129f44d8e43870c625839c02b8684f2801d4ca1b59a3 SHA512 95fed51c49f34cab69fafbc0d814aaa63c302d3443bf9bfefd18bc6bd57d337f0329de1eef0f5656dcf5741d7046b6eb64d780dea1a8d24a9c131dc05dd51503
diff --git a/app-emulation/libspectrum/libspectrum-1.4.4.ebuild b/app-emulation/libspectrum/libspectrum-1.4.4.ebuild
deleted file mode 100644
index f830494fd23b..000000000000
--- a/app-emulation/libspectrum/libspectrum-1.4.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Spectrum emulation library"
-HOMEPAGE="http://fuse-emulator.sourceforge.net/libspectrum.php"
-SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="audiofile bzip2 gcrypt zlib"
-
-RDEPEND="dev-libs/glib:2
-	audiofile? ( >=media-libs/audiofile-0.3.6 )
-	bzip2? ( >=app-arch/bzip2-1.0 )
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/remove-local-prefix.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		$(use_with audiofile libaudiofile)
-		$(use_with bzip2)
-		$(use_with gcrypt libgcrypt)
-		$(use_with zlib)
-	)
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# check only builds test executable but doesn't run it
-	emake check
-	./test/test || die
-}
-
-src_install() {
-	default
-	dodoc doc/*.txt *.txt
-}
diff --git a/app-emulation/libvirt-glib/Manifest b/app-emulation/libvirt-glib/Manifest
index 27ad22e55f1c..6334298e37a1 100644
--- a/app-emulation/libvirt-glib/Manifest
+++ b/app-emulation/libvirt-glib/Manifest
@@ -1,5 +1,5 @@
 DIST libvirt-glib-3.0.0.tar.gz 899180 BLAKE2B ef10b3d9bad48e49dd1898733aacb2f51f1826330eda9c63a7f8df5f11c96812f8cc7fe6a867961efa85a433f45c934d75cf605eb523ec723459da4646335b1a SHA512 b9e7d782c25b5c3a9b2829f1be8162352438ab3505510a1ca7dd64d741eaab158dc9206fdd4b0e3e27b0c049e4bcfc47db0c9a7fa1a84888864e23d3c35c079e
 DIST libvirt-glib-4.0.0.tar.xz 161836 BLAKE2B e196d1f02f6f202b1883500241bbfda963b34ee12bd945b3fa897f84f55a049f98e0429132ccfad7168e5ba2b41245e9e7e3817a7f057e0dc40b674ca6c9b661 SHA512 e1b99e80aa671fa5a4d7f7f7a4ea70ce7c5fdaf97574407f79aa11a75dd177e1e3f92027728a83ded62e305852bbda76eb90326aaa1f5f19b77272b008351810
 EBUILD libvirt-glib-3.0.0.ebuild 975 BLAKE2B 1ea53e40c805b2d2de91f7c1a7a0690bc8bf768919b0c3706a05ae557dd4d4f6040e6df9e0e75fcb16bcf2caa411eb2570028e2937ceb377cd0c74002f7fbbcd SHA512 ef198cbd6313dd117b62f95cd5884b0254f90f638f42818f29217e926d0f0eefd293416afeda704bd38f77f13d400dcd16a4c1e2e318e6e34def2a80aa7c4911
-EBUILD libvirt-glib-4.0.0.ebuild 1051 BLAKE2B 2e604c2224e005a6b7356d061d64062404c94c638fd8e0d4137b7561282ddf2c02d3b70fe84ff493e3d489311806d21f86729791fee977885352d424f5239c38 SHA512 0c991f47f15bb6fe2246f82ccb6914a90932fc9e4b5e0cd7528b842f04c8d153cbdae9132b703e946ae7095d445c04dc03164c2b47a63a05dc4f290c906b872f
+EBUILD libvirt-glib-4.0.0.ebuild 1049 BLAKE2B dbf6890b8721664c7adadd96bdb7062cf8c92a99ac3bd856c45bf047e58a10d7691dd7932afe546fc51636c16ae9aea168b6f5aab59c345d30041f0d6108a54d SHA512 9094f1b27c22b3a3b2c8964887b28c55abce4535277dcd51f9d1b96af4d130a2603d539a24897ee762223c64e7049d57e48e9c43bcb159060024b8475ef4b0ef
 MISC metadata.xml 353 BLAKE2B 84d64fcb26b450371bcdd9ce737aeb5b0337a23d8cd5401094793fc73e63610cda3c04853a6ea98a8d352d990a5067515bff049b86c305d48ed2828e98765e4a SHA512 b32b362e0267da5954557ffde2722311523b93bd84b0f8023671cf12ccd178577007b900e745671ec1aec5cb3c7bf8f538803669efb44865380a0d5010ee8d74
diff --git a/app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild b/app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild
index 15bc2925d9cf..759c44779b2d 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://libvirt.org/ https://gitlab.com/libvirt/libvirt-glib/"
 SRC_URI="https://libvirt.org/sources/glib/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="gtk-doc +introspection test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index da1047a1281b..142ed1466798 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -17,8 +17,11 @@ DIST libvirt-7.1.0.tar.xz 8645944 BLAKE2B 97a76091616b427fc64a6a3caf5d9b04d7b9ae
 DIST libvirt-7.1.0.tar.xz.asc 833 BLAKE2B 2610cff98967260a5005840e1b03cff16790da82d9a51f14d6b34453db3ba89aa34915bba69d57b333f50d17e2492c77e85ee4e6282b8fe5f4cd0f7ace638334 SHA512 6c92c91bc7f23b32deee3442008b44d6469a9cabf2ed39459afcbfce9b3f2b1b655514a068c4bcdc8909ba02a0a4762e8f845ae4dba8da18719acf45614ca6da
 DIST libvirt-7.2.0.tar.xz 8661052 BLAKE2B eae6b4e7422690dd780e1647e2a39dfdff0562f3e63bce9ca5ee34540dec3755269efaad459d1b516b56fdeb1503cc966ffa60378aaa18210b972b739716fe34 SHA512 f6bb26ca7cb5a8d342f1f39afd051ed76b71414e1b934557cf50784da17e4f2fb3301c2ace3b593fcdeb6a18ad559a007ad594111c2c348b9157d3a59d475928
 DIST libvirt-7.2.0.tar.xz.asc 833 BLAKE2B c389d80ef4f7627230b88446ef77daab1bf34e49e20cfb5c5418500fdf388af23aeb2458551548cb732c868f87f35a5c28acff8c01faebe985a6953953a69149 SHA512 526955a9f9d294635e63a4ed20c3e478fb4b5f3a63150a59ff30d84ad16a286ddb4c6508d0317c56df63a0d22a099085697df344fe2b15bce07acf9f05cda331
+DIST libvirt-7.3.0.tar.xz 8680468 BLAKE2B 88ad3dbac627203419eb80b28649613480a287014688b5b75b9a18d60b3d2b2c6628c803384ce0eed81bf84cdc0dd8539b072f32ccf0319f09bebaaeb0e089bf SHA512 e039d5cc000c0f29ead4faddf154852ee8d8b5943e940b717eabb33cc9990d3f257a942b05a661bf6c36df5b5763c31df3f8b5a0fc21e8111a81c57da42d903e
+DIST libvirt-7.3.0.tar.xz.asc 833 BLAKE2B 812a7cf4bcaef88a4229008579a18da19d78b0a988890359907e4067b5eb6d74176907875a3a27775ffabaf29fb4d0e92c7f2ec13042ef8657c09ad6b287984d SHA512 f5349bb6c7919b54518a2ffc058592fb588045d37d18dfce5efb7e2f512c2a19b0f956d6ee34a16982cdaec4c23954300f7e130656afeb3cf535c65a0d62c04e
 EBUILD libvirt-7.0.0-r2.ebuild 8728 BLAKE2B 69047ed88abf8ec34d90c77ab7ebb92513985477d816da1ad9ddcd42c33b1a47d70c574a7605a685919e42d33d1af835327ae63761f36bb325bf8a7195e8b6f2 SHA512 1a5216a9b524f77e5099bff5e791866a1432cfedf193afb45dc1a1b1d8720ebb102acf70b148dd0a071ad3d65412768838ea8d3a40765aa9238c77e158133bcf
 EBUILD libvirt-7.1.0-r1.ebuild 8479 BLAKE2B 2b16121f4b0930eae86e7866ca7ad5859cc5009cca4d3b2d3e08566a40dbe94f54e324435fdaa8ac8c6b8eff269fc02421c503b52ffd7e5ab31577bc40b03873 SHA512 75a840582349c8c9373e6f15645818a0f5ba6c8aa4510ab62a16499c9dc7d06f23d1caf488ada35d6d51b24fb62cb96d9c362c0cef592b75adaee8516739c4c9
 EBUILD libvirt-7.2.0-r1.ebuild 8285 BLAKE2B 7d5c0c746e44714177a6192250992e190d57deb8ee342e7fe5f457b2bb6a905bff860544f7fd6267624d46b95b0e75caf905dc6c29ea273f8c72cb5edbaadd45 SHA512 a578a69498e3bbe5b5d9df0509c9cfc6294d49f351bdf4ab20df8392152d655777897c8d15e58c2ff344251c444b981f3f7e58c49b09d952816733dd73f0ab9d
-EBUILD libvirt-9999.ebuild 8121 BLAKE2B afe23c5c267f86131782b7fe043368d2e26a67ca7b20d7f0014078ab1f69a3e7734ca8823beadadf29ad09d5617c5432a832895c0b441a024256425ee8a2e2e6 SHA512 24ca3d948f69ff72513ec5baf14da7905c35a0fcb90fb49b3fae3e43b19a83bc18cba353dd9bba52b94f80b8c7a710e74eb5f7623518d2b6e1b4c10985740a13
+EBUILD libvirt-7.3.0.ebuild 8183 BLAKE2B f5883eb9d0f5e8413fee7c1a413734957e99445fb60cbe56fea042c486430eb66a9daee811cd73befa1424aba25cda75898a6dc94e65ff000b275d89a0de6956 SHA512 c606015a23412fbb5878e939987ae98851690bbae777eec59e80945097751b60f960a4d1488943c55d0f9c3bc9b926e78574009fce707b53ffa4e26377fa67c4
+EBUILD libvirt-9999.ebuild 8183 BLAKE2B f5883eb9d0f5e8413fee7c1a413734957e99445fb60cbe56fea042c486430eb66a9daee811cd73befa1424aba25cda75898a6dc94e65ff000b275d89a0de6956 SHA512 c606015a23412fbb5878e939987ae98851690bbae777eec59e80945097751b60f960a4d1488943c55d0f9c3bc9b926e78574009fce707b53ffa4e26377fa67c4
 MISC metadata.xml 3326 BLAKE2B 70997d3eee5387a0735faad11a891927ad7c96b5fed632c3774611a7c35159eacfd6b0e9561c09dd08d64112c6bd66ff011fd58ed23520bc4f4f531c0d5f4693 SHA512 651bf4d8eec1af7b08c8b1050f2a4d57fa8e205205c59f231d3f84be643a71633b1426e9df1c83c838636245503bfefeef66696ddb9dc9e8da6b1aadee741856
diff --git a/app-emulation/libvirt/libvirt-7.3.0.ebuild b/app-emulation/libvirt/libvirt-7.3.0.ebuild
new file mode 100644
index 000000000000..2de18dcd6e20
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-7.3.0.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	SRC_URI=""
+	SLOT="0"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
+	parted pcap policykit +qemu rbd sasl selinux +udev
+	virtualbox +virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.48.0
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-1.0.25:0=
+	net-libs/libssh2
+	net-libs/libtirpc
+	net-libs/rpcsvc-proto
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-util/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:0= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( net-libs/libssh )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[-device-mapper-only(-)]
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-2.11
+		dev-libs/yajl
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6,script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		>=app-emulation/xen-4.6.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )"
+
+DEPEND="${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP_NF_TARGET_MASQUERADE
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_use apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 769f02106434..2de18dcd6e20 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles
+inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -22,9 +22,10 @@ fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
 LICENSE="LGPL-2.1"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="
-	apparmor audit +caps dtrace firewalld fuse glusterfs iscsi
-	iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
 	parted pcap policykit +qemu rbd sasl selinux +udev
 	virtualbox +virt-network wireshark-plugins xen zfs
 "
@@ -45,7 +46,9 @@ BDEPEND="
 	dev-libs/libxslt
 	dev-perl/XML-XPath
 	dev-python/docutils
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )"
 
 # gettext.sh command is used by the libvirt command wrappers, and it's
 # non-optional, so put it into RDEPEND.
@@ -98,7 +101,7 @@ RDEPEND="
 		>=sys-auth/polkit-0.9
 	)
 	qemu? (
-		>=app-emulation/qemu-1.5.0
+		>=app-emulation/qemu-2.11
 		dev-libs/yajl
 	)
 	rbd? ( sys-cluster/ceph )
@@ -293,9 +296,6 @@ src_install() {
 	rm -rf "${D}"/var
 	rm -rf "${D}"/run
 
-	newbashcomp "${BUILD_DIR}/tools/bash-completion/virsh" virsh
-	newbashcomp "${BUILD_DIR}/tools/bash-completion/virt-admin" virt-admin
-
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index 9a00574df2ad..dc86d4503f94 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -3,5 +3,5 @@ AUX protontricks-1.5.0_no-setuptools-scm.patch 1321 BLAKE2B d96472bf9b0827cbc6bb
 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 1443 BLAKE2B bf0b69a3d9e1dcd6c6a790b39110ee85da1a2cd9008acf2c734c929bd1c9506c9f5af43212e949932ddbb1cf72fd3c260fa5dfaa43eff64af59e0890663a80d3 SHA512 46385bc29c1d958e16eb6c65901bdcf073312a5e2d03add2148bce5c4817d513177b433459a69808cef9baba5c0b181ca3be2063bef46af7671190870b373301
+EBUILD protontricks-1.5.0.ebuild 1444 BLAKE2B cdb33ec0c2fa7d1c941f478f2613f54da28aac8b075deb185f3e96c294e88f1010f97d4f024fa36954371be55481c88ab4c274c222b1454778c50eeb528ce845 SHA512 d3e7c95a8f9869ce7722514b361f5e663092c5994a14a3e39345bd1b6dc5e13ebe31042767441ec32569cd43ed9129a99231cae52cb280b550817a5f6084018f
 MISC metadata.xml 808 BLAKE2B 9abbb6d1689e04026c239dc2bde4a2d975bb260473178e68c0ec3e37a3e4c3e6db701ece9e8551d5ba071db14effc7e59a15a5e13c2049a6cd9d0709562bf709 SHA512 21452c10fe698d461aa814bc1bddb6350fcd8f60b7c84d8949f1eb8a1932ae3f9214c123451334ac2108f6ad930d5e6f5b522eac477ed6f6af1c916326254c32
diff --git a/app-emulation/protontricks/protontricks-1.5.0.ebuild b/app-emulation/protontricks/protontricks-1.5.0.ebuild
index 2540f44fa284..06e0a22ded68 100644
--- a/app-emulation/protontricks/protontricks-1.5.0.ebuild
+++ b/app-emulation/protontricks/protontricks-1.5.0.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
 
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index d229aec7ca8e..62997d796a3c 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -7,6 +7,8 @@ AUX qemu-guest-agent-4.2.0-fix-shutdown.patch 515 BLAKE2B b70f9f67464b91042ced22
 AUX qemu-guest-agent-4.2.0-sysmacros.patch 367 BLAKE2B c52061d00b354917f701dadd37218f8e61d5a2e245ba3908f054891420c7626a8df7ecd0329edf1d11246d38e5591cb4530d63969134a34a5065c5ef041004b4 SHA512 41cb67cb02cf5a8eb5a5b929e2a6adcb6dfe376d6ea512d404edf18d0ca85fbec93140f83ee5d8f4980095fc46040cfd27b22f378cc61dcd6e147badd8b1a045
 DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
 DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
+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 1777 BLAKE2B 9796d27b88bf67eb7fefb402411bdce1f09c14bc0d75500217a8ed9ab16eba4d10e67d7cf83cc4245ab04d1c426060638fc91a49b0911cb709376b1a2d417371 SHA512 b3f2fa20422cf4e9c3bd9f65ae44950a8dcdd91cdcf03aa76f8e9995cc38e294143b3eb927007586aa811f3779822e524f34166850b502b3b8764ac167210961
+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
 MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild
index b01086e4fcac..9318ba4a519e 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="qemu"
 MY_P="${MY_PN}-${PV}"
 
 SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
 HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
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
new file mode 100644
index 000000000000..ade6439209c3
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit systemd toolchain-funcs udev python-any-r1
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/glib"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	tc-export AR LD OBJCOPY RANLIB
+
+	local myconf=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir="/usr/$(get_libdir)"
+		--localstatedir=/
+		--disable-bsd-user
+		--disable-linux-user
+		--disable-system
+		--disable-strip
+		--enable-tools
+		--disable-werror
+		--enable-guest-agent
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+	)
+	echo "./configure ${myconf[*]}"
+	./configure "${myconf[@]}" || die
+}
+
+src_install() {
+	dobin build/qga/qemu-ga
+
+	# Normal init stuff
+	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+	# systemd stuff
+	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
+
+	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+		qemu-guest-agent.service
+}
+
+pkg_postinst() {
+	elog "You should add 'qemu-guest-agent' to the default runlevel."
+	elog "e.g. rc-update add qemu-guest-agent default"
+}
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 9575abc40186..0d8d64185b85 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -8,13 +8,14 @@ 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
 DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
 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 25751 BLAKE2B 7a316b453d112521f814fb76da71681da9317681bdc43145ebacb8b0409066177e0cd0ea5b795590d1eabf3bbab84d58d69f9f37ca09d8bfb03c71dcfc03e5e7 SHA512 b49e53851bc907f9aa16169b22c12904911ef21c261477c2bb7681391e621db37581b63c5202aaa6088b4364800d090680a5312494e630ad3092405bbea8ba24
-EBUILD qemu-6.0.0.ebuild 25567 BLAKE2B 3a8e74d0045293b0d2afe88363b52de08ea454dabea902e7baea072c1c36f71afa06634422cfd1d5e3bc5b80e07074e835e405dd692075ae1d41ab7bb15bfd04 SHA512 7e601346df628c46c9eb8413599feba2754c96eaf09706dd327e05d2c315381a0c449234cac9fb02cfa7793ae6dfa804a07541ad5396f5dce47b19f898400992
-EBUILD qemu-9999.ebuild 25567 BLAKE2B 3a8e74d0045293b0d2afe88363b52de08ea454dabea902e7baea072c1c36f71afa06634422cfd1d5e3bc5b80e07074e835e405dd692075ae1d41ab7bb15bfd04 SHA512 7e601346df628c46c9eb8413599feba2754c96eaf09706dd327e05d2c315381a0c449234cac9fb02cfa7793ae6dfa804a07541ad5396f5dce47b19f898400992
+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-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
new file mode 100644
index 000000000000..2a1e6f9f5f43
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch
@@ -0,0 +1,35 @@
+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-5.2.0-r50.ebuild b/app-emulation/qemu/qemu-5.2.0-r50.ebuild
index 6d459a989b6b..5e20ed0ce712 100644
--- a/app-emulation/qemu/qemu-5.2.0-r50.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r50.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/qemu/qemu-6.0.0.ebuild b/app-emulation/qemu/qemu-6.0.0.ebuild
index 591f58deeb83..ddc491992357 100644
--- a/app-emulation/qemu/qemu-6.0.0.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE="ncurses,readline"
 
 FIRMWARE_ABI_VERSION="5.2.0-r50"
@@ -274,6 +274,7 @@ 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/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 591f58deeb83..b3bbda4c9b82 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE="ncurses,readline"
 
 FIRMWARE_ABI_VERSION="5.2.0-r50"
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index 24d2b8c4171e..a26f039def69 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,7 +1,7 @@
 DIST runc-1.0.0_rc10.tar.gz 1929802 BLAKE2B 8399c3d62726bbb6256efef7e15b7496a7172bf25170b12beb60be498967dec4fde2aebd073de4265e132ff864bafc4d2499ab677390a4f7c0a1605d83ae55e5 SHA512 598221071ef07d18bf34bf5d5c68b8ad78ee71716177fc3ce5b6909cd841d5aed93f17ebf1f3d134707d29eef1f54a4ddc21e79621a9bd957df28a8d2e028ab7
 DIST runc-1.0.0_rc92.tar.gz 2061469 BLAKE2B 06444eaf7602fe9ddaf7728c7f55bd718d1fe8f5f0ce6b21abc49a1d84eaa2fc3550d0d275ba5548ee9ebb6948a8ed415de8562a990d6085d1da8fb37e46afb9 SHA512 770a31736f5ab4ba359d91bd236750511f90b29af0af2bad5c238b611f465d7302e78b57ce8a702068440fda2d74588b92fd4d24c6d34e6fc1bd649ea3d8ee40
 DIST runc-1.0.0_rc93.tar.gz 2132429 BLAKE2B 35d6fe9eebd26fb37d648a67b35415c51283ac3dff0f111e88be9120cf139e4811ab9a7b98e2c559dc4ce8b0e7958f15464dc4f039f7b3eb9f06f26a1776875f SHA512 087becdf3882818b7c8d05ac0192928695b35033d72e5ce584d5b8291310f4ba35b1cc78299fc8f17dc7ee425a94817b989890f4108444cc3c45927740b2d378
-EBUILD runc-1.0.0_rc10-r1.ebuild 1837 BLAKE2B ffc28565f2daf8dbda38f643dfb2bd26596531a19b3087a17a3f59a9c535080ac93c530c21055716a5d4c36211a62e3aecce74ed385a0446bb47784bd49e8420 SHA512 cdceb2bf1583bdb678da403a3e47bd4cdcdf1af081889ca36da0bdf606e93d477950e1e8e58d51d7d36d78a4a7f482bdc49e677f106f53e8d4326fbc2e56b820
-EBUILD runc-1.0.0_rc92.ebuild 1774 BLAKE2B 9af109cdb8709fe3208a61e6a302d25f2bfbb72d7bc43c5e5dea90fdada7413fa4df770b84b3e0efc16c059895415f1fc0efc55f8811efd4736ca2be3a739fa2 SHA512 9da62ddf994c4e6b0f7be658a80873f64fff8a35582b25c8809477ed437befaeb80dee11878450de36b379f0f9114d61c10b291b2c958aa0e29c59a41f1324b9
-EBUILD runc-1.0.0_rc93.ebuild 1712 BLAKE2B 042989a2156ed211ee4da27c27e9a429feec94e62fe14d7d5d651de2be7a1de037634c86d6b9f51ee936eb00c5d2165b29db364fa25299f00e997c9269019f68 SHA512 63e044ff01f9eb9491f6fc3e42b6b2b102fac1e2854ad41466d37e2bccf047af3246b00fb79f18e057dd874e6d638c890ece42677a28a7bd7cdc23632ce6c17d
-MISC metadata.xml 876 BLAKE2B db5667a946ce043848f7cf87bcaa8c03594e9c4c35186fc905befd344202028742ab51a783751629086fc79cc3d6ee0d5b316978b2aa8677d6f47bd167fdca99 SHA512 0ad802b914d57523092f574450357bf90d54bce93d22e217061fce2817f68a43e5fd3402f80820c2b5e33ade763cb91ddb261250bfddf8ec4785e457981d69f0
+EBUILD runc-1.0.0_rc10-r1.ebuild 1877 BLAKE2B 770d1f1010886fd3d3bc5cef6e52dce7b73dd44971d34ab0b421b8ed1995182fd360b412257b2c28556ee6b7dea9bffcd05fafee1e0e06502580405276ca28c8 SHA512 68c40ecace94901438662468e4f6bb1c33f63ed7382e579e764cfe21241fb49b8bac335ec57eacabf95623fe1185fb6512e70678a98f9ced5a3f917cab4d4882
+EBUILD runc-1.0.0_rc92.ebuild 1815 BLAKE2B 7ff8d0c518fc735e3529ceefb5a963fe93025c403babaae144434c3662866c5ddaf60a3cf5b0e4b3cfc534a4c5dad5ab06d9c790c95667fd7e5705b1f9c169d2 SHA512 23324b45ab77036f4a6951951e6e5639c8465ad4b589d46ca49854c1f05fb586366b5b5d857bd00f5c9a5f46c09d14c7a1eea8fe0ab540bbd1ba681f7b0bbaf6
+EBUILD runc-1.0.0_rc93.ebuild 1764 BLAKE2B 3f9c71b441c120e4b10989c8d32a92ee9e3ebda927a4ee7bd553f78d05ddcfa225e1603bd6190640ac7ac40d0c75b7ed7c3b22fc599679888692f416d8f25c28 SHA512 56d5dfcfb84a0c2983d7401566e35b1d53222fa754081d575fcc0ebe49ce9458f094ec3de4eabb8f51ac297546d450622198320ad39c7d2c71480bf6e1a65aaf
+MISC metadata.xml 940 BLAKE2B deaf72fbb5341bc95ab446cefeff9fdc870dfa87df4364132b862f7a699b5028f54a9d8852bf75bad0e229429cc6d22eb0c75f6bfa3ea4b1c4514cf5d0fcae3a SHA512 f24b8b3d59a534ff1991dfef51655c9e7a93f6c4f4cdb4a85d52ad69bdf17d68ee519d703a15941098cc90ce46643db48a0b398f8524cb80a9a7b2030ca20dc0
diff --git a/app-emulation/runc/metadata.xml b/app-emulation/runc/metadata.xml
index 8b7ea39239c3..f9c14aa5bb8d 100644
--- a/app-emulation/runc/metadata.xml
+++ b/app-emulation/runc/metadata.xml
@@ -26,5 +26,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">opencontainers/runc</remote-id>
+		<remote-id type="cpe">cpe:/a:linuxfoundation:runc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
index 9f60bd86db13..0a433baafd1e 100644
--- a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,9 +40,9 @@ RESTRICT+=" test"
 
 src_compile() {
 	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
 	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ROOT}/usr/$(get_libdir)"
+		-L${ESYSROOT}/usr/$(get_libdir)"
 
 	# build up optional flags
 	local options=(
@@ -54,11 +54,8 @@ src_compile() {
 	)
 
 	myemakeargs=(
-		BINDIR="${ED}/usr/bin"
 		BUILDTAGS="${options[*]}"
 		COMMIT=${RUNC_COMMIT}
-		DESTDIR="${ED}"
-		PREFIX="${ED}/usr"
 		GOPATH="${S}"
 		-C "src/${EGO_PN}"
 	)
@@ -67,6 +64,11 @@ src_compile() {
 }
 
 src_install() {
+	myemakeargs+=(
+		PREFIX="${ED}/usr"
+		BINDIR="${ED}/usr/bin"
+		MANDIR="${ED}/usr/share/man"
+	)
 	emake "${myemakeargs[@]}" install install-man install-bash
 
 	local DOCS=( src/"${EGO_PN}"/{README.md,PRINCIPLES.md,docs/.} )
diff --git a/app-emulation/runc/runc-1.0.0_rc92.ebuild b/app-emulation/runc/runc-1.0.0_rc92.ebuild
index fe79682ba080..ec75ad824e47 100644
--- a/app-emulation/runc/runc-1.0.0_rc92.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc92.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 BSD-2 BSD MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="apparmor +ambient hardened +kmem +seccomp selinux test"
 
 DEPEND="seccomp? ( sys-libs/libseccomp )"
@@ -42,9 +42,9 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_compile() {
 	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
 	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ROOT}/usr/$(get_libdir)"
+		-L${ESYSROOT}/usr/$(get_libdir)"
 
 	# build up optional flags
 	local options=(
@@ -56,17 +56,19 @@ src_compile() {
 	)
 
 	myemakeargs=(
-		BINDIR="${ED}/usr/bin"
 		BUILDTAGS="${options[*]}"
-		COMMIT=${RUNC_COMMIT}
-		DESTDIR="${ED}"
-		PREFIX="${ED}/usr"
+		COMMIT="${RUNC_COMMIT}"
 	)
 
 	emake "${myemakeargs[@]}" runc man
 }
 
 src_install() {
+	myemakeargs+=(
+		PREFIX="${ED}/usr"
+		BINDIR="${ED}/usr/bin"
+		MANDIR="${ED}/usr/share/man"
+	)
 	emake "${myemakeargs[@]}" install install-man install-bash
 
 	local DOCS=( README.md PRINCIPLES.md docs/. )
diff --git a/app-emulation/runc/runc-1.0.0_rc93.ebuild b/app-emulation/runc/runc-1.0.0_rc93.ebuild
index f89d4a1ce278..316f720fc29c 100644
--- a/app-emulation/runc/runc-1.0.0_rc93.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc93.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,9 +42,9 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_compile() {
 	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
 	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ROOT}/usr/$(get_libdir)"
+		-L${ESYSROOT}/usr/$(get_libdir)"
 
 	# build up optional flags
 	local options=(
@@ -54,17 +54,19 @@ src_compile() {
 	)
 
 	myemakeargs=(
-		BINDIR="/usr/bin"
 		BUILDTAGS="${options[*]}"
-		COMMIT=${RUNC_COMMIT}
-		DESTDIR="${ED}"
-		PREFIX="/usr"
+		COMMIT="${RUNC_COMMIT}"
 	)
 
 	emake "${myemakeargs[@]}" runc man
 }
 
 src_install() {
+	myemakeargs+=(
+		PREFIX="${ED}/usr"
+		BINDIR="${ED}/usr/bin"
+		MANDIR="${ED}/usr/share/man"
+	)
 	emake "${myemakeargs[@]}" install install-man install-bash
 
 	local DOCS=( README.md PRINCIPLES.md docs/. )
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index 0058b529a7ea..5cbe8252d4f5 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -4,7 +4,10 @@ AUX spice-0.14.3-CVE-2020-14355-762e0aba.patch 533 BLAKE2B f6ecb51c2ef568d7e9c34
 AUX spice-0.14.3-CVE-2020-14355-b24fe6b6.patch 876 BLAKE2B 7ba5c57e7ca7265f6d42bf475403ba1f1ce3690b1d6ab9d9c65ee722005a1b198b7b6a5ffb0d94a2dea1c67eb7ecd2585d6974c43ffae1dd25a2bc51781d5483 SHA512 b13f1b44d3452b5b246efb1b98f9b4b9bcff8ed9161bfa79d31fb4404cc499772144676a96b37b1cb94c7e9036c23df092fb1a878651555164e733d0fafb0712
 AUX spice-0.14.3-CVE-2020-14355-ef1b6ff7.patch 759 BLAKE2B 8d3f0b5d03d79dc1c02efec9f3746d4d8a5fc3be9b4a98a1b1b6f325cb19a03dbc2d29ab5c7a3a7bb807fda2bd52080c87d706a1c61eff15bc74a8c65a60f8ce SHA512 9b72fb0195feb5ddbce7dacca0459d2f5ad00a72c0f45488debae50c188b14274ae8a7208052e85ca42793a6be3a7483c816f1f381015ea5fe42fa05bb2a9f5a
 DIST spice-0.14.3.tar.bz2 1504304 BLAKE2B be655e1d4c48dae29903ab8e0dc52da63723e3252052afccc9587065531f28c8af7dbab4c585093f26d98f2273c6e734a553c18d4779a9f4464334ae1764f682 SHA512 9ecdc455ff25c71ac1fe6c576654b51efbfb860110bd6828065d23f7462d5c5cac772074d1a40f033386258d970b77275b2007bcfdffb23fdff2137154ea46e4
+DIST spice-0.15.0-pthread-c5fe3df1.patch.bz2 7605 BLAKE2B 86b8094a22a02080db038ef98972bf09f391d5344fee8df2aa7d2def0b50a581353cb0e3dd97f99bbd58b88a13ceac4b54be8086a9f4274f38d132b27b62e84d SHA512 5075bd260b33c2dad8c3ce641372383871f7d69190a4f4697bd5e12af1bf5429310c592961de001d36c19a9cdd91143b8d6e8be0e08b3850b9700c2aef2ddd78
+DIST spice-0.15.0.tar.bz2 1537970 BLAKE2B 98e8f55de81a86c6370e4a74c0fd90db78a9a8e8e3af536bccd6a2a75185194ac7b87521163090c4312e392d2ee10036c0283171c7796aea630e1307128a2d55 SHA512 0a776d191c395ce1f7ebbbac47956a00a2765327d3127aeca6e232bd56fd4ccd28750ae1599eb6eb2909ac909cda517d5511faa631166db16b8b75bd4e7b86d9
 EBUILD spice-0.14.3-r1.ebuild 2621 BLAKE2B 5aa069382b144ce2f338821472519d7812794b731b36a442240fbfcbc0a3ea67aedc9e29658803775d86eb2af5712bd33cbf10809e87911a6165e878a422f582 SHA512 a0dc8069d249d8166875aefe31ab9101ef16a230b48d759e534183c4df10f1a218cf0d9edcbe4704cbfb52d999e1b34deb821d543e3b25deac7d748757c54a5a
 EBUILD spice-0.14.3.ebuild 2310 BLAKE2B 86625e340900ec8d98cb005f174bcc476b87701080567645b4434c1ad563a54dc83c32078989f9e3ab5691c34f0c5ae3db0d14f3716995f79680f55737700294 SHA512 d9efffe7a3424f5741733ded820cbd07d3d4b4e9bcc8a292ea9dd2f1dc67e2d05efbceed3ccd030f996e1b6a042ac46116b755f04aa9b7860100bf2977182c23
+EBUILD spice-0.15.0.ebuild 2567 BLAKE2B 868bd8b926b9772d2e9e69db95f5997450d30d11634f7307849df95a959e348c6e6998003e58387e93a64c767b709ea3a2e8361098000d630985d6d70f78bde3 SHA512 0b6eb0f8f0239feb04a4fe5115879692f9aa50721b65cd83d92d1386ea934146cdac807ff1738c03a45007fdedc397e9cad6ea250b3b124dea10b2cbbb26de1f
 EBUILD spice-9999.ebuild 2297 BLAKE2B ad91d32b9df3b604d1d529b93a103a1e9b1cf753fdb8fdce0c4279131fe7ce47b18ea8ad29c53876441bebc80cb13ac1501ea38a34e29b603932624824629c03 SHA512 e3f9b1fab98362588d8c274539b396d1eaec8fa2e7de5745222f9756ae903bc65da7e3b87b863ce44aadbada7e67362b526cedbcf74b06ad6a90f7ecb94e9972
 MISC metadata.xml 385 BLAKE2B 599bae33d9264b8b3b4474b0d2234d66e6c6f2cd3da1710bfea64f75570264da7f4de712cecb95408a059f70e3dba2de2a421c02f1f728e39c2bf913c2c570a0 SHA512 c75966298d69fb56b3e16c98b0cc7b3b2514d2ad2a6b790777c00493754e678388f0eb17fbabc6f58a667883e87d2a4f19c2a1c34f5c87f81fb13a8948ab85c8
diff --git a/app-emulation/spice/spice-0.15.0.ebuild b/app-emulation/spice/spice-0.15.0.ebuild
new file mode 100644
index 000000000000..30f4642538da
--- /dev/null
+++ b/app-emulation/spice/spice-0.15.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools python-any-r1 readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="SPICE server"
+HOMEPAGE="https://www.spice-space.org/"
+SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-pthread-c5fe3df1.patch.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="lz4 sasl smartcard static-libs gstreamer test"
+
+RESTRICT="!test? ( test )"
+
+# the libspice-server only uses the headers of libcacard
+RDEPEND="
+	dev-lang/orc[static-libs(+)?]
+	>=dev-libs/glib-2.22:2[static-libs(+)?]
+	media-libs/opus[static-libs(+)?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/jpeg:0=[static-libs(+)?]
+	>=x11-libs/pixman-0.17.7[static-libs(+)?]
+	dev-libs/openssl:0=[static-libs(+)?]
+	lz4? ( app-arch/lz4:0=[static-libs(+)?] )
+	smartcard? ( >=app-emulation/libcacard-0.1.2 )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)"
+DEPEND="${RDEPEND}
+	>=app-emulation/spice-protocol-0.14.0
+	smartcard? ( app-emulation/qemu[smartcard] )
+	test? ( net-libs/glib-networking )"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-pthread-c5fe3df1.patch
+)
+
+python_check_deps() {
+	has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/six[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	xdg_environment_reset
+
+	local myconf="
+		$(use_enable static-libs static)
+		$(use_enable lz4)
+		$(use_with sasl)
+		$(use_enable smartcard)
+		$(use_enable test tests)
+		--enable-gstreamer=$(usex gstreamer "1.0" "no")
+		--disable-celt051
+		"
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
+src_install() {
+	default
+	use static-libs || find "${D}" -name '*.la' -type f -delete || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 7a348f31b01d..82fcc38de0eb 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -3,6 +3,6 @@ DIST virt-manager-3.1.0.tar.gz 2848420 BLAKE2B 729a16ee419cfc9f118e4a59336e961f1
 DIST virt-manager-3.2.0.tar.gz 2858909 BLAKE2B 83bd8589fb7d9c855300e06689fdeeeee575e354f9349b5bc63ff1da1a8b578a842f6f60d95a8b8fa53ed007c090d37f706f50fb8dcbcee83c08e27853a150cc SHA512 90cd98fe6b269007cd30f628490c65df440abe39b4925c65dc80667e7d80d059752695353ccf6ac3e2436206da311bc402eda50df31874d82ef8fe115966e1ec
 EBUILD virt-manager-2.2.1-r3.ebuild 2369 BLAKE2B d429198a0d3b4e629b28bc43de33950e6a2e236cc732d641e9d05d9c48da1c3f3da629f06e3c451d357c9cd933bebc5950ca55aa3f6889e05775d2020e86a220 SHA512 49831cfc41641f24cc19306d829246bef0d80138ead3a29f4a311f775f88da4ee50ea40f14c05ba1751b5e7042d4ea4f8831d222ebdd5a9b100a38e5cd55cb30
 EBUILD virt-manager-3.1.0.ebuild 2426 BLAKE2B 0cddadea64ff30d4e262095c5fc0c3623c6f25a9a16a280aa594a62b437d20cbfb9cc4e12f498d55ef8f2e29eefa4a242daddcb04a267f169f38cc9770d007ca SHA512 09787a65b161d8b81e36e2210cdd0a3932013891d2dc86d97411d02734f8b0ed7c3936b69f88eaf80aef4d4035d5730c2fc73b87ddde0681c243d7cc548fc654
-EBUILD virt-manager-3.2.0.ebuild 2411 BLAKE2B 4f4986994aa87980410a323da133d864ad9d8a2ff7c93d0121db7c9a887cfe2b0cc80da20a2a29760082a8c849e3beba5144616f230a1ed38f32e9c84381fb90 SHA512 caaa2f03b65ca3e3f7997239d6a1d1f00cfb0b162d402749f8e61feeff31ce94173c9c9e4fd2b46991aeacc0d420cba78a5880c059029a5d9dc775d3926cfe09
+EBUILD virt-manager-3.2.0.ebuild 2410 BLAKE2B 2fd0693f3f03309ddd7f037852471a37e6cc8acae79e32323530985f06823fede5685da70a9cabc8db345ed3d9f05f8f1334a931353e665fbe0d9687aa82ba3f SHA512 34d89c7de927bda0a3c92f4977ffade32d85f261696264a180f9602a665ae6581bc0033406ff45a39f1329a1734e496e3e6da003e6f332090cc66ad5038b03d4
 EBUILD virt-manager-9999.ebuild 2405 BLAKE2B f9428dabdc6c1193af28d6c6829bafbef6ec70fdc9b9ad47600b2b73c25708856caef642b4c72ad327fec3c425547f57eca644fcba78d9ec497fb0462279dd7c SHA512 fb0017b665759dda9e58ffa010db2fb0a6fe6cbca1e5465646d3280129e9167acfab79ffb1c80289055a298549e871468c230d669e76731f285bb2f87c6d05da
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-3.2.0.ebuild b/app-emulation/virt-manager/virt-manager-3.2.0.ebuild
index 373dc31ea2bc..ddd942dd7b23 100644
--- a/app-emulation/virt-manager/virt-manager-3.2.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-3.2.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
 else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 06310a11d7ba..e7657043f6a0 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -19,7 +19,7 @@ DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 740
 DIST edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz 13192042 BLAKE2B 81afa7fd5f6f14fff35baa3c6c64583fa21c7b793ed847a3362fd05a926bb4402db911f9f78f4ffd76a6de9b815171dfa245ae41afac3b022cd108597e8c1ac3 SHA512 a032a1496db7ddc32a7d6d1a7d5fe4122ab43b13547ec019855166d785f162268ad82ceb3c41efafe1687e73fc72599ee6852741652451e1cb329fd655c69b6c
 DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b95266ec7fcee5c27065ba999b023ded9eb42a3690555e626911493f1dc995927fa67071bdc6432b3995df82134f8c49ea0d72eaf407f455dd1e2675d5b8d844 SHA512 8120696ba6d79fd9189664deed9b0489825d8d1edf7b931023b3979b7b9f82248e5b808c4517036cd40a85442ddf51a8dcad3b05d7f3c3cc6650654d53da4050
 DIST ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz 3931642 BLAKE2B bf0b5d9ea1d44803bc5c4aa0bf9188636e292b226ab759f32e3c2bfa3f80dd3f546526b9a11c1f67193793ede5309bfa67bdce80aba62ccca54597dc6e7e4ba4 SHA512 0a63f83c9135d05c6bfe7c4d12da3ff76271e35305a4d5654bd5aefa9ee59f5363546c65820c42133deb0fb5a0a0bcaa9b1c48396f9f996acea0d492a5f03f33
-DIST seabios-1.12.1.tar.gz 613450 BLAKE2B cb926b650c41a9962db407945cb5b6558079b061bd61f32ea56aedf0d37a00d10ad4434acbe717ffbc0dd1d1c0767304af8e640a53b0fc3784969dfa1590f681 SHA512 58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0
+DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
 DIST xen-4.13.3.tar.gz 39044539 BLAKE2B 5d0e57c76e12e1b86b78bbf561e947d70b9569a24412617a640346d2358b141a2741e7a3be454df52d198ad63e58b1519288de62330417c70e72445703f3fac2 SHA512 622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6
 DIST xen-4.14.2.tar.gz 39973157 BLAKE2B db5d3570f79e0fd97872f5e5dd57a4eb39e005728387bfef3b51fabe1c693cfd8108d09b1026f5a5a7eb79de71be6f4af36d252f7e0b35a65a1567b7949e3e29 SHA512 83c9333b70dbee3e29c6bf08e5ad030676e6c4a32b976f3f5e6a8f8d0dd9e4898bac88dd8e1c9d2ad3509cebb5d212e1745f9392a469d7afeb841d79801ccf39
@@ -27,7 +27,7 @@ DIST xen-4.15.0-upstream-patches-0.tar.xz 15744 BLAKE2B e2abb68524a7c190db8d91be
 DIST xen-4.15.0.tar.gz 40785399 BLAKE2B 8b0530f5516c39656506f4bb705952da0555a8ab7f47323473b171caeb7692f3107e9d94f13171d40576600064589eed35f4d210af02db4cc4706dd4fc202100 SHA512 93683b8a97387ca5f003c635a11d163e61c87dbdc9a03081f9155fe87b49f1dfa74ce243fcd5e04dc009353a36e2375b786f1ebde828b5951a094cd64197b4c7
 DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d
 DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49
-EBUILD xen-tools-4.13.3.ebuild 16810 BLAKE2B 6403dd7c879129c20dda44c526ef0efa909adf1e2d536d57a2f587c3ce0e153c4b5a7370794fb33021bbc3e48d9b356fdf9335395922cd30e3a7be1cbed0ccda SHA512 2b10b66fe9a450b948b3e3447082cd128a4263fa4d6c973c681a2d9aa5604ca3e02df658cbe39d69baa5342e3030dd82b4ff66253a35736aca739a0c8145d0e1
-EBUILD xen-tools-4.14.2.ebuild 16948 BLAKE2B 1d1e8911c873bc8581ec9cc692bce7fbd0f59d84a77ec94ae30469eeee9b75445d217d2bd86ab830a5da53b8a82030dbb55a4b54a5e5a9b0eba864ecca2af3e4 SHA512 82e3ba33a3d8bbff914a517789d305c27f0368e414d3c21557d6a730c7922792004c45cf4383ea5a5754e36f49a75142f4652b7a1c07c932b2484ed1bbb42899
-EBUILD xen-tools-4.15.0.ebuild 17115 BLAKE2B e319c2edab31c25659d1492b9e555a5bf35e2e1dca8e1ecf14715dcec60111d9811a20e996b621a58bd8b51e008aa31cbb17e1b2fc3a963ff36fba6136016fcd SHA512 d52a6096e980d3c536cf684500d5909281361e0d36a666f9ef9b7bf0aa9d4cf1556dff88c8d87b6fcb7c6993a6e83e17c2e3c4bb525753c925c32f9cbfa41651
+EBUILD xen-tools-4.13.3-r1.ebuild 16771 BLAKE2B 702c2dabd243882ae7f6e9799bb61bd4562fff638c402ff2f0b94916a2a160f71b8b571346bec95061ef541af534a52432bf79091ab93f59a03e954ae3094728 SHA512 197047822f855ce583d61eb57be28547764e5a7d16fefd719fe724a5bdc5b4d857a29fccbe7c2d3e7e5c501412c634082ffe235b3554e32ecc967c225ec5579d
+EBUILD xen-tools-4.14.2.ebuild 16913 BLAKE2B 5d625b6eb201712320ca82b6aea9c138f9e0351af4b8a590358752e7cf968f348b7c4c35d2555a86a7880569f6d7c678fa3251b3fe6310f7bb727b71d94544de SHA512 896e9e5f98f54fb12c264a703592f6a57bd2fc2879d39dc696bcf5d2c8b237d081ce19696517c7f44d94de0c061c17203bb65a29d81109904944b1402d92cae8
+EBUILD xen-tools-4.15.0.ebuild 17080 BLAKE2B 17215915a858eb3a92bcc7fade2d56f9bd7a594b1412a4a7a44dffc1eafb138738368c0b295e2533faa5965e4f2f9983d5beacb31158e793d1341417f7bb32ec SHA512 c841caa3d7cb5e983aecf06e38e92c2603fa20371b3a4a258b35636d5d9754b089eb840f5a7c30147a9dc7db26f1381f50f214744096b462e08ba50438ef064b
 MISC metadata.xml 1626 BLAKE2B 64ae7edd26ed6c4fc3777d042dc16b7848b52d5915ce6fc024cbd3b773301ff308b364e993750153bbcd8bb92d11d3d3fbbcc923f71464924e2fddcbbb7081b9 SHA512 d703b590e650ea9e8c2d70fd118c0c1420b2a90d799669ebe32f94e552888e9f9fbda7a0a06f158fe83615e0251559ebb1c3bb475f80efd11f5ba1d50e635299
diff --git a/app-emulation/xen-tools/xen-tools-4.13.3.ebuild b/app-emulation/xen-tools/xen-tools-4.13.3-r1.ebuild
index 37bd7fd1281d..56e600d9a968 100644
--- a/app-emulation/xen-tools/xen-tools-4.13.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.13.3-r1.ebuild
@@ -26,7 +26,7 @@ else
 	# xen-tools ovmf's patches
 	OVMF_VER=
 
-	SEABIOS_VER="1.12.1"
+	SEABIOS_VER="1.12.0"
 	EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
 	EDK2_OPENSSL_VERSION="1_1_1g"
 	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
@@ -46,7 +46,7 @@ else
 		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
 
 	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz
+	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
 	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
 	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
 		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
@@ -239,7 +239,7 @@ src_prepare() {
 	fi
 
 	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
 	pushd tools/firmware/ > /dev/null
 	ln -s seabios-dir-remote seabios-dir || die
 	popd > /dev/null
diff --git a/app-emulation/xen-tools/xen-tools-4.14.2.ebuild b/app-emulation/xen-tools/xen-tools-4.14.2.ebuild
index b32eb6386127..112aaab069f5 100644
--- a/app-emulation/xen-tools/xen-tools-4.14.2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.14.2.ebuild
@@ -46,7 +46,7 @@ else
 		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
 
 	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz
+	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
 	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
 	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
 		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
diff --git a/app-emulation/xen-tools/xen-tools-4.15.0.ebuild b/app-emulation/xen-tools/xen-tools-4.15.0.ebuild
index adfdaba5b5c2..c19f2eb37adc 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.0.ebuild
@@ -46,7 +46,7 @@ else
 		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
 
 	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz
+	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
 	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
 	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
 		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
commit	908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree	c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /app-emulation
parent	185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)