From 7b5e4e1f63da7fb63fba5f1a9fc41866c8ae5b2f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 7 Oct 2022 19:24:36 +0100 Subject: gentoo auto-resync : 07:10:2022 - 19:24:35 --- sys-libs/Manifest.gz | Bin 14395 -> 14403 bytes sys-libs/compiler-rt-sanitizers/Manifest | 6 +-- .../compiler-rt-sanitizers-15.0.2.9999.ebuild | 43 ++++++++++----------- .../compiler-rt-sanitizers-16.0.0.9999.ebuild | 43 ++++++++++----------- ...ompiler-rt-sanitizers-16.0.0_pre20221006.ebuild | 43 ++++++++++----------- sys-libs/compiler-rt/Manifest | 6 +-- .../compiler-rt/compiler-rt-15.0.2.9999.ebuild | 15 ++++--- .../compiler-rt/compiler-rt-16.0.0.9999.ebuild | 15 ++++--- .../compiler-rt-16.0.0_pre20221006.ebuild | 15 ++++--- sys-libs/libbacktrace/Manifest | 2 +- .../libbacktrace/libbacktrace-1.0_p20220709.ebuild | 2 +- sys-libs/libcxx/Manifest | 6 +-- 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 ++-- sys-libs/libcxxabi/Manifest | 6 +-- sys-libs/libcxxabi/libcxxabi-15.0.2.9999.ebuild | 7 ++-- sys-libs/libcxxabi/libcxxabi-16.0.0.9999.ebuild | 7 ++-- .../libcxxabi/libcxxabi-16.0.0_pre20221006.ebuild | 7 ++-- sys-libs/libomp/Manifest | 6 +-- sys-libs/libomp/libomp-15.0.2.9999.ebuild | 4 +- sys-libs/libomp/libomp-16.0.0.9999.ebuild | 4 +- sys-libs/libomp/libomp-16.0.0_pre20221006.ebuild | 4 +- sys-libs/libsmbios/Manifest | 2 +- sys-libs/libsmbios/libsmbios-2.4.3.ebuild | 2 +- sys-libs/llvm-libunwind/Manifest | 6 +-- .../llvm-libunwind-15.0.2.9999.ebuild | 7 ++-- .../llvm-libunwind-16.0.0.9999.ebuild | 7 ++-- .../llvm-libunwind-16.0.0_pre20221006.ebuild | 7 ++-- 29 files changed, 139 insertions(+), 154 deletions(-) (limited to 'sys-libs') diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz index e150234f8037..ffe458e00f6f 100644 Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest index 3b51e92cb308..94c4299ee72b 100644 --- a/sys-libs/compiler-rt-sanitizers/Manifest +++ b/sys-libs/compiler-rt-sanitizers/Manifest @@ -10,8 +10,8 @@ DIST llvm-project-5a0722e0469894564dd9b0ee1d4f8c291d09c776.tar.gz 169164627 BLAK DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6369 BLAKE2B 4e8a715cd19dd39087fe7d6cad9e30a7e130c69bde12ea382fc748cc152099607c23b75915c644785820ded954eaba31779f7c58b63a71255f9c6b610afcee7d SHA512 f5a680a5de09feecde1a3038ab185cc3b321eb2dc15b5841cd58863323fd6da727307c44127d2af5077ce2b17744ee5d3f8a17dd3bceea71b1dec2a13555dd66 EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6381 BLAKE2B 010ce621c56c1568eaddeb6f4af6e680f2596106768e3b40bffd3c221df20b565c565793ff14a46b2a96b080a696a9217be0f547c2e85430e9031bd86adc2b90 SHA512 d68b96a7458c8b0d1946523a7c1b20e413de38b7f53bd87b8729103935cdb9ad8fc38863138ba36ffc8da57e0ddcf591c7deeb23fba0d76003adea978b262e37 -EBUILD compiler-rt-sanitizers-15.0.2.9999.ebuild 6325 BLAKE2B 6477a9afca51d95071229d9959af18ac6afebbc1348cbb26a4a9e1253e4a40d57604f74a138b027cf3ec07bffe7e001543a356e5fc5d173e5f83fadd8e646d4e SHA512 9c553af9ff3f8ad99ef2da81a86362abcfcadcbf5407565a60be6c79f9fb89f2ae1f536f8df03cc4f3f797d8019f29d0e949dcbf82f59d2e1b1fa316d9074db2 +EBUILD compiler-rt-sanitizers-15.0.2.9999.ebuild 6363 BLAKE2B 640625391bc73444ed357c25028b641351e5e4f2661271e2d762a9d0a8bbf70a916018c82ddabb25f95679121eea1f35726e011f12d99bb88f1aa6aafef9f5ba SHA512 0c9b3e50c61cb6129fcc20e2fc08f7d32fd2ee180d2bad3e6ed9c7b71819320af9c74457332afac8c14b476d18b47ce7a353813e7bb29e0a568771d314f9c46a EBUILD compiler-rt-sanitizers-15.0.2.ebuild 6403 BLAKE2B ea9f3840de1121966b17fd4859a5915466e6f56670c0fb8966e3706c2054f9e298fe63ca55aad6d2f1564c2b5f31b38e89c383e66a607fbf4f3afaf12516cd53 SHA512 10e8b499cba821148e0af86231c0c6ac22f31cacef898b3b385cca2384deb13ac2e183b7acf209b13052f6b7dc788026328c6559e03bbaa582012efeaf66ad76 -EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6325 BLAKE2B 6477a9afca51d95071229d9959af18ac6afebbc1348cbb26a4a9e1253e4a40d57604f74a138b027cf3ec07bffe7e001543a356e5fc5d173e5f83fadd8e646d4e SHA512 9c553af9ff3f8ad99ef2da81a86362abcfcadcbf5407565a60be6c79f9fb89f2ae1f536f8df03cc4f3f797d8019f29d0e949dcbf82f59d2e1b1fa316d9074db2 -EBUILD compiler-rt-sanitizers-16.0.0_pre20221006.ebuild 6325 BLAKE2B 6477a9afca51d95071229d9959af18ac6afebbc1348cbb26a4a9e1253e4a40d57604f74a138b027cf3ec07bffe7e001543a356e5fc5d173e5f83fadd8e646d4e SHA512 9c553af9ff3f8ad99ef2da81a86362abcfcadcbf5407565a60be6c79f9fb89f2ae1f536f8df03cc4f3f797d8019f29d0e949dcbf82f59d2e1b1fa316d9074db2 +EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6363 BLAKE2B 640625391bc73444ed357c25028b641351e5e4f2661271e2d762a9d0a8bbf70a916018c82ddabb25f95679121eea1f35726e011f12d99bb88f1aa6aafef9f5ba SHA512 0c9b3e50c61cb6129fcc20e2fc08f7d32fd2ee180d2bad3e6ed9c7b71819320af9c74457332afac8c14b476d18b47ce7a353813e7bb29e0a568771d314f9c46a +EBUILD compiler-rt-sanitizers-16.0.0_pre20221006.ebuild 6363 BLAKE2B 640625391bc73444ed357c25028b641351e5e4f2661271e2d762a9d0a8bbf70a916018c82ddabb25f95679121eea1f35726e011f12d99bb88f1aa6aafef9f5ba SHA512 0c9b3e50c61cb6129fcc20e2fc08f7d32fd2ee180d2bad3e6ed9c7b71819320af9c74457332afac8c14b476d18b47ce7a353813e7bb29e0a568771d314f9c46a MISC metadata.xml 1412 BLAKE2B 75675507000fa6a6b8182e6b45a08a2716ae7fb9a7e3428dc8420464e4c1d1bdb5bea62cc2f553c579de5a4faa752b35cb3529d980fb07a055ff4ddf6e752707 SHA512 f05ea5168b923db72f4f5b53e9b748ebbcdae9eff09d86323313055933b47fc0089e1b2d73cd997d73dcfb2dca032344955816425fbddc09d27ca751463aadbb diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.2.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.2.9999.ebuild index f716dc74b423..1bcef45cdf8b 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.2.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.2.9999.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="$(ver_cut 1-3)" +SLOT="${LLVM_VERSION}" KEYWORDS="" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" # base targets @@ -34,9 +34,8 @@ RESTRICT=" !test? ( test ) " -LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - sys-devel/llvm:${LLVM_MAX_SLOT} + sys-devel/llvm:${LLVM_MAJOR} virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] " BDEPEND=" @@ -46,8 +45,8 @@ BDEPEND=" test? ( !!=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} - sys-libs/compiler-rt:${SLOT} + =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR} + sys-libs/compiler-rt:${LLVM_VERSION} ) !test? ( ${PYTHON_DEPS} @@ -77,7 +76,7 @@ pkg_pretend() { pkg_setup() { check_space - llvm_pkg_setup + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup python-any-r1_pkg_setup } @@ -126,10 +125,10 @@ src_configure() { done local mycmakeargs=( - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" + -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}" # use a build dir structure consistent with install # this makes it possible to easily deploy test-friendly clang - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}" + -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_VERSION}" -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) # builtins & crt installed by sys-libs/compiler-rt @@ -159,14 +158,14 @@ src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags)" # they are created during src_test() - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++" ) # same flags are passed for build & tests, so we need to strip # them down to a subset supported by clang - CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \ strip-unsupported-flags fi @@ -187,23 +186,23 @@ src_configure() { cmake_src_configure if use test; then - local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* ) + local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_VERSION}/lib/* ) [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}" [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}" # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die - cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ - "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_VERSION}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die + cp "${EPREFIX}"/usr/lib/clang/${LLVM_VERSION}/include/*.h \ + "${BUILD_DIR}"/lib/clang/${LLVM_VERSION}/include/ || die cp "${sys_dir}"/*builtins*.a \ - "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die + "${BUILD_DIR}/lib/clang/${LLVM_VERSION}/lib/${sys_dir##*/}/" || die # we also need LLVMgold.so for gold-based tests - if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then - ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die + if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild index f716dc74b423..1bcef45cdf8b 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="$(ver_cut 1-3)" +SLOT="${LLVM_VERSION}" KEYWORDS="" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" # base targets @@ -34,9 +34,8 @@ RESTRICT=" !test? ( test ) " -LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - sys-devel/llvm:${LLVM_MAX_SLOT} + sys-devel/llvm:${LLVM_MAJOR} virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] " BDEPEND=" @@ -46,8 +45,8 @@ BDEPEND=" test? ( !!=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} - sys-libs/compiler-rt:${SLOT} + =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR} + sys-libs/compiler-rt:${LLVM_VERSION} ) !test? ( ${PYTHON_DEPS} @@ -77,7 +76,7 @@ pkg_pretend() { pkg_setup() { check_space - llvm_pkg_setup + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup python-any-r1_pkg_setup } @@ -126,10 +125,10 @@ src_configure() { done local mycmakeargs=( - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" + -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}" # use a build dir structure consistent with install # this makes it possible to easily deploy test-friendly clang - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}" + -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_VERSION}" -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) # builtins & crt installed by sys-libs/compiler-rt @@ -159,14 +158,14 @@ src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags)" # they are created during src_test() - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++" ) # same flags are passed for build & tests, so we need to strip # them down to a subset supported by clang - CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \ strip-unsupported-flags fi @@ -187,23 +186,23 @@ src_configure() { cmake_src_configure if use test; then - local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* ) + local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_VERSION}/lib/* ) [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}" [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}" # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die - cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ - "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_VERSION}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die + cp "${EPREFIX}"/usr/lib/clang/${LLVM_VERSION}/include/*.h \ + "${BUILD_DIR}"/lib/clang/${LLVM_VERSION}/include/ || die cp "${sys_dir}"/*builtins*.a \ - "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die + "${BUILD_DIR}/lib/clang/${LLVM_VERSION}/lib/${sys_dir##*/}/" || die # we also need LLVMgold.so for gold-based tests - if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then - ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die + if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_pre20221006.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_pre20221006.ebuild index f716dc74b423..1bcef45cdf8b 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_pre20221006.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_pre20221006.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="$(ver_cut 1-3)" +SLOT="${LLVM_VERSION}" KEYWORDS="" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" # base targets @@ -34,9 +34,8 @@ RESTRICT=" !test? ( test ) " -LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - sys-devel/llvm:${LLVM_MAX_SLOT} + sys-devel/llvm:${LLVM_MAJOR} virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] " BDEPEND=" @@ -46,8 +45,8 @@ BDEPEND=" test? ( !!=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} - sys-libs/compiler-rt:${SLOT} + =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR} + sys-libs/compiler-rt:${LLVM_VERSION} ) !test? ( ${PYTHON_DEPS} @@ -77,7 +76,7 @@ pkg_pretend() { pkg_setup() { check_space - llvm_pkg_setup + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup python-any-r1_pkg_setup } @@ -126,10 +125,10 @@ src_configure() { done local mycmakeargs=( - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" + -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}" # use a build dir structure consistent with install # this makes it possible to easily deploy test-friendly clang - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}" + -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_VERSION}" -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) # builtins & crt installed by sys-libs/compiler-rt @@ -159,14 +158,14 @@ src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags)" # they are created during src_test() - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++" ) # same flags are passed for build & tests, so we need to strip # them down to a subset supported by clang - CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \ strip-unsupported-flags fi @@ -187,23 +186,23 @@ src_configure() { cmake_src_configure if use test; then - local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* ) + local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_VERSION}/lib/* ) [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}" [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}" # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die - cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ - "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_VERSION}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die + cp "${EPREFIX}"/usr/lib/clang/${LLVM_VERSION}/include/*.h \ + "${BUILD_DIR}"/lib/clang/${LLVM_VERSION}/include/ || die cp "${sys_dir}"/*builtins*.a \ - "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die + "${BUILD_DIR}/lib/clang/${LLVM_VERSION}/lib/${sys_dir##*/}/" || die # we also need LLVMgold.so for gold-based tests - if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then - ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die + if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die fi fi } diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest index 8e20a97864f9..3462a0527e5a 100644 --- a/sys-libs/compiler-rt/Manifest +++ b/sys-libs/compiler-rt/Manifest @@ -11,8 +11,8 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b EBUILD compiler-rt-13.0.1.ebuild 3880 BLAKE2B 83202517f413772d355aa49b5a3bd8b7000c86f6538da1a5ae96de5e84bc7536d0e639b530d1f504dc68b769565504434cc80d25426207b19283b9bc41df3388 SHA512 fe5329aee6c29d408c67af9e9891205fcdf313676780b948975f94ddce31b3f54e68cc041233c81b3005ff94f7685dcc09044f3634760d90e8c18c61f63651c3 EBUILD compiler-rt-14.0.6-r1.ebuild 4252 BLAKE2B 1fe9011c3d20a6e7f09683553e3e86151ce71e3667ce00fe4b5dd6dd8e932b8c9baa9e101f620467d813ffc1615c85e3522ce5732cee293d0bc2f8233c665bab SHA512 857bffe7b552c9e288b7f2e3cb67df1e2c8526b717df7a2bf7a1162de636ce90864a0ef1a9fec2c1f61702f6f491b5b12f6ce26964c133d339785ea7d67fc725 EBUILD compiler-rt-14.0.6.ebuild 4030 BLAKE2B 9881380671f25916b7a9356e14b45fd30b7c5cf5263fcf975b0d5ce0333389d519457dabaf1ac8dfc55f5206594335a5f996adcf26880f8a30c8a5ab99c3c391 SHA512 1ec4d79d5d319c5345caa7399c4d4bee5416af3952b9936f119764e17b1c05c25cc818a0c123c8b55ee31503e633999384d0a227a6c84d380cdbdc169f0f43ea -EBUILD compiler-rt-15.0.2.9999.ebuild 4183 BLAKE2B dc863bb9300dbf0b109642c9e79e6cd1c836209453f5f09e94d0bdb532336f9612af25c2154abe391998b66eddc6900593734570062800635985be4fccbd5581 SHA512 6e63963e9d6f4918714d97f37c69411ad95a7c0ffe03aacc96df829c35172e46b1595505a551063789988f2956674dbc7926128a8a03804458a8baca6280ab34 +EBUILD compiler-rt-15.0.2.9999.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153 EBUILD compiler-rt-15.0.2.ebuild 4261 BLAKE2B 1a632e00f5dd36c161f2df23dc7c9292429ce18f5df652480eba6592b4dbc72c0dc0154c40403e378a641e63af577357dc349175492cfb4b17534dc26b71e48c SHA512 d4cc5d0c50cb16ff74a74feee38f9430e930c76b57b6b038bf5c729159bc1af2263daf16cbe22b04d85393ee79b818975285a0330849c57274343cc4250f9ea8 -EBUILD compiler-rt-16.0.0.9999.ebuild 4183 BLAKE2B dc863bb9300dbf0b109642c9e79e6cd1c836209453f5f09e94d0bdb532336f9612af25c2154abe391998b66eddc6900593734570062800635985be4fccbd5581 SHA512 6e63963e9d6f4918714d97f37c69411ad95a7c0ffe03aacc96df829c35172e46b1595505a551063789988f2956674dbc7926128a8a03804458a8baca6280ab34 -EBUILD compiler-rt-16.0.0_pre20221006.ebuild 4183 BLAKE2B dc863bb9300dbf0b109642c9e79e6cd1c836209453f5f09e94d0bdb532336f9612af25c2154abe391998b66eddc6900593734570062800635985be4fccbd5581 SHA512 6e63963e9d6f4918714d97f37c69411ad95a7c0ffe03aacc96df829c35172e46b1595505a551063789988f2956674dbc7926128a8a03804458a8baca6280ab34 +EBUILD compiler-rt-16.0.0.9999.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153 +EBUILD compiler-rt-16.0.0_pre20221006.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153 MISC metadata.xml 416 BLAKE2B 79a58249c94b605ba57f346c4e05b43853cf6cfb8bb65a4f4e3c44039cccfdb83dd31bfaaaf398bcbdc393efabdfc7ed186fe775976c46227e74decf2c8f4fb2 SHA512 ce30c79a575e5933effb1fec36f9a4ef02d9f97f312feb39c55a88cbda9a1bae1d7af2ec4ad5f66212cbb2cdbfb26f1a436689f16f410153c9d65eb010264c48 diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.2.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.2.9999.ebuild index 236d4a319ccf..957caa27a746 100644 --- a/sys-libs/compiler-rt/compiler-rt-15.0.2.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-15.0.2.9999.ebuild @@ -10,21 +10,20 @@ DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="$(ver_cut 1-3)" +SLOT="${LLVM_VERSION}" KEYWORDS="" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - sys-devel/llvm:${LLVM_MAX_SLOT} + sys-devel/llvm:${LLVM_MAJOR} " BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} + =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR} ) !test? ( ${PYTHON_DEPS} @@ -52,7 +51,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 } @@ -97,7 +96,7 @@ src_configure() { fi local mycmakeargs=( - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" + -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}" -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) -DCOMPILER_RT_BUILD_LIBFUZZER=OFF @@ -135,8 +134,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild index 236d4a319ccf..957caa27a746 100644 --- a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild @@ -10,21 +10,20 @@ DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="$(ver_cut 1-3)" +SLOT="${LLVM_VERSION}" KEYWORDS="" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - sys-devel/llvm:${LLVM_MAX_SLOT} + sys-devel/llvm:${LLVM_MAJOR} " BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} + =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR} ) !test? ( ${PYTHON_DEPS} @@ -52,7 +51,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 } @@ -97,7 +96,7 @@ src_configure() { fi local mycmakeargs=( - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" + -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}" -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) -DCOMPILER_RT_BUILD_LIBFUZZER=OFF @@ -135,8 +134,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++" ) fi diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221006.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221006.ebuild index 236d4a319ccf..957caa27a746 100644 --- a/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221006.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221006.ebuild @@ -10,21 +10,20 @@ DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="$(ver_cut 1-3)" +SLOT="${LLVM_VERSION}" KEYWORDS="" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" -LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - sys-devel/llvm:${LLVM_MAX_SLOT} + sys-devel/llvm:${LLVM_MAJOR} " BDEPEND=" >=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} + =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR} ) !test? ( ${PYTHON_DEPS} @@ -52,7 +51,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 } @@ -97,7 +96,7 @@ src_configure() { fi local mycmakeargs=( - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" + -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}" -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) -DCOMPILER_RT_BUILD_LIBFUZZER=OFF @@ -135,8 +134,8 @@ src_configure() { -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++" ) fi diff --git a/sys-libs/libbacktrace/Manifest b/sys-libs/libbacktrace/Manifest index 5e19949f97cc..9d78c13cafc9 100644 --- a/sys-libs/libbacktrace/Manifest +++ b/sys-libs/libbacktrace/Manifest @@ -2,5 +2,5 @@ AUX libbacktrace-1.0_p20220709-teststatic.patch 13681 BLAKE2B 02ea2efbd9c2259bb0 DIST libbacktrace-1.0_p20220226.tgz 665988 BLAKE2B 0d8aff7f6261446fabe713653896b0cf2fec2d3aec508423577182383a7deb359100579817eaf64d65848c49ce655d8f57cf67452f16e3c88559aeae28cafd95 SHA512 700cb1930c409e4f1fe99e46920e83ea2b359daaea9f96e2b73b81857dea895c0ade0fc2b4dbe6b7c94df7d494dcd80a9f6686d9acad8452ca59760aafa74c2f DIST libbacktrace-1.0_p20220709.tar.gz 666166 BLAKE2B 1b35e0dafe31bc5d4fcc826f87f2e8200c27a4194719ee22d278b25fe081ec604e579aee72ebd7ea6d401b1a5bbc4b496b1083e3d761117bc3ccf23aabe046eb SHA512 8f303ff11250cbc644c91a07a55ffb1c6d52ca5eb76e3ea9405645bdd00715a25f57d1f39c7af16efbbe5b008ec76890f7fb3bca95eb89e7cd9a55c14a211643 EBUILD libbacktrace-1.0_p20220226.ebuild 520 BLAKE2B 87c85657c75b005b9c3a1237887c967b57339cc3eed3ed5b79d2ea67cd3f69b14d468d982caf897af8f51a3d1f78476e25a22aa24a2bb51fd461eaea0829b6a4 SHA512 7d9e81365b513da810942113c8ebd45ff455d2adaa92e369ddfab0d8d240f1bf7ee0314e603e96c435193153e0685eff3517b91d2bdfd26e97b221d51e599b20 -EBUILD libbacktrace-1.0_p20220709.ebuild 903 BLAKE2B da4fbe0e1d28d50da24d756eaaf76641d9f23b659fd972b2f87354c39ea33c5e096f1d57409afb3e74b166faf680f9e36a3c0a17b7a578843fde2994a9a25738 SHA512 dd0e5ac29823561de19edf479f26252d26a31c8a772a7a3fbb71a669004b937c28fc06ffb1b2368a17f7fae98403029ec5f6ae312f4c391e3403fe6419b0319a +EBUILD libbacktrace-1.0_p20220709.ebuild 910 BLAKE2B 71e90502a51049503b378e3b31300f5ab2a602cc3dc11b62eb6b0d93b73977aae20cd9d9dcdb77ecafd66fae9d59bd26de18cfb83e5694d6752d8b5d4e1e3983 SHA512 05b97cda204b6b1a2ca1fd818f1ef89e0d0e51b823381c0b558bfa8b81f051acad23a8e3091203a3980ed09e837060026716c46f46b0ddc2f7f9acdf0f8306f0 MISC metadata.xml 253 BLAKE2B 18358124554750550f4d403241c450e59df895e455eaa1b442ed49b3b3f72e4bc25d43aa3e23aae3fa932b8d22bc64de55c8166b749c9219b911b15971083250 SHA512 d69655b8f85ce0d4eba55033e667a0b697844773a17f91bc0f3bdb05b42f2208db2fb58d2d7ee58acadb9586af246dd2cf6d7cef04b66b0db4721fa941b3ae54 diff --git a/sys-libs/libbacktrace/libbacktrace-1.0_p20220709.ebuild b/sys-libs/libbacktrace/libbacktrace-1.0_p20220709.ebuild index 661af932a360..af8565eed742 100644 --- a/sys-libs/libbacktrace/libbacktrace-1.0_p20220709.ebuild +++ b/sys-libs/libbacktrace/libbacktrace-1.0_p20220709.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${COMMITHASH}" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest index f6d495c4a453..3337dae7ea77 100644 --- a/sys-libs/libcxx/Manifest +++ b/sys-libs/libcxx/Manifest @@ -8,8 +8,8 @@ DIST llvm-project-5a0722e0469894564dd9b0ee1d4f8c291d09c776.tar.gz 169164627 BLAK DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f EBUILD libcxx-13.0.1.ebuild 6768 BLAKE2B 71b0f62e35538d718d99e3d43447f98752933868d999bf831969a6940d3a817452789c2044e9ca3bb4d5d1f0c2976fc276c4d10cb018c44e0cc6109095d9c6d6 SHA512 a12023fa135a7945e8088b34421f575cab32bb8ac53f1aeaa61bcf2a7b9fe045a6e21efba168056ef47b165ef3100e382100f910c84dee972017de6355d2e9c0 EBUILD libcxx-14.0.6.ebuild 6948 BLAKE2B 203e04f4e2603ec0b8e3cd672ca2458c971e4ec3c1d24ea65f85db143561d349d9b7e4b4a58f7c57f5c0caa519e5a79f99f0a76c404aeba47b0bcc683adcb572 SHA512 c1a353dd558c68d439ab66e089e26993e66f1729f7879912413531bbd89318338649dccde1f84a32784de380997d2611d6b7cf86841feb47c3c0c8d67bfe28df -EBUILD libcxx-15.0.2.9999.ebuild 5689 BLAKE2B db5070429808dfd0c9cacd0e97c8573b4691e444705b499bb598c53aacbc344c0a1b7d05573eca3d44d23cfb3e7523fe03529215ca5039985e9a6737cc12c1c3 SHA512 697802bc6e30a2609cc949a1028655e535a10c77be6ec39897f30cfb7bedd89192221510528d63ee16ee6176c6d15fcc980da0b2a380e98a186bd21c7b5276cd +EBUILD libcxx-15.0.2.9999.ebuild 5687 BLAKE2B 47c5a90bc448fc848a61b971f53690559b1383e2b61d41423dab7e773eb4fc3bdcbde23785687664f0a0031a65d1b75b5411f01f7756e17369000dba23b7a6bc SHA512 80a539652f452e27df12a061d26c214f4083b28f702ca3f87688432d5672027f6e412fde2ec831d2c3cec165b9e51be9f935930ba1ddc10c25814c65553f931b EBUILD libcxx-15.0.2.ebuild 5737 BLAKE2B ee1e8abbc711cecdc7e92d19941191fc29016aea2a69fe68afa08e04cd0698cde3d78200fd77cc431b541655f6a1557b05c2dfabda5124558fcdf70694d131b0 SHA512 b8f022ed324c22e74f8cfa34090b524e829b237f1d4a73642969d14cf892da7a187b85a398349f9a69ab1f35df642a1301c3968603f73832446b44defc46b60e -EBUILD libcxx-16.0.0.9999.ebuild 5689 BLAKE2B db5070429808dfd0c9cacd0e97c8573b4691e444705b499bb598c53aacbc344c0a1b7d05573eca3d44d23cfb3e7523fe03529215ca5039985e9a6737cc12c1c3 SHA512 697802bc6e30a2609cc949a1028655e535a10c77be6ec39897f30cfb7bedd89192221510528d63ee16ee6176c6d15fcc980da0b2a380e98a186bd21c7b5276cd -EBUILD libcxx-16.0.0_pre20221006.ebuild 5689 BLAKE2B db5070429808dfd0c9cacd0e97c8573b4691e444705b499bb598c53aacbc344c0a1b7d05573eca3d44d23cfb3e7523fe03529215ca5039985e9a6737cc12c1c3 SHA512 697802bc6e30a2609cc949a1028655e535a10c77be6ec39897f30cfb7bedd89192221510528d63ee16ee6176c6d15fcc980da0b2a380e98a186bd21c7b5276cd +EBUILD libcxx-16.0.0.9999.ebuild 5687 BLAKE2B 47c5a90bc448fc848a61b971f53690559b1383e2b61d41423dab7e773eb4fc3bdcbde23785687664f0a0031a65d1b75b5411f01f7756e17369000dba23b7a6bc SHA512 80a539652f452e27df12a061d26c214f4083b28f702ca3f87688432d5672027f6e412fde2ec831d2c3cec165b9e51be9f935930ba1ddc10c25814c65553f931b +EBUILD libcxx-16.0.0_pre20221006.ebuild 5687 BLAKE2B 47c5a90bc448fc848a61b971f53690559b1383e2b61d41423dab7e773eb4fc3bdcbde23785687664f0a0031a65d1b75b5411f01f7756e17369000dba23b7a6bc SHA512 80a539652f452e27df12a061d26c214f4083b28f702ca3f87688432d5672027f6e412fde2ec831d2c3cec165b9e51be9f935930ba1ddc10c25814c65553f931b MISC metadata.xml 828 BLAKE2B 40af456df8ac1cfdb66fd62a217abbb4ca837956529906118c35232000435d9e991d18dd0332b7b95eed70d4c7610c7a1aee80af8ba511763edc1423749a4aa4 SHA512 257f8fd05fcade26ca02305356b67c8e2d67a87b180e38a189a659212093b07b9a710b871fbaab894dba9eba5fe450b76c52cc82f6405c24cc1ab2df3abe8bfd 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 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest index 9a0026900641..f3a596983c61 100644 --- a/sys-libs/libcxxabi/Manifest +++ b/sys-libs/libcxxabi/Manifest @@ -6,8 +6,8 @@ DIST llvm-project-5a0722e0469894564dd9b0ee1d4f8c291d09c776.tar.gz 169164627 BLAK DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f EBUILD libcxxabi-13.0.1.ebuild 3593 BLAKE2B 2e8717a8dadf431dc4360e4cee5d74875153f375f241388e3cc47410c9ecf4c97f2641c276927a99c6643460bbd1f7bddae72b06e7994e162cc1e7f3fd5e4fbe SHA512 4c943fe5483f94329e3f9390c8ddeaf89dc168220696fd5eb00692e7458d6ff92d3b37343bd6de23df70eea814243aee75bc8d75681ecb944a66cf37562fbdf7 EBUILD libcxxabi-14.0.6.ebuild 3509 BLAKE2B e6fa29bba6fcc72fa1c049ba696fd9cb6b34b0d89be89e449a21a9ba31c2e01d944ca15b1414043ba1def938dbdca144c37fdecdd39158dc3932ca7b7587f428 SHA512 4cd09cc7b0a0df878d2e2594750a80a18ee6aa09b195cb190ed8432464ec2563ea7b026d2748e6e0d198091e54e07aabdadc7f68919a3a81a4079d67262054f2 -EBUILD libcxxabi-15.0.2.9999.ebuild 3058 BLAKE2B 89bf6165d8e93a22e3cccb88f2760d82bd31a286b37ae341af23546ae7863b599285967f6bce31dcea1ac74572fcc046de2407c404198ec086384d22b994e6b8 SHA512 03b9133bfbbfbae4df5163196f3125cf35c8b90b6e447b2f3ca3c26f6d24705a0f05a0b24a2fc670ebaa4bbbdcca46852a374f6729f20822b880dd7f773163bb +EBUILD libcxxabi-15.0.2.9999.ebuild 3056 BLAKE2B 3ec19055b4465421ed3e80788abf44097c1f714704b1aa6efa3688f3052fac1e3a6e6fe102f9c53a1ec2d4ce5a604df14e8738a3b428097d9a324b16dd30eb59 SHA512 8ad6f7deef050526f160ab6eb5119985512b9332e288ca4da739d833566b5ee87c1c85ac0fe381dbd8aad2df76079e33e7283897c3386c34db53120703d1a33f EBUILD libcxxabi-15.0.2.ebuild 3106 BLAKE2B e5058971c3a8b58ea39aa5d09d885e437698f8855bfa86ed550f3878ac05a57c152ef9c5fca5eb9109f11f435c8fba9475aba7f6582761699116a3ce60da7a2b SHA512 9d39757e0d1f9b380df08988aa1b2a203179d488a477803baaf7652a4ac3cfa7954bfb62e1fded13a41f40388d0b5d0ae009ad937e0b71d7db050ab545e7ea78 -EBUILD libcxxabi-16.0.0.9999.ebuild 3058 BLAKE2B 89bf6165d8e93a22e3cccb88f2760d82bd31a286b37ae341af23546ae7863b599285967f6bce31dcea1ac74572fcc046de2407c404198ec086384d22b994e6b8 SHA512 03b9133bfbbfbae4df5163196f3125cf35c8b90b6e447b2f3ca3c26f6d24705a0f05a0b24a2fc670ebaa4bbbdcca46852a374f6729f20822b880dd7f773163bb -EBUILD libcxxabi-16.0.0_pre20221006.ebuild 3058 BLAKE2B 89bf6165d8e93a22e3cccb88f2760d82bd31a286b37ae341af23546ae7863b599285967f6bce31dcea1ac74572fcc046de2407c404198ec086384d22b994e6b8 SHA512 03b9133bfbbfbae4df5163196f3125cf35c8b90b6e447b2f3ca3c26f6d24705a0f05a0b24a2fc670ebaa4bbbdcca46852a374f6729f20822b880dd7f773163bb +EBUILD libcxxabi-16.0.0.9999.ebuild 3056 BLAKE2B 3ec19055b4465421ed3e80788abf44097c1f714704b1aa6efa3688f3052fac1e3a6e6fe102f9c53a1ec2d4ce5a604df14e8738a3b428097d9a324b16dd30eb59 SHA512 8ad6f7deef050526f160ab6eb5119985512b9332e288ca4da739d833566b5ee87c1c85ac0fe381dbd8aad2df76079e33e7283897c3386c34db53120703d1a33f +EBUILD libcxxabi-16.0.0_pre20221006.ebuild 3056 BLAKE2B 3ec19055b4465421ed3e80788abf44097c1f714704b1aa6efa3688f3052fac1e3a6e6fe102f9c53a1ec2d4ce5a604df14e8738a3b428097d9a324b16dd30eb59 SHA512 8ad6f7deef050526f160ab6eb5119985512b9332e288ca4da739d833566b5ee87c1c85ac0fe381dbd8aad2df76079e33e7283897c3386c34db53120703d1a33f MISC metadata.xml 557 BLAKE2B 4f6b0acb7cfdf74971a6fd96051d9f9020141c6117333a8de42bd043935b7bff8d9942faabdf3b1c94597c460393f64eb7d3f7b7d49f39ecfd0094de460f563e SHA512 67a812ef768e681ae77ef6e13bccffcbe53b41e94901f0558b3c7acaf896605ca670c4bb5a690bd9afa3b5a76271341710520a6abc0024c18f437fabde20e847 diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.2.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.2.9999.ebuild index 78be4b5b862f..130101c20cb9 100644 --- a/sys-libs/libcxxabi/libcxxabi-15.0.2.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-15.0.2.9999.ebuild @@ -21,14 +21,13 @@ RESTRICT="!test? ( test )" RDEPEND+=" ! ${P}.tar.gz" LICENSE="|| ( GPL-2+ OSL-2.1 ) BSD Boost-1.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ia64 ~riscv x86" +KEYWORDS="-* amd64 ~ia64 x86" IUSE="doc graphviz nls +python static-libs test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) test? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest index 0056d760b165..c1707163c451 100644 --- a/sys-libs/llvm-libunwind/Manifest +++ b/sys-libs/llvm-libunwind/Manifest @@ -7,8 +7,8 @@ DIST llvm-project-5a0722e0469894564dd9b0ee1d4f8c291d09c776.tar.gz 169164627 BLAK DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f EBUILD llvm-libunwind-13.0.1-r1.ebuild 3912 BLAKE2B 4d66504181497e9234ce0192dc75d68dd89652739f5b40f4ce5a6bac927b128be1f45feb0e960650d06fb4086592b6833f51972b77e908c525cf5257b88e3908 SHA512 70ca5f5567e654c33524b459f000dba8aa9b93c0b108ad88bd3eed3d7154904e6c775d54a0d9245d9f41d6229ae42a74ed6ed6728e31e94feae253106f463e53 EBUILD llvm-libunwind-14.0.6-r1.ebuild 3301 BLAKE2B 838c03d69e46a441ccbd7d9524fbde37e02c2f8ffa607ccdecf9fd7073a0d733d305457e574456dd519b7449825a538208e3b308235a65d687c4e76321f1b415 SHA512 acb17241c88b5a6ff0bbebe215a48bf603cc16f1e94f11f51a0b6d6934c940cf9b56c5c6090c96f64f4f6db1826764e7028d990cc7d44cb6a528639518820ac2 -EBUILD llvm-libunwind-15.0.2.9999.ebuild 3120 BLAKE2B 1c57bdc94602d5243a0aec800112545a97c111d80747b398ac1ee7f67751009069c390c11c3cc43613dcbbe83d127eee5d08e6702fbc966ea70b5a7e94ad0730 SHA512 6900401066b73cc3f4f709c12f7350d4bf7d0d680b17ceb9c01c475fcf00ef576c16e47545c2f802409862862cf5741dcca609fd187d25b4c39baf39c6567fd0 +EBUILD llvm-libunwind-15.0.2.9999.ebuild 3118 BLAKE2B 4c150f016537ae0cbf7f109336d4695f87a1173e25eb2481817f28231f49f6c524c953d34a5596901668192707f3231503edfd144f4064263597277c074c3737 SHA512 03997bdf37af9c01c28c62bb0428ec3145f1f91b8b9e383c01a9d51f21faa6ff39391055044b23c92c19a06c5327eb2eaa0a6ecf173bbe3a9fe3fb89e101b23c EBUILD llvm-libunwind-15.0.2.ebuild 3180 BLAKE2B 795d5d2954ce760102453b4d2d81274787f30d3389f0f45e6f07e34fbf0edb1d4453fece7246e8dbe198054c07fcc43c50ee819719071d42494edfc982866f31 SHA512 18b48fa57686da69d0bcf67c54feb16f586283b5379d46b82115d9443bd3ef611b3d355f6513655128f606cdef65b093805554012ab1df8435258696838b9887 -EBUILD llvm-libunwind-16.0.0.9999.ebuild 3120 BLAKE2B 1c57bdc94602d5243a0aec800112545a97c111d80747b398ac1ee7f67751009069c390c11c3cc43613dcbbe83d127eee5d08e6702fbc966ea70b5a7e94ad0730 SHA512 6900401066b73cc3f4f709c12f7350d4bf7d0d680b17ceb9c01c475fcf00ef576c16e47545c2f802409862862cf5741dcca609fd187d25b4c39baf39c6567fd0 -EBUILD llvm-libunwind-16.0.0_pre20221006.ebuild 3084 BLAKE2B 64af0ccfe2b63946dfeeb5fcdec9079a9427ca14021148ec3e2046088e237cadf5cd41df9f4157184b85c62e2d27eb1834159b534de03d7c6e8818b523f18a69 SHA512 f70f31cdd0267aaa6d33b21734df86343257913ea61f1a5d52996e048a1ade2e59696e347f01c3c48fbfcde815ea8c135239a7ca29d9896d1c653f2e659b360a +EBUILD llvm-libunwind-16.0.0.9999.ebuild 3118 BLAKE2B 4c150f016537ae0cbf7f109336d4695f87a1173e25eb2481817f28231f49f6c524c953d34a5596901668192707f3231503edfd144f4064263597277c074c3737 SHA512 03997bdf37af9c01c28c62bb0428ec3145f1f91b8b9e383c01a9d51f21faa6ff39391055044b23c92c19a06c5327eb2eaa0a6ecf173bbe3a9fe3fb89e101b23c +EBUILD llvm-libunwind-16.0.0_pre20221006.ebuild 3082 BLAKE2B 0d12f03bfcc8ed8148643660bd2afedce683722e9af9e3b24cd393432b6bbff4af577e9970e07093679b012a22d7f572129200b5a2eb5ccb177085348a6ff215 SHA512 158c89ee07d5e0e032adf547c22757d90ac5f2f186dae6d0467400fff4ae18ffe0eedd37563b5043d772f3400344431cb2e00944401d529c8774c50cd966b9f0 MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.2.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.2.9999.ebuild index 67d11a24dc77..b53a48502232 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.2.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.2.9999.ebuild @@ -20,13 +20,12 @@ RESTRICT="!test? ( test )" RDEPEND=" !sys-libs/libunwind " -LLVM_MAX_SLOT=${PV%%.*} DEPEND=" - 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} @@ -46,7 +45,7 @@ python_check_deps() { } pkg_setup() { - llvm_pkg_setup + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup python-any-r1_pkg_setup } diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.9999.ebuild index 67d11a24dc77..b53a48502232 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.9999.ebuild @@ -20,13 +20,12 @@ RESTRICT="!test? ( test )" RDEPEND=" !sys-libs/libunwind " -LLVM_MAX_SLOT=${PV%%.*} DEPEND=" - 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} @@ -46,7 +45,7 @@ python_check_deps() { } pkg_setup() { - llvm_pkg_setup + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup python-any-r1_pkg_setup } diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_pre20221006.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_pre20221006.ebuild index 71139d2b5fda..1d7329494c4c 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_pre20221006.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_pre20221006.ebuild @@ -20,13 +20,12 @@ RESTRICT="!test? ( test )" RDEPEND=" !sys-libs/libunwind " -LLVM_MAX_SLOT=${PV%%.*} DEPEND=" - 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} @@ -46,7 +45,7 @@ python_check_deps() { } pkg_setup() { - llvm_pkg_setup + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup python-any-r1_pkg_setup } -- cgit v1.2.3