gentoo auto-resync : 06:05:2023 - 05:33:06

3 files changed, 13 insertions, 14 deletions

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index cb04bc78cc20..069776d6dbb9 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -15,11 +15,12 @@ AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06 SHA512 a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530 SHA512 f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
 DIST qemu-7.2.1.tar.xz 122400592 BLAKE2B bae1df5d332beaca313c4bac88f06dd5992988d7c1b6fdc6ced4043d858f437339cd7d0009ae667f9e66705117697bee7ee44ec4e911cc203d34eecc3d8f139b SHA512 e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a
+DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa SHA512 d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054
 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f SHA512 1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
 EBUILD qemu-7.2.0-r2.ebuild 27511 BLAKE2B 42b6f37ac0884baec367ee08783d8605bab17c9d396a29d71a2f4d29171f27f41ade4c22918d9818460d1554ea354b844a0cbd3f967898ce0f8f5fc0d61339e3 SHA512 d92da3cbe562f29b1cdeaab456dd68eec0a57e54230deecce53537ff54ecab7a4abb839ae491eb3958f7635dcdc4327ba9ff4d879d7e2db3fecb62f44b693131
 EBUILD qemu-7.2.0-r3.ebuild 27557 BLAKE2B d460a49bc8da7c15f0511b5dad0f29d3759f7579b3523be45abf1e23b2352b01cfcd00cb748355ff475c04357a44cf795a968f9b07ac2331627fbc39d105f6cc SHA512 b931683cadd8a6247778fee17b0a18ee7a6afa36809f89f2b2356a88ed44095764a24de9fe1e13d1e35e0172a3b51d02ad55663bafdffbaeae255d934b906770
 EBUILD qemu-7.2.0.ebuild 27190 BLAKE2B e8043e113cef4b06501c0141126925ee21906c187868202b8c4b885120dc6552305558b55ba88f4cdc5c004771d8e888d86a6f8140f17200279e3b2ee85da9f8 SHA512 c413dfa2382e993022d079128afd5e49ce41eebd276323836058ce5fe2d620baad35868bf213cae3c0d212eb9bf7ba53c0eb58380435cb5808d96a11a8980822
 EBUILD qemu-7.2.1.ebuild 27511 BLAKE2B 0c2b097c0335e064647ef59a480e204adf3cb0a99a40e481a58705705aaef4c3ee53d8b10e71b27b242788859c40b129ca74fe321edca8a0ab74bd1d32e17259 SHA512 69b0d5c50c3d248485a33aba72612db4ad35c5214037f562d750f6f22cf74c37bb174fcf2d936576f6c6541624d79eec220726e03630c71aad343dee87be25b5
-EBUILD qemu-8.0.0.ebuild 27328 BLAKE2B 44630ed16870e8e6a5e44030d135c301bf1002bb5a667dbb6f80f92863366a756c6f708b8aa2a2d5feb97a7affe2c9caa90542617bb7e7c9d720fa82f7a3eebd SHA512 a9ab69cd53d428a8b498556b35e48ab0dc5d164358d05ea8cfac16c5f78a0e8b220180a11198fbb97c82a97da05de07a7c21dd64e752dbea899f7275c7ed3f05
-EBUILD qemu-9999.ebuild 27212 BLAKE2B b385ca5670ea5d14ea8db939bf7450cf2e332e2b5bd080cf48e11825f5bbd63648b608c09165e8d17bc22045f80d1e789a7e790acb0f385aa6103305e9acc42a SHA512 14a9614103e7b091364a210dec2c29612ddb5c6d3d300b5698925a77bf76c9047dba651c966193ffea5886565f07166c4023d265e15178f98a4b57a7888580e7
+EBUILD qemu-8.0.0-r1.ebuild 27327 BLAKE2B 304700a18a045f17851df427556ea57507f708b08485166ae9d1c30e617eae987db79aebafe65f230fe0c4b5b4b760e87f7e44e6084b16a8be0fb3c91a884f53 SHA512 bdc0008c18439a0688edc7715a0e9c836a57e08989c4bad7e29eef0ef3362958c8eee22ca71dc2d4939aee5b3b8dd500be0fe5ee3c8da866294a1cecedbf15cd
+EBUILD qemu-9999.ebuild 27230 BLAKE2B 5cd5f64fc23ee420a2df83ebb0e0c934626acf1cf31cd4a94ec29efece27d1335d76bca201becdb0c7377da29d16a5ddd8ff16b729ac7d9dc56a96bc507b25b0 SHA512 7e6d2836b6866dd825fa3df8eee6974e21199b562c069321cf3ed8e17c230b2ca0d5da6a59d57c39bd7816cc58de6786622933565313c75256e0d8c9d3efb0f8
 MISC metadata.xml 4249 BLAKE2B 56e23de79e691a3634c21f2c7d3d2d02461cc5d2569c4ff15856f8ea99f8d53837cfa7c4dede988c304fdbe3c831f9cd776b9d62191e87f593d9643594abc133 SHA512 c4fd2aea291de484c24e3ef8d1b88a95fe3ac0b73d44bbae99f0de076b2335222f32e1b49a3fe7bd7168dc5cc290274a13bd7c615aeb54d06a04c8819e1f1b96
diff --git a/app-emulation/qemu/qemu-8.0.0.ebuild b/app-emulation/qemu/qemu-8.0.0-r1.ebuild
index 3048bf51382f..3000130b6f90 100644
--- a/app-emulation/qemu/qemu-8.0.0.ebuild
+++ b/app-emulation/qemu/qemu-8.0.0-r1.ebuild
@@ -6,9 +6,9 @@ EAPI=8
 # Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-0}
-QEMU_DOCS_PREBUILT_DEV=ajak
-QEMU_DOCS_VERSION="7.2.0"
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+QEMU_DOCS_VERSION="8.0.0"
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
 # bug #830088
 QEMU_DOC_USEFLAG="+doc"
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 0be0f8edae3c..3129dc21e59e 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -6,8 +6,7 @@ EAPI=8
 # Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-: ${QEMU_DOCS_PREBUILT:=1}
-
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-0}
 QEMU_DOCS_PREBUILT_DEV=sam
 QEMU_DOCS_VERSION=$(ver_cut 1-3)
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
@@ -151,7 +150,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,8 +175,8 @@ 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/gtk+:3
@@ -205,7 +204,7 @@ SOFTMMU_TOOLS_DEPEND="
 	)
 	pam? ( sys-libs/pam )
 	png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
 	sdl? (
@@ -223,7 +222,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(+)] )
@@ -305,6 +304,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-8.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}-8.0.0-remove-python-meson-check.patch
 )
 
 QA_PREBUILT="
@@ -618,7 +618,6 @@ qemu_src_configure() {
 		conf_opts+=(
 			--enable-linux-user
 			--disable-system
-			--disable-install-blobs
 			--disable-tools
 			--disable-cap-ng
 			--disable-seccomp
@@ -639,7 +638,6 @@ qemu_src_configure() {
 		conf_opts+=(
 			--disable-linux-user
 			--disable-system
-			--disable-install-blobs
 			--enable-tools
 			--enable-cap-ng
 		)
@@ -651,7 +649,7 @@ qemu_src_configure() {
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
 	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backends=dtrace )
+	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
 	# We always want to attempt to build with PIE support as it results
 	# in a more secure binary. But it doesn't work with static or if