commit: c37413d540e7d5b53abb6b49ac3802de78093ba8 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Fri May 5 23:34:14 2023 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Fri May 5 23:34:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c37413d5
app-emulation/qemu: update live ebuild Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> app-emulation/qemu/qemu-9999.ebuild | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) 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
