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 BB3CD158094 for ; Fri, 7 Oct 2022 16:41:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D82CAE0990; Fri, 7 Oct 2022 16:41:37 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BEBE5E0990 for ; Fri, 7 Oct 2022 16:41:37 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF324340D6E for ; Fri, 7 Oct 2022 16:41:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DDB2617 for ; Fri, 7 Oct 2022 16:41:34 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1665160889.f557f797b99a8eaf2a482a89ec24f64a3e9326b8.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxx/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcxx/libcxx-15.0.2.9999.ebuild sys-libs/libcxx/libcxx-16.0.0.9999.ebuild sys-libs/libcxx/libcxx-16.0.0_pre20221006.ebuild X-VCS-Directories: sys-libs/libcxx/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f557f797b99a8eaf2a482a89ec24f64a3e9326b8 X-VCS-Branch: master Date: Fri, 7 Oct 2022 16:41:34 +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: 32458eda-7abe-4bc8-bdeb-716624df3e26 X-Archives-Hash: 0a09c278686d8e3ad8429aded4a5435c commit: f557f797b99a8eaf2a482a89ec24f64a3e9326b8 Author: Michał Górny gentoo org> AuthorDate: Fri Oct 7 16:38:22 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Oct 7 16:41:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f557f797 sys-libs/libcxx: Use the new version vars Signed-off-by: Michał Górny gentoo.org> sys-libs/libcxx/libcxx-15.0.2.9999.ebuild | 7 +++---- sys-libs/libcxx/libcxx-16.0.0.9999.ebuild | 7 +++---- sys-libs/libcxx/libcxx-16.0.0_pre20221006.ebuild | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/sys-libs/libcxx/libcxx-15.0.2.9999.ebuild b/sys-libs/libcxx/libcxx-15.0.2.9999.ebuild index 28c4cca66346..c28920c09043 100644 --- a/sys-libs/libcxx/libcxx-15.0.2.9999.ebuild +++ b/sys-libs/libcxx/libcxx-15.0.2.9999.ebuild @@ -23,14 +23,13 @@ RDEPEND=" ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) " -LLVM_MAX_SLOT=${PV%%.*} DEPEND=" ${RDEPEND} - sys-devel/llvm:${LLVM_MAX_SLOT} + sys-devel/llvm:${LLVM_MAJOR} " BDEPEND=" clang? ( - sys-devel/clang:${LLVM_MAX_SLOT} + sys-devel/clang:${LLVM_MAJOR} ) !test? ( ${PYTHON_DEPS} @@ -55,7 +54,7 @@ pkg_setup() { # bootstrap-prefix to set the appropriate path vars to LLVM instead # of using llvm_pkg_setup. if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then - llvm_pkg_setup + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup fi python-any-r1_pkg_setup diff --git a/sys-libs/libcxx/libcxx-16.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-16.0.0.9999.ebuild index 28c4cca66346..c28920c09043 100644 --- a/sys-libs/libcxx/libcxx-16.0.0.9999.ebuild +++ b/sys-libs/libcxx/libcxx-16.0.0.9999.ebuild @@ -23,14 +23,13 @@ RDEPEND=" ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) " -LLVM_MAX_SLOT=${PV%%.*} DEPEND=" ${RDEPEND} - sys-devel/llvm:${LLVM_MAX_SLOT} + sys-devel/llvm:${LLVM_MAJOR} " BDEPEND=" clang? ( - sys-devel/clang:${LLVM_MAX_SLOT} + sys-devel/clang:${LLVM_MAJOR} ) !test? ( ${PYTHON_DEPS} @@ -55,7 +54,7 @@ pkg_setup() { # bootstrap-prefix to set the appropriate path vars to LLVM instead # of using llvm_pkg_setup. if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then - llvm_pkg_setup + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup fi python-any-r1_pkg_setup diff --git a/sys-libs/libcxx/libcxx-16.0.0_pre20221006.ebuild b/sys-libs/libcxx/libcxx-16.0.0_pre20221006.ebuild index 28c4cca66346..c28920c09043 100644 --- a/sys-libs/libcxx/libcxx-16.0.0_pre20221006.ebuild +++ b/sys-libs/libcxx/libcxx-16.0.0_pre20221006.ebuild @@ -23,14 +23,13 @@ RDEPEND=" ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) " -LLVM_MAX_SLOT=${PV%%.*} DEPEND=" ${RDEPEND} - sys-devel/llvm:${LLVM_MAX_SLOT} + sys-devel/llvm:${LLVM_MAJOR} " BDEPEND=" clang? ( - sys-devel/clang:${LLVM_MAX_SLOT} + sys-devel/clang:${LLVM_MAJOR} ) !test? ( ${PYTHON_DEPS} @@ -55,7 +54,7 @@ pkg_setup() { # bootstrap-prefix to set the appropriate path vars to LLVM instead # of using llvm_pkg_setup. if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then - llvm_pkg_setup + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup fi python-any-r1_pkg_setup