diff --git a/metadata/md5-cache/app-accessibility/mimic1-1.3.0.1 b/metadata/md5-cache/app-accessibility/mimic1-1.3.0.1
index 86a59e258a..684f306f86 100644
--- a/metadata/md5-cache/app-accessibility/mimic1-1.3.0.1
+++ b/metadata/md5-cache/app-accessibility/mimic1-1.3.0.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/libpcre2 dev-libs/hts_engine alsa? ( media-libs/alsa-lib ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio )
 DESCRIPTION=Mycroft's TTS engine, based on CMU's Flite (Festival Lite)
@@ -11,5 +11,5 @@ LICENSE=BSD MIT public-domain freetts BSD-2 Apache-2.0
 RDEPEND=dev-libs/libpcre2 dev-libs/hts_engine alsa? ( media-libs/alsa-lib ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/MycroftAI/mimic1/archive/1.3.0.1.tar.gz -> mimic1-1.3.0.1.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=f8c334dd58a0fc049f06be74c4923cba
diff --git a/metadata/md5-cache/app-accessibility/mimic1-9999 b/metadata/md5-cache/app-accessibility/mimic1-9999
index 9d760ed25e..ed686715e7 100644
--- a/metadata/md5-cache/app-accessibility/mimic1-9999
+++ b/metadata/md5-cache/app-accessibility/mimic1-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=prepare unpack
 DEPEND=dev-libs/libpcre2 dev-libs/hts_engine alsa? ( media-libs/alsa-lib ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio )
 DESCRIPTION=Mycroft's TTS engine, based on CMU's Flite (Festival Lite)
@@ -10,5 +10,5 @@ LICENSE=BSD MIT public-domain freetts BSD-2 Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-libs/libpcre2 dev-libs/hts_engine alsa? ( media-libs/alsa-lib ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=defa798be6d0356587be3d5f5e0e475c
diff --git a/metadata/md5-cache/app-admin/oet-0.1.10 b/metadata/md5-cache/app-admin/oet-0.1.10
index 1af1933274..14b9f15087 100644
--- a/metadata/md5-cache/app-admin/oet-0.1.10
+++ b/metadata/md5-cache/app-admin/oet-0.1.10
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=sys-apps/util-linux
 DESCRIPTION=Update your system into binpkgs in an overlay sandbox
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=sys-apps/util-linux
 SLOT=0
 SRC_URI=https://codeberg.org/bcsthsc/overlay-emerge-tool/archive/oet-0.1.10.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=8b92af961a306db9b4b492446aa8c66c
diff --git a/metadata/md5-cache/app-admin/oet-0.1.9 b/metadata/md5-cache/app-admin/oet-0.1.9
index 3183789a6f..51eafafdd3 100644
--- a/metadata/md5-cache/app-admin/oet-0.1.9
+++ b/metadata/md5-cache/app-admin/oet-0.1.9
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=sys-apps/util-linux
 DESCRIPTION=Update your system into binpkgs in an overlay sandbox
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=sys-apps/util-linux
 SLOT=0
 SRC_URI=https://codeberg.org/bcsthsc/overlay-emerge-tool/archive/oet-0.1.9.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=8b92af961a306db9b4b492446aa8c66c
diff --git a/metadata/md5-cache/app-admin/oet-9999 b/metadata/md5-cache/app-admin/oet-9999
index 24b0302dfa..4bf9cd2bef 100644
--- a/metadata/md5-cache/app-admin/oet-9999
+++ b/metadata/md5-cache/app-admin/oet-9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=prepare unpack
 DEPEND=sys-apps/util-linux
 DESCRIPTION=Update your system into binpkgs in an overlay sandbox
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 PROPERTIES=live
 RDEPEND=sys-apps/util-linux
 SLOT=0
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=8b92af961a306db9b4b492446aa8c66c
diff --git a/metadata/md5-cache/app-backup/blocksync-fast-1.0.3 b/metadata/md5-cache/app-backup/blocksync-fast-1.0.3
index 8f185e3d01..f23dcf4c55 100644
--- a/metadata/md5-cache/app-backup/blocksync-fast-1.0.3
+++ b/metadata/md5-cache/app-backup/blocksync-fast-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/libgcrypt-1.9.0:0= xxhash? ( >=dev-libs/xxhash-0.8 )
 DESCRIPTION=Fast block device sync with digest, designed to improve block-based backups.
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/libgcrypt-1.9.0:0= xxhash? ( >=dev-libs/xxhash-0.8 )
 SLOT=0
 SRC_URI=https://github.com/nethappen/blocksync-fast/archive/v1.0.3.tar.gz -> blocksync-fast-1.0.3.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=43db9b0a60ba5eff2b81eab995ac3628
diff --git a/metadata/md5-cache/app-dicts/dictd-gazetteer-1.3 b/metadata/md5-cache/app-dicts/dictd-gazetteer-1.3
index 550ce2c243..f736e1bb87 100644
--- a/metadata/md5-cache/app-dicts/dictd-gazetteer-1.3
+++ b/metadata/md5-cache/app-dicts/dictd-gazetteer-1.3
@@ -1,4 +1,4 @@
-BDEPEND=>=app-text/dictd-1.13.0-r3 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=>=app-text/dictd-1.13.0-r3 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=The original U.S. Gazetteer Place and Zipcode Files for dict
 EAPI=7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 public-domain
 RDEPEND=>=app-text/dictd-1.13.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/project/dict-gazetteer/dict-gazetteer_1.3.orig.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=df642b56c73e13a870610bb6f3724cd9
diff --git a/metadata/md5-cache/app-dicts/dictd-mueller-3.1-r1 b/metadata/md5-cache/app-dicts/dictd-mueller-3.1-r1
index fce1bed238..77a223f7e7 100644
--- a/metadata/md5-cache/app-dicts/dictd-mueller-3.1-r1
+++ b/metadata/md5-cache/app-dicts/dictd-mueller-3.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-text/dictd-1.13.0-r3 dev-lang/perl sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=>=app-text/dictd-1.13.0-r3 dev-lang/perl sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=V. K. Mueller English-Russian Dictionary
 EAPI=7
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/dictd-1.13.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=f3af25fc0e2b0014273e6c169814ca6a
diff --git a/metadata/md5-cache/app-eselect/eselect-bluespec-1.0.2 b/metadata/md5-cache/app-eselect/eselect-bluespec-1.0.2
index ee7a15c7ba..9d6a052a30 100644
--- a/metadata/md5-cache/app-eselect/eselect-bluespec-1.0.2
+++ b/metadata/md5-cache/app-eselect/eselect-bluespec-1.0.2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DESCRIPTION=Manages the /usr/bin/bsc (bluespec) symlink
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/vowstar/eselect-bluespec/archive/refs/tags/1.0.2.tar.gz -> eselect-bluespec-1.0.2.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=f1a2c633a5b232b6c141ce20bee5b2f5
diff --git a/metadata/md5-cache/app-i18n/canna-3.7_p3-r4 b/metadata/md5-cache/app-i18n/canna-3.7_p3-r4
index 6cd1163847..2202db50a1 100644
--- a/metadata/md5-cache/app-i18n/canna-3.7_p3-r4
+++ b/metadata/md5-cache/app-i18n/canna-3.7_p3-r4
@@ -1,4 +1,4 @@
-BDEPEND=x11-misc/gccmakedep x11-misc/imake canuum? ( virtual/pkgconfig ) doc? ( app-text/ghostscript-gpl dev-texlive/texlive-langjapanese dev-texlive/texlive-latexrecommended ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+BDEPEND=x11-misc/gccmakedep x11-misc/imake canuum? ( virtual/pkgconfig ) doc? ( app-text/ghostscript-gpl dev-texlive/texlive-langjapanese dev-texlive/texlive-latexrecommended ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=acct-group/canna acct-user/canna canuum? ( dev-libs/libspt sys-libs/ncurses:= )
 DESCRIPTION=A client-server based Kana-Kanji conversion system
@@ -11,5 +11,5 @@ LICENSE=MIT GPL-2
 RDEPEND=acct-group/canna acct-user/canna canuum? ( dev-libs/libspt sys-libs/ncurses:= ) virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/canna/9565/Canna37p3.tar.bz2 https://sources.debian.org/data/main/c/canna/3.7p3-19/debian/patches/09_fix_manpages_error.patch
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	cannadic	ad961c92f4263dd6cbf82bf9b97c141c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	cannadic	ad961c92f4263dd6cbf82bf9b97c141c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f
 _md5_=d6b1234eddeaec1764db8b313142b5d6
diff --git a/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1 b/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1
index 0897b40519..99b587a173 100644
--- a/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1
+++ b/metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=install postinst postrm prepare
 DEPEND=app-i18n/canna x11-libs/gtk+:2 sys-devel/gettext
 DESCRIPTION=Japanese Canna input method module for GTK+2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/canna x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-canna-0.3.2.2.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	xdg-utils	baea6080dd821f5562d715887954c9d3	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	xdg-utils	baea6080dd821f5562d715887954c9d3	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116
 _md5_=4f4710cb3f65b0b07765c6c22e524726
diff --git a/metadata/md5-cache/app-i18n/scim-canna-1.0.1 b/metadata/md5-cache/app-i18n/scim-canna-1.0.1
index 67b468dd31..c4ef90c1c2 100644
--- a/metadata/md5-cache/app-i18n/scim-canna-1.0.1
+++ b/metadata/md5-cache/app-i18n/scim-canna-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=app-i18n/canna app-i18n/scim dev-libs/atk dev-libs/glib:2 dev-libs/libltdl media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango
 DESCRIPTION=SCIM IMEngine module using Canna
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=app-i18n/canna app-i18n/scim dev-libs/atk dev-libs/glib:2 dev-libs/libltdl media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango
 SLOT=0
 SRC_URI=https://free.nchc.org.tw/osdn//scim-imengine/29155/scim-canna-1.0.1.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=cdb552bf0472ef718843474c021a58fa
diff --git a/metadata/md5-cache/app-misc/dbf-0.9.0 b/metadata/md5-cache/app-misc/dbf-0.9.0
index 37bcd7d921..4a01d3316e 100644
--- a/metadata/md5-cache/app-misc/dbf-0.9.0
+++ b/metadata/md5-cache/app-misc/dbf-0.9.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-perl/XML-Parser dev-libs/libdbf doc? ( app-text/docbook-sgml-utils ) virtual/pkgconfig
 DESCRIPTION=Command line tool to read the content of dBASE III, IV, and 5.0 files
@@ -10,5 +10,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/rollinhand/dbf-core/archive/8c1df2e694ca81a2c2ff1d7de150629e69092ea1.tar.gz -> dbf-0.9.0.tgz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=e0dfa23df45deace31ba4bc67684e66e
diff --git a/metadata/md5-cache/app-misc/electricsheep-3.0.2_p20191005 b/metadata/md5-cache/app-misc/electricsheep-3.0.2_p20191005
index ad901994ca..80e4d342ca 100644
--- a/metadata/md5-cache/app-misc/electricsheep-3.0.2_p20191005
+++ b/metadata/md5-cache/app-misc/electricsheep-3.0.2_p20191005
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-lang/lua:5.1 dev-libs/boost dev-libs/expat dev-libs/tinyxml gnome-base/libgtop media-gfx/flam3 media-libs/freeglut media-libs/glee media-libs/libpng:* media-video/ffmpeg:0 net-misc/curl sys-libs/zlib x11-libs/libX11 x11-libs/libXrender x11-libs/wxGTK:3.0-gtk3 virtual/opengl
 DESCRIPTION=Realize the collective dream of sleeping computers from all over the internet
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/lua:5.1 dev-libs/boost dev-libs/expat dev-libs/tinyxml gnome-base/libgtop media-gfx/flam3 media-libs/freeglut media-libs/glee media-libs/libpng:* media-video/ffmpeg:0 net-misc/curl sys-libs/zlib x11-libs/libX11 x11-libs/libXrender x11-libs/wxGTK:3.0-gtk3 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/scottdraves/electricsheep/archive/37ba0fd692d6581f8fe009ed11c9650cd8174123.tar.gz -> electricsheep-3.0.2_p20191005.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	desktop	021728fdc1b03b36357dbc89489e0f0d
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	desktop	021728fdc1b03b36357dbc89489e0f0d
 _md5_=699586519794d28efb98d6210acd18b0
diff --git a/metadata/md5-cache/app-misc/electricsheep-3.0.2_p20191005-r1 b/metadata/md5-cache/app-misc/electricsheep-3.0.2_p20191005-r1
index 684378086a..c664b99f9e 100644
--- a/metadata/md5-cache/app-misc/electricsheep-3.0.2_p20191005-r1
+++ b/metadata/md5-cache/app-misc/electricsheep-3.0.2_p20191005-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-lang/lua:5.1 dev-libs/boost dev-libs/expat dev-libs/tinyxml gnome-base/libgtop media-gfx/flam3 media-libs/freeglut media-libs/glee media-libs/libpng:* media-video/ffmpeg:0 net-misc/curl sys-libs/zlib x11-libs/libX11 x11-libs/libXrender x11-libs/wxGTK:3.0-gtk3 virtual/opengl
 DESCRIPTION=Realize the collective dream of sleeping computers from all over the internet
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/lua:5.1 dev-libs/boost dev-libs/expat dev-libs/tinyxml gnome-base/libgtop media-gfx/flam3 media-libs/freeglut media-libs/glee media-libs/libpng:* media-video/ffmpeg:0 net-misc/curl sys-libs/zlib x11-libs/libX11 x11-libs/libXrender x11-libs/wxGTK:3.0-gtk3 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/scottdraves/electricsheep/archive/37ba0fd692d6581f8fe009ed11c9650cd8174123.tar.gz -> electricsheep-3.0.2_p20191005.tar.gz https://github.com/scottdraves/electricsheep/pull/109.patch -> electricsheep-fix-ffmpeg5.patch
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	desktop	021728fdc1b03b36357dbc89489e0f0d
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	desktop	021728fdc1b03b36357dbc89489e0f0d
 _md5_=f15fcc3def411a7f39709c987c5006d2
diff --git a/metadata/md5-cache/app-misc/neo-9999 b/metadata/md5-cache/app-misc/neo-9999
index 34d55b12af..6a68733899 100644
--- a/metadata/md5-cache/app-misc/neo-9999
+++ b/metadata/md5-cache/app-misc/neo-9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf sys-devel/autoconf-archive sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/autoconf sys-devel/autoconf-archive sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=prepare unpack
 DEPEND=sys-libs/ncurses
 DESCRIPTION=cmatrix clone with 32-bit color and Unicode support
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=sys-libs/ncurses
 SLOT=0
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=7b987d5299521a8ab0d29405d456f9f1
diff --git a/metadata/md5-cache/app-misc/oddjob-0.34.7 b/metadata/md5-cache/app-misc/oddjob-0.34.7
index 02e6c028ee..595855393f 100644
--- a/metadata/md5-cache/app-misc/oddjob-0.34.7
+++ b/metadata/md5-cache/app-misc/oddjob-0.34.7
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.3 app-text/xmlto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.3 app-text/xmlto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
 DEPEND=sys-apps/dbus[selinux?] pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-oddjob sys-libs/libselinux )
 DESCRIPTION=A D-Bus service which runs odd jobs on behalf of client applications
@@ -12,5 +12,5 @@ RDEPEND=sys-apps/dbus[selinux?] pam? ( sys-libs/pam ) selinux? ( sec-policy/seli
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.pagure.org/oddjob/oddjob-0.34.7.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	systemd	c8b03e8df84486aa991d4396686e8942
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	systemd	c8b03e8df84486aa991d4396686e8942
 _md5_=39189369a177cf36c424726e7a43e28c
diff --git a/metadata/md5-cache/app-portage/version-0.19.0_alpha b/metadata/md5-cache/app-portage/version-0.19.0_alpha
index 6255d2ce37..9bd1ee05a7 100644
--- a/metadata/md5-cache/app-portage/version-0.19.0_alpha
+++ b/metadata/md5-cache/app-portage/version-0.19.0_alpha
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-coreutils
 DESCRIPTION=A command line function for package version management.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-coreutils
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-version/archive/0.19.0-alpha.tar.gz -> version-0.19.0_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=aae9d545dbadbe35135e22a3b2eeae2d
diff --git a/metadata/md5-cache/app-portage/version-0.20.1_alpha b/metadata/md5-cache/app-portage/version-0.20.1_alpha
index 55a4bb12e5..6659e1a7ec 100644
--- a/metadata/md5-cache/app-portage/version-0.20.1_alpha
+++ b/metadata/md5-cache/app-portage/version-0.20.1_alpha
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-coreutils
 DESCRIPTION=A command line function for package version management.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-coreutils
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-version/archive/0.20.1-alpha.tar.gz -> version-0.20.1_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=aae9d545dbadbe35135e22a3b2eeae2d
diff --git a/metadata/md5-cache/app-portage/version-0.21.0_alpha b/metadata/md5-cache/app-portage/version-0.21.0_alpha
index 1a9a2e97bd..293b1ed07b 100644
--- a/metadata/md5-cache/app-portage/version-0.21.0_alpha
+++ b/metadata/md5-cache/app-portage/version-0.21.0_alpha
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-coreutils
 DESCRIPTION=A command line function for package version management.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-coreutils
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-version/archive/0.21.0-alpha.tar.gz -> version-0.21.0_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=aae9d545dbadbe35135e22a3b2eeae2d
diff --git a/metadata/md5-cache/dev-dotnet/gtk-sharp-2.99.3-r3 b/metadata/md5-cache/dev-dotnet/gtk-sharp-2.99.3-r3
index 054560eb63..03d102882e 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-sharp-2.99.3-r3
+++ b/metadata/md5-cache/dev-dotnet/gtk-sharp-2.99.3-r3
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/mono sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-lang/mono sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=>=dev-lang/mono-3.0 x11-libs/pango >=dev-libs/glib-2.31 dev-libs/atk x11-libs/gtk+:3 gnome-base/libglade dev-perl/XML-LibXML !dev-dotnet/gtk-sharp-gapi !dev-dotnet/gtk-sharp-docs !dev-dotnet/gtk-dotnet-sharp !dev-dotnet/gdk-sharp !dev-dotnet/glib-sharp !dev-dotnet/glade-sharp !dev-dotnet/pango-sharp !dev-dotnet/atk-sharp virtual/pkgconfig sys-devel/automake:1.11
 DESCRIPTION=gtk bindings for mono
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/mono-3.0 x11-libs/pango >=dev-libs/glib-2.31 dev-libs/atk x11
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/mono/gtk-sharp/archive/2.99.3.tar.gz -> gtk-sharp-2.99.3.tar.gz
-_eclasses_=mono-env	cef880fd27385e7e80934656e8789627	dotnet	ef209a6e0d509373d570f41c2120c9fa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=mono-env	cef880fd27385e7e80934656e8789627	dotnet	ef209a6e0d509373d570f41c2120c9fa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=829b15e8ea89fd62e5df4dc60bb081a6
diff --git a/metadata/md5-cache/dev-embedded/mv88e6xxx-dump-0.2.0_pre20210327 b/metadata/md5-cache/dev-embedded/mv88e6xxx-dump-0.2.0_pre20210327
index 3c521c7e80..b3d30d1677 100644
--- a/metadata/md5-cache/dev-embedded/mv88e6xxx-dump-0.2.0_pre20210327
+++ b/metadata/md5-cache/dev-embedded/mv88e6xxx-dump-0.2.0_pre20210327
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=net-libs/libmnl:=
 DESCRIPTION=Dump information about Marvell mv88e6xxx Ethernet switches
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/lunn/mv88e6xxx_dump/archive/25fa4d07d7a5551fee6d8d7ad128cdffd50532c8.tar.gz -> mv88e6xxx-dump-0.2.0_pre20210327.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=7b858f3c6f19ae2b537bbbabbb219041
diff --git a/metadata/md5-cache/dev-embedded/rauc-1.10.1 b/metadata/md5-cache/dev-embedded/rauc-1.10.1
index 4284b44b91..115962bb46 100644
--- a/metadata/md5-cache/dev-embedded/rauc-1.10.1
+++ b/metadata/md5-cache/dev-embedded/rauc-1.10.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/gdbus-codegen virtual/pkgconfig test? ( dev-libs/opensc net-misc/casync sys-fs/mtd-utils sys-fs/squashfs-tools sys-libs/libfaketime ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 doc? ( || ( ( dev-lang/python:3.12 dev-python/sphinx[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ) )
+BDEPEND=dev-util/gdbus-codegen virtual/pkgconfig test? ( dev-libs/opensc net-misc/casync sys-fs/mtd-utils sys-fs/squashfs-tools sys-libs/libfaketime ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 doc? ( || ( ( dev-lang/python:3.12 dev-python/sphinx[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ) )
 DEFINED_PHASES=compile configure prepare setup
 DEPEND=dev-libs/glib:2 dev-libs/openssl:0= json? ( dev-libs/json-glib ) network? ( net-misc/curl ) service? ( sys-apps/dbus )
 DESCRIPTION=Lightweight update client that runs on your Embedded Linux device
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/openssl:0= json? ( dev-libs/json-glib ) network
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rauc/rauc/releases/download/v1.10.1/rauc-1.10.1.tar.xz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2	docs	7f3c0d47338743498c69f1887a139f57
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2	docs	7f3c0d47338743498c69f1887a139f57
 _md5_=b50592ca02fcd4405a3c9d9c9fdd5826
diff --git a/metadata/md5-cache/dev-java/jcuber-4.7-r1 b/metadata/md5-cache/dev-java/jcuber-4.7-r1
index 2a97ea3454..f41ff5a84b 100644
--- a/metadata/md5-cache/dev-java/jcuber-4.7-r1
+++ b/metadata/md5-cache/dev-java/jcuber-4.7-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=dev-java/xerces:2 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Java reader library
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://apps.fz-juelich.de/scalasca/releases/cube/4.7/dist/jcuber-4.7.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	7420278ca3baf272711c56c3b435ac99
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	7420278ca3baf272711c56c3b435ac99
 _md5_=7693dc14d21fb51c0db52d90de625191
diff --git a/metadata/md5-cache/dev-lang/aldor-1.2.0_p20190730-r1 b/metadata/md5-cache/dev-lang/aldor-1.2.0_p20190730-r1
index a04893f1e4..35ab0b900d 100644
--- a/metadata/md5-cache/dev-lang/aldor-1.2.0_p20190730-r1
+++ b/metadata/md5-cache/dev-lang/aldor-1.2.0_p20190730-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/yacc doc? ( virtual/latex-base ) emacs? ( app-text/noweb ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=app-alternatives/yacc doc? ( virtual/latex-base ) emacs? ( app-text/noweb ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
 DEPEND=dev-libs/boehm-gc emacs? ( app-editors/emacs:= ) java? ( dev-java/junit:= ) java? ( virtual/jdk:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=The Aldor Programming Language
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/boehm-gc emacs? ( app-editors/emacs:= ) java? ( dev-java/junit:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/pippijn/aldor/archive/13e5b90eecc79ec6704efb333c4c100187520e80.tar.gz -> aldor-1.2.0_p20190730.tar.gz doc? ( http://aldor.org/docs/libaldor.pdf.gz https://github.com/pippijn/aldor/files/5469932/algebra.pdf ) emacs? ( http://hemmecke.de/aldor/aldor.el.nw )
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	elisp-common	2a0fa407d2e6363c663ccb299503b25c	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	elisp-common	2a0fa407d2e6363c663ccb299503b25c	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629
 _md5_=4a3520d189b141ecd48e2ef98b471ea9
diff --git a/metadata/md5-cache/dev-libs/cgicc-3.2.19 b/metadata/md5-cache/dev-libs/cgicc-3.2.19
index d60b34670f..ae97dc8a58 100644
--- a/metadata/md5-cache/dev-libs/cgicc-3.2.19
+++ b/metadata/md5-cache/dev-libs/cgicc-3.2.19
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=doc? ( app-text/doxygen )
 DESCRIPTION=A C++ class library for writing CGI applications
@@ -10,5 +10,5 @@ KEYWORDS=~amd64
 LICENSE=LGPL-3 doc? ( FDL-1.2 )
 SLOT=0
 SRC_URI=mirror://gnu/cgicc/cgicc-3.2.19.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=4a9eee6d5f7fea2aa486df7878dd7b35
diff --git a/metadata/md5-cache/dev-libs/cgicc-3.2.20 b/metadata/md5-cache/dev-libs/cgicc-3.2.20
index 5aa10499bf..dfd01fb137 100644
--- a/metadata/md5-cache/dev-libs/cgicc-3.2.20
+++ b/metadata/md5-cache/dev-libs/cgicc-3.2.20
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=doc? ( app-text/doxygen )
 DESCRIPTION=A C++ class library for writing CGI applications
@@ -10,5 +10,5 @@ KEYWORDS=~amd64
 LICENSE=LGPL-3 doc? ( FDL-1.2 )
 SLOT=0
 SRC_URI=mirror://gnu/cgicc/cgicc-3.2.20.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=4a9eee6d5f7fea2aa486df7878dd7b35
diff --git a/metadata/md5-cache/dev-libs/cubelib-4.7-r2 b/metadata/md5-cache/dev-libs/cubelib-4.7-r2
index c905f4e682..9ce434e143 100644
--- a/metadata/md5-cache/dev-libs/cubelib-4.7-r2
+++ b/metadata/md5-cache/dev-libs/cubelib-4.7-r2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/flex app-alternatives/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/flex app-alternatives/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=sys-libs/binutils-libs sys-libs/zlib R? ( dev-lang/R dev-R/Rcpp dev-R/RInside ) dev-cpp/gtest
 DESCRIPTION=General purpose C++ library and tools
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/binutils-libs sys-libs/zlib R? ( dev-lang/R dev-R/Rcpp dev-R/RI
 REQUIRED_USE=^^ ( cubelib_strategy_keepall cubelib_strategy_preload cubelib_strategy_manual cubelib_strategy_lastn )
 SLOT=0
 SRC_URI=https://apps.fz-juelich.de/scalasca/releases/cube/4.7/dist/cubelib-4.7.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=f5b30b05db2e7e87d98708d455648194
diff --git a/metadata/md5-cache/dev-libs/cubew-4.7 b/metadata/md5-cache/dev-libs/cubew-4.7
index bb6c8035e1..72613ae9d7 100644
--- a/metadata/md5-cache/dev-libs/cubew-4.7
+++ b/metadata/md5-cache/dev-libs/cubew-4.7
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=sys-libs/binutils-libs zlib? ( sys-libs/zlib )
 DESCRIPTION=High performance C Writer library
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/binutils-libs zlib? ( sys-libs/zlib )
 REQUIRED_USE=memory-tracking? ( advanced-memory ) memory-tracing? ( advanced-memory )
 SLOT=0
 SRC_URI=https://apps.fz-juelich.de/scalasca/releases/cube/4.7/dist/cubew-4.7.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=8b2dd12ad438fe23f0c8ab4fa63980d7
diff --git a/metadata/md5-cache/dev-libs/ip2loc-8.1.4 b/metadata/md5-cache/dev-libs/ip2loc-8.1.4
index 62bf5639d1..715897f009 100644
--- a/metadata/md5-cache/dev-libs/ip2loc-8.1.4
+++ b/metadata/md5-cache/dev-libs/ip2loc-8.1.4
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-lang/perl sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install
 DESCRIPTION=IP2Location C Library
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/chrislim2888/IP2Location-C-Library/archive/8.1.4.tar.gz -> ip2loc-8.1.4.gh.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=ebb54730ef2648514071c4961458e42b
diff --git a/metadata/md5-cache/dev-libs/libdatrie-0.2.13 b/metadata/md5-cache/dev-libs/libdatrie-0.2.13
index f7a7ced693..ad7b162053 100644
--- a/metadata/md5-cache/dev-libs/libdatrie-0.2.13
+++ b/metadata/md5-cache/dev-libs/libdatrie-0.2.13
@@ -1,4 +1,4 @@
-BDEPEND=dev-vcs/git sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-vcs/git sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DESCRIPTION=Double-Array Trie Library
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/tlwg/libdatrie/archive/v0.2.13.tar.gz -> libdatrie-0.2.13.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=5481d8a8ade5fd852d5c691fcf8dc290
diff --git a/metadata/md5-cache/dev-libs/libdbf-0.0.1 b/metadata/md5-cache/dev-libs/libdbf-0.0.1
index 7c67685c6b..2238a0dc93 100644
--- a/metadata/md5-cache/dev-libs/libdbf-0.0.1
+++ b/metadata/md5-cache/dev-libs/libdbf-0.0.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/intltool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/intltool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-perl/XML-Parser doc? ( app-text/docbook-sgml-utils ) virtual/pkgconfig
 DESCRIPTION=Library to read the content of dBASE III, IV, and 5.0 files
@@ -10,5 +10,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/rollinhand/libdbf/archive/d86e1dfb1e70f61b9227817dbccd20955cd8a86a.tar.gz -> libdbf-0.0.1.tgz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=d3fcbc31a8a2d65a859ffe07daec62f0
diff --git a/metadata/md5-cache/dev-libs/libthai-0.1.28 b/metadata/md5-cache/dev-libs/libthai-0.1.28
index 4119c912a0..df871cc624 100644
--- a/metadata/md5-cache/dev-libs/libthai-0.1.28
+++ b/metadata/md5-cache/dev-libs/libthai-0.1.28
@@ -1,4 +1,4 @@
-BDEPEND=dev-vcs/git sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-vcs/git sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/libdatrie
 DESCRIPTION=A a set of Thai language support routines
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libdatrie
 SLOT=0
 SRC_URI=https://github.com/tlwg/libthai/archive/v0.1.28.tar.gz -> libthai-0.1.28.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=f7507b82a4c460aad76884c12d2f5a47
diff --git a/metadata/md5-cache/dev-libs/libthai-0.1.29 b/metadata/md5-cache/dev-libs/libthai-0.1.29
index 3162c08353..e3045af04c 100644
--- a/metadata/md5-cache/dev-libs/libthai-0.1.29
+++ b/metadata/md5-cache/dev-libs/libthai-0.1.29
@@ -1,4 +1,4 @@
-BDEPEND=dev-vcs/git sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-vcs/git sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/libdatrie
 DESCRIPTION=A a set of Thai language support routines
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libdatrie
 SLOT=0
 SRC_URI=https://github.com/tlwg/libthai/archive/v0.1.29.tar.gz -> libthai-0.1.29.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=47d66386a98bdb86f0452c06ad69e3a9
diff --git a/metadata/md5-cache/dev-libs/luksmeta-9 b/metadata/md5-cache/dev-libs/luksmeta-9
index 16fa8f79e6..96f056031f 100644
--- a/metadata/md5-cache/dev-libs/luksmeta-9
+++ b/metadata/md5-cache/dev-libs/luksmeta-9
@@ -1,4 +1,4 @@
-BDEPEND=man? ( app-text/asciidoc ) sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=man? ( app-text/asciidoc ) sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=install prepare
 DEPEND=sys-fs/cryptsetup
 DESCRIPTION=LUKSMeta is a simple library for storing metadata in the LUKSv1 header
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-fs/cryptsetup
 SLOT=0
 SRC_URI=https://github.com/latchset/luksmeta/archive/v9.tar.gz -> luksmeta-9.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=dc50d0b123e75f520c56b1c20bb5d2ff
diff --git a/metadata/md5-cache/dev-libs/memkind-1.13.0 b/metadata/md5-cache/dev-libs/memkind-1.13.0
index ecfa0cb8cc..c82c2f7ca2 100644
--- a/metadata/md5-cache/dev-libs/memkind-1.13.0
+++ b/metadata/md5-cache/dev-libs/memkind-1.13.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare pretend setup test
 DEPEND=daxctl? ( sys-block/ndctl ) hwloc? ( sys-apps/hwloc ) sys-process/numactl || ( dev-lang/python:3.11 dev-lang/python:3.10 dev-python/pypy3 )
 DESCRIPTION=user extensible heap manager built on top of jemalloc
@@ -12,5 +12,5 @@ RDEPEND=daxctl? ( sys-block/ndctl ) hwloc? ( sys-apps/hwloc ) sys-process/numact
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/memkind/memkind/archive/v1.13.0.tar.gz -> memkind-1.13.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2
 _md5_=9436dcf904535778a4499e94f952e7d7
diff --git a/metadata/md5-cache/dev-libs/octetos-biblion-0.1.1_alpha b/metadata/md5-cache/dev-libs/octetos-biblion-0.1.1_alpha
index d14d8473fd..48b7a0bd42 100644
--- a/metadata/md5-cache/dev-libs/octetos-biblion-0.1.1_alpha
+++ b/metadata/md5-cache/dev-libs/octetos-biblion-0.1.1_alpha
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/cunit sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/cunit sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/octetos-core
 DESCRIPTION=Library for reading biblia.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-core
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-biblion/archive/0.1.1-alpha/.tar.gz -> octetos-biblion-0.1.1_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=5050c239e70cd4fd6d0b41af7b16801f
diff --git a/metadata/md5-cache/dev-libs/octetos-core-2.15.0_beta b/metadata/md5-cache/dev-libs/octetos-core-2.15.0_beta
index 75ef1a9141..3f34ec1f01 100644
--- a/metadata/md5-cache/dev-libs/octetos-core-2.15.0_beta
+++ b/metadata/md5-cache/dev-libs/octetos-core-2.15.0_beta
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/libconfig dev-perl/XML-Parser
 DESCRIPTION=C/C++ library to mainly provide Semantic Versioned implementation
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libconfig dev-perl/XML-Parser
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-core/archive/2.15.0-beta/.tar.gz -> octetos-core-2.15.0_beta.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=5dcefbba0e4d5ed2ede384d6ff86d147
diff --git a/metadata/md5-cache/dev-libs/octetos-core-2.20.0_beta b/metadata/md5-cache/dev-libs/octetos-core-2.20.0_beta
index 1fd8ac5c02..d395d4ea5d 100644
--- a/metadata/md5-cache/dev-libs/octetos-core-2.20.0_beta
+++ b/metadata/md5-cache/dev-libs/octetos-core-2.20.0_beta
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/libconfig dev-perl/XML-Parser
 DESCRIPTION=C/C++ library to mainly provide Semantic Versioned implementation
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libconfig dev-perl/XML-Parser
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-core/archive/2.20.0-beta/.tar.gz -> octetos-core-2.20.0_beta.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=5089ae02aba7614becfee8435579de83
diff --git a/metadata/md5-cache/dev-libs/octetos-core-2.25.0_beta b/metadata/md5-cache/dev-libs/octetos-core-2.25.0_beta
index a94277e13e..1f3f042513 100644
--- a/metadata/md5-cache/dev-libs/octetos-core-2.25.0_beta
+++ b/metadata/md5-cache/dev-libs/octetos-core-2.25.0_beta
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/libconfig dev-perl/XML-Parser
 DESCRIPTION=C/C++ library to mainly provide Semantic Versioned implementation
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libconfig dev-perl/XML-Parser
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-core/archive/2.25.0-beta/.tar.gz -> octetos-core-2.25.0_beta.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=b9416bc6f4f5c8e7513ddd66882ce8ec
diff --git a/metadata/md5-cache/dev-libs/octetos-core-2.25.1_beta b/metadata/md5-cache/dev-libs/octetos-core-2.25.1_beta
index d09bf42cb9..2b74c7080b 100644
--- a/metadata/md5-cache/dev-libs/octetos-core-2.25.1_beta
+++ b/metadata/md5-cache/dev-libs/octetos-core-2.25.1_beta
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/libconfig dev-perl/XML-Parser
 DESCRIPTION=C/C++ library to mainly provide Semantic Versioned implementation
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libconfig dev-perl/XML-Parser
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-core/archive/2.25.1-beta/.tar.gz -> octetos-core-2.25.1_beta.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=8c3b8c50aeafac1872a338c7d829df79
diff --git a/metadata/md5-cache/dev-libs/octetos-core-2.31.2_beta b/metadata/md5-cache/dev-libs/octetos-core-2.31.2_beta
index e9299621f4..e311aeaffd 100644
--- a/metadata/md5-cache/dev-libs/octetos-core-2.31.2_beta
+++ b/metadata/md5-cache/dev-libs/octetos-core-2.31.2_beta
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/libconfig dev-perl/XML-Parser
 DESCRIPTION=C/C++ library to mainly provide Semantic Versioned implementation
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libconfig dev-perl/XML-Parser
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-core/archive/2.31.2-beta/.tar.gz -> octetos-core-2.31.2_beta.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=8c3b8c50aeafac1872a338c7d829df79
diff --git a/metadata/md5-cache/dev-libs/octetos-core-2.31.3_beta b/metadata/md5-cache/dev-libs/octetos-core-2.31.3_beta
index 56274d9446..fdc57a53ba 100644
--- a/metadata/md5-cache/dev-libs/octetos-core-2.31.3_beta
+++ b/metadata/md5-cache/dev-libs/octetos-core-2.31.3_beta
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/libconfig dev-perl/XML-Parser
 DESCRIPTION=C/C++ library to mainly provide Semantic Versioned implementation
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libconfig dev-perl/XML-Parser
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-core/archive/2.31.3-beta/.tar.gz -> octetos-core-2.31.3_beta.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=8c3b8c50aeafac1872a338c7d829df79
diff --git a/metadata/md5-cache/dev-libs/octetos-core-2.31.5_beta b/metadata/md5-cache/dev-libs/octetos-core-2.31.5_beta
index e2302d198e..6cb66bc5b2 100644
--- a/metadata/md5-cache/dev-libs/octetos-core-2.31.5_beta
+++ b/metadata/md5-cache/dev-libs/octetos-core-2.31.5_beta
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/libconfig dev-perl/XML-Parser
 DESCRIPTION=C/C++ library to mainly provide Semantic Versioned implementation
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libconfig dev-perl/XML-Parser
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-core/archive/2.31.5-beta/.tar.gz -> octetos-core-2.31.5_beta.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=8c3b8c50aeafac1872a338c7d829df79
diff --git a/metadata/md5-cache/dev-libs/octetos-core-2.32.0_beta b/metadata/md5-cache/dev-libs/octetos-core-2.32.0_beta
index a48218bda4..540192165a 100644
--- a/metadata/md5-cache/dev-libs/octetos-core-2.32.0_beta
+++ b/metadata/md5-cache/dev-libs/octetos-core-2.32.0_beta
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/cunit dev-util/intltool sys-devel/bison >=sys-devel/gcc-8.1 sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/libconfig dev-perl/XML-Parser
 DESCRIPTION=C/C++ library to mainly provide Semantic Versioned implementation
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libconfig dev-perl/XML-Parser
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-core/archive/2.32.0-beta/.tar.gz -> octetos-core-2.32.0_beta.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=8c3b8c50aeafac1872a338c7d829df79
diff --git a/metadata/md5-cache/dev-libs/octetos-coreutils-0.11.1_alpha b/metadata/md5-cache/dev-libs/octetos-coreutils-0.11.1_alpha
index 959538704d..2bf9f877a2 100644
--- a/metadata/md5-cache/dev-libs/octetos-coreutils-0.11.1_alpha
+++ b/metadata/md5-cache/dev-libs/octetos-coreutils-0.11.1_alpha
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/cunit sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/cunit sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-core
 DESCRIPTION=Similar to coreutils but is a C++ API.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-core
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-coreutils/archive/0.11.1-alpha.tar.gz -> octetos-coreutils-0.11.1_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=da0a2e0794a75228dbfae942adde8be4
diff --git a/metadata/md5-cache/dev-libs/octetos-coreutils-0.13.0_alpha b/metadata/md5-cache/dev-libs/octetos-coreutils-0.13.0_alpha
index 621e35a849..d46ac4f229 100644
--- a/metadata/md5-cache/dev-libs/octetos-coreutils-0.13.0_alpha
+++ b/metadata/md5-cache/dev-libs/octetos-coreutils-0.13.0_alpha
@@ -1,4 +1,4 @@
-BDEPEND=dev-libs/check dev-util/cunit sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-libs/check dev-util/cunit sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-core
 DESCRIPTION=Similar to coreutils but is a C++ API.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-core
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-coreutils/archive/0.13.0-alpha.tar.gz -> octetos-coreutils-0.13.0_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=92275129363227e88089db9871a7aa5f
diff --git a/metadata/md5-cache/dev-libs/octetos-coreutils-0.17.0_alpha b/metadata/md5-cache/dev-libs/octetos-coreutils-0.17.0_alpha
index cae09adcab..5791050a00 100644
--- a/metadata/md5-cache/dev-libs/octetos-coreutils-0.17.0_alpha
+++ b/metadata/md5-cache/dev-libs/octetos-coreutils-0.17.0_alpha
@@ -1,4 +1,4 @@
-BDEPEND=dev-libs/check dev-util/cunit sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-libs/check dev-util/cunit sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-core
 DESCRIPTION=Similar to coreutils but is a C++ API.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-core
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-coreutils/archive/0.17.0-alpha.tar.gz -> octetos-coreutils-0.17.0_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=92275129363227e88089db9871a7aa5f
diff --git a/metadata/md5-cache/dev-libs/octetos-db-1.3.2_alpha b/metadata/md5-cache/dev-libs/octetos-db-1.3.2_alpha
index 765fd4906e..5f50881c06 100644
--- a/metadata/md5-cache/dev-libs/octetos-db-1.3.2_alpha
+++ b/metadata/md5-cache/dev-libs/octetos-db-1.3.2_alpha
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-core
 DESCRIPTION=C++ library for Database Acces.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-core
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-db/archive/1.3.2-alpha.tar.gz -> octetos-db-1.3.2_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=d71e61572eb9ea12758d50ce8d307ab9
diff --git a/metadata/md5-cache/dev-libs/octetos-db-1.3.3_alpha b/metadata/md5-cache/dev-libs/octetos-db-1.3.3_alpha
index 8c6664400d..95982181a7 100644
--- a/metadata/md5-cache/dev-libs/octetos-db-1.3.3_alpha
+++ b/metadata/md5-cache/dev-libs/octetos-db-1.3.3_alpha
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-core
 DESCRIPTION=C++ library for Database Acces.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-core
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-db/archive/1.3.3-alpha.tar.gz -> octetos-db-1.3.3_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=d71e61572eb9ea12758d50ce8d307ab9
diff --git a/metadata/md5-cache/dev-libs/octetos-db-abstract-0.1.2_alpha b/metadata/md5-cache/dev-libs/octetos-db-abstract-0.1.2_alpha
index b8ccc3961e..4de598f9e1 100644
--- a/metadata/md5-cache/dev-libs/octetos-db-abstract-0.1.2_alpha
+++ b/metadata/md5-cache/dev-libs/octetos-db-abstract-0.1.2_alpha
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-core
 DESCRIPTION=API to access database, abstract component.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-core !!dev-libs/octetos-db
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-db-abstract/archive/0.1.2-alpha.tar.gz -> octetos-db-abstract-0.1.2_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=b02f85458627dc8224fdf86c64cdd66d
diff --git a/metadata/md5-cache/dev-libs/octetos-db-abstract-0.6.0_alpha b/metadata/md5-cache/dev-libs/octetos-db-abstract-0.6.0_alpha
index efea3dca51..92fed638e9 100644
--- a/metadata/md5-cache/dev-libs/octetos-db-abstract-0.6.0_alpha
+++ b/metadata/md5-cache/dev-libs/octetos-db-abstract-0.6.0_alpha
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-core
 DESCRIPTION=API to access database, abstract component.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-core !!dev-libs/octetos-db
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-db-abstract/archive/0.6.0-alpha.tar.gz -> octetos-db-abstract-0.6.0_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=e1b30ef078d5889b483c3b13dd0b11a5
diff --git a/metadata/md5-cache/dev-libs/octetos-db-maria-1.4.2_alpha b/metadata/md5-cache/dev-libs/octetos-db-maria-1.4.2_alpha
index 42bbf45eaa..8d3f200c9e 100644
--- a/metadata/md5-cache/dev-libs/octetos-db-maria-1.4.2_alpha
+++ b/metadata/md5-cache/dev-libs/octetos-db-maria-1.4.2_alpha
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-db-abstract dev-db/mariadb-connector-c dev-db/mariadb:=
 DESCRIPTION=C++ library for Database Acces.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-db-abstract dev-db/mariadb-connector-c dev-db/mariadb:=
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-db-maria/archive/1.4.2-alpha.tar.gz -> octetos-db-maria-1.4.2_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=3a422416dfbd199e8085331251dd4710
diff --git a/metadata/md5-cache/dev-libs/octetos-db-maria-1.9.2_alpha b/metadata/md5-cache/dev-libs/octetos-db-maria-1.9.2_alpha
index fb6e2ed8f9..523eb4395c 100644
--- a/metadata/md5-cache/dev-libs/octetos-db-maria-1.9.2_alpha
+++ b/metadata/md5-cache/dev-libs/octetos-db-maria-1.9.2_alpha
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-db-abstract dev-db/mariadb-connector-c dev-db/mariadb:=
 DESCRIPTION=C++ library for Database Acces.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-db-abstract dev-db/mariadb-connector-c dev-db/mariadb:=
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-db-maria/archive/1.9.2-alpha.tar.gz -> octetos-db-maria-1.9.2_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=68da5ab6f4bbdf7f5630203d05e0753f
diff --git a/metadata/md5-cache/dev-libs/octetos-db-maria-9999 b/metadata/md5-cache/dev-libs/octetos-db-maria-9999
index 66f847dc25..f25f5bc4cc 100644
--- a/metadata/md5-cache/dev-libs/octetos-db-maria-9999
+++ b/metadata/md5-cache/dev-libs/octetos-db-maria-9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
 DEPEND=dev-libs/octetos-db-abstract dev-db/mariadb-connector-c
 DESCRIPTION=C++ library for Database Acces.
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/octetos-db-abstract dev-db/mariadb-connector-c
 SLOT=0
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=bc8b100a46ce811d7794958e0c80baa8
diff --git a/metadata/md5-cache/dev-libs/octetos-db-postgresql-1.3.10_alpha b/metadata/md5-cache/dev-libs/octetos-db-postgresql-1.3.10_alpha
index 85b31fc2c9..cd3ab2564e 100644
--- a/metadata/md5-cache/dev-libs/octetos-db-postgresql-1.3.10_alpha
+++ b/metadata/md5-cache/dev-libs/octetos-db-postgresql-1.3.10_alpha
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-db
 DESCRIPTION=C++ library for Database Acces.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-db dev-db/postgresql:*
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-db/archive/1.3.10-alpha.tar.gz -> octetos-db-postgresql-1.3.10_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=ea3df19c35077c03cbeee9480a08a9f0
diff --git a/metadata/md5-cache/dev-libs/octetos-db-postgresql-1.3.9_alpha b/metadata/md5-cache/dev-libs/octetos-db-postgresql-1.3.9_alpha
index ea6a444710..217eddf789 100644
--- a/metadata/md5-cache/dev-libs/octetos-db-postgresql-1.3.9_alpha
+++ b/metadata/md5-cache/dev-libs/octetos-db-postgresql-1.3.9_alpha
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/octetos-db dev-db/postgresql:*
 DESCRIPTION=C++ library for Database Acces.
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/octetos-db dev-db/postgresql:*
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/octetos-db/archive/1.3.9-alpha.tar.gz -> octetos-db-postgresql-1.3.9_alpha.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=ea01694032f7dff7fa4d4a79591df609
diff --git a/metadata/md5-cache/dev-octave/control-3.4.0 b/metadata/md5-cache/dev-octave/control-3.4.0
index 6b39e42086..cbdb58c237 100644
--- a/metadata/md5-cache/dev-octave/control-3.4.0
+++ b/metadata/md5-cache/dev-octave/control-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/fortran sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/fortran sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm setup test unpack
 DEPEND=>=sci-mathematics/octave-4.0.0 virtual/fortran
 DESCRIPTION=Computer-Aided Control System Design
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=sci-mathematics/octave-4.0.0 sci-libs/slicot virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/control-3.4.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=80cbfbe32737a549a2fc368f2552b280
diff --git a/metadata/md5-cache/dev-octave/dataframe-1.2.0 b/metadata/md5-cache/dev-octave/dataframe-1.2.0
index a50ccac8e0..f59b27c46d 100644
--- a/metadata/md5-cache/dev-octave/dataframe-1.2.0
+++ b/metadata/md5-cache/dev-octave/dataframe-1.2.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=sci-mathematics/octave-3.2.0
 DESCRIPTION=Data manipulation toolbox similar to R data.frame
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=sci-mathematics/octave-3.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/dataframe-1.2.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=fe16ab60bddad42ef9e6b089a5f8c222
diff --git a/metadata/md5-cache/dev-octave/fuzzy-logic-toolkit-0.4.6 b/metadata/md5-cache/dev-octave/fuzzy-logic-toolkit-0.4.6
index 39c87daa04..eda71ce10b 100644
--- a/metadata/md5-cache/dev-octave/fuzzy-logic-toolkit-0.4.6
+++ b/metadata/md5-cache/dev-octave/fuzzy-logic-toolkit-0.4.6
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=sci-mathematics/octave-3.2.4
 DESCRIPTION=A mostly MATLAB-compatible fuzzy logic toolkit for Octave
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=sci-mathematics/octave-3.2.4
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/fuzzy-logic-toolkit-0.4.6.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=c74b8dc5e560a6c397e52110320b255d
diff --git a/metadata/md5-cache/dev-octave/ga-0.10.3 b/metadata/md5-cache/dev-octave/ga-0.10.3
index c09e9fa43a..55cb11aeb3 100644
--- a/metadata/md5-cache/dev-octave/ga-0.10.3
+++ b/metadata/md5-cache/dev-octave/ga-0.10.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=sci-mathematics/octave-4.0.0
 DESCRIPTION=Genetic optimization code
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=sci-mathematics/octave-4.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/ga-0.10.3.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=2b92ba6facea6bc44bcc142b3f78d378
diff --git a/metadata/md5-cache/dev-octave/instrument-control-0.7.1 b/metadata/md5-cache/dev-octave/instrument-control-0.7.1
index 7ee52b3bd6..0021e2a270 100644
--- a/metadata/md5-cache/dev-octave/instrument-control-0.7.1
+++ b/metadata/md5-cache/dev-octave/instrument-control-0.7.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=sci-mathematics/octave-3.8.0
 DESCRIPTION=Low level I/O functions for serial, i2c and parallel interfaces
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=sci-mathematics/octave-3.8.0
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/instrument-control-0.7.1.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=642fcafd0d55ab31e89a2573b654cf42
diff --git a/metadata/md5-cache/dev-octave/io-2.6.4 b/metadata/md5-cache/dev-octave/io-2.6.4
index 7c48c2c3de..9a723893ad 100644
--- a/metadata/md5-cache/dev-octave/io-2.6.4
+++ b/metadata/md5-cache/dev-octave/io-2.6.4
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=sci-mathematics/octave-4.2.0
 DESCRIPTION=Input/Output in external formats
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ BSD-2
 RDEPEND=>=sci-mathematics/octave-4.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/io-2.6.4.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=91c71c0ab6f989412e73228c1e2d61ac
diff --git a/metadata/md5-cache/dev-octave/linear-algebra-2.2.3 b/metadata/md5-cache/dev-octave/linear-algebra-2.2.3
index c8081b4aae..5968fc49a8 100644
--- a/metadata/md5-cache/dev-octave/linear-algebra-2.2.3
+++ b/metadata/md5-cache/dev-octave/linear-algebra-2.2.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=sci-mathematics/octave-4.0.0
 DESCRIPTION=Additional linear algebra code
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ LGPL-3+ BSD-2
 RDEPEND=>=sci-mathematics/octave-4.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/linear-algebra-2.2.3.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=94184d43f851536212c8d8731ecb5370
diff --git a/metadata/md5-cache/dev-octave/miscellaneous-1.3.0 b/metadata/md5-cache/dev-octave/miscellaneous-1.3.0
index bb58351455..6cec9edaba 100644
--- a/metadata/md5-cache/dev-octave/miscellaneous-1.3.0
+++ b/metadata/md5-cache/dev-octave/miscellaneous-1.3.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=sci-calculators/units >=sci-mathematics/octave-3.8.0 sys-libs/libtermcap-compat sys-libs/ncurses-compat
 DESCRIPTION=Miscellaneous tools that don't fit somewhere else
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=sci-calculators/units >=sci-mathematics/octave-3.8.0 sys-libs/libtermcap-compat sys-libs/ncurses-compat
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/miscellaneous-1.3.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=383acea3c85191b44e89377f55cbe140
diff --git a/metadata/md5-cache/dev-octave/ocl-1.2.0 b/metadata/md5-cache/dev-octave/ocl-1.2.0
index 373091e8f5..8551bf2112 100644
--- a/metadata/md5-cache/dev-octave/ocl-1.2.0
+++ b/metadata/md5-cache/dev-octave/ocl-1.2.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=sci-mathematics/octave-4.2.0
 DESCRIPTION=OpenCL support for GNU Octave
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=sci-mathematics/octave-4.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/ocl-1.2.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=c74c07d749276990989a83dcc20abdee
diff --git a/metadata/md5-cache/dev-octave/optim-1.6.2 b/metadata/md5-cache/dev-octave/optim-1.6.2
index 1cb88f9da9..1edc351fb2 100644
--- a/metadata/md5-cache/dev-octave/optim-1.6.2
+++ b/metadata/md5-cache/dev-octave/optim-1.6.2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=dev-octave/statistics-1.4.0 >=dev-octave/struct-1.0.12 >=sci-mathematics/octave-4.0.0
 DESCRIPTION=Non-linear optimization toolkit
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ BSD public-domain
 RDEPEND=>=dev-octave/statistics-1.4.0 >=dev-octave/struct-1.0.12 >=sci-mathematics/octave-4.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/optim-1.6.2.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=4b8ae90f7c4299d4cdef8086bb869bcf
diff --git a/metadata/md5-cache/dev-octave/optiminterp-0.3.7 b/metadata/md5-cache/dev-octave/optiminterp-0.3.7
index 361b456f6a..2300c15d7d 100644
--- a/metadata/md5-cache/dev-octave/optiminterp-0.3.7
+++ b/metadata/md5-cache/dev-octave/optiminterp-0.3.7
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=sci-mathematics/octave-4.0.0
 DESCRIPTION=An optimal interpolation toolbox for octave
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=sci-mathematics/octave-4.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/optiminterp-0.3.7.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=e986bb1568e110fe269bdff3e787cdd1
diff --git a/metadata/md5-cache/dev-octave/quaternion-2.4.0 b/metadata/md5-cache/dev-octave/quaternion-2.4.0
index ca536b64c9..3496b8327a 100644
--- a/metadata/md5-cache/dev-octave/quaternion-2.4.0
+++ b/metadata/md5-cache/dev-octave/quaternion-2.4.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=sci-mathematics/octave-3.8.0
 DESCRIPTION=Quaternion package for GNU Octave, includes a quaternion class
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=sci-mathematics/octave-3.8.0
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/quaternion-2.4.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=ebd9cba5a908179fd860b9863a4d3a0f
diff --git a/metadata/md5-cache/dev-octave/splines-1.3.4 b/metadata/md5-cache/dev-octave/splines-1.3.4
index 883ac40310..f26d475674 100644
--- a/metadata/md5-cache/dev-octave/splines-1.3.4
+++ b/metadata/md5-cache/dev-octave/splines-1.3.4
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=sci-mathematics/octave-3.6.0
 DESCRIPTION=Additional spline functions
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ public-domain
 RDEPEND=>=sci-mathematics/octave-3.6.0
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/splines-1.3.4.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=93ec72f8c734e42c0df06fddf575eed5
diff --git a/metadata/md5-cache/dev-octave/statistics-1.4.3 b/metadata/md5-cache/dev-octave/statistics-1.4.3
index 8731dc33bf..1d89ba795b 100644
--- a/metadata/md5-cache/dev-octave/statistics-1.4.3
+++ b/metadata/md5-cache/dev-octave/statistics-1.4.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=dev-octave/io-1.0.18 >=sci-mathematics/octave-4.0.0
 DESCRIPTION=Additional statistics functions for Octave
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ public-domain
 RDEPEND=>=dev-octave/io-1.0.18 >=sci-mathematics/octave-4.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/statistics-1.4.3.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=beef32a07c4e577fe05efab1b088e61d
diff --git a/metadata/md5-cache/dev-octave/strings-1.2.0_p20211128 b/metadata/md5-cache/dev-octave/strings-1.2.0_p20211128
index 0004c6c7ea..2c384437e3 100644
--- a/metadata/md5-cache/dev-octave/strings-1.2.0_p20211128
+++ b/metadata/md5-cache/dev-octave/strings-1.2.0_p20211128
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=sci-mathematics/octave-3.8.0 dev-libs/libpcre
 DESCRIPTION=Additional functions for manipulation and analysis of strings
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ BSD-2
 RDEPEND=>=sci-mathematics/octave-3.8.0 dev-libs/libpcre
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/strings-1.2.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=cbeae468eeaa33cecfffce6096c44884
diff --git a/metadata/md5-cache/dev-octave/struct-1.0.18 b/metadata/md5-cache/dev-octave/struct-1.0.18
index f9771eee7f..c359cf499b 100644
--- a/metadata/md5-cache/dev-octave/struct-1.0.18
+++ b/metadata/md5-cache/dev-octave/struct-1.0.18
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm test unpack
 DEPEND=>=sci-mathematics/octave-4.0.0
 DESCRIPTION=Additional structure manipulation functions
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=sci-mathematics/octave-4.0.0
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/struct-1.0.18.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3
 _md5_=5391fa4f3769c3748a325796d33c32f8
diff --git a/metadata/md5-cache/dev-octave/symbolic-2.9.0 b/metadata/md5-cache/dev-octave/symbolic-2.9.0
index f240cdc6c0..ef64285520 100644
--- a/metadata/md5-cache/dev-octave/symbolic-2.9.0
+++ b/metadata/md5-cache/dev-octave/symbolic-2.9.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile install postinst postrm prepare prerm setup test unpack
 DEPEND=>=sci-mathematics/octave-4.2.0 python_single_target_python3_10? ( dev-python/mpmath[python_targets_python3_10(-)] dev-python/sympy[python_targets_python3_10(-)] )
 DESCRIPTION=Octave Symbolic Package using SymPy
@@ -12,5 +12,5 @@ RDEPEND=>=sci-mathematics/octave-4.2.0 python_single_target_python3_10? ( dev-py
 REQUIRED_USE=^^ ( python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/octave/symbolic-2.9.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	octaveforge	448723341c8ac493eb3abbe616472aa3	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
 _md5_=60c4b598b50cf73b60ac986d48b53c20
diff --git a/metadata/md5-cache/dev-php/pecl-inotify-3.0.0-r1 b/metadata/md5-cache/dev-php/pecl-inotify-3.0.0-r1
index 97fb7ad9dd..dadffbb384 100644
--- a/metadata/md5-cache/dev-php/pecl-inotify-3.0.0-r1
+++ b/metadata/md5-cache/dev-php/pecl-inotify-3.0.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 sys-devel/m4 dev-build/libtool php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=Inotify binding for PHP
@@ -12,5 +12,5 @@ RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/
 REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
 SLOT=0/3
 SRC_URI=https://pecl.php.net/get/inotify-3.0.0.tgz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	php-ext-source-r3	57493651a3540d6ef7bff5e1c97c8dd3	php-ext-pecl-r3	4ca93611caa4190394eb13cc22aedbd0
 _md5_=4e20a8020a3ac9b676d4db982350a904
diff --git a/metadata/md5-cache/dev-util/babeltrace2-2.0.4 b/metadata/md5-cache/dev-util/babeltrace2-2.0.4
index 845447a983..3fd5323400 100644
--- a/metadata/md5-cache/dev-util/babeltrace2-2.0.4
+++ b/metadata/md5-cache/dev-util/babeltrace2-2.0.4
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex doc? ( app-text/doxygen python? ( dev-python/sphinx ) ) man? ( app-text/asciidoc app-text/xmlto ) python? ( dev-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/bison sys-devel/flex doc? ( app-text/doxygen python? ( dev-python/sphinx ) ) man? ( app-text/asciidoc app-text/xmlto ) python? ( dev-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare setup
 DEPEND=dev-libs/glib:2 dev-libs/elfutils python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) virtual/libcrypt )
 DESCRIPTION=A command-line tool and library to read and convert trace files
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.efficios.com/files/babeltrace/babeltrace2-2.0.4.tar.bz2
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
 _md5_=5601f01b6815839781d9809ef1766c7b
diff --git a/metadata/md5-cache/games-action/netrek-cow-3.3.2 b/metadata/md5-cache/games-action/netrek-cow-3.3.2
index 091b52d0bc..a8a492b67e 100644
--- a/metadata/md5-cache/games-action/netrek-cow-3.3.2
+++ b/metadata/md5-cache/games-action/netrek-cow-3.3.2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=install prepare
 DEPEND=media-libs/imlib2 media-libs/libsdl media-libs/sdl-mixer x11-base/xorg-proto x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXmu
 DESCRIPTION=cow client for netrek
@@ -11,5 +11,5 @@ RDEPEND=media-libs/imlib2 media-libs/libsdl media-libs/sdl-mixer x11-base/xorg-p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/quozl/netrek-client-cow/archive/3.3.2.tar.gz -> netrek-cow-3.3.2.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=922f4580a25a6fd509f433e7555ce88d
diff --git a/metadata/md5-cache/games-emulation/dosbox-x-2023.10.06 b/metadata/md5-cache/games-emulation/dosbox-x-2023.10.06
index 7b75f94252..96cc140fda 100644
--- a/metadata/md5-cache/games-emulation/dosbox-x-2023.10.06
+++ b/metadata/md5-cache/games-emulation/dosbox-x-2023.10.06
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/nasm sys-libs/libcap sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-lang/nasm sys-libs/libcap sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure postinst postrm preinst prepare pretend test
 DEPEND=media-libs/alsa-lib media-libs/libsdl2[X,alsa,opengl?,sound,threads,video] media-libs/sdl2-net net-libs/libpcap sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libxkbfile ) debug? ( sys-libs/ncurses:= ) ffmpeg? ( media-video/ffmpeg:= ) fluidsynth? ( media-sound/fluidsynth:= ) opengl? ( media-libs/libglvnd[X] ) png? ( media-libs/libpng:= ) slirp? ( net-libs/libslirp ) truetype? ( media-libs/freetype )
 DESCRIPTION=Complete, accurate DOS emulator forked from DOSBox
@@ -13,5 +13,5 @@ RDEPEND=media-libs/alsa-lib media-libs/libsdl2[X,alsa,opengl?,sound,threads,vide
 RESTRICT=!debug? ( test )
 SLOT=0
 SRC_URI=https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v2023.10.06.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	xdg-utils	baea6080dd821f5562d715887954c9d3	xdg	4a14c5c24f121e7da66e5aab4a168c6e
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	xdg-utils	baea6080dd821f5562d715887954c9d3	xdg	4a14c5c24f121e7da66e5aab4a168c6e
 _md5_=f6a706252b929986669f3da8e6a8877b
diff --git a/metadata/md5-cache/games-emulation/dosbox-x-9999 b/metadata/md5-cache/games-emulation/dosbox-x-9999
index 30947adb33..4788cb171e 100644
--- a/metadata/md5-cache/games-emulation/dosbox-x-9999
+++ b/metadata/md5-cache/games-emulation/dosbox-x-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/nasm sys-libs/libcap sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/nasm sys-libs/libcap sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure postinst postrm preinst prepare pretend test unpack
 DEPEND=media-libs/alsa-lib media-libs/libsdl2[X,alsa,opengl?,sound,threads,video] media-libs/sdl2-net net-libs/libpcap sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libxkbfile ) debug? ( sys-libs/ncurses:= ) ffmpeg? ( media-video/ffmpeg:= ) fluidsynth? ( media-sound/fluidsynth:= ) opengl? ( media-libs/libglvnd[X] ) png? ( media-libs/libpng:= ) slirp? ( net-libs/libslirp ) truetype? ( media-libs/freetype )
 DESCRIPTION=Complete, accurate DOS emulator forked from DOSBox
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=media-libs/alsa-lib media-libs/libsdl2[X,alsa,opengl?,sound,threads,video] media-libs/sdl2-net net-libs/libpcap sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libxkbfile ) debug? ( sys-libs/ncurses:= ) ffmpeg? ( media-video/ffmpeg:= ) fluidsynth? ( media-sound/fluidsynth:= ) opengl? ( media-libs/libglvnd[X] ) png? ( media-libs/libpng:= ) slirp? ( net-libs/libslirp ) truetype? ( media-libs/freetype )
 RESTRICT=!debug? ( test )
 SLOT=0
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	xdg-utils	baea6080dd821f5562d715887954c9d3	xdg	4a14c5c24f121e7da66e5aab4a168c6e	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	xdg-utils	baea6080dd821f5562d715887954c9d3	xdg	4a14c5c24f121e7da66e5aab4a168c6e	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=f6a706252b929986669f3da8e6a8877b
diff --git a/metadata/md5-cache/games-fps/crispy-doom-5.12.0 b/metadata/md5-cache/games-fps/crispy-doom-5.12.0
index 2166dece5e..4c89b99039 100644
--- a/metadata/md5-cache/games-fps/crispy-doom-5.12.0
+++ b/metadata/md5-cache/games-fps/crispy-doom-5.12.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) doc? ( || ( dev-lang/python:3.11 dev-lang/python:3.10 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) doc? ( || ( dev-lang/python:3.11 dev-lang/python:3.10 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
 DEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[midi?,vorbis?] media-libs/sdl2-net libsamplerate? ( media-libs/libsamplerate ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib )
 DESCRIPTION=A limit-removing enhanced-resolution Doom source port based on Chocolate Doom
@@ -12,5 +12,5 @@ LICENSE=BSD GPL-2+
 RDEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[midi?,vorbis?] media-libs/sdl2-net libsamplerate? ( media-libs/libsamplerate ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-5.12.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2	xdg-utils	baea6080dd821f5562d715887954c9d3	xdg	4a14c5c24f121e7da66e5aab4a168c6e
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2	xdg-utils	baea6080dd821f5562d715887954c9d3	xdg	4a14c5c24f121e7da66e5aab4a168c6e
 _md5_=e62909fa2018dd747bce3bf1aa906d45
diff --git a/metadata/md5-cache/games-fps/crispy-doom-6.0 b/metadata/md5-cache/games-fps/crispy-doom-6.0
index 8653e0277a..77d9b20105 100644
--- a/metadata/md5-cache/games-fps/crispy-doom-6.0
+++ b/metadata/md5-cache/games-fps/crispy-doom-6.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) doc? ( || ( dev-lang/python:3.11 dev-lang/python:3.10 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) doc? ( || ( dev-lang/python:3.11 dev-lang/python:3.10 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
 DEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[fluidsynth?,midi?,vorbis?] media-libs/sdl2-net libsamplerate? ( media-libs/libsamplerate ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib )
 DESCRIPTION=A limit-removing enhanced-resolution Doom source port based on Chocolate Doom
@@ -12,5 +12,5 @@ LICENSE=BSD GPL-2+
 RDEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[fluidsynth?,midi?,vorbis?] media-libs/sdl2-net libsamplerate? ( media-libs/libsamplerate ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-6.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2	xdg-utils	baea6080dd821f5562d715887954c9d3	xdg	4a14c5c24f121e7da66e5aab4a168c6e
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2	xdg-utils	baea6080dd821f5562d715887954c9d3	xdg	4a14c5c24f121e7da66e5aab4a168c6e
 _md5_=d13cdd794dd8cb4f7de3ce617a84996c
diff --git a/metadata/md5-cache/games-puzzle/atris-1.0.7 b/metadata/md5-cache/games-puzzle/atris-1.0.7
index ffc159c40f..f5c68c42e9 100644
--- a/metadata/md5-cache/games-puzzle/atris-1.0.7
+++ b/metadata/md5-cache/games-puzzle/atris-1.0.7
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=install prepare
 DEPEND=acct-group/gamestat media-libs/freetype media-libs/libsdl media-libs/sdl-ttf
 DESCRIPTION=Alizarin tetris
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/gamestat media-libs/freetype media-libs/libsdl media-libs/sdl-ttf
 SLOT=0
 SRC_URI=http://www.gnu-darwin.org/distfiles/atris-1.0.7.tar.gz http://www.gnu-darwin.org/distfiles/atris-sounds-1.0.1.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	desktop	021728fdc1b03b36357dbc89489e0f0d
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	desktop	021728fdc1b03b36357dbc89489e0f0d
 _md5_=759f31d54b9021852479f57d7aaad045
diff --git a/metadata/md5-cache/media-libs/glee-5.4.0 b/metadata/md5-cache/media-libs/glee-5.4.0
index c7aa4260d0..b32f7fc093 100644
--- a/metadata/md5-cache/media-libs/glee-5.4.0
+++ b/metadata/md5-cache/media-libs/glee-5.4.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=virtual/opengl
 DESCRIPTION=OpenGL Easy Extension library
@@ -11,5 +11,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/opengl
 SLOT=0
 SRC_URI=https://elf-stone.com/downloads/GLee/GLee-5.4.0-src.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=2ed37ef506268db574ac4f3458f4857b
diff --git a/metadata/md5-cache/media-libs/glee-5.4.0-r1 b/metadata/md5-cache/media-libs/glee-5.4.0-r1
index d89e448c5d..f2d9874ef2 100644
--- a/metadata/md5-cache/media-libs/glee-5.4.0-r1
+++ b/metadata/md5-cache/media-libs/glee-5.4.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=virtual/opengl
 DESCRIPTION=OpenGL Easy Extension library
@@ -11,5 +11,5 @@ LICENSE=BSD-2
 RDEPEND=virtual/opengl
 SLOT=0
 SRC_URI=https://elf-stone.com/downloads/GLee/GLee-5.4.0-src.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=af2808ba38197bb19c0fa7cdb7be9602
diff --git a/metadata/md5-cache/media-plugins/whysynth-20170701_p20180323 b/metadata/md5-cache/media-plugins/whysynth-20170701_p20180323
index 4738f3240d..b7b9841164 100644
--- a/metadata/md5-cache/media-plugins/whysynth-20170701_p20180323
+++ b/metadata/md5-cache/media-plugins/whysynth-20170701_p20180323
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=media-libs/dssi media-libs/liblo sci-libs/fftw:3.0 x11-libs/gtk+:2 media-libs/ladspa-sdk media-libs/alsa-lib
 DESCRIPTION=A software synthesizer plugin for the DSSI Soft Synth Interface
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/dssi media-libs/liblo sci-libs/fftw:3.0 x11-libs/gtk+:2 media-libs/ladspa-sdk media-libs/alsa-lib
 SLOT=0
 SRC_URI=https://github.com/smbolton/whysynth/archive/32e4bc73baa554bb1844b3165e657911f43f3568.tar.gz -> whysynth-20170701_p20180323.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=0252c95a38e7cf28c517c913f8dde8b9
diff --git a/metadata/md5-cache/media-sound/pipewire-module-xrdp-0.1_pre20230609 b/metadata/md5-cache/media-sound/pipewire-module-xrdp-0.1_pre20230609
index 722a2e2b2c..2379d0859f 100644
--- a/metadata/md5-cache/media-sound/pipewire-module-xrdp-0.1_pre20230609
+++ b/metadata/md5-cache/media-sound/pipewire-module-xrdp-0.1_pre20230609
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=postinst postrm preinst prepare
 DEPEND=media-video/pipewire:=
 DESCRIPTION=PipeWire module which enables xrdp to use audio redirection
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=media-video/pipewire:=
 SLOT=0
 SRC_URI=https://github.com/neutrinolabs/pipewire-module-xrdp/archive/e9c6c05dd4327fca43d8861535c1f75c9b258aef.tar.gz -> pipewire-module-xrdp-0.1_pre20230609.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	xdg-utils	baea6080dd821f5562d715887954c9d3	xdg	4a14c5c24f121e7da66e5aab4a168c6e
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	xdg-utils	baea6080dd821f5562d715887954c9d3	xdg	4a14c5c24f121e7da66e5aab4a168c6e
 _md5_=5a3f48be7a6563f9f38b32c71c812dbc
diff --git a/metadata/md5-cache/net-dialup/minimodem-0.24-r1 b/metadata/md5-cache/net-dialup/minimodem-0.24-r1
index fa5566c242..586504fec9 100644
--- a/metadata/md5-cache/net-dialup/minimodem-0.24-r1
+++ b/metadata/md5-cache/net-dialup/minimodem-0.24-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=sndfile? ( media-libs/libsndfile ) sci-libs/fftw:3.0 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-libs/libpulse ) sndio? ( media-sound/sndio )
 DESCRIPTION=General-purpose software audio FSK modem
@@ -12,5 +12,5 @@ RDEPEND=sndfile? ( media-libs/libsndfile ) sci-libs/fftw:3.0 alsa? ( media-libs/
 REQUIRED_USE=|| ( alsa pulseaudio sndfile )
 SLOT=0
 SRC_URI=http://www.whence.com/minimodem/minimodem-0.24.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=5577706496a086f8187fe1a7c293cb00
diff --git a/metadata/md5-cache/net-dialup/minimodem-9999 b/metadata/md5-cache/net-dialup/minimodem-9999
index 81c1c4372d..378f61a1c8 100644
--- a/metadata/md5-cache/net-dialup/minimodem-9999
+++ b/metadata/md5-cache/net-dialup/minimodem-9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
 DEPEND=sndfile? ( media-libs/libsndfile ) sci-libs/fftw:3.0 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-libs/libpulse ) sndio? ( media-sound/sndio )
 DESCRIPTION=General-purpose software audio FSK modem
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=sndfile? ( media-libs/libsndfile ) sci-libs/fftw:3.0 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-libs/libpulse ) sndio? ( media-sound/sndio )
 REQUIRED_USE=|| ( alsa pulseaudio sndfile sndio )
 SLOT=0
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=78849e684cfeca7310ec8a5847a3629c
diff --git a/metadata/md5-cache/net-mail/dovecot-fts-xapian-1.5.4 b/metadata/md5-cache/net-mail/dovecot-fts-xapian-1.5.4
index c4645a7e3d..b2956ebde0 100644
--- a/metadata/md5-cache/net-mail/dovecot-fts-xapian-1.5.4
+++ b/metadata/md5-cache/net-mail/dovecot-fts-xapian-1.5.4
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/icu:= >=dev-libs/xapian-1.4:= net-mail/dovecot:=
 DESCRIPTION=Dovecot FTS plugin backed by Xapian
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/icu:= >=dev-libs/xapian-1.4:= net-mail/dovecot:=
 SLOT=0
 SRC_URI=https://github.com/grosjo/fts-xapian/archive/refs/tags/1.5.4.tar.gz -> dovecot-fts-xapian-1.5.4.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=e327778de7923e098d38f23d67c7ab93
diff --git a/metadata/md5-cache/net-mail/dovecot-fts-xapian-1.5.5 b/metadata/md5-cache/net-mail/dovecot-fts-xapian-1.5.5
index e7973f4b38..a36a631679 100644
--- a/metadata/md5-cache/net-mail/dovecot-fts-xapian-1.5.5
+++ b/metadata/md5-cache/net-mail/dovecot-fts-xapian-1.5.5
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/icu:= >=dev-libs/xapian-1.4:= net-mail/dovecot:=
 DESCRIPTION=Dovecot FTS plugin backed by Xapian
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/icu:= >=dev-libs/xapian-1.4:= net-mail/dovecot:=
 SLOT=0
 SRC_URI=https://github.com/grosjo/fts-xapian/archive/refs/tags/1.5.5.tar.gz -> dovecot-fts-xapian-1.5.5.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=3f30ae7af92b6934a975c911271dcd05
diff --git a/metadata/md5-cache/net-mail/dovecot-fts-xapian-1.5.7 b/metadata/md5-cache/net-mail/dovecot-fts-xapian-1.5.7
index c0cee78f9c..b3a1d5b3e9 100644
--- a/metadata/md5-cache/net-mail/dovecot-fts-xapian-1.5.7
+++ b/metadata/md5-cache/net-mail/dovecot-fts-xapian-1.5.7
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/icu:= >=dev-libs/xapian-1.4:= net-mail/dovecot:=
 DESCRIPTION=Dovecot FTS plugin backed by Xapian
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/icu:= >=dev-libs/xapian-1.4:= net-mail/dovecot:=
 SLOT=0
 SRC_URI=https://github.com/grosjo/fts-xapian/archive/refs/tags/1.5.7.tar.gz -> dovecot-fts-xapian-1.5.7.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=3f30ae7af92b6934a975c911271dcd05
diff --git a/metadata/md5-cache/net-mail/dovecot-fts-xapian-9999 b/metadata/md5-cache/net-mail/dovecot-fts-xapian-9999
index c72ec64810..2df0977700 100644
--- a/metadata/md5-cache/net-mail/dovecot-fts-xapian-9999
+++ b/metadata/md5-cache/net-mail/dovecot-fts-xapian-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
 DEPEND=dev-libs/icu:= >=dev-libs/xapian-1.4:= net-mail/dovecot:=
 DESCRIPTION=Dovecot FTS plugin backed by Xapian
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-libs/icu:= >=dev-libs/xapian-1.4:= net-mail/dovecot:=
 SLOT=0
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=5521d6b825de326248d70c35630f38be
diff --git a/metadata/md5-cache/net-misc/FORT-validator-1.5.3 b/metadata/md5-cache/net-misc/FORT-validator-1.5.3
index f2fbb5e2fe..2b3ef68dbe 100644
--- a/metadata/md5-cache/net-misc/FORT-validator-1.5.3
+++ b/metadata/md5-cache/net-misc/FORT-validator-1.5.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf sys-devel/automake sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 filecaps? ( sys-libs/libcap ) virtual/pkgconfig
+BDEPEND=sys-devel/autoconf sys-devel/automake sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 filecaps? ( sys-libs/libcap ) virtual/pkgconfig
 DEFINED_PHASES=install postinst prepare
 DEPEND=acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson dev-libs/openssl
 DESCRIPTION=FORT validator is an open source RPKI validator
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson dev-libs/openssl net-misc/rsync filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/NICMx/FORT-validator/releases/download/1.5.3/fort-1.5.3.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	fcaps	c0a086b957a1b183a8d136eabf02f191	systemd	c8b03e8df84486aa991d4396686e8942
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	fcaps	c0a086b957a1b183a8d136eabf02f191	systemd	c8b03e8df84486aa991d4396686e8942
 _md5_=b10c9ef40a4228c510f64be3fe256b39
diff --git a/metadata/md5-cache/net-misc/FORT-validator-1.5.4 b/metadata/md5-cache/net-misc/FORT-validator-1.5.4
index dd9304d612..6471bd7429 100644
--- a/metadata/md5-cache/net-misc/FORT-validator-1.5.4
+++ b/metadata/md5-cache/net-misc/FORT-validator-1.5.4
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf sys-devel/automake sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+BDEPEND=sys-devel/autoconf sys-devel/automake sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 virtual/pkgconfig
 DEFINED_PHASES=install postinst prepare
 DEPEND=acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson dev-libs/openssl
 DESCRIPTION=FORT validator is an open source RPKI validator
@@ -12,5 +12,5 @@ LICENSE=MIT
 RDEPEND=acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson dev-libs/openssl net-misc/rsync
 SLOT=0
 SRC_URI=https://github.com/NICMx/FORT-validator/releases/download/1.5.4/fort-1.5.4.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	fcaps	c0a086b957a1b183a8d136eabf02f191	systemd	c8b03e8df84486aa991d4396686e8942
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	fcaps	c0a086b957a1b183a8d136eabf02f191	systemd	c8b03e8df84486aa991d4396686e8942
 _md5_=b61f9fbb47b87d604cf7528bf09137fa
diff --git a/metadata/md5-cache/net-misc/can-utils-2021.08.0 b/metadata/md5-cache/net-misc/can-utils-2021.08.0
index a011818c76..81236fb980 100644
--- a/metadata/md5-cache/net-misc/can-utils-2021.08.0
+++ b/metadata/md5-cache/net-misc/can-utils-2021.08.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 virtual/pkgconfig
 DEFINED_PHASES=install prepare
 DESCRIPTION=SocketCAN userspace utilities and tools
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/linux-can/can-utils/archive/v2021.08.0.tar.gz -> can-utils-2021.08.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	systemd	c8b03e8df84486aa991d4396686e8942
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	systemd	c8b03e8df84486aa991d4396686e8942
 _md5_=855cb1a63b96740db3ca891ba87f4432
diff --git a/metadata/md5-cache/net-misc/can-utils-2023.03 b/metadata/md5-cache/net-misc/can-utils-2023.03
index 6d1896fab1..ed1400da00 100644
--- a/metadata/md5-cache/net-misc/can-utils-2023.03
+++ b/metadata/md5-cache/net-misc/can-utils-2023.03
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 virtual/pkgconfig
 DEFINED_PHASES=install prepare
 DESCRIPTION=SocketCAN userspace utilities and tools
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/linux-can/can-utils/archive/v2023.03.tar.gz -> can-utils-2023.03.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	systemd	c8b03e8df84486aa991d4396686e8942
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	systemd	c8b03e8df84486aa991d4396686e8942
 _md5_=855cb1a63b96740db3ca891ba87f4432
diff --git a/metadata/md5-cache/net-misc/can-utils-9999-r3 b/metadata/md5-cache/net-misc/can-utils-9999-r3
index 1874b42ee5..d78a3e9c5d 100644
--- a/metadata/md5-cache/net-misc/can-utils-9999-r3
+++ b/metadata/md5-cache/net-misc/can-utils-9999-r3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=install prepare unpack
 DESCRIPTION=CAN userspace utilities and tools
 EAPI=7
@@ -7,5 +7,5 @@ INHERIT=autotools git-r3 systemd
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	systemd	c8b03e8df84486aa991d4396686e8942
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	systemd	c8b03e8df84486aa991d4396686e8942
 _md5_=0059641b933603d44e20f2838d7bfdc8
diff --git a/metadata/md5-cache/net-misc/gsocket-1.4.41 b/metadata/md5-cache/net-misc/gsocket-1.4.41
index b8d5fcddf6..3d3cfab609 100644
--- a/metadata/md5-cache/net-misc/gsocket-1.4.41
+++ b/metadata/md5-cache/net-misc/gsocket-1.4.41
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/openssl
 DESCRIPTION=Connect like there is no firewall. Securely.
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/openssl
 SLOT=0
 SRC_URI=https://github.com/hackerschoice/gsocket/archive/v1.4.41.tar.gz -> gsocket-1.4.41.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=cfa2b62aeb2ac58f975027a6f2018caa
diff --git a/metadata/md5-cache/net-misc/gsocket-9999 b/metadata/md5-cache/net-misc/gsocket-9999
index d63a0c7677..66df504e5b 100644
--- a/metadata/md5-cache/net-misc/gsocket-9999
+++ b/metadata/md5-cache/net-misc/gsocket-9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=prepare unpack
 DEPEND=dev-libs/openssl
 DESCRIPTION=Connect like there is no firewall. Securely.
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=dev-libs/openssl
 SLOT=0
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=cfa2b62aeb2ac58f975027a6f2018caa
diff --git a/metadata/md5-cache/net-misc/megasync-4.11.0.0 b/metadata/md5-cache/net-misc/megasync-4.11.0.0
index b119c69c34..08095013f9 100644
--- a/metadata/md5-cache/net-misc/megasync-4.11.0.0
+++ b/metadata/md5-cache/net-misc/megasync-4.11.0.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 dolphin? ( kde-frameworks/extra-cmake-modules ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 app-alternatives/ninja >=dev-build/cmake-3.20.5
+BDEPEND=dev-qt/linguist-tools:5 dolphin? ( kde-frameworks/extra-cmake-modules ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-db/sqlite:3 dev-libs/crypto++:= dev-libs/libsodium:= dev-libs/libuv:= dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 dev-qt/qtimageformats:5 dev-qt/qtsvg:5 dev-qt/qtx11extras:5 media-libs/libmediainfo media-libs/libraw net-dns/c-ares:= net-misc/curl[ssl,curl_ssl_openssl(-)] sys-libs/zlib dolphin? ( kde-apps/dolphin ) freeimage? ( media-libs/freeimage media-video/ffmpeg:= ) nautilus? ( >=gnome-base/nautilus-43 ) nemo? ( gnome-extra/nemo ) thunar? ( xfce-base/thunar )
 DESCRIPTION=The official Qt-based program for syncing your MEGA account in your PC
@@ -12,5 +12,5 @@ LICENSE=MEGA
 RDEPEND=dev-db/sqlite:3 dev-libs/crypto++:= dev-libs/libsodium:= dev-libs/libuv:= dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 dev-qt/qtimageformats:5 dev-qt/qtsvg:5 dev-qt/qtx11extras:5 media-libs/libmediainfo media-libs/libraw net-dns/c-ares:= net-misc/curl[ssl,curl_ssl_openssl(-)] sys-libs/zlib dolphin? ( kde-apps/dolphin ) freeimage? ( media-libs/freeimage media-video/ffmpeg:= ) nautilus? ( >=gnome-base/nautilus-43 ) nemo? ( gnome-extra/nemo ) thunar? ( xfce-base/thunar ) x11-themes/hicolor-icon-theme
 SLOT=0
 SRC_URI=https://github.com/meganz/MEGAsync/archive/v4.11.0.0_Win.tar.gz -> megasync-4.11.0.0.tar.gz https://github.com/meganz/sdk/archive/6d4c102940dab277974090cd4292e58f08ac6032.tar.gz -> megasync-sdk-4.11.0.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	xdg	4a14c5c24f121e7da66e5aab4a168c6e
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	xdg	4a14c5c24f121e7da66e5aab4a168c6e
 _md5_=58f70df3fcc7dda973990145f8fd1417
diff --git a/metadata/md5-cache/net-misc/megasync-9999 b/metadata/md5-cache/net-misc/megasync-9999
index 945100d99b..6933d468e5 100644
--- a/metadata/md5-cache/net-misc/megasync-9999
+++ b/metadata/md5-cache/net-misc/megasync-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 dolphin? ( kde-frameworks/extra-cmake-modules ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-qt/linguist-tools:5 dolphin? ( kde-frameworks/extra-cmake-modules ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=dev-db/sqlite:3 dev-libs/crypto++:= dev-libs/libsodium:= dev-libs/libuv:= dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 dev-qt/qtimageformats:5 dev-qt/qtsvg:5 dev-qt/qtx11extras:5 media-libs/libmediainfo media-libs/libraw net-dns/c-ares:= net-misc/curl[ssl,curl_ssl_openssl(-)] sys-libs/zlib dolphin? ( kde-apps/dolphin ) freeimage? ( media-libs/freeimage media-video/ffmpeg:= ) nautilus? ( >=gnome-base/nautilus-43 ) nemo? ( gnome-extra/nemo ) thunar? ( xfce-base/thunar )
 DESCRIPTION=The official Qt-based program for syncing your MEGA account in your PC
@@ -11,5 +11,5 @@ LICENSE=MEGA
 PROPERTIES=live
 RDEPEND=dev-db/sqlite:3 dev-libs/crypto++:= dev-libs/libsodium:= dev-libs/libuv:= dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 dev-qt/qtimageformats:5 dev-qt/qtsvg:5 dev-qt/qtx11extras:5 media-libs/libmediainfo media-libs/libraw net-dns/c-ares:= net-misc/curl[ssl,curl_ssl_openssl(-)] sys-libs/zlib dolphin? ( kde-apps/dolphin ) freeimage? ( media-libs/freeimage media-video/ffmpeg:= ) nautilus? ( >=gnome-base/nautilus-43 ) nemo? ( gnome-extra/nemo ) thunar? ( xfce-base/thunar ) x11-themes/hicolor-icon-theme
 SLOT=0
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	xdg	4a14c5c24f121e7da66e5aab4a168c6e	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	xdg	4a14c5c24f121e7da66e5aab4a168c6e	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=58f70df3fcc7dda973990145f8fd1417
diff --git a/metadata/md5-cache/net-misc/openbgpd-9999 b/metadata/md5-cache/net-misc/openbgpd-9999
index 9f89df22f3..9036d3806c 100644
--- a/metadata/md5-cache/net-misc/openbgpd-9999
+++ b/metadata/md5-cache/net-misc/openbgpd-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/byacc sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
+BDEPEND=dev-util/byacc sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare unpack
 DESCRIPTION=OpenBGPD is a free implementation of BGPv4
 EAPI=7
@@ -8,5 +8,5 @@ LICENSE=ISC
 PROPERTIES=live
 RDEPEND=!!net-misc/quagga acct-group/_bgpd acct-user/_bgpd
 SLOT=0
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	systemd	c8b03e8df84486aa991d4396686e8942
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	systemd	c8b03e8df84486aa991d4396686e8942
 _md5_=51778ddc0a64fa95775c1d7bbcc4b489
diff --git a/metadata/md5-cache/net-nntp/pan-0.154-r1 b/metadata/md5-cache/net-nntp/pan-0.154-r1
index c5ead6bf86..c80fde244f 100644
--- a/metadata/md5-cache/net-nntp/pan-0.154-r1
+++ b/metadata/md5-cache/net-nntp/pan-0.154-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-text/yelp-tools >=sys-devel/gettext-0.19.7 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 app-arch/xz-utils
+BDEPEND=app-text/yelp-tools >=sys-devel/gettext-0.19.7 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-libs/glib-2.26:2 dev-libs/gmime:3.0 >=x11-libs/gtk+-3.00:3 gnome-keyring? ( >=app-crypt/gcr-3.20 >=app-crypt/libsecret-0.20 ) libnotify? ( >=x11-libs/libnotify-0.4.1:0= ) spell? ( >=app-text/enchant-2.2.3:2 >=app-text/gtkspell-3.0.10:3 ) ssl? ( >=net-libs/gnutls-3:0= ) >=sys-libs/zlib-1.2.0
 DESCRIPTION=A newsreader for GNOME
@@ -12,5 +12,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 dev-libs/gmime:3.0 >=x11-libs/gtk+-3.00:3 gnome-keyring? ( >=app-crypt/gcr-3.20 >=app-crypt/libsecret-0.20 ) libnotify? ( >=x11-libs/libnotify-0.4.1:0= ) spell? ( >=app-text/enchant-2.2.3:2 >=app-text/gtkspell-3.0.10:3 ) ssl? ( >=net-libs/gnutls-3:0= ) >=sys-libs/zlib-1.2.0
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/GNOME/pan/-/archive/v0.154/pan-v0.154.tar.bz2
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	gnome.org	6b39404f1491c60a2d32e3c693a683fe	xdg-utils	baea6080dd821f5562d715887954c9d3	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	xdg	4a14c5c24f121e7da66e5aab4a168c6e	gnome2	9bd787a54d31405e742ae7537eed650b
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	gnome.org	6b39404f1491c60a2d32e3c693a683fe	xdg-utils	baea6080dd821f5562d715887954c9d3	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	xdg	4a14c5c24f121e7da66e5aab4a168c6e	gnome2	9bd787a54d31405e742ae7537eed650b
 _md5_=a70bd1ae222448f274d6a4a83d5bfc79
diff --git a/metadata/md5-cache/net-nntp/pan-0.155 b/metadata/md5-cache/net-nntp/pan-0.155
index 21e643dfbc..4ac70cfb7f 100644
--- a/metadata/md5-cache/net-nntp/pan-0.155
+++ b/metadata/md5-cache/net-nntp/pan-0.155
@@ -1,4 +1,4 @@
-BDEPEND=app-text/yelp-tools >=sys-devel/gettext-0.19.7 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 app-arch/xz-utils
+BDEPEND=app-text/yelp-tools >=sys-devel/gettext-0.19.7 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-libs/glib-2.26:2 dev-libs/gmime:3.0 >=x11-libs/gtk+-3.00:3 gnome-keyring? ( >=app-crypt/gcr-3.20 >=app-crypt/libsecret-0.20 ) libnotify? ( >=x11-libs/libnotify-0.4.1:0= ) spell? ( >=app-text/enchant-2.2.3:2 >=app-text/gtkspell-3.0.10:3 ) ssl? ( >=net-libs/gnutls-3:0= ) >=sys-libs/zlib-1.2.0
 DESCRIPTION=A newsreader for GNOME
@@ -12,5 +12,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 dev-libs/gmime:3.0 >=x11-libs/gtk+-3.00:3 gnome-keyring? ( >=app-crypt/gcr-3.20 >=app-crypt/libsecret-0.20 ) libnotify? ( >=x11-libs/libnotify-0.4.1:0= ) spell? ( >=app-text/enchant-2.2.3:2 >=app-text/gtkspell-3.0.10:3 ) ssl? ( >=net-libs/gnutls-3:0= ) >=sys-libs/zlib-1.2.0
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/GNOME/pan/-/archive/v0.155/pan-v0.155.tar.bz2
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	gnome.org	6b39404f1491c60a2d32e3c693a683fe	xdg-utils	baea6080dd821f5562d715887954c9d3	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	xdg	4a14c5c24f121e7da66e5aab4a168c6e	gnome2	9bd787a54d31405e742ae7537eed650b
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	gnome.org	6b39404f1491c60a2d32e3c693a683fe	xdg-utils	baea6080dd821f5562d715887954c9d3	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	xdg	4a14c5c24f121e7da66e5aab4a168c6e	gnome2	9bd787a54d31405e742ae7537eed650b
 _md5_=a70bd1ae222448f274d6a4a83d5bfc79
diff --git a/metadata/md5-cache/net-p2p/dogecoin-qt-1.14.6 b/metadata/md5-cache/net-p2p/dogecoin-qt-1.14.6
index df28d4f87b..839df8b052 100644
--- a/metadata/md5-cache/net-p2p/dogecoin-qt-1.14.6
+++ b/metadata/md5-cache/net-p2p/dogecoin-qt-1.14.6
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf sys-devel/automake sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r6:2.71 >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/autoconf sys-devel/automake sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) >=dev-build/autoconf-2.71-r6:2.71 >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install postinst postrm prepare pretend
 DEPEND=sys-libs/db:5.3=[cxx] dev-libs/libevent:= dev-libs/protobuf dev-libs/openssl sys-devel/libtool sys-devel/automake:= >=dev-libs/boost-1.81.0-r1 dev-qt/qtcore dev-qt/qtgui dev-qt/qtwidgets dev-qt/qtdbus dev-qt/qtnetwork dev-qt/qtprintsupport dev-qt/linguist-tools:= cpu_flags_x86_avx2? ( app-crypt/intel-ipsec-mb ) wallet? ( media-gfx/qrencode ) zmq? ( net-libs/cppzmq )
 DESCRIPTION=Dogecoin Core Qt for desktop. Downloaded blockchain is under 2.2GB. Much secure.
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/db:5.3=[cxx] dev-libs/libevent:= dev-libs/protobuf dev-libs/ope
 REQUIRED_USE=dogecoind? ( utils )
 SLOT=0
 SRC_URI=https://github.com/dogecoin/dogecoin/archive/refs/tags/v1.14.6.tar.gz -> dogecoin-qt-v1.14.6.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	desktop	021728fdc1b03b36357dbc89489e0f0d	xdg-utils	baea6080dd821f5562d715887954c9d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	desktop	021728fdc1b03b36357dbc89489e0f0d	xdg-utils	baea6080dd821f5562d715887954c9d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
 _md5_=43f42bf4c6b10346f878c020ec0ef362
diff --git a/metadata/md5-cache/sci-electronics/verilator-4.106 b/metadata/md5-cache/sci-electronics/verilator-4.106
index 0c9c2cec54..13fbaec866 100644
--- a/metadata/md5-cache/sci-electronics/verilator-4.106
+++ b/metadata/md5-cache/sci-electronics/verilator-4.106
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/bison sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-lang/perl sys-libs/zlib
 DESCRIPTION=The fast free Verilog/SystemVerilog simulator
@@ -10,5 +10,5 @@ LICENSE=|| ( Artistic-2 LGPL-3 )
 RDEPEND=dev-lang/perl sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/verilator/verilator/archive/v4.106.tar.gz -> verilator-4.106.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=af5b9fd6095d78410d1362081e92d9bb
diff --git a/metadata/md5-cache/sci-electronics/verilator-5.014 b/metadata/md5-cache/sci-electronics/verilator-5.014
index 110a097ad5..4ae40446f8 100644
--- a/metadata/md5-cache/sci-electronics/verilator-5.014
+++ b/metadata/md5-cache/sci-electronics/verilator-5.014
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/bison sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-lang/perl sys-libs/zlib
 DESCRIPTION=The fast free Verilog/SystemVerilog simulator
@@ -10,5 +10,5 @@ LICENSE=|| ( Artistic-2 LGPL-3 )
 RDEPEND=dev-lang/perl sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/verilator/verilator/archive/v5.014.tar.gz -> verilator-5.014.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=af5b9fd6095d78410d1362081e92d9bb
diff --git a/metadata/md5-cache/sci-electronics/verilator-5.018 b/metadata/md5-cache/sci-electronics/verilator-5.018
index 2079a913bf..d3b8636954 100644
--- a/metadata/md5-cache/sci-electronics/verilator-5.018
+++ b/metadata/md5-cache/sci-electronics/verilator-5.018
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/bison sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=prepare
 DEPEND=dev-lang/perl sys-libs/zlib
 DESCRIPTION=The fast free Verilog/SystemVerilog simulator
@@ -10,5 +10,5 @@ LICENSE=|| ( Artistic-2 LGPL-3 )
 RDEPEND=dev-lang/perl sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/verilator/verilator/archive/v5.018.tar.gz -> verilator-5.018.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=af5b9fd6095d78410d1362081e92d9bb
diff --git a/metadata/md5-cache/sci-electronics/verilator-9999 b/metadata/md5-cache/sci-electronics/verilator-9999
index c87a68bc08..d592484bec 100644
--- a/metadata/md5-cache/sci-electronics/verilator-9999
+++ b/metadata/md5-cache/sci-electronics/verilator-9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/bison sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=prepare unpack
 DEPEND=dev-lang/perl sys-libs/zlib
 DESCRIPTION=The fast free Verilog/SystemVerilog simulator
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic-2 LGPL-3 )
 PROPERTIES=live
 RDEPEND=dev-lang/perl sys-libs/zlib
 SLOT=0
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=af5b9fd6095d78410d1362081e92d9bb
diff --git a/metadata/md5-cache/sci-libs/ann-1.1.2_p7-r2 b/metadata/md5-cache/sci-libs/ann-1.1.2_p7-r2
index 2a22ee4cd3..fbdaa30b35 100644
--- a/metadata/md5-cache/sci-libs/ann-1.1.2_p7-r2
+++ b/metadata/md5-cache/sci-libs/ann-1.1.2_p7-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/quilt sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/quilt sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare test
 DESCRIPTION=A Library for Approximate Nearest Neighbor Searching
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/ann/ann_1.1.2+doc.orig.tar.gz mirror://debian/pool/main/a/ann/ann_1.1.2+doc-7.debian.tar.xz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
 _md5_=328e0fcde002722515b26a70a4e13ea5
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-23.1-r1 b/metadata/md5-cache/sci-mathematics/frama-c-23.1-r1
index 59a3c21909..1fcea18d86 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-23.1-r1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-23.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure postinst prepare
 DEPEND=>=dev-lang/ocaml-4.08.1[ocamlopt?] >=dev-ml/ocamlgraph-1.8.5[ocamlopt?] >=dev-ml/zarith-1.5[ocamlopt?] >=dev-ml/yojson-1.4.1[ocamlopt?] gtk? ( >=dev-ml/lablgtk-2.14:2=[sourceview,gnomecanvas,ocamlopt?] ) media-gfx/graphviz
 DESCRIPTION=Framework for analysis of source codes written in C
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.08.1[ocamlopt?] >=dev-ml/ocamlgraph-1.8.5[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=bbe7e0c9df43651de066fa9df9434ecb
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-24.0-r1 b/metadata/md5-cache/sci-mathematics/frama-c-24.0-r1
index 7c7a95a13c..89dc7168a6 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-24.0-r1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-24.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure postinst prepare
 DEPEND=>=dev-lang/ocaml-4.08.1[ocamlopt?] >=dev-ml/ocamlgraph-1.8.8[ocamlopt?] >=dev-ml/zarith-1.5[ocamlopt?] >=dev-ml/yojson-1.4.1[ocamlopt?] gtk? ( >=dev-ml/lablgtk-2.14:2=[sourceview,gnomecanvas,ocamlopt?] ) media-gfx/graphviz
 DESCRIPTION=Framework for analysis of source codes written in C
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.08.1[ocamlopt?] >=dev-ml/ocamlgraph-1.8.8[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=8d4acbb639b2f51a76a885b1326ec784
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-25.0-r2 b/metadata/md5-cache/sci-mathematics/frama-c-25.0-r2
index 8c49eec1e6..1c772f3195 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-25.0-r2
+++ b/metadata/md5-cache/sci-mathematics/frama-c-25.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure postinst prepare
 DEPEND=>=dev-lang/ocaml-4.08.1[ocamlopt?] >=dev-ml/ocamlgraph-2.0.0[ocamlopt?] dev-ml/ppx_import[ocamlopt?] dev-ml/ppx_deriving[ocamlopt?] >=dev-ml/zarith-1.5[ocamlopt?] >=dev-ml/yojson-1.4.1[ocamlopt?] gtk? ( dev-ml/lablgtk:3=[ocamlopt?,sourceview] ) media-gfx/graphviz
 DESCRIPTION=Framework for analysis of source codes written in C
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.08.1[ocamlopt?] >=dev-ml/ocamlgraph-2.0.0[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=fba915586d1027cdf792264fc5018f94
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-aorai-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-aorai-23.1
index 37265b3631..d8ce5bca7d 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-aorai-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-aorai-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] eva? ( ~sci-mathematics/frama-c-eva-23.1:=[ocamlopt?] ) >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Aorai (automaton annotations) plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] eva? ( ~sci-mathematics/frama
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=60b1251e6322407c6b7c7dde00be725a
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-aorai-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-aorai-24.0
index d944990df6..b848b1c35d 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-aorai-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-aorai-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] eva? ( ~sci-mathematics/frama-c-eva-24.0:=[ocamlopt?] ) >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Aorai (automaton annotations) plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] eva? ( ~sci-mathematics/frama
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=7fa41ef87050bffd59d89b62bf989fde
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-aorai-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-aorai-25.0
index a925923883..75d9f7bc8f 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-aorai-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-aorai-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] eva? ( ~sci-mathematics/frama-c-eva-25.0:=[ocamlopt?] ) >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Aorai (automaton annotations) plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] eva? ( ~sci-mathematics/frama
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=b937f87c3f59cf48728b7c1ca44d7683
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-callgraph-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-callgraph-23.1
index 76dd9a5f82..751175cb00 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-callgraph-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-callgraph-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Callgraph plugin for frama-c
@@ -13,5 +13,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] dev-lang/ocaml:=[ocamlop
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=e2fbdc623fa8d1808501a0737f12be34
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-callgraph-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-callgraph-24.0
index b305480ae4..b495bbe480 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-callgraph-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-callgraph-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Callgraph plugin for frama-c
@@ -13,5 +13,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] dev-lang/ocaml:=[ocamlop
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=0cd5203f2c617f1bb5a909e8e5aa73b6
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-callgraph-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-callgraph-25.0
index 434ee14f7b..15be92ac46 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-callgraph-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-callgraph-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Callgraph plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=a195916d5dbef7acf57bcb107f574d88
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-constant-folding-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-constant-folding-23.1
index a192b3bf4e..0646ed9edc 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-constant-folding-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-constant-folding-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Constant folding plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-eva-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=97d76aa4f0f7852afe6dfdbb5457b58a
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-constant-folding-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-constant-folding-24.0
index bd70002dd8..dd9ac63c8e 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-constant-folding-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-constant-folding-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Constant folding plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=9dedafbdf10127892f0ea6711ebe9e97
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-constant-folding-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-constant-folding-25.0
index f45a971fcf..63683577c2 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-constant-folding-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-constant-folding-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Constant folding plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=3f67703709023bd4c6ed27653649f387
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-dive-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-dive-23.1
index fc7ddb72e2..51b3a62d86 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-dive-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-dive-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-studia-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-server-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Dive plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-eva-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=82d6e787460611fef91424acf010dec8
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-dive-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-dive-24.0
index b3eedf4b90..98b32817b9 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-dive-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-dive-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-studia-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-server-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Dive plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=e80c1e038c7cfcc33dfbcab484082def
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-dive-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-dive-25.0
index 16ad96f564..de6f54700f 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-dive-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-dive-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-studia-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-server-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Dive plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=8db7f7d802a90aefa2c5650a1d22884b
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-e-acsl-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-e-acsl-23.1
index 59e274a8e5..b63f6c221e 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-e-acsl-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-e-acsl-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-rtegen-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Runtime verification of ACSL (E-ACSL) plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-rteg
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=67536e9b0fb50d64662b6c556f4240eb
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-e-acsl-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-e-acsl-24.0
index 44fd6fc9c6..9c79f87ab7 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-e-acsl-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-e-acsl-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-rtegen-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Runtime verification of ACSL (E-ACSL) plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-rteg
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=d40816a2ad82878feff86082c24821dc
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-e-acsl-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-e-acsl-25.0
index d6bbd71039..3682885e3d 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-e-acsl-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-e-acsl-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-rtegen-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Runtime verification of ACSL (E-ACSL) plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-rteg
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=a5a872bed056b796207bb85b1f0c12b4
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-eva-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-eva-23.1
index 9ec01faa80..dfb5d56ec7 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-eva-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-eva-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-callgraph-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-loopanalysis-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-rtegen-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-server-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Value analysis (EVA) plugin for frama-c
@@ -13,5 +13,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=3fb2462e19c39dbeb8b18bfeba8b5645
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-eva-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-eva-24.0
index f6e470d248..7ab565af53 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-eva-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-eva-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-callgraph-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-loopanalysis-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-rtegen-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-server-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Value analysis (EVA) plugin for frama-c
@@ -13,5 +13,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=794462c0cf0f5ffcd55f95547c34119d
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-eva-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-eva-25.0
index f634598bdd..64cc240991 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-eva-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-eva-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-server-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Value analysis (EVA) plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=b0a6fbf317759aa4d928f7c292f42643
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-from-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-from-23.1
index 5cedd836df..7a09431ef9 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-from-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-from-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-callgraph-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-postdominators-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=From analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=096d978e60621ba9990a47dbf1d0e5d7
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-from-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-from-24.0
index 6b97c3c762..72264f9956 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-from-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-from-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-callgraph-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-postdominators-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=From analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=d8672872ee47e3e3883444f9be7ae1cb
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-from-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-from-25.0
index 697ce26132..bf3625fb67 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-from-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-from-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-callgraph-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-postdominators-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=From analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=2db4cf36ada3466c7cedd203598e2889
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-impact-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-impact-23.1
index 346d668321..e9e002f961 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-impact-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-impact-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-inout-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-pdg-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-slicing-23.1:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Impact plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=990aaf73a46e1d3cdd063af96ac23c1e
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-impact-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-impact-24.0
index 05bb862e7f..b9234fb0f7 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-impact-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-impact-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-inout-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-pdg-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-slicing-24.0:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Impact plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=68ed225bef9eb93b0b692a582ccf1d3c
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-impact-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-impact-25.0
index fd09bc93de..e2bf5effae 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-impact-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-impact-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-inout-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-pdg-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-slicing-25.0:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Impact plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=70195ec241f4dcf281d96f9da6ec5c3d
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-inout-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-inout-23.1
index d15efca9cf..a6a798b04f 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-inout-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-inout-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-callgraph-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-from-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=In/out analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-call
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=9a50accf45b0d9aa73c0f90e24a378c0
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-inout-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-inout-24.0
index 2d4632cc82..5f7ea428bf 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-inout-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-inout-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-callgraph-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-from-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=In/out analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-call
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=2299a5e7515a66156a49ddf6a2469466
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-inout-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-inout-25.0
index c9849c02c6..9add7b4e3b 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-inout-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-inout-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-callgraph-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-from-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=In/out analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-call
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=92a1686c83921e802f1a50dc3f4285ae
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-instantiate-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-instantiate-23.1
index fefda7360e..69d06cbe89 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-instantiate-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-instantiate-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Instantiate analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=3edd9bdef9f980d1bf228af3d1024c06
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-instantiate-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-instantiate-24.0
index 19c0aea549..a75f843111 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-instantiate-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-instantiate-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Instantiate analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=94611d89934f45b08e938b4fb377c203
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-instantiate-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-instantiate-25.0
index afa1b1a7ce..27d3361528 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-instantiate-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-instantiate-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Instantiate analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=2f6b144f58b60eebe50e7fedb9526e6d
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-loopanalysis-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-loopanalysis-23.1
index ef1f4428de..88c9a32f27 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-loopanalysis-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-loopanalysis-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Loop analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=d8ff826dea2efcd7fad8d248f307cdbf
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-loopanalysis-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-loopanalysis-24.0
index 495dc7cebc..74c915ef0c 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-loopanalysis-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-loopanalysis-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Loop analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=abc760813fa689b50ed538f21a69a3f6
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-loopanalysis-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-loopanalysis-25.0
index f3479704e0..698e953e4e 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-loopanalysis-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-loopanalysis-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Loop analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=ca44ebcf4d3dbc2985c70c968ddcfc15
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-metrics-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-metrics-23.1
index d3420ed0be..48c91e6b51 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-metrics-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-metrics-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Metrics plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=b58665887ee322c207eb2746c8602128
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-metrics-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-metrics-24.0
index a385cb3a0e..14eee7d0f4 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-metrics-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-metrics-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Metrics plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=ace806f8b18f8497b27addd02e5c1600
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-metrics-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-metrics-25.0
index bccfe3dd16..05429e8270 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-metrics-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-metrics-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-server-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Metrics plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=231d8a6342ed2b5eebe8a6ddee0ffdaf
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-nonterm-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-nonterm-23.1
index 70b639bb5e..34b6972167 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-nonterm-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-nonterm-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Nonterm plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-eva-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=e56b71fc50df6ec67926929a0fba0bd1
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-nonterm-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-nonterm-24.0
index e8222e03fe..5df0832324 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-nonterm-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-nonterm-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Nonterm plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=5ca966bc7e3a2f7ba4a98f14477a9392
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-nonterm-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-nonterm-25.0
index 98940f918b..6904cf9097 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-nonterm-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-nonterm-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Nonterm plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=3dc777d6718158e316b6c6fb003b1653
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-obfuscator-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-obfuscator-23.1
index fd4008e569..d20664cc92 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-obfuscator-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-obfuscator-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Obfuscator plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=6bdcaf3558b02edc9bca20122b38f475
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-obfuscator-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-obfuscator-24.0
index 73cb4542b7..691de7ea73 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-obfuscator-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-obfuscator-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Obfuscator plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=e4e3cabcf20de8198dbf0f9d0c53cb5b
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-obfuscator-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-obfuscator-25.0
index 74306b56d5..ab792716ec 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-obfuscator-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-obfuscator-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Obfuscator plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=e5d38caa5895de108e959c4a80800d4c
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-occurrence-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-occurrence-23.1
index 5763f2572b..cb020a95e2 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-occurrence-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-occurrence-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Occurrence analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=4cb4d90d414a8bc89bcdf034335d74f2
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-occurrence-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-occurrence-24.0
index 44e21ca58f..643b1db902 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-occurrence-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-occurrence-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Occurrence analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=0da9e5698170b9cb0205e77b5d8b9978
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-occurrence-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-occurrence-25.0
index 0c66d9d6e5..1987e59cd7 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-occurrence-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-occurrence-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Occurrence analysis plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=a416fe1a2bb228e02685b5cc40f64d55
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-pdg-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-pdg-23.1
index 726ffecf5a..01115caa22 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-pdg-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-pdg-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-callgraph-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-from-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Program dependence graph plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-call
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=6955ff4ef3e7f40ffcecf4b293372243
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-pdg-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-pdg-24.0
index bc157d5b48..9c08aeb2de 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-pdg-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-pdg-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-callgraph-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-from-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Program dependence graph plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-call
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=fc51cc62af4dbab1d63e29a57df19824
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-pdg-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-pdg-25.0
index 9004c755fe..e9ee5ef04e 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-pdg-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-pdg-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-callgraph-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-from-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Program dependence graph plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-call
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=fc35079e6b661adf93bb1e9c6b5b14de
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-postdominators-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-postdominators-23.1
index 263ee12ff4..1cc0455718 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-postdominators-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-postdominators-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Postdominators plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=4541ef30755f0ab18e6e1e119debec27
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-postdominators-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-postdominators-24.0
index f3701a418b..7c7db00d2f 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-postdominators-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-postdominators-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Postdominators plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=4aab26253bedf961f9c057d1d0e45964
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-postdominators-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-postdominators-25.0
index d77f4ebab5..e167169dbc 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-postdominators-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-postdominators-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Postdominators plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=215a067ef53b23ca3401da44707770d1
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-reduc-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-reduc-25.0
index 6cbb7af786..e2ba6caa8f 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-reduc-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-reduc-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-inout-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=frama-c plugin to generate ACSL annotations from Eva information
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=89476bb56129e313e40842023f4aa3d2
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-report-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-report-23.1
index 3ff0155667..60468af7b6 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-report-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-report-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Report plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=d9fd3400bb509f4d54d60b904f548d04
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-report-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-report-24.0
index e9dd3b9c10..1556a1e136 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-report-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-report-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Report plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=31cae3780402b7f2262b1d942728f426
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-report-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-report-25.0
index 25bc453b13..0b93aebc62 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-report-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-report-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Report plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=4d7b150fd2572277ab38826cfde0eabb
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-rtegen-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-rtegen-23.1
index 713a41751a..e730ef6907 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-rtegen-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-rtegen-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Runtime error annotation (RTE) generation plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=ea8b0443ecaf240b212718545853a9f7
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-rtegen-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-rtegen-24.0
index 57cd55c730..8e2b678834 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-rtegen-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-rtegen-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Runtime error annotation (RTE) generation plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=30c4b3888bc6dfbe06e870c62a510719
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-rtegen-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-rtegen-25.0
index ea74b4ccbe..34a8ceb2d6 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-rtegen-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-rtegen-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Runtime error annotation (RTE) generation plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=47d784a001ff7003f0e82fcaf1c9570d
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-scope-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-scope-23.1
index 430756ef3e..f584f581d1 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-scope-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-scope-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-inout-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Scope plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=52a015b22901b298ce6a55e0e53b2cde
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-scope-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-scope-24.0
index 5e43ac2725..af055410ab 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-scope-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-scope-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-inout-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Scope plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=fe2cd082921941c62b17bf02fc17f18d
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-scope-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-scope-25.0
index d49ff19b8d..04275d533e 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-scope-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-scope-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-inout-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Scope plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=301361ff9aa6e16bd64f454be6f662b8
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-security-slicing-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-security-slicing-23.1
index 2dafe7fe34..5827e4f905 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-security-slicing-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-security-slicing-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[gtk,ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[gtk,ocamlopt?] ~sci-mathematics/frama-c-pdg-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-slicing-23.1:=[gtk,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Security slicing plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[gtk,ocamlopt?] ~sci-mathematics/frama-c-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=c420213b9b3bf91b6313b7988a381d08
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-security-slicing-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-security-slicing-24.0
index 72b8025322..754327e5f9 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-security-slicing-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-security-slicing-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[gtk,ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[gtk,ocamlopt?] ~sci-mathematics/frama-c-pdg-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-slicing-24.0:=[gtk,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Security slicing plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[gtk,ocamlopt?] ~sci-mathematics/frama-c-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=b28ac4c9f2b5b2b77969219d1c5118da
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-security-slicing-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-security-slicing-25.0
index 12168bb8ca..0382beb257 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-security-slicing-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-security-slicing-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[gtk,ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[gtk,ocamlopt?] ~sci-mathematics/frama-c-pdg-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-slicing-25.0:=[gtk,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Security slicing plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[gtk,ocamlopt?] ~sci-mathematics/frama-c-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=a0f24ab644cfa777ce78f6a956d6bb8e
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-server-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-server-23.1
index bb561e9681..a58b2ca709 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-server-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-server-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Server plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=56cde4c39e4cd88d081616c51990cd39
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-server-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-server-24.0
index bddefd5b9f..f6325a2c50 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-server-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-server-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Server plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=5eca3d9d18255fb05b3f2e90a3af29fa
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-server-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-server-25.0
index 51f2f3e92a..0472237a1e 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-server-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-server-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Server plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=5be26e5852fa94ac089bb43af29487cd
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-slicing-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-slicing-23.1
index fbca5f061d..831cda9337 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-slicing-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-slicing-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-callgraph-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-pdg-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-sparecode-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Slicing plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=6eebae2a4ee9b2ed6797b61670a6b185
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-slicing-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-slicing-24.0
index a7ca9817bb..fd5d5773d2 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-slicing-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-slicing-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-callgraph-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-pdg-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-sparecode-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Slicing plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=a9239643a27f3ff0f813caedacd1792b
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-slicing-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-slicing-25.0
index 0053496f59..c95f2818e9 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-slicing-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-slicing-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-callgraph-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-pdg-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-sparecode-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Slicing plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=9c01b989d4d1f34900a1357455290a6a
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-sparecode-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-sparecode-23.1
index 1159fb4921..8325e6f90b 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-sparecode-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-sparecode-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-pdg-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-users-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Spare code plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-pdg-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=488b2a02fe6104bea2ba5372d014c45f
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-sparecode-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-sparecode-24.0
index e822669a46..6b0001e6a3 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-sparecode-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-sparecode-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-pdg-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-users-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Spare code plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-pdg-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=f764aa15e52083a1f9af84450002f9e6
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-sparecode-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-sparecode-25.0
index a1ffd8773a..ca32220e01 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-sparecode-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-sparecode-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-pdg-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-inout-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-users-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Spare code plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-pdg-
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=1555f41dfc867b4fa920b00c41412bad
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-studia-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-studia-23.1
index aacb83e971..c23577b034 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-studia-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-studia-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Studia plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=6b9aceebdc8a8db131612189bf78d408
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-studia-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-studia-24.0
index 90acba787e..0435a583c2 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-studia-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-studia-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Studia plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=a90aa556ec40b772089a57ca1c7c26da
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-studia-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-studia-25.0
index e21b68f0eb..8834a17082 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-studia-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-studia-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[gtk=,ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Studia plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=4a1bb303f0883052744b6dffda9db8bb
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-users-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-users-23.1
index 7a28c59c87..67e6f509a2 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-users-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-users-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-callgraph-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-eva-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Users plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] ~sci-mathematics/frama-c-call
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=5dccede47525733d3ebe4e5ec246ae58
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-users-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-users-24.0
index 49c25239f8..43d6d0e23a 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-users-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-users-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-callgraph-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Users plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] ~sci-mathematics/frama-c-call
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=f49b36ca2478b77361e9f6541a7b8416
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-users-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-users-25.0
index d634d3e044..b0a93ac88e 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-users-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-users-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-callgraph-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-eva-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Users plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] ~sci-mathematics/frama-c-call
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=81adf4c7add93d3188263a829b3c0282
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-variadic-23.1 b/metadata/md5-cache/sci-mathematics/frama-c-variadic-23.1
index cdc9bb7552..07fa7d65b1 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-variadic-23.1
+++ b/metadata/md5-cache/sci-mathematics/frama-c-variadic-23.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Variadic function transformation plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-23.1:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-23.1-Vanadium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=b8e33758717b3ee45034b4390fa22945
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-variadic-24.0 b/metadata/md5-cache/sci-mathematics/frama-c-variadic-24.0
index 331efa2335..a1445a92bc 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-variadic-24.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-variadic-24.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Variadic function transformation plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-24.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-24.0-Chromium.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=e4dad3dd93bb7025e80c844e272ba197
diff --git a/metadata/md5-cache/sci-mathematics/frama-c-variadic-25.0 b/metadata/md5-cache/sci-mathematics/frama-c-variadic-25.0
index c6cc0c50b5..6cff701bdc 100644
--- a/metadata/md5-cache/sci-mathematics/frama-c-variadic-25.0
+++ b/metadata/md5-cache/sci-mathematics/frama-c-variadic-25.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Variadic function transformation plugin for frama-c
@@ -12,5 +12,5 @@ RDEPEND=~sci-mathematics/frama-c-25.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://frama-c.com/download/frama-c-25.0-Manganese.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	findlib	cc1c14904708a0a28bcb256b342a808c
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	findlib	cc1c14904708a0a28bcb256b342a808c
 _md5_=83236655a867d15eceb584d2489fa877
diff --git a/metadata/md5-cache/sci-misc/boinc-wrapper-26018 b/metadata/md5-cache/sci-misc/boinc-wrapper-26018
index 95f89ac944..bb9331b818 100644
--- a/metadata/md5-cache/sci-misc/boinc-wrapper-26018
+++ b/metadata/md5-cache/sci-misc/boinc-wrapper-26018
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=dev-libs/openssl media-libs/freeglut media-libs/libjpeg-turbo
 DESCRIPTION=Wrapper to use non-BOINC apps with BOINC
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Info-ZIP LGPL-3+ regexp-UofT
 SLOT=0
 SRC_URI=https://github.com/BOINC/boinc/archive/refs/tags/wrapper/26018.tar.gz -> boinc-wrapper-26018.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	boinc	29357a75d6953641847e9b2f2fe608f6
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	boinc	29357a75d6953641847e9b2f2fe608f6
 _md5_=c51f4bb984662dc3eafaf96084303781
diff --git a/metadata/md5-cache/sci-misc/linuxcnc-9999 b/metadata/md5-cache/sci-misc/linuxcnc-9999
index ddde5301e5..4b0c85d6e0 100644
--- a/metadata/md5-cache/sci-misc/linuxcnc-9999
+++ b/metadata/md5-cache/sci-misc/linuxcnc-9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst prepare setup unpack
 DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) dev-lang/tcl dev-lang/tk dev-tcltk/bwidget dev-tcltk/tclx dev-tcltk/tkimg media-gfx/graphviz media-libs/mesa net-firewall/iptables sys-devel/gettext sys-process/procps sys-process/psmisc x11-libs/libXinerama x11-apps/mesa-progs virtual/glu virtual/opengl python_single_target_python3_10? ( dev-libs/boost[python,python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[tk,python_targets_python3_10(-)] dev-python/pygobject[python_targets_python3_10(-)] dev-python/pyopengl[python_targets_python3_10(-)] ) || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) modbus? ( <dev-libs/libmodbus-3.1 ) gtk? ( x11-libs/gtk+ ) rt? ( sys-kernel/rt-sources ) usb? ( virtual/libusb ) X? ( x11-libs/libXaw python_single_target_python3_10? ( dev-python/python-xlib[python_targets_python3_10(-)] ) )
 DESCRIPTION=LinuxCNC
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) dev-lang/tcl d
 REQUIRED_USE=^^ ( python_single_target_python3_10 ) rt? ( !simulator )
 RESTRICT=bindist
 SLOT=9999
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	desktop	021728fdc1b03b36357dbc89489e0f0d	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	desktop	021728fdc1b03b36357dbc89489e0f0d	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
 _md5_=05d56ecda9ea4f1f1b25fb83020178af
diff --git a/metadata/md5-cache/sci-physics/mbdyn-1.7.3_p20210925-r1 b/metadata/md5-cache/sci-physics/mbdyn-1.7.3_p20210925-r1
index f2aa87ff5a..f123422e62 100644
--- a/metadata/md5-cache/sci-physics/mbdyn-1.7.3_p20210925-r1
+++ b/metadata/md5-cache/sci-physics/mbdyn-1.7.3_p20210925-r1
@@ -1,4 +1,4 @@
-BDEPEND=python? ( dev-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 virtual/fortran
+BDEPEND=python? ( dev-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 virtual/fortran
 DEFINED_PHASES=configure install prepare setup
 DEPEND=dev-libs/libltdl virtual/blas virtual/lapack ann? ( sci-libs/ann ) arpack? ( sci-libs/arpack ) blender? ( media-gfx/blender:= ) boost? ( dev-libs/boost ) bullet? ( sci-physics/bullet ) chaco? ( sci-mathematics/chaco ) crypt? ( virtual/libcrypt ) ginac? ( sci-mathematics/ginac ) jdqz? ( sci-libs/jdqz ) mbdyn_module_damper? ( sci-libs/gsl ) mpi? ( virtual/mpi[cxx] ) metis? ( sci-libs/metis ) netcdf? ( sci-libs/netcdf-cxx:* ) octave? ( sci-mathematics/octave ) openblas? ( sci-libs/openblas ) pam? ( sys-libs/pam ) pastix? ( sci-libs/pastix ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) qrupdate? ( sci-libs/qrupdate ) sasl? ( dev-libs/cyrus-sasl ) sparse? ( sci-libs/klu sci-libs/umfpack ) superlu? ( sci-libs/superlu_mt ) threads? ( dev-libs/libatomic_ops ) udunits? ( sci-libs/udunits ) blender? ( sys-apps/pkgcore ) virtual/fortran
 DESCRIPTION=A general purpose Multibody Dynamics analysis software
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libltdl virtual/blas virtual/lapack ann? ( sci-libs/ann ) arpac
 REQUIRED_USE=mbdyn_module_bullet? ( bullet ) mbdyn_module_octave? ( octave ) mbdyn_module_udunits? ( udunits ) mbdyn_module_wheel4? ( ginac ) multithread-naive? ( threads ) pmpi? ( mpi ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) schur? ( || ( chaco metis ) mpi )
 SLOT=0
 SRC_URI=https://public.gitlab.polimi.it/DAER/mbdyn/-/archive/ae57618c4e7b030b59707b8c156a6e2a94a6efd0/mbdyn-ae57618c4e7b030b59707b8c156a6e2a94a6efd0.tar.bz2
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	pam	b56d0c9c20fc5b553f13c8ae165a10a5	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	pam	b56d0c9c20fc5b553f13c8ae165a10a5	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
 _md5_=a0a3f193849c50907553b7dfe8dca82a
diff --git a/metadata/md5-cache/sys-apps/sdate-0.7 b/metadata/md5-cache/sys-apps/sdate-0.7
index 40cf252680..4d9ba0e7cf 100644
--- a/metadata/md5-cache/sys-apps/sdate-0.7
+++ b/metadata/md5-cache/sys-apps/sdate-0.7
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=install prepare
 DESCRIPTION=Wrapper program to output dates like the Eternal September 1993
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/df7cb/sdate/archive/refs/tags/0.7.tar.gz -> sdate-0.7.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=2de5fcd5ba0609942a5cf573be8d0ac1
diff --git a/metadata/md5-cache/sys-apps/systemd-bootchart-235 b/metadata/md5-cache/sys-apps/systemd-bootchart-235
index 0e4beaf74a..291d095179 100644
--- a/metadata/md5-cache/sys-apps/systemd-bootchart-235
+++ b/metadata/md5-cache/sys-apps/systemd-bootchart-235
@@ -1,4 +1,4 @@
-BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare setup
 DESCRIPTION=systemd boot performance graphing tool
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=systemd? ( >=sys-apps/systemd-221 )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-bootchart/archive/refs/tags/v235.tar.gz -> systemd-bootchart-235.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=cdd0a75968f7b598a4cbd3ef9fa0100a
diff --git a/metadata/md5-cache/sys-apps/watchdogd-3.5 b/metadata/md5-cache/sys-apps/watchdogd-3.5
index 08ec7f2e6a..3900dfce52 100644
--- a/metadata/md5-cache/sys-apps/watchdogd-3.5
+++ b/metadata/md5-cache/sys-apps/watchdogd-3.5
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/confuse:= dev-libs/libite dev-libs/libuev systemd? ( sys-apps/systemd )
 DESCRIPTION=Advanced system & process supervisor for Linux
@@ -11,5 +11,5 @@ LICENSE=ISC
 RDEPEND=dev-libs/confuse:= dev-libs/libite dev-libs/libuev systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/troglobit/watchdogd/archive/refs/tags/3.5.tar.gz -> watchdogd-3.5.gh.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3
 _md5_=53bc34d537eead28fb49f605b630d018
diff --git a/metadata/md5-cache/sys-auth/pam-gnupg-0.3 b/metadata/md5-cache/sys-auth/pam-gnupg-0.3
index deb4ab5fe2..28e2cc3dc6 100644
--- a/metadata/md5-cache/sys-auth/pam-gnupg-0.3
+++ b/metadata/md5-cache/sys-auth/pam-gnupg-0.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DESCRIPTION=Unlock GnuPG keys on login
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/pam-1.5.1_p20210622-r1 >=app-crypt/gnupg-2.2.33-r1
 SLOT=0
 SRC_URI=https://github.com/cruegge/pam-gnupg/archive/refs/tags/v0.3.tar.gz -> pam-gnupg-0.3.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=718bbbbfe3caa1f65f25e32669a002a6
diff --git a/metadata/md5-cache/sys-block/partclone-0.3.20 b/metadata/md5-cache/sys-block/partclone-0.3.20
index 5441454cb8..d3b82960d5 100644
--- a/metadata/md5-cache/sys-block/partclone-0.3.20
+++ b/metadata/md5-cache/sys-block/partclone-0.3.20
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/openssl:* e2fs? ( sys-fs/e2fsprogs ) btrfs? ( sys-apps/util-linux ) fuse? ( sys-fs/fuse:0 ) jfs? ( sys-fs/jfsutils ) ncurses? ( sys-libs/ncurses:0 ) nilfs2? ( sys-fs/nilfs-utils ) ntfs? ( sys-fs/ntfs3g ) reiserfs? ( sys-fs/progsreiserfs ) reiser4? ( sys-fs/reiser4progs ) xfs? ( sys-apps/util-linux ) static? ( dev-libs/openssl:*[static-libs] e2fs? ( sys-fs/e2fsprogs[static-libs] ) btrfs? ( sys-apps/util-linux[static-libs] ) fuse? ( sys-fs/fuse:0[static-libs] ) jfs? ( sys-fs/jfsutils[static] ) ncurses? ( sys-libs/ncurses:0[static-libs] ) nilfs2? ( sys-fs/nilfs-utils[static-libs] ) ntfs? ( sys-fs/ntfs3g[static-libs] ) reiserfs? ( sys-fs/progsreiserfs[static-libs] ) reiser4? ( sys-fs/reiser4progs[static-libs] ) )
 DESCRIPTION=Partition cloning tool
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:* e2fs? ( sys-fs/e2fsprogs ) btrfs? ( sys-apps/util-linux ) fuse? ( sys-fs/fuse:0 ) jfs? ( sys-fs/jfsutils ) ncurses? ( sys-libs/ncurses:0 ) nilfs2? ( sys-fs/nilfs-utils ) ntfs? ( sys-fs/ntfs3g ) reiserfs? ( sys-fs/progsreiserfs ) reiser4? ( sys-fs/reiser4progs ) xfs? ( sys-apps/util-linux ) static? ( dev-libs/openssl:*[static-libs] e2fs? ( sys-fs/e2fsprogs[static-libs] ) btrfs? ( sys-apps/util-linux[static-libs] ) fuse? ( sys-fs/fuse:0[static-libs] ) jfs? ( sys-fs/jfsutils[static] ) ncurses? ( sys-libs/ncurses:0[static-libs] ) nilfs2? ( sys-fs/nilfs-utils[static-libs] ) ntfs? ( sys-fs/ntfs3g[static-libs] ) reiserfs? ( sys-fs/progsreiserfs[static-libs] ) reiser4? ( sys-fs/reiser4progs[static-libs] ) )
 SLOT=0
 SRC_URI=https://github.com/Thomas-Tsai/partclone/archive/refs/tags/0.3.20.tar.gz -> partclone-0.3.20.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
 _md5_=57244a9c1902e0ae9f98b9542bf6ac1c
diff --git a/metadata/md5-cache/sys-cluster/SOS-1.5.0-r1 b/metadata/md5-cache/sys-cluster/SOS-1.5.0-r1
index adb27cf8fa..9ce9eef4fd 100644
--- a/metadata/md5-cache/sys-cluster/SOS-1.5.0-r1
+++ b/metadata/md5-cache/sys-cluster/SOS-1.5.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 fortran? ( virtual/fortran )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install prepare setup
 DEPEND=ofi? ( sys-block/libfabric ) pmi? ( || ( sys-cluster/slurm sys-cluster/pmix[pmi] ) ) portals4? ( sys-cluster/portals4 ) ucx? ( sys-cluster/ucx ) xpmem? ( sys-kernel/xpmem ) fortran? ( virtual/fortran )
 DESCRIPTION=implementation of the OpenSHMEM specification
@@ -12,5 +12,5 @@ RDEPEND=ofi? ( sys-block/libfabric ) pmi? ( || ( sys-cluster/slurm sys-cluster/p
 REQUIRED_USE=^^ ( ofi_mr_basic ofi_mr_scalable ofi_mr_rma-event ) ^^ ( total_data_ordering_always total_data_ordering_check total_data_ordering_never ) ?? ( cma xpmem ) ?? ( ofi portals4 )
 SLOT=0
 SRC_URI=https://github.com/Sandia-OpenSHMEM/SOS/archive/refs/tags/v1.5.0.tar.gz -> SOS-1.5.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea
 _md5_=47ce80e0bc82abf5a64fa82645f8573c
diff --git a/metadata/md5-cache/sys-cluster/SOS-1.5.1 b/metadata/md5-cache/sys-cluster/SOS-1.5.1
index 219000e6b8..41f5f65647 100644
--- a/metadata/md5-cache/sys-cluster/SOS-1.5.1
+++ b/metadata/md5-cache/sys-cluster/SOS-1.5.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 fortran? ( virtual/fortran )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install prepare setup
 DEPEND=ofi? ( sys-block/libfabric ) pmi? ( || ( sys-cluster/slurm sys-cluster/pmix[pmi] ) ) portals4? ( sys-cluster/portals4 ) ucx? ( sys-cluster/ucx ) xpmem? ( sys-kernel/xpmem ) fortran? ( virtual/fortran )
 DESCRIPTION=implementation of the OpenSHMEM specification
@@ -12,5 +12,5 @@ RDEPEND=ofi? ( sys-block/libfabric ) pmi? ( || ( sys-cluster/slurm sys-cluster/p
 REQUIRED_USE=^^ ( ofi_mr_basic ofi_mr_scalable ofi_mr_rma-event ) ^^ ( total_data_ordering_always total_data_ordering_check total_data_ordering_never ) ?? ( cma xpmem ) ?? ( ofi portals4 )
 SLOT=0
 SRC_URI=https://github.com/Sandia-OpenSHMEM/SOS/archive/refs/tags/v1.5.1.tar.gz -> SOS-1.5.1.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea
 _md5_=47ce80e0bc82abf5a64fa82645f8573c
diff --git a/metadata/md5-cache/sys-cluster/TCL-1.0 b/metadata/md5-cache/sys-cluster/TCL-1.0
index d2f09e85cd..5308388509 100644
--- a/metadata/md5-cache/sys-cluster/TCL-1.0
+++ b/metadata/md5-cache/sys-cluster/TCL-1.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=virtual/mpi fti? ( sys-cluster/fti ) scr? ( sys-cluster/scr ) veloc? ( sys-cluster/veloc )
 DESCRIPTION=Transparent Checkpointing Library
@@ -12,5 +12,5 @@ RDEPEND=virtual/mpi fti? ( sys-cluster/fti ) scr? ( sys-cluster/scr ) veloc? ( s
 REQUIRED_USE=|| ( fti scr veloc ) || ( tcl_debug tcl_instrumentation tcl_instrumentation-debug tcl_performance )
 SLOT=0
 SRC_URI=https://github.com/bsc-pm/TCL/archive/refs/tags/v1.0.tar.gz -> TCL-1.0.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=581b992b5e0db4515a1235ef922404a4
diff --git a/metadata/md5-cache/sys-cluster/booth-1.0_p20210730 b/metadata/md5-cache/sys-cluster/booth-1.0_p20210730
index 3fc50966a0..dab3c82970 100644
--- a/metadata/md5-cache/sys-cluster/booth-1.0_p20210730
+++ b/metadata/md5-cache/sys-cluster/booth-1.0_p20210730
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
 DEPEND=acct-group/haclient acct-user/hacluster dev-libs/libxml2 sys-cluster/pacemaker sys-libs/zlib || ( dev-libs/libgcrypt app-crypt/mhash ) glue? ( sys-cluster/cluster-glue ) !glue? ( dev-libs/glib sys-apps/systemd sys-cluster/libqb )
 DESCRIPTION=The Booth Cluster Ticket Manager
@@ -12,5 +12,5 @@ RDEPEND=acct-group/haclient acct-user/hacluster dev-libs/libxml2 sys-cluster/pac
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/booth/archive/95d854b32a7cb20cb9a0e90c71d8cc269657304d.tar.gz -> booth-1.0_p20210730.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	systemd	c8b03e8df84486aa991d4396686e8942
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	systemd	c8b03e8df84486aa991d4396686e8942
 _md5_=1d220ba8fae0940822cbd01b0a878a6f
diff --git a/metadata/md5-cache/sys-cluster/clusteringsuite-2.6.9-r3 b/metadata/md5-cache/sys-cluster/clusteringsuite-2.6.9-r3
index b55e2f93de..7ab61c7e9a 100644
--- a/metadata/md5-cache/sys-cluster/clusteringsuite-2.6.9-r3
+++ b/metadata/md5-cache/sys-cluster/clusteringsuite-2.6.9-r3
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=doc? ( app-text/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=app-arch/bzip2 dev-libs/boost:= sci-libs/ann !sys-cluster/libbsctools mpi? ( virtual/mpi ) muster? ( sys-cluster/muster ) treedbscan? ( dev-libs/boost:=[threads(+)] dev-libs/gmp dev-libs/mpfr sci-mathematics/cgal sys-cluster/synapse ) || ( dev-lang/python:3.11 dev-lang/python:3.10 dev-python/pypy3 )
 DESCRIPTION=Expose the main performance trends in applications computation structure
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=app-arch/bzip2 dev-libs/boost:= sci-libs/ann !sys-cluster/libbsctools mpi? ( virtual/mpi ) muster? ( sys-cluster/muster ) treedbscan? ( dev-libs/boost:=[threads(+)] dev-libs/gmp dev-libs/mpfr sci-mathematics/cgal sys-cluster/synapse )
 SLOT=0
 SRC_URI=https://codeload.github.com/bsc-performance-tools/clustering-suite/tar.gz/refs/tags/2.6.9 -> clusteringsuite-2.6.9.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2
 _md5_=a0481530e3db1c6f35dfb32d1aca509c
diff --git a/metadata/md5-cache/sys-cluster/dimemas-5.4.2_p20220601 b/metadata/md5-cache/sys-cluster/dimemas-5.4.2_p20220601
index fccc0548ac..8a18dfe679 100644
--- a/metadata/md5-cache/sys-cluster/dimemas-5.4.2_p20220601
+++ b/metadata/md5-cache/sys-cluster/dimemas-5.4.2_p20220601
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install preinst prepare setup
 DEPEND=dev-libs/boost:= sys-libs/zlib java? ( dev-java/commons-io:1 ) || ( dev-lang/python:3.11 dev-lang/python:3.10 dev-python/pypy3 ) java? ( virtual/jdk:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=High-abstracted network simulator for message-passing programs
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost:= sys-libs/zlib java? ( dev-java/commons-io:1 ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/bsc-performance-tools/dimemas/archive/0dc28fafb8a917cee8d6ffd4a037cdc1f8755101.tar.gz -> dimemas-5.4.2_p20220601.gh.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2
 _md5_=bc160021958471ee09df2c8e13596eab
diff --git a/metadata/md5-cache/sys-cluster/dlb-2.1-r3 b/metadata/md5-cache/sys-cluster/dlb-2.1-r3
index 9d8843a8ae..6e4402babb 100644
--- a/metadata/md5-cache/sys-cluster/dlb-2.1-r3
+++ b/metadata/md5-cache/sys-cluster/dlb-2.1-r3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( sys-devel/bc ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=test? ( sys-devel/bc ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare setup
 DEPEND=hwloc? ( sys-apps/hwloc ) mpi? ( virtual/mpi )
 DESCRIPTION=Dynamically react to application imbalance by modifying the number of resources
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bsc-pm/dlb/archive/v2.1.tar.gz -> dlb-2.1.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
 _md5_=68b128ce5c88f0a8cace0213841e3598
diff --git a/metadata/md5-cache/sys-cluster/dtcmp-1.1.2 b/metadata/md5-cache/sys-cluster/dtcmp-1.1.2
index 8c69648447..c2c20f6ed9 100644
--- a/metadata/md5-cache/sys-cluster/dtcmp-1.1.2
+++ b/metadata/md5-cache/sys-cluster/dtcmp-1.1.2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=sys-cluster/lwgrp virtual/mpi
 DESCRIPTION=Datatype Compare Library for sorting and ranking distributed data using MPI
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=sys-cluster/lwgrp virtual/mpi
 SLOT=0
 SRC_URI=https://github.com/LLNL/dtcmp/archive/refs/tags/v1.1.2.tar.gz -> dtcmp-1.1.2.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=ec2ff58e49247811630bac19f99038e9
diff --git a/metadata/md5-cache/sys-cluster/dtcmp-1.1.4 b/metadata/md5-cache/sys-cluster/dtcmp-1.1.4
index 82d5306888..86fd2869c0 100644
--- a/metadata/md5-cache/sys-cluster/dtcmp-1.1.4
+++ b/metadata/md5-cache/sys-cluster/dtcmp-1.1.4
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=sys-cluster/lwgrp virtual/mpi
 DESCRIPTION=Datatype Compare Library for sorting and ranking distributed data using MPI
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=sys-cluster/lwgrp virtual/mpi
 SLOT=0
 SRC_URI=https://github.com/LLNL/dtcmp/archive/refs/tags/v1.1.4.tar.gz -> dtcmp-1.1.4.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=b275448481108410737d85a3c4fdf255
diff --git a/metadata/md5-cache/sys-cluster/extrae-4.0.1 b/metadata/md5-cache/sys-cluster/extrae-4.0.1
index 1a8cd835ad..1f3f569960 100644
--- a/metadata/md5-cache/sys-cluster/extrae-4.0.1
+++ b/metadata/md5-cache/sys-cluster/extrae-4.0.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/binutils-config doc? ( app-text/ghostscript-gpl dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra ) java? ( app-admin/chrpath ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/binutils-config doc? ( app-text/ghostscript-gpl dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra ) java? ( app-admin/chrpath ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install preinst prepare setup
 DEPEND=python_single_target_pypy3? ( dev-python/pypy3:= ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) dev-libs/libpfm:= dev-libs/libxml2 dev-libs/papi !sys-cluster/openmpi[libompitrace(+)] sys-libs/binutils-libs:= sys-libs/libunwind:= sys-libs/zlib virtual/mpi clustering? ( sys-cluster/clusteringsuite[treedbscan] ) dyninst? ( dev-libs/boost:= dev-libs/dyninst dev-libs/libdwarf virtual/libelf ) inotify? ( dev-libs/libevent ) memkind? ( dev-libs/memkind ) online? ( sys-cluster/synapse ) opencl? ( dev-util/opencl-headers ) openshmem? ( sys-cluster/SOS ) peruse? ( sys-cluster/openmpi[peruse(-)] ) sionlib? ( sys-cluster/sionlib:= ) spectral? ( sci-libs/fftw sys-cluster/spectral ) java? ( virtual/jdk:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Instrumentation framework to generate execution traces of parallel runtimes
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_pypy3? ( dev-python/pypy3:= ) python_single_target_
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_10 python_single_target_python3_11 ) || ( instrument_dynamic-memory instrument_io instrument_syscall ) java? ( pthread )
 SLOT=0
 SRC_URI=https://github.com/bsc-performance-tools/extrae/archive/4.0.1.tar.gz -> extrae-4.0.1.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
 _md5_=fbc5e21e6d0dea5e02662d61bea4fb1c
diff --git a/metadata/md5-cache/sys-cluster/launchmon-1.0.2_p20210430-r2 b/metadata/md5-cache/sys-cluster/launchmon-1.0.2_p20210430-r2
index d978c042a4..4302e191d1 100644
--- a/metadata/md5-cache/sys-cluster/launchmon-1.0.2_p20210430-r2
+++ b/metadata/md5-cache/sys-cluster/launchmon-1.0.2_p20210430-r2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/boost:= dev-libs/libgcrypt dev-libs/libgpg-error virtual/libelf virtual/mpi munge? ( sys-auth/munge )
 DESCRIPTION=Enables HPC run-time tools to co-locate tool daemons with a parallel job
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:= dev-libs/libgcrypt dev-libs/libgpg-error virtual/libelf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/LLNL/LaunchMON/archive/98ab769c53563f47c4319ce3c98ac394b4870bac.tar.gz -> launchmon-1.0.2_p20210430.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
 _md5_=6b96c46f99ac2f1a56caf37d08694c10
diff --git a/metadata/md5-cache/sys-cluster/libi-5.0.1_p20180510-r2 b/metadata/md5-cache/sys-cluster/libi-5.0.1_p20180510-r2
index 551dd19045..c410133852 100644
--- a/metadata/md5-cache/sys-cluster/libi-5.0.1_p20180510-r2
+++ b/metadata/md5-cache/sys-cluster/libi-5.0.1_p20180510-r2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=sys-cluster/launchmon sys-cluster/mrnet slurm? ( sys-cluster/slurm )
 DESCRIPTION=A framework for bootstrapping extreme scale software systems
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-cluster/launchmon sys-cluster/mrnet
 SLOT=0/5.0.1_p20180510
 SRC_URI=https://github.com/dyninst/mrnet/archive/7375ba5bb0df87c68e58ad15e9e5e351ae020c08.tar.gz -> mrnet-5.0.1_p20180510.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=acee7bd398cf1f0089d6835cc91af1a6
diff --git a/metadata/md5-cache/sys-cluster/libyogrt-1.27 b/metadata/md5-cache/sys-cluster/libyogrt-1.27
index cface0569a..c1814e6f93 100644
--- a/metadata/md5-cache/sys-cluster/libyogrt-1.27
+++ b/metadata/md5-cache/sys-cluster/libyogrt-1.27
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=slurm? ( sys-cluster/slurm )
 DESCRIPTION=Your One Get Remaining Time library
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=slurm? ( sys-cluster/slurm )
 SLOT=0
 SRC_URI=https://github.com/LLNL/libyogrt/archive/refs/tags/1.27.tar.gz -> libyogrt-1.27.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=1dd83a1a43717872a26d6ab028512dba
diff --git a/metadata/md5-cache/sys-cluster/libyogrt-1.28 b/metadata/md5-cache/sys-cluster/libyogrt-1.28
index 8433bda416..a3fce08ed6 100644
--- a/metadata/md5-cache/sys-cluster/libyogrt-1.28
+++ b/metadata/md5-cache/sys-cluster/libyogrt-1.28
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=slurm? ( sys-cluster/slurm )
 DESCRIPTION=Your One Get Remaining Time library
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=slurm? ( sys-cluster/slurm )
 SLOT=0
 SRC_URI=https://github.com/LLNL/libyogrt/archive/refs/tags/1.28.tar.gz -> libyogrt-1.28.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=1dd83a1a43717872a26d6ab028512dba
diff --git a/metadata/md5-cache/sys-cluster/lwgrp-1.0.3 b/metadata/md5-cache/sys-cluster/lwgrp-1.0.3
index 9adaa9b715..93276f1080 100644
--- a/metadata/md5-cache/sys-cluster/lwgrp-1.0.3
+++ b/metadata/md5-cache/sys-cluster/lwgrp-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=virtual/mpi
 DESCRIPTION=Light-weight Group Library
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=virtual/mpi
 SLOT=0
 SRC_URI=https://github.com/LLNL/lwgrp/archive/refs/tags/v1.0.3.tar.gz -> lwgrp-1.0.3.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=b940802e242915d9a863ef8399b06ea5
diff --git a/metadata/md5-cache/sys-cluster/lwgrp-1.0.5 b/metadata/md5-cache/sys-cluster/lwgrp-1.0.5
index bbc9707d5f..a5e0955cd3 100644
--- a/metadata/md5-cache/sys-cluster/lwgrp-1.0.5
+++ b/metadata/md5-cache/sys-cluster/lwgrp-1.0.5
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=virtual/mpi
 DESCRIPTION=Light-weight Group Library
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=virtual/mpi
 SLOT=0
 SRC_URI=https://github.com/LLNL/lwgrp/archive/refs/tags/v1.0.5.tar.gz -> lwgrp-1.0.5.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=8cc92ac80f60a0e34af21eecb5dba83c
diff --git a/metadata/md5-cache/sys-cluster/mcxx-2021.06 b/metadata/md5-cache/sys-cluster/mcxx-2021.06
index d120dba867..ead32aea2d 100644
--- a/metadata/md5-cache/sys-cluster/mcxx-2021.06
+++ b/metadata/md5-cache/sys-cluster/mcxx-2021.06
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/gperf sys-devel/flex virtual/pkgconfig app-alternatives/yacc test? ( sys-devel/bc app-alternatives/awk ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 virtual/fortran doc? ( app-text/doxygen )
+BDEPEND=dev-util/gperf sys-devel/flex virtual/pkgconfig app-alternatives/yacc test? ( sys-devel/bc app-alternatives/awk ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 virtual/fortran doc? ( app-text/doxygen )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-db/sqlite extrae? ( sys-cluster/extrae ) mpi? ( virtual/mpi ) nanox? ( sys-cluster/nanox ) ompss2? ( sys-cluster/nanos6 ) tcl? ( sys-cluster/TCL ) || ( dev-lang/python:3.11 dev-lang/python:3.10 dev-python/pypy3 ) opencl? ( dev-util/opencl-headers ) virtual/fortran
 DESCRIPTION=C/C++/Fortran source-to-source compilation aimed at fast prototyping
@@ -12,5 +12,5 @@ REQUIRED_USE=mpi? ( nanox ) ompss? ( nanox ) opencl? ( nanox ) openmp? ( nanox )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bsc-pm/mcxx/archive/refs/tags/github-release-2021.06.tar.gz -> mcxx-2021.06.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2	docs	7f3c0d47338743498c69f1887a139f57
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2	docs	7f3c0d47338743498c69f1887a139f57
 _md5_=5d3a4b56ffac2354f272997da367f497
diff --git a/metadata/md5-cache/sys-cluster/mrnet-5.0.1_p20180510-r5 b/metadata/md5-cache/sys-cluster/mrnet-5.0.1_p20180510-r5
index 6ca3426071..236e0ab225 100644
--- a/metadata/md5-cache/sys-cluster/mrnet-5.0.1_p20180510-r5
+++ b/metadata/md5-cache/sys-cluster/mrnet-5.0.1_p20180510-r5
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-libs/boost:= libi? ( sys-cluster/launchmon sys-cluster/libi ) slurm? ( sys-cluster/slurm )
 DESCRIPTION=A Multicast/Reduction Network
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:= libi? ( sys-cluster/launchmon sys-cluster/libi )
 REQUIRED_USE=slurm? ( libi )
 SLOT=0
 SRC_URI=https://github.com/dyninst/mrnet/archive/7375ba5bb0df87c68e58ad15e9e5e351ae020c08.tar.gz -> mrnet-5.0.1_p20180510.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
 _md5_=6b83d69c67f608bdb0c68dd4ed29c51f
diff --git a/metadata/md5-cache/sys-cluster/nanos6-2.6-r4 b/metadata/md5-cache/sys-cluster/nanos6-2.6-r4
index 910bba98a7..de254b9238 100644
--- a/metadata/md5-cache/sys-cluster/nanos6-2.6-r4
+++ b/metadata/md5-cache/sys-cluster/nanos6-2.6-r4
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install postinst prepare
 DEPEND=>=dev-libs/boost-1.59:= sys-apps/hwloc sys-process/numactl virtual/libelf ctf2prv? ( dev-util/babeltrace2 ) dlb? ( sys-cluster/dlb ) extrae? ( sys-cluster/extrae[nanos] ) memkind? ( dev-libs/memkind ) mercurium? ( sys-cluster/mcxx[ompss2] ) papi? ( dev-libs/papi ) pqos? ( sys-apps/intel-cmt-cat ) unwind? ( sys-libs/libunwind )
 DESCRIPTION=runtime that implements the OmpSs-2 parallel programming model
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( !mercurium )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bsc-pm/nanos6/archive/refs/tags/version-2.6.tar.gz -> nanos6-2.6.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=ed7a789b9ae5c18a6a704b37e257c392
diff --git a/metadata/md5-cache/sys-cluster/nanos6-2.7 b/metadata/md5-cache/sys-cluster/nanos6-2.7
index ebfc5214cc..0646d9cc78 100644
--- a/metadata/md5-cache/sys-cluster/nanos6-2.7
+++ b/metadata/md5-cache/sys-cluster/nanos6-2.7
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install postinst prepare
 DEPEND=>=dev-libs/boost-1.59:= sys-apps/hwloc sys-process/numactl virtual/libelf ctf2prv? ( dev-util/babeltrace2 ) dlb? ( sys-cluster/dlb ) extrae? ( sys-cluster/extrae[nanos] ) mercurium? ( sys-cluster/mcxx[ompss2] ) papi? ( dev-libs/papi ) pqos? ( sys-apps/intel-cmt-cat ) unwind? ( sys-libs/libunwind )
 DESCRIPTION=runtime that implements the OmpSs-2 parallel programming model
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( !mercurium )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bsc-pm/nanos6/archive/refs/tags/version-2.7.tar.gz -> nanos6-2.7.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=b2a2348cca1cc259f9c9f3239032893b
diff --git a/metadata/md5-cache/sys-cluster/nanox-0.15_p20210818 b/metadata/md5-cache/sys-cluster/nanox-0.15_p20210818
index 51ed54fbcd..e0f2a35a6b 100644
--- a/metadata/md5-cache/sys-cluster/nanox-0.15_p20210818
+++ b/metadata/md5-cache/sys-cluster/nanox-0.15_p20210818
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 doc? ( app-text/doxygen )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 doc? ( app-text/doxygen )
 DEFINED_PHASES=compile configure install prepare
 DEPEND=ayudame? ( sys-cluster/temanejo[-ompss] ) dlb? ( sys-cluster/dlb ) extrae? ( sys-cluster/extrae[nanos] ) gasnet? ( sys-cluster/gasnet ) hwloc? ( sys-apps/hwloc ) memkind? ( dev-libs/memkind ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) sqlite? ( dev-db/sqlite ) opencl? ( dev-util/opencl-headers )
 DESCRIPTION=Runtime designed to serve as runtime support in parallel environments
@@ -12,5 +12,5 @@ RDEPEND=ayudame? ( sys-cluster/temanejo[-ompss] ) dlb? ( sys-cluster/dlb ) extra
 REQUIRED_USE=|| ( nanox_debug nanox_instrumentation nanox_instrumentation-debug nanox_performance ) nanox_instrumentation? ( extrae ) nanox_instrumentation-debug? ( extrae )
 SLOT=0
 SRC_URI=https://github.com/bsc-pm/nanox/archive/a9df6936128ebe10374350c719a0fba74bc89803.tar.gz -> nanox-0.15_p20210818.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	docs	7f3c0d47338743498c69f1887a139f57
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	docs	7f3c0d47338743498c69f1887a139f57
 _md5_=54f1266d191c3c52e1a73e3f65adc005
diff --git a/metadata/md5-cache/sys-cluster/opari2-2.0.6 b/metadata/md5-cache/sys-cluster/opari2-2.0.6
index 4493a34cfb..bcb2657622 100644
--- a/metadata/md5-cache/sys-cluster/opari2-2.0.6
+++ b/metadata/md5-cache/sys-cluster/opari2-2.0.6
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=install prepare
 DESCRIPTION=OpenMP Pragma And Region Instrumentor
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://perftools.pages.jsc.fz-juelich.de/cicd/opari2/tags/opari2-2.0.6/opari2-2.0.6.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=31f093d78782437c1993be4123623ae2
diff --git a/metadata/md5-cache/sys-cluster/osu-micro-benchmarks-5.9 b/metadata/md5-cache/sys-cluster/osu-micro-benchmarks-5.9
index b977aae1d9..7deed5517e 100644
--- a/metadata/md5-cache/sys-cluster/osu-micro-benchmarks-5.9
+++ b/metadata/md5-cache/sys-cluster/osu-micro-benchmarks-5.9
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
 DEPEND=virtual/mpi openshmem? ( sys-cluster/SOS ) rocm? ( dev-util/hip )
 DESCRIPTION=MPI, OPC and many other benchmarks
@@ -10,5 +10,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-5.9.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3
 _md5_=092388f147650eade3480a5cbb5a155a
diff --git a/metadata/md5-cache/sys-cluster/parallel-netcdf-1.12.2 b/metadata/md5-cache/sys-cluster/parallel-netcdf-1.12.2
index 4ea0398942..bc0b60a3a6 100644
--- a/metadata/md5-cache/sys-cluster/parallel-netcdf-1.12.2
+++ b/metadata/md5-cache/sys-cluster/parallel-netcdf-1.12.2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen dev-texlive/texlive-latex ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 fortran? ( virtual/fortran )
+BDEPEND=doc? ( app-text/doxygen dev-texlive/texlive-latex ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 fortran? ( virtual/fortran )
 DEFINED_PHASES=configure install prepare setup
 DEPEND=netcdf? ( sci-libs/netcdf[mpi] ) virtual/mpi fortran? ( virtual/fortran )
 DESCRIPTION=Parallel extension to netCDF
@@ -12,5 +12,5 @@ RDEPEND=netcdf? ( sci-libs/netcdf[mpi] ) virtual/mpi fortran? ( virtual/fortran
 RESTRICT=test
 SLOT=0
 SRC_URI=https://parallel-netcdf.github.io/Release/pnetcdf-1.12.2.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea
 _md5_=3b349bbc2f4a4f3b8c9af3f88169993c
diff --git a/metadata/md5-cache/sys-cluster/paraver-kernel-4.10.1-r1 b/metadata/md5-cache/sys-cluster/paraver-kernel-4.10.1-r1
index 1239fa005b..69c244c9e0 100644
--- a/metadata/md5-cache/sys-cluster/paraver-kernel-4.10.1-r1
+++ b/metadata/md5-cache/sys-cluster/paraver-kernel-4.10.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/boost:= dev-libs/libxml2 sys-libs/zlib sys-cluster/libbsctools:= extrae? ( sys-cluster/extrae ) otf2? ( sys-cluster/otf2 )
 DESCRIPTION=paraver kernel library
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:= dev-libs/libxml2 sys-libs/zlib sys-cluster/libbsctools:
 REQUIRED_USE=extrae? ( openmp )
 SLOT=0
 SRC_URI=https://github.com/bsc-performance-tools/paraver-kernel/archive/refs/tags/v4.10.1.tar.gz -> paraver-kernel-4.10.1.gh.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
 _md5_=35d2111d9d0a8c27e17ad3b22dd2ecf0
diff --git a/metadata/md5-cache/sys-cluster/portals4-1.0_alpha1_p20190109-r3 b/metadata/md5-cache/sys-cluster/portals4-1.0_alpha1_p20190109-r3
index 2f6ca3af87..8c79f4f666 100644
--- a/metadata/md5-cache/sys-cluster/portals4-1.0_alpha1_p20190109-r3
+++ b/metadata/md5-cache/sys-cluster/portals4-1.0_alpha1_p20190109-r3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 doc? ( app-text/doxygen )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 doc? ( app-text/doxygen )
 DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=dev-libs/libev dev-libs/libxml2 knem? ( sys-cluster/knem ) pmi? ( || ( sys-cluster/slurm sys-cluster/pmix[pmi] ) ) ppe? ( sys-kernel/xpmem )
 DESCRIPTION=low-level network API for high-performance networking
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( ppe transport_shmem ) knem? ( transport_shmem ) reliable-udp?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Portals4/portals4/archive/71fc5d04c9f8fc9818a05cdc608e2d13af825d83.tar.gz -> portals4-1.0_alpha1_p20190109.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	docs	7f3c0d47338743498c69f1887a139f57	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	docs	7f3c0d47338743498c69f1887a139f57	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54
 _md5_=40fe7dcd9f4d46b5e1737abff6472515
diff --git a/metadata/md5-cache/sys-cluster/temanejo-1.3 b/metadata/md5-cache/sys-cluster/temanejo-1.3
index 181ac99c67..ab87ff2563 100644
--- a/metadata/md5-cache/sys-cluster/temanejo-1.3
+++ b/metadata/md5-cache/sys-cluster/temanejo-1.3
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( dev-texlive/texlive-latex ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=doc? ( dev-texlive/texlive-latex ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=a debugger for task-parallel programming
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=ompss? ( !sys-cluster/nanox[ayudame] )
 SLOT=0
 SRC_URI=https://fs.hlrs.de/projects/temanejo/temanejo-1.3.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=20a9d1f7a1de433db31095e420283b81
diff --git a/metadata/md5-cache/sys-cluster/wxparaver-4.10.1 b/metadata/md5-cache/sys-cluster/wxparaver-4.10.1
index 3cf96c2231..4beb6f535a 100644
--- a/metadata/md5-cache/sys-cluster/wxparaver-4.10.1
+++ b/metadata/md5-cache/sys-cluster/wxparaver-4.10.1
@@ -1,4 +1,4 @@
-BDEPEND=app-admin/chrpath sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7 doc? ( || ( ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-python/pypy3 dev-python/sphinx[python_targets_pypy3(-)] ) ) )
+BDEPEND=app-admin/chrpath sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7 doc? ( || ( ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-python/pypy3 dev-python/sphinx[python_targets_pypy3(-)] ) ) )
 DEFINED_PHASES=compile configure install prepare setup unpack
 DEPEND=dev-libs/boost:= dev-libs/openssl:= sys-cluster/paraver-kernel x11-libs/wxGTK:3.0-gtk3 extrae? ( sys-cluster/extrae )
 DESCRIPTION=Performance analyzer based on event traces
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost:= dev-libs/openssl:= sys-cluster/paraver-kernel x11-libs/wxGTK:3.0-gtk3 extrae? ( sys-cluster/extrae )
 SLOT=0
 SRC_URI=https://github.com/bsc-performance-tools/wxparaver/archive/v4.10.1.tar.gz -> wxparaver-4.10.1.gh.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2	docs	7f3c0d47338743498c69f1887a139f57	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2	docs	7f3c0d47338743498c69f1887a139f57	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
 _md5_=5908b66ec5fa12f44bad20c23f032f13
diff --git a/metadata/md5-cache/sys-fs/gfs2-utils-3.4.1 b/metadata/md5-cache/sys-fs/gfs2-utils-3.4.1
index 68114d35fa..709728c19d 100644
--- a/metadata/md5-cache/sys-fs/gfs2-utils-3.4.1
+++ b/metadata/md5-cache/sys-fs/gfs2-utils-3.4.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf sys-devel/automake sys-devel/libtool dev-build/make sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/autoconf sys-devel/automake sys-devel/libtool dev-build/make sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=sys-libs/zlib app-arch/bzip2 sys-libs/ncurses sys-apps/util-linux sys-devel/gettext sys-devel/bison sys-devel/flex test? ( dev-libs/check ) sys-kernel/linux-headers
 DESCRIPTION=Shared-disk cluster file system
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib app-arch/bzip2 sys-libs/ncurses sys-apps/util-linux
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pagure.io/gfs2-utils/archive/3.4.1/gfs2-utils-3.4.1.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91
 _md5_=29a35b5ac79e41719b8d28e002b865d6
diff --git a/metadata/md5-cache/sys-kernel/xpmem-2.6.5_p20210809 b/metadata/md5-cache/sys-kernel/xpmem-2.6.5_p20210809
index 755226f3a9..82995171b1 100644
--- a/metadata/md5-cache/sys-kernel/xpmem-2.6.5_p20210809
+++ b/metadata/md5-cache/sys-kernel/xpmem-2.6.5_p20210809
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
 DEPEND=modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) modules? ( kernel_linux? ( virtual/linux-sources virtual/libelf ) )
 DESCRIPTION=Linux Cross-Memory Attach
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://github.com/hjelmn/xpmem/archive/8700f281383a83b86d3bff5e46168eb24558b842.tar.gz -> xpmem-2.6.5_p20210809.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	linux-mod	000f3723e8e062061ee523106e69f84a
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	linux-mod	000f3723e8e062061ee523106e69f84a
 _md5_=252cb9904beddfced34650b6c161968d
diff --git a/metadata/md5-cache/sys-libs/libfixposix-0.5.1 b/metadata/md5-cache/sys-libs/libfixposix-0.5.1
index 87c6c26fc6..bebe0c6523 100644
--- a/metadata/md5-cache/sys-libs/libfixposix-0.5.1
+++ b/metadata/md5-cache/sys-libs/libfixposix-0.5.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=install prepare
 DESCRIPTION=Thin wrapper over POSIX syscalls
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Boost-1.0
 SLOT=0
 SRC_URI=https://github.com/sionescu/libfixposix/archive/refs/tags/v0.5.1.tar.gz -> libfixposix-0.5.1.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81
 _md5_=01768c5c92ae8fe510ffb36b56a8d2ab
diff --git a/metadata/md5-cache/sys-libs/safeclib-3.7.1-r2 b/metadata/md5-cache/sys-libs/safeclib-3.7.1-r2
index 2c1cf0bbfd..85dd7aed4c 100644
--- a/metadata/md5-cache/sys-libs/safeclib-3.7.1-r2
+++ b/metadata/md5-cache/sys-libs/safeclib-3.7.1-r2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen[dot] ) valgrind? ( dev-debug/valgrind ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=doc? ( app-text/doxygen[dot] ) valgrind? ( dev-debug/valgrind ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=safec libc extension with all C11 Annex K functions
@@ -12,5 +12,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rurban/safeclib/releases/download/v3.7.1/safeclib-3.7.1.tar.xz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	linux-mod	000f3723e8e062061ee523106e69f84a
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	linux-mod	000f3723e8e062061ee523106e69f84a
 _md5_=7c1d199ae56311a6c021eaac358af3b2
diff --git a/metadata/md5-cache/sys-power/geopmd-2.0.0_rc1 b/metadata/md5-cache/sys-power/geopmd-2.0.0_rc1
index e07f6fbeba..e856d437d6 100644
--- a/metadata/md5-cache/sys-power/geopmd-2.0.0_rc1
+++ b/metadata/md5-cache/sys-power/geopmd-2.0.0_rc1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( dev-python/sphinx dev-python/sphinx-rtd-theme dev-python/sphinxemoji ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=doc? ( dev-python/sphinx dev-python/sphinx-rtd-theme dev-python/sphinxemoji ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=configure install prepare setup
 DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( >=dev-python/cffi-1.15.0[python_targets_python3_10(-)] >=dev-python/dasbus-1.6[python_targets_python3_10(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_10(-)] >=dev-python/psutil-5.9.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/cffi-1.15.0[python_targets_python3_11(-)] >=dev-python/dasbus-1.6[python_targets_python3_11(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_11(-)] >=dev-python/psutil-5.9.0[python_targets_python3_11(-)] ) dev-cpp/json11 systemd? ( sys-apps/systemd:= ) dev-cpp/gtest
 DESCRIPTION=Global Extensible Open Power Manager (Daemon)
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/geopm/geopm/archive/refs/tags/v2.0.0+rc1.tar.gz -> geopm-2.0.0+rc1.gh.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562
 _md5_=33a92aa85a5d02297d928285e33c4b30
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-anclock-2.2.1 b/metadata/md5-cache/x11-misc/xscreensaver-anclock-2.2.1
index 328e3904cb..5329d2ca9d 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-anclock-2.2.1
+++ b/metadata/md5-cache/x11-misc/xscreensaver-anclock-2.2.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) || ( >=sys-devel/autoconf-2.72-r1:2.72 >=sys-devel/autoconf-2.71-r6:2.71 ) >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst prepare unpack
 DEPEND=dev-libs/libxml2 x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm virtual/libcrypt:= virtual/glu virtual/opengl sys-libs/pam x11-libs/libXft x11-base/xorg-proto
 DESCRIPTION=Analog clock hack for the xscreensaver program
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=x11-misc/xscreensaver-6.01
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-6.05.1.tar.gz http://pt2k.xii.jp/software/anclock/xscreensaver/oldver/anclock-2.2.1-for-xscreensaver-6.04.patch.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	5f729b9cb10d5eda573cd604c93c6dc5	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a
 _md5_=be0a567fc809e495d734888a4e1e1cf0
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5fcc0c6b8c..06f484540f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 15 Jan 2024 16:03:13 +0000
+Mon, 15 Jan 2024 16:18:32 +0000