Move sys-libs/llvm-libunwind → llvm-runtimes/libunwind

Signed-off-by: Michał Górny <mgorny@gentoo.org>

92 files changed, 96 insertions, 95 deletions

diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index 4ebc2d33e911..9f23795cdf4d 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -76,7 +76,7 @@ WINE_COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 484175067031..8e1cd967b2ef 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -76,7 +76,7 @@ WINE_COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
index e025b12e1398..a6b9ee58ff7d 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
@@ -77,7 +77,7 @@ WINE_COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
index 2b91f26fbdd4..1305b1a4a205 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
@@ -77,7 +77,7 @@ WINE_COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-proton/wine-proton-9999.ebuild b/app-emulation/wine-proton/wine-proton-9999.ebuild
index 6d5eab1af541..08f56853ca4a 100644
--- a/app-emulation/wine-proton/wine-proton-9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9999.ebuild
@@ -77,7 +77,7 @@ WINE_COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index 991310a78caf..afe3129b307d 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -102,7 +102,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-staging/wine-staging-9.19.ebuild b/app-emulation/wine-staging/wine-staging-9.19.ebuild
index e0c51c2bc68d..72af8a217ff8 100644
--- a/app-emulation/wine-staging/wine-staging-9.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.19.ebuild
@@ -104,7 +104,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-staging/wine-staging-9.20.ebuild b/app-emulation/wine-staging/wine-staging-9.20.ebuild
index fb3dc75e7ce3..b62f845c6556 100644
--- a/app-emulation/wine-staging/wine-staging-9.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.20.ebuild
@@ -104,7 +104,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-staging/wine-staging-9.21.ebuild b/app-emulation/wine-staging/wine-staging-9.21.ebuild
index fb3dc75e7ce3..b62f845c6556 100644
--- a/app-emulation/wine-staging/wine-staging-9.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.21.ebuild
@@ -104,7 +104,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-staging/wine-staging-9.22.ebuild b/app-emulation/wine-staging/wine-staging-9.22.ebuild
index fb3dc75e7ce3..b62f845c6556 100644
--- a/app-emulation/wine-staging/wine-staging-9.22.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.22.ebuild
@@ -104,7 +104,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index e15b54b84f47..163c60c3539b 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -104,7 +104,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index dfb613e944ad..9cc201c4e78e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -96,7 +96,7 @@ WINE_COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index 1f1319815791..95f7ef5d7382 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -92,7 +92,7 @@ WINE_COMMON_DEPEND="
 	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index 977ede6ca160..0a0a3172d3d3 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -96,7 +96,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild
index 9c6db6a38766..f66e58984ea5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild
@@ -98,7 +98,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild
index 28fa6e38456c..b052b1837c74 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild
@@ -98,7 +98,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild
index 28fa6e38456c..b052b1837c74 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild
@@ -98,7 +98,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.22.ebuild
index 28fa6e38456c..b052b1837c74 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.22.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.22.ebuild
@@ -98,7 +98,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 49dd31b80782..c10d8c52aedd 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -98,7 +98,7 @@ WINE_COMMON_DEPEND="
 	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
diff --git a/dev-cpp/edencommon/edencommon-2023.06.19.00.ebuild b/dev-cpp/edencommon/edencommon-2023.06.19.00.ebuild
index 1296800f7058..6c401a0596e4 100644
--- a/dev-cpp/edencommon/edencommon-2023.06.19.00.ebuild
+++ b/dev-cpp/edencommon/edencommon-2023.06.19.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-cpp/gflags:=
 	dev-cpp/glog:=[gflags]
 	dev-cpp/folly:=
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 "
 DEPEND="
diff --git a/dev-cpp/edencommon/edencommon-2024.11.04.00.ebuild b/dev-cpp/edencommon/edencommon-2024.11.04.00.ebuild
index bd951c699e39..feba00c2add7 100644
--- a/dev-cpp/edencommon/edencommon-2024.11.04.00.ebuild
+++ b/dev-cpp/edencommon/edencommon-2024.11.04.00.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	~dev-cpp/fb303-${PV}:=
 	~dev-cpp/wangle-${PV}:=
 	~dev-cpp/fbthrift-${PV}:=
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 "
 DEPEND="
diff --git a/dev-cpp/folly/folly-2023.06.19.00-r1.ebuild b/dev-cpp/folly/folly-2023.06.19.00-r1.ebuild
index 4f87b7aa969f..0257d178791a 100644
--- a/dev-cpp/folly/folly-2023.06.19.00-r1.ebuild
+++ b/dev-cpp/folly/folly-2023.06.19.00-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 	dev-libs/openssl:=
 	>=sys-libs/liburing-2.3:=
 	sys-libs/zlib
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 "
 # libiberty is linked statically
diff --git a/dev-cpp/folly/folly-2024.11.04.00-r2.ebuild b/dev-cpp/folly/folly-2024.11.04.00-r2.ebuild
index d861968c9242..166726ddaf3e 100644
--- a/dev-cpp/folly/folly-2024.11.04.00-r2.ebuild
+++ b/dev-cpp/folly/folly-2024.11.04.00-r2.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 	dev-libs/openssl:=
 	>=sys-libs/liburing-2.3:=
 	sys-libs/zlib
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 "
 # libiberty is linked statically
diff --git a/dev-cpp/glog/glog-0.5.0.ebuild b/dev-cpp/glog/glog-0.5.0.ebuild
index 6e7df7821fe7..4a54a63a949a 100644
--- a/dev-cpp/glog/glog-0.5.0.ebuild
+++ b/dev-cpp/glog/glog-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2022 Gentoo Authors
+# Copyright 2011-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="gflags? ( dev-cpp/gflags:0=[${MULTILIB_USEDEP}] )
 	libunwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:0=[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind:0=[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:0=[${MULTILIB_USEDEP}] )
 	)"
 DEPEND="${RDEPEND}
diff --git a/dev-cpp/glog/glog-0.6.0.ebuild b/dev-cpp/glog/glog-0.6.0.ebuild
index 6192cd198dbb..ed6817c72644 100644
--- a/dev-cpp/glog/glog-0.6.0.ebuild
+++ b/dev-cpp/glog/glog-0.6.0.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="gflags? ( dev-cpp/gflags:0=[${MULTILIB_USEDEP}] )
 	libunwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:0=[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind:0=[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:0=[${MULTILIB_USEDEP}] )
 	)
 "
diff --git a/dev-cpp/glog/metadata.xml b/dev-cpp/glog/metadata.xml
index f488a88cb0cf..bbbd4c7947cd 100644
--- a/dev-cpp/glog/metadata.xml
+++ b/dev-cpp/glog/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="gflags">Use <pkg>dev-cpp/gflags</pkg> for flag parsing</flag>
-		<flag name="libunwind">Use libunwind library (<pkg>sys-libs/libunwind</pkg> or <pkg>sys-libs/llvm-libunwind</pkg>) instead of built-in fallback implementation for stack unwinding</flag>
+		<flag name="libunwind">Use libunwind library (<pkg>sys-libs/libunwind</pkg> or <pkg>llvm-runtimes/libunwind</pkg>) instead of built-in fallback implementation for stack unwinding</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">google/glog</remote-id>
diff --git a/dev-lang/crystal/crystal-1.14.0.ebuild b/dev-lang/crystal/crystal-1.14.0.ebuild
index 3219d2a294a7..0b8e4b4929c6 100644
--- a/dev-lang/crystal/crystal-1.14.0.ebuild
+++ b/dev-lang/crystal/crystal-1.14.0.ebuild
@@ -40,7 +40,7 @@ DEPEND="
 		sys-devel/llvm:${LLVM_SLOT}=
 	')
 	llvm-libunwind? (
-		sys-libs/llvm-libunwind:=
+		llvm-runtimes/libunwind:=
 	)
 	!llvm-libunwind? (
 		sys-libs/libunwind:=
diff --git a/dev-lang/rust/rust-1.71.1-r100.ebuild b/dev-lang/rust/rust-1.71.1-r100.ebuild
index 61b83be8cfe4..32733a81cf84 100644
--- a/dev-lang/rust/rust-1.71.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.71.1-r100.ebuild
@@ -72,7 +72,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
diff --git a/dev-lang/rust/rust-1.74.1-r100.ebuild b/dev-lang/rust/rust-1.74.1-r100.ebuild
index 8f20eaf957cb..2df1ce78d319 100644
--- a/dev-lang/rust/rust-1.74.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.74.1-r100.ebuild
@@ -74,7 +74,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
diff --git a/dev-lang/rust/rust-1.75.0-r100.ebuild b/dev-lang/rust/rust-1.75.0-r100.ebuild
index e3beb23ab729..329a2420c5b1 100644
--- a/dev-lang/rust/rust-1.75.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.75.0-r100.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
diff --git a/dev-lang/rust/rust-1.76.0-r100.ebuild b/dev-lang/rust/rust-1.76.0-r100.ebuild
index 6dbaa9a73f61..f92d90dedfab 100644
--- a/dev-lang/rust/rust-1.76.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.76.0-r100.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
diff --git a/dev-lang/rust/rust-1.77.1-r100.ebuild b/dev-lang/rust/rust-1.77.1-r100.ebuild
index 1733f374b32e..7732fbfed81f 100644
--- a/dev-lang/rust/rust-1.77.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.77.1-r100.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
diff --git a/dev-lang/rust/rust-1.78.0-r100.ebuild b/dev-lang/rust/rust-1.78.0-r100.ebuild
index 110d37cfd528..da3dd7845c3f 100644
--- a/dev-lang/rust/rust-1.78.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.78.0-r100.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
diff --git a/dev-lang/rust/rust-1.79.0-r100.ebuild b/dev-lang/rust/rust-1.79.0-r100.ebuild
index 110d37cfd528..da3dd7845c3f 100644
--- a/dev-lang/rust/rust-1.79.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.79.0-r100.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
diff --git a/dev-lang/rust/rust-1.80.1-r100.ebuild b/dev-lang/rust/rust-1.80.1-r100.ebuild
index 4d508a08c7fa..fce3891fdd46 100644
--- a/dev-lang/rust/rust-1.80.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.80.1-r100.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
diff --git a/dev-lang/rust/rust-1.81.0-r100.ebuild b/dev-lang/rust/rust-1.81.0-r100.ebuild
index 3d79dc11e336..28a20f3ed55c 100644
--- a/dev-lang/rust/rust-1.81.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.81.0-r100.ebuild
@@ -74,7 +74,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
diff --git a/dev-lang/rust/rust-1.82.0-r100.ebuild b/dev-lang/rust/rust-1.82.0-r100.ebuild
index 26e89b486c4f..3def96441771 100644
--- a/dev-lang/rust/rust-1.82.0-r100.ebuild
+++ b/dev-lang/rust/rust-1.82.0-r100.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
diff --git a/dev-lang/rust/rust-1.82.0-r101.ebuild b/dev-lang/rust/rust-1.82.0-r101.ebuild
index 125da4e2056b..04d0813319bb 100644
--- a/dev-lang/rust/rust-1.82.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.82.0-r101.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
diff --git a/dev-lang/rust/rust-1.83.0-r1.ebuild b/dev-lang/rust/rust-1.83.0-r1.ebuild
index db171b2fb483..4eb9a1c2756c 100644
--- a/dev-lang/rust/rust-1.83.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.83.0-r1.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 	dev-libs/openssl:0=
 	system-llvm? (
 		${LLVM_DEPEND[*]}
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	!system-llvm? (
 		!llvm-libunwind? (
diff --git a/dev-ml/cudf/cudf-0.10-r1.ebuild b/dev-ml/cudf/cudf-0.10-r1.ebuild
index 0bda6ee73dcd..4dcacb01d097 100644
--- a/dev-ml/cudf/cudf-0.10-r1.ebuild
+++ b/dev-ml/cudf/cudf-0.10-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-ml/extlib:=
 	dev-ml/findlib:=
 	dev-libs/glib:2
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 	sys-libs/ncurses:=
 	app-arch/zstd
diff --git a/dev-util/google-perftools/google-perftools-2.15.ebuild b/dev-util/google-perftools/google-perftools-2.15.ebuild
index 5c2bca5d65fe..73227b0b523b 100644
--- a/dev-util/google-perftools/google-perftools-2.15.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.15.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="?? ( pagesize-16k pagesize-32k pagesize-64k pagesize-128k pagesize
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-util/google-perftools/google-perftools-2.16.ebuild b/dev-util/google-perftools/google-perftools-2.16.ebuild
index 1bceb84f6911..50df3cdf46c9 100644
--- a/dev-util/google-perftools/google-perftools-2.16.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.16.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="?? ( pagesize-16k pagesize-32k pagesize-64k pagesize-128k pagesize
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-util/watchman/watchman-2023.06.19.00-r2.ebuild b/dev-util/watchman/watchman-2023.06.19.00-r2.ebuild
index 591c4924066c..2408d44df3de 100644
--- a/dev-util/watchman/watchman-2023.06.19.00-r2.ebuild
+++ b/dev-util/watchman/watchman-2023.06.19.00-r2.ebuild
@@ -158,7 +158,7 @@ RDEPEND="
 	>=dev-libs/libfmt-8.1.1-r1:=
 	<dev-libs/libfmt-10
 	dev-libs/openssl:=
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 	python? ( ${PYTHON_DEPS} )
 "
diff --git a/dev-util/watchman/watchman-2024.11.04.00.ebuild b/dev-util/watchman/watchman-2024.11.04.00.ebuild
index f791648d2feb..26efcb7237bd 100644
--- a/dev-util/watchman/watchman-2024.11.04.00.ebuild
+++ b/dev-util/watchman/watchman-2024.11.04.00.ebuild
@@ -262,7 +262,7 @@ RDEPEND="
 	~dev-cpp/fizz-${PV}:=
 	~dev-cpp/folly-${PV}:=
 	~dev-cpp/wangle-${PV}:=
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 	python? ( ${PYTHON_DEPS} )
 "
diff --git a/sys-libs/llvm-libunwind/Manifest b/llvm-runtimes/libunwind/Manifest
index 808f097b416f..808f097b416f 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/llvm-runtimes/libunwind/Manifest
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.7.ebuild b/llvm-runtimes/libunwind/libunwind-15.0.7.ebuild
index 4623b458be97..71a3f02b0f03 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.7.ebuild
+++ b/llvm-runtimes/libunwind/libunwind-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/llvm-libunwind/llvm-libunwind-16.0.6-r1.ebuild b/llvm-runtimes/libunwind/libunwind-16.0.6-r1.ebuild
index e61b9836b074..e61b9836b074 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.6-r1.ebuild
+++ b/llvm-runtimes/libunwind/libunwind-16.0.6-r1.ebuild
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.6.ebuild b/llvm-runtimes/libunwind/libunwind-17.0.6.ebuild
index e61b9836b074..e61b9836b074 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.6.ebuild
+++ b/llvm-runtimes/libunwind/libunwind-17.0.6.ebuild
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-18.1.8.ebuild b/llvm-runtimes/libunwind/libunwind-18.1.8.ebuild
index aaa6c07084dc..aaa6c07084dc 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-18.1.8.ebuild
+++ b/llvm-runtimes/libunwind/libunwind-18.1.8.ebuild
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-19.1.4.ebuild b/llvm-runtimes/libunwind/libunwind-19.1.4.ebuild
index 02c17fd01f00..02c17fd01f00 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-19.1.4.ebuild
+++ b/llvm-runtimes/libunwind/libunwind-19.1.4.ebuild
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-19.1.5.ebuild b/llvm-runtimes/libunwind/libunwind-19.1.5.ebuild
index 45b7c96819be..45b7c96819be 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-19.1.5.ebuild
+++ b/llvm-runtimes/libunwind/libunwind-19.1.5.ebuild
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-20.0.0.9999.ebuild b/llvm-runtimes/libunwind/libunwind-20.0.0.9999.ebuild
index f2972aaec14a..f2972aaec14a 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-20.0.0.9999.ebuild
+++ b/llvm-runtimes/libunwind/libunwind-20.0.0.9999.ebuild
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-20.0.0_pre20241207.ebuild b/llvm-runtimes/libunwind/libunwind-20.0.0_pre20241207.ebuild
index f2972aaec14a..f2972aaec14a 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-20.0.0_pre20241207.ebuild
+++ b/llvm-runtimes/libunwind/libunwind-20.0.0_pre20241207.ebuild
diff --git a/sys-libs/llvm-libunwind/metadata.xml b/llvm-runtimes/libunwind/metadata.xml
index 9e58371ca860..9e58371ca860 100644
--- a/sys-libs/llvm-libunwind/metadata.xml
+++ b/llvm-runtimes/libunwind/metadata.xml
diff --git a/media-libs/libplacebo/libplacebo-7.349.0.ebuild b/media-libs/libplacebo/libplacebo-7.349.0.ebuild
index ee0a83ec2656..10102b7a31a0 100644
--- a/media-libs/libplacebo/libplacebo-7.349.0.ebuild
+++ b/media-libs/libplacebo/libplacebo-7.349.0.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
 	shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] )
 	!shaderc? ( glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index fd9eb972c5a4..2055812a69ea 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
 	shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] )
 	!shaderc? ( glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
 	)
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
diff --git a/media-libs/roc-toolkit/roc-toolkit-0.3.0.ebuild b/media-libs/roc-toolkit/roc-toolkit-0.3.0.ebuild
index 7b8860050538..142e9016166b 100644
--- a/media-libs/roc-toolkit/roc-toolkit-0.3.0.ebuild
+++ b/media-libs/roc-toolkit/roc-toolkit-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ DEPEND="
 	sox? ( media-sound/sox )
 	ssl? ( dev-libs/openssl:= )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 		!llvm-libunwind? ( sys-libs/libunwind:= )
 	)
 "
diff --git a/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild b/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild
index b5355e5f2b18..e2635d28b20c 100644
--- a/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild
+++ b/media-libs/roc-toolkit/roc-toolkit-0.4.0.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 	sndfile? ( >=media-libs/libsndfile-1.0.28 )
 	ssl? ( >=dev-libs/openssl-3.0.8:= )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 		!llvm-libunwind? ( >=sys-libs/libunwind-1.2.1:= )
 	)
 "
diff --git a/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.700.3000.ebuild b/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.700.3000.ebuild
index bdca16afb49a..50febcc0aaf3 100644
--- a/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.700.3000.ebuild
+++ b/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.700.3000.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
@@ -19,7 +19,7 @@ RESTRICT="fetch mirror strip"
 
 BDEPEND="app-arch/unzip"
 RDEPEND="
-	sys-libs/llvm-libunwind
+	llvm-runtimes/libunwind
 	|| (
 		media-video/pipewire
 		media-libs/libpulse
diff --git a/metadata/stabilization-groups/llvm.group b/metadata/stabilization-groups/llvm.group
index 5a451b107f7b..3c3e1acf5152 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/libunwind
 llvm-runtimes/offload
 sys-devel/clang
 sys-devel/clang-common
@@ -19,4 +20,3 @@ sys-libs/compiler-rt-sanitizers
 sys-libs/libcxx
 sys-libs/libcxxabi
 sys-libs/libomp
-sys-libs/llvm-libunwind
diff --git a/net-fs/samba/samba-4.19.7.ebuild b/net-fs/samba/samba-4.19.7.ebuild
index 16c88105a55d..b71f2f9b624d 100644
--- a/net-fs/samba/samba-4.19.7.ebuild
+++ b/net-fs/samba/samba-4.19.7.ebuild
@@ -113,7 +113,7 @@ COMMON_DEPEND="
 	!system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
 	systemd? ( sys-apps/systemd:= )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 		!llvm-libunwind? ( sys-libs/libunwind:= )
 	)
 	zeroconf? ( net-dns/avahi[dbus] )
diff --git a/net-fs/samba/samba-4.19.8.ebuild b/net-fs/samba/samba-4.19.8.ebuild
index fc5f032b6951..14c64b2ad49e 100644
--- a/net-fs/samba/samba-4.19.8.ebuild
+++ b/net-fs/samba/samba-4.19.8.ebuild
@@ -113,7 +113,7 @@ COMMON_DEPEND="
 	!system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
 	systemd? ( sys-apps/systemd:= )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 		!llvm-libunwind? ( sys-libs/libunwind:= )
 	)
 	zeroconf? ( net-dns/avahi[dbus] )
diff --git a/net-fs/samba/samba-4.19.9.ebuild b/net-fs/samba/samba-4.19.9.ebuild
index 88f3edac2776..bd4f6d5797fd 100644
--- a/net-fs/samba/samba-4.19.9.ebuild
+++ b/net-fs/samba/samba-4.19.9.ebuild
@@ -113,7 +113,7 @@ COMMON_DEPEND="
 	!system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
 	systemd? ( sys-apps/systemd:= )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 		!llvm-libunwind? ( sys-libs/libunwind:= )
 	)
 	zeroconf? ( net-dns/avahi[dbus] )
diff --git a/net-fs/samba/samba-4.20.5.ebuild b/net-fs/samba/samba-4.20.5.ebuild
index bc8c62560a28..92740c1a10dc 100644
--- a/net-fs/samba/samba-4.20.5.ebuild
+++ b/net-fs/samba/samba-4.20.5.ebuild
@@ -113,7 +113,7 @@ COMMON_DEPEND="
 	!system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
 	systemd? ( sys-apps/systemd:= )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 		!llvm-libunwind? ( sys-libs/libunwind:= )
 	)
 	zeroconf? ( net-dns/avahi[dbus] )
diff --git a/net-fs/samba/samba-4.21.0.ebuild b/net-fs/samba/samba-4.21.0.ebuild
index 51353dc4f979..fb93abd59244 100644
--- a/net-fs/samba/samba-4.21.0.ebuild
+++ b/net-fs/samba/samba-4.21.0.ebuild
@@ -111,7 +111,7 @@ COMMON_DEPEND="
 	!system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
 	systemd? ( sys-apps/systemd:= )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 		!llvm-libunwind? ( sys-libs/libunwind:= )
 	)
 	zeroconf? ( net-dns/avahi[dbus] )
diff --git a/net-fs/samba/samba-4.21.1.ebuild b/net-fs/samba/samba-4.21.1.ebuild
index af8e4d91ef4c..80aeecc1717a 100644
--- a/net-fs/samba/samba-4.21.1.ebuild
+++ b/net-fs/samba/samba-4.21.1.ebuild
@@ -112,7 +112,7 @@ COMMON_DEPEND="
 	!system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
 	systemd? ( sys-apps/systemd:= )
 	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 		!llvm-libunwind? ( sys-libs/libunwind:= )
 	)
 	zeroconf? ( net-dns/avahi[dbus] )
diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use
index 2ba8e0388262..f9f1cac49c8c 100644
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@@ -28,7 +28,7 @@ sys-devel/clang-runtime abi_x86_32
 sys-libs/libcxxabi abi_x86_32
 sys-libs/libcxx abi_x86_32
 sys-libs/libomp abi_x86_32
-sys-libs/llvm-libunwind abi_x86_32
+llvm-runtimes/libunwind abi_x86_32
 
 # Mike Gilbert <floppym@gentoo.org> (2016-11-17)
 # Enable both efi and pc by default.
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 2a84e7167144..0fdf0b377248 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -33,7 +33,7 @@ bluetooth
 pipewire
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
-# sys-libs/llvm-libunwind not supported on HPPA.
+# llvm-runtimes/libunwind not supported on HPPA.
 llvm-libunwind
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-11-12)
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index 848b8db5a597..0b66533c82e3 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -28,7 +28,7 @@ sasl
 ldap
 
 # Sam James <sam@gentoo.org> (2022-02-03)
-# sys-libs/llvm-libunwind isn't marked stable here
+# llvm-runtimes/libunwind isn't marked stable here
 llvm-libunwind
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-08-13)
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 838c3ee29f1d..b47aa73348bd 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -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
 
 # Unmask the flag which corresponds to ARCH.
@@ -37,7 +37,7 @@ tpm
 emacs
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
-# sys-libs/llvm-libunwind not supported on S390.
+# llvm-runtimes/libunwind not supported on S390.
 llvm-libunwind
 
 # Sam James <sam@gentoo.org> (2021-02-05)
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 f01a7a3572a2..0b5fde96c722 100644
--- a/profiles/default/linux/amd64/17.1/clang/package.use.force
+++ b/profiles/default/linux/amd64/17.1/clang/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # in a multilib profile we need multilib madness
@@ -11,6 +11,6 @@ sys-libs/compiler-rt abi_x86_32 abi_x86_64
 sys-libs/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
-sys-libs/llvm-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
 sys-libs/zlib 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 6d2600fecd08..0b5fde96c722 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
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # in a multilib profile we need multilib madness
@@ -11,6 +11,6 @@ sys-libs/compiler-rt abi_x86_32 abi_x86_64
 sys-libs/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
-sys-libs/llvm-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
 sys-libs/zlib 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 9c85ebdab0d8..592916e7e233 100644
--- a/profiles/default/linux/amd64/23.0/llvm/package.use.force
+++ b/profiles/default/linux/amd64/23.0/llvm/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # in a multilib profile we need multilib madness
@@ -11,7 +11,7 @@ sys-libs/compiler-rt abi_x86_32 abi_x86_64
 sys-libs/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
-sys-libs/llvm-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
 sys-libs/zlib 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 9c85ebdab0d8..592916e7e233 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
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # in a multilib profile we need multilib madness
@@ -11,7 +11,7 @@ sys-libs/compiler-rt abi_x86_32 abi_x86_64
 sys-libs/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
-sys-libs/llvm-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
 sys-libs/zlib abi_x86_32 abi_x86_64
 
diff --git a/profiles/features/llvm/make.defaults b/profiles/features/llvm/make.defaults
index f36599c1e300..5a49b6718476 100644
--- a/profiles/features/llvm/make.defaults
+++ b/profiles/features/llvm/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # this is for now highly experimental -dilfridge
@@ -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, sys-libs/llvm-libunwind, sys-libs/libcxx, sys-libs/libcxxabi
+# sys-devel/clang, sys-devel/clang-runtime, llvm-runtimes/libunwind, sys-libs/libcxx, sys-libs/libcxxabi
 BOOTSTRAP_USE="${BOOTSTRAP_USE} compiler-rt clang libunwind"
 
 # sys-devel/clang
diff --git a/profiles/features/llvm/package.use b/profiles/features/llvm/package.use
index b929e71ac461..7c8a171f3133 100644
--- a/profiles/features/llvm/package.use
+++ b/profiles/features/llvm/package.use
@@ -1,5 +1,5 @@
 # Make static linking work by default for simple binaries (bug #892956)
-sys-libs/llvm-libunwind static-libs
+llvm-runtimes/libunwind static-libs
 
 # use lld by default
 sys-devel/llvm -binutils-plugin
diff --git a/profiles/features/llvm/packages b/profiles/features/llvm/packages
index 9536b85862f3..6a13de712643 100644
--- a/profiles/features/llvm/packages
+++ b/profiles/features/llvm/packages
@@ -5,7 +5,7 @@
 *sys-libs/libcxx
 *sys-libs/libcxxabi
 *sys-libs/compiler-rt
-*sys-libs/llvm-libunwind
+*llvm-runtimes/libunwind
 
 # not needed with clang
 -*sys-devel/gcc
diff --git a/profiles/features/llvm/packages.build b/profiles/features/llvm/packages.build
index fd1e69e329e3..00f7e8397930 100644
--- a/profiles/features/llvm/packages.build
+++ b/profiles/features/llvm/packages.build
@@ -5,7 +5,7 @@ sys-libs/libcxx
 sys-devel/llvm
 sys-devel/lld
 sys-devel/clang
-sys-libs/llvm-libunwind
+llvm-runtimes/libunwind
 
 # remove gcc & friends
 -sys-devel/gcc
diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024
index 3dfdc044b0b3..fcd869890a89 100644
--- a/profiles/updates/4Q-2024
+++ b/profiles/updates/4Q-2024
@@ -63,3 +63,4 @@ move dev-python/PyQt5 dev-python/pyqt5
 move dev-python/PyQt6 dev-python/pyqt6
 move sys-libs/llvm-offload llvm-runtimes/offload
 move dev-libs/libclc llvm-core/libclc
+move sys-libs/llvm-libunwind llvm-runtimes/libunwind
diff --git a/profiles/use.desc b/profiles/use.desc
index 78dc60695051..92914bc79416 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -178,7 +178,7 @@ libsamplerate - Build with support for converting sample rates using libsamplera
 libwww - Add libwww support (General purpose WEB API)
 lirc - Add support for lirc (Linux's Infra-Red Remote Control)
 livecd - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used during livecd building
-llvm-libunwind - Use sys-libs/llvm-libunwind instead of sys-libs/libunwind
+llvm-libunwind - Use llvm-runtimes/libunwind instead of sys-libs/libunwind
 lm-sensors - Add linux lm-sensors (hardware sensors) support
 lto - Enable Link-Time Optimization (LTO) to optimize the build
 lua - Enable Lua scripting support
diff --git a/sys-devel/clang-common/clang-common-15.0.7-r10.ebuild b/sys-devel/clang-common/clang-common-15.0.7-r10.ebuild
index d724729a628b..863210b432e1 100644
--- a/sys-devel/clang-common/clang-common-15.0.7-r10.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.7-r10.ebuild
@@ -19,7 +19,7 @@ IUSE="
 PDEPEND="
 	default-compiler-rt? (
 		sys-devel/clang-runtime:${PV}[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
diff --git a/sys-devel/clang-common/clang-common-16.0.6-r6.ebuild b/sys-devel/clang-common/clang-common-16.0.6-r6.ebuild
index e6b8345426e7..3c2341b48f12 100644
--- a/sys-devel/clang-common/clang-common-16.0.6-r6.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.6-r6.ebuild
@@ -19,7 +19,7 @@ IUSE="
 PDEPEND="
 	default-compiler-rt? (
 		sys-devel/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
diff --git a/sys-devel/clang-common/clang-common-17.0.6-r10.ebuild b/sys-devel/clang-common/clang-common-17.0.6-r10.ebuild
index b7f5fcd8d0e0..4b4afea86e18 100644
--- a/sys-devel/clang-common/clang-common-17.0.6-r10.ebuild
+++ b/sys-devel/clang-common/clang-common-17.0.6-r10.ebuild
@@ -19,7 +19,7 @@ IUSE="
 PDEPEND="
 	default-compiler-rt? (
 		sys-devel/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
diff --git a/sys-devel/clang-common/clang-common-17.0.6-r9.ebuild b/sys-devel/clang-common/clang-common-17.0.6-r9.ebuild
index 5f634ac72ad7..406fb5e000ac 100644
--- a/sys-devel/clang-common/clang-common-17.0.6-r9.ebuild
+++ b/sys-devel/clang-common/clang-common-17.0.6-r9.ebuild
@@ -19,7 +19,7 @@ IUSE="
 PDEPEND="
 	default-compiler-rt? (
 		sys-devel/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
diff --git a/sys-devel/clang-common/clang-common-18.1.8-r3.ebuild b/sys-devel/clang-common/clang-common-18.1.8-r3.ebuild
index bd5543518470..d27470c98f00 100644
--- a/sys-devel/clang-common/clang-common-18.1.8-r3.ebuild
+++ b/sys-devel/clang-common/clang-common-18.1.8-r3.ebuild
@@ -19,7 +19,7 @@ IUSE="
 PDEPEND="
 	default-compiler-rt? (
 		sys-devel/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
diff --git a/sys-devel/clang-common/clang-common-19.1.4.ebuild b/sys-devel/clang-common/clang-common-19.1.4.ebuild
index ec4f3dbef5f3..30192b7fa601 100644
--- a/sys-devel/clang-common/clang-common-19.1.4.ebuild
+++ b/sys-devel/clang-common/clang-common-19.1.4.ebuild
@@ -19,7 +19,7 @@ IUSE="
 PDEPEND="
 	default-compiler-rt? (
 		sys-devel/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
diff --git a/sys-devel/clang-common/clang-common-19.1.5.ebuild b/sys-devel/clang-common/clang-common-19.1.5.ebuild
index d587000e70f7..5f4044001548 100644
--- a/sys-devel/clang-common/clang-common-19.1.5.ebuild
+++ b/sys-devel/clang-common/clang-common-19.1.5.ebuild
@@ -19,7 +19,7 @@ IUSE="
 PDEPEND="
 	default-compiler-rt? (
 		sys-devel/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
diff --git a/sys-devel/clang-common/clang-common-20.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-20.0.0.9999.ebuild
index 0351c7b25564..b3216cd5a275 100644
--- a/sys-devel/clang-common/clang-common-20.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-20.0.0.9999.ebuild
@@ -18,7 +18,7 @@ IUSE="
 PDEPEND="
 	default-compiler-rt? (
 		sys-devel/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
diff --git a/sys-devel/clang-common/clang-common-20.0.0_pre20241207.ebuild b/sys-devel/clang-common/clang-common-20.0.0_pre20241207.ebuild
index 0351c7b25564..b3216cd5a275 100644
--- a/sys-devel/clang-common/clang-common-20.0.0_pre20241207.ebuild
+++ b/sys-devel/clang-common/clang-common-20.0.0_pre20241207.ebuild
@@ -18,7 +18,7 @@ IUSE="
 PDEPEND="
 	default-compiler-rt? (
 		sys-devel/clang-runtime:${LLVM_MAJOR}[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
+		llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
 		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
 	)
 	!default-compiler-rt? ( sys-devel/gcc )
diff --git a/sys-process/htop/htop-3.2.2.ebuild b/sys-process/htop/htop-3.2.2.ebuild
index c4d46b9eefc4..1ed6d507ea23 100644
--- a/sys-process/htop/htop-3.2.2.ebuild
+++ b/sys-process/htop/htop-3.2.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
@@ -28,7 +28,7 @@ RDEPEND="
 	hwloc? ( sys-apps/hwloc:= )
 	unwind? (
 		!llvm-libunwind? ( sys-libs/libunwind:= )
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	kernel_linux? (
 		caps? ( sys-libs/libcap )
diff --git a/sys-process/htop/htop-3.3.0.ebuild b/sys-process/htop/htop-3.3.0.ebuild
index e0d1b768686b..13988e02418e 100644
--- a/sys-process/htop/htop-3.3.0.ebuild
+++ b/sys-process/htop/htop-3.3.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	hwloc? ( sys-apps/hwloc:= )
 	unwind? (
 		!llvm-libunwind? ( sys-libs/libunwind:= )
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	kernel_linux? (
 		caps? ( sys-libs/libcap )
diff --git a/sys-process/htop/htop-9999.ebuild b/sys-process/htop/htop-9999.ebuild
index 857fc8dee2b1..a4c49a99de39 100644
--- a/sys-process/htop/htop-9999.ebuild
+++ b/sys-process/htop/htop-9999.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
@@ -28,7 +28,7 @@ RDEPEND="
 	hwloc? ( sys-apps/hwloc:= )
 	unwind? (
 		!llvm-libunwind? ( sys-libs/libunwind:= )
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	)
 	kernel_linux? (
 		caps? ( sys-libs/libcap )