gentoo resync : 06.08.2019

16 files changed, 56 insertions, 67 deletions

diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index a70211ba1024..87ac0b1b5b4f 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/garcon-0.6.2 b/metadata/md5-cache/xfce-base/garcon-0.6.2
deleted file mode 100644
index ce9109000333..000000000000
--- a/metadata/md5-cache/xfce-base/garcon-0.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
-EAPI=7
-HOMEPAGE=https://docs.xfce.org/xfce/exo/start
-IUSE=+gtk2
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.2.tar.bz2
-_md5_=0afd109e44b74800991ecf9529bf63ef
diff --git a/metadata/md5-cache/xfce-base/garcon-0.6.2-r1 b/metadata/md5-cache/xfce-base/garcon-0.6.2-r1
new file mode 100644
index 000000000000..4bb1745ca06d
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/garcon-0.6.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)] >=xfce-base/libxfce4util-4.12:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
+EAPI=7
+HOMEPAGE=https://docs.xfce.org/xfce/exo/start
+IUSE=+gtk2
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)] >=xfce-base/libxfce4util-4.12:= gtk2? ( >=x11-libs/gtk+-2.24:2= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.2.tar.bz2
+_md5_=e42311e8392c5eae1cef3dc133b5c52e
diff --git a/metadata/md5-cache/xfce-base/garcon-0.6.3 b/metadata/md5-cache/xfce-base/garcon-0.6.3
index f2f0a7076e80..aee23082ab11 100644
--- a/metadata/md5-cache/xfce-base/garcon-0.6.3
+++ b/metadata/md5-cache/xfce-base/garcon-0.6.3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)] >=xfce-base/libxfce4util-4.12:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
 EAPI=7
 HOMEPAGE=https://docs.xfce.org/xfce/exo/start
 IUSE=+gtk2
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
+RDEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)] >=xfce-base/libxfce4util-4.12:= gtk2? ( >=x11-libs/gtk+-2.24:2= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.3.tar.bz2
-_md5_=1c1c4ad81939733af8bb3d195b5cbaeb
+_md5_=cced29407f4c4c1ac750b19590e529f8
diff --git a/metadata/md5-cache/xfce-base/garcon-0.6.4 b/metadata/md5-cache/xfce-base/garcon-0.6.4
deleted file mode 100644
index 5574cedd48ee..000000000000
--- a/metadata/md5-cache/xfce-base/garcon-0.6.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
-EAPI=7
-HOMEPAGE=https://docs.xfce.org/xfce/exo/start
-IUSE=+gtk2
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.4.tar.bz2
-_md5_=1c1c4ad81939733af8bb3d195b5cbaeb
diff --git a/metadata/md5-cache/xfce-base/garcon-0.6.4-r1 b/metadata/md5-cache/xfce-base/garcon-0.6.4-r1
new file mode 100644
index 000000000000..4ac6a413e1ca
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/garcon-0.6.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)] >=xfce-base/libxfce4util-4.12:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
+EAPI=7
+HOMEPAGE=https://docs.xfce.org/xfce/exo/start
+IUSE=+gtk2
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)] >=xfce-base/libxfce4util-4.12:= gtk2? ( >=x11-libs/gtk+-2.24:2= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.4.tar.bz2
+_md5_=cced29407f4c4c1ac750b19590e529f8
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.14.1 b/metadata/md5-cache/xfce-base/libxfce4ui-4.14.1
index 191084e5946d..e2c8dba53157 100644
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.14.1
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.14.1
@@ -1,14 +1,15 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.18:3=[introspection?] x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification:= ) !xfce-base/xfce-utils dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
+DEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.18:3=[introspection?] x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) gtk2? ( >=x11-libs/gtk+-2.24:2= ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification:= ) !xfce-base/xfce-utils dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
 DESCRIPTION=Unified widget and session management libs for Xfce
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=debug glade introspection startup-notification vala
+IUSE=debug glade +gtk2 introspection startup-notification vala
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.18:3=[introspection?] x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification:= ) !xfce-base/xfce-utils
+RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.18:3=[introspection?] x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) gtk2? ( >=x11-libs/gtk+-2.24:2= ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification:= ) !xfce-base/xfce-utils
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!gtk2? ( test )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.14/libxfce4ui-4.14.1.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46e4a80818a66a218a2744644a8a1129
+_md5_=75c34f839fe7bbd251d3db376cc7a00f
diff --git a/metadata/md5-cache/xfce-base/thunar-1.6.16 b/metadata/md5-cache/xfce-base/thunar-1.6.16-r1
index 8bca59f27e39..3de5b14b51d7 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.6.16
+++ b/metadata/md5-cache/xfce-base/thunar-1.6.16-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure postinst postrm test
-DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10.1:= >=xfce-base/xfconf-4.10:= dbus? ( >=dev-libs/dbus-glib-0.100:= ) exif? ( >=media-libs/libexif-0.6.19:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10.1:= >=xfce-base/xfconf-4.10:= dbus? ( >=dev-libs/dbus-glib-0.100:= ) exif? ( >=media-libs/libexif-0.6.19:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=File manager for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
 IUSE=+dbus exif libnotify pcre test +trash-panel-plugin udisks test
 KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10.1:= >=xfce-base/xfconf-4.10:= dbus? ( >=dev-libs/dbus-glib-0.100:= ) exif? ( >=media-libs/libexif-0.6.19:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info dbus? ( >=gnome-base/gvfs-1.18.3 ) trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
+RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10.1:= >=xfce-base/xfconf-4.10:= dbus? ( >=dev-libs/dbus-glib-0.100:= ) exif? ( >=media-libs/libexif-0.6.19:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info dbus? ( >=gnome-base/gvfs-1.18.3 ) trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
 REQUIRED_USE=trash-panel-plugin? ( dbus )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/thunar/1.6/Thunar-1.6.16.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	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca07a1d4f8059a02e6bfe5c9d7aca21d
+_md5_=265be9abed76af1efd3fa8d35d1bca5f
diff --git a/metadata/md5-cache/xfce-base/thunar-1.6.17 b/metadata/md5-cache/xfce-base/thunar-1.6.17
index 67b81637cf75..cdb4068c7c75 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.6.17
+++ b/metadata/md5-cache/xfce-base/thunar-1.6.17
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure postinst postrm test
-DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-2.24:2= <xfce-base/exo-0.12.5-r100:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10.1:= >=xfce-base/xfconf-4.10:= dbus? ( >=dev-libs/dbus-glib-0.100:= ) exif? ( >=media-libs/libexif-0.6.19:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-2.24:2= <xfce-base/exo-0.12.5-r100:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10.1:= >=xfce-base/xfconf-4.10:= dbus? ( >=dev-libs/dbus-glib-0.100:= ) exif? ( >=media-libs/libexif-0.6.19:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=File manager for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
 IUSE=+dbus exif libnotify pcre test +trash-panel-plugin udisks test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-2.24:2= <xfce-base/exo-0.12.5-r100:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10.1:= >=xfce-base/xfconf-4.10:= dbus? ( >=dev-libs/dbus-glib-0.100:= ) exif? ( >=media-libs/libexif-0.6.19:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info dbus? ( >=gnome-base/gvfs-1.18.3 ) trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
+RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-2.24:2= <xfce-base/exo-0.12.5-r100:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10.1:= >=xfce-base/xfconf-4.10:= dbus? ( >=dev-libs/dbus-glib-0.100:= ) exif? ( >=media-libs/libexif-0.6.19:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info dbus? ( >=gnome-base/gvfs-1.18.3 ) trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
 REQUIRED_USE=trash-panel-plugin? ( dbus )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/thunar/1.6/Thunar-1.6.17.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	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5009b191c756d15ff63d62f56bdce0e1
+_md5_=935b28eb000e60b2feccbe2241398847
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.14.0 b/metadata/md5-cache/xfce-base/xfce4-panel-4.14.0
index e25d95ab9154..87626c6e1dd7 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.14.0
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.14.0
@@ -1,14 +1,15 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.42 >=x11-libs/cairo-1 >=x11-libs/gtk+-2.20:2 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= introspection? ( dev-libs/gobject-introspection:= ) vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-lang/perl dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.42 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= gtk2? ( >=x11-libs/gtk+-2.20:2 ) introspection? ( dev-libs/gobject-introspection:= ) vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-lang/perl dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Panel for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
-IUSE=introspection vala
+IUSE=+gtk2 introspection vala
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.42 >=x11-libs/cairo-1 >=x11-libs/gtk+-2.20:2 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= introspection? ( dev-libs/gobject-introspection:= )
+RDEPEND=>=dev-libs/glib-2.42 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= gtk2? ( >=x11-libs/gtk+-2.20:2 ) introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!gtk2? ( test )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.14/xfce4-panel-4.14.0.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6182c1a88c90e4595c070afb29250118
+_md5_=85ad93dc0ed67dd514bc017c3f5e5c20
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4 b/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4-r1
index e31ace4339b1..8d24073c4ca9 100644
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.11 >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) dev-util/intltool virtual/pkgconfig sys-devel/gettext x11-base/xorg-proto
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.11[gtk2(+)] >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) dev-util/intltool virtual/pkgconfig sys-devel/gettext x11-base/xorg-proto
 DESCRIPTION=Configuration system for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=input_devices_libinput libcanberra libnotify upower +xklavier
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.11 >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 )
+RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.11[gtk2(+)] >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.12/xfce4-settings-4.12.4.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_=3324aebd680b28fc258142b97c3b8bfb
+_md5_=c0a963c3e378568be96a75505db65149
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.7 b/metadata/md5-cache/xfce-base/xfce4-settings-4.13.7
deleted file mode 100644
index fd59433e8af1..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig sys-devel/gettext x11-base/xorg-proto
-DESCRIPTION=Configuration system for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.13/xfce4-settings-4.13.7.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd7caa0a299d133487018d9a9b66f2a3
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.8 b/metadata/md5-cache/xfce-base/xfce4-settings-4.14.1
index ea403d2445b7..fc5d165fe05d 100644
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.8
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.14.1
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~am
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 )
 SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.13/xfce4-settings-4.13.8.tar.bz2
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.14/xfce4-settings-4.14.1.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd7caa0a299d133487018d9a9b66f2a3
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.12.4 b/metadata/md5-cache/xfce-base/xfdesktop-4.12.4
index dc359c3bce46..36088f180a6e 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.12.4
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.12.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure postinst postrm
-DEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:=[gtk2(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Desktop manager for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=debug libnotify +thunar
 KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] )
+RDEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:=[gtk2(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.12/xfdesktop-4.12.4.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_=eb354261934b9da3e22cd58c7a719e32
+_md5_=02fdbf7445248c0f85951027919d4774
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.12.5 b/metadata/md5-cache/xfce-base/xfdesktop-4.12.5-r1
index 8124d320d945..557eedd053fb 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.12.5
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.12.5-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure postinst postrm
-DEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:=[gtk2(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Desktop manager for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=debug libnotify +thunar
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
-RDEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] )
+RDEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:=[gtk2(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.12/xfdesktop-4.12.5.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce655926910c767120aad2e099913c79
+_md5_=115dd1d8ea6c9c49283cc54c8930908b
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.12.5 b/metadata/md5-cache/xfce-base/xfwm4-4.12.5-r1
index 1f6f0b02878b..8c5df8e31a88 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.12.5
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.12.5-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure
-DEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/xfconf-4.10:= startup-notification? ( x11-libs/startup-notification:= ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig dri? ( >=x11-libs/libdrm-2.4 )
+DEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:=[gtk2(+)] >=xfce-base/xfconf-4.10:= startup-notification? ( x11-libs/startup-notification:= ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig dri? ( >=x11-libs/libdrm-2.4 )
 DESCRIPTION=Window manager for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=dri startup-notification +xcomposite
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/xfconf-4.10:= startup-notification? ( x11-libs/startup-notification:= ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
+RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:=[gtk2(+)] >=xfce-base/xfconf-4.10:= startup-notification? ( x11-libs/startup-notification:= ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.12/xfwm4-4.12.5.tar.bz2
-_md5_=64fad4ba393b95ea4b23b7fd6d36faaf
+_md5_=c323c4927d204b8a66d7f0a1cb0f59b7