gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /metadata/md5-cache/x11-misc
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
158 files changed, 322 insertions, 382 deletions
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 1e341a515efa..82cf4cc96e06 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/alacarte-3.11.91 b/metadata/md5-cache/x11-misc/alacarte-3.11.91
index 67b87bf57baa..db5e565f20f5 100644
--- a/metadata/md5-cache/x11-misc/alacarte-3.11.91
+++ b/metadata/md5-cache/x11-misc/alacarte-3.11.91
@@ -4,11 +4,11 @@ DESCRIPTION=Simple GNOME menu editor
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/alacarte
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gnome-menus-3.5.3:3[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/alacarte/3.11/alacarte-3.11.91.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6bf534454da53070d1d578737c5d30b
+_md5_=839b1e383d7db93d4429c909d43328cd
diff --git a/metadata/md5-cache/x11-misc/albert-0.14.22 b/metadata/md5-cache/x11-misc/albert-0.14.22
index 38b5a2d1216a..ec725c4e791a 100644
--- a/metadata/md5-cache/x11-misc/albert-0.14.22
+++ b/metadata/md5-cache/x11-misc/albert-0.14.22
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-cpp/muParser dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=https://github.com/albertlauncher/albert/archive/v0.14.22.tar.gz -> albert-0.14.22.tar.gz https://github.com/albertlauncher/plugins/archive/5dc169ce81002b4472cc55c0341f6ac52fe130f5.tar.gz -> albert-0.14.22-plugins.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc6f4bc23a1aedf14faad9f3c2859902
diff --git a/metadata/md5-cache/x11-misc/albert-0.16.1 b/metadata/md5-cache/x11-misc/albert-0.16.1
index a3a365c0f88d..4a36f35fca60 100644
--- a/metadata/md5-cache/x11-misc/albert-0.16.1
+++ b/metadata/md5-cache/x11-misc/albert-0.16.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-cpp/muParser dev-qt/qtcharts:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=https://github.com/albertlauncher/albert/archive/v0.16.1.tar.gz -> albert-0.16.1.tar.gz https://github.com/albertlauncher/plugins/archive/029bd8ccb58c4452bd82ab42be8739f1639e42d4.tar.gz -> albert-0.16.1-plugins.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa95f8590aa594a1111138e9aea12f21
diff --git a/metadata/md5-cache/x11-misc/alock-1.0.0 b/metadata/md5-cache/x11-misc/alock-1.0.0
index 05d3b8f8ca0f..38016893cdea 100644
--- a/metadata/md5-cache/x11-misc/alock-1.0.0
+++ b/metadata/md5-cache/x11-misc/alock-1.0.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXcursor imlib? ( media-libs/imlib2[X] ) pam? ( virtual/pam ) doc? ( app-text/asciidoc )
+DEPEND=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 )
 DESCRIPTION=locks the local X display until a password is entered
 EAPI=6
 HOMEPAGE=https://darkshed.net/projects/alock https://github.com/mgumz/alock
 IUSE=doc imlib pam
 KEYWORDS=amd64 ppc x86
 LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXcursor imlib? ( media-libs/imlib2[X] ) pam? ( virtual/pam ) doc? ( app-text/asciidoc )
+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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f663ff225611d7a17d6252660c666a7
+_md5_=b8fbcc2d6eb7264e27718152e0cf0167
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 8dd4c2086594..c9a5700a36d5 100644
--- a/metadata/md5-cache/x11-misc/apwal-0.4.5-r2
+++ b/metadata/md5-cache/x11-misc/apwal-0.4.5-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 x11-libs/gdk-pixbuf dev-libs/libxml2 dev-libs/glib:2 virt
 DESCRIPTION=A simple application launcher and combined editor
 EAPI=6
 HOMEPAGE=http://apwal.free.fr/
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/gdk-pixbuf dev-libs/libxml2 dev-libs/glib:2
 SLOT=0
 SRC_URI=http://apwal.free.fr/download/apwal-0.4.5.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=29f7a37a05c707eee1b8ff69b33a2530
+_md5_=04a4a7228a7b6c9ebd712f4b7aa18fe7
diff --git a/metadata/md5-cache/x11-misc/bbcd-0.3.1-r2 b/metadata/md5-cache/x11-misc/bbcd-0.3.1-r2
index 85ffc59a4ec6..83fd94f00042 100644
--- a/metadata/md5-cache/x11-misc/bbcd-0.3.1-r2
+++ b/metadata/md5-cache/x11-misc/bbcd-0.3.1-r2
@@ -3,9 +3,9 @@ DEPEND=media-libs/libcdaudio x11-libs/libX11
 DESCRIPTION=Basic CD Player for blackbox wm
 EAPI=6
 HOMEPAGE=http://tranber1.free.fr/bbcd.html
-KEYWORDS=~amd64 ppc x86 ~x86-fbsd
+KEYWORDS=~amd64 ppc x86
 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_=2a16b6edc9e4ecb968762e8307a1af8e
+_md5_=9aa3fe9d12a60688416df9eb4ba6698f
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 30a4af369a49..6918479b5217 100644
--- a/metadata/md5-cache/x11-misc/bbdate-0.2.4-r2
+++ b/metadata/md5-cache/x11-misc/bbdate-0.2.4-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.
 DESCRIPTION=blackbox date display
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/bbtools
-KEYWORDS=amd64 ppc sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbdate-0.2.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=56ad0b03239a9798c4628e4e3a1fdde9
+_md5_=5b80f1807f57dc4010f7e31292647fb6
diff --git a/metadata/md5-cache/x11-misc/bbkeys-0.9.1-r1 b/metadata/md5-cache/x11-misc/bbkeys-0.9.1-r1
index aa10e0a28cb4..f7b902953666 100644
--- a/metadata/md5-cache/x11-misc/bbkeys-0.9.1-r1
+++ b/metadata/md5-cache/x11-misc/bbkeys-0.9.1-r1
@@ -3,9 +3,9 @@ DEPEND=>=x11-wm/blackbox-0.70.0 virtual/pkgconfig
 DESCRIPTION=Use keyboard shortcuts in the blackbox wm
 EAPI=6
 HOMEPAGE=http://bbkeys.sourceforge.net
-KEYWORDS=~amd64 ppc x86 ~x86-fbsd
+KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-wm/blackbox-0.70.0
 SLOT=0
 SRC_URI=mirror://sourceforge/bbkeys/bbkeys-0.9.1.tar.gz
-_md5_=1f8a4140ad1021fdb15825970877f658
+_md5_=7147cbfe56b8aac0afb7cc0a7f8f2041
diff --git a/metadata/md5-cache/x11-misc/bblaunch-0.0.3 b/metadata/md5-cache/x11-misc/bblaunch-0.0.3
index 411da6360dc9..15873f869620 100644
--- a/metadata/md5-cache/x11-misc/bblaunch-0.0.3
+++ b/metadata/md5-cache/x11-misc/bblaunch-0.0.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=An application launcher for Blackbox type window managers
 EAPI=7
 HOMEPAGE=http://blackboxwm.sourceforge.net/
-KEYWORDS=ppc x86 ~x86-fbsd
+KEYWORDS=ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.stud.ifi.uio.no/~steingrd/bblaunch-0.0.3.tar.gz
-_md5_=3f4f3db216747b2056547352f610e3d8
+_md5_=f8667671042e8f0ea40ff6cfcbb85b74
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 e5206fcb9955..4beb15949e01 100644
--- a/metadata/md5-cache/x11-misc/bbmail-0.9.3-r1
+++ b/metadata/md5-cache/x11-misc/bbmail-0.9.3-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl x11-wm/blackbox x11-libs/libX11 x11-libs/libXext x11-base/x
 DESCRIPTION=blackbox mail notification
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/bbtools
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ppc x86
 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	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=b374d52df63586cb2a1ec00ae1b7f001
+_md5_=b4915dd9901b0a50391a529aac3df233
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 5176538f3d41..c8655b1f12fd 100644
--- a/metadata/md5-cache/x11-misc/bbpager-0.4.7-r1
+++ b/metadata/md5-cache/x11-misc/bbpager-0.4.7-r1
@@ -3,10 +3,10 @@ DEPEND=x11-wm/blackbox virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sy
 DESCRIPTION=An understated pager for Blackbox
 EAPI=6
 HOMEPAGE=http://bbtools.sourceforge.net/
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=x11-wm/blackbox
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbpager-0.4.7.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=ee4a05473b24409719cd74c14b27a0b2
+_md5_=e195b00a74498b3be6a60f2a44aac161
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 360ec9aa3e40..e8d2cfd1390c 100644
--- a/metadata/md5-cache/x11-misc/bbtime-0.1.5-r1
+++ b/metadata/md5-cache/x11-misc/bbtime-0.1.5-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.
 DESCRIPTION=blackbox time watcher
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/bbtools/
-KEYWORDS=~amd64 ppc x86 ~x86-fbsd
+KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbtime-0.1.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=28830a66bfd9bdeace8e62e2a48a25a4
+_md5_=181cb3c2d72a3c66f53060ef14869cc8
diff --git a/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r1 b/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r1
index 0e548f08ce49..ca015372f010 100644
--- a/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r1
+++ b/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r1
@@ -3,10 +3,10 @@ DEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gettext >=app-portage/elt-p
 DESCRIPTION=An analog clock displaying the system-time
 EAPI=6
 HOMEPAGE=https://launchpad.net/cairo-clock
-KEYWORDS=amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~x86
 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	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=fd481e84d6da27f609f29d9431669358
+_md5_=2763f9e5bcd8d42a91ca79aacf1ce0d2
diff --git a/metadata/md5-cache/x11-misc/cbatticon-1.6.7 b/metadata/md5-cache/x11-misc/cbatticon-1.6.10
index 0c5b7a02cd3d..052741c4f211 100644
--- a/metadata/md5-cache/x11-misc/cbatticon-1.6.7
+++ b/metadata/md5-cache/x11-misc/cbatticon-1.6.10
@@ -8,6 +8,6 @@ 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.7.tar.gz -> cbatticon-1.6.7.tar.gz
+SRC_URI=https://github.com/ColinJones/cbatticon/archive/1.6.10.tar.gz -> cbatticon-1.6.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b6426fb3fa8bcd0139258c75ca66e09a
+_md5_=383e069f169baf32775117deacf2fe4c
diff --git a/metadata/md5-cache/x11-misc/cbatticon-1.6.8 b/metadata/md5-cache/x11-misc/cbatticon-1.6.8
deleted file mode 100644
index e4c64f6c1c66..000000000000
--- a/metadata/md5-cache/x11-misc/cbatticon-1.6.8
+++ /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.8.tar.gz -> cbatticon-1.6.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=112b3335762ab2fdd66ff92d362dd53d
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 b3a26d827ab7..e32d9bf394d1 100644
--- a/metadata/md5-cache/x11-misc/cdm-0.6.1_pre20180107
+++ b/metadata/md5-cache/x11-misc/cdm-0.6.1_pre20180107
@@ -5,9 +5,9 @@ HOMEPAGE=https://github.com/evertiro/cdm
 IUSE=pam consolekit
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-util/dialog x11-apps/xdpyinfo x11-apps/xinit consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( virtual/pam )
+RDEPEND=dev-util/dialog x11-apps/xdpyinfo x11-apps/xinit consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( sys-libs/pam )
 REQUIRED_USE=consolekit? ( pam )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~gienah/snapshots/cdm-0.6.1_pre20180107.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=de0e56fe446e194b02f6ba229b4df14e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2015e67b1dccd812e1c0197883f868b9
diff --git a/metadata/md5-cache/x11-misc/cdm-0.7 b/metadata/md5-cache/x11-misc/cdm-0.7
index f67b42b2a4eb..5fa336566b07 100644
--- a/metadata/md5-cache/x11-misc/cdm-0.7
+++ b/metadata/md5-cache/x11-misc/cdm-0.7
@@ -5,9 +5,9 @@ HOMEPAGE=https://github.com/evertiro/cdm
 IUSE=pam consolekit
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-util/dialog x11-apps/xdpyinfo x11-apps/xinit consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( virtual/pam )
+RDEPEND=dev-util/dialog x11-apps/xdpyinfo x11-apps/xinit consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( sys-libs/pam )
 REQUIRED_USE=consolekit? ( pam )
 SLOT=0
 SRC_URI=https://github.com/evertiro/cdm/archive/0.7.tar.gz -> cdm-0.7.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=3c7f69e3ddcce8ae588dfa2b44f80e0f
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=ac2fb852b96c19b8525f76726b16893c
diff --git a/metadata/md5-cache/x11-misc/colord-1.3.5 b/metadata/md5-cache/x11-misc/colord-1.3.5
index d121887fc344..081d3d840566 100644
--- a/metadata/md5-cache/x11-misc/colord-1.3.5
+++ b/metadata/md5-cache/x11-misc/colord-1.3.5
@@ -4,7 +4,7 @@ DESCRIPTION=System service to accurately color manage input and output devices
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/software/colord/
 IUSE=argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=dev-db/sqlite:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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? ( virtual/udev virtual/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-gfx/shared-color-profiles !<=media-gfx/colorhug-client-0.1.13
 REQUIRED_USE=gusb? ( udev ) scanner? ( udev ) vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/2
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-1.3.5.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bac09ef969f61eef0f373fe1c60b627a
+_md5_=577b0d5a422b27d2d87ee216058f387f
diff --git a/metadata/md5-cache/x11-misc/dclock-2.2.2_p9 b/metadata/md5-cache/x11-misc/dclock-2.2.2_p9
index ccec318bf484..ab5612cb5bd1 100644
--- a/metadata/md5-cache/x11-misc/dclock-2.2.2_p9
+++ b/metadata/md5-cache/x11-misc/dclock-2.2.2_p9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=xft? ( media-libs/freetype x11-libs/libXft ) x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 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-9.debian.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f2709bc81e3914a3a219a6d823559998
diff --git a/metadata/md5-cache/x11-misc/devilspie2-0.42 b/metadata/md5-cache/x11-misc/devilspie2-0.42
index 7193beeeedff..70c781e763c7 100644
--- a/metadata/md5-cache/x11-misc/devilspie2-0.42
+++ b/metadata/md5-cache/x11-misc/devilspie2-0.42
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-lang/lua-5.1.5:0 >=dev-libs/glib-2.32.4:2 >=x11-libs/gtk+-3.4.4:3 >=x11-libs/libwnck-3.4.4:3 x11-libs/libX11
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/devilspie2/devilspie2_0.42-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=72f8239b33bb4d1a2746336f14d80a23
diff --git a/metadata/md5-cache/x11-misc/dmenu-4.6 b/metadata/md5-cache/x11-misc/dmenu-4.6
index 9bb766e239d9..a6adbefaaa8a 100644
--- a/metadata/md5-cache/x11-misc/dmenu-4.6
+++ b/metadata/md5-cache/x11-misc/dmenu-4.6
@@ -4,10 +4,10 @@ DESCRIPTION=a generic, highly customizable, and efficient menu for the X Window
 EAPI=5
 HOMEPAGE=https://tools.suckless.org/dmenu/
 IUSE=xinerama
-KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd
+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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf8f5e97dc545ba6cea5e57379ae7e97
+_md5_=c9ea1c4b190e0f5587d486ac2b05ff1f
diff --git a/metadata/md5-cache/x11-misc/dmenu-4.8 b/metadata/md5-cache/x11-misc/dmenu-4.8
index 636b02f7fade..5325e53bbf5e 100644
--- a/metadata/md5-cache/x11-misc/dmenu-4.8
+++ b/metadata/md5-cache/x11-misc/dmenu-4.8
@@ -4,10 +4,10 @@ DESCRIPTION=a generic, highly customizable, and efficient menu for the X Window
 EAPI=6
 HOMEPAGE=https://tools.suckless.org/dmenu/
 IUSE=xinerama savedconfig
-KEYWORDS=amd64 ~arm arm64 hppa ~ppc ~ppc64 x86 ~x86-fbsd
+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	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	356fd0a7591e9b51742c209d13b729e1	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=396a83229f18c1ac3a8f257917ef0956
+_md5_=91f64474d8a4d83ad81949fe2490c593
diff --git a/metadata/md5-cache/x11-misc/dmenu-4.9 b/metadata/md5-cache/x11-misc/dmenu-4.9
index 5d8ee66adf8c..b41d21e4e485 100644
--- a/metadata/md5-cache/x11-misc/dmenu-4.9
+++ b/metadata/md5-cache/x11-misc/dmenu-4.9
@@ -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 ~x86-fbsd
+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	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	356fd0a7591e9b51742c209d13b729e1	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=f79ed28707158ff4a3792e9e0495d1ea
+_md5_=357f3add3619c0f80e21db5b90e257f6
diff --git a/metadata/md5-cache/x11-misc/dunst-1.4.1 b/metadata/md5-cache/x11-misc/dunst-1.4.1
new file mode 100644
index 000000000000..55a1b4cc171d
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/dunst-1.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=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/pango[X] dunstify? ( x11-libs/libnotify ) dev-lang/perl virtual/pkgconfig
+DESCRIPTION=Customizable and lightweight notification-daemon
+EAPI=7
+HOMEPAGE=http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst
+IUSE=dunstify
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+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/pango[X] dunstify? ( x11-libs/libnotify )
+SLOT=0
+SRC_URI=https://github.com/dunst-project/dunst/archive/v1.4.1.tar.gz -> dunst-1.4.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=4df6a4be628beacc2f7bf7dee3f32ebb
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 7876ce9afb48..547102ebde37 100644
--- a/metadata/md5-cache/x11-misc/easystroke-0.6.0-r3
+++ b/metadata/md5-cache/x11-misc/easystroke-0.6.0-r3
@@ -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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b2735b39618d1620b677d5b7a670ab40
diff --git a/metadata/md5-cache/x11-misc/evolvotron-0.7.1 b/metadata/md5-cache/x11-misc/evolvotron-0.7.1
index fae4ce9a7ce2..f77e84fb9afe 100644
--- a/metadata/md5-cache/x11-misc/evolvotron-0.7.1
+++ b/metadata/md5-cache/x11-misc/evolvotron-0.7.1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5
 DESCRIPTION=Generative art image evolver
 EAPI=6
 HOMEPAGE=http://www.bottlenose.net/share/evolvotron/index.htm https://sourceforge.net/projects/evolvotron/
-KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=mirror://sourceforge/evolvotron/evolvotron-0.7.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=cb48137e908d97ca9b0fe70f0abe2779
+_md5_=8ec76f2578757a8942490769ccdb23fb
diff --git a/metadata/md5-cache/x11-misc/fbpager-20090221-r1 b/metadata/md5-cache/x11-misc/fbpager-20090221-r1
index 2c2aeadc1a6c..f7a3cbcd8d45 100644
--- a/metadata/md5-cache/x11-misc/fbpager-20090221-r1
+++ b/metadata/md5-cache/x11-misc/fbpager-20090221-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A Pager for fluxbox
 EAPI=6
 HOMEPAGE=http://git.fluxbox.org/fbpager.git/
 IUSE=+xrender
-KEYWORDS=amd64 ~mips ppc ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ~mips ppc ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 xrender? ( x11-libs/libXrender )
 SLOT=0
 SRC_URI=mirror://gentoo/fbpager-20090221.tar.bz2
-_md5_=003faeded34ee9699e3ea0190be9cffd
+_md5_=598de582292114f8ca6c8ed439905c2c
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 68a3e8fc870f..9deeee9bde71 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-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae8e364c5c693187131abdb3da513acb
diff --git a/metadata/md5-cache/x11-misc/fluxter-0.1.0 b/metadata/md5-cache/x11-misc/fluxter-0.1.0
index 9e34fd2ad268..dc5b58e46ebe 100644
--- a/metadata/md5-cache/x11-misc/fluxter-0.1.0
+++ b/metadata/md5-cache/x11-misc/fluxter-0.1.0
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE >=app-portage/elt-patches-
 DESCRIPTION=workspace pager dockapp, particularly useful with the Fluxbox window manager
 EAPI=6
 HOMEPAGE=http://www.isomedia.com/homes/stevencooper
-KEYWORDS=amd64 hppa ppc x86 ~x86-fbsd
+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	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=636ec301bd0a2daf82533e9ae5d20786
+_md5_=160a3d4a5dd1ebdc9d88e92b4ac8f6c5
diff --git a/metadata/md5-cache/x11-misc/gccmakedep-1.0.3-r1 b/metadata/md5-cache/x11-misc/gccmakedep-1.0.3-r1
index 3ad4800b2a52..c3cd4190ed1e 100644
--- a/metadata/md5-cache/x11-misc/gccmakedep-1.0.3-r1
+++ b/metadata/md5-cache/x11-misc/gccmakedep-1.0.3-r1
@@ -3,8 +3,8 @@ DEPEND=x11-base/xorg-proto
 DESCRIPTION=create dependencies in makefiles using 'gcc -M'
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/gccmakedep
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
-SRC_URI=mirror://xorg/util/gccmakedep-1.0.3.tar.bz2
-_md5_=9c79b97f282d585feb54b2d486e65ff8
+SRC_URI=https://www.x.org/releases/individual/util/gccmakedep-1.0.3.tar.bz2
+_md5_=bc9bc6c5bc5b528e8259851ec42c0c33
diff --git a/metadata/md5-cache/x11-misc/gccmakedep-9999 b/metadata/md5-cache/x11-misc/gccmakedep-9999
index cd6d1e39030e..b4c005832763 100644
--- a/metadata/md5-cache/x11-misc/gccmakedep-9999
+++ b/metadata/md5-cache/x11-misc/gccmakedep-9999
@@ -8,4 +8,4 @@ LICENSE=MIT
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=a7c60a4a8801431e9c4321a5e957f95a
+_md5_=8f15399f2e75e1ba6ea968bd86c6e066
diff --git a/metadata/md5-cache/x11-misc/gcolor2-0.4-r4 b/metadata/md5-cache/x11-misc/gcolor2-0.4-r4
index 7df452477bb2..b747f45ff612 100644
--- a/metadata/md5-cache/x11-misc/gcolor2-0.4-r4
+++ b/metadata/md5-cache/x11-misc/gcolor2-0.4-r4
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/gtk+-2.4:2 >=dev-util/intltool-0.27 virtual/pkgconfig >=app-po
 DESCRIPTION=A GTK+ color selector
 EAPI=5
 HOMEPAGE=http://gcolor2.sourceforge.net
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 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	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5cca6e5b1e811a91300809639dd2da9
+_md5_=cb83d5a618471a5b9efaf87d7ad8d0dd
diff --git a/metadata/md5-cache/x11-misc/genmenu-1.1.0-r1 b/metadata/md5-cache/x11-misc/genmenu-1.1.0-r1
index d7f7cd81fbbb..af161561176b 100644
--- a/metadata/md5-cache/x11-misc/genmenu-1.1.0-r1
+++ b/metadata/md5-cache/x11-misc/genmenu-1.1.0-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=menu generator for *box, WindowMaker, and Enlightenment
 EAPI=6
 HOMEPAGE=http://f00l.de/genmenu/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=app-shells/bash
 SLOT=0
 SRC_URI=http://f00l.de/genmenu/genmenu-1.1.0.tar.bz2
-_md5_=b303a390540531dd9ee4f71b12e67878
+_md5_=2c5ff970621900a533cf41b4f52628da
diff --git a/metadata/md5-cache/x11-misc/gigolo-0.5.0 b/metadata/md5-cache/x11-misc/gigolo-0.5.0
index e46765735c72..02660cfb6915 100644
--- a/metadata/md5-cache/x11-misc/gigolo-0.5.0
+++ b/metadata/md5-cache/x11-misc/gigolo-0.5.0
@@ -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.0.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74f9167a13dc0b4b4073ec498d1c1dba
+_md5_=fa29f6483fe53e3f780b91d8889cff64
diff --git a/metadata/md5-cache/x11-misc/grsync-1.2.6 b/metadata/md5-cache/x11-misc/grsync-1.2.6
index b9223cf605d9..ef20c24927cc 100644
--- a/metadata/md5-cache/x11-misc/grsync-1.2.6
+++ b/metadata/md5-cache/x11-misc/grsync-1.2.6
@@ -3,9 +3,9 @@ DEPEND=>=x11-libs/gtk+-2.16:2 net-misc/rsync virtual/pkgconfig dev-util/intltool
 DESCRIPTION=A gtk frontend to rsync
 EAPI=6
 HOMEPAGE=http://www.opbyte.it/grsync/
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.16:2 net-misc/rsync
 SLOT=0
 SRC_URI=http://www.opbyte.it/release/grsync-1.2.6.tar.gz
-_md5_=b4c07bde44772748ea488503ffe55fde
+_md5_=27f7a40f379988d0cf15195306580ebd
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 94867f7248c7..f34119d7fa5d 100644
--- a/metadata/md5-cache/x11-misc/grun-0.9.3-r1
+++ b/metadata/md5-cache/x11-misc/grun-0.9.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A GTK based Run dialog resembling the Windows Run dialog, just like
 EAPI=5
 HOMEPAGE=https://github.com/lrgc/grun
 IUSE=nls
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ppc x86
 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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79ebcbc5493cd3a2281cfe14b66da933
+_md5_=1bd83f9e220a9027a5813e572a8fd381
diff --git a/metadata/md5-cache/x11-misc/gxmessage-2.20.3 b/metadata/md5-cache/x11-misc/gxmessage-2.20.3
index 46e1eb10e3e1..e0b8ddc54032 100644
--- a/metadata/md5-cache/x11-misc/gxmessage-2.20.3
+++ b/metadata/md5-cache/x11-misc/gxmessage-2.20.3
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/gtk+-2.20:2 virtual/pkgconfig >=dev-util/intltool-0.40.1 sys-d
 DESCRIPTION=A GTK+ based xmessage clone
 EAPI=5
 HOMEPAGE=https://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
-KEYWORDS=amd64 ppc sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-3 public-domain
 RDEPEND=>=x11-libs/gtk+-2.20:2
 SLOT=0
 SRC_URI=mirror://gnu/gxmessage/gxmessage-2.20.3.tar.gz http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-2.20.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1ca83741cde3b90f35524c00ed26827
+_md5_=6475ddb2d3a5df01add877be8869bbc8
diff --git a/metadata/md5-cache/x11-misc/gxmessage-3.4.3 b/metadata/md5-cache/x11-misc/gxmessage-3.4.3
index 4882b28c65d2..f71a034537be 100644
--- a/metadata/md5-cache/x11-misc/gxmessage-3.4.3
+++ b/metadata/md5-cache/x11-misc/gxmessage-3.4.3
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango virtual/pkgconfig >=dev-ut
 DESCRIPTION=A GTK+ based xmessage clone
 EAPI=5
 HOMEPAGE=https://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
-KEYWORDS=amd64 ppc sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-3 public-domain
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://gnu/gxmessage/gxmessage-3.4.3.tar.gz http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-3.4.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83e45d2e2e06ccbdf25c0c1bcf2b70be
+_md5_=81405f233f0b9f55b96b080db6b4dcda
diff --git a/metadata/md5-cache/x11-misc/habak-0.2.5-r2 b/metadata/md5-cache/x11-misc/habak-0.2.5-r2
index 2dfd9d5c8eb5..ee9cbf39b6b1 100644
--- a/metadata/md5-cache/x11-misc/habak-0.2.5-r2
+++ b/metadata/md5-cache/x11-misc/habak-0.2.5-r2
@@ -3,10 +3,10 @@ DEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=A simple but powerful tool to set desktop wallpaper
 EAPI=6
 HOMEPAGE=http://home.gna.org/fvwm-crystal/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/imlib2[X] x11-libs/libX11
 SLOT=0
 SRC_URI=http://download.gna.org/fvwm-crystal/habak/0.2.5/habak-0.2.5.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=a7103c74fd5cad348726c881cd8b9ce7
+_md5_=70dca8c1ea0f332ae81ab81758ecaab6
diff --git a/metadata/md5-cache/x11-misc/i3lock-2.10 b/metadata/md5-cache/x11-misc/i3lock-2.10
index 98535f077d88..c2d7c719f340 100644
--- a/metadata/md5-cache/x11-misc/i3lock-2.10
+++ b/metadata/md5-cache/x11-misc/i3lock-2.10
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util virtual/pkgconfig
+DEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev sys-libs/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util virtual/pkgconfig
 DESCRIPTION=Simple screen locker
 EAPI=6
 HOMEPAGE=https://i3wm.org/i3lock/
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
-RDEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util
+RDEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev sys-libs/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util
 SLOT=0
 SRC_URI=https://i3wm.org/i3lock/i3lock-2.10.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=9d943206f7bb823d8623a50928388f54
+_md5_=cb517c3b3b3b8b03fcff58dca1df1f43
diff --git a/metadata/md5-cache/x11-misc/i3lock-2.11.1 b/metadata/md5-cache/x11-misc/i3lock-2.11.1
index cd19a3bf1fdf..0b570e48262c 100644
--- a/metadata/md5-cache/x11-misc/i3lock-2.11.1
+++ b/metadata/md5-cache/x11-misc/i3lock-2.11.1
@@ -1,13 +1,13 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-xrm virtual/pkgconfig
+DEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev sys-libs/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-xrm virtual/pkgconfig
 DESCRIPTION=Simple screen locker
 EAPI=7
 HOMEPAGE=https://i3wm.org/i3lock/
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-xrm
+RDEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev sys-libs/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-xrm
 SLOT=0
 SRC_URI=https://i3wm.org/i3lock/i3lock-2.11.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=52eddb0aacc655990789d85419036ed2
+_md5_=524e8f93f9ee61af96a1425590e24074
diff --git a/metadata/md5-cache/x11-misc/i3lock-2.12 b/metadata/md5-cache/x11-misc/i3lock-2.12
index 81b6700b716c..27ed4553f24d 100644
--- a/metadata/md5-cache/x11-misc/i3lock-2.12
+++ b/metadata/md5-cache/x11-misc/i3lock-2.12
@@ -1,13 +1,13 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-xrm virtual/pkgconfig
+DEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev sys-libs/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-xrm virtual/pkgconfig
 DESCRIPTION=Simple screen locker
 EAPI=7
 HOMEPAGE=https://i3wm.org/i3lock/
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-xrm
+RDEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev sys-libs/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-xrm
 SLOT=0
 SRC_URI=https://i3wm.org/i3lock/i3lock-2.12.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=40e7fbd9ab5b661b489c282b749bb5d1
+_md5_=75894b486aecaa481065cdb52c3e1e23
diff --git a/metadata/md5-cache/x11-misc/icon-naming-utils-0.8.90-r1 b/metadata/md5-cache/x11-misc/icon-naming-utils-0.8.90-r1
index 49a25bce1321..bb47cefd93ef 100644
--- a/metadata/md5-cache/x11-misc/icon-naming-utils-0.8.90-r1
+++ b/metadata/md5-cache/x11-misc/icon-naming-utils-0.8.90-r1
@@ -3,9 +3,9 @@ DEPEND=>=dev-perl/XML-Simple-2 >=dev-lang/perl-5
 DESCRIPTION=Utils to help with the transition to the new freedesktop.org naming scheme
 EAPI=6
 HOMEPAGE=http://tango.freedesktop.org
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-perl/XML-Simple-2 >=dev-lang/perl-5
 SLOT=0
 SRC_URI=http://tango.freedesktop.org/releases/icon-naming-utils-0.8.90.tar.gz
-_md5_=1490ac7a84cabfe472ad639c25fc930b
+_md5_=ec0245c34a897879d269b67d208e0c31
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.8 b/metadata/md5-cache/x11-misc/imake-1.0.8
index 8d787d874f39..b30c875861e8 100644
--- a/metadata/md5-cache/x11-misc/imake-1.0.8
+++ b/metadata/md5-cache/x11-misc/imake-1.0.8
@@ -4,10 +4,10 @@ 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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
-_md5_=7e8a6cd7c8852671323c04d504a09c76
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
+_md5_=bc77f4708cbb91690cab416d41eede30
diff --git a/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre12 b/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre12
deleted file mode 100644
index c797ffe94168..000000000000
--- a/metadata/md5-cache/x11-misc/imwheel-1.0.0_pre12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-base/xorg-proto >=sys-apps/sed-4
-DESCRIPTION=mouse tool for advanced features such as wheels and 3+ buttons
-EAPI=0
-HOMEPAGE=http://imwheel.sourceforge.net/
-KEYWORDS=alpha amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
-SLOT=0
-SRC_URI=mirror://sourceforge/imwheel/imwheel-1.0.0pre12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a184e14bfb86faf5c2de51796b68e023
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 c2faa31099c7..6866dbd2a468 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
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/
 DESCRIPTION=mouse tool for advanced features such as wheels and 3+ buttons
 EAPI=6
 HOMEPAGE=http://imwheel.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
+KEYWORDS=~alpha amd64 ppc x86
 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	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=c2e936f3fcd876852a32b331661d21a7
+_md5_=8889caf9c0648416af9bebbf17aefd80
diff --git a/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.17 b/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.17
index 39bd96adf5cc..8f30682bb192 100644
--- a/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.17
+++ b/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.17
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-misc/dmenu
 SLOT=0
 SRC_URI=https://github.com/enkore/j4-dmenu-desktop/archive/r2.17.tar.gz -> j4-dmenu-desktop-2.17.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3f4bf625edc31d5572153ca07b8749d0
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.2.3 b/metadata/md5-cache/x11-misc/kronometer-2.2.3
index cc40a708aa07..bc002fd3beb1 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.2.3
+++ b/metadata/md5-cache/x11-misc/kronometer-2.2.3
@@ -10,9 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.2.3/src/kronometer-2.2.3.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da541bb0004079f9915a4c58312e5302
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1 b/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
index d63154550d5b..584cd3b6341a 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-1.26.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/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 ) dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig gnome? ( gnome-base/gnome-common ) vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+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 ) dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig gnome? ( gnome-base/gnome-common ) vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=A lightweight display manager
 EAPI=6
 HOMEPAGE=https://github.com/CanonicalLtd/lightdm
@@ -7,9 +7,9 @@ IUSE=audit +gnome +gtk +introspection qt5 vala
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-3 LGPL-3
 PDEPEND=gtk? ( x11-misc/lightdm-gtk-greeter )
-RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/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 ) >=sys-auth/pambase-20101024-r2
+RDEPEND=>=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 ) >=sys-auth/pambase-20101024-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.26.0/lightdm-1.26.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88f98a58cbe87da7ed3ea9d085b9e507
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=03cc724a024039f34ca9f3deeb1d1968
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.28.0 b/metadata/md5-cache/x11-misc/lightdm-1.28.0
index 40435555abfa..ec8b720bd2ff 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.28.0
+++ b/metadata/md5-cache/x11-misc/lightdm-1.28.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/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 ) dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig gnome? ( gnome-base/gnome-common ) vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+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 ) dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig gnome? ( gnome-base/gnome-common ) vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=A lightweight display manager
 EAPI=6
 HOMEPAGE=https://github.com/CanonicalLtd/lightdm
@@ -7,10 +7,10 @@ IUSE=audit +gnome +gtk +introspection qt5 vala
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-3 LGPL-3
 PDEPEND=gtk? ( x11-misc/lightdm-gtk-greeter )
-RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/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 ) >=sys-auth/pambase-20101024-r2
+RDEPEND=>=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 ) >=sys-auth/pambase-20101024-r2
 REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.28.0/lightdm-1.28.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ff1a0b708db924b8f488eb7474152c9
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3f0f074f4058d8a0e8d4654e14307915
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.30.0 b/metadata/md5-cache/x11-misc/lightdm-1.30.0
index 48ed790f6853..1a8e5278d1f3 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.30.0
+++ b/metadata/md5-cache/x11-misc/lightdm-1.30.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=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 virtual/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 )
+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
 EAPI=7
 HOMEPAGE=https://github.com/CanonicalLtd/lightdm
@@ -8,10 +8,10 @@ IUSE=audit +gnome +gtk +introspection non_root qt5 vala
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3 LGPL-3
 PDEPEND=gtk? ( x11-misc/lightdm-gtk-greeter )
-RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/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 ) >=sys-auth/pambase-20101024-r2
+RDEPEND=>=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 ) >=sys-auth/pambase-20101024-r2
 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	1bf086cdd7356f5c9a4acd9727bd2065	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a6f57035afacea279610ac82af1dfd0
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=388a98c77458eae42c1747e8dae14b69
diff --git a/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r1 b/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r1
deleted file mode 100644
index e917d22b35e7..000000000000
--- a/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND==x11-misc/lineakd-0.9.0* x11-libs/xosd
-DESCRIPTION=Xosd plugin for LINEAK
-EAPI=0
-HOMEPAGE=http://lineak.sourceforge.net/
-IUSE=debug
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND==x11-misc/lineakd-0.9.0* x11-libs/xosd
-SLOT=0
-SRC_URI=mirror://sourceforge/lineak/lineak-xosdplugin-0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3feffdf7d2ad150a4e26a109f615009
diff --git a/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2 b/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2
index 8c31c895d175..431a90e952d4 100644
--- a/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2
+++ b/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Xosd plugin for LINEAK
 EAPI=7
 HOMEPAGE=http://lineak.sourceforge.net/
 IUSE=debug
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND==x11-misc/lineakd-0.9.0* x11-libs/xosd
 SLOT=0
 SRC_URI=mirror://sourceforge/lineak/lineak-xosdplugin-0.9.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=62c045c5e18715176c9da1bbb5e85f06
+_md5_=c868853ba95000a74defa163f9b71d15
diff --git a/metadata/md5-cache/x11-misc/lndir-1.0.3-r2 b/metadata/md5-cache/x11-misc/lndir-1.0.3-r2
index 85a8bc847dd8..ad5c2131fd55 100644
--- a/metadata/md5-cache/x11-misc/lndir-1.0.3-r2
+++ b/metadata/md5-cache/x11-misc/lndir-1.0.3-r2
@@ -7,5 +7,5 @@ HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/lndir
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
-SRC_URI=mirror://xorg/util/lndir-1.0.3.tar.bz2
-_md5_=f05c3357b634a50bd112992bb97da27e
+SRC_URI=https://www.x.org/releases/individual/util/lndir-1.0.3.tar.bz2
+_md5_=18677e4aac73af83dd65e6302deda5fe
diff --git a/metadata/md5-cache/x11-misc/lndir-9999 b/metadata/md5-cache/x11-misc/lndir-9999
index 430147b6d29d..942291dd85c2 100644
--- a/metadata/md5-cache/x11-misc/lndir-9999
+++ b/metadata/md5-cache/x11-misc/lndir-9999
@@ -8,4 +8,4 @@ LICENSE=MIT
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=b13289061fecc7fff23b4db84500c303
+_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 f3edda9cdbdd..70e48fa71d30 100644
--- a/metadata/md5-cache/x11-misc/macopix-1.7.4-r1
+++ b/metadata/md5-cache/x11-misc/macopix-1.7.4-r1
@@ -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	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bdaf54ec555d38691096985b29d02a5b
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 8843d929bc87..028d91c98151 100644
--- a/metadata/md5-cache/x11-misc/macopix-1.7.4-r2
+++ b/metadata/md5-cache/x11-misc/macopix-1.7.4-r2
@@ -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	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
 _md5_=ac6532cc4296b70979e4cf999e8e2055
diff --git a/metadata/md5-cache/x11-misc/makedepend-1.0.6 b/metadata/md5-cache/x11-misc/makedepend-1.0.6
index 24b6a9c68b39..2548fbdc9242 100644
--- a/metadata/md5-cache/x11-misc/makedepend-1.0.6
+++ b/metadata/md5-cache/x11-misc/makedepend-1.0.6
@@ -4,9 +4,9 @@ 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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
-_md5_=a668a5fcace9d785b302dc2e26c847be
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
+_md5_=b59fdeecf5ac96cb36d015b50783d660
diff --git a/metadata/md5-cache/x11-misc/menumaker-0.99.10 b/metadata/md5-cache/x11-misc/menumaker-0.99.10
index e437efb65249..bd4c0d051542 100644
--- a/metadata/md5-cache/x11-misc/menumaker-0.99.10
+++ b/metadata/md5-cache/x11-misc/menumaker-0.99.10
@@ -4,11 +4,11 @@ DESCRIPTION=Utility that scans through the system and generates a menu of instal
 EAPI=6
 HOMEPAGE=http://menumaker.sourceforge.net/
 IUSE=doc python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/menumaker/menumaker-0.99.10.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=c3afddeedcd02979ad9123e38a77e550
+_md5_=0996e7012755355030457d24fcdf76f2
diff --git a/metadata/md5-cache/x11-misc/menumaker-0.99.11 b/metadata/md5-cache/x11-misc/menumaker-0.99.11
index 0bf8b6a94c01..157c1a88dfb3 100644
--- a/metadata/md5-cache/x11-misc/menumaker-0.99.11
+++ b/metadata/md5-cache/x11-misc/menumaker-0.99.11
@@ -5,11 +5,11 @@ DESCRIPTION=Utility that scans through the system and generates a menu of instal
 EAPI=7
 HOMEPAGE=http://menumaker.sourceforge.net/
 IUSE=doc python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/menumaker/menumaker-0.99.11.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=137d8842e3340f0bd67437db0e28f477
+_md5_=0353cf8a2b3ce5155bd84bf83b626304
diff --git a/metadata/md5-cache/x11-misc/mugshot-0.4.2 b/metadata/md5-cache/x11-misc/mugshot-0.4.2
new file mode 100644
index 000000000000..f244af90785c
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/mugshot-0.4.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/gobject-introspection dev-python/dbus-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/accountsservice x11-libs/gtk+:3 gnome? ( gnome-base/gnome-control-center ) libreoffice? ( || ( app-office/libreoffice-bin app-office/libreoffice ) ) webcam? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 gnome? ( media-libs/clutter-gtk[introspection] media-video/cheese[introspection] ) ) dev-python/python-distutils-extra[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=A lightweight user-configuration application
+EAPI=7
+HOMEPAGE=https://github.com/bluesabre/mugshot
+IUSE=gnome libreoffice webcam python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/gobject-introspection dev-python/dbus-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/accountsservice x11-libs/gtk+:3 gnome? ( gnome-base/gnome-control-center ) libreoffice? ( || ( app-office/libreoffice-bin app-office/libreoffice ) ) webcam? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 gnome? ( media-libs/clutter-gtk[introspection] media-video/cheese[introspection] ) ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/bluesabre/mugshot/archive/mugshot-0.4.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e164fea6693f077afbeb0c6f0f56223d
diff --git a/metadata/md5-cache/x11-misc/netwmpager-2.05 b/metadata/md5-cache/x11-misc/netwmpager-2.05
index 7a0f35da8af6..89a94272c5e6 100644
--- a/metadata/md5-cache/x11-misc/netwmpager-2.05
+++ b/metadata/md5-cache/x11-misc/netwmpager-2.05
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXft x11-libs/libXdmcp x11
 DESCRIPTION=Pager that works with Openbox and other EWMH compliant window managers
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/sf-xpaint/files/netwmpager/
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXft x11-libs/libXdmcp x11-libs/libXau
 SLOT=0
 SRC_URI=mirror://sourceforge/sf-xpaint/netwmpager-2.05.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=cedd63d9de3374f4f0e09736b990f890
+_md5_=ed81ce794ea3e903444ec8d086cc67bd
diff --git a/metadata/md5-cache/x11-misc/nitrogen-1.6.1 b/metadata/md5-cache/x11-misc/nitrogen-1.6.1
index d22f7b7b748b..8f2d22d43e7a 100644
--- a/metadata/md5-cache/x11-misc/nitrogen-1.6.1
+++ b/metadata/md5-cache/x11-misc/nitrogen-1.6.1
@@ -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=http://projects.l3ib.org/nitrogen/files/nitrogen-1.6.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6b8bd72e3ebf5d87006790d253e81942
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 45bc43739fa3..6a8dbf98e514 100644
--- a/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
+++ b/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
@@ -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	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d664973ca7f1ca1116e5ff9b213d498
diff --git a/metadata/md5-cache/x11-misc/notification-daemon-3.14.1 b/metadata/md5-cache/x11-misc/notification-daemon-3.14.1
index ee02c5e559a3..5a1bf0311546 100644
--- a/metadata/md5-cache/x11-misc/notification-daemon-3.14.1
+++ b/metadata/md5-cache/x11-misc/notification-daemon-3.14.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.28 >=x11-libs/gtk+-3.8:3 sys-apps/dbus media-libs/libca
 DESCRIPTION=Notification daemon
 EAPI=5
 HOMEPAGE=https://gitlab.gnome.org/GNOME/notification-daemon/
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28 >=x11-libs/gtk+-3.8:3 sys-apps/dbus media-libs/libcanberra[gtk3] >=x11-libs/libnotify-0.7 x11-libs/libX11 !x11-misc/notify-osd !x11-misc/qtnotifydaemon
 SLOT=0
 SRC_URI=mirror://gnome/sources/notification-daemon/3.14/notification-daemon-3.14.1.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4177305082a8ac0b012f0d5adbb0de59
+_md5_=77e16b094fcdd2c34cf585d09d663595
diff --git a/metadata/md5-cache/x11-misc/notification-daemon-3.18.2 b/metadata/md5-cache/x11-misc/notification-daemon-3.18.2
index eafcf390c0db..ffd7e2796d3f 100644
--- a/metadata/md5-cache/x11-misc/notification-daemon-3.18.2
+++ b/metadata/md5-cache/x11-misc/notification-daemon-3.18.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.15.2:3[X] sys-apps/dbus x11-libs
 DESCRIPTION=Notification daemon
 EAPI=5
 HOMEPAGE=https://gitlab.gnome.org/GNOME/notification-daemon/
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.15.2: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.18/notification-daemon-3.18.2.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3c0099fd17e439b122e4689ea54ccfc4
+_md5_=1b668e507b3d3f89e21fffa53271e701
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 f63c874858c3..a91366dff78c 100644
--- a/metadata/md5-cache/x11-misc/notification-daemon-3.20.0
+++ b/metadata/md5-cache/x11-misc/notification-daemon-3.20.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.19.5:3[X] sys-apps/dbus x11-libs
 DESCRIPTION=Notification daemon
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/notification-daemon/
-KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 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	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=02790b8bea18f3d91e4672547e549e87
+_md5_=d4f3c2bc9f9f2af470f7173ea6bd58db
diff --git a/metadata/md5-cache/x11-misc/obconf-2.0.4 b/metadata/md5-cache/x11-misc/obconf-2.0.4
index 6acffd487462..736e06252ec7 100644
--- a/metadata/md5-cache/x11-misc/obconf-2.0.4
+++ b/metadata/md5-cache/x11-misc/obconf-2.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=ObConf is a tool for configuring the Openbox window manager
 EAPI=5
 HOMEPAGE=http://openbox.org/wiki/ObConf:About
 IUSE=nls
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.2
 SLOT=0
 SRC_URI=http://openbox.org/dist/obconf/obconf-2.0.4.tar.gz
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ef0b92bc90e1eed96a85db03a12a77a
+_md5_=e978c4243ff4c99a89ee3ebed38a30db
diff --git a/metadata/md5-cache/x11-misc/obconf-qt-0.14.1 b/metadata/md5-cache/x11-misc/obconf-qt-0.14.1
index b74417a6ddd9..08b1bcbade52 100644
--- a/metadata/md5-cache/x11-misc/obconf-qt-0.14.1
+++ b/metadata/md5-cache/x11-misc/obconf-qt-0.14.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/sed x11-wm/openbox:3 x11-libs/libX11 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/obconf-qt/0.14.1/obconf-qt-0.14.1.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb98bc35d3ebd157c28680da0b289251
diff --git a/metadata/md5-cache/x11-misc/obmenu-1.0-r1 b/metadata/md5-cache/x11-misc/obmenu-1.0-r1
index c4a314c68e56..b0a71df17795 100644
--- a/metadata/md5-cache/x11-misc/obmenu-1.0-r1
+++ b/metadata/md5-cache/x11-misc/obmenu-1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Menu editor designed for openbox
 EAPI=5
 HOMEPAGE=http://obmenu.sourceforge.net/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/pygtk python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/obmenu/obmenu-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b548a73f1fd3ace30cc564232d134213
+_md5_=454436fb177bdbcbfc74af903f1c993c
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.14.1-r1 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.14.1-r1
index 2a8bbda59aa7..b2816d244ac1 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.14.1-r1
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.14.1-r1
@@ -9,5 +9,5 @@ LICENSE=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.14* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/pcmanfm-qt/0.14.1/pcmanfm-qt-0.14.1.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66381aeaf56a2545e8a69a74b4966f14
diff --git a/metadata/md5-cache/x11-misc/polybar-3.2.1 b/metadata/md5-cache/x11-misc/polybar-3.2.1
index 600aa0c78ae2..aab150261549 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.2.1
+++ b/metadata/md5-cache/x11-misc/polybar-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/jaagr/polybar/archive/3.2.1.tar.gz -> polybar-3.2.1.tar.gz https://github.com/jaagr/xpp/archive/1.4.0.tar.gz -> xpp-1.4.0.tar.gz https://github.com/jaagr/i3ipcpp/archive/v0.7.1.tar.gz -> i3ipcpp-0.7.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0db069149d2b088873d675b79804a78
diff --git a/metadata/md5-cache/x11-misc/polybar-3.3.1 b/metadata/md5-cache/x11-misc/polybar-3.3.1
index 564ac45aa240..ca3697b80877 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.3.1
+++ b/metadata/md5-cache/x11-misc/polybar-3.3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/jaagr/polybar/archive/3.3.1.tar.gz -> polybar-3.3.1.tar.gz https://github.com/jaagr/xpp/archive/1.4.0.tar.gz -> xpp-1.4.0.tar.gz https://github.com/jaagr/i3ipcpp/archive/v0.7.1.tar.gz -> i3ipcpp-0.7.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=350edf5400d8d7d9c3b0e99415c50832
diff --git a/metadata/md5-cache/x11-misc/polybar-9999 b/metadata/md5-cache/x11-misc/polybar-9999
index 666929b0909b..1fff67e798b5 100644
--- a/metadata/md5-cache/x11-misc/polybar-9999
+++ b/metadata/md5-cache/x11-misc/polybar-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo[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 ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2c9eb6b7240b45ec8151164bad83942
diff --git a/metadata/md5-cache/x11-misc/py3status-3.19 b/metadata/md5-cache/x11-misc/py3status-3.21
index 2908cfb593cd..95c44bd24ca8 100644
--- a/metadata/md5-cache/x11-misc/py3status-3.19
+++ b/metadata/md5-cache/x11-misc/py3status-3.21
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=x11-misc/i3status gevent? ( >=dev-python/gevent-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) udev? ( >=dev-python/pyudev-0.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-SRC_URI=https://github.com/ultrabug/py3status/archive/3.19.tar.gz -> py3status-3.19.tar.gz
+SRC_URI=https://github.com/ultrabug/py3status/archive/3.21.tar.gz -> py3status-3.21.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c700f45a7eca1eee07a6c1a1a34be35
diff --git a/metadata/md5-cache/x11-misc/qcomicbook-0.9.1 b/metadata/md5-cache/x11-misc/qcomicbook-0.9.1
index 74d60177b710..eefc0321de61 100644
--- a/metadata/md5-cache/x11-misc/qcomicbook-0.9.1
+++ b/metadata/md5-cache/x11-misc/qcomicbook-0.9.1
@@ -9,5 +9,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-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b9833b5886de6ba2eb5ae99486f99d3
diff --git a/metadata/md5-cache/x11-misc/qlipper-5.0.0 b/metadata/md5-cache/x11-misc/qlipper-5.0.0
index ac7a67b08106..97bd21dc1cc7 100644
--- a/metadata/md5-cache/x11-misc/qlipper-5.0.0
+++ b/metadata/md5-cache/x11-misc/qlipper-5.0.0
@@ -8,5 +8,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.0.0.tar.gz -> qlipper-5.0.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83ba9e761ffecb2c75c0a65c4d0be276
diff --git a/metadata/md5-cache/x11-misc/qlipper-5.1.2 b/metadata/md5-cache/x11-misc/qlipper-5.1.2
index c6d7638b452d..e22132cf9841 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-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=69e068ce9cc19dd7bdbca4bc43dbe120
diff --git a/metadata/md5-cache/x11-misc/qps-1.10.20 b/metadata/md5-cache/x11-misc/qps-1.10.20
index 72f4693d2ce5..3ce755a9996a 100644
--- a/metadata/md5-cache/x11-misc/qps-1.10.20
+++ b/metadata/md5-cache/x11-misc/qps-1.10.20
@@ -10,5 +10,5 @@ LICENSE=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
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/qps/1.10.20/qps-1.10.20.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1cc84df98458234d9e21329a048bf8b
diff --git a/metadata/md5-cache/x11-misc/qterm-0.7.1 b/metadata/md5-cache/x11-misc/qterm-0.7.1
index 87b9250a7efe..1b29bebf32b4 100644
--- a/metadata/md5-cache/x11-misc/qterm-0.7.1
+++ b/metadata/md5-cache/x11-misc/qterm-0.7.1
@@ -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.1.tar.gz -> qterm-0.7.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	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 3ac9dcc8a92c..6dfe745f10cd 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	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a860919959e2e320ef912563bb8eaba
diff --git a/metadata/md5-cache/x11-misc/qtfm-99999 b/metadata/md5-cache/x11-misc/qtfm-99999
index a98e0d20eaf2..fcc303008925 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? ( virtual/ffmpeg ) imagemagick? ( >=media-gfx/imagemagick-7:= )
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=30ba2b56d8187250c6bb807a2bfd3b0f
diff --git a/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20150305 b/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20150305
index f2c3427ba111..ebac9e6f539c 100644
--- a/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20150305
+++ b/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20150305
@@ -8,5 +8,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
 SLOT=0
 SRC_URI=https://github.com/disels/qxkb/archive/d7474a06055108c833bbb55b6cdef47e0edfb17d.tar.gz -> qxkb-0.5.1_pre20150305.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3ebbfa81d7784d6a09053aba2025aac
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 ff543fe8b131..801b22b8c090 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	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d20c5e357dac0e628e8aad2ffe92c8bc
diff --git a/metadata/md5-cache/x11-misc/rendercheck-1.5-r1 b/metadata/md5-cache/x11-misc/rendercheck-1.5-r1
index dc855ebe633f..67a288709769 100644
--- a/metadata/md5-cache/x11-misc/rendercheck-1.5-r1
+++ b/metadata/md5-cache/x11-misc/rendercheck-1.5-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXrender x11-libs/libX11
 SLOT=0
-SRC_URI=mirror://xorg/app/rendercheck-1.5.tar.bz2
-_md5_=4ea92bc4db3f1fcb428bc6c2a9157e71
+SRC_URI=https://www.x.org/releases/individual/app/rendercheck-1.5.tar.bz2
+_md5_=0c63225330a1d41a1d9719763449f93c
diff --git a/metadata/md5-cache/x11-misc/screengrab-1.101 b/metadata/md5-cache/x11-misc/screengrab-1.101
index 29d8b5f5cff7..fc2fc0dd7684 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-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ba27a468fd38ac9b5a7bfdc7cbd950b
diff --git a/metadata/md5-cache/x11-misc/sddm-0.15.0 b/metadata/md5-cache/x11-misc/sddm-0.15.0
index f39b3a47feb1..3b024f265e63 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	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bc8affc071a210e835e8bf7d6e3b76bb
diff --git a/metadata/md5-cache/x11-misc/sddm-0.18.1-r1 b/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
index 65258e7c748f..ab69d2b4dbd5 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
+++ b/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f2c6d2c350fbfe6e6c9ccaab0aa2528
diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-1.10 b/metadata/md5-cache/x11-misc/shared-mime-info-1.10
index 36fe0a0ff8c2..a4bbd72de71f 100644
--- a/metadata/md5-cache/x11-misc/shared-mime-info-1.10
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-1.10
@@ -4,10 +4,10 @@ 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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hadess/shared-mime-info-1.10.tar.xz
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e389ec11b47880475a3b03dfe1403775
+_md5_=5816e8342d45efbad08ca2cfc51425da
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 8a9a769398f2..9c1d0e92b6f7 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,10 +4,10 @@ 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hadess/shared-mime-info-1.10.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4636b33ad75b942974fcdac8cb89c57d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3dcc2d21d15e66cecd2d41f29d0b919a
diff --git a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202 b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202
index 2255b0b54280..5025e6eea5ae 100644
--- a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202
+++ b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202
@@ -8,5 +8,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a29ea01a6d40025423779fb9b3b32e40
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 a650afe08568..a8b32318900d 100644
--- a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1
+++ b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1
@@ -8,5 +8,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_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
 _md5_=23da58f4eea0cd282c1f4ac8c2fdda75
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 ce64c7880f39..185b5dfb79c6 100644
--- a/metadata/md5-cache/x11-misc/slim-1.3.6-r5
+++ b/metadata/md5-cache/x11-misc/slim-1.3.6-r5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( virtual/pam !x11-misc/slimlock ) virtual/pkgconfig x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( sys-libs/pam !x11-misc/slimlock ) virtual/pkgconfig x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
 DESCRIPTION=Simple Login Manager
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/slim.berlios/
 IUSE=branding pam consolekit
-KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 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 consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( virtual/pam !x11-misc/slimlock )
+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 consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( sys-libs/pam !x11-misc/slimlock )
 REQUIRED_USE=consolekit? ( pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/slim.berlios/slim-1.3.6.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3529c87225efc8e44ccd178e62047a36
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=76f7988993b8b80fa3a613d8f3187b66
diff --git a/metadata/md5-cache/x11-misc/slim-9999 b/metadata/md5-cache/x11-misc/slim-9999
index 03e08bf39ca8..d61c857e4e3d 100644
--- a/metadata/md5-cache/x11-misc/slim-9999
+++ b/metadata/md5-cache/x11-misc/slim-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( virtual/pam !x11-misc/slimlock ) virtual/pkgconfig x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( sys-libs/pam !x11-misc/slimlock ) virtual/pkgconfig x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Simple Login Manager
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/slim.berlios/
@@ -7,8 +7,8 @@ IUSE=branding pam consolekit
 LICENSE=GPL-2
 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 consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( virtual/pam !x11-misc/slimlock )
+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 consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( sys-libs/pam !x11-misc/slimlock )
 REQUIRED_USE=consolekit? ( pam )
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2814e2646efe038cc45335ae712813cb
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d65263a733e128936b62bdaa0e583730
diff --git a/metadata/md5-cache/x11-misc/slock-1.4 b/metadata/md5-cache/x11-misc/slock-1.4
index 610f1d86d1c0..90cc732e75b6 100644
--- a/metadata/md5-cache/x11-misc/slock-1.4
+++ b/metadata/md5-cache/x11-misc/slock-1.4
@@ -4,10 +4,10 @@ DESCRIPTION=simple X display locker
 EAPI=6
 HOMEPAGE=https://tools.suckless.org/slock
 IUSE=+filecaps savedconfig
-KEYWORDS=amd64 hppa x86 ~x86-fbsd
+KEYWORDS=amd64 hppa x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/slock-1.4.tar.gz
 _eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	356fd0a7591e9b51742c209d13b729e1	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=3ea5dbf0746e2505d191b9b5eb1f17d1
+_md5_=f6d38704c26d0648e1c04173ff9ece20
diff --git a/metadata/md5-cache/x11-misc/slop-7.4 b/metadata/md5-cache/x11-misc/slop-7.4
index d68e8fe08ddf..435865ba92d0 100644
--- a/metadata/md5-cache/x11-misc/slop-7.4
+++ b/metadata/md5-cache/x11-misc/slop-7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= x11-libs/libX11 x11-libs/libXext opengl? ( media-libs/glew:0= virtual/opengl x11-libs/libXrender:= )
 SLOT=0/7.4
 SRC_URI=https://github.com/naelstrof/slop/archive/v7.4.tar.gz -> slop-7.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c96423ad29497d25757026c33e290803
diff --git a/metadata/md5-cache/x11-misc/slop-9999 b/metadata/md5-cache/x11-misc/slop-9999
index 934073114d12..eae37d4f0c45 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= virtual/opengl x11-libs/libXrender:= )
 SLOT=0/9999
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d99ad9b5026ef8057bbd14bcc6b1b27
diff --git a/metadata/md5-cache/x11-misc/synergy-1.9.1 b/metadata/md5-cache/x11-misc/synergy-1.9.1
index b4f8e7672d59..9e9b62e76f08 100644
--- a/metadata/md5-cache/x11-misc/synergy-1.9.1
+++ b/metadata/md5-cache/x11-misc/synergy-1.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=Lets you easily share a single mouse and keyboard between multiple c
 EAPI=6
 HOMEPAGE=https://symless.com/synergy https://github.com/symless/synergy-core
 IUSE=libressl qt5
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) net-misc/curl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-dns/avahi[mdnsresponder-compat] ) qt5? ( !x11-misc/qsynergy )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/symless/synergy-core/archive/v1.9.1-stable.tar.gz -> synergy-1.9.1.tar.gz https://dev.gentoo.org/~jer/synergy.png
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cfa994197f70103ada67189c247a6c4b
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e5354c394dc5a309333a66cc137a314f
diff --git a/metadata/md5-cache/x11-misc/synergy-2.0.0 b/metadata/md5-cache/x11-misc/synergy-2.0.0
index 1e108430232b..ff7f9855d7b5 100644
--- a/metadata/md5-cache/x11-misc/synergy-2.0.0
+++ b/metadata/md5-cache/x11-misc/synergy-2.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lets you easily share a single mouse and keyboard between multiple c
 EAPI=6
 HOMEPAGE=http://synergy-project.org/ https://github.com/symless/synergy-core
 IUSE=libressl
-KEYWORDS=~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=net-misc/curl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= )
 SLOT=0
 SRC_URI=https://github.com/symless/synergy-core/archive/v2.0.0-stable.tar.gz -> synergy-2.0.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef22fee11dce4a1173bdb83fa1faa292
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0d16d3d2df2580612399b23563b13e03
diff --git a/metadata/md5-cache/x11-misc/tint2-16.2 b/metadata/md5-cache/x11-misc/tint2-16.2
index bd6a9234c9a8..fc555adfaec4 100644
--- a/metadata/md5-cache/x11-misc/tint2-16.2
+++ b/metadata/md5-cache/x11-misc/tint2-16.2
@@ -9,5 +9,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/repository/archive.tar.gz?ref=v16.2 -> tint2-16.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1544e3aeb85ab8f293a681a512c7dbce
diff --git a/metadata/md5-cache/x11-misc/tint2-16.6 b/metadata/md5-cache/x11-misc/tint2-16.6
index 0215dd60e199..2585a3ff4ab7 100644
--- a/metadata/md5-cache/x11-misc/tint2-16.6
+++ b/metadata/md5-cache/x11-misc/tint2-16.6
@@ -9,5 +9,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/repository/archive.tar.gz?ref=v16.6 -> tint2-16.6.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c87cc75dac135e32465e288db0a056c2
diff --git a/metadata/md5-cache/x11-misc/tint2-16.6.1 b/metadata/md5-cache/x11-misc/tint2-16.6.1
index c4793d5f335c..aeb250fe05a5 100644
--- a/metadata/md5-cache/x11-misc/tint2-16.6.1
+++ b/metadata/md5-cache/x11-misc/tint2-16.6.1
@@ -9,5 +9,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/repository/archive.tar.gz?ref=v16.6.1 -> tint2-16.6.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07bb5aa504319570acc5b968978abc2a
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.19.2-r1 b/metadata/md5-cache/x11-misc/util-macros-1.19.2-r1
index 81bd0d564054..268254aaaa6b 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.19.2-r1
+++ b/metadata/md5-cache/x11-misc/util-macros-1.19.2-r1
@@ -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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
-SRC_URI=mirror://xorg/util/util-macros-1.19.2.tar.bz2
-_md5_=454bd97e603ef372e5a31e3a4e8ef510
+SRC_URI=https://www.x.org/releases/individual/util/util-macros-1.19.2.tar.bz2
+_md5_=415e33f5e5ed8e0fd6c1637127901220
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.5.2-r1 b/metadata/md5-cache/x11-misc/virtualgl-2.5.2-r1
index e898d0ec81cf..9e94deaa22b5 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.5.2-r1
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.5.2-r1
@@ -9,5 +9,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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/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
 SRC_URI=mirror://sourceforge/virtualgl/files/2.5.2/VirtualGL-2.5.2.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a979752a39f2d04ba0a8b6190e6ea81
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.6.1 b/metadata/md5-cache/x11-misc/virtualgl-2.6.1
index d3a87bac27fe..377cff84214f 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.6.1
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.6.1
@@ -9,5 +9,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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/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
 SRC_URI=mirror://sourceforge/project/virtualgl/2.6.1/VirtualGL-2.6.1.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd281c7059d7200e06edbea414d4ede3
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.6.1-r1 b/metadata/md5-cache/x11-misc/virtualgl-2.6.1-r1
index 4884970f44df..b5671cb02a37 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.6.1-r1
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.6.1-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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
 SRC_URI=mirror://sourceforge/project/virtualgl/2.6.1/VirtualGL-2.6.1.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3381bb366554efe598629c3404ece83e
diff --git a/metadata/md5-cache/x11-misc/virtualgl-9999 b/metadata/md5-cache/x11-misc/virtualgl-9999
index d88e51782a72..95207f003797 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3381bb366554efe598629c3404ece83e
diff --git a/metadata/md5-cache/x11-misc/wdm-1.28-r4 b/metadata/md5-cache/x11-misc/wdm-1.28-r4
index f80f36a5ea69..2ad8d50d92a2 100644
--- a/metadata/md5-cache/x11-misc/wdm-1.28-r4
+++ b/metadata/md5-cache/x11-misc/wdm-1.28-r4
@@ -1,13 +1,13 @@
 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? ( virtual/pam ) sys-devel/gettext
+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? ( virtual/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
+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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b22680f59caed48dbb2f38a20dad7e6a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b18d566cd82d002177510bc877478afd
diff --git a/metadata/md5-cache/x11-misc/wdm-1.28-r5 b/metadata/md5-cache/x11-misc/wdm-1.28-r5
index 3ebfa418fdd8..4b1205200927 100644
--- a/metadata/md5-cache/x11-misc/wdm-1.28-r5
+++ b/metadata/md5-cache/x11-misc/wdm-1.28-r5
@@ -1,14 +1,14 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=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? ( virtual/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 ) sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=WINGs Display Manager
 EAPI=7
 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 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pam? ( virtual/pam ) truetype? ( x11-libs/libXft ) pam? ( >=sys-auth/pambase-20080219.1 )
+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	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=a4340aa18c2caebae274ed917b88330d
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=18da177dab38f6fc898202a9a02d81ad
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r2 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r2
index b03a459afa8e..b462cec39463 100644
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r2
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r2
@@ -5,10 +5,10 @@ DESCRIPTION=VNC server for real X displays
 EAPI=7
 HOMEPAGE=https://libvnc.github.io/
 IUSE=crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libvncserver-0.9.8[ssl] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 !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	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=27a2d7551d2b77d6caba4787eb616bc8
+_md5_=1b8ba6db9b5ceba3aee90d79c4349632
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r3 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r3
index b045320364b1..6115913898be 100644
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r3
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r3
@@ -5,10 +5,10 @@ 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 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=fd4fc0c75adc58844c51f2feb20097fb
+_md5_=300dee8425e8a38c128e5ba71b3d98c8
diff --git a/metadata/md5-cache/x11-misc/xbattbar-1.4.8 b/metadata/md5-cache/x11-misc/xbattbar-1.4.8
index 2be7fcb1ad57..c40c146c7a49 100644
--- a/metadata/md5-cache/x11-misc/xbattbar-1.4.8
+++ b/metadata/md5-cache/x11-misc/xbattbar-1.4.8
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl x11-libs/libX11 python_targets_python2_7? ( >=dev-lang/pyt
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xbattbar/xbattbar_1.4.8.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8eabe25b82b7599a86d093d95f0e3426
diff --git a/metadata/md5-cache/x11-misc/xbindkeys-1.8.6 b/metadata/md5-cache/x11-misc/xbindkeys-1.8.6
index cab1e84202a4..234495b3891d 100644
--- a/metadata/md5-cache/x11-misc/xbindkeys-1.8.6
+++ b/metadata/md5-cache/x11-misc/xbindkeys-1.8.6
@@ -4,9 +4,9 @@ DESCRIPTION=Tool for launching commands on keystrokes
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/xbindkeys/xbindkeys.html
 IUSE=guile tk
-KEYWORDS=amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 guile? ( >=dev-scheme/guile-1.8.4[deprecated] ) tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=http://www.nongnu.org/xbindkeys/xbindkeys-1.8.6.tar.gz
-_md5_=1cb6d5c9e6739b04b7a6d178aade6c20
+_md5_=a771d40487ce8d13353407562deb5fb0
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 b28320597223..d4a4ad499d68 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 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
-SRC_URI=mirror://xorg/data/xbitmaps-1.1.2.tar.bz2
-_md5_=883b835e9293076d4da8a0078e80422b
+SRC_URI=https://www.x.org/releases/individual/data/xbitmaps-1.1.2.tar.bz2
+_md5_=309bde16e567cf3f23ca28a9dc3ea18f
diff --git a/metadata/md5-cache/x11-misc/xcalendar-4.0-r2 b/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
index 1af7490722f1..63045a14eb0a 100644
--- a/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
+++ b/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A simple interactive calendar program with a notebook capability
 EAPI=6
 HOMEPAGE=http://www.freebsd.org/
 IUSE=motif
-KEYWORDS=alpha amd64 ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ppc ppc64 x86
 LICENSE=HPND
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext
 SLOT=0
 SRC_URI=ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/xcalendar-4.0+i18n.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=98e4870eb40156a2330395cb8e738a4d
+_md5_=c46f6f4c3edbec6e995f8cfbc8851f2e
diff --git a/metadata/md5-cache/x11-misc/xcalib-0.10 b/metadata/md5-cache/x11-misc/xcalib-0.10
index 45686b6721c8..d7096bfc0579 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-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e58941bf1f6fc0ee545ab31c4ed531a0
diff --git a/metadata/md5-cache/x11-misc/xclip-0.13 b/metadata/md5-cache/x11-misc/xclip-0.13
index 157dc6b0a897..6413b61a0bea 100644
--- a/metadata/md5-cache/x11-misc/xclip-0.13
+++ b/metadata/md5-cache/x11-misc/xclip-0.13
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt >=app-portage/elt-patches-
 DESCRIPTION=Copy data from standard input to X clipboard
 EAPI=6
 HOMEPAGE=https://github.com/astrand/xclip
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 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	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=4a565b7c0a2d5c2b1788b5a0563bb408
+_md5_=70a187b6525df1f0cde6083f39a2451d
diff --git a/metadata/md5-cache/x11-misc/xcompmgr-1.1.8 b/metadata/md5-cache/x11-misc/xcompmgr-1.1.8
index edf556163444..23d6dbba9859 100644
--- a/metadata/md5-cache/x11-misc/xcompmgr-1.1.8
+++ b/metadata/md5-cache/x11-misc/xcompmgr-1.1.8
@@ -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	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=2ee2c686fe2df2cca0c3b2ac08012c47
diff --git a/metadata/md5-cache/x11-misc/xdaliclock-2.43 b/metadata/md5-cache/x11-misc/xdaliclock-2.43
index 8db968d91d1c..4751c93335b5 100644
--- a/metadata/md5-cache/x11-misc/xdaliclock-2.43
+++ b/metadata/md5-cache/x11-misc/xdaliclock-2.43
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-base/xorg-proto
 DESCRIPTION=Dali Clock is a digital clock. When a digit changes, it melts into its new shape
 EAPI=5
 HOMEPAGE=http://www.jwz.org/xdaliclock
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=http://www.jwz.org/xdaliclock/xdaliclock-2.43.tar.gz
-_md5_=6a483acc050d3d7b890dc185c9a2a132
+_md5_=6fb58ae759599433789490a33d2a339c
diff --git a/metadata/md5-cache/x11-misc/xdaliclock-2.44 b/metadata/md5-cache/x11-misc/xdaliclock-2.44
index 8963fed6f8c5..13f63bc6f74f 100644
--- a/metadata/md5-cache/x11-misc/xdaliclock-2.44
+++ b/metadata/md5-cache/x11-misc/xdaliclock-2.44
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-base/xorg-proto
 DESCRIPTION=Dali Clock is a digital clock. When a digit changes, it melts into its new shape
 EAPI=7
 HOMEPAGE=https://www.jwz.org/xdaliclock
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=https://www.jwz.org/xdaliclock/xdaliclock-2.44.tar.gz
-_md5_=6f4283ff775eecfec08b419eb5950a99
+_md5_=49f20b283be60df01999ad9df9694a9c
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 029a9142f471..4c8c74906e9b 100644
--- a/metadata/md5-cache/x11-misc/xdg-user-dirs-0.17
+++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-0.17
@@ -4,10 +4,10 @@ DESCRIPTION=Tool to help manage 'well known' user directories
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-user-dirs
 IUSE=gtk
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 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	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=25e6a69e4388178bf3094ea02d39cdfa
+_md5_=bd77615e9b867f97bcb4a12d339d815c
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 eeb64c2b0847..8d366484fda1 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
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib >=x11-misc/xdg-user-dirs-0.14 >=x11-libs/gtk+-3.5.1:3 dev-u
 DESCRIPTION=Integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-user-dirs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib >=x11-misc/xdg-user-dirs-0.14 >=x11-libs/gtk+-3.5.1:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/xdg-user-dirs-gtk/0.10/xdg-user-dirs-gtk-0.10.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=156938db605e61dccf6e470f4c8635c0
+_md5_=0bd89652152dd7f04af6da10dabbdee9
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.1-r1 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.1-r1
index 840afd65fa13..c87d25008532 100644
--- a/metadata/md5-cache/x11-misc/xdg-utils-1.1.1-r1
+++ b/metadata/md5-cache/x11-misc/xdg-utils-1.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop intero
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-utils/
 IUSE=doc +perl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=MIT
 RDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info x11-apps/xprop x11-apps/xset perl? ( dev-perl/File-MimeInfo )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://portland.freedesktop.org/download/xdg-utils-1.1.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=6f743d63f1ec1593f124fa668cd12ad8
+_md5_=fe5e5451e7356e150db8af8e530473c4
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
index e89d3397061e..334e6ae912bf 100644
--- a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3-r1
+++ b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop intero
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-utils/
 IUSE=doc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
 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	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=74c05da63e1fb832ee5843e7da9a27e0
+_md5_=968324f897150fd4d2b1a740e36e0665
diff --git a/metadata/md5-cache/x11-misc/xdiskusage-1.51 b/metadata/md5-cache/x11-misc/xdiskusage-1.51
index df22dfcab887..67a699be1423 100644
--- a/metadata/md5-cache/x11-misc/xdiskusage-1.51
+++ b/metadata/md5-cache/x11-misc/xdiskusage-1.51
@@ -3,9 +3,9 @@ DEPEND=>=x11-libs/fltk-1.3:1
 DESCRIPTION=user-friendly program to show you what is using up all your disk space
 EAPI=6
 HOMEPAGE=http://xdiskusage.sourceforge.net/
-KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/fltk-1.3:1
 SLOT=0
 SRC_URI=http://xdiskusage.sourceforge.net/xdiskusage-1.51.tgz
-_md5_=56b57769af8271bc3f60f0c5e786e7a8
+_md5_=ade781c918ccd6d584a705473781f77d
diff --git a/metadata/md5-cache/x11-misc/xdotool-3.20150503.1-r1 b/metadata/md5-cache/x11-misc/xdotool-3.20150503.1-r1
index 798e6b4829e0..d22282a2cf82 100644
--- a/metadata/md5-cache/x11-misc/xdotool-3.20150503.1-r1
+++ b/metadata/md5-cache/x11-misc/xdotool-3.20150503.1-r1
@@ -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.20150503.1/xdotool-3.20150503.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56d4f54c802f1bde1d156e1eead8b50f
diff --git a/metadata/md5-cache/x11-misc/xdotool-3.20160805.1 b/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
index a5854524e638..9adfd7ad9b09 100644
--- a/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
+++ b/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
@@ -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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a313e774f523b5cee146ef19957a813b
diff --git a/metadata/md5-cache/x11-misc/xflux-20170103 b/metadata/md5-cache/x11-misc/xflux-20170103
index 2a4af36cf34f..bdb44aed6e48 100644
--- a/metadata/md5-cache/x11-misc/xflux-20170103
+++ b/metadata/md5-cache/x11-misc/xflux-20170103
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Makes the color of your computer's display adapt to the time of the day
 EAPI=7
 HOMEPAGE=https://justgetflux.com/
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=f.lux
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXxf86vm
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://justgetflux.com/linux/xflux12.tgz -> xflux12-20170103.tar.gz
-_md5_=0550d4561e0e09a82b644d41c94fa004
+_md5_=25191caefe31f3154253acb5821abceb
diff --git a/metadata/md5-cache/x11-misc/xflux-gui-1.1.10_p20180910 b/metadata/md5-cache/x11-misc/xflux-gui-1.1.10_p20180910
deleted file mode 100644
index bc1ea79f367e..000000000000
--- a/metadata/md5-cache/x11-misc/xflux-gui-1.1.10_p20180910
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A GUI for f.lux
-EAPI=6
-HOMEPAGE=https://justgetflux.com/
-IUSE=python_targets_python2_7
-KEYWORDS=-* amd64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/libappindicator:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gconf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/libglade x11-libs/libXxf86vm x11-misc/xflux python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/xflux-gui/fluxgui/archive/a3b55da976053fc978b29d191db52dfb8da2f8ee.tar.gz -> fluxgui-a3b55da976053fc978b29d191db52dfb8da2f8ee.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbbe228dd20252740b6af19e99e26b7a
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 ec08b1294cbb..4000f92a2031 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
@@ -4,11 +4,11 @@ DESCRIPTION=A GUI for f.lux
 EAPI=7
 HOMEPAGE=https://justgetflux.com/
 IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/libappindicator:3 dev-python/pexpect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/libXxf86vm x11-misc/xflux python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 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	9838160d624a44b2d56d1266a69fd473	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1620a986ed9a810820d03085601b2edf
+_md5_=881ba822a2467638d64384714cc8680f
diff --git a/metadata/md5-cache/x11-misc/xiccd-0.2.4 b/metadata/md5-cache/x11-misc/xiccd-0.2.4
deleted file mode 100644
index 79994ccd90dc..000000000000
--- a/metadata/md5-cache/x11-misc/xiccd-0.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=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
-EAPI=7
-HOMEPAGE=https://github.com/agalakhov/xiccd
-KEYWORDS=~amd64
-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.2.4.tar.gz -> xiccd-0.2.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=4a2da7e205eaf01831a9acad30c4d51c
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.27 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.27
index 4cf18e50e5a7..dc3b2e1ae413 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.27
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.27
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure prepare
 DESCRIPTION=X keyboard configuration database
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<x11-apps/xkbcomp-1.2.3 !<x11-libs/libX11-1.4.3
 SLOT=0
-SRC_URI=mirror://xorg/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2
-_md5_=c556bdcdbc80bb44bf013fe69aae20ef
+SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2
+_md5_=8d79505ed0b4a3f532fa4e21710a5ae0
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-9999 b/metadata/md5-cache/x11-misc/xkeyboard-config-9999
index d42068b97905..d97956804ea1 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-9999
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=!<x11-apps/xkbcomp-1.2.3 !<x11-libs/libX11-1.4.3
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=6fb7e18e3b92eb0a4b63104719d628c2
+_md5_=4244daa1f8c121d2229941f54790cac5
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.50 b/metadata/md5-cache/x11-misc/xlockmore-5.50
index 3615db8846ee..33fe45d8c643 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.50
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.50
@@ -1,14 +1,14 @@
 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? ( virtual/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/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+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/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Just another screensaver application for X
 EAPI=6
 HOMEPAGE=http://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? ( virtual/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 )
+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=http://www.sillycycle.com/xlock/xlockmore-5.50.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=864334a13100216b616b6e8ac8600e54
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=921af149a0e3f385840f1e8209eb778c
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.58 b/metadata/md5-cache/x11-misc/xlockmore-5.58
index dfa417e36292..78df66129098 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.58
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.58
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare unpack
-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? ( virtual/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
+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=http://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? ( virtual/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 )
+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=http://www.sillycycle.com/xlock/xlockmore-5.58.tar.xz https://dev.gentoo.org/~jer/ax_pthread.m4.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=0b6229122b714ef6357256e5b1ecacb5
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=d2a25ec943edff0bddb95db8a26bd4b6
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.57 b/metadata/md5-cache/x11-misc/xlockmore-5.59
index 4424fce663c1..76acce6b998a 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.57
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.59
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare unpack
-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? ( virtual/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
+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=http://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? ( virtual/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 )
+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=http://www.sillycycle.com/xlock/xlockmore-5.57.tar.xz https://dev.gentoo.org/~jer/ax_pthread.m4.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=0b6229122b714ef6357256e5b1ecacb5
+SRC_URI=http://www.sillycycle.com/xlock/xlockmore-5.59.tar.xz https://dev.gentoo.org/~jer/ax_pthread.m4.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=572a10d44f428395f2b698d139cfa5e5
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.59_alpha4 b/metadata/md5-cache/x11-misc/xlockmore-5.59_alpha4
deleted file mode 100644
index aad69b9afbbd..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.59_alpha4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare unpack
-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? ( virtual/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=http://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? ( virtual/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=http://www.sillycycle.com/xlock/xlockmore-5.59ALPHA4.tar.xz https://dev.gentoo.org/~jer/ax_pthread.m4.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=0b6229122b714ef6357256e5b1ecacb5
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.24.2 b/metadata/md5-cache/x11-misc/xmobar-0.24.2
index b4e17c2712f9..0b66450de77f 100644
--- a/metadata/md5-cache/x11-misc/xmobar-0.24.2
+++ b/metadata/md5-cache/x11-misc/xmobar-0.24.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= dev-haskell/transformers:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.4.1:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >dev-haskell/alsa-mixer-0.2.0.2:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) with_conduit? ( dev-haskell/http-conduit:= dev-haskell/http-types:= ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm ) >=dev-haskell/cabal-1.6
+DEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= dev-haskell/transformers:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.4.1:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >dev-haskell/alsa-mixer-0.2.0.2:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) conduit? ( dev-haskell/http-conduit:= dev-haskell/http-types:= ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm ) >=dev-haskell/cabal-1.6
 DESCRIPTION=A Minimalistic Text Based Status Bar
 EAPI=6
 HOMEPAGE=http://xmobar.org
-IUSE=alsa dbus inotify mpd mpris timezone wifi with_conduit with_uvmeter xft xpm
+IUSE=alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= dev-haskell/transformers:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.4.1:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >dev-haskell/alsa-mixer-0.2.0.2:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) with_conduit? ( dev-haskell/http-conduit:= dev-haskell/http-types:= ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm )
+RDEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= dev-haskell/transformers:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.4.1:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >dev-haskell/alsa-mixer-0.2.0.2:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) conduit? ( dev-haskell/http-conduit:= dev-haskell/http-types:= ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xmobar/0.24.2/xmobar-0.24.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0773382fb609d57d6cb7529e42a53861
+_md5_=21d096e1561027072ad1d1499dbcbb79
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.24.3 b/metadata/md5-cache/x11-misc/xmobar-0.24.3
index 967a47a9ce3c..33f92ee18911 100644
--- a/metadata/md5-cache/x11-misc/xmobar-0.24.3
+++ b/metadata/md5-cache/x11-misc/xmobar-0.24.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.8.2:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >dev-haskell/alsa-mixer-0.2.0.2:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) with_conduit? ( dev-haskell/http-conduit:= dev-haskell/http-types:= ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm ) >=dev-haskell/cabal-1.18.1.3
+DEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.8.2:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >dev-haskell/alsa-mixer-0.2.0.2:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) conduit? ( dev-haskell/http-conduit:= dev-haskell/http-types:= ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm ) >=dev-haskell/cabal-1.18.1.3
 DESCRIPTION=A Minimalistic Text Based Status Bar
 EAPI=6
 HOMEPAGE=http://xmobar.org
-IUSE=alsa dbus inotify mpd mpris timezone wifi with_conduit with_uvmeter xft xpm
+IUSE=alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.8.2:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >dev-haskell/alsa-mixer-0.2.0.2:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) with_conduit? ( dev-haskell/http-conduit:= dev-haskell/http-types:= ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm )
+RDEPEND=>=dev-haskell/http-4000.2.4:= >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= dev-haskell/old-locale:= >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= dev-haskell/regex-compat:= >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= >=dev-haskell/x11-1.6.1:= >=dev-lang/ghc-7.8.2:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= >dev-haskell/alsa-mixer-0.2.0.2:= ) dbus? ( >=dev-haskell/dbus-0.10:= ) inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) mpris? ( >=dev-haskell/dbus-0.10:= ) timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) wifi? ( net-wireless/wireless-tools ) conduit? ( dev-haskell/http-conduit:= dev-haskell/http-types:= ) xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xmobar/0.24.3/xmobar-0.24.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56e4089d7030a223446b89216f572f2b
+_md5_=727cc530e1c57c79c138f6aabcb8a7c9
diff --git a/metadata/md5-cache/x11-misc/xmountains-2.9-r1 b/metadata/md5-cache/x11-misc/xmountains-2.9-r1
index 03b3736e1a05..42dd60072f3a 100644
--- a/metadata/md5-cache/x11-misc/xmountains-2.9-r1
+++ b/metadata/md5-cache/x11-misc/xmountains-2.9-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-misc/xbitmaps x11-base/xorg-proto
 DESCRIPTION=Fractal terrains of snow-capped mountains near water
 EAPI=6
 HOMEPAGE=https://spbooth.github.io/xmountains/
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ppc x86
 LICENSE=HPND
 RDEPEND=x11-libs/libX11 x11-misc/xbitmaps
 SLOT=0
 SRC_URI=http://www.epcc.ed.ac.uk/~spb/xmountains/xmountains_2.9.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=d6a72083c716d863852c20d0bd58eb74
+_md5_=d577723b24b3aea5cc97c95a1222c38a
diff --git a/metadata/md5-cache/x11-misc/xnots-0.2.1-r1 b/metadata/md5-cache/x11-misc/xnots-0.2.1-r1
index cfc23aa5c873..c2642b42676f 100644
--- a/metadata/md5-cache/x11-misc/xnots-0.2.1-r1
+++ b/metadata/md5-cache/x11-misc/xnots-0.2.1-r1
@@ -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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=101356dbde3ec7043d34756c49f0bcd0
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 57422cfe42c7..ce69e396d520 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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b6df2faf2e3c4bc6e4ed488cb66ed5d9
diff --git a/metadata/md5-cache/x11-misc/xnots-9999 b/metadata/md5-cache/x11-misc/xnots-9999
index e0c9c62e3e5a..bd0cd99225c1 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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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-r1
index bd749b090db9..4adeb48259e4 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-r1
@@ -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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
-SRC_URI=mirror://xorg/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_=d81c6aa4b9cb728e9f13dd11a03d194f
+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_=184eb88dcbed7faf16c195141e2dff2c
diff --git a/metadata/md5-cache/x11-misc/xowl-9999 b/metadata/md5-cache/x11-misc/xowl-9999
index 9f770fe52a3e..e17209a83eef 100644
--- a/metadata/md5-cache/x11-misc/xowl-9999
+++ b/metadata/md5-cache/x11-misc/xowl-9999
@@ -8,9 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
 SLOT=0
-<<<<<<< HEAD
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	356fd0a7591e9b51742c209d13b729e1	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-=======
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	356fd0a7591e9b51742c209d13b729e1	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
->>>>>>> next
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	356fd0a7591e9b51742c209d13b729e1	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e33b819d9971dfb751faaccd64dde89e
diff --git a/metadata/md5-cache/x11-misc/xpad-4.2 b/metadata/md5-cache/x11-misc/xpad-4.2
index 3f6c726592f0..dfd847d41b42 100644
--- a/metadata/md5-cache/x11-misc/xpad-4.2
+++ b/metadata/md5-cache/x11-misc/xpad-4.2
@@ -3,9 +3,9 @@ DEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.38:2 x11-libs/libICE x11-libs/li
 DESCRIPTION=a sticky note application for jotting down things to remember
 EAPI=5
 HOMEPAGE=https://launchpad.net/xpad
-KEYWORDS=amd64 ~arm ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.38:2 x11-libs/libICE x11-libs/libSM x11-libs/pango
 SLOT=0
 SRC_URI=https://launchpad.net/xpad/trunk/4.2/+download/xpad-4.2.tar.bz2
-_md5_=fdf290fa43860c994af2a4be1807e451
+_md5_=6e240b90a0fd71000849db7c3f89e535
diff --git a/metadata/md5-cache/x11-misc/xpad-5.3.0 b/metadata/md5-cache/x11-misc/xpad-5.3.0
index 5b8d3dd99a22..8b2f13c6e32e 100644
--- a/metadata/md5-cache/x11-misc/xpad-5.3.0
+++ b/metadata/md5-cache/x11-misc/xpad-5.3.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-dev
 DESCRIPTION=a sticky note application for jotting down things to remember
 EAPI=7
 HOMEPAGE=https://launchpad.net/xpad
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~ppc ~x86
 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.3.0/+download/xpad-5.3.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=e6f63775a6bfcf2002488aa85787cde3
+_md5_=64b1d45b09fb70e22bbb064b69a6dc06
diff --git a/metadata/md5-cache/x11-misc/xpad-5.4.0 b/metadata/md5-cache/x11-misc/xpad-5.4.0
index 14a1a5c9b0e7..4f05105c50b2 100644
--- a/metadata/md5-cache/x11-misc/xpad-5.4.0
+++ b/metadata/md5-cache/x11-misc/xpad-5.4.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-dev
 DESCRIPTION=a sticky note application for jotting down things to remember
 EAPI=7
 HOMEPAGE=https://launchpad.net/xpad
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~ppc ~x86
 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	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=588fd2b145c38a828a94de7ed740bd22
+_md5_=f883c84a26f29d527dbbc2977f5375ff
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 f44ea0339a57..ac33ed0640f8 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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=101c68c42cebb61f6fa9475fad2f0def
diff --git a/metadata/md5-cache/x11-misc/xrestop-0.4 b/metadata/md5-cache/x11-misc/xrestop-0.4
index 77b6f9c34051..eebeb710d52e 100644
--- a/metadata/md5-cache/x11-misc/xrestop-0.4
+++ b/metadata/md5-cache/x11-misc/xrestop-0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXres x11-libs/libXt virtual/pkgconfig x11-bas
 DESCRIPTION='Top' like statistics of X11 client's server side resource usage
 EAPI=5
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/xrestop
-KEYWORDS=alpha amd64 hppa ppc ~ppc64 sparc x86 ~x86-fbsd
+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	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9ca08f75b56757fb377caabb6566e38
+_md5_=9bfcd8f6fe7a9579e2d093adc5f2e4d8
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.38 b/metadata/md5-cache/x11-misc/xscreensaver-5.38
index ce8a922a78e7..7340243a4a27 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.38
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.38
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm 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 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=6
 HOMEPAGE=https://www.jwz.org/xscreensaver/
 IUSE=gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
+RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm 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 ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.38.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=997118ab9634d00a2bbfda843755f3d7
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8d04d1547dd07d88b8421cbe0a5d35ab
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.42 b/metadata/md5-cache/x11-misc/xscreensaver-5.42
index 6d4fab8423c1..99137f6c20bf 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.42
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.42
@@ -1,14 +1,14 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=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/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
+DEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm 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
 EAPI=7
 HOMEPAGE=https://www.jwz.org/xscreensaver/
 IUSE=gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
+RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm 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 ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.42.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=24f54df268b9d19f16d89f88b5039f65
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=5d1fa273def9376af0f6e781bf349678
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.43-r1 b/metadata/md5-cache/x11-misc/xscreensaver-5.43-r1
index b4f38d830816..b55d0c8b5d24 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.43-r1
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.43-r1
@@ -1,14 +1,14 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=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/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
+DEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm 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
 EAPI=7
 HOMEPAGE=https://www.jwz.org/xscreensaver/
 IUSE=gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
+RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm 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 ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.43.tar.gz -> xscreensaver-5.43-r1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=0c7be393b8786d7229e0380c11c2bb6f
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=589009e9c5bd61cbfd65bf8d5df6f77c
diff --git a/metadata/md5-cache/x11-misc/xsnow-1.42-r2 b/metadata/md5-cache/x11-misc/xsnow-1.42-r2
index 542a4d167e67..f63a255e7627 100644
--- a/metadata/md5-cache/x11-misc/xsnow-1.42-r2
+++ b/metadata/md5-cache/x11-misc/xsnow-1.42-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXpm app-text/
 DESCRIPTION=let it snow on your desktop and windows
 EAPI=6
 HOMEPAGE=https://janswaal.home.xs4all.nl/Xsnow/
-KEYWORDS=amd64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=freedist
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://janswaal.home.xs4all.nl/Xsnow/xsnow-1.42.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=a5d9b25e44154f10f7e0ce83c5321fb5
+_md5_=9cba95d1e7b748e1ce9ae61d1983030c
diff --git a/metadata/md5-cache/x11-misc/xsri-2.1.0-r3 b/metadata/md5-cache/x11-misc/xsri-2.1.0-r3
index a89702016419..c9ebf29718f0 100644
--- a/metadata/md5-cache/x11-misc/xsri-2.1.0-r3
+++ b/metadata/md5-cache/x11-misc/xsri-2.1.0-r3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sy
 DESCRIPTION=The xsri wallpaper setter from RedHat
 EAPI=5
 HOMEPAGE=http://fedoraproject.org
-KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/source/SRPMS/xsri-2.1.0-17.fc12.src.rpm
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4558349d120b288b1b4c0a5868c0db02
+_md5_=012e7290f67901be8a306994c6957955
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 ab90fb5c69f0..5c43878aa843 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	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad891022af83ada62fc3ada924d90d64
diff --git a/metadata/md5-cache/x11-misc/xwrits-2.26-r1 b/metadata/md5-cache/x11-misc/xwrits-2.26-r1
index b16f86009a97..77c3ac927ea8 100644
--- a/metadata/md5-cache/x11-misc/xwrits-2.26-r1
+++ b/metadata/md5-cache/x11-misc/xwrits-2.26-r1
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-base/xorg-proto
 DESCRIPTION=Reminds you to take wrist breaks to help you prevent repetitive stress injury
 EAPI=6
 HOMEPAGE=http://www.lcdf.org/xwrits/
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama
 SLOT=0
 SRC_URI=http://www.lcdf.org/xwrits/xwrits-2.26.tar.gz
-_md5_=6d01d9d1e9fcea4d862bfc9076630b2f
+_md5_=e40c59202f854cbcbd322f4a9d46f00b
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /metadata/md5-cache/x11-misc
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)