gentoo auto-resync : 03:12:2024 - 02:07:18

11 files changed, 58 insertions, 9 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index d2e4c5f838a1..ca7f780fd132 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index fe46954930b3..b78d20d13371 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -5,5 +5,5 @@ AUX qemu-ga.conf-r1 452 BLAKE2B 546799fefad91644acc0cee1e5c3f4adfb3f12cf48831a61
 AUX qemu-ga.init-r1 624 BLAKE2B 79416a272a89349e4174a4238fc7763fc1f116c7c4a2e7c4d41ba2bb8d0a41a2db1abb2053e307a257519af3163e3d603280d45f20e259ec1a1a9b090a9891fd SHA512 820ae4b04b9eeb2c8ac6128544f764af67b4462cc98377ceb37708130a5cae118bd3ed892a945fb25234a8d73fb98e60dbf5da3a44861fc56f97b66a3f12532e
 AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a0679a90805919aa4b7afac4f1d0c3bac72fcc5c7c0e0d87b227be8b1697338b827c890c56be77b07db SHA512 0fb39dd7ee528b36d8e837fbc53ba69476ba83947a4df10a9df03a02861a37d21f53865adbd3050c24aad72ec8a8bee1fb33f7382213d855884aff109f3c3789
 DIST qemu-8.2.0.tar.xz 130008888 BLAKE2B a63667042e1e19c635568072d8dcc117320117e81e374a93cfb79e2363ebf505df3217fb098638e53c899eb6f83435221e8031f2aae003c27ec25af8654683b3 SHA512 92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c
-EBUILD qemu-guest-agent-8.2.0.ebuild 2053 BLAKE2B 4474e50a807f1e4e4b5c8f38a1ea5e79f7a2341d05f1cb3b330e9404b34521044338e0f0bf03017a3c1d8fb3be1abd183575388cf6b712364261133f79d3e3bf SHA512 82c4e6f1734c1fa331b6e6eb935daa9679e1dc9c858f516d2dd356fe1763f8ffbee805e0c52b1b76914714758996f576dfa0711216ceb38b3f2aabb99cdb6036
+EBUILD qemu-guest-agent-8.2.0.ebuild 2100 BLAKE2B 0914866095fa4de732357048d22a73d22c49351fb66629706b309ab35c81dfdcc2570751c2aaa1b81ae745cad00e0ab8752f0516e13d30a620b6c23f4dc4b12a SHA512 1d4041fc92c6fbe27caa8fc6209593ab02acec0409d71024f2144c2f4d9456d7d981d97e2b3b16982bff10bc9c9a08e3c3a1861e97eb5b0ea4523e98e8d48184
 MISC metadata.xml 480 BLAKE2B f04779f98156bb579169dcda6554134eaac4416f220a2356c145ba1ad57015e52cd2e1a9c392ccf7e2eb5aed6861ab24a3934dd9f4105a988eac1d8f43b2c7b1 SHA512 1830b7c53f4dc956c2c05e99af81b2a3883e6f7ee092dedd21c4c338bff71f16822d8dd0f7b1ea67a19bad9d8cc6cb2c5952c8f2a88b270acaed55ce39479a09
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
index 8edae8bf7044..d9988b5cbf5e 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
 
 inherit edo systemd toolchain-funcs python-any-r1 udev
 
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 955250824912..4550a10d595b 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -15,6 +15,7 @@ AUX qemu-9.0.0-also-build-virtfs-proxy-helper.patch 1397 BLAKE2B 636e52b5286c1e9
 AUX qemu-9.0.0-capstone-include-path.patch 1433 BLAKE2B 7ad95b5f4ce68ceb74e13183712dc2df6182019efba234f731f19bf0d6275268147f57815121b843dbddc5974f08a1d7b51db8f5ce52671edf47ff28b155ba56 SHA512 3664d3bdc549ce4ed827f08d3e9c75b1656eade4a00d33f0635be25a670a03b8c7571b1f8cee95769cfd78fa57b09c7233e07b2a1279fc4fcc66ba3985768fd9
 AUX qemu-9.0.0-disable-keymap.patch 1434 BLAKE2B daef38624095a5bd861e04930decd86dd8f5a8f505e0a885df1abd5dac79217e7b0db24429bb48d7a95b0c184c24ec2da333528db619955102432b7fd7898707 SHA512 603525c4549b6a7c7f6f83150d47949ace89e659054d1a67b523d61a816c51986a56df2f972a08587a8e127823768cd2f5c6ae3b32c52f893e4fb481b7884aed
 AUX qemu-9.1.0-capstone-include-path.patch 1097 BLAKE2B d59702b5e4ea11dc03e337f9cd281079f1bdbbe727f891b27c52c4a8d0b3579c2d0df1e78f3f81d86f1826f39121005373193dc4cbe2dae55be94aa028beccfc SHA512 dded3cd21740f704dab6c80c6a6037a512aa2f5777b3f7a940d12450c0ee93f0c6a0f3cda537e05d6cd2d8e854752f195f1f420d0fe89270c3f672a49f845f23
+AUX qemu-9.2.0-capstone-include-path.patch 1355 BLAKE2B e35e72378bf5c4e832da1061cfecd9b5ab14cf52a27abd519f44283cf8858935b996129b8530cce795289c409e9648295eb29493b0cba0659cfe646dc3d7cd9b SHA512 5f0e58ec87245495ea6e68f0494484f5ab5f57412ac05240547bf3df723aa0a0baaded9b50c3d4caf0be35f3e61a2cc71aafce260fba81f871e3262be633ed74
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037.tar.bz2 84094 BLAKE2B 396f9df2e6ad559545054e89916915c3a3c8ff80e5e409498fec497b564d8b3ac9dd3cb966e26dce232ddff82af18a0e84e864ca18a80c2a2f4fe47e320249c2 SHA512 93c20d50a356c90f4293d8c7593611b2e0a9bc7567b6d946319f8ae06962ae1e297c8788f66fd38a1d3a0d44661bff9a07a63eaa84c8bb40ae01a45476be446c
@@ -33,10 +34,10 @@ DIST qemu-9.1.0-docs.tar.xz 2376072 BLAKE2B 31d13133b3a2e21a7d9b5af028407610ae8f
 DIST qemu-9.1.2.tar.xz 132481332 BLAKE2B 2cbc55e09a8d46fe0c9e3e7e54b6cf4490bef01e8d6fc295158e8f823678cfaedf2f95b8256205cdb14db6e11b932378dee9f653c35c2f1d7e843304336aa2e0 SHA512 ff6ed9bc784f1aa7cf06604d0e38e26ebb2685885893a2cb7d044297f26d7efd0fa6cbb034dc1c422b58504ca1081b46ffe00dd8f9fab928cafa8cfc0d7d1747
 EBUILD qemu-7.2.14.ebuild 27621 BLAKE2B ea1c8dc0e44df0e71c07f2e9416133e8216d93539b551ff43196c29f633b2464caa842a87ff5674115579c65c609ed7342350000dab319b156d062ef3b9423ef SHA512 0faf6774070971b2364532623dcfb94c4b94a6acd54f57b7a7dfbc3ad40a2a87eb3e99a95d999625d7d98c77aefb9ab2da22b087592cbf6419579d76058a59c9
 EBUILD qemu-7.2.15.ebuild 27625 BLAKE2B e729b9657c2f4ebc2df89374b4c4945d1fb7fd63fdaf6397be53fefca9444802cf894f032b6369fd7c067e80551e8899636becbbb3033a1c8869594bc5d4d372 SHA512 d0e397039d956ef938c93993d5bf8cffa82f73a4383b9e98bcd34925f9553035d99b1041d5883c5e597b86387c9a6271fa2d098a7e457056acd9d36d6530fa84
-EBUILD qemu-8.2.3.ebuild 28053 BLAKE2B ac96263871cf5a077c3d93c56f6d7319d292166f5faf71aeb0dca667d4c26967c336edaf79bba3bcc5ffdfd7f4ac9d795b5689038082e41c4e5790efea5175cc SHA512 f095cb82a84d806985bed6e6e1f13086fe8f90d6b57d575b269ec44557c4ca6921369fb6021f8836be0b43d5c3ab16404bf8ab6bcec79ae0faac179efb46b8b9
-EBUILD qemu-8.2.7.ebuild 28056 BLAKE2B 02871829376806e232eec0b4f0d9984d3643862485c154557c3acc23cea464e50a9c917bda138ae2045c3de7c970397c0f01a2bbc0561b6ff56d60fb495e13f9 SHA512 79c5ac5d837bee406876439ca35a21294f20aef6168563a6b573c23507ed4d2a1150665d1d19e733449380a7af37e9bcfb352c198768dbb0e82da484242dec1b
-EBUILD qemu-8.2.8.ebuild 28057 BLAKE2B a56fe1b4486eb9edcf665c392f8678df4728ecb458c3b036bf5f44600a2d7dc5db760d89c0ce7a3320938c67d03a50377148fb7c2ca12dd2881f8db5c46469f6 SHA512 c11c72d66d421b41a1bea09293bc749459f911ef3046789a055b84f616fb21f6e3266c1d7a9a288cc6df11a2d12202fb95bd4578204808ca4c5f45bf5563103b
-EBUILD qemu-9.0.4.ebuild 28272 BLAKE2B 18bd08c5bec5b2374182959c3ba70d2a035b71198245e912be0008726b0af127b02d93b02249999eb6a38aba84f261d92222904fb91c32fc91381b6c1206e551 SHA512 e45c21dd2e9509341bc8776733851a0a2db71ed002b843196a943ba57183ea8d5e6e2e09396373d4268dd2ebd53cb656a81856a4a9f878e80a9b6fa5b45c5bb8
-EBUILD qemu-9.1.2.ebuild 28265 BLAKE2B bec054e4ba16559d76b515c83671dfea482531275b7223a1ee6fb77691268dff31aba0557a4e534055260438f53e6b4a2741ed5ce4adc69846c1d73dcd61a2ff SHA512 56b666bd3d2814f9625c4dfdf7deae68be67bbfea30e59691f7e99b9e2e633cc3607a2a728f0ba391f35522aa57df4114748e0c18d1b6c38aa848da209e1b411
-EBUILD qemu-9999.ebuild 28193 BLAKE2B 7046d48f70a86d2481b481e4a8c2261f406390eb1629d51d005fcd23c460c2f4442fcdb22e28f9a962803ee6980a6afa9077ea223deb34c98b086e7defb3b957 SHA512 cf12748c1bf43d3a42cd35ad01feed880dd28a41f4a51cadaf95d6eefa11fda47aa5c3a8001790c2760893bbcf90a0eee10a05423fd6d06454a1a1010fa9f6a2
+EBUILD qemu-8.2.3.ebuild 28076 BLAKE2B 4ba0551fd54b62ea9cd566221b0a4e8d9743e40e8d1dfd2c8de1716bc75d2a47140e47f3739df063a0639496961892920d1d3c5e3cebb61bc1bbbefec6d61566 SHA512 b7a9609d54b5502861df451552b177eae3e4c2bc28fb9890fc85a149d7f0fd355eb1f36a3d958cfade5384cd50987bb62a62bc02b2db4b15deb41a7aeb8315fd
+EBUILD qemu-8.2.7.ebuild 28079 BLAKE2B 3c5ec762c316d5362bb72bfb09ac02ab88b0fc8dafee982b576505bd7c0e0f68448f8ab7eaf401c34ac9a1c7ecabe0b5fd161b6c87309c66e24732d7b8376baa SHA512 327a46b9fa689d910336bd524b5f5c2d9e11a33bbdb0277add1fc156d6b63edd8c3165616d56b9dd0133a43024ab48f9c8432cc2eba111d8ca2e1e50f8a9bb44
+EBUILD qemu-8.2.8.ebuild 28080 BLAKE2B 68226fb94d2febe2e47d27c9452376d420803cd26471ab3e2cf0ca89fdd32b427a3288dfc05dd82c6a1f7d6cd86c6241e5cc22c333247b5d801efbcdb6fef5dc SHA512 b984b809661d79dbbb3b7050da56a14a767b8514c9a2dc88e8f56fa05854d86a5983141dd2c537340bdd74d0a8a29d905670dabcbe86d55f185ed6988ba7f160
+EBUILD qemu-9.0.4.ebuild 28295 BLAKE2B 825f64425eede13d8f3be3ddbe002e3976b9a8a341a73665f72e14fa61819ef14b3d20527b082c549584344f9d1811c9ee80be817f5a0b167fd36c4fdc0f1e09 SHA512 d65ae4a48ab9e35cadde02f21150ac055072b4d186da9389db3c147d140a4e510170bb3fe3b02e69d61456e7e5bce2f847fa40015d96272d233690584ea55902
+EBUILD qemu-9.1.2.ebuild 28288 BLAKE2B e1de26ffa286b2c8206c779b19edc5ce7b1a69f17b103dde66e5cd919dfd6ad0a496c4dbc11cdb4f908574d5a22940e1eb8d5768763da7293b668c9b42655d72 SHA512 18df78bfb47d2541ba300ce856f83db617a4731919ebc17c82d1f6a641a3252482b59f2f836b2e085b67bf5e2c3e77b093d5f2aeecf81f9401d0a1391cb156e9
+EBUILD qemu-9999.ebuild 28216 BLAKE2B 69665da90644655d215b479f0d38832e3ad5d4ba9beea253d1b1c628fa1cc517a3b7c50629e5f4c16fc758153277560dc8d3624612b78f6506ce72adb18e7317 SHA512 1921c4c20e66699374850673d215a33a18ecbad10aa9fed622e122082911279897a70f16e7d31841c7a855f5f0f98e613d6dcc4e73d0464841ba208de3d56df3
 MISC metadata.xml 4602 BLAKE2B dea1d38601d4998b681c41fd5570e7c606dc6621f5ec8f61ff701ba023b17dd86ff45bc784cb2fa8e8409ed86c924ce3232c1552859bef3a06679134ab4d284d SHA512 1b7bc98dc33ed1e5c57ce7e718b1f42bfde0f4006b7e194aaabdf7c35610376477c4575279750c17cfb128c8138f2a1454c082df49ecf4312ac9f5e1d4e0473c
diff --git a/app-emulation/qemu/files/qemu-9.2.0-capstone-include-path.patch b/app-emulation/qemu/files/qemu-9.2.0-capstone-include-path.patch
new file mode 100644
index 000000000000..8cb557b59bce
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-9.2.0-capstone-include-path.patch
@@ -0,0 +1,41 @@
+From: Sam James <sam@gentoo.org>
+Date: Sun, 6 Oct 2024 09:47:03 +0100
+Subject: [PATCH] Forward ported from qemu-7.1.0-capstone-include-path.patch.
+
+Bug: https://bugs.gentoo.org/873157
+Signed-off-by: Sam James <sam@gentoo.org>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ include/disas/capstone.h | 2 +-
+ meson.build              | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/disas/capstone.h b/include/disas/capstone.h
+index c43033f7f6..02bc067cd8 100644
+--- a/include/disas/capstone.h
++++ b/include/disas/capstone.h
+@@ -5,7 +5,7 @@
+ 
+ #define CAPSTONE_AARCH64_COMPAT_HEADER
+ #define CAPSTONE_SYSTEMZ_COMPAT_HEADER
+-#include <capstone.h>
++#include <capstone/capstone.h>
+ 
+ #else
+ 
+diff --git a/meson.build b/meson.build
+index 2c924f8f10..86858a325b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1892,7 +1892,7 @@ if not get_option('capstone').auto() or have_system or have_user
+   # that reports a wrong -I path, causing the #include to
+   # fail later. If the system has such a broken version
+   # do not use it.
+-  if capstone.found() and not cc.compiles('#include <capstone.h>',
++  if capstone.found() and not cc.compiles('#include <capstone/capstone.h>',
+                                           dependencies: [capstone])
+     capstone = not_found
+     if get_option('capstone').enabled()
+-- 
+2.45.2
+
diff --git a/app-emulation/qemu/qemu-8.2.3.ebuild b/app-emulation/qemu/qemu-8.2.3.ebuild
index 6fbc52d1a747..01ec0ca376eb 100644
--- a/app-emulation/qemu/qemu-8.2.3.ebuild
+++ b/app-emulation/qemu/qemu-8.2.3.ebuild
@@ -515,6 +515,7 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-download
+		--python="${PYTHON}"
 
 		# bug #746752: TCG interpreter has a few limitations:
 		# - it does not support FPU
diff --git a/app-emulation/qemu/qemu-8.2.7.ebuild b/app-emulation/qemu/qemu-8.2.7.ebuild
index 6d3d77d66526..4f1e891938a1 100644
--- a/app-emulation/qemu/qemu-8.2.7.ebuild
+++ b/app-emulation/qemu/qemu-8.2.7.ebuild
@@ -515,6 +515,7 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-download
+		--python="${PYTHON}"
 
 		# bug #746752: TCG interpreter has a few limitations:
 		# - it does not support FPU
diff --git a/app-emulation/qemu/qemu-8.2.8.ebuild b/app-emulation/qemu/qemu-8.2.8.ebuild
index 55910aad6115..7c5adb09c144 100644
--- a/app-emulation/qemu/qemu-8.2.8.ebuild
+++ b/app-emulation/qemu/qemu-8.2.8.ebuild
@@ -515,6 +515,7 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-download
+		--python="${PYTHON}"
 
 		# bug #746752: TCG interpreter has a few limitations:
 		# - it does not support FPU
diff --git a/app-emulation/qemu/qemu-9.0.4.ebuild b/app-emulation/qemu/qemu-9.0.4.ebuild
index e713c9e7834e..13ae2d10fa0b 100644
--- a/app-emulation/qemu/qemu-9.0.4.ebuild
+++ b/app-emulation/qemu/qemu-9.0.4.ebuild
@@ -521,6 +521,7 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-download
+		--python="${PYTHON}"
 
 		# bug #746752: TCG interpreter has a few limitations:
 		# - it does not support FPU
diff --git a/app-emulation/qemu/qemu-9.1.2.ebuild b/app-emulation/qemu/qemu-9.1.2.ebuild
index 61886a5726eb..80d4d3ac6ea3 100644
--- a/app-emulation/qemu/qemu-9.1.2.ebuild
+++ b/app-emulation/qemu/qemu-9.1.2.ebuild
@@ -520,6 +520,7 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-download
+		--python="${PYTHON}"
 
 		# bug #746752: TCG interpreter has a few limitations:
 		# - it does not support FPU
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 3de17faf48a3..e82bd167c807 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -90,6 +90,7 @@ COMMON_TARGETS="
 	riscv64
 	s390x
 	sh4
+	sh4eb
 	sparc
 	sparc64
 	x86_64
@@ -110,7 +111,6 @@ IUSE_USER_TARGETS="
 	mipsn32
 	mipsn32el
 	ppc64le
-	sh4eb
 	sparc32plus
 "
 
@@ -316,7 +316,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.0.0-disable-keymap.patch
-	"${FILESDIR}"/${PN}-9.1.0-capstone-include-path.patch
+	"${FILESDIR}"/${PN}-9.2.0-capstone-include-path.patch
 	"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
 	"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch
 
@@ -518,6 +518,7 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-download
+		--python="${PYTHON}"
 
 		# bug #746752: TCG interpreter has a few limitations:
 		# - it does not support FPU