From 7ef71dd2f0e15a353a958b2572de2f2c353c6afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 13 Jan 2024 14:21:13 +0100 Subject: [PATCH] =?UTF-8?q?Move=20{sys-devel=20=E2=86=92=20dev-build}/make?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- {sys-devel => dev-build}/make/Manifest | 0 .../make/files/make-3.82-darwin-library_search-dylib.patch | 0 .../make/files/make-4.2-default-cxx.patch | 0 .../make/files/make-4.4-default-cxx.patch | 0 {sys-devel => dev-build}/make/make-4.3-r1.ebuild | 2 +- {sys-devel => dev-build}/make/make-4.4.1-r1.ebuild | 2 +- {sys-devel => dev-build}/make/make-9999.ebuild | 2 +- {sys-devel => dev-build}/make/metadata.xml | 0 dev-util/android-ndk/android-ndk-11c-r1.ebuild | 4 ++-- dev-util/android-ndk/android-ndk-11c.ebuild | 4 ++-- dev-util/android-ndk/android-ndk-13b.ebuild | 4 ++-- dev-util/android-ndk/android-ndk-14b.ebuild | 4 ++-- dev-util/android-ndk/android-ndk-16b.ebuild | 4 ++-- dev-util/android-ndk/android-ndk-18.ebuild | 4 ++-- eclass/cmake.eclass | 2 +- eclass/kernel-2.eclass | 2 +- gnustep-base/gnustep-make/gnustep-make-2.8.0-r1.ebuild | 4 ++-- gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild | 4 ++-- gnustep-base/gnustep-make/gnustep-make-2.9.1.ebuild | 4 ++-- media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild | 4 ++-- media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0-r11.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0-r9.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.1-r4.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-9999.ebuild | 2 +- net-vpn/mullvad-netns/mullvad-netns-0.2-r1.ebuild | 4 ++-- net-vpn/mullvad-netns/mullvad-netns-0.3-r1.ebuild | 4 ++-- net-vpn/mullvad-netns/mullvad-netns-9999.ebuild | 4 ++-- profiles/base/packages | 4 ++-- profiles/default/linux/packages.build | 4 ++-- profiles/features/prefix/standalone/profile.bashrc | 2 +- profiles/info_pkgs | 4 ++-- profiles/updates/1Q-2024 | 1 + 36 files changed, 47 insertions(+), 46 deletions(-) rename {sys-devel => dev-build}/make/Manifest (100%) rename {sys-devel => dev-build}/make/files/make-3.82-darwin-library_search-dylib.patch (100%) rename {sys-devel => dev-build}/make/files/make-4.2-default-cxx.patch (100%) rename {sys-devel => dev-build}/make/files/make-4.4-default-cxx.patch (100%) rename {sys-devel => dev-build}/make/make-4.3-r1.ebuild (97%) rename {sys-devel => dev-build}/make/make-4.4.1-r1.ebuild (97%) rename {sys-devel => dev-build}/make/make-9999.ebuild (97%) rename {sys-devel => dev-build}/make/metadata.xml (100%) diff --git a/sys-devel/make/Manifest b/dev-build/make/Manifest similarity index 100% rename from sys-devel/make/Manifest rename to dev-build/make/Manifest diff --git a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch b/dev-build/make/files/make-3.82-darwin-library_search-dylib.patch similarity index 100% rename from sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch rename to dev-build/make/files/make-3.82-darwin-library_search-dylib.patch diff --git a/sys-devel/make/files/make-4.2-default-cxx.patch b/dev-build/make/files/make-4.2-default-cxx.patch similarity index 100% rename from sys-devel/make/files/make-4.2-default-cxx.patch rename to dev-build/make/files/make-4.2-default-cxx.patch diff --git a/sys-devel/make/files/make-4.4-default-cxx.patch b/dev-build/make/files/make-4.4-default-cxx.patch similarity index 100% rename from sys-devel/make/files/make-4.4-default-cxx.patch rename to dev-build/make/files/make-4.4-default-cxx.patch diff --git a/sys-devel/make/make-4.3-r1.ebuild b/dev-build/make/make-4.3-r1.ebuild similarity index 97% rename from sys-devel/make/make-4.3-r1.ebuild rename to dev-build/make/make-4.3-r1.ebuild index 86232f173a218..55a24ce4609e6 100644 --- a/sys-devel/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 diff --git a/sys-devel/make/make-4.4.1-r1.ebuild b/dev-build/make/make-4.4.1-r1.ebuild similarity index 97% rename from sys-devel/make/make-4.4.1-r1.ebuild rename to dev-build/make/make-4.4.1-r1.ebuild index dca1f3a7981cb..61fbc91f243f5 100644 --- a/sys-devel/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 diff --git a/sys-devel/make/make-9999.ebuild b/dev-build/make/make-9999.ebuild similarity index 97% rename from sys-devel/make/make-9999.ebuild rename to dev-build/make/make-9999.ebuild index 9cf849936bbea..2be7d7adb832e 100644 --- a/sys-devel/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 diff --git a/sys-devel/make/metadata.xml b/dev-build/make/metadata.xml similarity index 100% rename from sys-devel/make/metadata.xml rename to dev-build/make/metadata.xml diff --git a/dev-util/android-ndk/android-ndk-11c-r1.ebuild b/dev-util/android-ndk/android-ndk-11c-r1.ebuild index 705cbd78d6e5b..19893ccb67599 100644 --- 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] diff --git a/dev-util/android-ndk/android-ndk-11c.ebuild b/dev-util/android-ndk/android-ndk-11c.ebuild index 08f44168102d2..9f72e2cc96492 100644 --- 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" diff --git a/dev-util/android-ndk/android-ndk-13b.ebuild b/dev-util/android-ndk/android-ndk-13b.ebuild index 705cbd78d6e5b..19893ccb67599 100644 --- 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] diff --git a/dev-util/android-ndk/android-ndk-14b.ebuild b/dev-util/android-ndk/android-ndk-14b.ebuild index dd21a3e831cb5..535dd6a39767c 100644 --- 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] diff --git a/dev-util/android-ndk/android-ndk-16b.ebuild b/dev-util/android-ndk/android-ndk-16b.ebuild index dd21a3e831cb5..535dd6a39767c 100644 --- 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] diff --git a/dev-util/android-ndk/android-ndk-18.ebuild b/dev-util/android-ndk/android-ndk-18.ebuild index 7e1efb6dff778..1e630aefcd769 100644 --- 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" diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index ef5e6dd678a15..f403a19b28afd 100644 --- 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}" diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 00b3566ab92d4..a0574e0767406 100644 --- 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 diff --git a/gnustep-base/gnustep-make/gnustep-make-2.8.0-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.8.0-r1.ebuild index bd9584fbd81be..c89c1782c63c1 100644 --- 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 diff --git a/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild index 206cfadbc079d..20b903a1a69c7 100644 --- 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 diff --git a/gnustep-base/gnustep-make/gnustep-make-2.9.1.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.9.1.ebuild index 973d7c219618c..156ad8da76d33 100644 --- 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 diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild index bb38df15a23a2..beeede9790977 100644 --- 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 ) ) " diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 71b87b5d48391..b7074d60fdc34 100644 --- 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] ) diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild index 0a1efa6009aaf..6c34aca8e4cd7 100644 --- 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] ) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild index 8c9dd49fcbefb..422d790d9a524 100644 --- 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] ) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild index cce602989e5ca..9b1c07268516f 100644 --- 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] ) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild index ef173d48e83ff..5a13ca74021f1 100644 --- 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] ) diff --git a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild index 3fcc5394ed436..6db23cdd6bfc4 100644 --- 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] ) diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild index 9c44868b697fa..8da462e593feb 100644 --- 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] ) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 5e59091abc92e..4117023d4157d 100644 --- 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] ) diff --git a/net-vpn/mullvad-netns/mullvad-netns-0.2-r1.ebuild b/net-vpn/mullvad-netns/mullvad-netns-0.2-r1.ebuild index d15b1fff556c0..ec59c2d1b21ba 100644 --- 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 " diff --git a/net-vpn/mullvad-netns/mullvad-netns-0.3-r1.ebuild b/net-vpn/mullvad-netns/mullvad-netns-0.3-r1.ebuild index d15b1fff556c0..ec59c2d1b21ba 100644 --- 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 " diff --git a/net-vpn/mullvad-netns/mullvad-netns-9999.ebuild b/net-vpn/mullvad-netns/mullvad-netns-9999.ebuild index 5e06b511c5754..00aaf0206355a 100644 --- 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 " diff --git a/profiles/base/packages b/profiles/base/packages index a3d4c1b9205f8..fbd30a2b0357d 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 234eafa6d08ba..40f3d8e84fff6 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 87a6dacd7913a..56d55959e8ad6 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 bb782b2678814..4ddd85d40c70c 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/updates/1Q-2024 b/profiles/updates/1Q-2024 index 0265907781c07..85e90406f5b49 100644 --- 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