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

Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-08-25 07:08:13 -07:00 · 2024-01-14 21:22:41 +01:00
parent af466a47a6
commit 24579fc8ca
44 changed files with 38 additions and 37 deletions
--- a/dev-build/automake/Manifest
+++ b/dev-build/automake/Manifest
--- a/dev-build/automake/automake-1.11.6-r4.ebuild
+++ b/dev-build/automake/automake-1.11.6-r4.ebuild
--- a/dev-build/automake/automake-1.16.5-r1.ebuild
+++ b/dev-build/automake/automake-1.16.5-r1.ebuild
--- a/dev-build/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
--- a/dev-build/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch
+++ b/dev-build/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch
--- a/dev-build/automake/files/automake-1.11.6-perl-5.16.patch
+++ b/dev-build/automake/files/automake-1.11.6-perl-5.16.patch
--- a/dev-build/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch
+++ b/dev-build/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch
--- a/dev-build/automake/files/automake-1.16.5-apostrophe-in-tests.patch
+++ b/dev-build/automake/files/automake-1.16.5-apostrophe-in-tests.patch
--- a/dev-build/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch
+++ b/dev-build/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch
--- a/dev-build/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
+++ b/dev-build/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
--- a/dev-build/automake/files/automake-1.16.5-parallel-build.patch
+++ b/dev-build/automake/files/automake-1.16.5-parallel-build.patch
--- a/dev-build/automake/files/automake-1.16.5-py3-compile.patch
+++ b/dev-build/automake/files/automake-1.16.5-py3-compile.patch
--- a/dev-build/automake/metadata.xml
+++ b/dev-build/automake/metadata.xml
--- a/dev-util/autoproject/autoproject-0.20_p5.ebuild
+++ b/dev-util/autoproject/autoproject-0.20_p5.ebuild
@@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"

 RDEPEND="
 	dev-build/autoconf:*
-	sys-devel/automake:*"
+	dev-build/automake:*"
 DEPEND="${RDEPEND}
 	test? ( sys-apps/texinfo )"

--- a/dev-util/poke/poke-2.4-r1.ebuild
+++ b/dev-util/poke/poke-2.4-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
 	REGEN_BDEPEND="
 		>=dev-build/autoconf-2.62
-		>=sys-devel/automake-2.16
+		>=dev-build/automake-2.16
 		sys-apps/gawk
 		sys-apps/help2man
 		sys-apps/texinfo
--- a/dev-util/poke/poke-2.90.1.ebuild
+++ b/dev-util/poke/poke-2.90.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
 	REGEN_BDEPEND="
 		>=dev-build/autoconf-2.62
-		>=sys-devel/automake-1.16
+		>=dev-build/automake-1.16
 		sys-apps/gawk
 		sys-apps/help2man
 		sys-apps/texinfo
--- a/dev-util/poke/poke-3.0.ebuild
+++ b/dev-util/poke/poke-3.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
 	REGEN_BDEPEND="
 		>=dev-build/autoconf-2.62
-		>=sys-devel/automake-1.16
+		>=dev-build/automake-1.16
 		sys-apps/gawk
 		sys-apps/help2man
 		sys-apps/texinfo
--- a/dev-util/poke/poke-3.1.ebuild
+++ b/dev-util/poke/poke-3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
 	REGEN_BDEPEND="
 		>=dev-build/autoconf-2.62
-		>=sys-devel/automake-1.16
+		>=dev-build/automake-1.16
 		sys-apps/gawk
 		sys-apps/help2man
 		sys-apps/texinfo
--- a/dev-util/poke/poke-3.2.ebuild
+++ b/dev-util/poke/poke-3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
 	REGEN_BDEPEND="
 		>=dev-build/autoconf-2.62
-		>=sys-devel/automake-1.16
+		>=dev-build/automake-1.16
 		sys-apps/gawk
 		sys-apps/help2man
 		sys-apps/texinfo
--- a/dev-util/poke/poke-3.3.ebuild
+++ b/dev-util/poke/poke-3.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
 	REGEN_BDEPEND="
 		>=dev-build/autoconf-2.62
-		>=sys-devel/automake-1.16
+		>=dev-build/automake-1.16
 		sys-apps/gawk
 		sys-apps/help2man
 		sys-apps/texinfo
--- a/dev-util/poke/poke-9999.ebuild
+++ b/dev-util/poke/poke-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
 	REGEN_BDEPEND="
 		>=dev-build/autoconf-2.62
-		>=sys-devel/automake-1.16
+		>=dev-build/automake-1.16
 		sys-apps/gawk
 		sys-apps/help2man
 		sys-apps/texinfo
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -95,7 +95,7 @@ _LATEST_AUTOCONF=( 2.72-r1:2.72 2.71-r6:2.71 )
 # WANT value by using a colon:  <PV>:<WANT_AUTOMAKE>
 _LATEST_AUTOMAKE=( 1.16.5:1.16 )

-_automake_atom="sys-devel/automake"
+_automake_atom="dev-build/automake"
 _autoconf_atom="dev-build/autoconf"
 if [[ -n ${WANT_AUTOMAKE} ]] ; then
 	case ${WANT_AUTOMAKE} in
@@ -105,12 +105,12 @@ if [[ -n ${WANT_AUTOMAKE} ]] ; then
 			# the autoreconf tool, so this requirement is correct, bug #401605.
 			;;
 		latest)
-			printf -v _automake_atom_tmp '>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }
+			printf -v _automake_atom_tmp '>=dev-build/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }
 			_automake_atom="|| ( ${_automake_atom_tmp} )"
 			unset _automake_atom_tmp
 			;;
 		*)
-			_automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*"
+			_automake_atom="=dev-build/automake-${WANT_AUTOMAKE}*"
 			;;
 	esac
 	export WANT_AUTOMAKE
@@ -570,7 +570,7 @@ autotools_env_setup() {
 					hv_args="-b"
 					;;
 			esac
-			has_version ${hv_args} "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break
+			has_version ${hv_args} "=dev-build/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break
 		done

 		# During bootstrap in prefix there might be no automake merged yet
--- a/net-proxy/squidguard/squidguard-1.6.0-r1.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0-r1.ebuild
@@ -60,8 +60,8 @@ src_prepare() {
 	eautoreconf

 	# Workaround for missing install-sh, bug #705374
-	local amver=$(best_version sys-devel/automake)
-	amver=$(ver_cut 1-2 "${amver#sys-devel/automake-}")
+	local amver=$(best_version dev-build/automake)
+	amver=$(ver_cut 1-2 "${amver#dev-build/automake-}")
 	cp -p "${BROOT}/usr/share/automake-${amver}/install-sh" . || die
 }

--- a/profiles/default/linux/packages.build
+++ b/profiles/default/linux/packages.build
@@ -11,10 +11,10 @@ app-arch/xz-utils
 app-arch/tar
 app-shells/bash:0
 dev-build/autoconf
+dev-build/automake
 dev-build/make
 net-misc/rsync
 net-misc/wget
-sys-devel/automake
 sys-devel/libtool
 sys-apps/baselayout
 sys-apps/coreutils
--- a/profiles/info_pkgs
+++ b/profiles/info_pkgs
@@ -7,7 +7,7 @@
 ##
 app-shells/bash:0
 dev-build/autoconf
-sys-devel/automake
+dev-build/automake
 sys-kernel/linux-headers
 sys-libs/glibc
 sys-libs/musl
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -688,9 +688,9 @@ dev-tex/pdfannotextractor
 x11-drivers/nvidia-drivers:0/vulkan

 # Andreas K. Hüttel <dilfridge@gentoo.org> (2021-09-18)
-# sys-devel/automake version 1.11 is EOL and is only useful for testing
+# dev-build/automake version 1.11 is EOL and is only useful for testing
 # old de-ANSI-fication/ansi2knr/AM_C_PROTOTYPES code. Please uninstall.
-sys-devel/automake:1.11
+dev-build/automake:1.11

 # Joonas Niilola <juippis@gentoo.org> (2021-07-29)
 # Upstream provided migration instructions from 2. -> 3. update,
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -32,3 +32,4 @@ move sys-devel/autoconf-archive dev-build/autoconf-archive
 move sys-devel/autoconf dev-build/autoconf
 move sys-devel/automake-wrapper dev-build/automake-wrapper
 move sys-devel/automake-vanilla dev-build/automake-vanilla
+move sys-devel/automake dev-build/automake
--- a/sys-apps/flatpak/flatpak-1.12.8.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{10,11} )

 inherit linux-info python-any-r1

@@ -52,7 +52,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 # pyparsing version pinned for https://bugs.gentoo.org/825230
 BDEPEND="
-	>=sys-devel/automake-1.13.4
+	>=dev-build/automake-1.13.4
 	>=sys-devel/gettext-0.18.2
 	virtual/pkgconfig
 	dev-util/gdbus-codegen
--- a/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{10,11} )

 inherit linux-info python-any-r1 systemd

@@ -49,7 +49,7 @@ RDEPEND="

 DEPEND="${RDEPEND}"
 BDEPEND="
-	>=sys-devel/automake-1.13.4
+	>=dev-build/automake-1.13.4
 	>=sys-devel/gettext-0.18.2
 	virtual/pkgconfig
 	dev-util/gdbus-codegen
--- a/sys-apps/flatpak/flatpak-1.14.5.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.5.ebuild
@@ -49,7 +49,7 @@ RDEPEND="

 DEPEND="${RDEPEND}"
 BDEPEND="
-	>=sys-devel/automake-1.13.4
+	>=dev-build/automake-1.13.4
 	>=sys-devel/gettext-0.18.2
 	virtual/pkgconfig
 	dev-util/gdbus-codegen
--- a/sys-apps/texinfo/texinfo-7.0.3.ebuild
+++ b/sys-apps/texinfo/texinfo-7.0.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git"
 	REGEN_BDEPEND="
 		>=dev-build/autoconf-2.62
-		>=sys-devel/automake-1.16
+		>=dev-build/automake-1.16
 		sys-devel/libtool
 	"
 elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
--- a/sys-apps/texinfo/texinfo-7.1-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-7.1-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git"
 	REGEN_BDEPEND="
 		>=dev-build/autoconf-2.62
-		>=sys-devel/automake-1.16
+		>=dev-build/automake-1.16
 		sys-devel/libtool
 	"
 elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
--- a/sys-apps/texinfo/texinfo-9999.ebuild
+++ b/sys-apps/texinfo/texinfo-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git"
 	REGEN_BDEPEND="
 		>=dev-build/autoconf-2.62
-		>=sys-devel/automake-1.16
+		>=dev-build/automake-1.16
 		sys-devel/libtool
 	"
 elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
--- a/sys-devel/libtool/libtool-2.4.7-r1.ebuild
+++ b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
@@ -29,7 +29,7 @@ IUSE="vanilla"
 RDEPEND="
 	sys-devel/gnuconfig
 	>=dev-build/autoconf-2.69:*
-	>=sys-devel/automake-1.13:*
+	>=dev-build/automake-1.13:*
 	>=dev-libs/libltdl-2.4.7
 "
 DEPEND="${RDEPEND}"
--- a/sys-devel/libtool/libtool-2.4.7-r2.ebuild
+++ b/sys-devel/libtool/libtool-2.4.7-r2.ebuild
@@ -29,7 +29,7 @@ IUSE="vanilla"
 RDEPEND="
 	sys-devel/gnuconfig
 	>=dev-build/autoconf-2.69:*
-	>=sys-devel/automake-1.13:*
+	>=dev-build/automake-1.13:*
 "
 DEPEND="${RDEPEND}"
 [[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -29,7 +29,7 @@ IUSE="vanilla"
 RDEPEND="
 	sys-devel/gnuconfig
 	>=dev-build/autoconf-2.69:*
-	>=sys-devel/automake-1.13:*
+	>=dev-build/automake-1.13:*
 "
 DEPEND="${RDEPEND}"
 [[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
--- a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
@@ -119,7 +119,7 @@ RDEPEND="${PYTHON_DEPS}
 	sys-apps/sandbox
 	dev-build/autoconf
 	dev-build/autoconf-archive
-	sys-devel/automake
+	dev-build/automake
 	app-alternatives/bc
 	app-alternatives/yacc
 	app-alternatives/lex
--- a/sys-kernel/genkernel/genkernel-4.3.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.3.ebuild
@@ -119,7 +119,7 @@ RDEPEND="${PYTHON_DEPS}
 	sys-apps/sandbox
 	dev-build/autoconf
 	dev-build/autoconf-archive
-	sys-devel/automake
+	dev-build/automake
 	app-alternatives/bc
 	app-alternatives/yacc
 	app-alternatives/lex
--- a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
@@ -119,7 +119,7 @@ RDEPEND="${PYTHON_DEPS}
 	sys-apps/sandbox
 	dev-build/autoconf
 	dev-build/autoconf-archive
-	sys-devel/automake
+	dev-build/automake
 	app-alternatives/bc
 	app-alternatives/yacc
 	app-alternatives/lex
--- a/sys-kernel/genkernel/genkernel-4.3.5.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.5.ebuild
@@ -119,7 +119,7 @@ RDEPEND="${PYTHON_DEPS}
 	sys-apps/sandbox
 	dev-build/autoconf
 	dev-build/autoconf-archive
-	sys-devel/automake
+	dev-build/automake
 	app-alternatives/bc
 	app-alternatives/yacc
 	app-alternatives/lex
--- a/sys-kernel/genkernel/genkernel-4.3.6.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.6.ebuild
@@ -121,7 +121,7 @@ RDEPEND="${PYTHON_DEPS}
 	sys-apps/sandbox
 	dev-build/autoconf
 	dev-build/autoconf-archive
-	sys-devel/automake
+	dev-build/automake
 	app-alternatives/bc
 	app-alternatives/yacc
 	app-alternatives/lex
--- a/sys-kernel/genkernel/genkernel-4.3.7.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.7.ebuild
@@ -121,7 +121,7 @@ RDEPEND="${PYTHON_DEPS}
 	sys-apps/sandbox
 	dev-build/autoconf
 	dev-build/autoconf-archive
-	sys-devel/automake
+	dev-build/automake
 	app-alternatives/bc
 	app-alternatives/yacc
 	app-alternatives/lex
--- a/sys-kernel/genkernel/genkernel-4.3.8.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.8.ebuild
@@ -121,7 +121,7 @@ RDEPEND="${PYTHON_DEPS}
 	sys-apps/sandbox
 	dev-build/autoconf
 	dev-build/autoconf-archive
-	sys-devel/automake
+	dev-build/automake
 	app-alternatives/bc
 	app-alternatives/yacc
 	app-alternatives/lex
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -121,7 +121,7 @@ RDEPEND="${PYTHON_DEPS}
 	sys-apps/sandbox
 	dev-build/autoconf
 	dev-build/autoconf-archive
-	sys-devel/automake
+	dev-build/automake
 	app-alternatives/bc
 	app-alternatives/yacc
 	app-alternatives/lex