gentoo resync : 03.03.2021

44 files changed, 49 insertions, 812 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 189c6301a627..96f1d67f0451 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 1b39221bea0c..4c31f6ee7dcf 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-0.12.11.tar.bz2 1333227 BLAKE2B 4e95809c58b6db26ecdf524663c06df9cd70007726091e381a1f0dd58be52efee85ad9721c421c0df6438073bb9de97d56cd039f520e2f7c0f5722a1839ba167 SHA512 ecbf20feddf86178d34a5c70212f0c2310ab1d6ce25291846d6d1d3045270ae3e68102065d7b3d8840137406f826f9bc37fed92a16c1268c3d14f2833a97d533
 DIST exo-4.16.0.tar.bz2 966143 BLAKE2B ee2175d2d5087e948a6fb9bd4ffed2ecfe54be7078d2f1c55a6b30a0f3920689a46372af749035b1454e74ef5c75037996f3601d76adf1d0067eceba6775df76 SHA512 8fff640c4a229e77911cf091866f265e1f0d7f0b9274b1a879f46061644dd6aec07ae3f8fc43ac7277429ea98bdde8d0ee010da7ed398cddc7d755fea91b964c
-EBUILD exo-0.12.11.ebuild 1036 BLAKE2B 12fc8c5a693166a7672750259cf9b3061b24c104ad3aeaf234ce5fc3d189ca552502eefaf08b24836f1b4f8f356f181469c805929fa0fefdde652cf1c38218b2 SHA512 5e6486e6cabb66870995aa41337730f7dcc6f5dff787b2fb7eba254d11fa69ba1309fbfc7926fec4aba8f287c55f8d777210eb1fe523ceed42c9e1282184b733
-EBUILD exo-4.16.0.ebuild 1032 BLAKE2B 9104a4b45e3b7b8dbcbfc22aabc4148b4bacdd116cea745ddc2d4f094019b151906b5950adbacd13625faec4270ce036a13b9ed973e1a093444254ef995662ac SHA512 8ef28689f82121893a99e94c887a1d897c30e5e737fe235479c0dfb999b10f7555021afbe2f1e6719d7f2a160ff69cbd75b28043e762e3a3cd59bb50db243b9f
-MISC metadata.xml 334 BLAKE2B 0d61ecd7415a1a60ea5f53fdc29fae2ebf9c286822bd7ee5c10629fae5da0102687c3b07fdd5f81b123aa79e5d04905da705177402c491aad574dccc4e6d18ce SHA512 158e0c248e2d8f235fdb105f2342d0a3c4ca3f15b8938a73bfbc1da823d573a178857433e68a7b36cccc7449ba29cfb3fd4c3856b02c231bd5736d9f5932b6d7
+EBUILD exo-4.16.0.ebuild 1030 BLAKE2B 963d00d818cd3396ca5c2280514526818dff1d93de85385922bdfed8fa6e95ce07a9080a51d1b5cfcef1d6e126ded51070d1202ff3b316aeeb5a9121ec014f66 SHA512 e8caf13aa7e0a0edd441e7e757d296cc29eff9347ed56bff51caae3804cf662698ad0cea80cac6623a4e60fe598594bda41cd9b68d3db5d2bc578c8820546f04
+MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/xfce-base/exo/exo-0.12.11.ebuild b/xfce-base/exo/exo-0.12.11.ebuild
deleted file mode 100644
index 30c7ec67de13..000000000000
--- a/xfce-base/exo/exo-0.12.11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gtk2"
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.42
-	dev-perl/URI
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	gtk2? ( >=x11-libs/gtk+-2.24:2 )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable gtk2)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/exo/exo-4.16.0.ebuild b/xfce-base/exo/exo-4.16.0.ebuild
index 7e378b698e20..c0ba46ff6577 100644
--- a/xfce-base/exo/exo-4.16.0.ebuild
+++ b/xfce-base/exo/exo-4.16.0.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 ~x64-solaris ~x86-solaris"
+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
diff --git a/xfce-base/exo/metadata.xml b/xfce-base/exo/metadata.xml
index ee56aa91ceed..dce6704738a4 100644
--- a/xfce-base/exo/metadata.xml
+++ b/xfce-base/exo/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-  <use>
-    <flag name='gtk2'>Build deprecated GTK+2 libexo-1 library.</flag>
-  </use>
+	<maintainer type="project">
+		<email>xfce@gentoo.org</email>
+		<name>XFCE Team</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index 1d72c52bbb1a..751bc464c16c 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,5 +1,3 @@
-DIST garcon-0.6.4.tar.bz2 519744 BLAKE2B 3d5e90d8a1159aac4eb2f2455978bbe1de99b523b5383037c021f3490800349bff1d6f5333853b08db34c9d18f3c5fc787f51927d94cfd2cd747e839b1529e38 SHA512 96a99eb163909ba411ca5928c3fc0a569a6d833fba92edcfa845eb90b56abb02e1428a2cbf61fc1c564f1659d51b24ce174e3864fcc987a37158703df0ac2510
 DIST garcon-0.8.0.tar.bz2 539061 BLAKE2B 8d7b207fdb325d060c3ecfa5e2574961082706c5a4af59cabebad9d3c915228085dc32442521018bfb7da2d3c169445ac270c00c381e666bfda8774329a60cfc SHA512 708c68c31c0d3d89ecdde4790594837af0d065ecb805131fd7db2eb4c433c0523f44d51f2040f7bf9af729537e5f9e89ed06a435fc0c4e6113db00ad78ba8ce0
-EBUILD garcon-0.6.4-r2.ebuild 1081 BLAKE2B c2a17dccc2494c09ca1ddfa1a029764e7bea7307c0b0a25a3fa62d08ab123b940b85262fe98d3f0359d6172aad42ce12629930fe9eb10ed5a4e4f4212e85d49c SHA512 1b44d15c5d11de9d1ba452d72c0a3a8f5dd93e7389b05428eb83264427a4baa0132a80032928ab7dc96215398e5ba6e259dd051bad1759cb49027c14026b3633
-EBUILD garcon-0.8.0.ebuild 1150 BLAKE2B 6413ba89444e0b962fb9afab871949a17da97c64e5ad2c14dfe6ba52c4c351b5695ff33f73437c158cea24a16c54e1da0612c9afa3596665b00b408d12c84ad0 SHA512 d933b283f51cbd7a0cbcdd8442b0b8d24f6852250f3dba2ffe8b3339777ce0b62959c95efe798c67ad4cc2d853c6570f6b7abe84e56c04394c8271a50501c188
-MISC metadata.xml 395 BLAKE2B 13ea597065b0ffcb8a57e82f980dfa9b271a16f0c6ba824cb66f551d7bd6c49946985d1391a28360c4160bca5b88cc796b578b23f0b321d1670ab9f1c0addf23 SHA512 8783901107619bafc30acd3962284cf56376a14cd61039f862e1a7f0b5e17fc9d51f0e278c85161fb8b42c53b132a1ae7abe00c7e933eccf2ce3b74fa9956d54
+EBUILD garcon-0.8.0.ebuild 1148 BLAKE2B cac51c43f2c0c13f5567c87807eef06e2b2568cc3e3da37ecf739833f53e9070bc7b5f27c7e1fcc72ac97f5e09fc1e66794f282a6d93cea44958c4281bf45a01 SHA512 85b6f48467f0ef0fb190485a5847955feadcefe37629e599d1be3c2c34f4c27d463763bb2bbee2c444eb6267679311ade320acb0fb00bae74c5d032bec5ca38c
+MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/xfce-base/garcon/garcon-0.6.4-r2.ebuild b/xfce-base/garcon/garcon-0.6.4-r2.ebuild
deleted file mode 100644
index 79394ad32feb..000000000000
--- a/xfce-base/garcon/garcon-0.6.4-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
-HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="-gtk2"
-
-RDEPEND=">=dev-libs/glib-2.30:=
-	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4util-4.12:=
-	gtk2? (
-		>=x11-libs/gtk+-2.24:2=
-		<xfce-base/libxfce4ui-4.15:=[gtk2(+),gtk3(+)]
-	)
-	!gtk2? (
-		>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	)"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable gtk2)
-		$(use_enable gtk2 libxfce4ui)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-base/garcon/garcon-0.8.0.ebuild b/xfce-base/garcon/garcon-0.8.0.ebuild
index aa9803cbbc8b..90346021e1f6 100644
--- a/xfce-base/garcon/garcon-0.8.0.ebuild
+++ b/xfce-base/garcon/garcon-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~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="introspection"
 
 RDEPEND=">=dev-libs/glib-2.50.0
diff --git a/xfce-base/garcon/metadata.xml b/xfce-base/garcon/metadata.xml
index c5e73dd63979..dce6704738a4 100644
--- a/xfce-base/garcon/metadata.xml
+++ b/xfce-base/garcon/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-  <use>
-    <flag name="gtk2">Build the garcon-gtk2-1 library (required
-      for <pkg>xfce-base/xfce4-panel</pkg> &lt; 4.13 only).</flag>
-  </use>
+	<maintainer type="project">
+		<email>xfce@gentoo.org</email>
+		<name>XFCE Team</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 8f1b98e11283..33ebd16311c0 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,5 +1,3 @@
-DIST libxfce4ui-4.14.1.tar.bz2 756175 BLAKE2B d487cc0a04b6053ead6670eeb83cafe1c4098818d5ad6a94a81176720d78cfd65160156961cbb526baa1640ae66a5c6958f707b7078c412d81fcd24cc8cf4013 SHA512 f42f41da3a683a0c56c3b1e7ba420c4f50909d2613e681d053b09b50bc0eb7f750f44c892e94b0ee8b9207983a87c0cadbda1ad93d0df74ae351dc8812025407
 DIST libxfce4ui-4.16.0.tar.bz2 837838 BLAKE2B a7e0612bb2a6e47fb9e03c69f1f014740b1ed0f363e198823b328980c106bf5566c880cdeac254291a44ff5a4fc6c8ae95c0396b37e6869e0ec3721897c75d43 SHA512 07ce8399ca860d5414f91b0795ba61eff21b6022a9e8c26de77a6c4e6c45371e10318b626a892b7e2998d95c7e92cf32c2cd48fdefc291bb5521fe8a6cf93aed
-EBUILD libxfce4ui-4.14.1.ebuild 1704 BLAKE2B 83defd465a237ed31b648de09e2f657c3510d3dec1b52a217b4795be00e6206aa7b14f7b073c16cfe0def3155eb577e0a3b0985bc5a582ab6d0f9c264b47c408 SHA512 69d4fb24cc2a9b56e0fa2bc5d4d754cf8e02be58095a96fa0b459c84a8939b36adbd157c1debd42f116f77f484839d518d561d1218c4d1a0acb2c806c3c471cc
-EBUILD libxfce4ui-4.16.0.ebuild 1720 BLAKE2B 16d57a2d6b40c109f393683f758bff2ef837f3b591d0dbc638ef99d63d8a28f707714612e0f1991627bd5604539fd8606d6739e2a0de7c100d7c029158a43b35 SHA512 8e797eeee7bea97dc43324cce5437fb4bd9ba59224871db03ea81788c96918a4f4c2b2aec93de8e8bf0268c04fe282440594065af9f7debf550ca8c4a67fde21
-MISC metadata.xml 500 BLAKE2B 8c4d37d66b1a09a2fe75a1083c83c05ce98d694decbb2aa17d639383c91ab960ca1b729b71ee9a47636f3de4a130a6d0c6ead94a7983090746f355cc4156ba06 SHA512 e1578203a3f9dd88b7df619fdad8ca1ef9e83536f4453b8c302211b6d257d5f5ff09419f769bbf5fb0be0ea10a148107533cf0422bb96833b0d906f4f8ee9155
+EBUILD libxfce4ui-4.16.0.ebuild 1718 BLAKE2B cf127062d1f94a01a639938ebf7bf33cfb4cd4a2235797d91dcb0269eaf6f142dbaa15e71f433015738c1a6ff206bf6a898a687b02b9ae1a895083140a335f23 SHA512 317f89bfe1001b2106df18307754fa06810e3b907157e8fce0902e5767bcf813b7c7cd7fc4458f45d7439fed0a37a8d54ceb20a37736ae69bdd9d5515f51cc16
+MISC metadata.xml 414 BLAKE2B 4d93f626e3c5f6a5d95a1dac1d7caa2f44d294a3206cd5c2452ef1b1c2bc827e923adadec524b9013cfbbd6db5d907fa7e17be2e78b5bd24552b86ff5b5fe448 SHA512 3b0170eb48cad8b1fdfaafa9747c783c5efc906892dc928476992eb9915e1a2fb3864f7f90e513c649c17392916a3dffdc5021955132cb2535698ed7083f566a
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
deleted file mode 100644
index f5d7585f78c5..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
+++ /dev/null
@@ -1,72 +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 +gtk2 introspection startup-notification vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!gtk2? ( test )"
-
-RDEPEND=">=dev-libs/glib-2.42:2=
-	>=x11-libs/gtk+-3.18:3=[introspection?]
-	x11-libs/libX11:=
-	x11-libs/libICE:=
-	x11-libs/libSM:=
-	>=xfce-base/libxfce4util-4.12:=[introspection?]
-	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10= )
-	gtk2? ( >=x11-libs/gtk+-2.24:2= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	startup-notification? ( x11-libs/startup-notification:= )
-	!xfce-base/xfce-utils"
-DEPEND="${RDEPEND}
-	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 gtk2)
-		$(use_enable introspection)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		# requires deprecated glade:3 (gladeui-1.0), bug #551296
-		--disable-gladeui
-		# this one's for :3.10
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.16.0.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.16.0.ebuild
index 3372adeff840..b3654c0d1649 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.16.0.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-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 glade +introspection startup-notification system-info vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/libxfce4ui/metadata.xml b/xfce-base/libxfce4ui/metadata.xml
index dec4318de656..5306afcc9705 100644
--- a/xfce-base/libxfce4ui/metadata.xml
+++ b/xfce-base/libxfce4ui/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-  <use>
-    <flag name="glade">Build support for Glade 3's GtkBuilder implementation</flag>
-    <flag name="gtk2">Build deprecated GTK+2 libxfce4ui-1 library.</flag>
-    <flag name="system-info">Enable system information in xfce4-about.</flag>
-  </use>
+	<maintainer type="project">
+		<email>xfce@gentoo.org</email>
+		<name>XFCE Team</name>
+	</maintainer>
+	<use>
+		<flag name="glade">Build support for Glade 3's GtkBuilder implementation</flag>
+		<flag name="system-info">Enable system information in xfce4-about.</flag>
+	</use>
 </pkgmetadata>
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index b8ed3ad704ff..8b6862672e33 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,5 +1,3 @@
-DIST libxfce4util-4.14.0.tar.bz2 516358 BLAKE2B d8e3d1e3247e23908456aa296415240c1a9146001a02cb859541922ee541e30955279fd68f2d9938e43f992a5115b21836363fa8d8234de87fca0bbaac830bf0 SHA512 6ac95aea03052d9e2f886cbe76afe9bbb43511bf3fe1766097e10cd8762541ed17060a727df3ef93e226aae448c15d9dd3ad8acd55a9d5f2387cb360bdf72832
 DIST libxfce4util-4.16.0.tar.bz2 508328 BLAKE2B 99578b898389bd90841a7f903f5473b2ff357cf81256efe1019425b48da32401ce238deffefd299987477f4cdfb77e86e415b55049863c30bf16e0e641e08c72 SHA512 dce6992c3da73367461d7464794a9b2a5503666113682e07a86e18b1c5383de2b087809448d5729097571f4fda6b4af5f4f4600848514ab2ab4b3f367ca26f5c
-EBUILD libxfce4util-4.14.0.ebuild 1024 BLAKE2B 46f7b43ced6ac5109718d2085b0a43be351bda24cf7de22caa44d0c2a1ca21c72fdc5c117f9779883730a9d92d03a5df60ab5a0b4814090843a4a29fe0144e5d SHA512 39fae6a20d296ea91c5d1844a73a8d15656289d19586afed045fbf8468957c3a072861d7bbbc847dffb407c958005c8c40b746bbbb3c759e0d0dcb7c90f3bca9
-EBUILD libxfce4util-4.16.0.ebuild 1036 BLAKE2B 36c8683b71075d374d241b4d78285e3646db9e9d8388f72507ae7c34f9bfde86489875dce4c2947c3bee0065beafdc416b72a0059af3a7316e6b11529053a9d9 SHA512 734ca40d7400cb63b2c8d4313f800c572c3183bbb9a8ae12d913eb633dc1aceb4549e5741b08e0dca3d6edab7c6153da0b0fd60ed85d5623ce121d91297f7648
+EBUILD libxfce4util-4.16.0.ebuild 1034 BLAKE2B 4bcc4fcf218d939eb32c0adb5b3981fd482e541226161e5ebadf33149eb713c83383cbbb7ea16e2758dcb524355038ec281d9380983fd62fc781b3a7df22a267 SHA512 85d68d525a65b2c55e0b0589c42f71a9530190bb559dbe618a68266527b49d16640e1f675e3dded567107b53c499e37323ca4f513042b44ebc589685b58191ee
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfce4util/libxfce4util-4.14.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.14.0.ebuild
deleted file mode 100644
index dad20a22bb06..000000000000
--- a/xfce-base/libxfce4util/libxfce4util-4.14.0.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.42:=
-	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/libxfce4util/libxfce4util-4.16.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.16.0.ebuild
index e2cb205499ab..f9c84d230426 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.16.0.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 2257552a137f..bfbbcbabb55b 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,9 +1,7 @@
-DIST thunar-1.8.16.tar.bz2 2479718 BLAKE2B 2de72f0b9977a9815c0a7f0376ceb01ddd5a68dda6c33e7d99f34378f00086e6652fa2cfcecd12129811ed6e78d45c7a1b321563ad98c5257bb6d3c58689c60d SHA512 1d096c7328b6131f097663d8f769a1e7a2a15cb24ca5116e28de38162cf1c5c544b8ed856b0d3df758947154b9e76ca720d3c614e7dca4edb71e8a219438e7a7
 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.17.0.tar.bz2 2448027 BLAKE2B c3890dfe22384ecaa7a71805c68938d59cdfcd0a602512395e9011692de242c808dc13229c0c3b3ad93973845fe9e291cee4f3b6275fc87c75efade7731d580e SHA512 6a344f89ae51c4c0cbdbac1542558aeab3c0eb45a79320e58785033a3faa2ff95751e72e089f6a2ff23056a18a403845a2b5603c89550a6ba2e0c8286f75a5e4
-EBUILD thunar-1.8.16.ebuild 2180 BLAKE2B ac3dfc810f40aa2d61f2b1aeffbfcb528873e412bdb6236a3abe2b63bb956ee91616e37633a2b3fb701e3b8333032a06fc0fc7a6b816af4dd9ad790e5f797922 SHA512 cc9d8e1a200762976ee70ae36aa2ac8eb0a68262216bb444983c68547d131fdc37852815404029518c41c30ff59b90421d819f0a0ecd030a5e6be92886f75243
-EBUILD thunar-4.16.2.ebuild 2074 BLAKE2B 5a59dbea9a93215057f169940ffdf90cc78986b260aea5d349748d415843c5a6c1b19933fc2c7e459cb59d15e93034d8ed1f107cb688be7137ed1ed0a85c9159 SHA512 9b8d30054396a0992d5171432de1298133b50b60a0a4a4a441107ca75802ab17d5670401a5f4f9fec913724760eb41f9e005fffefd3ba3aa530b92760a104f00
+EBUILD thunar-4.16.2.ebuild 2072 BLAKE2B 92976daabe54c45026e4635611fbb1e909371997af406bf7a1e2ab1481b00d8721e390d12b9ad6d8eaa1e3b1f4955505b5d2d6e13b71ad607fca009e60543701 SHA512 9c20bb83356478e50c554d13a844a43a2506adb1b6ff29f64f0303f08078093804dd0c94cfccfabaaa0a310292974e229a802719d8ed87d8e295bd58329abdc5
 EBUILD thunar-4.16.3.ebuild 2077 BLAKE2B 65b8044aa9373d9276d0dc8d3e13003a8aff91db645475dc97b38ab19f928e771d4d78f736baeb2218f5f313b464a2910d927121661c6cd393480456ad6ae3be SHA512 c1995e6389f69f4b71182824764ba4a9dde937528c5f0d0d123d5da8f92e605e8a92e28c2225fef28051f691bd86fffe0d20f35819fc086dcfa3684d3e8d5179
 EBUILD thunar-4.17.0.ebuild 2077 BLAKE2B 65b8044aa9373d9276d0dc8d3e13003a8aff91db645475dc97b38ab19f928e771d4d78f736baeb2218f5f313b464a2910d927121661c6cd393480456ad6ae3be SHA512 c1995e6389f69f4b71182824764ba4a9dde937528c5f0d0d123d5da8f92e605e8a92e28c2225fef28051f691bd86fffe0d20f35819fc086dcfa3684d3e8d5179
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.8.16.ebuild b/xfce-base/thunar/thunar-1.8.16.ebuild
deleted file mode 100644
index d56945bf657d..000000000000
--- a/xfce-base/thunar/thunar-1.8.16.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
-
-GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
-COMMON_DEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.42
-	>=x11-libs/gdk-pixbuf-2.14
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/exo-0.12:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfconf-4.12:=
-	exif? ( >=media-libs/libexif-0.6.19:= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	pcre? ( >=dev-libs/libpcre-6:= )
-	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
-	udisks? ( dev-libs/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/desktop-file-utils-0.20-r1
-	x11-misc/shared-mime-info
-	trash-panel-plugin? ( ${GVFS_DEPEND} )
-	udisks? (
-		virtual/udev
-		${GVFS_DEPEND}[udisks,udev]
-		)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable udisks gudev)
-		$(use_enable libnotify notifications)
-		$(use_enable exif)
-		$(use_enable pcre)
-		$(use_enable trash-panel-plugin tpa-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "If you were using an older Xfce version and Thunar fails to start"
-	elog "with a message similar to:"
-	elog "  Failed to register: Timeout was reached"
-	elog "you may need to reset your xfce4 session:"
-	elog "  rm ~/.cache/sessions/xfce4-session-*"
-	elog "See https://bugs.gentoo.org/698914."
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/thunar/thunar-4.16.2.ebuild b/xfce-base/thunar/thunar-4.16.2.ebuild
index d8bd56ec9a71..b88c4b869e40 100644
--- a/xfce-base/thunar/thunar-4.16.2.ebuild
+++ b/xfce-base/thunar/thunar-4.16.2.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/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index 511249b5533e..65591a06f5a4 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-appfinder-4.14.0.tar.bz2 519705 BLAKE2B e5c107d975d7103a7f58fac534eaea3c483a82885778c12c8c01cfa552d305f2f0c0ba5f77f1911b29ce58ae2efec973359df9425370f5627c95a7826808f172 SHA512 94c7266fc7c738107f1674ea3d705aa4168d9f2ecada97dc3e97c85c3857bd37a2e6517028fb51dd4663eaba4bf758927879c7fdbff83df79f8648c61944402c
 DIST xfce4-appfinder-4.16.1.tar.bz2 579984 BLAKE2B 1441fa6aeb25ee64b809a2ff31340b7e52910a768ec3b605a3832adf36ea4e27eaa3d455a919c47003d551829114ee62e78c2d983cb6bcfded72e218fa6d29f3 SHA512 5a28d93675af7d77de3050e7df9e064a0fd94d579d7e617878329d4385b42594afd8de96740cb91de38ffcc22bda71e4f90b61ff401980a5582bf09b2a19870c
-EBUILD xfce4-appfinder-4.14.0.ebuild 757 BLAKE2B 5823a14e61dc759d4f1a245de0815d2a89e18bd2e598249ebd317feab6fd6245ef8c6ab5c6590664516c0593b7955fb7c5fcad158938b619ab5e903deb8e4a24 SHA512 4caecbe05f48ac0e7aef06a8e519b1df841c88b322ebe366daff56793fb555692d04679fd5461a2e77859a390e2df4720646f14068457b79c78bd1aa073a6005
-EBUILD xfce4-appfinder-4.16.1.ebuild 867 BLAKE2B b3e690ef45fdb1b3e141675a72eb936793c03e2d56dfba2143be026806932d10b102637e2819cba0c4bd20653dd837049a73c091faea6ee7f4d98a00e8d5cf84 SHA512 cb580054797041d15add36a1789ee801071e964e1846c39de72d7e2e24148702eafb46ac0cb65097c7bb3da58eb15eb718781963e6eaf044d661d1172567630e
+EBUILD xfce4-appfinder-4.16.1.ebuild 865 BLAKE2B a9a992629417c76548024251daae7f113699eefd50f5ce6b4c6d1de6f6dc2261581502f0bc24dd3bafcd70f4f5a2069d57e612367f0909269975da01b31b42fa SHA512 3d98473f09214339e0d47f6bae0b45ca6c5962b5e1332d4dd67a597e008520eeb175860acd789be0a5a32b081d95a55107eb9c2f6eb2cc990590517a2d7d71f5
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.14.0.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.14.0.ebuild
deleted file mode 100644
index acb37c4d733f..000000000000
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.14.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.11:=
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	>=xfce-base/xfconf-4.10:=
-	!xfce-base/xfce-utils"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.16.1.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.16.1.ebuild
index 7ee23cf93836..30ab77f98a9a 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.16.1.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-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"
 
 RDEPEND=">=dev-libs/glib-2.50
 	>=x11-libs/gtk+-3.22:3
diff --git a/xfce-base/xfce4-meta/Manifest b/xfce-base/xfce4-meta/Manifest
index 701bc920f4d4..b62741c3f2eb 100644
--- a/xfce-base/xfce4-meta/Manifest
+++ b/xfce-base/xfce4-meta/Manifest
@@ -1,4 +1,4 @@
 EBUILD xfce4-meta-4.14-r2.ebuild 1000 BLAKE2B 794eaf11dd8a3f119228080ccc7840bdb03dad88955c696a2ed81a1b0e9b01fd5f67397f3da24f06dd28c39a14ba35b70d93b51007cd887d5dd5843b00445fe0 SHA512 b7a86d05c67c1c3f857e73214907b43cf39fe1af876650db37dabca48b3fed6179fdc96d121dd831776d3ac263f0b6cecb3c83f455f72cb74590b93939ad883e
-EBUILD xfce4-meta-4.16-r2.ebuild 997 BLAKE2B 2b795474ca1f4c0ce14ed273c8e5b8becd2ed60440d8e029f132df560959bcb7566a7364a9e4c05142c99e9da5ccf28df1275fa8b1a45f2c03682c31c8f2bff8 SHA512 7d1422ab410f86b1c3239096a173806face543b6b8fd35b6895befa7a08db8db381e6fcc550d6ab167209d5783906c03219a2f5890467ad5104ffeabdfd2fa71
+EBUILD xfce4-meta-4.16-r2.ebuild 1000 BLAKE2B a59d797e7a2add23c00ec8cb0894184ddf59b1c93f31f378b5c5192c06c6c9dd889cf698e1960978717b054451ea5076f1fc60603ba8420a9cdc11fa65df4293 SHA512 bac36a56cb7ea788665faa702818ee567830275fd57392a6ed1a44386008da8876722fa70fc98b391fcb49e576a1dec84db58c78ba604715f53ecbbeaea13546
 EBUILD xfce4-meta-4.16.ebuild 979 BLAKE2B 49e57b6c37d2a2744c8303bd3b0351e1b55584c34a096e3534d272ea7e79d91f0608e74cff83b7bfd3465af2ddd2fe4df4a372a12cfc43e0c1bc308c70dd3f23 SHA512 e22b654cc4831b03b94fad9a01dff332bce12ab0fa00d7b2924db56027654d8639bc1cabdfd9b1957f7008ede29263d6c149578486c0cf98cc60ddb832557486
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
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 8893425dda45..3e2636292259 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 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-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 4ea34216585b..32110c61b7e9 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,7 +1,5 @@
-DIST xfce4-panel-4.14.4.tar.bz2 1307938 BLAKE2B 79e0abcc5dfe41faaab1de981b8a61a99e9c11ab5b3ddba5fb7385517d24b50210f12d0a6a49720d6d8458fa7143ed65d7960025c5e8c01af1a59dd6b339a2d9 SHA512 5ae7c7acf0254fdc3f5eaccf75d7c12699ab8147322f231af7bd17b1238b8c25a96d628dada9caa086fc8fde2b7dc4030a38eb7b863b290f9e069193b3728d85
-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
-EBUILD xfce4-panel-4.14.4.ebuild 1527 BLAKE2B d2934e562562ecbd321d33662f71fd5f2eb1f98a55cc65142487d4c94417a9bb2f21d6a344348383b1bc404007320469ba5f732e89af8f52ec990681fc35e561 SHA512 4e39319392bea17946856bb1ad3b0cbbe33f0104cf310a345c889fc51bbf09a2cc17ebf68ece96b0d1c76855328bce133c6a9158ef9566f37f393a7e0997f0f1
-EBUILD xfce4-panel-4.16.0.ebuild 1529 BLAKE2B 159ed59fb2b3deac0fdd184668f3baad9e089bf76f4952cf1e9a0c9061a3999ee61f7844d31ac3027ae792e3812fc9a7027344e7470645087e971603e3468b0f SHA512 f1763269c63698fa5c731e7f8df799ec0456aff122c0c2c40ccdf8fa8457a3f31e2164ef3487b3683adcda4fc9391b3dd059a5b98137560ec7c620d2b818c1f7
-EBUILD xfce4-panel-4.16.1.ebuild 1526 BLAKE2B aa9b8a993e6d70cecef18400e3e1800d3d5b3125ffd84b909fc19cbc93254a732ee34ebaa762956df0ec08e9f51ac1e879f114bf14f1d99a8cb807658468013e SHA512 9d89a04a1a7ee40ff7f0f5766aa0bf0a47dc0968b0525ac006ffd1d8f293455f44dffb9f280cc314d4a418c7fb4b61ef399f57acc87903b0606dab4296cee00c
-MISC metadata.xml 432 BLAKE2B dab6294a3da38c0cdb5e304422f5213bf198c4d146f58c9657ab9715e70076cb10b2db12d6b69c773837216bc781398c2251f33b19fe8752d265c9dc4c770682 SHA512 db51de1fe1a9cd3a6268e0a90e66a853272075d31536a7e3de337a9f077db5e23ac4e58cf30e3c4b3186cac5ea143676ec47f08a85239b6229f290cee65382e7
+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
+MISC metadata.xml 376 BLAKE2B 84b7637bb8b18e886b31631f243aa37c19508c4c3f5540e6f11dce05f49fd4a637e2098d43a6c57708a11b9d5520edad6d0a873712133b96e3f707f0660749a2 SHA512 a8dcec846dadd3d3b9c5555049b7d4a6ef1b7d4bcbc3f0ccebb8f92e2daa40ce443e47d3e850f47d30e2dc745804fb2a29f20b2441eaabc8cc9e62262cbaa0c7
diff --git a/xfce-base/xfce4-panel/metadata.xml b/xfce-base/xfce4-panel/metadata.xml
index d0063aeb56c1..a510c7560491 100644
--- a/xfce-base/xfce4-panel/metadata.xml
+++ b/xfce-base/xfce4-panel/metadata.xml
@@ -6,7 +6,6 @@
 		<name>XFCE Team</name>
 	</maintainer>
 	<use>
-		<flag name='gtk2'>Enable GTK+2 plugin support.</flag>
 		<flag name='dbusmenu'>
 			Enable <pkg>dev-libs/libdbusmenu</pkg> integration
 			(in status notifier plugin)
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.14.4.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.14.4.ebuild
deleted file mode 100644
index 73e89381c67e..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.14.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vala xdg-utils
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+gtk2 introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!gtk2? ( test )"
-
-RDEPEND=">=dev-libs/glib-2.42
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	x11-libs/libwnck:3
-	>=xfce-base/exo-0.11.2:=
-	>=xfce-base/garcon-0.5:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.13:=[introspection?]
-	>=xfce-base/xfconf-4.13:=
-	gtk2? ( >=x11-libs/gtk+-2.20:2 )
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend) )
-	dev-lang/perl
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-BDEPEND="dev-util/gdbus-codegen"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable gtk2)
-		$(use_enable introspection)
-		$(use_enable vala)
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.1.ebuild
index 001b99e1d685..e64f096e7b73 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.1.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.16.1.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 )"
 
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.2.ebuild
index 8cc7d2819e26..b3238b007d87 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.0.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.16.2.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-session/Manifest b/xfce-base/xfce4-session/Manifest
index 2eeab46c7ab6..066415015f3f 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,6 +1,4 @@
 AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 371 BLAKE2B 7737f95e5ce5ad9d421b8d39e577899b145d12ce4faebc135eaa052a6637508dfd4d5a8d9c6bcbe987026cedbedb5a396b294edadfc7241a607c7b0ef9a218b8 SHA512 85914b96def54a504f5dbaecc57f47f3529be0bd2efc8dae8529c56bd764ff9a644e17e14599b947aef4a7311a32a3e0b2ef5aa6dea45287cdc09b01bfcfcc48
-DIST xfce4-session-4.14.2.tar.bz2 841878 BLAKE2B e59be7bf622c40df60051643e52e703896d994f3729167e532a8594d19e139050b3dd995a153b0397c5aee2cbce9880abf8fdd011115db999508eede8de0034e SHA512 ab67cb576ac4880f41cf8eec05539a733da066c50913c9c2c9116ed3129b342aa3ca005ea5b46a733780cd062a4454d530240d89660b6c48a2045c821f7c490f
 DIST xfce4-session-4.16.0.tar.bz2 875504 BLAKE2B 8e06e1ff378593b90c3c600bd5aabb3ea9ba9e58854ed615d39009595be4b71c5f77359e4249a93f44aa67795e2d4bf658b83d9c1d445304764eee655ed1f9e9 SHA512 fd74b24d0c2762b5a99883b62ca9447c3683e42e9e39193d0f60e02b8c1ad77a3dfff4df6f3b3c345d8ea3d4c4ef93485e9b5586862bab85d4b37110d3400fad
-EBUILD xfce4-session-4.14.2.ebuild 1741 BLAKE2B dfd2a47a46a9305754ee200f164145213a5e31111b5ba3b77af41a12cb5e4516e17380a843f317edddb70d7b2d916a7b002a4ea6b6c3fa89422d1f27ad994a1d SHA512 1c0f371556319bc4d4a60077658358669065af5ac653be9572468e4bc73f3393770ab5399df3d197d82e6e9ca077e81a6282fe5ce55aceed1450ad23fb297785
-EBUILD xfce4-session-4.16.0.ebuild 1746 BLAKE2B f6a3cc4559dc9a0ff5e7e86d3f8df14de1538bf5738f981cc6817b65d45a1c0daeb07cf77550f690c41ed46e3c104f58840dc9054dd4308f3f4161c76a646f94 SHA512 703f7bd4aa59f5a2f260061c5d023187737a28efc56b4b649f41e9878c38a71fe326387193f1a1597ebf86b6bd80b54313516b1d975ae586d65b130b65043f85
+EBUILD xfce4-session-4.16.0.ebuild 1744 BLAKE2B aaa98735efc372687c10f4a80d16979634f9c898952009353a3f2d91815fbd4c28c3422236dd0fca4384c2d0fc0508107986dd43d181835018be61d763dd2df3 SHA512 83987e3546affae94aa61c77741698abb5c3cba1cb26e61daaa53667c7ec3ab895ccdec8513b57a6c56b2f46533baed10a99022c214a643e8aaa295049e8b7f1
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-session/xfce4-session-4.14.2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.14.2.ebuild
deleted file mode 100644
index 28535422b238..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.14.2.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.12:=
-	>=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)]
-	>=xfce-base/xfconf-4.12:=
-	policykit? ( >=sys-auth/polkit-0.102 )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xrdb
-	nls? ( x11-misc/xdg-user-dirs )
-	xscreensaver? ( || (
-		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-session/xfce4-session-4.16.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild
index 3dd1df480787..c449199458ff 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 bdf6c7c3d131..886b15d1c03a 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-settings-4.14.3.tar.bz2 1201308 BLAKE2B daf20e5adda24f3c1ecc88506c1a1cd03b33b379bafc236ed3b99404b816803288041de7d507072a311c3966bb0e040986e358ea94d01636c56ea31c1b843c8d SHA512 fcc5bfa98d8903dc3ac51ec909e542485a44f6c11ddca815508c2ed913410a0becd54b2db6761ee48f5a20d6ca08377eeefbb54bd0cb7cde0a0c0d4b65802ab5
 DIST xfce4-settings-4.16.0.tar.bz2 1492754 BLAKE2B 10bfa7ce556547a4a41e1a3691ea3e41b9de57bd21760a91424cd27469917264ce00ae7324ee1d81bdf27f6b275415af932d63aeba4e80de729e42df1cbff488 SHA512 38c06e4d4c0963019c20a3afadb0dc1bde8d1b477bcff2d0253e29beb5e4a8b5ae9d058b544cec6fe2bfc2c1d44f74283c94538eda25436d58db0754f112a238
-EBUILD xfce4-settings-4.14.3.ebuild 1563 BLAKE2B 45a73d4ada2598eda4a41b52c695ea07ee0cd3f8aaa6649bcb7fe1a0279832157f17d00ed7406b9ed24ff91b4dc7c0f2bf80a5eaffc31e77b87960e097686459 SHA512 f1984880e7249b27ea37de135af9032460ec93ada9fce55287cfafa1d81abe72e6ab55fe970d7a2edc3af8abc266398ef1d4854992fa918af0eec36ea5e12167
-EBUILD xfce4-settings-4.16.0.ebuild 1726 BLAKE2B 1985761d123d2b4d5892b8eea7264bd1bca72099fcad4d1c20e3c71f202933747460e3a1d27916385a9b9c05bde4354e1c72f1377d9fc2b0266adfb797608ada SHA512 e7e734d3aebc5f5a1b4d5a6209a4663da32d1e281e23cf5d01ee3a6e5b3177a51bceaeef840c663026b6670286cb37c211403ef68bd850b4e6da4f6a452cb1c4
+EBUILD xfce4-settings-4.16.0.ebuild 1724 BLAKE2B ad992daa89f1917c3834309c1ae532ee261ca8a5fe823389e15e78be9c916e1506afca2548ee5b82ec56a50172431cbb77c7b2c102e3eed0befebbc92cb1b862 SHA512 d458f2a4c4e6b5b617ba0c075f7147e32d6ab2e1b3d38f7d16ed2ccbbc03f449521bd5efa26f30754f48a7e2fba0758dd1179ef4ac48ad1c923ba4d7c49850fd
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.14.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.14.3.ebuild
deleted file mode 100644
index be11f7579648..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.14.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
-
-RDEPEND="
-	>=dev-libs/glib-2.24
-	media-libs/fontconfig
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2
-	>=xfce-base/exo-0.11
-	>=xfce-base/libxfce4ui-4.12
-	>=xfce-base/libxfce4util-4.12
-	>=xfce-base/xfconf-4.13
-	colord? ( x11-misc/colord:= )
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	xklavier? ( >=x11-libs/libxklavier-5 )"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	x11-base/xorg-proto"
-
-src_configure() {
-	local myconf=(
-		$(use_enable upower upower-glib)
-		$(use_enable input_devices_libinput xorg-libinput)
-		$(use_enable libnotify)
-		$(use_enable colord)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.16.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.16.0.ebuild
index 4f23c8f07721..ca7e2f49eef7 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/xfconf/Manifest b/xfce-base/xfconf/Manifest
index eed576c3fe9e..d8685998b88d 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,5 +1,3 @@
-DIST xfconf-4.14.4.tar.bz2 592024 BLAKE2B 1432ca360fd1f02437f238f66906f15a8b98fd0e7f4525bc2b61d53b4e3c146a1a4f8480089956e0a2e5f88d952822ba2b151f54183619a88e3f14f747f6676e SHA512 2335c73078ec1b035ceb1d96a2e16d9e63ca7ad5cabac96478d134ad3f94c0e81351df8acd8fb446a97a56f30472502006d93e96acdafc69262af3bbb1fc79ad
 DIST xfconf-4.16.0.tar.bz2 634858 BLAKE2B 34a03e457934310d4750b0811ff3b6fbde0c786656c9cc1bb2dd733e0104c2ab3ff1834fefcea31a6711931406b8ab507a528596b598e92c401defb8e6d7715e SHA512 d2e6b272243d6eda71f42cb3df18cb9c0745a1864718639e9aa494902dfe5b4989b2761fee2195456e5725cad0f744978f9c95c6f01e48aa016a919ce3468344
-EBUILD xfconf-4.14.4.ebuild 1964 BLAKE2B aa503be5c98ad70582b81367d59a179dfb06051094f3c93b08e8913d508e096ed93d7933f7eb524d12f041c42b1a4808493db4bed5dcf7e8d15919e8532f9d7a SHA512 4101839d285f48bee7ef4f3d95f8d7095963af1c3eb94c1e24c9b3173866cf1be34d80fc5c2a593f048b1035fa64b0f4bda37dc9ca0510646a8da2f39dabdf10
-EBUILD xfconf-4.16.0.ebuild 1765 BLAKE2B d8c407b6340f9eb0f58e542f0082611a34388a0583102d9152f8ada6d1c1744873f76911c2d364128c016c5411d3f22694101974541f22b631b1a5c438d99f9a SHA512 884ca712b4e3116c79a32c21245e85a819f91befa412051d416364f944ebef1a3f4b15ce6d19f1bbe81e8e452145d2598da5baa423aa36db6d6f1b6eefe951dc
+EBUILD xfconf-4.16.0.ebuild 1763 BLAKE2B 898add8e33ba629625d49bfa82c1b3031175d171428adf0380c11a057fb3806d5dc884afaca3e58bc7fd4af9e4d58b9ba16d59d17be6120b8cb197681662bc14 SHA512 85f5ab4cf332f998831f23a81522e23730c872eb6039ab1127324570d9ede1e196c2b588081d706ce88d9f6c27f898bc1dabf79e2aeda688ddb88bb3ad268e04
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.14.4.ebuild b/xfce-base/xfconf/xfconf-4.14.4.ebuild
deleted file mode 100644
index 6569c2001148..000000000000
--- a/xfce-base/xfconf/xfconf-4.14.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 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.16.0.ebuild b/xfce-base/xfconf/xfconf-4.16.0.ebuild
index 7caaabd416e4..c2ec5d56b1fe 100644
--- a/xfce-base/xfconf/xfconf-4.16.0.ebuild
+++ b/xfce-base/xfconf/xfconf-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/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 vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 31cd0716eb49..1076c2a6d707 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,5 +1,3 @@
-DIST xfdesktop-4.14.3.tar.bz2 1549953 BLAKE2B 338d80d8acf50235c0763e9de9dfe6fd933769b7f46ffa322eabca252761b13c5024c780aaec8e87e1d1ff08ce21e63e6ae871ad030daa0cedbd7734dbd94613 SHA512 30e5ce74468f8f56b78144bea9dca620af19aef031c86968eb40b0a804a7a767f3cf817994bbdc6ed096b4558fab3e59062fb832d79f7dc3455df9b5540577f8
 DIST xfdesktop-4.16.0.tar.bz2 2041114 BLAKE2B 153a11b27b3ac92ded0c97257f19b4bc9018f384d201b41d82dd07df26ced7b5ded19ac98f80fb14e018d2df848f10b93cf629f05a66cc3b29e08313805fcf38 SHA512 e62e5fb12997c3138fa36aed06388b921f5223ec09afbd22b622ef39bc421773acbf73606ffc3b38b5a01845678847cda43d193c8457608715cf750acd466129
-EBUILD xfdesktop-4.14.3.ebuild 1154 BLAKE2B 065908ca5d908a837bdd3edf753c0f8b2bd59ea51e4aeca51e68fa06e52dde8246c6af97c225f15c4a3aed95ce4ab45bb5884b19e83518744f5888ff6af65693 SHA512 01d3302fc5927bb6ca7ead4d47ba2ded68856d56500d68a3ebc41c85cd7d569bc6695c40b0e1386e07940ac176c6f5e9e07c032f5f21e98e38dd1db6180f4517
-EBUILD xfdesktop-4.16.0.ebuild 1167 BLAKE2B 192bcac6bde4d758cb46834fbfbbd491a2651a773b2deca59f6c9bfe9de55aabdd42c15dc71aa71fc7bde2d3abf299285febfc39a3bed0d3c04d0d6d7faaee52 SHA512 5cd12060a24a914b9f15481543c791681fbbcfaa1e000f3e335be03f39e36df99265a428a024da1d185c773fca6b10eef145524a938abe1632984a74dbe73a10
+EBUILD xfdesktop-4.16.0.ebuild 1165 BLAKE2B ca115a0a3fea0c1282fa6797a96b3476a205269870856e1a8006a8b4fa46bd0be9ffccc05e8c174566bf0acc829f47016fcdd489028db67884fb64dad99c5515 SHA512 3e782c1117d5c38a1a5f82d85c3981d04f5bd6e2d0752832488b6b59c375e27076d60b25005f7607b03beeb26a8ab33e4eb82d51206deb6ae1033050e537e1b6
 MISC metadata.xml 364 BLAKE2B 64544c9e89e370bb213647843ebc3c5d4ca08aa46564b02830ff041e74db5018d7503106cba4e7c1dd562f359649974f12b841e32136eb73e9d84ea0ed36f456 SHA512 3140dbe5320efba5393874f93b907ef2dff1cc8dd44cda7340abaf19dcbbd709beb7649ac72f1e9f92da546e010f966cd9f5d51b867c6df8c49332bf9de67dac
diff --git a/xfce-base/xfdesktop/xfdesktop-4.14.3.ebuild b/xfce-base/xfdesktop/xfdesktop-4.14.3.ebuild
deleted file mode 100644
index 64d22d2e74d8..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.14.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify +thunar"
-
-RDEPEND=">=x11-libs/cairo-1.12
-	>=dev-libs/glib-2.42
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libwnck-3.14:3
-	x11-libs/libX11
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/garcon-0.6:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.13:=
-	>=xfce-base/xfconf-4.12.1:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? ( >=xfce-base/thunar-1.7:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.16.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.16.0.ebuild
index 670ef24380f6..710a01ed71d4 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 1a856c207eac..4ab54ebd0d19 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,5 +1,3 @@
-DIST xfwm4-4.14.6.tar.bz2 1167818 BLAKE2B 2315843da3684ea069d8361d1d787634052da5449d7aeb4ba6b219cd46ae4b7b6007becca316a5ab552fe4432baab3efa6a23793b68a00d06c9fbe3d1164080a SHA512 1e3cc3e976250e311607d12e1a51047132584d6e8cd8979e3d5a85a3cc49e420453e3812b2d8a8f6268f3d6f1b44f4df2b57b7e1395d02ec63ae82a55bb9d4ee
 DIST xfwm4-4.16.1.tar.bz2 1201722 BLAKE2B 4aae9b97095b423964a2ece7fe09b46ecfcea6688af6ab3b38ee34611cd68a7427597cb963b91b209d161c85aed552df15d005268bd8585d365b0cf63adf36b3 SHA512 f0d5d00e58202457d0d7d5f9772e7b2aa3f3339850065609baab7d379248a628d147464cc605698970134b87d58b7867b8c09d0a3a45ab84b2f3aa95be26f0b9
-EBUILD xfwm4-4.14.6.ebuild 1657 BLAKE2B 1ab8099643ce1df13fdceb9e9392a41cdd4702fe5988f3aed77ab1d458dac95c2fe1349eae47a931b978813f7d943a4e5862578aa7419feae72efe46ac2294ec SHA512 91ef2257a1f57051692291375bc0dbb280e27a886fb92d0d8bbdd5e916f47b7708c2dc0e852f7c4370550cba31b7cf20cccaabca50d1935ff05a23a04b2b2e24
-EBUILD xfwm4-4.16.1.ebuild 1629 BLAKE2B 2469a1494d355540cd51fe1e384a68313ab92890bc0b6e0e85f90f6ddc5ca7765f6d310791f004b95df7a0c8461dfa1fe5a5de6b2c7fce091a0ea537efcad74c SHA512 8a85cdc341309b93ecf397dd7fd10321621a0c0ec5a5d8fae6d3334ea2456cc80eae0e88d428c4b173041847df755ed6ce194f74949591f17fafeeec9afd4d59
+EBUILD xfwm4-4.16.1.ebuild 1627 BLAKE2B 943752586ece3d85a1f2597a1e7488d3989dc56a6aa42888d16c9dbb3fbf5bbd88749e487052a6915c5273f5ec2d22b125b075ee1fd7038d1ce4ccb93b211ff4 SHA512 c0f51bc07e6d078280f28e745f13dc3f742fa2af6d88e4c0c3a263aac67a0000bf164a97d0a38e2022ef0f4d7a36e9422c77c13b95a3dc4f6406b80b824fd805
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/xfwm4-4.14.6.ebuild b/xfce-base/xfwm4/xfwm4-4.14.6.ebuild
deleted file mode 100644
index 58a16b960ecc..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.14.6.ebuild
+++ /dev/null
@@ -1,70 +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"
-
-DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable opengl epoxy)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xpresent)
-		$(use_enable xcomposite compositor)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfwm4/xfwm4-4.16.1.ebuild b/xfce-base/xfwm4/xfwm4-4.16.1.ebuild
index 245aa07b6ea8..5315650f598a 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