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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 33840158089 for ; Fri, 6 Oct 2023 07:43:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C9E92BC049; Fri, 6 Oct 2023 07:43:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 65F902BC049 for ; Fri, 6 Oct 2023 07:43:29 +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 A2752335CB7 for ; Fri, 6 Oct 2023 07:43:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8859949 for ; Fri, 6 Oct 2023 07:43:26 +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: <1696578193.8375a791a485e2169fed9c164a4e2d83b0bcb01a.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/shiboken6/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/shiboken6/shiboken6-6.5.2-r1.ebuild dev-python/shiboken6/shiboken6-6.5.2-r2.ebuild X-VCS-Directories: dev-python/shiboken6/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 8375a791a485e2169fed9c164a4e2d83b0bcb01a X-VCS-Branch: master Date: Fri, 6 Oct 2023 07:43:26 +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: 7ad044df-d7e5-46fb-98b9-cb3667c8f51e X-Archives-Hash: 5065d14b0c99fd1ce0c97654f6bd2920 commit: 8375a791a485e2169fed9c164a4e2d83b0bcb01a Author: Alfred Wingate protonmail com> AuthorDate: Tue Oct 3 13:55:39 2023 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Fri Oct 6 07:43:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8375a791 dev-python/shiboken6: bump LLVM_MAX_SLOT to 16 Clang-16 has been supported since 6.5.1 * https://github.com/pyside/pyside-setup/blob/dev/doc/changelogs/changes-6.5.1 * https://github.com/pyside/pyside-setup/commit/44ef1859214c66861a251d4a0faf5c38dc050850 Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/33167 Signed-off-by: Andrew Ammerlaan gentoo.org> ...hiboken6-6.5.2-r1.ebuild => shiboken6-6.5.2-r2.ebuild} | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dev-python/shiboken6/shiboken6-6.5.2-r1.ebuild b/dev-python/shiboken6/shiboken6-6.5.2-r2.ebuild similarity index 95% rename from dev-python/shiboken6/shiboken6-6.5.2-r1.ebuild rename to dev-python/shiboken6/shiboken6-6.5.2-r2.ebuild index 365771516fcd..359316a52fac 100644 --- a/dev-python/shiboken6/shiboken6-6.5.2-r1.ebuild +++ b/dev-python/shiboken6/shiboken6-6.5.2-r2.ebuild @@ -40,11 +40,11 @@ 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=15 +LLVM_MAX_SLOT=16 RDEPEND="${PYTHON_DEPS} =dev-qt/qtbase-${QT_PV} - =dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 @@ -82,6 +82,13 @@ src_prepare() { ApiExtractor/clangparser/compilersupport.cpp || die fi + local clangver="$(CPP=clang clang-major-version)" + + # Clang 15 and older used the full version as a directory name. + if [[ ${clangver} -lt 16 ]]; then + clangver="$(CPP=clang clang-fullversion)" + fi + # Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is @@ -97,7 +104,7 @@ src_prepare() { # PySide6 does *NOT* care whether the end user has done so or not, as # PySide6 unconditionally requires Clang in either case. See also: # https://bugs.gentoo.org/619490 - sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ + sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${clangver}"'/include"))~' \ ApiExtractor/clangparser/compilersupport.cpp || die cmake_src_prepare