From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AB9D8138206 for ; Mon, 1 Aug 2016 14:57:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B28AAE0A41; Mon, 1 Aug 2016 14:57:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3CDA4E0A41 for ; Mon, 1 Aug 2016 14:57:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A98FB340EBD for ; Mon, 1 Aug 2016 14:57:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0ECA77CD for ; Mon, 1 Aug 2016 14:57:31 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1470063441.8da7f8f919d627903c962ac5bb3022a2b6e790b8.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-2.5.1.ebuild app-emulation/qemu/qemu-2.6.0.ebuild app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 8da7f8f919d627903c962ac5bb3022a2b6e790b8 X-VCS-Branch: master Date: Mon, 1 Aug 2016 14:57:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: aab73197-d569-4455-acf4-df615c60a476 X-Archives-Hash: 87234f146ee8d61fb4708039f08d6943 commit: 8da7f8f919d627903c962ac5bb3022a2b6e790b8 Author: Mike Frysinger gentoo org> AuthorDate: Mon Aug 1 14:41:54 2016 +0000 Commit: Mike Frysinger gentoo 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" ;;