gentoo resync : 25.08.2020

40 files changed, 618 insertions, 420 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 28b8e8e2da24..77bd870146bf 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 2f4b0189be73..2dbd59845929 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,6 +1,8 @@
 AUX exo-4.15.1-parallel-make.patch 7738 BLAKE2B 26aa0f1208bd8cd606990d9430d948a7333a9d2bc419f1e40d5fb1ddfac52efbb860e18e16f2c805af86f170849540311206336298bd113b8d21c661a81ff7cd SHA512 085828b15cba8aec7445b1a3c9e09552f03ed8467e0ce58e2a619cc799753984cff3da61946ad840cb5ad05e178f40ecee4f4bc86ca1ea31b3019bce6840f390
 DIST exo-0.12.11.tar.bz2 1333227 BLAKE2B 4e95809c58b6db26ecdf524663c06df9cd70007726091e381a1f0dd58be52efee85ad9721c421c0df6438073bb9de97d56cd039f520e2f7c0f5722a1839ba167 SHA512 ecbf20feddf86178d34a5c70212f0c2310ab1d6ce25291846d6d1d3045270ae3e68102065d7b3d8840137406f826f9bc37fed92a16c1268c3d14f2833a97d533
 DIST exo-4.15.1.tar.bz2 1049760 BLAKE2B 365a51a6be44b36290d1bbe7100bc4e9a164436b2111997c969bdcc2f46306c0532fa41bedc231c5640992910e44acc8d072f5c070fc8d56f02b561002985224 SHA512 46b60bfde133969a25e72a5a80644454b06543888e554e8473145486d1b1952c4e508f2303045f183c49b053969189f50316ce7d18a0be2c404daa691e26d276
+DIST exo-4.15.2.tar.bz2 1010181 BLAKE2B 02b6cee68de61b1580e1676f7206f8f48f8c7c1a17050bf44e0ff922675ebd1a0eeceae2adc9f004e7e73a7e878af21867d7ca61c2fde9f10b2f80e917d1a318 SHA512 9b5838d2a69876164e5a89bd474428ace39bfb8f651bbe6c0873b52359893e40e156c862fb8a9f9ac3138ff2fa153e10085326e41045a41771e8961d3c0823f3
 EBUILD exo-0.12.11.ebuild 1036 BLAKE2B 12fc8c5a693166a7672750259cf9b3061b24c104ad3aeaf234ce5fc3d189ca552502eefaf08b24836f1b4f8f356f181469c805929fa0fefdde652cf1c38218b2 SHA512 5e6486e6cabb66870995aa41337730f7dcc6f5dff787b2fb7eba254d11fa69ba1309fbfc7926fec4aba8f287c55f8d777210eb1fe523ceed42c9e1282184b733
 EBUILD exo-4.15.1.ebuild 972 BLAKE2B babdb727d906288d66f8b0f9cfd77f2a4cbebf578360e8c892c469d011f7ef587159a3282df9114d8b250dea09c6ea02d84375b86e7f3a05b4b31224f38d1d9d SHA512 4962d6d382b26ca8fe10477a4c34daec7d206f3ac1aeb2ba80e3b87fdbce9193f5b53057ee9710deaa51924bb0d772c49d32c092f550fc20eb4f31dd94c202fe
+EBUILD exo-4.15.2.ebuild 878 BLAKE2B 4f81878a49ca1ecef3778a923fc10e88d83d88ed04e1d01b616dabfbc84dbccdddb30c0e9d00453872847313d715e30ee75c7796580e3464c08c905b5ada1f49 SHA512 8b13fc552ba30fdb85f4123fda5a7d009501217b25c28aba2acf86d2607ab64c656b4b3b0d8c9288a62f62d2f8d4eef27b0508d5597e4b3cf6e066c8378f141a
 MISC metadata.xml 334 BLAKE2B 0d61ecd7415a1a60ea5f53fdc29fae2ebf9c286822bd7ee5c10629fae5da0102687c3b07fdd5f81b123aa79e5d04905da705177402c491aad574dccc4e6d18ce SHA512 158e0c248e2d8f235fdb105f2342d0a3c4ca3f15b8938a73bfbc1da823d573a178857433e68a7b36cccc7449ba29cfb3fd4c3856b02c231bd5736d9f5932b6d7
diff --git a/xfce-base/exo/exo-4.15.2.ebuild b/xfce-base/exo/exo-4.15.2.ebuild
new file mode 100644
index 000000000000..7a4a8d07d379
--- /dev/null
+++ b/xfce-base/exo/exo-4.15.2.ebuild
@@ -0,0 +1,37 @@
+# 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"
+
+RDEPEND=">=dev-libs/glib-2.42
+	>=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() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index 9210caf53335..dff724d83064 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,5 +1,7 @@
 DIST garcon-0.6.4.tar.bz2 519744 BLAKE2B 3d5e90d8a1159aac4eb2f2455978bbe1de99b523b5383037c021f3490800349bff1d6f5333853b08db34c9d18f3c5fc787f51927d94cfd2cd747e839b1529e38 SHA512 96a99eb163909ba411ca5928c3fc0a569a6d833fba92edcfa845eb90b56abb02e1428a2cbf61fc1c564f1659d51b24ce174e3864fcc987a37158703df0ac2510
 DIST garcon-0.7.0.tar.bz2 508624 BLAKE2B 592d0078f4141b600f6a60818ed86cdffe289fda0f691d48b0e1992ed83191ec075483d200d312b27bd5f02e6bb0daabafeaf47a4492f489eb1e8c2af3283be2 SHA512 e865f68fe595bbc22d023d72ce4663c75e837a6789eb2158747e2cb7420ea2bba06dfd660e1de20675b9f9057cb2a9c1dc24221de8be93882e9b29bffb1fce37
+DIST garcon-0.7.1.tar.bz2 513717 BLAKE2B e87fb19ff0b3d0baf9e9def5ac028c481494334f425f28868c4e79b678e54ccdb925904980c5dc592c981c4159a8400af2d39f3350c525abef03622cd99d5be2 SHA512 90cc5c634200235a2a0d7f67584a14e32dedd9539bff627b699073a5d8797229245fd43a7256072cea40239e3b53da92691fec881195dc5d9d59f29e190054da
 EBUILD garcon-0.6.4-r2.ebuild 1081 BLAKE2B c2a17dccc2494c09ca1ddfa1a029764e7bea7307c0b0a25a3fa62d08ab123b940b85262fe98d3f0359d6172aad42ce12629930fe9eb10ed5a4e4f4212e85d49c SHA512 1b44d15c5d11de9d1ba452d72c0a3a8f5dd93e7389b05428eb83264427a4baa0132a80032928ab7dc96215398e5ba6e259dd051bad1759cb49027c14026b3633
 EBUILD garcon-0.7.0.ebuild 1082 BLAKE2B b038d90ffdedf417b40a66a3c4bf6d73392d0a4892da622e4022ad28d3ae06359a464e46f25e00befee71e544ab7bc81dfa9bbb8b8f205980c58da47352953a2 SHA512 553edc4cc725f92701cbca8efac4d35edfbba64bf630fc6afa6dc01cedc8175f73f37b4bbb9b8d33e076889b6d5ef8c98949095ffdda9ef396b99faf7c553974
+EBUILD garcon-0.7.1.ebuild 988 BLAKE2B 6162c32c6afc0a076806503b44fbd9c60e71a3627512c4d855d1e9826dab48526e4667f1eb31b07c72bbfd1b1f0634c5c28a1fede1de8504c01afedc05eec14e SHA512 11f16a8eef087ce3c6c4e454145d1ab251fc67b4cae1898154cc944ced9b42628aeccc4f545a8b0e6d0f86ac8c1682c26e1d53a4012f13ed8e76b4a9f06a1197
 MISC metadata.xml 395 BLAKE2B 13ea597065b0ffcb8a57e82f980dfa9b271a16f0c6ba824cb66f551d7bd6c49946985d1391a28360c4160bca5b88cc796b578b23f0b321d1670ab9f1c0addf23 SHA512 8783901107619bafc30acd3962284cf56376a14cd61039f862e1a7f0b5e17fc9d51f0e278c85161fb8b42c53b132a1ae7abe00c7e933eccf2ce3b74fa9956d54
diff --git a/xfce-base/libxfce4util/libxfce4util-4.15.1.ebuild b/xfce-base/garcon/garcon-0.7.1.ebuild
index dd5b8e34dae7..4c3203735172 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.15.1.ebuild
+++ b/xfce-base/garcon/garcon-0.7.1.ebuild
@@ -3,39 +3,32 @@
 
 EAPI=7
 
-inherit vala
-
-DESCRIPTION="A basic utility library for the Xfce desktop environment"
-HOMEPAGE="https://git.xfce.org/xfce/libxfce4util/"
+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+ GPL-2+"
-SLOT="0/7"
-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 )"
+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="introspection"
 
-RDEPEND=">=dev-libs/glib-2.42
+RDEPEND=">=dev-libs/glib-2.30
+	>=x11-libs/gtk+-3.20:3
+	>=xfce-base/libxfce4util-4.15.2:=[introspection?]
+	>=xfce-base/libxfce4ui-4.15.2:=[introspection?]
 	introspection? ( dev-libs/gobject-introspection:= )"
 DEPEND="${RDEPEND}
-	dev-util/intltool
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
+	dev-util/intltool
 	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
+	virtual/pkgconfig"
 
 src_configure() {
 	local myconf=(
 		$(use_enable introspection)
-		$(use_enable vala)
 	)
 
-	use vala && vala_src_prepare
 	econf "${myconf[@]}"
 }
 
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 5957a58bc769..dfe7e7f39770 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,7 +1,6 @@
+AUX libxfce4ui-4.15.3-kb-shortcut.patch 1373 BLAKE2B 7a582825c629a0a578d0aa5687f937dc81beec768293ca89211b6a820dc8ad23763c4ec13c8514003ad45ba7ec158bb6b7c6b3f23e53b58078baa34c1edb5217 SHA512 62dbebb708fa7845f9d36ab623dc7590fd37752ba092c6caf6e6635d358281cf7fd76aedf551d0fb36e95d2c6a11fad0c221aa874d7fcad16c19fc131652f264
 DIST libxfce4ui-4.14.1.tar.bz2 756175 BLAKE2B d487cc0a04b6053ead6670eeb83cafe1c4098818d5ad6a94a81176720d78cfd65160156961cbb526baa1640ae66a5c6958f707b7078c412d81fcd24cc8cf4013 SHA512 f42f41da3a683a0c56c3b1e7ba420c4f50909d2613e681d053b09b50bc0eb7f750f44c892e94b0ee8b9207983a87c0cadbda1ad93d0df74ae351dc8812025407
-DIST libxfce4ui-4.15.2.tar.bz2 740189 BLAKE2B 77263318afe376a9b50f129c6969fcb540685bb151f78a94f0024e27871cd8fb895d3edc41483ff8f3b8c8c28d24142252155c6ca68b614375c1fc93f08fdb45 SHA512 1ac2dea2200f00846bc5b5f86d02292f345dc904a121df86a662ca1844b1bdd9eea6bf0cd88dda97ff84e30d990b065bd9597cb563dbb75f639e820d41f83dbc
 DIST libxfce4ui-4.15.3.tar.bz2 756530 BLAKE2B ca2a9d5aae80d22a97b2fe932248756c9f34f71a13342670cdc0ad1c5393eb62d4f5bed8b21a45a60c762a83ebf1458deb7ef629c4dd3c894468ecf16a821dcf SHA512 a0e5a60c54df811fa2815238f9fe506700f6df8a6baa8172a6f8c68f005b54ba94ee31aba87d635fb506700da9c77e25f8c57268018fc8cfa5577f29aab58a6b
 EBUILD libxfce4ui-4.14.1.ebuild 1704 BLAKE2B 83defd465a237ed31b648de09e2f657c3510d3dec1b52a217b4795be00e6206aa7b14f7b073c16cfe0def3155eb577e0a3b0985bc5a582ab6d0f9c264b47c408 SHA512 69d4fb24cc2a9b56e0fa2bc5d4d754cf8e02be58095a96fa0b459c84a8939b36adbd157c1debd42f116f77f484839d518d561d1218c4d1a0acb2c806c3c471cc
-EBUILD libxfce4ui-4.15.2.ebuild 1565 BLAKE2B ee74c6a252293de607b8a79cfe7688cd59a08a7f6eabfd41242096d2116be8d91137190335944a0f3a21b02bd3020e158b76f21b13e0f3c7f8625db3375d482f SHA512 1dbe43388a3b95bfd70bdd04e8d8b5f5e2fd1717d3ee9fb285456cb35b7a441eb05d7ca1b8d544377133efc2ed30ad3372da65c5f10b36f5976afeba90a241af
-EBUILD libxfce4ui-4.15.3.ebuild 1565 BLAKE2B ee74c6a252293de607b8a79cfe7688cd59a08a7f6eabfd41242096d2116be8d91137190335944a0f3a21b02bd3020e158b76f21b13e0f3c7f8625db3375d482f SHA512 1dbe43388a3b95bfd70bdd04e8d8b5f5e2fd1717d3ee9fb285456cb35b7a441eb05d7ca1b8d544377133efc2ed30ad3372da65c5f10b36f5976afeba90a241af
+EBUILD libxfce4ui-4.15.3-r1.ebuild 1616 BLAKE2B ebc2d2e7089d9a68a08155b6f547e6e82c8d755a406c6a9ea563f8f4ac544ad2918aa4ed07875bfe0a6f3ea9c53601862ffbc8ed665f4e97466cc0adc36c3c5a SHA512 7e0364be788992bd60ae8a1d0493e19c5ccc05d1e4a2fb4f2723d73e7c6dfd1de67ab2cc1c232858f57a69564a38dec50de1a0b1cde6dd6e0f0dd5a89d0da8df
 MISC metadata.xml 515 BLAKE2B b0ddce75f198a496e2d7f1f658091c1301190aadef8f5a9a65b43e4f1a3c2a915e14329bd512984e13a2189eafb56bf00b571e9c4668fa5026eef01bb718d92c SHA512 ab5ebbf64571d8b5b7c1be3c329fa641ddb7ed5447066d5a207dce7487605bf2f86c13dce27788a17b2262efeec2845d42bf2aa9ca7dc16778b7288b77d29886
diff --git a/xfce-base/libxfce4ui/files/libxfce4ui-4.15.3-kb-shortcut.patch b/xfce-base/libxfce4ui/files/libxfce4ui-4.15.3-kb-shortcut.patch
new file mode 100644
index 000000000000..bfce065fdef4
--- /dev/null
+++ b/xfce-base/libxfce4ui/files/libxfce4ui-4.15.3-kb-shortcut.patch
@@ -0,0 +1,38 @@
+From 0fc934ebee037a91e032d362d83d991309c4ce88 Mon Sep 17 00:00:00 2001
+From: Harald Judt <h.judt@gmx.at>
+Date: Sat, 4 Jul 2020 00:22:31 +0200
+Subject: [PATCH] Always return GTK_RESPONSE_OK for accepted shortcut keys
+ (fixes #20)
+
+Commit a41dcb19 replaced the deprecated gtk_keyboard_ungrab code but
+also erroneously put the gtk_dialog_response call inside the
+gdk_seat_grab check, while it should be inside the shortcut_accepted
+check. This commit restores the original logic, thus properly setting
+the accepted shortcut key and closing the dialog.
+
+Closes !4
+---
+ libxfce4kbd-private/xfce-shortcut-dialog.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libxfce4kbd-private/xfce-shortcut-dialog.c b/libxfce4kbd-private/xfce-shortcut-dialog.c
+index 427855a..ae9c195 100644
+--- a/libxfce4kbd-private/xfce-shortcut-dialog.c
++++ b/libxfce4kbd-private/xfce-shortcut-dialog.c
+@@ -424,10 +424,10 @@ xfce_shortcut_dialog_key_released (XfceShortcutDialog *dialog,
+                          TRUE, NULL, NULL, NULL, NULL))
+         {
+           gdk_seat_ungrab (seat);
+-
+-          /* Exit dialog with positive response */
+-          gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+         }
++
++      /* Exit dialog with positive response */
++      gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+     }
+   else
+     {
+-- 
+2.26.2
+
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.2.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.3-r1.ebuild
index cddd13c8d5ef..9d9f9229dd38 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.15.2.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.15.3-r1.ebuild
@@ -33,6 +33,10 @@ BDEPEND="dev-lang/perl
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-kb-shortcut.patch
+)
+
 src_prepare() {
 	# stupid vala.eclass...
 	default
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.3.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.3.ebuild
deleted file mode 100644
index cddd13c8d5ef..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.15.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils vala
-
-DESCRIPTION="Unified widget and session management libs for Xfce"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug glade introspection libgtop startup-notification vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND=">=dev-libs/glib-2.42:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	>=xfce-base/libxfce4util-4.12:=[introspection?]
-	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10 )
-	introspection? ( dev-libs/gobject-introspection:= )
-	libgtop? ( gnome-base/libgtop )
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable libgtop glibtop)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_src_prepare
-	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/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 9ed79b9d5226..1d9d2c7bb30a 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,7 +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
-DIST libxfce4util-4.15.1.tar.bz2 520249 BLAKE2B 94a2d84d5e930cb590b87cd27d2a68e8a2d885fc783b9939adbb1af364cf84a0f2663920de5ae697e31e27c53f5665891733546d3e27e5f8cc01a56d9499ea03 SHA512 813269669df3b6b3d99f83142b4e0fbbc884306e467a3de34cd7e26e2dbe67e8cef769cab165e5f68838ead3ebd0d3895cc58e515c8e253b52a512298690acbf
+DIST libxfce4util-4.15.2.tar.bz2 520639 BLAKE2B ff08a4608bcf6ac854961c1753c531680bff5ba62e7103ffb1cab9c6132db9f07e1dfcf86e24dd7d492e42e6316931f1979567d304339678d3f7826e4e3f875d SHA512 1d244cee684229eacb9effc64f214899c1b449dbadabc422900a25a8870c98365c800d80edf9c252877c4d66d94394127195d3cbe4472493658e0f547c153812
 EBUILD libxfce4util-4.14.0.ebuild 1024 BLAKE2B 46f7b43ced6ac5109718d2085b0a43be351bda24cf7de22caa44d0c2a1ca21c72fdc5c117f9779883730a9d92d03a5df60ab5a0b4814090843a4a29fe0144e5d SHA512 39fae6a20d296ea91c5d1844a73a8d15656289d19586afed045fbf8468957c3a072861d7bbbc847dffb407c958005c8c40b746bbbb3c759e0d0dcb7c90f3bca9
-EBUILD libxfce4util-4.15.0.ebuild 1028 BLAKE2B 23a1b604164f6028791662299bdd0cfa4ee6fc0f1c65c0d2935177a7a0b74ce446ffb3ac051e9c5d8af3e07edc8724bad9c699db82b4f120a062012456068edf SHA512 a89d8e37eaf2f76fe590378405450084c412b2dc36738468e7cc388e852d8ecb8bee8812ad87161523a8a67fe840e1a6e56b476d6543fcb6834dc56325ce0ee0
-EBUILD libxfce4util-4.15.1.ebuild 1028 BLAKE2B 23a1b604164f6028791662299bdd0cfa4ee6fc0f1c65c0d2935177a7a0b74ce446ffb3ac051e9c5d8af3e07edc8724bad9c699db82b4f120a062012456068edf SHA512 a89d8e37eaf2f76fe590378405450084c412b2dc36738468e7cc388e852d8ecb8bee8812ad87161523a8a67fe840e1a6e56b476d6543fcb6834dc56325ce0ee0
+EBUILD libxfce4util-4.15.2.ebuild 1028 BLAKE2B 23a1b604164f6028791662299bdd0cfa4ee6fc0f1c65c0d2935177a7a0b74ce446ffb3ac051e9c5d8af3e07edc8724bad9c699db82b4f120a062012456068edf SHA512 a89d8e37eaf2f76fe590378405450084c412b2dc36738468e7cc388e852d8ecb8bee8812ad87161523a8a67fe840e1a6e56b476d6543fcb6834dc56325ce0ee0
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfce4util/libxfce4util-4.15.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.15.2.ebuild
index dd5b8e34dae7..dd5b8e34dae7 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.15.0.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.15.2.ebuild
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 2286e484f0bc..b51e297f3735 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,11 +1,7 @@
-DIST thunar-1.8.12.tar.bz2 2367685 BLAKE2B 259e7a2c9aeb66673a7b5e6d7147d5257d64b7143c79981ee65097568505969426ea4b20e7ef754fcc6f03e19f632b078115d2db524f2a6eeec1f1e3253e14e4 SHA512 cd27b26796602ea8623c368cd6c8bb53136c09e4a02c37775bed9918c801741e0adb5784151fbf4b93785967a637ffb8b1214b0721f9457de683ebd7718a8767
-DIST thunar-1.8.14.tar.bz2 2373742 BLAKE2B 32cdc316defaf781e705ecd9e0550014e1270f09e8eb914f164df4bc557c433fcedbcfb41e200faf317bbab96a20275e4416945050cb10981ee68e0f0cdd357d SHA512 ce6da526e6378ffc90686f6ae25e56109e8af7d0c592345aca3de4603f4c5b3d089255bc313f2a60ee454cc3f0af52106584663c72ecd542a9c92769559c6787
 DIST thunar-1.8.15.tar.bz2 2366401 BLAKE2B 2d594ccf4e0eb68fd9f1129b2d737121982ed4275265ea26866c766755f717cfa197abf89ff9d3c07403a71b7feb29ccfabb14e935ec08fab418b173c39fd8f6 SHA512 50020084105daf5d5464cdcd29827fa212b121b0f6a385b6e2820fd120b6880cffafe63f51e737bc33d13f174f83de5c165f2ce155ff6aae74cc1b285cbdc8db
-DIST thunar-4.15.0.tar.bz2 2444610 BLAKE2B c07cf9f29efad7f9ce2031b9f5f70f48afe7ced360495a51f7ad201efd41607ba557bc446210db13b11ece41ca104182d006d5fd8071e9fac540094ef48860e3 SHA512 17c78ccd8a97481135ab1c05be4dd666136cc0ab546fb3da52d48e38dbb04a035cdca172afc8b5c9df5cdb8fba4189b84846e96b12a8fa8cab3b3901ef92f4ef
 DIST thunar-4.15.1.tar.bz2 2468765 BLAKE2B 6620c5eef9e8d0afdbb9f38813127cd1cda7085f64951734b96c8f06fb44432a481be8045bea4bf81c28bc292aeabd6cecd1e9b49ae049e3f436f4d78768f662 SHA512 51ba1e6e8078093b1eef3b3440c258ed86e06e54abaeeadb459dde2ba6304c93e291667a2f2c82161e2002e21aaa7c8fe26d8f30ecae8846f30bf0a4569a9cfa
-EBUILD thunar-1.8.12.ebuild 2180 BLAKE2B ac3dfc810f40aa2d61f2b1aeffbfcb528873e412bdb6236a3abe2b63bb956ee91616e37633a2b3fb701e3b8333032a06fc0fc7a6b816af4dd9ad790e5f797922 SHA512 cc9d8e1a200762976ee70ae36aa2ac8eb0a68262216bb444983c68547d131fdc37852815404029518c41c30ff59b90421d819f0a0ecd030a5e6be92886f75243
-EBUILD thunar-1.8.14.ebuild 2180 BLAKE2B ac3dfc810f40aa2d61f2b1aeffbfcb528873e412bdb6236a3abe2b63bb956ee91616e37633a2b3fb701e3b8333032a06fc0fc7a6b816af4dd9ad790e5f797922 SHA512 cc9d8e1a200762976ee70ae36aa2ac8eb0a68262216bb444983c68547d131fdc37852815404029518c41c30ff59b90421d819f0a0ecd030a5e6be92886f75243
-EBUILD thunar-1.8.15.ebuild 2185 BLAKE2B 682399906df271677a1d53c7b941aa8c202c5f5875f9f7aacab1060b2d599b24423f5c4622d05df0d308e5f42676766bdc778952df1f795c1cf18a61c7e9349d SHA512 2ed3507de08d052233affa5f58dba9b12a8b244ba3ff0b4e7ada4868f27ee565224600025aee5543f35a1a4c1789c05effed6045dc6885656f54f571a48c2314
-EBUILD thunar-4.15.0.ebuild 2123 BLAKE2B 97c8c9038778b7be96f65894b4869cad0905f0aef103809eaccf071c7ece9ddf78502ba7e0514348e26c0dff32f62703630a037df1c16284167c42a47918d5b1 SHA512 b520c05d0ca336692310ce6891b2efc074ccabb1f46d5f6ae9bca0ef7ac845c5504aa92e0005fc50120d409cb3e1854f491829d7a59c2e41f738c52aba1aa409
+DIST thunar-4.15.2.tar.bz2 2458526 BLAKE2B 20cfb2df07aab3076619f00a391b8fa8bec3ee7dd251c79de434c55f236ca8ff5c0326a205276cf423128576bfa435316f3eb71a6148d7cb601b91742f44eef2 SHA512 ae33be362c178db8d0f027b0cf93d0787210e3e4d684b3d3fb28a488e53d410e84fed4684a7885da4fb1161443ea06998b0d375632423b99dc4949238709a0a4
+EBUILD thunar-1.8.15.ebuild 2180 BLAKE2B ac3dfc810f40aa2d61f2b1aeffbfcb528873e412bdb6236a3abe2b63bb956ee91616e37633a2b3fb701e3b8333032a06fc0fc7a6b816af4dd9ad790e5f797922 SHA512 cc9d8e1a200762976ee70ae36aa2ac8eb0a68262216bb444983c68547d131fdc37852815404029518c41c30ff59b90421d819f0a0ecd030a5e6be92886f75243
 EBUILD thunar-4.15.1.ebuild 2123 BLAKE2B 97c8c9038778b7be96f65894b4869cad0905f0aef103809eaccf071c7ece9ddf78502ba7e0514348e26c0dff32f62703630a037df1c16284167c42a47918d5b1 SHA512 b520c05d0ca336692310ce6891b2efc074ccabb1f46d5f6ae9bca0ef7ac845c5504aa92e0005fc50120d409cb3e1854f491829d7a59c2e41f738c52aba1aa409
+EBUILD thunar-4.15.2.ebuild 2125 BLAKE2B a63191a1ffaf1dba2f64b32bceda59e32a0385253d14a27413a8bc89d76b6d685baeebc0d8b6a9aff5d68617b39f31020703de39b32693c3785ef97d2325063b SHA512 138f268869a9732da303ae99aa7862de192ab7bb8f82ebc7538d1aa0583c3f667a9db7c259cd0819e1f16091136f698ff220d032f865a9593f8e876fd954c3da
 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
deleted file mode 100644
index d56945bf657d..000000000000
--- a/xfce-base/thunar/thunar-1.8.12.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-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%.*}/${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"
-
-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/thunar/thunar-1.8.14.ebuild b/xfce-base/thunar/thunar-1.8.14.ebuild
deleted file mode 100644
index d56945bf657d..000000000000
--- a/xfce-base/thunar/thunar-1.8.14.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-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%.*}/${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"
-
-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/thunar/thunar-1.8.15.ebuild b/xfce-base/thunar/thunar-1.8.15.ebuild
index 80545f3c2e18..d56945bf657d 100644
--- a/xfce-base/thunar/thunar-1.8.15.ebuild
+++ b/xfce-base/thunar/thunar-1.8.15.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-4.15.0.ebuild b/xfce-base/thunar/thunar-4.15.2.ebuild
index d8a4c532ccf8..8f8165249e08 100644
--- a/xfce-base/thunar/thunar-4.15.0.ebuild
+++ b/xfce-base/thunar/thunar-4.15.2.ebuild
@@ -20,7 +20,7 @@ COMMON_DEPEND=">=dev-lang/perl-5.6
 	>=x11-libs/gtk+-3.22:3
 	>=xfce-base/exo-0.12:=
 	>=xfce-base/libxfce4ui-4.15.3:=
-	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/libxfce4util-4.15.2:=
 	>=xfce-base/xfconf-4.12:=
 	exif? ( >=media-libs/libexif-0.6.19:= )
 	introspection? ( dev-libs/gobject-introspection:= )
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index a22082be525d..0f6b1877ccaa 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-appfinder-4.14.0.tar.bz2 519705 BLAKE2B e5c107d975d7103a7f58fac534eaea3c483a82885778c12c8c01cfa552d305f2f0c0ba5f77f1911b29ce58ae2efec973359df9425370f5627c95a7826808f172 SHA512 94c7266fc7c738107f1674ea3d705aa4168d9f2ecada97dc3e97c85c3857bd37a2e6517028fb51dd4663eaba4bf758927879c7fdbff83df79f8648c61944402c
 DIST xfce4-appfinder-4.15.0.tar.bz2 526475 BLAKE2B 3e694d8f92f288a85d073d678098b9205882ff4c7e8e3c8acb7c21c5007a72cb211c60601dca78d3233d4624801cdf235566487465cf14ddb13aa62330ea3a60 SHA512 96ba50ab1c0f383af6b58d0f864f1b45b9c116ec26ff04fba7326f6a214f3576645118c553166eb8683c238757943cadf0cc0966a1951f17f37ffd6bbf0af44c
+DIST xfce4-appfinder-4.15.1.tar.bz2 561294 BLAKE2B 17b1748040541762ab6b29038b93b9fa15330de0169848b73105e723f6b099fdb7e7278b0b09fd49b609665d41a0cd9abf02cbafcb32f1630083670236724760 SHA512 fc6c5b68c963fc46833b52e5035e3c3f7d7fb11008aaa40522b08dd3a13187553c08533ee1719d838840f26683f09965e81efdaa4fa9aa0b8378feec411b64a2
 EBUILD xfce4-appfinder-4.14.0.ebuild 757 BLAKE2B 5823a14e61dc759d4f1a245de0815d2a89e18bd2e598249ebd317feab6fd6245ef8c6ab5c6590664516c0593b7955fb7c5fcad158938b619ab5e903deb8e4a24 SHA512 4caecbe05f48ac0e7aef06a8e519b1df841c88b322ebe366daff56793fb555692d04679fd5461a2e77859a390e2df4720646f14068457b79c78bd1aa073a6005
 EBUILD xfce4-appfinder-4.15.0.ebuild 762 BLAKE2B b195ca46edbd2cb3e0217ba7820458fdfc47588c94b8358940755447665100522c2ee521a0054fd6864e89284326d7d71c5bc56e40affc494ba6e7e20df137b7 SHA512 9a71e260f42a902906ec342e14211374caa607f63aa344f7961dba0245a5f92d4c7311289e7f625ffe004061c63003435d440bc905d42e72fd3b8d99e073fa04
+EBUILD xfce4-appfinder-4.15.1.ebuild 867 BLAKE2B d3904ff26646399de7637bf067a7fbd96badae8fab83c5f699a274e615c6fece8d211bb969f897ec21e07e432c88dd4354387e45061f0f43a5f4d7376cfc0ad0 SHA512 d3d2d2427a6e64582564b085301e28e2506cc4f9066b0cccca24b4fb1e1d86c29858fcee2b8773e576e82ad7fb7147ebe75c2d0c51be8590983e35bfc4af52ff
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.15.1.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.15.1.ebuild
new file mode 100644
index 000000000000..f77a5531f4c6
--- /dev/null
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.15.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+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-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.42
+	>=x11-libs/gtk+-3.20:3
+	>=xfce-base/garcon-0.3:=
+	>=xfce-base/libxfce4util-4.15.2:=
+	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
+	>=xfce-base/xfconf-4.10:=
+	!xfce-base/xfce-utils"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 0b0c5e2d492d..361db658934d 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,9 +1,7 @@
-DIST xfce4-panel-4.14.3.tar.bz2 1304748 BLAKE2B 7e009e2afcc59b1d014fe776c439cd27c8ddb9b46215a9766f25f384802bc27a672201d0a73eff8aab3714822ee5f2c062806a60ccaf70cf6b5ec65f38f7e8a1 SHA512 c317741df1196a9f8d675c87732155f973022d1cb30a8815393980747d1569e8348c386253fc9056068c35fbdc13faefb4a0bef6678d072d51461c4aae909940
 DIST xfce4-panel-4.14.4.tar.bz2 1307938 BLAKE2B 79e0abcc5dfe41faaab1de981b8a61a99e9c11ab5b3ddba5fb7385517d24b50210f12d0a6a49720d6d8458fa7143ed65d7960025c5e8c01af1a59dd6b339a2d9 SHA512 5ae7c7acf0254fdc3f5eaccf75d7c12699ab8147322f231af7bd17b1238b8c25a96d628dada9caa086fc8fde2b7dc4030a38eb7b863b290f9e069193b3728d85
-DIST xfce4-panel-4.15.2.tar.bz2 1302860 BLAKE2B 0c2ee5dac584cd1cae940872ca1130ae710e23f46089ee16241f03f87317d905937f1eb6c382140659e9b01669ccce26bf7e6e64e90207db3c7b7a7865c71674 SHA512 7f2e0d1de70db1778cd5a0c0ae4845ffef960b16f1e147ec6fd47543a6360e2281d8290bc055bc83993796bdbd97edeaca867a6790052bc07d8e2bffa412e5a2
 DIST xfce4-panel-4.15.3.tar.bz2 1321860 BLAKE2B dbe4eff757e612267c0de6edc0689bf3b469c30cf8060f06e3e99de9093924bc0e8dbb4f1362349904c6d99dc250b240f34cbde218de0b13abdd259a8482cee0 SHA512 ab3ad010899cf86368e5dd8e469937d89221f6847f54d047536c120bf282bf5e7756dd8aa2837984c35a10c2f5c46c75874839d1b4cbbfe91417875fff4c3cc2
-EBUILD xfce4-panel-4.14.3.ebuild 1494 BLAKE2B 73021f104029c59f7f829083e61e558e76865ff57dd1faaf191c2a8d8c6cd927004d42f7f36c144841c40804c151f5bbba4512e65492d15ee40f3202445bb6aa SHA512 8105bf3c2606467e4763f86a5fa78b027aa26365977f62e752fa2ec921cb63b264540cb5ab91b936c952bb6093a705a956b9ff4ab6a9949055a5bdd8c9d7a923
-EBUILD xfce4-panel-4.14.4.ebuild 1528 BLAKE2B 34b45d8e47d944c1c762533671f9280c3e69c1c5687b7f928e1a3c85a7c795f828ee1083f5cf904433f17a1e7285e0b85919ef1d3ef5e04200b9a0a986ebea17 SHA512 0de8fdcdc6bc1379e9b0d26d67a374c565135df99517857fc3db6808f3d959c82762934be57978159a263bcf71ed0db741ad9b6d9511736dddda2758f251b075
-EBUILD xfce4-panel-4.15.2.ebuild 1413 BLAKE2B d5bdb34864314e9a177b1134a5bd89845b3e4b0bd5371c3bc653cb1c42644f7e917c46a2e70e29aaa5d16fdc1929d418dc758af172904e5f5ec12885d0ecf125 SHA512 ca1aa1cb317bf05ee8c36983767bfc9a40cde6e711873f67835843f5caef1486c1bcdf29996fef49e3054aeb933998231d50b52a890fdbfd3af81df976dfe790
+DIST xfce4-panel-4.15.4.tar.bz2 1358752 BLAKE2B 0920ee2cbc97e2884ded7a739db015bbe60498fcdf2cfee0672139508a1f98ef9dbfbda3a029dacaf790d9ec73aa63766bba8b2cc0dad66c9730c4aa11a3f596 SHA512 f8d48fa9691af64e12ea55b190206b6dd6a5faa4a361f45c485591c9ea0bcf01759c5457cd5bb48438f40411862ff873e3913bf3100afd2d9c9b4ab950816ae7
+EBUILD xfce4-panel-4.14.4.ebuild 1527 BLAKE2B d2934e562562ecbd321d33662f71fd5f2eb1f98a55cc65142487d4c94417a9bb2f21d6a344348383b1bc404007320469ba5f732e89af8f52ec990681fc35e561 SHA512 4e39319392bea17946856bb1ad3b0cbbe33f0104cf310a345c889fc51bbf09a2cc17ebf68ece96b0d1c76855328bce133c6a9158ef9566f37f393a7e0997f0f1
 EBUILD xfce4-panel-4.15.3.ebuild 1413 BLAKE2B d5bdb34864314e9a177b1134a5bd89845b3e4b0bd5371c3bc653cb1c42644f7e917c46a2e70e29aaa5d16fdc1929d418dc758af172904e5f5ec12885d0ecf125 SHA512 ca1aa1cb317bf05ee8c36983767bfc9a40cde6e711873f67835843f5caef1486c1bcdf29996fef49e3054aeb933998231d50b52a890fdbfd3af81df976dfe790
+EBUILD xfce4-panel-4.15.4.ebuild 1453 BLAKE2B dea32d45f298c36c35d730f146a6dfa4fd8fca3fe8d6483fdf934080b96016b5e5c61da5e6b45529671caf16dab4a63bc7225f8e7c515d72572a2d4112b129b5 SHA512 73be6d66478fd2973a0654e1fd94daa553804696900de594c9d3052e0c953f7420deb95dd5982b51fc9836f4db306683df9f26e40998bc59eb2f0b47fa50e345
 MISC metadata.xml 322 BLAKE2B 30f74676e7071e50ef0a877f83148fb5c90b6706e31b9a9b71540c7d5488ec04eed647e345aefe701315855fd047ca721a91031ef1cd7ca04388236d4a404d5e SHA512 3d6a3a46f9e77eb4904ac9385a4ddb3337b97f450c26895c2c3032095f94eb92420fe8d814da7696e4dc7aed3d8ca395aeca7c46914babfa845c6f61cbbe97c7
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.14.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.14.3.ebuild
deleted file mode 100644
index ffed406fa275..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.14.3.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.4.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.14.4.ebuild
index 73f4ea9adf6c..73e89381c67e 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.14.4.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.14.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-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.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.15.4.ebuild
index 9861259a3be5..ef53f027ae2c 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.15.2.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.15.4.ebuild
@@ -16,6 +16,7 @@ IUSE="introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND=">=dev-libs/glib-2.42
+	>=dev-libs/libdbusmenu-16.04.0[gtk3]
 	>=x11-libs/cairo-1
 	>=x11-libs/gtk+-3.22:3[introspection?]
 	x11-libs/libX11
@@ -23,7 +24,7 @@ RDEPEND=">=dev-libs/glib-2.42
 	>=xfce-base/exo-0.11.2:=
 	>=xfce-base/garcon-0.5:=
 	>=xfce-base/libxfce4ui-4.15.1:=
-	>=xfce-base/libxfce4util-4.13:=[introspection?]
+	>=xfce-base/libxfce4util-4.15.2:=[introspection?]
 	>=xfce-base/xfconf-4.13:=
 	introspection? ( dev-libs/gobject-introspection:= )"
 DEPEND="${RDEPEND}
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 5e8cb9cecda4..94c1cbc6cec7 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,6 +1,8 @@
 AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 371 BLAKE2B 7737f95e5ce5ad9d421b8d39e577899b145d12ce4faebc135eaa052a6637508dfd4d5a8d9c6bcbe987026cedbedb5a396b294edadfc7241a607c7b0ef9a218b8 SHA512 85914b96def54a504f5dbaecc57f47f3529be0bd2efc8dae8529c56bd764ff9a644e17e14599b947aef4a7311a32a3e0b2ef5aa6dea45287cdc09b01bfcfcc48
 DIST xfce4-session-4.14.1.tar.bz2 836607 BLAKE2B 916589884e47ce3224c4a6d5537dc7b03d18ec56009ae3e2b4db01d9614a18d1db0f14d3a732b0ed72b924a56831c37111f08068b39b43dab85a39d82ea38cac SHA512 af797e33145311015ca6444b929d82c4e321f76defe773aba723d0a373f894399216e043b45e0669dd1c9aa1ad3cd2dcfd422352fd2381b7425bb310be66c92b
 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 1755 BLAKE2B 92518c73e22f9b8a53497dad1ff935515448d63a6090aef891f06b70c76e615c979cbce4d5a737cbeffd75b87942fed7a8bc8845242172d2abefe5f60a53fe56 SHA512 1a76a304cfbadc833d411a2b7d405525618ad078f5de05ddacc3d77d2b02a20675bee550e3d26b6173b4af74c422d4a49e52b73a845c932e61e73f41d9f5d2e0
+DIST xfce4-session-4.15.0.tar.bz2 854285 BLAKE2B 96afd4f0169c9403bd1e34ab3acb9536a86c2adad6b125f80cee7d81010622a3798a8ac0a5c15e4487dfe5e24b4c945e275e8c0c2e20e365101fd3096ed042ad SHA512 dc2c02e814ae27209ffb5665b5adbf509e0339d882cb572bd94a01cb5aa9f591f6e96daca7c7953fff8ef56f42a9f4770bdeb1f1aaa6856b7f4f6d7c92151daf
+EBUILD xfce4-session-4.14.1.ebuild 1820 BLAKE2B 5b86be573accc6b86b38b46665ebd8ce1f72807c64cb9ae6fda92b2ed26eccda8a20633671420c0932a02674a3be7a6a6b4c1fa428dc30b4bd008e297f01a140 SHA512 90e95b18e22b0cf1dd3832d76efa89280c7638b595fd1d26742ea8c8ecf62259bde8b6627223597e1ffff667e86912fb348aa8f4fd23fb059b8bb2e921035245
+EBUILD xfce4-session-4.14.2.ebuild 1741 BLAKE2B dfd2a47a46a9305754ee200f164145213a5e31111b5ba3b77af41a12cb5e4516e17380a843f317edddb70d7b2d916a7b002a4ea6b6c3fa89422d1f27ad994a1d SHA512 1c0f371556319bc4d4a60077658358669065af5ac653be9572468e4bc73f3393770ab5399df3d197d82e6e9ca077e81a6282fe5ce55aceed1450ad23fb297785
+EBUILD xfce4-session-4.15.0.ebuild 1739 BLAKE2B 8c855b7b3d6fca6cb766c358f9b9a8ca4d4c544f038b7a4be0a9a18725b1f4f0235b7609b6a8f31875e6ea0bc616bcff13184444ace6a666bd9416d326ee102a SHA512 9f9312fcf7e47346f34942984ad748fa1d53054843b4a0e7d6dc76f1ea9dc066e268aa5c5badd8190d5eded9f12d38c3e6d55aafbcc1bc9d0725413fd33e607f
 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 45df505d24b9..a57cda3ae34a 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"
 IUSE="elogind nls policykit systemd +xscreensaver"
 
 COMMON_DEPEND="x11-apps/iceauth
diff --git a/xfce-base/xfce4-session/xfce4-session-4.14.2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.14.2.ebuild
index 4e2578f8bd47..28535422b238 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.14.2.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"
 IUSE="nls policykit +xscreensaver"
 
 COMMON_DEPEND="x11-apps/iceauth
diff --git a/xfce-base/xfce4-session/xfce4-session-4.15.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.15.0.ebuild
new file mode 100644
index 000000000000..aec4b51d30e9
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.15.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A session manager for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls policykit +xscreensaver"
+
+COMMON_DEPEND="x11-apps/iceauth
+	>=dev-libs/glib-2.42
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libSM
+	x11-libs/libwnck:3
+	x11-libs/libX11
+	>=xfce-base/libxfce4util-4.15.2:=
+	>=xfce-base/libxfce4ui-4.15.1:=
+	>=xfce-base/xfconf-4.12:=
+	policykit? ( >=sys-auth/polkit-0.102 )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xrdb
+	nls? ( x11-misc/xdg-user-dirs )
+	xscreensaver? ( || (
+		xfce-extra/xfce4-screensaver
+		>=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"
+
+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
+)
+
+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() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 9165f31a2245..85de267fe92d 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,10 +1,8 @@
 AUX xfce4-settings-4.15.1-install-icons.patch 2160 BLAKE2B 35c3e66101d33e8213dd848194d9d5fa3cbb424b466f2538e5109329064b37d7130c4cc4b4cfd7f65ba023f68d9547d752903be5610925f543d0967a82ccb417 SHA512 e2a5120a65636cc30c381e2065f1322b94cab25bd42a6d79da321328c79cd801919c6e5de0cc11422a461d5f57c2b1a9a4cb9b225ceb4751b9fdd9dc6f816910
-DIST xfce4-settings-4.14.2.tar.bz2 1194714 BLAKE2B ffcc17ca5c39837d8d60c3b5916cf6643218316e6f7a67f3d88c949ff814e98e1a7f46ccd4c9c1280e1fdade91f7c244e80080031b9b05060afa5546720ea03e SHA512 5882e96504e2ad869504e7c8e6e62d1d04f61beef524ba85a3ed962ca689d6e72a4ed717173f9e2645c078c2c8757caed1f3395dd185a3b0b5dc8b27a1a3d2d1
 DIST xfce4-settings-4.14.3.tar.bz2 1201308 BLAKE2B daf20e5adda24f3c1ecc88506c1a1cd03b33b379bafc236ed3b99404b816803288041de7d507072a311c3966bb0e040986e358ea94d01636c56ea31c1b843c8d SHA512 fcc5bfa98d8903dc3ac51ec909e542485a44f6c11ddca815508c2ed913410a0becd54b2db6761ee48f5a20d6ca08377eeefbb54bd0cb7cde0a0c0d4b65802ab5
-DIST xfce4-settings-4.15.0.tar.bz2 1199360 BLAKE2B add423dee8b5de6386aa5008c082d6266e0d4ffaf656ab960bca12798d03aedf6dcf98aae2200f4e855aec9749eaf69e4220c8f7d5ce5968edff469546afe614 SHA512 ef0d253ee5f79d57b62dc467223d23050fd21b99891fa7a3c8329d97261ba918a0f4b62a345916558685cae59bfee5da58b1e66a8a7f1b2219eb6cec2094fcbf
 DIST xfce4-settings-4.15.1.tar.bz2 1366752 BLAKE2B 1f236d39529b7a403691bbc82e5776d3c36af4e3414aa43b49cafb2ed9a9f9793dcd6d2fde35ab0d1a6764976a13ec337e097e64f39f9d7961763487c6021bad SHA512 5749db022e70b7bda3a8de1a09d339a69bd55ef6151e5b0f03f3cdc11ecd285cafd44be36299731d0d535cc396f2ec5afca6255291cfc02e0388977ac5ef19b6
-EBUILD xfce4-settings-4.14.2.ebuild 1563 BLAKE2B 45a73d4ada2598eda4a41b52c695ea07ee0cd3f8aaa6649bcb7fe1a0279832157f17d00ed7406b9ed24ff91b4dc7c0f2bf80a5eaffc31e77b87960e097686459 SHA512 f1984880e7249b27ea37de135af9032460ec93ada9fce55287cfafa1d81abe72e6ab55fe970d7a2edc3af8abc266398ef1d4854992fa918af0eec36ea5e12167
-EBUILD xfce4-settings-4.14.3.ebuild 1564 BLAKE2B 24397cce1de85bdf8e416fa5c2f891ed59337d70a7ea16ae12db8ae56d7568f9cda19f296e7098bbc714cf86840f519ec0f0db1a170e685000f6608332f62fac SHA512 e4c8fea2477c4c8aaf2874e22d27b5e9ed30eb65efc686823fc9ead862637959695fcfdfbf6d4fea6b77abb416ee428f5dd5f6a13de2470ae943bd73dac06c21
-EBUILD xfce4-settings-4.15.0.ebuild 1580 BLAKE2B d56cfba06ba8a1401766ff19c9ae6aa65bf9875c6c2364e517ab7e7255513d0a512b7eb6580a74ad11fa12b3bbac9baf9f7801f6ca3c4f3e2b2bfad151215434 SHA512 80b78019bbcc522e9ee29ba7142b20eb9c5bb1c31ec73853bf4e6cac846781c76a30ef13c363244919bd1d38430ea9696018a6d98077ef725b84178560fd1862
+DIST xfce4-settings-4.15.2.tar.bz2 1415214 BLAKE2B 508a2eaa8c73ab643ed42a768af3f2c5c97ac367a5dd5919f401424e21de6f9bea8a747d9920c396a313f3734ea1bd60d562a35bdd275b32314cc9658a2a4bda SHA512 f286be970d2351d1b47d7ff1ddf862093e8b88cd2d29aa088f81d48c30f120e03c0712526c562fb6fb3cc33939a7098c5d4de8938c1f825b87560544bad7606c
+EBUILD xfce4-settings-4.14.3.ebuild 1563 BLAKE2B 45a73d4ada2598eda4a41b52c695ea07ee0cd3f8aaa6649bcb7fe1a0279832157f17d00ed7406b9ed24ff91b4dc7c0f2bf80a5eaffc31e77b87960e097686459 SHA512 f1984880e7249b27ea37de135af9032460ec93ada9fce55287cfafa1d81abe72e6ab55fe970d7a2edc3af8abc266398ef1d4854992fa918af0eec36ea5e12167
 EBUILD xfce4-settings-4.15.1-r1.ebuild 1668 BLAKE2B 6b40caa5e907176a14b25e13a0ea853455a932d778a7cce87740790c28376c7e61c216b2628cedd1f089454721e7ad9f526db3c48b3000b38c166bcc010f7f8c SHA512 b96dd6e215eaac651d4e2557673f63a59499a933ec354645abe25dbccac4b43846b4e1b62c74d5a7d54e8ed7ed26b3d909ca97fb53a163209a5fe9d595b798ee
+EBUILD xfce4-settings-4.15.2.ebuild 1720 BLAKE2B b843192b87eda54d4b25b010f473d9864922d88878590576759c6cc457853195afbbb8882b471e4fe6c77f6592f29e33cf83e41c76a530345456c1163b2cf170 SHA512 f25fd28f77e09db964b54dd83c27524c02aea1f2b0e954b84123da128868cd58b3c6cbc0da4e4c4bc8a64c6952f4bb9534922da9da66c91e4ba965141d21fa61
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.14.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.14.2.ebuild
deleted file mode 100644
index be11f7579648..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.14.2.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.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.14.3.ebuild
index 105d571e27bc..be11f7579648 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.14.3.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.14.3.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/xfce4-settings/xfce4-settings-4.15.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.15.2.ebuild
index 5b919c306352..dc27875a4f06 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.15.0.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.15.2.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit xdg-utils
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-single-r1 xdg-utils
 
 DESCRIPTION="Configuration system for the Xfce desktop environment"
 HOMEPAGE="https://www.xfce.org/projects/"
@@ -12,26 +14,29 @@ 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"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
-	>=dev-libs/glib-2.24
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.45.8
 	media-libs/fontconfig
-	x11-libs/gtk+:3
+	>=x11-libs/gtk+-3.20: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/exo-4.15.1:=
 	>=xfce-base/libxfce4ui-4.15.1:=
-	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/libxfce4util-4.15.2:=
 	>=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 )"
+	xklavier? ( >=x11-libs/libxklavier-5 )
+	!<xfce-base/exo-4.15.1"
 DEPEND="${RDEPEND}
 	dev-util/gdbus-codegen
 	dev-util/intltool
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index c8074c7319eb..7d264495b7ea 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,5 +1,7 @@
 DIST xfconf-4.14.1.tar.bz2 644804 BLAKE2B 1b04770fa9b3f4901f561bc3978dd7ffdbfea9496330a98334ffb19c0c7413b0540423f20200e2e5191ff876f3e2c32ca8354bbab70aac4de00592d995f77e72 SHA512 727d013f7e71e0eb9ff17e464acd65c1fa507f8eba1bd29621dae070161042f60f47b8ac048b28849bf45232d04d5d6e48530aa0bd1e661a3f58db47703a8808
 DIST xfconf-4.14.3.tar.bz2 591432 BLAKE2B 9722547018a6db7132bad53b750ec8bd66b2f5dde2348b605bf9a6ce6a7d18fefbfb16c31f58c1c4e6c593d3f0525c3bd8231b4bab0728bd64f91d918f0a6c23 SHA512 e3add05018215cc597bb76d852903077e1fd0a21429c462116c560739eaf32167f9dddac3adb36e89b9380b87fc4b4c38d4ee9fdd5139b540268be437fc3a713
+DIST xfconf-4.15.0.tar.bz2 586244 BLAKE2B 0bc6331f6a00d9328b7d462da1bffd0aa57b7b6e5a48a6e9d05d43993910fe1a3677ca33ca2315caac0528087e61a66e574118efd6c9ea5fb2d068cc843532a8 SHA512 3d36881a5d4a8b514196905689f32eed0da49c642fced38c57fa9260013e2efc0ce83de502b91c5dd07734dd99c2521f2cac00b43d3d76141efe7eeddc03c5c7
 EBUILD xfconf-4.14.1.ebuild 1949 BLAKE2B a8a3953b1c2625ac1e2432217ddea0e7bdae9811c1770ea7f6b24d015ce1db9776e5f71cb591850babe297ae11366ee60f06777e3eaf510fe15b65974817632a SHA512 794c36200e9a9a7d6e41a54d8b8c1daeb6c1726acf3cf3a003740efc35050b947b06ae2832c4c206f29921707a2a6d8bbb978a254490b7cea0e33fb52f143579
-EBUILD xfconf-4.14.3.ebuild 1970 BLAKE2B 4e99b16d82c6afd2b8ad0201d01bcd0439f5c9031d4dfe20039bf807ea238b545c2817755ae5a7a96fcb949266bdb45900588f6762c4a009f8f24dcd5fa1bcdd SHA512 b5e23f16c284f91a66a4b81a08eec785ce306d0b81b48fbd57505e2c847d6551b1c0efdac6b4ad8050a0e4b9ad794a6b86f3712bc6b800d450a760956e1128ad
+EBUILD xfconf-4.14.3.ebuild 1965 BLAKE2B 18767591e7885e1acdd106c6c8393e5c99353802615adafda332fc451ef868671a123f3b7daa483fe6c0c0cc50011a36681c4806c3eeb53ed172308581f46ef3 SHA512 7ac591456badf8ad1f881be02dcbe5fd09065ef1aa61fabd89256390b1975764215d7da6b75c0a2d02c3972bd686ede9c8510891390b13850dde82d23266cd55
+EBUILD xfconf-4.15.0.ebuild 1757 BLAKE2B d09f4c9976687074b31d77ba0afb7a032239be697cb1d4a2f772b6986faa1da82c27151ffae7b6dbd72129274113c33598a546cc36a0d9e9b383ce072b84e2a6 SHA512 5eb83f862e7c62d8e1e67f7cb460ec616248f350033fc0eabbd1fc752e136b82e98c3e4b7d87562a2a255232d6db55c3cd740ec0ac83c63df42f7d6b7d151664
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.14.3.ebuild b/xfce-base/xfconf/xfconf-4.14.3.ebuild
index 93d826cca95d..497831d5927e 100644
--- a/xfce-base/xfconf/xfconf-4.14.3.ebuild
+++ b/xfce-base/xfconf/xfconf-4.14.3.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 ~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/xfconf/xfconf-4.15.0.ebuild b/xfce-base/xfconf/xfconf-4.15.0.ebuild
new file mode 100644
index 000000000000..993040c79af0
--- /dev/null
+++ b/xfce-base/xfconf/xfconf-4.15.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 vala
+
+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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND=">=dev-libs/glib-2.42
+	sys-apps/dbus
+	>=xfce-base/libxfce4util-4.14:=
+	introspection? ( dev-libs/gobject-introspection:= )
+	!<xfce-base/xfce4-panel-4.13.1
+	!<xfce-base/xfce4-settings-4.13.1"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	vala? ( $(vala_depend) )"
+
+src_prepare() {
+	# stupid vala.eclass...
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable vala)
+		$(use_enable debug checks)
+		--with-bash-completion-dir="$(get_bashcompdir)"
+	)
+
+	use vala && vala_src_prepare
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local service_dir=${HOME}/.local/share/dbus-1/services
+	mkdir -p "${service_dir}" || die
+	cat > "${service_dir}/org.xfce.Xfconf.service" <<-EOF || die
+		[D-BUS Service]
+		Name=org.xfce.Xfconf
+		Exec=${S}/xfconfd/xfconfd
+	EOF
+
+	(
+		# start isolated dbus session bus
+		dbus_data=$(dbus-launch --sh-syntax) || exit
+		eval "${dbus_data}"
+
+		# -j>1 often hangs
+		# https://gitlab.xfce.org/xfce/xfconf/-/issues/13
+		nonfatal emake -j1 check
+		ret=${?}
+
+		kill "${DBUS_SESSION_BUS_PID}"
+		exit "${ret}"
+	) || die
+}
+
+src_install() {
+	default
+	find "${D}" -type f -name '*.la' -delete || die
+}
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 5157d8f5c520..a4f1830059d8 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,5 +1,13 @@
-DIST xfwm4-4.14.0.tar.bz2 1122735 BLAKE2B 1865c0714ddd4107e806de5607ef0e260c3fd1b6c9abcbec112a126bf780f456873786595a4cb924ce2154a40868670699519e4bb4576d971f853f7d3f63e98c SHA512 27261b08b53ba7e70db547db81775154c2f4285ab0f1f8336bd9ef0aeacb3ab705ae8ac5b05f9ac23de550a9065e76487dc93a99e553549bff1c25ceb5216939
 DIST xfwm4-4.14.2.tar.bz2 1158799 BLAKE2B 87270997688a44e1476935f2158842999befebf18628f6cd92131d81beac2f0a91db0a6522f86340688285fd67cf48e94259bdb2e4ce8df567eba83319bb31e3 SHA512 9e28f7782ce6c1734f9a50efec75d4c03a193bf078fd29f42c11770cef134c4516c256cb9c4b92a71bbbbfca81f37ba0ce19477831bb1da858c839135005b8f2
-EBUILD xfwm4-4.14.0-r1.ebuild 1639 BLAKE2B 9ce4b689b7edbfc708a47fe45f3fa7aad4e5f65b148045edfd1ccc560d40a13e7f1294db936b93fd0759dda92a022662e0215ca4d319a63e088a693e857514c8 SHA512 81c8a383599a5f1c0ca0e39ff4e1e2bc3e785b0b5c553746cb268d4150d7070d42ff7836abdd6a575260c2517180e2594b61d8f5a343e54f19a9321d09bbd692
-EBUILD xfwm4-4.14.2.ebuild 1644 BLAKE2B 3120287eba4cee4b9b4e44a6675fab01ccea814aa04f1a7373e1eb2ce36daa1fa0047593fd28ea6bdfd4c9840c641f0f52d65b6e0544d74f784656fc42d78365 SHA512 19b6d413dc8c79b59f84f35eff7b0c1b7eb7608a064ed9d2ad0b723f48ff211473e2a531de9cfd44cb280db5dafcd6bbe869d84d548b7c26b93251c6e3a0dde5
+DIST xfwm4-4.14.3.tar.bz2 1164653 BLAKE2B 24db309df708164bd0554fb96499205b4f1437023c014d571ba86f7419e09e23ffdacbf31d3afd05b7bd4f4e8e88394cfe34ec233518078b88eb8c0c640b8af7 SHA512 eb27c9d540a4b1d773f31c16dd8e7e4cd8fb833514ecc62251c68b53e88440beccb4923c49c66a29b387c77e2e69cb36e83d0a3d457ef8e7fdd5d2b925fdfda6
+DIST xfwm4-4.14.4.tar.bz2 1164972 BLAKE2B 5bdf4837bd19708c975d6400750059c5182b9d1b1a0b7b30e8721e1c443d9f78c1ea1c868ad7ceb384e442b94139b89d50327dc6413e938348816a311cada2b2 SHA512 ca3c94d1835076b904aca9f531dccebd9d78a1c85e0f7af7ac7aaba1a067e0f11f5224bdc20dc233038dc752ae1ac85602608c168a4d91643ac7538b448c04bf
+DIST xfwm4-4.14.5.tar.bz2 1165140 BLAKE2B 3f598b5cb8ce58a8aa4a4c82e53a5b02a870e26ddd0487796aeab86695c5dc6bc132daac32630dc109ec12dd10dab370a91c00dfbdf1109815cf5a9ae82fc88b SHA512 d2b5b198f3ffa91b0b07d5258f5f14f45e431fd7d992143bf9fc381f647ea0ee47ae447122ef8c7a40606c08955f83975fcff94b6f7ceb331a0a8681b57050fd
+DIST xfwm4-4.15.0.tar.bz2 1179779 BLAKE2B c12ec365218b8afda7b01706d4f2822b4663d327aad482e89f8c8b2811b687594c6f58ea0b5be79eabe3771c125edb111c3b03a708dcfbf720eef993181b0e14 SHA512 8359c8e9414bc7a66a95c4b9eb98da7a3ba08c0e15752c2ebb4a569f9afcd50697d37685c786d6a4c23f1bfa12f8782293923fde309c7d027cf66dd4db44340e
+DIST xfwm4-4.15.1.tar.bz2 1179671 BLAKE2B c358f8050dd6fcc356c2d300dab959dbfb5f452484e0998b25755aa6c6dd1783ca117ba43f44e18a9555542a1794000a768765a5b98e1e381367260df1d503ba SHA512 ae4cea9da4bc852aa3ce19039b66cc05f7c7cabe07637837bf1a51c37b6c9536a46b6af85e9402c33578e8da305b28bac23792afa080076e625a7df9f769935c
+EBUILD xfwm4-4.14.2.ebuild 1639 BLAKE2B 9ce4b689b7edbfc708a47fe45f3fa7aad4e5f65b148045edfd1ccc560d40a13e7f1294db936b93fd0759dda92a022662e0215ca4d319a63e088a693e857514c8 SHA512 81c8a383599a5f1c0ca0e39ff4e1e2bc3e785b0b5c553746cb268d4150d7070d42ff7836abdd6a575260c2517180e2594b61d8f5a343e54f19a9321d09bbd692
+EBUILD xfwm4-4.14.3.ebuild 1662 BLAKE2B 454431488c93296760ea36e53c3e8a9135244b4146b861b354067e8dceb7debf0dc183dae67cd787dc2d563db88871ea45fc1317700e778cffc360426c01c9f8 SHA512 e6d3f2d2cad1273db7c2c129b67218603b22fdbdf8e331b7770ca60c3c4f62ee124d15143af15c304bdc33b384d24f206d9a0e7ef9e1f6c3694adb48538c9c48
+EBUILD xfwm4-4.14.4.ebuild 1662 BLAKE2B 454431488c93296760ea36e53c3e8a9135244b4146b861b354067e8dceb7debf0dc183dae67cd787dc2d563db88871ea45fc1317700e778cffc360426c01c9f8 SHA512 e6d3f2d2cad1273db7c2c129b67218603b22fdbdf8e331b7770ca60c3c4f62ee124d15143af15c304bdc33b384d24f206d9a0e7ef9e1f6c3694adb48538c9c48
+EBUILD xfwm4-4.14.5.ebuild 1662 BLAKE2B 454431488c93296760ea36e53c3e8a9135244b4146b861b354067e8dceb7debf0dc183dae67cd787dc2d563db88871ea45fc1317700e778cffc360426c01c9f8 SHA512 e6d3f2d2cad1273db7c2c129b67218603b22fdbdf8e331b7770ca60c3c4f62ee124d15143af15c304bdc33b384d24f206d9a0e7ef9e1f6c3694adb48538c9c48
+EBUILD xfwm4-4.15.0.ebuild 1662 BLAKE2B 454431488c93296760ea36e53c3e8a9135244b4146b861b354067e8dceb7debf0dc183dae67cd787dc2d563db88871ea45fc1317700e778cffc360426c01c9f8 SHA512 e6d3f2d2cad1273db7c2c129b67218603b22fdbdf8e331b7770ca60c3c4f62ee124d15143af15c304bdc33b384d24f206d9a0e7ef9e1f6c3694adb48538c9c48
+EBUILD xfwm4-4.15.1.ebuild 1662 BLAKE2B 454431488c93296760ea36e53c3e8a9135244b4146b861b354067e8dceb7debf0dc183dae67cd787dc2d563db88871ea45fc1317700e778cffc360426c01c9f8 SHA512 e6d3f2d2cad1273db7c2c129b67218603b22fdbdf8e331b7770ca60c3c4f62ee124d15143af15c304bdc33b384d24f206d9a0e7ef9e1f6c3694adb48538c9c48
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/xfwm4-4.14.2.ebuild b/xfce-base/xfwm4/xfwm4-4.14.2.ebuild
index 683589e357a0..d7d6669f20a2 100644
--- a/xfce-base/xfwm4/xfwm4-4.14.2.ebuild
+++ b/xfce-base/xfwm4/xfwm4-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="opengl startup-notification +xcomposite +xpresent"
 
 RDEPEND=">=dev-libs/glib-2.20
diff --git a/xfce-base/xfwm4/xfwm4-4.14.0-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.14.3.ebuild
index d7d6669f20a2..77ed670eb91b 100644
--- a/xfce-base/xfwm4/xfwm4-4.14.0-r1.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.14.3.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="opengl startup-notification +xcomposite +xpresent"
 
 RDEPEND=">=dev-libs/glib-2.20
@@ -21,6 +21,7 @@ RDEPEND=">=dev-libs/glib-2.20
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
+	x11-libs/libXres
 	x11-libs/pango
 	>=x11-libs/libwnck-3.14:3
 	>=xfce-base/libxfce4util-4.10:=
diff --git a/xfce-base/xfwm4/xfwm4-4.14.4.ebuild b/xfce-base/xfwm4/xfwm4-4.14.4.ebuild
new file mode 100644
index 000000000000..77ed670eb91b
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.14.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-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-linux ~x86-linux ~x86-solaris"
+IUSE="opengl startup-notification +xcomposite +xpresent"
+
+RDEPEND=">=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/libXres
+	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() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfwm4/xfwm4-4.14.5.ebuild b/xfce-base/xfwm4/xfwm4-4.14.5.ebuild
new file mode 100644
index 000000000000..77ed670eb91b
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.14.5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-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-linux ~x86-linux ~x86-solaris"
+IUSE="opengl startup-notification +xcomposite +xpresent"
+
+RDEPEND=">=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/libXres
+	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() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfwm4/xfwm4-4.15.0.ebuild b/xfce-base/xfwm4/xfwm4-4.15.0.ebuild
new file mode 100644
index 000000000000..77ed670eb91b
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.15.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-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-linux ~x86-linux ~x86-solaris"
+IUSE="opengl startup-notification +xcomposite +xpresent"
+
+RDEPEND=">=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/libXres
+	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() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfwm4/xfwm4-4.15.1.ebuild b/xfce-base/xfwm4/xfwm4-4.15.1.ebuild
new file mode 100644
index 000000000000..77ed670eb91b
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.15.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-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-linux ~x86-linux ~x86-solaris"
+IUSE="opengl startup-notification +xcomposite +xpresent"
+
+RDEPEND=">=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/libXres
+	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() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}