Move {sys-devel → dev-build}/make

Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-09-24 04:59:14 -07:00 · 2024-01-13 14:21:13 +01:00
parent b0cd08a079
commit 7ef71dd2f0
36 changed files with 47 additions and 46 deletions
--- a/dev-build/make/Manifest
+++ b/dev-build/make/Manifest
--- a/dev-build/make/files/make-3.82-darwin-library_search-dylib.patch
+++ b/dev-build/make/files/make-3.82-darwin-library_search-dylib.patch
--- a/dev-build/make/files/make-4.2-default-cxx.patch
+++ b/dev-build/make/files/make-4.2-default-cxx.patch
--- a/dev-build/make/files/make-4.4-default-cxx.patch
+++ b/dev-build/make/files/make-4.4-default-cxx.patch
--- a/dev-build/make/make-4.3-r1.ebuild
+++ b/dev-build/make/make-4.3-r1.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=7
--- a/dev-build/make/make-4.4.1-r1.ebuild
+++ b/dev-build/make/make-4.4.1-r1.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
--- a/dev-build/make/make-9999.ebuild
+++ b/dev-build/make/make-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
--- a/dev-build/make/metadata.xml
+++ b/dev-build/make/metadata.xml
--- a/dev-util/android-ndk/android-ndk-11c-r1.ebuild
+++ b/dev-util/android-ndk/android-ndk-11c-r1.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=6
@@ -18,7 +18,7 @@ RESTRICT="mirror strip installsources test"

 DEPEND="app-arch/p7zip"
 RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	|| (
 		sys-libs/ncurses:0/5[tinfo]
 		sys-libs/ncurses-compat:5[tinfo]
--- a/dev-util/android-ndk/android-ndk-11c.ebuild
+++ b/dev-util/android-ndk/android-ndk-11c.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=6
@@ -18,7 +18,7 @@ RESTRICT="mirror strip installsources test"

 DEPEND="app-arch/p7zip"
 RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	sys-libs/ncurses-compat:5
 	virtual/libcrypt"

--- a/dev-util/android-ndk/android-ndk-13b.ebuild
+++ b/dev-util/android-ndk/android-ndk-13b.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=6
@@ -18,7 +18,7 @@ RESTRICT="mirror strip installsources test"

 DEPEND="app-arch/p7zip"
 RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	|| (
 		sys-libs/ncurses:0/5[tinfo]
 		sys-libs/ncurses-compat:5[tinfo]
--- a/dev-util/android-ndk/android-ndk-14b.ebuild
+++ b/dev-util/android-ndk/android-ndk-14b.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=6
@@ -18,7 +18,7 @@ RESTRICT="mirror strip installsources test"

 DEPEND="app-arch/p7zip"
 RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	|| (
 		sys-libs/ncurses:0/5[tinfo]
 		sys-libs/ncurses-compat:5[tinfo]
--- a/dev-util/android-ndk/android-ndk-16b.ebuild
+++ b/dev-util/android-ndk/android-ndk-16b.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=6
@@ -18,7 +18,7 @@ RESTRICT="mirror strip installsources test"

 DEPEND="app-arch/p7zip"
 RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	|| (
 		sys-libs/ncurses:0/5[tinfo]
 		sys-libs/ncurses-compat:5[tinfo]
--- a/dev-util/android-ndk/android-ndk-18.ebuild
+++ b/dev-util/android-ndk/android-ndk-18.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=6
@@ -18,7 +18,7 @@ RESTRICT="mirror strip installsources test"

 DEPEND="app-arch/p7zip"
 RDEPEND=">=dev-util/android-sdk-update-manager-10
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	sys-libs/ncurses-compat:5[abi_x86_32(-),tinfo]
 	virtual/libcrypt"

--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -139,7 +139,7 @@ fi

 case ${CMAKE_MAKEFILE_GENERATOR} in
 	emake)
-		BDEPEND="sys-devel/make"
+		BDEPEND="dev-build/make"
 		;;
 	ninja)
 		BDEPEND="${NINJA_DEPEND}"
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -658,7 +658,7 @@ if [[ ${ETYPE} == sources ]]; then
 		app-alternatives/bc
 		app-alternatives/yacc
 		app-alternatives/lex
-		sys-devel/make
+		dev-build/make
 		>=sys-libs/ncurses-5.2
 		virtual/libelf
 		virtual/pkgconfig
--- a/gnustep-base/gnustep-make/gnustep-make-2.8.0-r1.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.8.0-r1.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=7
@@ -14,7 +14,7 @@ KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libobjc2 native-exceptions"

 DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
+	>=dev-build/make-3.75
 	libobjc2? ( gnustep-base/libobjc2
 		sys-devel/clang:* )
 	!libobjc2? ( !!gnustep-base/libobjc2
--- a/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.9.0.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=7
@@ -14,7 +14,7 @@ KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libobjc2 native-exceptions"

 DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
+	>=dev-build/make-3.75
 	libobjc2? ( gnustep-base/libobjc2
 		sys-devel/clang:* )
 	!libobjc2? ( !!gnustep-base/libobjc2
--- a/gnustep-base/gnustep-make/gnustep-make-2.9.1.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.9.1.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
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="libobjc2 native-exceptions"

 DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
+	>=dev-build/make-3.75
 	libobjc2? ( gnustep-base/libobjc2
 		sys-devel/clang:* )
 	!libobjc2? ( !!gnustep-base/libobjc2
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.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
@@ -107,7 +107,7 @@ DEPEND="${RDEPEND}
 	vulkan? ( >=dev-util/vulkan-headers-1.3.255 )
 "
 BDEPEND="
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	virtual/pkgconfig
 	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
 "
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild
@@ -303,7 +303,7 @@ DEPEND="${RDEPEND}

 # += for verify-sig above
 BDEPEND+="
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	virtual/pkgconfig
 	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
 	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
--- a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild
@@ -307,7 +307,7 @@ DEPEND="${RDEPEND}

 # += for verify-sig above
 BDEPEND+="
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	virtual/pkgconfig
 	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
 	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
--- a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild
@@ -305,7 +305,7 @@ DEPEND="${RDEPEND}

 # += for verify-sig above
 BDEPEND+="
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	virtual/pkgconfig
 	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
 	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
--- a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild
@@ -303,7 +303,7 @@ DEPEND="${RDEPEND}

 # += for verify-sig above
 BDEPEND+="
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	virtual/pkgconfig
 	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
 	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
--- a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild
@@ -305,7 +305,7 @@ DEPEND="${RDEPEND}

 # += for verify-sig above
 BDEPEND+="
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	virtual/pkgconfig
 	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
 	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
--- a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild
@@ -311,7 +311,7 @@ DEPEND="${RDEPEND}

 # += for verify-sig above
 BDEPEND+="
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	virtual/pkgconfig
 	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
 	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild
@@ -311,7 +311,7 @@ DEPEND="${RDEPEND}

 # += for verify-sig above
 BDEPEND+="
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	virtual/pkgconfig
 	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
 	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -311,7 +311,7 @@ DEPEND="${RDEPEND}

 # += for verify-sig above
 BDEPEND+="
-	>=sys-devel/make-3.81
+	>=dev-build/make-3.81
 	virtual/pkgconfig
 	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
 	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
--- a/net-vpn/mullvad-netns/mullvad-netns-0.2-r1.ebuild
+++ b/net-vpn/mullvad-netns/mullvad-netns-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -29,6 +29,6 @@ RDEPEND="
 	sys-apps/util-linux
 "
 BDEPEND="
+	dev-build/make
 	sys-apps/coreutils
-	sys-devel/make
 "
--- a/net-vpn/mullvad-netns/mullvad-netns-0.3-r1.ebuild
+++ b/net-vpn/mullvad-netns/mullvad-netns-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -29,6 +29,6 @@ RDEPEND="
 	sys-apps/util-linux
 "
 BDEPEND="
+	dev-build/make
 	sys-apps/coreutils
-	sys-devel/make
 "
--- a/net-vpn/mullvad-netns/mullvad-netns-9999.ebuild
+++ b/net-vpn/mullvad-netns/mullvad-netns-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -31,6 +31,6 @@ RDEPEND="
 	sys-apps/util-linux
 "
 BDEPEND="
+	dev-build/make
 	sys-apps/coreutils
-	sys-devel/make
 "
--- 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
--- 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
--- 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 $?
--- 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
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -12,3 +12,4 @@ 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