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.

diff --git a/app-emulation/qemu/qemu-2.5.1.ebuild b/app-emulation/qemu/qemu-2.5.1.ebuild
index cb4fa6e582038ae1513bba4866b73ca0f64f9c62..6148c726099dd3bd238a2d417a0c29221d0aebb7 100644 (file)
--- 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 c39088d1dee4c19441a58fe31cb60cf4718d9a7b..8f9ff83c3e569f35bfc1ef5e5c8be4623da941fa 100644 (file)
--- 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 9e43b148c0595ccb89c9bd47667cba66bebb5464..8d9075e2c9b19817146dfa11294149822a459dfe 100644 (file)
--- 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"
                ;;