diff --git a/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9-r1.ebuild b/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9-r1.ebuild
index 3f2cb7b0ec..5cfcc62db5 100644
--- a/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9-r1.ebuild
+++ b/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9-r1.ebuild
@@ -24,8 +24,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="
 	$(vala_depend)
-	sys-devel/libtool
-	>=sys-devel/automake-1.11
+	dev-build/libtool
+	>=dev-build/automake-1.11
 	appindicator? ( dev-libs/libappindicator )
 	x11-libs/gtk+:3
 	>=dev-libs/glib-2
diff --git a/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9-r2.ebuild b/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9-r2.ebuild
index 417a1d97f6..2dc21af408 100644
--- a/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9-r2.ebuild
+++ b/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9-r2.ebuild
@@ -29,8 +29,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="
 	$(vala_depend)
-	sys-devel/libtool
-	>=sys-devel/automake-1.11
+	dev-build/libtool
+	>=dev-build/automake-1.11
 	appindicator? ( dev-libs/libappindicator )
 	x11-libs/gtk+:3
 	>=dev-libs/glib-2
diff --git a/app-misc/neo/neo-0.6.1.ebuild b/app-misc/neo/neo-0.6.1.ebuild
index 6a82993628..d81e8c60c9 100644
--- a/app-misc/neo/neo-0.6.1.ebuild
+++ b/app-misc/neo/neo-0.6.1.ebuild
@@ -21,8 +21,8 @@ IUSE=""
 DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}"
 [ "$PV" = 9999 ] && BDEPEND="
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
+	dev-build/automake
+	dev-build/automake-archive
 "
 
 src_prepare() {
diff --git a/app-misc/neo/neo-9999.ebuild b/app-misc/neo/neo-9999.ebuild
index 6a82993628..d81e8c60c9 100644
--- a/app-misc/neo/neo-9999.ebuild
+++ b/app-misc/neo/neo-9999.ebuild
@@ -21,8 +21,8 @@ IUSE=""
 DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}"
 [ "$PV" = 9999 ] && BDEPEND="
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
+	dev-build/automake
+	dev-build/automake-archive
 "
 
 src_prepare() {
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.99.3-r3.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.99.3-r3.ebuild
index 822c9e902c..a9c1f384ea 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-2.99.3-r3.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.99.3-r3.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	!dev-dotnet/atk-sharp"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	sys-devel/automake:1.11"
+	dev-build/automake:1.11"
 
 src_prepare() {
 	base_src_prepare
diff --git a/dev-libs/luksmeta/luksmeta-9.ebuild b/dev-libs/luksmeta/luksmeta-9.ebuild
index 0f5d87e819..b451e73eb6 100644
--- a/dev-libs/luksmeta/luksmeta-9.ebuild
+++ b/dev-libs/luksmeta/luksmeta-9.ebuild
@@ -17,7 +17,7 @@ IUSE="+man"
 DEPEND="sys-fs/cryptsetup"
 RDEPEND="${DEPEND}"
 BDEPEND="man? ( app-text/asciidoc )
-	sys-devel/libtool"
+	dev-build/libtool"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-tests.patch"
diff --git a/dev-libs/octetos-core/octetos-core-2.25.1_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.25.1_beta.ebuild
index 8970c37f77..139af41b47 100644
--- a/dev-libs/octetos-core/octetos-core-2.25.1_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.25.1_beta.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 	dev-util/intltool
 	sys-devel/bison
 	>=sys-devel/gcc-8.1
-	sys-devel/libtool
+	dev-build/libtool
 "
 
 S="${WORKDIR}/${PN}-${MYPV}"
diff --git a/dev-libs/octetos-core/octetos-core-2.31.2_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.31.2_beta.ebuild
index 8970c37f77..139af41b47 100644
--- a/dev-libs/octetos-core/octetos-core-2.31.2_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.31.2_beta.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 	dev-util/intltool
 	sys-devel/bison
 	>=sys-devel/gcc-8.1
-	sys-devel/libtool
+	dev-build/libtool
 "
 
 S="${WORKDIR}/${PN}-${MYPV}"
diff --git a/dev-libs/octetos-core/octetos-core-2.31.3_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.31.3_beta.ebuild
index 8970c37f77..139af41b47 100644
--- a/dev-libs/octetos-core/octetos-core-2.31.3_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.31.3_beta.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 	dev-util/intltool
 	sys-devel/bison
 	>=sys-devel/gcc-8.1
-	sys-devel/libtool
+	dev-build/libtool
 "
 
 S="${WORKDIR}/${PN}-${MYPV}"
diff --git a/dev-libs/octetos-core/octetos-core-2.31.5_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.31.5_beta.ebuild
index 8970c37f77..139af41b47 100644
--- a/dev-libs/octetos-core/octetos-core-2.31.5_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.31.5_beta.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 	dev-util/intltool
 	sys-devel/bison
 	>=sys-devel/gcc-8.1
-	sys-devel/libtool
+	dev-build/libtool
 "
 
 S="${WORKDIR}/${PN}-${MYPV}"
diff --git a/dev-libs/octetos-core/octetos-core-2.32.0_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.32.0_beta.ebuild
index 8970c37f77..139af41b47 100644
--- a/dev-libs/octetos-core/octetos-core-2.32.0_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.32.0_beta.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 	dev-util/intltool
 	sys-devel/bison
 	>=sys-devel/gcc-8.1
-	sys-devel/libtool
+	dev-build/libtool
 "
 
 S="${WORKDIR}/${PN}-${MYPV}"
diff --git a/games-emulation/np2kai/np2kai-22.ebuild b/games-emulation/np2kai/np2kai-22.ebuild
index 035962b57a..cf91d20a70 100644
--- a/games-emulation/np2kai/np2kai-22.ebuild
+++ b/games-emulation/np2kai/np2kai-22.ebuild
@@ -31,7 +31,7 @@ DEPEND="media-libs/libsdl
 	x11-base/xorg-server
 	x11-libs/gtk+:2"
 RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/automake"
+BDEPEND="dev-build/automake"
 
 S="${WORKDIR}/NP2kai-rev.${PV}/x11"
 
diff --git a/mail-client/mailspring-bin/mailspring-bin-1.13.2-r3.ebuild b/mail-client/mailspring-bin/mailspring-bin-1.13.2-r3.ebuild
index c942e91833..8cc9840cca 100644
--- a/mail-client/mailspring-bin/mailspring-bin-1.13.2-r3.ebuild
+++ b/mail-client/mailspring-bin/mailspring-bin-1.13.2-r3.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	media-libs/mesa
 	net-print/cups
 	sys-apps/dbus
-	sys-devel/libtool
+	dev-build/libtool
 	sys-libs/db:5.3
 	x11-libs/cairo
 	x11-libs/gtk+:3
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild
index ef339e39b2..8101d9af32 100644
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild
+++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild
@@ -31,8 +31,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 if [ "$PV" = 9999 ] ; then
 	BDPEND="${BDEPEND}
-		sys-devel/autoconf
-		sys-devel/autoconf-archive
+		dev-build/automake
+		dev-build/automake-archive
 	"
 fi
 
diff --git a/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild
index d96515b720..5642e8bc64 100644
--- a/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild
@@ -28,8 +28,8 @@ RDEPEND="
 	net-misc/rsync
 "
 BDEPEND="
-	sys-devel/autoconf
-	sys-devel/automake
+	dev-build/automake
+	dev-build/automake
 "
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild
index a3eb5a2a92..4b1ba919b3 100644
--- a/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild
@@ -28,8 +28,8 @@ RDEPEND="
 	net-misc/rsync
 "
 BDEPEND="
-	sys-devel/autoconf
-	sys-devel/automake
+	dev-build/automake
+	dev-build/automake
 "
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/net-misc/openbgpd/openbgpd-6.9_p0.ebuild b/net-misc/openbgpd/openbgpd-6.9_p0.ebuild
index ec04df6036..f198ed2645 100644
--- a/net-misc/openbgpd/openbgpd-6.9_p0.ebuild
+++ b/net-misc/openbgpd/openbgpd-6.9_p0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	acct-user/_bgpd
 "
 BDEPEND="
-	sys-devel/libtool
+	dev-build/libtool
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/openbgpd/openbgpd-8.0.ebuild b/net-misc/openbgpd/openbgpd-8.0.ebuild
index f6272cfcbd..957cc121b9 100644
--- a/net-misc/openbgpd/openbgpd-8.0.ebuild
+++ b/net-misc/openbgpd/openbgpd-8.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	acct-user/_bgpd
 "
 BDEPEND="
-	sys-devel/libtool
+	dev-build/libtool
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/openbgpd/openbgpd-9999.ebuild b/net-misc/openbgpd/openbgpd-9999.ebuild
index 53a836bd2e..285599ed18 100644
--- a/net-misc/openbgpd/openbgpd-9999.ebuild
+++ b/net-misc/openbgpd/openbgpd-9999.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 "
 BDEPEND="
 	dev-util/byacc
-	sys-devel/libtool
+	dev-build/libtool
 "
 
 PATCHES=(
diff --git a/net-misc/rpki-client/rpki-client-6.8_p0.ebuild b/net-misc/rpki-client/rpki-client-6.8_p0.ebuild
index 9e990f3102..3eb59e6b80 100644
--- a/net-misc/rpki-client/rpki-client-6.8_p0.ebuild
+++ b/net-misc/rpki-client/rpki-client-6.8_p0.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	sys-devel/libtool
+	dev-build/libtool
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/rpki-client/rpki-client-6.8_p1.ebuild b/net-misc/rpki-client/rpki-client-6.8_p1.ebuild
index 84362d0568..504e275228 100644
--- a/net-misc/rpki-client/rpki-client-6.8_p1.ebuild
+++ b/net-misc/rpki-client/rpki-client-6.8_p1.ebuild
@@ -19,7 +19,7 @@ DEPEND="
 	acct-user/_rpki-client
 "
 RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/libtool"
+BDEPEND="dev-build/libtool"
 
 S="${WORKDIR}/${MY_P}"
 src_configure() {
diff --git a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
index 229340a2bd..4d8d5a6a4e 100644
--- a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
+++ b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
@@ -20,8 +20,8 @@ DEPEND="
 	dev-libs/libevent:=
 	dev-libs/protobuf
 	dev-libs/openssl
-	sys-devel/libtool
-	sys-devel/automake:=
+	dev-build/libtool
+	dev-build/automake:=
 	>=dev-libs/boost-1.81.0-r1
 	dev-qt/qtcore
 	dev-qt/qtgui
@@ -36,8 +36,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	sys-devel/autoconf
-	sys-devel/automake
+	dev-build/automake
+	dev-build/automake
 "
 
 PATCHES=(
@@ -45,7 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/"${PV}"-paymentserver.patch
 	"${FILESDIR}"/"${PV}"-transactiondesc.patch
 	"${FILESDIR}"/"${PV}"-deque.patch
-	"${FILESDIR}"/gcc13.patch	
+	"${FILESDIR}"/gcc13.patch
 )
 
 WORKDIR_="${WORKDIR}/dogecoin-${PV}"
@@ -57,7 +57,7 @@ pkg_pretend() {
 		eerror "${ROOT}/etc/portage/patches/app-crypt/intel-ipsec-mb/remove_digest_init.patch does not exist!"
 		eerror "To build with avx2 intel support, please create ${ROOT}/etc/portage/patches/app-crypt/intel-ipsec-mb directory"
 		eerror "and copy patch from package net-p2p/dogecoin-qt/files/intel-ipsec-mb/remove_digest_init.patch into that directory"
-		die     
+		die
 	fi
 }
 
diff --git a/sci-electronics/bluespec/bluespec-2022.01-r1.ebuild b/sci-electronics/bluespec/bluespec-2022.01-r1.ebuild
index e89971935c..890871c122 100644
--- a/sci-electronics/bluespec/bluespec-2022.01-r1.ebuild
+++ b/sci-electronics/bluespec/bluespec-2022.01-r1.ebuild
@@ -61,7 +61,7 @@ BDEPEND="
 		dev-texlive/texlive-plaingeneric
 	)
 	sys-apps/coreutils
-	sys-devel/autoconf
+	dev-build/automake
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
diff --git a/sci-electronics/bluespec/bluespec-2023.01.ebuild b/sci-electronics/bluespec/bluespec-2023.01.ebuild
index e89971935c..890871c122 100644
--- a/sci-electronics/bluespec/bluespec-2023.01.ebuild
+++ b/sci-electronics/bluespec/bluespec-2023.01.ebuild
@@ -61,7 +61,7 @@ BDEPEND="
 		dev-texlive/texlive-plaingeneric
 	)
 	sys-apps/coreutils
-	sys-devel/autoconf
+	dev-build/automake
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
diff --git a/sci-electronics/bluespec/bluespec-2023.07.ebuild b/sci-electronics/bluespec/bluespec-2023.07.ebuild
index e89971935c..890871c122 100644
--- a/sci-electronics/bluespec/bluespec-2023.07.ebuild
+++ b/sci-electronics/bluespec/bluespec-2023.07.ebuild
@@ -61,7 +61,7 @@ BDEPEND="
 		dev-texlive/texlive-plaingeneric
 	)
 	sys-apps/coreutils
-	sys-devel/autoconf
+	dev-build/automake
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
diff --git a/sci-electronics/bluespec/bluespec-9999.ebuild b/sci-electronics/bluespec/bluespec-9999.ebuild
index e89971935c..890871c122 100644
--- a/sci-electronics/bluespec/bluespec-9999.ebuild
+++ b/sci-electronics/bluespec/bluespec-9999.ebuild
@@ -61,7 +61,7 @@ BDEPEND="
 		dev-texlive/texlive-plaingeneric
 	)
 	sys-apps/coreutils
-	sys-devel/autoconf
+	dev-build/automake
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
diff --git a/sys-fs/gfs2-utils/gfs2-utils-3.4.1.ebuild b/sys-fs/gfs2-utils/gfs2-utils-3.4.1.ebuild
index 657fd86f10..38c664cf56 100644
--- a/sys-fs/gfs2-utils/gfs2-utils-3.4.1.ebuild
+++ b/sys-fs/gfs2-utils/gfs2-utils-3.4.1.ebuild
@@ -16,9 +16,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="sys-devel/autoconf
-		sys-devel/automake
-		sys-devel/libtool
+BDEPEND="dev-build/automake
+		dev-build/automake
+		dev-build/libtool
 		dev-build/make
 "
 RDEPEND="sys-libs/zlib