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

Signed-off-by: Michał Górny <mgorny@gentoo.org>

44 files changed, 38 insertions, 37 deletions

diff --git a/sys-devel/automake/Manifest b/dev-build/automake/Manifest
index ee180dcca549..ee180dcca549 100644
--- a/sys-devel/automake/Manifest
+++ b/dev-build/automake/Manifest
diff --git a/sys-devel/automake/automake-1.11.6-r4.ebuild b/dev-build/automake/automake-1.11.6-r4.ebuild
index 63adb6b1358a..63adb6b1358a 100644
--- a/sys-devel/automake/automake-1.11.6-r4.ebuild
+++ b/dev-build/automake/automake-1.11.6-r4.ebuild
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild b/dev-build/automake/automake-1.16.5-r1.ebuild
index 07d5a58bdec0..07d5a58bdec0 100644
--- a/sys-devel/automake/automake-1.16.5-r1.ebuild
+++ b/dev-build/automake/automake-1.16.5-r1.ebuild
diff --git a/sys-devel/automake/automake-9999.ebuild b/dev-build/automake/automake-9999.ebuild
index a16d0ba489bc..a16d0ba489bc 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/dev-build/automake/automake-9999.ebuild
diff --git a/sys-devel/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
index c435b9004f8d..c435b9004f8d 100644
--- a/sys-devel/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
diff --git a/sys-devel/automake/files/automake-1.11.6-perl-5.16.patch b/dev-build/automake/files/automake-1.11.6-perl-5.16.patch
index 19fe249e0c00..19fe249e0c00 100644
--- a/sys-devel/automake/files/automake-1.11.6-perl-5.16.patch
+++ b/dev-build/automake/files/automake-1.11.6-perl-5.16.patch
diff --git a/sys-devel/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
index bf8819adcf4c..bf8819adcf4c 100644
--- a/sys-devel/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
diff --git a/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch b/dev-build/automake/files/automake-1.16.5-apostrophe-in-tests.patch
index 2c1c99d57367..2c1c99d57367 100644
--- a/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch
+++ b/dev-build/automake/files/automake-1.16.5-apostrophe-in-tests.patch
diff --git a/sys-devel/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
index 5cddb4cfb83f..5cddb4cfb83f 100644
--- a/sys-devel/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
diff --git a/sys-devel/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
index 85273d6aaf03..85273d6aaf03 100644
--- a/sys-devel/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
diff --git a/sys-devel/automake/files/automake-1.16.5-parallel-build.patch b/dev-build/automake/files/automake-1.16.5-parallel-build.patch
index 985e86aeb32c..985e86aeb32c 100644
--- a/sys-devel/automake/files/automake-1.16.5-parallel-build.patch
+++ b/dev-build/automake/files/automake-1.16.5-parallel-build.patch
diff --git a/sys-devel/automake/files/automake-1.16.5-py3-compile.patch b/dev-build/automake/files/automake-1.16.5-py3-compile.patch
index 003b391b04ac..003b391b04ac 100644
--- a/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
+++ b/dev-build/automake/files/automake-1.16.5-py3-compile.patch
diff --git a/sys-devel/automake/metadata.xml b/dev-build/automake/metadata.xml
index 6e5b45d8c011..6e5b45d8c011 100644
--- a/sys-devel/automake/metadata.xml
+++ b/dev-build/automake/metadata.xml
diff --git a/dev-util/autoproject/autoproject-0.20_p5.ebuild b/dev-util/autoproject/autoproject-0.20_p5.ebuild
index 6a8253554286..c965e30bc08c 100644
--- 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 )"
 
diff --git a/dev-util/poke/poke-2.4-r1.ebuild b/dev-util/poke/poke-2.4-r1.ebuild
index 7d1ab3d9d754..b44a7334de30 100644
--- 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
diff --git a/dev-util/poke/poke-2.90.1.ebuild b/dev-util/poke/poke-2.90.1.ebuild
index 11863fa8be83..540363525164 100644
--- 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
diff --git a/dev-util/poke/poke-3.0.ebuild b/dev-util/poke/poke-3.0.ebuild
index 84311c5c7d78..993b532d0a88 100644
--- 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
diff --git a/dev-util/poke/poke-3.1.ebuild b/dev-util/poke/poke-3.1.ebuild
index 84311c5c7d78..993b532d0a88 100644
--- 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
diff --git a/dev-util/poke/poke-3.2.ebuild b/dev-util/poke/poke-3.2.ebuild
index 84311c5c7d78..993b532d0a88 100644
--- 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
diff --git a/dev-util/poke/poke-3.3.ebuild b/dev-util/poke/poke-3.3.ebuild
index 2bbff967e9e9..7ea895387635 100644
--- 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
diff --git a/dev-util/poke/poke-9999.ebuild b/dev-util/poke/poke-9999.ebuild
index c12b7b4fe380..1aadadd1833d 100644
--- 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
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 169d4ab19bbe..2b793f445591 100644
--- 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
diff --git a/net-proxy/squidguard/squidguard-1.6.0-r1.ebuild b/net-proxy/squidguard/squidguard-1.6.0-r1.ebuild
index 521511c2bdd7..32fc9e26092a 100644
--- 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
 }
 
diff --git a/profiles/default/linux/packages.build b/profiles/default/linux/packages.build
index 5703583207b2..a0557aae33ae 100644
--- 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
diff --git a/profiles/info_pkgs b/profiles/info_pkgs
index 907e1ae4e75f..ec0c83b51c04 100644
--- 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
diff --git a/profiles/package.mask b/profiles/package.mask
index 29638fbe3310..0a3dff5114dd 100644
--- 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,
diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index 3be9e02f848c..366230bf9994 100644
--- 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
diff --git a/sys-apps/flatpak/flatpak-1.12.8.ebuild b/sys-apps/flatpak/flatpak-1.12.8.ebuild
index 8d690737f967..6bc1f0bd87d5 100644
--- 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
diff --git a/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild b/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild
index cc266504983d..b5359b986a75 100644
--- 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
diff --git a/sys-apps/flatpak/flatpak-1.14.5.ebuild b/sys-apps/flatpak/flatpak-1.14.5.ebuild
index 7cf4ba08b4c4..517a31bce219 100644
--- 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
diff --git a/sys-apps/texinfo/texinfo-7.0.3.ebuild b/sys-apps/texinfo/texinfo-7.0.3.ebuild
index a8f0aaa57fc4..aa15291f2d08 100644
--- 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
diff --git a/sys-apps/texinfo/texinfo-7.1-r1.ebuild b/sys-apps/texinfo/texinfo-7.1-r1.ebuild
index 0b5c7e66076b..e51aaead9873 100644
--- 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
diff --git a/sys-apps/texinfo/texinfo-9999.ebuild b/sys-apps/texinfo/texinfo-9999.ebuild
index d9f05fd9dd2b..8579319f28b6 100644
--- 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
diff --git a/sys-devel/libtool/libtool-2.4.7-r1.ebuild b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
index af97aa52d36d..aa94eae26eeb 100644
--- 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}"
diff --git a/sys-devel/libtool/libtool-2.4.7-r2.ebuild b/sys-devel/libtool/libtool-2.4.7-r2.ebuild
index 3adbc48885b0..ec3be9b992e0 100644
--- 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"
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index e2533af5f5d2..5a5d4b118ef9 100644
--- 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"
diff --git a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
index d8740e99e5cd..cb966071f694 100644
--- 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
diff --git a/sys-kernel/genkernel/genkernel-4.3.3.ebuild b/sys-kernel/genkernel/genkernel-4.3.3.ebuild
index 8d3ff0c71807..4a1d75462fe7 100644
--- 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
diff --git a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
index 4d196c32bd92..c75b39355fbd 100644
--- 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
diff --git a/sys-kernel/genkernel/genkernel-4.3.5.ebuild b/sys-kernel/genkernel/genkernel-4.3.5.ebuild
index d314803da83d..e39196fe1c0c 100644
--- 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
diff --git a/sys-kernel/genkernel/genkernel-4.3.6.ebuild b/sys-kernel/genkernel/genkernel-4.3.6.ebuild
index 1fa9c2b0ec69..f731d23c5c69 100644
--- 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
diff --git a/sys-kernel/genkernel/genkernel-4.3.7.ebuild b/sys-kernel/genkernel/genkernel-4.3.7.ebuild
index 87d1d6438cd7..461945c27028 100644
--- 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
diff --git a/sys-kernel/genkernel/genkernel-4.3.8.ebuild b/sys-kernel/genkernel/genkernel-4.3.8.ebuild
index 87d1d6438cd7..461945c27028 100644
--- 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
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 87d1d6438cd7..461945c27028 100644
--- 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