2021-03-28 10:53:17 UTC

23 files changed, 37 insertions, 23 deletions

diff --git a/metadata/md5-cache/net-im/bitlbee-3.6-r1 b/metadata/md5-cache/net-im/bitlbee-3.6-r1
index 10122d01e462..c00c9db7fdd4 100644
--- a/metadata/md5-cache/net-im/bitlbee-3.6-r1
+++ b/metadata/md5-cache/net-im/bitlbee-3.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( purple xmpp msn oscar ) xmpp? ( !nss ) test? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://get.bitlbee.org/src/bitlbee-3.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	systemd	74b223e42834adf09a2d21fe5fe13741
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98	systemd	74b223e42834adf09a2d21fe5fe13741
 _md5_=85f46e8e53f86f490a95f87097f402ff
diff --git a/metadata/md5-cache/net-im/bitlbee-9999 b/metadata/md5-cache/net-im/bitlbee-9999
index 7debc277a4b3..6c41560cbf17 100644
--- a/metadata/md5-cache/net-im/bitlbee-9999
+++ b/metadata/md5-cache/net-im/bitlbee-9999
@@ -12,5 +12,5 @@ RDEPEND=acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 purple? ( net-im/pi
 REQUIRED_USE=|| ( purple xmpp msn oscar ) xmpp? ( !nss ) test? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	systemd	74b223e42834adf09a2d21fe5fe13741	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98	systemd	74b223e42834adf09a2d21fe5fe13741	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=bd2b69fa0c090ef1af1a21b161b1a477
diff --git a/metadata/md5-cache/net-im/empathy-3.12.14 b/metadata/md5-cache/net-im/empathy-3.12.14
index bcd98c40820d..8a6c12317256 100644
--- a/metadata/md5-cache/net-im/empathy-3.12.14
+++ b/metadata/md5-cache/net-im/empathy-3.12.14
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.48:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.4
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/empathy/3.12/empathy-3.12.14.tar.xz
-_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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	4d6de9e2337521f60965d1a9a118761f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	4d6de9e2337521f60965d1a9a118761f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=59828fe4c0ff5c1d2129ebb8698aa1df
diff --git a/metadata/md5-cache/net-im/err-6.1.7 b/metadata/md5-cache/net-im/err-6.1.7
index 94bbdc9fe82b..d8c3ce73fa60 100644
--- a/metadata/md5-cache/net-im/err-6.1.7
+++ b/metadata/md5-cache/net-im/err-6.1.7
@@ -4,6 +4,7 @@ DEPEND=acct-group/err acct-user/err
 DESCRIPTION=Multiprotocol chatbot designed to be easily deployable and maintainable
 EAPI=7
 HOMEPAGE=https://errbot.readthedocs.io/en/latest/
+INHERIT=distutils-r1
 IUSE=irc +xmpp test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/errbotio/errbot/archive/6.1.7.tar.gz -> err-6.1.7.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35
 _md5_=dc13f59f73eaf1635d0fe23a727e710b
diff --git a/metadata/md5-cache/net-im/gajim-1.2.1 b/metadata/md5-cache/net-im/gajim-1.2.1
index f79ae5ae0f4e..ec1566301724 100644
--- a/metadata/md5-cache/net-im/gajim-1.2.1
+++ b/metadata/md5-cache/net-im/gajim-1.2.1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspec
 DESCRIPTION=Jabber client written in PyGTK
 EAPI=7
 HOMEPAGE=https://gajim.org/
+INHERIT=distutils-r1 xdg-utils
 IUSE=+crypt geolocation jingle remote rst +spell upnp +webp python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspe
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://gajim.org/downloads/1.2/gajim-1.2.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39106cb142379c39511a3f538ab3083d
diff --git a/metadata/md5-cache/net-im/gajim-1.2.2 b/metadata/md5-cache/net-im/gajim-1.2.2
index 53cf46c129b5..3621d8207872 100644
--- a/metadata/md5-cache/net-im/gajim-1.2.2
+++ b/metadata/md5-cache/net-im/gajim-1.2.2
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspec
 DESCRIPTION=Jabber client written in PyGTK
 EAPI=7
 HOMEPAGE=https://gajim.org/
+INHERIT=distutils-r1 xdg-utils
 IUSE=+crypt geolocation jingle remote rst +spell upnp +webp python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspe
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://gajim.org/downloads/1.2/gajim-1.2.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb52152bc228a87219cddf7e6c9bdc83
diff --git a/metadata/md5-cache/net-im/gajim-1.3.0 b/metadata/md5-cache/net-im/gajim-1.3.0
index 10ac20228ada..4443e6c342a0 100644
--- a/metadata/md5-cache/net-im/gajim-1.3.0
+++ b/metadata/md5-cache/net-im/gajim-1.3.0
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspec
 DESCRIPTION=Jabber client written in PyGTK
 EAPI=7
 HOMEPAGE=https://gajim.org/
+INHERIT=distutils-r1 xdg-utils
 IUSE=+crypt geolocation jingle remote rst +spell upnp +webp python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspe
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://gajim.org/downloads/1.3/gajim-1.3.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b3f96930e762fcf7beba4db17ebf443
diff --git a/metadata/md5-cache/net-im/gajim-1.3.1 b/metadata/md5-cache/net-im/gajim-1.3.1
index fa0c68fbb517..2141944446d6 100644
--- a/metadata/md5-cache/net-im/gajim-1.3.1
+++ b/metadata/md5-cache/net-im/gajim-1.3.1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspec
 DESCRIPTION=Jabber client written in PyGTK
 EAPI=7
 HOMEPAGE=https://gajim.org/
+INHERIT=distutils-r1 xdg-utils
 IUSE=+crypt geolocation jingle remote rst +spell upnp +webp python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspe
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://gajim.org/downloads/1.3/gajim-1.3.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b3f96930e762fcf7beba4db17ebf443
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.1 b/metadata/md5-cache/net-im/pidgin-2.14.1
index f4de476e4bda..a139722afdf8 100644
--- a/metadata/md5-cache/net-im/pidgin-2.14.1
+++ b/metadata/md5-cache/net-im/pidgin-2.14.1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/lib
 REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.1.tar.bz2 https://dev.gentoo.org/~polynomial-c/pidgin-eds-3.6.patch.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-single-r1	d3100de905f978df912135806cf27188	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
 _md5_=ebdad2c7684110a96af59ab3bd7ab79a
diff --git a/metadata/md5-cache/net-im/poezio-0.13.1-r1 b/metadata/md5-cache/net-im/poezio-0.13.1-r1
index 552bba129d9b..b1f370d3359d 100644
--- a/metadata/md5-cache/net-im/poezio-0.13.1-r1
+++ b/metadata/md5-cache/net-im/poezio-0.13.1-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Console XMPP client that looks like most famous IRC clients
 EAPI=7
 HOMEPAGE=https://poez.io/
+INHERIT=distutils-r1 readme.gentoo-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64
 LICENSE=ZLIB
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/poezio/poezio-0.13.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=44b2a3dc398a5f5cc8c554bd0ba3d7f2
diff --git a/metadata/md5-cache/net-im/poezio-9999 b/metadata/md5-cache/net-im/poezio-9999
index 5e5256934b27..71492b4cfda7 100644
--- a/metadata/md5-cache/net-im/poezio-9999
+++ b/metadata/md5-cache/net-im/poezio-9999
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test unpack
 DESCRIPTION=Console XMPP client that looks like most famous IRC clients
 EAPI=7
 HOMEPAGE=https://poez.io/
+INHERIT=distutils-r1 readme.gentoo-r1 git-r3
 IUSE=test python_targets_python3_7 python_targets_python3_8
 LICENSE=ZLIB
 PROPERTIES=live
@@ -10,5 +11,5 @@ RDEPEND=dev-python/aiodns[python_targets_python3_7(-)?,python_targets_python3_8(
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=b6457e5948271ccefc5b2714dfb690ee
diff --git a/metadata/md5-cache/net-im/skype-dbus-mock-0_pre20181011 b/metadata/md5-cache/net-im/skype-dbus-mock-0_pre20181011
index 07f4338584ae..8183abad5b30 100644
--- a/metadata/md5-cache/net-im/skype-dbus-mock-0_pre20181011
+++ b/metadata/md5-cache/net-im/skype-dbus-mock-0_pre20181011
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst setup
 DESCRIPTION=Mocked systemd dbus interface for skype 8.30+
 EAPI=7
 HOMEPAGE=https://github.com/maelnor/skype-dbus-mock
+INHERIT=python-single-r1
 IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -9,5 +10,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/maelnor/skype-dbus-mock/archive/3a9e2882ac5c0ad6be3c5cb5c7da008b4cfa51da.tar.gz -> skype-dbus-mock-0_pre20181011.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c
 _md5_=ff0385e2810cbfe2a27a97f1d44dc887
diff --git a/metadata/md5-cache/net-im/swift-4.0.2-r102 b/metadata/md5-cache/net-im/swift-4.0.2-r102
index 088eea440124..10522204a70f 100644
--- a/metadata/md5-cache/net-im/swift-4.0.2-r102
+++ b/metadata/md5-cache/net-im/swift-4.0.2-r102
@@ -4,6 +4,7 @@ DEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/openssl:0= net-libs/libnatpmp n
 DESCRIPTION=An elegant, secure, adaptable and intuitive XMPP Client
 EAPI=7
 HOMEPAGE=https://www.swift.im/
+INHERIT=lua-single python-any-r1 scons-utils toolchain-funcs
 IUSE=expat +icu +idn lua test zeroconf lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2
 KEYWORDS=amd64
 LICENSE=BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1
@@ -12,5 +13,5 @@ REQUIRED_USE=|| ( icu idn ) lua? ( ^^ ( lua_single_target_luajit lua_single_targ
 RESTRICT=test
 SLOT=4/0
 SRC_URI=https://swift.im/downloads/releases/swift-4.0.2/swift-4.0.2.tar.gz https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	0c3d02e3e56d99a17ac273db118e8a24
 _md5_=c202ff32ea0e57807cf1c7e2f1b5ef2a
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.4.11 b/metadata/md5-cache/net-im/telegram-desktop-2.4.11
index c5d4c205d8d4..6af393e72d45 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-2.4.11
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.4.11
@@ -12,5 +12,5 @@ RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= app-arch/xz-utils !libressl?
 REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) webrtc? ( !libressl )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.4.11/tdesktop-2.4.11-full.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98
 _md5_=4aa0e6d0e5aa388aa2790d1930c3fc6f
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.4.7-r1 b/metadata/md5-cache/net-im/telegram-desktop-2.4.7-r1
index bc9186582eee..d4c1a26e7195 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-2.4.7-r1
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.4.7-r1
@@ -4,6 +4,7 @@ DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) !net-i
 DESCRIPTION=Official desktop client for Telegram
 EAPI=7
 HOMEPAGE=https://desktop.telegram.org
+INHERIT=cmake desktop flag-o-matic ninja-utils python-any-r1 xdg-utils
 IUSE=+dbus enchant +gtk +hunspell libressl lto pulseaudio +spell +webrtc +X
 KEYWORDS=amd64 ~ppc64
 LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
@@ -11,5 +12,5 @@ RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= app-arch/xz-utils !libressl?
 REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) webrtc? ( !libressl )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.4.7/tdesktop-2.4.7-full.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98
 _md5_=c7e1bc73b40ef1bdd2315b1fd715bda4
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.7.1-r1 b/metadata/md5-cache/net-im/telegram-desktop-2.7.1-r1
index a27d26068ade..bf699cf2eecd 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-2.7.1-r1
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.7.1-r1
@@ -12,5 +12,5 @@ RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/xx
 REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.7.1/tdesktop-2.7.1-full.tar.gz
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	cmake	314a813be2f09820e8978cdee941e501	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	cmake	314a813be2f09820e8978cdee941e501	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98
 _md5_=30bc038e09a125037b3fd7bdd89b9319
diff --git a/metadata/md5-cache/net-im/telepathy-logger-0.8.2-r1 b/metadata/md5-cache/net-im/telepathy-logger-0.8.2-r1
index 38823c45b36b..9c2cc6d4aa03 100644
--- a/metadata/md5-cache/net-im/telepathy-logger-0.8.2-r1
+++ b/metadata/md5-cache/net-im/telepathy-logger-0.8.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.1 >=dev-libs/dbus-glib-0.82 >=n
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-0.8.2.tar.bz2 https://gitlab.freedesktop.org/telepathy/telepathy-logger/-/merge_requests/1.patch -> telepathy-logger-0.8.2-py3.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	4d6de9e2337521f60965d1a9a118761f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	e8f1ec13660dc2f44b32775765d85e42	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	4d6de9e2337521f60965d1a9a118761f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=2c981723a944bad53ac4eea307076a09
diff --git a/metadata/md5-cache/net-im/telepathy-mission-control-5.16.5 b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.5
index 753a9e4133cb..6cb1a2d3fbca 100644
--- a/metadata/md5-cache/net-im/telepathy-mission-control-5.16.5
+++ b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.82 >=dev-libs/glib-2.46:2 >=sys-apps/dbus-0.95 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-5.16.5.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	libtool	f143db5a74ccd9ca28c1234deffede96	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	4d6de9e2337521f60965d1a9a118761f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
+_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	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	gnome.org	4d6de9e2337521f60965d1a9a118761f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98
 _md5_=5b3af646c35bbc9436b8a967580d0897
diff --git a/metadata/md5-cache/net-im/telepathy-mission-control-5.16.6 b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.6
index d1bd5923c0a3..6ea54c7a30f1 100644
--- a/metadata/md5-cache/net-im/telepathy-mission-control-5.16.6
+++ b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.6
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/dbus-glib-0.82 >=dev-libs/glib-2.46:2 >=sys-apps/dbus-0.95 >=net-libs/telepathy-glib-0.20 networkmanager? ( >=net-misc/networkmanager-1:= )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-5.16.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	gnome.org	4d6de9e2337521f60965d1a9a118761f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	gnome.org	4d6de9e2337521f60965d1a9a118761f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	gnome2	c156bb2ac81c822dd861424ce19bc168	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-any-r1	690a993463cd2ebcde40ccdf1bd9ba98
 _md5_=2a9cca7953b215b428e541e384187916
diff --git a/metadata/md5-cache/net-im/toxic-0.10.0-r1 b/metadata/md5-cache/net-im/toxic-0.10.0-r1
index 17e88e1b8cb6..f61452f9db23 100644
--- a/metadata/md5-cache/net-im/toxic-0.10.0-r1
+++ b/metadata/md5-cache/net-im/toxic-0.10.0-r1
@@ -3,6 +3,7 @@ DEPEND=dev-libs/libconfig:= net-libs/tox:= net-misc/curl sys-libs/ncurses:= audi
 DESCRIPTION=A curses-based client for Tox
 EAPI=7
 HOMEPAGE=https://github.com/JFreegman/toxic
+INHERIT=python-single-r1 xdg
 IUSE=+audio-notify debug doc llvm notification png python qrcode +sound +video +X python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/libconfig:= net-libs/tox:= net-misc/curl sys-libs/ncurses:= aud
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) video? ( sound X )
 SLOT=0
 SRC_URI=https://github.com/JFreegman/toxic/archive/v0.10.0.tar.gz -> toxic-0.10.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
 _md5_=3a524c375a5635a4ffe7f22fbdbff8a3
diff --git a/metadata/md5-cache/net-im/toxic-0.8.3-r2 b/metadata/md5-cache/net-im/toxic-0.8.3-r2
index 97eb066af5dd..f34b2c3cee73 100644
--- a/metadata/md5-cache/net-im/toxic-0.8.3-r2
+++ b/metadata/md5-cache/net-im/toxic-0.8.3-r2
@@ -3,6 +3,7 @@ DEPEND=dev-libs/libconfig:= >=net-libs/tox-0.2.8:= net-misc/curl sys-libs/ncurse
 DESCRIPTION=A curses-based client for Tox
 EAPI=7
 HOMEPAGE=https://github.com/JFreegman/toxic
+INHERIT=python-single-r1 xdg
 IUSE=notification python qrcode +sound +video +X python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/libconfig:= >=net-libs/tox-0.2.8:= net-misc/curl sys-libs/ncurs
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/JFreegman/toxic/archive/v0.8.3.tar.gz -> toxic-0.8.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
 _md5_=0f66c8b9ad50e26f016db50820bdc2bd
diff --git a/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r1 b/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r1
index f2040cb4101a..db72e66d57a3 100644
--- a/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r1
+++ b/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r1
@@ -4,6 +4,7 @@ DEPEND=dev-python/protobuf-python[python_targets_python3_7(-)?,python_targets_py
 DESCRIPTION=A WhatsApp XMPP Gateway based on Spectrum 2 and Yowsup 3
 EAPI=7
 HOMEPAGE=https://github.com/stv0g/transwhat
+INHERIT=distutils-r1
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
@@ -11,5 +12,5 @@ RDEPEND=dev-python/protobuf-python[python_targets_python3_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/stv0g/transwhat/archive/d022243f6c7b23674d3c87a09819f00b10df1165.tar.gz -> transwhat-0.2.2_p20190426.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35
 _md5_=0e0e71b3c850e09cd8aa22e6d45c1a3f
diff --git a/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905 b/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
index a598eab9f761..5837b2bdd7a8 100644
--- a/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
+++ b/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
@@ -4,6 +4,7 @@ DEPEND=dev-python/appdirs[python_targets_python3_7(-)?,python_targets_python3_8(
 DESCRIPTION=A library that enables you to build applications which use the WhatsApp service
 EAPI=7
 HOMEPAGE=https://github.com/tgalal/yowsup
+INHERIT=distutils-r1
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=dev-python/appdirs[python_targets_python3_7(-)?,python_targets_python3_8
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/tgalal/yowsup/archive/2adc067f306d9e7d8b634f66e96c52d80a42e1ff.tar.gz -> yowsup-3.2.3_p20190905.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35
 _md5_=462ec9e9d498c0e707034380c7e40495