Skip to content

Commit

Permalink
Move {sys-devel → dev-build}/make
Browse files Browse the repository at this point in the history
Signed-off-by: Michał Górny <[email protected]>
  • Loading branch information
mgorny committed Jan 13, 2024
1 parent b0cd08a commit 7ef71dd
Show file tree
Hide file tree
Showing 36 changed files with 47 additions and 46 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions dev-util/android-ndk/android-ndk-11c-r1.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions dev-util/android-ndk/android-ndk-11c.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions dev-util/android-ndk/android-ndk-13b.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions dev-util/android-ndk/android-ndk-14b.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions dev-util/android-ndk/android-ndk-16b.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions dev-util/android-ndk/android-ndk-18.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion eclass/cmake.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ fi

case ${CMAKE_MAKEFILE_GENERATOR} in
emake)
BDEPEND="sys-devel/make"
BDEPEND="dev-build/make"
;;
ninja)
BDEPEND="${NINJA_DEPEND}"
Expand Down
2 changes: 1 addition & 1 deletion eclass/kernel-2.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gnustep-base/gnustep-make/gnustep-make-2.8.0-r1.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gnustep-base/gnustep-make/gnustep-make-2.9.1.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions media-video/ffmpeg-chromium/ffmpeg-chromium-120.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 ) )
"
Expand Down
2 changes: 1 addition & 1 deletion media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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] )
Expand Down
2 changes: 1 addition & 1 deletion media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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] )
Expand Down
2 changes: 1 addition & 1 deletion media-video/ffmpeg/ffmpeg-6.0-r11.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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] )
Expand Down
2 changes: 1 addition & 1 deletion media-video/ffmpeg/ffmpeg-6.0-r9.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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] )
Expand Down
2 changes: 1 addition & 1 deletion media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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] )
Expand Down
2 changes: 1 addition & 1 deletion media-video/ffmpeg/ffmpeg-6.1-r4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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] )
Expand Down
2 changes: 1 addition & 1 deletion media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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] )
Expand Down
2 changes: 1 addition & 1 deletion media-video/ffmpeg/ffmpeg-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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] )
Expand Down
4 changes: 2 additions & 2 deletions net-vpn/mullvad-netns/mullvad-netns-0.2-r1.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -29,6 +29,6 @@ RDEPEND="
sys-apps/util-linux
"
BDEPEND="
dev-build/make
sys-apps/coreutils
sys-devel/make
"
4 changes: 2 additions & 2 deletions net-vpn/mullvad-netns/mullvad-netns-0.3-r1.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -29,6 +29,6 @@ RDEPEND="
sys-apps/util-linux
"
BDEPEND="
dev-build/make
sys-apps/coreutils
sys-devel/make
"
4 changes: 2 additions & 2 deletions net-vpn/mullvad-netns/mullvad-netns-9999.ebuild
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -31,6 +31,6 @@ RDEPEND="
sys-apps/util-linux
"
BDEPEND="
dev-build/make
sys-apps/coreutils
sys-devel/make
"
4 changes: 2 additions & 2 deletions profiles/base/packages
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions profiles/default/linux/packages.build
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion profiles/features/prefix/standalone/profile.bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -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 $?
Expand Down
4 changes: 2 additions & 2 deletions profiles/info_pkgs
Original file line number Diff line number Diff line change
@@ -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

##
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions profiles/updates/1Q-2024
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 7ef71dd

Please sign in to comment.