commit: c8022ad722380fee53a70349c9f034ba5371c8c4
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 11:11:34 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 11:53:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8022ad7
Move {sys-libs → llvm-runtimes}/libcxxabi
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
kde-plasma/plasma-meta/plasma-meta-6.2.4.ebuild | 2 +-
{sys-libs => llvm-runtimes}/libcxxabi/Manifest | 0
{sys-libs => llvm-runtimes}/libcxxabi/libcxxabi-15.0.7.ebuild | 4 ++--
{sys-libs => llvm-runtimes}/libcxxabi/libcxxabi-16.0.6.ebuild | 0
{sys-libs => llvm-runtimes}/libcxxabi/libcxxabi-17.0.6.ebuild | 0
{sys-libs => llvm-runtimes}/libcxxabi/libcxxabi-18.1.8.ebuild | 0
{sys-libs => llvm-runtimes}/libcxxabi/libcxxabi-19.1.4.ebuild | 0
{sys-libs => llvm-runtimes}/libcxxabi/libcxxabi-19.1.5.ebuild | 0
{sys-libs => llvm-runtimes}/libcxxabi/libcxxabi-20.0.0.9999.ebuild | 0
.../libcxxabi/libcxxabi-20.0.0_pre20241207.ebuild | 0
{sys-libs => llvm-runtimes}/libcxxabi/metadata.xml | 0
metadata/stabilization-groups/llvm.group | 2 +-
net-misc/icaclient/icaclient-23.5.0.58.ebuild | 4 ++--
net-misc/icaclient/icaclient-23.7.0.17.ebuild | 4 ++--
net-misc/icaclient/icaclient-24.2.0.65.ebuild | 2 +-
profiles/arch/amd64/package.use | 2 +-
profiles/default/linux/amd64/17.1/clang/package.use.force | 2 +-
profiles/default/linux/amd64/17.1/systemd/clang/package.use.force | 2 +-
profiles/default/linux/amd64/23.0/llvm/package.use.force | 2 +-
profiles/default/linux/amd64/23.0/split-usr/llvm/package.use.force | 2 +-
profiles/features/llvm/make.defaults | 4 ++--
profiles/features/llvm/packages | 2 +-
profiles/features/llvm/packages.build | 2 +-
profiles/updates/4Q-2024 | 1 +
sys-libs/libcxx/libcxx-15.0.7-r1.ebuild | 2 +-
sys-libs/libcxx/libcxx-16.0.6.ebuild | 2 +-
sys-libs/libcxx/libcxx-17.0.6.ebuild | 2 +-
sys-libs/libcxx/libcxx-18.1.8.ebuild | 2 +-
sys-libs/libcxx/libcxx-19.1.4.ebuild | 2 +-
sys-libs/libcxx/libcxx-19.1.5.ebuild | 2 +-
sys-libs/libcxx/libcxx-20.0.0.9999.ebuild | 2 +-
sys-libs/libcxx/libcxx-20.0.0_pre20241207.ebuild | 2 +-
sys-libs/libcxx/metadata.xml | 2 +-
33 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/kde-plasma/plasma-meta/plasma-meta-6.2.4.ebuild
b/kde-plasma/plasma-meta/plasma-meta-6.2.4.ebuild
index 79128fa099af..39031f2c11f9 100644
--- a/kde-plasma/plasma-meta/plasma-meta-6.2.4.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-6.2.4.ebuild
@@ -135,7 +135,7 @@ pkg_postinst() {
ewarn "on a panel. See bug #923292."
ewarn ""
ewarn "A possible (no warranty!) workaround is building
sys-libs/libcxx and"
- ewarn "sys-libs/libcxxabi with the following in package.env:"
+ ewarn "llvm-runtimes/libcxxabi with the following in
package.env:"
ewarn "
MYCMAKEARGS=\"-DLIBCXX_TYPEINFO_COMPARISON_IMPLEMENTATION=2\""
ewarn "You may then need to rebuild dev-qt/* and kde-*/*."
fi
diff --git a/sys-libs/libcxxabi/Manifest b/llvm-runtimes/libcxxabi/Manifest
similarity index 100%
rename from sys-libs/libcxxabi/Manifest
rename to llvm-runtimes/libcxxabi/Manifest
diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.7.ebuild
b/llvm-runtimes/libcxxabi/libcxxabi-15.0.7.ebuild
similarity index 97%
rename from sys-libs/libcxxabi/libcxxabi-15.0.7.ebuild
rename to llvm-runtimes/libcxxabi/libcxxabi-15.0.7.ebuild
index 047a5a0e8d28..a21bc6a0aecd 100644
--- a/sys-libs/libcxxabi/libcxxabi-15.0.7.ebuild
+++ b/llvm-runtimes/libcxxabi/libcxxabi-15.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
toolchain-funcs
diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.6.ebuild
b/llvm-runtimes/libcxxabi/libcxxabi-16.0.6.ebuild
similarity index 100%
rename from sys-libs/libcxxabi/libcxxabi-16.0.6.ebuild
rename to llvm-runtimes/libcxxabi/libcxxabi-16.0.6.ebuild
diff --git a/sys-libs/libcxxabi/libcxxabi-17.0.6.ebuild
b/llvm-runtimes/libcxxabi/libcxxabi-17.0.6.ebuild
similarity index 100%
rename from sys-libs/libcxxabi/libcxxabi-17.0.6.ebuild
rename to llvm-runtimes/libcxxabi/libcxxabi-17.0.6.ebuild
diff --git a/sys-libs/libcxxabi/libcxxabi-18.1.8.ebuild
b/llvm-runtimes/libcxxabi/libcxxabi-18.1.8.ebuild
similarity index 100%
rename from sys-libs/libcxxabi/libcxxabi-18.1.8.ebuild
rename to llvm-runtimes/libcxxabi/libcxxabi-18.1.8.ebuild
diff --git a/sys-libs/libcxxabi/libcxxabi-19.1.4.ebuild
b/llvm-runtimes/libcxxabi/libcxxabi-19.1.4.ebuild
similarity index 100%
rename from sys-libs/libcxxabi/libcxxabi-19.1.4.ebuild
rename to llvm-runtimes/libcxxabi/libcxxabi-19.1.4.ebuild
diff --git a/sys-libs/libcxxabi/libcxxabi-19.1.5.ebuild
b/llvm-runtimes/libcxxabi/libcxxabi-19.1.5.ebuild
similarity index 100%
rename from sys-libs/libcxxabi/libcxxabi-19.1.5.ebuild
rename to llvm-runtimes/libcxxabi/libcxxabi-19.1.5.ebuild
diff --git a/sys-libs/libcxxabi/libcxxabi-20.0.0.9999.ebuild
b/llvm-runtimes/libcxxabi/libcxxabi-20.0.0.9999.ebuild
similarity index 100%
rename from sys-libs/libcxxabi/libcxxabi-20.0.0.9999.ebuild
rename to llvm-runtimes/libcxxabi/libcxxabi-20.0.0.9999.ebuild
diff --git a/sys-libs/libcxxabi/libcxxabi-20.0.0_pre20241207.ebuild
b/llvm-runtimes/libcxxabi/libcxxabi-20.0.0_pre20241207.ebuild
similarity index 100%
rename from sys-libs/libcxxabi/libcxxabi-20.0.0_pre20241207.ebuild
rename to llvm-runtimes/libcxxabi/libcxxabi-20.0.0_pre20241207.ebuild
diff --git a/sys-libs/libcxxabi/metadata.xml
b/llvm-runtimes/libcxxabi/metadata.xml
similarity index 100%
rename from sys-libs/libcxxabi/metadata.xml
rename to llvm-runtimes/libcxxabi/metadata.xml
diff --git a/metadata/stabilization-groups/llvm.group
b/metadata/stabilization-groups/llvm.group
index 68c79531c78c..6b5bd7894d1f 100644
--- a/metadata/stabilization-groups/llvm.group
+++ b/metadata/stabilization-groups/llvm.group
@@ -3,6 +3,7 @@ dev-ml/llvm-ocaml
dev-python/clang-python
dev-python/lit
llvm-core/libclc
+llvm-runtimes/libcxxabi
llvm-runtimes/libunwind
llvm-runtimes/offload
llvm-runtimes/openmp
@@ -19,4 +20,3 @@ sys-devel/llvmgold
sys-libs/compiler-rt
sys-libs/compiler-rt-sanitizers
sys-libs/libcxx
-sys-libs/libcxxabi
diff --git a/net-misc/icaclient/icaclient-23.5.0.58.ebuild
b/net-misc/icaclient/icaclient-23.5.0.58.ebuild
index 03db22459332..ffdea83ccffa 100644
--- a/net-misc/icaclient/icaclient-23.5.0.58.ebuild
+++ b/net-misc/icaclient/icaclient-23.5.0.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -77,7 +77,7 @@ RDEPEND="
net-libs/webkit-gtk:4
sys-apps/util-linux
sys-libs/libcxx
- sys-libs/libcxxabi
+ llvm-runtimes/libcxxabi
sys-libs/zlib
virtual/krb5
virtual/libudev
diff --git a/net-misc/icaclient/icaclient-23.7.0.17.ebuild
b/net-misc/icaclient/icaclient-23.7.0.17.ebuild
index 03db22459332..ffdea83ccffa 100644
--- a/net-misc/icaclient/icaclient-23.7.0.17.ebuild
+++ b/net-misc/icaclient/icaclient-23.7.0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -77,7 +77,7 @@ RDEPEND="
net-libs/webkit-gtk:4
sys-apps/util-linux
sys-libs/libcxx
- sys-libs/libcxxabi
+ llvm-runtimes/libcxxabi
sys-libs/zlib
virtual/krb5
virtual/libudev
diff --git a/net-misc/icaclient/icaclient-24.2.0.65.ebuild
b/net-misc/icaclient/icaclient-24.2.0.65.ebuild
index b670a9733253..00ba9ec8a118 100644
--- a/net-misc/icaclient/icaclient-24.2.0.65.ebuild
+++ b/net-misc/icaclient/icaclient-24.2.0.65.ebuild
@@ -76,7 +76,7 @@ RDEPEND="
net-libs/webkit-gtk:4.1
sys-apps/util-linux
sys-libs/libcxx
- sys-libs/libcxxabi
+ llvm-runtimes/libcxxabi
sys-libs/zlib
virtual/krb5
virtual/libudev
diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use
index 6b2d4c6a3f71..51102bafee26 100644
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@@ -25,7 +25,7 @@ sys-apps/memtest86+ bios64 uefi64
# Theo Anderson <tel...@posteo.de> (2021-03-06)
# Enable 32-bit clang runtime to ease -m32 builds with non-GCC runtime
sys-devel/clang-runtime abi_x86_32
-sys-libs/libcxxabi abi_x86_32
+llvm-runtimes/libcxxabi abi_x86_32
sys-libs/libcxx abi_x86_32
llvm-runtimes/openmp abi_x86_32
llvm-runtimes/libunwind abi_x86_32
diff --git a/profiles/default/linux/amd64/17.1/clang/package.use.force
b/profiles/default/linux/amd64/17.1/clang/package.use.force
index 0b5fde96c722..42e779649317 100644
--- a/profiles/default/linux/amd64/17.1/clang/package.use.force
+++ b/profiles/default/linux/amd64/17.1/clang/package.use.force
@@ -8,7 +8,7 @@ sys-devel/clang abi_x86_32 abi_x86_64
sys-devel/clang-runtime abi_x86_32 abi_x86_64
sys-devel/llvm abi_x86_32 abi_x86_64
sys-libs/compiler-rt abi_x86_32 abi_x86_64
-sys-libs/libcxxabi abi_x86_32 abi_x86_64
+llvm-runtimes/libcxxabi abi_x86_32 abi_x86_64
sys-libs/libcxx abi_x86_32 abi_x86_64
sys-libs/libunwind abi_x86_32 abi_x86_64
llvm-runtimes/libunwind abi_x86_32 abi_x86_64
diff --git a/profiles/default/linux/amd64/17.1/systemd/clang/package.use.force
b/profiles/default/linux/amd64/17.1/systemd/clang/package.use.force
index 0b5fde96c722..42e779649317 100644
--- a/profiles/default/linux/amd64/17.1/systemd/clang/package.use.force
+++ b/profiles/default/linux/amd64/17.1/systemd/clang/package.use.force
@@ -8,7 +8,7 @@ sys-devel/clang abi_x86_32 abi_x86_64
sys-devel/clang-runtime abi_x86_32 abi_x86_64
sys-devel/llvm abi_x86_32 abi_x86_64
sys-libs/compiler-rt abi_x86_32 abi_x86_64
-sys-libs/libcxxabi abi_x86_32 abi_x86_64
+llvm-runtimes/libcxxabi abi_x86_32 abi_x86_64
sys-libs/libcxx abi_x86_32 abi_x86_64
sys-libs/libunwind abi_x86_32 abi_x86_64
llvm-runtimes/libunwind abi_x86_32 abi_x86_64
diff --git a/profiles/default/linux/amd64/23.0/llvm/package.use.force
b/profiles/default/linux/amd64/23.0/llvm/package.use.force
index 592916e7e233..a5e409066217 100644
--- a/profiles/default/linux/amd64/23.0/llvm/package.use.force
+++ b/profiles/default/linux/amd64/23.0/llvm/package.use.force
@@ -8,7 +8,7 @@ sys-devel/clang abi_x86_32 abi_x86_64
sys-devel/clang-runtime abi_x86_32 abi_x86_64
sys-devel/llvm abi_x86_32 abi_x86_64
sys-libs/compiler-rt abi_x86_32 abi_x86_64
-sys-libs/libcxxabi abi_x86_32 abi_x86_64
+llvm-runtimes/libcxxabi abi_x86_32 abi_x86_64
sys-libs/libcxx abi_x86_32 abi_x86_64
sys-libs/libunwind abi_x86_32 abi_x86_64
llvm-runtimes/libunwind abi_x86_32 abi_x86_64
diff --git a/profiles/default/linux/amd64/23.0/split-usr/llvm/package.use.force
b/profiles/default/linux/amd64/23.0/split-usr/llvm/package.use.force
index 592916e7e233..a5e409066217 100644
--- a/profiles/default/linux/amd64/23.0/split-usr/llvm/package.use.force
+++ b/profiles/default/linux/amd64/23.0/split-usr/llvm/package.use.force
@@ -8,7 +8,7 @@ sys-devel/clang abi_x86_32 abi_x86_64
sys-devel/clang-runtime abi_x86_32 abi_x86_64
sys-devel/llvm abi_x86_32 abi_x86_64
sys-libs/compiler-rt abi_x86_32 abi_x86_64
-sys-libs/libcxxabi abi_x86_32 abi_x86_64
+llvm-runtimes/libcxxabi abi_x86_32 abi_x86_64
sys-libs/libcxx abi_x86_32 abi_x86_64
sys-libs/libunwind abi_x86_32 abi_x86_64
llvm-runtimes/libunwind abi_x86_32 abi_x86_64
diff --git a/profiles/features/llvm/make.defaults
b/profiles/features/llvm/make.defaults
index 5a49b6718476..fecef96bcb0c 100644
--- a/profiles/features/llvm/make.defaults
+++ b/profiles/features/llvm/make.defaults
@@ -44,7 +44,7 @@ BOOTSTRAP_USE="${BOOTSTRAP_USE} ssl curl_ssl_openssl"
# sys-devel/llvm
BOOTSTRAP_USE="${BOOTSTRAP_USE} -binutils-plugin"
-# sys-devel/clang, sys-devel/clang-runtime, llvm-runtimes/libunwind,
sys-libs/libcxx, sys-libs/libcxxabi
+# sys-devel/clang, sys-devel/clang-runtime, llvm-runtimes/libunwind,
sys-libs/libcxx, llvm-runtimes/libcxxabi
BOOTSTRAP_USE="${BOOTSTRAP_USE} compiler-rt clang libunwind"
# sys-devel/clang
@@ -53,7 +53,7 @@ BOOTSTRAP_USE="${BOOTSTRAP_USE} default-compiler-rt
default-lld default-libcxx l
# sys-devel/clang-runtime
BOOTSTRAP_USE="${BOOTSTRAP_USE} libcxx -sanitize"
-# sys-libs/libcxxabi
+# llvm-runtimes/libcxxabi
BOOTSTRAP_USE="${BOOTSTRAP_USE} libcxxabi"
# llvm & clang: explicitly disable all extra targets, otherwise linking stage2
fails
diff --git a/profiles/features/llvm/packages b/profiles/features/llvm/packages
index 6a13de712643..2c36740026c5 100644
--- a/profiles/features/llvm/packages
+++ b/profiles/features/llvm/packages
@@ -3,7 +3,7 @@
*sys-devel/llvm
*sys-devel/clang
*sys-libs/libcxx
-*sys-libs/libcxxabi
+*llvm-runtimes/libcxxabi
*sys-libs/compiler-rt
*llvm-runtimes/libunwind
diff --git a/profiles/features/llvm/packages.build
b/profiles/features/llvm/packages.build
index 00f7e8397930..1d52b4722566 100644
--- a/profiles/features/llvm/packages.build
+++ b/profiles/features/llvm/packages.build
@@ -1,6 +1,6 @@
# will be pulled by stage1
sys-libs/compiler-rt
-sys-libs/libcxxabi
+llvm-runtimes/libcxxabi
sys-libs/libcxx
sys-devel/llvm
sys-devel/lld
diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024
index dff1a5f8dbc7..09fffe60a3c6 100644
--- a/profiles/updates/4Q-2024
+++ b/profiles/updates/4Q-2024
@@ -65,3 +65,4 @@ move sys-libs/llvm-offload llvm-runtimes/offload
move dev-libs/libclc llvm-core/libclc
move sys-libs/llvm-libunwind llvm-runtimes/libunwind
move sys-libs/libomp llvm-runtimes/openmp
+move sys-libs/libcxxabi llvm-runtimes/libcxxabi
diff --git a/sys-libs/libcxx/libcxx-15.0.7-r1.ebuild
b/sys-libs/libcxx/libcxx-15.0.7-r1.ebuild
index f07e4e73f9ce..429e5f596920 100644
--- a/sys-libs/libcxx/libcxx-15.0.7-r1.ebuild
+++ b/sys-libs/libcxx/libcxx-15.0.7-r1.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
libcxxabi? (
- ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+ ~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
)
!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
"
diff --git a/sys-libs/libcxx/libcxx-16.0.6.ebuild
b/sys-libs/libcxx/libcxx-16.0.6.ebuild
index f58235f01d4e..e66a304bab88 100644
--- a/sys-libs/libcxx/libcxx-16.0.6.ebuild
+++ b/sys-libs/libcxx/libcxx-16.0.6.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
libcxxabi? (
- ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+ ~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
)
!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
"
diff --git a/sys-libs/libcxx/libcxx-17.0.6.ebuild
b/sys-libs/libcxx/libcxx-17.0.6.ebuild
index 0f39a16ae5e9..044e5553e75c 100644
--- a/sys-libs/libcxx/libcxx-17.0.6.ebuild
+++ b/sys-libs/libcxx/libcxx-17.0.6.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
libcxxabi? (
- ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+ ~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
)
!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
"
diff --git a/sys-libs/libcxx/libcxx-18.1.8.ebuild
b/sys-libs/libcxx/libcxx-18.1.8.ebuild
index 372665da52df..8cc099018bca 100644
--- a/sys-libs/libcxx/libcxx-18.1.8.ebuild
+++ b/sys-libs/libcxx/libcxx-18.1.8.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
libcxxabi? (
- ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+ ~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
)
!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
"
diff --git a/sys-libs/libcxx/libcxx-19.1.4.ebuild
b/sys-libs/libcxx/libcxx-19.1.4.ebuild
index b1a524e796f3..ef26774b58e0 100644
--- a/sys-libs/libcxx/libcxx-19.1.4.ebuild
+++ b/sys-libs/libcxx/libcxx-19.1.4.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
libcxxabi? (
- ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+ ~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
)
!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
"
diff --git a/sys-libs/libcxx/libcxx-19.1.5.ebuild
b/sys-libs/libcxx/libcxx-19.1.5.ebuild
index 80dbe207d4c4..b6a85d925747 100644
--- a/sys-libs/libcxx/libcxx-19.1.5.ebuild
+++ b/sys-libs/libcxx/libcxx-19.1.5.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
libcxxabi? (
- ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+ ~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
)
!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
"
diff --git a/sys-libs/libcxx/libcxx-20.0.0.9999.ebuild
b/sys-libs/libcxx/libcxx-20.0.0.9999.ebuild
index 73b362d082dd..c39257020ea3 100644
--- a/sys-libs/libcxx/libcxx-20.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-20.0.0.9999.ebuild
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
libcxxabi? (
- ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+ ~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
)
!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
"
diff --git a/sys-libs/libcxx/libcxx-20.0.0_pre20241207.ebuild
b/sys-libs/libcxx/libcxx-20.0.0_pre20241207.ebuild
index 73b362d082dd..c39257020ea3 100644
--- a/sys-libs/libcxx/libcxx-20.0.0_pre20241207.ebuild
+++ b/sys-libs/libcxx/libcxx-20.0.0_pre20241207.ebuild
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
libcxxabi? (
- ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+ ~llvm-runtimes/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
)
!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
"
diff --git a/sys-libs/libcxx/metadata.xml b/sys-libs/libcxx/metadata.xml
index 413b6a08b4d8..c42166cd519a 100644
--- a/sys-libs/libcxx/metadata.xml
+++ b/sys-libs/libcxx/metadata.xml
@@ -8,7 +8,7 @@
<use>
<flag name="clang">Force building using installed clang (rather
than the default CC/CXX; required for testing).</flag>
- <flag name="libcxxabi">Build on top of
<pkg>sys-libs/libcxxabi</pkg> instead of gcc's libsupc++ (avoids depending on
gcc).</flag>
+ <flag name="libcxxabi">Build on top of
<pkg>llvm-runtimes/libcxxabi</pkg> instead of gcc's libsupc++ (avoids depending
on gcc).</flag>
</use>
<upstream>
<remote-id type="github">llvm/llvm-project</remote-id>
