commit: aafb01bd5375daf076ca07cc59808995d2cedcf5 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Sun Jun 10 03:18:18 2018 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> 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"
