2021-04-21 19:20:17 UTC

83 files changed, 225 insertions, 223 deletions

diff --git a/metadata/md5-cache/app-arch/pbzip2-1.1.12 b/metadata/md5-cache/app-arch/pbzip2-1.1.12
index 05f7c43c4838..d31f8826cd89 100644
--- a/metadata/md5-cache/app-arch/pbzip2-1.1.12
+++ b/metadata/md5-cache/app-arch/pbzip2-1.1.12
@@ -3,7 +3,7 @@ DEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] ) static
 DESCRIPTION=Parallel bzip2 (de)compressor using libbz2
 EAPI=5
 HOMEPAGE=http://compression.ca/pbzip2/ https://launchpad.net/pbzip2
-INHERIT=flag-o-matic eutils toolchain-funcs
+INHERIT=flag-o-matic epatch toolchain-funcs
 IUSE=static symlink
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BZIP2
@@ -11,4 +11,4 @@ RDEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] )
 SLOT=0
 SRC_URI=https://launchpad.net/pbzip2/1.1/1.1.12/+download/pbzip2-1.1.12.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=3fcdf3def411267a6d497fc08a60b8cd
+_md5_=0972af4065e16e65da63d15910ef330a
diff --git a/metadata/md5-cache/app-arch/pbzip2-1.1.13 b/metadata/md5-cache/app-arch/pbzip2-1.1.13
index fbef7811f3ee..c96d27da9563 100644
--- a/metadata/md5-cache/app-arch/pbzip2-1.1.13
+++ b/metadata/md5-cache/app-arch/pbzip2-1.1.13
@@ -3,7 +3,7 @@ DEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] ) static
 DESCRIPTION=Parallel bzip2 (de)compressor using libbz2
 EAPI=5
 HOMEPAGE=http://compression.ca/pbzip2/ https://launchpad.net/pbzip2
-INHERIT=flag-o-matic eutils toolchain-funcs
+INHERIT=flag-o-matic epatch toolchain-funcs
 IUSE=static symlink
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BZIP2
@@ -11,4 +11,4 @@ RDEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] )
 SLOT=0
 SRC_URI=https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=a3aea4401fe1877c4241c016938ae207
+_md5_=914058381980d3e9a6924e5a4e2e20bd
diff --git a/metadata/md5-cache/app-arch/sharutils-4.15.2-r1 b/metadata/md5-cache/app-arch/sharutils-4.15.2-r1
index 9ffdd213c605..4fd549bf554b 100644
--- a/metadata/md5-cache/app-arch/sharutils-4.15.2-r1
+++ b/metadata/md5-cache/app-arch/sharutils-4.15.2-r1
@@ -3,11 +3,11 @@ DEPEND=app-arch/xz-utils sys-apps/texinfo nls? ( >=sys-devel/gettext-0.10.35 )
 DESCRIPTION=Tools to deal with shar archives
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/sharutils/
-INHERIT=eutils flag-o-matic
+INHERIT=epatch l10n flag-o-matic
 IUSE=nls
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/sharutils/sharutils-4.15.2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=04ecefcd418b2bfd4aedd54c7c2bb179
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=ee4d63ecaa6c9e9241ad6a2eb8d73aa4
diff --git a/metadata/md5-cache/app-arch/sharutils-4.15.2-r2 b/metadata/md5-cache/app-arch/sharutils-4.15.2-r2
index c19721a9a10c..e9edcad0c63a 100644
--- a/metadata/md5-cache/app-arch/sharutils-4.15.2-r2
+++ b/metadata/md5-cache/app-arch/sharutils-4.15.2-r2
@@ -3,11 +3,11 @@ DEPEND=app-arch/xz-utils sys-apps/texinfo nls? ( >=sys-devel/gettext-0.10.35 )
 DESCRIPTION=Tools to deal with shar archives
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/sharutils/
-INHERIT=eutils flag-o-matic
+INHERIT=flag-o-matic l10n
 IUSE=nls
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/sharutils/sharutils-4.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=e8ea14da08753c192eb713bc40d61442
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=3503329bfaab0fff2a7180991c9567f3
diff --git a/metadata/md5-cache/app-editors/hexcurse-1.55 b/metadata/md5-cache/app-editors/hexcurse-1.55
index 15c8057dc37a..bea53b969b16 100644
--- a/metadata/md5-cache/app-editors/hexcurse-1.55
+++ b/metadata/md5-cache/app-editors/hexcurse-1.55
@@ -3,11 +3,11 @@ DEPEND=>=sys-libs/ncurses-5.2:0= sys-devel/gnuconfig >=app-portage/elt-patches-2
 DESCRIPTION=ncurses based hex editor
 EAPI=5
 HOMEPAGE=http://www.jewfish.net/description.php?title=HexCurse
-INHERIT=autotools eutils
+INHERIT=autotools epatch
 KEYWORDS=~alpha amd64 arm ~hppa ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0=
 SLOT=0
 SRC_URI=http://www.jewfish.net/downloads/hexcurse-1.55.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=8630a4d645fed6e42d4d3b6e38ead991
+_md5_=54da1be0081f51618fe3e9c3ff9265fc
diff --git a/metadata/md5-cache/app-portage/elt-patches-20201205 b/metadata/md5-cache/app-portage/elt-patches-20201205
index b9b5d849892b..67ceb882b349 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20201205
+++ b/metadata/md5-cache/app-portage/elt-patches-20201205
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/xz-utils
 DEFINED_PHASES=compile install
-DEPEND=app-arch/xz-utils
 DESCRIPTION=Collection of patches for libtool.eclass
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grobian/distfiles/elt-patches-20201205.tar.xz
-_md5_=172f45b4f8503eb57aad7c19ca48973f
+_md5_=00ecbfced8f01ccea041126c340430b6
diff --git a/metadata/md5-cache/dev-embedded/avr-libc-2.0.0 b/metadata/md5-cache/dev-embedded/avr-libc-2.0.0
index 6844c2efbb0d..9bd8a7c27291 100644
--- a/metadata/md5-cache/dev-embedded/avr-libc-2.0.0
+++ b/metadata/md5-cache/dev-embedded/avr-libc-2.0.0
@@ -3,11 +3,11 @@ DEPEND=>=sys-devel/crossdev-0.9.1
 DESCRIPTION=C library for Atmel AVR microcontrollers
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/avr-libc/
-INHERIT=flag-o-matic eutils
+INHERIT=flag-o-matic epatch
 IUSE=doc headers-only
 KEYWORDS=amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/avr-libc/avr-libc-2.0.0.tar.bz2 https://savannah.nongnu.org/download/avr-libc/avr-libc-manpages-2.0.0.tar.bz2 doc? ( https://savannah.nongnu.org/download/avr-libc/avr-libc-user-manual-2.0.0.tar.bz2 )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=cf6fd0dec05c02218211365bf0f51325
+_md5_=b621050361fb5c731789392962d1712a
diff --git a/metadata/md5-cache/media-libs/openal-1.21.1-r1 b/metadata/md5-cache/media-libs/openal-1.21.1-r1
index 2e5fa0f064a1..f73c794b60db 100644
--- a/metadata/md5-cache/media-libs/openal-1.21.1-r1
+++ b/metadata/md5-cache/media-libs/openal-1.21.1-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.openal-soft.org/
 INHERIT=cmake-multilib
 IUSE=alsa coreaudio debug jack oss portaudio pulseaudio sdl sndio qt5 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_arm_neon 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 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2+ BSD
 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(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio[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://www.openal-soft.org/openal-releases/openal-soft-1.21.1.tar.bz2
 _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	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999
-_md5_=5d8bb2849670ebb228b30bf0daf01290
+_md5_=b6c2683a3efb48858a8429fedc8dcc13
diff --git a/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.200.2506-r1 b/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.200.2506-r1
index b3f2223bc994..e7476495f7d0 100644
--- a/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.200.2506-r1
+++ b/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.200.2506-r1
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install nofetch postinst setup unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=HDX RealTime Media Engine plugin for Citrix Workspace App
 EAPI=7
 HOMEPAGE=https://www.citrix.com/
@@ -11,4 +11,4 @@ RESTRICT=fetch mirror strip
 SLOT=0
 SRC_URI=amd64? ( HDX_RealTime_Media_Engine_2.9.200_for_Linux_x64.zip ) x86? ( HDX_RealTime_Media_Engine_2.9.200_for_Linux.zip )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	unpacker	517f16af48ee3ab88180dd58b5143213
-_md5_=7e7ca5167ff320ed516d235844eb9585
+_md5_=0a0d61ab9cc2d659af86b6a81e76293f
diff --git a/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.300.2604 b/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.300.2604
index 1b7d377e396e..41477c38236c 100644
--- a/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.300.2604
+++ b/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.300.2604
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=install nofetch postinst setup unpack
-DEPEND=app-arch/unzip
 DESCRIPTION=HDX RealTime Media Engine plugin for Citrix Workspace App
 EAPI=7
 HOMEPAGE=https://www.citrix.com/
@@ -11,4 +11,4 @@ RESTRICT=fetch mirror strip
 SLOT=0
 SRC_URI=amd64? ( HDX_RealTime_Media_Engine_2.9.300_for_Linux_x64.zip ) x86? ( HDX_RealTime_Media_Engine_2.9.300_for_Linux.zip )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	unpacker	517f16af48ee3ab88180dd58b5143213
-_md5_=7e7ca5167ff320ed516d235844eb9585
+_md5_=0a0d61ab9cc2d659af86b6a81e76293f
diff --git a/metadata/md5-cache/media-sound/asunder-2.9.6 b/metadata/md5-cache/media-sound/asunder-2.9.6
index 8670bc045091..ab6daed11686 100644
--- a/metadata/md5-cache/media-sound/asunder-2.9.6
+++ b/metadata/md5-cache/media-sound/asunder-2.9.6
@@ -4,11 +4,12 @@ DEPEND=>=media-libs/libcddb-0.9.5 media-sound/cdparanoia x11-libs/gtk+:2 dev-uti
 DESCRIPTION=Graphical Audio CD ripper and encoder with support for many output formats
 EAPI=7
 HOMEPAGE=http://littlesvr.ca/asunder/
+INHERIT=xdg
 IUSE=flac mac mp3 musepack opus vorbis wavpack
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libcddb-0.9.5 media-sound/cdparanoia x11-libs/gtk+:2 flac? ( media-libs/flac ) mac? ( media-sound/mac ) mp3? ( media-sound/lame ) musepack? ( media-sound/musepack-tools ) opus? ( media-sound/opus-tools ) vorbis? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=http://littlesvr.ca/asunder/releases/asunder-2.9.6.tar.bz2
-_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=55d8242ded84e0fcdd81f013675bbe11
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=b1f5eebada431dbb55607f50d3b9639a
diff --git a/metadata/md5-cache/media-sound/fapg-0.43 b/metadata/md5-cache/media-sound/fapg-0.43
index f2e60346b406..e78d7109f1cf 100644
--- a/metadata/md5-cache/media-sound/fapg-0.43
+++ b/metadata/md5-cache/media-sound/fapg-0.43
@@ -4,9 +4,9 @@ DESCRIPTION=Fast Audio Playlist Generator
 EAPI=7
 HOMEPAGE=http://royale.zerezo.com/fapg/
 IUSE=xspf
-KEYWORDS=~amd64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=xspf? ( >=dev-libs/uriparser-0.6.3 )
 SLOT=0
 SRC_URI=http://royale.zerezo.com/fapg/fapg-0.43.tar.gz
-_md5_=2ce31cb78c2f3fdcc15b9a849723cade
+_md5_=d9a37034587f4eeb6fd8b4c8a2d77e63
diff --git a/metadata/md5-cache/sys-apps/dmapi-2.2.12-r1 b/metadata/md5-cache/sys-apps/dmapi-2.2.12-r1
index 6ef9fb1af619..ae4a4e5787b2 100644
--- a/metadata/md5-cache/sys-apps/dmapi-2.2.12-r1
+++ b/metadata/md5-cache/sys-apps/dmapi-2.2.12-r1
@@ -3,12 +3,12 @@ DEPEND=sys-fs/xfsprogs
 DESCRIPTION=XFS data management API library
 EAPI=5
 HOMEPAGE=https://xfs.wiki.kernel.org/
-INHERIT=eutils toolchain-funcs ltprune multilib multilib-minimal usr-ldscript
+INHERIT=epatch toolchain-funcs ltprune multilib multilib-minimal usr-ldscript
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-fs/xfsprogs
 SLOT=0
 SRC_URI=ftp://oss.sgi.com/projects/xfs/cmd_tars/dmapi-2.2.12.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/dmapi-2.2.12.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=5099d2ff7f5ea473caf7dcd227900bcf
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=0e4f9aef1568373ff03a8cb0d3368270
diff --git a/metadata/md5-cache/sys-apps/ethtool-5.10 b/metadata/md5-cache/sys-apps/ethtool-5.10
index a39b9b10bcb7..afb18a0d7626 100644
--- a/metadata/md5-cache/sys-apps/ethtool-5.10
+++ b/metadata/md5-cache/sys-apps/ethtool-5.10
@@ -1,5 +1,6 @@
+BDEPEND=app-arch/xz-utils
 DEFINED_PHASES=configure
-DEPEND=app-arch/xz-utils
+DEPEND=netlink? ( net-libs/libmnl )
 DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/software/network/ethtool/
@@ -9,4 +10,4 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libmnl )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/network/ethtool/ethtool-5.10.tar.xz
-_md5_=d5e6c2116c85585ade823c09840ee6a2
+_md5_=9a75e723aa1ebc6eba6ce4e21fc8b056
diff --git a/metadata/md5-cache/sys-apps/ethtool-5.4 b/metadata/md5-cache/sys-apps/ethtool-5.4
index 65574c2f2714..45240c818ae5 100644
--- a/metadata/md5-cache/sys-apps/ethtool-5.4
+++ b/metadata/md5-cache/sys-apps/ethtool-5.4
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/xz-utils
 DEFINED_PHASES=-
-DEPEND=app-arch/xz-utils
 DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/software/network/ethtool/
@@ -7,4 +7,4 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/network/ethtool/ethtool-5.4.tar.xz
-_md5_=2e7a172f1b9f948e1ab59eaab273963f
+_md5_=34957d29ec445c15c15fd2a098d96070
diff --git a/metadata/md5-cache/sys-apps/ethtool-5.8-r1 b/metadata/md5-cache/sys-apps/ethtool-5.8-r1
index 434e71689834..6e7957ce8e4d 100644
--- a/metadata/md5-cache/sys-apps/ethtool-5.8-r1
+++ b/metadata/md5-cache/sys-apps/ethtool-5.8-r1
@@ -1,5 +1,6 @@
+BDEPEND=app-arch/xz-utils
 DEFINED_PHASES=configure
-DEPEND=app-arch/xz-utils
+DEPEND=netlink? ( net-libs/libmnl )
 DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/software/network/ethtool/
@@ -9,4 +10,4 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libmnl )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/network/ethtool/ethtool-5.8.tar.xz
-_md5_=c83c7269cb8d5af72449833026cf6ff6
+_md5_=a4898d96c3efc22c3ae86281e8ec1a18
diff --git a/metadata/md5-cache/sys-apps/ethtool-5.9 b/metadata/md5-cache/sys-apps/ethtool-5.9
index 5adcc56a593b..97db8f94bbaa 100644
--- a/metadata/md5-cache/sys-apps/ethtool-5.9
+++ b/metadata/md5-cache/sys-apps/ethtool-5.9
@@ -1,5 +1,6 @@
+BDEPEND=app-arch/xz-utils
 DEFINED_PHASES=configure
-DEPEND=app-arch/xz-utils
+DEPEND=netlink? ( net-libs/libmnl )
 DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/software/network/ethtool/
@@ -9,4 +10,4 @@ LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libmnl )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/network/ethtool/ethtool-5.9.tar.xz
-_md5_=d5e6c2116c85585ade823c09840ee6a2
+_md5_=9a75e723aa1ebc6eba6ce4e21fc8b056
diff --git a/metadata/md5-cache/sys-apps/lsb-release-1.4-r3 b/metadata/md5-cache/sys-apps/lsb-release-1.4-r3
index 273d2887cd11..17f60f436460 100644
--- a/metadata/md5-cache/sys-apps/lsb-release-1.4-r3
+++ b/metadata/md5-cache/sys-apps/lsb-release-1.4-r3
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=LSB version query program
 EAPI=5
 HOMEPAGE=https://wiki.linuxfoundation.org/lsb/
-INHERIT=eutils prefix
+INHERIT=epatch prefix
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lsb/lsb-release-1.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=04f5a6775e2b53f9cf8e9d180e3621a9
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=d7395a72fdca81c46f2488240ef62634
diff --git a/metadata/md5-cache/sys-apps/man-pages-posix-2013a b/metadata/md5-cache/sys-apps/man-pages-posix-2013a
index f21bad25d361..5959be516dd2 100644
--- a/metadata/md5-cache/sys-apps/man-pages-posix-2013a
+++ b/metadata/md5-cache/sys-apps/man-pages-posix-2013a
@@ -2,12 +2,10 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=POSIX man-pages (0p, 1p, 3p)
 EAPI=5
 HOMEPAGE=https://www.kernel.org/doc/man-pages/
-INHERIT=eutils
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=man-pages-posix-2013
 RDEPEND=virtual/man !<sys-apps/man-pages-3
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-2013-a.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=5395bfa0dbf73434560ff584f6168365
+_md5_=3e4a60b451b326a0bc4b2dd239b6b073
diff --git a/metadata/md5-cache/sys-apps/man2html-1.6g b/metadata/md5-cache/sys-apps/man2html-1.6g
index 114879a34232..f54a2e010a6c 100644
--- a/metadata/md5-cache/sys-apps/man2html-1.6g
+++ b/metadata/md5-cache/sys-apps/man2html-1.6g
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Standard commands to read man pages
 EAPI=5
 HOMEPAGE=http://primates.ximian.com/~flucifredi/man/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/man
 SLOT=0
 SRC_URI=http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=712903a946fc6efc3c5c12a2b5e47052
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=71aa07f03df8bebd4dc64c52b44f4338
diff --git a/metadata/md5-cache/sys-apps/memtest86+-5.01-r4 b/metadata/md5-cache/sys-apps/memtest86+-5.01-r4
index ea5a6cf43fef..a828deb5405d 100644
--- a/metadata/md5-cache/sys-apps/memtest86+-5.01-r4
+++ b/metadata/md5-cache/sys-apps/memtest86+-5.01-r4
@@ -3,12 +3,12 @@ DEPEND=iso? ( app-cdr/cdrtools )
 DESCRIPTION=Memory tester based on memtest86
 EAPI=6
 HOMEPAGE=http://www.memtest.org/
-INHERIT=mount-boot eutils toolchain-funcs
+INHERIT=mount-boot epatch toolchain-funcs
 IUSE=+boot floppy iso serial
 KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
 RDEPEND=floppy? ( sys-fs/mtools )
 SLOT=0
 SRC_URI=http://www.memtest.org/download/5.01/memtest86+-5.01.tar.gz
-_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=b14f939b66e5d45a201f648c7280f5da
+_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=db2e170b713d68f3166dd682d63829e6
diff --git a/metadata/md5-cache/sys-apps/memtest86+-5.01-r5 b/metadata/md5-cache/sys-apps/memtest86+-5.01-r5
index 08c24ecbb4b5..aa80c2f856b8 100644
--- a/metadata/md5-cache/sys-apps/memtest86+-5.01-r5
+++ b/metadata/md5-cache/sys-apps/memtest86+-5.01-r5
@@ -3,12 +3,12 @@ DEPEND=iso? ( app-cdr/cdrtools )
 DESCRIPTION=Memory tester based on memtest86
 EAPI=6
 HOMEPAGE=http://www.memtest.org/
-INHERIT=mount-boot eutils toolchain-funcs
+INHERIT=mount-boot epatch toolchain-funcs
 IUSE=+boot floppy iso serial
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=floppy? ( sys-fs/mtools )
 SLOT=0
 SRC_URI=http://www.memtest.org/download/5.01/memtest86+-5.01.tar.gz
-_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=910532241b707349795e99642b04ebf2
+_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=d7b59e93c4325bbe9aed760ae61dffa0
diff --git a/metadata/md5-cache/sys-apps/mlocate-0.26-r2 b/metadata/md5-cache/sys-apps/mlocate-0.26-r2
index 04d77ce0af72..4d3498f25791 100644
--- a/metadata/md5-cache/sys-apps/mlocate-0.26-r2
+++ b/metadata/md5-cache/sys-apps/mlocate-0.26-r2
@@ -3,12 +3,12 @@ DEPEND=app-arch/xz-utils nls? ( sys-devel/gettext )
 DESCRIPTION=Merging locate is an utility to index and quickly search for files
 EAPI=5
 HOMEPAGE=https://pagure.io/mlocate
-INHERIT=eutils user toolchain-funcs
+INHERIT=user toolchain-funcs
 IUSE=nls selinux
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/slocate !sys-apps/rlocate selinux? ( sec-policy/selinux-slocate )
 SLOT=0
 SRC_URI=http://releases.pagure.org/mlocate/mlocate-0.26.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=ca2e983e98809aa72eecd22b1947ba30
+_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=4b46b04a2c64a8cde13f4923ed03daf5
diff --git a/metadata/md5-cache/sys-apps/qingy-1.0.0-r5 b/metadata/md5-cache/sys-apps/qingy-1.0.0-r5
index 43e16099cc76..fb2a48484553 100644
--- a/metadata/md5-cache/sys-apps/qingy-1.0.0-r5
+++ b/metadata/md5-cache/sys-apps/qingy-1.0.0-r5
@@ -3,7 +3,7 @@ DEPEND=>=sys-libs/ncurses-5.7-r7:= opensslcrypt? ( dev-libs/openssl:0= ) crypt?
 DESCRIPTION=A DirectFB getty replacement
 EAPI=6
 HOMEPAGE=http://qingy.sourceforge.net/
-INHERIT=autotools elisp-common eutils flag-o-matic pam systemd
+INHERIT=autotools elisp-common epatch flag-o-matic pam systemd
 IUSE=crypt emacs gpm opensslcrypt pam static X
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.7-r7:= opensslcrypt? ( dev-libs/openssl:0= ) crypt?
 SLOT=0
 SRC_URI=mirror://sourceforge/qingy/qingy-1.0.0.tar.bz2 mirror://gentoo/qingy-gentoo-theme-2.1.tar.bz2 https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/qingy-1.0.0-screensavers.patch.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=43c5d57ff2fcd070846fedfd9b658092
+_md5_=03a189b468844c8735782db495f9d52b
diff --git a/metadata/md5-cache/sys-apps/sed-4.7 b/metadata/md5-cache/sys-apps/sed-4.7
index ef062a737460..29f2c0ed5510 100644
--- a/metadata/md5-cache/sys-apps/sed-4.7
+++ b/metadata/md5-cache/sys-apps/sed-4.7
@@ -3,7 +3,7 @@ DEPEND=!static? ( acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-l
 DESCRIPTION=Super-useful stream editor
 EAPI=6
 HOMEPAGE=http://sed.sourceforge.net/
-INHERIT=flag-o-matic toolchain-funcs
+INHERIT=flag-o-matic
 IUSE=acl nls selinux static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ RDEPEND=!static? ( acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.7.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=eba0776ccc9d4cca3911177e71ce845e
+_md5_=3120c5f58543bd2b2554300aeaf8e031
diff --git a/metadata/md5-cache/sys-apps/sed-4.8 b/metadata/md5-cache/sys-apps/sed-4.8
index aecdb7c91e87..9c41446ea971 100644
--- a/metadata/md5-cache/sys-apps/sed-4.8
+++ b/metadata/md5-cache/sys-apps/sed-4.8
@@ -4,7 +4,7 @@ DEPEND=!static? ( acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-l
 DESCRIPTION=Super-useful stream editor
 EAPI=7
 HOMEPAGE=http://sed.sourceforge.net/
-INHERIT=flag-o-matic toolchain-funcs
+INHERIT=flag-o-matic
 IUSE=acl nls selinux static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3
@@ -12,4 +12,4 @@ RDEPEND=!static? ( acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.8.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=e4ce1daee21c2ec25685b23c70874d2b
+_md5_=03072716a8bfbe52928992dd47259007
diff --git a/metadata/md5-cache/sys-apps/sg3_utils-1.42 b/metadata/md5-cache/sys-apps/sg3_utils-1.42
index 23f574e072e9..f05ddcf9f586 100644
--- a/metadata/md5-cache/sys-apps/sg3_utils-1.42
+++ b/metadata/md5-cache/sys-apps/sg3_utils-1.42
@@ -3,12 +3,12 @@ DEPEND=sys-devel/libtool
 DESCRIPTION=Apps for querying the sg SCSI interface
 EAPI=5
 HOMEPAGE=http://sg.danny.cz/sg/
-INHERIT=eutils multilib ltprune
+INHERIT=epatch multilib ltprune
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 PDEPEND=>=sys-apps/rescan-scsi-bus-1.24
 SLOT=0
 SRC_URI=http://sg.danny.cz/sg/p/sg3_utils-1.42.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=ce405380f407e05fcf8871dc76a5b414
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=c96aecca17e3e48caae4982c5e50626f
diff --git a/metadata/md5-cache/sys-apps/shadow-4.8-r5 b/metadata/md5-cache/sys-apps/shadow-4.8-r5
index b4092e847c78..06eca27cf6f2 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.8-r5
+++ b/metadata/md5-cache/sys-apps/shadow-4.8-r5
@@ -4,7 +4,7 @@ DEPEND=acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib?
 DESCRIPTION=Utilities to deal with user accounts
 EAPI=7
 HOMEPAGE=https://github.com/shadow-maint/shadow
-INHERIT=autotools libtool pam
+INHERIT=autotools pam
 IUSE=acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD GPL-2
@@ -13,4 +13,4 @@ REQUIRED_USE=?? ( cracklib pam )
 SLOT=0
 SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.8/shadow-4.8.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2
-_md5_=6b42523c8ad10b2c06c1334159465c89
+_md5_=05a33c7607f7ea2912a06511ba91c14f
diff --git a/metadata/md5-cache/sys-apps/shadow-4.8.1-r3 b/metadata/md5-cache/sys-apps/shadow-4.8.1-r3
index 1781319218e2..7e9d31c32f04 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.8.1-r3
+++ b/metadata/md5-cache/sys-apps/shadow-4.8.1-r3
@@ -4,7 +4,7 @@ DEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-
 DESCRIPTION=Utilities to deal with user accounts
 EAPI=7
 HOMEPAGE=https://github.com/shadow-maint/shadow
-INHERIT=autotools libtool pam
+INHERIT=autotools pam
 IUSE=acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD GPL-2
@@ -13,4 +13,4 @@ REQUIRED_USE=?? ( cracklib pam )
 SLOT=0
 SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.8.1/shadow-4.8.1.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2
-_md5_=3c58e17712fe199e3796dcd643673bd4
+_md5_=e215949ec9a6b4c34caed6df1ded6d41
diff --git a/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.28 b/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.28
index 1339408b3580..c0744699186b 100644
--- a/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.28
+++ b/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.28
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install preinst prepare test
 DESCRIPTION=TCP Wrappers
 EAPI=7
 HOMEPAGE=http://ftp.porcupine.org/pub/security
-INHERIT=toolchain-funcs flag-o-matic multilib-minimal usr-ldscript
+INHERIT=toolchain-funcs multilib-minimal usr-ldscript
 IUSE=ipv6 netgroups static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=tcp_wrappers_license
 SLOT=0
 SRC_URI=http://ftp.porcupine.org/pub/security/tcp_wrappers_7.6.tar.gz mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.q-28.debian.tar.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=e1f6b73833a716b528a19cd74c6e4b5d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=84a7e7eb4d3d93577447530d561b7194
diff --git a/metadata/md5-cache/sys-apps/usbredir-0.8.0 b/metadata/md5-cache/sys-apps/usbredir-0.8.0
index 3bf2092d7d56..892287f8a570 100644
--- a/metadata/md5-cache/sys-apps/usbredir-0.8.0
+++ b/metadata/md5-cache/sys-apps/usbredir-0.8.0
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
-DEPEND=virtual/libusb:1 virtual/pkgconfig
+DEPEND=virtual/libusb:1
 DESCRIPTION=TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)
 EAPI=7
 HOMEPAGE=https://www.spice-space.org/usbredir.html
-INHERIT=eutils flag-o-matic
+INHERIT=flag-o-matic
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/usbredir/usbredir-0.8.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=60a81456abae37c82121b511b7112c4d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=77ac9289a135c9e71749d76c8c3c9ae7
diff --git a/metadata/md5-cache/sys-apps/usbredir-0.9.0 b/metadata/md5-cache/sys-apps/usbredir-0.9.0
index 66c8e24fe50a..75c9f37350ec 100644
--- a/metadata/md5-cache/sys-apps/usbredir-0.9.0
+++ b/metadata/md5-cache/sys-apps/usbredir-0.9.0
@@ -1,15 +1,15 @@
-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
+BDEPEND=virtual/pkgconfig 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
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/libusb:1 virtual/pkgconfig
+DEPEND=virtual/libusb:1
 DESCRIPTION=TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)
 EAPI=7
 HOMEPAGE=https://www.spice-space.org/usbredir.html
-INHERIT=eutils flag-o-matic autotools
+INHERIT=autotools flag-o-matic
 IUSE=static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/spice/usbredir/-/archive/usbredir-0.9.0/usbredir-usbredir-0.9.0.tar.bz2 -> usbredir-0.9.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=05f22b7d3b7431a5e466b8f4022dedc7
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=c1ed265dcda6984677aa24b5fad6daa5
diff --git a/metadata/md5-cache/sys-apps/usbredir-9999 b/metadata/md5-cache/sys-apps/usbredir-9999
index 53964f24b03f..88582aeff290 100644
--- a/metadata/md5-cache/sys-apps/usbredir-9999
+++ b/metadata/md5-cache/sys-apps/usbredir-9999
@@ -1,14 +1,14 @@
-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 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig 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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=virtual/libusb:1 virtual/pkgconfig
+DEPEND=virtual/libusb:1
 DESCRIPTION=TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)
 EAPI=7
 HOMEPAGE=https://www.spice-space.org/usbredir.html
-INHERIT=eutils flag-o-matic autotools git-r3
+INHERIT=autotools flag-o-matic git-r3
 IUSE=static-libs
 LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=a808d55babcd68896013b3ce9f0d15ee
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=395600ca29cbc02739d7399361a1d72b
diff --git a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3 b/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3
index 294093b448da..6f5f7005173c 100644
--- a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3
+++ b/metadata/md5-cache/sys-apps/xinetd-2.3.15-r3
@@ -3,12 +3,12 @@ DEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) rpc? ( net-libs/libtirpc:= ) vir
 DESCRIPTION=powerful replacement for inetd
 EAPI=5
 HOMEPAGE=http://www.xinetd.org/ https://github.com/xinetd-org/xinetd
-INHERIT=eutils flag-o-matic systemd toolchain-funcs
+INHERIT=epatch flag-o-matic systemd toolchain-funcs
 IUSE=perl rpc tcpd
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) rpc? ( net-libs/libtirpc:= ) perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=http://www.xinetd.org/xinetd-2.3.15.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=b8b682ec7ae08ff2da9e95b8b8c17fae
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=b1bb56410d0a0681021fa2cab4befa85
diff --git a/metadata/md5-cache/sys-block/aoetools-36 b/metadata/md5-cache/sys-block/aoetools-36
index 1457f0081b1e..a56c13d27ac8 100644
--- a/metadata/md5-cache/sys-block/aoetools-36
+++ b/metadata/md5-cache/sys-block/aoetools-36
@@ -2,10 +2,10 @@ DEFINED_PHASES=prepare
 DESCRIPTION=tools for ATA over Ethernet (AoE) network storage protocol
 EAPI=5
 HOMEPAGE=http://aoetools.sourceforge.net/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
 KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/aoetools/aoetools-36.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=a127fddefe5ea0ad9b93c08d11341690
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=d02b88a7a371fe3a6cd61705b6a0551d
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
index c87ce0635b47..8441265affaf 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
@@ -3,12 +3,12 @@ DEPEND=slp? ( net-libs/openslp ) virtual/pkgconfig
 DESCRIPTION=A performant, transport independent, multi-platform implementation of RFC3720
 EAPI=5
 HOMEPAGE=http://www.open-iscsi.com/
-INHERIT=versionator linux-info eutils flag-o-matic toolchain-funcs udev
+INHERIT=versionator linux-info epatch flag-o-matic toolchain-funcs udev
 IUSE=debug slp kernel_linux
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=slp? ( net-libs/openslp ) sys-fs/lsscsi sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=da7c7150bbcacd3198827ca93becf054
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	epatch	9f813bb3c47cf2e60619a663b87c5f4e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=b7b6dd536cbfa611ccb09c40922d3e32
diff --git a/metadata/md5-cache/sys-boot/lilo-24.0-r1 b/metadata/md5-cache/sys-boot/lilo-24.0-r1
index 8087842f5a84..3fb02f8cfd8e 100644
--- a/metadata/md5-cache/sys-boot/lilo-24.0-r1
+++ b/metadata/md5-cache/sys-boot/lilo-24.0-r1
@@ -3,12 +3,12 @@ DEPEND=>=sys-devel/bin86-0.15.5
 DESCRIPTION=Standard Linux boot loader
 EAPI=5
 HOMEPAGE=https://alioth.debian.org/projects/lilo/
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=epatch flag-o-matic toolchain-funcs
 IUSE=static minimal pxeserial device-mapper
 KEYWORDS=-* amd64 x86
 LICENSE=BSD GPL-2
 RDEPEND=device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 SLOT=0
 SRC_URI=http://lilo.alioth.debian.org/ftp/sources/lilo-24.0.tar.gz mirror://gentoo/dolilo-0.6.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=0231561e435e0a69439e7905a8a74f03
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=d2ba0d42c0d493eaa8c1dfcde5ad521b
diff --git a/metadata/md5-cache/sys-devel/bc-1.06.95-r2 b/metadata/md5-cache/sys-devel/bc-1.06.95-r2
index 7c151b4f007b..1b072fe1194f 100644
--- a/metadata/md5-cache/sys-devel/bc-1.06.95-r2
+++ b/metadata/md5-cache/sys-devel/bc-1.06.95-r2
@@ -3,12 +3,12 @@ DEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/rea
 DESCRIPTION=Handy console-based calculator utility
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/bc/bc.html
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=epatch flag-o-matic toolchain-funcs
 IUSE=libedit readline static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= )
 SLOT=0
 SRC_URI=https://alpha.gnu.org/gnu/bc/bc-1.06.95.tar.bz2 mirror://gnu/bc/bc-1.06.95.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=a15ae2ae30b3ccdafdb6691510ec8075
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=21e995ce89007499ca0879cd3dbd7f62
diff --git a/metadata/md5-cache/sys-devel/kgcc64-8.3.0 b/metadata/md5-cache/sys-devel/kgcc64-8.3.0
index f398d5a32b9f..7dd799b0a849 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-8.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-8.3.0
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-INHERIT=eutils toolchain
+INHERIT=toolchain
 IUSE=test vanilla +nls
 KEYWORDS=hppa
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) strip
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.0.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	toolchain	1db6586d659f34fb03fe4b58674408b6
-_md5_=fa7ffc6f25d6f3fb3d23420c4d7ec9e2
+_md5_=a581fb99ceda85244925bb747df74044
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.9-r1 b/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
index dfdf0c3002ce..8b4856374c1c 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
@@ -1,10 +1,9 @@
-BDEPEND=>=app-portage/elt-patches-20170815 virtual/pkgconfig
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
 DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/pkgconfig
 DESCRIPTION=An interface for filesystems implemented in userspace
 EAPI=7
 HOMEPAGE=https://github.com/libfuse/libfuse
-INHERIT=flag-o-matic libtool linux-info udev toolchain-funcs
+INHERIT=flag-o-matic libtool linux-info udev
 IUSE=examples kernel_linux kernel_FreeBSD static-libs kernel_linux
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -13,4 +12,4 @@ RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=3802f88c6f2222a003484efa4207f380
+_md5_=df3be7fac4218f8549d1fb808f2a13aa
diff --git a/metadata/md5-cache/sys-fs/fuse-3.10.1 b/metadata/md5-cache/sys-fs/fuse-3.10.1
index 1ac760eef7e5..68141a64a402 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.10.1
+++ b/metadata/md5-cache/sys-fs/fuse-3.10.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install setup test
 DESCRIPTION=An interface for filesystems implemented in userspace
 EAPI=7
 HOMEPAGE=https://github.com/libfuse/libfuse
-INHERIT=meson multilib-minimal flag-o-matic udev python-any-r1
+INHERIT=meson multilib-minimal udev python-any-r1
 IUSE=+suid 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 ~s390 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.10.1/fuse-3.10.1.tar.xz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	udev	452708c3f55cf6e918b045adb949a9e6	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=af5ed64d0bed5460c369d544956bfabc
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	udev	452708c3f55cf6e918b045adb949a9e6	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=b9165b93e9f2a80e1418f2b04c0ba904
diff --git a/metadata/md5-cache/sys-fs/fuse-3.10.2 b/metadata/md5-cache/sys-fs/fuse-3.10.2
index 54a6429cb446..97cf54fbe72c 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.10.2
+++ b/metadata/md5-cache/sys-fs/fuse-3.10.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install setup test
 DESCRIPTION=An interface for filesystems implemented in userspace
 EAPI=7
 HOMEPAGE=https://github.com/libfuse/libfuse
-INHERIT=meson multilib-minimal flag-o-matic udev python-any-r1
+INHERIT=meson multilib-minimal udev python-any-r1
 IUSE=+suid 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
 LICENSE=GPL-2 LGPL-2.1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.10.2/fuse-3.10.2.tar.xz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	udev	452708c3f55cf6e918b045adb949a9e6	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=c2905272694356c45e3404ec46f318d2
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	udev	452708c3f55cf6e918b045adb949a9e6	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=a38f9f2595444f94bcd0c83fe09c5ea7
diff --git a/metadata/md5-cache/sys-fs/fuse-3.9.1 b/metadata/md5-cache/sys-fs/fuse-3.9.1
index dad746082000..2baad49f489e 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.9.1
+++ b/metadata/md5-cache/sys-fs/fuse-3.9.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.9.1/fuse-3.9.1.tar.xz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	udev	452708c3f55cf6e918b045adb949a9e6	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=4b3367294a9fdd2171ace60135b16bf9
+_md5_=7e82e76e2fb1d21ef95e0bbb3dcaae2c
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.20.11.0 b/metadata/md5-cache/sys-fs/inotify-tools-3.20.11.0
index 91c3b5318033..976f6b870d27 100644
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.20.11.0
+++ b/metadata/md5-cache/sys-fs/inotify-tools-3.20.11.0
@@ -1,6 +1,5 @@
-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
+BDEPEND=doc? ( app-doc/doxygen ) 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
 DEFINED_PHASES=configure install prepare
-DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=a set of command-line programs providing a simple interface to inotify
 EAPI=7
 HOMEPAGE=https://github.com/inotify-tools/inotify-tools
@@ -11,4 +10,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/inotify-tools/inotify-tools/archive/3.20.11.0.tar.gz -> inotify-tools-3.20.11.0.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=6ead840d08925da5dd2fc65ff73466cc
+_md5_=7a7b9767663d688d210df8a02fb294c8
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2 b/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2
index fbd851c0192b..282f30b7d264 100644
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2
+++ b/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2
@@ -1,6 +1,5 @@
-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
+BDEPEND=doc? ( app-doc/doxygen ) 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
 DEFINED_PHASES=configure install prepare
-DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=a set of command-line programs providing a simple interface to inotify
 EAPI=7
 HOMEPAGE=https://github.com/inotify-tools/inotify-tools
@@ -11,4 +10,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/inotify-tools/inotify-tools/archive/3.20.2.2.tar.gz -> inotify-tools-3.20.2.2.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=2b3984d50e634b19a12305caa8899221
+_md5_=0887f5176b72064a0760311d98d26eb8
diff --git a/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8 b/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8
index 4608e73d6360..e528d2391b4c 100644
--- a/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8
+++ b/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8
@@ -3,11 +3,11 @@ DEPEND=sys-apps/util-linux nls? ( sys-devel/gettext ) >=app-portage/elt-patches-
 DESCRIPTION=Library for accessing and manipulating reiserfs partitions
 EAPI=5
 HOMEPAGE=http://reiserfs.linux.kiev.ua/
-INHERIT=eutils flag-o-matic libtool ltprune
+INHERIT=epatch flag-o-matic libtool ltprune
 IUSE=debug examples nls static-libs
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://reiserfs.linux.kiev.ua/snapshots/progsreiserfs-0.3.1-rc8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	libtool	f143db5a74ccd9ca28c1234deffede96
-_md5_=32775975a683e6d94c9027210787f2db
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	libtool	f143db5a74ccd9ca28c1234deffede96
+_md5_=57e0c9a712a4ad67e47d10c0436de4f2
diff --git a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.25 b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.25
index 7bc18580874a..5391e7cf0e72 100644
--- a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.25
+++ b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.25
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Reiserfs Utilities
 EAPI=5
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/fs/reiserfs/
-INHERIT=eutils flag-o-matic usr-ldscript
+INHERIT=epatch flag-o-matic usr-ldscript
 IUSE=static-libs split-usr
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-3.6.25.tar.xz https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v3.6.25/reiserfsprogs-3.6.25.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=ddc2c35348785615c66c7331cea87904
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=a98513059300da755f47c1a900b18ebb
diff --git a/metadata/md5-cache/sys-libs/db-5.3.28-r2 b/metadata/md5-cache/sys-libs/db-5.3.28-r2
index f9877026dbc5..aca25d0ca0b5 100644
--- a/metadata/md5-cache/sys-libs/db-5.3.28-r2
+++ b/metadata/md5-cache/sys-libs/db-5.3.28-r2
@@ -3,7 +3,7 @@ DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 DESCRIPTION=Oracle Berkeley DB
 EAPI=5
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
-INHERIT=eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal toolchain-funcs
+INHERIT=epatch db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal toolchain-funcs
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java 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 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Sleepycat
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tcl )
 RESTRICT=!test? ( test )
 SLOT=5.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	db	c42a9015ada022c979cd2ca4bc247821	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=7bf834f5206656cb0ca4401e6a94b86b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multiprocessing	cac3169468f893670dac3e7cb940e045	db	c42a9015ada022c979cd2ca4bc247821	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=8a1b302dcdc3a710a19d2b0a145b85fc
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1 b/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
index 15eae542a5fe..c744295421c6 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
+++ b/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
@@ -4,12 +4,12 @@ DEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 DESCRIPTION=Standard GNU database libraries
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gdbm/
-INHERIT=autotools flag-o-matic multilib multilib-minimal
+INHERIT=autotools multilib-minimal
 IUSE=+berkdb nls +readline static-libs 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=readline? ( sys-libs/readline: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(-)?] )
 SLOT=0/6
 SRC_URI=mirror://gnu/gdbm/gdbm-1.18.1.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=1f9b66c86c397a6b7ace3fe608be99e9
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=40c59bc5f5f6c8e4c918d4a3284e5f7a
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.19 b/metadata/md5-cache/sys-libs/gdbm-1.19
index f0d71fb6bfd7..75f891487158 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.19
+++ b/metadata/md5-cache/sys-libs/gdbm-1.19
@@ -4,12 +4,12 @@ DEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 DESCRIPTION=Standard GNU database libraries
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gdbm/
-INHERIT=autotools flag-o-matic multilib multilib-minimal
+INHERIT=autotools multilib-minimal
 IUSE=+berkdb nls +readline static-libs 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=readline? ( sys-libs/readline: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(-)?] )
 SLOT=0/6
 SRC_URI=mirror://gnu/gdbm/gdbm-1.19.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=dec61e4c0ac91f91d90ef6f77b79e741
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=8bdf220ffee8198cb7bec445c692d366
diff --git a/metadata/md5-cache/sys-libs/glibc-2.19-r2 b/metadata/md5-cache/sys-libs/glibc-2.19-r2
index 50095fb63585..a5fd80be89bd 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.19-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.19-r2
@@ -3,7 +3,7 @@ DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap )
 DESCRIPTION=GNU libc C library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libc/
-INHERIT=prefix eutils toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
+INHERIT=prefix toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps compile-locales debug doc gd headers-only multilib nscd profile selinux suid systemtap vanilla
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
@@ -12,5 +12,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.19.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.19-patches-9.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=25a20e26cfa107a41b1fa0ba513ca1b5
+_eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=27ca4337e43292a6dbfc64b931aec86a
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r11 b/metadata/md5-cache/sys-libs/glibc-2.25-r11
index f9854d0ba45d..0d7ea1766943 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r11
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r11
@@ -3,7 +3,7 @@ DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap )
 DESCRIPTION=GNU libc6 (also called glibc2) C library
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libc/libc.html
-INHERIT=toolchain-funcs toolchain-glibc
+INHERIT=epatch toolchain-funcs toolchain-glibc
 IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
@@ -12,5 +12,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-15.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	unpacker	517f16af48ee3ab88180dd58b5143213	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-glibc	f4798a5bda9d686857a55100961df8b2
-_md5_=2374a2d139c6b11b3ce96b77f68b43e3
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	unpacker	517f16af48ee3ab88180dd58b5143213	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-glibc	f4798a5bda9d686857a55100961df8b2
+_md5_=464ed9a867f7bdbb9c1c81d6401d8b67
diff --git a/metadata/md5-cache/sys-libs/glibc-2.30-r9 b/metadata/md5-cache/sys-libs/glibc-2.30-r9
index 515214d6455a..6d832681b1c9 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.30-r9
+++ b/metadata/md5-cache/sys-libs/glibc-2.30-r9
@@ -4,7 +4,7 @@ DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit )
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
-INHERIT=python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
+INHERIT=python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs suid systemtap test vanilla
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.30.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.30-patches-10.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz ) https://dev.gentoo.org/~slyfox/distfiles/glibc-2.30-sparc-reg-fix-clobber.patch
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=2254e1bdcc98cef70febedc5c44c8375
+_md5_=bef5febfea3be870d542e474f4f1e21d
diff --git a/metadata/md5-cache/sys-libs/glibc-2.31-r7 b/metadata/md5-cache/sys-libs/glibc-2.31-r7
index 6f50fc824d14..43287c9a176a 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.31-r7
+++ b/metadata/md5-cache/sys-libs/glibc-2.31-r7
@@ -4,7 +4,7 @@ DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit )
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
-INHERIT=python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
+INHERIT=python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.31.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.31-patches-9.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.00.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=484e7ec2517bf0e31b21f66e626177f5
+_md5_=a94678f587acb92c1b5a5af48478b46e
diff --git a/metadata/md5-cache/sys-libs/glibc-2.32-r6 b/metadata/md5-cache/sys-libs/glibc-2.32-r6
index 1913ed2d2d69..048835dccf18 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.32-r6
+++ b/metadata/md5-cache/sys-libs/glibc-2.32-r6
@@ -4,7 +4,7 @@ DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit )
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
-INHERIT=python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
+INHERIT=python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.32.tar.xz https://dev.gentoo.org/~slyfox/distfiles/glibc-2.32-patches-5.tar.xz riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=084e555ff78a5bf3f7d4aa5a7e8207a8
+_md5_=05ba0775f99b44e6b79307e886fde99a
diff --git a/metadata/md5-cache/sys-libs/glibc-2.32-r7 b/metadata/md5-cache/sys-libs/glibc-2.32-r7
index e3f82b56ce18..3f645c4860d3 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.32-r7
+++ b/metadata/md5-cache/sys-libs/glibc-2.32-r7
@@ -4,7 +4,7 @@ DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit )
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
-INHERIT=python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
+INHERIT=python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.32.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.32-patches-6.tar.xz riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=520bae5ab1df01df9cdfda7926c29a02
+_md5_=64b39bdc723802c2794a713720904c85
diff --git a/metadata/md5-cache/sys-libs/glibc-2.32-r8 b/metadata/md5-cache/sys-libs/glibc-2.32-r8
index dcbf99885148..36ec2443ff5b 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.32-r8
+++ b/metadata/md5-cache/sys-libs/glibc-2.32-r8
@@ -4,7 +4,7 @@ DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit )
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
-INHERIT=python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
+INHERIT=python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.32.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.32-patches-8.tar.xz riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=c7a415508b5718496ae3f3c3bd9f35cc
+_md5_=db389bcd07df29cb5651bb87ae4031c3
diff --git a/metadata/md5-cache/sys-libs/glibc-2.33 b/metadata/md5-cache/sys-libs/glibc-2.33
index baccb4424137..e5181d30f83e 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.33
+++ b/metadata/md5-cache/sys-libs/glibc-2.33
@@ -4,7 +4,7 @@ DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit )
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
-INHERIT=python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
+INHERIT=python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.33.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.33-patches-3.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=7ce8229f0b4c9684c5e54ad1a1f11a64
+_md5_=d217013b5d71b0b06f20ecd60ebd8053
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index e58561a10401..d3bc44dcfc36 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -4,7 +4,7 @@ DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit )
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
-INHERIT=python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles git-r3
+INHERIT=python-any-r1 prefix toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles git-r3
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multiprocessing	cac3169468f893670dac3e7cb940e045	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=019a28b832e2d1758c23c90edd69b48c
+_md5_=3693047defe59ee4bc5eec3f11498c5f
diff --git a/metadata/md5-cache/sys-libs/gpm-1.20.7-r2 b/metadata/md5-cache/sys-libs/gpm-1.20.7-r2
index 5d2e6c06228a..c84fe32828b1 100644
--- a/metadata/md5-cache/sys-libs/gpm-1.20.7-r2
+++ b/metadata/md5-cache/sys-libs/gpm-1.20.7-r2
@@ -3,12 +3,12 @@ DEPEND=>=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 DESCRIPTION=Console-based mouse driver
 EAPI=5
 HOMEPAGE=https://www.nico.schottelius.org/software/gpm/
-INHERIT=eutils systemd toolchain-funcs autotools multilib-minimal usr-ldscript
+INHERIT=epatch systemd autotools multilib-minimal usr-ldscript
 IUSE=selinux static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3: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(-)?] selinux? ( sec-policy/selinux-gpm )
 SLOT=0
 SRC_URI=https://www.nico.schottelius.org/software/gpm/archives/gpm-1.20.7.tar.lzma mirror://gentoo/gpm-1.20.7-docs.patch.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=39d910ab9c2cd3f65eb961207e7330e8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=73c6d2c6efdcf3c43bda4f7e447a8791
diff --git a/metadata/md5-cache/sys-libs/libcap-2.43 b/metadata/md5-cache/sys-libs/libcap-2.43
index 27fc79aaa31e..7bd8ce09ab75 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.43
+++ b/metadata/md5-cache/sys-libs/libcap-2.43
@@ -3,7 +3,7 @@ DEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 DESCRIPTION=POSIX 1003.1e capabilities
 EAPI=7
 HOMEPAGE=https://sites.google.com/site/fullycapable/
-INHERIT=multilib multilib-minimal toolchain-funcs pam usr-ldscript
+INHERIT=multilib-minimal toolchain-funcs pam usr-ldscript
 IUSE=pam static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 BSD )
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.43.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=13a73a823cc034acc93c010deeb182e6
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=efbd78b23b61b9177a938048515e40da
diff --git a/metadata/md5-cache/sys-libs/libcap-2.48 b/metadata/md5-cache/sys-libs/libcap-2.48
index 304f0df0bac4..a0b5dfbc6e87 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.48
+++ b/metadata/md5-cache/sys-libs/libcap-2.48
@@ -3,7 +3,7 @@ DEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 DESCRIPTION=POSIX 1003.1e capabilities
 EAPI=7
 HOMEPAGE=https://sites.google.com/site/fullycapable/
-INHERIT=multilib multilib-minimal toolchain-funcs pam usr-ldscript
+INHERIT=multilib-minimal toolchain-funcs pam usr-ldscript
 IUSE=pam static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 BSD )
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.48.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=fc0fa1cb73b19b98c4f82f8d0096f911
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=8cb0879c309d4490b7738cf7730f8d62
diff --git a/metadata/md5-cache/sys-libs/libcap-2.49 b/metadata/md5-cache/sys-libs/libcap-2.49
index 6e4833e9bfb0..d3f0547bc887 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.49
+++ b/metadata/md5-cache/sys-libs/libcap-2.49
@@ -3,7 +3,7 @@ DEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 DESCRIPTION=POSIX 1003.1e capabilities
 EAPI=7
 HOMEPAGE=https://sites.google.com/site/fullycapable/
-INHERIT=multilib multilib-minimal toolchain-funcs pam usr-ldscript
+INHERIT=multilib-minimal toolchain-funcs pam usr-ldscript
 IUSE=pam static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 BSD )
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.49.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=7248b043b5192c13279217c4959b29ba
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	pam	b097695df28f3974e3af860d6704d4f2	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=5a4aa20270ca18efea6b14d8ed10cf34
diff --git a/metadata/md5-cache/sys-libs/libhugetlbfs-2.22 b/metadata/md5-cache/sys-libs/libhugetlbfs-2.22
index 24fc40b651f1..730b21148eeb 100644
--- a/metadata/md5-cache/sys-libs/libhugetlbfs-2.22
+++ b/metadata/md5-cache/sys-libs/libhugetlbfs-2.22
@@ -1,14 +1,14 @@
+BDEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) )
 DEFINED_PHASES=compile install prepare setup test
-DEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) )
-DESCRIPTION=easy hugepage access
+DESCRIPTION=Easy hugepage access
 EAPI=7
 HOMEPAGE=https://github.com/libhugetlbfs/libhugetlbfs
-INHERIT=multilib toolchain-funcs python-any-r1
+INHERIT=toolchain-funcs python-any-r1
 IUSE=static-libs test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86
 LICENSE=GPL-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libhugetlbfs/libhugetlbfs/archive/2.22.tar.gz -> libhugetlbfs-2.22.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=f70f018fc0388dbd72b28b8aea1215ce
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=557fa3a7a5f2fa957e7f03d27b836997
diff --git a/metadata/md5-cache/sys-libs/libhugetlbfs-2.23 b/metadata/md5-cache/sys-libs/libhugetlbfs-2.23
index ef542adf168d..aa39c2763673 100644
--- a/metadata/md5-cache/sys-libs/libhugetlbfs-2.23
+++ b/metadata/md5-cache/sys-libs/libhugetlbfs-2.23
@@ -1,14 +1,14 @@
+BDEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) )
 DEFINED_PHASES=compile install prepare setup test
-DEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) )
-DESCRIPTION=easy hugepage access
+DESCRIPTION=Easy hugepage access
 EAPI=7
 HOMEPAGE=https://github.com/libhugetlbfs/libhugetlbfs
-INHERIT=multilib toolchain-funcs python-any-r1
+INHERIT=toolchain-funcs python-any-r1
 IUSE=static-libs test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86
 LICENSE=GPL-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libhugetlbfs/libhugetlbfs/archive/2.23.tar.gz -> libhugetlbfs-2.23.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
-_md5_=d1f5faffd5481fa882f5c8370610cfaf
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=8a9a2048dedc62abb1620ca9f9bdac8e
diff --git a/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r2 b/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r2
index ce62e33049ba..ade76a8ef9d8 100644
--- a/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r2
+++ b/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r2
@@ -3,11 +3,11 @@ DEPEND=sys-devel/bison >=app-portage/elt-patches-20170815
 DESCRIPTION=Compatibility package for binaries linked against a pre gcc 3.4 libstdc++
 EAPI=6
 HOMEPAGE=https://gcc.gnu.org/libstdc++/
-INHERIT=eutils flag-o-matic libtool multilib
+INHERIT=epatch flag-o-matic libtool multilib
 IUSE=multilib nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=5
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.10.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	libtool	f143db5a74ccd9ca28c1234deffede96
-_md5_=12285f6281a68f303e8626f04da82c91
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	libtool	f143db5a74ccd9ca28c1234deffede96
+_md5_=e21dcd7ca69ded3e578dc4e702933575
diff --git a/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r4 b/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r4
index 6a03a8509cce..8695ba2884ed 100644
--- a/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r4
+++ b/metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r4
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Compatibility package for old termcap-based programs
 EAPI=5
 HOMEPAGE=http://www.catb.org/~esr/terminfo/
-INHERIT=eutils multilib toolchain-funcs multilib-minimal
+INHERIT=epatch multilib toolchain-funcs multilib-minimal
 IUSE=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 ~hppa ppc sparc x86
 LICENSE=GPL-2 LGPL-2 BSD
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/terminfo/termtypes.tc.gz mirror://gentoo/termcap-2.0.8.tar.bz2 mirror://gentoo/termcap-2.0.8-patches-2.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
-_md5_=0b9cfb7f40e88137a241e6c434ee9115
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566
+_md5_=32c334e23f14483f3ede3078de3d022e
diff --git a/metadata/md5-cache/sys-libs/libutempter-1.1.6-r3 b/metadata/md5-cache/sys-libs/libutempter-1.1.6-r3
index b5c719283e1e..c1a532e2391e 100644
--- a/metadata/md5-cache/sys-libs/libutempter-1.1.6-r3
+++ b/metadata/md5-cache/sys-libs/libutempter-1.1.6-r3
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst prepare
 DESCRIPTION=Library that allows non-privileged apps to write utmp (login) info
 EAPI=7
 HOMEPAGE=https://altlinux.org/index.php?module=sisyphus&package=libutempter
-INHERIT=multilib flag-o-matic toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=static-libs elibc_FreeBSD
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=!sys-apps/utempter acct-group/utmp
 SLOT=0
 SRC_URI=ftp://ftp.altlinux.org/pub/people/ldv/libutempter/libutempter-1.1.6.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=44010d08f496236d77c3d59e3013c5ca
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=6afd20283eb75cedc5bcc373b67deae9
diff --git a/metadata/md5-cache/sys-libs/libutempter-1.2.0 b/metadata/md5-cache/sys-libs/libutempter-1.2.0
index e3b74788567f..71a9981819ce 100644
--- a/metadata/md5-cache/sys-libs/libutempter-1.2.0
+++ b/metadata/md5-cache/sys-libs/libutempter-1.2.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst prepare
 DESCRIPTION=Library that allows non-privileged apps to write utmp (login) info
 EAPI=7
 HOMEPAGE=https://altlinux.org/index.php?module=sisyphus&package=libutempter
-INHERIT=multilib flag-o-matic toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=static-libs elibc_FreeBSD
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=!sys-apps/utempter acct-group/utmp
 SLOT=0
 SRC_URI=ftp://ftp.altlinux.org/pub/people/ldv/libutempter/libutempter-1.2.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=8b74f851b045341552a89f1f78f387f3
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=9bbc6f4a1be62872bbdfd3416186fe8d
diff --git a/metadata/md5-cache/sys-libs/libutempter-1.2.1 b/metadata/md5-cache/sys-libs/libutempter-1.2.1
index bfe591a7460b..29d04a4ef593 100644
--- a/metadata/md5-cache/sys-libs/libutempter-1.2.1
+++ b/metadata/md5-cache/sys-libs/libutempter-1.2.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst prepare
 DESCRIPTION=Library that allows non-privileged apps to write utmp (login) info
 EAPI=7
 HOMEPAGE=https://altlinux.org/index.php?module=sisyphus&package=libutempter
-INHERIT=multilib flag-o-matic toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=static-libs elibc_FreeBSD
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=!sys-apps/utempter acct-group/utmp
 SLOT=0
 SRC_URI=ftp://ftp.altlinux.org/pub/people/ldv/libutempter/libutempter-1.2.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=06bd2a09f134159ebfbba7340d627711
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=c468d6b98a3c44161455d89de0de966e
diff --git a/metadata/md5-cache/sys-libs/musl-1.2.1-r2 b/metadata/md5-cache/sys-libs/musl-1.2.1-r2
index 447df383020b..29e8b3bab9dd 100644
--- a/metadata/md5-cache/sys-libs/musl-1.2.1-r2
+++ b/metadata/md5-cache/sys-libs/musl-1.2.1-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst setup
 DESCRIPTION=Light, fast and simple C library focused on standards-conformance and safety
 EAPI=7
 HOMEPAGE=http://www.musl-libc.org/
-INHERIT=eutils flag-o-matic multilib toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=headers-only
 KEYWORDS=-* amd64 arm arm64 ~mips ppc ppc64 x86
 LICENSE=MIT LGPL-2 GPL-2
 SLOT=0
 SRC_URI=http://www.musl-libc.org/releases/musl-1.2.1.tar.gz https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://dev.gentoo.org/~blueness/musl-misc/getent.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=92ac4e1c68d5cb0d219242c9ae9dd142
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=60da85843d21be744de72f4ec528d1b2
diff --git a/metadata/md5-cache/sys-libs/musl-1.2.2-r2 b/metadata/md5-cache/sys-libs/musl-1.2.2-r2
index 02437300e1c8..b557a3073f4a 100644
--- a/metadata/md5-cache/sys-libs/musl-1.2.2-r2
+++ b/metadata/md5-cache/sys-libs/musl-1.2.2-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst setup unpack
 DESCRIPTION=Light, fast and simple C library focused on standards-conformance and safety
 EAPI=7
 HOMEPAGE=http://www.musl-libc.org/
-INHERIT=eutils flag-o-matic multilib toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=headers-only
 KEYWORDS=-* amd64 arm arm64 ~mips ppc ppc64 x86
 LICENSE=MIT LGPL-2 GPL-2
 SLOT=0
 SRC_URI=http://www.musl-libc.org/releases/musl-1.2.2.tar.gz https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://gitlab.alpinelinux.org/alpine/aports/-/raw/93a08815f8598db442d8b766b463d0150ed8e2ab/main/musl/getent.c -> musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
-_md5_=83953a9b644ab0e00bc6af76480ef004
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=cd99d7e6dad5300fd8631555728e872e
diff --git a/metadata/md5-cache/sys-libs/musl-9999 b/metadata/md5-cache/sys-libs/musl-9999
index 007d3c3cc12e..b9913a2257c7 100644
--- a/metadata/md5-cache/sys-libs/musl-9999
+++ b/metadata/md5-cache/sys-libs/musl-9999
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install postinst setup unpack
 DESCRIPTION=Light, fast and simple C library focused on standards-conformance and safety
 EAPI=7
 HOMEPAGE=http://www.musl-libc.org/
-INHERIT=eutils flag-o-matic multilib toolchain-funcs git-r3
+INHERIT=flag-o-matic toolchain-funcs git-r3
 IUSE=headers-only
 LICENSE=MIT LGPL-2 GPL-2
 PROPERTIES=live
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://gitlab.alpinelinux.org/alpine/aports/-/raw/93a08815f8598db442d8b766b463d0150ed8e2ab/main/musl/getent.c -> musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=8695db72c7e9a257e4e8c332ec24831f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=8877e2e8d3586f6fa64f873c7a0dc4e0
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.2-r1 b/metadata/md5-cache/sys-libs/ncurses-6.2-r1
index 594e6307e7e8..dcf8e3161cdc 100644
--- a/metadata/md5-cache/sys-libs/ncurses-6.2-r1
+++ b/metadata/md5-cache/sys-libs/ncurses-6.2-r1
@@ -3,7 +3,7 @@ DEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 DESCRIPTION=console display library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/
-INHERIT=flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
+INHERIT=toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript
 IUSE=ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 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=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://gnu/ncurses/ncurses-6.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=e5d9390a7bfdc91eabbec68ac198159f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=35fd189f29f6a682750248e454255fd7
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.2_p20210123 b/metadata/md5-cache/sys-libs/ncurses-6.2_p20210123
index 8beedb787909..14b23a5e33ba 100644
--- a/metadata/md5-cache/sys-libs/ncurses-6.2_p20210123
+++ b/metadata/md5-cache/sys-libs/ncurses-6.2_p20210123
@@ -3,7 +3,7 @@ DEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 DESCRIPTION=console display library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/
-INHERIT=flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
+INHERIT=toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript
 IUSE=ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 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=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://gnu/ncurses/ncurses-6.2.tar.gz https://dev.gentoo.org/~polynomial-c/dist/ncurses-6.2_p20210123.patch.xz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=78fd5f25e29e04fbbf2af324e8a9b452
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=2245cc2f1cf287a2a5e98e4068f28df6
diff --git a/metadata/md5-cache/sys-libs/pwdb-0.62-r1 b/metadata/md5-cache/sys-libs/pwdb-0.62-r1
index 7de11fffc450..3be57e6e0f85 100644
--- a/metadata/md5-cache/sys-libs/pwdb-0.62-r1
+++ b/metadata/md5-cache/sys-libs/pwdb-0.62-r1
@@ -3,7 +3,7 @@ DEPEND=selinux? ( sys-libs/libselinux ) net-libs/libnsl:0= net-libs/libtirpc
 DESCRIPTION=Password database
 EAPI=5
 HOMEPAGE=https://packages.gentoo.org/package/sys-libs/pwdb
-INHERIT=eutils toolchain-funcs flag-o-matic usr-ldscript
+INHERIT=epatch toolchain-funcs flag-o-matic usr-ldscript
 IUSE=selinux split-usr
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=|| ( BSD GPL-2 )
@@ -11,5 +11,5 @@ RDEPEND=selinux? ( sys-libs/libselinux ) net-libs/libnsl:0= net-libs/libtirpc
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/pwdb-0.62.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=7d94a5ec1cb6fcfac33aa36238eaa7df
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
+_md5_=ce456341ecd4ac56ed73ac96f5a51fed
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.11-r3 b/metadata/md5-cache/sys-libs/zlib-1.2.11-r3
index 95b34a44f37e..dd641249b542 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.11-r3
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.11-r3
@@ -4,7 +4,7 @@ DEPEND=!<dev-libs/libxml2-2.7.7
 DESCRIPTION=Standard (de)compression library
 EAPI=7
 HOMEPAGE=https://zlib.net/
-INHERIT=autotools toolchain-funcs multilib multilib-minimal usr-ldscript
+INHERIT=autotools multilib-minimal usr-ldscript
 IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 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 ~x86-winnt
 LICENSE=ZLIB
@@ -12,4 +12,4 @@ RDEPEND=!<dev-libs/libxml2-2.7.7
 SLOT=0/1
 SRC_URI=https://zlib.net/zlib-1.2.11.tar.gz http://www.gzip.org/zlib/zlib-1.2.11.tar.gz http://www.zlib.net/current/beta/zlib-1.2.11.tar.gz elibc_Cygwin? ( https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> zlib-1.2.11-cygwin-gzopen_w.patch https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> zlib-1.2.7-cygwin-minizip.patch )
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=aa2ce66a904152130931cc83dad2c32e
+_md5_=9ca0c2015d2536dd493dc4b7cde261cc
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.11-r4 b/metadata/md5-cache/sys-libs/zlib-1.2.11-r4
index 888d3bde630c..25023c4fc968 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.11-r4
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.11-r4
@@ -4,7 +4,7 @@ DEPEND=!<dev-libs/libxml2-2.7.7 !sys-libs/zlib-ng[compat]
 DESCRIPTION=Standard (de)compression library
 EAPI=7
 HOMEPAGE=https://zlib.net/
-INHERIT=autotools toolchain-funcs multilib multilib-minimal usr-ldscript
+INHERIT=autotools multilib-minimal usr-ldscript
 IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 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 ~x86-winnt
 LICENSE=ZLIB
@@ -12,4 +12,4 @@ RDEPEND=!<dev-libs/libxml2-2.7.7 !sys-libs/zlib-ng[compat]
 SLOT=0/1
 SRC_URI=https://zlib.net/zlib-1.2.11.tar.gz http://www.gzip.org/zlib/zlib-1.2.11.tar.gz http://www.zlib.net/current/beta/zlib-1.2.11.tar.gz elibc_Cygwin? ( https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> zlib-1.2.11-cygwin-gzopen_w.patch https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> zlib-1.2.7-cygwin-minizip.patch )
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=e152bd2a66ef3fd36fa01a29bd26b2ca
+_md5_=e98512e9edba25e88c7cc30dd9549e22
diff --git a/metadata/md5-cache/sys-power/iasl-20200326 b/metadata/md5-cache/sys-power/iasl-20200326
index 3d6555d6bde6..618de61aaa65 100644
--- a/metadata/md5-cache/sys-power/iasl-20200326
+++ b/metadata/md5-cache/sys-power/iasl-20200326
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Intel ACPI Source Language (ASL) compiler
 EAPI=7
 HOMEPAGE=https://www.acpica.org/downloads/
+INHERIT=edos2unix toolchain-funcs
 IUSE=test
 KEYWORDS=amd64 ~arm64 ppc ~ppc64 x86
 LICENSE=iASL
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.acpica.org/sites/acpica/files/acpica-unix-20200326.tar.gz test? ( http://www.acpica.org/sites/acpica/files/acpitests-unix-20200326.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2d0dd01ee0f3fbb17ff59b4a3395ef65
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=066ca089120ce633676b605fd27efa9e
diff --git a/metadata/md5-cache/sys-power/iasl-20200717 b/metadata/md5-cache/sys-power/iasl-20200717
index b175614400a3..642d17b439d4 100644
--- a/metadata/md5-cache/sys-power/iasl-20200717
+++ b/metadata/md5-cache/sys-power/iasl-20200717
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Intel ACPI Source Language (ASL) compiler
 EAPI=7
 HOMEPAGE=https://www.acpica.org/downloads/
+INHERIT=edos2unix toolchain-funcs
 IUSE=test
 KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=iASL
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.acpica.org/sites/acpica/files/acpica-unix-20200717.tar.gz test? ( http://www.acpica.org/sites/acpica/files/acpitests-unix-20200717.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b746e587861f29dd55e0b70f002f9998
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=8ea5f003ea1d87a9d70ec5c98e7e1f31
diff --git a/metadata/md5-cache/sys-process/latencytop-0.5-r1 b/metadata/md5-cache/sys-process/latencytop-0.5-r1
index 81d6ff9d891e..baccb57c44d3 100644
--- a/metadata/md5-cache/sys-process/latencytop-0.5-r1
+++ b/metadata/md5-cache/sys-process/latencytop-0.5-r1
@@ -3,12 +3,12 @@ DEPEND=dev-libs/glib:2 gtk? ( x11-libs/gtk+:2 ) sys-libs/ncurses:0= virtual/pkgc
 DESCRIPTION=tool for identifying where in the system latency is happening
 EAPI=5
 HOMEPAGE=http://git.infradead.org/latencytop.git
-INHERIT=eutils linux-info
+INHERIT=epatch linux-info
 IUSE=gtk kernel_linux
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gtk? ( x11-libs/gtk+:2 ) sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gentoo/latencytop-0.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=545b0c5cfe66e1191c92b7ea671cb46b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=be3c2cd9ef4098d5f821c174e5eadce5
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 34d00b6fcd27..17f2cab33cc2 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -17800,7 +17800,7 @@ sys-libs/libchipcard 5.1.5_rc2: Library for accessing chip cards via chip card r
 sys-libs/libcxx 10.0.1 11.0.0 11.0.1 11.1.0 12.0.0 12.0.0.9999 13.0.0.9999: New implementation of the C++ standard library, targeting C++11
 sys-libs/libcxxabi 10.0.1 11.0.0 11.0.1 11.1.0 12.0.0 12.0.0.9999 13.0.0.9999: Low level support for a standard C++ library
 sys-libs/libfaketime 0.9.6-r2 0.9.7 0.9.8 0.9.9: Report faked system time to programs
-sys-libs/libhugetlbfs 2.22 2.23: easy hugepage access
+sys-libs/libhugetlbfs 2.22 2.23: Easy hugepage access
 sys-libs/libhx 3.24-r1 3.25: Platform independent library providing basic system functions
 sys-libs/libieee1284 0.2.11-r8: Library to query devices using IEEE1284
 sys-libs/libixp 0.5_p20110208-r3: A stand-alone client/server 9P library including ixpc client
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 29797a3fdd61..69d7091f942c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Apr 2021 19:05:18 +0000
+Wed, 21 Apr 2021 19:20:17 +0000