commit: 8cc786f417cf9d1be00d1ae8b9a533ef8a4ce6f2 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Sun Feb 11 13:46:52 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sun Feb 11 14:38:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc786f4
dev-python/shiboken2: migrate to llvm-r1.eclass Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> dev-python/shiboken2/shiboken2-5.15.12.ebuild | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dev-python/shiboken2/shiboken2-5.15.12.ebuild b/dev-python/shiboken2/shiboken2-5.15.12.ebuild index b52da8ea06a2..d28471fbf10e 100644 --- a/dev-python/shiboken2/shiboken2-5.15.12.ebuild +++ b/dev-python/shiboken2/shiboken2-5.15.12.ebuild @@ -14,7 +14,9 @@ EAPI=8 # https://bugreports.qt.io/browse/PYSIDE-535 PYTHON_COMPAT=( python3_{10..11} ) -inherit cmake llvm python-r1 toolchain-funcs +LLVM_COMPAT=( 15 ) + +inherit cmake llvm-r1 python-r1 toolchain-funcs MY_P=pyside-setup-opensource-src-${PV} @@ -40,11 +42,12 @@ RESTRICT="test" QT_PV="$(ver_cut 1-3)*:5" # Since Clang is required at both build- and runtime, BDEPEND is omitted here. -LLVM_MAX_SLOT=15 RDEPEND="${PYTHON_DEPS} =dev-qt/qtcore-${QT_PV} - <sys-devel/clang-16:= - <sys-devel/clang-runtime-16:= + $(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 @@ -55,16 +58,11 @@ RDEPEND="${PYTHON_DEPS} vulkan? ( dev-util/vulkan-headers ) " DEPEND="${RDEPEND} - test? ( =dev-qt/qttest-${QT_PV} ) + test? ( =dev-qt/qttest-${QT_PV} ) " DOCS=( AUTHORS ) -# 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 @@ -123,7 +121,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 shiboken2_configure
