gentoo resync : 28.04.2019

29 files changed, 75 insertions, 682 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 7a1c39602724..d519136c6c53 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 90c60a68e3bc..723d0f325d14 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,5 +1,5 @@
 DIST exo-0.12.3.tar.bz2 1233053 BLAKE2B 27cb6041778d5b0c93002f474d96d3a0ae9b02d651d3be047eb0e3d1e6640614c457fbac7557216c46b28008bca3f3be674e29e8be48243b6bf15917bae0c907 SHA512 1a727050b822aa4bdfbce22c1668372b10ddfd9c3988f6949ee32a5c5213d90e20ebafc923193c70dea373d217994fb42101fe2aad7bf55c8e81f983c5a2106f
 DIST exo-0.12.4.tar.bz2 1235738 BLAKE2B f05ae13bb5ec599686207df3fe7458b8a42227194c91c24397ed282d2c7a6ccf10989f14c662f2e0d986c59695de2b8d50743c8489bc716aaa001cbd23fe3598 SHA512 8f84258aeb5c1fcfe91e775af1e5fed02f36b3d18aa72d497cd05294d54f050d679628cdb4339219c67b203a8cc663704a240fc18e6a918cef363cf4d9b94783
 EBUILD exo-0.12.3.ebuild 973 BLAKE2B 430993a3415dbf13e10705eafd59f8f52baf428889dc7d76fe83a48f0110d56a0c79c8ebd388a9a672de599cb8ad9d5d0e9ae64151bd94cece7813979172aad6 SHA512 b1eb116c6247d62cb221c243a36b36775a237afe8ceccfb643b254ebe97e74cf5539815e52ca8b55770e7a14351b628d83be6755747c1828d3149191ea2d90f1
-EBUILD exo-0.12.4.ebuild 980 BLAKE2B 531ece9d9d94c6ae24077a7f94ae93ba00a78163080641a139f75d464dc6905ce5ee18112fbe8ba0c1b2f466ecbdb44e0daf546b1110912343c36a226cc67382 SHA512 8a0a68a616517db15f374066720eafd2733915bda0b2d8cc7c6318dd6d12f8f96bc6af45e690691ef9f0e4c080197d102104301ea243ce835e8f879886a20abb
+EBUILD exo-0.12.4.ebuild 974 BLAKE2B 6ebb54a4157f3024f7f9502acbfe23bf2211dcd8cc4c6fd06bff00e0cb595b4f33040a32704ededdbf36551acd6106906848f36e3fb631fb3e67fa98e425e40b SHA512 a8bdc535037c1114ee8f8f0b1a52015d13e4601d1dd775db0630a650e627c965ced0317c2984cb3f01a09358f6973e78cc6eab968919bbdd0325a78c3e4f6663
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/exo/exo-0.12.4.ebuild b/xfce-base/exo/exo-0.12.4.ebuild
index 18ebb2a6602c..609b0f8868eb 100644
--- a/xfce-base/exo/exo-0.12.4.ebuild
+++ b/xfce-base/exo/exo-0.12.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/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"
+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
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index af25f94b578d..df761005845c 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,5 +1,5 @@
 DIST garcon-0.6.1.tar.bz2 511415 BLAKE2B 03c9076d8507737ed64b48597ff53c4cb3ae9beafd14b28d4d61fc29fa007f5ac4757f96ba0dc56c8b069a4eebd5d38202862856f96a1b08474de2aa93d518ca SHA512 36c5b1ba3c91e613853cd5e986176c8cbd2a509fafde1b302334deda872b7f7073fd06ba341220b030d8d5728346b7339368190b225203f33c023dd96f3ed1a3
 DIST garcon-0.6.2.tar.bz2 539745 BLAKE2B 1bcbb136cd525f1280f6539ea447b4b84f935297f6bd4391407e31925cf873fdd0cfbeb70dba5ce882e4620f1ce7b89d51c9c26232db88b1202f5a0fca3f6175 SHA512 7a96c33b47302fa989862098bc5b8ed64515a60e19a4b8dbb049398cf847d64584f93f85b1f6e1327653b22f0b44a805b737258bbc9ac69197639ef7f13f20b1
 EBUILD garcon-0.6.1.ebuild 1045 BLAKE2B fa3a310133435fa9bb0536e2d69173d6b10c49b992c3a58115812e1c96d720550c55589ada3a91e026d0b81b42cbacaa0a7d6c33e1c3a5099102e16a421f83c2 SHA512 90611bac1fda29c045e05ac9112da1d2753ba135077f7a5f49a87a80445ef854cc452ebceb0c89188167adfd514ea9e9554de35f8c8749455a1b4e82f73eba93
-EBUILD garcon-0.6.2.ebuild 1047 BLAKE2B 04c97745872eeb5d5849b6e3378e3a97bf410a663104a6c5eab96e1dc3662523f47640f48eb4de539312b9c5ccdf1eaa29e58e1aaaecfbade12c5c20a49e0614 SHA512 c214a53be6bcf768db2d5d78d6219d6836274cd7c54f617d012ed4ee911fe572d1f0fcd810c5cd7250a81ce2ae035d61f6b2ff3a9cba8adfa2f77293e52df1b3
+EBUILD garcon-0.6.2.ebuild 1041 BLAKE2B de746c02621aff776afd9f78edacdcd362cfe0a2e9f726a45c8a8098236975d8857e009968d24f8810445f65ec4b0fc34a28712879d93b52bda51a80dbc77dac SHA512 ce4721343a9a416eec1d9a1766f00133992ddbf5d3ffaac96f90ca1c1e0451c9685d0baeb927a6fd2ee9160c1823473ac7cb29857a5818eb291cd147765e7c31
 MISC metadata.xml 395 BLAKE2B 13ea597065b0ffcb8a57e82f980dfa9b271a16f0c6ba824cb66f551d7bd6c49946985d1391a28360c4160bca5b88cc796b578b23f0b321d1670ab9f1c0addf23 SHA512 8783901107619bafc30acd3962284cf56376a14cd61039f862e1a7f0b5e17fc9d51f0e278c85161fb8b42c53b132a1ae7abe00c7e933eccf2ce3b74fa9956d54
diff --git a/xfce-base/garcon/garcon-0.6.2.ebuild b/xfce-base/garcon/garcon-0.6.2.ebuild
index fa58d50f7a3f..ef314194e25d 100644
--- a/xfce-base/garcon/garcon-0.6.2.ebuild
+++ b/xfce-base/garcon/garcon-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+gtk2"
 
 RDEPEND=">=dev-libs/glib-2.30:=
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 6402ee5397b0..5661062ec618 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,5 +1,3 @@
-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 855 BLAKE2B 5d068475a5308444ca458473055b89405219724e488a68e87f3f7424fc8d4af16be61bab01c4f3275ef611cf312128bd693cef4915f8e6d7aedbb686be014dc7 SHA512 1552c7de2a1f63c48de4f4ad7eddad4f8dcbe0d98f79693aa3970fadfb8cf980672d60b44b26e146a2a6e0dc875c3c39bcaa2665eb4fe302bffea4e1ef2af7cb
 EBUILD libxfce4util-4.13.2.ebuild 1041 BLAKE2B 8b023aafc1f8ecdc8b28fd04ba157b8aba8acb5acfa9c632ad0430a388860385a4b94d6288ee11a85236f89eb0468dbb6317ba8378dbf0e5700d7dfb2e5c787a SHA512 91cf34ea64d24c21d603eef18e95c8d2164aaa9825fc3a2056cce5edb40564fa796e2975374f9a2c78ec97b6d180c5b6573ab23e9f895990a437e258ef9fea52
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfce4util/libxfce4util-4.13.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.13.1.ebuild
deleted file mode 100644
index 0c4f2b0bc59b..000000000000
--- a/xfce-base/libxfce4util/libxfce4util-4.13.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A basic utility library for the Xfce desktop environment"
-HOMEPAGE="https://git.xfce.org/xfce/libxfce4util/"
-SRC_URI="https://archive.xfce.org/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"
-
-RDEPEND=">=dev-libs/glib-2.30:=
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 54558fa87215..68a7b365aa4f 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,13 +1,7 @@
 DIST Thunar-1.6.14.tar.bz2 1964822 BLAKE2B f080f3d0634b4b4a8e11cdb902d5f300b1829979a98b573bdb6fd11b273cdc5e37f8e8c03556561b9f8730a70c7f7c34cbfbda76fe90f86cf2c443c3f426aabe SHA512 63287e35e71a6d1cb75a4d4db4d05f0fdf34d43b0ce7a2094e6aa9042d16f3eb60f7c5d755810bb0807112177e37954ba566b4f0ef701766205ed9e5561bd6e1
-DIST Thunar-1.6.15.tar.bz2 1964447 BLAKE2B 07dd4241f5aad975ae8f3c4cffb1b40338fd31f5434fb436a2772a9671673b4b124ac4363dd7c1267b0b51d42550735bbb733ada16f77a5b89176a353c84edbc SHA512 836d2d10347915b2e03be5501806e358af1c60786284c5e5afa11a6a79bc6a790966ea43bd9add6783fab91b08f06ae7852c21152f3aa0f29814325a16d65a7f
 DIST Thunar-1.6.16.tar.bz2 1977562 BLAKE2B efad6b45a64c5c80bff3d829207a1a0b45b4b48ab168c38bbcd263445a16dc230b0c5ea7515b65d686cbf256d294bcced19b248c252478a6a1cecb393d71a7f6 SHA512 6c7b8b88e01762e606bfd9e3848a98ae5825ff431f0686dd7bbcb987e448aa4c20d7cca3fb6b7c5d5dfde91ae6f8a16e674769d168f6f875e2efe519f4cdfd1b
-DIST Thunar-1.8.2.tar.bz2 2274521 BLAKE2B b5460a4bc5dd6547b8d620fd60a506899b4cfe6fdbadc46c9e7d259bed90ae5f98de2fa337762f8cbe5c7bdcb020ce3afd3d942763f0ea5aa84d1d9ceb47154f SHA512 c770fae8b6e5e0e42148ed2b9777afba5159783e5fc716eba1e0499b5390684f386eb575f1a608814bc118bbf05ede34c6737e28c06470c4d01717b579308ec9
-DIST Thunar-1.8.3.tar.bz2 2348196 BLAKE2B c89ad2a763b3aa6956e32777c7000fedbb8448704b11cfdb979e350a665b3ee3f43bc065af3fbd396c6810438ba5e49515204f40d68a2b2217fd4e18019140da SHA512 f584d4f8a474797bf422101c2eb21fe08e10c3ba0b842ac157b1016c49e164069181db9393c2c46c376e012bf0fd6ef693fd203175392368b5e30d5f44ee986f
 DIST Thunar-1.8.4.tar.bz2 2349249 BLAKE2B 4f1ac9c3177587b5ff2f3acd7220fb08921fc9db9711dd5925b65068db9bb14e7cf9d17834a96395c3fc27927030dbd2ba70d08c5b14d28e4aaf553493bce5f2 SHA512 886c0789aa19c2ab2ef34892c4afd09c857585b4796140ea3c84ccb9e1e1ca2935cf7e3a760a6ca8d8c68a5866663412500b4779878c7f48c9365c3ac7bf0eec
 EBUILD thunar-1.6.14.ebuild 1970 BLAKE2B 83e3ce6a0c069817781c5f62d32cfe60c255aadce6686821e1bc42190089a57a05b86bb2d0aeac07a6877b97ae9aceaa2690628aa2bc620c810bde3289b5903d SHA512 5bdf24285de7371faf55ffae6a820c40af03a77aa5e4abdf2c1c359efb7bc8440ccec58075a70aade6689d1f2e63f7deb285635665882f93df4e347ae624f2b0
-EBUILD thunar-1.6.15.ebuild 1977 BLAKE2B 9776c8cf558e86c8945d2c6b7d3545a27fc3823703954370ed8eb3a6790ccdac2b1c5ef11ddb497b6ca166b602e0998a74b239be6a897b18ab094f39ebc29579 SHA512 db1fa4fbd51b6e6305026a669711b2e2854e0e077623a10fcf323f3746d64c87491146528714acfd9ab4a537100cb395ec6183227fe8fa92e091f06f07006397
-EBUILD thunar-1.6.16.ebuild 1976 BLAKE2B d612903d6ca877ebf8f845cb41a2095a5094e4b5d01010b0defaae9020678c3571a8b9825453cc59495d2d5a2272610b71d59477da90a0dfa648fca1b530ee26 SHA512 f85d298bd15bb7aeeecc3acd6dceb11672d2e489c9cd52a05f56a39852ecc45a670de2376181d046105356abe35f70bd2ca005e9ab74f8ebff2b1aa7e3e7853d
-EBUILD thunar-1.8.2.ebuild 2006 BLAKE2B 0b842d7d0bafeee107a849dfbc826dff698dcf9ca04f4f64f9b7fe6303ef16519f18be79c772288cdda44b14e288a2693fe842b3c392c873ac43e0e770563a90 SHA512 1f0e98c6e308f5fd982609e100f1383283f92a9f27dec8d3445ff9efbd1f269380b359f62e2662eccc7a658a4add1839c4e3f94abcf36d1b0c4f73e969fa3367
-EBUILD thunar-1.8.3.ebuild 2005 BLAKE2B ef10efa2bb1f33b302661ed8aae22d00eb0e9417adfde68d75804ae87bb607b3c0d8ef58c158cfb5cc52a60d7ed3d73dfc91119ff347d59285b6a399c4d4db46 SHA512 7a50c1fcea6fdf59c62d3a51ded1b1c5cf978b10cf306ee7111567541f7df254832346793374132201581383b7e7c006edf293d756575e773b4f72726cce682b
+EBUILD thunar-1.6.16.ebuild 1970 BLAKE2B e1cbcb965868303758bc993bb4078a950956a52161cd888ff02115fbab3053edf68bc2997d990d880feb1fe7e160b14c6e61a3a9523f37abaea5a70873589852 SHA512 10e4fe34c2c4c8cfdf4e301347096b915233097a061f4fc38e5594004d8e24743aaf152005de7c569f26586f57987983c79b98134d175884370ac66050c1d626
 EBUILD thunar-1.8.4.ebuild 2005 BLAKE2B ef10efa2bb1f33b302661ed8aae22d00eb0e9417adfde68d75804ae87bb607b3c0d8ef58c158cfb5cc52a60d7ed3d73dfc91119ff347d59285b6a399c4d4db46 SHA512 7a50c1fcea6fdf59c62d3a51ded1b1c5cf978b10cf306ee7111567541f7df254832346793374132201581383b7e7c006edf293d756575e773b4f72726cce682b
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.6.15.ebuild b/xfce-base/thunar/thunar-1.6.15.ebuild
deleted file mode 100644
index 6b8669db163b..000000000000
--- a/xfce-base/thunar/thunar-1.6.15.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbus exif 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+-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:= )"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/desktop-file-utils-0.20-r1
-	x11-misc/shared-mime-info
-	dbus? ( ${GVFS_DEPEND} )
-	trash-panel-plugin? ( ${GVFS_DEPEND} )
-	udisks? (
-		virtual/udev
-		${GVFS_DEPEND}[udisks,udev]
-		)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-REQUIRED_USE="trash-panel-plugin? ( dbus )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable dbus)
-		$(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
-}
-
-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/thunar/thunar-1.6.16.ebuild b/xfce-base/thunar/thunar-1.6.16.ebuild
index 90a2f9ca2ebe..afdcc7924f69 100644
--- a/xfce-base/thunar/thunar-1.6.16.ebuild
+++ b/xfce-base/thunar/thunar-1.6.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbus exif libnotify pcre test +trash-panel-plugin udisks"
 
 GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
diff --git a/xfce-base/thunar/thunar-1.8.2.ebuild b/xfce-base/thunar/thunar-1.8.2.ebuild
deleted file mode 100644
index dc5dc32391c8..000000000000
--- a/xfce-base/thunar/thunar-1.8.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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="https://archive.xfce.org/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/thunar/thunar-1.8.3.ebuild b/xfce-base/thunar/thunar-1.8.3.ebuild
deleted file mode 100644
index 9ce63186aa29..000000000000
--- a/xfce-base/thunar/thunar-1.8.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://archive.xfce.org/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-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index fd8f5d27c9f5..9fbb314f895a 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,8 +1,5 @@
 DIST xfce4-appfinder-4.12.0.tar.bz2 459338 BLAKE2B bd3fdb379fa50e7977aed87e54956a6e04645fb92dc55bfd22e5723fe162ca0f65dade18d8f077105fe5aa4bc922fe0a8f6fa1308fa2705d570c76d4bbbecc62 SHA512 025d38f9f2d57d1bcc37d38f4956742593cbee820ccf7d375138ca3eb0a9614090e3b969aba9d80b546eac43d2a9fd6c530ff829f0e4f59621ca068159e9adaf
-DIST xfce4-appfinder-4.13.1.tar.bz2 485729 BLAKE2B 269aa1763a0a9063396c6724fcd37ea4d8f3c35907502c3b7a65a99fa038442acda5b4a2aff2102ab28ccfb110423ce2cfd2bb1406a1fc570b29b1f6d5dff9e1 SHA512 1be1508bea87e9ff7763dc6a8dd0a45b3e1ef39400486b9926de190e146c4c3fd96d08508d32c53a99ff92e98c4cc504e074f651273aac917a79e5df71022116
 DIST xfce4-appfinder-4.13.2.tar.bz2 499368 BLAKE2B 2584bfd5dd1e6f8cb28ba3e6ecdcfd6345f26ace2fe97237c9c7b5385824a40f3f88f86d7c7577b9e683bd73d3404087c52df0b451b2408350d8dc3268eb7171 SHA512 96ac782c785649ddf75f8659f9cf10f42c37bab647824f0c76714baca0b61904fa8ba6d23dc1574aae5fdf2538201936d26b42ea6c0f5d5f0f9d71c8ba0a51b8
-EBUILD xfce4-appfinder-4.12.0-r1.ebuild 903 BLAKE2B e6e8737c441cb539b18879439a5229d571be89dfc681d36bb762dbf9f3097168662ccbdd2e59510875777df5e25cb0c8e26ab47d3011d0b8157c644a0c8755c3 SHA512 d021368df87e09a97a5bd7d570541a12518af7600732839590dc9c0fb38d6d2090bf3be98f688f51193759f9e67d2c0a21f7bcea5a095375a9f5317a7911c1f7
 EBUILD xfce4-appfinder-4.12.0-r2.ebuild 856 BLAKE2B d4fe8eb778eba2341b293a90a2cc51e8654476f4a8cb448d134db662947e850b6e0c1b740da8d3b885831841357a11e83884620616852bb911733ff6e152b7c0 SHA512 ef25599bdee332d4244a57e011d5a6b5bcf9f772a386dcc2414dcbfc20996da6a0e98cd13672aec5b8ab8e69651497e006267c5966c4ae91a2927c34683cdcc7
-EBUILD xfce4-appfinder-4.13.1.ebuild 789 BLAKE2B f5cb3ec554ebb7db9a4637cebdadcd6c47d20e242f38e10174d8765be7c1f88d9639e2d8179548a180adb3480797a4764b3853c0c624392c93a342ca4719f848 SHA512 0403dcf2c578136bd81c8289923b81b8c1c8df05fbb1db2c867ff3a1f6073e98a674cf6df086d983a909c369251a7a19c75b8b85184fb0babbfce460c6c5d937
 EBUILD xfce4-appfinder-4.13.2.ebuild 787 BLAKE2B 024c79a06caae6edf78fd944370ef024cfb91ef594e798db7449aa51550bd0363ccc87bb28836c7775f9a4baf971ef1ae1c004fa7a6f02137430c67bda9817aa SHA512 84a365bf0ed6c6d6a841f46d87f148f2c978b3ebf7482a4f9a25f2fa145bddcf98922d7414ff1bf9dd135bb46d1dace00b5737a8b2f442247fb354fd7f4e6369
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild
deleted file mode 100644
index ab8cbc464458..000000000000
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-appfinder/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.30:=
-	>=x11-libs/gtk+-3.2:3=
-	>=xfce-base/garcon-0.3:=
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	>=xfce-base/xfconf-4.10:=
-	!xfce-base/xfce-utils"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--enable-gtk3
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS )
-}
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.1.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.1.ebuild
deleted file mode 100644
index 6ab6b0d8e9eb..000000000000
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-appfinder/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.30:=
-	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/garcon-0.3:=
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	>=xfce-base/xfconf-4.10:=
-	!xfce-base/xfce-utils"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index fc057fcb0574..252cc21a1534 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,7 +1,5 @@
 DIST xfce4-panel-4.12.2.tar.bz2 1167175 BLAKE2B 09d16c58bb2d78242069fc2191009af6bb737fd6571f7d9ceef4b2b2dc0f0be6fcdad17aa588f69573b9d7f62ca0c54ec712bd467ff793b6952ede733889136b SHA512 b455e28ecbd9e2fc152e1132a806307597157605fef19c61091fce90984b2eded2c0b691d1fa2475c218c9d0b12103e348e648a32d3e8d0aa9ca210b7ae36a9e
-DIST xfce4-panel-4.13.3.tar.bz2 1239212 BLAKE2B 8bab0c2f291874064ec8684ab8ada8177cca3f6ad163638bb57b02d0e0f77ed484ecb71bd9a4e54a63d75a572db260d6f92b755d413e1c6c111aef613ca2c2cd SHA512 99921ffc295b0e00689df50946ea326496c6fca68d6dfc6a563c0fb9e18bef1e537659963e3a0e6ee83756417565ac3531bc43e0e909dbb369068e4905bde045
 DIST xfce4-panel-4.13.4.tar.bz2 1261056 BLAKE2B e09c540fca10417e8f3340cacd3f35dded832b512c11e4c485b93120b331cd4a29bcf0df6dae787cb3fd65567a705dff69d95551b073e49b5fc4fc62f598eb0e SHA512 16a3680aa2ab7fa357ca9d477ea0e41ca159a2c626fe65454ccdca339bb501ff0979264f5a4ae4728e3c0efe24e193eb28e7b5d1e003fecad8ab36b8457203c8
 EBUILD xfce4-panel-4.12.2.ebuild 1503 BLAKE2B 29250232c73abbad889c3d1b86360e7401efaaf99f95ca8bd3f59b33065c42f4d63ae1b887cd538f180014514a37fb1d804fd696931b1e3c2bc49776f44e5c2f SHA512 bf46894dd6479d4521604c0b5e57d9fbd2d598c757dbd1004e63449a2f36d0bc088c7cc9f404e9126d546692ca7ffd6b98d06432575334ed72591e7d9eff637b
-EBUILD xfce4-panel-4.13.3.ebuild 1343 BLAKE2B 268b496bbe6d1d39869d7ed9320465d7ca2f988d326fd3814ef0726401a00705953acb67a4435e29cb2b033570497328a74fc292d0e6683032347bcc5875c8a7 SHA512 26cbe2d4ed4a9055f0d0794f92566cb9c7dcdb5672fbed3786a6d146a006fddd6537f8e9800a78de35f485ab46e40c6e411941f55895346af944a9d53e193823
 EBUILD xfce4-panel-4.13.4.ebuild 1342 BLAKE2B f53b2b4bf99364b5e5e06fddd32f8e23548d9f1baf418c9aa08a38e1c6f1f45ba34ecd25950363d7d8f26614d5683c70f59a23e042b629780bc422bb0209bd60 SHA512 d3be27ecd6b561985df7a30414f9d7e7e0b9eda177c07b731cc0bb4d5e5d5fcb3fb7c38eeac76bd9ad97736b4d7c9881f0189fca46b01fc1d8e33045ccc377e6
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.13.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.13.3.ebuild
deleted file mode 100644
index 3aae4328d6aa..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.13.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/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 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="introspection"
-
-RDEPEND=">=dev-libs/glib-2.24:=
-	>=x11-libs/cairo-1:=
-	>=x11-libs/gtk+-2.20:2=
-	>=x11-libs/gtk+-3.16: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:= )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-
-		# enable GTK+2 compatibility
-		--enable-gtk2
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index a826209f8657..d217fabd7286 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -3,7 +3,6 @@ AUX xfce4-session-4.12.1-light-locker_support_to_xflock4.patch 569 BLAKE2B f05f0
 AUX xfce4-session-4.13.1-kill-dbus-includes.patch 1279 BLAKE2B 3c446b5dcadc9f68dcfd9b2fd9d8ebd1b94e54fc6f3815ff7ee5d01f9be9fbefd1b2b269344bcff148a4c5199bb3dc58d4e1253450c541f4f996e6d4c55ad64d SHA512 8d5265737db4ade8fe59b7b051b741ca5b1a90a7d2abcdf5a48e658c04b3fc25f304555116009e58125662b243cf3dae1822c7ab387c7fe6ac6e0fb661b2d6b3
 DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224 SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df
 DIST xfce4-session-4.13.1.tar.bz2 1322823 BLAKE2B e50cc2628a068bed39d2aa6344eab7676e6464c84e3cf11d79518f78db54ea01316bd098a541b6f0897f3decbed2eb37e55009d4bf89d460e136d7a44d31c26a SHA512 5845e3591919e23ca176199e81075a097ef9d65cbcf23b34d84afc649a307bfa8c6492e3a01855cacff9328da809725213ec1fa9d76024c0a0c25cce3c51da1b
-EBUILD xfce4-session-4.12.1-r1.ebuild 1882 BLAKE2B 07829f94bc2ea104a95ab0eb3e631903331a0432ac030840fae8fd52f03383fa2356783fff7a4ad5f61d2348eb1f36322f0be16af5624714957f819cc3c5dfa6 SHA512 f00f579028cb83844fc4c8e53415e25b4dde5c10f9820fb57e3889069dbc5765c82e0e62360aa7f7d91a67b6d7d1a097dcbdb1c75130864d36b8b4cd4593d71b
 EBUILD xfce4-session-4.12.1-r2.ebuild 1882 BLAKE2B 7c7b06cdd917d710fd5b00cd8344a7f9234c60e6d5797d55f2116468466c2d9b41050dfcde85720768d3c6571ed00c87477a929ba2922bd329c5d630e46e40c9 SHA512 a1ae9a240697d3ab38a28cf9a835b7516009f92a6a6961a07f1477e6e8709da7d2ce0c2ebdab2999b1fbf47a6cddd18d7152946e157669181ab04b48c0cfcf7a
 EBUILD xfce4-session-4.13.1.ebuild 1947 BLAKE2B 2dbc0df69e245a1f40117538a9901ec0e9db880e89a48200b88da090e041c9f9b0c6782adca26f13ad877010fc4112adfa055555156cfdf5247d6a39e931809c SHA512 98c11533356719c6f76eeaff3300d7eee28e3981da46f932897011aff2ced7a9cfe23ec3eb79e6a31692dad82a05b2226544933dfbca2d6f0f02c95fa5a823ce
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
deleted file mode 100644
index c572b71ce575..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-EAUTORECONF=1
-inherit xfconf
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="https://archive.xfce.org/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 ~x86-solaris"
-IUSE="debug nls policykit systemd upower +xscreensaver"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
-	x11-apps/iceauth
-	x11-libs/libSM:=
-	>=x11-libs/libwnck-2.30:1=
-	x11-libs/libX11:=
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/libxfce4ui-4.12.1:=
-	>=xfce-base/xfconf-4.10:=
-	!xfce-base/xfce-utils
-	!=xfce-base/libxfce4ui-4.12.0
-	policykit? ( >=sys-auth/polkit-0.102:= )
-	upower? ( >=sys-power/upower-0.9.23 )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xrdb
-	nls? ( x11-misc/xdg-user-dirs )
-	!systemd? ( upower? ( sys-power/pm-utils ) )
-	xscreensaver? ( || (
-		>=x11-misc/xscreensaver-5.26
-		x11-misc/light-locker
-		>=x11-misc/xlockmore-5.43
-		x11-misc/slock
-		x11-misc/alock[pam]
-		) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-REQUIRED_USE="systemd? ( policykit )"
-
-pkg_setup() {
-	PATCHES=(
-			"${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
-			"${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
-		)
-
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable policykit polkit)
-		--with-xsession-prefix="${EPREFIX}"/usr
-		$(xfconf_use_debug)
-		)
-
-	use upower && XFCONF+=( --enable-upower )
-
-	DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
-}
-
-src_install() {
-	xfconf_src_install
-
-	local sessiondir=/etc/X11/Sessions
-	echo startxfce4 > "${T}"/Xfce4
-	exeinto ${sessiondir}
-	doexe "${T}"/Xfce4
-	dosym Xfce4 ${sessiondir}/Xfce
-}
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index d91ebb1bf5c6..68ab84cded8f 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,7 +1,5 @@
-DIST xfce4-settings-4.12.3.tar.bz2 1035504 BLAKE2B db045839ea075d08acbad2bb316a4b577df959312146f8487e667c1de3fe69d129e9c80a21b97834e7f86598d776d7aaf7104f7640429a45a6d02ca3ca6c8bc4 SHA512 46bde0de70d8ebcc869ea5ba4f3eb0f123fb2e6f16e8a837c301e445044d65d90843fe3c8274a53818099112e43ff6217dfffd32bc032560331f5ca5fc5ba3ad
 DIST xfce4-settings-4.12.4.tar.bz2 1036773 BLAKE2B 512547a172081d75e7eeb97f499e77320a3df1090e80ef548dbbaf84d454b614ddb6a36bbfe4cd06d18b478ada7bd76f385dde374a93380f848ffcc232b133d3 SHA512 9b74daa3f98f15c8cb696dc79f9913fecb37f2ca44c2fd3f24865ae03e9a1db93cb5a8ddb27da3c4af7d7a9e9d718a22e46188ff515caf925a5cedfaab37b189
 DIST xfce4-settings-4.13.5.tar.bz2 1067538 BLAKE2B e1c747582744bd2102f46fa45340d5695240f98941ebe55a83067b9c99b00946b8df9c522313418219acd11048d49b8c6617abde64eb3dce583be59c9272ade3 SHA512 5e7b13b25767091ab0b1a5683359f33e4a86151dd9321681fc4d896fcd9cc569effaebfbab70bc734e07041e9fbb1c3015f9a177146de8a128c4a539462dba5e
-EBUILD xfce4-settings-4.12.3.ebuild 1502 BLAKE2B 63a0e92aeaed682c19876099050f2d6b3aec8fb144ffa11e14ad55654a2fe2691c530a61b6ac3067155ba93f98a7f34d818738277f08a91adffef362c50ff8a0 SHA512 f2a13e12709785cefda04dd41a056d57bce944700e9c43b1770914b63c4998630a0b1d9989b03f9d2521e142e89aed10dd08f93649b3b4f6a8d1ad4708c9775b
 EBUILD xfce4-settings-4.12.4.ebuild 1502 BLAKE2B 63a0e92aeaed682c19876099050f2d6b3aec8fb144ffa11e14ad55654a2fe2691c530a61b6ac3067155ba93f98a7f34d818738277f08a91adffef362c50ff8a0 SHA512 f2a13e12709785cefda04dd41a056d57bce944700e9c43b1770914b63c4998630a0b1d9989b03f9d2521e142e89aed10dd08f93649b3b4f6a8d1ad4708c9775b
 EBUILD xfce4-settings-4.13.5.ebuild 1501 BLAKE2B bddb40c911bd63957c5a2ff36d08de769ae55768c62f1581b1b428cddbf6307577adae021896bb7fc561a30b42477d15158912504b8d3d563e57aadae868fb58 SHA512 bc86fc48a7be96eebb740d6df897b58c358cd35dda14a90c3894686083af9a1e04d565b91e27b97b693238684c85d4e51a5e2cf646a6dd586ff8341bf32dd824
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild
deleted file mode 100644
index 0bae89cc8381..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.12.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/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="input_devices_libinput libcanberra libnotify upower +xklavier"
-
-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 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	x11-base/xorg-proto"
-
-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)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index c9946934856b..aab238452f43 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -2,7 +2,6 @@ DIST xfconf-4.12.1.tar.bz2 564131 BLAKE2B 893210f19d743559b0879e9e38004400c8f8af
 DIST xfconf-4.13.5.tar.bz2 609549 BLAKE2B ccd5e907752d8fa5b5c4a7468c9eeec4083709bbe11b14ae79b20938e3b7c6ff097805be56b3f8cee146e2d0c0ffb272b856e559d1699c4e40d7c140fe7515fe SHA512 34e6b99be0b288707f8632c5fe4f2e66e01ec3950f4d194a7007afb4bc1cfe8bea44f8f80873de2364680481921332c9860b23bca4ced94ecb95c9199df5315b
 DIST xfconf-4.13.6.tar.bz2 578107 BLAKE2B 6348b536978d1d3f611783e530be7b694c46ad3030ed02e04a6e38122028068ec8392f34667e5d54a09d9115db191d6366619707e117f2b37f3ad8f14a3de2c2 SHA512 0eaa1ad428be5bea97b891a6bf0488293064e31d4869b70389ded940a23f9d8cffd0801dd98932658a67e57d6a0da95998872202cf7756aa24caa8f9d2c5f755
 EBUILD xfconf-4.12.1-r1.ebuild 1823 BLAKE2B d8af63d40df95e867353c32ef841f33caf711e5c6c3de5b1a3af54432ab356952a9a7797715c1991cbac1e7b1f74d451f18d1afd2650928b726033fa04bf3836 SHA512 11dcc3a86019a72063a4e94817b69c75deb14fa82eb13ef9821b1c26e9b29fd8b944d16b08a1f4e11b9fb33313bc1917b6f521a428c735edc624b7ff0255575f
-EBUILD xfconf-4.12.1.ebuild 1507 BLAKE2B 03e1ea51842ae97a8bace0626ea2057bec514205c8e08034d5728ebc66601596506a677dffcc15271896fbc6b77e10b0883f4fff2b0952a976e8a347b18f69db SHA512 d3d6c22b4cc9de16056580a81faddba0c1629b711a389ecbfbe10313273bfb2d558a97c06e39e546183580ed7525257fa791e3162c355e7ac5dde71154d8e703
-EBUILD xfconf-4.13.5.ebuild 1646 BLAKE2B fac9125900a540df75188349e283b7671e2451c44ce321b8990b4830ec00a271ad3878569898e551ed802e5b26e482917db73b270fca3e73e39cbab1a1e5720a SHA512 6b98d4d1f82b233b8110ffa8abe8c2e2d6336f23312bf6d8c0bf7358b8cc3f03d03fad5779c0010722000bf7fcebcffe6d4e3d95b7e80d2441b6b81105971fb0
+EBUILD xfconf-4.13.5.ebuild 1643 BLAKE2B c0ec3ea5952565769892124c73207b720afcd78ee73f354ca1632973b31d1910804ea1ac5ec37c4760f233cc5218cefa6494c5bb4f6cc7f2e75ab155ff746be1 SHA512 bac2083f81068db1c0078aa20ddda95bc057a8a9f4e2b9e75456e9fdf4846af23b0b31f78d4f47c9f367bd6fecafeb1b8561a4d427348c8631a8ea4b1f7c5a6c
 EBUILD xfconf-4.13.6.ebuild 1646 BLAKE2B fac9125900a540df75188349e283b7671e2451c44ce321b8990b4830ec00a271ad3878569898e551ed802e5b26e482917db73b270fca3e73e39cbab1a1e5720a SHA512 6b98d4d1f82b233b8110ffa8abe8c2e2d6336f23312bf6d8c0bf7358b8cc3f03d03fad5779c0010722000bf7fcebcffe6d4e3d95b7e80d2441b6b81105971fb0
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.12.1.ebuild b/xfce-base/xfconf/xfconf-4.12.1.ebuild
deleted file mode 100644
index e38db0fa9701..000000000000
--- a/xfce-base/xfconf/xfconf-4.12.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A configuration management system for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-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/dbus-glib-0.98
-	>=dev-libs/glib-2.30
-	>=xfce-base/libxfce4util-4.10
-	perl? (
-		dev-lang/perl:=[-build(-)]
-		dev-perl/glib-perl
-	)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	perl? (
-		dev-perl/ExtUtils-Depends
-		dev-perl/ExtUtils-PkgConfig
-	)"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable perl perl-bindings)
-		$(xfconf_use_debug)
-		$(use_enable debug checks)
-		--with-perl-options=INSTALLDIRS=vendor
-		)
-
-	[[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
-
-	DOCS=( AUTHORS ChangeLog NEWS TODO )
-}
-
-src_prepare() {
-	# https://bugzilla.xfce.org/show_bug.cgi?id=9556
-	cat <<-EOF >> po/POTFILES.skip
-	xfconf-perl/xs/Xfconf.c
-	xfconf-perl/xs/XfconfBinding.c
-	xfconf-perl/xs/XfconfChannel.c
-	EOF
-	xfconf_src_prepare
-}
-
-src_compile() {
-	emake OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	xfconf_src_install
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-}
diff --git a/xfce-base/xfconf/xfconf-4.13.5.ebuild b/xfce-base/xfconf/xfconf-4.13.5.ebuild
index 2cd890f3d36b..244033bffc4a 100644
--- a/xfce-base/xfconf/xfconf-4.13.5.ebuild
+++ b/xfce-base/xfconf/xfconf-4.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index a2dbd8d2014d..b7d46cb8e4cb 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,7 +1,5 @@
 DIST xfdesktop-4.12.4.tar.bz2 1421623 BLAKE2B a18b891d639165d617f2701106dedb2f8577273ece5a4c93f6b5e1ef26f801304ea2014f21bd2821eb9bac9b19e02dd75cd4054a116eefd544f4d8e5d6968879 SHA512 29f170b96836298dc83e3c49650ab7e88a93c1a2fa1599d1d98f3b6c80c9c059748b76a821077eea39b5b4619998bb300ff17f06e88483a59bd5ae2b76d0605e
-DIST xfdesktop-4.13.2.tar.bz2 1486455 BLAKE2B 38ba5da7172212f74281f60688a581e525dcbb91ea381f8fcbdef57f90b54b9c21d08f20f3b1da5c91dcab158c2a7ba415822ec7b1f92f1cef80e53624a1f741 SHA512 0002ed639f8554144d8c921ca5bd9d1c2ed634baa11c98f95685c8a636ae6bdc87f8df19aa138fe4eda591facba964451a10aef6ba303be1fad66013bb06ae13
 DIST xfdesktop-4.13.3.tar.bz2 1487433 BLAKE2B 81c5be8d54da6bfdb121d5632d67abfe6705eeddfb8c247ebf6870261093908660f880c8152d0cff87c912b1f3277d6551993a6a64384e610928c9bc6fda45a9 SHA512 5d828ad653b46ab1edc8300335321bab48e0ad2be1ae02944eff553375a6059513aeb363c73aaec1a6958dd3f1c873920287ad911cfe7b8096b447f1b8165ce3
 EBUILD xfdesktop-4.12.4.ebuild 1304 BLAKE2B 694689d44b083df8e79f3d3c0666c1e17d8dae958c08b6cab9180925d15852a555f99b62364dddc6c8eae7075fd457dfbe6292a1fb94c61edb4feb1f8d1f4e73 SHA512 9ddbcdd35ed2d9b59c0c99eb4f909f0315d89c32749514ba1c59b98edf295554e364bc28d6459722d7941a67d55ea2484e48fa668bd334fc378ec609d2ca60b4
-EBUILD xfdesktop-4.13.2.ebuild 1214 BLAKE2B 96edb0596ae76382349eab0b68bae69c48138bf743d0da68c7959311f57f44c59825e5daa3fbd87b74f0e601e459622a354afec6f4ffc1a2f55defea6e215c95 SHA512 b3f1cf01c59567247bd55744c23fd2ef983b09695c20ddb049a2d3a87a2268429b65a19546cb52bffdb2af3f4c936359aa6ebf68608daf299603d60fa826d6b7
 EBUILD xfdesktop-4.13.3.ebuild 1215 BLAKE2B dc10aa26a8014804048ba4cc5fedd11d71f8cde4afe06881b38f34a5f1e5322a02316e8967f7a112535df14631b5497ba1fe31cf9f815eab610bf43b4e329dd9 SHA512 36dfdae27fa6810ed2267fe3ac6f2a77715c23f3f8ada7768b5b6fa022afb732a5e7b23a6355b951402bd3ac42c641a12301de9dd68f9e1792f776f3a8dd5689
 MISC metadata.xml 364 BLAKE2B 64544c9e89e370bb213647843ebc3c5d4ca08aa46564b02830ff041e74db5018d7503106cba4e7c1dd562f359649974f12b841e32136eb73e9d84ea0ed36f456 SHA512 3140dbe5320efba5393874f93b907ef2dff1cc8dd44cda7340abaf19dcbbd709beb7649ac72f1e9f92da546e010f966cd9f5d51b867c6df8c49332bf9de67dac
diff --git a/xfce-base/xfdesktop/xfdesktop-4.13.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.13.2.ebuild
deleted file mode 100644
index 2e52cabcdef6..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.13.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://archive.xfce.org/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 ~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
-}
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index c1df1aa4515d..b44b44dcb362 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,8 +1,8 @@
-DIST xfwm4-4.12.4.tar.bz2 1208874 BLAKE2B 60b584d71bc4696bae83897d80cd90d9c13233d1971c823eea6417c8020a0440dc0d648df4e11b27947915ca57130ea3bc7b588e902dc7db74945349ff9ac514 SHA512 a33530b08f094456c45ad7c627ba34d3772eaeacdc9f422a3a54a16194d494cb1d6798122398d917fb8bc970db7e1184d9dc8edefc365dacc86de22be397b43d
+AUX xfwm4-4.13.1-fix-mask-len.patch 871 BLAKE2B 048bbabfa59671a5e0dba77e353a8daed8677839b82de6e4a9b0419217bc3d91baac8ccd7c8129aa907de4396014503947501a3cb0c12f44ed96795337ff548d SHA512 beb34642c63f1dc1734261039a00ea6e845c0b544c655633096027ad627b003fac221b74345150aac92854416bae054c3bb4efcce195026432061610480500ad
 DIST xfwm4-4.12.5.tar.bz2 1215450 BLAKE2B 3a156af589ec7391245edbedbc6e10ac9c746121f68e4bd0c64e30b9b0c11abfe13c1fb77321249edd4e5c8d3051f62f135093fabfd8ba215573d330fd3745c2 SHA512 b723638b9cd858beb75232a251471cfb2d01ddb412b536c3f0b432e1f894014e1ad51c77d208d5439ae8a8d970344d0146d5f9475106c1b66d22715af7af42d9
 DIST xfwm4-4.13.1-patchset.tar.bz2 2739 BLAKE2B 895ac4939c9f9ab75e7f9e5b237cc731dd619bc87ac7a4f6623dc30ef5f4b7e0a80c826881a430b9c1d42ae0172fb72af2d4ff7c5ad6b54890f6d9233c4ecf49 SHA512 aa918e8efb050b87afb90594cfeb69a4457117b6bd47142d16f3cdf3d1cd7a4d9d2670dbbb68d939f5d2e52a05b42cefb59325963aabad84fd82ddf1f6ffd6f5
 DIST xfwm4-4.13.1.tar.bz2 1224120 BLAKE2B 983b12775ba8998598efb22a2a7ab6f539cb1c6074c3fbaa882b9627e5ad0ff3b96ed0d4352c31dd04451c37dd706404147b87bd899f6b6f1b38df0162b82a15 SHA512 2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320
-EBUILD xfwm4-4.12.4.ebuild 1526 BLAKE2B fb44b379be5c8e5420d2b58b8754f7accbe518442c48b707a36e10ce62220212ea5c6b005d5c3abe3082d24108689adbaac03cb412138983de73c308dcd2da78 SHA512 87d67c9e6ff47c4b785fcbc8e71007ed5af134552fec9616b41bc26a81b72428314999d9969ab261ddd88c1bef4184f78d17a4a9f06970c1ec4565089de1a390
 EBUILD xfwm4-4.12.5.ebuild 1548 BLAKE2B bcad70f5676a341ada91eb817f59a5dfe1cf1f071ee2f767ba9e499e107c9c57f89ff138b6cdc05a579e28101d183557c9ae922cb8f94468589cfa9885ca91ee SHA512 5b38b1c8492b8c8a261ef0e89eddc531210dfcaf9158a32bae18ff1721f88ea91646a05a600fa5931bf53acedacebb26320a1ef136445c4b99ea011141222245
 EBUILD xfwm4-4.13.1-r1.ebuild 1897 BLAKE2B 28113547afdd5fc3671ba6414a05560a29050a1fdd21edcad7976b94dbd045dc2ec502d62db0fcefa960ad94603f0cf94716da0644fe8a936339f24ce0b074d2 SHA512 e9be0515a5cfcd81ce74cac2640f10b1bb34b57af7f709f5390e073d6e3b744de8664a0ae2ed58ef601d9ca3a2adab5985a7618dcd426a5f3d40ed83a7c94c2f
+EBUILD xfwm4-4.13.1-r2.ebuild 1945 BLAKE2B 0f035f0041217d7d3eae637a723872b65deb77ca015166bab9f03c4d7dc4e37896153ea4bb7358679335084bfe69365c2c41fd77343cd6397e9e68ca517f7568 SHA512 7f6889976c91d99710bbd5a3b0af1226d9dd7967114e32e0e5d53b589b3322821d3c939b890f13db1b2a561b99e9dec4cdc4f683a94746645d6a59d5e6dc4f19
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch b/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch
new file mode 100644
index 000000000000..640e297ce92e
--- /dev/null
+++ b/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch
@@ -0,0 +1,31 @@
+From 2080fa3c81b3810228ae5a8abbb494c78dd1d566 Mon Sep 17 00:00:00 2001
+From: Timo <timo.teras@iki.fi>
+Date: Thu, 13 Sep 2018 20:25:33 +0200
+Subject: device: Fix wrong mask len
+
+Bug: 14695
+
+The `mask_len` field is setup incorrectly in
+`xfwm_device_fill_xi2_event_mask()`.
+
+The size is the pointer length, not the bitmask data area length.
+---
+ src/device.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/device.c b/src/device.c
+index b1e33ae2..01c0c81d 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -301,7 +301,7 @@ xfwm_device_fill_xi2_event_mask (XIEventMask *xievent_mask, gulong core_mask)
+     guint i;
+ 
+     xievent_mask->deviceid = XIAllMasterDevices;
+-    xievent_mask->mask_len = sizeof (mask);
++    xievent_mask->mask_len = len;
+     xievent_mask->mask = mask;
+ 
+     for (i = 0; i < G_N_ELEMENTS (core_to_xi2); i++)
+-- 
+cgit v1.2.1
+
diff --git a/xfce-base/xfwm4/xfwm4-4.12.4.ebuild b/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
index 53af72fbcb4e..b929ce60b99d 100644
--- a/xfce-base/xfwm4/xfwm4-4.12.4.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
@@ -3,35 +3,40 @@
 
 EAPI=6
 
+inherit gnome2-utils
+
 DESCRIPTION="Window manager for the Xfce desktop environment"
 HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dri startup-notification +xcomposite"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="opengl startup-notification +xcomposite +xpresent"
 
 RDEPEND="dev-libs/dbus-glib:=
 	>=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-2.24:2=
+	>=x11-libs/gtk+-3.20:3=
 	x11-libs/libX11:=
 	x11-libs/libXext:=
+	x11-libs/libXinerama:=
 	x11-libs/libXrandr:=
 	x11-libs/libXrender:=
 	x11-libs/pango:=
-	>=x11-libs/libwnck-2.30:1=
+	>=x11-libs/libwnck-3.14:3=
 	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.11:=
-	>=xfce-base/xfconf-4.10:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/xfconf-4.13:=
+	opengl? ( media-libs/libepoxy:=[X(+)] )
 	startup-notification? ( x11-libs/startup-notification:= )
+	xpresent? ( x11-libs/libXpresent )
 	xcomposite? (
 		x11-libs/libXcomposite:=
 		x11-libs/libXdamage:=
 		x11-libs/libXfixes:=
 		)"
-# libdrm: only headers are used
-# libICE/liBSM: not really used anywhere but checked by configure
+# libICE/libSM: not really used anywhere but checked by configure
 #   https://bugzilla.xfce.org/show_bug.cgi?id=11914
 DEPEND="${RDEPEND}
 	dev-util/intltool
@@ -39,20 +44,36 @@ DEPEND="${RDEPEND}
 	x11-libs/libICE
 	x11-libs/libSM
 	xfce-base/exo
-	virtual/pkgconfig
-	dri? ( >=x11-libs/libdrm-2.4 )"
+	virtual/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
 
+PATCHES=(
+	# set of patches to fix refresh issues
+	# https://bugs.gentoo.org/614564
+	"${WORKDIR}/${P}-patchset"
+
+	"${FILESDIR}"/xfwm4-4.13.1-fix-mask-len.patch
+)
+
 src_configure() {
 	local myconf=(
-		$(use_enable dri libdrm)
+		$(use_enable opengl epoxy)
 		$(use_enable startup-notification)
 		--enable-xsync
 		--enable-render
 		--enable-randr
+		$(use_enable xpresent)
 		$(use_enable xcomposite compositor)
 	)
 
 	econf "${myconf[@]}"
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}