From f493874fb34c5817081a0545f61be16165bfca50 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 29 Mar 2021 17:35:00 +0200 Subject: dev-util/apitrace: Put libX11/mesa[X] behind USE=X Signed-off-by: Haelwenn (lanodan) Monnier Closes: https://github.com/gentoo/gentoo/pull/20179 Signed-off-by: Joonas Niilola --- dev-util/apitrace/apitrace-9.0-r1.ebuild | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'dev-util/apitrace') diff --git a/dev-util/apitrace/apitrace-9.0-r1.ebuild b/dev-util/apitrace/apitrace-9.0-r1.ebuild index dde14319289d..4834bd7b743b 100644 --- a/dev-util/apitrace/apitrace-9.0-r1.ebuild +++ b/dev-util/apitrace/apitrace-9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="qt5" +IUSE="qt5 X" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -22,11 +22,11 @@ DEPEND="${PYTHON_DEPS} app-arch/brotli:=[${MULTILIB_USEDEP}] >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] media-libs/libpng:0= - media-libs/mesa[egl,gles1,gles2,X(+),${MULTILIB_USEDEP}] + media-libs/mesa[egl,gles1,gles2,X?,${MULTILIB_USEDEP}] >=media-libs/waffle-1.6.0-r1[egl,${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] sys-process/procps:=[${MULTILIB_USEDEP}] - x11-libs/libX11 + X? ( x11-libs/libX11 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] @@ -55,6 +55,7 @@ src_configure() { my_configure() { local mycmakeargs=( -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF} + -DENABLE_X11=$(usex X) -DENABLE_EGL=ON -DENABLE_CLI=ON -DENABLE_GUI=$(multilib_native_usex qt5) @@ -71,8 +72,8 @@ src_install() { MULTILIB_CHOST_TOOLS=( /usr/bin/apitrace$(get_exeext) /usr/bin/eglretrace$(get_exeext) - /usr/bin/glretrace$(get_exeext) ) + use X && MULTILIB_CHOST_TOOLS+=( /usr/bin/glretrace$(get_exeext) ) cmake-multilib_src_install @@ -81,5 +82,5 @@ src_install() { dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 } - multilib_foreach_abi make_libgl_symlinks + use X && multilib_foreach_abi make_libgl_symlinks } -- cgit v1.2.3-65-gdbad