2021-03-21 15:37:56 UTC

114 files changed, 220 insertions, 114 deletions

diff --git a/metadata/md5-cache/net-misc/arpd-0.2-r1 b/metadata/md5-cache/net-misc/arpd-0.2-r1
index a3e59bfbb129..41e622b97de3 100644
--- a/metadata/md5-cache/net-misc/arpd-0.2-r1
+++ b/metadata/md5-cache/net-misc/arpd-0.2-r1
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/libdnet-1.4 >=dev-libs/libevent-0.6 net-libs/libpcap !sys-apps
 DESCRIPTION=ARP server claiming all unassigned addresses (for network monitoring/simulation)
 EAPI=6
 HOMEPAGE=http://www.citi.umich.edu/u/provos/honeyd/
+INHERIT=autotools
 KEYWORDS=amd64 ~hppa ppc ~ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/libdnet-1.4 >=dev-libs/libevent-0.6 net-libs/libpcap !sys-apps/iproute2
 SLOT=0
 SRC_URI=http://www.citi.umich.edu/u/provos/honeyd/arpd-0.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=ffadd96de8ba00c14b5ee17d1e11f614
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.1-r2 b/metadata/md5-cache/net-misc/asterisk-13.38.1-r2
index 3025f5fa9c8f..62ebecf15119 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.38.1-r2
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.1-r2
@@ -12,5 +12,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0/13
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=8e8593c676c217aad2e80bf558b33265
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.2 b/metadata/md5-cache/net-misc/asterisk-13.38.2
index a77513821d7d..03282cd6155a 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.38.2
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.2
@@ -12,5 +12,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0/13
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=6328b70429a13f2eceea81c10f4d65bb
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.2-r1 b/metadata/md5-cache/net-misc/asterisk-13.38.2-r1
index 94ac811a5309..c423a1376a18 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.38.2-r1
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.2-r1
@@ -12,5 +12,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0/13
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=1f599577d1d07c53ae87ffcd3a39cdc4
diff --git a/metadata/md5-cache/net-misc/asterisk-16.16.2 b/metadata/md5-cache/net-misc/asterisk-16.16.2
index 3c1bb7a61f83..12511138136d 100644
--- a/metadata/md5-cache/net-misc/asterisk-16.16.2
+++ b/metadata/md5-cache/net-misc/asterisk-16.16.2
@@ -12,5 +12,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=d
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0/16
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.16.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=164d62bb7731371b24a2730c6205a67c
diff --git a/metadata/md5-cache/net-misc/asterisk-16.16.2-r1 b/metadata/md5-cache/net-misc/asterisk-16.16.2-r1
index 48075713a6e5..c819e82ff07e 100644
--- a/metadata/md5-cache/net-misc/asterisk-16.16.2-r1
+++ b/metadata/md5-cache/net-misc/asterisk-16.16.2-r1
@@ -12,5 +12,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=d
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0/16
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.16.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=bec42aa387b626b825dcf369f95f405f
diff --git a/metadata/md5-cache/net-misc/asterisk-18.2.2 b/metadata/md5-cache/net-misc/asterisk-18.2.2
index 97bd66789a94..5f4b9dde7c5b 100644
--- a/metadata/md5-cache/net-misc/asterisk-18.2.2
+++ b/metadata/md5-cache/net-misc/asterisk-18.2.2
@@ -12,5 +12,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=d
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) voicemail_storage_odbc? ( odbc )
 SLOT=0/18
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-18.2.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=7d72d946c6be88410841b78e9f48746f
diff --git a/metadata/md5-cache/net-misc/autoupnp-9999 b/metadata/md5-cache/net-misc/autoupnp-9999
index 7471daa9db51..790b4eebfe5f 100644
--- a/metadata/md5-cache/net-misc/autoupnp-9999
+++ b/metadata/md5-cache/net-misc/autoupnp-9999
@@ -4,10 +4,11 @@ DEPEND=net-libs/miniupnpc:0= libnotify? ( x11-libs/libtinynotify:0= )
 DESCRIPTION=Automatic open port forwarder using UPnP
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/autoupnp/
+INHERIT=autotools git-r3
 IUSE=libnotify
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=net-libs/miniupnpc:0= libnotify? ( x11-libs/libtinynotify:0= )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=2242114e86534818d89cebafdc79329f
diff --git a/metadata/md5-cache/net-misc/axel-2.17.10 b/metadata/md5-cache/net-misc/axel-2.17.10
index c04abb878f82..cec0e9914fe8 100644
--- a/metadata/md5-cache/net-misc/axel-2.17.10
+++ b/metadata/md5-cache/net-misc/axel-2.17.10
@@ -4,11 +4,12 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0
 DESCRIPTION=Light Unix download accelerator
 EAPI=7
 HOMEPAGE=https://github.com/axel-download-accelerator/axel
+INHERIT=autotools
 IUSE=debug libressl nls ssl
 KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
 SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.10/axel-2.17.10.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=5ab81de6484a550047a3af789987cc75
diff --git a/metadata/md5-cache/net-misc/axel-2.17.8 b/metadata/md5-cache/net-misc/axel-2.17.8
index ac914b7193ad..4357e0776eb8 100644
--- a/metadata/md5-cache/net-misc/axel-2.17.8
+++ b/metadata/md5-cache/net-misc/axel-2.17.8
@@ -4,11 +4,12 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0
 DESCRIPTION=Light Unix download accelerator
 EAPI=7
 HOMEPAGE=https://github.com/axel-download-accelerator/axel
+INHERIT=autotools
 IUSE=debug libressl nls ssl
 KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
 SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.8/axel-2.17.8.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=6967dd44b71dd475dbe2266a9bb4076e
diff --git a/metadata/md5-cache/net-misc/axel-2.17.9 b/metadata/md5-cache/net-misc/axel-2.17.9
index 51fb933fcc07..ec113a521685 100644
--- a/metadata/md5-cache/net-misc/axel-2.17.9
+++ b/metadata/md5-cache/net-misc/axel-2.17.9
@@ -4,11 +4,12 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0
 DESCRIPTION=Light Unix download accelerator
 EAPI=7
 HOMEPAGE=https://github.com/axel-download-accelerator/axel
+INHERIT=autotools
 IUSE=debug libressl nls ssl
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
 SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.9/axel-2.17.9.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=f5c212fc20084956caf9bf165529c56c
diff --git a/metadata/md5-cache/net-misc/bgpq3-0.1.33 b/metadata/md5-cache/net-misc/bgpq3-0.1.33
index d457fdc647be..2dcaddc8fa7e 100644
--- a/metadata/md5-cache/net-misc/bgpq3-0.1.33
+++ b/metadata/md5-cache/net-misc/bgpq3-0.1.33
@@ -3,9 +3,10 @@ DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.
 DESCRIPTION=Generate access-lists for Cisco/Juniper routers, successor of bgpq
 EAPI=6
 HOMEPAGE=https://github.com/snar/bgpq3/
+INHERIT=autotools eutils
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/snar/bgpq3/archive/v0.1.33.tar.gz -> bgpq3-0.1.33.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=c6e78f896c969f95b12a89d4f8c79a06
diff --git a/metadata/md5-cache/net-misc/bgpq3-0.1.35 b/metadata/md5-cache/net-misc/bgpq3-0.1.35
index adb53c50a2e0..9b78490d475d 100644
--- a/metadata/md5-cache/net-misc/bgpq3-0.1.35
+++ b/metadata/md5-cache/net-misc/bgpq3-0.1.35
@@ -3,9 +3,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Generate access-lists for Cisco/Juniper routers, successor of bgpq
 EAPI=7
 HOMEPAGE=https://github.com/snar/bgpq3/
+INHERIT=autotools eutils
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/snar/bgpq3/archive/v0.1.35.tar.gz -> bgpq3-0.1.35.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=74f7a5aab4364882ae21e5e91fa41d01
diff --git a/metadata/md5-cache/net-misc/bopm-3.1.3-r4 b/metadata/md5-cache/net-misc/bopm-3.1.3-r4
index c022a41247dd..509e7f638c13 100644
--- a/metadata/md5-cache/net-misc/bopm-3.1.3-r4
+++ b/metadata/md5-cache/net-misc/bopm-3.1.3-r4
@@ -3,9 +3,10 @@ DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.
 DESCRIPTION=Blitzed Open Proxy Monitor
 EAPI=6
 HOMEPAGE=https://github.com/blitzed-org/bopm
+INHERIT=autotools user
 KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://static.blitzed.org/www.blitzed.org/bopm/files/bopm-3.1.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8
 _md5_=961e0fb8047978f5026b0944ce5c83c8
diff --git a/metadata/md5-cache/net-misc/bridge-utils-1.6 b/metadata/md5-cache/net-misc/bridge-utils-1.6
index 97e904db6873..e6149a5bc0de 100644
--- a/metadata/md5-cache/net-misc/bridge-utils-1.6
+++ b/metadata/md5-cache/net-misc/bridge-utils-1.6
@@ -3,11 +3,12 @@ DEPEND=virtual/os-headers >=app-portage/elt-patches-20170815 || ( >=sys-devel/au
 DESCRIPTION=Tools for configuring the Linux kernel 802.1d Ethernet Bridge
 EAPI=6
 HOMEPAGE=http://bridge.sourceforge.net/
+INHERIT=autotools linux-info toolchain-funcs
 IUSE=selinux kernel_linux
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-brctl )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-1.6.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955
 _md5_=0d0908e80c77b7befbc566e2365415e2
diff --git a/metadata/md5-cache/net-misc/cadaver-0.23.3 b/metadata/md5-cache/net-misc/cadaver-0.23.3
index 1b8f8ec04872..1bebc3875437 100644
--- a/metadata/md5-cache/net-misc/cadaver-0.23.3
+++ b/metadata/md5-cache/net-misc/cadaver-0.23.3
@@ -3,11 +3,12 @@ DEPEND=>=net-libs/neon-0.27.0 sys-devel/gettext >=app-portage/elt-patches-201708
 DESCRIPTION=Command-line WebDAV client
 EAPI=6
 HOMEPAGE=http://webdav.org/cadaver/
+INHERIT=autotools
 IUSE=nls
 KEYWORDS=~amd64 ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/neon-0.27.0
 SLOT=0
 SRC_URI=http://webdav.org/cadaver/cadaver-0.23.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=fccba14b558a5d0133479e106cf545ab
diff --git a/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.20-r2 b/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.20-r2
index 74eb04621385..a8b430da6afd 100644
--- a/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.20-r2
+++ b/metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.20-r2
@@ -3,10 +3,11 @@ DEPEND=app-shells/bash:0 media-libs/tiff:0 net-libs/libcapi sys-libs/zlib virtua
 DESCRIPTION=capi4hylafax adds a faxcapi modem to the hylafax enviroment
 EAPI=6
 HOMEPAGE=https://packages.qa.debian.org/c/capi4hylafax.html
+INHERIT=autotools epatch optfeature versionator
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=app-shells/bash:0 media-libs/tiff:0 net-libs/libcapi sys-libs/zlib virtual/jpeg:0 dev-util/dialog
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/capi4hylafax/capi4hylafax_01.03.00.99.svn.300.orig.tar.gz mirror://debian/pool/main/c/capi4hylafax/capi4hylafax_01.03.00.99.svn.300-20.debian.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	optfeature	6a2add34e06e5a05d88471a33ccdd73e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=ea235b5c39591eff1f07091dec3f5801
diff --git a/metadata/md5-cache/net-misc/cfengine-3.6.2 b/metadata/md5-cache/net-misc/cfengine-3.6.2
index 503ba9685043..95ae9794933c 100644
--- a/metadata/md5-cache/net-misc/cfengine-3.6.2
+++ b/metadata/md5-cache/net-misc/cfengine-3.6.2
@@ -3,6 +3,7 @@ DEPEND=acl? ( virtual/acl ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgres
 DESCRIPTION=An automated suite of programs for configuring and maintaining Unix-like computers
 EAPI=5
 HOMEPAGE=http://www.cfengine.org/
+INHERIT=eutils autotools flag-o-matic
 IUSE=acl examples libvirt mysql masterfiles postgres +qdbm selinux tokyocabinet vim-syntax xml
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=acl? ( virtual/acl ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgre
 REQUIRED_USE=^^ ( qdbm tokyocabinet )
 SLOT=3
 SRC_URI=http://cfengine.package-repos.s3.amazonaws.com/tarballs/cfengine-3.6.2.tar.gz -> cfengine-3.6.2.tar.gz masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-3.6.2.tar.gz -> cfengine-masterfiles-3.6.2.tar.gz )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=350c9d0dc3f19eff5bf7192830b2a57e
diff --git a/metadata/md5-cache/net-misc/connman-1.39 b/metadata/md5-cache/net-misc/connman-1.39
index 16c203fba6c6..a99e64eec92a 100644
--- a/metadata/md5-cache/net-misc/connman-1.39
+++ b/metadata/md5-cache/net-misc/connman-1.39
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 sys-libs/readline:0= bluetoot
 DESCRIPTION=Provides a daemon for managing internet connections
 EAPI=7
 HOMEPAGE=https://01.org/connman
+INHERIT=autotools systemd tmpfiles
 IUSE=bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager +nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard wispr
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 sys-libs/readline:0= bluetoo
 REQUIRED_USE=^^ ( iptables nftables )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/connman/connman-1.39.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=8b9d3e2fb2097ee15b608f6423efdd81
diff --git a/metadata/md5-cache/net-misc/connman-1.39-r1 b/metadata/md5-cache/net-misc/connman-1.39-r1
index e0586f14229e..cb457299f426 100644
--- a/metadata/md5-cache/net-misc/connman-1.39-r1
+++ b/metadata/md5-cache/net-misc/connman-1.39-r1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 sys-libs/readline:0= bluetoot
 DESCRIPTION=Provides a daemon for managing internet connections
 EAPI=7
 HOMEPAGE=https://01.org/connman
+INHERIT=autotools systemd tmpfiles
 IUSE=bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager +nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard wispr
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 sys-libs/readline:0= bluetoo
 REQUIRED_USE=^^ ( iptables nftables )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/connman/connman-1.39.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=effbfb25fffad7154ba90b86a984acf1
diff --git a/metadata/md5-cache/net-misc/connman-9999 b/metadata/md5-cache/net-misc/connman-9999
index b3f345071d08..ad313bc838c8 100644
--- a/metadata/md5-cache/net-misc/connman-9999
+++ b/metadata/md5-cache/net-misc/connman-9999
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 sys-libs/readline:0= bluetoot
 DESCRIPTION=Provides a daemon for managing internet connections
 EAPI=7
 HOMEPAGE=https://01.org/connman
+INHERIT=autotools systemd tmpfiles git-r3
 IUSE=bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager +nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard wispr
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 sys-libs/readline:0= bluetooth? ( net-wireless/bluez ) iptables? ( >=net-firewall/iptables-1.4.8 ) iwd? ( net-wireless/iwd ) l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4:0= >=net-libs/libmnl-1.0.0:0= ) ofono? ( net-misc/ofono ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wireguard? ( >=net-libs/libmnl-1.0.0:0= ) wispr? ( net-libs/gnutls ) virtual/tmpfiles
 REQUIRED_USE=^^ ( iptables nftables )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=4bd5b982dd32ba7d4734c50127a32b9f
diff --git a/metadata/md5-cache/net-misc/connman-gtk-1.1.1 b/metadata/md5-cache/net-misc/connman-gtk-1.1.1
index ff948a8de893..33b15a4c182e 100644
--- a/metadata/md5-cache/net-misc/connman-gtk-1.1.1
+++ b/metadata/md5-cache/net-misc/connman-gtk-1.1.1
@@ -3,11 +3,12 @@ DEPEND=>=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig >=app-port
 DESCRIPTION=GTK GUI for Connman
 EAPI=6
 HOMEPAGE=https://github.com/jgke/connman-gtk
+INHERIT=autotools gnome2-utils
 IUSE=openconnect
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.0:2 >=x11-libs/gtk+-3.10:3 openconnect? ( >=net-vpn/openconnect-5.99 ) net-misc/connman
 SLOT=0
 SRC_URI=https://github.com/jgke/connman-gtk/archive/v1.1.1.tar.gz -> connman-gtk-1.1.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
 _md5_=925e851793f5f501e7d8ee490cdfd3b3
diff --git a/metadata/md5-cache/net-misc/connman-gtk-1.1.1-r1 b/metadata/md5-cache/net-misc/connman-gtk-1.1.1-r1
index 25de6cdd06e9..3b9c6c8126df 100644
--- a/metadata/md5-cache/net-misc/connman-gtk-1.1.1-r1
+++ b/metadata/md5-cache/net-misc/connman-gtk-1.1.1-r1
@@ -4,11 +4,12 @@ DEPEND=>=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=GTK GUI for Connman
 EAPI=7
 HOMEPAGE=https://github.com/jgke/connman-gtk
+INHERIT=autotools gnome2-utils
 IUSE=openconnect
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.0:2 >=x11-libs/gtk+-3.10:3 openconnect? ( >=net-vpn/openconnect-5.99 ) net-misc/connman
 SLOT=0
 SRC_URI=https://github.com/jgke/connman-gtk/archive/v1.1.1.tar.gz -> connman-gtk-1.1.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
 _md5_=2141b34b9c0d35d043ccf6f0edc4f4c2
diff --git a/metadata/md5-cache/net-misc/connman-json-client-1.0_p20150721-r2 b/metadata/md5-cache/net-misc/connman-json-client-1.0_p20150721-r2
index 3977914ad0a9..d64d2bd41c4a 100644
--- a/metadata/md5-cache/net-misc/connman-json-client-1.0_p20150721-r2
+++ b/metadata/md5-cache/net-misc/connman-json-client-1.0_p20150721-r2
@@ -3,10 +3,11 @@ DEPEND=dev-libs/json-c:0= >=sys-apps/dbus-1.4 sys-libs/ncurses:0 >=app-portage/e
 DESCRIPTION=An ncurses UI for connman
 EAPI=6
 HOMEPAGE=https://github.com/eurogiciel-oss/connman-json-client
+INHERIT=autotools vcs-snapshot
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/json-c:0= >=sys-apps/dbus-1.4 sys-libs/ncurses:0
 SLOT=0
 SRC_URI=https://github.com/eurogiciel-oss/connman-json-client/archive/3c34b2ee62d2e188090d20e7ed2fd94bab9c47f2.tar.gz -> connman-json-client-1.0_p20150721.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=dad5970aa8c9ed835be618fea95823e5
diff --git a/metadata/md5-cache/net-misc/connman-ui-0_p20150622 b/metadata/md5-cache/net-misc/connman-ui-0_p20150622
index c12eab8a2ecd..387f43117635 100644
--- a/metadata/md5-cache/net-misc/connman-ui-0_p20150622
+++ b/metadata/md5-cache/net-misc/connman-ui-0_p20150622
@@ -3,10 +3,11 @@ DEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/gtk+:3 dev-util/intltool virtual/p
 DESCRIPTION=A full-featured GTK based trayicon UI for ConnMan
 EAPI=6
 HOMEPAGE=https://github.com/tbursztyka/connman-ui
+INHERIT=autotools vcs-snapshot
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/gtk+:3 net-misc/connman
 SLOT=0
 SRC_URI=https://github.com/tbursztyka/connman-ui/archive/fce0af94e121bde77c7fa2ebd6a319f0180c5516.tar.gz -> connman-ui-0_p20150622.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=ff8752d1ecdaf1f1a8c9095acbd5bc90
diff --git a/metadata/md5-cache/net-misc/connman-ui-9999 b/metadata/md5-cache/net-misc/connman-ui-9999
index e482158c69cb..85cf6ac546ee 100644
--- a/metadata/md5-cache/net-misc/connman-ui-9999
+++ b/metadata/md5-cache/net-misc/connman-ui-9999
@@ -3,9 +3,10 @@ DEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/gtk+:3 dev-util/intltool virtual/p
 DESCRIPTION=A full-featured GTK based trayicon UI for ConnMan
 EAPI=6
 HOMEPAGE=https://github.com/tbursztyka/connman-ui
+INHERIT=autotools git-r3
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/gtk+:3 net-misc/connman
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=4ac4112f49c0b4abdba95c3e1f2e18a1
diff --git a/metadata/md5-cache/net-misc/curl-7.74.0-r2 b/metadata/md5-cache/net-misc/curl-7.74.0-r2
index 7270dff451ed..a682e35c297d 100644
--- a/metadata/md5-cache/net-misc/curl-7.74.0-r2
+++ b/metadata/md5-cache/net-misc/curl-7.74.0-r2
@@ -4,6 +4,7 @@ DEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=A Client that groks URLs
 EAPI=7
 HOMEPAGE=https://curl.haxx.se/
+INHERIT=autotools eutils prefix multilib-minimal
 IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=curl
@@ -12,5 +13,5 @@ REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnu
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.74.0.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
 _md5_=0ca3f55a26ad68483aeea6392d91b185
diff --git a/metadata/md5-cache/net-misc/curl-7.74.0-r4 b/metadata/md5-cache/net-misc/curl-7.74.0-r4
index 372b797c0bb6..2b99c270886f 100644
--- a/metadata/md5-cache/net-misc/curl-7.74.0-r4
+++ b/metadata/md5-cache/net-misc/curl-7.74.0-r4
@@ -4,6 +4,7 @@ DEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=A Client that groks URLs
 EAPI=7
 HOMEPAGE=https://curl.haxx.se/
+INHERIT=autotools prefix multilib-minimal
 IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=curl
@@ -12,5 +13,5 @@ REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnu
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.74.0.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
 _md5_=e6b6e15df00cf191bdfe8a2259516632
diff --git a/metadata/md5-cache/net-misc/curl-7.75.0 b/metadata/md5-cache/net-misc/curl-7.75.0
index 85cff3c90c98..ed469869a39d 100644
--- a/metadata/md5-cache/net-misc/curl-7.75.0
+++ b/metadata/md5-cache/net-misc/curl-7.75.0
@@ -4,6 +4,7 @@ DEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=A Client that groks URLs
 EAPI=7
 HOMEPAGE=https://curl.haxx.se/
+INHERIT=autotools prefix multilib-minimal
 IUSE=adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=curl
@@ -12,5 +13,5 @@ REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnu
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.75.0.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
 _md5_=d85b182a780844120df3ad10f532d9ad
diff --git a/metadata/md5-cache/net-misc/dahdi-tools-3.1.0 b/metadata/md5-cache/net-misc/dahdi-tools-3.1.0
index c5c6e5d47613..c4648b105202 100644
--- a/metadata/md5-cache/net-misc/dahdi-tools-3.1.0
+++ b/metadata/md5-cache/net-misc/dahdi-tools-3.1.0
@@ -4,11 +4,12 @@ DEPEND=dev-libs/newt net-misc/dahdi sys-kernel/linux-headers virtual/libusb:0 pp
 DESCRIPTION=Userspace tools to configure the kernel modules from net-misc/dahdi
 EAPI=7
 HOMEPAGE=https://www.asterisk.org
+INHERIT=autotools bash-completion-r1 perl-functions
 IUSE=ppp
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/newt net-misc/dahdi sys-kernel/linux-headers virtual/libusb:0 ppp? ( net-dialup/ppp ) dev-lang/perl:= dev-perl/CGI
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-3.1.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	bash-completion-r1	be99724bde4274de21e581204e9d164a	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b
 _md5_=91b2959529b3c2e7c82e61ed91d58118
diff --git a/metadata/md5-cache/net-misc/dahdi-tools-3.1.0-r1 b/metadata/md5-cache/net-misc/dahdi-tools-3.1.0-r1
index 6b8d8e6e6b5a..c85b0a0d23f3 100644
--- a/metadata/md5-cache/net-misc/dahdi-tools-3.1.0-r1
+++ b/metadata/md5-cache/net-misc/dahdi-tools-3.1.0-r1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/newt net-misc/dahdi sys-kernel/linux-headers virtual/libusb:0 pp
 DESCRIPTION=Userspace tools to configure the kernel modules from net-misc/dahdi
 EAPI=7
 HOMEPAGE=https://www.asterisk.org
+INHERIT=autotools bash-completion-r1 perl-functions
 IUSE=ppp
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/newt net-misc/dahdi sys-kernel/linux-headers virtual/libusb:0 ppp? ( net-dialup/ppp ) dev-lang/perl:= dev-perl/CGI
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-3.1.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	bash-completion-r1	be99724bde4274de21e581204e9d164a	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b
 _md5_=7b2579198ac42c30a6111c3201728f11
diff --git a/metadata/md5-cache/net-misc/dleyna-server-0.6.0 b/metadata/md5-cache/net-misc/dleyna-server-0.6.0
index 9b947eb86720..5848fe153037 100644
--- a/metadata/md5-cache/net-misc/dleyna-server-0.6.0
+++ b/metadata/md5-cache/net-misc/dleyna-server-0.6.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=media-libs/gupnp-dlna-0.9.4:2
 DESCRIPTION=Service that allows to discover and manipulate DLNA Digital Media servers (DMS)
 EAPI=7
 HOMEPAGE=https://01.org/dleyna/
+INHERIT=autotools
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=media-libs/gupnp-dlna-0.9.4:2.0 >=net-libs/dleyna-core-0.6.0 >=net-libs/gssdp-1.2:0= >=net-libs/gupnp-1.2:0= >=net-libs/gupnp-av-0.11.5 >=net-libs/libsoup-2.28.2:2.4
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/downloads/dleyna/dleyna-server-0.6.0.tar_2.gz -> dleyna-server-0.6.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=9544533364e22a8087786a4bf1b531ef
diff --git a/metadata/md5-cache/net-misc/frr-7.5 b/metadata/md5-cache/net-misc/frr-7.5
index 9048ef9ea11d..5e0ced48e940 100644
--- a/metadata/md5-cache/net-misc/frr-7.5
+++ b/metadata/md5-cache/net-misc/frr-7.5
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-e
 DESCRIPTION=The FRRouting Protocol Suite
 EAPI=7
 HOMEPAGE=https://frrouting.org/
+INHERIT=autotools pam python-single-r1 systemd
 IUSE=doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FRRouting/frr/archive/frr-7.5.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pam	b097695df28f3974e3af860d6704d4f2	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=388ffa6688e79e6c52ec1fd967f92066
diff --git a/metadata/md5-cache/net-misc/grdesktop-0.23-r2 b/metadata/md5-cache/net-misc/grdesktop-0.23-r2
index 57a59626f890..5b03b6d285fb 100644
--- a/metadata/md5-cache/net-misc/grdesktop-0.23-r2
+++ b/metadata/md5-cache/net-misc/grdesktop-0.23-r2
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/gtk+-3.21.4:3 net-misc/rdesktop app-text/rarian virtual/pkgcon
 DESCRIPTION=Gtk3 frontend for rdesktop
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/grdesktop/
+INHERIT=gnome2
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-3.21.4:3 net-misc/rdesktop
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/grdesktop/grdesktop-0.23.tar.gz https://dev.gentoo.org/~leio/distfiles/grdesktop-0.23-patchset.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	532d56d07b9eace4831aaa817d2b756a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168
 _md5_=d8d94ac621233db498dc3eedc5fb8eab
diff --git a/metadata/md5-cache/net-misc/gsasl-1.10.0 b/metadata/md5-cache/net-misc/gsasl-1.10.0
index f7aa03824e34..03c8b430ed6c 100644
--- a/metadata/md5-cache/net-misc/gsasl-1.10.0
+++ b/metadata/md5-cache/net-misc/gsasl-1.10.0
@@ -4,11 +4,12 @@ DEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( v
 DESCRIPTION=The GNU SASL client, server, and library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gsasl/
+INHERIT=autotools
 IUSE=doc gcrypt idn kerberos nls ntlm static-libs +threads
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/gsasl-1.10.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=73faf7d3e89a9402b09b08a4135a0d9f
diff --git a/metadata/md5-cache/net-misc/icecast-2.4.4 b/metadata/md5-cache/net-misc/icecast-2.4.4
index 2e02e4717e22..b6180d55a119 100644
--- a/metadata/md5-cache/net-misc/icecast-2.4.4
+++ b/metadata/md5-cache/net-misc/icecast-2.4.4
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libxml2 dev-libs/libxslt media-libs/libogg media-libs/libvorbis
 DESCRIPTION=Opensource alternative to shoutcast that supports mp3, ogg and aac streaming
 EAPI=7
 HOMEPAGE=https://www.icecast.org/
+INHERIT=autotools systemd user
 IUSE=kate libressl logrotate +speex +ssl +theora +yp
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/icecast/icecast-2.4.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	systemd	74b223e42834adf09a2d21fe5fe13741	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8
 _md5_=d5a29dd7e17f0a1f7a7ef301807528e8
diff --git a/metadata/md5-cache/net-misc/igmpproxy-0.3 b/metadata/md5-cache/net-misc/igmpproxy-0.3
index 08bbc5b3dedb..864ea500aef9 100644
--- a/metadata/md5-cache/net-misc/igmpproxy-0.3
+++ b/metadata/md5-cache/net-misc/igmpproxy-0.3
@@ -3,10 +3,11 @@ DEFINED_PHASES=install prepare setup
 DESCRIPTION=A multicast routing daemon which uses IGMP forwarding
 EAPI=7
 HOMEPAGE=https://github.com/pali/igmpproxy
+INHERIT=autotools linux-info systemd
 IUSE=kernel_linux
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/pali/igmpproxy/releases/download/0.3/igmpproxy-0.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=97d5c621d66037dd0c3c460b2c7eb879
diff --git a/metadata/md5-cache/net-misc/iperf-3.99999.99999 b/metadata/md5-cache/net-misc/iperf-3.99999.99999
index fd80ee75a014..34c23e05450e 100644
--- a/metadata/md5-cache/net-misc/iperf-3.99999.99999
+++ b/metadata/md5-cache/net-misc/iperf-3.99999.99999
@@ -4,10 +4,11 @@ DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sct
 DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
 EAPI=7
 HOMEPAGE=https://github.com/esnet/iperf/
+INHERIT=autotools git-r3
 IUSE=libressl sctp static-libs
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sctp? ( net-misc/lksctp-tools )
 SLOT=3
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=6877c50edd626d54f2414bf0ad97219c
diff --git a/metadata/md5-cache/net-misc/kea-9999 b/metadata/md5-cache/net-misc/kea-9999
index a6a4fad76bda..20894daacf3a 100644
--- a/metadata/md5-cache/net-misc/kea-9999
+++ b/metadata/md5-cache/net-misc/kea-9999
@@ -4,10 +4,11 @@ DEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-c
 DESCRIPTION=High-performance production grade DHCPv4 & DHCPv6 server
 EAPI=7
 HOMEPAGE=http://www.isc.org/kea/
+INHERIT=toolchain-funcs autotools git-r3
 IUSE=mysql +openssl postgres samples
 LICENSE=ISC BSD SSLeay GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* ) acct-group/dhcp acct-user/dhcp
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=a24100e84e88c4385e66e8f983ee8aff
diff --git a/metadata/md5-cache/net-misc/lambdamoo-1.8.1-r3 b/metadata/md5-cache/net-misc/lambdamoo-1.8.1-r3
index b8ff09d61346..65ab2c021f19 100644
--- a/metadata/md5-cache/net-misc/lambdamoo-1.8.1-r3
+++ b/metadata/md5-cache/net-misc/lambdamoo-1.8.1-r3
@@ -3,9 +3,10 @@ DEPEND=sys-devel/bison >=app-portage/elt-patches-20170815 || ( >=sys-devel/autom
 DESCRIPTION=networked mud that can be used for different types of collaborative software
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/lambdamoo/
+INHERIT=autotools toolchain-funcs
 KEYWORDS=~sparc ~x86
 LICENSE=LambdaMOO GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lambdamoo/LambdaMOO-1.8.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=443429405861236254a222deb2f87e70
diff --git a/metadata/md5-cache/net-misc/lanmap-81-r2 b/metadata/md5-cache/net-misc/lanmap-81-r2
index ec4476bfe0b9..b3a4028c39c5 100644
--- a/metadata/md5-cache/net-misc/lanmap-81-r2
+++ b/metadata/md5-cache/net-misc/lanmap-81-r2
@@ -3,10 +3,11 @@ DEPEND=net-libs/libpcap app-arch/unzip >=app-portage/elt-patches-20170815 || ( >
 DESCRIPTION=lanmap sits quietly on a network and builds a picture of what it sees
 EAPI=5
 HOMEPAGE=http://www.parseerror.com/lanmap
+INHERIT=autotools eutils toolchain-funcs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap media-gfx/graphviz
 SLOT=0
 SRC_URI=http://www.parseerror.com/lanmap/rev/lanmap-2006-03-07-rev81.zip
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=6c828cd3c215538e9b480159d92e5bfe
diff --git a/metadata/md5-cache/net-misc/libteam-1.31 b/metadata/md5-cache/net-misc/libteam-1.31
index 546cddaaa501..275790631f9d 100644
--- a/metadata/md5-cache/net-misc/libteam-1.31
+++ b/metadata/md5-cache/net-misc/libteam-1.31
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils]
 DESCRIPTION=Library and tools set for controlling team network device
 EAPI=7
 HOMEPAGE=http://libteam.org
+INHERIT=autotools linux-info
 IUSE=dbus debug examples static-libs +syslog zmq kernel_linux
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
 SRC_URI=https://github.com/jpirko/libteam/archive/v1.31.tar.gz -> libteam-1.31.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955
 _md5_=a4c9beec1bd3c10bb81fd91cf38829d1
diff --git a/metadata/md5-cache/net-misc/libteam-9999 b/metadata/md5-cache/net-misc/libteam-9999
index 397a1967f4f8..d3e59b11dc3f 100644
--- a/metadata/md5-cache/net-misc/libteam-9999
+++ b/metadata/md5-cache/net-misc/libteam-9999
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils]
 DESCRIPTION=Library and tools set for controlling team network device
 EAPI=7
 HOMEPAGE=http://libteam.org
+INHERIT=autotools linux-info git-r3
 IUSE=dbus debug examples static-libs +syslog zmq kernel_linux
 LICENSE=LGPL-2.1+
 PROPERTIES=live
 RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=b806f44bc8968d160a0023b6ccd4c05e
diff --git a/metadata/md5-cache/net-misc/linux-eoip-0.5 b/metadata/md5-cache/net-misc/linux-eoip-0.5
index eeabac54f6bd..4b1d74552d8f 100644
--- a/metadata/md5-cache/net-misc/linux-eoip-0.5
+++ b/metadata/md5-cache/net-misc/linux-eoip-0.5
@@ -4,10 +4,11 @@ DEPEND=dev-libs/lzo:2
 DESCRIPTION=Linux support for proprietary MIkrotik EoIP protocol
 EAPI=7
 HOMEPAGE=https://code.google.com/p/linux-eoip/
+INHERIT=autotools vcs-clean
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2
 SLOT=0
 SRC_URI=https://linux-eoip.googlecode.com/files/linux-eoip-0.5.tgz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=335e99cc40d2f7ca14c4fba4c0a36def
diff --git a/metadata/md5-cache/net-misc/liveice-2000530-r2 b/metadata/md5-cache/net-misc/liveice-2000530-r2
index 7ca43dd4b456..e722119a1cbd 100644
--- a/metadata/md5-cache/net-misc/liveice-2000530-r2
+++ b/metadata/md5-cache/net-misc/liveice-2000530-r2
@@ -4,10 +4,11 @@ DEPEND=media-sound/lame media-sound/mpg123
 DESCRIPTION=Live Source Client For IceCast
 EAPI=7
 HOMEPAGE=http://star.arm.ac.uk/~spm/software/liveice.html
+INHERIT=autotools flag-o-matic toolchain-funcs
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2+
 RDEPEND=media-sound/lame media-sound/mpg123
 SLOT=0
 SRC_URI=mirror://gentoo/liveice-2000530.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=c1628db693a08170a88d97ac96cd70ee
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
index fc2835a3b152..e29543807d23 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
@@ -3,11 +3,12 @@ DEPEND=>=sys-kernel/linux-headers-2.6 >=app-portage/elt-patches-20170815 || ( >=
 DESCRIPTION=Tools for Linux Kernel Stream Control Transmission Protocol implementation
 EAPI=6
 HOMEPAGE=http://lksctp.sourceforge.net/
+INHERIT=flag-o-matic autotools linux-info multilib-minimal
 IUSE=kernel_linux static-libs kernel_linux 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 )
 REQUIRED_USE=kernel_linux
 SLOT=0
 SRC_URI=https://github.com/sctp/lksctp-tools/archive/v1.0.18.tar.gz -> lksctp-tools-1.0.18.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566
 _md5_=911b574da3d080081141235abdcd7359
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.3 b/metadata/md5-cache/net-misc/lldpd-1.0.3
index 5f884c76ba92..6250d8b63ee6 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.3
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.3
@@ -3,6 +3,7 @@ DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? (
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=6
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
+INHERIT=eutils user systemd bash-completion-r1 autotools ltprune tmpfiles
 IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
 KEYWORDS=amd64 x86
 LICENSE=ISC
@@ -11,5 +12,5 @@ REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	systemd	74b223e42834adf09a2d21fe5fe13741	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=c1b03ac293a3a39ec80716bdeecfcebe
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.4 b/metadata/md5-cache/net-misc/lldpd-1.0.4
index 34426fdd1fdb..549a0711643a 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.4
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.4
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? (
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=7
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
+INHERIT=eutils user systemd bash-completion-r1 autotools tmpfiles
 IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
@@ -12,5 +13,5 @@ REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=d5dad6b01962a90e52438c4db0368714
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.5-r1 b/metadata/md5-cache/net-misc/lldpd-1.0.5-r1
index e6e152a41872..30d253f05584 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.5-r1
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.5-r1
@@ -4,6 +4,7 @@ DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.0.
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=7
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
+INHERIT=systemd bash-completion-r1 autotools tmpfiles
 IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
 KEYWORDS=amd64 x86
 LICENSE=ISC
@@ -12,5 +13,5 @@ REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0/4.8.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.5.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=5ab2d66c7a19e366276a36fead7e5967
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.6 b/metadata/md5-cache/net-misc/lldpd-1.0.6
index 1db21183c916..80dd70f57bbc 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.6
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.6
@@ -4,6 +4,7 @@ DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=7
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
+INHERIT=systemd bash-completion-r1 autotools tmpfiles
 IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
@@ -12,5 +13,5 @@ REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=5a4f9049a03983245aabc4f655f1f391
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.7 b/metadata/md5-cache/net-misc/lldpd-1.0.7
index 8a9ead99f91f..48974b48984b 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.7
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.7
@@ -4,6 +4,7 @@ DEPEND=acct-group/lldpd acct-user/lldpd dev-libs/libbsd >=dev-libs/libevent-2.1.
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=7
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
+INHERIT=systemd bash-completion-r1 autotools tmpfiles
 IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
@@ -12,5 +13,5 @@ REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0/4.9.0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.7.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=d72d814e4c2e0cdb8d09feca533ea80a
diff --git a/metadata/md5-cache/net-misc/megatools-1.10.3 b/metadata/md5-cache/net-misc/megatools-1.10.3
index 9fa8fa9354ed..b02549291797 100644
--- a/metadata/md5-cache/net-misc/megatools-1.10.3
+++ b/metadata/md5-cache/net-misc/megatools-1.10.3
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2 dev-libs/openssl:0= net-misc/curl virtual/pkgconfig app-t
 DESCRIPTION=Command line tools and C library for accessing Mega cloud storage
 EAPI=7
 HOMEPAGE=https://megatools.megous.com
+INHERIT=autotools eutils
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/openssl:0= net-misc/curl net-libs/glib-networking[ssl]
 SLOT=0
 SRC_URI=https://megatools.megous.com/builds/megatools-1.10.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=a9847277641332d0dca50de0bedc3275
diff --git a/metadata/md5-cache/net-misc/memcached-1.6.9 b/metadata/md5-cache/net-misc/memcached-1.6.9
index d28eb893bf8b..ab28c4a95136 100644
--- a/metadata/md5-cache/net-misc/memcached-1.6.9
+++ b/metadata/md5-cache/net-misc/memcached-1.6.9
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) sec
 DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=7
 HOMEPAGE=http://memcached.org/
+INHERIT=autotools eutils flag-o-matic systemd
 IUSE=debug sasl seccomp selinux slabs-reassign test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) se
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.6.9.tar.gz https://www.memcached.org/files/old/memcached-1.6.9.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=b1a9e672c831a402379c060202b6910e
diff --git a/metadata/md5-cache/net-misc/mico-2.3.13-r13 b/metadata/md5-cache/net-misc/mico-2.3.13-r13
index 2139eecbd2dd..8377c62b2628 100644
--- a/metadata/md5-cache/net-misc/mico-2.3.13-r13
+++ b/metadata/md5-cache/net-misc/mico-2.3.13-r13
@@ -4,6 +4,7 @@ DEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-lib
 DESCRIPTION=A freely available and fully compliant implementation of the CORBA standard
 EAPI=7
 HOMEPAGE=http://www.mico.org/
+INHERIT=flag-o-matic toolchain-funcs autotools
 IUSE=gtk postgres ssl tcl threads X
 KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt
 LICENSE=GPL-2 LGPL-2
@@ -11,5 +12,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-li
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mico.org/mico-2.3.13.tar.gz https://github.com/haubi/mico/compare/2.3.13-raw...2.3.13-gentoo-r13.patch -> mico-2.3.13-gentoo-r13.patch
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=6f072aeecd243baca71308c7f3fa3971
diff --git a/metadata/md5-cache/net-misc/mico-2.3.13-r14 b/metadata/md5-cache/net-misc/mico-2.3.13-r14
index 9a515786056c..d2293ad38709 100644
--- a/metadata/md5-cache/net-misc/mico-2.3.13-r14
+++ b/metadata/md5-cache/net-misc/mico-2.3.13-r14
@@ -4,6 +4,7 @@ DEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-lib
 DESCRIPTION=A freely available and fully compliant implementation of the CORBA standard
 EAPI=7
 HOMEPAGE=http://www.mico.org/
+INHERIT=flag-o-matic toolchain-funcs autotools
 IUSE=gtk postgres ssl tcl threads X
 KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt
 LICENSE=GPL-2 LGPL-2
@@ -11,5 +12,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-li
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mico.org/mico-2.3.13.tar.gz https://github.com/haubi/mico/compare/2.3.13-raw...2.3.13-gentoo-r14.patch -> mico-2.3.13-gentoo-r14.patch
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=6f072aeecd243baca71308c7f3fa3971
diff --git a/metadata/md5-cache/net-misc/mico-9999 b/metadata/md5-cache/net-misc/mico-9999
index 44c65b3183b6..6350644765a4 100644
--- a/metadata/md5-cache/net-misc/mico-9999
+++ b/metadata/md5-cache/net-misc/mico-9999
@@ -4,11 +4,12 @@ DEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-lib
 DESCRIPTION=A freely available and fully compliant implementation of the CORBA standard
 EAPI=7
 HOMEPAGE=http://www.mico.org/
+INHERIT=flag-o-matic toolchain-funcs autotools darcs
 IUSE=gtk postgres ssl tcl threads X
 LICENSE=GPL-2 LGPL-2
 PROPERTIES=live
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) tcl? ( dev-lang/tcl:0 ) X? ( x11-libs/libXt )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	darcs	2affb9c1b0522b809ad117a9ccc42669	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	estack	055c42df72f76a4f45ec92b35e83cd56	darcs	2affb9c1b0522b809ad117a9ccc42669
 _md5_=6f072aeecd243baca71308c7f3fa3971
diff --git a/metadata/md5-cache/net-misc/mosh-1.3.2 b/metadata/md5-cache/net-misc/mosh-1.3.2
index fec855eab0cf..faad5737fbfc 100644
--- a/metadata/md5-cache/net-misc/mosh-1.3.2
+++ b/metadata/md5-cache/net-misc/mosh-1.3.2
@@ -3,6 +3,7 @@ DEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/p
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=6
 HOMEPAGE=https://mosh.org
+INHERIT=autotools bash-completion-r1 eutils
 IUSE=+client examples libressl +mosh-hardening +server ufw +utempter
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=https://mosh.org/mosh-1.3.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=c2f540629776de2c6029eb8742295edc
diff --git a/metadata/md5-cache/net-misc/mosh-9999 b/metadata/md5-cache/net-misc/mosh-9999
index dd3ba6bd152e..19c0b4b78fc8 100644
--- a/metadata/md5-cache/net-misc/mosh-9999
+++ b/metadata/md5-cache/net-misc/mosh-9999
@@ -3,11 +3,12 @@ DEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/p
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=6
 HOMEPAGE=https://mosh.org
+INHERIT=autotools bash-completion-r1 eutils git-r3
 IUSE=+client examples libressl +mosh-hardening +server ufw +utempter
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) utempter? ( sys-libs/libutempter )
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	bash-completion-r1	be99724bde4274de21e581204e9d164a	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=260b6250b52e5a68cb02e1420a54e75c
diff --git a/metadata/md5-cache/net-misc/mstpd-0.0.9 b/metadata/md5-cache/net-misc/mstpd-0.0.9
index 7437ebba96fb..e378957f0ac9 100644
--- a/metadata/md5-cache/net-misc/mstpd-0.0.9
+++ b/metadata/md5-cache/net-misc/mstpd-0.0.9
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Multiple spanning tree protocol daemon
 EAPI=7
 HOMEPAGE=https://github.com/mstpd/mstpd
+INHERIT=autotools bash-completion-r1 systemd
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/mstpd/mstpd/archive/0.0.9.tar.gz -> mstpd-0.0.9.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	bash-completion-r1	be99724bde4274de21e581204e9d164a	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=3adb269319dbc9f8b98ba8befc6f4340
diff --git a/metadata/md5-cache/net-misc/nemesis-1.7-r1 b/metadata/md5-cache/net-misc/nemesis-1.7-r1
index 60e222c2e115..3c4059409260 100644
--- a/metadata/md5-cache/net-misc/nemesis-1.7-r1
+++ b/metadata/md5-cache/net-misc/nemesis-1.7-r1
@@ -4,10 +4,11 @@ DEPEND=net-libs/libnet:1.1 net-libs/libpcap
 DESCRIPTION=A commandline-based, portable human IP stack for UNIX/Linux
 EAPI=7
 HOMEPAGE=https://github.com/libnet/nemesis
+INHERIT=autotools
 KEYWORDS=~alpha amd64 sparc x86
 LICENSE=BSD
 RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=https://github.com/libnet/nemesis/archive/v1.7.tar.gz -> nemesis-1.7.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=46b2df832f361a18eeb0b5f63aa6c832
diff --git a/metadata/md5-cache/net-misc/netstat-nat-1.4.10 b/metadata/md5-cache/net-misc/netstat-nat-1.4.10
index 26254f776861..556eac8b56f3 100644
--- a/metadata/md5-cache/net-misc/netstat-nat-1.4.10
+++ b/metadata/md5-cache/net-misc/netstat-nat-1.4.10
@@ -3,9 +3,10 @@ DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.
 DESCRIPTION=Display NAT connections
 EAPI=5
 HOMEPAGE=http://tweegy.nl/projects/netstat-nat/index.html
+INHERIT=autotools eutils
 KEYWORDS=amd64 ~arm ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://tweegy.nl/download/netstat-nat-1.4.10.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=a63418259851d62c567b3d986d87dedc
diff --git a/metadata/md5-cache/net-misc/npapi-sdk-9999 b/metadata/md5-cache/net-misc/npapi-sdk-9999
index 20ff76de84b9..46d69b67ba41 100644
--- a/metadata/md5-cache/net-misc/npapi-sdk-9999
+++ b/metadata/md5-cache/net-misc/npapi-sdk-9999
@@ -4,8 +4,9 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=NPAPI headers bundle
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/npapi-sdk/
+INHERIT=autotools git-r3
 LICENSE=BSD
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=88ae1b02d2645970817fc9d53ee3adda
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p15 b/metadata/md5-cache/net-misc/ntp-4.2.8_p15
index 36ba2148462c..69a4865af54f 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p15
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p15
@@ -4,6 +4,7 @@ DEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[thre
 DESCRIPTION=Network Time Protocol suite/programs
 EAPI=7
 HOMEPAGE=http://www.ntp.org/
+INHERIT=autotools toolchain-funcs flag-o-matic systemd
 IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=HPND BSD ISC
@@ -11,5 +12,5 @@ PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools ) acct-group/ntp acct-user/ntp selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p15.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p15-manpages.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=5fe0fd1db1b88a2696c0c7e91e9027d4
diff --git a/metadata/md5-cache/net-misc/nx-3.5.99.25 b/metadata/md5-cache/net-misc/nx-3.5.99.25
index c8b24694fb2f..0785fdb194b4 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.99.25
+++ b/metadata/md5-cache/net-misc/nx-3.5.99.25
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libxml2 >=media-libs/libpng-1.2.8:0= >=sys-libs/zlib-1.2.3 virtu
 DESCRIPTION=NX compression technology core libraries
 EAPI=7
 HOMEPAGE=https://github.com/ArcticaProject/nx-libs
+INHERIT=autotools toolchain-funcs
 IUSE=elibc_glibc
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 >=media-libs/libpng-1.2.8:0= >=sys-libs/zlib-1.2.3 virtual/jpeg:* x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pixman
 SLOT=0
 SRC_URI=https://github.com/ArcticaProject/nx-libs/archive/3.5.99.25.tar.gz -> nx-libs-3.5.99.25.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=0712180b536fe5a0d493c637ab8ba4d4
diff --git a/metadata/md5-cache/net-misc/nx-3.5.99.26 b/metadata/md5-cache/net-misc/nx-3.5.99.26
index f01e90a75a22..2f07790f1b46 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.99.26
+++ b/metadata/md5-cache/net-misc/nx-3.5.99.26
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libxml2 >=media-libs/libpng-1.2.8:0= >=sys-libs/zlib-1.2.3 virtu
 DESCRIPTION=NX compression technology core libraries
 EAPI=7
 HOMEPAGE=https://github.com/ArcticaProject/nx-libs
+INHERIT=autotools toolchain-funcs
 IUSE=elibc_glibc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 >=media-libs/libpng-1.2.8:0= >=sys-libs/zlib-1.2.3 virtual/jpeg:* x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pixman
 SLOT=0
 SRC_URI=https://github.com/ArcticaProject/nx-libs/archive/3.5.99.26.tar.gz -> nx-libs-3.5.99.26.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=efd2df3296470473f045085945d3e7c9
diff --git a/metadata/md5-cache/net-misc/oidentd-2.5.0 b/metadata/md5-cache/net-misc/oidentd-2.5.0
index a4f64f3a669a..7ec004004264 100644
--- a/metadata/md5-cache/net-misc/oidentd-2.5.0
+++ b/metadata/md5-cache/net-misc/oidentd-2.5.0
@@ -4,11 +4,12 @@ DEPEND=masquerade? ( net-libs/libnetfilter_conntrack )
 DESCRIPTION=Another (RFC1413 compliant) ident daemon
 EAPI=7
 HOMEPAGE=https://oidentd.janikrabe.com/
+INHERIT=autotools systemd
 IUSE=debug ipv6 masquerade selinux
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=BSD-2 GPL-2 LGPL-2+ MIT
 RDEPEND=acct-user/oidentd acct-group/oidentd selinux? ( sec-policy/selinux-oident ) masquerade? ( net-libs/libnetfilter_conntrack )
 SLOT=0
 SRC_URI=https://files.janikrabe.com/pub/oidentd/releases/2.5.0/oidentd-2.5.0.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=f74a73cb0288a080e166e10891b90f3f
diff --git a/metadata/md5-cache/net-misc/openr2-1.3.0 b/metadata/md5-cache/net-misc/openr2-1.3.0
index 9062d81a318d..b41c44733ab3 100644
--- a/metadata/md5-cache/net-misc/openr2-1.3.0
+++ b/metadata/md5-cache/net-misc/openr2-1.3.0
@@ -3,10 +3,11 @@ DEPEND=net-misc/dahdi >=app-portage/elt-patches-20170815 || ( >=sys-devel/automa
 DESCRIPTION=An open implementation of the MFC/R2 telephony signaling protocol
 EAPI=6
 HOMEPAGE=https://libopenr2.org/
+INHERIT=autotools
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=net-misc/dahdi
 SLOT=0
 SRC_URI=https://openr2.googlecode.com/files/openr2-1.3.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=612570d0136480a51c117b9cb849a78a
diff --git a/metadata/md5-cache/net-misc/openssh-8.4_p1-r3 b/metadata/md5-cache/net-misc/openssh-8.4_p1-r3
index 416ac3496975..d02efd83ddfe 100644
--- a/metadata/md5-cache/net-misc/openssh-8.4_p1-r3
+++ b/metadata/md5-cache/net-misc/openssh-8.4_p1-r3
@@ -4,6 +4,7 @@ DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ld
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=7
 HOMEPAGE=https://www.openssh.com/
+INHERIT=user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
 IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss
 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=BSD GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.4p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.4p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2014v22%208.3p1/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2014v22%208.3p1/openssh-8_3_P1-hpn-AES-CTR-14.22.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2014v22%208.3p1/openssh-8_3_P1-hpn-PeakTput-14.22.diff ) X509? ( https://roumenpetrov.info/openssh/x509-12.6/openssh-8.4p1+x509-12.6.diff.gz )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=b5d14756eec004f850be9b69e3adc822
diff --git a/metadata/md5-cache/net-misc/openssh-8.5_p1 b/metadata/md5-cache/net-misc/openssh-8.5_p1
index 2eeb3bb54124..1506addc4635 100644
--- a/metadata/md5-cache/net-misc/openssh-8.5_p1
+++ b/metadata/md5-cache/net-misc/openssh-8.5_p1
@@ -4,6 +4,7 @@ DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ld
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=7
 HOMEPAGE=https://www.openssh.com/
+INHERIT=user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
 IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss
 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=BSD GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.5p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.5p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v1%208.4p1/openssh-8_4_P1-hpn-DynWinNoneSwitch-15.1.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v1%208.4p1/openssh-8_4_P1-hpn-AES-CTR-15.1.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v1%208.4p1/openssh-8_4_P1-hpn-PeakTput-15.1.diff ) X509? ( https://roumenpetrov.info/openssh/x509-13.0/openssh-8.5p1+x509-13.0.diff.gz )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=cf58977a8f2f0b3b61569c89d90bb0c3
diff --git a/metadata/md5-cache/net-misc/openssh-8.5_p1-r1 b/metadata/md5-cache/net-misc/openssh-8.5_p1-r1
index 40f7a1814fd5..c8470c17ef9b 100644
--- a/metadata/md5-cache/net-misc/openssh-8.5_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-8.5_p1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.5p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.5p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff ) X509? ( https://roumenpetrov.info/openssh/x509-13.0.1/openssh-8.5p1+x509-13.0.1.diff.gz )
-_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741
+_eclasses_=user-info	a2abd4e2f4c3b9b06d64bf1329359a02	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	pam	b097695df28f3974e3af860d6704d4f2	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=d1d8912a1f8986d78f496ce409b2257d
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.14.1 b/metadata/md5-cache/net-misc/openvswitch-2.14.1
index 356841f81d02..deb4a1263d8d 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.14.1
+++ b/metadata/md5-cache/net-misc/openvswitch-2.14.1
@@ -4,6 +4,7 @@ DEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python3_7? ( dev-lang/python:
 DESCRIPTION=Production quality, multilayer virtual switch
 EAPI=7
 HOMEPAGE=https://www.openvswitch.org
+INHERIT=autotools eutils linux-info linux-mod python-r1 systemd tmpfiles
 IUSE=debug modules monitor +ssl kernel_linux kernel_linux kernel_linux dist-kernel python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0 GPL-2
@@ -11,5 +12,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python3_7? ( dev-lang/python
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.14.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	6eea2d40e8514773bec08ae1be26800b	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-r1	6d099888c5b4dd4868c26508df307e95	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=d0dfbfdc253a951fa69611fdb059e221
diff --git a/metadata/md5-cache/net-misc/packETH-2.1 b/metadata/md5-cache/net-misc/packETH-2.1
index b369688d7dd1..e1f98de73742 100644
--- a/metadata/md5-cache/net-misc/packETH-2.1
+++ b/metadata/md5-cache/net-misc/packETH-2.1
@@ -4,6 +4,7 @@ DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) gtk? ( virtu
 DESCRIPTION=Packet generator tool for ethernet
 EAPI=7
 HOMEPAGE=http://packeth.sourceforge.net/
+INHERIT=autotools toolchain-funcs
 IUSE=cli +gtk
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
 REQUIRED_USE=|| ( cli gtk )
 SLOT=0
 SRC_URI=https://github.com/jemcek/packETH/archive/2.1.tar.gz -> packETH-2.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=c015bfb96e34cd104032202038c7ba7a
diff --git a/metadata/md5-cache/net-misc/portfwd-0.29-r1 b/metadata/md5-cache/net-misc/portfwd-0.29-r1
index b1195da3e4b2..bec538b7529a 100644
--- a/metadata/md5-cache/net-misc/portfwd-0.29-r1
+++ b/metadata/md5-cache/net-misc/portfwd-0.29-r1
@@ -3,9 +3,10 @@ DEPEND=>=sys-apps/sed-4 >=app-portage/elt-patches-20170815 || ( >=sys-devel/auto
 DESCRIPTION=Port Forwarding Daemon
 EAPI=6
 HOMEPAGE=http://portfwd.sourceforge.net
+INHERIT=autotools eutils systemd
 KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/portfwd/portfwd-0.29.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=fc51cc05ff86d3b8f013c25e1b5da48f
diff --git a/metadata/md5-cache/net-misc/portspoof-9999 b/metadata/md5-cache/net-misc/portspoof-9999
index 9b8e968cd120..bb67ddcd0df9 100644
--- a/metadata/md5-cache/net-misc/portspoof-9999
+++ b/metadata/md5-cache/net-misc/portspoof-9999
@@ -3,8 +3,9 @@ DEFINED_PHASES=install prepare unpack
 DESCRIPTION=return SYN+ACK for every port connection attempt
 EAPI=7
 HOMEPAGE=http://portspoof.org/
+INHERIT=git-r3 autotools
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=e9a8d1e45e5979eea0054ab99731a1b9
diff --git a/metadata/md5-cache/net-misc/ptpd-2.3.1-r1 b/metadata/md5-cache/net-misc/ptpd-2.3.1-r1
index 7ca5de80336e..3358410bf528 100644
--- a/metadata/md5-cache/net-misc/ptpd-2.3.1-r1
+++ b/metadata/md5-cache/net-misc/ptpd-2.3.1-r1
@@ -3,11 +3,12 @@ DEPEND=pcap? ( net-libs/libpcap ) snmp? ( net-analyzer/net-snmp ) >=app-portage/
 DESCRIPTION=Precision Time Protocol daemon
 EAPI=6
 HOMEPAGE=https://github.com/ptpd/ptpd
+INHERIT=autotools flag-o-matic systemd
 IUSE=debug experimental ntp +pcap snmp slave-only +statistics
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=pcap? ( net-libs/libpcap ) snmp? ( net-analyzer/net-snmp ) ntp? ( net-misc/ntp )
 SLOT=0
 SRC_URI=https://github.com/ptpd/ptpd/archive/ptpd-2.3.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=5bfbc8e93be7c24fcf997eaf8d21d4cc
diff --git a/metadata/md5-cache/net-misc/ptpd-2.3.1-r2 b/metadata/md5-cache/net-misc/ptpd-2.3.1-r2
index 2eaf66600100..374316546b61 100644
--- a/metadata/md5-cache/net-misc/ptpd-2.3.1-r2
+++ b/metadata/md5-cache/net-misc/ptpd-2.3.1-r2
@@ -3,11 +3,12 @@ DEPEND=pcap? ( net-libs/libpcap ) snmp? ( net-analyzer/net-snmp ) >=app-portage/
 DESCRIPTION=Precision Time Protocol daemon
 EAPI=6
 HOMEPAGE=https://github.com/ptpd/ptpd
+INHERIT=autotools flag-o-matic systemd
 IUSE=debug experimental ntp +pcap snmp slave-only +statistics
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=pcap? ( net-libs/libpcap ) snmp? ( net-analyzer/net-snmp ) ntp? ( net-misc/ntp )
 SLOT=0
 SRC_URI=https://github.com/ptpd/ptpd/archive/ptpd-2.3.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=7087c0df45b2e73a0f35c25f5f719041
diff --git a/metadata/md5-cache/net-misc/putty-0.74 b/metadata/md5-cache/net-misc/putty-0.74
index 43c22ce95123..19a7e077567d 100644
--- a/metadata/md5-cache/net-misc/putty-0.74
+++ b/metadata/md5-cache/net-misc/putty-0.74
@@ -4,6 +4,7 @@ DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11
 DESCRIPTION=A Free Telnet/SSH Client
 EAPI=7
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
+INHERIT=autotools desktop toolchain-funcs xdg-utils
 IUSE=doc +gtk gtk2 ipv6 gssapi
 KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX1
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.74/putty-0.74.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b81e21b0e3e26a81e0a79c5becee2e3
diff --git a/metadata/md5-cache/net-misc/putty-9999 b/metadata/md5-cache/net-misc/putty-9999
index 9a3a656d8fce..b7fea6d0eb62 100644
--- a/metadata/md5-cache/net-misc/putty-9999
+++ b/metadata/md5-cache/net-misc/putty-9999
@@ -4,6 +4,7 @@ DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11
 DESCRIPTION=A Free Telnet/SSH Client
 EAPI=7
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
+INHERIT=autotools desktop git-r3 toolchain-funcs xdg-utils
 IUSE=doc +gtk gtk2 ipv6 gssapi
 LICENSE=MIT
 PROPERTIES=live
@@ -11,5 +12,5 @@ RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX1
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/putty-icons.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	3e7ec3d6619213460c85e2aa48398441	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=73d7c096af1f0f32ad8b11990ef3da97
diff --git a/metadata/md5-cache/net-misc/quagga-1.2.4 b/metadata/md5-cache/net-misc/quagga-1.2.4
index 8e121cb2bdf8..808c4ca527f6 100644
--- a/metadata/md5-cache/net-misc/quagga-1.2.4
+++ b/metadata/md5-cache/net-misc/quagga-1.2.4
@@ -4,6 +4,7 @@ DEPEND=acct-group/quagga acct-user/quagga caps? ( sys-libs/libcap ) nhrpd? ( net
 DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
 EAPI=7
 HOMEPAGE=https://www.quagga.net/
+INHERIT=autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd tmpfiles
 IUSE=bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test
 KEYWORDS=~alpha amd64 arm ~hppa ppc ~s390 sparc x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=acct-group/quagga acct-user/quagga caps? ( sys-libs/libcap ) nhrpd? ( ne
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.2.4.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	pam	b097695df28f3974e3af860d6704d4f2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b
 _md5_=ed19d461358b19c20d4f9bba7a371a4b
diff --git a/metadata/md5-cache/net-misc/rdate-1.10 b/metadata/md5-cache/net-misc/rdate-1.10
index a2b93360d1e3..3fb2bea3c1a7 100644
--- a/metadata/md5-cache/net-misc/rdate-1.10
+++ b/metadata/md5-cache/net-misc/rdate-1.10
@@ -4,10 +4,11 @@ DEPEND=dev-libs/libbsd
 DESCRIPTION=Use TCP or UDP to retrieve the current time of another machine
 EAPI=7
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/openrdate
+INHERIT=autotools
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=BSD-4
 RDEPEND=dev-libs/libbsd
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/openrdate/archive/1.10.tar.gz -> rdate-1.10.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=e34a31294e18b9ba8cba63f4378a8d5f
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.8.6 b/metadata/md5-cache/net-misc/rdesktop-1.8.6
index a78b7a1a8ab2..f560012d1da1 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.8.6
+++ b/metadata/md5-cache/net-misc/rdesktop-1.8.6
@@ -4,11 +4,12 @@ DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-
 DESCRIPTION=A Remote Desktop Protocol Client
 EAPI=7
 HOMEPAGE=http://www.rdesktop.org/
+INHERIT=autotools eutils
 IUSE=alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( virtual/krb5 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
 SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.8.6/rdesktop-1.8.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=2789e41dc434e33ef9061a1734734424
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.8.6-r1 b/metadata/md5-cache/net-misc/rdesktop-1.8.6-r1
index ca77e257e791..01b76b83a55f 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.8.6-r1
+++ b/metadata/md5-cache/net-misc/rdesktop-1.8.6-r1
@@ -4,11 +4,12 @@ DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-
 DESCRIPTION=A Remote Desktop Protocol Client
 EAPI=7
 HOMEPAGE=http://www.rdesktop.org/
+INHERIT=autotools eutils
 IUSE=alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( virtual/krb5 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
 SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.8.6/rdesktop-1.8.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=ea9d798b3ce67f2e92cb84f66de559ae
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.9.0 b/metadata/md5-cache/net-misc/rdesktop-1.9.0
index 88c2dc523259..958d8f9bcb8e 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.9.0
+++ b/metadata/md5-cache/net-misc/rdesktop-1.9.0
@@ -4,11 +4,12 @@ DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.2.0:0= x11-libs/libX11 x11-libs/li
 DESCRIPTION=A Remote Desktop Protocol Client
 EAPI=7
 HOMEPAGE=http://www.rdesktop.org/
+INHERIT=autotools eutils
 IUSE=alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.2.0:0= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib media-libs/libsamplerate ) ao? ( >=media-libs/libao-0.8.6 media-libs/libsamplerate ) kerberos? ( virtual/krb5 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) oss? ( media-libs/libsamplerate ) pulseaudio? ( media-libs/libsamplerate media-sound/pulseaudio ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
 SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.9.0/rdesktop-1.9.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=954f41755debe2e3f0a3dd2a42e4215a
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.9.0-r1 b/metadata/md5-cache/net-misc/rdesktop-1.9.0-r1
index 01448a2c5dbc..e5561867abfb 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.9.0-r1
+++ b/metadata/md5-cache/net-misc/rdesktop-1.9.0-r1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.2.0:0= x11-libs/libX11 x11-libs/li
 DESCRIPTION=A Remote Desktop Protocol Client
 EAPI=7
 HOMEPAGE=http://www.rdesktop.org/
+INHERIT=autotools eutils
 IUSE=alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.2.0:0= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib media-libs/libsamplerate ) ao? ( >=media-libs/libao-0.8.6 media-libs/libsamplerate ) kerberos? ( virtual/krb5 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) oss? ( media-libs/libsamplerate ) pulseaudio? ( media-libs/libsamplerate media-sound/pulseaudio ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
 SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.9.0/rdesktop-1.9.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=b3d21c317c4cc916596b93f6e5b8ff7e
diff --git a/metadata/md5-cache/net-misc/rsync-9999 b/metadata/md5-cache/net-misc/rsync-9999
index 87da5d45da68..d69f791cf21e 100644
--- a/metadata/md5-cache/net-misc/rsync-9999
+++ b/metadata/md5-cache/net-misc/rsync-9999
@@ -4,10 +4,11 @@ DEPEND=acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/o
 DESCRIPTION=File transfer program to keep remote files into sync
 EAPI=7
 HOMEPAGE=https://rsync.samba.org/
+INHERIT=flag-o-matic prefix systemd autotools git-r3 python-any-r1
 IUSE=acl examples iconv ipv6 libressl lz4 ssl stunnel system-zlib xattr xxhash zstd cpu_flags_x86_sse2
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	systemd	74b223e42834adf09a2d21fe5fe13741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
 _md5_=266590df7414ebd2bb3fd16d2417a834
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.1 b/metadata/md5-cache/net-misc/seafile-8.0.1
index df5ce0324a31..eed7014e2d1e 100644
--- a/metadata/md5-cache/net-misc/seafile-8.0.1
+++ b/metadata/md5-cache/net-misc/seafile-8.0.1
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-e
 DESCRIPTION=File syncing and sharing software with file encryption and group sharing
 EAPI=7
 HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile/
+INHERIT=autotools python-single-r1 vala
 IUSE=libressl python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+-with-openssl-exception
@@ -11,5 +12,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/v8.0.1.tar.gz -> seafile-8.0.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	vala	5fab64090cefe75c5df431cefa0b653d
 _md5_=38582b70e0d1340b08f03fd224c28609
diff --git a/metadata/md5-cache/net-misc/shigofumi-0.3-r1 b/metadata/md5-cache/net-misc/shigofumi-0.3-r1
index 94fb49f98f6c..251fe9ceae6c 100644
--- a/metadata/md5-cache/net-misc/shigofumi-0.3-r1
+++ b/metadata/md5-cache/net-misc/shigofumi-0.3-r1
@@ -3,11 +3,12 @@ DEPEND=dev-libs/confuse:0= dev-libs/libxml2:2 sys-libs/readline:0= >=net-libs/li
 DESCRIPTION=Command line client for ISDS
 EAPI=6
 HOMEPAGE=http://xpisar.wz.cz/shigofumi/
+INHERIT=autotools
 IUSE=debug doc nls xattr
 KEYWORDS=~amd64 ~mips ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/confuse:0= dev-libs/libxml2:2 sys-libs/readline:0= >=net-libs/libisds-0.7 xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=http://xpisar.wz.cz/shigofumi/dist/shigofumi-0.3.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=0a4415da852214435aa737474c8c7104
diff --git a/metadata/md5-cache/net-misc/shigofumi-9999 b/metadata/md5-cache/net-misc/shigofumi-9999
index 7ef47ff75915..507534fbd235 100644
--- a/metadata/md5-cache/net-misc/shigofumi-9999
+++ b/metadata/md5-cache/net-misc/shigofumi-9999
@@ -3,10 +3,11 @@ DEPEND=dev-libs/confuse:0= dev-libs/libxml2:2 sys-libs/readline:0= >=net-libs/li
 DESCRIPTION=Command line client for ISDS
 EAPI=6
 HOMEPAGE=http://xpisar.wz.cz/shigofumi/
+INHERIT=autotools git-r3
 IUSE=debug doc nls xattr
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/confuse:0= dev-libs/libxml2:2 sys-libs/readline:0= >=net-libs/libisds-0.7 xattr? ( sys-apps/attr )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=2ae53855088f6629680b3eb80359ad2c
diff --git a/metadata/md5-cache/net-misc/shmux-1.0.2 b/metadata/md5-cache/net-misc/shmux-1.0.2
index 90c1db383e34..d384bdfffa77 100644
--- a/metadata/md5-cache/net-misc/shmux-1.0.2
+++ b/metadata/md5-cache/net-misc/shmux-1.0.2
@@ -3,6 +3,7 @@ DEPEND=pcre? ( dev-libs/libpcre ) sys-libs/ncurses virtual/awk >=app-portage/elt
 DESCRIPTION=Program for executing the same command on many hosts in parallel
 EAPI=5
 HOMEPAGE=http://web.taranis.org/shmux/
+INHERIT=autotools eutils
 IUSE=pcre
 KEYWORDS=amd64 ~ppc x86
 LICENSE=shmux
@@ -10,5 +11,5 @@ RDEPEND=pcre? ( dev-libs/libpcre ) sys-libs/ncurses
 RESTRICT=test
 SLOT=0
 SRC_URI=http://web.taranis.org/shmux/dist/shmux-1.0.2.tgz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=bc54d20904f88adb2f7c34b88f504144
diff --git a/metadata/md5-cache/net-misc/shmux-1.0.2-r1 b/metadata/md5-cache/net-misc/shmux-1.0.2-r1
index d3568bffea0a..7a23268f3f48 100644
--- a/metadata/md5-cache/net-misc/shmux-1.0.2-r1
+++ b/metadata/md5-cache/net-misc/shmux-1.0.2-r1
@@ -3,6 +3,7 @@ DEPEND=pcre? ( dev-libs/libpcre ) sys-libs/ncurses:0= virtual/awk >=app-portage/
 DESCRIPTION=run the same command across many hosts in parallel
 EAPI=6
 HOMEPAGE=http://web.taranis.org/shmux/
+INHERIT=autotools
 IUSE=pcre
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=shmux
@@ -10,5 +11,5 @@ RDEPEND=pcre? ( dev-libs/libpcre ) sys-libs/ncurses:0=
 RESTRICT=test
 SLOT=0
 SRC_URI=http://web.taranis.org/shmux/dist/shmux-1.0.2.tgz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=34ded8a8853f271cf71b13e2caaf6d68
diff --git a/metadata/md5-cache/net-misc/sipp-3.6.0 b/metadata/md5-cache/net-misc/sipp-3.6.0
index 05f6d11ad61f..c2ea496ad13c 100644
--- a/metadata/md5-cache/net-misc/sipp-3.6.0
+++ b/metadata/md5-cache/net-misc/sipp-3.6.0
@@ -4,11 +4,12 @@ DEPEND=sys-libs/ncurses:= gsl? ( sci-libs/gsl:= ) pcap? ( net-libs/libpcap net-l
 DESCRIPTION=A free Open Source test tool / traffic generator for the SIP protocol
 EAPI=7
 HOMEPAGE=http://sipp.sourceforge.net/ https://github.com/SIPp/sipp/releases
+INHERIT=autotools
 IUSE=gsl +pcap sctp +ssl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 ISC
 RDEPEND=sys-libs/ncurses:= gsl? ( sci-libs/gsl:= ) pcap? ( net-libs/libpcap net-libs/libnet:1.1 ) ssl? ( dev-libs/openssl:= )
 SLOT=0
 SRC_URI=https://github.com/SIPp/sipp/releases/download/v3.6.0/sipp-3.6.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=0aaa5a786880b72c9b558f35a08816b0
diff --git a/metadata/md5-cache/net-misc/sitecopy-0.16.6-r1 b/metadata/md5-cache/net-misc/sitecopy-0.16.6-r1
index 1100c7f7377e..6d5e403914e6 100644
--- a/metadata/md5-cache/net-misc/sitecopy-0.16.6-r1
+++ b/metadata/md5-cache/net-misc/sitecopy-0.16.6-r1
@@ -4,11 +4,12 @@ DEPEND=rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] <=
 DESCRIPTION=Maintain remote web sites with ease
 EAPI=7
 HOMEPAGE=http://www.manyfish.co.uk/sitecopy/
+INHERIT=autotools
 IUSE=expat nls rsh ssl webdav xml zlib
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] <=net-libs/neon-0.30.9999[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] )
 SLOT=0
 SRC_URI=mirror://gentoo/sitecopy-0.16.6.tar.gz https://dev.gentoo.org/~jstein/files/sitecopy-0.16.6-04-manpages-addition-fixes.patch
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=05bb2fe55f18b750807b7e927f237340
diff --git a/metadata/md5-cache/net-misc/smbc-1.2.2-r3 b/metadata/md5-cache/net-misc/smbc-1.2.2-r3
index 685195d690f7..f6888d7407a1 100644
--- a/metadata/md5-cache/net-misc/smbc-1.2.2-r3
+++ b/metadata/md5-cache/net-misc/smbc-1.2.2-r3
@@ -4,11 +4,12 @@ DEPEND=dev-libs/popt net-fs/samba sys-libs/ncurses nls? ( sys-devel/gettext )
 DESCRIPTION=Text mode (ncurses) SMB network commander. Features: resume and UTF-8
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/smbc/
+INHERIT=autotools
 IUSE=nls debug
 KEYWORDS=~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/popt net-fs/samba sys-libs/ncurses nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=mirror://sourceforge/smbc/smbc-1.2.2.tgz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=01e7210162598f35d715fedaf825e01f
diff --git a/metadata/md5-cache/net-misc/socat-2.0.0_beta9 b/metadata/md5-cache/net-misc/socat-2.0.0_beta9
index 2e3d596edf98..aecc8b209794 100644
--- a/metadata/md5-cache/net-misc/socat-2.0.0_beta9
+++ b/metadata/md5-cache/net-misc/socat-2.0.0_beta9
@@ -4,11 +4,12 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:=
 DESCRIPTION=Multipurpose relay (SOcket CAT)
 EAPI=7
 HOMEPAGE=http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git
+INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=libressl ssl readline ipv6 tcpd
 LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers )
 RESTRICT=test ssl? ( readline? ( bindist ) )
 SLOT=0
 SRC_URI=http://www.dest-unreach.org/socat/download/socat-2.0.0-b9.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=6e2d943eeec5e25c5851af4c4a3ab419
diff --git a/metadata/md5-cache/net-misc/socat-9999 b/metadata/md5-cache/net-misc/socat-9999
index 53038b934163..69b4a2c09a6a 100644
--- a/metadata/md5-cache/net-misc/socat-9999
+++ b/metadata/md5-cache/net-misc/socat-9999
@@ -4,10 +4,11 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:=
 DESCRIPTION=Multipurpose relay (SOcket CAT)
 EAPI=7
 HOMEPAGE=http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git
+INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=bindist libressl ssl readline ipv6 tcpd
 LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers )
 RESTRICT=test ssl? ( readline? ( bindist ) )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=bfde76663444615e6be3990407bd17a5
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.37-r2 b/metadata/md5-cache/net-misc/spice-gtk-0.37-r2
index ae114c0e63c1..33f26ec2896f 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.37-r2
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.37-r2
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=7
 HOMEPAGE=https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/
+INHERIT=autotools desktop eutils xdg-utils vala readme.gentoo-r1
 IUSE=+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus sys-libs/zlib virtual/jpeg:0= >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lz4? ( app-arch/lz4 ) pulseaudio? ( media-sound/pulseaudio[glib] ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91 ) amd64? ( x11-libs/libva:= ) arm64? ( x11-libs/libva:= ) x86? ( x11-libs/libva:= )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.37.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	vala	5fab64090cefe75c5df431cefa0b653d	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=83d68796b8511233629dd27435c8c2cb
diff --git a/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.2 b/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.2
index f9ab39f15abc..3e0a8e874a44 100644
--- a/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.2
+++ b/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.2
@@ -4,10 +4,11 @@ DEPEND=>=x11-libs/gtk+-2.10.0:2 x11-libs/libX11 virtual/pkgconfig
 DESCRIPTION=A small SSH Askpass replacement written with GTK2
 EAPI=7
 HOMEPAGE=https://github.com/atj/ssh-askpass-fullscreen
+INHERIT=autotools
 KEYWORDS=~alpha amd64 ~arm ~ia64 ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-2.10.0:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/atj/ssh-askpass-fullscreen/releases/download/v1.2/ssh-askpass-fullscreen-1.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=b0e62aad8a8aa0ad18efda1454f6a76b
diff --git a/metadata/md5-cache/net-misc/sstp-client-1.0.10-r1 b/metadata/md5-cache/net-misc/sstp-client-1.0.10-r1
index edbcee24ba80..dd90312a8b75 100644
--- a/metadata/md5-cache/net-misc/sstp-client-1.0.10-r1
+++ b/metadata/md5-cache/net-misc/sstp-client-1.0.10-r1
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-dialup/ppp:= virtual/pk
 DESCRIPTION=A client implementation of Secure Socket Tunneling Protocol (SSTP)
 EAPI=6
 HOMEPAGE=http://sstp-client.sourceforge.net/
+INHERIT=autotools linux-info multilib user
 IUSE=static kernel_linux
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-dialup/ppp:=
 SLOT=0
 SRC_URI=mirror://sourceforge/sstp-client/sstp-client-1.0.10.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8
 _md5_=b8e4ffe427d30f3679742850961e91d8
diff --git a/metadata/md5-cache/net-misc/sstp-client-1.0.12 b/metadata/md5-cache/net-misc/sstp-client-1.0.12
index 9b8357af7a02..1dbe7b183fdc 100644
--- a/metadata/md5-cache/net-misc/sstp-client-1.0.12
+++ b/metadata/md5-cache/net-misc/sstp-client-1.0.12
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0= net-dialup/ppp:= virtual/p
 DESCRIPTION=A client implementation of Secure Socket Tunneling Protocol (SSTP)
 EAPI=6
 HOMEPAGE=http://sstp-client.sourceforge.net/
+INHERIT=autotools linux-info user
 IUSE=static kernel_linux
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0= net-dialup/ppp:=
 SLOT=0
 SRC_URI=mirror://sourceforge/sstp-client/sstp-client-1.0.12.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8
 _md5_=d08ee2d3c054162bdda266c5e69594fb
diff --git a/metadata/md5-cache/net-misc/taylor-uucp-1.07-r4 b/metadata/md5-cache/net-misc/taylor-uucp-1.07-r4
index 1f05016859b0..d72f4e23c30b 100644
--- a/metadata/md5-cache/net-misc/taylor-uucp-1.07-r4
+++ b/metadata/md5-cache/net-misc/taylor-uucp-1.07-r4
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install preinst prepare
 DESCRIPTION=Taylor UUCP
 EAPI=7
 HOMEPAGE=https://www.airs.com/ian/uucp.html
+INHERIT=autotools flag-o-matic
 KEYWORDS=~alpha amd64 ~arm ~ia64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/uucp/uucp-1.07.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
 _md5_=1300c526214aedf1ca46f83d60b948d7
diff --git a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1 b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
index d97d38220a9f..60f29d7a6278 100644
--- a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
+++ b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
@@ -3,11 +3,12 @@ DEPEND=sys-libs/ncurses:= !net-misc/netkit-telnetd xinetd? ( sys-apps/xinetd ) v
 DESCRIPTION=Telnet and telnetd ported from OpenBSD with IPv6 support
 EAPI=5
 HOMEPAGE=ftp://ftp.suse.com/pub/people/kukuk/ipv6/
+INHERIT=eutils autotools toolchain-funcs
 IUSE=nls xinetd
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/telnet-bsd-1.2.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=34c36967d2f8ed3069c13c087d7ecd22
diff --git a/metadata/md5-cache/net-misc/throttle-1.2-r1 b/metadata/md5-cache/net-misc/throttle-1.2-r1
index e1ea47cc54e4..b460b362148b 100644
--- a/metadata/md5-cache/net-misc/throttle-1.2-r1
+++ b/metadata/md5-cache/net-misc/throttle-1.2-r1
@@ -3,9 +3,10 @@ DEFINED_PHASES=prepare
 DESCRIPTION=Bandwidth limiting pipe
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=autotools
 KEYWORDS=amd64 ~x86 ~amd64-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grobian/throttle-1.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=73af1cdb4461fc85be11bbce76a5f207
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.11.0-r2 b/metadata/md5-cache/net-misc/tigervnc-1.11.0-r2
index af8c7c728365..9bc4aa122eb8 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.11.0-r2
+++ b/metadata/md5-cache/net-misc/tigervnc-1.11.0-r2
@@ -4,11 +4,12 @@ DEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/g
 DESCRIPTION=Remote desktop viewer display system
 EAPI=7
 HOMEPAGE=http://www.tigervnc.org
+INHERIT=autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
 IUSE=dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule elibc_FreeBSD java
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( sys-libs/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/pixman server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xinerama? ( x11-libs/libXinerama ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.11.0.tar.gz -> tigervnc-1.11.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.20.0.tar.bz2 )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	systemd	74b223e42834adf09a2d21fe5fe13741	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
 _md5_=31a30a8b92ef74fc11abdfa5defa6314
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1 b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
index fa74fd98939a..bf90006a5829 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
+++ b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
@@ -3,11 +3,12 @@ DEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/g
 DESCRIPTION=Remote desktop viewer display system
 EAPI=6
 HOMEPAGE=http://www.tigervnc.org
+INHERIT=autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd xdg-utils gnome2-utils
 IUSE=dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule elibc_FreeBSD java
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( sys-libs/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xinerama? ( x11-libs/libXinerama ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.9.0.tar.gz -> tigervnc-1.9.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.20.0.tar.bz2 )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	378e4cda228ea0231a0ac283cb2ad25c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	systemd	74b223e42834adf09a2d21fe5fe13741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
 _md5_=02d9ab631537741edf9102cdcd75b49d
diff --git a/metadata/md5-cache/net-misc/usbip-4.13-r1 b/metadata/md5-cache/net-misc/usbip-4.13-r1
index 7fbe8db2c1d8..c4b254cec570 100644
--- a/metadata/md5-cache/net-misc/usbip-4.13-r1
+++ b/metadata/md5-cache/net-misc/usbip-4.13-r1
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtua
 DESCRIPTION=Userspace utilities for a general USB device sharing system over IP networks
 EAPI=6
 HOMEPAGE=https://www.kernel.org/
+INHERIT=autotools kernel-2
 IUSE=tcpd symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtu
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	estack	055c42df72f76a4f45ec92b35e83cd56	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26
 _md5_=7d8cd139f4cd66e96ed87d0eb695bde3
diff --git a/metadata/md5-cache/net-misc/vde-2.3.2_p20191011 b/metadata/md5-cache/net-misc/vde-2.3.2_p20191011
index d04a7a7dd489..4e14ba172c92 100644
--- a/metadata/md5-cache/net-misc/vde-2.3.2_p20191011
+++ b/metadata/md5-cache/net-misc/vde-2.3.2_p20191011
@@ -3,11 +3,12 @@ DEPEND=pcap? ( net-libs/libpcap ) >=app-portage/elt-patches-20170815 || ( >=sys-
 DESCRIPTION=Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml
 EAPI=6
 HOMEPAGE=https://virtualsquare.org
+INHERIT=flag-o-matic autotools
 IUSE=pcap selinux static-libs
 KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=pcap? ( net-libs/libpcap ) acct-group/qemu selinux? ( sec-policy/selinux-vde )
 SLOT=0
 SRC_URI=https://github.com/virtualsquare/vde-2/archive/c7b36a57831a9067c8619c3e17a03e595623b3eb.tar.gz -> vde-2.3.2_p20191011.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=7a5d21177cdde908faf0ced050021d1d
diff --git a/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1 b/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
index 2c215f84f848..b4e646f75fe4 100644
--- a/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
+++ b/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=pcap? ( net-libs/libpcap ) acct-group/qemu selinux? ( sec-policy/selinux-vde )
 SLOT=0
 SRC_URI=https://github.com/virtualsquare/vde-2/archive/c7b36a57831a9067c8619c3e17a03e595623b3eb.tar.gz -> vde-2.3.2_p20191011.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=9c9142d7cd5f62bd475599a3bc7dc6dc
diff --git a/metadata/md5-cache/net-misc/vde-9999 b/metadata/md5-cache/net-misc/vde-9999
index fde28c6b3bc7..d81dc62223f4 100644
--- a/metadata/md5-cache/net-misc/vde-9999
+++ b/metadata/md5-cache/net-misc/vde-9999
@@ -3,10 +3,11 @@ DEPEND=pcap? ( net-libs/libpcap ) >=app-portage/elt-patches-20170815 || ( >=sys-
 DESCRIPTION=Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml
 EAPI=6
 HOMEPAGE=https://virtualsquare.org
+INHERIT=flag-o-matic autotools git-r3
 IUSE=pcap selinux static-libs
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=pcap? ( net-libs/libpcap ) acct-group/qemu selinux? ( sec-policy/selinux-vde )
 SLOT=0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=7a5d21177cdde908faf0ced050021d1d
diff --git a/metadata/md5-cache/net-misc/vinagre-3.22.0-r3 b/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
index 72d9b70352ef..9478517c19ac 100644
--- a/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
+++ b/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=de
 DESCRIPTION=VNC client for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Vinagre
+INHERIT=autotools gnome2 linux-info vala
 IUSE=rdp +ssh spice +telepathy zeroconf kernel_linux
 KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3(+)] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/hicolor-icon-theme rdp? ( >=net-misc/freerdp-1.1:= ) ssh? ( >=x11-libs/vte-0.20:2.91 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3(+)] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vinagre/3.22/vinagre-3.22.0.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	532d56d07b9eace4831aaa817d2b756a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	vala	5fab64090cefe75c5df431cefa0b653d
 _md5_=b7697d99f64c8213386e85820f210498
diff --git a/metadata/md5-cache/net-misc/vino-3.22.0-r3 b/metadata/md5-cache/net-misc/vino-3.22.0-r3
index ec54778ab82b..c6f5c207d3d4 100644
--- a/metadata/md5-cache/net-misc/vino-3.22.0-r3
+++ b/metadata/md5-cache/net-misc/vino-3.22.0-r3
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libgcrypt-1.1.90:0= >=x11-libs/gtk+-3:3
 DESCRIPTION=An integrated VNC server for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vino
+INHERIT=gnome2 systemd
 IUSE=crypt debug gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libgcrypt-1.1.90:0= >=x11-libs/gtk+-3:
 REQUIRED_USE=jpeg? ( zlib )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vino/3.22/vino-3.22.0.tar.xz https://dev.gentoo.org/~leio/distfiles/vino-3.22.0-patchset.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	532d56d07b9eace4831aaa817d2b756a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=527d224de2c11e8bd45a20cde021d3a7
diff --git a/metadata/md5-cache/net-misc/vmpsd-1.4 b/metadata/md5-cache/net-misc/vmpsd-1.4
index 35f7d99c75aa..f54d21e4be06 100644
--- a/metadata/md5-cache/net-misc/vmpsd-1.4
+++ b/metadata/md5-cache/net-misc/vmpsd-1.4
@@ -4,10 +4,11 @@ DEPEND=net-analyzer/net-snmp:=[ucd-compat(+)] dev-libs/openssl
 DESCRIPTION=An open-source VLAN management system
 EAPI=7
 HOMEPAGE=http://vmps.sourceforge.net
+INHERIT=autotools
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=net-analyzer/net-snmp:=[ucd-compat(+)]
 SLOT=0
 SRC_URI=mirror://sourceforge/vmps/vmpsd-1.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=b9f1cf7439a20c6a3ead753abf9d16b9
diff --git a/metadata/md5-cache/net-misc/wget2-1.99.2 b/metadata/md5-cache/net-misc/wget2-1.99.2
index 5d784ab16847..da5cc2eeb794 100644
--- a/metadata/md5-cache/net-misc/wget2-1.99.2
+++ b/metadata/md5-cache/net-misc/wget2-1.99.2
@@ -4,6 +4,7 @@ DEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) !gnutls? ( dev-libs
 DESCRIPTION=GNU Wget2 is a file and recursive website downloader
 EAPI=7
 HOMEPAGE=https://gitlab.com/gnuwget/wget2
+INHERIT=autotools
 IUSE=brotli bzip2 doc +gnutls gpgme +http2 idn libressl lzma openssl pcre psl +ssl test valgrind xattr zlib
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=valgrind? ( test )
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=mirror://gnu/wget/wget2-1.99.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b
 _md5_=18cee69ce4faf8c961864f4df866bc0b
diff --git a/metadata/md5-cache/net-misc/wget2-9999 b/metadata/md5-cache/net-misc/wget2-9999
index b8a4a44af1a0..48704c2b287f 100644
--- a/metadata/md5-cache/net-misc/wget2-9999
+++ b/metadata/md5-cache/net-misc/wget2-9999
@@ -4,6 +4,7 @@ DEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) !gnutls? ( dev-libs
 DESCRIPTION=GNU Wget2 is a file and recursive website downloader
 EAPI=7
 HOMEPAGE=https://gitlab.com/gnuwget/wget2
+INHERIT=autotools git-r3
 IUSE=brotli bzip2 doc +gnutls gpgme +http2 idn libressl lzma openssl pcre psl +ssl test valgrind xattr zlib
 LICENSE=GPL-3
 PROPERTIES=live
@@ -11,5 +12,5 @@ RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) !gnutls? ( dev-lib
 REQUIRED_USE=valgrind? ( test )
 RESTRICT=!test? ( test )
 SLOT=0/0
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=93f8eb82bb8884866bed29e9517fcf5a
diff --git a/metadata/md5-cache/net-misc/zsync-0.6.2-r1 b/metadata/md5-cache/net-misc/zsync-0.6.2-r1
index 7ef77a0229e6..cc7caf541871 100644
--- a/metadata/md5-cache/net-misc/zsync-0.6.2-r1
+++ b/metadata/md5-cache/net-misc/zsync-0.6.2-r1
@@ -3,9 +3,10 @@ DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.
 DESCRIPTION=Partial/differential file download client over HTTP which uses the rsync algorithm
 EAPI=5
 HOMEPAGE=http://zsync.moria.org.uk/
+INHERIT=autotools eutils
 KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=Artistic-2
 SLOT=0
 SRC_URI=http://zsync.moria.org.uk/download/zsync-0.6.2.tar.bz2 http://www.gzip.org/zlib/zlib-1.2.3.tar.bz2 http://www.zlib.net/zlib-1.2.3.tar.bz2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=0be0796d5dd11fbf561de541d842a06e