2021-04-11 21:32:32 UTC

11 files changed, 19 insertions, 19 deletions

diff --git a/metadata/md5-cache/app-accessibility/brltty-6.1 b/metadata/md5-cache/app-accessibility/brltty-6.1
index 6554ede8566e..46828409d35e 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.1
+++ b/metadata/md5-cache/app-accessibility/brltty-6.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig java? ( >=virtual/jdk-1.4 ) nls? ( virtual/libintl ) python? ( >=dev-python/cython-0.16[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+BDEPEND=virtual/pkgconfig java? ( >=virtual/jdk-1.4 ) nls? ( virtual/libintl ) python? ( >=dev-python/cython-0.16[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-apps/gawk virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare setup
 DEPEND=app-accessibility/at-spi2-core:2 dev-libs/libpcre2[pcre32] sys-apps/dbus bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) speech? ( app-accessibility/espeak app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:0 ) xml? ( dev-libs/expat ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst ) ocaml? ( >=dev-ml/findlib-1.0.4-r1 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind person
@@ -12,5 +12,5 @@ RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/libpcre2[pcre32] sys-apps/dbus
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python3_7 python_targets_python3_8 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-6.1.tar.xz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	udev	452708c3f55cf6e918b045adb949a9e6	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	79023c161e8f625b0f1823715941c2da	udev	452708c3f55cf6e918b045adb949a9e6	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
 _md5_=f2cf503cc9b001f88512016d1a5d0f09
diff --git a/metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1-r1 b/metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1-r1
index 92797542b170..868a57ed5375 100644
--- a/metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1-r1
+++ b/metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/tidy-html5 dev-lang/duktape:= dev-libs/libpcre net-misc/curl sys-libs/readline:= odbc? ( dev-db/unixODBC )
 SLOT=0
 SRC_URI=https://github.com/CMB/edbrowse/archive/v3.7.5.1.tar.gz -> edbrowse-3.7.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
 _md5_=90db04186d43406b2b4bef09c33ddc5f
diff --git a/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3 b/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3
index 7643884f41dd..da5bd1017194 100644
--- a/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3
+++ b/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=app-accessibility/flite-1.4 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=app-accessibility/flite-1.4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-apps/gawk
 DESCRIPTION=A speech server that allows screen readers to interact with festival lite
 EAPI=5
 HOMEPAGE=http://eflite.sourceforge.net
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-accessibility/flite-1.4
 SLOT=0
 SRC_URI=mirror://sourceforge/eflite/eflite-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	79023c161e8f625b0f1823715941c2da	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
 _md5_=a06e6c86fbeedd1f84567d4ca8127075
diff --git a/metadata/md5-cache/app-accessibility/epos-2.5.37-r3 b/metadata/md5-cache/app-accessibility/epos-2.5.37-r3
index cc869b9a36f9..3755390e8b67 100644
--- a/metadata/md5-cache/app-accessibility/epos-2.5.37-r3
+++ b/metadata/md5-cache/app-accessibility/epos-2.5.37-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-util/byacc >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-util/byacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-apps/gawk
 DESCRIPTION=language independent text-to-speech system
 EAPI=6
 HOMEPAGE=http://epos.ufe.cz/
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/epos/epos-2.5.37.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	79023c161e8f625b0f1823715941c2da
 _md5_=d9bfa72b7e454707e5ab62d4e7c3d211
diff --git a/metadata/md5-cache/app-accessibility/flite-1.4-r4 b/metadata/md5-cache/app-accessibility/flite-1.4-r4
index f72cebde989f..8c1302444e5c 100644
--- a/metadata/md5-cache/app-accessibility/flite-1.4-r4
+++ b/metadata/md5-cache/app-accessibility/flite-1.4-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-apps/gawk
 DESCRIPTION=Flite text to speech engine
 EAPI=6
 HOMEPAGE=http://www.speech.cs.cmu.edu/flite/index.html
@@ -10,5 +10,5 @@ LICENSE=BSD freetts public-domain regexp-UofT BSD-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://www.speech.cs.cmu.edu/flite/packed/flite-1.4/flite-1.4-release.tar.bz2
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	79023c161e8f625b0f1823715941c2da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
 _md5_=a97d2381090cef84cd3404e7ef476b7c
diff --git a/metadata/md5-cache/app-accessibility/flite-2.1 b/metadata/md5-cache/app-accessibility/flite-2.1
index a24ca5edea01..6af349edbbb3 100644
--- a/metadata/md5-cache/app-accessibility/flite-2.1
+++ b/metadata/md5-cache/app-accessibility/flite-2.1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-apps/gawk
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !pulseaudio? ( alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 DESCRIPTION=Flite text to speech engine
@@ -11,5 +11,5 @@ LICENSE=BSD freetts public-domain regexp-UofT BSD-2
 RDEPEND=pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !pulseaudio? ( alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 SRC_URI=http://www.festvox.org/flite/packed/flite-2.1/flite-2.1-release.tar.bz2 voices? ( http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_indic_ben_rm.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_indic_guj_ad.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_indic_guj_dp.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_indic_guj_kt.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_indic_hin_ab.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_indic_kan_plv.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_indic_mar_aup.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_indic_mar_slp.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_indic_pan_amp.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_indic_tam_sdr.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_indic_tel_kpn.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_indic_tel_sk.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_indic_tel_ss.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_aew.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_ahw.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_aup.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_awb.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_axb.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_bdl.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_clb.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_eey.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_fem.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_gka.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_jmk.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_ksp.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_ljm.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_lnh.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_rms.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_rxr.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_slp.flitevox http://www.festvox.org/flite/packed/flite-2.1/voices/cmu_us_slt.flitevox )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	79023c161e8f625b0f1823715941c2da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
 _md5_=81bd18354341a695605a02b75c566b52
diff --git a/metadata/md5-cache/app-accessibility/flite-2.2 b/metadata/md5-cache/app-accessibility/flite-2.2
index 88a9426e8e64..45e6e3eacd27 100644
--- a/metadata/md5-cache/app-accessibility/flite-2.2
+++ b/metadata/md5-cache/app-accessibility/flite-2.2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-apps/gawk
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !pulseaudio? ( alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 DESCRIPTION=Flite text to speech engine
@@ -11,5 +11,5 @@ LICENSE=BSD freetts public-domain regexp-UofT BSD-2
 RDEPEND=pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !pulseaudio? ( alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 SRC_URI=https://github.com/festvox/flite/archive/v2.2.tar.gz -> flite-2.2.tar.gz voices? ( http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_ben_rm.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_guj_ad.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_guj_dp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_guj_kt.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_hin_ab.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_kan_plv.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_mar_aup.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_mar_slp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_pan_amp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_tam_sdr.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_tel_kpn.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_tel_sk.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_tel_ss.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_aew.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_ahw.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_aup.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_awb.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_axb.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_bdl.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_clb.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_eey.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_fem.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_gka.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_jmk.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_ksp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_ljm.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_lnh.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_rms.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_rxr.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_slp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_slt.flitevox )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	79023c161e8f625b0f1823715941c2da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
 _md5_=6a7b684f8a1da8f687c6ce1087a354d2
diff --git a/metadata/md5-cache/app-accessibility/kontrast-20.12.3 b/metadata/md5-cache/app-accessibility/kontrast-20.12.3
index aaf91a0be9ec..e10fce7a6fe3 100644
--- a/metadata/md5-cache/app-accessibility/kontrast-20.12.3
+++ b/metadata/md5-cache/app-accessibility/kontrast-20.12.3
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kirigami-5.74.0:5 kde-plasma/xdg-desktop-portal-kde || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/kontrast-20.12.3.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	ecm	23462b13731a265a5d99e493ec4a7720	kde.org	8ab7639dfaec743469a517f35332a111
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	ecm	23462b13731a265a5d99e493ec4a7720	kde.org	8ab7639dfaec743469a517f35332a111
 _md5_=32aed2cb2144b22018a826153e8631ec
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-2.1-r4 b/metadata/md5-cache/app-accessibility/speech-tools-2.1-r4
index 674e3c7d5d70..c9ab0d8d3b56 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-2.1-r4
+++ b/metadata/md5-cache/app-accessibility/speech-tools-2.1-r4
@@ -10,5 +10,5 @@ LICENSE=FESTIVAL HPND BSD rc regexp-UofT
 RDEPEND=nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) >=media-libs/alsa-lib-1.0.20-r1 !<app-accessibility/festival-1.96_beta !sys-power/powerman >=sys-libs/ncurses-5.6-r2:0=
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.1/speech_tools-2.1-release.tar.gz https://dev.gentoo.org/~neurogeek/speech-tools/speech_tools-2.1-r3-patches.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
 _md5_=0a90d8c411d89f751466bf0c52df528b
diff --git a/metadata/md5-cache/app-accessibility/sphinx2-0.6 b/metadata/md5-cache/app-accessibility/sphinx2-0.6
index 73b163fdda53..7710a7dc4a73 100644
--- a/metadata/md5-cache/app-accessibility/sphinx2-0.6
+++ b/metadata/md5-cache/app-accessibility/sphinx2-0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-apps/gawk
 DESCRIPTION=CMU Speech Recognition-engine
 EAPI=6
 HOMEPAGE=https://cmusphinx.github.io
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/sphinx2-0.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	79023c161e8f625b0f1823715941c2da
 _md5_=41d5b8c65ce357702016f62359bac273
diff --git a/metadata/md5-cache/app-accessibility/yasr-0.6.9-r1 b/metadata/md5-cache/app-accessibility/yasr-0.6.9-r1
index 2e3bab5afc17..7f9517b66068 100644
--- a/metadata/md5-cache/app-accessibility/yasr-0.6.9-r1
+++ b/metadata/md5-cache/app-accessibility/yasr-0.6.9-r1
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-apps/gawk
 DEFINED_PHASES=configure postinst prepare
 DESCRIPTION=General-purpose console screen reader
 EAPI=7
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/yasr/yasr-0.6.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	79023c161e8f625b0f1823715941c2da
 _md5_=863ad6ea3c59592366f368536de984fb