2022-03-09 23:22:09 UTC

32 files changed, 82 insertions, 110 deletions

diff --git a/metadata/md5-cache/app-admin/testdisk-7.1-r1 b/metadata/md5-cache/app-admin/testdisk-7.1-r1
index 71311ed646ae..777ce1fb2a54 100644
--- a/metadata/md5-cache/app-admin/testdisk-7.1-r1
+++ b/metadata/md5-cache/app-admin/testdisk-7.1-r1
@@ -1,10 +1,9 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure postinst postrm
 DEPEND=static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[static-libs] sys-libs/ncurses:0[static-libs] jpeg? ( virtual/jpeg:0[static-libs] ) ntfs? ( sys-fs/ntfs3g[static-libs] ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) zlib? ( sys-libs/zlib[static-libs] ) !arm? ( ewf? ( app-forensics/libewf[static-libs] ) ) ) !static? ( sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses:0= jpeg? ( virtual/jpeg:0 ) ntfs? ( sys-fs/ntfs3g:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) zlib? ( sys-libs/zlib ) !arm? ( ewf? ( app-forensics/libewf:= ) ) ) qt5? ( dev-qt/linguist-tools:5 )
 DESCRIPTION=Checks and undeletes partitions + PhotoRec, signature based recovery tool
 EAPI=7
 HOMEPAGE=https://www.cgsecurity.org/wiki/TestDisk
-INHERIT=autotools flag-o-matic qmake-utils xdg-utils
+INHERIT=flag-o-matic qmake-utils xdg-utils
 IUSE=ewf jpeg ntfs qt5 reiserfs static zlib
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=GPL-2+
@@ -12,5 +11,5 @@ RDEPEND=!static? ( static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[s
 REQUIRED_USE=static? ( !qt5 )
 SLOT=0
 SRC_URI=https://www.cgsecurity.org/testdisk-7.1.tar.bz2
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=c66301411b15af29bcd559fbae6ca08e
+_eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=9f798ee1bed099d461b39ed9836f876e
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4.17 b/metadata/md5-cache/app-arch/xarchiver-0.5.4.17
index bdbeb352dd16..dd83e5e7b1a4 100644
--- a/metadata/md5-cache/app-arch/xarchiver-0.5.4.17
+++ b/metadata/md5-cache/app-arch/xarchiver-0.5.4.17
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets dev-libs/libxml2 dev-libs/libxslt ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets dev-libs/libxml2 dev-libs/libxslt )
 DEFINED_PHASES=configure postinst postrm
 DEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= !!<app-arch/pigz-2.4[symlink]
 DESCRIPTION=A GTK+ archive manager that can be used with Thunar
 EAPI=7
 HOMEPAGE=https://github.com/ib/xarchiver
-INHERIT=autotools xdg-utils
+INHERIT=xdg-utils
 IUSE=doc
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= !!<app-arch/pigz-2.4[symlink]
 SLOT=0
 SRC_URI=https://github.com/ib/xarchiver/archive/0.5.4.17.tar.gz -> xarchiver-0.5.4.17.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=e95ba5e6e4adfe62904ca1826b24e4d5
+_eclasses_=xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=55ac4eb071180917dfea39cae8e2b20b
diff --git a/metadata/md5-cache/app-containers/crun-1.2 b/metadata/md5-cache/app-containers/crun-1.2
deleted file mode 100644
index 5ff9e5777338..000000000000
--- a/metadata/md5-cache/app-containers/crun-1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install setup
-DEPEND=sys-kernel/linux-headers >=dev-libs/yajl-2.0.0 caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=A fast and low-memory footprint OCI Container Runtime fully written in C
-EAPI=7
-HOMEPAGE=https://github.com/containers/crun
-INHERIT=autotools python-any-r1
-IUSE=+bpf +caps criu +seccomp systemd static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=sys-kernel/linux-headers >=dev-libs/yajl-2.0.0 caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/containers/crun/releases/download/1.2/crun-1.2.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	python-any-r1	54666a8fa603df658d9284845fc3d755
-_md5_=c26f06264627eff9681738afc57ac199
diff --git a/metadata/md5-cache/app-emulation/spice-vdagent-0.19.0-r1 b/metadata/md5-cache/app-emulation/spice-vdagent-0.19.0-r1
index 6313aa49fa1a..d922a668b548 100644
--- a/metadata/md5-cache/app-emulation/spice-vdagent-0.19.0-r1
+++ b/metadata/md5-cache/app-emulation/spice-vdagent-0.19.0-r1
@@ -1,15 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install setup
 DEPEND=dev-libs/glib:2 >=app-emulation/spice-protocol-0.14.0 media-libs/alsa-lib sys-apps/dbus >=x11-libs/libpciaccess-0.10 x11-libs/libdrm x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama gtk? ( x11-libs/gtk+:3 ) systemd? ( sys-apps/systemd ) virtual/pkgconfig
 DESCRIPTION=SPICE VD Linux Guest Agent
 EAPI=7
 HOMEPAGE=https://www.spice-space.org/
-INHERIT=autotools linux-info
+INHERIT=linux-info
 IUSE=gtk selinux systemd
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 >=app-emulation/spice-protocol-0.14.0 media-libs/alsa-lib sys-apps/dbus >=x11-libs/libpciaccess-0.10 x11-libs/libdrm x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama gtk? ( x11-libs/gtk+:3 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-vdagent )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-vdagent-0.19.0.tar.bz2
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e	linux-info	2f039741fe92bcea55c78806d16ac0f5
-_md5_=5099fdef8ffad771da013fd43a2c2c07
+_eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	linux-info	2f039741fe92bcea55c78806d16ac0f5
+_md5_=55483e560630d3fca2f64b6a90cc51aa
diff --git a/metadata/md5-cache/app-emulation/spice-vdagent-0.21.0 b/metadata/md5-cache/app-emulation/spice-vdagent-0.21.0
index 87ffaef0e348..4fd4c0ece070 100644
--- a/metadata/md5-cache/app-emulation/spice-vdagent-0.21.0
+++ b/metadata/md5-cache/app-emulation/spice-vdagent-0.21.0
@@ -1,15 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst setup
 DEPEND=dev-libs/glib:2 >=app-emulation/spice-protocol-0.14.0 media-libs/alsa-lib sys-apps/dbus >=x11-libs/libpciaccess-0.10 x11-libs/libdrm x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama gtk? ( x11-libs/gtk+:3 ) systemd? ( sys-apps/systemd ) virtual/pkgconfig
 DESCRIPTION=SPICE VD Linux Guest Agent
 EAPI=7
 HOMEPAGE=https://www.spice-space.org/
-INHERIT=autotools linux-info tmpfiles
+INHERIT=linux-info tmpfiles
 IUSE=gtk selinux systemd
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 >=app-emulation/spice-protocol-0.14.0 media-libs/alsa-lib sys-apps/dbus >=x11-libs/libpciaccess-0.10 x11-libs/libdrm x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama gtk? ( x11-libs/gtk+:3 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-vdagent ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-vdagent-0.21.0.tar.bz2
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e	linux-info	2f039741fe92bcea55c78806d16ac0f5	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8
-_md5_=57a9d0effc6d1ae6f0ef91a47a14d9f6
+_eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	linux-info	2f039741fe92bcea55c78806d16ac0f5	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8
+_md5_=2300b96433df66ee263bf71914cc1d27
diff --git a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325 b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325
index abe026ce2295..af0846b881ee 100644
--- a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325
+++ b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325
@@ -1,14 +1,12 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure
 DEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1
 DESCRIPTION=Freetype 2 based TrueType font to TeX's PK format converter
 EAPI=7
 HOMEPAGE=http://tug.org/texlive/
-INHERIT=autotools
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/texlive/texlive-20210325-source.tar.xz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e
-_md5_=a09f9991c8523bbd01bb684908835107
+_md5_=0f4ace42d634aa3dfb0939a086f0ed9f
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.12 b/metadata/md5-cache/dev-libs/libevent-2.1.12
index 0a2b94668f12..1a7689ba8804 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.12
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.12
@@ -1,10 +1,10 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[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=Library to execute a function when a specific event occurs on a file descriptor
 EAPI=7
 HOMEPAGE=https://libevent.org/ https://github.com/libevent/libevent/
-INHERIT=autotools multilib-minimal
+INHERIT=libtool multilib-minimal
 IUSE=+clock-gettime debug malloc-replacement +ssl static-libs test +threads verbose-debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
@@ -12,5 +12,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi
 RESTRICT=!test? ( test )
 SLOT=0/2.1-7
 SRC_URI=https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz -> libevent-2.1.12.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b
-_md5_=15d266b94284c674c892743d6ad2628a
+_eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b
+_md5_=b0080191e45e568e94f416166d7705ee
diff --git a/metadata/md5-cache/dev-libs/libffi-compat-3.3-r2 b/metadata/md5-cache/dev-libs/libffi-compat-3.3-r2
index d34f09e0fce3..f22f96a9df03 100644
--- a/metadata/md5-cache/dev-libs/libffi-compat-3.3-r2
+++ b/metadata/md5-cache/dev-libs/libffi-compat-3.3-r2
@@ -1,9 +1,9 @@
-BDEPEND=test? ( dev-util/dejagnu ) >=app-portage/elt-patches-20170815
+BDEPEND=test? ( dev-util/dejagnu )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=a portable, high level programming interface to various calling conventions
 EAPI=7
 HOMEPAGE=https://sourceware.org/libffi/
-INHERIT=libtool multilib-minimal
+INHERIT=multilib-minimal
 IUSE=debug pax-kernel test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -11,5 +11,5 @@ RDEPEND=!dev-libs/libffi:0/7
 RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz
-_eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b
-_md5_=5e643ad54571cd2d9e503551f72dbed5
+_eclasses_=multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b
+_md5_=b24c5e8dfc887a34ca5f633002b1a233
diff --git a/metadata/md5-cache/dev-scheme/gauche-gtk-0.6 b/metadata/md5-cache/dev-scheme/gauche-gtk-0.6
index 2704003ad61c..0c3a2ee712d5 100644
--- a/metadata/md5-cache/dev-scheme/gauche-gtk-0.6
+++ b/metadata/md5-cache/dev-scheme/gauche-gtk-0.6
@@ -1,10 +1,9 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
 DEPEND=dev-scheme/gauche:= x11-libs/gtk+:2
 DESCRIPTION=GTK2 binding for Gauche
 EAPI=8
 HOMEPAGE=https://practical-scheme.net/gauche/
-INHERIT=autotools
 IUSE=examples
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
@@ -12,5 +11,4 @@ RDEPEND=dev-scheme/gauche:= x11-libs/gtk+:2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/shirok/Gauche-gtk2/releases/download/release-0.6/Gauche-gtk-0.6.tgz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e
-_md5_=9848c3ffb6788044293dc0580f7026c1
+_md5_=294d7b63624ccd30dfb3ba9af97c8a4f
diff --git a/metadata/md5-cache/dev-util/re2c-2.2 b/metadata/md5-cache/dev-util/re2c-2.2
index 51d37a029915..f4feefb0484e 100644
--- a/metadata/md5-cache/dev-util/re2c-2.2
+++ b/metadata/md5-cache/dev-util/re2c-2.2
@@ -1,14 +1,14 @@
-BDEPEND=test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) )
 DEFINED_PHASES=configure install setup
-DESCRIPTION=tool for generating C-based recognizers from regular expressions
+DESCRIPTION=Tool for generating C-based recognizers from regular expressions
 EAPI=8
-HOMEPAGE=http://re2c.org/
-INHERIT=autotools python-any-r1
+HOMEPAGE=https://re2c.org/
+INHERIT=python-any-r1
 IUSE=debug test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/skvadrik/re2c/releases/download/2.2/re2c-2.2.tar.xz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	python-any-r1	54666a8fa603df658d9284845fc3d755
-_md5_=2208abdcc80a5413c22669bacafd5da1
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	python-any-r1	54666a8fa603df658d9284845fc3d755
+_md5_=d2cb1acd42269d523fe89e2924f1c4b8
diff --git a/metadata/md5-cache/media-libs/libsmf-1.3 b/metadata/md5-cache/media-libs/libsmf-1.3
index db12c4db9562..92fc8e80f5d1 100644
--- a/metadata/md5-cache/media-libs/libsmf-1.3
+++ b/metadata/md5-cache/media-libs/libsmf-1.3
@@ -1,15 +1,13 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install
 DEPEND=dev-libs/glib:2 readline? ( sys-libs/readline:= )
 DESCRIPTION=Standard MIDI File format library
 EAPI=7
 HOMEPAGE=http://libsmf.sourceforge.net/api/
-INHERIT=autotools
 IUSE=doc readline
 KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib:2 readline? ( sys-libs/readline:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/libsmf/libsmf-1.3.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e
-_md5_=2bf723d84bc52de6a017ef0fac82da8a
+_md5_=63cfb34fe806115eda0614602ee7c79e
diff --git a/metadata/md5-cache/media-libs/libtaginfo-0.2.1 b/metadata/md5-cache/media-libs/libtaginfo-0.2.1
index 2d8cd57c63eb..93ed543b0382 100644
--- a/metadata/md5-cache/media-libs/libtaginfo-0.2.1
+++ b/metadata/md5-cache/media-libs/libtaginfo-0.2.1
@@ -1,14 +1,12 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=-
 DEPEND=media-libs/taglib !<media-sound/xnoise-0.2.16
 DESCRIPTION=A library for reading media metadata
 EAPI=7
 HOMEPAGE=https://bitbucket.org/shuerhaaken/libtaginfo
-INHERIT=autotools
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/taglib !<media-sound/xnoise-0.2.16
 SLOT=0
 SRC_URI=https://bitbucket.org/shuerhaaken/libtaginfo/downloads/libtaginfo-0.2.1.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e
-_md5_=909ccc06af16c26239cc8ded4ff96f00
+_md5_=abf7f5463d906b8e0b8e92ed1cf8a27b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.20.0 b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.20.0
index 00bf7b1d208b..d872bb7d28f7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.20.0
+++ b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.20.0
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.0.tar.xz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	meson	9f3e84959ae1d60e19bc91f212774dcc	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	4f29a8b760a594a212abe9c2ba957c31	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b	gstreamer-meson	b84fa5c9ed2fa8d651ae59f9d99a8b79
-_md5_=0aaa5e8e05ba3e4b19dbfa54b09f33fd
+_md5_=6294c9cd7f0e7faf3cc288c8edfda90e
diff --git a/metadata/md5-cache/media-plugins/ir_lv2-1.3.4-r1 b/metadata/md5-cache/media-plugins/ir_lv2-1.3.4-r1
index 8f072d7fc8cd..5c602cf2bede 100644
--- a/metadata/md5-cache/media-plugins/ir_lv2-1.3.4-r1
+++ b/metadata/md5-cache/media-plugins/ir_lv2-1.3.4-r1
@@ -4,12 +4,12 @@ DEPEND=media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 >=media-lib
 DESCRIPTION=LV2 convolver plugin especially for creating reverb effects
 EAPI=7
 HOMEPAGE=https://tomszilagyi.github.io/plugins/ir.lv2/
-INHERIT=toolchain-funcs flag-o-matic
+INHERIT=toolchain-funcs
 IUSE=tools
 KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 >=media-libs/zita-convolver-3:= >=x11-libs/gtk+-2.16:2
 SLOT=0
 SRC_URI=https://github.com/tomszilagyi/ir.lv2/archive/1.3.4.tar.gz -> ir_lv2-1.3.4.tar.gz
-_eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7
-_md5_=0a2921cced6df17e89ac35d8e785bf6b
+_eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784
+_md5_=19c21c6747a7e07427228648063053dd
diff --git a/metadata/md5-cache/media-plugins/swh-plugins-0.4.17 b/metadata/md5-cache/media-plugins/swh-plugins-0.4.17
index 67368a47c84d..a7901e2ecf36 100644
--- a/metadata/md5-cache/media-plugins/swh-plugins-0.4.17
+++ b/metadata/md5-cache/media-plugins/swh-plugins-0.4.17
@@ -4,7 +4,7 @@ DEPEND=>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 DESCRIPTION=Large collection of LADSPA audio plugins/effects
 EAPI=7
 HOMEPAGE=http://plugin.org.uk
-INHERIT=autotools flag-o-matic multilib-minimal
+INHERIT=autotools flag-o-matic toolchain-funcs multilib-minimal
 IUSE=nls cpu_flags_x86_3dnow cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RDEPEND=>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 SLOT=0
 SRC_URI=https://github.com/swh/ladspa/archive/v0.4.17.tar.gz -> swh-plugins-0.4.17.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b
-_md5_=5bbca64c8aec002a73acb6dbca835ac8
+_md5_=6f5e7ace099760a9c830d30d01ebc427
diff --git a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1 b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
index 576ec58ba738..b40c0c945eb7 100644
--- a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
+++ b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
@@ -3,11 +3,11 @@ DEPEND=>=media-libs/aubio-0.4.1 media-libs/vamp-plugin-sdk =sci-libs/fftw-3* ||
 DESCRIPTION=Onset detection, pitch tracking, note tracking and tempo tracking plugins
 EAPI=6
 HOMEPAGE=https://www.vamp-plugins.org/
-INHERIT=flag-o-matic toolchain-funcs multilib python-any-r1 waf-utils
+INHERIT=python-any-r1 waf-utils
 KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/aubio-0.4.1 media-libs/vamp-plugin-sdk =sci-libs/fftw-3*
 SLOT=0
 SRC_URI=https://aubio.org/pub/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.tar.bz2 https://waf.io/waf-2.0.20
-_eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	python-any-r1	54666a8fa603df658d9284845fc3d755	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
-_md5_=e3dac07e977c38eedd0ad3849d264a6a
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	python-any-r1	54666a8fa603df658d9284845fc3d755	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
+_md5_=4c03705b36eca89ecbade2f586937109
diff --git a/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204 b/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204
index 8226ef8a0df2..07be1215265b 100644
--- a/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204
+++ b/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204
@@ -3,11 +3,11 @@ DEPEND==sci-libs/fftw-3* >=media-libs/libxtract-0.6.6 media-libs/vamp-plugin-sdk
 DESCRIPTION=Vamp plugin encapsulating many of the functions of the LibXtract library
 EAPI=6
 HOMEPAGE=https://www.vamp-plugins.org/
-INHERIT=multilib toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ppc ppc64 x86
 LICENSE=GPL-2+
 RDEPEND==sci-libs/fftw-3* >=media-libs/libxtract-0.6.6 media-libs/vamp-plugin-sdk
 SLOT=0
 SRC_URI=https://code.soundsoftware.ac.uk/attachments/download/618/vamp-libxtract-plugins-0.6.6.20121204.tar.gz
-_eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=599f57668ac8e26f87a9acd880424bb1
+_eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784
+_md5_=14cb72d421cd0db0a1e0e2d0f2bcdfef
diff --git a/metadata/md5-cache/media-sound/aeolus-0.9.9 b/metadata/md5-cache/media-sound/aeolus-0.9.9
index 222e421ca4b4..0c59854ce636 100644
--- a/metadata/md5-cache/media-sound/aeolus-0.9.9
+++ b/metadata/md5-cache/media-sound/aeolus-0.9.9
@@ -4,11 +4,11 @@ DEPEND=dev-libs/libclthreads media-libs/alsa-lib >=media-libs/zita-alsa-pcmi-0.3
 DESCRIPTION=A synthesised pipe organ emulator
 EAPI=7
 HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html
-INHERIT=toolchain-funcs flag-o-matic multilib desktop xdg
+INHERIT=toolchain-funcs flag-o-matic desktop xdg
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libclthreads media-libs/alsa-lib >=media-libs/zita-alsa-pcmi-0.3 sys-libs/readline:0 virtual/jack x11-libs/libclxclient x11-libs/libX11 x11-libs/libXft media-libs/stops
 SLOT=0
 SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/aeolus-0.9.9.tar.bz2
 _eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	4f29a8b760a594a212abe9c2ba957c31	xdg	6024fbc93167fad782e2032933654857
-_md5_=6948173274d379c3d42ab6cc95fccb34
+_md5_=8f83ef0d9f93fddda2468ccddffd8742
diff --git a/metadata/md5-cache/media-sound/baudline-1.08-r1 b/metadata/md5-cache/media-sound/baudline-1.08-r1
index 6e78fee7ebfc..2be1ef2285af 100644
--- a/metadata/md5-cache/media-sound/baudline-1.08-r1
+++ b/metadata/md5-cache/media-sound/baudline-1.08-r1
@@ -3,7 +3,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A time-frequency browser designed for visualization of spectral domains
 EAPI=6
 HOMEPAGE=http://www.baudline.com/
-INHERIT=eutils xdg
+INHERIT=desktop xdg
 IUSE=jack
 KEYWORDS=amd64 ~x86
 LICENSE=baudline
@@ -11,5 +11,5 @@ RDEPEND=media-fonts/font-adobe-75dpi media-fonts/font-misc-misc x11-libs/libX11
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=amd64? ( http://www.baudline.com/baudline_1.08_linux_x86_64.tar.gz ) ppc? ( http://www.baudline.com/baudline_1.08_linux_ppc.tar.gz ) s390? ( http://www.baudline.com/baudline_1.08_linux_s390.tar.gz ) x86? ( http://www.baudline.com/baudline_1.08_linux_i686.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	xdg-utils	4f29a8b760a594a212abe9c2ba957c31	xdg	6024fbc93167fad782e2032933654857
-_md5_=f7d336e5fe97f061ca0e6135ab7b3ee1
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	4f29a8b760a594a212abe9c2ba957c31	xdg	6024fbc93167fad782e2032933654857
+_md5_=a2e15438011d159cf50b02e98e125bcd
diff --git a/metadata/md5-cache/media-sound/bristol-0.60.11-r2 b/metadata/md5-cache/media-sound/bristol-0.60.11-r2
index c99b6028ad4d..1c0161619285 100644
--- a/metadata/md5-cache/media-sound/bristol-0.60.11-r2
+++ b/metadata/md5-cache/media-sound/bristol-0.60.11-r2
@@ -4,7 +4,7 @@ DEPEND=virtual/jack x11-libs/libX11 alsa? ( media-libs/alsa-lib ) x11-base/xorg-
 DESCRIPTION=Synthesizer keyboard emulation package: Moog, Hammond and others
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/bristol
-INHERIT=autotools flag-o-matic
+INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=alsa oss
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RDEPEND=virtual/jack x11-libs/libX11 alsa? ( media-libs/alsa-lib )
 SLOT=0
 SRC_URI=mirror://sourceforge/bristol/bristol-0.60.11.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7
-_md5_=d8d9ec0ddbd4ccb3ca74caf31ded7cf9
+_md5_=12d86b250080c8f4a9ee47b751f2f5fb
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.8.8-r2 b/metadata/md5-cache/media-sound/deadbeef-1.8.8-r2
index 99c801e95a45..e4cb5a6d675e 100644
--- a/metadata/md5-cache/media-sound/deadbeef-1.8.8-r2
+++ b/metadata/md5-cache/media-sound/deadbeef-1.8.8-r2
@@ -4,7 +4,7 @@ DEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson:= aac? ( media-libs/faa
 DESCRIPTION=DeaDBeeF is a modular audio player similar to foobar2000
 EAPI=7
 HOMEPAGE=https://deadbeef.sourceforge.io/
-INHERIT=autotools xdg flag-o-matic plocale
+INHERIT=autotools xdg flag-o-matic toolchain-funcs plocale
 IUSE=aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1 wavpack? ( BSD )
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
 SLOT=0
 SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.8.8.tar.bz2
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e	xdg-utils	4f29a8b760a594a212abe9c2ba957c31	xdg	6024fbc93167fad782e2032933654857	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	plocale	89c6aac5da68423465e6fd79fb4ad5fb
-_md5_=2a4b8a738c47560471e634ca220b72db
+_md5_=4fe84ba769cd08f645821e1657d32e07
diff --git a/metadata/md5-cache/media-sound/gstreamripper-0.2 b/metadata/md5-cache/media-sound/gstreamripper-0.2
index d9fb369a155f..cb6565fd8695 100644
--- a/metadata/md5-cache/media-sound/gstreamripper-0.2
+++ b/metadata/md5-cache/media-sound/gstreamripper-0.2
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
 DEPEND=x11-libs/gtk+:2 media-sound/streamripper
 DESCRIPTION=A GTK+ toolkit based frontend for streamripper
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/gstreamripper/
-INHERIT=autotools desktop
+INHERIT=desktop
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 media-sound/streamripper
 SLOT=0
 SRC_URI=mirror://sourceforge/gstreamripper/GStreamripperX-0.2.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e	desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=8bcbf685d6e9d41e99c52688ba639489
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=b0e2c771e426d82cb9f93c3e19beab22
diff --git a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1 b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
index 518507d52fa8..697e9d3eb530 100644
--- a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
+++ b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
@@ -4,12 +4,12 @@ DEPEND=sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(
 DESCRIPTION=A low-latency audio server
 EAPI=7
 HOMEPAGE=http://www.jackaudio.org
-INHERIT=flag-o-matic multilib-minimal
+INHERIT=multilib-minimal
 IUSE=cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/db:=[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-libs/readline:0= >=media-libs/libsndfile-1.0.0 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(-)?] media-libs/zita-resampler media-libs/zita-alsa-pcmi ) >=media-libs/libsamplerate-0.1.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( sys-process/lsof ) pam? ( sys-auth/realtime-base )
 SLOT=0
 SRC_URI=https://github.com/jackaudio/jack1/archive/0.125.0.tar.gz -> jack-audio-connection-kit-0.125.0.tar.gz
-_eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b
-_md5_=f075b39825f0f7080fc277845c329fd4
+_eclasses_=multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b
+_md5_=f2ba1f6ba93e479b1d8144736c663a60
diff --git a/metadata/md5-cache/media-sound/lltag-0.14.6 b/metadata/md5-cache/media-sound/lltag-0.14.6
index 5ba1eb66e10c..f29d7e2cd8e2 100644
--- a/metadata/md5-cache/media-sound/lltag-0.14.6
+++ b/metadata/md5-cache/media-sound/lltag-0.14.6
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-perl/libwww-perl flac? ( media-libs/flac ) mp3? ( dev-perl/MP3-Tag media-sound/mp3info ) ogg? ( media-sound/vorbis-tools ) readline? ( dev-perl/Term-ReadLine-Perl ) dev-lang/perl
 DESCRIPTION=Automatic command-line mp3/ogg/flac file tagger and renamer
 EAPI=7
@@ -12,4 +12,4 @@ RDEPEND=dev-perl/libwww-perl flac? ( media-libs/flac ) mp3? ( dev-perl/MP3-Tag m
 SLOT=0
 SRC_URI=https://github.com/bgoglin/lltag/archive/lltag-0.14.6.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=1335cf58565818fae4b790f70518eafb
+_md5_=5d151c3c8a043276d2c8d2f7be740e1f
diff --git a/metadata/md5-cache/media-sound/mpd-0.23.5 b/metadata/md5-cache/media-sound/mpd-0.23.5
index 864ab80378fa..47a80b9a2b61 100644
--- a/metadata/md5-cache/media-sound/mpd-0.23.5
+++ b/metadata/md5-cache/media-sound/mpd-0.23.5
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.23/mpd-0.23.5.tar.xz
 _eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	2f039741fe92bcea55c78806d16ac0f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	meson	9f3e84959ae1d60e19bc91f212774dcc	systemd	2736b403a83f194b59b767f3b344c2c1	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=41f4fb862759c6d268b7658632d27d11
+_md5_=b42824450b93f11c1a7d7241bda4135f
diff --git a/metadata/md5-cache/media-sound/rawrec-0.9.991 b/metadata/md5-cache/media-sound/rawrec-0.9.991
index 9c14ad3820ae..626b11d79a0c 100644
--- a/metadata/md5-cache/media-sound/rawrec-0.9.991
+++ b/metadata/md5-cache/media-sound/rawrec-0.9.991
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=CLI program to play and record audiofiles
 EAPI=7
 HOMEPAGE=http://rawrec.sourceforge.net
-INHERIT=flag-o-matic toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/rawrec/rawrec-0.9.991.tar.gz
-_eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7
-_md5_=784188e9ed9b40108944595c460c8beb
+_eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784
+_md5_=f4893c6981d629bc2eb172d07149c461
diff --git a/metadata/md5-cache/media-sound/wavpack-5.4.0 b/metadata/md5-cache/media-sound/wavpack-5.4.0
index 7311b19cf6f9..5a39708ff964 100644
--- a/metadata/md5-cache/media-sound/wavpack-5.4.0
+++ b/metadata/md5-cache/media-sound/wavpack-5.4.0
@@ -1,10 +1,9 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install test
 DEPEND=>=virtual/libiconv-0-r1
 DESCRIPTION=Hybrid lossless audio compression tools
 EAPI=7
 HOMEPAGE=https://www.wavpack.com/
-INHERIT=autotools multilib-minimal
+INHERIT=multilib-minimal
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
@@ -12,5 +11,5 @@ RDEPEND=>=virtual/libiconv-0-r1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbry/WavPack/releases/download/5.4.0/wavpack-5.4.0.tar.xz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	6cc26735fa9dd59e8c62880beda05b6e	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b
-_md5_=2d925f4507e474541a80914bc9dcfef3
+_eclasses_=multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b
+_md5_=15da097770930f2a7e484159ee351a96
diff --git a/metadata/md5-cache/media-video/ccextractor-0.88 b/metadata/md5-cache/media-video/ccextractor-0.88
index 3f73712f9110..916486b0e1cb 100644
--- a/metadata/md5-cache/media-video/ccextractor-0.88
+++ b/metadata/md5-cache/media-video/ccextractor-0.88
@@ -4,11 +4,11 @@ DEPEND=media-libs/libpng:0= sys-libs/zlib:=
 DESCRIPTION=Extract closed captioning subtitles from video to SRT
 EAPI=7
 HOMEPAGE=https://www.ccextractor.org/
-INHERIT=cmake flag-o-matic
+INHERIT=cmake
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://github.com/CCExtractor/ccextractor/archive/v0.88.tar.gz -> ccextractor-0.88.tar.gz
 _eclasses_=toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	xdg-utils	4f29a8b760a594a212abe9c2ba957c31	cmake	9f12546ab831b81c615d90e6b9e34e68
-_md5_=109ec970fc967328c3ff7ec527cbb8dd
+_md5_=c40c2d9ed3a400dbfc82d3577efef35e
diff --git a/metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1 b/metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1
index d23b59d5d30a..be8cac47ca6a 100644
--- a/metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1
+++ b/metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1
@@ -4,7 +4,7 @@ DEPEND=media-video/ffmpeg:0=[postproc] >=media-libs/libvorbis-1.1 >=media-libs/l
 DESCRIPTION=A simple converter to create Ogg Theora files
 EAPI=7
 HOMEPAGE=http://www.v2v.cc/~j/ffmpeg2theora/
-INHERIT=python-any-r1 scons-utils toolchain-funcs
+INHERIT=python-any-r1 scons-utils
 IUSE=kate
 KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3
@@ -12,4 +12,4 @@ RDEPEND=media-video/ffmpeg:0=[postproc] >=media-libs/libvorbis-1.1 >=media-libs/
 SLOT=0
 SRC_URI=http://www.v2v.cc/~j/ffmpeg2theora/downloads/ffmpeg2theora-0.30.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	python-any-r1	54666a8fa603df658d9284845fc3d755	scons-utils	ce050be6e12c98ec6b7f0706e4be9d85
-_md5_=6dec885c8bae87d18b2140f6c83da42d
+_md5_=8ef2244d32965615418ee8463bbac02a
diff --git a/metadata/md5-cache/media-video/jubler-5.1 b/metadata/md5-cache/media-video/jubler-5.1
index 7dd01016a87f..5a0a8681776d 100644
--- a/metadata/md5-cache/media-video/jubler-5.1
+++ b/metadata/md5-cache/media-video/jubler-5.1
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8
 DESCRIPTION=Java subtitle editor
 EAPI=6
 HOMEPAGE=https://www.jubler.org/
-INHERIT=java-pkg-2 java-ant-2 xdg
+INHERIT=desktop java-pkg-2 java-ant-2 xdg
 IUSE=mplayer spell nls
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=mplayer? ( media-video/mplayer[libass] ) spell? ( app-text/aspell ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jubler/Jubler-source-5.1.tar.bz2 -> jubler-5.1.tar.bz2
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	fe178a2da6b16798a2363acc5543dffa	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-ant-2	262d853e2dd1056dc103b953dfc113b9	xdg-utils	4f29a8b760a594a212abe9c2ba957c31	xdg	6024fbc93167fad782e2032933654857
-_md5_=5b6449634c6d4f0a5e52fdabbe2f6e1c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	fe178a2da6b16798a2363acc5543dffa	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-ant-2	262d853e2dd1056dc103b953dfc113b9	xdg-utils	4f29a8b760a594a212abe9c2ba957c31	xdg	6024fbc93167fad782e2032933654857
+_md5_=6c0167950f7c269c2550b1be255e2c50
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 28dfc1ddaf9c..d025c1d2a9c1 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -1319,7 +1319,7 @@ app-containers/containers-storage 1.37.0 1.38.0 1.38.2: containers/storage libra
 app-containers/cosign 1.5.2: container signing utility
 app-containers/cri-o 1.23.1: OCI-based implementation of Kubernetes Container Runtime Interface
 app-containers/cri-tools 1.18.0 1.21.0 1.22.0 1.23.0: CLI and validation tools for Kubelet Container Runtime (CRI)
-app-containers/crun 1.2 1.3 1.4.2: A fast and low-memory footprint OCI Container Runtime fully written in C
+app-containers/crun 1.3 1.4.2: A fast and low-memory footprint OCI Container Runtime fully written in C
 app-containers/distrobuilder 1.1 1.2 2.0: System container image builder for LXC and LXD
 app-containers/docker 20.10.9 20.10.12-r1: The core functions you need to create Docker images and run Docker containers
 app-containers/docker-bench-security 1.3.2 1.3.3: Test for best practices around deploying docker containers
@@ -11301,7 +11301,7 @@ dev-util/radare2 4.5.1-r1 5.3.1 5.5.4 9999: unix-like reverse engineering framew
 dev-util/ragel 6.10 7.0.0.12 7.0.3 7.0.4 7.0.4-r1: Compiles finite state machines from regular languages into executable code
 dev-util/rats 2.4: RATS - Rough Auditing Tool for Security
 dev-util/rbtools 2.0 2.0.1: Command line tools for use with Review Board
-dev-util/re2c 2.1.1-r1 2.2: tool for generating C-based recognizers from regular expressions
+dev-util/re2c 2.1.1-r1 2.2: Tool for generating C-based recognizers from regular expressions
 dev-util/rebar 2.6.4-r1: A sophisticated build-tool for Erlang projects that follows OTP principles
 dev-util/rebar-bin 3.18.0: A sophisticated build-tool for Erlang projects that follows OTP principles
 dev-util/redo 0.42a 0.42c 99999: Smaller, easier, more powerful, and more reliable than make
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2219052862cd..57ebf02cc9ae 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 09 Mar 2022 22:37:00 +0000
+Wed, 09 Mar 2022 23:22:09 +0000