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 9FEEA139694 for ; Wed, 12 Apr 2017 05:11:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D59BE21C06B; Wed, 12 Apr 2017 05:11:12 +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 9F9E821C06B for ; Wed, 12 Apr 2017 05:11:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 573183412CB for ; Wed, 12 Apr 2017 05:11:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD15273F3 for ; Wed, 12 Apr 2017 05:11:09 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1491973801.d12496d57eed74c6413db5b449407d1301b78c5c.tamiko@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.8.0-r10.ebuild app-emulation/qemu/qemu-2.8.0-r9.ebuild app-emulation/qemu/qemu-2.8.1.ebuild app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: d12496d57eed74c6413db5b449407d1301b78c5c X-VCS-Branch: master Date: Wed, 12 Apr 2017 05:11:09 +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: 6ff1e3ca-b881-4958-af2a-22879446a566 X-Archives-Hash: 2cf1b7c0bf42a5048ed0a9d3a005a38b commit: d12496d57eed74c6413db5b449407d1301b78c5c Author: Matthias Maier gentoo org> AuthorDate: Wed Apr 12 05:10:01 2017 +0000 Commit: Matthias Maier gentoo org> CommitDate: Wed Apr 12 05:10:01 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12496d5 app-emulation/qemu: maintenance: update 9999, small cleanup Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-emulation/qemu/qemu-2.8.0-r10.ebuild | 7 ++----- app-emulation/qemu/qemu-2.8.0-r9.ebuild | 1 - app-emulation/qemu/qemu-2.8.1.ebuild | 7 ++----- app-emulation/qemu/qemu-9999.ebuild | 32 ++++++++++++++++++++++---------- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/app-emulation/qemu/qemu-2.8.0-r10.ebuild b/app-emulation/qemu/qemu-2.8.0-r10.ebuild index 4e6a2220fba..6faddfc06b4 100644 --- a/app-emulation/qemu/qemu-2.8.0-r10.ebuild +++ b/app-emulation/qemu/qemu-2.8.0-r10.ebuild @@ -75,8 +75,7 @@ ALL_DEPEND=" sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) systemtap? ( dev-util/systemtap ) - xattr? ( sys-apps/attr[static-libs(+)] ) - " + xattr? ( sys-apps/attr[static-libs(+)] )" # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) # softmmu targets (qemu-system-*). @@ -151,8 +150,7 @@ SOFTMMU_TOOLS_DEPEND=" virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] ) -" + xfs? ( sys-fs/xfsprogs[static-libs(+)] )" X86_FIRMWARE_DEPEND=" >=sys-firmware/ipxe-1.0.0_p20130624 @@ -752,7 +750,6 @@ src_install() { pkg_postinst() { DISABLE_AUTOFORMATTING=true - FORCE_PRINT_ELOG=1 # remove for next version bump readme.gentoo_print_elog if [[ -n ${softmmu_targets} ]] && use kernel_linux; then diff --git a/app-emulation/qemu/qemu-2.8.0-r9.ebuild b/app-emulation/qemu/qemu-2.8.0-r9.ebuild index 1cff5b77296..89dc516716b 100644 --- a/app-emulation/qemu/qemu-2.8.0-r9.ebuild +++ b/app-emulation/qemu/qemu-2.8.0-r9.ebuild @@ -747,7 +747,6 @@ src_install() { pkg_postinst() { DISABLE_AUTOFORMATTING=true - FORCE_PRINT_ELOG=1 # remove for next version bump readme.gentoo_print_elog if [[ -n ${softmmu_targets} ]] && use kernel_linux; then diff --git a/app-emulation/qemu/qemu-2.8.1.ebuild b/app-emulation/qemu/qemu-2.8.1.ebuild index 60572f21d30..3e859615eed 100644 --- a/app-emulation/qemu/qemu-2.8.1.ebuild +++ b/app-emulation/qemu/qemu-2.8.1.ebuild @@ -71,8 +71,7 @@ ALL_DEPEND=" sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) systemtap? ( dev-util/systemtap ) - xattr? ( sys-apps/attr[static-libs(+)] ) - " + xattr? ( sys-apps/attr[static-libs(+)] )" # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) # softmmu targets (qemu-system-*). @@ -147,8 +146,7 @@ SOFTMMU_TOOLS_DEPEND=" virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] ) -" + xfs? ( sys-fs/xfsprogs[static-libs(+)] )" X86_FIRMWARE_DEPEND=" >=sys-firmware/ipxe-1.0.0_p20130624 @@ -741,7 +739,6 @@ src_install() { pkg_postinst() { DISABLE_AUTOFORMATTING=true - FORCE_PRINT_ELOG=1 # remove for next version bump readme.gentoo_print_elog if [[ -n ${softmmu_targets} ]] && use kernel_linux; then diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index c208a1d924b..2279c396cfa 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -73,11 +73,21 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # pulseaudio? ( media-sound/pulseaudio ) # seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) # but these are so few it is not worth the effort to separate this list. -TARGETS_DEPEND=" +ALL_DEPEND=" >=dev-libs/glib-2.0[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] sys-libs/zlib[static-libs(+)] - accessibility? ( app-accessibility/brltty[static-libs(+)] ) + python? ( ${PYTHON_DEPS} ) + systemtap? ( dev-util/systemtap ) + xattr? ( sys-apps/attr[static-libs(+)] )" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# softmmu targets (qemu-system-*). +SOFTMMU_TOOLS_DEPEND=" + accessibility? ( + app-accessibility/brltty[api] + app-accessibility/brltty[static-libs(+)] + ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) @@ -118,7 +128,6 @@ TARGETS_DEPEND=" ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) - python? ( ${PYTHON_DEPS} ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( @@ -139,13 +148,11 @@ TARGETS_DEPEND=" >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) - systemtap? ( dev-util/systemtap ) - usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) + usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) - xattr? ( sys-apps/attr[static-libs(+)] ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] )" @@ -163,7 +170,10 @@ X86_FIRMWARE_DEPEND=" )" CDEPEND=" - !static? ( ${TARGETS_DEPEND//\[static-libs(+)]} ) + !static? ( + ${ALL_DEPEND//\[static-libs(+)]} + ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} + ) qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )" DEPEND="${CDEPEND} @@ -173,8 +183,11 @@ DEPEND="${CDEPEND} virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) - static? ( ${TARGETS_DEPEND} ) - static-user? ( ${TARGETS_DEPEND} ) + static? ( + ${ALL_DEPEND} + ${SOFTMMU_TOOLS_DEPEND} + ) + static-user? ( ${ALL_DEPEND} ) test? ( dev-libs/glib[utils] sys-devel/bc @@ -714,7 +727,6 @@ src_install() { pkg_postinst() { DISABLE_AUTOFORMATTING=true - FORCE_PRINT_ELOG=1 # remove for next version bump readme.gentoo_print_elog if [[ -n ${softmmu_targets} ]] && use kernel_linux; then