commit: 9afa8df73220596495f2caaa68c9b681e5f0a467 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Sun Feb 11 14:23:18 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sun Feb 11 14:38:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9afa8df7
dev-python/shiboken6: migrate to llvm-r1.eclass Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> dev-python/shiboken6/shiboken6-6.6.1.ebuild | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dev-python/shiboken6/shiboken6-6.6.1.ebuild b/dev-python/shiboken6/shiboken6-6.6.1.ebuild index 0cc981aa5bf8..428293079631 100644 --- a/dev-python/shiboken6/shiboken6-6.6.1.ebuild +++ b/dev-python/shiboken6/shiboken6-6.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,9 @@ EAPI=8 # https://bugreports.qt.io/browse/PYSIDE-535 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake llvm python-r1 toolchain-funcs +LLVM_COMPAT=( {15..17} ) + +inherit cmake llvm-r1 python-r1 toolchain-funcs MY_PN="pyside-setup-everywhere-src" @@ -40,11 +42,12 @@ RESTRICT="test" QT_PV="$(ver_cut 1-3)*:6" # Since Clang is required at both build- and runtime, BDEPEND is omitted here. -LLVM_MAX_SLOT=17 RDEPEND="${PYTHON_DEPS} =dev-qt/qtbase-${QT_PV} - <sys-devel/clang-18:= - <sys-devel/clang-runtime-18:= + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + sys-devel/llvm:${LLVM_SLOT} + ') docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 @@ -63,11 +66,6 @@ PATCHES=( "${FILESDIR}/${PN}-6.3.1-no-strip.patch" ) -# Ensure the path returned by get_llvm_prefix() contains clang as well. -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - src_prepare() { # TODO: File upstream issue requesting a sane way to disable NumPy support. if ! use numpy; then @@ -126,7 +124,7 @@ src_configure() { -DUSE_PYTHON_VERSION="${EPYTHON#python}" ) # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. - local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" + local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)" cmake_src_configure } python_foreach_impl shiboken6_configure
