gentoo resync : 02.06.2019

29 files changed, 47 insertions, 724 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index d619c826fd9c..3264eb6de594 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 4f3b028b2c8e..293e9ec52f63 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,6 +1,6 @@
 DIST exo-0.12.4.tar.bz2 1235738 BLAKE2B f05ae13bb5ec599686207df3fe7458b8a42227194c91c24397ed282d2c7a6ccf10989f14c662f2e0d986c59695de2b8d50743c8489bc716aaa001cbd23fe3598 SHA512 8f84258aeb5c1fcfe91e775af1e5fed02f36b3d18aa72d497cd05294d54f050d679628cdb4339219c67b203a8cc663704a240fc18e6a918cef363cf4d9b94783
 DIST exo-0.12.5.tar.bz2 1236257 BLAKE2B e1ea6f63e1e64a4f098e03ab45f2ff21a3a3851dcafa314aaadea9fcbb00f790ab18d608b4920dac868a31048d618a67c7f69c7fd5bcd8ea187fea78d20f7d0b SHA512 00165ef85145603f59cc4188d2637ec51c8cc51d9f2288c4e5b0328a2b085e940fbaaa987bf5a51c9999184f2d4f6f9751f4304feb6143416bade826007b3bf6
-EBUILD exo-0.12.4.ebuild 974 BLAKE2B 6ebb54a4157f3024f7f9502acbfe23bf2211dcd8cc4c6fd06bff00e0cb595b4f33040a32704ededdbf36551acd6106906848f36e3fb631fb3e67fa98e425e40b SHA512 a8bdc535037c1114ee8f8f0b1a52015d13e4601d1dd775db0630a650e627c965ced0317c2984cb3f01a09358f6973e78cc6eab968919bbdd0325a78c3e4f6663
+EBUILD exo-0.12.4.ebuild 973 BLAKE2B 32d7e76849460688e87425fec759c80ff86a0c4df8053ad1f291fd5c7b5f0833c0f067cbf59c34a839e06149de77dd6b8f8e872ae35365b781e3115ae1bc5fa2 SHA512 e3e7f48051217562ab90795c4cc403a23d6da6d117c00c502f4475b81839e0712aac9c80601347014e472c121ab478b51a8cfcf5158a73173965f97ba04102ca
 EBUILD exo-0.12.5-r100.ebuild 1025 BLAKE2B 9126a34aec5fca2a5a18d1318f48c37619883a26aceaaf98b52c6ab1d673bb87da517ad59ee8f07b7a4fafa0f0728d584fa61cfbb3f2f3d4434f2b54b22c4ac1 SHA512 61f058fa1c4e597d05da0f31b061380efbfd3a98d92657c0d26c96794dd11a46861d7f6a5714391862457323b24143ac02048400d6bed0773690003be3ca9cb1
 EBUILD exo-0.12.5.ebuild 971 BLAKE2B c77ca40760ca40d6e57715b1bf144fe3fbeef49238a8fbb853e80d438e7355116546b13bb304e2995247e2afdaa27e4755a84509ed69aa40ab08a01b5f84cb9a SHA512 239e7e2c99bb5bc5721e7e986ea04447a325a74d617f1bfb8fdd952431a1aeb7806649b09570486be3b799a771bba2261e67b66b028f48355b0d0e4e4994e03e
 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 609b0f8868eb..9f3eb265a50d 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/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 9d4de5b39637..73b560610c2d 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,5 +1,5 @@
 DIST libxfce4ui-4.13.4.tar.bz2 684065 BLAKE2B 1da875832683b5e06b8e91b4078be8122ae85a91560d7b1768cb8c880fcf5e1d7cd07d24927ae3325ba9c500c6c2cd30e717e517775492b9948add0711f5aa40 SHA512 c82d6ff7ea0da4fc0f664bab92f1e9531162996a26bb092e6ba651cfc4551732cbcd8023908d428b47906c17c331c14bf4804256566ca564befa218dc1194206
 DIST libxfce4ui-4.13.5.tar.bz2 742371 BLAKE2B 1ddfed2f6b2c360e39a00c5bbe7c9e2a01595197e808531438eb8f84e8e13680c4fa8a29f0d1ba61be0726222d253921740e73f960fedd12c3ec8339c345ea81 SHA512 5ce49c7052392ac0df74b0d5069fa7880d7b322a15b10c5c20932f10ae06529be2b21d95f7e1c10a8ecb2e38cce9a2d880ac107c3ce1e7f51d570d5ece7b7d3c
-EBUILD libxfce4ui-4.13.4.ebuild 1737 BLAKE2B d6afb27abf1c7d16dbc2b36fed86a627e67d75aa5ea6e228fa63ee9e32b4e4c8bf8ffd1e44b474118ec3ca02fd09a00f8ae6146f8f5aeb7fcc681ca7aa628a55 SHA512 65fc6d9ecf0607ccc928e8e461c9e379e7a0b3c5720e0e44583d4e1f62c046231ccdef9ef599a6c043a89aae8a9a0a79eeb2f7105ede81effec997933e16742e
+EBUILD libxfce4ui-4.13.4.ebuild 1733 BLAKE2B 36374a9f88c975b57ccfc7e03b2589ad4c08242290aa692308b43e9e68522dfb7ee061acc059562c70d0a46f3112c0c0bd787d4e162ae45161119b4988bad6ba SHA512 9e972e257858f985b1f105aceeb5a59be40e6d2401b344aa042ee238cbae9ef3b06bd0defb8c66a3553657cfb031f870d03481bc7bde92871b3cf551532b5887
 EBUILD libxfce4ui-4.13.5.ebuild 1742 BLAKE2B 78326ca8b4ed0a27c49f4798d5b56ac46a74635567cefb0e81693f8f029792eaf23ec5ffb0b621e2246cfd79caf7d9fa3c305b32303df872d6c734e47be4b84c SHA512 a14b4b7441711cb1c9daa7de8e2e3dee27be1fdbfe123bd1cd3950847ee1baae60c8c6459f26f7c1b53cc0210b6cbfa2c5978c3e0e195de890921c7b9a40b98d
 MISC metadata.xml 348 BLAKE2B b833ebf4da605db088c633bbd7e8a5747edbffae3671d6049154f89b6ecdcf3054624b5e17d55332f405608d57dd3022c1dd78b81376bd2d28c063291d32073c SHA512 f3894d3ccb668e76deaa0651414359838402d2b1e11fbe816375e6147f89847257008d5807766796fb1249217f6454a5f5896941e7ce3bc79dce09b130db4fc6
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
index df96178f0f2a..6af639e0b19d 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.13.4.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
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 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="debug glade introspection startup-notification vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index e838534ab9e8..58d797da71b8 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,5 +1,5 @@
 DIST libxfce4util-4.13.2.tar.bz2 509280 BLAKE2B 40f1fb95abff4857e976dd5f3ae8c8ad5e66e2c1c49723735e85124db71d30f204525cd74baf22e31bf405718f378b0c9ac37ec4189e1f4b9941d0eb6fc141ce SHA512 3bbb718f3a6d2213c86695b3f99d1e67c859ce635e5d066b18745d2ee57c0b2eea468b61079d8e2514c2d8f5fa847539d236ec0ed3fd17fecd9d1b36dc3595c4
 DIST libxfce4util-4.13.3.tar.bz2 511277 BLAKE2B 0815808166bc488cfa3636a18c9486fd1b3a81376766a77eef80ee24274bb290b9bece5e7786f7e412154f201bef251ce90d350c9e69db79bb893fd9081d2dac SHA512 e06bf58d46c5c3c6964a17ca8d998bd8e78bb61577ddcd855680878a890912a167212a2b4e3b347f41f84d2983e71fd1d76716db9c4a88a1d4f45a0f5aaf5e51
-EBUILD libxfce4util-4.13.2.ebuild 1041 BLAKE2B 8b023aafc1f8ecdc8b28fd04ba157b8aba8acb5acfa9c632ad0430a388860385a4b94d6288ee11a85236f89eb0468dbb6317ba8378dbf0e5700d7dfb2e5c787a SHA512 91cf34ea64d24c21d603eef18e95c8d2164aaa9825fc3a2056cce5edb40564fa796e2975374f9a2c78ec97b6d180c5b6573ab23e9f895990a437e258ef9fea52
+EBUILD libxfce4util-4.13.2.ebuild 1040 BLAKE2B a11dbb202a566265ba80d2dbedcd2814c6e3a70fb36522409f1d830dd1ec5c8639899df3d68ba3dec5f34233b964e836c3819814904fe1694167740325990a67 SHA512 e30111c79f541cff506c5b46e979ef589b889f3005ecc6fb0b0c2b28a66afe8ac57f1bc116479175cab9c32ae075f7615d4bafc5f8454675981fa1e97a80ca8b
 EBUILD libxfce4util-4.13.3.ebuild 1048 BLAKE2B 397d348fc9cd6c1442530d58523f66d6c597ea8dea4287d0abf854ec803d717bc2262df1c715fdfb1f1e7a4a45504e3242c0ba3ef721d40fb30383ded56aaf39 SHA512 2f60d797b1bc0d8f76331b71a2889b4bdfac91572d166d48f9e91f4d175311fcb92937f05fd9e7c5a51915c15d9812776c45f773e10f3fd3203b704cc2be1622
 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
index 6f87c6b032cd..87a4747dfbf0 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.13.2.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.13.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=6
@@ -11,7 +11,7 @@ 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"
+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 )"
 
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 42f58119abbd..8fc9bbfea785 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,11 +1,7 @@
 DIST Thunar-1.6.16.tar.bz2 1977562 BLAKE2B efad6b45a64c5c80bff3d829207a1a0b45b4b48ab168c38bbcd263445a16dc230b0c5ea7515b65d686cbf256d294bcced19b248c252478a6a1cecb393d71a7f6 SHA512 6c7b8b88e01762e606bfd9e3848a98ae5825ff431f0686dd7bbcb987e448aa4c20d7cca3fb6b7c5d5dfde91ae6f8a16e674769d168f6f875e2efe519f4cdfd1b
 DIST Thunar-1.6.17.tar.bz2 1995398 BLAKE2B c6bc0ebc29cdf8b0d3d184fd5b5019bb6f4caa4e43e16237325ae938e95c077198801e7f0d5210c458e316e0c7f35aa735f8e5bca61372c3cb2f5cf40b78c59a SHA512 2ace85994af51e1651b1e58c4436b5d4a986e75ef56f85c765e7dad8698681a73e009feafff0c9e056153b13c37b915a43529451960a209ae7e0bc23544492b8
-DIST Thunar-1.8.4.tar.bz2 2349249 BLAKE2B 4f1ac9c3177587b5ff2f3acd7220fb08921fc9db9711dd5925b65068db9bb14e7cf9d17834a96395c3fc27927030dbd2ba70d08c5b14d28e4aaf553493bce5f2 SHA512 886c0789aa19c2ab2ef34892c4afd09c857585b4796140ea3c84ccb9e1e1ca2935cf7e3a760a6ca8d8c68a5866663412500b4779878c7f48c9365c3ac7bf0eec
-DIST Thunar-1.8.5.tar.bz2 2303914 BLAKE2B e47e3e635e883ea4d044c8a66014bc11f21da780b1d834f25678763ace0609ee77755fc04b6a437f238275b0a9bf8df485cc826a6bfef93751427ee93d7e43ac SHA512 491f1a69cc1e825c9c2493af719ba22811d1300f1dfe06e98c45c878649921608d14c08e4f61551dfa3d5227ea0b0af6abad1c953d6fe4b9274ade76bc33e6cc
 DIST Thunar-1.8.6.tar.bz2 2317253 BLAKE2B ee992640e1c3df64f7aad13390a263e4599c9f0a19640b77bf5383ab6f93898f8785c86bbe307da9158390aa435699eb9a70ea3a96fb82d3b726db657436ce52 SHA512 086dc139627d8f11341b2db91358ef1831d2b8494d34abac49355dbaf850a21c30f979294f9adf2bc8548e5f817a4e165803a3db74cd989cd3867a4e228d74db
 EBUILD thunar-1.6.16.ebuild 1970 BLAKE2B e1cbcb965868303758bc993bb4078a950956a52161cd888ff02115fbab3053edf68bc2997d990d880feb1fe7e160b14c6e61a3a9523f37abaea5a70873589852 SHA512 10e4fe34c2c4c8cfdf4e301347096b915233097a061f4fc38e5594004d8e24743aaf152005de7c569f26586f57987983c79b98134d175884370ac66050c1d626
 EBUILD thunar-1.6.17.ebuild 1982 BLAKE2B 80c4db25fefa53601d8febf049c580afdf37a7776fb521e7c409d101a11f545e7fc30339dff806883f0a814e5ebb35fcb93bb64767110518f00d6d3642884be2 SHA512 a5c69521c5b22bcab2fbfd48678286934457371f16b6ffb3d1d0860a78a100af569169eb1fa5d0dd4fb43a6317bb5fdbc844d73cfa838991d81498a01cb17161
-EBUILD thunar-1.8.4.ebuild 2005 BLAKE2B ef10efa2bb1f33b302661ed8aae22d00eb0e9417adfde68d75804ae87bb607b3c0d8ef58c158cfb5cc52a60d7ed3d73dfc91119ff347d59285b6a399c4d4db46 SHA512 7a50c1fcea6fdf59c62d3a51ded1b1c5cf978b10cf306ee7111567541f7df254832346793374132201581383b7e7c006edf293d756575e773b4f72726cce682b
-EBUILD thunar-1.8.5.ebuild 1942 BLAKE2B 04ab5fd44b65bfca9f85c78613594f3019e9b5f57ad42878e5dba139a3631caa22c77ecc7904c59a05c97d02067f73cc43b3f7ada12f00fba5d4772bf20c60fb SHA512 5305f3380834f6300e0c67349a941501a4e0f9816cca9c1d66451ee98a44af52a8eef19fe2fa1d1e886cd7345b11d2c8c74056826d6cfbd460a19e8f4c0f7e75
 EBUILD thunar-1.8.6.ebuild 1942 BLAKE2B 4f4279fa467490f8fbe7cc98952892e95f6f73fa18f55eee8aa4b841e6adc9177a75e71d71ff103b9d90d9458464359b9b748c2a16433799de168e3b4e1573ff SHA512 e284953d7ae6bc71d1f7dc814f86708ab20efbe7129ec6df2f1e24ad6fe2e2b43b832254d9d24de22c20e0b0e4c288d7ff2ce6066e7785e6598f3f624bfb5ac6
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.8.4.ebuild b/xfce-base/thunar/thunar-1.8.4.ebuild
deleted file mode 100644
index 9ce63186aa29..000000000000
--- a/xfce-base/thunar/thunar-1.8.4.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/thunar/thunar-1.8.5.ebuild b/xfce-base/thunar/thunar-1.8.5.ebuild
deleted file mode 100644
index f1892f3a51b0..000000000000
--- a/xfce-base/thunar/thunar-1.8.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit 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_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index 90ded79a6db0..f14e9792ed5c 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,7 +1,5 @@
 DIST xfce4-appfinder-4.12.0.tar.bz2 459338 BLAKE2B bd3fdb379fa50e7977aed87e54956a6e04645fb92dc55bfd22e5723fe162ca0f65dade18d8f077105fe5aa4bc922fe0a8f6fa1308fa2705d570c76d4bbbecc62 SHA512 025d38f9f2d57d1bcc37d38f4956742593cbee820ccf7d375138ca3eb0a9614090e3b969aba9d80b546eac43d2a9fd6c530ff829f0e4f59621ca068159e9adaf
-DIST xfce4-appfinder-4.13.2.tar.bz2 499368 BLAKE2B 2584bfd5dd1e6f8cb28ba3e6ecdcfd6345f26ace2fe97237c9c7b5385824a40f3f88f86d7c7577b9e683bd73d3404087c52df0b451b2408350d8dc3268eb7171 SHA512 96ac782c785649ddf75f8659f9cf10f42c37bab647824f0c76714baca0b61904fa8ba6d23dc1574aae5fdf2538201936d26b42ea6c0f5d5f0f9d71c8ba0a51b8
 DIST xfce4-appfinder-4.13.3.tar.bz2 511606 BLAKE2B 3e1038b7a9d9b4aec4ef6654e8fb0790dba3a378a0416757fbf2f5bfa23dfd655bc2abb9680a3144d6d57830dd18d48bdf48dc6960aaf32d4263e62779ac7f24 SHA512 47f69e8daf6f963b8130c0380f2201cdb2d02212cfb8b5c05fedbebb78222d3bd35db0fd422418cf3f9d1f2b90e66ee4d143bed57881f5673aefca8bc58e059a
 EBUILD xfce4-appfinder-4.12.0-r2.ebuild 857 BLAKE2B d58099530d95557f2daf58dd6ff2d256b61c54c9121f32d5866fc5843f65017921ce85d56110dc19b0bf631ea65b4ed5ef23efcb46216000736559fac938aaf5 SHA512 a65d81e4033ae435ef323005f67af53d0a927d7d0d97f99fd7ccab924d4ab1cd1d7c1bd18856ac567b7f8b1592d6a6a7ff2c232495919c5a5f1a9e7d82dfbee0
-EBUILD xfce4-appfinder-4.13.2.ebuild 787 BLAKE2B 024c79a06caae6edf78fd944370ef024cfb91ef594e798db7449aa51550bd0363ccc87bb28836c7775f9a4baf971ef1ae1c004fa7a6f02137430c67bda9817aa SHA512 84a365bf0ed6c6d6a841f46d87f148f2c978b3ebf7482a4f9a25f2fa145bddcf98922d7414ff1bf9dd135bb46d1dace00b5737a8b2f442247fb354fd7f4e6369
 EBUILD xfce4-appfinder-4.13.3.ebuild 787 BLAKE2B 7419b7c377f2d8602f247779bb722249103d68c0b82e103beb699c3b6971ef37730f6b873104176d023b6b96e7d39acb8f17984d420349c5ab4900f78f48076e SHA512 35e78c1f10608c9688ddb54ea0c64f54ee9f96df0f3c44c58c782f113ba3e926d49503aa3f3eef73339a7ac9af1fd572e96c8efbe9bfef9fbb1b8bf275ed6d68
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.2.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.2.ebuild
deleted file mode 100644
index 98ad1e6778c5..000000000000
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-meta/Manifest b/xfce-base/xfce4-meta/Manifest
index aa37bee73e04..a9c9d3671066 100644
--- a/xfce-base/xfce4-meta/Manifest
+++ b/xfce-base/xfce4-meta/Manifest
@@ -1,2 +1,3 @@
 EBUILD xfce4-meta-4.12-r1.ebuild 733 BLAKE2B 794d9072cd32913eb60f9c895acfb36e6de8c94ce6418516c67e60be494637b989b37899eda1759e439691043c6bb5f23ca9aacf28a11e59321ecf47660a1a17 SHA512 b382d26a9d0c0720394c3d8130e82c6c794aad646bb81555e946eb232018891d3067675f3429b5b81ac66be2f5d1690dd242552bc3bf9f20cd3d5476cb9ac11d
+EBUILD xfce4-meta-4.14_pre1.ebuild 971 BLAKE2B 7a50f99a69d65fcb8ce6c6ef5d3775ea521ca099b39824a2c515e1214473f5955e3e6b7374e0b05b40bafa71e63cdc7323d792c8f3e6bebaa27c881c7ff27a84 SHA512 4c372f5c39ae42005560d3bc93136087c0cb05d3954ef7652935a42b5e420e0b855d127e33faebdfc9e8e79a3c8ad5c0184b52d87b0514273bb6c4d4ebb7c964
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.14_pre1.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.14_pre1.ebuild
new file mode 100644
index 000000000000..b0a2b25906eb
--- /dev/null
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.14_pre1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The Xfce Desktop Environment (meta package)"
+HOMEPAGE="https://www.xfce.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="minimal +svg"
+
+RDEPEND=">=x11-themes/gtk-engines-xfce-3:0
+	x11-themes/hicolor-icon-theme
+	>=xfce-base/exo-0.12.5
+	>=xfce-base/garcon-0.6.2
+	>=xfce-base/libxfce4ui-4.13.5
+	>=xfce-base/libxfce4util-4.13.3
+	>=xfce-base/thunar-1.8.6
+	>=xfce-base/xfce4-appfinder-4.13.3
+	>=xfce-base/xfce4-panel-4.13.5
+	>=xfce-base/xfce4-session-4.13.2
+	>=xfce-base/xfce4-settings-4.13.6
+	>=xfce-base/xfconf-4.13.7
+	>=xfce-base/xfdesktop-4.13.4
+	>=xfce-base/xfwm4-4.13.2
+	>=xfce-extra/thunar-volman-0.9.2
+	>=xfce-extra/tumbler-0.2.4
+	!minimal? (
+		media-fonts/dejavu
+		virtual/freedesktop-icon-theme
+		)
+	svg? ( gnome-base/librsvg )"
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index deed8d32cd68..4f56b675ed3a 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.4.tar.bz2 1261056 BLAKE2B e09c540fca10417e8f3340cacd3f35dded832b512c11e4c485b93120b331cd4a29bcf0df6dae787cb3fd65567a705dff69d95551b073e49b5fc4fc62f598eb0e SHA512 16a3680aa2ab7fa357ca9d477ea0e41ca159a2c626fe65454ccdca339bb501ff0979264f5a4ae4728e3c0efe24e193eb28e7b5d1e003fecad8ab36b8457203c8
 DIST xfce4-panel-4.13.5.tar.bz2 1259668 BLAKE2B 533f1be8d240787678eae401c07db7d159b2f43c212d57d4fca4bf53f58f033fd12bc193de1740a65dd513658889f5fb404154356bc33eba59fefea8bea27526 SHA512 3eb4034bd6eae38f8f533b8cd2cae4ec8b40cab5f0d6810639baad641b4adaf15d03254ec79cd49d04e3498d3a4752bd9e968a0383468e7337106b3665092c4e
 EBUILD xfce4-panel-4.12.2.ebuild 1504 BLAKE2B 35b2d7c2dbf64d7596d0b413b7ac059d7b163119098dd1019bd4afa9fec3cd20133be387f2d8cf855067cd1305c73f52e9542ead6d2a307ae17d9160caa2d1a9 SHA512 d3c4d3f4097d93e6e17a35dbe20239551cc35257604ccc679571c45efe941e504e356bb1d61fface34182d920b78f20e46c8363c86b8195295cebaf02da042f5
-EBUILD xfce4-panel-4.13.4.ebuild 1342 BLAKE2B f53b2b4bf99364b5e5e06fddd32f8e23548d9f1baf418c9aa08a38e1c6f1f45ba34ecd25950363d7d8f26614d5683c70f59a23e042b629780bc422bb0209bd60 SHA512 d3be27ecd6b561985df7a30414f9d7e7e0b9eda177c07b731cc0bb4d5e5d5fcb3fb7c38eeac76bd9ad97736b4d7c9881f0189fca46b01fc1d8e33045ccc377e6
 EBUILD xfce4-panel-4.13.5.ebuild 1342 BLAKE2B 5c38816b491f669710e2e71c927025448eb4d8a01f0c366f96e6e982634e0efddce1879ae40c5069c07ae17751dc344dbc8943844ac8e377e6f4e06f65c83c86 SHA512 4ffa6dcca11069ec55c93f0fd0bd0d113dd938dfc90cbd7a744ed95ff6008349ef47850f83866393dcf33117e4382fe30d787efcf32ec3223ce2363dab2e150a
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.13.4.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.13.4.ebuild
deleted file mode 100644
index 1632b090f2e2..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.13.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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.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:= )"
-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 534ae74412f1..1402a85a2cd2 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -2,9 +2,7 @@ AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 371 BLAKE2B 7737f95e5ce5
 AUX xfce4-session-4.12.1-light-locker_support_to_xflock4.patch 569 BLAKE2B f05f03f7ee891fe286d4cb2781393d1a836e89c5ab6b2f7e0bfdba3582549d054cc6beaefb805d83d12ff1fafc8581ce12d2e284314ac14ef6b3fd9cd1c724f1 SHA512 da3b4fcc3cd059db267807fc46db6b484a2cf9d27e457850adc71e465300eb3d776ae8f10c204f0d419dbfbb135fce60ee5a89a75aad8d3644c7ba749f0a2c83
 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
 DIST xfce4-session-4.13.2.tar.bz2 829041 BLAKE2B 3b5c8a5722b7a38a95e12ec2145e2c155928e0ee5d7d8e9f47c86ec4e03f34b983bcd3dcbc1a3d6c2d84f991ed8e9f59b7db76716862c91290280db507a8b84e SHA512 cb1e63a3df9c4ac3efcb0cce20cb5528f9d1a46731ad4b32634ad5f4a53711f05b40d98464bfd562b4e3d42b2555827ece03e63c6a433e879fa0f0a4ccda6a57
 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
 EBUILD xfce4-session-4.13.2.ebuild 1824 BLAKE2B b4352ef3e5793e032aaedea4267847eb747a4e7f564832a0c22cfc17fe37d91b0e9f897c79ca45b0d035c9f90dce7f54f112fdd65d2439bc2ff07fe810632c48 SHA512 462de9c5f68e30da0222949b0f961688eccdc8d782771956ef51907e86f34355262ae354d730cbfb1baa25f44bd0d7edb6de608295e154171f38244f4b7a5362
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
deleted file mode 100644
index 67b5f3f2722b..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.13.1.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
-
-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="elogind nls policykit systemd +xscreensaver"
-
-COMMON_DEPEND="x11-apps/iceauth
-	>=x11-libs/gtk+-3.20:3=
-	x11-libs/libSM:=
-	x11-libs/libwnck:3=
-	x11-libs/libX11:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)]
-	>=xfce-base/xfconf-4.12:=
-	policykit? ( >=sys-auth/polkit-0.102:= )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xrdb
-	nls? ( x11-misc/xdg-user-dirs )
-	xscreensaver? ( || (
-		>=x11-misc/xscreensaver-5.26
-		>=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="elogind? ( policykit )
-	systemd? ( policykit )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
-# TODO: this patch needs updating for the new version, and finding
-# upstream bug.
-#	"${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
-
-	# fix building with no dbus dependency
-	# https://bugs.gentoo.org/667440
-	"${FILESDIR}"/xfce4-session-4.13.1-kill-dbus-includes.patch
-)
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		--with-xsession-prefix="${EPREFIX}"/usr
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	local sessiondir=/etc/X11/Sessions
-	echo startxfce4 > "${T}"/Xfce4 || die
-	exeinto ${sessiondir}
-	doexe "${T}"/Xfce4
-	dosym Xfce4 ${sessiondir}/Xfce
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 0f618ed42eaf..8f04adcc7dee 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,7 +1,5 @@
 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
 DIST xfce4-settings-4.13.6.tar.bz2 1163147 BLAKE2B 28986789cb82f91dd70d33203503cf49c4e20b548722be3cb8a2214ea16b762841cd56ad0ff7fc106b8ee35c812a7b455076c8fdce79aa7bf84e7706c15bd3ab SHA512 7fe4655a5644dec8688eebc508e23bace7af76c6b8eeb3821fa9a4ec79862cde64cf59ee2ac70a27ff378ef887ce6d109ef1b1d9e5f7e98f96fdb43604e024b6
 EBUILD xfce4-settings-4.12.4.ebuild 1503 BLAKE2B c11e3874f0ef54d18f003aead151f25623ca2ae32a9d8cee943f1e1f3a9398e2bf1eb3710c1193ee387ab70e38f9f19c72dbebcf5f20441b63cdc444aafba483 SHA512 d62e35948f10f10cb6ab49c141a3a2b3dc25183bf87f448b27d167cbcd1bbb0a6a3c484c4a5f58fbabbcebf3dc3b16c320b9899dd2c9af3a88dd097eaac3265e
-EBUILD xfce4-settings-4.13.5.ebuild 1501 BLAKE2B bddb40c911bd63957c5a2ff36d08de769ae55768c62f1581b1b428cddbf6307577adae021896bb7fc561a30b42477d15158912504b8d3d563e57aadae868fb58 SHA512 bc86fc48a7be96eebb740d6df897b58c358cd35dda14a90c3894686083af9a1e04d565b91e27b97b693238684c85d4e51a5e2cf646a6dd586ff8341bf32dd824
 EBUILD xfce4-settings-4.13.6.ebuild 1578 BLAKE2B efc118d9b1cdb9e34f9194712188169469209dcc4e5ae58704a9ecdd9ac628d44893d2ff025e3e6183bc20565c90a9f2c6592817771acccb06bf80bc82d48713 SHA512 7b8bbeea0f3d9028700d05617d1a71696cc8f6ec82adef4538d14c06213075aaf1673ce0ab35dbf5ecac6bd39297de95b48fb5574376dbcb5a0f9ba3125fe38b
 MISC metadata.xml 568 BLAKE2B 84eb32975dbf31237aacc657e8caff9c190ee8c0703206188ecf72ff4e53c582740c2bf0601ef906e7ef4de1fd7943a22fe34ad88321bf70ab86ef41d7a8aac4 SHA512 08955196da3e56d7c1d249282dcbdd7e06f699b8113b3279cbcfa0b3619965465af8b72326c1cdbf562062a307cbf92970f388b8a1765c58a3d107062ee0d431
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.5.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.13.5.ebuild
deleted file mode 100644
index ab7704362e6a..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.5.ebuild
+++ /dev/null
@@ -1,56 +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/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
-	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/gdbus-codegen
-	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 f609a433a35f..2e4ccdc3f938 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,9 +1,5 @@
 DIST xfconf-4.12.1.tar.bz2 564131 BLAKE2B 893210f19d743559b0879e9e38004400c8f8af0b6b8c72db4602360eee2ee7058f074e86f2f9e4397f6e728eae0148d3621424461d53e84ad768d7f0673ed08a SHA512 114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f
-DIST xfconf-4.13.5.tar.bz2 609549 BLAKE2B ccd5e907752d8fa5b5c4a7468c9eeec4083709bbe11b14ae79b20938e3b7c6ff097805be56b3f8cee146e2d0c0ffb272b856e559d1699c4e40d7c140fe7515fe SHA512 34e6b99be0b288707f8632c5fe4f2e66e01ec3950f4d194a7007afb4bc1cfe8bea44f8f80873de2364680481921332c9860b23bca4ced94ecb95c9199df5315b
-DIST xfconf-4.13.6.tar.bz2 578107 BLAKE2B 6348b536978d1d3f611783e530be7b694c46ad3030ed02e04a6e38122028068ec8392f34667e5d54a09d9115db191d6366619707e117f2b37f3ad8f14a3de2c2 SHA512 0eaa1ad428be5bea97b891a6bf0488293064e31d4869b70389ded940a23f9d8cffd0801dd98932658a67e57d6a0da95998872202cf7756aa24caa8f9d2c5f755
 DIST xfconf-4.13.7.tar.bz2 618676 BLAKE2B 8f7dd97530d4781e2d46d8139800f54991d932db5de0050e66d711bafef1daa0355383fd139789037a92b462042563a9aa2269295785b2f8217a0e9ff6a00c80 SHA512 113fb22b449a318b0cca6521914eda6cfeb6b2056a1aad4d49a5e83c28661c843c9912bbf7eddb7d6cd1f172b532c73dd02259bf6fabe60a377024f9f8d5825d
-EBUILD xfconf-4.12.1-r1.ebuild 1823 BLAKE2B d8af63d40df95e867353c32ef841f33caf711e5c6c3de5b1a3af54432ab356952a9a7797715c1991cbac1e7b1f74d451f18d1afd2650928b726033fa04bf3836 SHA512 11dcc3a86019a72063a4e94817b69c75deb14fa82eb13ef9821b1c26e9b29fd8b944d16b08a1f4e11b9fb33313bc1917b6f521a428c735edc624b7ff0255575f
-EBUILD xfconf-4.13.5.ebuild 1643 BLAKE2B c0ec3ea5952565769892124c73207b720afcd78ee73f354ca1632973b31d1910804ea1ac5ec37c4760f233cc5218cefa6494c5bb4f6cc7f2e75ab155ff746be1 SHA512 bac2083f81068db1c0078aa20ddda95bc057a8a9f4e2b9e75456e9fdf4846af23b0b31f78d4f47c9f367bd6fecafeb1b8561a4d427348c8631a8ea4b1f7c5a6c
-EBUILD xfconf-4.13.6.ebuild 1646 BLAKE2B fac9125900a540df75188349e283b7671e2451c44ce321b8990b4830ec00a271ad3878569898e551ed802e5b26e482917db73b270fca3e73e39cbab1a1e5720a SHA512 6b98d4d1f82b233b8110ffa8abe8c2e2d6336f23312bf6d8c0bf7358b8cc3f03d03fad5779c0010722000bf7fcebcffe6d4e3d95b7e80d2441b6b81105971fb0
+EBUILD xfconf-4.12.1-r1.ebuild 1822 BLAKE2B b37314d0bc755c1144da7e9173e6998e2efcac9501362035ed0989fc8a148f2d55ba3dd7a182fac68994284b8bc98e386c202f9d67282b76d2506e2a9070b96a SHA512 e841c7e830bb3e016c29a968e756f4497f7942740eb2bc7c3f3e298de35189faa0af7d7968260a5dc1fea738fc645f2cd490ce40eb7adb6c28e4fba974717962
 EBUILD xfconf-4.13.7.ebuild 1644 BLAKE2B 8829022a08c21700ec90b0f350f8892fab125859c47ec4922b52cd9104a745203382d3d2ae5e153315f17be17be6ecc04771307cb5a9dce691b3993f47c0e52b SHA512 d28e2c4989873b338166fa2a9837553b1ceb366d20befea84414b7b8b894c2801d14d7be22b7b547595f32d3621d6cda4dca0a697eb83c720fb10412e77bc343
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild b/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
index 81f5a2d94ea2..0f7f61db433d 100644
--- a/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
+++ b/xfce-base/xfconf/xfconf-4.12.1-r1.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=6
@@ -11,7 +11,7 @@ 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"
+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
diff --git a/xfce-base/xfconf/xfconf-4.13.5.ebuild b/xfce-base/xfconf/xfconf-4.13.5.ebuild
deleted file mode 100644
index 244033bffc4a..000000000000
--- a/xfce-base/xfconf/xfconf-4.13.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="https://archive.xfce.org/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/glib-utils
-	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/xfconf/xfconf-4.13.6.ebuild b/xfce-base/xfconf/xfconf-4.13.6.ebuild
deleted file mode 100644
index 2cd890f3d36b..000000000000
--- a/xfce-base/xfconf/xfconf-4.13.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 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="https://archive.xfce.org/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/glib-utils
-	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 7dc847c47481..d65599d5c321 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.3.tar.bz2 1487433 BLAKE2B 81c5be8d54da6bfdb121d5632d67abfe6705eeddfb8c247ebf6870261093908660f880c8152d0cff87c912b1f3277d6551993a6a64384e610928c9bc6fda45a9 SHA512 5d828ad653b46ab1edc8300335321bab48e0ad2be1ae02944eff553375a6059513aeb363c73aaec1a6958dd3f1c873920287ad911cfe7b8096b447f1b8165ce3
 DIST xfdesktop-4.13.4.tar.bz2 1485482 BLAKE2B c0f40c448d79e3840d8708e8c5fb4a1d94658ab866c630c5a9b2cd40e3b92b3598e57377ed60621a5b28daedd7ab877aeb13b84735a23f5a302cf07434008012 SHA512 3943fc2af3ca3996a38900fea4a03004e1d3f8728a8517c988bd59744607ed8e4ba3f135d6075833af206df3c35464633f47e374c26fcbb8a20f0f1ecfdb7da6
 EBUILD xfdesktop-4.12.4.ebuild 1305 BLAKE2B fa4e890b1e14d7afbf5f8e7e64e666cf91c36b6c2b80f93bbadaae07906b3678955d4a578a23f0aa2e3054e4c2c048a6bb438cf3f3f9a284b39ad67556c07c73 SHA512 12cebc35ec79e0b580c4256092e502164826c7f9abbb3c8558e36a1b9eb480ba3004fb4f68622081f8043efc0569d3b8fead5a5e2ed3549c43a2d9035db89514
-EBUILD xfdesktop-4.13.3.ebuild 1215 BLAKE2B dc10aa26a8014804048ba4cc5fedd11d71f8cde4afe06881b38f34a5f1e5322a02316e8967f7a112535df14631b5497ba1fe31cf9f815eab610bf43b4e329dd9 SHA512 36dfdae27fa6810ed2267fe3ac6f2a77715c23f3f8ada7768b5b6fa022afb732a5e7b23a6355b951402bd3ac42c641a12301de9dd68f9e1792f776f3a8dd5689
 EBUILD xfdesktop-4.13.4.ebuild 1215 BLAKE2B dc10aa26a8014804048ba4cc5fedd11d71f8cde4afe06881b38f34a5f1e5322a02316e8967f7a112535df14631b5497ba1fe31cf9f815eab610bf43b4e329dd9 SHA512 36dfdae27fa6810ed2267fe3ac6f2a77715c23f3f8ada7768b5b6fa022afb732a5e7b23a6355b951402bd3ac42c641a12301de9dd68f9e1792f776f3a8dd5689
 MISC metadata.xml 364 BLAKE2B 64544c9e89e370bb213647843ebc3c5d4ca08aa46564b02830ff041e74db5018d7503106cba4e7c1dd562f359649974f12b841e32136eb73e9d84ea0ed36f456 SHA512 3140dbe5320efba5393874f93b907ef2dff1cc8dd44cda7340abaf19dcbbd709beb7649ac72f1e9f92da546e010f966cd9f5d51b867c6df8c49332bf9de67dac
diff --git a/xfce-base/xfdesktop/xfdesktop-4.13.3.ebuild b/xfce-base/xfdesktop/xfdesktop-4.13.3.ebuild
deleted file mode 100644
index b4de135cc031..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.13.3.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.22: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 869a7ec2b6bb..e14aed85881b 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,9 +1,5 @@
-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
 DIST xfwm4-4.13.2.tar.bz2 1139976 BLAKE2B 724cb6562f89048f3f94740ff6984f2780274240800646050c62d0b19e303fcdfb1022227262953c09bb42a9a5a176dca8e1e69252d953df15660dd22f906ecb SHA512 85440a377cd7034e986b317e35c25ac6d4723bd4c1ce1e6951d8545a44f3c47340952fd0211f55cf19411539be6d86f4c34fca7b2219b0873654a6d311c95055
 EBUILD xfwm4-4.12.5.ebuild 1549 BLAKE2B e8fccfcedf7cd833cd36547ca919c9f59ab6fb4b4e56f376c5c5d86178f65b04f6b275dc5509f91c31badcf0aeef7a64ed8b1c19cefabee1bd550703aa8dc5f4 SHA512 c5287cc701a6762d1ec634ced21aaf36b4b2108ab4d9f4a9029e11212e9f4fbdceeacd3c994d8a096de39b351e0adbc3ae613a3f6dd610a956768c9c04e16003
-EBUILD xfwm4-4.13.1-r2.ebuild 1945 BLAKE2B 0f035f0041217d7d3eae637a723872b65deb77ca015166bab9f03c4d7dc4e37896153ea4bb7358679335084bfe69365c2c41fd77343cd6397e9e68ca517f7568 SHA512 7f6889976c91d99710bbd5a3b0af1226d9dd7967114e32e0e5d53b589b3322821d3c939b890f13db1b2a561b99e9dec4cdc4f683a94746645d6a59d5e6dc4f19
 EBUILD xfwm4-4.13.2.ebuild 1712 BLAKE2B f1c7953b879cb57bca4d17c73857b55c66d96aca637a5a8235bd3196bd79f7cb221255143c4c0c1fc74c406f7c4a47fa842543e576f51f91fb370aeb983ff2ee SHA512 c723db233d7802f937dfee28a1a2f7e09e27cdf90cdf3428f8bf4768033518ed338f87fc5e7d7427d7c2684df23c93dfd43ef6421f5d1f7b1f753b0d9f06bac1
 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
deleted file mode 100644
index 640e297ce92e..000000000000
--- a/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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.13.1-r2.ebuild b/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
deleted file mode 100644
index b929ce60b99d..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-	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="opengl startup-notification +xcomposite +xpresent"
-
-RDEPEND="dev-libs/dbus-glib:=
-	>=dev-libs/glib-2.20:=
-	>=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-3.14:3=
-	>=xfce-base/libxfce4util-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:=
-		)"
-# libICE/libSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	x11-libs/libICE
-	x11-libs/libSM
-	xfce-base/exo
-	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 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
-}