Move {sys-libs → llvm-runtimes}/libcxx

Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-24 04:59:14 -07:00 · 2024-12-11 12:12:10 +01:00
parent c8022ad722
commit c614d9691e
79 changed files with 78 additions and 77 deletions
--- a/app-office/wps-office/wps-office-11.1.0.11723.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.11723.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
 	sys-apps/tcp-wrappers
 	sys-apps/util-linux
 	sys-libs/libcap
-	sys-libs/libcxx
+	llvm-runtimes/libcxx
 	sys-libs/zlib:0
 	virtual/glu
 	x11-libs/gtk+:2
--- a/dev-cpp/benchmark/benchmark-1.9.0.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.9.0.ebuild
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"

 DEPEND="
-	libcxx? ( sys-libs/libcxx[${MULTILIB_USEDEP}] )
+	libcxx? ( llvm-runtimes/libcxx[${MULTILIB_USEDEP}] )
 	libpfm? ( dev-libs/libpfm:= )
 "

--- a/dev-cpp/benchmark/metadata.xml
+++ b/dev-cpp/benchmark/metadata.xml
@@ -11,13 +11,13 @@
 	</maintainer>
 	<use>
 		<flag name="exceptions">Enable the use of exceptions in the benchmark library</flag>
-		<flag name="libcxx">Use <pkg>sys-libs/libcxx</pkg> instead of libstdc++ as the default stdlib</flag>
+		<flag name="libcxx">Use <pkg>llvm-runtimes/libcxx</pkg> instead of libstdc++ as the default stdlib</flag>
 		<flag name="libpfm">Enable <pkg>dev-libs/libpfm</pkg> support</flag>
 		<flag name="tools">Install some additional Python tools</flag>
 	</use>
 	<use lang="fr">
 		<flag name="exceptions">Utiliser les exceptions inclues dans la bibliothèque</flag>
-		<flag name="libcxx">Utiliser <pkg>sys-libs/libcxx</pkg> à la place de libstdc++ comme bibliothèque standard</flag>
+		<flag name="libcxx">Utiliser <pkg>llvm-runtimes/libcxx</pkg> à la place de libstdc++ comme bibliothèque standard</flag>
 		<flag name="libpfm">Activer le support de <pkg>dev-libs/libpfm</pkg></flag>
 		<flag name="tools">Installer des outils Python additionnels</flag>
 	</use>
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -1242,7 +1242,7 @@ gen_usr_ldscript() {
 # If the library is identified, the function returns 0 and prints one
 # of the following:
 #
-# - ``libc++`` for ``sys-libs/libcxx``
+# - ``libc++`` for ``llvm-runtimes/libcxx``
 # - ``libstdc++`` for ``sys-devel/gcc``'s libstdc++
 #
 # If the library is not recognized, the function returns 1.
--- a/kde-plasma/plasma-meta/plasma-meta-6.2.4.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-6.2.4.ebuild
@@ -131,10 +131,10 @@ pkg_postinst() {
 	if [[ $(tc-get-cxx-stdlib) == "libc++" ]] ; then
 		# Workaround for bug #923292 (KDE-bug 479679)
 		ewarn "plasmashell and other KDE Plasma components are known to misbehave"
-		ewarn "when built with sys-libs/libcxx, e.g. crashing when right-clicking"
+		ewarn "when built with llvm-runtimes/libcxx, e.g. crashing when right-clicking"
 		ewarn "on a panel. See bug #923292."
 		ewarn ""
-		ewarn "A possible (no warranty!) workaround is building sys-libs/libcxx and"
+		ewarn "A possible (no warranty!) workaround is building llvm-runtimes/libcxx and"
 		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-*/*."
--- a/llvm-runtimes/libcxx/Manifest
+++ b/llvm-runtimes/libcxx/Manifest
--- a/llvm-runtimes/libcxx/libcxx-15.0.7-r1.ebuild
+++ b/llvm-runtimes/libcxx/libcxx-15.0.7-r1.ebuild
--- a/llvm-runtimes/libcxx/libcxx-16.0.6.ebuild
+++ b/llvm-runtimes/libcxx/libcxx-16.0.6.ebuild
--- a/llvm-runtimes/libcxx/libcxx-17.0.6.ebuild
+++ b/llvm-runtimes/libcxx/libcxx-17.0.6.ebuild
--- a/llvm-runtimes/libcxx/libcxx-18.1.8.ebuild
+++ b/llvm-runtimes/libcxx/libcxx-18.1.8.ebuild
--- a/llvm-runtimes/libcxx/libcxx-19.1.4.ebuild
+++ b/llvm-runtimes/libcxx/libcxx-19.1.4.ebuild
--- a/llvm-runtimes/libcxx/libcxx-19.1.5.ebuild
+++ b/llvm-runtimes/libcxx/libcxx-19.1.5.ebuild
--- a/llvm-runtimes/libcxx/libcxx-20.0.0.9999.ebuild
+++ b/llvm-runtimes/libcxx/libcxx-20.0.0.9999.ebuild
--- a/llvm-runtimes/libcxx/libcxx-20.0.0_pre20241207.ebuild
+++ b/llvm-runtimes/libcxx/libcxx-20.0.0_pre20241207.ebuild
--- a/llvm-runtimes/libcxx/metadata.xml
+++ b/llvm-runtimes/libcxx/metadata.xml
--- a/llvm-runtimes/libcxxabi/libcxxabi-15.0.7.ebuild
+++ b/llvm-runtimes/libcxxabi/libcxxabi-15.0.7.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"

 # in 15.x, cxxabi.h is moving from libcxx to libcxxabi
 RDEPEND+="
-	!<sys-libs/libcxx-15
+	!<llvm-runtimes/libcxx-15
 "
 DEPEND="
 	${RDEPEND}
--- a/llvm-runtimes/libcxxabi/libcxxabi-16.0.6.ebuild
+++ b/llvm-runtimes/libcxxabi/libcxxabi-16.0.6.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"

 # in 15.x, cxxabi.h is moving from libcxx to libcxxabi
 RDEPEND+="
-	!<sys-libs/libcxx-15
+	!<llvm-runtimes/libcxx-15
 "
 DEPEND="
 	${RDEPEND}
--- a/llvm-runtimes/libcxxabi/libcxxabi-17.0.6.ebuild
+++ b/llvm-runtimes/libcxxabi/libcxxabi-17.0.6.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"

 # in 15.x, cxxabi.h is moving from libcxx to libcxxabi
 RDEPEND+="
-	!<sys-libs/libcxx-15
+	!<llvm-runtimes/libcxx-15
 "
 DEPEND="
 	${RDEPEND}
--- a/llvm-runtimes/libcxxabi/libcxxabi-18.1.8.ebuild
+++ b/llvm-runtimes/libcxxabi/libcxxabi-18.1.8.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"

 # in 15.x, cxxabi.h is moving from libcxx to libcxxabi
 RDEPEND+="
-	!<sys-libs/libcxx-15
+	!<llvm-runtimes/libcxx-15
 "
 DEPEND="
 	${RDEPEND}
--- a/llvm-runtimes/libcxxabi/libcxxabi-19.1.4.ebuild
+++ b/llvm-runtimes/libcxxabi/libcxxabi-19.1.4.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"

 # in 15.x, cxxabi.h is moving from libcxx to libcxxabi
 RDEPEND+="
-	!<sys-libs/libcxx-15
+	!<llvm-runtimes/libcxx-15
 "
 DEPEND="
 	${RDEPEND}
--- a/llvm-runtimes/libcxxabi/libcxxabi-19.1.5.ebuild
+++ b/llvm-runtimes/libcxxabi/libcxxabi-19.1.5.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"

 # in 15.x, cxxabi.h is moving from libcxx to libcxxabi
 RDEPEND+="
-	!<sys-libs/libcxx-15
+	!<llvm-runtimes/libcxx-15
 "
 DEPEND="
 	${RDEPEND}
--- a/llvm-runtimes/libcxxabi/libcxxabi-20.0.0.9999.ebuild
+++ b/llvm-runtimes/libcxxabi/libcxxabi-20.0.0.9999.ebuild
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"

 # in 15.x, cxxabi.h is moving from libcxx to libcxxabi
 RDEPEND+="
-	!<sys-libs/libcxx-15
+	!<llvm-runtimes/libcxx-15
 "
 DEPEND="
 	${RDEPEND}
--- a/llvm-runtimes/libcxxabi/libcxxabi-20.0.0_pre20241207.ebuild
+++ b/llvm-runtimes/libcxxabi/libcxxabi-20.0.0_pre20241207.ebuild
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"

 # in 15.x, cxxabi.h is moving from libcxx to libcxxabi
 RDEPEND+="
-	!<sys-libs/libcxx-15
+	!<llvm-runtimes/libcxx-15
 "
 DEPEND="
 	${RDEPEND}
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -16,7 +16,7 @@
 	</longdescription>
 	<use>
 		<flag name="gui">Build the osltoy binary (with Qt5)</flag>
-		<flag name="libcxx">Build against <pkg>sys-libs/libcxx</pkg> when using clang</flag>
+		<flag name="libcxx">Build against <pkg>llvm-runtimes/libcxx</pkg> when using clang</flag>
 		<flag name="nofma">Do not use Fuse-Multiply-Add operations</flag>
 		<flag name="optix">Add support for NVIDIA's OptiX Raytracing Engine</flag>
 		<flag name="partio">Use <pkg>media-libs/partio</pkg></flag>
--- a/media-sound/teamspeak-client/metadata.xml
+++ b/media-sound/teamspeak-client/metadata.xml
@@ -13,7 +13,7 @@
 		from which the user may join chat channels.
 	</longdescription>
 	<use>
-		<flag name="system-libcxx">Use <pkg>sys-libs/libcxx</pkg> instead of shipped libs.</flag>
+		<flag name="system-libcxx">Use <pkg>llvm-runtimes/libcxx</pkg> instead of shipped libs.</flag>
 		<flag name="system-quazip">Use <pkg>dev-libs/quazip</pkg> instead of shipped libs.</flag>
 	</use>
 </pkgmetadata>
--- a/media-sound/teamspeak-client/teamspeak-client-3.6.2.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.6.2.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
@@ -34,7 +34,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	alsa? ( media-libs/alsa-lib )
 	pulseaudio? ( media-libs/libpulse )
-	system-libcxx? ( sys-libs/libcxx[libcxxabi] )
+	system-libcxx? ( llvm-runtimes/libcxx[libcxxabi] )
 	!system-libcxx? ( sys-libs/libunwind )
 	system-quazip? ( dev-libs/quazip:0/1[qt5(+)] )
 "
--- 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/libcxx
 llvm-runtimes/libcxxabi
 llvm-runtimes/libunwind
 llvm-runtimes/offload
@@ -19,4 +20,3 @@ sys-devel/llvm-toolchain-symlinks
 sys-devel/llvmgold
 sys-libs/compiler-rt
 sys-libs/compiler-rt-sanitizers
-sys-libs/libcxx
--- a/net-misc/icaclient/icaclient-23.5.0.58.ebuild
+++ b/net-misc/icaclient/icaclient-23.5.0.58.ebuild
@@ -76,7 +76,7 @@ RDEPEND="
 	net-libs/libsoup:2.4
 	net-libs/webkit-gtk:4
 	sys-apps/util-linux
-	sys-libs/libcxx
+	llvm-runtimes/libcxx
 	llvm-runtimes/libcxxabi
 	sys-libs/zlib
 	virtual/krb5
--- a/net-misc/icaclient/icaclient-23.7.0.17.ebuild
+++ b/net-misc/icaclient/icaclient-23.7.0.17.ebuild
@@ -76,7 +76,7 @@ RDEPEND="
 	net-libs/libsoup:2.4
 	net-libs/webkit-gtk:4
 	sys-apps/util-linux
-	sys-libs/libcxx
+	llvm-runtimes/libcxx
 	llvm-runtimes/libcxxabi
 	sys-libs/zlib
 	virtual/krb5
--- a/net-misc/icaclient/icaclient-24.2.0.65.ebuild
+++ b/net-misc/icaclient/icaclient-24.2.0.65.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
 	net-libs/libsoup:2.4
 	net-libs/webkit-gtk:4.1
 	sys-apps/util-linux
-	sys-libs/libcxx
+	llvm-runtimes/libcxx
 	llvm-runtimes/libcxxabi
 	sys-libs/zlib
 	virtual/krb5
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@@ -26,7 +26,7 @@ sys-apps/memtest86+ bios64 uefi64
 # Enable 32-bit clang runtime to ease -m32 builds with non-GCC runtime
 sys-devel/clang-runtime abi_x86_32
 llvm-runtimes/libcxxabi abi_x86_32
-sys-libs/libcxx abi_x86_32
+llvm-runtimes/libcxx abi_x86_32
 llvm-runtimes/openmp abi_x86_32
 llvm-runtimes/libunwind abi_x86_32

--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -217,7 +217,7 @@ net-misc/wget ssl
 # Michał Górny <mgorny@gentoo.org> (2020-01-12)
 # libcxxabi is the only supported option.  The support for libsupc++
 # is maintained for experts only.
-sys-libs/libcxx libcxxabi
+llvm-runtimes/libcxx libcxxabi

 # Sergei Trofimovich <slyfox@gentoo.org> (2019-08-17)
 # USE=-cxx us a sure way to break native install as modern gcc
--- a/profiles/default/linux/amd64/17.1/clang/package.use.force
+++ b/profiles/default/linux/amd64/17.1/clang/package.use.force
@@ -9,7 +9,7 @@ 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
 llvm-runtimes/libcxxabi abi_x86_32 abi_x86_64
-sys-libs/libcxx abi_x86_32 abi_x86_64
+llvm-runtimes/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
 sys-libs/ncurses abi_x86_32 abi_x86_64
--- a/profiles/default/linux/amd64/17.1/systemd/clang/package.use.force
+++ b/profiles/default/linux/amd64/17.1/systemd/clang/package.use.force
@@ -9,7 +9,7 @@ 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
 llvm-runtimes/libcxxabi abi_x86_32 abi_x86_64
-sys-libs/libcxx abi_x86_32 abi_x86_64
+llvm-runtimes/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
 sys-libs/ncurses abi_x86_32 abi_x86_64
--- a/profiles/default/linux/amd64/23.0/llvm/package.use.force
+++ b/profiles/default/linux/amd64/23.0/llvm/package.use.force
@@ -9,7 +9,7 @@ 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
 llvm-runtimes/libcxxabi abi_x86_32 abi_x86_64
-sys-libs/libcxx abi_x86_32 abi_x86_64
+llvm-runtimes/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
 sys-libs/ncurses abi_x86_32 abi_x86_64
--- 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
@@ -9,7 +9,7 @@ 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
 llvm-runtimes/libcxxabi abi_x86_32 abi_x86_64
-sys-libs/libcxx abi_x86_32 abi_x86_64
+llvm-runtimes/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
 sys-libs/ncurses abi_x86_32 abi_x86_64
--- a/profiles/default/linux/ppc/package.use.mask
+++ b/profiles/default/linux/ppc/package.use.mask
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2024-08-06)
-# Requires sys-libs/libcxx.
+# Requires llvm-runtimes/libcxx.
 dev-cpp/benchmark libcxx

 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
--- a/profiles/default/linux/ppc64/package.use.mask
+++ b/profiles/default/linux/ppc64/package.use.mask
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2024-08-06)
-# Requires sys-libs/libcxx.
+# Requires llvm-runtimes/libcxx.
 dev-cpp/benchmark libcxx

 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
--- a/profiles/default/linux/ppc64le/package.use.mask
+++ b/profiles/default/linux/ppc64le/package.use.mask
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2024-08-06)
-# Requires sys-libs/libcxx.
+# Requires llvm-runtimes/libcxx.
 dev-cpp/benchmark libcxx

 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
--- 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, llvm-runtimes/libcxxabi
+# sys-devel/clang, sys-devel/clang-runtime, llvm-runtimes/libunwind, llvm-runtimes/libcxx, llvm-runtimes/libcxxabi
 BOOTSTRAP_USE="${BOOTSTRAP_USE} compiler-rt clang libunwind"

 # sys-devel/clang
--- a/profiles/features/llvm/package.use
+++ b/profiles/features/llvm/package.use
@@ -11,4 +11,4 @@ sys-libs/compiler-rt clang
 sys-devel/clang-runtime compiler-rt libcxx -sanitize
 # sys-libs/compiler-rt-sanitizers clang

-sys-libs/libcxx libcxxabi
+llvm-runtimes/libcxx libcxxabi
--- a/profiles/features/llvm/packages
+++ b/profiles/features/llvm/packages
@@ -2,7 +2,7 @@
 *sys-devel/lld
 *sys-devel/llvm
 *sys-devel/clang
-*sys-libs/libcxx
+*llvm-runtimes/libcxx
 *llvm-runtimes/libcxxabi
 *sys-libs/compiler-rt
 *llvm-runtimes/libunwind
--- a/profiles/features/llvm/packages.build
+++ b/profiles/features/llvm/packages.build
@@ -1,7 +1,7 @@
 # will be pulled by stage1
 sys-libs/compiler-rt
 llvm-runtimes/libcxxabi
-sys-libs/libcxx
+llvm-runtimes/libcxx
 sys-devel/llvm
 sys-devel/lld
 sys-devel/clang
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -16,7 +16,7 @@ gui-libs/neatvnc tracing
 gui-apps/wayvnc tracing

 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2024-08-06)
-# Requires sys-libs/libcxx.
+# Requires llvm-runtimes/libcxx.
 dev-cpp/benchmark libcxx

 # Nowa Ammerlaan <nowa@gentoo.org> (2024-07-25)
--- a/profiles/prefix/darwin/macos/package.use.force
+++ b/profiles/prefix/darwin/macos/package.use.force
@@ -7,7 +7,7 @@ sys-devel/gcc -default-znow

 # Jacob Floyd <cognifloyd@gmail.org> (2020-12-20)
 # Make sure we always use libcxxabi on macos prefix
-sys-libs/libcxx libcxxabi
+llvm-runtimes/libcxx libcxxabi

 # Fabian Groffen <grobian@gentoo.org> (2020-06-08)
 # Do NOT enable tinfo, it breaks ANYTHING existing, and it also breaks
--- a/profiles/updates/4Q-2024
+++ b/profiles/updates/4Q-2024
@@ -66,3 +66,4 @@ 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
+move sys-libs/libcxx llvm-runtimes/libcxx
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -31,7 +31,7 @@
    <flag name="gdml">Enable GDML writer and reader</flag>
    <flag name="http">Enable http server support including but not limited to fastcgi support</flag>
    <flag name="jupyter">Install dependencies to enable ROOT's C++ kernel in Jupyter notebooks</flag>
-    <flag name="libcxx">Build ROOT against <pkg>sys-libs/libcxx</pkg></flag>
+    <flag name="libcxx">Build ROOT against <pkg>llvm-runtimes/libcxx</pkg></flag>
    <flag name="minuit">Build ROOT's internal versions of minuit (fortran) and minuit2 (C++)</flag>
    <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
    <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>
--- a/sci-physics/root/root-6.30.08.ebuild
+++ b/sci-physics/root/root-6.30.08.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit cmake cuda flag-o-matic fortran-2 python-single-r1 toolchain-funcs

@@ -95,7 +95,7 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	gsl? ( sci-libs/gsl:= )
 	http? ( dev-libs/fcgi:0= )
-	libcxx? ( sys-libs/libcxx )
+	libcxx? ( llvm-runtimes/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	mpi? ( virtual/mpi[fortran?] )
 	mysql? ( dev-db/mysql-connector-c )
--- a/sci-physics/root/root-6.32.06.ebuild
+++ b/sci-physics/root/root-6.32.06.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit cmake cuda flag-o-matic fortran-2 python-single-r1 toolchain-funcs

@@ -94,7 +94,7 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	gsl? ( sci-libs/gsl:= )
 	http? ( dev-libs/fcgi:0= )
-	libcxx? ( sys-libs/libcxx )
+	libcxx? ( llvm-runtimes/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	mpi? ( virtual/mpi[fortran?] )
 	mysql? ( dev-db/mysql-connector-c )
--- a/sci-physics/root/root-6.32.08.ebuild
+++ b/sci-physics/root/root-6.32.08.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit cmake cuda flag-o-matic fortran-2 python-single-r1 toolchain-funcs

@@ -94,7 +94,7 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	gsl? ( sci-libs/gsl:= )
 	http? ( dev-libs/fcgi:0= )
-	libcxx? ( sys-libs/libcxx )
+	libcxx? ( llvm-runtimes/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	mpi? ( virtual/mpi[fortran?] )
 	mysql? ( dev-db/mysql-connector-c )
--- a/sci-physics/root/root-6.34.00.ebuild
+++ b/sci-physics/root/root-6.34.00.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit cmake cuda flag-o-matic fortran-2 python-single-r1 toolchain-funcs

@@ -89,7 +89,7 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	gsl? ( sci-libs/gsl:= )
 	http? ( dev-libs/fcgi:0= )
-	libcxx? ( sys-libs/libcxx )
+	libcxx? ( llvm-runtimes/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	mpi? ( virtual/mpi[fortran?] )
 	mysql? ( dev-db/mysql-connector-c )
--- a/sci-physics/root/root-6.34.9999.ebuild
+++ b/sci-physics/root/root-6.34.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit cmake cuda flag-o-matic fortran-2 python-single-r1 toolchain-funcs

@@ -89,7 +89,7 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	gsl? ( sci-libs/gsl:= )
 	http? ( dev-libs/fcgi:0= )
-	libcxx? ( sys-libs/libcxx )
+	libcxx? ( llvm-runtimes/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	mpi? ( virtual/mpi[fortran?] )
 	mysql? ( dev-db/mysql-connector-c )
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # ninja does not work due to fortran
 CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit cmake cuda flag-o-matic fortran-2 python-single-r1 toolchain-funcs

@@ -89,7 +89,7 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	gsl? ( sci-libs/gsl:= )
 	http? ( dev-libs/fcgi:0= )
-	libcxx? ( sys-libs/libcxx )
+	libcxx? ( llvm-runtimes/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	mpi? ( virtual/mpi[fortran?] )
 	mysql? ( dev-db/mysql-connector-c )
--- a/sys-devel/clang-common/clang-common-15.0.7-r10.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.7-r10.ebuild
@@ -23,7 +23,7 @@ PDEPEND="
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
+	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
 	!default-libcxx? ( sys-devel/gcc )
 	default-lld? ( >=sys-devel/lld-${PV} )
 	!default-lld? ( sys-devel/binutils )
--- a/sys-devel/clang-common/clang-common-16.0.6-r6.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.6-r6.ebuild
@@ -23,7 +23,7 @@ PDEPEND="
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
+	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
 	!default-libcxx? ( sys-devel/gcc )
 	default-lld? ( >=sys-devel/lld-${PV} )
 	!default-lld? ( sys-devel/binutils )
--- a/sys-devel/clang-common/clang-common-17.0.6-r10.ebuild
+++ b/sys-devel/clang-common/clang-common-17.0.6-r10.ebuild
@@ -23,7 +23,7 @@ PDEPEND="
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
+	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
 	!default-libcxx? ( sys-devel/gcc )
 	default-lld? ( >=sys-devel/lld-${PV} )
 	!default-lld? ( sys-devel/binutils )
--- a/sys-devel/clang-common/clang-common-17.0.6-r9.ebuild
+++ b/sys-devel/clang-common/clang-common-17.0.6-r9.ebuild
@@ -23,7 +23,7 @@ PDEPEND="
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
+	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
 	!default-libcxx? ( sys-devel/gcc )
 	default-lld? ( >=sys-devel/lld-${PV} )
 	!default-lld? ( sys-devel/binutils )
--- a/sys-devel/clang-common/clang-common-18.1.8-r3.ebuild
+++ b/sys-devel/clang-common/clang-common-18.1.8-r3.ebuild
@@ -23,7 +23,7 @@ PDEPEND="
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
+	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
 	!default-libcxx? ( sys-devel/gcc )
 	default-lld? ( >=sys-devel/lld-${PV} )
 	!default-lld? ( sys-devel/binutils )
--- a/sys-devel/clang-common/clang-common-19.1.4.ebuild
+++ b/sys-devel/clang-common/clang-common-19.1.4.ebuild
@@ -23,7 +23,7 @@ PDEPEND="
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
+	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
 	!default-libcxx? ( sys-devel/gcc )
 	default-lld? ( >=sys-devel/lld-${PV} )
 	!default-lld? ( sys-devel/binutils )
--- a/sys-devel/clang-common/clang-common-19.1.5.ebuild
+++ b/sys-devel/clang-common/clang-common-19.1.5.ebuild
@@ -23,7 +23,7 @@ PDEPEND="
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
+	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
 	!default-libcxx? ( sys-devel/gcc )
 	default-lld? ( >=sys-devel/lld-${PV} )
 	!default-lld? ( sys-devel/binutils )
--- a/sys-devel/clang-common/clang-common-20.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-20.0.0.9999.ebuild
@@ -22,7 +22,7 @@ PDEPEND="
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
+	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
 	!default-libcxx? ( sys-devel/gcc )
 	default-lld? ( >=sys-devel/lld-${PV} )
 	!default-lld? ( sys-devel/binutils )
--- a/sys-devel/clang-common/clang-common-20.0.0_pre20241207.ebuild
+++ b/sys-devel/clang-common/clang-common-20.0.0_pre20241207.ebuild
@@ -22,7 +22,7 @@ PDEPEND="
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
+	default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
 	!default-libcxx? ( sys-devel/gcc )
 	default-lld? ( >=sys-devel/lld-${PV} )
 	!default-lld? ( sys-devel/binutils )
--- a/sys-devel/clang-runtime/clang-runtime-15.0.7.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-15.0.7.ebuild
@@ -21,6 +21,6 @@ RDEPEND="
 			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
 		)
 	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	libcxx? ( >=llvm-runtimes/libcxx-${PV}[${MULTILIB_USEDEP}] )
 	openmp? ( >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] )
 "
--- a/sys-devel/clang-runtime/clang-runtime-16.0.6.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-16.0.6.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
 		)
 	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	libcxx? ( >=llvm-runtimes/libcxx-${PV}[${MULTILIB_USEDEP}] )
 	openmp? ( >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] )
 "

--- a/sys-devel/clang-runtime/clang-runtime-17.0.6.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-17.0.6.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
 		)
 	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	libcxx? ( >=llvm-runtimes/libcxx-${PV}[${MULTILIB_USEDEP}] )
 	openmp? ( >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] )
 "

--- a/sys-devel/clang-runtime/clang-runtime-18.1.8.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-18.1.8.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
 		)
 	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	libcxx? ( >=llvm-runtimes/libcxx-${PV}[${MULTILIB_USEDEP}] )
 	openmp? ( >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] )
 "

--- a/sys-devel/clang-runtime/clang-runtime-19.1.4.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-19.1.4.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
 		)
 	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	libcxx? ( >=llvm-runtimes/libcxx-${PV}[${MULTILIB_USEDEP}] )
 	openmp? ( >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] )
 "

--- a/sys-devel/clang-runtime/clang-runtime-19.1.5.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-19.1.5.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
 		)
 	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	libcxx? ( >=llvm-runtimes/libcxx-${PV}[${MULTILIB_USEDEP}] )
 	openmp? ( >=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}] )
 "

--- a/sys-devel/clang-runtime/clang-runtime-20.0.0.9999.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-20.0.0.9999.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
 		)
 	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	libcxx? ( >=llvm-runtimes/libcxx-${PV}[${MULTILIB_USEDEP}] )
 	openmp? (
 		>=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}]
 		offload? (
--- a/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20241207.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-20.0.0_pre20241207.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
 		)
 	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	libcxx? ( >=llvm-runtimes/libcxx-${PV}[${MULTILIB_USEDEP}] )
 	openmp? (
 		>=llvm-runtimes/openmp-${PV}[${MULTILIB_USEDEP}]
 		offload? (
--- a/sys-devel/clang-runtime/metadata.xml
+++ b/sys-devel/clang-runtime/metadata.xml
@@ -6,7 +6,7 @@
 	</maintainer>
 	<use>
 		<flag name="compiler-rt">Install <pkg>sys-libs/compiler-rt</pkg> for -rtlib=compiler-rt</flag>
-		<flag name="libcxx">Install <pkg>sys-libs/libcxx</pkg> for -stdlib=libc++</flag>
+		<flag name="libcxx">Install <pkg>llvm-runtimes/libcxx</pkg> for -stdlib=libc++</flag>
 		<flag name="offload">Install <pkg>llvm-runtimes/offload</pkg> for -fopenmp GPU offloading</flag>
 		<flag name="openmp">Install <pkg>llvm-runtimes/openmp</pkg> for -fopenmp support</flag>
 		<flag name="sanitize">Enable compiler-rt sanitizer (-fsanitize*) support</flag>
--- a/sys-devel/llvm/llvm-15.0.7-r7.ebuild
+++ b/sys-devel/llvm/llvm-15.0.7-r7.ebuild
@@ -45,7 +45,7 @@ BDEPEND="
 	dev-lang/perl
 	sys-devel/gnuconfig
 	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
+		<llvm-runtimes/libcxx-${LLVM_VERSION}.9999
 		>=sys-devel/binutils-apple-5.1
 	)
 	doc? ( $(python_gen_any_dep '
--- a/sys-devel/llvm/llvm-16.0.6-r5.ebuild
+++ b/sys-devel/llvm/llvm-16.0.6-r5.ebuild
@@ -46,7 +46,7 @@ BDEPEND="
 	dev-lang/perl
 	sys-devel/gnuconfig
 	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
+		<llvm-runtimes/libcxx-${LLVM_VERSION}.9999
 	)
 	doc? ( $(python_gen_any_dep '
 		dev-python/recommonmark[${PYTHON_USEDEP}]
--- a/sys-devel/llvm/llvm-17.0.6-r3.ebuild
+++ b/sys-devel/llvm/llvm-17.0.6-r3.ebuild
@@ -50,7 +50,7 @@ BDEPEND="
 	dev-lang/perl
 	sys-devel/gnuconfig
 	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
+		<llvm-runtimes/libcxx-${LLVM_VERSION}.9999
 	)
 	doc? ( $(python_gen_any_dep '
 		dev-python/recommonmark[${PYTHON_USEDEP}]
--- a/sys-devel/llvm/llvm-18.1.8-r6.ebuild
+++ b/sys-devel/llvm/llvm-18.1.8-r6.ebuild
@@ -49,7 +49,7 @@ BDEPEND="
 	dev-lang/perl
 	sys-devel/gnuconfig
 	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
+		<llvm-runtimes/libcxx-${LLVM_VERSION}.9999
 	)
 	libffi? ( virtual/pkgconfig )
 "
--- a/sys-devel/llvm/llvm-19.1.4.ebuild
+++ b/sys-devel/llvm/llvm-19.1.4.ebuild
@@ -48,7 +48,7 @@ BDEPEND="
 	dev-lang/perl
 	sys-devel/gnuconfig
 	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
+		<llvm-runtimes/libcxx-${LLVM_VERSION}.9999
 	)
 	libffi? ( virtual/pkgconfig )
 "
--- a/sys-devel/llvm/llvm-19.1.5.ebuild
+++ b/sys-devel/llvm/llvm-19.1.5.ebuild
@@ -48,7 +48,7 @@ BDEPEND="
 	dev-lang/perl
 	sys-devel/gnuconfig
 	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
+		<llvm-runtimes/libcxx-${LLVM_VERSION}.9999
 	)
 	libffi? ( virtual/pkgconfig )
 "
--- a/sys-devel/llvm/llvm-20.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-20.0.0.9999.ebuild
@@ -47,7 +47,7 @@ BDEPEND="
 	dev-lang/perl
 	sys-devel/gnuconfig
 	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
+		<llvm-runtimes/libcxx-${LLVM_VERSION}.9999
 	)
 	libffi? ( virtual/pkgconfig )
 "
--- a/sys-devel/llvm/llvm-20.0.0_pre20241207.ebuild
+++ b/sys-devel/llvm/llvm-20.0.0_pre20241207.ebuild
@@ -47,7 +47,7 @@ BDEPEND="
 	dev-lang/perl
 	sys-devel/gnuconfig
 	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
+		<llvm-runtimes/libcxx-${LLVM_VERSION}.9999
 	)
 	libffi? ( virtual/pkgconfig )
 "