gentoo resync : 23.06.2018

18 files changed, 309 insertions, 58 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index a099e9931263..120d7e2750a8 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 8a538fcd96d5..3c3bb57892a5 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,5 +1,5 @@
-DIST exo-0.10.7.tar.bz2 1262301 BLAKE2B f9a0454b1f5f125fec49de834bdefd12ad827e88a852596315090cca92f92628d594fe609a35b9f926c4d19ac67fbfa60fcd5e277d6cd69082b27273ff17c823 SHA512 5a872e6895595da027f403fb7951922c40481d53242cb4d9c3da2d36690c61dce2fdb34ba0eb39367558a5e3055733af25432d1f3a8f60984b7e2ed997408b60
 DIST exo-0.12.0.tar.bz2 1310691 BLAKE2B 6acdfe0b3cf7b19717d17c4acc7973bc8e27e963b4213376061cee0bec72734303ed75b7bfd8d8cbe1da98af4a9b43132657ade0020f9d26add36aa77c184ff4 SHA512 8ec52aba3faa9728bb60e09cf696f772160bfd8357c06015a6d72a2302572e74389f78a20addcf3ac632a3ac84b3ee2f40750483a16e2f7e1cff7de6f7aa2692
-EBUILD exo-0.10.7.ebuild 999 BLAKE2B 494d2a2c795f897b4407c7a87e7fdb507ff2dcef5f3bd100a8b018428eca4668aef4aeacaeadabe8639f29f29c35007ff30ee782734c515f0280ad6c2dd21e37 SHA512 ada3bcf2c65344bf189bffe809352ceafc16368a5fe7fb543f861a4c51df0d384c553f6e46fa5de513466ffa9e6c63d70339916296404442565578659d27492c
+DIST exo-0.12.2.tar.bz2 1321379 BLAKE2B bf17b8dfb6489b5c168893599e67bac603e6915e78930d0d460e94d23a60b53e720439653358c2566083a3773cd5bb898da5210200a2c6dfac7ca9b730ca4aaf SHA512 771c4e3c09683ccf2d028a5203d4b2af0da38e6ae97baa7825714ad6e2e81d128d9238d060cdd80c95660a0394b632caec3e31df1f2cc28b1fed8ef19ee2011a
 EBUILD exo-0.12.0.ebuild 963 BLAKE2B a32cbf86a3ccdd2e58bb43c5571351186049862393cdf570ef6c5d8427b7ea5abe13544d73a2f7065441a07f1789e249d3b918ebb39b424f01f76dbeb064e74b SHA512 0627ecf7f0c795afafa54b19c2e090236d5842d105e45068c697d32b5b40b123a53fadb1f00d62da9d5557a961a7b14317323618029c3ee25f20117c91983c68
+EBUILD exo-0.12.2.ebuild 970 BLAKE2B a190fe9e1304fffac4c0957f83364d1be961cdd7b1f567e5aa15b50559f3c9ba39ecd168bfd3ea332c858bc794747bd9ca31b1d3de540037871535a095446b99 SHA512 14acbe8df6cb3fa1e3d5fedd36121de002e892fee67a2c55ab37dd36e06c1bebb43a0f21c4b2527de79321e4584e26c2a8f14566785e8144d980813fda66a3de
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/exo/exo-0.10.7.ebuild b/xfce-base/exo/exo-0.12.2.ebuild
index 4f487bb2ba83..40a8273b293e 100644
--- a/xfce-base/exo/exo-0.10.7.ebuild
+++ b/xfce-base/exo/exo-0.12.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xfconf
+EAPI=6
+
+inherit gnome2-utils
 
 DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
 HOMEPAGE="https://www.xfce.org/projects/"
@@ -10,28 +11,31 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="debug"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.30:=
+	>=dev-libs/glib-2.42:=
 	dev-perl/URI
 	>=x11-libs/gtk+-2.24:2=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:="
+	>=x11-libs/gtk+-3.22:3=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:="
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(xfconf_use_debug)
-		)
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
 
-	[[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
 
-	DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 255779e5e17b..aa039043ca81 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,3 +1,5 @@
 DIST libxfce4util-4.13.1.tar.bz2 497192 BLAKE2B 56ec5929df43e2c430c45298a2f7634a539ef1f32598ce4cd038659c93ed5de4f28472f744ab03e3cefd040266c1e1bd415c8b4e9489be8f3930bd6df8d1c5c0 SHA512 1667cc22ff72920d3280725cb40c41f5fba9dcfcba8e357ba85548c7f254a67a3ef942c1b71f0ac5c3a7fe46c8c4cb559a06a8111aa71ce1f6824d1a1c2b5063
+DIST libxfce4util-4.13.2.tar.bz2 509280 BLAKE2B 40f1fb95abff4857e976dd5f3ae8c8ad5e66e2c1c49723735e85124db71d30f204525cd74baf22e31bf405718f378b0c9ac37ec4189e1f4b9941d0eb6fc141ce SHA512 3bbb718f3a6d2213c86695b3f99d1e67c859ce635e5d066b18745d2ee57c0b2eea468b61079d8e2514c2d8f5fa847539d236ec0ed3fd17fecd9d1b36dc3595c4
 EBUILD libxfce4util-4.13.1.ebuild 844 BLAKE2B f471a8a51b57b9f4ef8ab3d8861bf7640fe3f25dc1ddf9c43955185b6c10ab05e3e7cd7b49c8516f0a5b6a6a9ded3cbf16e928b113aeb4f82b91839c951c0fed SHA512 7a93bbf44afcf3fc24452d905535996e0a0ae6af27f9a7da06e61ac847de4a9ae75cbeeccc36b49ae55f03b27f78317f29489a36df1a5e789a8fd72e7db8706a
+EBUILD libxfce4util-4.13.2.ebuild 1040 BLAKE2B c52757969560b71249b0441467635b31ae8fbafee578d074599a2f0f3c50e262067560f37d834b9d4e71124a7a0e54cc14043b5bc0c5f0b0a3dae9d79ef2fe05 SHA512 755727b0dc33ebc56ff1cfc68ecb53876f7ee6a0876b1aaa42f40d7be70ad7e7d6c6d34ef261dba8161ce6ad811265d83c3eb8bb9d3148bd5d1e8d9be29a7f1e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfce4util/libxfce4util-4.13.2.ebuild b/xfce-base/libxfce4util/libxfce4util-4.13.2.ebuild
new file mode 100644
index 000000000000..6686fd3a1762
--- /dev/null
+++ b/xfce-base/libxfce4util/libxfce4util-4.13.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vala
+
+DESCRIPTION="A basic utility library for the Xfce desktop environment"
+HOMEPAGE="https://git.xfce.org/xfce/libxfce4util/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND=">=dev-libs/glib-2.30:=
+	introspection? ( dev-libs/gobject-introspection:= )
+	vala? ( $(vala_depend) )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# stupid vala.eclass...
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable vala)
+	)
+
+	use vala && vala_src_prepare
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index ba619a54ed86..b90f598766a8 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -5,10 +5,12 @@ DIST Thunar-1.6.15.tar.bz2 1964447 BLAKE2B 07dd4241f5aad975ae8f3c4cffb1b40338fd3
 DIST Thunar-1.7.1.tar.bz2 2264496 BLAKE2B 84fc0ae18ec4d4bd414bbce30b6ba7f1f0c90de6202d8b830335fb49561c85428ee13753bdc1cb810713e628b977aacf78c93d7bd88c9ac90e3a78f8d74f5737 SHA512 200d2f7a30529fa9a93340a24d019a883193952157f3b37e67d4618ccff95823dfa06f6b04845d185fcb5ead780ea5c69ba9b846c82ea22bc433321b2b160ffb
 DIST Thunar-1.7.2.tar.bz2 2236176 BLAKE2B e7ebcd8b74295539edfeed710cc25204691af3eaa1c84dcd9b56399f5af2220aabc9ce2736f03c7c1bfe9a61600c6acc4f659ba8d56e575f0e4679a644f1c459 SHA512 b98b72558c9a8872f89632820be816f2c2e7f7e07750cc62eace741794cde4aa4daf2f4ed7fd52a5b1e3c4e9965925a038a948124d32ed6d392db65b8780ccdb
 DIST Thunar-1.8.0.tar.bz2 2240878 BLAKE2B 03b77fe7f7695eec3430c7c6350825b9fcda76ffab408461bbf6e7f21f76bd8cbab05caf144222471ab7225086a2a7e541bc4777593abfb6bdcd9bb0c22db287 SHA512 4f0cc00904e9e7f02d2cf79fe36bda4857c1354917f656a2376c73bb755c3dc359e277f3a050fa60754f9adfadb75cefa9287334f6a97c1b4ebdf1f63545da4b
+DIST Thunar-1.8.1.tar.bz2 2289891 BLAKE2B 79ccb1408bcacba7ed50536f0a8e622d2e251fedf4b0ffef425f1e0926dbaa93ccef0fa751c8362cb420eef013f9f442de3fe58d411558dd7b9cb5751d2e89f4 SHA512 89aa29af5e272d58c7de02ba1c96d7f0c32eed49cda9621ef863dd679712cc653f58e729e49b9dc3d1626c9b8ebe2b18a2307e00c7ea1d1d2b42fa71272aced7
 EBUILD thunar-1.6.13.ebuild 2023 BLAKE2B 44188d0301976e69b8889e67498199a66c7d5088165be529790b05811a54928442067a4c4b778415a8443a9a4c9945d4a9fa356f06484af35f412183c049964c SHA512 55c8db9c7651b7a72f3a58ce02fef6a91f3ffdd4266e1f4b84e3849c77f2d9bd8d1e421493926d3206d621f82285c56355bc423fb130eb4d049491ad2a74541a
 EBUILD thunar-1.6.14.ebuild 1959 BLAKE2B 0efb287771c2dd2b78562b29e5e8767104837f2840b08e08fe9a533c1604346e2f723dd8e955bddec165762fe93e84ef620c2e42087ebad7d8de871e43f80c6e SHA512 4dfdf6ba9f10d23e5104a7a7c1f0ea4d81a85756605c4f925a9d6e471fe5bf96cc1b3b47a7374031228ba57e4d281e6d4ce972af9963a24e5c6d2d893b5ad7db
 EBUILD thunar-1.6.15.ebuild 1966 BLAKE2B 26b9fc6171eed41563721f89aa5255b9b7aa8802a9d95270ab35bdeabb8baf12ba524e91816d363d94f1ac2b4fdd39ebb80c45bd9cac97aaff6e30d92518430f SHA512 0f858769d7f8f05cd8cf2d1c92aa3f9d52bea3e600cd5da764383a98d05ced3b33a5eac868bc37ad5b70400a3160555973f0c4981a7d000f2c88591f576acde1
 EBUILD thunar-1.7.1.ebuild 1993 BLAKE2B ab5c787b9798f19b683709d2d17818cd40b28c165497121d0f8d778be45c45fc3d13ef97ffa7394530eba9b75156ac4d24b6028b816c54c606bceb4dd25dc6a5 SHA512 6a27b9e39078a223028ebceeb2fbde6e8084d35f4ae6cd51885937787ea98cc3510dc876400ca7c6b98b769ae8e4ec02e89be564153e87e5bbc8e64446781d73
 EBUILD thunar-1.7.2.ebuild 1993 BLAKE2B ab5c787b9798f19b683709d2d17818cd40b28c165497121d0f8d778be45c45fc3d13ef97ffa7394530eba9b75156ac4d24b6028b816c54c606bceb4dd25dc6a5 SHA512 6a27b9e39078a223028ebceeb2fbde6e8084d35f4ae6cd51885937787ea98cc3510dc876400ca7c6b98b769ae8e4ec02e89be564153e87e5bbc8e64446781d73
-EBUILD thunar-1.8.0.ebuild 1993 BLAKE2B ab5c787b9798f19b683709d2d17818cd40b28c165497121d0f8d778be45c45fc3d13ef97ffa7394530eba9b75156ac4d24b6028b816c54c606bceb4dd25dc6a5 SHA512 6a27b9e39078a223028ebceeb2fbde6e8084d35f4ae6cd51885937787ea98cc3510dc876400ca7c6b98b769ae8e4ec02e89be564153e87e5bbc8e64446781d73
+EBUILD thunar-1.8.0.ebuild 1995 BLAKE2B 6378212643bcc55285a5cc9bc7a7ccdc7a2605d2bfcdc32c30db03c5b79e7d9f45c3954391e499444eb747e1cca6355f8aa9e7bf3f4dd3e1ab27922df7c82466 SHA512 ad9e50839f59b7ccb8398cc7bb6e00f753109fd7a91dfb2ba12c5d2e5ee224f1e34627f17b6f39bb4d96db77c772ff5b8dc5e1c964509e20865f4598c3a37a66
+EBUILD thunar-1.8.1.ebuild 1995 BLAKE2B 5cf34cd7ffde72b943e72a51305ae1234c776ace2a9a77bd20828588f3c225dc502071623b82bec665dd769367210830b78ae44c0231af6ed920aca5efb07e41 SHA512 88f81d19207215b9f14b53bb39be1cda22ba4bc1a1da71feaef5771f1c9e07b9817ee45919922b1bfa757703814e864e20ab2bd2bbf927ae59dbbe70d1ec5e6f
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.8.0.ebuild b/xfce-base/thunar/thunar-1.8.0.ebuild
index fb1e05deebaf..06c8c90c8f87 100644
--- a/xfce-base/thunar/thunar-1.8.0.ebuild
+++ b/xfce-base/thunar/thunar-1.8.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
 SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
-SLOT="0"
+SLOT="0/3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="exif introspection libnotify pcre test +trash-panel-plugin udisks"
 
diff --git a/xfce-base/thunar/thunar-1.8.1.ebuild b/xfce-base/thunar/thunar-1.8.1.ebuild
new file mode 100644
index 000000000000..56c3d89950ef
--- /dev/null
+++ b/xfce-base/thunar/thunar-1.8.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils virtualx xdg-utils
+
+MY_P=${P^}
+
+DESCRIPTION="File manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="exif introspection libnotify pcre test +trash-panel-plugin udisks"
+
+GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
+COMMON_DEPEND=">=dev-lang/perl-5.6
+	>=dev-libs/glib-2.30:=
+	>=x11-libs/gdk-pixbuf-2.14:=
+	>=x11-libs/gtk+-3.22:3=
+	>=xfce-base/exo-0.12:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfconf-4.12:=
+	exif? ( >=media-libs/libexif-0.6.19:= )
+	introspection? ( dev-libs/gobject-introspection:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	pcre? ( >=dev-libs/libpcre-6:= )
+	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
+	udisks? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/desktop-file-utils-0.20-r1
+	x11-misc/shared-mime-info
+	trash-panel-plugin? ( ${GVFS_DEPEND} )
+	udisks? (
+		virtual/udev
+		${GVFS_DEPEND}[udisks,udev]
+		)"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable udisks gudev)
+		$(use_enable libnotify notifications)
+		$(use_enable exif)
+		$(use_enable pcre)
+		$(use_enable trash-panel-plugin tpa-plugin)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index cd00a1376aea..b79bb6aa7f5b 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,8 +1,7 @@
-AUX xfce4-settings-4.12.0-HDMI-power-cycling.patch 542 BLAKE2B e3c46cd52b11e5f5960fd1ed5234758348678c5de496f95532fead40b3e2c8faccab3aa6d10bd9b8b918a9ed5cfd8f06b891ce19c9a71680c2c9a45a3d7bcc87 SHA512 d38cf790a20e54899b31db28e7cf5e683196e91cc6f4c48732f526d2a44e9235a0ee4331a26fe01e088a2bbfbe61fefd4404e9e56794b0b1f9c41e2530bcc0be
-DIST xfce4-settings-4.12.0.tar.bz2 973324 BLAKE2B 2c6103ac0d43c89f523e530d2eccc0974b6a67a9206f300aba8630b6ea819ea16774141d92647e7b3682b437555a75a4c0a8e06e4abf593a302010342dfb3a10 SHA512 4a61c16f1f03de98c9968a00b50595e2934aaf28b80613c59403d33a293a7f8ef9ebb6fad98b0eeb97a6590b9100e91f73dd6363133d5d8bd06714f1126d8856
 DIST xfce4-settings-4.12.3.tar.bz2 1035504 BLAKE2B db045839ea075d08acbad2bb316a4b577df959312146f8487e667c1de3fe69d129e9c80a21b97834e7f86598d776d7aaf7104f7640429a45a6d02ca3ca6c8bc4 SHA512 46bde0de70d8ebcc869ea5ba4f3eb0f123fb2e6f16e8a837c301e445044d65d90843fe3c8274a53818099112e43ff6217dfffd32bc032560331f5ca5fc5ba3ad
-DIST xfce4-settings-4.13.2.tar.bz2 1043277 BLAKE2B acbb2b78ce7002afb1489491f0cd856b42ee7db6441a908e1244aa22a0bd497de4ba11bd31cff33d2c4a5f0a94bec6a63244c7c493d15deac7d8b5016ec8c0a1 SHA512 3564ee50914a6cb1955457c2b7bc5b515815142b04df418c70ed87692bc9aa87365af61682f07a5d979501df0fe32fe229f5be927fe0233855dfd9f454ff9643
-EBUILD xfce4-settings-4.12.0-r2.ebuild 1549 BLAKE2B dc28fbb30ef2a2d570f58e2da0c9455587134610a52e23d36fe1dd17cb55783576abd1e74affb7f4d667a0958db4023cfacd46897e6088b7fb8c053c212293e9 SHA512 cdefe4d13cf1257474f4e9a49c409d682e72ef14a256c445dc2bfb61aae526d8f7c8be6dab29d2eca2aee2685ea61d744ea8a6b8c94bb24bb8b1f5d646ac3aca
+DIST xfce4-settings-4.12.4.tar.bz2 1036773 BLAKE2B 512547a172081d75e7eeb97f499e77320a3df1090e80ef548dbbaf84d454b614ddb6a36bbfe4cd06d18b478ada7bd76f385dde374a93380f848ffcc232b133d3 SHA512 9b74daa3f98f15c8cb696dc79f9913fecb37f2ca44c2fd3f24865ae03e9a1db93cb5a8ddb27da3c4af7d7a9e9d718a22e46188ff515caf925a5cedfaab37b189
+DIST xfce4-settings-4.13.4.tar.bz2 1046733 BLAKE2B 8694a72e32568b963d4c754faf578ac3e651ce0be5a4b650a45393822fcb6102de4ea9ce0eb16c387605ddecd763057dcb622ef60ce546aeca2d42d3ea5561d0 SHA512 39e2adaa93e2d86ff51e47f194306e57d025c13b5c07ee76cad7f67994f26fe03677c5a3bac91d1db4a25201371f6d135f36eed110dc15a1fbb46228ee715893
 EBUILD xfce4-settings-4.12.3.ebuild 1527 BLAKE2B bb69fa67131a081117931aec36501ff7fc15fb82735f14acf281e58c4d396e67972442fa6f1734cf30c65a97db1ef43a0aab2f19fdec2a4a77d8e0b03a6ca340 SHA512 d0849b13ef3be178469e9fc505f16d156a4a01f6448b29810d9b3fec614d4710b788750de1105f0ea78a69f20274ff4dceda0c95451c516988a9709acea82b7b
-EBUILD xfce4-settings-4.13.2.ebuild 1528 BLAKE2B 220106031193b56f8704aaebb460c2f31752ffe00a87a1f13a97506fb24b268c7ece40d9713a8db764fba8815a6c0b0eb95b22cd9aabc329de9ee2a76d09883f SHA512 8b585a153ea4dc9f8f3a77ca15dc874aefc81cab4ed48dd664e2f5c0d678ab640844c1001423550c293c7c766dc3ce1f96fef940de59df0399076184fa99ff36
+EBUILD xfce4-settings-4.12.4.ebuild 1534 BLAKE2B b59609f030b4bbaee835e5256af079eaf127ec934c2d06a31c7a8a9f1d3e2882ae744635509194e9408960c8a5c7348b9843a8eb35f8ca588a3aaa647d21905b SHA512 c1cad13e57e3555df0f9aac83c003103c5a971553496e07f27f9b22d62c5e43af975acf9df3860eb018874b0a422ab23c88b4f3c87b02df1c5d2ac07480d6f30
+EBUILD xfce4-settings-4.13.4.ebuild 1526 BLAKE2B cbbc0aff77bd2988097901f46cd55905e5361e2fe1008fd1ff7d61678b2fdc50cc035dd4a87849a5bcdfea2ff01e9e2b24f1e30fa51a726772ac5ae28390cca3 SHA512 9b96f377cedfe112f55f22a8d45632e3f91eec08b8b2cca14e0d49fb60a83d109bd026056218b7191a291af3f75770671628841d1808f0ef206f030587d75e43
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.12.0-HDMI-power-cycling.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.12.0-HDMI-power-cycling.patch
deleted file mode 100644
index 895dd58e1b1d..000000000000
--- a/xfce-base/xfce4-settings/files/xfce4-settings-4.12.0-HDMI-power-cycling.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From https://bugzilla.xfce.org/show_bug.cgi?id=11107#c3
-
-diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
-index 3497804..449500b 100644
---- a/xfsettingsd/displays.c
-+++ b/xfsettingsd/displays.c
-@@ -368,7 +368,7 @@ xfce_displays_helper_reload (XfceDisplaysHelper *helper)
-     xfsettings_dbg (XFSD_DEBUG_DISPLAYS, "Refreshing RandR cache.");
- 
-     /* Free the caches */
--    g_ptr_array_unref (helper->outputs);
-+    g_ptr_array_free (helper->outputs, TRUE);
-     g_ptr_array_unref (helper->crtcs);
- 
-     gdk_error_trap_push ();
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.0-r2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild
index 4255798bb473..553d8cc61269 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.12.0-r2.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit xfconf
+EAPI=6
+inherit gnome2-utils
 
 DESCRIPTION="Configuration system for the Xfce desktop environment"
 HOMEPAGE="https://www.xfce.org/projects/"
@@ -11,8 +10,8 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug input_devices_libinput libcanberra libnotify upower +xklavier"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="input_devices_libinput libcanberra libnotify upower +xklavier"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
 	>=dev-libs/glib-2.24
@@ -38,17 +37,19 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	XFCONF=(
-		$(use_enable upower upower-glib)
-		$(use_enable input_devices_libinput xorg-libinput)
-		$(use_enable libnotify)
-		$(use_enable xklavier libxklavier)
+src_configure() {
+	econf \
+		$(use_enable upower upower-glib) \
+		$(use_enable input_devices_libinput xorg-libinput) \
+		$(use_enable libnotify) \
+		$(use_enable xklavier libxklavier) \
 		$(use_enable libcanberra sound-settings)
-		$(xfconf_use_debug)
-		)
+}
 
-	DOCS=( AUTHORS ChangeLog NEWS TODO )
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
 
-	PATCHES=( "${FILESDIR}/${P}-HDMI-power-cycling.patch" )
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.13.4.ebuild
index 7164a73dcb59..0d6ecd2df123 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.2.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.13.4.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="input_devices_libinput libcanberra libnotify upower +xklavier"
 
-RDEPEND=">=dev-libs/dbus-glib-0.100
+RDEPEND="
 	>=dev-libs/glib-2.24
 	media-libs/fontconfig
 	x11-libs/gtk+:3
@@ -32,6 +32,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.100
 	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
 	xklavier? ( >=x11-libs/libxklavier-5 )"
 DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
 	dev-util/intltool
 	virtual/pkgconfig
 	sys-devel/gettext
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 520cbe3794fc..06b31bdc482a 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,6 +1,8 @@
 DIST xfconf-4.12.1.tar.bz2 564131 BLAKE2B 893210f19d743559b0879e9e38004400c8f8af0b6b8c72db4602360eee2ee7058f074e86f2f9e4397f6e728eae0148d3621424461d53e84ad768d7f0673ed08a SHA512 114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f
 DIST xfconf-4.13.4.tar.bz2 598700 BLAKE2B 05d4f7e360359e8d56b8a4cf6a39f22506113a758861fb730d9fb858f92554af3e28c49a21ceb246f8503087bec1032d430b16df999f7db22c56d3d3cb12ad68 SHA512 17c4c2ff4b02eef2d3040c21120e34863e4b38794d7670e42a31e4062a0ba0d4064d4239e8166a2c05d5d316773fdc96ae6098e78ab9b058b9c5a31f94c7f3dc
+DIST xfconf-4.13.5.tar.bz2 609549 BLAKE2B ccd5e907752d8fa5b5c4a7468c9eeec4083709bbe11b14ae79b20938e3b7c6ff097805be56b3f8cee146e2d0c0ffb272b856e559d1699c4e40d7c140fe7515fe SHA512 34e6b99be0b288707f8632c5fe4f2e66e01ec3950f4d194a7007afb4bc1cfe8bea44f8f80873de2364680481921332c9860b23bca4ced94ecb95c9199df5315b
 EBUILD xfconf-4.12.1-r1.ebuild 1822 BLAKE2B efb440814d76cda63c879f32a9476fe3982b649b80667acb909830259c83dcb154c189979244ea5764d4946cad6c90f9281716d2febdc6e34cf86c6c9ef737ad SHA512 be35dca28ac0c084195fc9f6ff6cd30634593cbe7f23437d352dca00428480b57bf2244830d76b39ff27632651f010753266f231002dbd45a5bc7138a6dd526f
 EBUILD xfconf-4.12.1.ebuild 1496 BLAKE2B d5f1e391025f6339da53bf505ccafc5bb29ea057d294134a0169541d8983ff3d780e9cd1d6c6cbb49fce41716b741920fbc8cfa103f86f9af817dc205e33a341 SHA512 9b5165e8d4246cba0eb0d3c37f1dbc363385bd14f24f06b4159cae98169c924a60563ba897ec6891bd860c8f93cc1ec67f154cae2158311a6b20bcc8a21d41db
 EBUILD xfconf-4.13.4.ebuild 1614 BLAKE2B 35e383b99237f8e84def2b182c441dc109b1c7f207a7cd11de4d120055ed27a635221457fb3ba1ede4cdcfbb00d191a9e1df90b8e3fba975334b5115071a3694 SHA512 479bcf4cb0d7be46ca871186e1ed202964cdb1a6ad86fddb246773a6a93bfae5908ba409ba53c6254e6bf2107c1fcf5c04a2ade04c6b318d643633883907ccee
+EBUILD xfconf-4.13.5.ebuild 1614 BLAKE2B 35e383b99237f8e84def2b182c441dc109b1c7f207a7cd11de4d120055ed27a635221457fb3ba1ede4cdcfbb00d191a9e1df90b8e3fba975334b5115071a3694 SHA512 479bcf4cb0d7be46ca871186e1ed202964cdb1a6ad86fddb246773a6a93bfae5908ba409ba53c6254e6bf2107c1fcf5c04a2ade04c6b318d643633883907ccee
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.13.5.ebuild b/xfce-base/xfconf/xfconf-4.13.5.ebuild
new file mode 100644
index 000000000000..d82d16a974dd
--- /dev/null
+++ b/xfce-base/xfconf/xfconf-4.13.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit virtualx xdg-utils
+
+DESCRIPTION="A configuration management system for Xfce"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug perl"
+
+RDEPEND=">=dev-libs/glib-2.30:=
+	>=xfce-base/libxfce4util-4.10:=
+	perl? (
+		dev-lang/perl:=[-build(-)]
+		dev-perl/glib-perl
+	)
+	!<xfce-base/xfce4-panel-4.13.1
+	!<xfce-base/xfce4-settings-4.13.1"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	perl? (
+		dev-perl/ExtUtils-Depends
+		dev-perl/ExtUtils-PkgConfig
+	)"
+
+src_configure() {
+	local myconf=(
+		$(use_enable perl perl-bindings)
+		$(use_enable debug checks)
+		--with-perl-options=INSTALLDIRS=vendor
+	)
+
+	xdg_environment_reset
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake OTHERLDFLAGS="${LDFLAGS}"
+}
+
+my_test() {
+	local out=$(./xfconfd/xfconfd --daemon) || return 1
+	eval "${out}"
+
+	local ret=0
+	# https://bugzilla.xfce.org/show_bug.cgi?id=13840
+	nonfatal emake -j1 check || ret=1
+
+	kill "${XFCONFD_PID}" || ewarn "Unable to kill xfconfd"
+	return "${ret}"
+}
+
+src_test() {
+	virtx my_test
+}
+
+src_install() {
+	default
+	find "${D}" -type f -name '*.la' -delete || die
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -delete || die
+		find "${ED}" -depth -mindepth 1 -type d -empty -delete || die
+	fi
+}
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 25ab632542af..346fc0572a6e 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,5 +1,7 @@
 DIST xfdesktop-4.12.4.tar.bz2 1421623 BLAKE2B a18b891d639165d617f2701106dedb2f8577273ece5a4c93f6b5e1ef26f801304ea2014f21bd2821eb9bac9b19e02dd75cd4054a116eefd544f4d8e5d6968879 SHA512 29f170b96836298dc83e3c49650ab7e88a93c1a2fa1599d1d98f3b6c80c9c059748b76a821077eea39b5b4619998bb300ff17f06e88483a59bd5ae2b76d0605e
 DIST xfdesktop-4.13.1.tar.bz2 1485914 BLAKE2B 2b991b40317c9d92b53f357d674078598a7b17dd870155de8eb360fd9998d5376582909b57a93e00628a7dfd7e65bfea22b7f57b9373bab869296ef9b2973af5 SHA512 efe5ffe450f498ee0188a1ca5efd0ef340d73b5650060f18db4fe94ae9130dd27e41c6b30af2f90839e6c8272f3e270d16b86df64d595fe82169c26d624f806a
-EBUILD xfdesktop-4.12.4.ebuild 1293 BLAKE2B f873bc525418e4943330020e327404ff21e193efe6fe839f4b3f5efbbb69e594bca309d1c349b1534b625b4797f054b34ed8248ec22185d54bde46bb4b59b1dd SHA512 b347815d11c3045613df97c6b9c41f636f8d79edb4b9c06cf1a2ad4cd78101043afb18854f9dc5176e228bdebe13e691ca9d32aab8a0cedf46d01939e08a5124
-EBUILD xfdesktop-4.13.1.ebuild 1269 BLAKE2B 91c7ea39e8c021e64f07bfdd91edbc7fcaa4f2f1277a7b47a32e781eeb1270cfbfdb27dfb0685661b1abda22237f8899a54b54d184730bc4332d4e72819f794d SHA512 8df648b74234353c6e0bb4b6efe2bee271a2e4071416721cd927a2e8ae9ace3e99af1b5492b4347392ce5e0ac303568ea08c32015f1bbedb48c5f3921e0a1d80
+DIST xfdesktop-4.13.2.tar.bz2 1486455 BLAKE2B 38ba5da7172212f74281f60688a581e525dcbb91ea381f8fcbdef57f90b54b9c21d08f20f3b1da5c91dcab158c2a7ba415822ec7b1f92f1cef80e53624a1f741 SHA512 0002ed639f8554144d8c921ca5bd9d1c2ed634baa11c98f95685c8a636ae6bdc87f8df19aa138fe4eda591facba964451a10aef6ba303be1fad66013bb06ae13
+EBUILD xfdesktop-4.12.4.ebuild 1293 BLAKE2B afee7c95eb813c38c160599c78a894870a18c3bd3b52030bbf568efaec03f627457ff8b4062c16f4e7e5baf7755647f7ca843e6a194a8d8161ee7cac7771373c SHA512 f310a9dae888e03bc2fb487eb24d4ae2f305aa91a5d14758d7af2f9b00254bf757d8005baedec59181014def8353b1ebde0825f45d615c062c5dee7c0e8f6dcf
+EBUILD xfdesktop-4.13.1.ebuild 1269 BLAKE2B 154710d7f9b611dfbd98ce74090ac9b95a65da9a716c63b18e283c3d1b1026a24b2811aa866cf06390437eeb09b03c941ab3502902511b0d2fb62cad47f71c16 SHA512 9c73c11f37312317b3f330f91ef062ca645f9db4d15ca55e9abe1b8e2b975be0a7a21fb1f2af81d4f6a59de2938b20bdb66956b681ae47bb3f1012ab319c83c1
+EBUILD xfdesktop-4.13.2.ebuild 1200 BLAKE2B ee9fab8f3f3490b4f0d83664b928de46900dfe9019b1567264e16781f01bd98638d702e655eb2e1ebade3d3d32ba4bc38d23d2dcb334241f69d312ba03f90486 SHA512 7f1cb8f934aefddf39e76b8f9ae867f691172166bc16e7a427af354022ffa5edf8c5c86c8749a449bc70d31da408607a4d490b549ffa1c3edff3ab0ab5ab9cf4
 MISC metadata.xml 364 BLAKE2B 64544c9e89e370bb213647843ebc3c5d4ca08aa46564b02830ff041e74db5018d7503106cba4e7c1dd562f359649974f12b841e32136eb73e9d84ea0ed36f456 SHA512 3140dbe5320efba5393874f93b907ef2dff1cc8dd44cda7340abaf19dcbbd709beb7649ac72f1e9f92da546e010f966cd9f5d51b867c6df8c49332bf9de67dac
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
index b2a1a15735ed..ddd5690a79af 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
@@ -29,7 +29,7 @@ RDEPEND=">=x11-libs/cairo-1.6:=
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
 	thunar? (
 		>=dev-libs/glib-2.38:=
-		>=xfce-base/thunar-1.6:=[dbus]
+		=xfce-base/thunar-1.6*:=[dbus]
 		)"
 DEPEND="${RDEPEND}
 	dev-util/intltool
diff --git a/xfce-base/xfdesktop/xfdesktop-4.13.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.13.1.ebuild
index b5ffb7e7d4ba..9eb738e9029b 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.13.1.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.13.1.ebuild
@@ -28,7 +28,7 @@ RDEPEND=">=x11-libs/cairo-1.12:=
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
 	thunar? (
 		>=dev-libs/glib-2.38:=
-		>=xfce-base/thunar-1.6:=[dbus]
+		=xfce-base/thunar-1.6*:=[dbus]
 		)"
 DEPEND="${RDEPEND}
 	dev-util/intltool
diff --git a/xfce-base/xfdesktop/xfdesktop-4.13.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.13.2.ebuild
new file mode 100644
index 000000000000..87c12c2ee90d
--- /dev/null
+++ b/xfce-base/xfdesktop/xfdesktop-4.13.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="Desktop manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug libnotify +thunar"
+
+RDEPEND=">=x11-libs/cairo-1.12:=
+	>=dev-libs/glib-2.42:=
+	>=x11-libs/gtk+-3.20:3=
+	>=x11-libs/libwnck-3.14:3=
+	x11-libs/libX11:=
+	>=xfce-base/exo-0.11:=
+	>=xfce-base/garcon-0.6:=
+	>=xfce-base/libxfce4ui-4.13:=
+	>=xfce-base/libxfce4util-4.13:=
+	>=xfce-base/xfconf-4.12.1:=
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	thunar? (
+		>=dev-libs/glib-2.38:=
+		>=xfce-base/thunar-1.7:=
+		)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable thunar file-icons)
+		$(use_enable thunar thunarx)
+		$(use_enable libnotify notifications)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}