From a6851389a535631627664b6b0a33202dd2fd29e1 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Sat, 19 Nov 2022 20:24:20 -0500 Subject: media-libs/libplacebo: make jinja unconditional Thought this was only needed by glad (USE=opengl), but it's also used by vulkan/utils_gen.py. To avoid making this needlessly messy over a trivial dep, just always check (realistically both USE="-opengl -vulkan" hardly makes sense). Signed-off-by: Ionen Wolkens --- media-libs/libplacebo/libplacebo-5.229.1.ebuild | 7 +++---- media-libs/libplacebo/libplacebo-9999.ebuild | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/media-libs/libplacebo/libplacebo-5.229.1.ebuild b/media-libs/libplacebo/libplacebo-5.229.1.ebuild index 5d4ebd8448bf..153994a42c5d 100644 --- a/media-libs/libplacebo/libplacebo-5.229.1.ebuild +++ b/media-libs/libplacebo/libplacebo-5.229.1.ebuild @@ -43,9 +43,8 @@ DEPEND=" ${RDEPEND} dev-util/vulkan-headers" BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - opengl? ( $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') )" + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch @@ -54,7 +53,7 @@ PATCHES=( ) python_check_deps() { - use !opengl || python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" } src_unpack() { diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild index 5d4ebd8448bf..153994a42c5d 100644 --- a/media-libs/libplacebo/libplacebo-9999.ebuild +++ b/media-libs/libplacebo/libplacebo-9999.ebuild @@ -43,9 +43,8 @@ DEPEND=" ${RDEPEND} dev-util/vulkan-headers" BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - opengl? ( $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') )" + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch @@ -54,7 +53,7 @@ PATCHES=( ) python_check_deps() { - use !opengl || python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" } src_unpack() { -- cgit v1.2.3-65-gdbad