gentoo resync : 06.08.2019

19 files changed, 59 insertions, 47 deletions

diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 9cd775bc1625..9d808a4a04fd 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/multiload-nandhp-0.3-r1 b/metadata/md5-cache/xfce-extra/multiload-nandhp-0.3-r2
index 1699b6a48679..dfdd1bc559cb 100644
--- a/metadata/md5-cache/xfce-extra/multiload-nandhp-0.3-r1
+++ b/metadata/md5-cache/xfce-extra/multiload-nandhp-0.3-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.14:2= x11-libs/cairo:= >=gnome-base/libgtop-2.11.92:= >=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 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=x11-libs/gtk+-2.14:2= x11-libs/cairo:= >=gnome-base/libgtop-2.11.92:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)] 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
 DESCRIPTION=A port of the GNOME multiload applet for the Xfce panel
 EAPI=6
 HOMEPAGE=https://github.com/nandhp/multiload-nandhp
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.14:2= x11-libs/cairo:= >=gnome-base/libgtop-2.11.92:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
+RDEPEND=>=x11-libs/gtk+-2.14:2= x11-libs/cairo:= >=gnome-base/libgtop-2.11.92:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)]
 SLOT=0
 SRC_URI=https://github.com/nandhp/multiload-nandhp/archive/version-0-3.tar.gz -> multiload-nandhp-0.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1a5b4197fde9dfe881a010252b0e039f
+_md5_=5d811f09444faab347ea9fedf3113148
diff --git a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1 b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r2
index e2c8a2b83da5..84e80ed7f1f1 100644
--- a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1
+++ b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.30 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.30 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10[gtk2(+)] >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 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+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/udev >=xfce-base/thunar-1.6[udisks]
+RDEPEND=>=dev-libs/glib-2.30 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10[gtk2(+)] >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 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.8/thunar-volman-0.8.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44b53deef0ea3413710097b718825285
+_md5_=3505143eb8d6a4df1cb3c99907db4dd2
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 f65f568c9d81..b087cf9b7069 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,12 +1,12 @@
 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.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-util/intltool
+DEPEND=media-libs/alsa-lib xfce-base/xfce4-panel[gtk2(+)] 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.46 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
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
-RDEPEND=media-libs/alsa-lib xfce-base/xfce4-panel x11-libs/gtk+:2
+RDEPEND=media-libs/alsa-lib xfce-base/xfce4-panel[gtk2(+)] 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	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=a71ba4d4448b278c88997f139dda203a
+_md5_=df9cf8fd622fb54334f765907131809d
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 574fa9dc3288..cc797a8acdba 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
@@ -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	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b2d59237f509ea4ead8fb3be91bdae1
diff --git a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.1 b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.1
index 37e7da146d09..f871eb556cec 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.1
@@ -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.1.tar.gz -> xfce4-alsa-plugin-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b2d59237f509ea4ead8fb3be91bdae1
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r1 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r2
index b36a999408e6..a7e7ff755c2b 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst postrm
-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
+DEPEND=>=x11-libs/gtk+-2.12:2 >=xfce-base/libxfce4ui-4.8[gtk2(+)] >=xfce-base/xfce4-panel-4.8[gtk2(+)] dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=A system load plug-in for the Xfce panel
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~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
+RDEPEND=>=x11-libs/gtk+-2.12:2 >=xfce-base/libxfce4ui-4.8[gtk2(+)] >=xfce-base/xfce4-panel-4.8[gtk2(+)]
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91e34bce291909fcdcde5f496228b99e
+_md5_=446696bf9b6b116709f2bf6128d24ad3
diff --git a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0-r1 b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0-r2
index 5852bb836e7d..95e6b214fbcb 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
-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
+DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)] dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=A plug-in for embedding arbitrary application windows into the Xfce panel
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin
 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:=
+RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)]
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-embed-plugin/1.6/xfce4-embed-plugin-1.6.0.tar.bz2
-_md5_=222c784d10d8a363afe2dba9accc8f73
+_md5_=166426fbc89077424591e7a28d0c39f9
diff --git a/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1 b/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1
index c9509b6b5ff0..6d57d178f319 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=postinst postrm
-DEPEND=>=dev-libs/glib-2:= x11-libs/gtk+: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
+DEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)] dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Panel plug-in that displays information about earthquakes at regular intervals
 EAPI=6
 HOMEPAGE=http://www.e-quake.org/
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
+RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)]
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-equake-plugin/1.3/xfce4-equake-plugin-1.3.8.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a9562d2be7c4598ed98ec5d935d8454
+_md5_=11256f196b14b2b50ccdeb6698257243
diff --git a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5-r1 b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5-r2
index c88b9aa45813..eae5f56f252c 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
-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
+DEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)] dev-util/intltool virtual/pkgconfig
 DESCRIPTION=A panel plug-in which adds classic eyes to your every step
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~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:=
+RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)]
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-eyes-plugin/4.4/xfce4-eyes-plugin-4.4.5.tar.bz2
-_md5_=cec27d2deb07f953c03a917d95ef5673
+_md5_=0dab1b8b04554b3370f272a71f59ae69
diff --git a/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r1 b/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r2
index 5bbd2bb3ffb5..8e11ee547de6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install postinst postrm pretend 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
+DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8[gtk2(+)] >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8[gtk2(+)] dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=A plugin to indicate the status of the IBM Hard Drive Active Protection System
 EAPI=6
 HOMEPAGE=http://michael.orlitzky.com/code/xfce4-hdaps.php
 IUSE=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
+RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8[gtk2(+)] >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8[gtk2(+)] >=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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e2e45ebb7eb1bbc08d39cfc2dc19a0b
+_md5_=0acb3e3bbf6e72f411e027a3bf8b7aec
diff --git a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r1 b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r2
index d79d3ed71af4..e4e950e4f2a7 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst postrm
-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
+DEPEND=>=xfce-base/libxfce4ui-4.8[gtk2(+)] >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8[gtk2(+)] >=x11-libs/gtk+-2.20:2 dev-util/intltool virtual/pkgconfig sys-devel/gettext
 DESCRIPTION=A panel plug-in to show state of Caps, Num and Scroll Lock keys
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-kbdleds-plugin
 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
+RDEPEND=>=xfce-base/libxfce4ui-4.8[gtk2(+)] >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8[gtk2(+)] >=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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=00ecf79e3e6169d7345dc8518b4c1487
+_md5_=d650c84711f5d84f58a6b30ac33bd45b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r2 b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r3
index 843531e8cbec..37a69c14572f 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r2
+++ b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2:= >=x11-libs/gtk+-2.18:2= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100 >=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
+DEPEND=>=dev-libs/glib-2:= >=x11-libs/gtk+-2.18:2= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10[gtk2(+)] ssl? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
 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 ~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.12.5-r100 >=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:= )
+RDEPEND=>=dev-libs/glib-2:= >=x11-libs/gtk+-2.18:2= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10[gtk2(+)] 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	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=320c7b8ab78acf8af4e5b8876ca7a670
+_md5_=b144eff1856c44de935332725082adf3
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-r2
index 466ec85e14c5..7a86986d8b40 100644
--- 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-r2
@@ -1,12 +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
+DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)] >=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 ~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=
+RDEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)] >=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	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69c41f2722c487b3bf09eaaaf2ae07e0
+_md5_=397ac5016d00fd825ce88bde6c9f3924
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-r2
index 3e8fea2ec3dc..6182aec6d243 100644
--- 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-r2
@@ -1,12 +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
+DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/exo-0.6:=[gtk2(+)] >=xfce-base/libxfce4ui-4.8:=[gtk2(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=[gtk2(+)] >=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 ~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:= )
+RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/exo-0.6:=[gtk2(+)] >=xfce-base/libxfce4ui-4.8:=[gtk2(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=[gtk2(+)] >=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_=b1d1462df8e2793015d782fc9121375a
+_md5_=ced929d473b4920dec7f6125abac2093
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.6 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.6
new file mode 100644
index 000000000000..3b52eb436a1e
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.6
@@ -0,0 +1,12 @@
+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 ~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.6.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6398c531936cc6a2c1852e2cfc33259e
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
index cf3548a44eb2..d9575ce74dbd 100644
--- 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
@@ -1,12 +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
+DEPEND=x11-libs/gtk+:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.8:=[gtk2(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=[gtk2(+)] 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 ~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:=
+RDEPEND=x11-libs/gtk+:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.8:=[gtk2(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=[gtk2(+)]
 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	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc8f4d2af0074ab2320ceeee45fa0e60
+_md5_=5e03c0c6f377563724bfec2e9fd5b0aa
diff --git a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.3 b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.3-r1
index b0dd398c45fd..8c1d5befd64d 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.3-r1
@@ -1,12 +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
+DEPEND=x11-libs/gtk+:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8:=[gtk2(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=[gtk2(+)] 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 ~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:=
+RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8:=[gtk2(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=[gtk2(+)]
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-1.0.3.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77d4d1a243f27944cc61d74feb971f4b
+_md5_=6742ca400d95d9239539b0cbe9fbcecb
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-r1
index b43c597413d4..c5085bd6c552 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6
+++ b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6-r1
@@ -1,13 +1,13 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install 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
+DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:=[gtk2(+)] >=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:=
+RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:=[gtk2(+)] >=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	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99376c6ed6e0545b3a7a119cb08b7321
+_md5_=eabd749d4d7a4efbc9f0af77ba742a5d