| 1 |
commit: 8da7f8f919d627903c962ac5bb3022a2b6e790b8 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 1 14:41:54 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 1 14:57:21 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da7f8f9 |
| 7 |
|
| 8 |
app-emulation/qemu: handle bzip2 dep #589968 |
| 9 |
|
| 10 |
The block layer uses it to support bzip2 compression in dmg images. |
| 11 |
That code makes it into softmmu binaries and userland utils. |
| 12 |
|
| 13 |
app-emulation/qemu/qemu-2.5.1.ebuild | 8 +++++++- |
| 14 |
app-emulation/qemu/qemu-2.6.0.ebuild | 8 +++++++- |
| 15 |
app-emulation/qemu/qemu-9999.ebuild | 8 +++++++- |
| 16 |
3 files changed, 21 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-emulation/qemu/qemu-2.5.1.ebuild b/app-emulation/qemu/qemu-2.5.1.ebuild |
| 19 |
index cb4fa6e..6148c72 100644 |
| 20 |
--- a/app-emulation/qemu/qemu-2.5.1.ebuild |
| 21 |
+++ b/app-emulation/qemu/qemu-2.5.1.ebuild |
| 22 |
@@ -30,7 +30,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" |
| 23 |
|
| 24 |
LICENSE="GPL-2 LGPL-2 BSD-2" |
| 25 |
SLOT="0" |
| 26 |
-IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \ |
| 27 |
+IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs \ |
| 28 |
gnutls gtk gtk2 infiniband iscsi +jpeg \ |
| 29 |
kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs |
| 30 |
+png pulseaudio python \ |
| 31 |
@@ -70,8 +70,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 32 |
# |
| 33 |
# Older versions of gnutls are supported, but it's simpler to just require |
| 34 |
# the latest versions. This is also why we require nettle. |
| 35 |
+# |
| 36 |
+# TODO: Split out tools deps into another var. e.g. bzip2 is only used by |
| 37 |
+# system binaries and tools, not user binaries. |
| 38 |
COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] |
| 39 |
sys-libs/zlib[static-libs(+)] |
| 40 |
+ bzip2? ( app-arch/bzip2[static-libs(+)] ) |
| 41 |
xattr? ( sys-apps/attr[static-libs(+)] )" |
| 42 |
SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} |
| 43 |
>=x11-libs/pixman-0.28.0[static-libs(+)] |
| 44 |
@@ -407,6 +411,7 @@ qemu_src_configure() { |
| 45 |
conf_opts+=( |
| 46 |
$(conf_softmmu accessibility brlapi) |
| 47 |
$(conf_softmmu aio linux-aio) |
| 48 |
+ $(conf_softmmu bzip2) |
| 49 |
$(conf_softmmu bluetooth bluez) |
| 50 |
$(conf_softmmu caps cap-ng) |
| 51 |
$(conf_softmmu curl) |
| 52 |
@@ -477,6 +482,7 @@ qemu_src_configure() { |
| 53 |
--disable-linux-user |
| 54 |
--disable-system |
| 55 |
--disable-blobs |
| 56 |
+ $(use_enable bzip2) |
| 57 |
) |
| 58 |
static_flag="static" |
| 59 |
;; |
| 60 |
|
| 61 |
diff --git a/app-emulation/qemu/qemu-2.6.0.ebuild b/app-emulation/qemu/qemu-2.6.0.ebuild |
| 62 |
index c39088d..8f9ff83 100644 |
| 63 |
--- a/app-emulation/qemu/qemu-2.6.0.ebuild |
| 64 |
+++ b/app-emulation/qemu/qemu-2.6.0.ebuild |
| 65 |
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" |
| 66 |
|
| 67 |
LICENSE="GPL-2 LGPL-2 BSD-2" |
| 68 |
SLOT="0" |
| 69 |
-IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \ |
| 70 |
+IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs \ |
| 71 |
gnutls gtk gtk2 infiniband iscsi +jpeg \ |
| 72 |
kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs |
| 73 |
+png pulseaudio python \ |
| 74 |
@@ -65,8 +65,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 75 |
# |
| 76 |
# Older versions of gnutls are supported, but it's simpler to just require |
| 77 |
# the latest versions. This is also why we require nettle. |
| 78 |
+# |
| 79 |
+# TODO: Split out tools deps into another var. e.g. bzip2 is only used by |
| 80 |
+# system binaries and tools, not user binaries. |
| 81 |
COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] |
| 82 |
sys-libs/zlib[static-libs(+)] |
| 83 |
+ bzip2? ( app-arch/bzip2[static-libs(+)] ) |
| 84 |
xattr? ( sys-apps/attr[static-libs(+)] )" |
| 85 |
SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} |
| 86 |
>=x11-libs/pixman-0.28.0[static-libs(+)] |
| 87 |
@@ -393,6 +397,7 @@ qemu_src_configure() { |
| 88 |
conf_opts+=( |
| 89 |
$(conf_softmmu accessibility brlapi) |
| 90 |
$(conf_softmmu aio linux-aio) |
| 91 |
+ $(conf_softmmu bzip2) |
| 92 |
$(conf_softmmu bluetooth bluez) |
| 93 |
$(conf_softmmu caps cap-ng) |
| 94 |
$(conf_softmmu curl) |
| 95 |
@@ -463,6 +468,7 @@ qemu_src_configure() { |
| 96 |
--disable-linux-user |
| 97 |
--disable-system |
| 98 |
--disable-blobs |
| 99 |
+ $(use_enable bzip2) |
| 100 |
) |
| 101 |
static_flag="static" |
| 102 |
;; |
| 103 |
|
| 104 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 105 |
index 9e43b14..8d9075e 100644 |
| 106 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 107 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 108 |
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" |
| 109 |
|
| 110 |
LICENSE="GPL-2 LGPL-2 BSD-2" |
| 111 |
SLOT="0" |
| 112 |
-IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \ |
| 113 |
+IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs \ |
| 114 |
gnutls gtk gtk2 infiniband iscsi +jpeg \ |
| 115 |
kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs |
| 116 |
+png pulseaudio python \ |
| 117 |
@@ -65,8 +65,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 118 |
# |
| 119 |
# Older versions of gnutls are supported, but it's simpler to just require |
| 120 |
# the latest versions. This is also why we require nettle. |
| 121 |
+# |
| 122 |
+# TODO: Split out tools deps into another var. e.g. bzip2 is only used by |
| 123 |
+# system binaries and tools, not user binaries. |
| 124 |
COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] |
| 125 |
sys-libs/zlib[static-libs(+)] |
| 126 |
+ bzip2? ( app-arch/bzip2[static-libs(+)] ) |
| 127 |
xattr? ( sys-apps/attr[static-libs(+)] )" |
| 128 |
SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} |
| 129 |
>=x11-libs/pixman-0.28.0[static-libs(+)] |
| 130 |
@@ -393,6 +397,7 @@ qemu_src_configure() { |
| 131 |
conf_opts+=( |
| 132 |
$(conf_softmmu accessibility brlapi) |
| 133 |
$(conf_softmmu aio linux-aio) |
| 134 |
+ $(conf_softmmu bzip2) |
| 135 |
$(conf_softmmu bluetooth bluez) |
| 136 |
$(conf_softmmu caps cap-ng) |
| 137 |
$(conf_softmmu curl) |
| 138 |
@@ -463,6 +468,7 @@ qemu_src_configure() { |
| 139 |
--disable-linux-user |
| 140 |
--disable-system |
| 141 |
--disable-blobs |
| 142 |
+ $(use_enable bzip2) |
| 143 |
) |
| 144 |
static_flag="static" |
| 145 |
;; |
Archives