Diff qemu-7.2.6 with a qemu-8.0.0-r1

/usr/portage/app-emulation/qemu/qemu-8.0.0-r1.ebuild 2023-10-09 14:52:28.732368331 +0300
7 7
# Set to 1 if prebuilt, 0 if not
8 8
# (the construct below is to allow overriding from env for script)
9 9
QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
10
QEMU_DOCS_PREBUILT_DEV=ajak
11
QEMU_DOCS_VERSION="7.2.0"
10
QEMU_DOCS_PREBUILT_DEV=sam
11
QEMU_DOCS_VERSION="8.0.0"
12 12
# Default to generating docs (inc. man pages) if no prebuilt; overridden later
13 13
# bug #830088
14 14
QEMU_DOC_USEFLAG="+doc"
......
59 59
	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
60 60
	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
61 61
	+slirp
62
	smartcard snappy spice ssh static static-user systemtap test udev usb
62
	smartcard snappy spice ssh static-user systemtap test udev usb
63 63
	usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
64 64
	zstd"
65 65

  
......
129 129
	qemu_softmmu_targets_riscv64? ( fdt )
130 130
	qemu_softmmu_targets_x86_64? ( fdt )
131 131
	sdl-image? ( sdl )
132
	static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev )
133 132
	static-user? ( !plugins )
134 133
	virgl? ( opengl )
135 134
	virtfs? ( xattr )
136 135
	vnc? ( gnutls )
137 136
	vte? ( gtk )
138 137
	multipath? ( udev )
139
	plugins? ( !static !static-user )
138
	plugins? ( !static-user )
140 139
"
141 140
for smname in ${IUSE_SOFTMMU_TARGETS} ; do
142 141
	REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( seccomp ) "
......
207 206
		media-libs/mesa[egl(+),gbm(+)]
208 207
	)
209 208
	pam? ( sys-libs/pam )
210
	png? ( media-libs/libpng:0=[static-libs(+)] )
209
	png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
211 210
	pulseaudio? ( media-libs/libpulse )
212 211
	rbd? ( sys-cluster/ceph )
213 212
	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
......
221 220
	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
222 221
	snappy? ( app-arch/snappy:= )
223 222
	spice? (
224
		>=app-emulation/spice-protocol-0.12.3
225
		>=app-emulation/spice-0.12.0[static-libs(+)]
223
		>=app-emulation/spice-protocol-0.14.0
224
		>=app-emulation/spice-0.14.0[static-libs(+)]
226 225
	)
227 226
	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
228 227
	udev? ( virtual/libudev:= )
......
286 285
	)
287 286
"
288 287
CDEPEND="
289
	!static? (
290
		${ALL_DEPEND//\[static-libs(+)]}
291
		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
292
	)
288
	${ALL_DEPEND//\[static-libs(+)]}
289
	${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
293 290
	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
294 291
	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
295 292
	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
......
297 294
"
298 295
DEPEND="${CDEPEND}
299 296
	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
300
	static? (
301
		${ALL_DEPEND}
302
		${SOFTMMU_TOOLS_DEPEND}
303
	)
304 297
	static-user? ( ${ALL_DEPEND} )"
305 298
RDEPEND="${CDEPEND}
306 299
	acct-group/kvm
......
310 303
	)"
311 304

  
312 305
PATCHES=(
313
	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
314
	"${FILESDIR}"/${PN}-6.0.0-make.patch
306
	"${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch
307
	"${FILESDIR}"/${PN}-8.0.0-make.patch
315 308
	"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
316 309
	"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
317 310
	"${FILESDIR}"/${PN}-7.2.0-disable-gmp.patch
318
	"${FILESDIR}"/${PN}-7.2.0-linux-headers-6.2-glibc-2.36.patch
311
	"${FILESDIR}"/${PN}-8.0.0-remove-python-meson-check.patch
319 312
)
320 313

  
321 314
QA_PREBUILT="
......
629 622
		conf_opts+=(
630 623
			--enable-linux-user
631 624
			--disable-system
632
			--disable-blobs
633 625
			--disable-tools
634 626
			--disable-cap-ng
635 627
			--disable-seccomp
......
644 636
			--enable-cap-ng
645 637
			--enable-seccomp
646 638
		)
647
		local static_flag="static"
639
		local static_flag="none"
648 640
		;;
649 641
	tools)
650 642
		conf_opts+=(
651 643
			--disable-linux-user
652 644
			--disable-system
653
			--disable-blobs
654 645
			--enable-tools
655 646
			--enable-cap-ng
656 647
		)
657
		local static_flag="static"
648
		local static_flag="none"
658 649
		;;
659 650
	esac
660 651

  
......
662 653
	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
663 654

  
664 655
	# Add support for SystemTAP
665
	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
656
	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
666 657

  
667 658
	# We always want to attempt to build with PIE support as it results
668 659
	# in a more secure binary. But it doesn't work with static or if
669 660
	# the current GCC doesn't have PIE support.
670
	if use ${static_flag}; then
661
	if [[ ${static_flag} != "none" ]] && use ${static_flag}; then
671 662
		conf_opts+=( --static --disable-pie )
672 663
	else
673 664
		tc-enables-pie && conf_opts+=( --enable-pie )
Thank you!