gentoo resync : 28.04.2019

70 files changed, 159 insertions, 577 deletions

diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 301b7588fc2d..9b6fec4acb72 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105 b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105
deleted file mode 100644
index e1e65f2a0279..000000000000
--- a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-2.12:2 <xfce-base/thunar-1.7 dev-util/intltool virtual/pkgconfig >=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 >=dev-util/xfce4-dev-tools-4.10
-DESCRIPTION=Thunar plugin to share files using Samba
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-2.12:2 <xfce-base/thunar-1.7
-SLOT=0
-SRC_URI=mirror://gentoo/thunar-shares-plugin-0.2.0_p20101105.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=278c001cfd2bbc7db58b18f7afd483f7
diff --git a/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.90 b/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.90
deleted file mode 100644
index efdd36d4d829..000000000000
--- a/metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.1.90
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.11.4:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/thunar-1.7:= git? ( dev-vcs/git ) subversion? ( >=dev-libs/apr-0.9.7:= >=dev-vcs/subversion-1.5:= ) dev-util/intltool virtual/pkgconfig
-DESCRIPTION=Adds Subversion and GIT actions to the context menu of thunar
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin
-IUSE=+git +subversion
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.11.4:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/thunar-1.7:= git? ( dev-vcs/git ) subversion? ( >=dev-libs/apr-0.9.7:= >=dev-vcs/subversion-1.5:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-vcs-plugin/0.1/thunar-vcs-plugin-0.1.90.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b4aca8c819baf25981ea18b51b761e77
diff --git a/metadata/md5-cache/xfce-extra/thunar-volman-0.9.0 b/metadata/md5-cache/xfce-extra/thunar-volman-0.9.0
deleted file mode 100644
index 18b7398d44e5..000000000000
--- a/metadata/md5-cache/xfce-extra/thunar-volman-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.30:= virtual/libgudev:= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Daemon that enforces volume-related policies
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-volman
-IUSE=libnotify
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.30:= virtual/libgudev:= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7:= ) virtual/udev >=xfce-base/thunar-1.6[udisks]
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/thunar-volman/0.9/thunar-volman-0.9.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1674e1ebab7973d96cc40e65e5c78d35
diff --git a/metadata/md5-cache/xfce-extra/transd-0_p20120503 b/metadata/md5-cache/xfce-extra/transd-0_p20120503
deleted file mode 100644
index 6c352d74886b..000000000000
--- a/metadata/md5-cache/xfce-extra/transd-0_p20120503
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=x11-libs/libX11 >=xfce-base/libxfce4util-4.8 dev-util/intltool virtual/pkgconfig >=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 >=dev-util/xfce4-dev-tools-4.10
-DESCRIPTION=A small daemon to watch for window creation and set window transparency values
-EAPI=5
-HOMEPAGE=http://spuriousinterrupt.org/projects/transd
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/libX11 >=xfce-base/libxfce4util-4.8
-SLOT=0
-SRC_URI=mirror://gentoo/transd-0_p20120503.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=cd058dc8402c1e7e99bd75d0b92cba01
diff --git a/metadata/md5-cache/xfce-extra/tumbler-0.2.0 b/metadata/md5-cache/xfce-extra/tumbler-0.2.0
deleted file mode 100644
index 22cce49facf8..000000000000
--- a/metadata/md5-cache/xfce-extra/tumbler-0.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.26:2= media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6:= >=x11-libs/gdk-pixbuf-2.14:2= curl? ( >=net-misc/curl-7.25:= ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A thumbnail service for Thunar
-EAPI=6
-HOMEPAGE=https://docs.xfce.org/xfce/thunar/start
-IUSE=curl ffmpeg gstreamer jpeg odf pdf raw
-KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.26:2= media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6:= >=x11-libs/gdk-pixbuf-2.14:2= curl? ( >=net-misc/curl-7.25:= ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) >=xfce-base/thunar-1.4 gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/tumbler/0.2/tumbler-0.2.0.tar.bz2
-_md5_=d77756d73433150d082212a0c2d40934
diff --git a/metadata/md5-cache/xfce-extra/tumbler-0.2.3 b/metadata/md5-cache/xfce-extra/tumbler-0.2.3
index 0a0844f0f4d9..2f8bf4a0d56a 100644
--- a/metadata/md5-cache/xfce-extra/tumbler-0.2.3
+++ b/metadata/md5-cache/xfce-extra/tumbler-0.2.3
@@ -4,9 +4,9 @@ DESCRIPTION=A thumbnail service for Thunar
 EAPI=6
 HOMEPAGE=https://docs.xfce.org/xfce/thunar/start
 IUSE=curl ffmpeg gstreamer jpeg odf pdf raw
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.26:2= media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6:= >=x11-libs/gdk-pixbuf-2.14:2= curl? ( >=net-misc/curl-7.25:= ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) >=xfce-base/thunar-1.4 gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/tumbler/0.2/tumbler-0.2.3.tar.bz2
-_md5_=d3318b8489fe09f8e6e3b2285d7765af
+_md5_=ff4b92ec5300530fd66743dbaf2a43cb
diff --git a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.1 b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.1
index 7fbda9bf07db..00ad4643d6bf 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=media-libs/alsa-lib xfce-base/xfce4-panel x11-libs/gtk+:2 || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/intltool
+DEPEND=media-libs/alsa-lib xfce-base/xfce4-panel x11-libs/gtk+:2 || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-util/intltool
 DESCRIPTION=Simple ALSA volume control for xfce4-panel
 EAPI=6
 HOMEPAGE=https://github.com/equeim/xfce4-alsa-plugin
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib xfce-base/xfce4-panel x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/equeim/xfce4-alsa-plugin/archive/0.1.1.tar.gz -> xfce4-alsa-plugin-0.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	a94a0fb4c35fe91774bb72ec8f3c861f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=d7fc1ede93095788e8060c2271194e85
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=a71ba4d4448b278c88997f139dda203a
diff --git a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.2_p20190102 b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.2_p20190102
deleted file mode 100644
index 2bb5c3e69e51..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.2_p20190102
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/alsa-lib >=xfce-base/xfce4-panel-4.13 x11-libs/gtk+:3[introspection] || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/intltool >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=Simple ALSA volume control for xfce4-panel
-EAPI=6
-HOMEPAGE=https://github.com/equeim/xfce4-alsa-plugin
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/alsa-lib >=xfce-base/xfce4-panel-4.13 x11-libs/gtk+:3[introspection]
-SLOT=0
-SRC_URI=https://github.com/equeim/xfce4-alsa-plugin/archive/10159129e14a59d14b5761441aaaf7c2f41a3673.tar.gz -> xfce4-alsa-plugin-10159129e14a59d14b5761441aaaf7c2f41a3673.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	a94a0fb4c35fe91774bb72ec8f3c861f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=86b81badbe359c5e06905e10deda5168
diff --git a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.0 b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.0
index 2f8b7db0ca07..5a689c3955fc 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/alsa-lib >=xfce-base/xfce4-panel-4.13 x11-libs/gtk+:3[introspection] || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/intltool >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEPEND=media-libs/alsa-lib >=xfce-base/xfce4-panel-4.13 x11-libs/gtk+:3[introspection] || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-util/intltool >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
 DESCRIPTION=Simple ALSA volume control for xfce4-panel
 EAPI=6
 HOMEPAGE=https://github.com/equeim/xfce4-alsa-plugin
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib >=xfce-base/xfce4-panel-4.13 x11-libs/gtk+:3[introspection]
 SLOT=0
 SRC_URI=https://github.com/equeim/xfce4-alsa-plugin/archive/0.2.0.tar.gz -> xfce4-alsa-plugin-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	a94a0fb4c35fe91774bb72ec8f3c861f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=14bc21d1245883cb521c58d95666435a
diff --git a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.0 b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.0
deleted file mode 100644
index 503b357d3f41..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst postrm preinst setup
-DEPEND=>=dev-libs/glib-2.24:2= >=x11-libs/gtk+-3.14:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.12:= dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A battery monitor panel plugin for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin
-IUSE=kernel_linux kernel_linux
-KEYWORDS=amd64 ~arm ~mips ~ppc x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-libs/glib-2.24:2= >=x11-libs/gtk+-3.14:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-1.1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=dc391ae2e7b762824a9f4598ce8cc70a
diff --git a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.1 b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.1
deleted file mode 100644
index 55088add35e7..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst postrm setup
-DEPEND=>=dev-libs/glib-2.24:2= >=x11-libs/gtk+-3.16:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.12:= dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A battery monitor panel plugin for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin
-IUSE=kernel_linux kernel_linux
-KEYWORDS=amd64 ~arm ~mips ~ppc x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.24:2= >=x11-libs/gtk+-3.16:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-1.1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8fe58baf03ec99b109e7d0b139c48a62
diff --git a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.2 b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.2
index 8dd23496028e..d192191bc3cf 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=A battery monitor panel plugin for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin
 IUSE=kernel_linux kernel_linux
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86
+KEYWORDS=amd64 ~arm ~mips ~ppc x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.24:2= >=x11-libs/gtk+-3.16:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-1.1.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ffd8ed6e1edecaf01954eaf6aa79763f
+_md5_=010eea78c3eb839add9b92a6ed447567
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5 b/metadata/md5-cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5
deleted file mode 100644
index d31143efd494..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=sys-apps/pciutils virtual/libusb:0 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig >=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 >=dev-util/xfce4-dev-tools-4.10
-DESCRIPTION=A panel plug-in with monitoring support for GPRS/UMTS(3G)/HSDPA(3.5G) modems
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cellmodem-plugin
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils virtual/libusb:0 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cellmodem-plugin/0.0/xfce4-cellmodem-plugin-0.0.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=939a5f9ad8a83647d6153bc07aa5ca01
diff --git a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.4.2-r1 b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.4.2-r1
deleted file mode 100644
index b5a340bb21b6..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.4.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.14:3= x11-libs/libXtst:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= qrcode? ( >=media-gfx/qrencode-3.3.0:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=A clipboard manager plug-in for the Xfce panel
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin
-IUSE=qrcode
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.14:3= x11-libs/libXtst:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= qrcode? ( >=media-gfx/qrencode-3.3.0:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.4/xfce4-clipman-plugin-1.4.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5c732d13139a8e5a9fe8423a3e084c6d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0 b/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0
deleted file mode 100644
index 41e749352d52..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-shells/bash:* >=x11-misc/gtkdialog-0.8 >=app-portage/elt-patches-20170815
-DESCRIPTION=An graphical interface to modify composite settings
-EAPI=5
-HOMEPAGE=http://keithhedger.hostingsiteforfree.com/pages/apps.html#xfcecomp
-KEYWORDS=~amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-shells/bash:* >=x11-misc/gtkdialog-0.8
-SLOT=0
-SRC_URI=http://keithhedger.hostingsiteforfree.com/zips/Xfce4-Composite-Editor.tar.gz -> Xfce4-Composite-Editor-0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=9ec5dd0fe310debce9be9e65ae3d8ca0
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.1.90 b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.1.90
deleted file mode 100644
index d44d8c73c80a..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.1.90
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A panel plugin for showing information about cpufreq settings
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin
-KEYWORDS=amd64 ~arm ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.1/xfce4-cpufreq-plugin-1.1.90.tar.bz2
-_md5_=4701dea0f7f94e33c068ddc0b5016b3a
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5
deleted file mode 100644
index 02d5c0e87a70..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=x11-libs/gtk+-2.12:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=A system load plug-in for the Xfce panel
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin
-IUSE=debug
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2 GPL-2
-RDEPEND=>=x11-libs/gtk+-2.12:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-1.0.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=9ad831a1ebe88c6e3824cdcfa73436db
diff --git a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.0 b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.0
deleted file mode 100644
index 74e93cd763d0..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfce4-panel-4.10:= dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A dict.org querying application and panel plug-in for the Xfce desktop
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-dict
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfce4-panel-4.10:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-0.8.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cf5ad24ed36a0018dd3696328415ed72
diff --git a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.2 b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.2
index 5c085d2f3ae3..32a6c4411fe1 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-3.22:3= x11-libs/libX11:= >=xfce-b
 DESCRIPTION=A dict.org querying application and panel plug-in for the Xfce desktop
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-dict
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-3.22:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfce4-panel-4.10:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-0.8.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=72344cc373f881945a9ff0e8efc10f46
+_md5_=ac9a2343a2f7fc0ce55bccbe794d5a6f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0 b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0
deleted file mode 100644
index d2f5bea9bc83..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=x11-libs/gtk+-2.20:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=A plug-in for embedding arbitrary application windows into the Xfce panel
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=x11-libs/gtk+-2.20:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-embed-plugin/1.6/xfce4-embed-plugin-1.6.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=5c5d53ab0e62e9ff7ee4dcecc1d901fd
diff --git a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5 b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5
deleted file mode 100644
index 1c718251781e..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=A panel plug-in which adds classic eyes to your every step
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin
-IUSE=debug
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-eyes-plugin/4.4/xfce4-eyes-plugin-4.4.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=165974b30dbda719f18c15edb8cb4679
diff --git a/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9 b/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9
deleted file mode 100644
index f9ddec377c74..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=A plugin to indicate the status of the IBM Hard Drive Active Protection System
-EAPI=5
-HOMEPAGE=http://michael.orlitzky.com/code/xfce4-hdaps.php
-IUSE=debug kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=app-laptop/hdapsd-20090101 >=app-laptop/tp_smapi-0.39
-SLOT=0
-SRC_URI=http://michael.orlitzky.com/code/releases/xfce4-hdaps-0.0.9.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=ef7c3ef5473015a80f8bf3da114218f6
diff --git a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6 b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6
deleted file mode 100644
index 477848fb7ba6..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=x11-libs/gtk+-2.20:2 dev-util/intltool virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815
-DESCRIPTION=A panel plug-in to show state of Caps, Num and Scroll Lock keys
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-kbdleds-plugin
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=x11-libs/gtk+-2.20:2
-SLOT=0
-SRC_URI=http://compas.com.ua/oco/file/xfce4-kbdleds-plugin-0.0.6.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=e389fa4102a4ef81b8596efae1f65875
diff --git a/metadata/md5-cache/xfce-extra/xfce4-linelight-plugin-0.1.7 b/metadata/md5-cache/xfce-extra/xfce4-linelight-plugin-0.1.7
deleted file mode 100644
index 5dfec0f090ef..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-linelight-plugin-0.1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.12:2 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 virtual/pkgconfig sys-devel/gettext >=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 >=dev-util/xfce4-dev-tools-4.10
-DESCRIPTION=A simple locate based search plug-in for the Xfce panel
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-linelight-plugin
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.12:2 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 sys-apps/mlocate
-SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xfce4-linelight-plugin/xfce4-linelight-plugin_0.1.7.orig.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=468f7375e417c9e373170f25970f38b9
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0 b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0
deleted file mode 100644
index 883e8004f3db..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2:= >=x11-libs/gtk+-2.18:2= x11-libs/libX11:= >=xfce-base/exo-0.7.2 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10 ssl? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=An mail notification panel plug-in for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/
-IUSE=debug ipv6 ssl
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2:= >=x11-libs/gtk+-2.18:2= x11-libs/libX11:= >=xfce-base/exo-0.7.2 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10 ssl? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/1.2/xfce4-mailwatch-plugin-1.2.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=1f204589470681eb65d233ad512bd42b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r1 b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r1
index 96d5a0b59746..390714c701e5 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An mail notification panel plug-in for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/
 IUSE=ipv6 ssl
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:= >=x11-libs/gtk+-2.18:2= x11-libs/libX11:= >=xfce-base/exo-0.7.2 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10 ssl? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/1.2/xfce4-mailwatch-plugin-1.2.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9ab5b0d6191b6f2a1cdcbff78ed9c877
+_md5_=f8b5aece4b66f3b25576bf27d18e7de2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-messenger-plugin-0.1.0 b/metadata/md5-cache/xfce-extra/xfce4-messenger-plugin-0.1.0
deleted file mode 100644
index 61a0498964b4..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-messenger-plugin-0.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/dbus-glib >=dev-libs/glib-2 sys-apps/dbus x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig >=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 >=dev-util/xfce4-dev-tools-4.10
-DESCRIPTION=A plugin that listens DBus messages and displays received messages
-EAPI=5
-HOMEPAGE=https://packages.qa.debian.org/x/xfce4-messenger-plugin.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2 sys-apps/dbus x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
-SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xfce4-messenger-plugin/xfce4-messenger-plugin_0.1.0.orig.tar.gz mirror://debian/pool/main/x/xfce4-messenger-plugin/xfce4-messenger-plugin_0.1.0-5.debian.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=1968b5233fe66a9b4c8189fcc66b22d5
diff --git a/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99 b/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99
deleted file mode 100644
index 44ecaacbc7dc..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-modemlights-plugin-0.1.3.99
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=A panel plug-in intended to simplify establishing a ppp connection
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-modemlights-plugin
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-modemlights-plugin/0.1/xfce4-modemlights-plugin-0.1.3.99.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=3d4e725e84d5d724bfcb1c4249d937b1
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.2 b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.2
deleted file mode 100644
index 7d4bfc04a857..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=An mount plug-in for the Xfce panel
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-mount-plugin/1.1/xfce4-mount-plugin-1.1.2.tar.bz2
-_md5_=33df8f66968aaa5ab6bbf8ae1fb6cf4f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.0 b/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.0
deleted file mode 100644
index 5f5c539867bc..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst
-DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= libmpd? ( media-libs/libmpd:= ) dev-util/intltool virtual/pkgconfig
-DESCRIPTION=Music Player Daemon (mpd) panel plugin
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin
-IUSE=+libmpd
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=ISC
-RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= libmpd? ( media-libs/libmpd:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-mpc-plugin/0.5/xfce4-mpc-plugin-0.5.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=294b8e355cf4889da249ab9d6968404f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.1 b/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.1
index 70fdacf38f9a..e49410b07e7d 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.1
@@ -4,10 +4,10 @@ DESCRIPTION=Music Player Daemon (mpd) panel plugin
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin
 IUSE=+libmpd
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=ISC
 RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= libmpd? ( media-libs/libmpd:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-mpc-plugin/0.5/xfce4-mpc-plugin-0.5.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6c253243c6a581c1b2bc494477be9357
+_md5_=02cc4b0fea1fd22d813179ae104c9b31
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r1 b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r1
new file mode 100644
index 000000000000..13aed61878a6
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= >=xfce-base/xfconf-4.10:= dev-libs/libunique:1= virtual/pkgconfig dev-util/intltool
+DESCRIPTION=Xfce4 panel sticky notes plugin
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= >=xfce-base/xfconf-4.10:= dev-libs/libunique:1=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.8/xfce4-notes-plugin-1.8.1.tar.bz2
+_eclasses_=xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=945e1bf8bc2d4e5753cb88264db27fe5
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.2 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.2
deleted file mode 100644
index 94c1054a325c..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst postrm
-DEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Notification daemon for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-notifyd
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-0.4.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d5c5d1d4b6850cbc58caed03d8bc0c4e
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.3 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.4
index 726ff0cf3c11..b7c4ea7a4491 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.4.4
@@ -1,12 +1,12 @@
-DEFINED_PHASES=configure postinst postrm
+DEFINED_PHASES=postinst postrm
 DEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Notification daemon for the Xfce desktop environment
-EAPI=6
+EAPI=7
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-notifyd
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
 SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-0.4.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=19869d5c450cc1dc48fab3062a5d239e
+SRC_URI=https://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-0.4.4.tar.bz2 -> xfce4-notifyd-0.4.4-r1.tar.bz2
+_eclasses_=xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=ebfbad2bf2874d8fce3be7ad06b32106
diff --git a/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.8 b/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.8
index b787855e259b..47ba7f43d8a3 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.8
+++ b/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.8
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-panel-profiles/1.0/xfce4-panel-profiles-1.0.8.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=ac9f59ac47def787bf63550d789a170f
+_md5_=d9bc68eb67cb011d80c5e07605e7994f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0-r1 b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0-r1
new file mode 100644
index 000000000000..1438d92492e8
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:= >=xfce-base/xfconf-4.8:= libnotify? ( >=x11-libs/libnotify-0.7:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=A panel plug-in to provide quick access to files, folders and removable media
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin
+IUSE=libnotify
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:= >=xfce-base/xfconf-4.8:= libnotify? ( >=x11-libs/libnotify-0.7:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.7/xfce4-places-plugin-1.7.0.tar.bz2
+_md5_=886b2a655327e79754eeff541e6a354a
diff --git a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.0 b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.0
deleted file mode 100644
index b55b861199e7..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.42.0:= media-sound/pulseaudio:= >=x11-libs/gtk+-3.20.0:3= >=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.9.0:= >=xfce-base/xfce4-panel-4.11.0:= >=xfce-base/xfconf-4.6.0:= keybinder? ( dev-libs/keybinder:3= ) libnotify? ( x11-libs/libnotify:= ) wnck? ( x11-libs/libwnck:3= ) dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A panel plug-in for PulseAudio volume control
-EAPI=6
-HOMEPAGE=https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/
-IUSE=debug keybinder libnotify wnck
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.42.0:= media-sound/pulseaudio:= >=x11-libs/gtk+-3.20.0:3= >=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.9.0:= >=xfce-base/xfce4-panel-4.11.0:= >=xfce-base/xfconf-4.6.0:= keybinder? ( dev-libs/keybinder:3= ) libnotify? ( x11-libs/libnotify:= ) wnck? ( x11-libs/libwnck:3= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=868e88496b5f5dd68ce34df05b1aa14c
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.2-r1 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.2-r1
deleted file mode 100644
index c627d547b7ab..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86misc:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= x11-misc/xscreensaver >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= consolekit? ( sys-auth/consolekit ) locking? ( pam? ( virtual/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= ) dev-util/glib-utils dev-util/intltool sys-apps/dbus virtual/pkgconfig
-DESCRIPTION=Screen saver and locker (port of MATE screensaver)
-EAPI=6
-HOMEPAGE=https://git.xfce.org/apps/xfce4-screensaver/about/
-IUSE=consolekit +locking opengl pam systemd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86misc:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= x11-misc/xscreensaver >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= consolekit? ( sys-auth/consolekit ) locking? ( pam? ( virtual/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/0.1/xfce4-screensaver-0.1.2.tar.bz2
-_md5_=fb0e745f1f3f384bd8ede66094a53354
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.3 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.3
deleted file mode 100644
index f0564ff60a51..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86misc:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= x11-misc/xscreensaver >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= consolekit? ( sys-auth/consolekit ) locking? ( pam? ( virtual/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= ) dev-util/glib-utils dev-util/intltool sys-apps/dbus virtual/pkgconfig
-DESCRIPTION=Screen saver and locker (port of MATE screensaver)
-EAPI=6
-HOMEPAGE=https://git.xfce.org/apps/xfce4-screensaver/about/
-IUSE=consolekit +locking opengl pam systemd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86misc:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= x11-misc/xscreensaver >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= consolekit? ( sys-auth/consolekit ) locking? ( pam? ( virtual/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/0.1/xfce4-screensaver-0.1.3.tar.bz2
-_md5_=fb0e745f1f3f384bd8ede66094a53354
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.4 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.4
deleted file mode 100644
index 0fe380e5a932..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86misc:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= x11-misc/xscreensaver >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= consolekit? ( sys-auth/consolekit ) locking? ( pam? ( virtual/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= ) dev-util/glib-utils dev-util/intltool sys-apps/dbus virtual/pkgconfig
-DESCRIPTION=Screen saver and locker (port of MATE screensaver)
-EAPI=6
-HOMEPAGE=https://git.xfce.org/apps/xfce4-screensaver/about/
-IUSE=consolekit +locking opengl pam systemd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86misc:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= x11-misc/xscreensaver >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= consolekit? ( sys-auth/consolekit ) locking? ( pam? ( virtual/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/0.1/xfce4-screensaver-0.1.4.tar.bz2
-_md5_=c1f5deaaf8a483ddbd64ad611e1bc390
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.4-r1 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.4-r1
new file mode 100644
index 000000000000..e863665a1dfa
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86misc:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= consolekit? ( sys-auth/consolekit ) locking? ( pam? ( virtual/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= ) dev-util/glib-utils dev-util/intltool sys-apps/dbus virtual/pkgconfig
+DESCRIPTION=Screen saver and locker (port of MATE screensaver)
+EAPI=6
+HOMEPAGE=https://git.xfce.org/apps/xfce4-screensaver/about/
+IUSE=consolekit +locking opengl pam systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86misc:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= consolekit? ( sys-auth/consolekit ) locking? ( pam? ( virtual/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/0.1/xfce4-screensaver-0.1.4.tar.bz2
+_md5_=4836a1338379e14d5cf7fc2c43197cf8
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.4 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.4
deleted file mode 100644
index 4a10ee4a2519..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= dev-util/glib-utils dev-util/intltool sys-apps/help2man virtual/pkgconfig
-DESCRIPTION=Xfce4 screenshooter application and panel plugin
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-screenshooter
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3fa5512a75f35cd4edb357087a5fa5a9
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.5 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.5
index b67831703e38..bcaaef9a9603 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.5
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.
 DESCRIPTION=Xfce4 screenshooter application and panel plugin
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-screenshooter
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.5.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3fa5512a75f35cd4edb357087a5fa5a9
+_md5_=77e8115d14a129bb6bb10b3e40751dba
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.98 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.98
deleted file mode 100644
index f62378e3109a..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.2.98
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A panel plug-in for acpi, lm_sensors and hddtemp sensors
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
-IUSE=+acpi hddtemp libnotify lm_sensors video_cards_nvidia
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-REQUIRED_USE=|| ( hddtemp lm_sensors acpi )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.2/xfce4-sensors-plugin-1.2.98.tar.bz2
-_md5_=0d6caa4ea781a29b5566fce1cf005f32
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0-r1
index beb24e4b25a1..6f16a1b76d15 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig
+DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat net-analyzer/gnu-netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig
 DESCRIPTION=A panel plug-in for acpi, lm_sensors and hddtemp sensors
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
 IUSE=+acpi hddtemp libnotify lm_sensors video_cards_nvidia
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat net-analyzer/gnu-netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 REQUIRED_USE=|| ( hddtemp lm_sensors acpi )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-1.3.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ff734bdcacb0c21ed2162e7bde92c4da
+_md5_=8862f104f4c38e48404e3df50347151b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.90 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.90
deleted file mode 100644
index bce3ce1603ca..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.90
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A panel plug-in for acpi, lm_sensors and hddtemp sensors
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
-IUSE=+acpi hddtemp libnotify lm_sensors video_cards_nvidia
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-REQUIRED_USE=|| ( hddtemp lm_sensors acpi )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-1.3.90.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0480715d15c594796005c713a35cdc9d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92-r1
index 8b55ad199136..fd828443f8e6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig
+DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat net-analyzer/gnu-netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig
 DESCRIPTION=A panel plug-in for acpi, lm_sensors and hddtemp sensors
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
 IUSE=+acpi hddtemp libnotify lm_sensors video_cards_nvidia
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2+
-RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat net-analyzer/gnu-netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 REQUIRED_USE=|| ( hddtemp lm_sensors acpi )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-1.3.92.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a9d4174cbcd9746207d9c9f3a636fe6e
+_md5_=1d7b8a4b3754f4ca3dad8600bc04836c
diff --git a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.1 b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.1
deleted file mode 100644
index 65c8ee80d3c0..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst
-DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= upower? ( >=sys-power/upower-0.9.23 ) dev-util/intltool virtual/pkgconfig
-DESCRIPTION=System load plug-in for Xfce panel
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
-IUSE=upower
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= upower? ( >=sys-power/upower-0.9.23 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-1.2.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2fee428419d6deacb21e81816241bacb
diff --git a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.2 b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.2
index c05689260d75..073998458b76 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=System load plug-in for Xfce panel
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
 IUSE=upower
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= upower? ( >=sys-power/upower-0.9.23 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-1.2.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6303050e83b42ae6290739c7710f040d
+_md5_=dfa15f652c118c4df8194f655b5213b7
diff --git a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.0 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.0
deleted file mode 100644
index 716efb73fa57..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=x11-libs/cairo:= x11-libs/libX11:= x11-libs/libXmu:= gtk3? ( x11-libs/gtk+:3= x11-libs/libwnck:3= ) !gtk3? ( >=x11-libs/gtk+-2.12:2= x11-libs/libwnck:1= ) dev-util/intltool sys-devel/gettext >=x11-libs/gtk+-2.12:2 virtual/pkgconfig
-DESCRIPTION=Easy to use task manager
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-taskmanager
-IUSE=gtk3
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=x11-libs/cairo:= x11-libs/libX11:= x11-libs/libXmu:= gtk3? ( x11-libs/gtk+:3= x11-libs/libwnck:3= ) !gtk3? ( >=x11-libs/gtk+-2.12:2= x11-libs/libwnck:1= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-taskmanager/1.2/xfce4-taskmanager-1.2.0.tar.bz2
-_md5_=92ab5d7b46907614e89d6a70929c06d4
diff --git a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.2 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.2
index 149f77b0fca8..c49543e40f7a 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/cairo:= x11-libs/libX11:= x11-libs/libXmu:= x11-libs/gtk+:3= x11
 DESCRIPTION=Easy to use task manager
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-taskmanager
-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 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=x11-libs/cairo:= x11-libs/libX11:= x11-libs/libXmu:= x11-libs/gtk+:3= x11-libs/libwnck:3=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-taskmanager/1.2/xfce4-taskmanager-1.2.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=331b2e9e69412ae0cb1b6a33351062ac
+_md5_=48904673918fcf6852ad7ddeaa8105c7
diff --git a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2-r1 b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2-r1
new file mode 100644
index 000000000000..ba4b9cbf635d
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=x11-libs/gtk+:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:= dev-util/intltool virtual/pkgconfig
+DESCRIPTION=A panel plug-in to take periodical breaks from the computer
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=x11-libs/gtk+:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-1.0.2.tar.bz2
+_eclasses_=xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=bbd4fa0d1779daad31b69a4973977d3b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r3 b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r3
deleted file mode 100644
index 4b4461644730..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=|| ( dev-lang/vala:0.32[vapigen(+)] ) >=xfce-base/exo-0.10 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10 virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=Vala bindings for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://wiki.xfce.org/vala-bindings
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=|| ( dev-lang/vala:0.32[vapigen(+)] ) >=xfce-base/exo-0.10 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/bindings/xfce4-vala/4.10/xfce4-vala-4.10.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	a94a0fb4c35fe91774bb72ec8f3c861f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=77ba132b030c05b1c22816976c8179fc
diff --git a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r5 b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r5
new file mode 100644
index 000000000000..9b3e19460201
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=|| ( dev-lang/vala:0.40[vapigen(+)] ) >=xfce-base/exo-0.10:= >=xfce-base/garcon-0.2:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= >=xfce-base/xfconf-4.10:= virtual/pkgconfig
+DESCRIPTION=Vala bindings for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://wiki.xfce.org/vala-bindings
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1+
+RDEPEND=|| ( dev-lang/vala:0.40[vapigen(+)] ) >=xfce-base/exo-0.10:= >=xfce-base/garcon-0.2:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= >=xfce-base/xfconf-4.10:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/bindings/xfce4-vala/4.10/xfce4-vala-4.10.3.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	cfb1d97eac9fead928d3240c8636b9ae
+_md5_=9263d8d83663dde0855e5eb7834275be
diff --git a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r6 b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r6
new file mode 100644
index 000000000000..fae4ebe471ba
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=|| ( dev-lang/vala:0.42[vapigen(+)] ) >=xfce-base/exo-0.10:= >=xfce-base/garcon-0.2:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= >=xfce-base/xfconf-4.10:= virtual/pkgconfig
+DESCRIPTION=Vala bindings for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://wiki.xfce.org/vala-bindings
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=|| ( dev-lang/vala:0.42[vapigen(+)] ) >=xfce-base/exo-0.10:= >=xfce-base/garcon-0.2:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= >=xfce-base/xfconf-4.10:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/bindings/xfce4-vala/4.10/xfce4-vala-4.10.3.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	cfb1d97eac9fead928d3240c8636b9ae
+_md5_=c06f872d35b60adf0dc982a1837e2070
diff --git a/metadata/md5-cache/xfce-extra/xfce4-verve-plugin-1.1.0 b/metadata/md5-cache/xfce-extra/xfce4-verve-plugin-1.1.0
deleted file mode 100644
index 369f999a818c..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-verve-plugin-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=xfce-base/exo-0.6:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/libxfcegui4-4.8:= >=xfce-base/xfce4-panel-4.8:= dev-libs/glib:2= >=dev-libs/libpcre-5:= dbus? ( >=dev-libs/dbus-glib-0.98:= ) dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=A comfortable command line plugin for the Xfce panel
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin
-IUSE=dbus
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=xfce-base/exo-0.6:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/libxfcegui4-4.8:= >=xfce-base/xfce4-panel-4.8:= dev-libs/glib:2= >=dev-libs/libpcre-5:= dbus? ( >=dev-libs/dbus-glib-0.98:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/1.1/xfce4-verve-plugin-1.1.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=aa92d9b7012e3d3fdba66b822e16e470
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.10 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.10
deleted file mode 100644
index 3f3ce9c30369..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.20:= dev-libs/libxml2:= >=net-libs/libsoup-2.32:=[ssl] >=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= upower? ( >=sys-power/upower-0.9.23 ) dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A weather plug-in for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin
-IUSE=upower
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.20:= dev-libs/libxml2:= >=net-libs/libsoup-2.32:=[ssl] >=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= upower? ( >=sys-power/upower-0.9.23 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.8/xfce4-weather-plugin-0.8.10.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=41b7a681e84a35779e90fcc4aa924d9d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.11 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.11
deleted file mode 100644
index 494fab26d3c5..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.20:= dev-libs/libxml2:= >=net-libs/libsoup-2.32:=[ssl] >=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= upower? ( >=sys-power/upower-0.9.23 ) dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A weather plug-in for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin
-IUSE=upower
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.20:= dev-libs/libxml2:= >=net-libs/libsoup-2.32:=[ssl] >=x11-libs/gtk+-2.14:2= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= upower? ( >=sys-power/upower-0.9.23 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.8/xfce4-weather-plugin-0.8.11.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c249f74e7e19f683418b556fe4514815
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.9.0 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.9.0
deleted file mode 100644
index affaf9c4a508..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.42 dev-libs/libxml2:= >=net-libs/libsoup-2.42:=[ssl] >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= upower? ( >=sys-power/upower-0.9.23 ) dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A weather plug-in for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin
-IUSE=upower
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.42 dev-libs/libxml2:= >=net-libs/libsoup-2.42:=[ssl] >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= upower? ( >=sys-power/upower-0.9.23 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.9/xfce4-weather-plugin-0.9.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=22fa1df8653cc25c1f1c1f26d14e9b7c
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.9.1 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.9.1
index c6c3e5f9f663..7a80565700a0 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.9.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=A weather plug-in for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin
 IUSE=upower
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42 dev-libs/libxml2:= >=net-libs/libsoup-2.42:=[ssl] >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= upower? ( >=sys-power/upower-0.9.23 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.9/xfce4-weather-plugin-0.9.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=eb1bd6e744d1d6bb0b4b0cf247d10495
+_md5_=fa5eae3a6fb2c265863ee83f8e5f02c7
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.3.0 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.3.0
deleted file mode 100644
index 60c877fe0433..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Alternate application launcher for Xfce
-EAPI=6
-HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.3/xfce4-whiskermenu-plugin-2.3.0.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=af6eb2d627f249fa6115a06be59dccb7
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.3.1 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.3.1
deleted file mode 100644
index 160ebb72ec4b..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Alternate application launcher for Xfce
-EAPI=6
-HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.3/xfce4-whiskermenu-plugin-2.3.1.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=442d09bc3a83ff3aec517d98873d2cc6
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.3.2 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.3.2
index 02cac9e9dd31..b6a188031b02 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.3.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.3.2
@@ -3,10 +3,10 @@ DEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/gar
 DESCRIPTION=Alternate application launcher for Xfce
 EAPI=6
 HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=virtual/libintl:= x11-libs/gtk+:3= >=xfce-base/exo-0.11.0:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.3/xfce4-whiskermenu-plugin-2.3.2.tar.bz2
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=442d09bc3a83ff3aec517d98873d2cc6
+_md5_=90e67b1d49cbb197cc0dfbd336f50abc
diff --git a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.2.4 b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.2.4
deleted file mode 100644
index 48c3a9789491..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=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 >=dev-util/xfce4-dev-tools-4.10
-DESCRIPTION=Xfce plugin puts the maximized window title and windows buttons on the panel
-EAPI=5
-HOMEPAGE=https://github.com/cedl38/xfce4-windowck-plugin
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10
-SLOT=0
-SRC_URI=https://github.com/cedl38/xfce4-windowck-plugin/archive/v0.2.4.tar.gz -> xfce4-windowck-plugin-0.2.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=036d0c7aa032b2b58314e5d6be6f76ff
diff --git a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.5 b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.5
new file mode 100644
index 000000000000..bf5eb6426897
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.5
@@ -0,0 +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=postinst postrm prepare setup
+DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/intltool dev-util/xfce4-dev-tools media-gfx/imagemagick[png] sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Xfce plugin puts the maximized window title and windows buttons on the panel
+EAPI=7
+HOMEPAGE=https://github.com/cedl38/xfce4-windowck-plugin
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
+SLOT=0
+SRC_URI=https://github.com/cedl38/xfce4-windowck-plugin/archive/v0.4.5.tar.gz -> xfce4-windowck-plugin-0.4.5.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=994df61ad2ab1008c2ae064fd43de287
diff --git a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6 b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6
new file mode 100644
index 000000000000..166e35f6bdc0
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6
@@ -0,0 +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=postinst postrm prepare setup
+DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/intltool dev-util/xfce4-dev-tools media-gfx/imagemagick[png] sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Xfce plugin puts the maximized window title and windows buttons on the panel
+EAPI=7
+HOMEPAGE=https://github.com/cedl38/xfce4-windowck-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
+SLOT=0
+SRC_URI=https://github.com/cedl38/xfce4-windowck-plugin/archive/v0.4.6.tar.gz -> xfce4-windowck-plugin-0.4.6.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=a24188f554cbb7bf46e1286adc8c729c
diff --git a/metadata/md5-cache/xfce-extra/xfdashboard-0.4.0 b/metadata/md5-cache/xfce-extra/xfdashboard-0.4.0
deleted file mode 100644
index 704e092fffdf..000000000000
--- a/metadata/md5-cache/xfce-extra/xfdashboard-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:= >=x11-libs/gtk+-3.2:3= >=media-libs/clutter-1.12:1.0= >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.10:= dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=Maybe a GNOME shell like dashboard for the Xfce desktop environment
-EAPI=5
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfdashboard/start
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:= >=x11-libs/gtk+-3.2:3= >=media-libs/clutter-1.12:1.0= >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.10:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfdashboard/0.4/xfdashboard-0.4.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213	xfconf	2d8c177734e778123f65326f8d05c3c8
-_md5_=dc8c549af959b96218610f0868b9662b
diff --git a/metadata/md5-cache/xfce-extra/xfdashboard-0.6.1 b/metadata/md5-cache/xfce-extra/xfdashboard-0.6.1
new file mode 100644
index 000000000000..4651670eaa27
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfdashboard-0.6.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0= >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.10:= dev-util/intltool virtual/pkgconfig
+DESCRIPTION=Maybe a GNOME shell like dashboard for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/applications/xfdashboard/start
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0= >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.10:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfdashboard/0.6/xfdashboard-0.6.1.tar.bz2
+_eclasses_=xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=49b819b4891fdf99e09263189fb25b59
diff --git a/metadata/md5-cache/xfce-extra/xfdashboard-0.7.5 b/metadata/md5-cache/xfce-extra/xfdashboard-0.7.5
new file mode 100644
index 000000000000..443d1b2a588e
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfdashboard-0.7.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.13:= dev-util/intltool virtual/pkgconfig
+DESCRIPTION=Maybe a GNOME shell like dashboard for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/applications/xfdashboard/start
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.13:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfdashboard/0.7/xfdashboard-0.7.5.tar.bz2
+_eclasses_=xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=8fd5fc27d9ee2264020b41d3707485d4