commit: 8da7f8f919d627903c962ac5bb3022a2b6e790b8 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Mon Aug 1 14:41:54 2016 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Mon Aug 1 14:57:21 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da7f8f9
app-emulation/qemu: handle bzip2 dep #589968 The block layer uses it to support bzip2 compression in dmg images. That code makes it into softmmu binaries and userland utils. app-emulation/qemu/qemu-2.5.1.ebuild | 8 +++++++- app-emulation/qemu/qemu-2.6.0.ebuild | 8 +++++++- app-emulation/qemu/qemu-9999.ebuild | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app-emulation/qemu/qemu-2.5.1.ebuild b/app-emulation/qemu/qemu-2.5.1.ebuild index cb4fa6e..6148c72 100644 --- a/app-emulation/qemu/qemu-2.5.1.ebuild +++ b/app-emulation/qemu/qemu-2.5.1.ebuild @@ -30,7 +30,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"; LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" -IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \ +IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs \ gnutls gtk gtk2 infiniband iscsi +jpeg \ kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python \ @@ -70,8 +70,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # # Older versions of gnutls are supported, but it's simpler to just require # the latest versions. This is also why we require nettle. +# +# TODO: Split out tools deps into another var. e.g. bzip2 is only used by +# system binaries and tools, not user binaries. COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] + bzip2? ( app-arch/bzip2[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] )" SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} >=x11-libs/pixman-0.28.0[static-libs(+)] @@ -407,6 +411,7 @@ qemu_src_configure() { conf_opts+=( $(conf_softmmu accessibility brlapi) $(conf_softmmu aio linux-aio) + $(conf_softmmu bzip2) $(conf_softmmu bluetooth bluez) $(conf_softmmu caps cap-ng) $(conf_softmmu curl) @@ -477,6 +482,7 @@ qemu_src_configure() { --disable-linux-user --disable-system --disable-blobs + $(use_enable bzip2) ) static_flag="static" ;; diff --git a/app-emulation/qemu/qemu-2.6.0.ebuild b/app-emulation/qemu/qemu-2.6.0.ebuild index c39088d..8f9ff83 100644 --- a/app-emulation/qemu/qemu-2.6.0.ebuild +++ b/app-emulation/qemu/qemu-2.6.0.ebuild @@ -25,7 +25,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"; LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" -IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \ +IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs \ gnutls gtk gtk2 infiniband iscsi +jpeg \ kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python \ @@ -65,8 +65,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # # Older versions of gnutls are supported, but it's simpler to just require # the latest versions. This is also why we require nettle. +# +# TODO: Split out tools deps into another var. e.g. bzip2 is only used by +# system binaries and tools, not user binaries. COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] + bzip2? ( app-arch/bzip2[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] )" SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} >=x11-libs/pixman-0.28.0[static-libs(+)] @@ -393,6 +397,7 @@ qemu_src_configure() { conf_opts+=( $(conf_softmmu accessibility brlapi) $(conf_softmmu aio linux-aio) + $(conf_softmmu bzip2) $(conf_softmmu bluetooth bluez) $(conf_softmmu caps cap-ng) $(conf_softmmu curl) @@ -463,6 +468,7 @@ qemu_src_configure() { --disable-linux-user --disable-system --disable-blobs + $(use_enable bzip2) ) static_flag="static" ;; diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 9e43b14..8d9075e 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -25,7 +25,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"; LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" -IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \ +IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs \ gnutls gtk gtk2 infiniband iscsi +jpeg \ kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python \ @@ -65,8 +65,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # # Older versions of gnutls are supported, but it's simpler to just require # the latest versions. This is also why we require nettle. +# +# TODO: Split out tools deps into another var. e.g. bzip2 is only used by +# system binaries and tools, not user binaries. COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] + bzip2? ( app-arch/bzip2[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] )" SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} >=x11-libs/pixman-0.28.0[static-libs(+)] @@ -393,6 +397,7 @@ qemu_src_configure() { conf_opts+=( $(conf_softmmu accessibility brlapi) $(conf_softmmu aio linux-aio) + $(conf_softmmu bzip2) $(conf_softmmu bluetooth bluez) $(conf_softmmu caps cap-ng) $(conf_softmmu curl) @@ -463,6 +468,7 @@ qemu_src_configure() { --disable-linux-user --disable-system --disable-blobs + $(use_enable bzip2) ) static_flag="static" ;;
