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 9D3BD1382C5 for ; Sun, 18 Mar 2018 20:02:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C994EE0878; Sun, 18 Mar 2018 20:02:09 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86293E089B for ; Sun, 18 Mar 2018 20:02:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 CEBF4335D2F for ; Sun, 18 Mar 2018 20:02:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B8FC25B for ; Sun, 18 Mar 2018 20:02:06 +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: <1521403310.b065ef515f80ea20952322a705a519d396a7243c.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-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: b065ef515f80ea20952322a705a519d396a7243c X-VCS-Branch: master Date: Sun, 18 Mar 2018 20:02:06 +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: ed57f495-7817-4c97-9418-61555f08467c X-Archives-Hash: c89f20432181feb416a92635c7990f48 commit: b065ef515f80ea20952322a705a519d396a7243c Author: Matthias Maier gentoo org> AuthorDate: Sun Mar 18 19:29:55 2018 +0000 Commit: Matthias Maier gentoo org> CommitDate: Sun Mar 18 20:01:50 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b065ef51 app-emulation/qemu: update live ebuild Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-emulation/qemu/qemu-9999.ebuild | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 9bba915ab0d..35bc1ee955b 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -8,7 +8,7 @@ PYTHON_REQ_USE="ncurses,readline" PLOCALES="bg de_DE fr_FR hu it tr zh_CN" -FIRMWARE_ABI_VERSION="2.9.0-r52" +FIRMWARE_ABI_VERSION="2.11.1-r50" inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \ user udev fcaps readme.gentoo-r1 pax-utils l10n @@ -27,20 +27,21 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" -IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt - glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux +IUSE="accessibility +aio alsa bluetooth bzip2 capstone +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 rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs" COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel - mips mips64 mips64el mipsel nios2 or1k ppc ppc64 s390x sh4 sh4eb sparc - sparc64 x86_64" + mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x + sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb" IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} - lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb" + lm32 moxie ppcemb tricore unicore32" IUSE_USER_TARGETS="${COMMON_TARGETS} - aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx" + aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus + tilegx" use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) @@ -67,7 +68,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # # The attr lib isn't always linked in (although the USE flag is always # respected). This is because qemu supports using the C library's API -# when available rather than always using the extranl library. +# when available rather than always using the external library. ALL_DEPEND=" >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] @@ -153,10 +154,10 @@ SOFTMMU_TOOLS_DEPEND=" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] - ~sys-firmware/ipxe-1.0.0_p20160620 - ~sys-firmware/seabios-1.10.2[binary,seavgabios] - ~sys-firmware/sgabios-0.1_pre8 + ~sys-firmware/edk2-ovmf-2017_p20180211[binary] + ~sys-firmware/ipxe-1.0.0_p20180211[binary] + ~sys-firmware/seabios-1.11.0[binary,seavgabios] + ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf @@ -166,7 +167,7 @@ X86_FIRMWARE_DEPEND=" )" PPC64_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/seabios-1.10.2[binary,seavgabios] + ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] @@ -202,8 +203,9 @@ RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-qemu )" PATCHES=( - "${FILESDIR}"/${PN}-2.11.9999-cflags.patch + "${FILESDIR}"/${PN}-2.5.0-cflags.patch "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch + "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch ) STRIP_MASK="/usr/share/qemu/palcode-clipper" @@ -430,6 +432,7 @@ qemu_src_configure() { $(conf_notuser aio linux-aio) $(conf_notuser bzip2) $(conf_notuser bluetooth bluez) + $(conf_notuser capstone) $(conf_notuser caps cap-ng) $(conf_notuser curl) $(conf_notuser fdt) @@ -525,9 +528,6 @@ qemu_src_configure() { tc-enables-pie && conf_opts+=( --enable-pie ) fi - #bug #647570 - conf_opts+=( --disable-capstone ) - echo "../configure ${conf_opts[*]}" cd "${builddir}" ../configure "${conf_opts[@]}" || die "configure failed"