gentoo resync : 18.11.2018

29 files changed, 21 insertions, 641 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 71b44891ce90..e648714391c2 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index ee1c7d3e323c..9cdb961d554a 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,7 +1,5 @@
 DIST exo-0.12.0.tar.bz2 1310691 BLAKE2B 6acdfe0b3cf7b19717d17c4acc7973bc8e27e963b4213376061cee0bec72734303ed75b7bfd8d8cbe1da98af4a9b43132657ade0020f9d26add36aa77c184ff4 SHA512 8ec52aba3faa9728bb60e09cf696f772160bfd8357c06015a6d72a2302572e74389f78a20addcf3ac632a3ac84b3ee2f40750483a16e2f7e1cff7de6f7aa2692
-DIST exo-0.12.2.tar.bz2 1321379 BLAKE2B bf17b8dfb6489b5c168893599e67bac603e6915e78930d0d460e94d23a60b53e720439653358c2566083a3773cd5bb898da5210200a2c6dfac7ca9b730ca4aaf SHA512 771c4e3c09683ccf2d028a5203d4b2af0da38e6ae97baa7825714ad6e2e81d128d9238d060cdd80c95660a0394b632caec3e31df1f2cc28b1fed8ef19ee2011a
 DIST exo-0.12.3.tar.bz2 1233053 BLAKE2B 27cb6041778d5b0c93002f474d96d3a0ae9b02d651d3be047eb0e3d1e6640614c457fbac7557216c46b28008bca3f3be674e29e8be48243b6bf15917bae0c907 SHA512 1a727050b822aa4bdfbce22c1668372b10ddfd9c3988f6949ee32a5c5213d90e20ebafc923193c70dea373d217994fb42101fe2aad7bf55c8e81f983c5a2106f
 EBUILD exo-0.12.0.ebuild 974 BLAKE2B 41181a6cdeb7163c0a85dfca00214b9f4234a48b93264fb8fe284a3a86fff516a1286b0a0045389f5e2e76fff364d07011f82c54d54bde844823157870ed1b99 SHA512 3e6cbbd1e1ad33c5b0dca9013bf449a3ce88a11a8aa9b278b65e3bec6eb8b7d8c56a81dc29e4057a38116adf9c8595156675385e6dc10153a076b4c31e5d2a83
-EBUILD exo-0.12.2.ebuild 981 BLAKE2B 2bd59fef6efbcbd3cece52cc786a273a9780cd494a449899afcefa9351f40ce15fff26d8c9b5d4f5c36816c8e42a19cc792cf27317a04f94f313d6850d443313 SHA512 21c17ba439953fb6b4456e9535723fcce794c8fb766d5b3cbb4e1be06c1e5556c0e627119f4a7f6c216c370beec67560118613648bdb013e673caef82fdc24fe
-EBUILD exo-0.12.3.ebuild 983 BLAKE2B 8d943d2e0d3cfb0af3e13cc8bec6c7205e7c44555b81ce6061848f2ffd1b4446c7135e6681abfa3ce8af9c64b055532e406130e87c2b760cee42b329d0194e38 SHA512 048c01308bb3207c295f7e21f27fba7e7e0b3250c61b8ff98f6febef5e27ba3ffb79bb02eed15a73cc603da250b3fe785e5b2e4dfd7532dd2aee6dc3d21fe37c
+EBUILD exo-0.12.3.ebuild 978 BLAKE2B f72b4197b1a72bd41b65dd8a330e120cefb235c1dd0ba71cbbf44742062b0e6177e761e57790621a43dd47dfd28fc19098abea194f81942bc5d09a80e1f705d2 SHA512 670d330b58d0ed73377889645082e566487bec5103e78cfaad57fe55af4c8621fbeae4d3c543c82efe10603804a4d5618fcc949e76a16f90425b07c196ebc417
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/exo/exo-0.12.2.ebuild b/xfce-base/exo/exo-0.12.2.ebuild
deleted file mode 100644
index 5d80d9847c26..000000000000
--- a/xfce-base/exo/exo-0.12.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.42:=
-	dev-perl/URI
-	>=x11-libs/gtk+-2.24:2=
-	>=x11-libs/gtk+-3.22:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/exo/exo-0.12.3.ebuild b/xfce-base/exo/exo-0.12.3.ebuild
index 9a0d73773d13..31a30d037137 100644
--- a/xfce-base/exo/exo-0.12.3.ebuild
+++ b/xfce-base/exo/exo-0.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 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+ 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 0ab4470e6e92..6d480cfc23f6 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,5 +1,3 @@
-DIST garcon-0.5.0.tar.bz2 456940 BLAKE2B 1e2eb7351fc63c3dcaef358174f38e6da308141923474ad215309304644db85112d7f1edfd258bca5bca3c596f8e98c5d38cc830bcc11e91d5fc71e4c1c956d4 SHA512 9e360e71ae12dbfb5e948fd86c2ec3d6993e6ec68379adb588492386a4fe492480c365bd33f811c5cc7c8bf80044eff8bd942690b4dd4e0a9d4fc0c58dd29cf5
 DIST garcon-0.6.1.tar.bz2 511415 BLAKE2B 03c9076d8507737ed64b48597ff53c4cb3ae9beafd14b28d4d61fc29fa007f5ac4757f96ba0dc56c8b069a4eebd5d38202862856f96a1b08474de2aa93d518ca SHA512 36c5b1ba3c91e613853cd5e986176c8cbd2a509fafde1b302334deda872b7f7073fd06ba341220b030d8d5728346b7339368190b225203f33c023dd96f3ed1a3
-EBUILD garcon-0.5.0-r2.ebuild 894 BLAKE2B 596f95f6cb42333a7345352f39d2a2c1ffdad669d9a36ebf23ac1f053f43790101c5b1908208ac70ef6e32e34984731bd421e22befe12f61bad3540559a3c7de SHA512 ab5e6a3f8f7eb0af2a0ce525b66b954fe063a3d21f0ffbd67c894fca045f9cfc529f9614e4db2ac755aa29578fc1aad74f4e509713b6507e0e384cce56fa2b7f
 EBUILD garcon-0.6.1.ebuild 1045 BLAKE2B fa3a310133435fa9bb0536e2d69173d6b10c49b992c3a58115812e1c96d720550c55589ada3a91e026d0b81b42cbacaa0a7d6c33e1c3a5099102e16a421f83c2 SHA512 90611bac1fda29c045e05ac9112da1d2753ba135077f7a5f49a87a80445ef854cc452ebceb0c89188167adfd514ea9e9554de35f8c8749455a1b4e82f73eba93
 MISC metadata.xml 395 BLAKE2B 13ea597065b0ffcb8a57e82f980dfa9b271a16f0c6ba824cb66f551d7bd6c49946985d1391a28360c4160bca5b88cc796b578b23f0b321d1670ab9f1c0addf23 SHA512 8783901107619bafc30acd3962284cf56376a14cd61039f862e1a7f0b5e17fc9d51f0e278c85161fb8b42c53b132a1ae7abe00c7e933eccf2ce3b74fa9956d54
diff --git a/xfce-base/garcon/garcon-0.5.0-r2.ebuild b/xfce-base/garcon/garcon-0.5.0-r2.ebuild
deleted file mode 100644
index 0e3a12f8750e..000000000000
--- a/xfce-base/garcon/garcon-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
-HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
-SRC_URI="https://archive.xfce.org/src/libs/${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"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.30:=
-	>=x11-libs/gtk+-2.24:2=
-	>=x11-libs/gtk+-3.14:3=
-	>=xfce-base/libxfce4ui-4.11.1:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.11:="
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )
-}
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 3763e18286f6..cde07d60c184 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,5 +1,5 @@
 DIST libxfce4util-4.13.1.tar.bz2 497192 BLAKE2B 56ec5929df43e2c430c45298a2f7634a539ef1f32598ce4cd038659c93ed5de4f28472f744ab03e3cefd040266c1e1bd415c8b4e9489be8f3930bd6df8d1c5c0 SHA512 1667cc22ff72920d3280725cb40c41f5fba9dcfcba8e357ba85548c7f254a67a3ef942c1b71f0ac5c3a7fe46c8c4cb559a06a8111aa71ce1f6824d1a1c2b5063
 DIST libxfce4util-4.13.2.tar.bz2 509280 BLAKE2B 40f1fb95abff4857e976dd5f3ae8c8ad5e66e2c1c49723735e85124db71d30f204525cd74baf22e31bf405718f378b0c9ac37ec4189e1f4b9941d0eb6fc141ce SHA512 3bbb718f3a6d2213c86695b3f99d1e67c859ce635e5d066b18745d2ee57c0b2eea468b61079d8e2514c2d8f5fa847539d236ec0ed3fd17fecd9d1b36dc3595c4
 EBUILD libxfce4util-4.13.1.ebuild 855 BLAKE2B 5d068475a5308444ca458473055b89405219724e488a68e87f3f7424fc8d4af16be61bab01c4f3275ef611cf312128bd693cef4915f8e6d7aedbb686be014dc7 SHA512 1552c7de2a1f63c48de4f4ad7eddad4f8dcbe0d98f79693aa3970fadfb8cf980672d60b44b26e146a2a6e0dc875c3c39bcaa2665eb4fe302bffea4e1ef2af7cb
-EBUILD libxfce4util-4.13.2.ebuild 1051 BLAKE2B 9867429304e18f2e814a11954fd76973a211a71dc68eca6e95cc66e0da7b824681cd9ce87e54fce5c6d09a1ab10577cda131d1331e74b62cd9be275844a5afd4 SHA512 6028211ae25b8b3150c3a09060a017ea54f20beecbea7c39cd98128bbe5c173367162a47b2822818fa275394eec15db11c0440eb5115f0e0432ff88ac32359ee
+EBUILD libxfce4util-4.13.2.ebuild 1046 BLAKE2B 4db4f1d49ebf7e704e2c5d0b34cfb1b1327fa519a0eb8b1a3de3ba288f3bb2dd1c693540b6ae485ff70acafaed8ede1b62fb32ba1d80cef422e3980212a9aca2 SHA512 eff5aff127ae6170e1356b2f6ae16493f888bdfa1ce9df3b7bdac879160597c80ace4e3e7631355138c09e97f82f505f6f3c3648e7811deff04057faba778382
 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 9073774a0740..ec64ba1b3736 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 Foundation
+# Copyright 1999-2018 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/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index c6d4df1f0435..03c9f83ab505 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,8 +1,6 @@
 DIST xfce4-appfinder-4.12.0.tar.bz2 459338 BLAKE2B bd3fdb379fa50e7977aed87e54956a6e04645fb92dc55bfd22e5723fe162ca0f65dade18d8f077105fe5aa4bc922fe0a8f6fa1308fa2705d570c76d4bbbecc62 SHA512 025d38f9f2d57d1bcc37d38f4956742593cbee820ccf7d375138ca3eb0a9614090e3b969aba9d80b546eac43d2a9fd6c530ff829f0e4f59621ca068159e9adaf
-DIST xfce4-appfinder-4.13.0.tar.bz2 476547 BLAKE2B 179f77efcbb3d24982fd0598ac840a2f60bbd5cc95275621f2483da23557cd5175c7a348467d67f8b029eed62cf7035567ee433f8560ee535bf1148a30ae22a7 SHA512 1efd2dcedeadd6e14ee7db9defbec3c8233a5634a38b0c6274b9a858cfebaff815dc0095515866b83aad1981a363e6ca4b3c12190faa64f485421d570c5155b2
 DIST xfce4-appfinder-4.13.1.tar.bz2 485729 BLAKE2B 269aa1763a0a9063396c6724fcd37ea4d8f3c35907502c3b7a65a99fa038442acda5b4a2aff2102ab28ccfb110423ce2cfd2bb1406a1fc570b29b1f6d5dff9e1 SHA512 1be1508bea87e9ff7763dc6a8dd0a45b3e1ef39400486b9926de190e146c4c3fd96d08508d32c53a99ff92e98c4cc504e074f651273aac917a79e5df71022116
 EBUILD xfce4-appfinder-4.12.0-r1.ebuild 903 BLAKE2B e6e8737c441cb539b18879439a5229d571be89dfc681d36bb762dbf9f3097168662ccbdd2e59510875777df5e25cb0c8e26ab47d3011d0b8157c644a0c8755c3 SHA512 d021368df87e09a97a5bd7d570541a12518af7600732839590dc9c0fb38d6d2090bf3be98f688f51193759f9e67d2c0a21f7bcea5a095375a9f5317a7911c1f7
-EBUILD xfce4-appfinder-4.12.0-r2.ebuild 866 BLAKE2B e556da74d3bde21a66a964b4a40695291871e4ccf48a870631deb7788d8f8299e41bfebfae5518a5740e53ae8fc3b7eb58285ed7c47101d6d6d3157e4a6fda9f SHA512 6463736248650bbb0127148ebecf79d15ebfc7d2c8a7338a27bbf3ee272dc727ecc25f1bf31204dd5fdcf125657bf7737a90ba6a3317cc7d7254b816b17443f7
-EBUILD xfce4-appfinder-4.13.0.ebuild 789 BLAKE2B f5cb3ec554ebb7db9a4637cebdadcd6c47d20e242f38e10174d8765be7c1f88d9639e2d8179548a180adb3480797a4764b3853c0c624392c93a342ca4719f848 SHA512 0403dcf2c578136bd81c8289923b81b8c1c8df05fbb1db2c867ff3a1f6073e98a674cf6df086d983a909c369251a7a19c75b8b85184fb0babbfce460c6c5d937
+EBUILD xfce4-appfinder-4.12.0-r2.ebuild 861 BLAKE2B 7c5c12eccca49b774b5df338565dbc57dd6153d6132ba744eca675571c8074da47035b9b0a7a16e652f4856d96eddcb6e15b1061668d7a7382d43ad62b1309a2 SHA512 7f445f89387f95d7dfc639d8af0c50bfd1041514e7867b1b632a199afc1ac0bd181a12cc1936fd49054b0624b77050411104348410dc06c53048db7b1ef9aafc
 EBUILD xfce4-appfinder-4.13.1.ebuild 789 BLAKE2B f5cb3ec554ebb7db9a4637cebdadcd6c47d20e242f38e10174d8765be7c1f88d9639e2d8179548a180adb3480797a4764b3853c0c624392c93a342ca4719f848 SHA512 0403dcf2c578136bd81c8289923b81b8c1c8df05fbb1db2c867ff3a1f6073e98a674cf6df086d983a909c369251a7a19c75b8b85184fb0babbfce460c6c5d937
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r2.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r2.ebuild
index 0257a3ab9b31..5c0a932de144 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r2.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+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:=
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.0.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.0.ebuild
deleted file mode 100644
index 6ab6b0d8e9eb..000000000000
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.13.0.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 b219907ab0a7..3bacf564a7b1 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.2.tar.bz2 1231467 BLAKE2B 994aa5daf3e2c09c96dfda82a67bdd5f28dad1edb2ed85fc5c9ac5c314eb426bb6431f9ae9e3fc5b5ee49fd818255c7c2f6abd58bf323a1ac92d2ca520a5224c SHA512 d26ffd904bc2dc1e8b866215c6c07e1c4052d8c46378c33dd45c90833cb4e80c452b7dc5f8d7dab0cfe28657c3eb0f4cb620b823938f54f8eb1ae1e4f8077ed0
 DIST xfce4-panel-4.13.3.tar.bz2 1239212 BLAKE2B 8bab0c2f291874064ec8684ab8ada8177cca3f6ad163638bb57b02d0e0f77ed484ecb71bd9a4e54a63d75a572db260d6f92b755d413e1c6c111aef613ca2c2cd SHA512 99921ffc295b0e00689df50946ea326496c6fca68d6dfc6a563c0fb9e18bef1e537659963e3a0e6ee83756417565ac3531bc43e0e909dbb369068e4905bde045
 EBUILD xfce4-panel-4.12.2.ebuild 1503 BLAKE2B 29250232c73abbad889c3d1b86360e7401efaaf99f95ca8bd3f59b33065c42f4d63ae1b887cd538f180014514a37fb1d804fd696931b1e3c2bc49776f44e5c2f SHA512 bf46894dd6479d4521604c0b5e57d9fbd2d598c757dbd1004e63449a2f36d0bc088c7cc9f404e9126d546692ca7ffd6b98d06432575334ed72591e7d9eff637b
-EBUILD xfce4-panel-4.13.2.ebuild 1343 BLAKE2B 8f6afca190ca1f99fe096ff3e544b656d22999e353d18868adb72354be95bc3ee9f5e033307b6a73d1c06adee53c5d0fef5e625cae90c1b928c01f4cb64e9d83 SHA512 904bf031fd0d2eaf6900650a11cb5117de7557d0279d6010663fde9045af2b651c98e5ea9da02d5f0354ffc8fc09ccad0af74fec9e19c4a4eb5f972b5ef5ebca
 EBUILD xfce4-panel-4.13.3.ebuild 1343 BLAKE2B 268b496bbe6d1d39869d7ed9320465d7ca2f988d326fd3814ef0726401a00705953acb67a4435e29cb2b033570497328a74fc292d0e6683032347bcc5875c8a7 SHA512 26cbe2d4ed4a9055f0d0794f92566cb9c7dcdb5672fbed3786a6d146a006fddd6537f8e9800a78de35f485ab46e40c6e411941f55895346af944a9d53e193823
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.13.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.13.2.ebuild
deleted file mode 100644
index abf6ac482c15..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.13.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 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 b49eab0210b4..2cfeee788ab4 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -3,10 +3,8 @@ AUX xfce4-session-4.12.1-light-locker_support_to_xflock4.patch 569 BLAKE2B f05f0
 AUX xfce4-session-4.13.0-add-edit-autostart-segv.patch 2511 BLAKE2B 028e1b05cd830f6eec9e2668414e94e792569811eccc9bf9ccbec300d80fcab300e8039538e11fb371ca2c5cc7c8c3816267751aa32d1d843d5b0850a4dbea99 SHA512 96e4ee3fe66c02775efc2d3222e9c668c9f422a303e0bc5837e2fb1dba5e07d4fda2c420c37e35da73731597b922f995c1e30dd40dfcd903081d566fc5a569ea
 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.0.tar.bz2 1314715 BLAKE2B 7ab5bf645feaf9862e9cc4f36f26cfd614e7c66aa32cdb41ded8b0067e3aa23a6897beb6c362685f84c5b2a0f3d91462ab3dc7fed5a15875eff49107719c6c1c SHA512 61f9a547b03eb109a1a0fc83feaac743ea2119360f2f7208e589feb3e8f1db016ffe85cf1c8e20633ec399f263dcbccd35c431bde6f6f1482658688096da5cb0
 DIST xfce4-session-4.13.1.tar.bz2 1322823 BLAKE2B e50cc2628a068bed39d2aa6344eab7676e6464c84e3cf11d79518f78db54ea01316bd098a541b6f0897f3decbed2eb37e55009d4bf89d460e136d7a44d31c26a SHA512 5845e3591919e23ca176199e81075a097ef9d65cbcf23b34d84afc649a307bfa8c6492e3a01855cacff9328da809725213ec1fa9d76024c0a0c25cce3c51da1b
 EBUILD xfce4-session-4.12.1-r1.ebuild 1918 BLAKE2B f031e4d584bb86a02542543db6289d235e355f54bdafbb4b14b43198d683449be3ef1fa09a8425af8c5642dba7c7b0a91cb401d8a4d84a9fe95303cc3ee42c8e SHA512 5248448b59df99255762ee61dda50b487cbfae77d01c5bc41ea7e04e2211df99190f4f544d77d38c0db86e25ca7a5c7582d1915053b8da33d70c9e0a2f2a242f
-EBUILD xfce4-session-4.12.1-r2.ebuild 1893 BLAKE2B 767bec90fd2e60d63c6d83c35104178505bdca2c4e79b342271cf73f6c299c32fbd3ad8d32ed61952a38757eed97f58e7916a197f6a21a4551ee69b459d726d0 SHA512 0e8a76a1d685b980aaaf7d837926dd22d6e8281f764744c5e9cb85fb06128876e8adf74bd127bf612a6dbd939c02e6e99240981d56cd80769b31ce84d6f84160
-EBUILD xfce4-session-4.13.0-r1.ebuild 1820 BLAKE2B cf9018c5a77b4faf3d5b05725080d248d1d5f731fe3f469927511283ba0e0d345468f1e2296ee0d7b85eeb4f3465bec856cd0fda57abcf980c5706759d769b73 SHA512 de30ec68465bc12f9be4b6b54f44511d42c136e446a79e49fbea0eb7b8bb7fd0d75477d6aa5607d15cbfa397c68c24bb5fd40f953babe096aa94e147176dcad2
+EBUILD xfce4-session-4.12.1-r2.ebuild 1888 BLAKE2B a84a4840c33d017527f8d01047a8d747eb59b5c07cb827b80a807015363302dc9d682b3bb0c84c262ba6232f13a9eb0644496bc8fb11b0434ea332988930f792 SHA512 9c376b4a8b9308b95274dd36f2d5edb238ba652810ff4ed659580df32beb491a6ead9feec844be5749b7fe0352ce9fc732e07cb8822e927d8ba58139f1cf8979
 EBUILD xfce4-session-4.13.1.ebuild 1912 BLAKE2B de6a89c260be73b8e01a98ab8737d8a53bbca0442c1d22d23d947fe914ec24f2635b6d1ce765fd6e8f8636f4de96e31707235fe0b285bc2fcc9efa39d686ba44 SHA512 5cf4fb7960a5ae8bcbf929d9e9a2599fa96d6441e240762929cc5e6392ebd2aae67aadc5d3a3777e74a6c312e5a8f1c44dd2e4d42728af072986a06a0239bb93
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
index bf59c0c7e889..3ebcdf8307f0 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 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 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls policykit systemd upower +xscreensaver"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
diff --git a/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild
deleted file mode 100644
index c8b5b81004be..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.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
-
-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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="nls policykit systemd +xscreensaver"
-
-COMMON_DEPEND="x11-apps/iceauth
-	x11-libs/gtk+: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="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
-
-	"${FILESDIR}"/${P}-add-edit-autostart-segv.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 d9abe7a74b0a..38c734de8348 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,9 +1,7 @@
 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.4.tar.bz2 1046733 BLAKE2B 8694a72e32568b963d4c754faf578ac3e651ce0be5a4b650a45393822fcb6102de4ea9ce0eb16c387605ddecd763057dcb622ef60ce546aeca2d42d3ea5561d0 SHA512 39e2adaa93e2d86ff51e47f194306e57d025c13b5c07ee76cad7f67994f26fe03677c5a3bac91d1db4a25201371f6d135f36eed110dc15a1fbb46228ee715893
 DIST xfce4-settings-4.13.5.tar.bz2 1067538 BLAKE2B e1c747582744bd2102f46fa45340d5695240f98941ebe55a83067b9c99b00946b8df9c522313418219acd11048d49b8c6617abde64eb3dce583be59c9272ade3 SHA512 5e7b13b25767091ab0b1a5683359f33e4a86151dd9321681fc4d896fcd9cc569effaebfbab70bc734e07041e9fbb1c3015f9a177146de8a128c4a539462dba5e
 EBUILD xfce4-settings-4.12.3.ebuild 1538 BLAKE2B 837b802a9ab371d5254cd614a18f5ed302fb9e5ad00292b8e32a5a6c317a8e3addfdf09f9b650644d5eac79eeb6545a6d2044e078f567c922a3bb5d69f4a3ab3 SHA512 eed0caceb050be9531554027ef3cd2c8565faab86b6c9179b18d74cf8602f0076968bedcdcb81bf3644a3e0276dcec4d79133497dca72a75b8b6a5764fef3571
-EBUILD xfce4-settings-4.12.4.ebuild 1545 BLAKE2B 73ba84e843636cb6e94a6f6dc1831b1c1437a6a77b8c740f404f9abc023579f8eab0f906cca2e9de8dd03c3929c75fe7008291e78777c02c6a6ffcbd55da2c05 SHA512 4b34b89e69a4b32a50372303b4c5d289f007f75b83233efba43ba40dfc4e079739d4d13f665b1bdc849a78d9054a7cad87c4ccac2513b6ccf9961a5a89142119
-EBUILD xfce4-settings-4.13.4.ebuild 1537 BLAKE2B 8df96eab92c84ffee72c62cec458c91ee387f9b60c090cbe111d4e95708bd2841f3ebf8a4cd2e37fd38f9d60e946660ace933f25a64a3aad50c3e0a414839593 SHA512 b47ee676ddac58d4ca54386edadfd9c247e81b3fd472f89857b441574e2ee3b1a42c5b8af214035bc73bf5c094d4515852587e999d1015475f8d5039741f6715
+EBUILD xfce4-settings-4.12.4.ebuild 1540 BLAKE2B 5292a1e358da7a052047388dbc82b29b8f8265ac8960d757985c7927db8d212048ed63dd5fadc7e14b8a72862069060961405552bc56cf6963d701a9439507a8 SHA512 23a4975979e0033f715ac6fe8f86a687c0f49126ab6db07261c498e3add709e83df17c041fe8416d50b3025dd75b2c65f664ef6bae5d292bd059550be337cdc1
 EBUILD xfce4-settings-4.13.5.ebuild 1537 BLAKE2B 8df96eab92c84ffee72c62cec458c91ee387f9b60c090cbe111d4e95708bd2841f3ebf8a4cd2e37fd38f9d60e946660ace933f25a64a3aad50c3e0a414839593 SHA512 b47ee676ddac58d4ca54386edadfd9c247e81b3fd472f89857b441574e2ee3b1a42c5b8af214035bc73bf5c094d4515852587e999d1015475f8d5039741f6715
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild
index a4d3a291064f..1d0ade8d5793 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,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 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+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
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.4.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.13.4.ebuild
deleted file mode 100644
index c72c06e61b71..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 sys-power/upower-pm-utils ) )
-	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 d5961b4be44e..472dc2f15574 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,10 +1,8 @@
 DIST xfconf-4.12.1.tar.bz2 564131 BLAKE2B 893210f19d743559b0879e9e38004400c8f8af0b6b8c72db4602360eee2ee7058f074e86f2f9e4397f6e728eae0148d3621424461d53e84ad768d7f0673ed08a SHA512 114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f
-DIST xfconf-4.13.4.tar.bz2 598700 BLAKE2B 05d4f7e360359e8d56b8a4cf6a39f22506113a758861fb730d9fb858f92554af3e28c49a21ceb246f8503087bec1032d430b16df999f7db22c56d3d3cb12ad68 SHA512 17c4c2ff4b02eef2d3040c21120e34863e4b38794d7670e42a31e4062a0ba0d4064d4239e8166a2c05d5d316773fdc96ae6098e78ab9b058b9c5a31f94c7f3dc
 DIST xfconf-4.13.5.tar.bz2 609549 BLAKE2B ccd5e907752d8fa5b5c4a7468c9eeec4083709bbe11b14ae79b20938e3b7c6ff097805be56b3f8cee146e2d0c0ffb272b856e559d1699c4e40d7c140fe7515fe SHA512 34e6b99be0b288707f8632c5fe4f2e66e01ec3950f4d194a7007afb4bc1cfe8bea44f8f80873de2364680481921332c9860b23bca4ced94ecb95c9199df5315b
 DIST xfconf-4.13.6.tar.bz2 578107 BLAKE2B 6348b536978d1d3f611783e530be7b694c46ad3030ed02e04a6e38122028068ec8392f34667e5d54a09d9115db191d6366619707e117f2b37f3ad8f14a3de2c2 SHA512 0eaa1ad428be5bea97b891a6bf0488293064e31d4869b70389ded940a23f9d8cffd0801dd98932658a67e57d6a0da95998872202cf7756aa24caa8f9d2c5f755
-EBUILD xfconf-4.12.1-r1.ebuild 1833 BLAKE2B 9bca9d31e9c753fefff39b9265b24cd21c6f1e6760c748f6074e96e930e665f138d5a30ee9443526d407321017417dd0d400909e73a438fe8ebbf8762e3d49d8 SHA512 0588601a0cd15eebc6405d6bb4b5a1cdc6dcdaf33b5cbe36313b64741563da57f068674e8367f1734cf61161bcbd02b60e87585a868b0eaf5e284273e3699dbe
+EBUILD xfconf-4.12.1-r1.ebuild 1828 BLAKE2B 6b4efa214ec0f6bf4dec79f9803a6f3f0e5a6488a2068cfd0639480236ba91906d9d02056a311107292818f5ded357fdf3b837c2a794b824876c8f65891e862e SHA512 6feb0d9d8bb601cf039e12029d53776a55d842bb0907cd29a380adfecc835092b4d5676bb1f7530ee468976e8aeb8faf7cc9ea844e56586c5eac059134f52717
 EBUILD xfconf-4.12.1.ebuild 1507 BLAKE2B 03e1ea51842ae97a8bace0626ea2057bec514205c8e08034d5728ebc66601596506a677dffcc15271896fbc6b77e10b0883f4fff2b0952a976e8a347b18f69db SHA512 d3d6c22b4cc9de16056580a81faddba0c1629b711a389ecbfbe10313273bfb2d558a97c06e39e546183580ed7525257fa791e3162c355e7ac5dde71154d8e703
-EBUILD xfconf-4.13.4.ebuild 1625 BLAKE2B 65367829873114f7b9990458fd85341a15f9e00c6ebace1bae53f3465dc534932c94670f2798aef0fb3190599dfd7b23e5242f79da696ffcbb2e75c74ee4b7ee SHA512 68d8c46f9a547588a713b9edc023e8889dab1ff69fdc7cd476c5ce9c0ab61becb9a643c023a5d66c05fed054e4abad69d5049b50c608076888214bb663bf01aa
 EBUILD xfconf-4.13.5.ebuild 1646 BLAKE2B fac9125900a540df75188349e283b7671e2451c44ce321b8990b4830ec00a271ad3878569898e551ed802e5b26e482917db73b270fca3e73e39cbab1a1e5720a SHA512 6b98d4d1f82b233b8110ffa8abe8c2e2d6336f23312bf6d8c0bf7358b8cc3f03d03fad5779c0010722000bf7fcebcffe6d4e3d95b7e80d2441b6b81105971fb0
 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-r1.ebuild b/xfce-base/xfconf/xfconf-4.12.1-r1.ebuild
index 0a9248e0894f..cc04f82c326e 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 Foundation
+# Copyright 1999-2018 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.4.ebuild b/xfce-base/xfconf/xfconf-4.13.4.ebuild
deleted file mode 100644
index 39a35ac7568d..000000000000
--- a/xfce-base/xfconf/xfconf-4.13.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit virtualx xdg-utils
-
-DESCRIPTION="A configuration management system for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="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/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 d01d20bcb029..019d6f4cdec3 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.1.tar.bz2 1485914 BLAKE2B 2b991b40317c9d92b53f357d674078598a7b17dd870155de8eb360fd9998d5376582909b57a93e00628a7dfd7e65bfea22b7f57b9373bab869296ef9b2973af5 SHA512 efe5ffe450f498ee0188a1ca5efd0ef340d73b5650060f18db4fe94ae9130dd27e41c6b30af2f90839e6c8272f3e270d16b86df64d595fe82169c26d624f806a
 DIST xfdesktop-4.13.2.tar.bz2 1486455 BLAKE2B 38ba5da7172212f74281f60688a581e525dcbb91ea381f8fcbdef57f90b54b9c21d08f20f3b1da5c91dcab158c2a7ba415822ec7b1f92f1cef80e53624a1f741 SHA512 0002ed639f8554144d8c921ca5bd9d1c2ed634baa11c98f95685c8a636ae6bdc87f8df19aa138fe4eda591facba964451a10aef6ba303be1fad66013bb06ae13
 EBUILD xfdesktop-4.12.4.ebuild 1304 BLAKE2B 694689d44b083df8e79f3d3c0666c1e17d8dae958c08b6cab9180925d15852a555f99b62364dddc6c8eae7075fd457dfbe6292a1fb94c61edb4feb1f8d1f4e73 SHA512 9ddbcdd35ed2d9b59c0c99eb4f909f0315d89c32749514ba1c59b98edf295554e364bc28d6459722d7941a67d55ea2484e48fa668bd334fc378ec609d2ca60b4
-EBUILD xfdesktop-4.13.1.ebuild 1280 BLAKE2B 6eee55154454d4801622c4eb508d6321e8c36b3f6142ed4f5d570a0154b408d849f9d3f7e8b29d0ff0b127ba6bf58bbd2ea8b254843d5e3ae628be571a9d8191 SHA512 716247c2a28fbaeed8f6c546f10b4fb6299557481d07112c1f1fc4c83b3e5dca3e3dd9fe0101fd1de1a0e99c78b33e7153f9ea1018d48db9c2156300ab6857c0
 EBUILD xfdesktop-4.13.2.ebuild 1211 BLAKE2B 58a338a3daf13ed88f5601c603510906759fbde4d8859eea998713c860c60d9e28f371383161ff0bd7f0c979e1cb76fb0f004ba7f91d8337876e54bf9f384820 SHA512 8cafa8e3b5429c15832c6b329f431e7bdb79a48f7d0ca5d5fed1668af1d543db98da1cbc62d25e21fba30dcc96675bb943ae4371fc482b8af38bc3a49cb36372
 MISC metadata.xml 364 BLAKE2B 64544c9e89e370bb213647843ebc3c5d4ca08aa46564b02830ff041e74db5018d7503106cba4e7c1dd562f359649974f12b841e32136eb73e9d84ea0ed36f456 SHA512 3140dbe5320efba5393874f93b907ef2dff1cc8dd44cda7340abaf19dcbbd709beb7649ac72f1e9f92da546e010f966cd9f5d51b867c6df8c49332bf9de67dac
diff --git a/xfce-base/xfdesktop/xfdesktop-4.13.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.13.1.ebuild
deleted file mode 100644
index 3741432d8dea..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.13.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify +thunar"
-
-# src/xfdesktop-file-utils.c:#if GLIB_CHECK_VERSION (2, 38, 0)
-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.12:=
-	>=xfce-base/xfconf-4.12.1:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? (
-		>=dev-libs/glib-2.38:=
-		=xfce-base/thunar-1.6*:=[dbus]
-		)"
-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 a88ca0461909..574181019f09 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,12 +1,8 @@
-AUX xfwm4-4.13.0-ctrl-f1.patch 998 BLAKE2B 9124fb6d749875de12cdc4794e923c621a6dbd7d6ee01ccbdaa876a72f41ce1fa2f5dff1ab4b718aa400c46f5a0c65c9d193c413a6ca78d07e99a077ac683134 SHA512 266977cbbedb5656196276c9441922346d936f1cdebdcfb24253add1c4d643344e00046e5574a534a5b5b70ca13826797f6202700b4aac09e0281e5c518428ba
 DIST xfwm4-4.12.4.tar.bz2 1208874 BLAKE2B 60b584d71bc4696bae83897d80cd90d9c13233d1971c823eea6417c8020a0440dc0d648df4e11b27947915ca57130ea3bc7b588e902dc7db74945349ff9ac514 SHA512 a33530b08f094456c45ad7c627ba34d3772eaeacdc9f422a3a54a16194d494cb1d6798122398d917fb8bc970db7e1184d9dc8edefc365dacc86de22be397b43d
 DIST xfwm4-4.12.5.tar.bz2 1215450 BLAKE2B 3a156af589ec7391245edbedbc6e10ac9c746121f68e4bd0c64e30b9b0c11abfe13c1fb77321249edd4e5c8d3051f62f135093fabfd8ba215573d330fd3745c2 SHA512 b723638b9cd858beb75232a251471cfb2d01ddb412b536c3f0b432e1f894014e1ad51c77d208d5439ae8a8d970344d0146d5f9475106c1b66d22715af7af42d9
-DIST xfwm4-4.13.0.tar.bz2 1229878 BLAKE2B 9d7f3d6121a1d1522294a659204d391e120b971cbca00f53f0a0d37f256f2ad65dc6ac1cfd5355d78fa5bd811ed8f7d4013081a10470f18e3edb9fcc0395e218 SHA512 01c6cc31dc179ccb51f9881f64ee9e4e16320ab888381d0b203ca0b2a46097048c30eabe7083aaec869c80e8e358c287896d6a1965a36ed6f2f981c27cfb2dce
 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 1558 BLAKE2B bb4409211fd13a1ce52189b284dff93313c14b7a83f7520c033d057c674a2aad60add8f98e40cbb5c9a2be15b1dec2f0e0080a100ffc78971ec98f2374a11763 SHA512 5af645ff4b16e4215405bfd567907e9063489ab9ecd2e12d4719f40517544b0aeca8c6334c33fad4535574f06a62443ac874215b39aa0988c8b24c79113b5be1
-EBUILD xfwm4-4.13.0-r1.ebuild 1752 BLAKE2B f35aca2c13b7104805d4bac0787c6b03b90bef02ca32bdf306f98bda1ec00d929b3066d8158b400cadb6e011cebd003ebe7c6a777fab0c9fc851a2f55db4a447 SHA512 62821ac7e4454357071cc1953e47d05b3f5d84b367e5d3856ddf726120e692b0e4161597c8046ae32732ae395b891064d66b2efabf497652f3b9adfda9786700
+EBUILD xfwm4-4.12.5.ebuild 1553 BLAKE2B 244f517b4a3baeeeb907c2497582a14f06f764c4925bd30bbb35bd47e4700f627798ccbfcde9c7ee51fee3e4b9d74bfad9680863707ff8dd44e482e4be360d62 SHA512 0a0c53d9ed150bee06a021b1c4cc2d74d921b2ee536375432b34de1060485be535a9fadf9566a84b7f7ca35f90193fef9f91a226b826ff8d4ae370b189151681
 EBUILD xfwm4-4.13.1-r1.ebuild 1897 BLAKE2B 28113547afdd5fc3671ba6414a05560a29050a1fdd21edcad7976b94dbd045dc2ec502d62db0fcefa960ad94603f0cf94716da0644fe8a936339f24ce0b074d2 SHA512 e9be0515a5cfcd81ce74cac2640f10b1bb34b57af7f709f5390e073d6e3b744de8664a0ae2ed58ef601d9ca3a2adab5985a7618dcd426a5f3d40ed83a7c94c2f
-EBUILD xfwm4-4.13.1.ebuild 1722 BLAKE2B 2e1113a5fdc7ad12266f1057b49b95a09d56d4d2eb12c6ff3665b49074781b65e9a2c5e7d9a2947e7a2c7f45238d630fba7fda1c976f551cd662f82102e28013 SHA512 788876e3fa69a3160d04febe1908558a444c83c699774c5a2685afb336a2b5f7323cf27392d25f02bf715fe7c84df0fca24cb2db04ea345d5f21348e2a9178f5
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch b/xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch
deleted file mode 100644
index 28624ee754c5..000000000000
--- a/xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 012bdbfc826466d7ffae0c52387ae949aa17aabe Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <fourdan@xfce.org>
-Date: Thu, 23 Mar 2017 11:40:46 +0100
-Subject: [PATCH] Revert "Add PointerMotionHintMask"
-
-Bug: 12534
-
-This reverts commit 0dfb55407a830572f03297b3c118fac1f3c5b80d.
----
- src/client.c     | 1 -
- src/moveresize.c | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/src/client.c b/src/client.c
-index 668c11b0b..6a16971a3 100644
---- a/src/client.c
-+++ b/src/client.c
-@@ -73,7 +73,6 @@
- #define FRAME_EVENT_MASK \
-     SubstructureNotifyMask|\
-     SubstructureRedirectMask|\
--    PointerMotionHintMask|\
-     PointerMotionMask|\
-     ButtonMotionMask|\
-     FocusChangeMask|\
-diff --git a/src/moveresize.c b/src/moveresize.c
-index 026cc0d9e..1c07e8ed7 100644
---- a/src/moveresize.c
-+++ b/src/moveresize.c
-@@ -53,7 +53,6 @@
- #include "xsync.h"
- 
- #define MOVERESIZE_EVENT_MASK \
--    PointerMotionHintMask | \
-     PointerMotionMask | \
-     ButtonMotionMask | \
-     ButtonReleaseMask | \
diff --git a/xfce-base/xfwm4/xfwm4-4.12.5.ebuild b/xfce-base/xfwm4/xfwm4-4.12.5.ebuild
index b1ef18f4ba3a..2cadb01c6353 100644
--- a/xfce-base/xfwm4/xfwm4-4.12.5.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.12.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+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"
 
 RDEPEND="dev-libs/dbus-glib:=
diff --git a/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild
deleted file mode 100644
index 398cd2db17a7..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 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"
-
-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+-2.24:2=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/pango:=
-	>=x11-libs/libwnck-2.30:1=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.11:=
-	>=xfce-base/xfconf-4.10:=
-	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=(
-	"${FILESDIR}"/xfwm4-4.13.0-ctrl-f1.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
-}
diff --git a/xfce-base/xfwm4/xfwm4-4.13.1.ebuild b/xfce-base/xfwm4/xfwm4-4.13.1.ebuild
deleted file mode 100644
index 6c5cc896faef..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.13.1.ebuild
+++ /dev/null
@@ -1,70 +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"
-
-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 )
-
-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
-}