Diff qemu-10.0.10 with a qemu-9999

/usr/portage/app-emulation/qemu/qemu-9999.ebuild 2026-06-23 19:41:04.138230599 +0300
13 13
# bug #830088
14 14
QEMU_DOC_USEFLAG="+doc"
15 15

  
16
PYTHON_COMPAT=( python3_{12..13} )
16
PYTHON_COMPAT=( python3_{12..14} )
17 17
PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
18 18

  
19 19
inherit eapi9-ver flag-o-matic linux-info toolchain-funcs python-r1 udev fcaps \
......
63 63
	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
64 64
	jack jemalloc +jpeg keyutils
65 65
	lzo multipath
66
	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
66
	ncurses nfs nls numa opengl +oss pam passt +pin-upstream-blobs pipewire
67 67
	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
68 68
	+slirp
69 69
	smartcard snappy spice ssh static-user systemtap test udev usb
70
	usbredir vde +vhost-net virgl virtfs +vnc vte wayland X xattr xdp xen
70
	usbredir valgrind vde +vhost-net virgl virtfs +vnc vte wayland X xattr xdp xen
71 71
	zstd"
72 72

  
73 73
COMMON_TARGETS="
......
79 79
	loongarch64
80 80
	m68k
81 81
	microblaze
82
	microblazeel
83 82
	mips
84 83
	mips64
85 84
	mips64el
......
109 108
	aarch64_be
110 109
	armeb
111 110
	hexagon
111
	microblazeel
112 112
	mipsn32
113 113
	mipsn32el
114 114
	ppc64le
......
181 181
	fuse? ( >=sys-fs/fuse-3.1:3=[static-libs(+)] )
182 182
	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
183 183
	gnutls? (
184
		>=net-libs/gnutls-3.0:=[static-libs(+)]
185
		dev-libs/nettle:=[static-libs(+)]
184
		>=net-libs/gnutls-3.7.5:=[static-libs(+)]
185
		>=dev-libs/nettle-3.7.3:=[static-libs(+)]
186 186
	)
187 187
	gtk? (
188 188
		x11-libs/gtk+:3[wayland?,X?]
......
211 211
		media-libs/mesa[egl(+),gbm(+)]
212 212
	)
213 213
	pam? ( sys-libs/pam )
214
	passt? ( net-misc/passt )
214 215
	pipewire? ( >=media-video/pipewire-0.3.60 )
215 216
	png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
216 217
	pulseaudio? ( media-libs/libpulse )
......
329 330
	${CDEPEND}
330 331
	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
331 332
	static-user? ( ${ALL_DEPEND} )
333
	valgrind? ( dev-debug/valgrind )
332 334
"
333 335
RDEPEND="
334 336
	${CDEPEND}
......
340 342
"
341 343

  
342 344
PATCHES=(
345
	"${FILESDIR}"/${PN}-10.1.2-fix_passt.patch
343 346
	"${FILESDIR}"/${PN}-9.0.0-disable-keymap.patch
344 347
	"${FILESDIR}"/${PN}-9.2.0-capstone-include-path.patch
345 348
	"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
......
581 584
		$(use_enable pulseaudio pa)
582 585
		$(use_enable selinux)
583 586
		$(use_enable xattr attr)
587
		$(use_enable valgrind)
584 588
	)
585 589

  
586 590
	# Disable options not used by user targets. This simplifies building
......
643 647
		$(conf_notuser numa)
644 648
		$(conf_notuser opengl)
645 649
		$(conf_notuser pam auth-pam)
650
		$(conf_notuser passt)
646 651
		$(conf_notuser png)
647 652
		$(conf_notuser rbd)
648 653
		$(conf_notuser sasl vnc-sasl)
......
672 677
	)
673 678

  
674 679
	if [[ ! ${buildtype} == "user" ]] ; then
680
		# used by passt and spice, enable it because glib is required anyway
681
		conf_opts+=(
682
			--enable-gio
683
		)
675 684
		# audio options
676 685
		local audio_opts=(
677 686
			# Note: backend order matters here: #716202
......
905 914
	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
906 915
	popd >/dev/null || die
907 916

  
917
	# suid in src_install to allow FEATURES=suidctl to work properly
918
	fperms u+s /usr/libexec/qemu-bridge-helper
919

  
908 920
	# Install config file example for qemu-bridge-helper
909 921
	insinto "/etc/qemu"
910 922
	doins "${FILESDIR}/bridge.conf"
......
968 980
	xdg_icon_cache_update
969 981

  
970 982
	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
971
		fcaps -m u+s cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
983
		fcaps -M u-s cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
972 984

  
973 985
	DISABLE_AUTOFORMATTING=true
974 986
	readme.gentoo_print_elog
Thank you!