gentoo auto-resync : 18:01:2023 - 23:57:58

4 files changed, 56 insertions, 6 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index cc3ea57102e9..1f40aabd6c3a 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 6fa7e816b30b..d0d9e70c7e4a 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -8,6 +8,7 @@ AUX qemu-7.1.0-faccessat2.patch 2862 BLAKE2B 08daf0fa043b900bd503f07c1ee4c1a2e40
 AUX qemu-7.1.0-loong-stat.patch 2978 BLAKE2B e4c233fa9b561278c7df8dcc19c19868b96698f19b0d881c40e8d961c8721fc5cfad0c50e309ae92b009b6d1e2b01c5cf5ec4fbf644058e13e6d57bb00ebd8af SHA512 6e2f7b5a16d981bb21a0acc1ffe8ff6c05fe64152f93d50a0274b8d5c1635a8af1bec38e71c3350c4643582bdb0a30dda8793e9a67bd20046cee9528198da6dd
 AUX qemu-7.1.0-mips-n32-syscalls.patch 4010 BLAKE2B 8ef814ed186ca1863bbdf2e88d76af18146c50581de45406eb2e1d91f72feda34d2516a81c6cfce24843a9eb30bffc91072ec3b6bdc43a2f5dead03283fef2d1 SHA512 0146fb659762eec9fe236ea3cf0382e75b79c2d9bdf5065f0f5b3904b961f76e1b877589d95de1de09d009d9364bdeb077c6a06efb78ab91f5971f91b2bf588e
 AUX qemu-7.1.0-strings.patch 868 BLAKE2B 89f17618de07b0f025d8702b73590aa91f890ab1e7f2a1592146eacf6378ecd940ff1ee07519da2b0a8c26b11fdd0f11808ebfb69d518eeffe5f557d157c7177 SHA512 c0f26e5b68aaf97b54248cf2e5e8900f215a1cda297422a4d8564e5c38fb026d9834918b95e66ac307db94576c165485d381ca404c388e7655cbf32fe974a49d
+AUX qemu-7.2.0-disable-gmp.patch 1554 BLAKE2B ac21e5985676123e8b61de8d590d8489de1d7401e5005899e5a95d7e86b77741572087a294d4b63533c26fe53f81c76e23ee482fd3a371f2e3700859644b6c8a SHA512 d4a600cfe42f1c49d45cffae64ba1e1225ae8e75a92454cbb534be5f95e1b8dbdbf441d092764cc9f9e97ed6bf6367175d7b56cdf97694dec57da2c8fabd1969
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-7.1.0-docs.tar.xz 2016780 BLAKE2B 1b84361fe58d504ab740a0b805a25d02f497ca776e7251a99f0e98e3720d1a2029b7a171f9d79dd128ba17a82c72d497e09baa1a4b2f192ba390f0f3b1950792 SHA512 7a328303b8af0ab63aa1f0fe07a121d3ca459d00fca817412e645416af795930dbea0a3e60f4ca006a74d1672e84fa4e626e4d83918e0b685b601043d0d8159e
@@ -16,7 +17,7 @@ DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 103900fb7903ed8d75f7f012bf61fa2d6fce
 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530 SHA512 f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
 EBUILD qemu-7.1.0-r2.ebuild 27363 BLAKE2B f4dbdcd125941b7dcabe9234f4e7e2bbd7b9a78073bd461eda22b8a1aacaf9ea677d4c221a75bc41643f44356c730d68cde7898012fb6cdf13e465ae59555f4d SHA512 a26cc96eee88a06bd4e5ccaa47d77377687683178131d4e76550a32693046c292461c7830917144847ee7a3e50d65837ded9527c42233e5c2a9250b0bd5aaa5a
 EBUILD qemu-7.1.0.ebuild 28395 BLAKE2B eadf553ea0007dd16d5e47c853f2ebb9821b444776b4027bfff5cfb5d788657edd58fe90d09b5f83e951504e256d2e274157c2935aae20ce16a3671926ad6e3c SHA512 d79fd86995afb946e322420bb3b9364e66ff6627c5c2ff9496a58016c9177eebfd590406d9cf4fecd07065f1d6414153d09e04b71d53e0ac7a9710a6de6b778a
-EBUILD qemu-7.2.0-r1.ebuild 27336 BLAKE2B 42a50f91090865721bf05c44d2e2b812a29ac3225cdbc6cb9c10e19980bd6b9b85c05e27deeefe326030cd1f67b206e1606099dbd66e457c2d5abdaba58f679f SHA512 d5fddfac52f49db98ee698eb14d89d233a1551f3eb5b45972540dea37ddc666f999a7ab2c1164055ed5a64426f0d0a6603d7c01444c76853776b171248a3fed7
+EBUILD qemu-7.2.0-r1.ebuild 27433 BLAKE2B 50664af473ae8749f83954fc31af021b9ee0f94531674732591e632758b031052dab73ebbe8267e29341738ec9e7bf083132f0f176bb6b74bd9eabdba44c35dc SHA512 b12769c6a0a8d7587cedc3b39de3ba0a11eba60931b11baa8cd8495e75c3c32dc4da15ecb195421a41992790fafabd2fd8d486a34da0487a54d0551605a3dd16
 EBUILD qemu-7.2.0.ebuild 27193 BLAKE2B 1bf104928d2c89a9a411bdd83f08ee2335921823ae722bc02f1f3ed4ed565114f3854a4fa0e113485bf1eeb7e738626ee59a0c29c8a458ccd7797121f3d4963a SHA512 c7b02fadcb6211bdd6ccbb44a347ba697e6f7650103894403b6f2d16d27fdb43f907ccb031abdb973168b791c6737b1e3e3eb4ba4422f6c4f76fb88626bc1db6
 EBUILD qemu-9999.ebuild 27324 BLAKE2B 0340d644d02489f262914bd103e13d0c3ee9e8687eaadae7c264e313fecf433af0f0f404f1673676a7b3766474a3f42b8d19926f57887a9a71ae5eac642974f3 SHA512 68ba6c5cd82edd97202fe1e8ca3774900919771740f5585b1cd0dd865db0bbd906ac9e22166505687759f9b3c1746b023f754b10b0a17fb4133d78ab9fef61ac
 MISC metadata.xml 4363 BLAKE2B d3091daee173604ab2bf2b0d047201a2741d3125d769590e3ae8c31c2ae781db4cc937ae10e4ae49ebbae1a633505c4de04727101f6a6e29be3fedf6e6b41e6a SHA512 efccf9cff5475dcf849d71c7769997f7209dc25d8593efa9e1e72458dcc711b69b86afbbd13d6b04ed5763b32d3837a6b04bf45454dcbebbea44182df90ad44e
diff --git a/app-emulation/qemu/files/qemu-7.2.0-disable-gmp.patch b/app-emulation/qemu/files/qemu-7.2.0-disable-gmp.patch
new file mode 100644
index 000000000000..3050228b4e0c
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-7.2.0-disable-gmp.patch
@@ -0,0 +1,45 @@
+commit 433c2acd1b9c3f7f5903273e85fed9a7f9157b23
+Author: John Helmert III <ajak@gentoo.org>
+Date:   Wed Jan 4 12:25:08 2023 -0600
+
+    meson.build: disable gmp
+    
+    gmp isn't required, and we want to avoid linking to it automatigcally
+    in Gentoo.
+    
+    Bug: https://bugs.gentoo.org/886207
+    Signed-off-by: John Helmert III <ajak@gentoo.org>
+
+diff --git a/meson.build b/meson.build
+index 5c6b5a1c75..2f9550362d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1234,15 +1234,6 @@ if not gnutls_crypto.found()
+   endif
+ endif
+ 
+-gmp = dependency('gmp', required: false, method: 'pkg-config', kwargs: static_kwargs)
+-if nettle.found() and gmp.found()
+-  hogweed = dependency('hogweed', version: '>=3.4',
+-                       method: 'pkg-config',
+-                       required: get_option('nettle'),
+-                       kwargs: static_kwargs)
+-endif
+-
+-
+ gtk = not_found
+ gtkx11 = not_found
+ vte = not_found
+diff --git a/meson_options.txt b/meson_options.txt
+index 4b749ca549..e06b274960 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -277,6 +277,8 @@ option('vduse_blk_export', type: 'feature', value: 'auto',
+ 
+ option('capstone', type: 'feature', value: 'auto',
+        description: 'Whether and how to find the capstone library')
++option('gmp', type: 'feature', value: 'auto',
++       description: 'Whether or not to find the gmp library')
+ option('fdt', type: 'combo', value: 'auto',
+        choices: ['disabled', 'enabled', 'auto', 'system', 'internal'],
+        description: 'Whether and how to find the libfdt library')
diff --git a/app-emulation/qemu/qemu-7.2.0-r1.ebuild b/app-emulation/qemu/qemu-7.2.0-r1.ebuild
index 7d6949eb5d3a..2656a331fa14 100644
--- a/app-emulation/qemu/qemu-7.2.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-7.2.0-r1.ebuild
@@ -41,7 +41,7 @@ else
 	fi
 
 	S="${WORKDIR}/${MY_P}"
-	# [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -151,7 +151,7 @@ done
 # respected).  This is because qemu supports using the C library's API
 # when available rather than always using the external library.
 ALL_DEPEND="
-	>=dev-libs/glib-2.0[static-libs(+)]
+	dev-libs/glib:2[static-libs(+)]
 	sys-libs/zlib[static-libs(+)]
 	python? ( ${PYTHON_DEPS} )
 	systemtap? ( dev-util/systemtap )
@@ -176,11 +176,14 @@ SOFTMMU_TOOLS_DEPEND="
 	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
 	gnutls? (
-		dev-libs/nettle:=[static-libs(+)]
 		>=net-libs/gnutls-3.0:=[static-libs(+)]
+		dev-libs/nettle:=[static-libs(+)]
 	)
 	gtk? (
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
 		x11-libs/gtk+:3
+		x11-libs/libX11
 		vte? ( x11-libs/vte:2.91 )
 	)
 	infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
@@ -205,7 +208,7 @@ SOFTMMU_TOOLS_DEPEND="
 	)
 	pam? ( sys-libs/pam )
 	png? ( media-libs/libpng:0=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
 	sdl? (
@@ -223,7 +226,7 @@ SOFTMMU_TOOLS_DEPEND="
 	)
 	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
 	udev? ( virtual/libudev:= )
-	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2:1[static-libs(+)] )
 	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
 	vde? ( net-misc/vde[static-libs(+)] )
 	virgl? ( media-libs/virglrenderer[static-libs(+)] )
@@ -311,6 +314,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-make.patch
 	"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
 	"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
+	"${FILESDIR}"/${PN}-7.2.0-disable-gmp.patch
 )
 
 QA_PREBUILT="