19 files changed, 65 insertions, 19 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f35e050b52be..8ea65ea4f1c1 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index d4342c7d883c..e150a87519db 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-01-13)
+# Unmask only where grub is keyworded
+sys-kernel/installkernel -grub
+
 # Michał Górny <mgorny@gentoo.org> (2023-12-31)
 # Requires dev-libs/level-zero.
 dev-lang/ispc -gpu
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 43c53495a4f5..4cfb9679833c 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-01-13)
+# Unmask only where grub is keyworded
+sys-kernel/installkernel -grub
+
 # Marek Szuba <marecki@gentoo.org> (2023-12-05)
 # Needs USE=video_cards_amdgpu, currently masked on this arch
 >=sys-apps/fwupd-1.9.10 amdgpu
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index f81227a0ad83..edb30fee4c2a 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-01-13)
+# Unmask only where grub is keyworded
+sys-kernel/installkernel -grub
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-12-18)
 # Experimental and only available on a subset of architectures
 sys-kernel/gentoo-kernel -generic-uki
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index d7c804f7b184..62e83683950a 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-01-13)
+# Unmask only where grub is keyworded
+sys-kernel/installkernel grub
+
 # Michał Górny <mgorny@gentoo.org> (2023-12-31)
 # Requires dev-libs/level-zero.
 dev-lang/ispc gpu
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index db535bdd298b..39ed32f14633 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -296,7 +296,7 @@ net-analyzer/wireshark ilbc
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-07-19)
 # gdbserver is not implemented yet for hppa target.
-sys-devel/gdb server
+dev-debug/gdb server
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-07-07)
 # Test dependencies are no longer keyworded due to dropped Rails
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index 3b44f1b6c94c..e9e8113acd7c 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -64,7 +64,7 @@ sys-process/htop hwloc
 
 # Sam James <sam@gentoo.org> (2021-11-03)
 # dev-util/source-highlight is not marked stable on HPPA
-sys-devel/gdb source-highlight
+dev-debug/gdb source-highlight
 
 # Matt Turner <mattst88@gentoo.org> (2021-09-22)
 # Non-stable deps.
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 601ed1930ae3..daed8ca56645 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-01-13)
+# Unmask only where grub is keyworded
+sys-kernel/installkernel -grub
+
 # Sam James <sam@gentoo.org> (2024-01-02)
 # dev-libs/capstone not keyworded here
 dev-lang/php capstone
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index c4927819cfed..def60658c249 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-01-13)
+# Unmask only where grub is keyworded
+sys-kernel/installkernel -grub
+
 # WANG Xuerui <xen0n@gentoo.org> (2024-01-09)
 # PCRE2 upstream has gained JIT support on loong since 10.43.
 <dev-libs/libpcre2-10.43_rc1 jit
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 4dfbad342a3d..9b2232a1a046 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-01-13)
+# Unmask only where grub is keyworded
+sys-kernel/installkernel -grub
+
 # matoro <matoro_gentoo@matoro.tk> (2023-12-19)
 # JIT not supported here (#909826)
 dev-scheme/racket chez futures jit
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index c40de70a3264..742b8eae3979 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-01-13)
+# Unmask only where grub is keyworded
+sys-kernel/installkernel -grub
+
 # Leonardo Hernández Hernández <leohdz172@proton.me> (2023-11-22)
 # media-libs/libdisplay-info (drm) and dev-libs/libliftoff (liftoff)
 # are only available for amd64 and riscv
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index ceb5f2b226ee..691574997f60 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-01-13)
+# Unmask only where grub is keyworded
+sys-kernel/installkernel -grub
+
 # Jaco Kroon <jaco@uls.co.za> (2024-01-09)
 # net-libs/pjproject[srtp] and net-misc/asterisk[srtp] depends on
 # net-libs/libsrtp which is -sparc.
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 2ecea2704d65..4abd90fec08e 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-01-13)
+# Unmask only where grub is keyworded
+sys-kernel/installkernel -grub
+
 # Ionen Wolkens <ionen@gentoo.org> (2023-10-09)
 # media-libs/shaderc is keyworded here.
 media-libs/libplacebo -shaderc
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 5f7495e2bd3e..bccd61a79503 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -705,7 +705,7 @@ dev-python/paramiko server
 # and compiler/binutils combinations.)
 sys-devel/binutils cet
 sys-devel/binutils-hppa64 cet
-sys-devel/gdb cet
+dev-debug/gdb cet
 sys-libs/binutils-libs cet
 sys-libs/glibc cet
 sys-devel/gcc cet
diff --git a/profiles/categories b/profiles/categories
index 0fabf5bef615..691304863fd1 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -31,8 +31,10 @@ app-text
 app-vim
 app-xemacs
 dev-ada
+dev-build
 dev-cpp
 dev-db
+dev-debug
 dev-dotnet
 dev-embedded
 dev-erlang
diff --git a/profiles/features/hardened/amd64/package.use.mask b/profiles/features/hardened/amd64/package.use.mask
index c1152ea1c608..4a02dcd75989 100644
--- a/profiles/features/hardened/amd64/package.use.mask
+++ b/profiles/features/hardened/amd64/package.use.mask
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2021-11-27)
 # Unmask CET here. It works on amd64 and this is the hardened profile.
 sys-devel/binutils -cet
 sys-devel/binutils-hppa64 -cet
-sys-devel/gdb -cet
+dev-debug/gdb -cet
 sys-libs/binutils-libs -cet
 sys-libs/glibc -cet
 sys-devel/gcc -cet
diff --git a/profiles/prefix/darwin/package.use.mask b/profiles/prefix/darwin/package.use.mask
index 40dcb8932b8d..4b5ae83616ed 100644
--- a/profiles/prefix/darwin/package.use.mask
+++ b/profiles/prefix/darwin/package.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
 
 # Fabian Groffen <grobian@gentoo.org> (2023-05-03)
@@ -23,7 +23,7 @@ media-gfx/tachyon mpi
 
 # Fabian Groffen <grobian@gentoo.org> (2012-01-01)
 # gdb server is not supported on this platform
-sys-devel/gdb server
+dev-debug/gdb server
 
 # Fabian Groffen <grobian@gentoo.org> (2011-01-08)
 # Darwin has libuuid from util-linux
diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index 29de82324a16..4771d1dc9fcf 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -6,3 +6,7 @@ move app-doc/halibut app-text/halibut
 move app-doc/psmark app-text/psmark
 move app-doc/xmltoman app-text/xmltoman
 move app-doc/zeal app-text/zeal
+move sys-devel/gdb dev-debug/gdb
+move sys-devel/gdb-apple dev-debug/gdb-apple
+move dev-util/lldb dev-debug/lldb
+move dev-util/cgdb dev-debug/cgdb
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 19cfe619c778..a6cd2f6c9bf1 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1386,6 +1386,16 @@ dev-db/sqlitestudio:cli - Build CLI interface
 dev-db/timescaledb:proprietary-extensions - Enable proprietary features/extensions licensed under the TimeScale License
 dev-db/unixODBC:minimal - Disable bundled drivers and extra libraries (most users don't need these)
 dev-db/unixODBC:odbcmanual - Administrator, Internal Structure, Programmer and User documentation
+dev-debug/gdb:cet - Enable Intel Control-flow Enforcement Technology.
+dev-debug/gdb:debuginfod - Enable debuginfod support via dev-libs/elfutils libdebuginfod
+dev-debug/gdb:lzma - Support lzma compression in ELF debug info
+dev-debug/gdb:multitarget - Support all known targets in one gdb binary
+dev-debug/gdb:python - Enable support for the new internal scripting language, as well as extended pretty printers
+dev-debug/gdb:server - Install the "gdbserver" program (useful for embedded/remote targets)
+dev-debug/gdb:sim - Build gdb's simulators for various hardware platforms. See https://sourceware.org/gdb/wiki/Sim.
+dev-debug/gdb:source-highlight - Enable listing highlighting via dev-util/source-highlight
+dev-debug/gdb:xml - Support parsing XML data files needed (at least) for cpu features, memory maps, and syscall tracing
+dev-debug/gdb:xxhash - Use dev-libs/xxhash to speed up internal hashing.
 dev-embedded/avrdude:ftdi - Enable support for USB FTDI chips via dev-embedded/libftdi
 dev-embedded/libftdi:tools - build ftdi_eeprom helper tool
 dev-embedded/openocd:capstone - Use dev-libs/capstone for disassembly support
@@ -2496,7 +2506,7 @@ dev-python/qiskit-terra:visualization - Enable visualization modules
 dev-python/rarfile:compressed - Enables the module to support compressed v3 archives by calling the app-arch/unrar.
 dev-python/reedsolo:native-extensions - Compile native C extensions.
 dev-python/rfc3986:idna - enable support for the IDNA specification (RFC 5891)
-dev-python/rpyc:gdb - Run tests depending on sys-devel/gdb
+dev-python/rpyc:gdb - Run tests depending on dev-debug/gdb
 dev-python/rpyc:numpy - Run tests depending on dev-python/numpy, dev-python/pandas
 dev-python/shiboken2:docstrings - Expose documentation as Python docstrings (recommended)
 dev-python/shiboken2:numpy - Implicitly convert passed NumPy arrays to Qt lists
@@ -2805,7 +2815,7 @@ dev-util/edi:clang - Provide integration with sys-devel/clang and dev-util/bear
 dev-util/flatpak-builder:yaml - Use libyaml for yaml support
 dev-util/geany:vte - Enable Terminal support (x11-libs/vte)
 dev-util/geany-plugins:ctags - Enable ctags plugin
-dev-util/geany-plugins:debugger - Enable the debugger plugin which interfaces with sys-devel/gdb
+dev-util/geany-plugins:debugger - Enable the debugger plugin which interfaces with dev-debug/gdb
 dev-util/geany-plugins:enchant - Enable spell checking using enchant
 dev-util/geany-plugins:gpg - Enable geanypg plugin which integrates GPG using app-crypt/gpgme
 dev-util/geany-plugins:gtkspell - Use gtkspell for dictionary support in GeanyVC
@@ -8153,16 +8163,6 @@ sys-devel/gcc-apple:objc - Build support for the Objective C code language
 sys-devel/gcc-apple:objc++ - Build support for the Objective C++ language
 sys-devel/gcc-config:cc-wrappers - Install and manage 'cc' and 'f77' wrappers in /usr/bin. Otherwise ignore them.
 sys-devel/gcc-config:native-symlinks - Install native symlinks like 'gcc' or 'g++' to /usr/bin. Otherwise keep only ${CTARGET}-gcc and friends.
-sys-devel/gdb:cet - Enable Intel Control-flow Enforcement Technology.
-sys-devel/gdb:debuginfod - Enable debuginfod support via dev-libs/elfutils libdebuginfod
-sys-devel/gdb:lzma - Support lzma compression in ELF debug info
-sys-devel/gdb:multitarget - Support all known targets in one gdb binary
-sys-devel/gdb:python - Enable support for the new internal scripting language, as well as extended pretty printers
-sys-devel/gdb:server - Install the "gdbserver" program (useful for embedded/remote targets)
-sys-devel/gdb:sim - Build gdb's simulators for various hardware platforms. See https://sourceware.org/gdb/wiki/Sim.
-sys-devel/gdb:source-highlight - Enable listing highlighting via dev-util/source-highlight
-sys-devel/gdb:xml - Support parsing XML data files needed (at least) for cpu features, memory maps, and syscall tracing
-sys-devel/gdb:xxhash - Use dev-libs/xxhash to speed up internal hashing.
 sys-devel/gettext:git - When running `autopoint`, use git to store the internal development files; this requires git at runtime, but will be faster/smaller than raw archives
 sys-devel/lld-toolchain-symlinks:multilib-symlinks - Install symlinks for all ABI CHOSTs. Note that this can result in gcc being overrode for native builds, as well as conflict with crossdev if used for the same targets.
 sys-devel/lld-toolchain-symlinks:native-symlinks - Install generic 'ld' symlink, as well as ${CTARGET}-ld. These symlinks are installed into slotted LLVM bindir, so they should not take precedence over symlinks installed into /usr/bin by sys-devel/binutils-config but they can be helpful for binutils-free setups.