gentoo auto-resync : 13:01:2024 - 19:12:15

23 files changed, 37 insertions, 35 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8ea65ea4f1c1..6e0171a6a0c9 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 7dff65e5cba2..6099f2df38d5 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -23,7 +23,7 @@ app-text/doxygen gui
 dev-util/cmake gui
 
 # Violet Purcell <vimproved@inventati.org> (2023-10-12)
-# dev-util/samurai is not keyworded here.
+# dev-build/samurai is not keyworded here.
 app-alternatives/ninja samurai
 
 # matoro <matoro_gentoo@matoro.tk> (2023-06-29)
diff --git a/profiles/arch/arm/23.0-armv7a_hf/package.mask b/profiles/arch/arm/23.0-armv7a_hf/package.mask
index 5e7abc375abb..30e86d72cc26 100644
--- a/profiles/arch/arm/23.0-armv7a_hf/package.mask
+++ b/profiles/arch/arm/23.0-armv7a_hf/package.mask
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2020-06-24)
 # Valgrind works on ARMv7
--dev-util/valgrind
+-dev-debug/valgrind
 
 # James Le Cuirot <chewi@gentoo.org> (2015-05-24)
 # This is built for armv7a so unmask against the wider arm mask.
diff --git a/profiles/arch/arm/23.0-armv7a_sf/package.mask b/profiles/arch/arm/23.0-armv7a_sf/package.mask
index 5e7abc375abb..30e86d72cc26 100644
--- a/profiles/arch/arm/23.0-armv7a_sf/package.mask
+++ b/profiles/arch/arm/23.0-armv7a_sf/package.mask
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2020-06-24)
 # Valgrind works on ARMv7
--dev-util/valgrind
+-dev-debug/valgrind
 
 # James Le Cuirot <chewi@gentoo.org> (2015-05-24)
 # This is built for armv7a so unmask against the wider arm mask.
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index 5e7abc375abb..30e86d72cc26 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2020-06-24)
 # Valgrind works on ARMv7
--dev-util/valgrind
+-dev-debug/valgrind
 
 # James Le Cuirot <chewi@gentoo.org> (2015-05-24)
 # This is built for armv7a so unmask against the wider arm mask.
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index fed64262f02f..efb8d898013b 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -96,7 +96,7 @@ media-video/jellyfin-media-player
 # Sam James <sam@gentoo.org> (2020-06-24)
 # Valgrind lacks support for < ARMv7
 # https://valgrind.org/info/platforms.html
-dev-util/valgrind
+dev-debug/valgrind
 
 # James Le Cuirot <chewi@gentoo.org> (2015-05-24)
 # This is built for armv7a and will not work on earlier generations.
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 39ed32f14633..db4ce9e90e09 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -21,7 +21,7 @@ media-libs/libv4l bpf
 media-video/ffmpeg glslang shaderc vulkan
 
 # Violet Purcell <vimproved@inventati.org> (2023-10-12)
-# dev-util/samurai is not keyworded here.
+# dev-build/samurai is not keyworded here.
 app-alternatives/ninja samurai
 
 # Ionen Wolkens <ionen@gentoo.org> (2023-10-09)
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index ad317b071e07..429687a52b99 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/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.
@@ -174,7 +174,7 @@ kwallet
 flite
 
 # Jeroen Roovers <jer@gentoo.org> (2008-06-07)
-# dev-util/valgrind has not been ported to HPPA.
+# dev-debug/valgrind has not been ported to HPPA.
 valgrind
 
 # Jeroen Roovers <jer@gentoo.org> (2008-01-04)
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index daed8ca56645..cf2c7474c9fb 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -26,7 +26,7 @@ media-libs/libv4l bpf
 media-video/ffmpeg glslang shaderc vulkan
 
 # Violet Purcell <vimproved@inventati.org> (2023-10-12)
-# dev-util/samurai is not keyworded here.
+# dev-build/samurai is not keyworded here.
 app-alternatives/ninja samurai
 
 # Patrick McLean <chutzpah@gentoo.org> (2023-10-03)
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index def60658c249..a80faf224e94 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -18,7 +18,7 @@ media-libs/libplacebo -shaderc
 app-arch/rpm -sequoia
 
 # Violet Purcell <vimproved@inventati.org> (2023-10-12)
-# dev-util/samurai is not keyworded here.
+# dev-build/samurai is not keyworded here.
 app-alternatives/ninja samurai
 
 # Sam James <sam@gentoo.org> (2023-10-08)
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index 090a12840d35..84c7e1c2367a 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -6,7 +6,7 @@
 media-libs/libv4l bpf
 
 # Violet Purcell <vimproved@inventati.org> (2023-10-12)
-# dev-util/samurai is not keyworded here.
+# dev-build/samurai is not keyworded here.
 app-alternatives/ninja samurai
 
 # Sam James <sam@gentoo.org> (2023-06-18)
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 52eb3ff1932f..08776de3d673 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -56,7 +56,7 @@ x11-misc/xscreensaver new-login
 app-i18n/ibus gtk4
 
 # Violet Purcell <vimproved@inventati.org> (2023-10-12)
-# dev-util/samurai is not keyworded here.
+# dev-build/samurai is not keyworded here.
 app-alternatives/ninja samurai
 
 # matoro <matoro_gentoo@matoro.tk> (2023-06-18)
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 1476d8f8c050..751e44f5b836 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/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.
@@ -30,7 +30,7 @@ tpm
 rdma
 
 # Mart Raudsepp <leio@gentoo.org> (2018-02-11)
-# dev-util/valgrind is not keyworded here yet,
+# dev-debug/valgrind is not keyworded here yet,
 # though the MIPS platform is supported upstream
 valgrind
 
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index cc653abdeb60..dd06dd907f21 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -24,7 +24,7 @@ dev-python/nbclient test
 dev-python/nbconvert test
 
 # Violet Purcell <vimproved@inventati.org> (2023-10-12)
-# dev-util/samurai is not keyworded here.
+# dev-build/samurai is not keyworded here.
 app-alternatives/ninja samurai
 
 # Patrick McLean <chutzpah@gentoo.org> (2023-10-03)
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 691574997f60..eb1f8de33578 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -48,7 +48,7 @@ dev-python/nbclient test
 dev-python/nbconvert test
 
 # Violet Purcell <vimproved@inventati.org> (2023-10-12)
-# dev-util/samurai is not keyworded here.
+# dev-build/samurai is not keyworded here.
 app-alternatives/ninja samurai
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2023-10-08)
diff --git a/profiles/base/packages b/profiles/base/packages
index a3d4c1b9205f..fbd30a2b0357 100644
--- a/profiles/base/packages
+++ b/profiles/base/packages
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
 # Gentoo Base Profile
@@ -35,6 +35,7 @@
 *app-arch/tar
 *app-arch/xz-utils
 *app-shells/bash:0
+*dev-build/make
 *net-misc/iputils
 *net-misc/rsync
 *net-misc/wget
@@ -59,7 +60,6 @@
 *sys-devel/binutils
 *sys-devel/gcc
 *sys-devel/gnuconfig
-*sys-devel/make
 *>=sys-devel/patch-2.7
 *sys-fs/e2fsprogs
 *virtual/dev-manager
diff --git a/profiles/default/linux/packages.build b/profiles/default/linux/packages.build
index 234eafa6d08b..40f3d8e84fff 100644
--- a/profiles/default/linux/packages.build
+++ b/profiles/default/linux/packages.build
@@ -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
 
 # This file describes the packages needed to build a stage1 based on this
@@ -10,6 +10,7 @@ app-arch/gzip
 app-arch/xz-utils
 app-arch/tar
 app-shells/bash:0
+dev-build/make
 net-misc/rsync
 net-misc/wget
 sys-devel/autoconf
@@ -33,7 +34,6 @@ sys-devel/flex
 sys-devel/gcc
 sys-devel/gettext
 sys-devel/gnuconfig
-sys-devel/make
 sys-devel/patch
 virtual/editor
 virtual/libc
diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc
index 87a6dacd7913..56d55959e8ad 100644
--- a/profiles/features/prefix/standalone/profile.bashrc
+++ b/profiles/features/prefix/standalone/profile.bashrc
@@ -43,7 +43,7 @@ elif [[ ${CATEGORY}/${PN} == dev-lang/perl && ${EBUILD_PHASE} == configure ]]; t
     ebegin "Removing Android detection"
     sed "/libandroid.so/d" -i "${S}"/Configure
     eend $?
-elif [[ ${CATEGORY}/${PN} == sys-devel/make && ${EBUILD_PHASE} == prepare ]]; then
+elif [[ ${CATEGORY}/${PN} == dev-build/make && ${EBUILD_PHASE} == prepare ]]; then
     ebegin "Prefixifying default shell"
     sed -i -r "/default_shell/s,\"(/bin/sh),\"${EPREFIX}\1," "${S}"/job.c
     eend $?
diff --git a/profiles/info_pkgs b/profiles/info_pkgs
index bb782b267881..4ddd85d40c70 100644
--- a/profiles/info_pkgs
+++ b/profiles/info_pkgs
@@ -1,4 +1,4 @@
-# Copyright 2004-2022 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ##
@@ -14,7 +14,7 @@ sys-libs/musl
 sys-devel/binutils
 sys-devel/binutils-config
 sys-devel/libtool
-sys-devel/make
+dev-build/make
 dev-lang/python
 dev-lang/perl
 dev-lang/rust
diff --git a/profiles/package.mask b/profiles/package.mask
index d10e14d6733e..12d3ecff2177 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -463,11 +463,6 @@ dev-ruby/http:4
 <sys-kernel/gentoo-kernel-5.10
 <virtual/dist-kernel-5.10
 
-# Michał Górny <mgorny@gentoo.org> (2023-12-12)
-# Merged into dev-python/blake3[-rust].  Please use that instead.
-# Removal on 2024-01-11.  Bug #919771.
-dev-python/blake3-py-c
-
 # Hans de Graaff <graaff@gentoo.org> (2023-12-10)
 # Test failures that seem to indicate this package no longer works
 # correctly. Last release 6 years ago. No reverse dependencies.
diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index 4771d1dc9fcf..f13c0df06bf2 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -10,3 +10,10 @@ 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
+move dev-util/ninja dev-build/ninja
+move dev-util/samurai dev-build/samurai
+move sys-devel/make dev-build/make
+move sys-devel/bmake dev-build/bmake
+move sys-devel/pmake dev-build/pmake
+move sys-devel/remake dev-build/remake
+move dev-util/valgrind dev-debug/valgrind
diff --git a/profiles/use.desc b/profiles/use.desc
index 5476b35be009..311978a68dea 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -354,7 +354,7 @@ usb - Add USB support to applications that have optional USB support (e.g. cups)
 v4l - Enable support for video4linux (using linux-headers or userspace libv4l libraries)
 vaapi - Enable Video Acceleration API for hardware decoding
 vala - Enable bindings for dev-lang/vala
-valgrind - Enable annotations for accuracy. May slow down runtime slightly. Safe to use even if not currently using dev-util/valgrind
+valgrind - Enable annotations for accuracy. May slow down runtime slightly. Safe to use even if not currently using dev-debug/valgrind
 vanilla - Do not add extra patches which change default behaviour; DO NOT USE THIS ON A GLOBAL SCALE as the severity of the meaning changes drastically
 vcd - Video CD support
 vdpau - Enable the Video Decode and Presentation API for Unix acceleration interface
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a6cd2f6c9bf1..5b253df6c39b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -198,8 +198,8 @@ app-alternatives/gzip:pigz - Symlink to app-arch/pigz.
 app-alternatives/gzip:reference - Symlink to app-arch/gzip.
 app-alternatives/lex:flex - Symlink to sys-devel/flex.
 app-alternatives/lex:reflex - Symlink to sys-devel/reflex.
-app-alternatives/ninja:reference - Symlink to dev-util/ninja.
-app-alternatives/ninja:samurai - Symlink to dev-util/samurai.
+app-alternatives/ninja:reference - Symlink to dev-build/ninja.
+app-alternatives/ninja:samurai - Symlink to dev-build/samurai.
 app-alternatives/sh:bash - Symlink to app-shells/bash
 app-alternatives/sh:busybox - Symlink to sys-apps/busybox
 app-alternatives/sh:dash - Symlink to app-shells/dash
@@ -1822,7 +1822,7 @@ dev-lang/python:bluetooth - Build Bluetooth protocol support in socket module
 dev-lang/python:ensurepip - Install the ensurepip module that uses bundled wheels to bootstrap pip and setuptools (if disabled, it will be only possible to use venv `--without-pip`)
 dev-lang/python:libedit - Link readline extension against dev-libs/libedit instead of sys-libs/readline
 dev-lang/python:pgo - Optimize the build using Profile Guided Optimization (PGO) by running Python's test suite and collecting statistics based on its performance. This will take longer to build.
-dev-lang/python:valgrind - Disable pymalloc when running under dev-util/valgrind is detected (may incur minor performance penalty even when valgrind is not used)
+dev-lang/python:valgrind - Disable pymalloc when running under dev-debug/valgrind is detected (may incur minor performance penalty even when valgrind is not used)
 dev-lang/python:wininst - Install Windows executables required to create an executable installer for MS Windows
 dev-lang/python-exec:native-symlinks - Install generic symlinks like python and python3. If this flag is disabled, only versioned python3.X executables will be available to end users and ebuilds not using python eclasses.
 dev-lang/qu-prolog:pedro - Pedro subscription/notification communications system