gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /metadata/md5-cache/x11-misc
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
320 files changed, 741 insertions, 869 deletions
diff --git a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2 b/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2
index 7981e5ae17bb..f9f74de35db3 100644
--- a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2
+++ b/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=postinst prepare
 DEPEND=>=media-libs/freetype-2 media-libs/freeglut media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm x11-base/xorg-proto
 DESCRIPTION=OpenGL virtual desktop switching
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/freetype-2 media-libs/freeglut media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=mirror://sourceforge/desk3d/3ddesktop-0.2.9.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1747249f259ae3d15de0c6412f8812f0
diff --git a/metadata/md5-cache/x11-misc/3dfb-0.6.1-r1 b/metadata/md5-cache/x11-misc/3dfb-0.6.1-r1
index 4b27ba315754..251658cfd0df 100644
--- a/metadata/md5-cache/x11-misc/3dfb-0.6.1-r1
+++ b/metadata/md5-cache/x11-misc/3dfb-0.6.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 media-libs/freeglut virtual/opengl x11-libs/libXmu
 SLOT=0
 SRC_URI=mirror://sourceforge/dz3d/3dfb-0.6.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ecf9b29c482e6dbdc98dcee82c22d011
+_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56
+_md5_=5fab99c3318383027609ce635c7e78c3
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index f7255f637417..1296a37620f2 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/accessx-0951-r2 b/metadata/md5-cache/x11-misc/accessx-0951-r2
index fdec1168e2f3..59a048dad102 100644
--- a/metadata/md5-cache/x11-misc/accessx-0951-r2
+++ b/metadata/md5-cache/x11-misc/accessx-0951-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext dev-lang/tk:0=
+DEPEND=x11-libs/libX11 x11-libs/libXext dev-lang/tk:0= virtual/pkgconfig
 DESCRIPTION=Interface to the XKEYBOARD extension in X11
 EAPI=6
 HOMEPAGE=http://cita.disability.uiuc.edu/software/accessx/freewareaccessx.php
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext dev-lang/tk:0=
 SLOT=0
 SRC_URI=http://cmos-eng.rehab.uiuc.edu/accessx/software/accessx0951.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e3c32c385546ab566e19e150f6a9da77
+_md5_=16d0cefb57971ffc9f3f3beda5886633
diff --git a/metadata/md5-cache/x11-misc/alacarte-3.36.0 b/metadata/md5-cache/x11-misc/alacarte-3.36.0
index ef760960d443..330cf13195bd 100644
--- a/metadata/md5-cache/x11-misc/alacarte-3.36.0
+++ b/metadata/md5-cache/x11-misc/alacarte-3.36.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/alacarte/3.36/alacarte-3.36.0.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1123ac26796ef6ddee62602989275f34
diff --git a/metadata/md5-cache/x11-misc/albert-0.17.2 b/metadata/md5-cache/x11-misc/albert-0.17.2
index 7a6c35d90088..0a0bad586d0e 100644
--- a/metadata/md5-cache/x11-misc/albert-0.17.2
+++ b/metadata/md5-cache/x11-misc/albert-0.17.2
@@ -12,5 +12,5 @@ REQUIRED_USE=python-extensions? ( python )
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://github.com/albertlauncher/albert/archive/v0.17.2.tar.gz -> albert-0.17.2.tar.gz https://github.com/albertlauncher/plugins/archive/b4cac28be7b265027b00279baba14086d97c4d07.tar.gz -> albert-0.17.2-plugins.tar.gz python? ( https://github.com/pybind/pybind11/archive/v2.6.1.tar.gz -> albert-0.17.2-pybind11-2.6.1.tar.gz ) python-extensions? ( https://github.com/albertlauncher/python/archive/7f571aceaf8e60eee8bb21e1ec4efa0e95523d13.tar.gz -> albert-0.17.2-python-extensions.tar.gz https://github.com/mqus/jetbrains-albert-plugin/archive/b7157473cc923fe4f15023c85a032eeab3627652.tar.gz -> albert-0.17.2-jetbrains-python-extension.tar.gz https://github.com/bergercookie/xkcd-albert-plugin/archive/bf88a964473d65b39c9e09eb48dabb847206f06f.tar.gz -> albert-0.17.2-xkcd-python-extension.tar.gz )
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3f3c0949335e9e8617e59d462d64b3ab
diff --git a/metadata/md5-cache/x11-misc/alock-1.0.0 b/metadata/md5-cache/x11-misc/alock-1.0.0
index 4a4d423e5350..9da916fc63b8 100644
--- a/metadata/md5-cache/x11-misc/alock-1.0.0
+++ b/metadata/md5-cache/x11-misc/alock-1.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXcursor imlib? ( media-libs/imlib2[X] ) pam? ( sys-libs/pam ) doc? ( app-text/asciidoc )
 SLOT=0
 SRC_URI=https://github.com/mgumz/alock/archive/v1.0.0.tar.gz -> alock-1.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b8fbcc2d6eb7264e27718152e0cf0167
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5114043eadc076043def8925d92f607c
diff --git a/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1 b/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
index 73acac89bfd5..909eb49daecc 100644
--- a/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
+++ b/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/glib[dbus] >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gtk+-3.22.0:3
 SLOT=0
 SRC_URI=https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d1a65e77d42cb19e5972d0d1b84/appmenu-gtk-module-0.7.3.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c0f1322fb01e114091a714ebd494cc2
diff --git a/metadata/md5-cache/x11-misc/apwal-0.4.5-r2 b/metadata/md5-cache/x11-misc/apwal-0.4.5-r2
index 84bd82681626..214e9434ec89 100644
--- a/metadata/md5-cache/x11-misc/apwal-0.4.5-r2
+++ b/metadata/md5-cache/x11-misc/apwal-0.4.5-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure
-DEPEND=x11-libs/gtk+:2 x11-libs/gdk-pixbuf dev-libs/libxml2 dev-libs/glib:2 virtual/pkgconfig
+DEPEND=dev-libs/libxml2 dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=A simple application launcher and combined editor
 EAPI=6
 HOMEPAGE=http://apwal.free.fr/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 x11-libs/gdk-pixbuf dev-libs/libxml2 dev-libs/glib:2
+RDEPEND=dev-libs/libxml2 dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://apwal.free.fr/download/apwal-0.4.5.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=04a4a7228a7b6c9ebd712f4b7aa18fe7
+_md5_=e759bf37d93f00861c2fd5385bae5c10
diff --git a/metadata/md5-cache/x11-misc/arandr-0.1.10 b/metadata/md5-cache/x11-misc/arandr-0.1.10
index a91b8979f9b0..d8c1cea5436b 100644
--- a/metadata/md5-cache/x11-misc/arandr-0.1.10
+++ b/metadata/md5-cache/x11-misc/arandr-0.1.10
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3=[python_targets_python3_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://christian.amsuess.com/tools/arandr/files/arandr-0.1.10.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=947ff0c9eae8cf800ebd4de4b67db860
diff --git a/metadata/md5-cache/x11-misc/barrier-2.3.3 b/metadata/md5-cache/x11-misc/barrier-2.3.3
index b054c73ff15f..1b54a7332175 100644
--- a/metadata/md5-cache/x11-misc/barrier-2.3.3
+++ b/metadata/md5-cache/x11-misc/barrier-2.3.3
@@ -11,5 +11,5 @@ RDEPEND=net-misc/curl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/debauchee/barrier/archive/v2.3.3.tar.gz -> barrier-2.3.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=459b0a0fe5550d578070e8a2b8211d04
diff --git a/metadata/md5-cache/x11-misc/bbacpi-0.1.5-r3 b/metadata/md5-cache/x11-misc/bbacpi-0.1.5-r3
index 788f6f25df97..2483df09d8f1 100644
--- a/metadata/md5-cache/x11-misc/bbacpi-0.1.5-r3
+++ b/metadata/md5-cache/x11-misc/bbacpi-0.1.5-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=media-libs/imlib sys-power/acpi sys-power/acpid x11-libs/libX11 x11-misc/xdialog >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/imlib sys-power/acpi sys-power/acpid x11-libs/libX11 x11-misc/xdialog sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=ACPI monitor for X11
 EAPI=6
 HOMEPAGE=http://bbacpi.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/imlib sys-power/acpi sys-power/acpid x11-libs/libX11 x11-misc/xdialog media-fonts/font-adobe-100dpi
 SLOT=0
 SRC_URI=mirror://sourceforge/bbacpi/bbacpi-0.1.5.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=237534b593c157d74dbefea1bb533f64
diff --git a/metadata/md5-cache/x11-misc/bbcd-0.3.1-r2 b/metadata/md5-cache/x11-misc/bbcd-0.3.1-r3
index 83fd94f00042..b6b328998517 100644
--- a/metadata/md5-cache/x11-misc/bbcd-0.3.1-r2
+++ b/metadata/md5-cache/x11-misc/bbcd-0.3.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=media-libs/libcdaudio x11-libs/libX11
+DEPEND=media-libs/libcdaudio x11-libs/libX11 x11-libs/libXt
 DESCRIPTION=Basic CD Player for blackbox wm
 EAPI=6
 HOMEPAGE=http://tranber1.free.fr/bbcd.html
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libcdaudio x11-libs/libX11
 SLOT=0
 SRC_URI=http://tranber1.free.fr/bbcd-0.3.1.tar.gz
-_md5_=9aa3fe9d12a60688416df9eb4ba6698f
+_md5_=99b3b0d56f6bc2a654a61f1ab5f5aefe
diff --git a/metadata/md5-cache/x11-misc/bbdate-0.2.4-r2 b/metadata/md5-cache/x11-misc/bbdate-0.2.4-r2
index 9ed883300c96..dc417d4f7f77 100644
--- a/metadata/md5-cache/x11-misc/bbdate-0.2.4-r2
+++ b/metadata/md5-cache/x11-misc/bbdate-0.2.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=x11-libs/libX11 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=blackbox date display
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/bbtools
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbdate-0.2.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cc5d4d3267b6bd333bd3d68f20dbb914
diff --git a/metadata/md5-cache/x11-misc/bbkeys-0.9.2 b/metadata/md5-cache/x11-misc/bbkeys-0.9.2
new file mode 100644
index 000000000000..53f3e8cc49b8
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/bbkeys-0.9.2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=>=x11-wm/blackbox-0.70.0 x11-libs/libXext x11-libs/libXft x11-libs/libX11
+DESCRIPTION=Use keyboard shortcuts in the blackbox wm
+EAPI=7
+HOMEPAGE=http://bbkeys.sourceforge.net
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=x11-wm/blackbox-0.70.0 x11-libs/libXext x11-libs/libXft x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/bbidulock/bbkeys/archive/rel-092.tar.gz -> bbkeys-0.9.2.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a7beafd4bc615169908a70eeb99bb992
diff --git a/metadata/md5-cache/x11-misc/bbmail-0.9.3-r1 b/metadata/md5-cache/x11-misc/bbmail-0.9.3-r1
index 823eb04fc18f..8cc4aac305cc 100644
--- a/metadata/md5-cache/x11-misc/bbmail-0.9.3-r1
+++ b/metadata/md5-cache/x11-misc/bbmail-0.9.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl x11-wm/blackbox x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-lang/perl x11-wm/blackbox x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=blackbox mail notification
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/bbtools
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl x11-wm/blackbox x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbmail-0.9.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=76fbf503acb2d75a9489925b649285f2
diff --git a/metadata/md5-cache/x11-misc/bbpager-0.4.7-r1 b/metadata/md5-cache/x11-misc/bbpager-0.4.7-r1
index a3ad19614c51..7bfbcfa6c46c 100644
--- a/metadata/md5-cache/x11-misc/bbpager-0.4.7-r1
+++ b/metadata/md5-cache/x11-misc/bbpager-0.4.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-wm/blackbox virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=x11-wm/blackbox virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=An understated pager for Blackbox
 EAPI=6
 HOMEPAGE=http://bbtools.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-wm/blackbox
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbpager-0.4.7.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e195b00a74498b3be6a60f2a44aac161
diff --git a/metadata/md5-cache/x11-misc/bbppp-0.2.5-r1 b/metadata/md5-cache/x11-misc/bbppp-0.2.5-r1
index 158e9c7eb733..7b6a61b4ccb9 100644
--- a/metadata/md5-cache/x11-misc/bbppp-0.2.5-r1
+++ b/metadata/md5-cache/x11-misc/bbppp-0.2.5-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install postinst prepare
 DEPEND=x11-libs/libX11
 DESCRIPTION=blackbox ppp frontend/monitor
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 media-fonts/font-adobe-100dpi
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbppp/bbppp-0.2.5/bbppp-0.2.5.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f556e9c2c2f28c2c652f9eac5514377d
diff --git a/metadata/md5-cache/x11-misc/bbrun-1.6-r1 b/metadata/md5-cache/x11-misc/bbrun-1.6-r1
index ec6190ab760a..8a563b71c89f 100644
--- a/metadata/md5-cache/x11-misc/bbrun-1.6-r1
+++ b/metadata/md5-cache/x11-misc/bbrun-1.6-r1
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install
+DEFINED_PHASES=compile install prepare
 DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 DESCRIPTION=blackbox program execution dialog box
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-lib
 SLOT=0
 SRC_URI=http://www.darkops.net/bbrun/bbrun-1.6.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3041a7f06bdfd64c0cfcd2c47f42460f
+_md5_=bf708401655b58d1fcc15d6463dd0c8f
diff --git a/metadata/md5-cache/x11-misc/bbtime-0.1.5-r1 b/metadata/md5-cache/x11-misc/bbtime-0.1.5-r1
index 6aab72185b28..1fc1c53bd3c2 100644
--- a/metadata/md5-cache/x11-misc/bbtime-0.1.5-r1
+++ b/metadata/md5-cache/x11-misc/bbtime-0.1.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=x11-libs/libX11 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=blackbox time watcher
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/bbtools/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbtime-0.1.5.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f2a53d19cea466d976e66de4a334fa87
diff --git a/metadata/md5-cache/x11-misc/bbweather-0.6.3-r2 b/metadata/md5-cache/x11-misc/bbweather-0.6.3-r2
index 013fbf8812a3..5d0d47990daa 100644
--- a/metadata/md5-cache/x11-misc/bbweather-0.6.3-r2
+++ b/metadata/md5-cache/x11-misc/bbweather-0.6.3-r2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
 DEPEND=dev-lang/perl x11-libs/libX11
 DESCRIPTION=blackbox weather monitor
@@ -6,8 +6,8 @@ EAPI=7
 HOMEPAGE=https://www.netmeister.org/apps/bbweather/
 KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=GPL-2+
-RDEPEND=dev-lang/perl x11-libs/libX11 net-misc/wget x11-apps/xmessage !<=x11-plugins/gkrellweather-2.0.7-r1
+RDEPEND=dev-lang/perl x11-libs/libX11 net-misc/wget x11-apps/xmessage
 SLOT=0
 SRC_URI=https://www.netmeister.org/apps/bbweather-0.6.3.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0c8993f0f218ec17b3a09257276ba673
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=865eb99f6214a5e4ec2446f74c57b899
diff --git a/metadata/md5-cache/x11-misc/birdtray-1.9.0 b/metadata/md5-cache/x11-misc/birdtray-1.9.0
index c5e4a4b8d812..7aba8f754741 100644
--- a/metadata/md5-cache/x11-misc/birdtray-1.9.0
+++ b/metadata/md5-cache/x11-misc/birdtray-1.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/gyunaev/birdtray/archive/v1.9.0.tar.gz -> birdtray-1.9.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=926c9214905a77cbd7baf49a2731127f
diff --git a/metadata/md5-cache/x11-misc/birdtray-9999 b/metadata/md5-cache/x11-misc/birdtray-9999
index 33ef8ef0f499..0cb2a9527b90 100644
--- a/metadata/md5-cache/x11-misc/birdtray-9999
+++ b/metadata/md5-cache/x11-misc/birdtray-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-db/sqlite:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11
 SLOT=0
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55130a963e9cca3dfae32787be27754a
diff --git a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20190421-r1 b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20190421-r1
index 3b54c1b8513e..de5f5e2a877f 100644
--- a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20190421-r1
+++ b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20190421-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install prepare setup
 DEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 sys-apps/help2man virtual/pkgconfig
 DESCRIPTION=Service providing elegant and stable means of managing Optimus graphics chipsets
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 virtual/op
 REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/Bumblebee/archive/7aa457fe7b4fffc3b175ad36fdae00d7777065dc.tar.gz -> bumblebee-3.2.1_p20190421.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ff72eb33295a20d730657dc8358f349f
diff --git a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r1 b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r1
index 5da941b49546..66bcf08939c8 100644
--- a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r1
+++ b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install prepare setup
 DEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 sys-apps/help2man virtual/pkgconfig
 DESCRIPTION=Service providing elegant and stable means of managing Optimus graphics chipsets
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 virtual/op
 REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/Bumblebee/archive/8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec.tar.gz -> bumblebee-3.2.1_p20210112.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=62ee4db9b6f564606d30ec48ce9e12f6
diff --git a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r3 b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r3
deleted file mode 100644
index f52bea1121bf..000000000000
--- a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 sys-apps/help2man virtual/pkgconfig
-DESCRIPTION=Service providing elegant and stable means of managing Optimus graphics chipsets
-EAPI=7
-HOMEPAGE=https://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee
-IUSE=+bbswitch video_cards_nouveau video_cards_nvidia
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-PDEPEND=|| ( x11-misc/primus x11-misc/virtualgl )
-RDEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 virtual/opengl x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?] bbswitch? ( sys-power/bbswitch )
-REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
-SLOT=0
-SRC_URI=https://github.com/Bumblebee-Project/Bumblebee/archive/8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec.tar.gz -> bumblebee-3.2.1_p20210112.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=fac6687a52b963d069eb6f1e1be8c006
diff --git a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r4 b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r4
new file mode 100644
index 000000000000..13dd67e66a02
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20210112-r4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 sys-apps/help2man virtual/pkgconfig
+DESCRIPTION=Service providing elegant and stable means of managing Optimus graphics chipsets
+EAPI=7
+HOMEPAGE=https://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee
+IUSE=+bbswitch video_cards_nouveau video_cards_nvidia
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+PDEPEND=|| ( x11-misc/primus x11-misc/virtualgl )
+RDEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 acct-group/bumblebee virtual/opengl x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?] bbswitch? ( sys-power/bbswitch )
+REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
+SLOT=0
+SRC_URI=https://github.com/Bumblebee-Project/Bumblebee/archive/8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec.tar.gz -> bumblebee-3.2.1_p20210112.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2d1a1efe28e0b5c78d2196810a9a1b04
diff --git a/metadata/md5-cache/x11-misc/bumblebee-9999 b/metadata/md5-cache/x11-misc/bumblebee-9999
index 43ce0c7f8941..e85865319e8c 100644
--- a/metadata/md5-cache/x11-misc/bumblebee-9999
+++ b/metadata/md5-cache/x11-misc/bumblebee-9999
@@ -1,14 +1,15 @@
-DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 sys-apps/help2man virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 sys-apps/help2man virtual/pkgconfig
 DESCRIPTION=Service providing elegant and stable means of managing Optimus graphics chipsets
-EAPI=6
+EAPI=7
 HOMEPAGE=https://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee
 IUSE=+bbswitch video_cards_nouveau video_cards_nvidia
 LICENSE=GPL-3
 PDEPEND=|| ( x11-misc/primus x11-misc/virtualgl )
 PROPERTIES=live
-RDEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 virtual/opengl x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?] bbswitch? ( sys-power/bbswitch )
+RDEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 acct-group/bumblebee virtual/opengl x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?] bbswitch? ( sys-power/bbswitch )
 REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=6bd6b9d38420bcb61eb7897b88e5465b
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=707fffefbc12e409b4fc3a59399b166d
diff --git a/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r2 b/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r2
index 9d337effba6e..69af3ffd7de6 100644
--- a/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r2
+++ b/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
 DEPEND=>=dev-libs/glib-2.8 >=gnome-base/libglade-2.6 >=gnome-base/librsvg-2.14 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.10:2 >=x11-libs/pango-1.10 dev-util/intltool virtual/pkgconfig sys-devel/gettext
 DESCRIPTION=An analog clock displaying the system-time
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.8 >=gnome-base/libglade-2.6 >=gnome-base/librsvg-2.14 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.10:2 >=x11-libs/pango-1.10
 SLOT=0
 SRC_URI=http://macslow.thepimp.net/projects/cairo-clock/cairo-clock-0.3.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=243c0171669a9496e0e00a94e604d03a
diff --git a/metadata/md5-cache/x11-misc/cbatticon-1.6.10 b/metadata/md5-cache/x11-misc/cbatticon-1.6.10
index 761367199f9b..3d5a06875200 100644
--- a/metadata/md5-cache/x11-misc/cbatticon-1.6.10
+++ b/metadata/md5-cache/x11-misc/cbatticon-1.6.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=https://github.com/valr/cbatticon/archive/1.6.10.tar.gz -> cbatticon-1.6.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d4c0b7d7e89c7d12bf0038558b54ca3b
diff --git a/metadata/md5-cache/x11-misc/cbatticon-1.6.5 b/metadata/md5-cache/x11-misc/cbatticon-1.6.5
deleted file mode 100644
index 8e0ce6f57347..000000000000
--- a/metadata/md5-cache/x11-misc/cbatticon-1.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 libnotify? ( x11-libs/libnotify ) virtual/pkgconfig
-DESCRIPTION=A lightweight and fast battery icon that sits in your system tray
-EAPI=6
-HOMEPAGE=https://github.com/ColinJones/cbatticon
-IUSE=libnotify
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 libnotify? ( x11-libs/libnotify )
-SLOT=0
-SRC_URI=https://github.com/ColinJones/cbatticon/archive/1.6.5.tar.gz -> cbatticon-1.6.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=255a02a4d76ccce8b8244301a1443cb4
diff --git a/metadata/md5-cache/x11-misc/cdm-0.6.1_pre20180107 b/metadata/md5-cache/x11-misc/cdm-0.6.1_pre20180107
index f8bcab263180..ddb2cda46eea 100644
--- a/metadata/md5-cache/x11-misc/cdm-0.6.1_pre20180107
+++ b/metadata/md5-cache/x11-misc/cdm-0.6.1_pre20180107
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-util/dialog x11-apps/xdpyinfo x11-apps/xinit pam? ( sys-libs/pam )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~gienah/snapshots/cdm-0.6.1_pre20180107.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5d372dec43fc4b3f9cced4e7cc5e2939
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8ea8e2266bc7bda3c08c615beacf685a
diff --git a/metadata/md5-cache/x11-misc/cdm-0.7 b/metadata/md5-cache/x11-misc/cdm-0.7
index 95f5ea8f52e2..152ba2c6e437 100644
--- a/metadata/md5-cache/x11-misc/cdm-0.7
+++ b/metadata/md5-cache/x11-misc/cdm-0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-util/dialog x11-apps/xdpyinfo x11-apps/xinit pam? ( sys-libs/pam )
 SLOT=0
 SRC_URI=https://github.com/evertiro/cdm/archive/0.7.tar.gz -> cdm-0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9c8ed48716d6fd6cee029426de37cb9a
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1f89a1212fe7cb0166b625403ed910f8
diff --git a/metadata/md5-cache/x11-misc/chgres-0.1-r2 b/metadata/md5-cache/x11-misc/chgres-0.1-r2
index 9cff35789d5a..1168ca79a926 100644
--- a/metadata/md5-cache/x11-misc/chgres-0.1-r2
+++ b/metadata/md5-cache/x11-misc/chgres-0.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXxf86dga x11-libs/libXext x11-libs/libXxf86vm x11-base/xorg-proto
+DEPEND=x11-libs/libX11 x11-libs/libXxf86dga x11-libs/libXext x11-libs/libXxf86vm x11-base/xorg-proto virtual/pkgconfig
 DESCRIPTION=A very simple command line utility for changing X resolutions
 EAPI=6
 HOMEPAGE=http://hpwww.ec-lyon.fr/~vincent/
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXxf86dga x11-libs/libXext x11-libs/libXxf86v
 SLOT=0
 SRC_URI=http://hpwww.ec-lyon.fr/~vincent/chgres-0.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=90b831c5adcef332e1d3cb30fb921ab8
+_md5_=ea59eaa07cd9f4d4b17462357e895399
diff --git a/metadata/md5-cache/x11-misc/clipmenu-6.2.0 b/metadata/md5-cache/x11-misc/clipmenu-6.2.0
index 63f4b1208558..37bcc6253ef1 100644
--- a/metadata/md5-cache/x11-misc/clipmenu-6.2.0
+++ b/metadata/md5-cache/x11-misc/clipmenu-6.2.0
@@ -8,5 +8,5 @@ LICENSE=Unlicense
 RDEPEND=x11-misc/clipnotify x11-misc/dmenu x11-misc/xsel
 SLOT=0
 SRC_URI=https://github.com/cdown/clipmenu/archive/6.2.0.tar.gz -> clipmenu-6.2.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=368998f4acb558efe4b9eea2911bded7
diff --git a/metadata/md5-cache/x11-misc/colord-1.3.5 b/metadata/md5-cache/x11-misc/colord-1.3.5
index ef9de623ac62..de59fbe19019 100644
--- a/metadata/md5-cache/x11-misc/colord-1.3.5
+++ b/metadata/md5-cache/x11-misc/colord-1.3.5
@@ -1,4 +1,4 @@
-BDEPEND=acct-group/colord acct-user/colord dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) dev-libs/glib:2 media-libs/lcms >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
+BDEPEND=acct-group/colord acct-user/colord dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) dev-libs/glib:2 media-libs/lcms sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=dev-db/sqlite:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.6:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] argyllcms? ( media-gfx/argyllcms ) gusb? ( >=dev-libs/libgusb-0.2.7[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) policykit? ( >=sys-auth/polkit-0.104 ) scanner? ( media-gfx/sane-backends sys-apps/dbus ) systemd? ( >=sys-apps/systemd-44:0= ) udev? ( dev-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/udev ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=System service to accurately color manage input and output devices
@@ -12,5 +12,5 @@ REQUIRED_USE=gusb? ( udev ) scanner? ( udev ) vala? ( introspection )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-1.3.5.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	bash-completion-r1	be99724bde4274de21e581204e9d164a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a668d87bd358d736c8249d3cb9f65e9
diff --git a/metadata/md5-cache/x11-misc/colord-1.4.5 b/metadata/md5-cache/x11-misc/colord-1.4.5
new file mode 100644
index 000000000000..e2aa77fde899
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/colord-1.4.5
@@ -0,0 +1,16 @@
+BDEPEND=acct-group/colord acct-user/colord app-text/docbook-xsl-ns-stylesheets dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) dev-libs/glib:2 media-libs/lcms >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.58.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.6:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/sqlite:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgusb-0.2.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( dev-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/udev ) systemd? ( >=sys-apps/systemd-44:0= ) scanner? ( media-gfx/sane-backends sys-apps/dbus ) >=sys-auth/polkit-0.104 argyllcms? ( media-gfx/argyllcms ) introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+DESCRIPTION=System service to accurately color manage input and output devices
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/software/colord/
+IUSE=gtk-doc argyllcms examples extra-print-profiles +introspection scanner systemd test +udev vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.58.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.6:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/sqlite:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgusb-0.2.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( dev-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/udev ) systemd? ( >=sys-apps/systemd-44:0= ) scanner? ( media-gfx/sane-backends sys-apps/dbus ) >=sys-auth/polkit-0.104 argyllcms? ( media-gfx/argyllcms ) introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) acct-group/colord acct-user/colord
+REQUIRED_USE=scanner? ( udev ) vala? ( introspection )
+RESTRICT=!test? ( test ) test
+SLOT=0/2
+SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-1.4.5.tar.xz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8fdbdc15ec56317a7523035d6b310cee
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.7.0 b/metadata/md5-cache/x11-misc/compose-tables-1.7.0
index 15199f9c6d79..a6d3a91adb2e 100644
--- a/metadata/md5-cache/x11-misc/compose-tables-1.7.0
+++ b/metadata/md5-cache/x11-misc/compose-tables-1.7.0
@@ -1,13 +1,13 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1 x11-libs/xtrans
 DESCRIPTION=X.Org Compose Key tables from libX11
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=!<x11-libs/libX11-1.7.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.0.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
-_md5_=5edbbed80a3a6e1ee678eef4d5946375
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=a677603dcfcb8b3fcea096cad6568dc3
diff --git a/metadata/md5-cache/x11-misc/compton-0.1_beta2-r1 b/metadata/md5-cache/x11-misc/compton-0.1_beta2-r1
index 635c9be8e4be..3420c05a11b7 100644
--- a/metadata/md5-cache/x11-misc/compton-0.1_beta2-r1
+++ b/metadata/md5-cache/x11-misc/compton-0.1_beta2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/chjj/compton/archive/v0.1_beta2.tar.gz -> compton-0.1_beta2.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=5f214e4ed710badeaa4c0db180e3f5f9
diff --git a/metadata/md5-cache/x11-misc/copyq-3.13.0 b/metadata/md5-cache/x11-misc/copyq-3.13.0
index 22fc0fbd3c5a..5371af66944e 100644
--- a/metadata/md5-cache/x11-misc/copyq-3.13.0
+++ b/metadata/md5-cache/x11-misc/copyq-3.13.0
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hluk/CopyQ/archive/v3.13.0.tar.gz -> copyq-3.13.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f25d02071f10c3767db48b626ceebe1
diff --git a/metadata/md5-cache/x11-misc/dclock-2.2.2_p12 b/metadata/md5-cache/x11-misc/dclock-2.2.2_p12
index 42e8f0df8984..95c52c885ceb 100644
--- a/metadata/md5-cache/x11-misc/dclock-2.2.2_p12
+++ b/metadata/md5-cache/x11-misc/dclock-2.2.2_p12
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman x11-misc/imake xft? ( virtual/pkgconfig )
+BDEPEND=app-text/rman >=x11-misc/imake-1.0.8-r1 xft? ( virtual/pkgconfig )
 DEFINED_PHASES=compile configure install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt xft? ( media-libs/freetype x11-libs/libXft )
 DESCRIPTION=Digital clock for the X window system
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt xft? ( media-libs/freetype x11-libs/libXft )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dclock/dclock_2.2.2.orig.tar.gz mirror://debian/pool/main/d/dclock/dclock_2.2.2-12.debian.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=32faad548c8b14fe2385b097fe37d1d2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d0405e8469a593e51c117e863d63ba86
diff --git a/metadata/md5-cache/x11-misc/devilspie-0.23 b/metadata/md5-cache/x11-misc/devilspie-0.23
deleted file mode 100644
index 2dc7bd9074ea..000000000000
--- a/metadata/md5-cache/x11-misc/devilspie-0.23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-libs/glib-2.10 x11-libs/gtk+:3[X] x11-libs/libwnck:3 x11-libs/libX11 virtual/pkgconfig dev-util/intltool sys-devel/gettext gnome-base/gnome-common >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A Window Matching utility similar to Sawfish's Matched Windows feature
-EAPI=6
-HOMEPAGE=http://www.burtonini.com/blog/tag/devilspie.html
-KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.10 x11-libs/gtk+:3[X] x11-libs/libwnck:3 x11-libs/libX11
-SLOT=0
-SRC_URI=http://www.burtonini.com/computing/devilspie-0.23.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cd016fc8dbf4dfe858bdb390c5ed22e8
diff --git a/metadata/md5-cache/x11-misc/devilspie-0.23-r2 b/metadata/md5-cache/x11-misc/devilspie-0.23-r2
index a9871dbfa684..f9b480220110 100644
--- a/metadata/md5-cache/x11-misc/devilspie-0.23-r2
+++ b/metadata/md5-cache/x11-misc/devilspie-0.23-r2
@@ -4,9 +4,9 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libwnck:3 x11
 DESCRIPTION=Window matching utility similar to Sawfish's Matched Windows
 EAPI=7
 HOMEPAGE=http://www.burtonini.com/blog/tag/devilspie.html
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libwnck:3
 SLOT=0
 SRC_URI=http://www.burtonini.com/computing/devilspie-0.23.tar.xz
-_md5_=58f6251547529fce3c214ad3700b7620
+_md5_=ddbe55af4993f8de02a5883030243919
diff --git a/metadata/md5-cache/x11-misc/devilspie2-0.43-r100 b/metadata/md5-cache/x11-misc/devilspie2-0.43-r100
index 9cb7cb36d8aa..c762db580269 100644
--- a/metadata/md5-cache/x11-misc/devilspie2-0.43-r100
+++ b/metadata/md5-cache/x11-misc/devilspie2-0.43-r100
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/devilspie2/devilspie2_0.43-src.tar.gz
 _eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=49bfeb940a8a7ad57a4b12d1485c0e91
+_md5_=4f38972efbcc854a06b76a945f7d8b0c
diff --git a/metadata/md5-cache/x11-misc/dex-0.8.0 b/metadata/md5-cache/x11-misc/dex-0.8.0
index 8498cd934524..80de58973639 100644
--- a/metadata/md5-cache/x11-misc/dex-0.8.0
+++ b/metadata/md5-cache/x11-misc/dex-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jceb/dex/archive/v0.8.0.tar.gz -> dex-0.8.0.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=60a5e7489d6d392e6102044454a25681
diff --git a/metadata/md5-cache/x11-misc/dmenu-4.6 b/metadata/md5-cache/x11-misc/dmenu-4.6
deleted file mode 100644
index 3440a6141973..000000000000
--- a/metadata/md5-cache/x11-misc/dmenu-4.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=a generic, highly customizable, and efficient menu for the X Window System
-EAPI=5
-HOMEPAGE=https://tools.suckless.org/dmenu/
-IUSE=xinerama
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=https://dl.suckless.org/tools/dmenu-4.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8fbc6a563665d1e9630bd5b6928e2d43
diff --git a/metadata/md5-cache/x11-misc/dmenu-4.8 b/metadata/md5-cache/x11-misc/dmenu-4.8
deleted file mode 100644
index 04d052770320..000000000000
--- a/metadata/md5-cache/x11-misc/dmenu-4.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=a generic, highly customizable, and efficient menu for the X Window System
-EAPI=6
-HOMEPAGE=https://tools.suckless.org/dmenu/
-IUSE=xinerama savedconfig
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=https://dl.suckless.org/tools/dmenu-4.8.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=87ba548c3e5229a138f1360c0bbfa63b
diff --git a/metadata/md5-cache/x11-misc/dmenu-4.9 b/metadata/md5-cache/x11-misc/dmenu-4.9
deleted file mode 100644
index 0c41af8a7b76..000000000000
--- a/metadata/md5-cache/x11-misc/dmenu-4.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=a generic, highly customizable, and efficient menu for the X Window System
-EAPI=7
-HOMEPAGE=https://tools.suckless.org/dmenu/
-IUSE=xinerama savedconfig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=https://dl.suckless.org/tools/dmenu-4.9.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=357f3add3619c0f80e21db5b90e257f6
diff --git a/metadata/md5-cache/x11-misc/dmenu-5.0 b/metadata/md5-cache/x11-misc/dmenu-5.0
index 6d528a5497a0..09d883f84fb3 100644
--- a/metadata/md5-cache/x11-misc/dmenu-5.0
+++ b/metadata/md5-cache/x11-misc/dmenu-5.0
@@ -4,10 +4,10 @@ DESCRIPTION=a generic, highly customizable, and efficient menu for the X Window
 EAPI=7
 HOMEPAGE=https://tools.suckless.org/dmenu/
 IUSE=xinerama savedconfig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/dmenu-5.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ccdaa7722d26459ac773751525249cfe
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4adbd8b71e4cf1cdb0dd83f8beb9bc8c
diff --git a/metadata/md5-cache/x11-misc/dmenu-9999 b/metadata/md5-cache/x11-misc/dmenu-9999
index 96ba344da9c6..0cc3b6f3836d 100644
--- a/metadata/md5-cache/x11-misc/dmenu-9999
+++ b/metadata/md5-cache/x11-misc/dmenu-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=74f318a3b01087437cb9299f45775262
diff --git a/metadata/md5-cache/x11-misc/dunst-1.6.1 b/metadata/md5-cache/x11-misc/dunst-1.6.1
index ccf2ad80f3ea..f16301c48d6a 100644
--- a/metadata/md5-cache/x11-misc/dunst-1.6.1
+++ b/metadata/md5-cache/x11-misc/dunst-1.6.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dunst-project/dunst/archive/v1.6.1.tar.gz -> dunst-1.6.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c9ef4ef55295f888c40af260c4b37226
diff --git a/metadata/md5-cache/x11-misc/dunst-9999 b/metadata/md5-cache/x11-misc/dunst-9999
index b585f55a7e0a..75eb9104d294 100644
--- a/metadata/md5-cache/x11-misc/dunst-9999
+++ b/metadata/md5-cache/x11-misc/dunst-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] wayland? ( dev-libs/wayland )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c9ef4ef55295f888c40af260c4b37226
diff --git a/metadata/md5-cache/x11-misc/dzen-0.9.5-r1 b/metadata/md5-cache/x11-misc/dzen-0.9.5-r1
deleted file mode 100644
index 80cf0bfa805e..000000000000
--- a/metadata/md5-cache/x11-misc/dzen-0.9.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=a general purpose messaging, notification and menuing program for X11
-EAPI=5
-HOMEPAGE=https://github.com/robm/dzen
-IUSE=minimal xft xinerama xpm
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm )
-SLOT=2
-SRC_URI=https://github.com/robm/dzen/tarball/f7907da3a42a6d59e27ede88f5f01e4e41c4c9e0 -> dzen-0.9.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=368b5f70d67e6dcb0702042b34aea6f2
diff --git a/metadata/md5-cache/x11-misc/dzen-0.9.5_p2 b/metadata/md5-cache/x11-misc/dzen-0.9.5_p2
index 93d38683cb98..2019470af915 100644
--- a/metadata/md5-cache/x11-misc/dzen-0.9.5_p2
+++ b/metadata/md5-cache/x11-misc/dzen-0.9.5_p2
@@ -5,10 +5,10 @@ DESCRIPTION=General purpose messaging, notification, and menu utility
 EAPI=7
 HOMEPAGE=https://github.com/robm/dzen
 IUSE=xinerama xpm
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm )
 SLOT=2
 SRC_URI=https://github.com/robm/dzen/archive/488ab66019f475e35e067646621827c18a879ba1.tar.gz -> dzen-0.9.5_p2.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=187b084b5bf59041539370ab85e67f92
+_md5_=ed02f0b285173c4c8e9da6399b9d238b
diff --git a/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3 b/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
index 831c83e2ec0e..e01033c203cb 100644
--- a/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
+++ b/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=gnome-base/libglade-2.4 x11-libs/gtk+:2 x11-wm/e16 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=gnome-base/libglade-2.4 virtual/pkgconfig x11-libs/gtk+:2 x11-wm/e16 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Menu editor for Enlightenment DR16 written in GTK2
 EAPI=6
 HOMEPAGE=https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT-with-advertising
-RDEPEND=>=gnome-base/libglade-2.4 x11-libs/gtk+:2 x11-wm/e16
+RDEPEND=>=gnome-base/libglade-2.4 virtual/pkgconfig x11-libs/gtk+:2 x11-wm/e16
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/e16menuedit2-0.0.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	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
-_md5_=2e74b9a59b14fb59affe2c492d503f82
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	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
+_md5_=1def64332ce86f663654f578140e70f3
diff --git a/metadata/md5-cache/x11-misc/easystroke-0.6.0-r3 b/metadata/md5-cache/x11-misc/easystroke-0.6.0-r3
index 85289cc248f7..99a966c40ac9 100644
--- a/metadata/md5-cache/x11-misc/easystroke-0.6.0-r3
+++ b/metadata/md5-cache/x11-misc/easystroke-0.6.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-cpp/gtkmm:3.0 dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 x11-base/xorg-server x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXtst dev-util/intltool sys-devel/gettext
+DEPEND=dev-cpp/gtkmm:3.0 dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 x11-base/xorg-server x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXtst dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=a gesture-recognition application for X11
 EAPI=6
 HOMEPAGE=https://sourceforge.net/apps/trac/easystroke/
@@ -8,5 +8,5 @@ LICENSE=ISC
 RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 x11-base/xorg-server x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXtst
 SLOT=0
 SRC_URI=mirror://sourceforge/project/easystroke/easystroke/0.6.0/easystroke-0.6.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b2735b39618d1620b677d5b7a670ab40
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=38c809b31862151263586a3333384ee5
diff --git a/metadata/md5-cache/x11-misc/fbpanel-7.0-r2 b/metadata/md5-cache/x11-misc/fbpanel-7.0-r2
index c741530cc7b9..28cf684770ae 100644
--- a/metadata/md5-cache/x11-misc/fbpanel-7.0-r2
+++ b/metadata/md5-cache/x11-misc/fbpanel-7.0-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 alsa? ( media-libs/alsa-lib )
 SLOT=0
 SRC_URI=https://aanatoly.github.io/fbpanel/archive/7.0.tar.gz -> fbpanel-7.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9d8094a8adeeadb76766df14d3d784ac
diff --git a/metadata/md5-cache/x11-misc/fireflies-2.08-r1 b/metadata/md5-cache/x11-misc/fireflies-2.08-r1
index 9d0ff18c290e..84af57b55672 100644
--- a/metadata/md5-cache/x11-misc/fireflies-2.08-r1
+++ b/metadata/md5-cache/x11-misc/fireflies-2.08-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsdl[X,opengl,video] virtual/glu virtual/opengl x11-libs/libX11 sys-devel/autoconf-archive >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/libsdl[X,opengl,video] virtual/glu virtual/opengl x11-libs/libX11 sys-devel/autoconf-archive sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Fireflies screensaver: Wicked cool eye candy
 EAPI=5
 HOMEPAGE=https://github.com/mpcomplete/fireflies
@@ -8,5 +8,5 @@ LICENSE=GPL-2 icu
 RDEPEND=media-libs/libsdl[X,opengl,video] virtual/glu virtual/opengl x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/mpcomplete/fireflies/archive/v2.08.tar.gz -> fireflies-2.08.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=693e8bc740305aa2caebef7d544686fb
diff --git a/metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0-r1 b/metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0-r1
index 2517dd5b7375..67406a12507d 100644
--- a/metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0-r1
+++ b/metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/iamsergio/flow-pomodoro/archive/v1.2.0.tar.gz -> flow-pomodoro-1.2.0.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a3d71be51482dbe3ea21598d9608cc6f
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=57492a0f1e6109d6e74bd60d61fad4e7
diff --git a/metadata/md5-cache/x11-misc/fluxter-0.1.0 b/metadata/md5-cache/x11-misc/fluxter-0.1.0
index e498063c620c..0bdf0d6084cb 100644
--- a/metadata/md5-cache/x11-misc/fluxter-0.1.0
+++ b/metadata/md5-cache/x11-misc/fluxter-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=workspace pager dockapp, particularly useful with the Fluxbox window manager
 EAPI=6
 HOMEPAGE=http://www.isomedia.com/homes/stevencooper
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.isomedia.com/homes/stevencooper/files/fluxter-0.1.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=255afe9f442f30a8915fa211ac3ddf9e
diff --git a/metadata/md5-cache/x11-misc/gbase-0.5-r1 b/metadata/md5-cache/x11-misc/gbase-0.5-r1
index 368fecace6ab..3d0ff7da94e5 100644
--- a/metadata/md5-cache/x11-misc/gbase-0.5-r1
+++ b/metadata/md5-cache/x11-misc/gbase-0.5-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install
 DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=a convert program for decimal, hexadecimal, octal and binary values
+DESCRIPTION=A convert program for decimal, hexadecimal, octal and binary values
 EAPI=6
 HOMEPAGE=http://www.fluxcode.net
 KEYWORDS=amd64 x86
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.fluxcode.net/files/gbase-0.5.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9845afd9a2d1f8f82cec3d48a51d59a8
+_md5_=da701bde1fb8519fe0a0db48b8e6350b
diff --git a/metadata/md5-cache/x11-misc/gbdfed-1.6 b/metadata/md5-cache/x11-misc/gbdfed-1.6
index 0d640b96c124..7b67a5af0b78 100644
--- a/metadata/md5-cache/x11-misc/gbdfed-1.6
+++ b/metadata/md5-cache/x11-misc/gbdfed-1.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/gtk+-2.6:2 >=media-libs/freetype-2 x11-libs/libX11 x11-libs/pango
 SLOT=0
 SRC_URI=http://sofia.nmsu.edu/~mleisher/Software/gbdfed/gbdfed-1.6.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1e6507fd5077f6387cd1abf20a614d9
diff --git a/metadata/md5-cache/x11-misc/gccmakedep-9999 b/metadata/md5-cache/x11-misc/gccmakedep-9999
index f7bfd15f9319..226485a1d282 100644
--- a/metadata/md5-cache/x11-misc/gccmakedep-9999
+++ b/metadata/md5-cache/x11-misc/gccmakedep-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
 DEPEND=>=x11-misc/util-macros-1.18 x11-base/xorg-proto
 DESCRIPTION=create dependencies in makefiles using 'gcc -M'
@@ -7,5 +7,5 @@ HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/gccmak
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a3f49e8d5aa4cf860bda1f35eecb77ae
diff --git a/metadata/md5-cache/x11-misc/gcolor2-0.4-r4 b/metadata/md5-cache/x11-misc/gcolor2-0.4-r4
index 23b75fbb6ee5..1aefd5866fcb 100644
--- a/metadata/md5-cache/x11-misc/gcolor2-0.4-r4
+++ b/metadata/md5-cache/x11-misc/gcolor2-0.4-r4
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/intltool-0.27 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=dev-util/intltool-0.27 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install postinst postrm preinst prepare
 DEPEND=>=x11-libs/gtk+-2.4:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A GTK+ color selector
@@ -9,5 +9,5 @@ LICENSE=GPL-2 public-domain
 RDEPEND=>=x11-libs/gtk+-2.4:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gcolor2/gcolor2-0.4.tar.gz https://dev.gentoo.org/~pacho/gnome/gcolor2.svg
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ee667382e5840904a6371a8711fde6b
diff --git a/metadata/md5-cache/x11-misc/gigolo-0.5.1 b/metadata/md5-cache/x11-misc/gigolo-0.5.1
deleted file mode 100644
index dc0c24833c57..000000000000
--- a/metadata/md5-cache/x11-misc/gigolo-0.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-3.14:3 dev-util/intltool virtual/pkgconfig
-DESCRIPTION=a frontend to easily manage connections to remote filesystems using GIO/GVfs
-EAPI=7
-HOMEPAGE=https://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-3.14:3
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/gigolo/0.5/gigolo-0.5.1.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8491749535cb90fb0e60ccf6762bc803
diff --git a/metadata/md5-cache/x11-misc/gigolo-0.5.2 b/metadata/md5-cache/x11-misc/gigolo-0.5.2
index 2de0c602f1c9..366bf5eca5fc 100644
--- a/metadata/md5-cache/x11-misc/gigolo-0.5.2
+++ b/metadata/md5-cache/x11-misc/gigolo-0.5.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-3.14:3 dev-util/intltool virtual/pkg
 DESCRIPTION=a frontend to easily manage connections to remote filesystems using GIO/GVfs
 EAPI=7
 HOMEPAGE=https://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.16 >=x11-libs/gtk+-3.14:3
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/gigolo/0.5/gigolo-0.5.2.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5cbd6dbaac93dc0b968b7dd3712d832e
+_md5_=fb4851af023020d40d05f88354266a8a
diff --git a/metadata/md5-cache/x11-misc/gmrun-0.9.2-r2 b/metadata/md5-cache/x11-misc/gmrun-0.9.2-r2
index 1b6e230aa7ed..91721d5f7c54 100644
--- a/metadata/md5-cache/x11-misc/gmrun-0.9.2-r2
+++ b/metadata/md5-cache/x11-misc/gmrun-0.9.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-libs/glib:2 dev-libs/popt x11-libs/gtk+:2 elibc_glibc? ( >=sys-libs/glibc-2.10 ) sys-apps/sed virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2 dev-libs/popt x11-libs/gtk+:2 elibc_glibc? ( >=sys-libs/glibc-2.10 ) sys-apps/sed virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A GTK-2 based launcher box with bash style auto completion!
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/gmrun/
@@ -8,5 +8,5 @@ LICENSE=GPL-1
 RDEPEND=dev-libs/glib:2 dev-libs/popt x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gmrun/gmrun-0.9.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6eacc711faf054f88f2e6f320e0b3118
diff --git a/metadata/md5-cache/x11-misc/gpaste-3.36.3 b/metadata/md5-cache/x11-misc/gpaste-3.36.3
index b840781239dd..99f1b9ea7c54 100644
--- a/metadata/md5-cache/x11-misc/gpaste-3.36.3
+++ b/metadata/md5-cache/x11-misc/gpaste-3.36.3
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig gnome? ( gnome-base/gnome-control-center:2 ) systemd? ( sys-apps/systemd ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=virtual/pkgconfig gnome? ( gnome-base/gnome-control-center:2 ) systemd? ( sys-apps/systemd ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.48:2 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.34:2 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXi x11-libs/pango gnome? ( >=x11-wm/mutter-3.36 ) introspection? ( dev-libs/gjs >=dev-libs/gobject-introspection-1.48.0 >=x11-wm/mutter-3.36[introspection] )
 DESCRIPTION=Clipboard management system
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.48:2 sys-apps/dbus >=x11-libs/
 REQUIRED_USE=gnome? ( introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.36.3.tar.gz -> gpaste-3.36.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=166a2708d8a7a836e135b52f137fc105
diff --git a/metadata/md5-cache/x11-misc/grabc-1.1-r2 b/metadata/md5-cache/x11-misc/grabc-1.1-r2
index db325a9039c0..885f1e21802b 100644
--- a/metadata/md5-cache/x11-misc/grabc-1.1-r2
+++ b/metadata/md5-cache/x11-misc/grabc-1.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-base/xorg-proto
+DEPEND=x11-libs/libX11 x11-base/xorg-proto virtual/pkgconfig
 DESCRIPTION=Identify color of a pixel on the screen by clicking on a pixel on the screen
 EAPI=6
 HOMEPAGE=https://www.muquit.com/muquit/software/grabc/grabc.html
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.muquit.com/muquit/software/grabc/grabc1.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=19a9a45b1d9673969ba448689f92c9f9
+_md5_=afb36fbcebca0dc9e2eed503e666fb34
diff --git a/metadata/md5-cache/x11-misc/gromit-20041213-r1 b/metadata/md5-cache/x11-misc/gromit-20041213-r1
index e296f9bb194f..b8b125057b34 100644
--- a/metadata/md5-cache/x11-misc/gromit-20041213-r1
+++ b/metadata/md5-cache/x11-misc/gromit-20041213-r1
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.home.unix-ag.org/simon/gromit/gromit-20041213.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d40bc448386926e853290f6c9e746b70
+_md5_=063d8bd30267ad547cdc4741ca229644
diff --git a/metadata/md5-cache/x11-misc/grsync-1.3.0 b/metadata/md5-cache/x11-misc/grsync-1.3.0
index fddf299ab358..faada6df61eb 100644
--- a/metadata/md5-cache/x11-misc/grsync-1.3.0
+++ b/metadata/md5-cache/x11-misc/grsync-1.3.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig dev-util/intltool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig dev-util/intltool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure postinst postrm preinst prepare
 DEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.16:2 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A gtk frontend to rsync
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.16:2 ) net-misc/rsync
 SLOT=0
 SRC_URI=http://www.opbyte.it/release/grsync-1.3.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c6f514dc1c0e869b81b3c7cf9d4baa7
diff --git a/metadata/md5-cache/x11-misc/grub2-theme-preview-2.3.0 b/metadata/md5-cache/x11-misc/grub2-theme-preview-2.3.0
index 63e6699df5d4..dcbd75994ace 100644
--- a/metadata/md5-cache/x11-misc/grub2-theme-preview-2.3.0
+++ b/metadata/md5-cache/x11-misc/grub2-theme-preview-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/qemu dev-libs/libisoburn sys-fs/mtools grub_platforms_efi-
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/hartwork/grub2-theme-preview/archive/2.3.0.tar.gz -> grub2-theme-preview-2.3.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=84e1793f6033ab96331fb50215f0a538
diff --git a/metadata/md5-cache/x11-misc/grun-0.9.3-r1 b/metadata/md5-cache/x11-misc/grun-0.9.3-r1
index b0e10b46e0a7..9efb320a9f68 100644
--- a/metadata/md5-cache/x11-misc/grun-0.9.3-r1
+++ b/metadata/md5-cache/x11-misc/grun-0.9.3-r1
@@ -1,7 +1,8 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 virtual/pkgconfig nls? ( sys-devel/gettext )
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2
 DESCRIPTION=A GTK based Run dialog resembling the Windows Run dialog, just like xexec
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/lrgc/grun
 IUSE=nls
 KEYWORDS=amd64 ppc x86
@@ -9,5 +10,4 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://grun.googlecode.com/files/grun-0.9.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1bd83f9e220a9027a5813e572a8fd381
+_md5_=59846f04a3f214de9f08ef18232e1fa7
diff --git a/metadata/md5-cache/x11-misc/gtkdialog-0.8.3_p20200202 b/metadata/md5-cache/x11-misc/gtkdialog-0.8.3_p20200202
index 068f515b2a89..21c3a556ba9d 100644
--- a/metadata/md5-cache/x11-misc/gtkdialog-0.8.3_p20200202
+++ b/metadata/md5-cache/x11-misc/gtkdialog-0.8.3_p20200202
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=gtk2? ( x11-libs/gtk+:2 x11-libs/vte:0= ) !gtk2? ( x11-libs/gtk+:3 x11-libs/vte:2.91= ) sys-apps/texinfo sys-devel/flex virtual/pkgconfig virtual/yacc
 DESCRIPTION=A small utility for fast and easy GUI building
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=gtk2? ( x11-libs/gtk+:2 x11-libs/vte:0= ) !gtk2? ( x11-libs/gtk+:3 x11-libs/vte:2.91= )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/gtkdialog-0.8.3_p20200202.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97a1473ef6cddf88de5354179232ac11
diff --git a/metadata/md5-cache/x11-misc/gtkdialog-99999 b/metadata/md5-cache/x11-misc/gtkdialog-99999
index f3a7a661077e..806b45a66f2d 100644
--- a/metadata/md5-cache/x11-misc/gtkdialog-99999
+++ b/metadata/md5-cache/x11-misc/gtkdialog-99999
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/texinfo sys-devel/flex virtual/pkgconfig virtual/yacc >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-apps/texinfo sys-devel/flex virtual/pkgconfig virtual/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
 DEPEND=x11-libs/gtk+:3 x11-libs/vte:2.91=
 DESCRIPTION=Small utility for fast and easy GUI building
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=x11-libs/gtk+:3 x11-libs/vte:2.91=
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c79c0ae73482f87f0aefe1d6d37660ea
diff --git a/metadata/md5-cache/x11-misc/i3blocks-1.5-r1 b/metadata/md5-cache/x11-misc/i3blocks-1.5-r1
index 79bfe1181eaf..e2d3656a8e6f 100644
--- a/metadata/md5-cache/x11-misc/i3blocks-1.5-r1
+++ b/metadata/md5-cache/x11-misc/i3blocks-1.5-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
 DESCRIPTION=highly flexible status line for the i3 window manager
 EAPI=7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PDEPEND=contrib? ( x11-misc/i3blocks-contrib )
 SLOT=0
 SRC_URI=https://github.com/vivien/i3blocks/archive/1.5.tar.gz -> i3blocks-1.5.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=61df1b893178755afeba4fd75b1fd0dd
diff --git a/metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127 b/metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127
index d1acad097d40..e4f03348fc67 100644
--- a/metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127
+++ b/metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=!<x11-misc/i3blocks-1.5 >=x11-misc/i3blocks-1.5
 SLOT=0
 SRC_URI=https://github.com/vivien/i3blocks-contrib/archive/154001e5713c26c70063446022919225b6f916f0.tar.gz -> i3blocks-contrib-1.4.0_p20201127.tar.gz
-_eclasses_=optfeature	6a2add34e06e5a05d88471a33ccdd73e	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=b4abc7d7e5571f8aa4d7bd1ceaab5aab
+_eclasses_=optfeature	e142388219c7fee6ff016fe1c78a10a5	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=67986a627edde47a0cfd059a12400de8
diff --git a/metadata/md5-cache/x11-misc/i3status-2.13-r1 b/metadata/md5-cache/x11-misc/i3status-2.13-r1
index f75919568251..65a83a5aa6a7 100644
--- a/metadata/md5-cache/x11-misc/i3status-2.13-r1
+++ b/metadata/md5-cache/x11-misc/i3status-2.13-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig filecaps? ( sys-libs/libcap ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig filecaps? ( sys-libs/libcap ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=>=dev-libs/yajl-2.0.2 dev-libs/confuse:= dev-libs/libnl:3 media-libs/alsa-lib pulseaudio? ( || ( media-sound/pulseaudio media-sound/apulse[sdk] ) ) app-text/asciidoc app-text/xmlto
 DESCRIPTION=generates a status bar for dzen2, xmobar or similar
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/yajl-2.0.2 dev-libs/confuse:= dev-libs/libnl:3 media-libs/alsa-lib pulseaudio? ( || ( media-sound/pulseaudio media-sound/apulse[sdk] ) ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://i3wm.org/i3status/i3status-2.13.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	fcaps	da689a8e04bbbb3518888ff668fee45b	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c0c3c4a3a6086cfc41c4cb3047a80d80
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.8 b/metadata/md5-cache/x11-misc/imake-1.0.8
index 5d5ce551d421..e039e6723754 100644
--- a/metadata/md5-cache/x11-misc/imake-1.0.8
+++ b/metadata/md5-cache/x11-misc/imake-1.0.8
@@ -1,13 +1,13 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
 DEPEND=x11-misc/xorg-cf-files x11-base/xorg-proto
 DESCRIPTION=C preprocessor interface to the make utility
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/imake
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-misc/xorg-cf-files
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/imake-1.0.8.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
-_md5_=1f88a885dd5c47bac5a81923615af0a2
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=1c0b85588ac440f78cba365bed91dce7
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.8-r1 b/metadata/md5-cache/x11-misc/imake-1.0.8-r1
new file mode 100644
index 000000000000..62d34ad4b508
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/imake-1.0.8-r1
@@ -0,0 +1,12 @@
+BDEPEND=x11-base/xorg-proto sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DESCRIPTION=C preprocessor interface to the make utility
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/imake
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=x11-misc/xorg-cf-files
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/util/imake-1.0.8.tar.bz2
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=67c1d1804c95aac5f03735b4f51e438c
diff --git a/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827 b/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827
index b99f6f20c7e3..054846af1cd6 100644
--- a/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827
+++ b/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=mouse tool for advanced features such as wheels and 3+ buttons
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://gentoo/imwheel-1.0.0_pre13_p20100827.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=6760d62d57500230ca7bfd29f1a3127e
diff --git a/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.18 b/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.18
index 24ac2acd0b29..d2b268c6fefa 100644
--- a/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.18
+++ b/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.18
@@ -11,5 +11,5 @@ RDEPEND=dmenu? ( x11-misc/dmenu )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/enkore/j4-dmenu-desktop/archive/r2.18.tar.gz -> j4-dmenu-desktop-2.18.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7610187724a875aca935889b2af30f59
diff --git a/metadata/md5-cache/x11-misc/kbdd-0.7.1 b/metadata/md5-cache/x11-misc/kbdd-0.7.1
index 38d7ceff110d..1d54b4ab6f15 100644
--- a/metadata/md5-cache/x11-misc/kbdd-0.7.1
+++ b/metadata/md5-cache/x11-misc/kbdd-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare unpack
-DEPEND=dev-libs/glib:2= x11-libs/libX11:0= dbus? ( sys-apps/dbus:0= >=dev-libs/dbus-glib-0.86:0= ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2= x11-libs/libX11:0= dbus? ( sys-apps/dbus:0= >=dev-libs/dbus-glib-0.86:0= ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Very simple layout switcher
 EAPI=5
 HOMEPAGE=https://github.com/qnikst/kbdd
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2= x11-libs/libX11:0= dbus? ( sys-apps/dbus:0= >=dev-libs/dbus-glib-0.86:0= )
 SLOT=0
 SRC_URI=https://github.com/qnikst/kbdd/tarball/v0.7.1 -> kbdd-0.7.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	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	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2e4f19ed6f86d410d847016e99106ac3
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7a883bc7373ad1de42fca0018322ec63
diff --git a/metadata/md5-cache/x11-misc/kdocker-5.2 b/metadata/md5-cache/x11-misc/kdocker-5.2
index d0a44c384829..727ceb5cd517 100644
--- a/metadata/md5-cache/x11-misc/kdocker-5.2
+++ b/metadata/md5-cache/x11-misc/kdocker-5.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm
 SLOT=0
 SRC_URI=https://github.com/user-none/KDocker/archive/5.2.tar.gz -> KDocker-5.2.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4d1cb5235d26f0ee5d55fc5906390c6
diff --git a/metadata/md5-cache/x11-misc/kdocker-5.3 b/metadata/md5-cache/x11-misc/kdocker-5.3
index d61f7686a817..69bad455a626 100644
--- a/metadata/md5-cache/x11-misc/kdocker-5.3
+++ b/metadata/md5-cache/x11-misc/kdocker-5.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm
 SLOT=0
 SRC_URI=https://github.com/user-none/KDocker/archive/5.3.tar.gz -> KDocker-5.3.tar.gz
-_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d56217f9a23793044a18828eaf36e393
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.2.3 b/metadata/md5-cache/x11-misc/kronometer-2.2.3
index d9b4f230a7f7..c579ded85694 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.2.3
+++ b/metadata/md5-cache/x11-misc/kronometer-2.2.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.2.3/src/kronometer-2.2.3.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	ecm	23462b13731a265a5d99e493ec4a7720	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	1c383520a04b2d5564075764eaf0bde0	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26249e52a6c10c7b87e937289f8f5909
diff --git a/metadata/md5-cache/x11-misc/ktsuss-2.1 b/metadata/md5-cache/x11-misc/ktsuss-2.1
index e9805d28547a..b0d2cd88c9aa 100644
--- a/metadata/md5-cache/x11-misc/ktsuss-2.1
+++ b/metadata/md5-cache/x11-misc/ktsuss-2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=virtual/pkgconfig >=x11-libs/gtk+-2.12.11:2 >=dev-libs/glib-2.16.5:2 sudo? ( app-admin/sudo ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=virtual/pkgconfig >=x11-libs/gtk+-2.12.11:2 >=dev-libs/glib-2.16.5:2 sudo? ( app-admin/sudo ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Graphical version of su written in C and GTK+ 2
 EAPI=6
 HOMEPAGE=https://github.com/nomius/ktsuss
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=x11-libs/gtk+-2.12.11:2 >=dev-libs/glib-2.16.5:2 sudo? ( app-admin/sudo )
 SLOT=0
 SRC_URI=https://github.com/nomius/ktsuss/archive/2.1.tar.gz -> ktsuss-2.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0d21c1eb7ad0a13c2ceefd773d01f3a3
diff --git a/metadata/md5-cache/x11-misc/libinput-gestures-2.48 b/metadata/md5-cache/x11-misc/libinput-gestures-2.48
index 383475a70dd0..85c851944515 100644
--- a/metadata/md5-cache/x11-misc/libinput-gestures-2.48
+++ b/metadata/md5-cache/x11-misc/libinput-gestures-2.48
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/bulletmark/libinput-gestures/archive/2.48.tar.gz -> libinput-gestures-2.48.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d83d25eac0f78b72477d267a77c11f38
diff --git a/metadata/md5-cache/x11-misc/libinput-gestures-2.56 b/metadata/md5-cache/x11-misc/libinput-gestures-2.56
index b7de04a5aa6c..ef2155320029 100644
--- a/metadata/md5-cache/x11-misc/libinput-gestures-2.56
+++ b/metadata/md5-cache/x11-misc/libinput-gestures-2.56
@@ -10,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/bulletmark/libinput-gestures/archive/2.56.tar.gz -> libinput-gestures-2.56.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2071103589594b20f12ab4f446ddd751
diff --git a/metadata/md5-cache/x11-misc/libinput-gestures-9999 b/metadata/md5-cache/x11-misc/libinput-gestures-9999
index 4abac67fd00e..234b83cca76c 100644
--- a/metadata/md5-cache/x11-misc/libinput-gestures-9999
+++ b/metadata/md5-cache/x11-misc/libinput-gestures-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/libinput x11-misc/wmctrl x11-misc/xdotool
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2071103589594b20f12ab4f446ddd751
diff --git a/metadata/md5-cache/x11-misc/light-locker-1.9.0-r2 b/metadata/md5-cache/x11-misc/light-locker-1.9.0-r2
index 00324a512b6c..b6edde704b69 100644
--- a/metadata/md5-cache/x11-misc/light-locker-1.9.0-r2
+++ b/metadata/md5-cache/x11-misc/light-locker-1.9.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-perl/XML-Parser dev-util/intltool sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-lang/perl dev-perl/XML-Parser dev-util/intltool sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure postinst postrm prepare
 DEPEND=dev-libs/dbus-glib dev-libs/glib sys-apps/dbus x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango x11-libs/libXxf86vm dpms? ( x11-libs/libXext ) elogind? ( sys-auth/elogind ) screensaver? ( x11-libs/libXScrnSaver ) systemd? ( sys-apps/systemd ) upower? ( sys-power/upower )
 DESCRIPTION=A simple locker using lightdm
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/dbus-glib dev-libs/glib sys-apps/dbus x11-libs/cairo x11-libs/g
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/the-cavalry/light-locker/archive/v1.9.0.tar.gz -> light-locker-1.9.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26ebd683a1123add9764361b42076364
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.30.0-r2 b/metadata/md5-cache/x11-misc/lightdm-1.30.0-r2
index 2814c093c1c3..8f08c4a95a1a 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.30.0-r2
+++ b/metadata/md5-cache/x11-misc/lightdm-1.30.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare setup
 DEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 sys-libs/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) gnome? ( gnome-base/gnome-common )
 DESCRIPTION=A lightweight display manager
@@ -13,5 +13,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.30.0/lightdm-1.30.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97ce2b0c4ffe29b7b76e5551fa1c9426
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1
index b0b63f70f3ab..52368201779c 100644
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/intltool sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-util/intltool sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm prepare
 DEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 xfce-base/exo
 DESCRIPTION=LightDM GTK+ Greeter
@@ -10,5 +10,5 @@ LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
 RDEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
 SLOT=0
 SRC_URI=https://launchpad.net/lightdm-gtk-greeter/2.0/2.0.7/+download/lightdm-gtk-greeter-2.0.7.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=133692613fc7126919a80d6f259de227
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
index 4beefb90670b..c35e27426a8b 100644
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/intltool dev-util/xfce4-dev-tools sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-util/intltool dev-util/xfce4-dev-tools sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm prepare
 DEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2
 DESCRIPTION=LightDM GTK+ Greeter
@@ -10,5 +10,5 @@ LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
 RDEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
 SLOT=0
 SRC_URI=https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-2.0.8/lightdm-gtk-greeter-2.0.8.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7ad2fe1e26ac04a0dd03ba2c0ef38f1
diff --git a/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.3.4 b/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.3.4
index faae9b0d975c..1c46a8858df0 100644
--- a/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.3.4
+++ b/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.3.4
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DEPEND=>=x11-libs/gtk+-3.14:3 >=x11-misc/lightdm-1.12
 DESCRIPTION=A Minimal, Configurable, Single-User GTK3 LightDM Greeter
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-3.14:3 >=x11-misc/lightdm-1.12
 SLOT=0
 SRC_URI=https://github.com/prikhi/lightdm-mini-greeter/archive/0.3.4.tar.gz -> lightdm-mini-greeter-0.3.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=db14ab3b87fdfb3910d68ff766e4cfa3
diff --git a/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.4.0 b/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.4.0
index d7773d539047..fd911e37f6d2 100644
--- a/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.4.0
+++ b/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.4.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DEPEND=>=x11-libs/gtk+-3.14:3 >=x11-misc/lightdm-1.12
 DESCRIPTION=A Minimal, Configurable, Single-User GTK3 LightDM Greeter
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-3.14:3 >=x11-misc/lightdm-1.12
 SLOT=0
 SRC_URI=https://github.com/prikhi/lightdm-mini-greeter/archive/0.4.0.tar.gz -> lightdm-mini-greeter-0.4.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=172b76bbd740ce069bb8a5c6fe595ba3
diff --git a/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.5.0 b/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.5.0
index 03e7d5b464b8..94bdf5734e2c 100644
--- a/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.5.0
+++ b/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.5.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DEPEND=>=x11-libs/gtk+-3.14:3 >=x11-misc/lightdm-1.12
 DESCRIPTION=A Minimal, Configurable, Single-User GTK3 LightDM Greeter
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-3.14:3 >=x11-misc/lightdm-1.12
 SLOT=0
 SRC_URI=https://github.com/prikhi/lightdm-mini-greeter/archive/0.5.0.tar.gz -> lightdm-mini-greeter-0.5.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c835bf049c0c87e4f1aebc2b33a7c29d
diff --git a/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.5.1 b/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.5.1
index 4b64ec1528eb..84104a5187ae 100644
--- a/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.5.1
+++ b/metadata/md5-cache/x11-misc/lightdm-mini-greeter-0.5.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DEPEND=>=x11-libs/gtk+-3.14:3 >=x11-misc/lightdm-1.12
 DESCRIPTION=A Minimal, Configurable, Single-User GTK3 LightDM Greeter
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-3.14:3 >=x11-misc/lightdm-1.12
 SLOT=0
 SRC_URI=https://github.com/prikhi/lightdm-mini-greeter/archive/0.5.1.tar.gz -> lightdm-mini-greeter-0.5.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c835bf049c0c87e4f1aebc2b33a7c29d
diff --git a/metadata/md5-cache/x11-misc/lndir-9999 b/metadata/md5-cache/x11-misc/lndir-9999
index 2e3d93972df5..eb5208601580 100644
--- a/metadata/md5-cache/x11-misc/lndir-9999
+++ b/metadata/md5-cache/x11-misc/lndir-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
 DEPEND=>=x11-misc/util-macros-1.18 x11-base/xorg-proto
 DESCRIPTION=create a shadow directory of symbolic links to another directory tree
@@ -7,5 +7,5 @@ HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/lndir
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ba327c2722a23ff0d617bb2f694e6a6b
diff --git a/metadata/md5-cache/x11-misc/macopix-1.7.4-r1 b/metadata/md5-cache/x11-misc/macopix-1.7.4-r1
index 6992e05d8b0b..82ec7e33b436 100644
--- a/metadata/md5-cache/x11-misc/macopix-1.7.4-r1
+++ b/metadata/md5-cache/x11-misc/macopix-1.7.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 media-libs/libpng:0= sys-devel/gettext x11-libs/gtk+:2 gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2 media-libs/libpng:0= sys-devel/gettext x11-libs/gtk+:2 gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application
 EAPI=6
 HOMEPAGE=http://rosegray.sakura.ne.jp/macopix/index-e.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2 free-noncomm
 RDEPEND=dev-libs/glib:2 media-libs/libpng:0= sys-devel/gettext x11-libs/gtk+:2 gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://rosegray.sakura.ne.jp/macopix/macopix-1.7.4.tar.bz2 http://rosegray.sakura.ne.jp/macopix/macopix-mascot-HxB-euc-ja-0.30.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-marimite-euc-ja-2.20.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-cosmos-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-mizuiro-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-pia2-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-tsukihime-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-comic_party-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-kanon-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-one-euc-ja-1.02.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	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_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=937f820290fcde54e67eadbc31aaebe5
diff --git a/metadata/md5-cache/x11-misc/macopix-1.7.4-r2 b/metadata/md5-cache/x11-misc/macopix-1.7.4-r2
index a6962cb156a3..9b41153ace79 100644
--- a/metadata/md5-cache/x11-misc/macopix-1.7.4-r2
+++ b/metadata/md5-cache/x11-misc/macopix-1.7.4-r2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/glib:2 media-libs/libpng:0= sys-devel/gettext x11-libs/gtk+:2 gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) virtual/pkgconfig
 DESCRIPTION=MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application
@@ -10,5 +10,5 @@ LICENSE=GPL-2 free-noncomm
 RDEPEND=dev-libs/glib:2 media-libs/libpng:0= sys-devel/gettext x11-libs/gtk+:2 gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://rosegray.sakura.ne.jp/macopix/macopix-1.7.4.tar.bz2 http://rosegray.sakura.ne.jp/macopix/macopix-mascot-HxB-euc-ja-0.30.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-marimite-euc-ja-2.20.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-cosmos-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-mizuiro-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-pia2-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-tsukihime-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-comic_party-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-kanon-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-one-euc-ja-1.02.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2100ed11857f0ad75337dbe50cd7d0b0
diff --git a/metadata/md5-cache/x11-misc/macopix-3.4.0 b/metadata/md5-cache/x11-misc/macopix-3.4.0
index 3f735358507a..94cab50b6812 100644
--- a/metadata/md5-cache/x11-misc/macopix-3.4.0
+++ b/metadata/md5-cache/x11-misc/macopix-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/glib:2 media-libs/libpng:0= sys-devel/gettext gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) x11-libs/gtk+:3 virtual/pkgconfig
 DESCRIPTION=MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application
@@ -10,5 +10,5 @@ LICENSE=GPL-2 free-noncomm
 RDEPEND=dev-libs/glib:2 media-libs/libpng:0= sys-devel/gettext gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://rosegray.sakura.ne.jp/macopix/macopix-3.4.0.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-HxB-euc-ja-0.30.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-marimite-euc-ja-2.20.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-cosmos-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-mizuiro-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-pia2-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-tsukihime-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-comic_party-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-kanon-euc-ja-1.02.tar.gz http://rosegray.sakura.ne.jp/macopix/macopix-mascot-one-euc-ja-1.02.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ff9a6bb9dcab99cce23052d071f81a58
diff --git a/metadata/md5-cache/x11-misc/makedepend-1.0.6 b/metadata/md5-cache/x11-misc/makedepend-1.0.6
index 2208c70f17b2..f5e7ba1de019 100644
--- a/metadata/md5-cache/x11-misc/makedepend-1.0.6
+++ b/metadata/md5-cache/x11-misc/makedepend-1.0.6
@@ -1,12 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
 DEPEND=x11-base/xorg-proto
 DESCRIPTION=create dependencies in makefiles
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/makedepend
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/makedepend-1.0.6.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
-_md5_=083d309e9bb480fefff7d03654060d73
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=b25397267081f2664c268206a95e280a
diff --git a/metadata/md5-cache/x11-misc/matchbox-keyboard-0.1-r1 b/metadata/md5-cache/x11-misc/matchbox-keyboard-0.1-r1
index 3f020191083b..c9ba14056275 100644
--- a/metadata/md5-cache/x11-misc/matchbox-keyboard-0.1-r1
+++ b/metadata/md5-cache/x11-misc/matchbox-keyboard-0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libfakekey cairo? ( x11-libs/cairo[X] ) !cairo? ( x11-libs/libXft )
 SLOT=0
 SRC_URI=http://matchbox-project.org/sources/matchbox-keyboard/0.1/matchbox-keyboard-0.1.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e38b2e6835ba6523e66d204c0b9e24c
diff --git a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.24.0 b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.24.0
index d772aac02dd5..9a5b5c098770 100644
--- a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.24.0
+++ b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.24.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=sys-apps/dbus-1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7 x11-libs/libX11 virtual/libintl >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] app-arch/xz-utils dev-libs/libxml2 dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8:* >=sys-devel/libtool-2.2.6:2 virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
+DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=sys-apps/dbus-1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7 x11-libs/libX11 virtual/libintl >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] app-arch/xz-utils dev-libs/libxml2 dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8:* >=sys-devel/libtool-2.2.6:2 virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
 DESCRIPTION=MATE Notification daemon
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=sys-apps/dbus-1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7 x11-libs/libX11 virtual/libintl >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] virtual/libintl !x11-misc/notify-osd !x11-misc/qtnotifydaemon !x11-misc/notification-daemon
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-notification-daemon-1.24.0.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	600a203b6f17fa1070d58baa12f6e737	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e77952e7187a27622222ba277c7a0083
diff --git a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.24.1 b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.24.1
index ffcf85a9c979..bdbd3450fa21 100644
--- a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.24.1
+++ b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.24.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.9.0 >=sys-apps/dbus-1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7 x11-libs/libX11 virtual/libintl >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] app-arch/xz-utils dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2.6:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
+DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.9.0 >=sys-apps/dbus-1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7 x11-libs/libX11 virtual/libintl >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] app-arch/xz-utils dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2.6:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
 DESCRIPTION=MATE Notification daemon
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.9.0 >=sys-apps/dbus-1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7 x11-libs/libX11 virtual/libintl >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] virtual/libintl !x11-misc/notify-osd !x11-misc/qtnotifydaemon !x11-misc/notification-daemon
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-notification-daemon-1.24.1.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	600a203b6f17fa1070d58baa12f6e737	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d485e768a7876058bb7b291b3e19fcf7
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2 b/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
index 3c10805d4680..f20597edc085 100644
--- a/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
+++ b/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/psutil[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://launchpad.net/menulibre/2.2/2.2.1/+download/menulibre-2.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=937519a9e0a5aa6fc29f115a69e183be
diff --git a/metadata/md5-cache/x11-misc/menumaker-0.99.12 b/metadata/md5-cache/x11-misc/menumaker-0.99.12
index ad8273c93384..c6b8b218052b 100644
--- a/metadata/md5-cache/x11-misc/menumaker-0.99.12
+++ b/metadata/md5-cache/x11-misc/menumaker-0.99.12
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) doc? ( sys-apps/texinfo )
 DESCRIPTION=Utility that scans through the system and generates a menu of installed programs
@@ -11,5 +11,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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/menumaker/menumaker-0.99.12.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4a637e7fb29a5309ca3c345da425f3e3
diff --git a/metadata/md5-cache/x11-misc/mozo-1.24.0 b/metadata/md5-cache/x11-misc/mozo-1.24.0
index a02ff6ad3487..e526204e9024 100644
--- a/metadata/md5-cache/x11-misc/mozo-1.24.0
+++ b/metadata/md5-cache/x11-misc/mozo-1.24.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pygobject-3:3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
+DEPEND=python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pygobject-3:3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
 DESCRIPTION=Mozo menu editor for MATE
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/mozo-1.24.0.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	600a203b6f17fa1070d58baa12f6e737	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=531740810ddb4ea87baca643ef1faf66
diff --git a/metadata/md5-cache/x11-misc/mozo-1.24.0-r1 b/metadata/md5-cache/x11-misc/mozo-1.24.0-r1
index a8b94d7e6d13..f36d15849603 100644
--- a/metadata/md5-cache/x11-misc/mozo-1.24.0-r1
+++ b/metadata/md5-cache/x11-misc/mozo-1.24.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygobject-3:3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
+DEPEND=python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygobject-3:3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
 DESCRIPTION=Mozo menu editor for MATE
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/mozo-1.24.0.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	4d6de9e2337521f60965d1a9a118761f	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	600a203b6f17fa1070d58baa12f6e737	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6833ac0adf21e0086201eed9a1edec21
diff --git a/metadata/md5-cache/x11-misc/mugshot-0.4.3 b/metadata/md5-cache/x11-misc/mugshot-0.4.3
index aa6ed568aebe..688dcba65032 100644
--- a/metadata/md5-cache/x11-misc/mugshot-0.4.3
+++ b/metadata/md5-cache/x11-misc/mugshot-0.4.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/dbus-python[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/bluesabre/mugshot/archive/mugshot-0.4.3.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8081d01794ef243ab3ef10dfd8777988
diff --git a/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1 b/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
index 279b8fc897b7..d23fd91fec64 100644
--- a/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
+++ b/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A background browser and setter for X
 EAPI=6
 HOMEPAGE=https://github.com/l3ib/nitrogen
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://github.com/l3ib/nitrogen/releases/download/1.6.1/nitrogen-1.6.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	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
-_md5_=4df88aac13ea038db4d37bed48ef8df9
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c425cc697c82f385fc8e4cc215bd4a54
diff --git a/metadata/md5-cache/x11-misc/nitrogen-99999 b/metadata/md5-cache/x11-misc/nitrogen-99999
index 1998e662005b..8be9f3ca9035 100644
--- a/metadata/md5-cache/x11-misc/nitrogen-99999
+++ b/metadata/md5-cache/x11-misc/nitrogen-99999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure postinst postrm prepare unpack
 DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto )
 DESCRIPTION=A background browser and setter for X
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama )
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3c9e88fbec12613d8a735c8f0c813e10
diff --git a/metadata/md5-cache/x11-misc/notification-daemon-3.20.0 b/metadata/md5-cache/x11-misc/notification-daemon-3.20.0
index d8358e8a8be4..6d5022262748 100644
--- a/metadata/md5-cache/x11-misc/notification-daemon-3.20.0
+++ b/metadata/md5-cache/x11-misc/notification-daemon-3.20.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.19.5:3[X] sys-apps/dbus x11-libs/libX11 !x11-misc/notify-osd !x11-misc/qtnotifydaemon
 SLOT=0
 SRC_URI=mirror://gnome/sources/notification-daemon/3.20/notification-daemon-3.20.0.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	gnome.org	4d6de9e2337521f60965d1a9a118761f	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	gnome.org	df5c6c53843e1be0aad724138e78bbc3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=59aa09e074c5ab88aa2b0c7fb47abe06
diff --git a/metadata/md5-cache/x11-misc/notification-daemon-3.20.0-r1 b/metadata/md5-cache/x11-misc/notification-daemon-3.20.0-r1
index 43dfe2375b3b..85389df5909e 100644
--- a/metadata/md5-cache/x11-misc/notification-daemon-3.20.0-r1
+++ b/metadata/md5-cache/x11-misc/notification-daemon-3.20.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.19.5:3[X] sys-apps/dbus x11-libs/libX11 !x11-misc/notify-osd
 SLOT=0
 SRC_URI=mirror://gnome/sources/notification-daemon/3.20/notification-daemon-3.20.0.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3
 _md5_=b10480ae2de775e7f58a23c3eb1a8b2e
diff --git a/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1 b/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
index 41f995dac0bd..78ac86a83e53 100644
--- a/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
+++ b/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >=x11-libs/libnotify-0.7 >=x11-libs/libwnck-3:3 x11-libs/libX11 x11-libs/pixman !x11-misc/notification-daemon !x11-misc/qtnotifydaemon dev-util/glib-utils gnome-base/gnome-common x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >=x11-libs/libnotify-0.7 >=x11-libs/libwnck-3:3 x11-libs/libX11 x11-libs/pixman !x11-misc/notification-daemon !x11-misc/qtnotifydaemon dev-util/glib-utils gnome-base/gnome-common x11-base/xorg-proto virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Canonical's on-screen-display notification agent
 EAPI=6
 HOMEPAGE=https://launchpad.net/notify-osd
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/notify-osd/precise/0.9.34/+download/notify-osd-0.9.34.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b17ef88a244b891828e15874f1569c92
diff --git a/metadata/md5-cache/x11-misc/numlockx-1.2 b/metadata/md5-cache/x11-misc/numlockx-1.2
index bc3861a96175..1448f7b3c39e 100644
--- a/metadata/md5-cache/x11-misc/numlockx-1.2
+++ b/metadata/md5-cache/x11-misc/numlockx-1.2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXtst x11-base/xorg-proto
 DESCRIPTION=Changes keyboard's numlock state under X
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXtst
 SLOT=0
 SRC_URI=mirror://gentoo/numlockx-1.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f75cf71c292a552a94fb66f093e31cb2
diff --git a/metadata/md5-cache/x11-misc/obconf-9999 b/metadata/md5-cache/x11-misc/obconf-9999
index fc65c8264fae..56e7d305c677 100644
--- a/metadata/md5-cache/x11-misc/obconf-9999
+++ b/metadata/md5-cache/x11-misc/obconf-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm prepare unpack
-DEPEND=x11-libs/gtk+:3 x11-libs/startup-notification =x11-wm/openbox-9999 virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=x11-libs/gtk+:3 x11-libs/startup-notification =x11-wm/openbox-9999 virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=ObConf is a tool for configuring the Openbox window manager
 EAPI=6
 HOMEPAGE=http://openbox.org/wiki/ObConf:About
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=x11-libs/gtk+:3 x11-libs/startup-notification =x11-wm/openbox-9999
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd6ca92d4224c7b3d3f52512bf90e706
diff --git a/metadata/md5-cache/x11-misc/obconf-qt-0.16.0 b/metadata/md5-cache/x11-misc/obconf-qt-0.16.0
index aef260e354cb..5a6c2be9bd5b 100644
--- a/metadata/md5-cache/x11-misc/obconf-qt-0.16.0
+++ b/metadata/md5-cache/x11-misc/obconf-qt-0.16.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-wm/openbox:3 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/obconf-qt/releases/download/0.16.0/obconf-qt-0.16.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8557b62df9a39dc33b77f67d17c92d10
diff --git a/metadata/md5-cache/x11-misc/obmenu-generator-0.88 b/metadata/md5-cache/x11-misc/obmenu-generator-0.88
deleted file mode 100644
index 7838ce375754..000000000000
--- a/metadata/md5-cache/x11-misc/obmenu-generator-0.88
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=A fast pipe/static menu generator for the Openbox Window Manager
-EAPI=7
-HOMEPAGE=https://github.com/trizen/obmenu-generator
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl[gdbm] dev-perl/Data-Dump >=dev-perl/Linux-DesktopFiles-0.90.0 x11-wm/openbox
-SLOT=0
-SRC_URI=https://github.com/trizen/obmenu-generator/archive/0.88.tar.gz -> obmenu-generator-0.88.tar.gz
-_eclasses_=optfeature	6a2add34e06e5a05d88471a33ccdd73e
-_md5_=4ff8114188a53cab0fe69ea6b6a8858f
diff --git a/metadata/md5-cache/x11-misc/obmenu-generator-0.89 b/metadata/md5-cache/x11-misc/obmenu-generator-0.89
index 02ca10b029cd..28f569bf0210 100644
--- a/metadata/md5-cache/x11-misc/obmenu-generator-0.89
+++ b/metadata/md5-cache/x11-misc/obmenu-generator-0.89
@@ -7,5 +7,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl[gdbm] dev-perl/Data-Dump >=dev-perl/Linux-DesktopFiles-0.90.0 x11-wm/openbox
 SLOT=0
 SRC_URI=https://github.com/trizen/obmenu-generator/archive/0.89.tar.gz -> obmenu-generator-0.89.tar.gz
-_eclasses_=optfeature	6a2add34e06e5a05d88471a33ccdd73e
-_md5_=8ac3e60767f20a571e7ecd58b30d3f55
+_eclasses_=optfeature	e142388219c7fee6ff016fe1c78a10a5
+_md5_=ee1f1eed9b8879bd73e98128c71d8240
diff --git a/metadata/md5-cache/x11-misc/openbox-menu-0.8.0 b/metadata/md5-cache/x11-misc/openbox-menu-0.8.0
index 7324c5612ccf..f91658720c65 100644
--- a/metadata/md5-cache/x11-misc/openbox-menu-0.8.0
+++ b/metadata/md5-cache/x11-misc/openbox-menu-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 lxde-base/menu-cache x11-libs/gtk+:2 icons? ( x11-wm/ope
 REQUIRED_USE=svg? ( icons )
 SLOT=0
 SRC_URI=https://bitbucket.org/fabriceT/openbox-menu/downloads/openbox-menu-0.8.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dae71d9210088fc5a041e99b70c17f3d
+_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a5932e7523eeccff80edddfd36188878
diff --git a/metadata/md5-cache/x11-misc/openbox-menu-0.8.1 b/metadata/md5-cache/x11-misc/openbox-menu-0.8.1
index 0fee3476383c..d516c8443ce5 100644
--- a/metadata/md5-cache/x11-misc/openbox-menu-0.8.1
+++ b/metadata/md5-cache/x11-misc/openbox-menu-0.8.1
@@ -5,11 +5,11 @@ DESCRIPTION=Another dynamic menu generator for Openbox
 EAPI=7
 HOMEPAGE=http://fabrice.thiroux.free.fr/openbox-menu_en.html
 IUSE=+icons svg
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 lxde-base/menu-cache x11-libs/gtk+:3 icons? ( x11-wm/openbox[imlib,svg?] ) !icons? ( x11-wm/openbox )
 REQUIRED_USE=svg? ( icons )
 SLOT=0
 SRC_URI=https://github.com/fabriceT/openbox-menu/archive/v0.8.1.tar.gz -> openbox-menu-0.8.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0a9e905b2fbfb0a0ac150358977a203e
+_md5_=d7a7980d043f83538053c61da79557f5
diff --git a/metadata/md5-cache/x11-misc/parcellite-1.2.1 b/metadata/md5-cache/x11-misc/parcellite-1.2.1
index c50aea0ea660..0e93786de5fa 100644
--- a/metadata/md5-cache/x11-misc/parcellite-1.2.1
+++ b/metadata/md5-cache/x11-misc/parcellite-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 x11-misc/xdotool virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 x11-misc/xdotool virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A lightweight GTK+ based clipboard manager
 EAPI=5
 HOMEPAGE=http://parcellite.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 x11-misc/xdotool
 SLOT=0
 SRC_URI=mirror://sourceforge/parcellite/parcellite-1.2.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	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	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a52eaf1c99998e199d3cbf678c7347cd
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-1.3.1-r1 b/metadata/md5-cache/x11-misc/pcmanfm-1.3.1-r1
deleted file mode 100644
index 09cf8e5b8e76..000000000000
--- a/metadata/md5-cache/x11-misc/pcmanfm-1.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info ~x11-libs/libfm-1.3.1:=[gtk] virtual/eject virtual/freedesktop-icon-theme app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=Fast lightweight tabbed filemanager
-EAPI=7
-HOMEPAGE=https://wiki.lxde.org/en/PCManFM
-IUSE=debug
-KEYWORDS=~alpha amd64 arm arm64 ~mips ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info ~x11-libs/libfm-1.3.1:=[gtk] virtual/eject virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=mirror://sourceforge/pcmanfm/pcmanfm-1.3.1.tar.xz
-_eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4ecc138f74d7d8de5b12b0fef758dbcf
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0
index 5544109711cb..e87966d47624 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.16* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/pcmanfm-qt/releases/download/0.16.0/pcmanfm-qt-0.16.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a5c463d3479d0b3f7121e20cf4971fd
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.17.0 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.17.0
new file mode 100644
index 000000000000..34cb60f74de7
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.17.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.9.0 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.17* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme
+DESCRIPTION=Qt GUI Tabbed Filemanager
+EAPI=7
+HOMEPAGE=https://lxqt.github.io/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 GPL-2+ LGPL-2.1+
+RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.17* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme >=lxde-base/lxmenu-data-0.1.5
+SLOT=0
+SRC_URI=https://github.com/lxqt/pcmanfm-qt/releases/download/0.17.0/pcmanfm-qt-0.17.0.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=89527e7492901045fe4a655a2639a12e
diff --git a/metadata/md5-cache/x11-misc/peksystray-0.4.0 b/metadata/md5-cache/x11-misc/peksystray-0.4.0
index 5ff955185c27..9b9a6f17864a 100644
--- a/metadata/md5-cache/x11-misc/peksystray-0.4.0
+++ b/metadata/md5-cache/x11-misc/peksystray-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXt >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=x11-libs/libX11 x11-libs/libXt sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A system tray dockapp for window managers supporting docking
 EAPI=6
 HOMEPAGE=http://peksystray.sourceforge.net/
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/peksystray/peksystray-0.4.0.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3edd5b78b4c9d40af4e1b3094334780d
diff --git a/metadata/md5-cache/x11-misc/picom-8-r1 b/metadata/md5-cache/x11-misc/picom-8-r1
index 73c12a3c821d..4c9c294747b5 100644
--- a/metadata/md5-cache/x11-misc/picom-8-r1
+++ b/metadata/md5-cache/x11-misc/picom-8-r1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig doc? ( app-text/asciidoc ) test? ( || ( ( dev-lang/python:3.8 dev-python/xcffib[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/xcffib[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= dev-libs/libxdg-basedir ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A lightweight compositor for X11 (previously a compton fork)
 EAPI=7
 HOMEPAGE=https://github.com/yshui/picom
 IUSE=+config-file dbus +doc +drm opengl pcre test test
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=MPL-2.0 MIT
-RDEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= dev-libs/libxdg-basedir ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton
+RDEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton
 REQUIRED_USE=test? ( dbus )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/yshui/picom/archive/v8.tar.gz -> picom-8.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bbf7f0f1598003cbaa7ca335bd98fecd
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=00cfae73e4fea6e57d19fb0db68bdfcc
diff --git a/metadata/md5-cache/x11-misc/picom-8.2-r1 b/metadata/md5-cache/x11-misc/picom-8.2-r1
deleted file mode 100644
index 31983dfea62b..000000000000
--- a/metadata/md5-cache/x11-misc/picom-8.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/asciidoc ) test? ( || ( ( dev-lang/python:3.9 dev-python/xcffib[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/xcffib[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/xcffib[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= dev-libs/libxdg-basedir ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A lightweight compositor for X11 (previously a compton fork)
-EAPI=7
-HOMEPAGE=https://github.com/yshui/picom
-IUSE=+config-file dbus +doc +drm opengl pcre test test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MPL-2.0 MIT
-RDEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= dev-libs/libxdg-basedir ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton
-REQUIRED_USE=test? ( dbus )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/yshui/picom/archive/v8.2.tar.gz -> picom-8.2.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20bdc8cab13670422f7277634a895dec
diff --git a/metadata/md5-cache/x11-misc/picom-8.2-r2 b/metadata/md5-cache/x11-misc/picom-8.2-r2
index de7a02c86238..7f327b66464c 100644
--- a/metadata/md5-cache/x11-misc/picom-8.2-r2
+++ b/metadata/md5-cache/x11-misc/picom-8.2-r2
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig doc? ( app-text/asciidoc ) test? ( || ( ( dev-lang/python:3.9 dev-python/xcffib[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/xcffib[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/xcffib[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= dev-libs/libxdg-basedir ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A lightweight compositor for X11 (previously a compton fork)
 EAPI=7
 HOMEPAGE=https://github.com/yshui/picom
 IUSE=+config-file dbus +doc +drm opengl pcre test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MPL-2.0 MIT
-RDEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= dev-libs/libxdg-basedir ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton
+RDEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton
 REQUIRED_USE=test? ( dbus )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/yshui/picom/archive/v8.2.tar.gz -> picom-8.2.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e5a36ad8164da4b036c88692fd75959
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a25f3266f141f466885c986527473d04
diff --git a/metadata/md5-cache/x11-misc/picom-9999 b/metadata/md5-cache/x11-misc/picom-9999
index d3c3d872fc74..e52466bd68d2 100644
--- a/metadata/md5-cache/x11-misc/picom-9999
+++ b/metadata/md5-cache/x11-misc/picom-9999
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig doc? ( app-text/asciidoc ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= dev-libs/libxdg-basedir ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A lightweight compositor for X11 (previously a compton fork)
 EAPI=7
 HOMEPAGE=https://github.com/yshui/picom
 IUSE=+config-file dbus +doc +drm opengl pcre
 LICENSE=MPL-2.0 MIT
 PROPERTIES=live
-RDEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= dev-libs/libxdg-basedir ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton
+RDEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cea837263ab254c9b2d1ffa8ab20befe
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c88404673d64922f903e6d0131ab2266
diff --git a/metadata/md5-cache/x11-misc/piedock-1.6.9 b/metadata/md5-cache/x11-misc/piedock-1.6.9
index 16d8ccd39b31..6875abee3f60 100644
--- a/metadata/md5-cache/x11-misc/piedock-1.6.9
+++ b/metadata/md5-cache/x11-misc/piedock-1.6.9
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DEPEND=media-libs/libpng:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
 DESCRIPTION=A little bit like the famous OS X dock but in shape of a pie menu
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=media-libs/libpng:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://github.com/markusfisch/PieDock/archive/1.6.9.tar.gz -> piedock-1.6.9.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b7fa809bbeb0d6298ecc393d75864734
diff --git a/metadata/md5-cache/x11-misc/polybar-3.4.3 b/metadata/md5-cache/x11-misc/polybar-3.4.3
index a3f8a97b803c..d41bd9fcbf52 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.4.3
+++ b/metadata/md5-cache/x11-misc/polybar-3.4.3
@@ -11,5 +11,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/polybar/polybar/archive/3.4.3.tar.gz -> polybar-3.4.3.tar.gz https://github.com/polybar/xpp/archive/8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz -> xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz https://github.com/polybar/i3ipcpp/archive/21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz -> i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f471f772a81e2a28aca1594353f44e4
diff --git a/metadata/md5-cache/x11-misc/polybar-3.5.5 b/metadata/md5-cache/x11-misc/polybar-3.5.5
index eb13135e50b6..8c4c447baffa 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.5.5
+++ b/metadata/md5-cache/x11-misc/polybar-3.5.5
@@ -5,11 +5,11 @@ DESCRIPTION=A fast and easy-to-use tool for creating status bars
 EAPI=7
 HOMEPAGE=https://github.com/polybar/polybar
 IUSE=alsa curl doc i3wm ipc mpd network pulseaudio python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( x11-base/xcb-proto[python_targets_python3_7(-)] ) python_single_target_python3_8? ( x11-base/xcb-proto[python_targets_python3_8(-)] ) python_single_target_python3_9? ( x11-base/xcb-proto[python_targets_python3_9(-)] ) x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) doc? ( dev-python/sphinx ) i3wm? ( dev-libs/jsoncpp:= || ( x11-wm/i3 x11-wm/i3-gaps ) ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/polybar/polybar/archive/3.5.5.tar.gz -> polybar-3.5.5.tar.gz https://github.com/polybar/xpp/archive/044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz -> xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz https://github.com/polybar/i3ipcpp/archive/cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz -> i3ipcpp-cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4b92367e09029920ce1b7f4354b51888
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=288492f7cefb2762da8f19b9cd42bec6
diff --git a/metadata/md5-cache/x11-misc/primus-0.2-r3 b/metadata/md5-cache/x11-misc/primus-0.2-r3
index 273a0860307a..444303153182 100644
--- a/metadata/md5-cache/x11-misc/primus-0.2-r3
+++ b/metadata/md5-cache/x11-misc/primus-0.2-r3
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=x11-misc/bumblebee x11-drivers/nvidia-drivers[libglvnd(+)=]
 SLOT=0
 SRC_URI=https://github.com/amonakov/primus/archive/v0.2.tar.gz -> primus-0.2.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8a35f28eb5025c6f3ae33907a88e06a3
diff --git a/metadata/md5-cache/x11-misc/projecteur-0.8 b/metadata/md5-cache/x11-misc/projecteur-0.8
deleted file mode 100644
index 1e392724a2dc..000000000000
--- a/metadata/md5-cache/x11-misc/projecteur-0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/udev x11-libs/libX11
-DESCRIPTION=Linux Desktop Application for the Logitech Spotlight device
-EAPI=7
-HOMEPAGE=https://github.com/jahnf/Projecteur
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/udev x11-libs/libX11
-SLOT=0
-SRC_URI=https://github.com/jahnf/Projecteur/archive/v0.8.tar.gz -> projecteur-0.8.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=170506ea2965e009e193343b3ebc2069
diff --git a/metadata/md5-cache/x11-misc/projecteur-0.9.1 b/metadata/md5-cache/x11-misc/projecteur-0.9.1
index 4b2458072f8f..7e9e406c7d86 100644
--- a/metadata/md5-cache/x11-misc/projecteur-0.9.1
+++ b/metadata/md5-cache/x11-misc/projecteur-0.9.1
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/q
 DESCRIPTION=Linux Desktop Application for the Logitech Spotlight device
 EAPI=7
 HOMEPAGE=https://github.com/jahnf/Projecteur
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/udev x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/jahnf/Projecteur/archive/v0.9.1.tar.gz -> projecteur-0.9.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6976bf23892f7e6fc6947fc2cc776020
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=904f3c9aee3e2bf52a4b2102fc40581e
diff --git a/metadata/md5-cache/x11-misc/py3status-3.35 b/metadata/md5-cache/x11-misc/py3status-3.36
index 852b509682ad..79137247744e 100644
--- a/metadata/md5-cache/x11-misc/py3status-3.35
+++ b/metadata/md5-cache/x11-misc/py3status-3.36
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=!minimal? ( x11-misc/i3status ) gevent? ( >=dev-python/gevent-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) udev? ( >=dev-python/pyudev-0.21.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-SRC_URI=https://github.com/ultrabug/py3status/archive/3.35.tar.gz -> py3status-3.35.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+SRC_URI=https://github.com/ultrabug/py3status/archive/3.36.tar.gz -> py3status-3.36.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1851c00728eafeb3bc8748d07cebcc2b
diff --git a/metadata/md5-cache/x11-misc/qcomicbook-0.9.1 b/metadata/md5-cache/x11-misc/qcomicbook-0.9.1
index 7d1bf8b64452..523a3b2d4e5d 100644
--- a/metadata/md5-cache/x11-misc/qcomicbook-0.9.1
+++ b/metadata/md5-cache/x11-misc/qcomicbook-0.9.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
 SLOT=0
 SRC_URI=https://github.com/stolowski/QComicBook/archive/0.9.1.tar.gz -> qcomicbook-0.9.1.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a34bfaf2d6a345be87c4510d13fce0d7
diff --git a/metadata/md5-cache/x11-misc/qlipper-5.1.2 b/metadata/md5-cache/x11-misc/qlipper-5.1.2
index 2e24fc19aba9..7eafdc2e24c5 100644
--- a/metadata/md5-cache/x11-misc/qlipper-5.1.2
+++ b/metadata/md5-cache/x11-misc/qlipper-5.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/pvanek/qlipper/archive/5.1.2.tar.gz -> qlipper-5.1.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=150de0ea2caf8a9bbee1ad90f509c14f
diff --git a/metadata/md5-cache/x11-misc/qps-2.2.0 b/metadata/md5-cache/x11-misc/qps-2.2.0
index 1f3384d2f679..bf94eca3b920 100644
--- a/metadata/md5-cache/x11-misc/qps-2.2.0
+++ b/metadata/md5-cache/x11-misc/qps-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxqt-base/liblxqt-0.16.0
 SLOT=0
 SRC_URI=https://github.com/lxqt/qps/releases/download/2.2.0/qps-2.2.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a12454d3bd1050235d5d544d6ab5bdb
diff --git a/metadata/md5-cache/x11-misc/qps-2.3.0 b/metadata/md5-cache/x11-misc/qps-2.3.0
new file mode 100644
index 000000000000..d86208a68d2d
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/qps-2.3.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.9.0 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxqt-base/liblxqt-0.17.0
+DESCRIPTION=Qt GUI Process Manager
+EAPI=7
+HOMEPAGE=https://lxqt.github.io/
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxqt-base/liblxqt-0.17.0
+SLOT=0
+SRC_URI=https://github.com/lxqt/qps/releases/download/2.3.0/qps-2.3.0.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=75902d66dbd5e21fa6676ec517b879fd
diff --git a/metadata/md5-cache/x11-misc/qt5ct-1.2-r1 b/metadata/md5-cache/x11-misc/qt5ct-1.2-r1
new file mode 100644
index 000000000000..4b38569d80d0
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/qt5ct-1.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-qt/qtpaths:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] )
+DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/qt5ct/
+IUSE=+dbus
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD-2
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] )
+SLOT=0
+SRC_URI=https://download.sourceforge.net/qt5ct/qt5ct-1.2.tar.bz2
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=759d4fb4d180e8482930fbd0e0efdbbc
diff --git a/metadata/md5-cache/x11-misc/qterm-0.7.1 b/metadata/md5-cache/x11-misc/qterm-0.7.1
deleted file mode 100644
index e6c5df38cc01..000000000000
--- a/metadata/md5-cache/x11-misc/qterm-0.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5[scripttools] dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-qt/linguist-tools:5 dev-qt/qthelp:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A BBS client based on Qt
-EAPI=6
-HOMEPAGE=https://github.com/qterm/qterm
-IUSE=libressl
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5[scripttools] dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
-SLOT=0
-SRC_URI=https://github.com/qterm/qterm/archive/0.7.1.tar.gz -> qterm-0.7.1.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=362c78d8937a660863e26c2612847431
diff --git a/metadata/md5-cache/x11-misc/qterm-0.7.3 b/metadata/md5-cache/x11-misc/qterm-0.7.3
index e929257b2088..5eb734ef72f7 100644
--- a/metadata/md5-cache/x11-misc/qterm-0.7.3
+++ b/metadata/md5-cache/x11-misc/qterm-0.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5[scripttools] dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 SLOT=0
 SRC_URI=https://github.com/qterm/qterm/archive/0.7.3.tar.gz -> qterm-0.7.3.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ef7e2253a290c4bd5041ad243970dad
diff --git a/metadata/md5-cache/x11-misc/qtfm-99999 b/metadata/md5-cache/x11-misc/qtfm-99999
index ef225f355f0e..646f8894fceb 100644
--- a/metadata/md5-cache/x11-misc/qtfm-99999
+++ b/metadata/md5-cache/x11-misc/qtfm-99999
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-apps/file dbus? ( dev-qt/qtdbus:5 ) ffmpeg? ( media-video/ffmpeg ) imagemagick? ( >=media-gfx/imagemagick-7:= )
 SLOT=0
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6594342ff3cf386138cd7da624ad327
diff --git a/metadata/md5-cache/x11-misc/quitcount-3.1.3 b/metadata/md5-cache/x11-misc/quitcount-3.1.3
index d4f03243c1dc..7528cc1738a9 100644
--- a/metadata/md5-cache/x11-misc/quitcount-3.1.3
+++ b/metadata/md5-cache/x11-misc/quitcount-3.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/quitcount/3.1/quitcount-3.1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d1e1c78868b7e8c0cb77a5a7af60619
diff --git a/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20190821 b/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20190821
index 1780e988f374..f7303c0af76f 100644
--- a/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20190821
+++ b/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20190821
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxkbfile x11-apps/setxkbmap
 SLOT=0
 SRC_URI=https://github.com/disels/qxkb/archive/ee9a1eee9dc810b33b931601203051d841bc3e7a.tar.gz -> qxkb-0.5.1_pre20190821.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3d19af1e83e402fc1d037538be8b214
diff --git a/metadata/md5-cache/x11-misc/read-edid-3.0.2 b/metadata/md5-cache/x11-misc/read-edid-3.0.2
index 587caeb3ee5f..83824f71bc73 100644
--- a/metadata/md5-cache/x11-misc/read-edid-3.0.2
+++ b/metadata/md5-cache/x11-misc/read-edid-3.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libx86-1.1
 SLOT=0
 SRC_URI=http://www.polypux.org/projects/read-edid/read-edid-3.0.2.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=532a793a3c5ec982cc57010dd70711d2
diff --git a/metadata/md5-cache/x11-misc/redshift-1.12-r3 b/metadata/md5-cache/x11-misc/redshift-1.12-r3
index 513222789f26..3b66d2ce16b5 100644
--- a/metadata/md5-cache/x11-misc/redshift-1.12-r3
+++ b/metadata/md5-cache/x11-misc/redshift-1.12-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm appindicator? ( dev-libs/libappindicator:3[introspection] ) geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-util/intltool-0.50 nls? ( sys-devel/gettext ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm appindicator? ( dev-libs/libappindicator:3[introspection] ) geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-util/intltool-0.50 nls? ( sys-devel/gettext ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A screen color temperature adjusting software
 EAPI=6
 HOMEPAGE=http://jonls.dk/redshift/
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdr
 REQUIRED_USE=gtk? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/jonls/redshift/archive/v1.12.tar.gz -> redshift-1.12.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d2ca1fe8c42b1e56f44b38cf911c066
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7ffe66e6da63d25e60685524afdded6c
diff --git a/metadata/md5-cache/x11-misc/redshift-1.12-r4 b/metadata/md5-cache/x11-misc/redshift-1.12-r4
new file mode 100644
index 000000000000..9b5a77aade67
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/redshift-1.12-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm appindicator? ( dev-libs/libappindicator:3[introspection] ) geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-util/intltool-0.50 nls? ( sys-devel/gettext ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A screen color temperature adjusting software
+EAPI=6
+HOMEPAGE=http://jonls.dk/redshift/
+IUSE=appindicator geoclue gtk nls python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm appindicator? ( dev-libs/libappindicator:3[introspection] ) geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) gtk? ( dev-python/pygobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] dev-python/pyxdg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+REQUIRED_USE=gtk? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=https://github.com/jonls/redshift/archive/v1.12.tar.gz -> redshift-1.12.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=92705982a23cef7c0630030f1f24b486
diff --git a/metadata/md5-cache/x11-misc/redshift-1.12-r5 b/metadata/md5-cache/x11-misc/redshift-1.12-r5
new file mode 100644
index 000000000000..0400e1d6ac66
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/redshift-1.12-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm appindicator? ( dev-libs/libappindicator:3[introspection] ) geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-util/intltool-0.50 nls? ( sys-devel/gettext ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A screen color temperature adjusting software
+EAPI=6
+HOMEPAGE=http://jonls.dk/redshift/
+IUSE=appindicator geoclue gtk nls python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm appindicator? ( dev-libs/libappindicator:3[introspection] ) geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) gtk? ( dev-python/pygobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] dev-python/pyxdg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+REQUIRED_USE=gtk? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=https://github.com/jonls/redshift/archive/v1.12.tar.gz -> redshift-1.12.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=396dddf9fd7141e06b71c490cdcd23f6
diff --git a/metadata/md5-cache/x11-misc/revelation-0.5.4-r1 b/metadata/md5-cache/x11-misc/revelation-0.5.4-r1
index ed2a8c80f3e6..8ef56cd65fd7 100644
--- a/metadata/md5-cache/x11-misc/revelation-0.5.4-r1
+++ b/metadata/md5-cache/x11-misc/revelation-0.5.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mikelolasagasti/revelation/releases/download/revelation-0.5.4/revelation-0.5.4.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7a122ce87f41b80e5bd30e269bda0b3
diff --git a/metadata/md5-cache/x11-misc/rodent-5.3.16.3-r1 b/metadata/md5-cache/x11-misc/rodent-5.3.16.3-r1
index 361dc14cbbc9..ae20e70b15cf 100644
--- a/metadata/md5-cache/x11-misc/rodent-5.3.16.3-r1
+++ b/metadata/md5-cache/x11-misc/rodent-5.3.16.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=postinst postrm prepare
-DEPEND=>=x11-libs/librfm-5.3.16.3 dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=x11-libs/librfm-5.3.16.3 dev-util/intltool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A fast, small and powerful file manager and graphical shell
 EAPI=6
 HOMEPAGE=http://xffm.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=x11-libs/librfm-5.3.16.3
 SLOT=0
 SRC_URI=mirror://sourceforge/xffm/5.3.16.3/rodent-5.3.16.3.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	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_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f46e4c150dca655d555984500e2dea2b
diff --git a/metadata/md5-cache/x11-misc/rofi-1.6.1 b/metadata/md5-cache/x11-misc/rofi-1.6.1
index afb5faa8e215..36aa0dc7e5dd 100644
--- a/metadata/md5-cache/x11-misc/rofi-1.6.1
+++ b/metadata/md5-cache/x11-misc/rofi-1.6.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
 DESCRIPTION=A window switcher, run dialog and dmenu replacement
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davatorium/rofi/releases/download/1.6.1/rofi-1.6.1.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=355b6cdfd5bfe49aefdc5b1703be2acf
diff --git a/metadata/md5-cache/x11-misc/rofi-99999 b/metadata/md5-cache/x11-misc/rofi-99999
index af3bc1a172da..e0ef22200103 100644
--- a/metadata/md5-cache/x11-misc/rofi-99999
+++ b/metadata/md5-cache/x11-misc/rofi-99999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
 DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
 DESCRIPTION=A window switcher, run dialog and dmenu replacement
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7a85ad04df245e612e25ad2b09df5c11
diff --git a/metadata/md5-cache/x11-misc/rofi-calc-2.0.0 b/metadata/md5-cache/x11-misc/rofi-calc-2.0.0
index 3d00abe4d068..62ee89484169 100644
--- a/metadata/md5-cache/x11-misc/rofi-calc-2.0.0
+++ b/metadata/md5-cache/x11-misc/rofi-calc-2.0.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DEPEND=x11-misc/rofi >=sci-libs/libqalculate-2.0
 DESCRIPTION=Do live calculations in rofi!
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-misc/rofi >=sci-libs/libqalculate-2.0
 SLOT=0
 SRC_URI=https://github.com/svenstaro/rofi-calc/archive/v2.0.0.tar.gz -> rofi-calc-2.0.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4b2c4a4388b24914beae50e3b15167a3
diff --git a/metadata/md5-cache/x11-misc/rofi-calc-9999 b/metadata/md5-cache/x11-misc/rofi-calc-9999
index 149cd50d72bc..57f2f6199165 100644
--- a/metadata/md5-cache/x11-misc/rofi-calc-9999
+++ b/metadata/md5-cache/x11-misc/rofi-calc-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare unpack
 DEPEND=x11-misc/rofi >=sci-libs/libqalculate-2.0
 DESCRIPTION=Do live calculations in rofi!
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-misc/rofi >=sci-libs/libqalculate-2.0
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=76c5de72c181d71ef17891cbe75b87a6
diff --git a/metadata/md5-cache/x11-misc/rss-glx-0.9.1-r3 b/metadata/md5-cache/x11-misc/rss-glx-0.9.1-r3
index 7c24b209817a..02a39390601c 100644
--- a/metadata/md5-cache/x11-misc/rss-glx-0.9.1-r3
+++ b/metadata/md5-cache/x11-misc/rss-glx-0.9.1-r3
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig bzip2? ( app-arch/bzip2 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig bzip2? ( app-arch/bzip2 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext >=media-libs/glew-1.5.1:= media-libs/mesa[X(+)] >=media-gfx/imagemagick-6.4:= >=x11-misc/xscreensaver-5.08-r2 bzip2? ( app-arch/bzip2 ) openal? ( >=media-libs/freealut-1.1.0-r1 ) quesoglc? ( media-libs/quesoglc ) x11-base/xorg-proto
 DESCRIPTION=Really Slick OpenGL Screensavers for XScreenSaver
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=media-libs/glew-1.5.1:= media-libs/mesa[X(+)] >=media-gfx/imagemagick-6.4:= >=x11-misc/xscreensaver-5.08-r2 bzip2? ( app-arch/bzip2 ) openal? ( >=media-libs/freealut-1.1.0-r1 ) quesoglc? ( media-libs/quesoglc )
 SLOT=0
 SRC_URI=mirror://sourceforge/rss-glx/rss-glx_0.9.1.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=422f001d4d038b358256a96fea635faa
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.0.9-r2 b/metadata/md5-cache/x11-misc/safeeyes-2.0.9-r2
index 811f4a6976ac..b7f4af725096 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.0.9-r2
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.0.9-r2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.0.9.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0aafaff6eed166962b4c656ceff53a98
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.1.1 b/metadata/md5-cache/x11-misc/safeeyes-2.1.1
index a74677a99cfb..b3a443a65796 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.1.1
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.1.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.1.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbd2096e440ea61e2b7a4421b4890d3c
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.1.2 b/metadata/md5-cache/x11-misc/safeeyes-2.1.2
index b2434b911c4b..1174f5c20df9 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.1.2
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.1.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.1.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3501a8ca3a93b1525c682b03e8bc7814
diff --git a/metadata/md5-cache/x11-misc/screengrab-1.101 b/metadata/md5-cache/x11-misc/screengrab-1.101
index 00831e11338a..b52d36238dc2 100644
--- a/metadata/md5-cache/x11-misc/screengrab-1.101
+++ b/metadata/md5-cache/x11-misc/screengrab-1.101
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtnetwork:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libxcb x11-libs/libX11
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/screengrab/1.101/screengrab-1.101.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea3dcad4f8f46b212097f78972a7e01a
diff --git a/metadata/md5-cache/x11-misc/screengrab-2.0.0 b/metadata/md5-cache/x11-misc/screengrab-2.0.0
index 212730d27eb7..c0843d512dc8 100644
--- a/metadata/md5-cache/x11-misc/screengrab-2.0.0
+++ b/metadata/md5-cache/x11-misc/screengrab-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtnetwork:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libxcb x11-libs/libX11 x11-libs/libXfixes
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/screengrab/2.0.0/screengrab-2.0.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=555b383e22294bb4185f57ee8cea9b1f
diff --git a/metadata/md5-cache/x11-misc/screengrab-2.0.1 b/metadata/md5-cache/x11-misc/screengrab-2.0.1
index 61e78e9e437d..810bdea04b94 100644
--- a/metadata/md5-cache/x11-misc/screengrab-2.0.1
+++ b/metadata/md5-cache/x11-misc/screengrab-2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.5.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtnetwork:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libxcb x11-libs/libX11 x11-libs/libXfixes
 SLOT=0
 SRC_URI=https://github.com/lxqt/screengrab/releases/download/2.0.1/screengrab-2.0.1.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c83c5c1ab7f6c7e011bcf005965b2636
diff --git a/metadata/md5-cache/x11-misc/screengrab-2.1.0 b/metadata/md5-cache/x11-misc/screengrab-2.1.0
index a199ceb04dac..26921a8c098d 100644
--- a/metadata/md5-cache/x11-misc/screengrab-2.1.0
+++ b/metadata/md5-cache/x11-misc/screengrab-2.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.6.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libX11 x11-libs/libxcb x11-libs/libXfixes
 SLOT=0
 SRC_URI=https://github.com/lxqt/screengrab/releases/download/2.1.0/screengrab-2.1.0.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=749b8b2497b704870a7a066339c951c6
diff --git a/metadata/md5-cache/x11-misc/screengrab-2.2.0 b/metadata/md5-cache/x11-misc/screengrab-2.2.0
new file mode 100644
index 000000000000..94015e7e32fb
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/screengrab-2.2.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/libqtxdg-3.7.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libX11 x11-libs/libxcb x11-libs/libXfixes
+DESCRIPTION=Qt GUI Screenshot Utility
+EAPI=7
+HOMEPAGE=https://lxqt.github.io/
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/libqtxdg-3.7.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libX11 x11-libs/libxcb x11-libs/libXfixes
+SLOT=0
+SRC_URI=https://github.com/lxqt/screengrab/releases/download/2.2.0/screengrab-2.2.0.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce8d0975a25b93f7e91176c876fdaa61
diff --git a/metadata/md5-cache/x11-misc/screenkey-1.3 b/metadata/md5-cache/x11-misc/screenkey-1.3
index 4723f8221500..7b58046adb0c 100644
--- a/metadata/md5-cache/x11-misc/screenkey-1.3
+++ b/metadata/md5-cache/x11-misc/screenkey-1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/screenkey/screenkey/-/archive/v1.3/screenkey-v1.3.tar.gz -> screenkey-1.3.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=295df2fa7eac41537de1009e2a29549a
diff --git a/metadata/md5-cache/x11-misc/screenkey-1.4 b/metadata/md5-cache/x11-misc/screenkey-1.4
index e97d86b20415..a13f31eb1d84 100644
--- a/metadata/md5-cache/x11-misc/screenkey-1.4
+++ b/metadata/md5-cache/x11-misc/screenkey-1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/screenkey/screenkey/-/archive/v1.4/screenkey-v1.4.tar.gz -> screenkey-1.4.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b911855ebd269f93d748fa82aed3c8bc
diff --git a/metadata/md5-cache/x11-misc/screenkey-9999 b/metadata/md5-cache/x11-misc/screenkey-9999
index 6dcbf45d9b28..2258df5c53b6 100644
--- a/metadata/md5-cache/x11-misc/screenkey-9999
+++ b/metadata/md5-cache/x11-misc/screenkey-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pycairo[python_targets_python3_7(-)?,python_targets_python3_8
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b911855ebd269f93d748fa82aed3c8bc
diff --git a/metadata/md5-cache/x11-misc/sddm-0.15.0 b/metadata/md5-cache/x11-misc/sddm-0.15.0
index 91c7380562ff..84d3255689d4 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.15.0
+++ b/metadata/md5-cache/x11-misc/sddm-0.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-q
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.15.0/sddm-0.15.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd0d4945838571d103bb584c4858971b
diff --git a/metadata/md5-cache/x11-misc/sddm-0.18.1-r3 b/metadata/md5-cache/x11-misc/sddm-0.18.1-r3
index fc0bcad086c0..6740ca9829b2 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.18.1-r3
+++ b/metadata/md5-cache/x11-misc/sddm-0.18.1-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a32fc46c4db3f27aa5a3615338f4e1b
diff --git a/metadata/md5-cache/x11-misc/seetxt-0.72-r1 b/metadata/md5-cache/x11-misc/seetxt-0.72-r1
index 8d1d32422e80..020a962b48c3 100644
--- a/metadata/md5-cache/x11-misc/seetxt-0.72-r1
+++ b/metadata/md5-cache/x11-misc/seetxt-0.72-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
 DEPEND=x11-libs/gtk+:2
 DESCRIPTION=Clever, lightweight GUI text file and manual page viewer for X windows
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://seetxt.googlecode.com/files/seetxt-0.72.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b47f8ceccd956ab9b37257e7afdcc6da
diff --git a/metadata/md5-cache/x11-misc/sent-0.2 b/metadata/md5-cache/x11-misc/sent-0.2
deleted file mode 100644
index 9d56457882f5..000000000000
--- a/metadata/md5-cache/x11-misc/sent-0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=media-libs/fontconfig media-libs/libpng:* x11-libs/libX11 x11-libs/libXft
-DESCRIPTION=Simple plaintext presentation tool
-EAPI=5
-HOMEPAGE=https://tools.suckless.org/sent/
-IUSE=savedconfig
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=media-libs/fontconfig media-libs/libpng:* x11-libs/libX11 x11-libs/libXft
-SLOT=0
-SRC_URI=https://dl.suckless.org/tools/sent-0.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7309a56300cbda9baa93abf6ec210159
diff --git a/metadata/md5-cache/x11-misc/sent-1-r1 b/metadata/md5-cache/x11-misc/sent-1-r1
index e3e0ff131210..297844ef143b 100644
--- a/metadata/md5-cache/x11-misc/sent-1-r1
+++ b/metadata/md5-cache/x11-misc/sent-1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft !savedconfig? ( media-gfx/farbfeld )
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/sent-1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b37b7e4fcd292576275c19f35744a6af
diff --git a/metadata/md5-cache/x11-misc/sent-9999 b/metadata/md5-cache/x11-misc/sent-9999
index 05e8c65f4470..9a1290c6718d 100644
--- a/metadata/md5-cache/x11-misc/sent-9999
+++ b/metadata/md5-cache/x11-misc/sent-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft !savedconfig? ( media-gfx/farbfeld )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=6080da427b7212cb251f9fb00841ce77
diff --git a/metadata/md5-cache/x11-misc/set_opacity-9999 b/metadata/md5-cache/x11-misc/set_opacity-9999
index ca5a52f94830..2a8676b3c506 100644
--- a/metadata/md5-cache/x11-misc/set_opacity-9999
+++ b/metadata/md5-cache/x11-misc/set_opacity-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=x11-libs/libXdamage x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXrender
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0cdd4b53908ab36fd4fde6d8c05019fb
diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-1.10-r1 b/metadata/md5-cache/x11-misc/shared-mime-info-1.10-r1
index a035b53c984a..0aaddb945cc3 100644
--- a/metadata/md5-cache/x11-misc/shared-mime-info-1.10-r1
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-1.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Shared MIME-info Database specification
 EAPI=6
 HOMEPAGE=https://freedesktop.org/wiki/Software/shared-mime-info
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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=GPL-2
 RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hadess/shared-mime-info-1.10.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc3624f2fcd77769bcef158894264889
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=419b52e4a8a4c5370aadfd4583acd90a
diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-1.15 b/metadata/md5-cache/x11-misc/shared-mime-info-1.15
index b9715bafe961..64c1c53a8f4d 100644
--- a/metadata/md5-cache/x11-misc/shared-mime-info-1.15
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-1.15
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-libs/libxml2
 DESCRIPTION=The Shared MIME-info Database specification
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/xdg/shared-mime-info
-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
+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=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-1.15.tar.xz
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05eeab7a813fa9c9ed053d97199d041c
+_md5_=80eb2ed761f5dc4d10bf7e2e18a1120d
diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-2.0-r2 b/metadata/md5-cache/x11-misc/shared-mime-info-2.0-r2
index 5483f3578269..23a8aded34d0 100644
--- a/metadata/md5-cache/x11-misc/shared-mime-info-2.0-r2
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-2.0-r2
@@ -4,11 +4,11 @@ DEPEND=dev-libs/glib:2 dev-libs/libxml2
 DESCRIPTION=The Shared MIME-info Database specification
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/xdg/shared-mime-info
-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
+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=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0440063a2e6823a4b1a6fb2f2af8350f/shared-mime-info-2.0.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6dc0aaa066ca90705896e74be82b518
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4d13df2867c7bbe8448758b193fc7e4c
diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-2.1 b/metadata/md5-cache/x11-misc/shared-mime-info-2.1
index 555e1b2c1e73..fd65537826bd 100644
--- a/metadata/md5-cache/x11-misc/shared-mime-info-2.1
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libxml2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-2.1.tar.xz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=096e0bfc54ac774c73425b7aa89fc182
diff --git a/metadata/md5-cache/x11-misc/shutter-0.94.3_p20200621 b/metadata/md5-cache/x11-misc/shutter-0.94.3_p20200621
index e854707315b8..8d77243d0e94 100644
--- a/metadata/md5-cache/x11-misc/shutter-0.94.3_p20200621
+++ b/metadata/md5-cache/x11-misc/shutter-0.94.3_p20200621
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/gnome2-canvas dev-perl/gnome2-wnck dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/Gtk2-Unique dev-perl/Gtk2-ImageView dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl]
 SLOT=0
 SRC_URI=https://github.com/shutter-project/shutter/archive/af237e7f415a5fa20402703490c6190dc1af9b20.tar.gz -> shutter-0.94.3_p20200621.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	6a2add34e06e5a05d88471a33ccdd73e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	e142388219c7fee6ff016fe1c78a10a5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00dedbd7fad9ee5d3ca7d00c4209ce55
diff --git a/metadata/md5-cache/x11-misc/shutter-0.95 b/metadata/md5-cache/x11-misc/shutter-0.95
index 3bf8421eeeed..ce16bec1b96b 100644
--- a/metadata/md5-cache/x11-misc/shutter-0.95
+++ b/metadata/md5-cache/x11-misc/shutter-0.95
@@ -3,10 +3,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Feature-rich screenshot program
 EAPI=7
 HOMEPAGE=https://shutter-project.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/gnome2-canvas dev-perl/gnome2-wnck dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/Gtk2-Unique dev-perl/Gtk2-ImageView dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl]
 SLOT=0
 SRC_URI=https://github.com/shutter-project/shutter/archive/v0.95.tar.gz -> shutter-0.95.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	6a2add34e06e5a05d88471a33ccdd73e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1547d88e61bb031629c5ae997488df89
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	e142388219c7fee6ff016fe1c78a10a5	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ad13dfa0ebefbb188eb79ec59f680782
diff --git a/metadata/md5-cache/x11-misc/simpleswitcher-99999999 b/metadata/md5-cache/x11-misc/simpleswitcher-99999999
index 928df97fdd65..a531f90b429c 100644
--- a/metadata/md5-cache/x11-misc/simpleswitcher-99999999
+++ b/metadata/md5-cache/x11-misc/simpleswitcher-99999999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=871795db87928d021b9c8afc25ab9d28
diff --git a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1 b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1
index fc3f1ca35122..d7d0451dcf54 100644
--- a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1
+++ b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=http://www.winischhofer.net/sis/sisctrl-0.0.20051202.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=22e196c17d2c8f7bd787a34e11bf38f2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=cb1d11c9fa61f9a43c82e23b26f87767
diff --git a/metadata/md5-cache/x11-misc/skippy-0.5.0-r1 b/metadata/md5-cache/x11-misc/skippy-0.5.0-r1
index ceac9a8164de..ba6ad4acab2f 100644
--- a/metadata/md5-cache/x11-misc/skippy-0.5.0-r1
+++ b/metadata/md5-cache/x11-misc/skippy-0.5.0-r1
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile postinst
-DEPEND=media-libs/imlib2[X] x11-libs/libXext x11-libs/libX11 x11-libs/libXinerama x11-libs/libXmu x11-libs/libXft x11-base/xorg-proto virtual/pkgconfig
+DEPEND=media-libs/imlib2[X] x11-libs/libXext x11-libs/libX11 x11-libs/libXinerama x11-libs/libXmu x11-libs/libXft x11-base/xorg-proto
 DESCRIPTION=A full-screen task-switcher providing Apple Expose-like functionality
 EAPI=7
 HOMEPAGE=http://thegraveyard.org/skippy.php
@@ -9,4 +10,4 @@ RDEPEND=media-libs/imlib2[X] x11-libs/libXext x11-libs/libX11 x11-libs/libXinera
 SLOT=0
 SRC_URI=http://thegraveyard.org/files/skippy-0.5.0.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8a3314a71a1daddb64bc2bd0fff2178d
+_md5_=f11126b38d22c83a8a12577fe67596c8
diff --git a/metadata/md5-cache/x11-misc/slim-1.3.6-r5 b/metadata/md5-cache/x11-misc/slim-1.3.6-r5
index 1527e05034ae..db237bbfe58e 100644
--- a/metadata/md5-cache/x11-misc/slim-1.3.6-r5
+++ b/metadata/md5-cache/x11-misc/slim-1.3.6-r5
@@ -10,5 +10,5 @@ PDEPEND=branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )
 RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg pam? ( sys-libs/pam !x11-misc/slimlock )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/slim.berlios/slim-1.3.6.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7e75715e4adc1985bfc802dd5796e408
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d637bb7126af5c62392306f755c5625b
diff --git a/metadata/md5-cache/x11-misc/slim-9999 b/metadata/md5-cache/x11-misc/slim-9999
index fb59d1519f9d..a9993b3bc5da 100644
--- a/metadata/md5-cache/x11-misc/slim-9999
+++ b/metadata/md5-cache/x11-misc/slim-9999
@@ -9,5 +9,5 @@ PDEPEND=branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )
 PROPERTIES=live
 RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg pam? ( sys-libs/pam !x11-misc/slimlock )
 SLOT=0
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f91cb1804bea7fd44291ed814b061df0
diff --git a/metadata/md5-cache/x11-misc/slock-1.4 b/metadata/md5-cache/x11-misc/slock-1.4
index 641bb62513ae..46e48a9cd71f 100644
--- a/metadata/md5-cache/x11-misc/slock-1.4
+++ b/metadata/md5-cache/x11-misc/slock-1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/slock-1.4.tar.gz
-_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0b51a5562fd2114826139d67f03e87b2
diff --git a/metadata/md5-cache/x11-misc/slop-7.5 b/metadata/md5-cache/x11-misc/slop-7.5
index 5eca6c027f14..39e0bc6913e5 100644
--- a/metadata/md5-cache/x11-misc/slop-7.5
+++ b/metadata/md5-cache/x11-misc/slop-7.5
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= x11-libs/libX11 x11-libs/libXext opengl? ( media-libs/glew:0= media-libs/libglvnd virtual/opengl x11-libs/libXrender:= )
 SLOT=0/7.5
 SRC_URI=https://github.com/naelstrof/slop/archive/v7.5.tar.gz -> slop-7.5.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=273ce7e68494daf4d996ae287f17deed
diff --git a/metadata/md5-cache/x11-misc/slop-9999 b/metadata/md5-cache/x11-misc/slop-9999
index 1220f8da624a..e55718ac873f 100644
--- a/metadata/md5-cache/x11-misc/slop-9999
+++ b/metadata/md5-cache/x11-misc/slop-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/icu:= x11-libs/libX11 x11-libs/libXext opengl? ( media-libs/glew:0= media-libs/libglvnd virtual/opengl x11-libs/libXrender:= )
 SLOT=0/9999
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87e9d58577d843ac14f0ff638c0f0a97
diff --git a/metadata/md5-cache/x11-misc/snixembed-0.2.2 b/metadata/md5-cache/x11-misc/snixembed-0.2.2
index 60c67dca2f87..380e083d790e 100644
--- a/metadata/md5-cache/x11-misc/snixembed-0.2.2
+++ b/metadata/md5-cache/x11-misc/snixembed-0.2.2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) virtual/pkgconfig doc? ( dev-lang/vala[valadoc] )
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) virtual/pkgconfig doc? ( dev-lang/vala[valadoc] )
 DEFINED_PHASES=compile install prepare
 DEPEND=dev-libs/glib:2 dev-libs/libdbusmenu[gtk3] x11-libs/gtk+:3
 DESCRIPTION=Proxy StatusNotifierItems as XEmbedded systemtray-spec icons
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=dev-libs/glib:2 dev-libs/libdbusmenu[gtk3] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://git.sr.ht/~steef/snixembed/archive/0.2.2.tar.gz -> snixembed-0.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4b6cb37102abcd01a3ede700fe29d1cd
diff --git a/metadata/md5-cache/x11-misc/snixembed-0.3.0 b/metadata/md5-cache/x11-misc/snixembed-0.3.0
index 3217324ad024..58d7b17103c2 100644
--- a/metadata/md5-cache/x11-misc/snixembed-0.3.0
+++ b/metadata/md5-cache/x11-misc/snixembed-0.3.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) virtual/pkgconfig doc? ( dev-lang/vala[valadoc] )
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) virtual/pkgconfig doc? ( dev-lang/vala[valadoc] )
 DEFINED_PHASES=compile install prepare
 DEPEND=dev-libs/glib:2 dev-libs/libdbusmenu[gtk3] x11-libs/gtk+:3
 DESCRIPTION=Proxy StatusNotifierItems as XEmbedded systemtray-spec icons
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=dev-libs/glib:2 dev-libs/libdbusmenu[gtk3] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://git.sr.ht/~steef/snixembed/archive/0.3.0.tar.gz -> snixembed-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	5fab64090cefe75c5df431cefa0b653d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e457a8153b10d7ea102a7054f9244f08
diff --git a/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1 b/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
index a99dc6758ba1..b68690795097 100644
--- a/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
+++ b/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils virtual/udev virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
 SLOT=0
 SRC_URI=https://github.com/IgnorantGuru/spacefm/archive/1.0.6.tar.gz -> spacefm-1.0.6.tar.gz
-_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=830a12f77428e19e1d145c29f55f3f9b
diff --git a/metadata/md5-cache/x11-misc/spacefm-9999 b/metadata/md5-cache/x11-misc/spacefm-9999
index 69b7aa3deb3b..5c3e5ec7a1ba 100644
--- a/metadata/md5-cache/x11-misc/spacefm-9999
+++ b/metadata/md5-cache/x11-misc/spacefm-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils virtual/udev virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=830a12f77428e19e1d145c29f55f3f9b
diff --git a/metadata/md5-cache/x11-misc/splatmoji-1.2.0 b/metadata/md5-cache/x11-misc/splatmoji-1.2.0
index 207bf1a80490..1adb872687cd 100644
--- a/metadata/md5-cache/x11-misc/splatmoji-1.2.0
+++ b/metadata/md5-cache/x11-misc/splatmoji-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=app-shells/bash x11-misc/rofi x11-misc/xdotool x11-misc/xsel
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cspeterson/splatmoji/archive/v1.2.0.tar.gz -> splatmoji-1.2.0.tar.gz
-_eclasses_=optfeature	6a2add34e06e5a05d88471a33ccdd73e
-_md5_=73fe7aedeb949f8440252a9747381105
+_eclasses_=optfeature	e142388219c7fee6ff016fe1c78a10a5
+_md5_=0dd4d33051ea7517e296053158658e33
diff --git a/metadata/md5-cache/x11-misc/sselp-9999 b/metadata/md5-cache/x11-misc/sselp-9999
index 2fd8c508c069..1b69a450e6bc 100644
--- a/metadata/md5-cache/x11-misc/sselp-9999
+++ b/metadata/md5-cache/x11-misc/sselp-9999
@@ -7,5 +7,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-libs/libX11
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9b0fc07e4519a9c4367765e4df62c38c
diff --git a/metadata/md5-cache/x11-misc/stalonetray-0.8.4 b/metadata/md5-cache/x11-misc/stalonetray-0.8.4
index b483e315d5c8..5abd2a6eab28 100644
--- a/metadata/md5-cache/x11-misc/stalonetray-0.8.4
+++ b/metadata/md5-cache/x11-misc/stalonetray-0.8.4
@@ -1,14 +1,14 @@
-BDEPEND=app-text/docbook-xml-dtd dev-libs/libxslt >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-text/docbook-xml-dtd dev-libs/libxslt sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure prepare
 DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=System tray utility including support for KDE system tray icons
 EAPI=7
-HOMEPAGE=https://stalonetray.github.io/
+HOMEPAGE=https://kolbusa.github.io/stalonetray/
 IUSE=debug +graceful-exit
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=https://github.com/kolbusa/stalonetray/archive/v0.8.4.tar.gz -> stalonetray-0.8.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b02be0485bb7a18f9ec52c0bfc43d443
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0eedf18deef7a3115bdf63f9a2d591bd
diff --git a/metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1 b/metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1
index 521d43b319e4..a1b71a5e07be 100644
--- a/metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1
+++ b/metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/sunflower/sunflower-0.4_p20200716.tar.xz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9aeff0a8aa92c17ef1e9baaa1a01fbf2
diff --git a/metadata/md5-cache/x11-misc/superswitcher-0.6-r1 b/metadata/md5-cache/x11-misc/superswitcher-0.6-r1
index 3fe674a0c289..2d66aede488a 100644
--- a/metadata/md5-cache/x11-misc/superswitcher-0.6-r1
+++ b/metadata/md5-cache/x11-misc/superswitcher-0.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=gnome-base/gconf-2:2 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrender gnome-base/gnome-common virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=gnome-base/gconf-2:2 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrender gnome-base/gnome-common virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A more feature-full replacement of the Alt-Tab window switching behavior
 EAPI=6
 HOMEPAGE=https://code.google.com/p/superswitcher/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=gnome-base/gconf-2:2 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrender
 SLOT=0
 SRC_URI=https://superswitcher.googlecode.com/files/superswitcher-0.6.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a3303231afa628172fdb953a7f07ea7c
diff --git a/metadata/md5-cache/x11-misc/sux-1.0-r4 b/metadata/md5-cache/x11-misc/sux-1.0-r4
deleted file mode 100644
index 8102409739c5..000000000000
--- a/metadata/md5-cache/x11-misc/sux-1.0-r4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION="su" wrapper which transfers X credentials
-EAPI=5
-HOMEPAGE=http://fgouget.free.fr/sux/sux-readme.shtml
-KEYWORDS=~alpha amd64 arm ~arm64 ppc sparc x86
-LICENSE=MIT
-RDEPEND=x11-apps/xauth
-SLOT=0
-SRC_URI=http://fgouget.free.fr/sux/sux
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7c2ce0759cfbfa0d7685a436c8583f5b
diff --git a/metadata/md5-cache/x11-misc/sux-1.0.1 b/metadata/md5-cache/x11-misc/sux-1.0.1
index 4dfac8c9b54d..31fa1ffd63b0 100644
--- a/metadata/md5-cache/x11-misc/sux-1.0.1
+++ b/metadata/md5-cache/x11-misc/sux-1.0.1
@@ -3,9 +3,9 @@ DEPEND=x11-apps/xauth
 DESCRIPTION="su" wrapper which transfers X credentials
 EAPI=7
 HOMEPAGE=http://fgouget.free.fr/sux/sux-readme.shtml
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ppc sparc x86
 LICENSE=MIT
 RDEPEND=x11-apps/xauth
 SLOT=0
 SRC_URI=mirror://sourceforge/sux/1.0.1/sux-1.0.1.tar.gz
-_md5_=39dc7cecc498d3e2fea6bc48155f74df
+_md5_=1db7d5c576d9f85ef5caadf6834e3f05
diff --git a/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1 b/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1
index 5f99b2682151..7a264d88b2c5 100644
--- a/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1
+++ b/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare
 DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXtst x11-base/xorg-proto
 DESCRIPTION=Simple Virtual Keyboard
@@ -9,5 +10,5 @@ LICENSE=MIT-with-advertising
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXtst
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/svkbd-0.2.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1c4f9cea487648e96336ef379dc695bf
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=98a5dcc1a0667d070626539a9ebe2eab
diff --git a/metadata/md5-cache/x11-misc/sw-notify-send-9999 b/metadata/md5-cache/x11-misc/sw-notify-send-9999
index 07a045ef3000..e259fe6ecf25 100644
--- a/metadata/md5-cache/x11-misc/sw-notify-send-9999
+++ b/metadata/md5-cache/x11-misc/sw-notify-send-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
 DEPEND=x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-9999 x11-libs/libtinynotify-systemwide:0= dev-util/gtk-doc virtual/pkgconfig
 DESCRIPTION=A system-wide variant of tinynotify-send
@@ -8,5 +8,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-9999 x11-libs/libtinynotify-systemwide:0=
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7cb89c23156b3c0e4e0d4df248d6da49
diff --git a/metadata/md5-cache/x11-misc/sxhkd-0.6.1 b/metadata/md5-cache/x11-misc/sxhkd-0.6.1
index f8c29c0956ad..22102a365969 100644
--- a/metadata/md5-cache/x11-misc/sxhkd-0.6.1
+++ b/metadata/md5-cache/x11-misc/sxhkd-0.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms
 SLOT=0
 SRC_URI=https://github.com/baskerville/sxhkd/archive/0.6.1.tar.gz -> sxhkd-0.6.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=93167f8d491ae3f08b802f82b61ced86
diff --git a/metadata/md5-cache/x11-misc/sxhkd-0.6.2 b/metadata/md5-cache/x11-misc/sxhkd-0.6.2
index 68f7bc4379cb..6b38df1b9f85 100644
--- a/metadata/md5-cache/x11-misc/sxhkd-0.6.2
+++ b/metadata/md5-cache/x11-misc/sxhkd-0.6.2
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms
 SLOT=0
 SRC_URI=https://github.com/baskerville/sxhkd/archive/0.6.2.tar.gz -> sxhkd-0.6.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c16df87474763339358cebf853badcd0
diff --git a/metadata/md5-cache/x11-misc/synergy-1.13.0 b/metadata/md5-cache/x11-misc/synergy-1.13.0
index e092901d9dbe..fb96d92cbdd6 100644
--- a/metadata/md5-cache/x11-misc/synergy-1.13.0
+++ b/metadata/md5-cache/x11-misc/synergy-1.13.0
@@ -11,5 +11,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) x11-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symless/synergy-core/archive/v1.13.0-stable.tar.gz -> synergy-core-1.13.0-stable.tar.gz https://dev.gentoo.org/~mgorny/dist/synergy-1.12.0.png test? ( https://github.com/google/googletest/archive/aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.tar.gz -> googletest-aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.tar.gz )
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=10174f161e6d76cf41b0c8ffd88b3640
diff --git a/metadata/md5-cache/x11-misc/synergy-1.13.1.41 b/metadata/md5-cache/x11-misc/synergy-1.13.1.41
index f0194df7fdfb..e9afd1a843d9 100644
--- a/metadata/md5-cache/x11-misc/synergy-1.13.1.41
+++ b/metadata/md5-cache/x11-misc/synergy-1.13.1.41
@@ -5,11 +5,11 @@ DESCRIPTION=Lets you easily share a single mouse and keyboard between multiple c
 EAPI=7
 HOMEPAGE=https://symless.com/synergy https://github.com/symless/synergy-core/
 IUSE=libressl gui test zeroconf test
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) x11-libs/libICE:= x11-libs/libSM:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXi:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXtst:= gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symless/synergy-core/archive/1.13.1.41-stable.tar.gz -> synergy-core-1.13.1.41-stable.tar.gz https://dev.gentoo.org/~mgorny/dist/synergy-1.12.0.png test? ( https://github.com/google/googletest/archive/18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz -> googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz )
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef404e55e7aeee1c57226239b9d5afa6
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b4536e7157dff807d53fc9a0cc9d199f
diff --git a/metadata/md5-cache/x11-misc/tabbed-0.6 b/metadata/md5-cache/x11-misc/tabbed-0.6-r1
index aed1827cb466..ee85723115f8 100644
--- a/metadata/md5-cache/x11-misc/tabbed-0.6
+++ b/metadata/md5-cache/x11-misc/tabbed-0.6-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install postinst prepare
 DEPEND=x11-base/xorg-proto x11-libs/libX11
 DESCRIPTION=Simple generic tabbed fronted to xembed aware applications
-EAPI=5
+EAPI=7
 HOMEPAGE=https://tools.suckless.org/tabbed
 IUSE=savedconfig
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/tabbed-0.6.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7d3f30c38d8ffaa21efd66e58ebc5912
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b771e2b42f6a002cf47864cac614cc6f
diff --git a/metadata/md5-cache/x11-misc/tdrop-0.4.0 b/metadata/md5-cache/x11-misc/tdrop-0.4.0
new file mode 100644
index 000000000000..1b814ece9a7f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/tdrop-0.4.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=WM-Independent Dropdown Creator
+EAPI=7
+HOMEPAGE=https://github.com/noctuid/tdrop
+KEYWORDS=~amd64 ~ppc64
+LICENSE=BSD-2
+RDEPEND=app-shells/bash sys-process/procps x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo x11-misc/xdotool
+SLOT=0
+SRC_URI=https://github.com/noctuid/tdrop/archive/0.4.0.tar.gz -> tdrop-0.4.0.tar.gz
+_md5_=8dde4178f013a95d08b1b8a4900af816
diff --git a/metadata/md5-cache/x11-misc/tdrop-9999 b/metadata/md5-cache/x11-misc/tdrop-9999
index 55509f3a90f8..07c1ce37c912 100644
--- a/metadata/md5-cache/x11-misc/tdrop-9999
+++ b/metadata/md5-cache/x11-misc/tdrop-9999
@@ -7,5 +7,5 @@ LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=app-shells/bash sys-process/procps x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo x11-misc/xdotool
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
-_md5_=3274f5826dc18eee3d47d8bd34ea6e29
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=8dde4178f013a95d08b1b8a4900af816
diff --git a/metadata/md5-cache/x11-misc/tint2-16.7 b/metadata/md5-cache/x11-misc/tint2-16.7
index 6bd907e72001..46cffe3c9253 100644
--- a/metadata/md5-cache/x11-misc/tint2-16.7
+++ b/metadata/md5-cache/x11-misc/tint2-16.7
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 svg? ( gnome-base/librsvg:2 ) >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo[X] x11-libs/pango tint2conf? ( x11-libs/gtk+:2 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama >=x11-libs/libXrandr-1.3 x11-libs/libXrender startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=https://gitlab.com/o9000/tint2/-/archive/v16.7/tint2-v16.7.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9db7d9f19a83ab3f983d1dc8a3d804d9
diff --git a/metadata/md5-cache/x11-misc/tinynotify-send-9999 b/metadata/md5-cache/x11-misc/tinynotify-send-9999
index 002e4530a555..8f59619af864 100644
--- a/metadata/md5-cache/x11-misc/tinynotify-send-9999
+++ b/metadata/md5-cache/x11-misc/tinynotify-send-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm prepare unpack
-DEPEND=app-eselect/eselect-notify-send x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-9999 dev-util/gtk-doc virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=app-eselect/eselect-notify-send x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-9999 dev-util/gtk-doc virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A notification sending utility (using libtinynotify)
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/tinynotify-send/
@@ -7,5 +7,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=app-eselect/eselect-notify-send x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-9999
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=90f65de3b4c3fdd8fb412553687a29f6
diff --git a/metadata/md5-cache/x11-misc/unclutter-xfixes-1.5 b/metadata/md5-cache/x11-misc/unclutter-xfixes-1.5
deleted file mode 100644
index 899aaa0af3d0..000000000000
--- a/metadata/md5-cache/x11-misc/unclutter-xfixes-1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile
-DEPEND=dev-libs/libev x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi !x11-misc/unclutter app-text/asciidoc virtual/pkgconfig
-DESCRIPTION=A rewrite of unclutter using the x11-xfixes extension
-EAPI=7
-HOMEPAGE=https://github.com/Airblader/unclutter-xfixes
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/libev x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi !x11-misc/unclutter
-SLOT=0
-SRC_URI=https://github.com/Airblader/unclutter-xfixes/archive/v1.5.tar.gz -> unclutter-xfixes-1.5.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=195596bd86cf290aff0684e48ece408e
diff --git a/metadata/md5-cache/x11-misc/unclutter-xfixes-1.5-r2 b/metadata/md5-cache/x11-misc/unclutter-xfixes-1.5-r2
index 1dcfd9b18c67..9e5ce68c41f8 100644
--- a/metadata/md5-cache/x11-misc/unclutter-xfixes-1.5-r2
+++ b/metadata/md5-cache/x11-misc/unclutter-xfixes-1.5-r2
@@ -4,10 +4,10 @@ DEPEND=dev-libs/libev x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi !x11-mis
 DESCRIPTION=Hides mouse pointer while not in use (rewrite of unclutter)
 EAPI=7
 HOMEPAGE=https://github.com/Airblader/unclutter-xfixes
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/libev x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi !x11-misc/unclutter
 SLOT=0
 SRC_URI=https://github.com/Airblader/unclutter-xfixes/archive/v1.5.tar.gz -> unclutter-xfixes-1.5.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=95b3e79d8d54520326e929446e2c1f8a
+_md5_=e53a8111f392937b3d82682bb167384d
diff --git a/metadata/md5-cache/x11-misc/urxvt-font-size-9999 b/metadata/md5-cache/x11-misc/urxvt-font-size-9999
index ab930f4d0250..a70ed9aa929f 100644
--- a/metadata/md5-cache/x11-misc/urxvt-font-size-9999
+++ b/metadata/md5-cache/x11-misc/urxvt-font-size-9999
@@ -7,5 +7,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-apps/xlsfonts x11-terms/rxvt-unicode[perl]
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=c08c2442cd9191c9b2cb24dda6f7abc6
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.19.2-r2 b/metadata/md5-cache/x11-misc/util-macros-1.19.2-r2
index a18585bb7ded..22e9cb23ce1a 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.19.2-r2
+++ b/metadata/md5-cache/x11-misc/util-macros-1.19.2-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile
 DESCRIPTION=X.Org autotools utility macros
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/util-macros-1.19.2.tar.bz2
-_md5_=32ccb1a757f5613a170acdfd8ad3df52
+_md5_=74c340fbc7fb8a460f5ca055395ce731
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.19.3 b/metadata/md5-cache/x11-misc/util-macros-1.19.3
index 25322078ede6..0c125104c990 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.19.3
+++ b/metadata/md5-cache/x11-misc/util-macros-1.19.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile
 DESCRIPTION=X.Org autotools utility macros
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/util-macros-1.19.3.tar.bz2
-_md5_=6999a0c7aeef69a73ed56de5befaf336
+_md5_=8331c12938edf0586f071c0e56ed3775
diff --git a/metadata/md5-cache/x11-misc/vdpauinfo-1.4 b/metadata/md5-cache/x11-misc/vdpauinfo-1.4
index 04d35cfd8386..ebb1f105902b 100644
--- a/metadata/md5-cache/x11-misc/vdpauinfo-1.4
+++ b/metadata/md5-cache/x11-misc/vdpauinfo-1.4
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DEPEND=>=x11-libs/libvdpau-1.4 x11-libs/libX11 virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=Displays info about your card's VDPAU support
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libvdpau-1.4 x11-libs/libX11
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/1.4/vdpauinfo-1.4.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c67671304fde84e8b46c29865ae6c432
diff --git a/metadata/md5-cache/x11-misc/vdpauinfo-99999 b/metadata/md5-cache/x11-misc/vdpauinfo-99999
index a54322d03a25..fd623d9dafa9 100644
--- a/metadata/md5-cache/x11-misc/vdpauinfo-99999
+++ b/metadata/md5-cache/x11-misc/vdpauinfo-99999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=prepare unpack
 DEPEND=>=x11-libs/libvdpau-1.4 x11-libs/libX11 virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=Displays info about your card's VDPAU support
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=x11-libs/libvdpau-1.4 x11-libs/libX11
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8953941d6bec694307fcfe72f0bbeecc
diff --git a/metadata/md5-cache/x11-misc/viewglob-2.0.4-r1 b/metadata/md5-cache/x11-misc/viewglob-2.0.4-r1
index 2e3efd77d7fe..b8388786f4a6 100644
--- a/metadata/md5-cache/x11-misc/viewglob-2.0.4-r1
+++ b/metadata/md5-cache/x11-misc/viewglob-2.0.4-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install postinst prepare
 DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 || ( app-shells/bash:* app-shells/zsh )
 DESCRIPTION=Graphical display of directories and globs referenced at the shell prompt
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 || ( app-shells/bash:* app-shells/zsh )
 SLOT=0
 SRC_URI=mirror://sourceforge/viewglob/viewglob-2.0.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=56c3d2e0291c4c58b82c83e3007b4da1
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.6.4-r1 b/metadata/md5-cache/x11-misc/virtualgl-2.6.4-r1
index 764a02812992..b3235545dcc0 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.6.4-r1
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.6.4-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] x11-libs/xcb-util-keysyms[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] virtual/opencl[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/virtualgl/2.6.4/VirtualGL-2.6.4.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76fecaf3d10f7d07ae494fbe38d70659
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.6.5-r1 b/metadata/md5-cache/x11-misc/virtualgl-2.6.5-r1
index 5a2a6365fa88..384fe4608e7d 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.6.5-r1
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.6.5-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] x11-libs/xcb-util-keysyms[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] virtual/opencl[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/virtualgl/2.6.5/VirtualGL-2.6.5.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f8f1d5359fe192f3af8fe0647667757f
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.6.5-r3 b/metadata/md5-cache/x11-misc/virtualgl-2.6.5-r3
index 2728db367bef..f8afd9ce513c 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.6.5-r3
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.6.5-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
 EAPI=7
 HOMEPAGE=https://www.virtualgl.org/
 IUSE=libressl ssl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] x11-libs/xcb-util-keysyms[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] virtual/opencl[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/virtualgl/2.6.5/VirtualGL-2.6.5.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e30516e2b9ea6be6ed6efab53219b8b
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7099001f32196ca30e581579be0b4b2b
diff --git a/metadata/md5-cache/x11-misc/virtualgl-9999 b/metadata/md5-cache/x11-misc/virtualgl-9999
index 0c3a497e2007..38e0537e9716 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-9999
+++ b/metadata/md5-cache/x11-misc/virtualgl-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
 PROPERTIES=live
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
 SLOT=0
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	cmake-multilib	a5c3801ef28d6532f611ba480516d0ac	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	e476ccf3e90e9b1807f8d0ca7dfe3999	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a1b4c6fd3ce444be3b2bdaa0af978b3
diff --git a/metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1 b/metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1
index 68d9b84c9b69..a376788f3bb1 100644
--- a/metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1
+++ b/metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
 DEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11vnc? ( x11-misc/x11vnc ) x11-base/xorg-proto
 DESCRIPTION=A tool for recording Flash SWF movies from VNC sessions
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11vnc? ( x11-misc/x11vnc )
 SLOT=0
 SRC_URI=https://www.unixuser.org/~euske/vnc2swf/vnc2swf-0.5.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b55227030e3cc24b8f8bb7d002187f26
diff --git a/metadata/md5-cache/x11-misc/vym-9999 b/metadata/md5-cache/x11-misc/vym-9999
index 287b0a41b006..88f2fd1dc3bc 100644
--- a/metadata/md5-cache/x11-misc/vym-9999
+++ b/metadata/md5-cache/x11-misc/vym-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7e2d581fbd038e41e1e999bf8984c4c6
diff --git a/metadata/md5-cache/x11-misc/wayv-0.3-r3 b/metadata/md5-cache/x11-misc/wayv-0.3-r3
index 2d4121e0cb47..e5c571574715 100644
--- a/metadata/md5-cache/x11-misc/wayv-0.3-r3
+++ b/metadata/md5-cache/x11-misc/wayv-0.3-r3
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
 DESCRIPTION=Wayv is hand-writing/gesturing recognition software for X
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXtst
 SLOT=0
 SRC_URI=http://www.stressbunny.com/gimme/wayv/wayv-0.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ae2e4e6d48c8e65a58cfe35e01bb23c9
diff --git a/metadata/md5-cache/x11-misc/wbar-2.3.4-r3 b/metadata/md5-cache/x11-misc/wbar-2.3.4-r3
index f56481817e01..86e56857cb75 100644
--- a/metadata/md5-cache/x11-misc/wbar-2.3.4-r3
+++ b/metadata/md5-cache/x11-misc/wbar-2.3.4-r3
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DEPEND=media-libs/imlib2[X] x11-libs/libX11 gtk? ( dev-libs/glib gnome-base/libglade media-libs/freetype:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=A fast, lightweight quick launch bar
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/imlib2[X] x11-libs/libX11 gtk? ( dev-libs/glib gnome-base/libglade media-libs/freetype:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://wbar.googlecode.com/files/wbar-2.3.4.tgz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	bash-completion-r1	be99724bde4274de21e581204e9d164a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7707b88dbbabd30f4748ae719f485222
diff --git a/metadata/md5-cache/x11-misc/wdm-1.28-r6 b/metadata/md5-cache/x11-misc/wdm-1.28-r6
deleted file mode 100644
index 5a49bebb5da4..000000000000
--- a/metadata/md5-cache/x11-misc/wdm-1.28-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=x11-wm/windowmaker-0.70.0 truetype? ( x11-libs/libXft ) x11-libs/libXmu x11-libs/libXt x11-libs/libXpm pam? ( sys-libs/pam ) sys-devel/gettext
-DESCRIPTION=WINGs Display Manager
-EAPI=6
-HOMEPAGE=https://github.com/voins/wdm
-IUSE=pam selinux truetype
-KEYWORDS=~alpha amd64 ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=x11-wm/windowmaker-0.70.0 truetype? ( x11-libs/libXft ) x11-libs/libXmu x11-libs/libXt x11-libs/libXpm pam? ( sys-libs/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
-SLOT=0
-SRC_URI=http://voins.program.ru/wdm/wdm-1.28.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2c73e84d32cf8b2c39e161ef6deb192e
diff --git a/metadata/md5-cache/x11-misc/wdm-1.28-r7 b/metadata/md5-cache/x11-misc/wdm-1.28-r7
index 782f9ef995d4..80c20a753992 100644
--- a/metadata/md5-cache/x11-misc/wdm-1.28-r7
+++ b/metadata/md5-cache/x11-misc/wdm-1.28-r7
@@ -1,14 +1,14 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-wm/windowmaker-0.70.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pam? ( sys-libs/pam ) truetype? ( x11-libs/libXft ) sys-devel/gettext virtual/pkgconfig
+DEPEND=>=x11-wm/windowmaker-0.70.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pam? ( sys-libs/pam ) truetype? ( x11-libs/libXft )
 DESCRIPTION=WINGs Display Manager
 EAPI=7
 HOMEPAGE=https://github.com/voins/wdm
 IUSE=pam selinux truetype
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-wm/windowmaker-0.70.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pam? ( sys-libs/pam ) truetype? ( x11-libs/libXft ) pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=http://voins.program.ru/wdm/wdm-1.28.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bae5ead4f8d24fbd57dcd8c1efc9a26d
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=cb7b604d8f514d1617b9e81dab0720c2
diff --git a/metadata/md5-cache/x11-misc/whaw-0.2 b/metadata/md5-cache/x11-misc/whaw-0.2
index 6a0320e85fd2..ed2e75762959 100644
--- a/metadata/md5-cache/x11-misc/whaw-0.2
+++ b/metadata/md5-cache/x11-misc/whaw-0.2
@@ -1,12 +1,11 @@
-DEFINED_PHASES=prepare
+DEFINED_PHASES=-
 DEPEND=dev-libs/popt x11-libs/libX11 x11-libs/libXinerama x11-libs/libXmu
 DESCRIPTION=Window manager independent Window Layout tool
-EAPI=5
+EAPI=7
 HOMEPAGE=http://repetae.net/computer/whaw/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/popt x11-libs/libX11 x11-libs/libXinerama x11-libs/libXmu
 SLOT=0
 SRC_URI=http://repetae.net/computer/whaw/drop/whaw-0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=84138c7c4542bb101955c5c9bfa7d00a
+_md5_=e2ef45119df73f485ff11966fe6a21ed
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4
index 5bee520c50e3..0cd47ae6d173 100644
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt
 DESCRIPTION=VNC server for real X displays
@@ -10,5 +10,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) dev-lang/tk:0
 SLOT=0
 SRC_URI=https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz -> x11vnc-0.9.16.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=cfac0c9ce660fd88d9d7af4b1b97c91a
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r5 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r5
index 236924cc1d87..56356cd809b8 100644
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r5
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r5
@@ -1,14 +1,14 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt
 DESCRIPTION=VNC server for real X displays
 EAPI=7
 HOMEPAGE=https://libvnc.github.io/
 IUSE=crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) dev-lang/tk:0
 SLOT=0
 SRC_URI=https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz -> x11vnc-0.9.16.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e04623417a798ebd5012211561bbba5f
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=26dee19f0f6806af0acedf1004e20375
diff --git a/metadata/md5-cache/x11-misc/x2x-1.27-r3 b/metadata/md5-cache/x11-misc/x2x-1.27-r3
index f0ab57795ef9..c025805489df 100644
--- a/metadata/md5-cache/x11-misc/x2x-1.27-r3
+++ b/metadata/md5-cache/x11-misc/x2x-1.27-r3
@@ -1,5 +1,6 @@
+BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXtst x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/imake
+DEPEND=x11-libs/libX11 x11-libs/libXtst x11-libs/libXext
 DESCRIPTION=A utility to connect the Mouse and KeyBoard to another X
 EAPI=7
 HOMEPAGE=http://www.the-labs.com/X11/#x2x
@@ -9,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXtst x11-libs/libXext
 SLOT=0
 SRC_URI=http://ftp.digital.com/pub/Digital/SRC/x2x/x2x-1.27.tar.gz mirror://debian/pool/main/x/x2x/x2x_1.27-8.diff.gz mirror://gentoo/x2x_1.27-8-initvars.patch.gz mirror://gentoo/x2x-1.27-keymap.diff.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1f711d34590fff2f002e5941de905462
+_md5_=abd5cebce33eceef077b8e9b000c22b0
diff --git a/metadata/md5-cache/x11-misc/xaos-3.6 b/metadata/md5-cache/x11-misc/xaos-3.6
index f4c816f555de..271bf5760a3b 100644
--- a/metadata/md5-cache/x11-misc/xaos-3.6
+++ b/metadata/md5-cache/x11-misc/xaos-3.6
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
 DEPEND=sci-libs/gsl:= sys-libs/zlib aalib? ( media-libs/aalib ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) X? ( x11-base/xorg-proto )
 DESCRIPTION=Very fast real-time fractal zoomer
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/gsl:= sys-libs/zlib aalib? ( media-libs/aalib ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm )
 SLOT=0
 SRC_URI=mirror://sourceforge/xaos/xaos-3.6.tar.gz https://dev.gentoo.org/~jlec/distfiles/xaos.png.tar
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1a52b694f22e642133f1bfdac4b23112
diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p7 b/metadata/md5-cache/x11-misc/xautolock-2.2_p7
index 5b79581892fd..ecc79fc1f69c 100644
--- a/metadata/md5-cache/x11-misc/xautolock-2.2_p7
+++ b/metadata/md5-cache/x11-misc/xautolock-2.2_p7
@@ -1,5 +1,6 @@
+BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libXScrnSaver app-text/rman x11-base/xorg-proto x11-misc/imake
+DEPEND=x11-libs/libXScrnSaver
 DESCRIPTION=An automatic X screen-locker/screen-saver
 EAPI=7
 HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
@@ -9,4 +10,4 @@ RDEPEND=x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-7.debian.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=08267d5a08d5162df4d5e8723e87580b
+_md5_=94ab67536d33111cf082bae387df8b47
diff --git a/metadata/md5-cache/x11-misc/xbatt-1.3_rc1 b/metadata/md5-cache/x11-misc/xbatt-1.3_rc1
index 57c97e2221ec..c17bdd99dda7 100644
--- a/metadata/md5-cache/x11-misc/xbatt-1.3_rc1
+++ b/metadata/md5-cache/x11-misc/xbatt-1.3_rc1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-libs/libxkbfile x11-libs/libXpm x11-base/xorg-proto x11-misc/imake
+DEFINED_PHASES=compile configure install
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-libs/libxkbfile x11-libs/libXpm x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DESCRIPTION=Notebook battery indicator for X
 EAPI=6
 HOMEPAGE=http://www.clave.gr.jp/~eto/xbatt/
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/
 SLOT=0
 SRC_URI=http://www.clave.gr.jp/~eto/xbatt/xbatt-1.3pr1.tar.gz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=77b7cf0838d7676382faecdd7fffd019
+_md5_=b1d5d9712f15a255baaaeddb1bfe5cc0
diff --git a/metadata/md5-cache/x11-misc/xbattbar-1.4.9 b/metadata/md5-cache/x11-misc/xbattbar-1.4.9
index b7fcfe71f6fb..e682425faf23 100644
--- a/metadata/md5-cache/x11-misc/xbattbar-1.4.9
+++ b/metadata/md5-cache/x11-misc/xbattbar-1.4.9
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
 DEPEND=dev-lang/perl x11-libs/libX11
 DESCRIPTION=Advanced Power Management battery status display for X
@@ -8,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl x11-libs/libX11 !ppc? ( >=sys-power/acpi-1.5 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xbattbar/xbattbar_1.4.9.orig.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=54e77e724712859065b5058cf04909de
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c8fd82c10508696e766080807c4e063a
diff --git a/metadata/md5-cache/x11-misc/xbitmaps-1.1.2-r1 b/metadata/md5-cache/x11-misc/xbitmaps-1.1.2-r1
index 3310b236ede0..a8f8e0269a89 100644
--- a/metadata/md5-cache/x11-misc/xbitmaps-1.1.2-r1
+++ b/metadata/md5-cache/x11-misc/xbitmaps-1.1.2-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile
 DESCRIPTION=X.Org bitmaps data
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xbitmaps-1.1.2.tar.bz2
-_md5_=a6c483520ecb14c00c4dc32291d8e588
+_md5_=7dc01693c050036270ccc47462f4afdf
diff --git a/metadata/md5-cache/x11-misc/xcalendar-4.0-r2 b/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
index d8047c8722dd..8e8022c7b049 100644
--- a/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
+++ b/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-base/xorg-proto x11-misc/imake x11-misc/gccmakedep motif? ( >=x11-libs/motif-2.3:0 )
+DEFINED_PHASES=compile configure install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 x11-misc/gccmakedep motif? ( >=x11-libs/motif-2.3:0 )
 DESCRIPTION=A simple interactive calendar program with a notebook capability
 EAPI=6
 HOMEPAGE=https://www.freebsd.org/
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/
 SLOT=0
 SRC_URI=ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/xcalendar-4.0+i18n.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=934edd06f1d14d8759e28eb111a55346
+_md5_=0b973061058483fc1103c86d52b98a62
diff --git a/metadata/md5-cache/x11-misc/xcalib-0.10 b/metadata/md5-cache/x11-misc/xcalib-0.10
index 14878fb5614b..9e148a7c51aa 100644
--- a/metadata/md5-cache/x11-misc/xcalib-0.10
+++ b/metadata/md5-cache/x11-misc/xcalib-0.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXrandr x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=https://github.com/OpenICC/xcalib/archive/0.10.tar.gz -> xcalib-0.10.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=597b0c07d2e0414b0f5de3cc90c02e7e
diff --git a/metadata/md5-cache/x11-misc/xcape-1.1 b/metadata/md5-cache/x11-misc/xcape-1.1
deleted file mode 100644
index 2dd49e53ce33..000000000000
--- a/metadata/md5-cache/x11-misc/xcape-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXtst virtual/pkgconfig
-DESCRIPTION=Utility to make modifier keys send custom key events when pressed on their own
-EAPI=5
-HOMEPAGE=https://github.com/alols/xcape
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=x11-libs/libX11 x11-libs/libXtst
-SLOT=0
-SRC_URI=https://github.com/alols/xcape/archive/v1.1.tar.gz -> xcape-1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dcc541a3dc413340ead8a8c8d4911130
diff --git a/metadata/md5-cache/x11-misc/xcave-2.5.1 b/metadata/md5-cache/x11-misc/xcave-2.5.1
index 8f2b86eddc8e..a5ee9ef5fc18 100644
--- a/metadata/md5-cache/x11-misc/xcave-2.5.1
+++ b/metadata/md5-cache/x11-misc/xcave-2.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2:2 gnome-base/libglade x11-libs/gtk+:2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/xcave/xcave-2.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fedcd3b709bf35580abe1e5dcd1e49e0
diff --git a/metadata/md5-cache/x11-misc/xclip-0.13 b/metadata/md5-cache/x11-misc/xclip-0.13
index 5bab2a2c4f96..a96339b66be6 100644
--- a/metadata/md5-cache/x11-misc/xclip-0.13
+++ b/metadata/md5-cache/x11-misc/xclip-0.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Copy data from standard input to X clipboard
 EAPI=6
 HOMEPAGE=https://github.com/astrand/xclip
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXmu
 SLOT=0
 SRC_URI=https://github.com/astrand/xclip/archive/0.13.tar.gz -> xclip-0.13.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c71a03f0f2f3ec426611e0e45963ef21
diff --git a/metadata/md5-cache/x11-misc/xclip-9999 b/metadata/md5-cache/x11-misc/xclip-9999
index 3463b8fa3789..cd0766b199f3 100644
--- a/metadata/md5-cache/x11-misc/xclip-9999
+++ b/metadata/md5-cache/x11-misc/xclip-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=prepare unpack
 DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt
 DESCRIPTION=Copy data from standard input to X clipboard
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXmu
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0464fdf9e90fe686fc48f95f0ec5955b
diff --git a/metadata/md5-cache/x11-misc/xcompmgr-1.1.8 b/metadata/md5-cache/x11-misc/xcompmgr-1.1.8
index f21a2fc9f357..90dc029c4f20 100644
--- a/metadata/md5-cache/x11-misc/xcompmgr-1.1.8
+++ b/metadata/md5-cache/x11-misc/xcompmgr-1.1.8
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
 DEPEND=x11-libs/libXrender x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=X Compositing manager
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/libXrender x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXext
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xcompmgr-1.1.8.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	87a9e316d5b1fa9345e77329cc0ebe3b
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
 _md5_=816b1b53b462bf3a3523b74e978b81ae
diff --git a/metadata/md5-cache/x11-misc/xdesktopwaves-1.4 b/metadata/md5-cache/x11-misc/xdesktopwaves-1.4
index cd619a8e75c1..ec171df6f7bb 100644
--- a/metadata/md5-cache/x11-misc/xdesktopwaves-1.4
+++ b/metadata/md5-cache/x11-misc/xdesktopwaves-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=x11-libs/libXext x11-base/xorg-proto
+DEPEND=x11-libs/libXext virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=A cellular automata setting the background of your X Windows desktop under water
 EAPI=7
 HOMEPAGE=http://xdesktopwaves.sourceforge.net/
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://sourceforge/xdesktopwaves/xdesktopwaves-1.4.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d8c37b5e79c5bc64290f0d2753a5e8fa
+_md5_=4c1a14f3a2509745b08b98f2722271c2
diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-0.17 b/metadata/md5-cache/x11-misc/xdg-user-dirs-0.17
index 404ba85cc1b6..4d8e2b382dca 100644
--- a/metadata/md5-cache/x11-misc/xdg-user-dirs-0.17
+++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-0.17
@@ -1,4 +1,4 @@
-BDEPEND=app-text/docbook-xml-dtd:4.3 dev-libs/libxslt sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-text/docbook-xml-dtd:4.3 dev-libs/libxslt sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DESCRIPTION=Tool to help manage 'well known' user directories
 EAPI=7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PDEPEND=gtk? ( x11-misc/xdg-user-dirs-gtk )
 SLOT=0
 SRC_URI=https://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.17.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b3bbf9601498e9c40afacdc89572df71
diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1 b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
index 9d26c4772635..23c93ad6a341 100644
--- a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
+++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib >=x11-libs/gtk+-3.5.1:3 >=x11-misc/xdg-user-dirs-0.14
 SLOT=0
 SRC_URI=mirror://gnome/sources/xdg-user-dirs-gtk/0.10/xdg-user-dirs-gtk-0.10.tar.xz
-_eclasses_=gnome.org	4d6de9e2337521f60965d1a9a118761f	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=dc68f04976f0425dfc9a451cbecde5cc
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3-r1 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3-r1
deleted file mode 100644
index ce203570c8c1..000000000000
--- a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=app-text/xmlto-0.0.26-r1[text(+)] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-utils/
-IUSE=doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-util/desktop-file-utils dev-perl/File-MimeInfo dev-perl/Net-DBus dev-perl/X11-Protocol sys-apps/dbus x11-misc/shared-mime-info x11-apps/xprop x11-apps/xset
-RESTRICT=test
-SLOT=0
-SRC_URI=https://portland.freedesktop.org/download/xdg-utils-1.1.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=487da319bc0079c7ede62ab20f3f8373
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3-r3 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3-r3
new file mode 100644
index 000000000000..176e6f257168
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=app-text/xmlto-0.0.28-r3[text(+)] virtual/awk sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-utils/
+IUSE=doc
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-util/desktop-file-utils dev-perl/File-MimeInfo dev-perl/Net-DBus dev-perl/X11-Protocol sys-apps/dbus x11-misc/shared-mime-info x11-apps/xprop x11-apps/xset
+RESTRICT=test
+SLOT=0
+SRC_URI=https://portland.freedesktop.org/download/xdg-utils-1.1.3.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2497cb5ecdab2b10969b4e60fe0dc48c
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220
deleted file mode 100644
index b9510822311e..000000000000
--- a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-text/xmlto-0.0.26-r1[text(+)] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-utils/
-IUSE=doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-util/desktop-file-utils dev-perl/File-MimeInfo dev-perl/Net-DBus dev-perl/X11-Protocol sys-apps/dbus x11-misc/shared-mime-info x11-apps/xprop x11-apps/xset
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/9816ebb3e6fd9f23e993b8b7fcbd56f92d9c9197/xdg-utils-1.1.3_p20200220.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=869bbe5f182c44cb883e360667f1bd6f
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r4 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r4
new file mode 100644
index 000000000000..18d99b6ffea3
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r4
@@ -0,0 +1,14 @@
+BDEPEND=>=app-text/xmlto-0.0.28-r3[text(+)] virtual/awk sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-utils/
+IUSE=doc
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-util/desktop-file-utils dev-perl/File-MimeInfo dev-perl/Net-DBus dev-perl/X11-Protocol sys-apps/dbus x11-misc/shared-mime-info x11-apps/xprop x11-apps/xset
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/9816ebb3e6fd9f23e993b8b7fcbd56f92d9c9197/xdg-utils-1.1.3_p20200220.tar.bz2
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b05dea4ffbdae438a35f1e0914bad7a3
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r1 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r5
index da1f32e35b0c..ce15704da580 100644
--- a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r1
+++ b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r5
@@ -1,15 +1,15 @@
-BDEPEND=>=app-text/xmlto-0.0.26-r1[text(+)] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-text/xmlto-0.0.28-r3[text(+)] virtual/awk sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare
 DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-utils/
 IUSE=dbus doc gnome
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-util/desktop-file-utils dev-perl/File-MimeInfo dbus? ( sys-apps/dbus gnome? ( dev-perl/Net-DBus dev-perl/X11-Protocol ) ) x11-misc/shared-mime-info x11-apps/xprop x11-apps/xset
 REQUIRED_USE=gnome? ( dbus )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/9816ebb3e6fd9f23e993b8b7fcbd56f92d9c9197/xdg-utils-1.1.3_p20200220.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5eae73790d9d72109bfea9a106070aed
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=581e745075a41eab5b9ce97b710dc2f3
diff --git a/metadata/md5-cache/x11-misc/xdialog-2.3.1 b/metadata/md5-cache/x11-misc/xdialog-2.3.1
index 6bb24d577932..cd02f6b5f2d8 100644
--- a/metadata/md5-cache/x11-misc/xdialog-2.3.1
+++ b/metadata/md5-cache/x11-misc/xdialog-2.3.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.2:2
 DESCRIPTION=Drop-in replacement for cdialog using GTK
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.2:2
 SLOT=0
 SRC_URI=http://xdialog.free.fr/Xdialog-2.3.1.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f77f67c15ed31ca6a76930916c44037e
diff --git a/metadata/md5-cache/x11-misc/xdock-0.3.0 b/metadata/md5-cache/x11-misc/xdock-0.3.0
index f0d4f4e3667e..d6459a54bfe9 100644
--- a/metadata/md5-cache/x11-misc/xdock-0.3.0
+++ b/metadata/md5-cache/x11-misc/xdock-0.3.0
@@ -1,12 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=emulates Window Maker docks (runs in any window manager)
-EAPI=5
+DEPEND=x11-libs/libX11
+DESCRIPTION=Emulates Window Maker docks (runs in any window manager)
+EAPI=7
 HOMEPAGE=http://xdock.sourceforge.net
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/xdock/xdock-0.3.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	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
-_md5_=79263f6f1f8d3b5fd0e843177314feff
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8087dd42e330df69e77cd0beb931ec88
diff --git a/metadata/md5-cache/x11-misc/xdotool-3.20160805.1 b/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
index eede716bf13c..85a1f36c7d86 100644
--- a/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
+++ b/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXinerama x11-libs/libxkbcommon x11-base/xorg-proto
+DEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXinerama x11-libs/libxkbcommon virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=Simulate keyboard input and mouse activity, move and resize windows
 EAPI=6
 HOMEPAGE=https://www.semicomplete.com/projects/xdotool/
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXinerama x11-libs/libxkbcom
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jordansissel/xdotool/releases/download/v3.20160805.1/xdotool-3.20160805.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9e2786d444f972df88d4faed4d94d269
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=310c2e36ff2e53d4b833eb595bc0dcc4
diff --git a/metadata/md5-cache/x11-misc/xearth-1.1-r1 b/metadata/md5-cache/x11-misc/xearth-1.1-r1
index 0f0366b92b67..c3d63e206af7 100644
--- a/metadata/md5-cache/x11-misc/xearth-1.1-r1
+++ b/metadata/md5-cache/x11-misc/xearth-1.1-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-base/xorg-proto x11-misc/imake app-text/rman
-DESCRIPTION=Xearth sets the X root window to an image of the Earth
-EAPI=5
+BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+DEFINED_PHASES=compile configure install
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt
+DESCRIPTION=Set the X root window to an image of the Earth
+EAPI=7
 HOMEPAGE=https://hewgill.com/xearth/original/
 KEYWORDS=~alpha amd64 ppc ppc64 x86
 LICENSE=xearth
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=ftp://cag.lcs.mit.edu/pub/tuna/xearth-1.1.tar.gz ftp://ftp.cs.colorado.edu/users/tuna/xearth-1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=498ac1469c2fb2b9e09c437c2d307901
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=111d5e4d6a7bb1941435ac171adabbc7
diff --git a/metadata/md5-cache/x11-misc/xfe-1.42 b/metadata/md5-cache/x11-misc/xfe-1.42
deleted file mode 100644
index 9548ac512d1f..000000000000
--- a/metadata/md5-cache/x11-misc/xfe-1.42
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=media-libs/libpng:0 x11-libs/fox:1.6[png,truetype] x11-libs/libX11 x11-libs/libXft startup-notification? ( x11-libs/startup-notification ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=MS-Explorer-like minimalist file manager for X
-EAPI=6
-HOMEPAGE=http://roland65.free.fr/xfe
-IUSE=debug nls startup-notification
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng:0 x11-libs/fox:1.6[png,truetype] x11-libs/libX11 x11-libs/libXft startup-notification? ( x11-libs/startup-notification )
-SLOT=0
-SRC_URI=mirror://sourceforge/xfe/xfe/1.42/xfe-1.42.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	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
-_md5_=19499447a3c25669cdd8e994dc20d326
diff --git a/metadata/md5-cache/x11-misc/xfe-1.43.1 b/metadata/md5-cache/x11-misc/xfe-1.43.1
deleted file mode 100644
index 484341c25ba8..000000000000
--- a/metadata/md5-cache/x11-misc/xfe-1.43.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=media-libs/libpng:0 x11-libs/fox:1.6[png,truetype] x11-libs/libX11 x11-libs/libXft startup-notification? ( x11-libs/startup-notification ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
-DESCRIPTION=MS-Explorer-like minimalist file manager for X
-EAPI=6
-HOMEPAGE=http://roland65.free.fr/xfe
-IUSE=debug nls startup-notification
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng:0 x11-libs/fox:1.6[png,truetype] x11-libs/libX11 x11-libs/libXft startup-notification? ( x11-libs/startup-notification )
-SLOT=0
-SRC_URI=mirror://sourceforge/xfe/xfe/1.43.1/xfe-1.43.1.tar.gz
-_eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa3de6861e47afa57686a44aa6ef31a1
diff --git a/metadata/md5-cache/x11-misc/xfishtank-2.5 b/metadata/md5-cache/x11-misc/xfishtank-2.5
index 787d7240b8ee..6e90fb9541ca 100644
--- a/metadata/md5-cache/x11-misc/xfishtank-2.5
+++ b/metadata/md5-cache/x11-misc/xfishtank-2.5
@@ -1,6 +1,6 @@
-BDEPEND=x11-misc/imake
+BDEPEND=x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure
-DEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-base/xorg-proto
+DEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 DESCRIPTION=Turns your root window into an aquarium
 EAPI=7
 HOMEPAGE=https://jim.rees.org/computers/xfishtank.html
@@ -10,4 +10,4 @@ RDEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/xfishtank-2.5.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=98ceb0f4a4b2e65e00e9d35cf5f6993c
+_md5_=fcb5cf396ae4d2288d6f8802485c6524
diff --git a/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1 b/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1
index a4e279d00664..0f6e428af837 100644
--- a/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1
+++ b/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libappindicator:3 dev-python/pexpect[python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/xflux-gui/fluxgui/archive/v1.2.0.tar.gz -> xflux-gui-1.2.0.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=790638277a85ed10bafab48119276473
diff --git a/metadata/md5-cache/x11-misc/xgestures-0.4 b/metadata/md5-cache/x11-misc/xgestures-0.4
index 94240ea5ab15..32239ae53819 100644
--- a/metadata/md5-cache/x11-misc/xgestures-0.4
+++ b/metadata/md5-cache/x11-misc/xgestures-0.4
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXrender x11-libs/libXtst x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://sourceforge/xgestures/xgestures-0.4.tar.bz2
-_md5_=9786e0664dee06b2315bf8c62967f48e
+_md5_=d1739e0847d19e09ec5ec1124b9e74b9
diff --git a/metadata/md5-cache/x11-misc/xhkeys-2.2.1 b/metadata/md5-cache/x11-misc/xhkeys-2.2.1
index 43ecc1fe8d4f..e8b222b5df2f 100644
--- a/metadata/md5-cache/x11-misc/xhkeys-2.2.1
+++ b/metadata/md5-cache/x11-misc/xhkeys-2.2.1
@@ -8,5 +8,4 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://gentoo/xhkeys-2.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5c5a81dabc0f7d8c575e580b68723e0a
+_md5_=471526a5e062198a5fcedc585f1f933d
diff --git a/metadata/md5-cache/x11-misc/xiccd-0.3.0 b/metadata/md5-cache/x11-misc/xiccd-0.3.0
index 08da7b70475d..58163bd8fb8f 100644
--- a/metadata/md5-cache/x11-misc/xiccd-0.3.0
+++ b/metadata/md5-cache/x11-misc/xiccd-0.3.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/glib:2 x11-apps/xrandr x11-misc/colord
 DESCRIPTION=A desktop environment-independent bridge between colord and X
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 x11-apps/xrandr x11-misc/colord
 SLOT=0
 SRC_URI=https://github.com/agalakhov/xiccd/archive/v0.3.0.tar.gz -> xiccd-0.3.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b0a5ba6b2894e1c8bf04e12b8e71e035
diff --git a/metadata/md5-cache/x11-misc/xidle-26052015 b/metadata/md5-cache/x11-misc/xidle-26052015
index 9e53d24cbf42..f39f51c22dd0 100644
--- a/metadata/md5-cache/x11-misc/xidle-26052015
+++ b/metadata/md5-cache/x11-misc/xidle-26052015
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst
-DEPEND=x11-libs/libX11 x11-libs/libXScrnSaver
+DEPEND=virtual/pkgconfig
 DESCRIPTION=Monitors inactivity in X and runs the specified program when a timeout occurs
 EAPI=6
 HOMEPAGE=http://www.freebsdsoftware.org/x11/xidle.html
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=http://distcache.freebsd.org/local-distfiles/novel/xidle-26052015.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=98b8584f36cfec700c71b5df6f15713a
+_md5_=1de90e53fc6b3d6afdd5674ec97d4303
diff --git a/metadata/md5-cache/x11-misc/xkbd-0.8.18 b/metadata/md5-cache/x11-misc/xkbd-0.8.18
index 186c8bb988e5..4168d17f055e 100644
--- a/metadata/md5-cache/x11-misc/xkbd-0.8.18
+++ b/metadata/md5-cache/x11-misc/xkbd-0.8.18
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DEPEND=x11-libs/libX11 x11-libs/libXtst xft? ( x11-libs/libXft ) xpm? ( x11-libs/libXpm ) x11-base/xorg-proto
 DESCRIPTION=onscreen soft keyboard for X11
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXtst xft? ( x11-libs/libXft ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=https://github.com/mahatma-kaganovich/xkbd/archive/xkbd-0.8.18.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=12f7f803bd677adcbdb23181f206bf36
diff --git a/metadata/md5-cache/x11-misc/xkbd-999999 b/metadata/md5-cache/x11-misc/xkbd-999999
index e3fd6e08c479..a3aa8ab65f6a 100644
--- a/metadata/md5-cache/x11-misc/xkbd-999999
+++ b/metadata/md5-cache/x11-misc/xkbd-999999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
 DEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXfixes x11-libs/libXi x11-libs/libXtst evdev? ( dev-libs/libevdev ) xft? ( x11-libs/libXft ) xpm? ( x11-libs/libXpm ) xrandr? ( x11-libs/libXrandr ) x11-base/xorg-proto
 DESCRIPTION=onscreen soft keyboard for X11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXfixes x11-libs/libXi x11-libs/libXtst evdev? ( dev-libs/libevdev ) xft? ( x11-libs/libXft ) xpm? ( x11-libs/libXpm ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fa4fe6adb6269c9e0ed49a57834e0ec6
diff --git a/metadata/md5-cache/x11-misc/xkblayout-state-9999 b/metadata/md5-cache/x11-misc/xkblayout-state-9999
index 4be5a1da4a29..3ff4a734f5a4 100644
--- a/metadata/md5-cache/x11-misc/xkblayout-state-9999
+++ b/metadata/md5-cache/x11-misc/xkblayout-state-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=x11-libs/libX11
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7bdbda28ec8c69531fa5973a816ba829
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.31 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.31
index 0539759bf3e9..8ded585840b4 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.31
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.31
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.31.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=64c4fd1df9580aa93b5dbcf13cd3f405
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.32 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.32
index 761ed1e950ac..85299909b209 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.32
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.32
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~s
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.32.tar.bz2
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=af323da33361f9e5c4fdd42b9a6b755c
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-9999 b/metadata/md5-cache/x11-misc/xkeyboard-config-9999
index 5aec2bdd55cd..c7c295245cf6 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-9999
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitla
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=af323da33361f9e5c4fdd42b9a6b755c
diff --git a/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7 b/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7
index cefdf89b8083..50884b3a9798 100644
--- a/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7
+++ b/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7
@@ -1,5 +1,6 @@
+BDEPEND=>=sys-apps/sed-4 x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps >=sys-apps/sed-4 x11-base/xorg-proto x11-misc/imake
+DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps
 DESCRIPTION=GUI frontend to xmodmap
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/x/xkeycaps.html
@@ -9,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-lib
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xkeycaps/xkeycaps_2.47.orig.tar.gz mirror://debian/pool/main/x/xkeycaps/xkeycaps_2.47-7.debian.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ec1a490d0cc8d3c0224d7b802f183d0d
+_md5_=a4482a70e019710d9d7bc596af333744
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.50-r1 b/metadata/md5-cache/x11-misc/xlockmore-5.50-r1
deleted file mode 100644
index 6d58612e74d3..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.50-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Just another screensaver application for X
-EAPI=6
-HOMEPAGE=https://www.sillycycle.com/xlockmore.html
-IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86
-LICENSE=BSD GPL-2
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
-REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
-SLOT=0
-SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.50.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.50.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cb2705f76cef3f69a963a2e93251f7f5
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.65-r1 b/metadata/md5-cache/x11-misc/xlockmore-5.65-r1
index 1556326137a7..35e16cd0ad78 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.65-r1
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.65-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=Just another screensaver application for X
@@ -11,5 +11,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif?
 REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
 SLOT=0
 SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.65.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.65.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c0277fe06863bc86357192882a84af9f
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.66 b/metadata/md5-cache/x11-misc/xlockmore-5.66
index 90f01cc97bbe..2f58b23ed3a4 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.66
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.66
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
 DESCRIPTION=Just another screensaver application for X
 EAPI=7
 HOMEPAGE=https://www.sillycycle.com/xlockmore.html
 IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) xinerama? ( x11-libs/libXinerama )
 REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
 SLOT=0
 SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.66.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9c6575191df2776d8af423689d8f22ff
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7fb3d24cb30a2fd4442fa3f1734fa54e
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha12-r1 b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha12-r1
deleted file mode 100644
index 78e1043a3ad9..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha12-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Just another screensaver application for X
-EAPI=7
-HOMEPAGE=https://www.sillycycle.com/xlockmore.html
-IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
-REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
-SLOT=0
-SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.66ALPHA12.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66ALPHA12.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db39133f4c72d8244e0a6aa20accbd38
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.36 b/metadata/md5-cache/x11-misc/xmobar-0.37
index b35d61a36c6c..afc167cd1aae 100644
--- a/metadata/md5-cache/x11-misc/xmobar-0.36
+++ b/metadata/md5-cache/x11-misc/xmobar-0.37
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/parsec-numbers-0.1.0:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] ) dbus? ( >=dev-haskell/dbus-1:=[profile?] weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xpm? ( x11-libs/libXpm ) ) !dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) inotify? ( >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] ) iwlib? ( >=dev-haskell/iwlib-0.1.0:=[profile?] <dev-haskell/iwlib-0.2:=[profile?] net-wireless/wireless-tools ) !iwlib? ( wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] >=dev-haskell/netlink-1.1.1.0:=[profile?] ) ) mpd? ( >=dev-haskell/libmpd-0.9.0.10:=[profile?] ) mpris? ( >=dev-haskell/dbus-1:=[profile?] !dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) !xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) ) !mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) timezone? ( >=dev-haskell/timezone-olson-0.1:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) uvmeter? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/parsec-numbers-0.1.0:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] ) dbus? ( >=dev-haskell/dbus-1:=[profile?] weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xpm? ( x11-libs/libXpm ) ) !dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) inotify? ( >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] ) mpd? ( >=dev-haskell/libmpd-0.9.2.0:=[profile?] ) mpris? ( >=dev-haskell/dbus-1:=[profile?] !dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) !xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) ) !mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) timezone? ( >=dev-haskell/timezone-olson-0.2:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) uvmeter? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] >=dev-haskell/netlink-1.1.1.0:=[profile?] ) !wifi? ( iwlib? ( >=dev-haskell/iwlib-0.1.0:=[profile?] <dev-haskell/iwlib-0.2:=[profile?] net-wireless/wireless-tools ) ) xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Minimalistic Text Based Status Bar
 EAPI=7
 HOMEPAGE=https://xmobar.org
 IUSE=alsa dbus inotify iwlib mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/parsec-numbers-0.1.0:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] ) dbus? ( >=dev-haskell/dbus-1:=[profile?] weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xpm? ( x11-libs/libXpm ) ) !dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) inotify? ( >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] ) iwlib? ( >=dev-haskell/iwlib-0.1.0:=[profile?] <dev-haskell/iwlib-0.2:=[profile?] net-wireless/wireless-tools ) !iwlib? ( wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] >=dev-haskell/netlink-1.1.1.0:=[profile?] ) ) mpd? ( >=dev-haskell/libmpd-0.9.0.10:=[profile?] ) mpris? ( >=dev-haskell/dbus-1:=[profile?] !dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) !xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) ) !mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) timezone? ( >=dev-haskell/timezone-olson-0.1:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) uvmeter? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] )
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/parsec-numbers-0.1.0:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] ) dbus? ( >=dev-haskell/dbus-1:=[profile?] weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xpm? ( x11-libs/libXpm ) ) !dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) inotify? ( >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] ) mpd? ( >=dev-haskell/libmpd-0.9.2.0:=[profile?] ) mpris? ( >=dev-haskell/dbus-1:=[profile?] !dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) !xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) ) !mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) timezone? ( >=dev-haskell/timezone-olson-0.2:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) uvmeter? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] >=dev-haskell/netlink-1.1.1.0:=[profile?] ) !wifi? ( iwlib? ( >=dev-haskell/iwlib-0.1.0:=[profile?] <dev-haskell/iwlib-0.2:=[profile?] net-wireless/wireless-tools ) ) xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] )
 RESTRICT=!test? ( test )
-SLOT=0/0.36
-SRC_URI=https://hackage.haskell.org/package/xmobar-0.36/xmobar-0.36.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	9d756e2e026abb59bf29f5b777bb34b2	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a19d38e4d439fdfd14a024b7d0eb1b6c
+SLOT=0/0.37
+SRC_URI=https://hackage.haskell.org/package/xmobar-0.37/xmobar-0.37.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	2f31876646b777a7851b22816735765c	haskell-cabal	781f607e5fa6b3d28f694be10c79646b	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b9d53e42c7522e0aede8a43364189fa7
diff --git a/metadata/md5-cache/x11-misc/xnee-3.19-r2 b/metadata/md5-cache/x11-misc/xnee-3.19-r2
index 991e89b068c6..a0607baa3eb3 100644
--- a/metadata/md5-cache/x11-misc/xnee-3.19-r2
+++ b/metadata/md5-cache/x11-misc/xnee-3.19-r2
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig sys-devel/gettext gnome? ( virtual/imagemagick-tools[jpeg,png] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gettext gnome? ( virtual/imagemagick-tools[jpeg,png] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install prepare test
 DEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXtst x11-libs/libxcb gnome? ( >=gnome-base/gconf-2 x11-libs/gtk+:2 ) x11-base/xorg-proto
 DESCRIPTION=Program suite to record, replay and distribute user actions
 EAPI=7
 HOMEPAGE=https://xnee.wordpress.com/
-IUSE=gnome xosd
+IUSE=gnome xosd test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXtst x11-libs/libxcb gnome? ( >=gnome-base/gconf-2 x11-libs/gtk+:2 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/xnee/xnee-3.19.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e1e9206d7e4d8d2e76f4d350a83fc3b3
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0a7c712078111cd98246d191ff02cdaa
diff --git a/metadata/md5-cache/x11-misc/xnots-0.2.1-r2 b/metadata/md5-cache/x11-misc/xnots-0.2.1-r2
index ed41acadd4e3..b015faf4642f 100644
--- a/metadata/md5-cache/x11-misc/xnots-0.2.1-r2
+++ b/metadata/md5-cache/x11-misc/xnots-0.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/xnots/xnots-0.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4d23d44398831cf2698b1132ef90b3c9
diff --git a/metadata/md5-cache/x11-misc/xnots-9999 b/metadata/md5-cache/x11-misc/xnots-9999
index 0ef53d644bf4..0b044f08bc4a 100644
--- a/metadata/md5-cache/x11-misc/xnots-9999
+++ b/metadata/md5-cache/x11-misc/xnots-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/pango[X]
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c0b317d4ec9505612109471aae37ff5b
diff --git a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6-r1 b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6-r2
index 3398e395f42b..6de3648dc87d 100644
--- a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6-r1
+++ b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6-r2
@@ -3,8 +3,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Old Imake-related build files
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/xorg-cf-files-1.0.6.tar.bz2 https://dev.gentoo.org/~mattst88/distfiles/xorg-cf-files-1.0.6-solaris-prefix.patch.bz2
-_md5_=f397df750aa31c907e95356588cbb354
+_md5_=5860f73207c7e202be055fe07246806f
diff --git a/metadata/md5-cache/x11-misc/xowl-9999 b/metadata/md5-cache/x11-misc/xowl-9999
index 65e9ec261a63..dfa843424296 100644
--- a/metadata/md5-cache/x11-misc/xowl-9999
+++ b/metadata/md5-cache/x11-misc/xowl-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=X11 Obstinate Window Lister
 EAPI=6
 HOMEPAGE=https://github.com/seanpringle/xowl
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e33b819d9971dfb751faaccd64dde89e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8726a85410c680b66868b6e9e42cf092
diff --git a/metadata/md5-cache/x11-misc/xpad-5.4.0 b/metadata/md5-cache/x11-misc/xpad-5.4.0
index 180c5040f2a0..2439f0f18b27 100644
--- a/metadata/md5-cache/x11-misc/xpad-5.4.0
+++ b/metadata/md5-cache/x11-misc/xpad-5.4.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-devel/gettext x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/gtksourceview:3.0 x11-libs/libICE x11-libs/libSM x11-libs/pango >=dev-util/intltool-0.31 sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=a sticky note application for jotting down things to remember
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-devel/gettext x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/gtksourceview:3.0 x11-libs/libICE x11-libs/libSM x11-libs/pango
 SLOT=0
 SRC_URI=https://launchpad.net/xpad/trunk/5.4.0/+download/xpad-5.4.0.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ab8196ddae09d93f4814a9546cc13c31
diff --git a/metadata/md5-cache/x11-misc/xplanet-1.3.1-r1 b/metadata/md5-cache/x11-misc/xplanet-1.3.1-r1
index a13601a814ed..355bd882c193 100644
--- a/metadata/md5-cache/x11-misc/xplanet-1.3.1-r1
+++ b/metadata/md5-cache/x11-misc/xplanet-1.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gif? ( media-libs/giflib:= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= media-libs/netpbm ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 x11-libs/pango ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://sourceforge/xplanet/xplanet-1.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=101c68c42cebb61f6fa9475fad2f0def
diff --git a/metadata/md5-cache/x11-misc/xprintidle-2.0 b/metadata/md5-cache/x11-misc/xprintidle-2.0
index dfb49dca3e62..cfcd5e5a23b0 100644
--- a/metadata/md5-cache/x11-misc/xprintidle-2.0
+++ b/metadata/md5-cache/x11-misc/xprintidle-2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Prints user's X server idle time in milliseconds
 EAPI=6
 HOMEPAGE=https://github.com/lucianposton/xprintidle
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=https://github.com/lucianposton/xprintidle/archive/v2.0.tar.gz -> xprintidle-2.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=45f55be8bd4a7023fb844c0c4cc7195d
diff --git a/metadata/md5-cache/x11-misc/xrestop-0.4 b/metadata/md5-cache/x11-misc/xrestop-0.4
index 13e2b2203e28..a94c2f41cd98 100644
--- a/metadata/md5-cache/x11-misc/xrestop-0.4
+++ b/metadata/md5-cache/x11-misc/xrestop-0.4
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 x11-libs/libXres x11-libs/libXt virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=x11-libs/libX11 x11-libs/libXres x11-libs/libXt x11-base/xorg-proto
 DESCRIPTION='Top' like statistics of X11 client's server side resource usage
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/xrestop
 KEYWORDS=~alpha amd64 ~hppa ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXres x11-libs/libXt
 SLOT=0
 SRC_URI=http://projects.o-hand.com/sources/xrestop/xrestop-0.4.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	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
-_md5_=155bf45fb85be71f3914d9c74ce816a0
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0cd50124e7d9de5d927409543cbfbcad
diff --git a/metadata/md5-cache/x11-misc/xrootconsole-0.6-r1 b/metadata/md5-cache/x11-misc/xrootconsole-0.6-r1
index 38fa06c2e83b..f700032eabf0 100644
--- a/metadata/md5-cache/x11-misc/xrootconsole-0.6-r1
+++ b/metadata/md5-cache/x11-misc/xrootconsole-0.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-base/xorg-proto
+DEPEND=x11-libs/libX11 x11-base/xorg-proto virtual/pkgconfig
 DESCRIPTION=A utility that displays its input in a text box on your root window
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/xrootconsole/
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/xrootconsole/xrootconsole-0.6.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f95a10a923bfa233bf4ebeafef256edd
+_md5_=77decaa6b899380a61ab228d36277e42
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.44-r4 b/metadata/md5-cache/x11-misc/xscreensaver-5.44-r4
index a8d84c593582..aef57e42bc6c 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.44-r4
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.44-r4
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm caps? ( sys-libs/libcap ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=A modular screen saver and locker for the X Window System
@@ -11,5 +11,5 @@ RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appr
 REQUIRED_USE=gdk-pixbuf? ( gtk )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.44.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a2437ca89c6cbec03f36ec545be24bc9
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.45 b/metadata/md5-cache/x11-misc/xscreensaver-5.45
index 11d12c7dbf6d..fe86aef76aea 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.45
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.45
@@ -1,15 +1,15 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare
 DEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm caps? ( sys-libs/libcap ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-221 ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=7
 HOMEPAGE=https://www.jwz.org/xscreensaver/
 IUSE=caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm caps? ( sys-libs/libcap ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-221 ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
 REQUIRED_USE=gdk-pixbuf? ( gtk )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.45.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e274315b6ccc15918e82cf2790b217c5
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7bda68503114475ca79a1baf88a9bf9d
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r4 b/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r4
index 800ecf1a3d2d..5931c2fcb3c3 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r4
+++ b/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r4
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
 DEPEND=x11-libs/libdockapp x11-libs/libX11 virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=XScreenSaver dockapp for the Window Maker window manager
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libdockapp x11-libs/libX11 x11-misc/xscreensaver
 SLOT=0
 SRC_URI=mirror://sourceforge/project/xscreensaverapp/XScreenSaver.App/2.3/XScreenSaver.App-2.3.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ffca0ec3fdceb3e3cd666e29ad33240c
diff --git a/metadata/md5-cache/x11-misc/xsel-9999 b/metadata/md5-cache/x11-misc/xsel-9999
index deaa42e958d0..1a35b4d978b5 100644
--- a/metadata/md5-cache/x11-misc/xsel-9999
+++ b/metadata/md5-cache/x11-misc/xsel-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=prepare unpack
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto x11-libs/libXt
 DESCRIPTION=Command-line program for getting and setting the contents of the X selection
@@ -8,5 +8,5 @@ LICENSE=HPND
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c8e879bae9546f1e2cb6db59313a2976
diff --git a/metadata/md5-cache/x11-misc/xsensors-0.80 b/metadata/md5-cache/x11-misc/xsensors-0.80
index c36b27fd368b..cac1fc6b0e07 100644
--- a/metadata/md5-cache/x11-misc/xsensors-0.80
+++ b/metadata/md5-cache/x11-misc/xsensors-0.80
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm preinst prepare
 DEPEND=>=sys-apps/lm-sensors-3 dev-libs/glib:2 x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A hardware health information viewer, interface to lm-sensors
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/lm-sensors-3 dev-libs/glib:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/Mystro256/xsensors/archive/0.80.tar.gz -> xsensors-0.80.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e91768ef869694cff4853eb53a0b9a8d
diff --git a/metadata/md5-cache/x11-misc/xsettingsd-1.0.2 b/metadata/md5-cache/x11-misc/xsettingsd-1.0.2
index 931d26d83054..c0b94d7af468 100644
--- a/metadata/md5-cache/x11-misc/xsettingsd-1.0.2
+++ b/metadata/md5-cache/x11-misc/xsettingsd-1.0.2
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/libX11
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/derat/xsettingsd/archive/v1.0.2.tar.gz -> xsettingsd-1.0.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d51ad5faf8ce4b82345bb6d9d2b0e63b
diff --git a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2 b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2
index 6bffff7fcb98..c2cbb66d6bb6 100644
--- a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2
+++ b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2
@@ -1,5 +1,6 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm app-text/rman dev-lang/perl x11-base/xorg-proto x11-misc/imake
+BDEPEND=app-text/rman dev-lang/perl x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm
 DESCRIPTION=Program to interactively take a 'snapshot' of a region of the screen
 EAPI=7
 HOMEPAGE=ftp://ftp.ac-grenoble.fr/ge/Xutils/
@@ -9,4 +10,4 @@ RDEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-l
 SLOT=0
 SRC_URI=ftp://ftp.ac-grenoble.fr/ge/Xutils/xsnap-1.5.15.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ebd680a652358a3f5fba5821ae300004
+_md5_=1eb1f7160cbf9243c4f81e31c56c5350
diff --git a/metadata/md5-cache/x11-misc/xsnow-3.0.7 b/metadata/md5-cache/x11-misc/xsnow-3.0.7
deleted file mode 100644
index b1445f99c166..000000000000
--- a/metadata/md5-cache/x11-misc/xsnow-3.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/dbus x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXpm x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=let it snow on your desktop and windows
-EAPI=7
-HOMEPAGE=https://janswaal.home.xs4all.nl/Xsnow/ https://sourceforge.net/projects/xsnow/
-KEYWORDS=amd64 ppc ppc64 sparc x86
-LICENSE=freedist
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/dbus x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXpm
-SLOT=0
-SRC_URI=mirror://sourceforge/xsnow/3.0.7/xsnow-3.0.7.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a80dd46fa4396e2295a8eab6fde148c
diff --git a/metadata/md5-cache/x11-misc/xsnow-3.2.2 b/metadata/md5-cache/x11-misc/xsnow-3.2.2
index aca6a7ad179e..63dc6a253ad0 100644
--- a/metadata/md5-cache/x11-misc/xsnow-3.2.2
+++ b/metadata/md5-cache/x11-misc/xsnow-3.2.2
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=postinst postrm preinst prepare
 DEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/dbus x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXpm x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=let it snow on your desktop and windows
@@ -9,5 +9,5 @@ LICENSE=freedist
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/dbus x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://sourceforge/xsnow/3.2.2/xsnow-3.2.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2da7b5710533046428d98a0bb903f8bd
diff --git a/metadata/md5-cache/x11-misc/xsnow-3.3.0 b/metadata/md5-cache/x11-misc/xsnow-3.3.0
new file mode 100644
index 000000000000..9e988427f72e
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xsnow-3.3.0
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/dbus x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXpm x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=let it snow on your desktop and windows
+EAPI=7
+HOMEPAGE=https://janswaal.home.xs4all.nl/Xsnow/ https://sourceforge.net/projects/xsnow/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=freedist
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/dbus x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXpm
+SLOT=0
+SRC_URI=mirror://sourceforge/xsnow/3.3.0/xsnow-3.3.0.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c9c59ce27d13f52604abe33fe780e9ad
diff --git a/metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12 b/metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12
index 2e25ab19888f..e86b1eab78c2 100644
--- a/metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12
+++ b/metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=app-arch/rpm2targz-9.0.0.3g
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=app-arch/rpm2targz-9.0.0.3g
 DEFINED_PHASES=install prepare unpack
 DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=The xsri wallpaper setter from RedHat
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/source/SRPMS/xsri-2.1.0-17.fc12.src.rpm
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0378d627a9a84cee27f2ca2465f1635f
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a18c2e77a0cccd9257f9cce1c811bec6
diff --git a/metadata/md5-cache/x11-misc/xss-lock-0.3.0_p20140302-r1 b/metadata/md5-cache/x11-misc/xss-lock-0.3.0_p20140302-r1
index dd858aa01cb0..d75ebfd65166 100644
--- a/metadata/md5-cache/x11-misc/xss-lock-0.3.0_p20140302-r1
+++ b/metadata/md5-cache/x11-misc/xss-lock-0.3.0_p20140302-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util
 SLOT=0
 SRC_URI=https://bitbucket.org/raymonad/xss-lock/get/1e158fb20108058dbd62bd51d8e8c003c0a48717.tar.bz2 -> xss-lock-0.3.0_p20140302.tar.bz2
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad891022af83ada62fc3ada924d90d64
diff --git a/metadata/md5-cache/x11-misc/xssstate-1.1 b/metadata/md5-cache/x11-misc/xssstate-1.1
index efe5554803c1..61a23149a52b 100644
--- a/metadata/md5-cache/x11-misc/xssstate-1.1
+++ b/metadata/md5-cache/x11-misc/xssstate-1.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-base/xorg-proto
 DESCRIPTION=A simple tool to retrieve the X screensaver state
-EAPI=5
+EAPI=7
 HOMEPAGE=https://tools.suckless.org/x/xssstate
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/xssstate-1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=62fe40f11268c4dd69fffdc981ce18aa
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5c5b277ad74f1d926b7aaa6c57b1936d
diff --git a/metadata/md5-cache/x11-misc/xstroke-0.6-r1 b/metadata/md5-cache/x11-misc/xstroke-0.6-r1
index d9ecfee7fbb5..a77b67b3d4dd 100644
--- a/metadata/md5-cache/x11-misc/xstroke-0.6-r1
+++ b/metadata/md5-cache/x11-misc/xstroke-0.6-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/flex virtual/pkgconfig virtual/yacc >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/flex virtual/pkgconfig virtual/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXtst x11-base/xorg-proto
 DESCRIPTION=Gesture/Handwriting recognition engine for X
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXtst
 SLOT=0
 SRC_URI=mirror://gentoo/xstroke-0.6.tar.bz2
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=30259334dc814f1480dc03520edc89f9
diff --git a/metadata/md5-cache/x11-misc/xteddy-2.2 b/metadata/md5-cache/x11-misc/xteddy-2.2
index c121ac8babea..222276aaa075 100644
--- a/metadata/md5-cache/x11-misc/xteddy-2.2
+++ b/metadata/md5-cache/x11-misc/xteddy-2.2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DEPEND=media-libs/imlib2[X,png] x11-libs/libX11 x11-libs/libXext
 DESCRIPTION=A cuddly teddy bear (or other image) for your X desktop
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/imlib2[X,png] x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://webstaff.itn.liu.se/~stegu/xteddy/xteddy-2.2.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=95787bc48f9225409606bf77eb15d6d1
diff --git a/metadata/md5-cache/x11-misc/xtitle-1.0.4 b/metadata/md5-cache/x11-misc/xtitle-1.0.4
index 0b7031f4ec58..f81c3c5eb10d 100644
--- a/metadata/md5-cache/x11-misc/xtitle-1.0.4
+++ b/metadata/md5-cache/x11-misc/xtitle-1.0.4
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-misc/imake
+DEFINED_PHASES=configure install
+DEPEND=>=x11-misc/imake-1.0.8-r1
 DESCRIPTION=Set window title and icon name for an X11 terminal window
 EAPI=6
 HOMEPAGE=https://kinzler.com/me/xtitle/
@@ -7,4 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://kinzler.com/me/xtitle/xtitle-1.0.4.tgz
-_md5_=c367627c8d9b48764f2df9c761ed173b
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6e2d1961cf1bbc063edac4246125330b
diff --git a/metadata/md5-cache/x11-misc/xtoolwait-1.3-r2 b/metadata/md5-cache/x11-misc/xtoolwait-1.3-r2
index 4163776ee0d1..9ebcd0a3c549 100644
--- a/metadata/md5-cache/x11-misc/xtoolwait-1.3-r2
+++ b/metadata/md5-cache/x11-misc/xtoolwait-1.3-r2
@@ -1,6 +1,6 @@
-BDEPEND=app-text/rman x11-misc/imake
+BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
 DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto
+DEPEND=x11-libs/libX11 x11-libs/libXext
 DESCRIPTION=Xtoolwait notably decreases the startup time of an X session
 EAPI=7
 HOMEPAGE=http://ftp.x.org/contrib/utilities/xtoolwait-1.3.README
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://ftp.x.org/contrib/utilities/xtoolwait-1.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6544e96f36923fe99c23885cbd94d06f
+_md5_=24a57a39261653c7ce895f73d53854c2
diff --git a/metadata/md5-cache/x11-misc/xtrace-1.4.0 b/metadata/md5-cache/x11-misc/xtrace-1.4.0
index 36a63c1e3e97..817987e444d1 100644
--- a/metadata/md5-cache/x11-misc/xtrace-1.4.0
+++ b/metadata/md5-cache/x11-misc/xtrace-1.4.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure postinst prepare
 DEPEND=x11-base/xorg-proto x11-libs/libXext x11-libs/libX11
 DESCRIPTION=X11 protocol trace utility
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-base/xorg-proto x11-libs/libXext x11-libs/libX11
 SLOT=0
 SRC_URI=https://salsa.debian.org/debian/xtrace/-/archive/xtrace-1.4.0/xtrace-xtrace-1.4.0.tar.gz -> xtrace-1.4.0.tar.gz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d1ef88b99a7b54c7f53336481871b14a
diff --git a/metadata/md5-cache/x11-misc/xtrlock-2.13 b/metadata/md5-cache/x11-misc/xtrlock-2.13
index cee1a632702d..0ae72800e638 100644
--- a/metadata/md5-cache/x11-misc/xtrlock-2.13
+++ b/metadata/md5-cache/x11-misc/xtrlock-2.13
@@ -1,5 +1,6 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-base/xorg-proto x11-misc/imake
+BDEPEND=x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1
+DEFINED_PHASES=compile configure install
+DEPEND=x11-libs/libX11
 DESCRIPTION=A simplistic screen locking program for X
 EAPI=7
 HOMEPAGE=http://ftp.debian.org/debian/pool/main/x/xtrlock/
@@ -9,4 +10,4 @@ RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xtrlock/xtrlock_2.13.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=211b253b9e272563eaea710fc0a618f8
+_md5_=60abdade63236bfeb1d62fffee663421
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-0.6.2-r1 b/metadata/md5-cache/x11-misc/xwallpaper-0.6.2-r1
index cb07d35ed243..cc5776deeb06 100644
--- a/metadata/md5-cache/x11-misc/xwallpaper-0.6.2-r1
+++ b/metadata/md5-cache/x11-misc/xwallpaper-0.6.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig
 DESCRIPTION=Wallpaper setting utility for X
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=https://github.com/stoeckmann/xwallpaper/releases/download/v0.6.2/xwallpaper-0.6.2.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=72a850b7f839f03e780c78b3dd2bf9f8
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-0.6.4 b/metadata/md5-cache/x11-misc/xwallpaper-0.6.4
index b3efc42f8d6e..014d38bb44a8 100644
--- a/metadata/md5-cache/x11-misc/xwallpaper-0.6.4
+++ b/metadata/md5-cache/x11-misc/xwallpaper-0.6.4
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig
 DESCRIPTION=Wallpaper setting utility for X
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=https://github.com/stoeckmann/xwallpaper/releases/download/v0.6.4/xwallpaper-0.6.4.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8189ea58ff709307aa4ad9ddaa61f37f
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-0.6.5 b/metadata/md5-cache/x11-misc/xwallpaper-0.6.5
index 9d706eeb8c0d..ee7c6f54cd04 100644
--- a/metadata/md5-cache/x11-misc/xwallpaper-0.6.5
+++ b/metadata/md5-cache/x11-misc/xwallpaper-0.6.5
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig
 DESCRIPTION=Wallpaper setting utility for X
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=https://github.com/stoeckmann/xwallpaper/releases/download/v0.6.5/xwallpaper-0.6.5.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8189ea58ff709307aa4ad9ddaa61f37f
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-0.6.6 b/metadata/md5-cache/x11-misc/xwallpaper-0.6.6
index 1d5658398624..84a909e02078 100644
--- a/metadata/md5-cache/x11-misc/xwallpaper-0.6.6
+++ b/metadata/md5-cache/x11-misc/xwallpaper-0.6.6
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
 DEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig
 DESCRIPTION=Wallpaper setting utility for X
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=https://github.com/stoeckmann/xwallpaper/releases/download/v0.6.6/xwallpaper-0.6.6.tar.xz
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=01ff7d901a4b9fcd98a0bb6d95a83c01
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-9999 b/metadata/md5-cache/x11-misc/xwallpaper-9999
index c46014c498b4..704398906052 100644
--- a/metadata/md5-cache/x11-misc/xwallpaper-9999
+++ b/metadata/md5-cache/x11-misc/xwallpaper-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
 DEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig
 DESCRIPTION=Wallpaper setting utility for X
@@ -9,5 +9,5 @@ LICENSE=ISC
 PROPERTIES=live
 RDEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm )
 SLOT=0
-_eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=01ff7d901a4b9fcd98a0bb6d95a83c01
diff --git a/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1 b/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
index c254c3ea6d7d..3c773e6c727f 100644
--- a/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
+++ b/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman x11-misc/imake svg? ( virtual/pkgconfig )
+BDEPEND=app-text/rman >=x11-misc/imake-1.0.8-r1 svg? ( virtual/pkgconfig )
 DEFINED_PHASES=compile configure install prepare
 DEPEND=x11-libs/gdk-pixbuf-xlib x11-libs/libX11 x11-libs/libXpm x11-libs/libXt svg? ( dev-libs/glib:2 gnome-base/librsvg:2 x11-libs/gtk+:2 )
 DESCRIPTION=eXtended XKB - assign different keymaps to different windows
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/gdk-pixbuf-xlib x11-libs/libX11 x11-libs/libXpm x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://sourceforge/xxkb/xxkb-1.11.1-src.tar.gz svg? ( https://dev.gentoo.org/~jer/xxkb-flags.tar.bz2 )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=59b4e73d21b4f6679a5cf1a21fe3d5d6
+_md5_=53920838e5b7e59c3ac710a492fa718f
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.1 b/metadata/md5-cache/x11-misc/zim-0.73.1
index e36f2340c8bf..e2f3a34f794a 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.1
+++ b/metadata/md5-cache/x11-misc/zim-0.73.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.1.tar.gz -> zim-0.73.1.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7652eee68dceb0b678d637e0d6c18d91
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.2 b/metadata/md5-cache/x11-misc/zim-0.73.2
index 2c4a5ec59785..9397df330615 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.2
+++ b/metadata/md5-cache/x11-misc/zim-0.73.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.2.tar.gz -> zim-0.73.2.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f13603d2a32ed200cfcbcd108a51752c
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.3 b/metadata/md5-cache/x11-misc/zim-0.73.3
index 21c74df6d92f..54f950181d50 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.3
+++ b/metadata/md5-cache/x11-misc/zim-0.73.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.3.tar.gz -> zim-0.73.3.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f13603d2a32ed200cfcbcd108a51752c
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.4 b/metadata/md5-cache/x11-misc/zim-0.73.4
index 78d747fc0e92..9689bcf05243 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.4
+++ b/metadata/md5-cache/x11-misc/zim-0.73.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.4.tar.gz -> zim-0.73.4.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=22bfb18a80f7b514f7acb04e71e831aa
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.5 b/metadata/md5-cache/x11-misc/zim-0.73.5
index b916a8d3b036..f2a11fef9da7 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.5
+++ b/metadata/md5-cache/x11-misc/zim-0.73.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.5.tar.gz -> zim-0.73.5.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	d8655e1387589a2e1930339b1627d5c1	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2990281c53b71e7b0b026abaccf0d8c8
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /metadata/md5-cache/x11-misc
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)