From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 80DA315815E for ; Sun, 11 Feb 2024 14:38:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F8B3E2A24; Sun, 11 Feb 2024 14:38:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7090BE2A24 for ; Sun, 11 Feb 2024 14:38:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 73320343055 for ; Sun, 11 Feb 2024 14:38:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2127AE3 for ; Sun, 11 Feb 2024 14:38:45 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1707662298.8cc786f417cf9d1be00d1ae8b9a533ef8a4ce6f2.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/shiboken2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/shiboken2/shiboken2-5.15.12.ebuild X-VCS-Directories: dev-python/shiboken2/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 8cc786f417cf9d1be00d1ae8b9a533ef8a4ce6f2 X-VCS-Branch: master Date: Sun, 11 Feb 2024 14:38:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d3d1c31b-4423-4789-af60-7f0faf967bf3 X-Archives-Hash: 728637fac785688f82f4e196ba7f002b commit: 8cc786f417cf9d1be00d1ae8b9a533ef8a4ce6f2 Author: Andrew Ammerlaan gentoo org> AuthorDate: Sun Feb 11 13:46:52 2024 +0000 Commit: Andrew Ammerlaan gentoo 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 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} - =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