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

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

14 files changed, 20 insertions, 19 deletions

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