Updating liguros repov21.1.3

34 files changed, 12 insertions, 1153 deletions

diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 18cb03d35df5..18de9e6a21b6 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,3 +1,2 @@
 DIST exo-0.12.11.tar.bz2 1333227 BLAKE2B 4e95809c58b6db26ecdf524663c06df9cd70007726091e381a1f0dd58be52efee85ad9721c421c0df6438073bb9de97d56cd039f520e2f7c0f5722a1839ba167 SHA512 ecbf20feddf86178d34a5c70212f0c2310ab1d6ce25291846d6d1d3045270ae3e68102065d7b3d8840137406f826f9bc37fed92a16c1268c3d14f2833a97d533
-DIST exo-4.15.3.tar.bz2 994455 BLAKE2B 9c62b31a2f5cba4853263ea0b155fc3e5439170c7cc3011c03022a5419a9a0910c4b47431cf916f6e6ad4a5d2580e488ba8a18e4bbaa4d97d35a61711fd4a93a SHA512 3da0a0aadd15e140e43eece56bb92872e05f90b0da88368a84f3d3bc8d53c19d12549693fe00518937a691a3af559d1dba3170fa2490a64dbc26fa2f7faf13ea
 DIST exo-4.16.0.tar.bz2 966143 BLAKE2B ee2175d2d5087e948a6fb9bd4ffed2ecfe54be7078d2f1c55a6b30a0f3920689a46372af749035b1454e74ef5c75037996f3601d76adf1d0067eceba6775df76 SHA512 8fff640c4a229e77911cf091866f265e1f0d7f0b9274b1a879f46061644dd6aec07ae3f8fc43ac7277429ea98bdde8d0ee010da7ed398cddc7d755fea91b964c
diff --git a/xfce-base/exo/exo-4.15.3.ebuild b/xfce-base/exo/exo-4.15.3.ebuild
deleted file mode 100644
index aa7befedb775..000000000000
--- a/xfce-base/exo/exo-4.15.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-libs/glib-2.42
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.15.1:=[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 19e2335dd2f6..9214d3b3bb28 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,3 +1,2 @@
 DIST garcon-0.6.4.tar.bz2 519744 BLAKE2B 3d5e90d8a1159aac4eb2f2455978bbe1de99b523b5383037c021f3490800349bff1d6f5333853b08db34c9d18f3c5fc787f51927d94cfd2cd747e839b1529e38 SHA512 96a99eb163909ba411ca5928c3fc0a569a6d833fba92edcfa845eb90b56abb02e1428a2cbf61fc1c564f1659d51b24ce174e3864fcc987a37158703df0ac2510
-DIST garcon-0.7.3.tar.bz2 543598 BLAKE2B d89377946616b955098bb4a6898288ca9c4a4995e737e5a56eee3b1fcfcb0a67061771505f0174b343a68054443a00476df38e5bf643d41bb5f4189a9fef1986 SHA512 a648bac5c2b0b3d41592eb953f800f0eaf4c47cbeb3d9c1f532243182ca1d8e9d856e92ff5abbe01224b060b8ec7bb55983d64cfd8e42e9373f3911dc157fd37
 DIST garcon-0.8.0.tar.bz2 539061 BLAKE2B 8d7b207fdb325d060c3ecfa5e2574961082706c5a4af59cabebad9d3c915228085dc32442521018bfb7da2d3c169445ac270c00c381e666bfda8774329a60cfc SHA512 708c68c31c0d3d89ecdde4790594837af0d065ecb805131fd7db2eb4c433c0523f44d51f2040f7bf9af729537e5f9e89ed06a435fc0c4e6113db00ad78ba8ce0
diff --git a/xfce-base/garcon/garcon-0.7.3.ebuild b/xfce-base/garcon/garcon-0.7.3.ebuild
deleted file mode 100644
index 6433ea9ccb51..000000000000
--- a/xfce-base/garcon/garcon-0.7.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
-HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="introspection"
-
-RDEPEND=">=dev-libs/glib-2.50.0
-	>=x11-libs/gtk+-3.20:3
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
-	>=xfce-base/libxfce4ui-4.15.7:=[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND=${RDEPEND}
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	introspection? ( dev-libs/gobject-introspection )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-	)
-
-	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/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index b4d36470a2f3..142e81aeddec 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,4 +1,2 @@
 DIST libxfce4ui-4.14.1.tar.bz2 756175 BLAKE2B d487cc0a04b6053ead6670eeb83cafe1c4098818d5ad6a94a81176720d78cfd65160156961cbb526baa1640ae66a5c6958f707b7078c412d81fcd24cc8cf4013 SHA512 f42f41da3a683a0c56c3b1e7ba420c4f50909d2613e681d053b09b50bc0eb7f750f44c892e94b0ee8b9207983a87c0cadbda1ad93d0df74ae351dc8812025407
-DIST libxfce4ui-4.15.7.tar.bz2 807676 BLAKE2B 0280d0e35244740d016fc4cd8afebb5a70348226011473117c3b7124abcc597baf8015754bb8aaa2fa3f0560d1a98d68f319c5b5870e1c8f5543c0a9458eb541 SHA512 0fd05bbaa42d3f3a0df552fb7419ebc390e6292f4bae58d4c9d6137421cdd55f17756e51c3adcd5ad6e7c92f277b9485ea1d791ef1295ac3d65d86201fc33a6a
-DIST libxfce4ui-4.15.8.tar.bz2 817242 BLAKE2B f0d85fd6e35f65ed416085fbd5da4a1624d8ea9eb90b692463f41e840cea943dbf25a9d057db6101288000fad46468efa4417be87ef24b02f2f73c0a6d11c144 SHA512 a6ea4b6fc1542f6bbc2a2003e1836f1e24ea8c36460460e9e7eddafc7c3c36206fe94a9ccdc17b3b488e857d11a1f1b21ff248349a9820fe9a584bb9dcc1a90f
 DIST libxfce4ui-4.16.0.tar.bz2 837838 BLAKE2B a7e0612bb2a6e47fb9e03c69f1f014740b1ed0f363e198823b328980c106bf5566c880cdeac254291a44ff5a4fc6c8ae95c0396b37e6869e0ec3721897c75d43 SHA512 07ce8399ca860d5414f91b0795ba61eff21b6022a9e8c26de77a6c4e6c45371e10318b626a892b7e2998d95c7e92cf32c2cd48fdefc291bb5521fe8a6cf93aed
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.7.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.7.ebuild
deleted file mode 100644
index 5ec78d67a32b..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.15.7.ebuild
+++ /dev/null
@@ -1,73 +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 startup-notification system-info vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND=">=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
-	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10 )
-	introspection? ( dev-libs/gobject-introspection:= )
-	startup-notification? ( x11-libs/startup-notification )
-	system-info? (
-		dev-libs/libgudev
-		gnome-base/libgtop
-		>=media-libs/libepoxy-1.2
-	)"
-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 system-info glibtop)
-		$(use_enable system-info epoxy)
-		$(use_enable system-info gudev)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.8.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.8.ebuild
deleted file mode 100644
index 5ec78d67a32b..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.15.8.ebuild
+++ /dev/null
@@ -1,73 +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 startup-notification system-info vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND=">=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
-	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10 )
-	introspection? ( dev-libs/gobject-introspection:= )
-	startup-notification? ( x11-libs/startup-notification )
-	system-info? (
-		dev-libs/libgudev
-		gnome-base/libgtop
-		>=media-libs/libepoxy-1.2
-	)"
-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 system-info glibtop)
-		$(use_enable system-info epoxy)
-		$(use_enable system-info gudev)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	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 29078091f0d4..2d281abf8640 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,3 +1,2 @@
 DIST libxfce4util-4.14.0.tar.bz2 516358 BLAKE2B d8e3d1e3247e23908456aa296415240c1a9146001a02cb859541922ee541e30955279fd68f2d9938e43f992a5115b21836363fa8d8234de87fca0bbaac830bf0 SHA512 6ac95aea03052d9e2f886cbe76afe9bbb43511bf3fe1766097e10cd8762541ed17060a727df3ef93e226aae448c15d9dd3ad8acd55a9d5f2387cb360bdf72832
-DIST libxfce4util-4.15.6.tar.bz2 523102 BLAKE2B 2af9b631dcff75dfb83997a6daa1729aee46929da4c028dd5013b6b801d87758c06b2a9e738ff7734343024c6b2f416828ca1ce0f3cef6b7df252daf3c5d987e SHA512 6241ce0457f99274bdb864fe46c3e4d72e84dcd01bca515505dcab22ceb51a46bae75d586587a4129f45fdb7cefd627e17f4399ef6d6692c2b343a8caed3feef
 DIST libxfce4util-4.16.0.tar.bz2 508328 BLAKE2B 99578b898389bd90841a7f903f5473b2ff357cf81256efe1019425b48da32401ce238deffefd299987477f4cdfb77e86e415b55049863c30bf16e0e641e08c72 SHA512 dce6992c3da73367461d7464794a9b2a5503666113682e07a86e18b1c5383de2b087809448d5729097571f4fda6b4af5f4f4600848514ab2ab4b3f367ca26f5c
diff --git a/xfce-base/libxfce4util/libxfce4util-4.15.6.ebuild b/xfce-base/libxfce4util/libxfce4util-4.15.6.ebuild
deleted file mode 100644
index f7d468347592..000000000000
--- a/xfce-base/libxfce4util/libxfce4util-4.15.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vala
-
-DESCRIPTION="A basic utility library for the Xfce desktop environment"
-HOMEPAGE="https://git.xfce.org/xfce/libxfce4util/"
-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 )"
-
-RDEPEND=">=dev-libs/glib-2.50
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable vala)
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index eed35cadced7..dceeeb3098ef 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,5 +1,3 @@
 DIST thunar-1.8.16.tar.bz2 2479718 BLAKE2B 2de72f0b9977a9815c0a7f0376ceb01ddd5a68dda6c33e7d99f34378f00086e6652fa2cfcecd12129811ed6e78d45c7a1b321563ad98c5257bb6d3c58689c60d SHA512 1d096c7328b6131f097663d8f769a1e7a2a15cb24ca5116e28de38162cf1c5c544b8ed856b0d3df758947154b9e76ca720d3c614e7dca4edb71e8a219438e7a7
-DIST thunar-4.15.3.tar.bz2 2445923 BLAKE2B 7c1fcbb77eba1a2198bbfac88d43d9a332941aca9dec46d239933288d6e97d4029208bcbe6574577d71aad11292c2ca8015374502b724fa3e3844f0fa664152b SHA512 a86a2e984ccbec82f50b479efc61334615b0ac116d8b3a479c61470d34fe47bac0d3e327cf4e10a1bf3ad50910abb26767bbd7ffed0cf4263e3435a21e1ab6dd
-DIST thunar-4.16.0.tar.bz2 2454813 BLAKE2B 528abf3f3227992dbed23e453205a55dcdda8bf03d242f6668e45e2d22921dfe5f5dd5550a7cdf53fd5c39c21ecf9567bc02e2d178ae7a1d35ad0c4f6932e4a7 SHA512 0f288018ead108c6a170a9b98d45d6c005301eb51526b357ab81411724451f0e6a1154ae44dd7681ee5bc9a8807df1497ed26d1af0ac002d68c69fede808cc51
-DIST thunar-4.16.1.tar.bz2 2447673 BLAKE2B 6a0533fb052c9cb1e478145685859e22fb3134aee4332e4bf23d3c9addaa17e1514ebf3e8087474cdc728d44a52d43a15d1b10a62e3a3c6e1654404097461957 SHA512 aa579682cb6fc9af339ae40a6fdd66e49d34ae849388384af5665499c3b58f59a628a8380bd174d0988249139a7f7783cb3fa5342e1b019e8d2e0c044ea8f6d0
 DIST thunar-4.16.2.tar.bz2 2434525 BLAKE2B e50fb41d7d333fe23729ddc01ce7e1313124ad3607e0e57fd210794b21f83fb83cd2a4ef9845638c0e10ceb5995392b754991600fc242e4a7e11af6a55971624 SHA512 761bc2b2106db523b5b56b9f330a42e487aeccd144d2118956a67d6935ee6d795edf543a815c3e035dd7cc4b0965679811d39d9c5e6b6f7ca84eb362f22561e0
+DIST thunar-4.17.0.tar.bz2 2448027 BLAKE2B c3890dfe22384ecaa7a71805c68938d59cdfcd0a602512395e9011692de242c808dc13229c0c3b3ad93973845fe9e291cee4f3b6275fc87c75efade7731d580e SHA512 6a344f89ae51c4c0cbdbac1542558aeab3c0eb45a79320e58785033a3faa2ff95751e72e089f6a2ff23056a18a403845a2b5603c89550a6ba2e0c8286f75a5e4
diff --git a/xfce-base/thunar/thunar-4.15.3.ebuild b/xfce-base/thunar/thunar-4.15.3.ebuild
deleted file mode 100644
index 8f8165249e08..000000000000
--- a/xfce-base/thunar/thunar-4.15.3.ebuild
+++ /dev/null
@@ -1,77 +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.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="${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"
-
-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.1.ebuild b/xfce-base/thunar/thunar-4.16.1.ebuild
deleted file mode 100644
index 647aad08c705..000000000000
--- a/xfce-base/thunar/thunar-4.16.1.ebuild
+++ /dev/null
@@ -1,77 +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"
-DEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.50
-	>=x11-libs/gdk-pixbuf-2.14
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/exo-0.12:=
-	>=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.2.ebuild b/xfce-base/thunar/thunar-4.16.2.ebuild
index 1446de509f0a..a50b1046a411 100644
--- a/xfce-base/thunar/thunar-4.16.2.ebuild
+++ b/xfce-base/thunar/thunar-4.16.2.ebuild
@@ -17,7 +17,7 @@ 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-0.12:=
+	>=xfce-base/exo-4.15.3:=
 	>=xfce-base/libxfce4ui-4.15.3:=
 	>=xfce-base/libxfce4util-4.15.2:=
 	>=xfce-base/xfconf-4.12:=
diff --git a/xfce-base/thunar/thunar-4.16.0.ebuild b/xfce-base/thunar/thunar-4.17.0.ebuild
index 647aad08c705..a50b1046a411 100644
--- a/xfce-base/thunar/thunar-4.16.0.ebuild
+++ b/xfce-base/thunar/thunar-4.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,11 +14,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-l
 IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
 
 GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
-DEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.50
+DEPEND=">=dev-libs/glib-2.50
 	>=x11-libs/gdk-pixbuf-2.14
 	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/exo-0.12:=
+	>=xfce-base/exo-4.15.3:=
 	>=xfce-base/libxfce4ui-4.15.3:=
 	>=xfce-base/libxfce4util-4.15.2:=
 	>=xfce-base/xfconf-4.12:=
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index 90a70cc8a368..dc9109816361 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,3 +1,2 @@
 DIST xfce4-appfinder-4.14.0.tar.bz2 519705 BLAKE2B e5c107d975d7103a7f58fac534eaea3c483a82885778c12c8c01cfa552d305f2f0c0ba5f77f1911b29ce58ae2efec973359df9425370f5627c95a7826808f172 SHA512 94c7266fc7c738107f1674ea3d705aa4168d9f2ecada97dc3e97c85c3857bd37a2e6517028fb51dd4663eaba4bf758927879c7fdbff83df79f8648c61944402c
-DIST xfce4-appfinder-4.15.2.tar.bz2 559694 BLAKE2B f472e0a6de30f07234fbcb2cb395991dcda737c2a7e19ca37731ccafe9c67a2a8e39e5554c01f5fce00f45adc958806d2f508227a9b2bb261371f57497440899 SHA512 2df5032d224277819b3c2aa146651c67a1315964d2b0105dd9fbaad7c0d00b12819aeccbb61ce95272d1f8f444ced79f5be7c35690365bec55733162d5b74cb7
-DIST xfce4-appfinder-4.16.0.tar.bz2 569271 BLAKE2B 7878f1cf14e65858b063e487be5936f7df165f9de14863597ac00f70efb06dc1ca0a260e1c82d77922b5a8fe0f6d8c8ac60adcab7729ddb7e9c1688e510864cb SHA512 e2caa296960769d96395e932d7f2301467ad0d02d24fbcc9e6e79c1774d51a3e854cebdf8fee70fc1c9e68c3ab5a3c3a1e370762978bc2b2797c62de040ef88a
+DIST xfce4-appfinder-4.16.1.tar.bz2 579984 BLAKE2B 1441fa6aeb25ee64b809a2ff31340b7e52910a768ec3b605a3832adf36ea4e27eaa3d455a919c47003d551829114ee62e78c2d983cb6bcfded72e218fa6d29f3 SHA512 5a28d93675af7d77de3050e7df9e064a0fd94d579d7e617878329d4385b42594afd8de96740cb91de38ffcc22bda71e4f90b61ff401980a5582bf09b2a19870c
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.15.2.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.15.2.ebuild
deleted file mode 100644
index f77a5531f4c6..000000000000
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.15.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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-appfinder/xfce4-appfinder-4.16.0.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.16.1.ebuild
index 3d3748d7f1ee..20223fc67eea 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.16.0.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index a405727633ca..8d9a2b053f24 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-panel-4.14.4.tar.bz2 1307938 BLAKE2B 79e0abcc5dfe41faaab1de981b8a61a99e9c11ab5b3ddba5fb7385517d24b50210f12d0a6a49720d6d8458fa7143ed65d7960025c5e8c01af1a59dd6b339a2d9 SHA512 5ae7c7acf0254fdc3f5eaccf75d7c12699ab8147322f231af7bd17b1238b8c25a96d628dada9caa086fc8fde2b7dc4030a38eb7b863b290f9e069193b3728d85
-DIST xfce4-panel-4.15.6.tar.bz2 1382484 BLAKE2B 7ee01597459dd58c818e292e75b0c3864a5af94c7c8a4adf0eb65ed0ddce4ae7d10e407d0b92dd86eef6005c8c05c851cbbeee560dd8a37eaca722713414b00b SHA512 d1a77d6ae29b5f21d1609318ea15ad8e5851a5de0af24ff4e709a9e735c7361c440c705d314e17a8bc2b48ee8398ac2599d6f35c3c939b4c09ea00e4baa11dfa
 DIST xfce4-panel-4.16.0.tar.bz2 1382354 BLAKE2B 37737826e9d08974a2cad7513d93f6d998c6a49df0ae35b496db231448cb75d7b27631936fbae7ad25ed7bd80649737d678d6a761311c369e49e347876035c3b SHA512 ab3c4f23d67ff382c6f8bdc6c4f35c968f7789ab35132836c0aba824d074eda09c8cc7518b1f9f251a8e9cd6fa52844f194e70af52e3e11b0576d0ab8917a2f5
+DIST xfce4-panel-4.16.1.tar.bz2 1381003 BLAKE2B 103d1b60c13758ad5e3f139d3bc66923e648540195c7a71fb6c39bcdb06b109f620ced42b7eb6c36ccf5a833e97957c373e760feab3f062c5a7ecd3038803366 SHA512 ec55a9812d61db755ea56a87ea1b709af2870703fc0e5a45797406f2f4c78e8afecd6e1bc081f3618a81030c9c0595ae8edbb29731d4bef3750e202bbf35e99c
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.15.6.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.1.ebuild
index 9899ea91cbbc..b3238b007d87 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.15.6.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.50
 	x11-libs/libwnck:3
 	>=xfce-base/exo-0.11.2:=
 	>=xfce-base/garcon-0.5:=
-	>=xfce-base/libxfce4ui-4.15.6:=
+	>=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] )
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index a245c90f4c89..221b238aaec4 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,3 +1,2 @@
 DIST xfce4-session-4.14.2.tar.bz2 841878 BLAKE2B e59be7bf622c40df60051643e52e703896d994f3729167e532a8594d19e139050b3dd995a153b0397c5aee2cbce9880abf8fdd011115db999508eede8de0034e SHA512 ab67cb576ac4880f41cf8eec05539a733da066c50913c9c2c9116ed3129b342aa3ca005ea5b46a733780cd062a4454d530240d89660b6c48a2045c821f7c490f
-DIST xfce4-session-4.15.1.tar.bz2 871639 BLAKE2B 1079040abfbc0c25e9547d96dcf4ffc8c1b7b1ddeea5c79587c98518d34514df37fd91552876a4f13cb2d468ee199971ed50f1bda6fec2fd4936cbea5e2ca797 SHA512 062771564df073fd34b6cb074ee3032d898ecf18e36cfca9dc0bd5d3ad4a082c8ff670a89437ab697383cd009d8752e787e16fce8330727be15c22c7736f8ea0
 DIST xfce4-session-4.16.0.tar.bz2 875504 BLAKE2B 8e06e1ff378593b90c3c600bd5aabb3ea9ba9e58854ed615d39009595be4b71c5f77359e4249a93f44aa67795e2d4bf658b83d9c1d445304764eee655ed1f9e9 SHA512 fd74b24d0c2762b5a99883b62ca9447c3683e42e9e39193d0f60e02b8c1ad77a3dfff4df6f3b3c345d8ea3d4c4ef93485e9b5586862bab85d4b37110d3400fad
diff --git a/xfce-base/xfce4-session/xfce4-session-4.15.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.15.1.ebuild
deleted file mode 100644
index aec4b51d30e9..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.15.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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 b4427e463fe5..76992a77577c 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,3 +1,2 @@
 DIST xfce4-settings-4.14.3.tar.bz2 1201308 BLAKE2B daf20e5adda24f3c1ecc88506c1a1cd03b33b379bafc236ed3b99404b816803288041de7d507072a311c3966bb0e040986e358ea94d01636c56ea31c1b843c8d SHA512 fcc5bfa98d8903dc3ac51ec909e542485a44f6c11ddca815508c2ed913410a0becd54b2db6761ee48f5a20d6ca08377eeefbb54bd0cb7cde0a0c0d4b65802ab5
-DIST xfce4-settings-4.15.3.tar.bz2 1487754 BLAKE2B 272c76096f1f0690bead5472e949057959fc7c90558be7c96454f121a9c427494490b4aaf64c6490fe9df0a1de131e630b2cc0ae1310f8dfb7057d573a55f39f SHA512 a2c841e971a0a67bb81697c7e31568026d90b185a7acc93bd39b22f3f4b3670b15f6b798b6658dee4b9bb44df1a5a2b4985e743cc36dc11dbb047baa816f1941
 DIST xfce4-settings-4.16.0.tar.bz2 1492754 BLAKE2B 10bfa7ce556547a4a41e1a3691ea3e41b9de57bd21760a91424cd27469917264ce00ae7324ee1d81bdf27f6b275415af932d63aeba4e80de729e42df1cbff488 SHA512 38c06e4d4c0963019c20a3afadb0dc1bde8d1b477bcff2d0253e29beb5e4a8b5ae9d058b544cec6fe2bfc2c1d44f74283c94538eda25436d58db0754f112a238
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.15.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.15.3.ebuild
deleted file mode 100644
index 6ce41244eaf8..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.15.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-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.45.8
-	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}
-	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/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 6fac71ba39f1..3928a2f5d7b3 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,6 +1,2 @@
-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.14.4.tar.bz2 592024 BLAKE2B 1432ca360fd1f02437f238f66906f15a8b98fd0e7f4525bc2b61d53b4e3c146a1a4f8480089956e0a2e5f88d952822ba2b151f54183619a88e3f14f747f6676e SHA512 2335c73078ec1b035ceb1d96a2e16d9e63ca7ad5cabac96478d134ad3f94c0e81351df8acd8fb446a97a56f30472502006d93e96acdafc69262af3bbb1fc79ad
-DIST xfconf-4.15.0.tar.bz2 586244 BLAKE2B 0bc6331f6a00d9328b7d462da1bffd0aa57b7b6e5a48a6e9d05d43993910fe1a3677ca33ca2315caac0528087e61a66e574118efd6c9ea5fb2d068cc843532a8 SHA512 3d36881a5d4a8b514196905689f32eed0da49c642fced38c57fa9260013e2efc0ce83de502b91c5dd07734dd99c2521f2cac00b43d3d76141efe7eeddc03c5c7
-DIST xfconf-4.15.1.tar.bz2 588820 BLAKE2B a269612366ec8bf23db5848e24ff566939e46e6ddbae1665ec9685c72ca913fb23bf2d8f97397422def4eeab9ad37eeb6f3d0b045b692370c299607ccf4bb323 SHA512 7f9d39ef12a92dfa8fa11a8ef59e99b75646b0caf0dfd8bd1e044bb78f5fcfc0160587b112634a7c8f8417788a14a73bbc0f134f0432c693183f7e82e2a21b47
 DIST xfconf-4.16.0.tar.bz2 634858 BLAKE2B 34a03e457934310d4750b0811ff3b6fbde0c786656c9cc1bb2dd733e0104c2ab3ff1834fefcea31a6711931406b8ab507a528596b598e92c401defb8e6d7715e SHA512 d2e6b272243d6eda71f42cb3df18cb9c0745a1864718639e9aa494902dfe5b4989b2761fee2195456e5725cad0f744978f9c95c6f01e48aa016a919ce3468344
diff --git a/xfce-base/xfconf/xfconf-4.14.1.ebuild b/xfce-base/xfconf/xfconf-4.14.1.ebuild
deleted file mode 100644
index f78771776f9c..000000000000
--- a/xfce-base/xfconf/xfconf-4.14.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 perl vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND=">=dev-libs/glib-2.42
-	>=xfce-base/libxfce4util-4.10:=
-	introspection? ( dev-libs/gobject-introspection:= )
-	perl? (
-		dev-lang/perl:=[-build(-)]
-		dev-perl/glib-perl
-	)
-	!<xfce-base/xfce4-panel-4.13.1
-	!<xfce-base/xfce4-settings-4.13.1"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	perl? (
-		dev-perl/ExtUtils-Depends
-		dev-perl/ExtUtils-PkgConfig
-	)
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable perl perl-bindings)
-		$(use_enable introspection)
-		$(use_enable vala)
-		$(use_enable debug checks)
-		--with-perl-options=INSTALLDIRS=vendor
-	)
-
-	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}"
-
-		nonfatal emake check
-		ret=${?}
-
-		kill "${DBUS_SESSION_BUS_PID}"
-		exit "${ret}"
-	) || die
-}
-
-src_install() {
-	default
-	find "${D}" -type f -name '*.la' -delete || die
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -delete || die
-		find "${ED}" -depth -mindepth 1 -type d -empty -delete || die
-	fi
-}
diff --git a/xfce-base/xfconf/xfconf-4.14.3.ebuild b/xfce-base/xfconf/xfconf-4.14.3.ebuild
deleted file mode 100644
index 497831d5927e..000000000000
--- a/xfce-base/xfconf/xfconf-4.14.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 perl vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND=">=dev-libs/glib-2.42
-	sys-apps/dbus
-	>=xfce-base/libxfce4util-4.10:=
-	introspection? ( dev-libs/gobject-introspection:= )
-	perl? (
-		dev-lang/perl:=[-build(-)]
-		dev-perl/glib-perl
-	)
-	!<xfce-base/xfce4-panel-4.13.1
-	!<xfce-base/xfce4-settings-4.13.1"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	perl? (
-		dev-perl/ExtUtils-Depends
-		dev-perl/ExtUtils-PkgConfig
-	)
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable perl perl-bindings)
-		$(use_enable introspection)
-		$(use_enable vala)
-		$(use_enable debug checks)
-		--with-perl-options=INSTALLDIRS=vendor
-	)
-
-	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}"
-
-		nonfatal emake check
-		ret=${?}
-
-		kill "${DBUS_SESSION_BUS_PID}"
-		exit "${ret}"
-	) || die
-}
-
-src_install() {
-	default
-	find "${D}" -type f -name '*.la' -delete || die
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -delete || die
-		find "${ED}" -depth -mindepth 1 -type d -empty -delete || die
-	fi
-}
diff --git a/xfce-base/xfconf/xfconf-4.14.4.ebuild b/xfce-base/xfconf/xfconf-4.14.4.ebuild
index 497831d5927e..6569c2001148 100644
--- a/xfce-base/xfconf/xfconf-4.14.4.ebuild
+++ b/xfce-base/xfconf/xfconf-4.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 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
deleted file mode 100644
index 993040c79af0..000000000000
--- a/xfce-base/xfconf/xfconf-4.15.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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/xfconf/xfconf-4.15.1.ebuild b/xfce-base/xfconf/xfconf-4.15.1.ebuild
deleted file mode 100644
index 993040c79af0..000000000000
--- a/xfce-base/xfconf/xfconf-4.15.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index da7de24c0719..51ef022e6610 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,3 +1,2 @@
 DIST xfdesktop-4.14.3.tar.bz2 1549953 BLAKE2B 338d80d8acf50235c0763e9de9dfe6fd933769b7f46ffa322eabca252761b13c5024c780aaec8e87e1d1ff08ce21e63e6ae871ad030daa0cedbd7734dbd94613 SHA512 30e5ce74468f8f56b78144bea9dca620af19aef031c86968eb40b0a804a7a767f3cf817994bbdc6ed096b4558fab3e59062fb832d79f7dc3455df9b5540577f8
-DIST xfdesktop-4.15.1.tar.bz2 1528853 BLAKE2B 71e16095441e9310efc9d8885538cc5c93649b9a1c9bfa499710b6564a52e352198a47bfc66c36f9b0e3eb3b39c7df7655f5fdaf7d9c50050225930eee727879 SHA512 62f64e120b373526b3c370d553575cfeb5719364bc64f069f4d859961f82fdb90d1332b243b90a63f1dd2e7d9609ad64ef81de17487cfea0c7c6d62f27db06cd
 DIST xfdesktop-4.16.0.tar.bz2 2041114 BLAKE2B 153a11b27b3ac92ded0c97257f19b4bc9018f384d201b41d82dd07df26ced7b5ded19ac98f80fb14e018d2df848f10b93cf629f05a66cc3b29e08313805fcf38 SHA512 e62e5fb12997c3138fa36aed06388b921f5223ec09afbd22b622ef39bc421773acbf73606ffc3b38b5a01845678847cda43d193c8457608715cf750acd466129
diff --git a/xfce-base/xfdesktop/xfdesktop-4.15.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.15.1.ebuild
deleted file mode 100644
index c0250e01fe7a..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.15.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify +thunar"
-
-RDEPEND=">=x11-libs/cairo-1.12
-	>=dev-libs/glib-2.42
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libwnck-3.14:3
-	x11-libs/libX11
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/garcon-0.6:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.13:=
-	>=xfce-base/xfconf-4.12.1:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? ( >=xfce-base/thunar-1.7:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 5c7156126f4c..38da6c2173d7 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,4 +1,2 @@
 DIST xfwm4-4.14.6.tar.bz2 1167818 BLAKE2B 2315843da3684ea069d8361d1d787634052da5449d7aeb4ba6b219cd46ae4b7b6007becca316a5ab552fe4432baab3efa6a23793b68a00d06c9fbe3d1164080a SHA512 1e3cc3e976250e311607d12e1a51047132584d6e8cd8979e3d5a85a3cc49e420453e3812b2d8a8f6268f3d6f1b44f4df2b57b7e1395d02ec63ae82a55bb9d4ee
-DIST xfwm4-4.15.3.tar.bz2 1180308 BLAKE2B e76651e58bdb6b4c4b15c6dd49d5df16b40729fc41302d0eff336194d84a8b467c9b6b2f37094657b0555c25d87d92744991dfc00127638468b23eae31088475 SHA512 6ca7faba7fdd225d1c91e7c217200eebf271abc6058f3b9a46ce7bce8f31028c99e454412afa4ca441a5b30decb0d33a03ca5caeed7e4b20a29efa855af8328d
-DIST xfwm4-4.16.0.tar.bz2 1200929 BLAKE2B 2df17028287ff3e4fea7ea082ea39545a05fba5089fbaea1764bbb59ff550d9dbf14322246d9dcd455bc589055c75b7941f08f6ab4a59fe2089001236ab8677b SHA512 f21e773b34092cadd86713373e59880cf68020cbfa3d16ab651f48a8a051a38925428358e0bca5ffc346eb62dc6cc53c87a9e6895d7e613dadf3cdac499dae02
 DIST xfwm4-4.16.1.tar.bz2 1201722 BLAKE2B 4aae9b97095b423964a2ece7fe09b46ecfcea6688af6ab3b38ee34611cd68a7427597cb963b91b209d161c85aed552df15d005268bd8585d365b0cf63adf36b3 SHA512 f0d5d00e58202457d0d7d5f9772e7b2aa3f3339850065609baab7d379248a628d147464cc605698970134b87d58b7867b8c09d0a3a45ab84b2f3aa95be26f0b9
diff --git a/xfce-base/xfwm4/xfwm4-4.15.3.ebuild b/xfce-base/xfwm4/xfwm4-4.15.3.ebuild
deleted file mode 100644
index bf9677a00866..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.15.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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"
-
-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.16.0.ebuild b/xfce-base/xfwm4/xfwm4-4.16.0.ebuild
deleted file mode 100644
index 26cb91f81588..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.16.0.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 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.22: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}
-	x11-libs/libICE
-	x11-libs/libSM"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	xfce-base/exo
-	virtual/pkgconfig"
-
-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
-}