gentoo Easter resync : 12.04.2020

36 files changed, 90 insertions, 411 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 2954e3dd649c..2f04d672eefa 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index a757b9812890..cdceb18ed92a 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,7 +1,3 @@
-DIST exo-0.12.10.tar.bz2 1333794 BLAKE2B 6dd32fcb797f704713a01a01960cb047809e2d3fad3962fbc5a16a510f78ba359978664c4ca7b20e066fdac77a41568ed15af84b6f45048b6bd78a7fadcbeed1 SHA512 b532a33eededc0d81e37c49975281e64d27bacebe878b784669d18112bc70dc39a4e82f781ad602263b10e0167e6391511a8be51f37e82f7be3b14cb6990a49e
 DIST exo-0.12.11.tar.bz2 1333227 BLAKE2B 4e95809c58b6db26ecdf524663c06df9cd70007726091e381a1f0dd58be52efee85ad9721c421c0df6438073bb9de97d56cd039f520e2f7c0f5722a1839ba167 SHA512 ecbf20feddf86178d34a5c70212f0c2310ab1d6ce25291846d6d1d3045270ae3e68102065d7b3d8840137406f826f9bc37fed92a16c1268c3d14f2833a97d533
-DIST exo-0.12.8.tar.bz2 1342201 BLAKE2B 6f52072f169a48ace6490d4c272e7e1208ca66efc388c8706b183d8ebe908d2fc305ae0239647e96e860eaacb1fbc440fc8dd559757f29088548c95702b1401e SHA512 5b96f1e3ba7112d349ee7d986288996c52210304d0aa54594fdc8c85ec0b12e13791f320f28e91bd25afda5f1046f402ba4fcf2eca5df5d8fc0c3515cd6b98a3
-EBUILD exo-0.12.10.ebuild 1037 BLAKE2B 4b782195ab2e8eae15f9a391ceba33f1075d4c84078a11d61d9f10a05b45d33e743fe5e8af2456908442b5e25171acbe090578ccd9570a38c6d1ea81e6b6df4a SHA512 9383bf5cbf184f5eb0e55bd00d8842b0bdcaba8e0b3bac1d812aaba6de3abd31df9c0a33df8d19d9dff2a1fbe2c2facd812d3f5fc7502d03d7e06f588f45c147
-EBUILD exo-0.12.11.ebuild 1042 BLAKE2B caa421201b26271500b559723962272df40080162effc5c753a7801f89bf6b84b9ebf3456093fd065645de077b9ff13f43be378d1870e6d179a420390f0ad08a SHA512 0ebeea78020e4cd1bc4d2d96bdd9594e05b1efbedece9cc1bb0b0b02bfe91fbe41a3d52c9dd8ef7c0ac5733f64f951e2dfc15a58937c42b9b470e022e3bc2b2e
-EBUILD exo-0.12.8.ebuild 1036 BLAKE2B 12fc8c5a693166a7672750259cf9b3061b24c104ad3aeaf234ce5fc3d189ca552502eefaf08b24836f1b4f8f356f181469c805929fa0fefdde652cf1c38218b2 SHA512 5e6486e6cabb66870995aa41337730f7dcc6f5dff787b2fb7eba254d11fa69ba1309fbfc7926fec4aba8f287c55f8d777210eb1fe523ceed42c9e1282184b733
+EBUILD exo-0.12.11.ebuild 1036 BLAKE2B 12fc8c5a693166a7672750259cf9b3061b24c104ad3aeaf234ce5fc3d189ca552502eefaf08b24836f1b4f8f356f181469c805929fa0fefdde652cf1c38218b2 SHA512 5e6486e6cabb66870995aa41337730f7dcc6f5dff787b2fb7eba254d11fa69ba1309fbfc7926fec4aba8f287c55f8d777210eb1fe523ceed42c9e1282184b733
 MISC metadata.xml 334 BLAKE2B 0d61ecd7415a1a60ea5f53fdc29fae2ebf9c286822bd7ee5c10629fae5da0102687c3b07fdd5f81b123aa79e5d04905da705177402c491aad574dccc4e6d18ce SHA512 158e0c248e2d8f235fdb105f2342d0a3c4ca3f15b8938a73bfbc1da823d573a178857433e68a7b36cccc7449ba29cfb3fd4c3856b02c231bd5736d9f5932b6d7
diff --git a/xfce-base/exo/exo-0.12.10.ebuild b/xfce-base/exo/exo-0.12.10.ebuild
deleted file mode 100644
index 83eae0e79f2c..000000000000
--- a/xfce-base/exo/exo-0.12.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-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-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gtk2"
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.42
-	dev-perl/URI
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	gtk2? ( >=x11-libs/gtk+-2.24:2 )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable gtk2)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/exo/exo-0.12.11.ebuild b/xfce-base/exo/exo-0.12.11.ebuild
index 77319c3c1ace..30c7ec67de13 100644
--- a/xfce-base/exo/exo-0.12.11.ebuild
+++ b/xfce-base/exo/exo-0.12.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gtk2"
 
 RDEPEND=">=dev-lang/perl-5.6
diff --git a/xfce-base/exo/exo-0.12.8.ebuild b/xfce-base/exo/exo-0.12.8.ebuild
deleted file mode 100644
index 30c7ec67de13..000000000000
--- a/xfce-base/exo/exo-0.12.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-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-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gtk2"
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.42
-	dev-perl/URI
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	gtk2? ( >=x11-libs/gtk+-2.24:2 )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable gtk2)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index 49f6107e27a9..9210caf53335 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,3 +1,5 @@
 DIST garcon-0.6.4.tar.bz2 519744 BLAKE2B 3d5e90d8a1159aac4eb2f2455978bbe1de99b523b5383037c021f3490800349bff1d6f5333853b08db34c9d18f3c5fc787f51927d94cfd2cd747e839b1529e38 SHA512 96a99eb163909ba411ca5928c3fc0a569a6d833fba92edcfa845eb90b56abb02e1428a2cbf61fc1c564f1659d51b24ce174e3864fcc987a37158703df0ac2510
-EBUILD garcon-0.6.4-r2.ebuild 1085 BLAKE2B 0d98e036a90fffe79efd7c3bc24b480566f0428b84921d6c043d735fb57f2cd4980d6d3c7f4f10ba93cf5ae6a27bc6cf025e7990d4b7d32065a06a9225e8f2a7 SHA512 975f5d523cd8f45835d647e8f0b5e792667671dca44820d19f603440f93816d38caa6a59cc4c54ed287603ae77b859b86a8f8954cd291afcb2b3e44daa5dab25
+DIST garcon-0.7.0.tar.bz2 508624 BLAKE2B 592d0078f4141b600f6a60818ed86cdffe289fda0f691d48b0e1992ed83191ec075483d200d312b27bd5f02e6bb0daabafeaf47a4492f489eb1e8c2af3283be2 SHA512 e865f68fe595bbc22d023d72ce4663c75e837a6789eb2158747e2cb7420ea2bba06dfd660e1de20675b9f9057cb2a9c1dc24221de8be93882e9b29bffb1fce37
+EBUILD garcon-0.6.4-r2.ebuild 1081 BLAKE2B c2a17dccc2494c09ca1ddfa1a029764e7bea7307c0b0a25a3fa62d08ab123b940b85262fe98d3f0359d6172aad42ce12629930fe9eb10ed5a4e4f4212e85d49c SHA512 1b44d15c5d11de9d1ba452d72c0a3a8f5dd93e7389b05428eb83264427a4baa0132a80032928ab7dc96215398e5ba6e259dd051bad1759cb49027c14026b3633
+EBUILD garcon-0.7.0.ebuild 1082 BLAKE2B b038d90ffdedf417b40a66a3c4bf6d73392d0a4892da622e4022ad28d3ae06359a464e46f25e00befee71e544ab7bc81dfa9bbb8b8f205980c58da47352953a2 SHA512 553edc4cc725f92701cbca8efac4d35edfbba64bf630fc6afa6dc01cedc8175f73f37b4bbb9b8d33e076889b6d5ef8c98949095ffdda9ef396b99faf7c553974
 MISC metadata.xml 395 BLAKE2B 13ea597065b0ffcb8a57e82f980dfa9b271a16f0c6ba824cb66f551d7bd6c49946985d1391a28360c4160bca5b88cc796b578b23f0b321d1670ab9f1c0addf23 SHA512 8783901107619bafc30acd3962284cf56376a14cd61039f862e1a7f0b5e17fc9d51f0e278c85161fb8b42c53b132a1ae7abe00c7e933eccf2ce3b74fa9956d54
diff --git a/xfce-base/garcon/garcon-0.6.4-r2.ebuild b/xfce-base/garcon/garcon-0.6.4-r2.ebuild
index 8e1a4c798140..79394ad32feb 100644
--- a/xfce-base/garcon/garcon-0.6.4-r2.ebuild
+++ b/xfce-base/garcon/garcon-0.6.4-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="-gtk2"
 
 RDEPEND=">=dev-libs/glib-2.30:=
diff --git a/xfce-base/garcon/garcon-0.7.0.ebuild b/xfce-base/garcon/garcon-0.7.0.ebuild
new file mode 100644
index 000000000000..cc7ef745786c
--- /dev/null
+++ b/xfce-base/garcon/garcon-0.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="-gtk2"
+
+RDEPEND=">=dev-libs/glib-2.30
+	>=x11-libs/gtk+-3.20:3
+	>=xfce-base/libxfce4util-4.12:=
+	gtk2? (
+		>=x11-libs/gtk+-2.24:2
+		<xfce-base/libxfce4ui-4.15:=[gtk2(+),gtk3(+)]
+	)
+	!gtk2? (
+		>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	)"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable gtk2)
+		$(use_enable gtk2 libxfce4ui)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 940ecdc14674..83953b5ff1c8 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,7 +1,7 @@
 DIST libxfce4ui-4.14.1.tar.bz2 756175 BLAKE2B d487cc0a04b6053ead6670eeb83cafe1c4098818d5ad6a94a81176720d78cfd65160156961cbb526baa1640ae66a5c6958f707b7078c412d81fcd24cc8cf4013 SHA512 f42f41da3a683a0c56c3b1e7ba420c4f50909d2613e681d053b09b50bc0eb7f750f44c892e94b0ee8b9207983a87c0cadbda1ad93d0df74ae351dc8812025407
-DIST libxfce4ui-4.15.0.tar.bz2 711299 BLAKE2B 60e13f3ed415fb138b256f19ec81b13bafb3f1223a996b18ef93b847346b593246012e8bded9c88dc5a905f355eb838b2295c0c91c8eb6d0d966efe748a0e15f SHA512 0a430d79dcc0088b061b020c78235775da5829b9c862e7201db4abca0d1753198c21f43ec0649e6c434ac9b382ff920a250895cb7ca38691a60f86e2e07fe6d0
 DIST libxfce4ui-4.15.1.tar.bz2 720332 BLAKE2B 198a162c2dd47d83102da8aee0c7943c869d708e36f2e0806988f63fb1f88c84c0b9ee3b5a6b14279a5359fa2afc1dfe7f8faedaff281635e0a2299a3a06618c SHA512 1b46109b79b849b38de7e8ebf0958ab5edace48cfc0a8b58c07d29d5f9b73998e078f6aa27650c0b30898cad5c251cdc45303e13982c1bb72101f9bc13d72f10
-EBUILD libxfce4ui-4.14.1.ebuild 1707 BLAKE2B 9c6858da4d55ac3ba439f716b6b947dbe29e4a0db31b39daa6efedd7bbf2ec45473db7be78244788fd07171f6800a57dbc31e7a12a8c6ed6967003bcaafeba2d SHA512 0719e9bbb3b9f5a9b14b0b5e5892fcd5a40eb7910aef11cf76380efc527ffb424db61a440c4e9418b9d164e0dfe8d13892fab3f819246902596828d58995708c
-EBUILD libxfce4ui-4.15.0.ebuild 1569 BLAKE2B 7957460abc6d35d29ca998f0be2c490423e2f98e1b9e815eef3bcc350448052cdc6fdf9cd7b77dd4ded97bffd5ac56e0b5ae82aea94d113eef614e7faed5c034 SHA512 e797e1de51807ecd8b69c69195f8c39be0e9b4ba23129253a937a2a0de0870156723047ecce7ba33c1f070743f18bcf2261a3741914951a7be5d6535499c58b1
-EBUILD libxfce4ui-4.15.1.ebuild 1569 BLAKE2B 13a80b46133d40a392549cac873de1fe128cf3e6f824822eaf286b1f66fe78e0592db29d9eab23316a01bafa18c113df39ebd0efa0e0ed4a22c1af4f1594fe4f SHA512 600e86ae51931b3fd7b445c821b5521008ce840fa0afa53353bdf8b3a706704e6281c2c098f73b43e58f79d3b08da46594e3cda1e2bc6479b85aebcc5a167207
+DIST libxfce4ui-4.15.2.tar.bz2 740189 BLAKE2B 77263318afe376a9b50f129c6969fcb540685bb151f78a94f0024e27871cd8fb895d3edc41483ff8f3b8c8c28d24142252155c6ca68b614375c1fc93f08fdb45 SHA512 1ac2dea2200f00846bc5b5f86d02292f345dc904a121df86a662ca1844b1bdd9eea6bf0cd88dda97ff84e30d990b065bd9597cb563dbb75f639e820d41f83dbc
+EBUILD libxfce4ui-4.14.1.ebuild 1704 BLAKE2B 83defd465a237ed31b648de09e2f657c3510d3dec1b52a217b4795be00e6206aa7b14f7b073c16cfe0def3155eb577e0a3b0985bc5a582ab6d0f9c264b47c408 SHA512 69d4fb24cc2a9b56e0fa2bc5d4d754cf8e02be58095a96fa0b459c84a8939b36adbd157c1debd42f116f77f484839d518d561d1218c4d1a0acb2c806c3c471cc
+EBUILD libxfce4ui-4.15.1.ebuild 1565 BLAKE2B ee74c6a252293de607b8a79cfe7688cd59a08a7f6eabfd41242096d2116be8d91137190335944a0f3a21b02bd3020e158b76f21b13e0f3c7f8625db3375d482f SHA512 1dbe43388a3b95bfd70bdd04e8d8b5f5e2fd1717d3ee9fb285456cb35b7a441eb05d7ca1b8d544377133efc2ed30ad3372da65c5f10b36f5976afeba90a241af
+EBUILD libxfce4ui-4.15.2.ebuild 1565 BLAKE2B ee74c6a252293de607b8a79cfe7688cd59a08a7f6eabfd41242096d2116be8d91137190335944a0f3a21b02bd3020e158b76f21b13e0f3c7f8625db3375d482f SHA512 1dbe43388a3b95bfd70bdd04e8d8b5f5e2fd1717d3ee9fb285456cb35b7a441eb05d7ca1b8d544377133efc2ed30ad3372da65c5f10b36f5976afeba90a241af
 MISC metadata.xml 515 BLAKE2B b0ddce75f198a496e2d7f1f658091c1301190aadef8f5a9a65b43e4f1a3c2a915e14329bd512984e13a2189eafb56bf00b571e9c4668fa5026eef01bb718d92c SHA512 ab5ebbf64571d8b5b7c1be3c329fa641ddb7ed5447066d5a207dce7487605bf2f86c13dce27788a17b2262efeec2845d42bf2aa9ca7dc16778b7288b77d29886
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
index 46a3f9d709f7..f5d7585f78c5 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug glade +gtk2 introspection startup-notification vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!gtk2? ( test )"
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.1.ebuild
index d7598a86b7a2..cddd13c8d5ef 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.15.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.15.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug glade introspection libgtop startup-notification vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.0.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.2.ebuild
index c412d638a219..cddd13c8d5ef 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.15.0.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug glade introspection libgtop startup-notification vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index ca04a3d013f1..486c06754a9f 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,5 +1,5 @@
 DIST libxfce4util-4.14.0.tar.bz2 516358 BLAKE2B d8e3d1e3247e23908456aa296415240c1a9146001a02cb859541922ee541e30955279fd68f2d9938e43f992a5115b21836363fa8d8234de87fca0bbaac830bf0 SHA512 6ac95aea03052d9e2f886cbe76afe9bbb43511bf3fe1766097e10cd8762541ed17060a727df3ef93e226aae448c15d9dd3ad8acd55a9d5f2387cb360bdf72832
 DIST libxfce4util-4.15.0.tar.bz2 516074 BLAKE2B 67ba9d34c850d057012a4a2c76acce55e3afd606ab379eadc6873a62651affd69cb5d2ecd6be5e03f11b81d7bdb9ff43e39b04886f9c2c214b898b7b0dcf6b09 SHA512 f47194c999d5c4b0fd44abf392ea40ea2c3f07064e15b900821e30adc58c791e533ae2df20927037bad9db5e94981621716c743522b6daad579badd0094cffaf
-EBUILD libxfce4util-4.14.0.ebuild 1027 BLAKE2B 728aa2fd69ec0492b1608e6ef87db85a18b1a12e72642c1e30b39966facabc5cc72b63165608fbf32252b8c3d927103a8c0fa171f20d9939a8c7ab5107334033 SHA512 b3f87630690ba2681c4c45da3ef267994f21714f6f42f34299a37c13f89a4f6b002ab00440b4aea37ad9637dbc3f8436faa9b8da272c2f04099161af160a1104
-EBUILD libxfce4util-4.15.0.ebuild 1032 BLAKE2B 32edb8cab3c2e348ed5a6bb8118a7eabac3ce540590a5443cf55d0a9fe864bfaf5cb66d2049d04b6a26ede933275fcbf4189e73c03fad2c6d23b1e101d93ee4f SHA512 359b1d53ba2f8409fcc85540c97eb6a68bda36d19e6169110f7b97cad2ed9cff405ce8e9fd805eeb86b2e63b2afb13179174982046f91450608506f6c81b202a
+EBUILD libxfce4util-4.14.0.ebuild 1024 BLAKE2B 46f7b43ced6ac5109718d2085b0a43be351bda24cf7de22caa44d0c2a1ca21c72fdc5c117f9779883730a9d92d03a5df60ab5a0b4814090843a4a29fe0144e5d SHA512 39fae6a20d296ea91c5d1844a73a8d15656289d19586afed045fbf8468957c3a072861d7bbbc847dffb407c958005c8c40b746bbbb3c759e0d0dcb7c90f3bca9
+EBUILD libxfce4util-4.15.0.ebuild 1028 BLAKE2B 23a1b604164f6028791662299bdd0cfa4ee6fc0f1c65c0d2935177a7a0b74ce446ffb3ac051e9c5d8af3e07edc8724bad9c699db82b4f120a062012456068edf SHA512 a89d8e37eaf2f76fe590378405450084c412b2dc36738468e7cc388e852d8ecb8bee8812ad87161523a8a67fe840e1a6e56b476d6543fcb6834dc56325ce0ee0
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfce4util/libxfce4util-4.14.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.14.0.ebuild
index 4fb2cf7d6938..dad20a22bb06 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.14.0.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/libxfce4util/libxfce4util-4.15.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.15.0.ebuild
index 0e8c6a843107..dd5b8e34dae7 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.15.0.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 a84e926c57c1..51999d404613 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,7 +1,5 @@
-DIST Thunar-1.8.9.tar.bz2 2375302 BLAKE2B e98659633b448e1d231e466c72741de71ce448ecf413a4f29df47acd78c9353a8cbc374961b6bb09d4d9d6ff4b98b81d575e987059999a742e30038a7c549604 SHA512 8e1bff80692ee22393a0c0cfa09178aa14cc476a058f406cab7ca873778ac4673cbac2d271f525a51e0120f1b17f8872c58407e8d7b77c6e67b721f4e5318f80
-DIST thunar-1.8.11.tar.bz2 2362727 BLAKE2B 75146010df503146413d0d669d24f2e36e23f50952acb06e8670ee41a1dbf21ccb1992e9dbd2296d0ce46d120d81a0e2838e972b7e869977e2d4a8697a4e89eb SHA512 13576616fc556dae9be97f2390e85c12c01b78d86a59e5e8700b67dca7a2e70fe5f1e5716d3d77d22e158e7573a89e096aa8098ccccb78e7bd8e81cb319a6809
 DIST thunar-1.8.12.tar.bz2 2367685 BLAKE2B 259e7a2c9aeb66673a7b5e6d7147d5257d64b7143c79981ee65097568505969426ea4b20e7ef754fcc6f03e19f632b078115d2db524f2a6eeec1f1e3253e14e4 SHA512 cd27b26796602ea8623c368cd6c8bb53136c09e4a02c37775bed9918c801741e0adb5784151fbf4b93785967a637ffb8b1214b0721f9457de683ebd7718a8767
-EBUILD thunar-1.8.11.ebuild 2180 BLAKE2B ac3dfc810f40aa2d61f2b1aeffbfcb528873e412bdb6236a3abe2b63bb956ee91616e37633a2b3fb701e3b8333032a06fc0fc7a6b816af4dd9ad790e5f797922 SHA512 cc9d8e1a200762976ee70ae36aa2ac8eb0a68262216bb444983c68547d131fdc37852815404029518c41c30ff59b90421d819f0a0ecd030a5e6be92886f75243
-EBUILD thunar-1.8.12.ebuild 2185 BLAKE2B 682399906df271677a1d53c7b941aa8c202c5f5875f9f7aacab1060b2d599b24423f5c4622d05df0d308e5f42676766bdc778952df1f795c1cf18a61c7e9349d SHA512 2ed3507de08d052233affa5f58dba9b12a8b244ba3ff0b4e7ada4868f27ee565224600025aee5543f35a1a4c1789c05effed6045dc6885656f54f571a48c2314
-EBUILD thunar-1.8.9.ebuild 2217 BLAKE2B dbb43207c25439336ea80716a6dc4a46ad2dd63f890134986c8b848d717ad37c0c4d2482f8c07b3c45209e2e2a18f110ce6ff8667a374c619e7def9c1910a3b2 SHA512 3b2857928871f343d0a961b63a48d0d2db4c48f33aaca897fe0d7077f5becd61cf7eaebd05a5ccd16e9087a2a4af9c66a6b1b52f691714f74dad01f30b188a52
+DIST thunar-1.8.14.tar.bz2 2373742 BLAKE2B 32cdc316defaf781e705ecd9e0550014e1270f09e8eb914f164df4bc557c433fcedbcfb41e200faf317bbab96a20275e4416945050cb10981ee68e0f0cdd357d SHA512 ce6da526e6378ffc90686f6ae25e56109e8af7d0c592345aca3de4603f4c5b3d089255bc313f2a60ee454cc3f0af52106584663c72ecd542a9c92769559c6787
+EBUILD thunar-1.8.12.ebuild 2180 BLAKE2B ac3dfc810f40aa2d61f2b1aeffbfcb528873e412bdb6236a3abe2b63bb956ee91616e37633a2b3fb701e3b8333032a06fc0fc7a6b816af4dd9ad790e5f797922 SHA512 cc9d8e1a200762976ee70ae36aa2ac8eb0a68262216bb444983c68547d131fdc37852815404029518c41c30ff59b90421d819f0a0ecd030a5e6be92886f75243
+EBUILD thunar-1.8.14.ebuild 2185 BLAKE2B 682399906df271677a1d53c7b941aa8c202c5f5875f9f7aacab1060b2d599b24423f5c4622d05df0d308e5f42676766bdc778952df1f795c1cf18a61c7e9349d SHA512 2ed3507de08d052233affa5f58dba9b12a8b244ba3ff0b4e7ada4868f27ee565224600025aee5543f35a1a4c1789c05effed6045dc6885656f54f571a48c2314
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.8.12.ebuild b/xfce-base/thunar/thunar-1.8.12.ebuild
index 80545f3c2e18..d56945bf657d 100644
--- a/xfce-base/thunar/thunar-1.8.12.ebuild
+++ b/xfce-base/thunar/thunar-1.8.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
 
 GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
diff --git a/xfce-base/thunar/thunar-1.8.11.ebuild b/xfce-base/thunar/thunar-1.8.14.ebuild
index d56945bf657d..80545f3c2e18 100644
--- a/xfce-base/thunar/thunar-1.8.11.ebuild
+++ b/xfce-base/thunar/thunar-1.8.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
 
 GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
diff --git a/xfce-base/thunar/thunar-1.8.9.ebuild b/xfce-base/thunar/thunar-1.8.9.ebuild
deleted file mode 100644
index 6fe5b951c220..000000000000
--- a/xfce-base/thunar/thunar-1.8.9.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 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 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
-
-GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
-COMMON_DEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.42
-	>=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? ( dev-libs/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() {
-	elog "If you were using an older Xfce version and Thunar fails to start"
-	elog "with a message similar to:"
-	elog "  Failed to register: Timeout was reached"
-	elog "you may need to reset your xfce4 session:"
-	elog "  rm ~/.cache/sessions/xfce4-session-*"
-	elog "See https://bugs.gentoo.org/698914."
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-meta/Manifest b/xfce-base/xfce4-meta/Manifest
index c6cdce2f9dac..686718b4bac3 100644
--- a/xfce-base/xfce4-meta/Manifest
+++ b/xfce-base/xfce4-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-meta-4.14-r2.ebuild 1013 BLAKE2B 8dcdc71a2dc79f2531a58bdf3971dfd3a789284170456824aaefc198a716c21fdc425cc83c57d697443a6ddfcd32389171958b94d07f311a35113d2355b609e7 SHA512 98811bfdf3310b5b8cd9df94af1fb441ed37c0720a2f7d4c02074e1c36c89087ca54252fb021b28e767375eb5a0f914b648cceaf8ba541432fa12f270f99493e
+EBUILD xfce4-meta-4.14-r2.ebuild 1000 BLAKE2B 794eaf11dd8a3f119228080ccc7840bdb03dad88955c696a2ed81a1b0e9b01fd5f67397f3da24f06dd28c39a14ba35b70d93b51007cd887d5dd5843b00445fe0 SHA512 b7a86d05c67c1c3f857e73214907b43cf39fe1af876650db37dabca48b3fed6179fdc96d121dd831776d3ac263f0b6cecb3c83f455f72cb74590b93939ad883e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.14-r2.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.14-r2.ebuild
index ee0927b43a05..6751db6f2fbd 100644
--- a/xfce-base/xfce4-meta/xfce4-meta-4.14-r2.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.14-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="minimal +svg upower"
 
 RDEPEND="x11-themes/hicolor-icon-theme
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index bcc7139a042c..10a60c0ca3d6 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,9 +1,7 @@
-DIST xfce4-panel-4.14.1.tar.bz2 1294087 BLAKE2B d88100d068348aab32f7a133ca98e17c1586f3d6c5ffcb53493e953930108d4d1ebd0972d84c4bd077ab58c4a3ae34303682084daff4e34a168c5c2f981597bf SHA512 1c86362489677f2e04cf3b98dbc1a80b4998335c00a47d256e741446f00437ad04539041648848eca1f45fa1fa70974ca6cf65cb7f762a79a46c16484557e400
 DIST xfce4-panel-4.14.3.tar.bz2 1304748 BLAKE2B 7e009e2afcc59b1d014fe776c439cd27c8ddb9b46215a9766f25f384802bc27a672201d0a73eff8aab3714822ee5f2c062806a60ccaf70cf6b5ec65f38f7e8a1 SHA512 c317741df1196a9f8d675c87732155f973022d1cb30a8815393980747d1569e8348c386253fc9056068c35fbdc13faefb4a0bef6678d072d51461c4aae909940
-DIST xfce4-panel-4.15.0.tar.bz2 1271290 BLAKE2B 6062ed76d8372f5e1ab9def67bcc8c4006ef269309b47740c331c8afef8f320069478846e802c6a090c4a6aa465d79c75e028d52b8f09dd8e1dafa11c8d415ec SHA512 3f4d9a097cb9b9a4ec4296b518e91b13394ca063664c78768dc3e2a964090177485c189c3ff3e118b179d58aafdb27d2edf67ddb49434290eaed157b449fc817
 DIST xfce4-panel-4.15.1.tar.bz2 1291026 BLAKE2B fe27e7238f3be3d53c42af185ceabfec133cac5f996af8d57eba456bb26c60e59d0e246d2d2f17b06eb35ad7fb08b009a453201b396021c34722d414c4c2034f SHA512 b635168043b1b0714796fae7d9b102ebfaa35b06ebca686cd3ba9124f21288f02009cf186aa09a93c1fd3343c769f38e8865c6aba98bd01d108f41e3ff041f80
-EBUILD xfce4-panel-4.14.1.ebuild 1494 BLAKE2B 73021f104029c59f7f829083e61e558e76865ff57dd1faaf191c2a8d8c6cd927004d42f7f36c144841c40804c151f5bbba4512e65492d15ee40f3202445bb6aa SHA512 8105bf3c2606467e4763f86a5fa78b027aa26365977f62e752fa2ec921cb63b264540cb5ab91b936c952bb6093a705a956b9ff4ab6a9949055a5bdd8c9d7a923
-EBUILD xfce4-panel-4.14.3.ebuild 1499 BLAKE2B 7e3536aaba031b819b7bec7ff7c6c99eead504488b0466d201b28bfd91bb7abfbcdfc39b5a5e8040da1abd1a5e8a293e56460f0de07f2d19214668b1fc10ea2b SHA512 5d62de28c4729b9c34e2ec54239ef1e18a34bae20d9bb34415866df2e0df005ea2d66d4859602336d1500cc473a56fb389e9cc6b6014f0860ec970199fe2e7f8
-EBUILD xfce4-panel-4.15.0.ebuild 1411 BLAKE2B f50f045e4c2a1b80a2917e9808c102c7dba18596d27ce5efe62d35fb3e74cd04693bd1b9bf25db2b9fcc173334ed4001887dc15a353fabe1320102387147ac22 SHA512 35544da6c0f69f586f901c436e2394d58f58a82e1ff83fd3322a0a9c59b2d6e62a09ba58bf311445f515b88454131feb62e73bf8551b1660c60c82a42858e556
+DIST xfce4-panel-4.15.2.tar.bz2 1302860 BLAKE2B 0c2ee5dac584cd1cae940872ca1130ae710e23f46089ee16241f03f87317d905937f1eb6c382140659e9b01669ccce26bf7e6e64e90207db3c7b7a7865c71674 SHA512 7f2e0d1de70db1778cd5a0c0ae4845ffef960b16f1e147ec6fd47543a6360e2281d8290bc055bc83993796bdbd97edeaca867a6790052bc07d8e2bffa412e5a2
+EBUILD xfce4-panel-4.14.3.ebuild 1494 BLAKE2B 73021f104029c59f7f829083e61e558e76865ff57dd1faaf191c2a8d8c6cd927004d42f7f36c144841c40804c151f5bbba4512e65492d15ee40f3202445bb6aa SHA512 8105bf3c2606467e4763f86a5fa78b027aa26365977f62e752fa2ec921cb63b264540cb5ab91b936c952bb6093a705a956b9ff4ab6a9949055a5bdd8c9d7a923
 EBUILD xfce4-panel-4.15.1.ebuild 1413 BLAKE2B d5bdb34864314e9a177b1134a5bd89845b3e4b0bd5371c3bc653cb1c42644f7e917c46a2e70e29aaa5d16fdc1929d418dc758af172904e5f5ec12885d0ecf125 SHA512 ca1aa1cb317bf05ee8c36983767bfc9a40cde6e711873f67835843f5caef1486c1bcdf29996fef49e3054aeb933998231d50b52a890fdbfd3af81df976dfe790
+EBUILD xfce4-panel-4.15.2.ebuild 1413 BLAKE2B d5bdb34864314e9a177b1134a5bd89845b3e4b0bd5371c3bc653cb1c42644f7e917c46a2e70e29aaa5d16fdc1929d418dc758af172904e5f5ec12885d0ecf125 SHA512 ca1aa1cb317bf05ee8c36983767bfc9a40cde6e711873f67835843f5caef1486c1bcdf29996fef49e3054aeb933998231d50b52a890fdbfd3af81df976dfe790
 MISC metadata.xml 322 BLAKE2B 30f74676e7071e50ef0a877f83148fb5c90b6706e31b9a9b71540c7d5488ec04eed647e345aefe701315855fd047ca721a91031ef1cd7ca04388236d4a404d5e SHA512 3d6a3a46f9e77eb4904ac9385a4ddb3337b97f450c26895c2c3032095f94eb92420fe8d814da7696e4dc7aed3d8ca395aeca7c46914babfa845c6f61cbbe97c7
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.14.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.14.1.ebuild
deleted file mode 100644
index ffed406fa275..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.14.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vala 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 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+gtk2 introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!gtk2? ( test )"
-
-RDEPEND=">=dev-libs/glib-2.42
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	x11-libs/libwnck:3
-	>=xfce-base/exo-0.11.2:=
-	>=xfce-base/garcon-0.5:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.13:=[introspection?]
-	>=xfce-base/xfconf-4.13:=
-	gtk2? ( >=x11-libs/gtk+-2.20:2 )
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend) )
-	dev-lang/perl
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable gtk2)
-		$(use_enable introspection)
-		$(use_enable vala)
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.14.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.14.3.ebuild
index 4c13761e1a68..ffed406fa275 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.14.3.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.14.3.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-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+gtk2 introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!gtk2? ( test )"
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.15.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.15.2.ebuild
index b4d4d7358e0f..9861259a3be5 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.15.0.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.42
 	x11-libs/libwnck:3
 	>=xfce-base/exo-0.11.2:=
 	>=xfce-base/garcon-0.5:=
-	>=xfce-base/libxfce4ui-4.13:=
+	>=xfce-base/libxfce4ui-4.15.1:=
 	>=xfce-base/libxfce4util-4.13:=[introspection?]
 	>=xfce-base/xfconf-4.13:=
 	introspection? ( dev-libs/gobject-introspection:= )"
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 9fee4fdf2e63..86fd157e3956 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,6 +1,6 @@
 AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 371 BLAKE2B 7737f95e5ce5ad9d421b8d39e577899b145d12ce4faebc135eaa052a6637508dfd4d5a8d9c6bcbe987026cedbedb5a396b294edadfc7241a607c7b0ef9a218b8 SHA512 85914b96def54a504f5dbaecc57f47f3529be0bd2efc8dae8529c56bd764ff9a644e17e14599b947aef4a7311a32a3e0b2ef5aa6dea45287cdc09b01bfcfcc48
-DIST xfce4-session-4.14.0.tar.bz2 826950 BLAKE2B 164fd9f61f03a61e705abf1f7ab82e81eccbd5269d28d66f6da7234ba073d38a1b38d1be0ddb5f3c055e829adf12673611a2b0ea0585f9fd1d2806b17cf0e761 SHA512 fba79ef9727d47514c5e4223376c49057b714f9be9bda6031a1220f4840abb257d31517252180c0af2e7cd6969bbc4e6f525b00cac594e1a3b80f09f3f2335cb
 DIST xfce4-session-4.14.1.tar.bz2 836607 BLAKE2B 916589884e47ce3224c4a6d5537dc7b03d18ec56009ae3e2b4db01d9614a18d1db0f14d3a732b0ed72b924a56831c37111f08068b39b43dab85a39d82ea38cac SHA512 af797e33145311015ca6444b929d82c4e321f76defe773aba723d0a373f894399216e043b45e0669dd1c9aa1ad3cd2dcfd422352fd2381b7425bb310be66c92b
-EBUILD xfce4-session-4.14.0.ebuild 1832 BLAKE2B f9869eacafbb872d1648d4e6c52d29fc8eec842c796215a8a50bdb6868f941b5345b3dcab89a815bc5de676e1e0b602462137c0a2291ac5c1aa05a6b10c7baf4 SHA512 210fa864750e2f75c197a6dddba6e5d1ce64d8b8224adda466df83ea2731936931618cf93ec9f441c45aedeef1e8b9d6949d681bdce5cc1bd9f811c5208f8bae
-EBUILD xfce4-session-4.14.1.ebuild 1838 BLAKE2B e36bcb11df689424b3716e1ca563badc9a2601e4931c35847efbb9fa8dcc943824f52505fe6a85784f8a915393240311720039efe9ba7af966bec633ed4751ff SHA512 a787c94a4894947dffa67fe7f14c48d1ef3659fe6cca2d6cef129ad148f9af92b11a3010c23320ede57f704c68491576862f2c6261f21adcfb4705197357f0f4
+DIST xfce4-session-4.14.2.tar.bz2 841878 BLAKE2B e59be7bf622c40df60051643e52e703896d994f3729167e532a8594d19e139050b3dd995a153b0397c5aee2cbce9880abf8fdd011115db999508eede8de0034e SHA512 ab67cb576ac4880f41cf8eec05539a733da066c50913c9c2c9116ed3129b342aa3ca005ea5b46a733780cd062a4454d530240d89660b6c48a2045c821f7c490f
+EBUILD xfce4-session-4.14.1.ebuild 1833 BLAKE2B c9c90288c6abc55322333c8cc6e6452ae466cd1ceb10d7b63ce9e1d3959ae51524a7b866d3e13c234011f16cec33c26448ef78d0c145249c722b054e8cc562cd SHA512 e77ca32d7e012728115e7700376c0895e79e262458e5bda4f568939a8459d3e4e01ce2eb3d624fb83da91f7ffeaf0035853be52d56ff6dc69001f5caf87e215f
+EBUILD xfce4-session-4.14.2.ebuild 1838 BLAKE2B e36bcb11df689424b3716e1ca563badc9a2601e4931c35847efbb9fa8dcc943824f52505fe6a85784f8a915393240311720039efe9ba7af966bec633ed4751ff SHA512 a787c94a4894947dffa67fe7f14c48d1ef3659fe6cca2d6cef129ad148f9af92b11a3010c23320ede57f704c68491576862f2c6261f21adcfb4705197357f0f4
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/xfce4-session-4.14.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.14.1.ebuild
index 251ab43f61cc..45df505d24b9 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.14.1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.14.1.ebuild
@@ -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 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="elogind nls policykit systemd +xscreensaver"
 
 COMMON_DEPEND="x11-apps/iceauth
diff --git a/xfce-base/xfce4-session/xfce4-session-4.14.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.14.2.ebuild
index a1048d916b8e..251ab43f61cc 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.14.0.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.14.2.ebuild
@@ -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 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="elogind nls policykit systemd +xscreensaver"
 
 COMMON_DEPEND="x11-apps/iceauth
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 5bd833111861..9903f70139fe 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,7 +1,5 @@
-DIST xfce4-settings-4.14.1.tar.bz2 1187352 BLAKE2B 797b685e583a142f6f23a743233853c52a0247747e31d90bc0bb07103482fbf0495739493cfc19e738f8965834d18deeb1f28e6e85a11849165ef948df682607 SHA512 d854ca93199ce99d63e83ad38d654b86d883ebef5fb62a5c444f08b481df8f29a7ff27c60053c071e887be8d7ea0c51e9691a6209ca515a4e396e2c7405593b5
 DIST xfce4-settings-4.14.2.tar.bz2 1194714 BLAKE2B ffcc17ca5c39837d8d60c3b5916cf6643218316e6f7a67f3d88c949ff814e98e1a7f46ccd4c9c1280e1fdade91f7c244e80080031b9b05060afa5546720ea03e SHA512 5882e96504e2ad869504e7c8e6e62d1d04f61beef524ba85a3ed962ca689d6e72a4ed717173f9e2645c078c2c8757caed1f3395dd185a3b0b5dc8b27a1a3d2d1
 DIST xfce4-settings-4.15.0.tar.bz2 1199360 BLAKE2B add423dee8b5de6386aa5008c082d6266e0d4ffaf656ab960bca12798d03aedf6dcf98aae2200f4e855aec9749eaf69e4220c8f7d5ce5968edff469546afe614 SHA512 ef0d253ee5f79d57b62dc467223d23050fd21b99891fa7a3c8329d97261ba918a0f4b62a345916558685cae59bfee5da58b1e66a8a7f1b2219eb6cec2094fcbf
-EBUILD xfce4-settings-4.14.1.ebuild 1563 BLAKE2B 45a73d4ada2598eda4a41b52c695ea07ee0cd3f8aaa6649bcb7fe1a0279832157f17d00ed7406b9ed24ff91b4dc7c0f2bf80a5eaffc31e77b87960e097686459 SHA512 f1984880e7249b27ea37de135af9032460ec93ada9fce55287cfafa1d81abe72e6ab55fe970d7a2edc3af8abc266398ef1d4854992fa918af0eec36ea5e12167
-EBUILD xfce4-settings-4.14.2.ebuild 1568 BLAKE2B 89e50683bef0f0158cf193523e936542a4079796919e9e24dc91cd4f29553fe175f4f01d4e62e22bc2c6c640357d9d55cafce4e1a2cca1dc182865ed1007c791 SHA512 eff37b47e3d9703217309461b656ae0108048b01f5dc6204f59b8ca5af61737cda3888d08d83fa4b0f80d44e27cf04bb786229cd06dc58a24f6b6960ff52602b
+EBUILD xfce4-settings-4.14.2.ebuild 1563 BLAKE2B 45a73d4ada2598eda4a41b52c695ea07ee0cd3f8aaa6649bcb7fe1a0279832157f17d00ed7406b9ed24ff91b4dc7c0f2bf80a5eaffc31e77b87960e097686459 SHA512 f1984880e7249b27ea37de135af9032460ec93ada9fce55287cfafa1d81abe72e6ab55fe970d7a2edc3af8abc266398ef1d4854992fa918af0eec36ea5e12167
 EBUILD xfce4-settings-4.15.0.ebuild 1580 BLAKE2B d56cfba06ba8a1401766ff19c9ae6aa65bf9875c6c2364e517ab7e7255513d0a512b7eb6580a74ad11fa12b3bbac9baf9f7801f6ca3c4f3e2b2bfad151215434 SHA512 80b78019bbcc522e9ee29ba7142b20eb9c5bb1c31ec73853bf4e6cac846781c76a30ef13c363244919bd1d38430ea9696018a6d98077ef725b84178560fd1862
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.14.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.14.1.ebuild
deleted file mode 100644
index be11f7579648..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.14.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-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 ~amd64-linux ~x86-linux"
-IUSE="colord 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
-	colord? ( x11-misc/colord:= )
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	xklavier? ( >=x11-libs/libxklavier-5 )"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	x11-base/xorg-proto"
-
-src_configure() {
-	local myconf=(
-		$(use_enable upower upower-glib)
-		$(use_enable input_devices_libinput xorg-libinput)
-		$(use_enable libnotify)
-		$(use_enable colord)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.14.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.14.2.ebuild
index e599c6e826fb..be11f7579648 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.14.2.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.14.2.ebuild
@@ -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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
 
 RDEPEND="
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 864d6549cdae..8a6b03f6e0fc 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,3 +1,3 @@
 DIST xfconf-4.14.1.tar.bz2 644804 BLAKE2B 1b04770fa9b3f4901f561bc3978dd7ffdbfea9496330a98334ffb19c0c7413b0540423f20200e2e5191ff876f3e2c32ca8354bbab70aac4de00592d995f77e72 SHA512 727d013f7e71e0eb9ff17e464acd65c1fa507f8eba1bd29621dae070161042f60f47b8ac048b28849bf45232d04d5d6e48530aa0bd1e661a3f58db47703a8808
-EBUILD xfconf-4.14.1.ebuild 1952 BLAKE2B 8ec22ce297984f260bb37f2c8ff734f8f4480c47bb93f833d10f7cbaafac64fe97cd29ac08d1c070a92045f977d20a7392efc883da5f135cf9e6b8a0bde75f70 SHA512 9f0373f7bf9d5b4d9c53dea4dd2ceb52f23962700c1bdb3beeffec0ed5afc6a5c3ea78871621683c9389c5e5afd7453c9644575a6e6144222d61e2874de3ea12
+EBUILD xfconf-4.14.1.ebuild 1949 BLAKE2B a8a3953b1c2625ac1e2432217ddea0e7bdae9811c1770ea7f6b24d015ce1db9776e5f71cb591850babe297ae11366ee60f06777e3eaf510fe15b65974817632a SHA512 794c36200e9a9a7d6e41a54d8b8c1daeb6c1726acf3cf3a003740efc35050b947b06ae2832c4c206f29921707a2a6d8bbb978a254490b7cea0e33fb52f143579
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.14.1.ebuild b/xfce-base/xfconf/xfconf-4.14.1.ebuild
index 2ffd6d07999e..f78771776f9c 100644
--- a/xfce-base/xfconf/xfconf-4.14.1.ebuild
+++ b/xfce-base/xfconf/xfconf-4.14.1.ebuild
@@ -11,7 +11,7 @@ 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-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug introspection perl vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index b60839fc3f5e..97eda020d9fb 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,5 +1,3 @@
-DIST xfdesktop-4.14.1.tar.bz2 1533788 BLAKE2B ea43c57dc9439b5b4799d3859b28287e7cc807a488d57f79ba83424fc1d5257eba6b2d8f9aa712aef68f8aa81d296376fd3ab507cb90566b0b76aab92665c117 SHA512 05e8e79efe9683d46e69375eb5c3f1d923b5e875bc7dbb8f9405338e44ae0c48172af119c5e7b141595c38b8de00c58c21f7b7d218737f5ddc2428fd7aa4bc6c
 DIST xfdesktop-4.14.2.tar.bz2 1513121 BLAKE2B afe5dad03ed4d084bd7578074f91fbc8dc121bf67b8f4793ca5c6abb67dea4f61cfa484404d79d14cf2abf64227cee883bc8f36af05802071f5b9f79300704d4 SHA512 8515fc1c048da50c8c2986ea8590144203fdf3107b81e2d2dd44ee408938fb71281abe52cc098508dc2ae20ef2cbc31903086941206c0cbbc92a661dbfb2c472
-EBUILD xfdesktop-4.14.1.ebuild 1154 BLAKE2B 065908ca5d908a837bdd3edf753c0f8b2bd59ea51e4aeca51e68fa06e52dde8246c6af97c225f15c4a3aed95ce4ab45bb5884b19e83518744f5888ff6af65693 SHA512 01d3302fc5927bb6ca7ead4d47ba2ded68856d56500d68a3ebc41c85cd7d569bc6695c40b0e1386e07940ac176c6f5e9e07c032f5f21e98e38dd1db6180f4517
-EBUILD xfdesktop-4.14.2.ebuild 1159 BLAKE2B c700d0cee41fd788ac2809efae9f9c77942926542565540ca2e7be2b800eaef88bd449b32e3f2f3c9b52a12d636556f73ae79d38844ec7b0ce4c830dded65e60 SHA512 b1a33f3af5644294c1f5f6265ae939d3ac29424cc9678576b2eec1076fbdaff577a961e26cf0dd0a6be4332afa1b0e4579ebcb42e8f165bb7cc827a0a8d02563
+EBUILD xfdesktop-4.14.2.ebuild 1154 BLAKE2B 065908ca5d908a837bdd3edf753c0f8b2bd59ea51e4aeca51e68fa06e52dde8246c6af97c225f15c4a3aed95ce4ab45bb5884b19e83518744f5888ff6af65693 SHA512 01d3302fc5927bb6ca7ead4d47ba2ded68856d56500d68a3ebc41c85cd7d569bc6695c40b0e1386e07940ac176c6f5e9e07c032f5f21e98e38dd1db6180f4517
 MISC metadata.xml 364 BLAKE2B 64544c9e89e370bb213647843ebc3c5d4ca08aa46564b02830ff041e74db5018d7503106cba4e7c1dd562f359649974f12b841e32136eb73e9d84ea0ed36f456 SHA512 3140dbe5320efba5393874f93b907ef2dff1cc8dd44cda7340abaf19dcbbd709beb7649ac72f1e9f92da546e010f966cd9f5d51b867c6df8c49332bf9de67dac
diff --git a/xfce-base/xfdesktop/xfdesktop-4.14.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.14.1.ebuild
deleted file mode 100644
index 64d22d2e74d8..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.14.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-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 ~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? ( >=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() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild
index c0250e01fe7a..64d22d2e74d8 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild
@@ -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 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug libnotify +thunar"
 
 RDEPEND=">=x11-libs/cairo-1.12