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 CB3F3138334 for ; Sun, 10 Jun 2018 03:31:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 147DAE0875; Sun, 10 Jun 2018 03:31:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 C3F45E0872 for ; Sun, 10 Jun 2018 03:31:22 +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 B181C335C97 for ; Sun, 10 Jun 2018 03:31:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 093932C5 for ; Sun, 10 Jun 2018 03:31:19 +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: <1528601401.aafb01bd5375daf076ca07cc59808995d2cedcf5.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.12.0-r1.ebuild app-emulation/qemu/qemu-2.12.0.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: aafb01bd5375daf076ca07cc59808995d2cedcf5 X-VCS-Branch: master Date: Sun, 10 Jun 2018 03:31:19 +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: a1f0968f-d60b-4361-b246-c4bc60c0fbe0 X-Archives-Hash: 5612434c79a0abbcbd04bcba9723d4c3 commit: aafb01bd5375daf076ca07cc59808995d2cedcf5 Author: Matthias Maier gentoo org> AuthorDate: Sun Jun 10 03:18:18 2018 +0000 Commit: Matthias Maier gentoo org> CommitDate: Sun Jun 10 03:30:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aafb01bd app-emulation/qemu: try to fix dependency mess - add missing USE=infiniband dependencies - fix automagic libxml2 dependency, also fixes static build - add python-3 support - fix automagic libxbcommon dependency Closes: https://bugs.gentoo.org/656006 Closes: https://bugs.gentoo.org/656076 Closes: https://bugs.gentoo.org/657428 Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../qemu/{qemu-2.12.0.ebuild => qemu-2.12.0-r1.ebuild} | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app-emulation/qemu/qemu-2.12.0.ebuild b/app-emulation/qemu/qemu-2.12.0-r1.ebuild similarity index 98% rename from app-emulation/qemu/qemu-2.12.0.ebuild rename to app-emulation/qemu/qemu-2.12.0-r1.ebuild index e74669774d1..886789224cf 100644 --- a/app-emulation/qemu/qemu-2.12.0.ebuild +++ b/app-emulation/qemu/qemu-2.12.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI="6" -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) PYTHON_REQ_USE="ncurses,readline" PLOCALES="bg de_DE fr_FR hu it tr zh_CN" @@ -82,6 +82,8 @@ ALL_DEPEND=" # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) # softmmu targets (qemu-system-*). SOFTMMU_TOOLS_DEPEND=" + dev-libs/libxml2[static-libs(+)] + x11-libs/libxkbcommon[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] @@ -110,7 +112,11 @@ SOFTMMU_TOOLS_DEPEND=" vte? ( x11-libs/vte:2.91 ) ) ) - infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) + infiniband? ( + sys-fabric/libibumad:=[static-libs(+)] + sys-fabric/libibverbs:=[static-libs(+)] + sys-fabric/librdmacm:=[static-libs(+)] + ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) @@ -475,6 +481,12 @@ qemu_src_configure() { $(conf_notuser xfs xfsctl) ) + if [[ ${buildtype} == "user" ]] ; then + conf_opts+=( --disable-libxml2 ) + else + conf_opts+=( --enable-libxml2 ) + fi + if [[ ! ${buildtype} == "user" ]] ; then # audio options local audio_opts="oss"