gentoo resync : 22.05.2021

5 files changed, 43 insertions, 6 deletions

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"