From cb861ca8e611e651d4203590e0a9c3c4c2196bd4 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 8 Apr 2023 05:31:31 +0100
Subject: gentoo auto-resync : 08:04:2023 - 05:31:31

---
 app-emulation/Manifest.gz           | Bin 14811 -> 14814 bytes
 app-emulation/qemu/Manifest         |   2 +-
 app-emulation/qemu/qemu-9999.ebuild |  21 +++++++--------------
 3 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'app-emulation')

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 86c1fe79b1ee..77c9265eca93 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index ad90832eb94f..e0fbf0e19d53 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -16,5 +16,5 @@ DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 415ff621356c59f88b29cfe3ef5db1e282b26bb
 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-9999.ebuild 27365 BLAKE2B 560f23f250a9d377853a19e1eea99c82e561189b84066ee111d093d61e89e7ba60470738a4fc9ba6fcedcae5ce2ab40f308cb1deeeee16dd05ab00053c81e90d SHA512 680271052011be37781a89f0476a302a9ae4f2be6cdbb31f21b44ded0aa73e23a8084ad6aea346068c3b1034a1ce00514b45d2e6b0d886a6b44e8b3ecf10094a
+EBUILD qemu-9999.ebuild 27212 BLAKE2B b385ca5670ea5d14ea8db939bf7450cf2e332e2b5bd080cf48e11825f5bbd63648b608c09165e8d17bc22045f80d1e789a7e790acb0f385aa6103305e9acc42a SHA512 14a9614103e7b091364a210dec2c29612ddb5c6d3d300b5698925a77bf76c9047dba651c966193ffea5886565f07166c4023d265e15178f98a4b57a7888580e7
 MISC metadata.xml 4249 BLAKE2B 56e23de79e691a3634c21f2c7d3d2d02461cc5d2569c4ff15856f8ea99f8d53837cfa7c4dede988c304fdbe3c831f9cd776b9d62191e87f593d9643594abc133 SHA512 c4fd2aea291de484c24e3ef8d1b88a95fe3ac0b73d44bbae99f0de076b2335222f32e1b49a3fe7bd7168dc5cc290274a13bd7c615aeb54d06a04c8819e1f1b96
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 874bcfff7852..0be0f8edae3c 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -60,7 +60,7 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
 	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
 	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
 	+slirp
-	smartcard snappy spice ssh static static-user systemtap test udev usb
+	smartcard snappy spice ssh static-user systemtap test udev usb
 	usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
 	zstd"
 
@@ -130,14 +130,13 @@ REQUIRED_USE="
 	qemu_softmmu_targets_riscv64? ( fdt )
 	qemu_softmmu_targets_x86_64? ( fdt )
 	sdl-image? ( sdl )
-	static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev )
 	static-user? ( !plugins )
 	virgl? ( opengl )
 	virtfs? ( xattr )
 	vnc? ( gnutls )
 	vte? ( gtk )
 	multipath? ( udev )
-	plugins? ( !static !static-user )
+	plugins? ( !static-user )
 "
 for smname in ${IUSE_SOFTMMU_TARGETS} ; do
 	REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( seccomp ) "
@@ -284,10 +283,8 @@ BDEPEND="
 	)
 "
 CDEPEND="
-	!static? (
-		${ALL_DEPEND//\[static-libs(+)]}
-		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	)
+	${ALL_DEPEND//\[static-libs(+)]}
+	${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
 	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
 	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
 	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
@@ -295,10 +292,6 @@ CDEPEND="
 "
 DEPEND="${CDEPEND}
 	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? (
-		${ALL_DEPEND}
-		${SOFTMMU_TOOLS_DEPEND}
-	)
 	static-user? ( ${ALL_DEPEND} )"
 RDEPEND="${CDEPEND}
 	acct-group/kvm
@@ -640,7 +633,7 @@ qemu_src_configure() {
 			--enable-cap-ng
 			--enable-seccomp
 		)
-		local static_flag="static"
+		local static_flag="none"
 		;;
 	tools)
 		conf_opts+=(
@@ -650,7 +643,7 @@ qemu_src_configure() {
 			--enable-tools
 			--enable-cap-ng
 		)
-		local static_flag="static"
+		local static_flag="none"
 		;;
 	esac
 
@@ -663,7 +656,7 @@ qemu_src_configure() {
 	# 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
 	# the current GCC doesn't have PIE support.
-	if use ${static_flag}; then
+	if [[ ${static_flag} != "none" ]] && use ${static_flag}; then
 		conf_opts+=( --static --disable-pie )
 	else
 		tc-enables-pie && conf_opts+=( --enable-pie )
-- 
cgit v1.2.3