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 D61F4138334 for ; Tue, 19 Feb 2019 20:09:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9647E087E; Tue, 19 Feb 2019 20:09:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 82D5AE087E for ; Tue, 19 Feb 2019 20:09:50 +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 F01BA335CF3 for ; Tue, 19 Feb 2019 20:09:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 473BF522 for ; Tue, 19 Feb 2019 20:09:47 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1550606958.f32dd8f024fb67bf25b97e2c4b1e454929e717b8.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-3.1.0-r2.ebuild app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: f32dd8f024fb67bf25b97e2c4b1e454929e717b8 X-VCS-Branch: master Date: Tue, 19 Feb 2019 20:09:47 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ba7862aa-3629-4eb9-9f82-0a8723586caa X-Archives-Hash: 753a64f5fb601f3e65819eafefb758cb commit: f32dd8f024fb67bf25b97e2c4b1e454929e717b8 Author: James Le Cuirot gentoo org> AuthorDate: Tue Feb 19 20:09:18 2019 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Tue Feb 19 20:09:18 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f32dd8f0 app-emulation/qemu: Move some DEPEND entries to BDEPEND I'm not sure about PYTHON_DEPS but it usually needs to be in both and this is safest anyhow. Package-Manager: Portage-2.3.61, Repoman-2.3.12 Signed-off-by: James Le Cuirot gentoo.org> .../{qemu-9999.ebuild => qemu-3.1.0-r2.ebuild} | 32 +++++++++++++++------- app-emulation/qemu/qemu-9999.ebuild | 21 ++++++++------ 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-3.1.0-r2.ebuild similarity index 98% copy from app-emulation/qemu/qemu-9999.ebuild copy to app-emulation/qemu/qemu-3.1.0-r2.ebuild index 7561f0f611c..0eacff29941 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-3.1.0-r2.ebuild @@ -20,6 +20,9 @@ if [[ ${PV} = *9999* ]]; then else SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz" KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + + # Gentoo specific patchsets: + #SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" @@ -170,6 +173,17 @@ PPC64_FIRMWARE_DEPEND=" ) " +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + sys-apps/texinfo + virtual/pkgconfig + gtk? ( nls? ( sys-devel/gettext ) ) + test? ( + dev-libs/glib[utils] + sys-devel/bc + ) +" CDEPEND=" !static? ( ${ALL_DEPEND//\[static-libs(+)]} @@ -181,20 +195,12 @@ CDEPEND=" " DEPEND="${CDEPEND} ${PYTHON_DEPS} - dev-lang/perl - sys-apps/texinfo - virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - gtk? ( nls? ( sys-devel/gettext ) ) static? ( ${ALL_DEPEND} ${SOFTMMU_TOOLS_DEPEND} ) - static-user? ( ${ALL_DEPEND} ) - test? ( - dev-libs/glib[utils] - sys-devel/bc - )" + static-user? ( ${ALL_DEPEND} )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-qemu )" @@ -202,6 +208,9 @@ PATCHES=( "${FILESDIR}"/${PN}-2.5.0-cflags.patch "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch + "${FILESDIR}"/${PN}-3.1.0-CVE-2018-20123.patch + "${FILESDIR}"/${PN}-3.1.0-CVE-2019-3812.patch + #"${WORKDIR}"/patches ) QA_PREBUILT=" @@ -670,7 +679,10 @@ src_install() { emake DESTDIR="${ED}" install # This might not exist if the test failed. #512010 - [[ -e check-report.html ]] && dohtml check-report.html + if [[ -e check-report.html ]]; then + docinto html + dodoc check-report.html + fi if use kernel_linux; then udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 7561f0f611c..41fd6e7737b 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -170,6 +170,17 @@ PPC64_FIRMWARE_DEPEND=" ) " +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + sys-apps/texinfo + virtual/pkgconfig + gtk? ( nls? ( sys-devel/gettext ) ) + test? ( + dev-libs/glib[utils] + sys-devel/bc + ) +" CDEPEND=" !static? ( ${ALL_DEPEND//\[static-libs(+)]} @@ -181,20 +192,12 @@ CDEPEND=" " DEPEND="${CDEPEND} ${PYTHON_DEPS} - dev-lang/perl - sys-apps/texinfo - virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - gtk? ( nls? ( sys-devel/gettext ) ) static? ( ${ALL_DEPEND} ${SOFTMMU_TOOLS_DEPEND} ) - static-user? ( ${ALL_DEPEND} ) - test? ( - dev-libs/glib[utils] - sys-devel/bc - )" + static-user? ( ${ALL_DEPEND} )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-qemu )"