gentoo resync : 28.04.2021

27 files changed, 85 insertions, 604 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 903bfb740f0b..7f9d185af6d5 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 7f30daa79697..dfae1ac2862c 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,6 +1,4 @@
 AUX exo-4.16.0-allow-cross.patch 2264 BLAKE2B b59456418bfc355aae39841adc530b2303faa1e7f6f3ead6d0657aa7ce5861ed9ce6aa4275335d468a89742cdd8dbf3cbac84412d5a764e6b5aab623082de129 SHA512 69cc01d7780c9cc488a32aab1a4246c7a7933c4c2cf45ac88cbfd6e9259a682ee7f31c079d103f9e86030cdb585eda86e9342c63cfcaed0ef1b249f4ad020ec8
-DIST exo-4.16.0.tar.bz2 966143 BLAKE2B ee2175d2d5087e948a6fb9bd4ffed2ecfe54be7078d2f1c55a6b30a0f3920689a46372af749035b1454e74ef5c75037996f3601d76adf1d0067eceba6775df76 SHA512 8fff640c4a229e77911cf091866f265e1f0d7f0b9274b1a879f46061644dd6aec07ae3f8fc43ac7277429ea98bdde8d0ee010da7ed398cddc7d755fea91b964c
-DIST exo-4.16.1.tar.bz2 880947 BLAKE2B d21509d15275d98a0b99acc6e101aad1423a859f0430957d5ce2b6c693ae0d189010d6cb8500b8d4f364edb3de787f4ee33ca4d1735d8c8fe7f8ad016027a799 SHA512 692d1c5adf58704546c580c1959b893ef20503180620b731444e29d534407515067b892736ad5ed904d3dbf480fbee7df9f36725b003067272c973f6ac8279d7
-EBUILD exo-4.16.0.ebuild 1030 BLAKE2B 963d00d818cd3396ca5c2280514526818dff1d93de85385922bdfed8fa6e95ce07a9080a51d1b5cfcef1d6e126ded51070d1202ff3b316aeeb5a9121ec014f66 SHA512 e8caf13aa7e0a0edd441e7e757d296cc29eff9347ed56bff51caae3804cf662698ad0cea80cac6623a4e60fe598594bda41cd9b68d3db5d2bc578c8820546f04
-EBUILD exo-4.16.1.ebuild 1036 BLAKE2B 98eaad351a5ed893c52e0de1e43e708e0a5edb75fbebd10532e3f637f7f03f3cb846b6c03bc026da44ac898ba3b6d76ce1bd61a2e7e2d15567ff26517c65eec1 SHA512 ed593fd1f3c8cfc6791e22a062dc8f7a60bd664bf1e9df55759ccb54ef8a348b4796c5aae5fdb5b7bf267cf77d32525b581e441a9c5c5ac49766313201b72b57
+DIST exo-4.16.2.tar.bz2 881098 BLAKE2B df1ad499becd22087724abb716d07a50e432ec555d03a3892d0b81745045c334cb3705419e901697e4c3bc10328837b4f5c4055800d1b6c79c9cfc503427643b SHA512 9c1252d78f5bb900254841a79f1c1b952cb60d9d0197e184266c35a86c340140cdff2460fa83f6fabb66380e2b3d7ab8a08719b4f4784d2215dde51410ce33e8
+EBUILD exo-4.16.2.ebuild 1030 BLAKE2B 963d00d818cd3396ca5c2280514526818dff1d93de85385922bdfed8fa6e95ce07a9080a51d1b5cfcef1d6e126ded51070d1202ff3b316aeeb5a9121ec014f66 SHA512 e8caf13aa7e0a0edd441e7e757d296cc29eff9347ed56bff51caae3804cf662698ad0cea80cac6623a4e60fe598594bda41cd9b68d3db5d2bc578c8820546f04
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/xfce-base/exo/exo-4.16.1.ebuild b/xfce-base/exo/exo-4.16.1.ebuild
deleted file mode 100644
index 2cfa5d5ce161..000000000000
--- a/xfce-base/exo/exo-4.16.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools 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.50
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.16.0
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16.0-allow-cross.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-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-4.16.0.ebuild b/xfce-base/exo/exo-4.16.2.ebuild
index c0ba46ff6577..c0ba46ff6577 100644
--- a/xfce-base/exo/exo-4.16.0.ebuild
+++ b/xfce-base/exo/exo-4.16.2.ebuild
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 7e9736a54c8a..88995eff668c 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,15 +1,5 @@
-DIST thunar-4.16.2.tar.bz2 2434525 BLAKE2B e50fb41d7d333fe23729ddc01ce7e1313124ad3607e0e57fd210794b21f83fb83cd2a4ef9845638c0e10ceb5995392b754991600fc242e4a7e11af6a55971624 SHA512 761bc2b2106db523b5b56b9f330a42e487aeccd144d2118956a67d6935ee6d795edf543a815c3e035dd7cc4b0965679811d39d9c5e6b6f7ca84eb362f22561e0
-DIST thunar-4.16.3.tar.bz2 2434256 BLAKE2B 87b2afd9e110d0852540bdde572a05359924bc4dbba65a947028d2a438bf8ecd7990f213cfed5dfb7af7367e8c047a55ffe1915e225df5329f09a66ebf9e62c4 SHA512 e895e9323b6c24a7ebbfbdc9d5b79b6c80e44a29c828d25444d2e4268d374debaa4a4e3ba00487ff15746549d0a5e1a45a886a9290926960a8db1d298139a5b7
-DIST thunar-4.16.4.tar.bz2 2434519 BLAKE2B df5ade14ea5e758f7d7da3931c857509c0bd168fbb0ab31e3a9a1d329b5ff131f5c42bf37e5b1ba1dce7cfef04f47d19d220ddb87ab639a611aa84c3e8422585 SHA512 6c8d501ee54dd745e7e42e37841caa92f1af25f3d162820e38897a82576f1c2982f3a2b38b3d93e1ddb6ae5aff205bbd1eed348bda1840f9dfaed2f4057b1544
-DIST thunar-4.16.5.tar.bz2 2435070 BLAKE2B dabab4198d4290162a0e035d444351c6a5e132fcb1379d926315e7aa8ef73d1573ef8b249f3e4049f2557026d06561c96402bdc0184c769eaee1821dbabbcbbe SHA512 8c24be876f20e2fa93b8ef05e230c61a412c674fe8f9c796cf4036e1d2e38f1b4ed582475158cc86ace6fe82affa005b201a1e565cd7ccd4dfebbcc114067140
 DIST thunar-4.16.6.tar.bz2 2435447 BLAKE2B 0ec50e8330643fc0c1881fa49ef1b8d0a90c8ef3ade3f7bb0756525381ec885137f808451db0eff52a0f51f337cf0de787dcb43544e52c832e8e94332345ea75 SHA512 2e9800935907477664d3a17bca5998266873a84423586f9e7ee3b7c6ba41314b372f7a6db5d9dd17f10af6405afafb808a78b8e8d07dbdfa8e00aa5fa9d3a552
-DIST thunar-4.17.0.tar.bz2 2448027 BLAKE2B c3890dfe22384ecaa7a71805c68938d59cdfcd0a602512395e9011692de242c808dc13229c0c3b3ad93973845fe9e291cee4f3b6275fc87c75efade7731d580e SHA512 6a344f89ae51c4c0cbdbac1542558aeab3c0eb45a79320e58785033a3faa2ff95751e72e089f6a2ff23056a18a403845a2b5603c89550a6ba2e0c8286f75a5e4
 DIST thunar-4.17.1.tar.bz2 2461612 BLAKE2B 2afed1e57c3f81ba255a02c3d6092492292e143162c47813159fabca5a0891d7d089053fcbab8e0ec60436a94121828905bece8af2e1e91f5dc3884bf05703bb SHA512 e6f5e70679dafd91d992a950f90b21ef062c7e262443c496724b170baf409e74342dc56d7a046124c0ad00a827c9b1ca616d34c74b543a61316e236810e537af
-EBUILD thunar-4.16.2.ebuild 2072 BLAKE2B 92976daabe54c45026e4635611fbb1e909371997af406bf7a1e2ab1481b00d8721e390d12b9ad6d8eaa1e3b1f4955505b5d2d6e13b71ad607fca009e60543701 SHA512 9c20bb83356478e50c554d13a844a43a2506adb1b6ff29f64f0303f08078093804dd0c94cfccfabaaa0a310292974e229a802719d8ed87d8e295bd58329abdc5
-EBUILD thunar-4.16.3.ebuild 2073 BLAKE2B 7ac1810f6fdd307d26f7ac5e0d4e60e2766405ae16aa2830d083fe9c40f695d6c677482f57f2e5bef0b0de28cd38ef794c96f9f2aff0628caea71ec71041933f SHA512 6d211f8708e46d394ef9b7536d471514dd5d18da337a9a3e2fa8b8ae9b2448aee58957ef1eef81a3258d05ca8e190c168e6757417d0581bec6ca445a561883d0
-EBUILD thunar-4.16.4.ebuild 2077 BLAKE2B 65b8044aa9373d9276d0dc8d3e13003a8aff91db645475dc97b38ab19f928e771d4d78f736baeb2218f5f313b464a2910d927121661c6cd393480456ad6ae3be SHA512 c1995e6389f69f4b71182824764ba4a9dde937528c5f0d0d123d5da8f92e605e8a92e28c2225fef28051f691bd86fffe0d20f35819fc086dcfa3684d3e8d5179
-EBUILD thunar-4.16.5.ebuild 2073 BLAKE2B 7ac1810f6fdd307d26f7ac5e0d4e60e2766405ae16aa2830d083fe9c40f695d6c677482f57f2e5bef0b0de28cd38ef794c96f9f2aff0628caea71ec71041933f SHA512 6d211f8708e46d394ef9b7536d471514dd5d18da337a9a3e2fa8b8ae9b2448aee58957ef1eef81a3258d05ca8e190c168e6757417d0581bec6ca445a561883d0
-EBUILD thunar-4.16.6.ebuild 2077 BLAKE2B 65b8044aa9373d9276d0dc8d3e13003a8aff91db645475dc97b38ab19f928e771d4d78f736baeb2218f5f313b464a2910d927121661c6cd393480456ad6ae3be SHA512 c1995e6389f69f4b71182824764ba4a9dde937528c5f0d0d123d5da8f92e605e8a92e28c2225fef28051f691bd86fffe0d20f35819fc086dcfa3684d3e8d5179
-EBUILD thunar-4.17.0.ebuild 2077 BLAKE2B 65b8044aa9373d9276d0dc8d3e13003a8aff91db645475dc97b38ab19f928e771d4d78f736baeb2218f5f313b464a2910d927121661c6cd393480456ad6ae3be SHA512 c1995e6389f69f4b71182824764ba4a9dde937528c5f0d0d123d5da8f92e605e8a92e28c2225fef28051f691bd86fffe0d20f35819fc086dcfa3684d3e8d5179
+EBUILD thunar-4.16.6.ebuild 2071 BLAKE2B d015592ff9c4d08936ba5b5c3a44bd74e45bb067000f89cae57a12734a05d18c3adb79e2785076859b8d6d78c9909adabb9ec2c74e10380dbaacababdb145748 SHA512 6f4fcffc0f5f5c48a87a96e971b04a362a119e09a7dad70ee990e3c7c858549d3ca08a3e0d5629e84e10230276c9a6949e5ab2103025bbacffdcee63df2e9b85
 EBUILD thunar-4.17.1.ebuild 2077 BLAKE2B 65b8044aa9373d9276d0dc8d3e13003a8aff91db645475dc97b38ab19f928e771d4d78f736baeb2218f5f313b464a2910d927121661c6cd393480456ad6ae3be SHA512 c1995e6389f69f4b71182824764ba4a9dde937528c5f0d0d123d5da8f92e605e8a92e28c2225fef28051f691bd86fffe0d20f35819fc086dcfa3684d3e8d5179
 MISC metadata.xml 372 BLAKE2B 35cec7c8487a748045795a1a2467878a3ba2df30880256a0add3757f2785b01a09f2f30046f5f02b28434ca2c7d683a409e1a6e2461d1671bea8b9198b9e92ff SHA512 0e12c13eeae06f579b45cedd3b61a158958ae3d08f181e289dedaf04e69629de78f9a8baa0c9baa51f66285e8c6c82740dc2453fd655152d049d4412e9883a3a
diff --git a/xfce-base/thunar/thunar-4.16.2.ebuild b/xfce-base/thunar/thunar-4.16.2.ebuild
deleted file mode 100644
index b88c4b869e40..000000000000
--- a/xfce-base/thunar/thunar-4.16.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 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"
-DEPEND=">=dev-libs/glib-2.50
-	>=x11-libs/gdk-pixbuf-2.14
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/exo-4.15.3:=
-	>=xfce-base/libxfce4ui-4.15.3:=
-	>=xfce-base/libxfce4util-4.15.2:=
-	>=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="${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]
-		)"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-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-4.16.3.ebuild b/xfce-base/thunar/thunar-4.16.3.ebuild
deleted file mode 100644
index 64b83ce8355c..000000000000
--- a/xfce-base/thunar/thunar-4.16.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 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"
-DEPEND=">=dev-libs/glib-2.50
-	>=x11-libs/gdk-pixbuf-2.14
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/exo-4.15.3:=
-	>=xfce-base/libxfce4ui-4.15.3:=
-	>=xfce-base/libxfce4util-4.15.2:=
-	>=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="${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]
-		)"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-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-4.16.4.ebuild b/xfce-base/thunar/thunar-4.16.4.ebuild
deleted file mode 100644
index a50b1046a411..000000000000
--- a/xfce-base/thunar/thunar-4.16.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 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"
-DEPEND=">=dev-libs/glib-2.50
-	>=x11-libs/gdk-pixbuf-2.14
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/exo-4.15.3:=
-	>=xfce-base/libxfce4ui-4.15.3:=
-	>=xfce-base/libxfce4util-4.15.2:=
-	>=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="${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]
-		)"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-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-4.16.5.ebuild b/xfce-base/thunar/thunar-4.16.5.ebuild
deleted file mode 100644
index 64b83ce8355c..000000000000
--- a/xfce-base/thunar/thunar-4.16.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 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"
-DEPEND=">=dev-libs/glib-2.50
-	>=x11-libs/gdk-pixbuf-2.14
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/exo-4.15.3:=
-	>=xfce-base/libxfce4ui-4.15.3:=
-	>=xfce-base/libxfce4util-4.15.2:=
-	>=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="${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]
-		)"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-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-4.16.6.ebuild b/xfce-base/thunar/thunar-4.16.6.ebuild
index a50b1046a411..25406e337a93 100644
--- a/xfce-base/thunar/thunar-4.16.6.ebuild
+++ b/xfce-base/thunar/thunar-4.16.6.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.17.0.ebuild b/xfce-base/thunar/thunar-4.17.0.ebuild
deleted file mode 100644
index a50b1046a411..000000000000
--- a/xfce-base/thunar/thunar-4.17.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 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"
-DEPEND=">=dev-libs/glib-2.50
-	>=x11-libs/gdk-pixbuf-2.14
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/exo-4.15.3:=
-	>=xfce-base/libxfce4ui-4.15.3:=
-	>=xfce-base/libxfce4util-4.15.2:=
-	>=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="${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]
-		)"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-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 b62741c3f2eb..54b7977898a5 100644
--- a/xfce-base/xfce4-meta/Manifest
+++ b/xfce-base/xfce4-meta/Manifest
@@ -1,4 +1,2 @@
-EBUILD xfce4-meta-4.14-r2.ebuild 1000 BLAKE2B 794eaf11dd8a3f119228080ccc7840bdb03dad88955c696a2ed81a1b0e9b01fd5f67397f3da24f06dd28c39a14ba35b70d93b51007cd887d5dd5843b00445fe0 SHA512 b7a86d05c67c1c3f857e73214907b43cf39fe1af876650db37dabca48b3fed6179fdc96d121dd831776d3ac263f0b6cecb3c83f455f72cb74590b93939ad883e
-EBUILD xfce4-meta-4.16-r2.ebuild 1000 BLAKE2B a59d797e7a2add23c00ec8cb0894184ddf59b1c93f31f378b5c5192c06c6c9dd889cf698e1960978717b054451ea5076f1fc60603ba8420a9cdc11fa65df4293 SHA512 bac36a56cb7ea788665faa702818ee567830275fd57392a6ed1a44386008da8876722fa70fc98b391fcb49e576a1dec84db58c78ba604715f53ecbbeaea13546
-EBUILD xfce4-meta-4.16.ebuild 979 BLAKE2B 49e57b6c37d2a2744c8303bd3b0351e1b55584c34a096e3534d272ea7e79d91f0608e74cff83b7bfd3465af2ddd2fe4df4a372a12cfc43e0c1bc308c70dd3f23 SHA512 e22b654cc4831b03b94fad9a01dff332bce12ab0fa00d7b2924db56027654d8639bc1cabdfd9b1957f7008ede29263d6c149578486c0cf98cc60ddb832557486
+EBUILD xfce4-meta-4.16-r2.ebuild 999 BLAKE2B ef2d828ea0ab3dc6412f374be165deac643ccc30da8c285ee22a2dd41558288257f4f35341140b719d671efd84d264020cd825e10f203f099b943889fe017ff1 SHA512 4b7def2abbbd079c8838296260cb18b8e9f5cdd46b1c7c801b0d0336d845c51c55ef030a02377012e9c261c5a81a52526c2e24a66f9c7e133858f42dd660b08f
 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
deleted file mode 100644
index 6751db6f2fbd..000000000000
--- a/xfce-base/xfce4-meta/xfce4-meta-4.14-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The Xfce Desktop Environment (meta package)"
-HOMEPAGE="https://www.xfce.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="minimal +svg upower"
-
-RDEPEND="x11-themes/hicolor-icon-theme
-	>=xfce-base/exo-0.12.8
-	>=xfce-base/garcon-0.6.4
-	>=xfce-base/libxfce4ui-4.14.1
-	>=xfce-base/libxfce4util-4.14.0
-	>=xfce-base/thunar-1.8.9
-	>=xfce-base/xfce4-appfinder-4.14.0
-	>=xfce-base/xfce4-panel-4.14.0
-	>=xfce-base/xfce4-session-4.14.0
-	>=xfce-base/xfce4-settings-4.14.0
-	x11-terms/xfce4-terminal
-	>=xfce-base/xfconf-4.14.1
-	>=xfce-base/xfdesktop-4.14.1
-	>=xfce-base/xfwm4-4.14.0
-	>=xfce-extra/thunar-volman-0.9.5
-	>=xfce-extra/tumbler-0.2.7
-	!minimal? (
-		media-fonts/dejavu
-		virtual/freedesktop-icon-theme
-		)
-	svg? ( gnome-base/librsvg )
-	upower? ( >=xfce-extra/xfce4-power-manager-1.6.5 )"
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
index 3e2636292259..e22aed1ca892 100644
--- a/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86"
 IUSE="minimal pulseaudio +svg upower"
 
 RDEPEND="x11-themes/hicolor-icon-theme
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.16.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.16.ebuild
deleted file mode 100644
index 6e8c7a408b5e..000000000000
--- a/xfce-base/xfce4-meta/xfce4-meta-4.16.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The Xfce Desktop Environment (meta package)"
-HOMEPAGE="https://www.xfce.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="minimal +svg upower"
-
-RDEPEND="x11-themes/hicolor-icon-theme
-	>=xfce-base/exo-4.16
-	>=xfce-base/garcon-0.8
-	>=xfce-base/libxfce4ui-4.16
-	>=xfce-base/libxfce4util-4.16
-	>=xfce-base/thunar-4.16
-	>=xfce-base/xfce4-appfinder-4.16
-	>=xfce-base/xfce4-panel-4.16
-	>=xfce-base/xfce4-session-4.16
-	>=xfce-base/xfce4-settings-4.16
-	x11-terms/xfce4-terminal
-	>=xfce-base/xfconf-4.16
-	>=xfce-base/xfdesktop-4.16
-	>=xfce-base/xfwm4-4.16
-	>=xfce-extra/thunar-volman-4.16
-	>=xfce-extra/tumbler-4.16
-	!minimal? (
-		media-fonts/dejavu
-		virtual/freedesktop-icon-theme
-		)
-	svg? ( gnome-base/librsvg )
-	upower? ( >=xfce-extra/xfce4-power-manager-4.16 )"
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 88864586084f..00dc3534e93b 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-panel-4.16.1.tar.bz2 1381003 BLAKE2B 103d1b60c13758ad5e3f139d3bc66923e648540195c7a71fb6c39bcdb06b109f620ced42b7eb6c36ccf5a833e97957c373e760feab3f062c5a7ecd3038803366 SHA512 ec55a9812d61db755ea56a87ea1b709af2870703fc0e5a45797406f2f4c78e8afecd6e1bc081f3618a81030c9c0595ae8edbb29731d4bef3750e202bbf35e99c
 DIST xfce4-panel-4.16.2.tar.bz2 1381569 BLAKE2B d4b8455e31f942d0facfc0d90b14fb050142b3d8b3d0e61d5b687f973769e2888ea7f058c4f6a86f96dbd67329719ef49e72896774ac36591c2793847aa411ba SHA512 25b817a9abc4cea57cd29c4558236a5581a03ccb50796c83f7ca1b292e8aa83c7a39b089619959b6f6fd9c5c8bbdf950d9bba1b5c4fb3d0a95cabad8a9ca763d
-EBUILD xfce4-panel-4.16.1.ebuild 1524 BLAKE2B 6bff168a5b40c0dc7c61c455c80cdd17be3215e5e8645c56f080d50375a73bdd61c8d85be244251f1528f396336b1a397247a2a081cc741de1c95392a745e786 SHA512 bd93a9220fde1b4cd65d8d086074b373eaddadfe12f7d9d6d6907ad1a70a31b142a3a10fb3d8e843f306788b8ca36a536fc0efa57786345f0c39d7f05b1e62bc
-EBUILD xfce4-panel-4.16.2.ebuild 1529 BLAKE2B e05304f973f50adc97528efb98a6a161f64add9ef09953ce9ea015a36a0f70db0bf3f24e6bf8e045adc4ad82037983d4de0ef1afad8f1c3ee161ecb7fd1e1d65 SHA512 6b3fee88d609eae1b5d4aaf56f699453916b7be499cc7beb374c09186978084cd14c21bd439c8cdfa416b1109bce28642d872b407a451f58e05d19e830988741
+EBUILD xfce4-panel-4.16.2-r1.ebuild 1529 BLAKE2B 9b479e7c3535a274d6fe4570c55487a03101b915a5acce92633f034406d83c019c86287feee5a60e51902329015622826ffcacbe9a0d9b8cb2148d04f802be6c SHA512 4ab0868367fedc799a23c283c99b5aa998c66c97c9ad8a95ea04e10e9ba277457a4631c418acf4c70154670518b8eca8ceea1a049a60e6489ff8202870bf24bb
 MISC metadata.xml 376 BLAKE2B 8e3bae72680451c622ad0c7594d756af6027e70fcc35e6f48fab7b63f511322034311ef496595c9edf301d668f4aeea3f8d6950e8db5555b3f90905d60aad8fb SHA512 75403270836578c8c7207777feac8b88b784976f3b887c472d29fdfb5bad7ad738eeae4ec0739a71993988f41378da1187b93b010cddc2d227a59ae9995f67a4
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.1.ebuild
deleted file mode 100644
index e64f096e7b73..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 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="+dbusmenu introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND=">=dev-libs/glib-2.50
-	>=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.15.8:=
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
-	>=xfce-base/xfconf-4.13:=
-	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	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 introspection)
-		$(use_enable dbusmenu dbusmenu-gtk3)
-		$(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.16.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.2-r1.ebuild
index b3238b007d87..8d87e930110b 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.2.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.16.2-r1.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="+dbusmenu introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.50
 	>=xfce-base/exo-0.11.2:=
 	>=xfce-base/garcon-0.5:=
 	>=xfce-base/libxfce4ui-4.15.8:=
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
+	>=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?]
 	>=xfce-base/xfconf-4.13:=
 	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
 	introspection? ( dev-libs/gobject-introspection:= )
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 066415015f3f..bacd1aa97d57 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,4 +1,4 @@
 AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 371 BLAKE2B 7737f95e5ce5ad9d421b8d39e577899b145d12ce4faebc135eaa052a6637508dfd4d5a8d9c6bcbe987026cedbedb5a396b294edadfc7241a607c7b0ef9a218b8 SHA512 85914b96def54a504f5dbaecc57f47f3529be0bd2efc8dae8529c56bd764ff9a644e17e14599b947aef4a7311a32a3e0b2ef5aa6dea45287cdc09b01bfcfcc48
 DIST xfce4-session-4.16.0.tar.bz2 875504 BLAKE2B 8e06e1ff378593b90c3c600bd5aabb3ea9ba9e58854ed615d39009595be4b71c5f77359e4249a93f44aa67795e2d4bf658b83d9c1d445304764eee655ed1f9e9 SHA512 fd74b24d0c2762b5a99883b62ca9447c3683e42e9e39193d0f60e02b8c1ad77a3dfff4df6f3b3c345d8ea3d4c4ef93485e9b5586862bab85d4b37110d3400fad
-EBUILD xfce4-session-4.16.0.ebuild 1744 BLAKE2B aaa98735efc372687c10f4a80d16979634f9c898952009353a3f2d91815fbd4c28c3422236dd0fca4384c2d0fc0508107986dd43d181835018be61d763dd2df3 SHA512 83987e3546affae94aa61c77741698abb5c3cba1cb26e61daaa53667c7ec3ab895ccdec8513b57a6c56b2f46533baed10a99022c214a643e8aaa295049e8b7f1
+EBUILD xfce4-session-4.16.0.ebuild 1743 BLAKE2B 3875834ba9fa299f6b112054135c3897f06232bde54eb9c46b2b43a1a6daef7373aac79e77c2f7a1fddb4e5aa5f16fa08e475edf9dce9d9aaa5c516ae234e8aa SHA512 f65642619e8b3d488a70687509aafebda3575d49a6d38e48512a61f2837c943ee2321defa5d2b12d0fe9743fdf607b5da44973988dbcba22117c1a9bf1b16091
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild
index c449199458ff..2644259daa7f 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.16.0.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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls policykit +xscreensaver"
 
 DEPEND=">=dev-libs/glib-2.50
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 886b15d1c03a..945243a4df9f 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-settings-4.16.0.tar.bz2 1492754 BLAKE2B 10bfa7ce556547a4a41e1a3691ea3e41b9de57bd21760a91424cd27469917264ce00ae7324ee1d81bdf27f6b275415af932d63aeba4e80de729e42df1cbff488 SHA512 38c06e4d4c0963019c20a3afadb0dc1bde8d1b477bcff2d0253e29beb5e4a8b5ae9d058b544cec6fe2bfc2c1d44f74283c94538eda25436d58db0754f112a238
-EBUILD xfce4-settings-4.16.0.ebuild 1724 BLAKE2B ad992daa89f1917c3834309c1ae532ee261ca8a5fe823389e15e78be9c916e1506afca2548ee5b82ec56a50172431cbb77c7b2c102e3eed0befebbc92cb1b862 SHA512 d458f2a4c4e6b5b617ba0c075f7147e32d6ab2e1b3d38f7d16ed2ccbbc03f449521bd5efa26f30754f48a7e2fba0758dd1179ef4ac48ad1c923ba4d7c49850fd
+DIST xfce4-settings-4.16.1.tar.bz2 1496053 BLAKE2B dd4176a5edc6a52c885ec80d4f5855ba7ea0ed6a70180f8b15d9754a246a097c82eeba4fb52b3ff1f551c905c21073c153fac3a4c47259710fae9cef8a95f45e SHA512 0f918ea61dfa71816366663114250ca97bb7e41f3cbd0e569b12e8271641f1b2b622ad17f9a185a30f638093328db0c6d175b7e7d03de56963b19e44eb29383c
+EBUILD xfce4-settings-4.16.0.ebuild 1723 BLAKE2B 8d9b77e0d005e432cffdb12c0188df9223a7213c2133dff1011f48e69b90be10a6dd4aeb949cba15c953d34753c72229c9a11c000d84f424d6c404b491de82f1 SHA512 3d6d9abfdcd61161666fe50ceb94dee3506ebd6998d802aa182fe6ab10f0ff6551f00f1ee333aafdaec276f0b8ad372cef9583d28b8b62a3e77260d164a40e12
+EBUILD xfce4-settings-4.16.1.ebuild 1729 BLAKE2B d88b1a84609a1271326e69a794e799eb50b303550050641396b1d204dd651228846001bddf49d9c890b08d0175b65371fb14c26d325e33684fccbfbe3223b5c8 SHA512 6cef39ec4888724250f9beb1bfcd71273a732bf2fac399f1578050f8b10e162802d6741bad2d7eb382a03743b22032eebb6c203e351db14df8642f224f14e8e8
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.16.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.16.0.ebuild
index ca7e2f49eef7..319ea8937db7 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.16.0.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.16.0.ebuild
@@ -12,7 +12,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"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.16.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.16.1.ebuild
new file mode 100644
index 000000000000..1d3bec2bcf6b
--- /dev/null
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.16.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-single-r1 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"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.50
+	media-libs/fontconfig
+	>=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-4.15.1:=
+	>=xfce-base/libxfce4ui-4.15.1:=
+	>=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 )
+	!<xfce-base/exo-4.15.1"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	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/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 1076c2a6d707..aabfb9b03883 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,3 +1,3 @@
 DIST xfdesktop-4.16.0.tar.bz2 2041114 BLAKE2B 153a11b27b3ac92ded0c97257f19b4bc9018f384d201b41d82dd07df26ced7b5ded19ac98f80fb14e018d2df848f10b93cf629f05a66cc3b29e08313805fcf38 SHA512 e62e5fb12997c3138fa36aed06388b921f5223ec09afbd22b622ef39bc421773acbf73606ffc3b38b5a01845678847cda43d193c8457608715cf750acd466129
-EBUILD xfdesktop-4.16.0.ebuild 1165 BLAKE2B ca115a0a3fea0c1282fa6797a96b3476a205269870856e1a8006a8b4fa46bd0be9ffccc05e8c174566bf0acc829f47016fcdd489028db67884fb64dad99c5515 SHA512 3e782c1117d5c38a1a5f82d85c3981d04f5bd6e2d0752832488b6b59c375e27076d60b25005f7607b03beeb26a8ab33e4eb82d51206deb6ae1033050e537e1b6
+EBUILD xfdesktop-4.16.0.ebuild 1164 BLAKE2B db2460ac3bec116cb6778ae6776c28c7f8fbc362c59feb5eecff45039fde742ff5d7c4cc9f99278fbf89c5912466b32133dd6d50f777ebd8283e0734cf5dbc24 SHA512 802d341693aeb11364f17a1fab04b5c5ee87be58b5589797d3d3cc1b3be6795cbab4d60685f7aa663b50c7a57584f811f74b3c6dd86946b4a814994356dc00ac
 MISC metadata.xml 364 BLAKE2B 64544c9e89e370bb213647843ebc3c5d4ca08aa46564b02830ff041e74db5018d7503106cba4e7c1dd562f359649974f12b841e32136eb73e9d84ea0ed36f456 SHA512 3140dbe5320efba5393874f93b907ef2dff1cc8dd44cda7340abaf19dcbbd709beb7649ac72f1e9f92da546e010f966cd9f5d51b867c6df8c49332bf9de67dac
diff --git a/xfce-base/xfdesktop/xfdesktop-4.16.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.16.0.ebuild
index 710a01ed71d4..8aa49d0cf4e2 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.16.0.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.16.0.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
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 4ab54ebd0d19..99201807bfc7 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,3 +1,3 @@
 DIST xfwm4-4.16.1.tar.bz2 1201722 BLAKE2B 4aae9b97095b423964a2ece7fe09b46ecfcea6688af6ab3b38ee34611cd68a7427597cb963b91b209d161c85aed552df15d005268bd8585d365b0cf63adf36b3 SHA512 f0d5d00e58202457d0d7d5f9772e7b2aa3f3339850065609baab7d379248a628d147464cc605698970134b87d58b7867b8c09d0a3a45ab84b2f3aa95be26f0b9
-EBUILD xfwm4-4.16.1.ebuild 1627 BLAKE2B 943752586ece3d85a1f2597a1e7488d3989dc56a6aa42888d16c9dbb3fbf5bbd88749e487052a6915c5273f5ec2d22b125b075ee1fd7038d1ce4ccb93b211ff4 SHA512 c0f51bc07e6d078280f28e745f13dc3f742fa2af6d88e4c0c3a263aac67a0000bf164a97d0a38e2022ef0f4d7a36e9422c77c13b95a3dc4f6406b80b824fd805
+EBUILD xfwm4-4.16.1.ebuild 1626 BLAKE2B 15ea6d75a28d704b5c58834fa6cec0a2d86a8f2150ef3cacf5da69a3fcae72f5fba44d4666588a17cb9c6cda2db8a4221bcc587bb589ae66cc26d187e88e2804 SHA512 a7de51c42069843e7e954d00af422951e276a7368404e34e96e1b42a902daa6266e1cbec17289e8f10052d9b5e68f269b6d9e99e245221646bccd84ffc519d8f
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/xfwm4-4.16.1.ebuild b/xfce-base/xfwm4/xfwm4-4.16.1.ebuild
index 5315650f598a..96235cda2980 100644
--- a/xfce-base/xfwm4/xfwm4-4.16.1.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.16.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="opengl startup-notification +xcomposite +xpresent"
 
 RDEPEND=">=dev-libs/glib-2.20