commit: 02154447b98eefc3da490904d229d5b6aff0619a Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Thu Nov 24 01:49:48 2022 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Thu Nov 24 01:49:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02154447
app-emulation/qemu: Drop caps and seccomp USE Non-maintainer commit This follows with the vhost-user-fs drop as it made these USE required. Instead of having users get errors, just drop the USE and make the deps and configure options always installed. Bug: https://bugs.gentoo.org/873190 Signed-off-by: Brian Evans <grknight <AT> gentoo.org> app-emulation/qemu/qemu-7.1.0-r2.ebuild | 20 ++++++++++++-------- app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild | 20 ++++++++++++-------- app-emulation/qemu/qemu-9999.ebuild | 20 ++++++++++++-------- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/app-emulation/qemu/qemu-7.1.0-r2.ebuild b/app-emulation/qemu/qemu-7.1.0-r2.ebuild index a71f1773c462..7937c736489c 100644 --- a/app-emulation/qemu/qemu-7.1.0-r2.ebuild +++ b/app-emulation/qemu/qemu-7.1.0-r2.ebuild @@ -52,12 +52,12 @@ SLOT="0" [[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc" -IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug ${QEMU_DOC_USEFLAG} +IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG} +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg lzo multipath ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs - plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux + plugins +png pulseaudio python rbd sasl sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen @@ -117,7 +117,7 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}" RESTRICT="!test? ( test )" # Allow no targets to be built so that people can get a tools-only build. # Block USE flag configurations known to not work. -REQUIRED_USE="caps seccomp +REQUIRED_USE=" ${PYTHON_REQUIRED_USE} qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) @@ -131,7 +131,7 @@ REQUIRED_USE="caps seccomp static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) virgl? ( opengl ) - virtfs? ( caps xattr ) + virtfs? ( xattr ) vnc? ( gnutls ) vte? ( gtk ) multipath? ( udev ) @@ -156,6 +156,8 @@ ALL_DEPEND=" # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) # softmmu targets (qemu-system-*). SOFTMMU_TOOLS_DEPEND=" + sys-libs/libcap-ng[static-libs(+)] + >=sys-libs/libseccomp-2.1.0[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] @@ -166,7 +168,6 @@ SOFTMMU_TOOLS_DEPEND=" bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) - caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) @@ -209,7 +210,6 @@ SOFTMMU_TOOLS_DEPEND=" media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) - seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) @@ -555,7 +555,6 @@ qemu_src_configure() { $(conf_softmmu bpf) $(conf_notuser bzip2) $(conf_notuser capstone) - $(conf_notuser caps cap-ng) $(conf_notuser curl) $(conf_tools doc docs) $(conf_notuser fdt) @@ -582,7 +581,6 @@ qemu_src_configure() { $(conf_notuser sasl vnc-sasl) $(conf_notuser sdl) $(conf_softmmu sdl-image) - $(conf_notuser seccomp) $(conf_notuser slirp slirp system) $(conf_notuser smartcard) $(conf_notuser snappy) @@ -627,6 +625,8 @@ qemu_src_configure() { --disable-system --disable-blobs --disable-tools + --disable-cap-ng + --disable-seccomp ) local static_flag="static-user" ;; @@ -635,6 +635,8 @@ qemu_src_configure() { --disable-linux-user --enable-system --disable-tools + --enable-cap-ng + --enable-seccomp ) local static_flag="static" ;; @@ -643,6 +645,8 @@ qemu_src_configure() { --disable-linux-user --disable-system --disable-blobs + --enable-cap-ng + --enable-seccomp --enable-tools ) local static_flag="static" diff --git a/app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild b/app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild index 55f7d11a7162..2a80d49394ec 100644 --- a/app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild +++ b/app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild @@ -52,12 +52,12 @@ SLOT="0" [[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc" -IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug ${QEMU_DOC_USEFLAG} +IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG} +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg lzo multipath ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs - plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux + plugins +png pulseaudio python rbd sasl sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen @@ -117,7 +117,7 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}" RESTRICT="!test? ( test )" # Allow no targets to be built so that people can get a tools-only build. # Block USE flag configurations known to not work. -REQUIRED_USE="caps seccomp +REQUIRED_USE=" ${PYTHON_REQUIRED_USE} qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) @@ -131,7 +131,7 @@ REQUIRED_USE="caps seccomp static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) virgl? ( opengl ) - virtfs? ( caps xattr ) + virtfs? ( xattr ) vnc? ( gnutls ) vte? ( gtk ) multipath? ( udev ) @@ -156,6 +156,8 @@ ALL_DEPEND=" # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) # softmmu targets (qemu-system-*). SOFTMMU_TOOLS_DEPEND=" + sys-libs/libcap-ng[static-libs(+)] + >=sys-libs/libseccomp-2.1.0[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] @@ -166,7 +168,6 @@ SOFTMMU_TOOLS_DEPEND=" bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) - caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) @@ -209,7 +210,6 @@ SOFTMMU_TOOLS_DEPEND=" media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) - seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) @@ -554,7 +554,6 @@ qemu_src_configure() { $(conf_softmmu bpf) $(conf_notuser bzip2) $(conf_notuser capstone) - $(conf_notuser caps cap-ng) $(conf_notuser curl) $(conf_tools doc docs) $(conf_notuser fdt) @@ -581,7 +580,6 @@ qemu_src_configure() { $(conf_notuser sasl vnc-sasl) $(conf_notuser sdl) $(conf_softmmu sdl-image) - $(conf_notuser seccomp) $(conf_notuser slirp) $(conf_notuser smartcard) $(conf_notuser snappy) @@ -626,6 +624,8 @@ qemu_src_configure() { --disable-system --disable-blobs --disable-tools + --disable-cap-ng + --disable-seccomp ) local static_flag="static-user" ;; @@ -634,6 +634,8 @@ qemu_src_configure() { --disable-linux-user --enable-system --disable-tools + --enable-cap-ng + --enable-seccomp ) local static_flag="static" ;; @@ -643,6 +645,8 @@ qemu_src_configure() { --disable-system --disable-blobs --enable-tools + --enable-cap-ng + --enable-seccomp ) local static_flag="static" ;; diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 3616ee03475f..29c185858cb4 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -53,12 +53,12 @@ SLOT="0" [[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc" -IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug ${QEMU_DOC_USEFLAG} +IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG} +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg lzo multipath ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs - plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux + plugins +png pulseaudio python rbd sasl sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen @@ -118,7 +118,7 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}" RESTRICT="!test? ( test )" # Allow no targets to be built so that people can get a tools-only build. # Block USE flag configurations known to not work. -REQUIRED_USE="caps seccomp +REQUIRED_USE=" ${PYTHON_REQUIRED_USE} qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) @@ -132,7 +132,7 @@ REQUIRED_USE="caps seccomp static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) virgl? ( opengl ) - virtfs? ( caps xattr ) + virtfs? ( xattr ) vnc? ( gnutls ) vte? ( gtk ) multipath? ( udev ) @@ -157,6 +157,8 @@ ALL_DEPEND=" # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) # softmmu targets (qemu-system-*). SOFTMMU_TOOLS_DEPEND=" + sys-libs/libcap-ng[static-libs(+)] + >=sys-libs/libseccomp-2.1.0[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] @@ -167,7 +169,6 @@ SOFTMMU_TOOLS_DEPEND=" bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) - caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) @@ -210,7 +211,6 @@ SOFTMMU_TOOLS_DEPEND=" media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) - seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) @@ -555,7 +555,6 @@ qemu_src_configure() { $(conf_softmmu bpf) $(conf_notuser bzip2) $(conf_notuser capstone) - $(conf_notuser caps cap-ng) $(conf_notuser curl) $(conf_tools doc docs) $(conf_notuser fdt) @@ -582,7 +581,6 @@ qemu_src_configure() { $(conf_notuser sasl vnc-sasl) $(conf_notuser sdl) $(conf_softmmu sdl-image) - $(conf_notuser seccomp) $(conf_notuser slirp) $(conf_notuser smartcard) $(conf_notuser snappy) @@ -627,6 +625,8 @@ qemu_src_configure() { --disable-system --disable-blobs --disable-tools + --disable-cap-ng + --disable-seccomp ) local static_flag="static-user" ;; @@ -635,6 +635,8 @@ qemu_src_configure() { --disable-linux-user --enable-system --disable-tools + --enable-cap-ng + --enable-seccomp ) local static_flag="static" ;; @@ -644,6 +646,8 @@ qemu_src_configure() { --disable-system --disable-blobs --enable-tools + --enable-cap-ng + --enable-seccomp ) local static_flag="static" ;;
