gentoo resync : 03.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
commit: d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree: cf61513204d97974179580065e85df5c8009087c /xfce-extra
parent: 463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
80 files changed, 200 insertions, 1072 deletions
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index cd984318bc9b..0374b59680f7 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/thunar-volman/Manifest b/xfce-extra/thunar-volman/Manifest
index b72f0830ac25..537f3b5209e8 100644
--- a/xfce-extra/thunar-volman/Manifest
+++ b/xfce-extra/thunar-volman/Manifest
@@ -1,5 +1,3 @@
-DIST thunar-volman-0.9.5.tar.bz2 501846 BLAKE2B e64a1593551cb542461be54e7e0624a9e3a3f0db43df166f0922f79e031a0f85da3eb00289a8d30c427c5f6500a3e12b065a7fdf3f34e24d6e88d27be048669a SHA512 843ff1f55b68e6f584da29c2c6c91ed045c4e9ee05cb573db6a0192553cf05faefb4227359bd6ef306c2bbb94e2fe5357c07f70a0d170b35c48d3e9ebac7a9b9
 DIST thunar-volman-4.16.0.tar.bz2 501194 BLAKE2B 3d2fce7bb9a52a950ab84fa9986387af01d7d55864bd8fc1a3051ab406c99648b4ba21d018e806baa07ec1ac7e2bc798eb402b1c0e115e52b58ccdbda0ca4c5f SHA512 33b7561e55491b793aa634dfa0b108788286e6b7a2f60a781b8ba10f73de74630520736ae99c4db66ae2da562a82bb1a6bdacd8307d6d452f26e647da6471af8
-EBUILD thunar-volman-0.9.5.ebuild 1062 BLAKE2B b3e9b1dbb12732f360c15428089dfd864e4108b59c2d76ddbca329efd69a28cf13f5e74623bddfe2169f2085d047ad7d113e9523c90f81243d062d10a96881c6 SHA512 937e34e64e87df8692eeed601b4e70687cb3f501576ee1da6f26f79bfcf77f000cd334a732a41935028c420cc6b5aead6dc996c2cd22e90253e1545d17a6fdb4
-EBUILD thunar-volman-4.16.0.ebuild 1035 BLAKE2B a1cee28dc31d5ea46415ada7d5452eebac9ece78262e869bcec7eb325a930a60d40c0e02772082b4887806e0f953b16b6d5f6d53fb301090a1b944838ad82deb SHA512 5e65f646fcac050af7d0c7bd742999cc41a2418bac78b7398108694d3b2c74ef96c6ed587da6d7ada25a7198595473033244ff7e27c51130293c486d4d19ae1c
+EBUILD thunar-volman-4.16.0.ebuild 1033 BLAKE2B 1da1a31a0bc9e7745c5b638f000aecb9d1d2f299385491554d0490a5adca4ac8fce12fd9efb00c665fec6273d2853cdfcc6f7acd48fff71836e1f7b390c80beb SHA512 23ab9877e624e2e4c37b85edc2528ad31ec340e62dbd075c42e329967e4f5974e184eb2417b9ce0fecc6835b48c7ec8c56e2b65f73b276e2445e801a7648d9dc
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.9.5.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.9.5.ebuild
deleted file mode 100644
index 69aefe7cda58..000000000000
--- a/xfce-extra/thunar-volman/thunar-volman-0.9.5.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
-
-inherit xdg-utils
-
-DESCRIPTION="Daemon that enforces volume-related policies"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-volman"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-# CC for tvm-burn-cd.svg
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="libnotify"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30
-	dev-libs/libgudev:=
-	>=x11-libs/gtk+-3.20:3
-	>=xfce-base/exo-0.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfconf-4.12:=
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/udev
-	>=xfce-base/thunar-1.6[udisks]"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable libnotify notifications)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/thunar-volman/thunar-volman-4.16.0.ebuild b/xfce-extra/thunar-volman/thunar-volman-4.16.0.ebuild
index e35b5245b30a..38182c999cd4 100644
--- a/xfce-extra/thunar-volman/thunar-volman-4.16.0.ebuild
+++ b/xfce-extra/thunar-volman/thunar-volman-4.16.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 # CC for tvm-burn-cd.svg
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="libnotify"
 
 DEPEND=">=dev-libs/glib-2.50
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index b3e06582e6d2..e938ce1c211f 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -1,5 +1,3 @@
-DIST tumbler-0.2.9.tar.bz2 557794 BLAKE2B 564b0d91489ee617799749db13085301f8b7195736ee01cd44d1e4bee7130a34235deaaac973f9be902b63eab46c69a5a277872204f53067d15645556f00dd42 SHA512 df9cf9b2ba77e220f11c5ca3ec4601c973802b802e989dcd24d1b2c7c13e97c185071488c866f3ed5ed1cc6defde1a4879b5fc2c48bfc015456508e526d6bf0f
 DIST tumbler-4.16.0.tar.bz2 607640 BLAKE2B 9958c70f5e8b09e3a23e54cb0ce5a66416fe7459455dd145196daad24c2db0cea77ef4a4c7a8809a150f8dc6161e7e4825bf2ca48a5348fe702cec5e09a93706 SHA512 86b30a1b3a8b668bfd6cecb39bbfc642793d63055b0f3dc32e4e275082d086a9c011a98511938b7489099f35458613b3df24224ff48e4940f42ff552a14fa9d2
-EBUILD tumbler-0.2.9.ebuild 1519 BLAKE2B a81a65908ada232820909bcb584c7cea3bf3beaa19dac3c30cea459474f72605416949e9c81ea8b7edc86a1eb75f17ea8d48f9d95a8159d7aeb8c2cf59ab7000 SHA512 f22ac81f25795bd3e4ed679673b0544d6c814a5a60a2a8d5ac117e12a471b534aaf09bddf590c2d45dda9fec617f818bee34c136d5c2a889d101468fcd175658
-EBUILD tumbler-4.16.0.ebuild 1668 BLAKE2B 02b45c6a77080f6065436209c9c58f88114202bd772d31d0f2383d2ffb9bf1bc8933f8c31a298d3d0c079de2f2eb6e7fac5ffbd81db79a4cc2d36723939fceac SHA512 7dbf259fae3839dda8813b933afc4d1f58f4556b859ac63e302fde86e7a00e88e4821da416affa18f76631ae3522059ba881ed1b1e02f7f9f9bf9355924ffde7
+EBUILD tumbler-4.16.0.ebuild 1666 BLAKE2B d15a776d9068b5a1e489abcf9ed5e952133f8eb50cf6b0c5f427b573f84fb808c7544b2ca88f923c6de52014debf4bc217b3fcc197520672c091440c96789c5e SHA512 7a0c02627a020e00fd8239b6f167da764d65494d38e9a4006484bce6a471fe88a0cb919698775508046d9faf8c70f59a38f46f273144646de5525f06448495f1
 MISC metadata.xml 469 BLAKE2B d1fbc54e5a48e14e245c99882b0c070086c9a9f353b428dc5bc4cf7f5f00b016e7e3c79760535ea58b6e88b11251a05ec3adbe386990f33db32b4f2f19185890 SHA512 985db7ab2e2cfde51f401b503e880dc47e67726fa9ddb78262d1a5f6c9b13a61b109ba2432c68bcbda8032a97a9ebacb3aecef852ef7622a56290db5d5c91e73
diff --git a/xfce-extra/tumbler/tumbler-0.2.9.ebuild b/xfce-extra/tumbler/tumbler-0.2.9.ebuild
deleted file mode 100644
index 9421282d86ae..000000000000
--- a/xfce-extra/tumbler/tumbler-0.2.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A thumbnail service for Thunar"
-HOMEPAGE="https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="curl ffmpeg gstreamer jpeg odf pdf raw"
-
-COMMON_DEPEND=">=dev-libs/glib-2.42:2
-	media-libs/freetype:2=
-	media-libs/libpng:0=
-	>=sys-apps/dbus-1.6
-	>=x11-libs/gdk-pixbuf-2.14:2
-	curl? ( >=net-misc/curl-7.25:= )
-	ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		)
-	jpeg? ( virtual/jpeg:0= )
-	odf? ( >=gnome-extra/libgsf-1.14.20:= )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )"
-RDEPEND="${COMMON_DEPEND}
-	>=xfce-base/thunar-1.4
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable curl cover-thumbnailer)
-		$(use_enable jpeg jpeg-thumbnailer)
-		$(use_enable ffmpeg ffmpeg-thumbnailer)
-		$(use_enable gstreamer gstreamer-thumbnailer)
-		$(use_enable odf odf-thumbnailer)
-		$(use_enable pdf poppler-thumbnailer)
-		$(use_enable raw raw-thumbnailer)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/tumbler/tumbler-4.16.0.ebuild b/xfce-extra/tumbler/tumbler-4.16.0.ebuild
index 655d7b13a8a7..8aa91ff1a0b2 100644
--- a/xfce-extra/tumbler/tumbler-4.16.0.ebuild
+++ b/xfce-extra/tumbler/tumbler-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 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl epub ffmpeg gstreamer jpeg odf pdf raw"
 
 DEPEND=">=dev-libs/glib-2.50:2
diff --git a/xfce-extra/xfce4-cpufreq-plugin/Manifest b/xfce-extra/xfce4-cpufreq-plugin/Manifest
index 2aa1900486d2..a3fabfe1d9ad 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/Manifest
+++ b/xfce-extra/xfce4-cpufreq-plugin/Manifest
@@ -1,7 +1,5 @@
-DIST xfce4-cpufreq-plugin-1.2.2.tar.bz2 408480 BLAKE2B da6f38a57126b8ad06dd77c9a1f09ffee78e58b390b53b5020af8da403b51f20ed8965b9d0bd0da2add993228d19ec9fcaa15ea4c22b42011140a8bfdb440dfa SHA512 b0cab40fa0e6cdbb59606d7712b1b1479e4a1e8ca1aa5a59d43fc863ac10eee6477461c827805d7544db49fa6e821f0351973fe650e2ef1520ddcadcbbde096e
-DIST xfce4-cpufreq-plugin-1.2.3.tar.bz2 415151 BLAKE2B 5c3c1298c5dc0562f4daf8df9c4f9e0d26b638f85efc5ec35d8edc08bb54a8de46b5af98c603fad6042eca0353419ae4f55cb642dcac7e3ef47509fbb712d58f SHA512 e8e9d705f304681253b6e8fb7ff8724dc7c339fda750c2fb7f05dc4f295b483679c0e2884e508c108ca9018499b50f4ff48a7d4dae5ef7c8ab78f0018f1ef959
 DIST xfce4-cpufreq-plugin-1.2.4.tar.bz2 416385 BLAKE2B 65df9bdd0427f5cdebe1a3427801b2ac69fa04a1b6da069c15a7463927101a6744e99207de69bd8ed6f0a92259fcaaa34a25e7cb26b74f82a9bfad38ddab8cda SHA512 6aad36cf44ebde55e9d05cabe8547e9335188749ce92317c949c00577b04a80f2239c03664802ef386a06a2c24c433a515dc598ea36c9299766a5e56b5ae6ae4
-EBUILD xfce4-cpufreq-plugin-1.2.2.ebuild 808 BLAKE2B 80c8eb54af5cab054ddf19f65ce267f9379ca27dedf2824e56c426562e57604f83116f73f6dcf3c496e9aba906e82d80cfbadbc96f0a4eb1608e61bf81273055 SHA512 38b38bfac8e184db72f84730990afe7ee572210ea90c90289a880b49ebecdd380627150260a4be54556c1221fe340e55a2ea2030c48d0a0e6f200aadb569470e
-EBUILD xfce4-cpufreq-plugin-1.2.3.ebuild 815 BLAKE2B 8a801efb5c5cc46f22c9efafba35eae02b84f48129fe95553faafd8acf82b8f693b57e0aa5833aa1655cb62c76656cbc461a0805cd6c93fa720d126573362efc SHA512 218bf651bb50bc9fabc8bbdb688b7e316a1946a926d447661ff521ddc470c62233af933401909f5cae0b3d62d0ce4ded841c4307638207c247538bb652ffa0d3
-EBUILD xfce4-cpufreq-plugin-1.2.4.ebuild 812 BLAKE2B 2db68434dadd262bf1cb9a92b756730a4b098ced7aca60daf8cc64a1e73025c48ddd5ad456473fc37f89ccfc0f0059921810046add50108dce7422bb2efedfb6 SHA512 a17b00f2056cbdda8c628a588ad4f4cab6df372fb014ddeaf325c6cfd0ead61cb4e5f52b29066e916c8697e6fbaa3408b1eb66808481062c155e1a302c0bd8e1
+DIST xfce4-cpufreq-plugin-1.2.5.tar.bz2 424858 BLAKE2B 2d93e9f3e591cb3f97289b3a449e4a3494a4bcefe97ad481ab46d0c1b749a85b068cc8e6ecad5ed0d591516cf996d7ab901cf21bcfbb63c28f5b28f4e7e01a3e SHA512 4a098861875f2a413e8d3778e4eef709f00efc87d9cd76ddab22462653ec21f4b8756c421e3f0726c56f151f0e637e27d2c80c4b09ab8ecb419e00bb108d3b80
+EBUILD xfce4-cpufreq-plugin-1.2.4.ebuild 811 BLAKE2B e1e4f481034767e8dda039250e22c4364fbe101b7473d8d60744f20e6f2c1e08c622de11854fb9f52221331bb88fd6a1f88ed8b27f2b7c8423cf40973c042300 SHA512 b4156b88783f689b2c1649a23763b9b0ba65294d1e42f5b30c5289f67affa99717c2386b595bf9503d59c2d3d8d371351345bddb14a8bb291857fede6d3a3d2e
+EBUILD xfce4-cpufreq-plugin-1.2.5.ebuild 806 BLAKE2B b2f197fc74f02cc65c16a10f3720567da3c10bdd583af712755daa8a74f12b640a927ccb82d8e8d0020d88add980f11f890bb1943d0e3c375f73b2b2b75ce5f4 SHA512 e153904e3f6baacac964d4a36b94a08f02bb4abd388acfc828502a60e83f5b132ab3e7216ac9e67c372c04b3cd3f892858bd34f26af8feb5b88986b0edcb0417
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.4.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.4.ebuild
index f1e8dc52853e..68d79bc783c0 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.4.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 
 RDEPEND=">=dev-libs/glib-2.20:=
 	>=x11-libs/gtk+-3.20:3=
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.3.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.5.ebuild
index 3bf59fb4081e..0c6ed8e23b60 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.3.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.5.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND=">=dev-libs/glib-2.20:=
 	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4ui-4.14:=
 	>=xfce-base/xfce4-panel-4.12:="
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index 45bd1a40065d..aad9b2c9ee4f 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1,10 +1,7 @@
-AUX xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch 582 BLAKE2B fac452ea81882f1305e913bd25c48db3e8d01459ccb8b387ed395f4b48ffb83b7e9d5ae28a4a6d10056944d270571edf2228a81510f63134aeaae1c9f62729a5 SHA512 a856f816e04b2b7629f02f27f309ee40728a0f98702b95692e9c466d548f4536eb6b32590aacc29721987d3f96bc99a9a8ac209a63035aa02fe1c1b4cf038651
-DIST xfce4-cpugraph-plugin-1.1.0.tar.bz2 391629 BLAKE2B e1a18df75461466abf908100e3ace73c46751d78527a9928a5712e3b3388cb0908b697055bd229f700f3e36e908cbc90f2732fc65568ebbe47d876aa376fd087 SHA512 c928baac776517da8929b8ce3842be7e02a2b3394b7cc848028d1720ca611e1aa4ef706bd00736fecfed0b3b2d0cce94c09b0f905a226db5e50c036dabb8df2a
-DIST xfce4-cpugraph-plugin-1.2.0.tar.bz2 416669 BLAKE2B 1adc1ac15b5280cb20dbc9e346ac99692fa5ce345431ffadad0e202cbad462d8210433b03d58f6970c493987a69866e97287b4a4ce655afe3d867258c8f8c14d SHA512 b7d8402646bb4bca82c767b2a4e25a96d6d9a0327f13b934afd2165e9884a134686cf18e43c6fb30f93f9aba5f41aeceb0cbfb49c15f165ce972ed82eb9eb563
 DIST xfce4-cpugraph-plugin-1.2.1.tar.bz2 424101 BLAKE2B 228277cccbe89ac43b78d41de489f1b58e30cc8e6f900840bf0d3c41d3f392d10fcba43b64bb8edb4ecade363d63af2860f1174b5b1b944ac7dc261071397111 SHA512 ca8b7dc1ccad163e8bbe28723ded0c9cf5a1b72aa350e1d9c8e0b0654e97704f0ffba9a7128fc6da289dbea7b9668f1d493eca09e87abd0cdd109998a2749fe1
 DIST xfce4-cpugraph-plugin-1.2.2.tar.bz2 425245 BLAKE2B 1ca1bc0d210b607079ba4706db5c0bd58b3fae17d22f82722f55d685132bf4ea04ec28d148eafe1183cff517c7ea859032a92ed1e5a20c7bbaac77ba9249a4ed SHA512 18bdda603e657b87bf3c4bbf5785aaa5b735102dfde515f2850396b2501ba8d5305245b5b4cbf3157bde8178167499ba3def7535ba357750a311531b9c2072a9
-EBUILD xfce4-cpugraph-plugin-1.1.0.ebuild 876 BLAKE2B 41f0719868c92273d56a9d3d14c410ea912bc4969689c870b92447c02e29b5090eb7eeb2d59874cafb77e9d26f885d94c200ce425269b6efffa479728ce85508 SHA512 97fcc5c20ac23fe9c7651d3ab08edccbed0b4a147cfb827c49951d5f2fcb86bc02d9b333144f076f99cfbcdedbad072037721804350a265ca885aa18ec64146d
-EBUILD xfce4-cpugraph-plugin-1.2.0.ebuild 818 BLAKE2B 7f3e9e1f7acf34dbb27485eda041044f06199cecb87cbb65cd8811048c0259e33e9fdf7eec3a47eb0f27eedf61dd79dd0fc6f4211b826d369f005bb86ba900c3 SHA512 92a38e0cce88e616a75afd63e3a475c61246ef3b39ca8f7bc8e5b79dc9829a0ed53470b05968708a21ce96cc6b63f7eb90ef3a65b2353cdd486b8e7cd8386a99
-EBUILD xfce4-cpugraph-plugin-1.2.1.ebuild 816 BLAKE2B 488d8434e7fbd646836d299e2ca12c9ff57f4ac16f9feb1c6b469a3ef22f1b7f4bdb7b39508b2399d5d0782258f9a1cfe67f035bb8f2c2463de4e5b221a428f4 SHA512 83058cc6438284e090c0ef58c10abf725929928bed47fd4e6ef539c2387a6ad363322ba6e9e8e173e54fd7be988c0f7592f24b9c16fb16e120e3850b6c578100
+DIST xfce4-cpugraph-plugin-1.2.3.tar.bz2 427880 BLAKE2B 1e2223eab1c8db275eb2aa43197c9aac8a79faee96778a5b684c0dc74e1b55046d0c1bbe3c00d316118be33ef3ee3777cafd258ef3919d36bbbb073e51fc9455 SHA512 79d7c5b328e778156c6a35b1f4947732f42aaffb23f05fdc5e1e7668d03149f1a72ca4bf9b835904a93db6b23660cb10118b4d046b1bd2dded38ef382719052e
+EBUILD xfce4-cpugraph-plugin-1.2.1.ebuild 815 BLAKE2B c070d7478c0da519addbc77b994ef70b02bf2305f77dbc7f54ddda572ac525a921f5cba4dda9b14082f8f56815f556c1858799f70ed12672ea95339006b4a354 SHA512 9c995793b7412222b659740866971b37841a08e35cf8619339aaa3b7a6aa6061e2477750bde0ca00d5d45a29a52d929c1560851af7c72e4fa58bc070f893c8c6
 EBUILD xfce4-cpugraph-plugin-1.2.2.ebuild 818 BLAKE2B 5852db7a5334f9100c4df822d9f7c6fe5c44cf52f2638573bfaf1d56ab38a085bb4a5952842a0a80cb8d7151a05ae2d48e8a1cb00f8000033b307002b48b48f9 SHA512 1a7edfede3f7ea58a740a3882cb7361d6744e8bc687319f12cfee0f57ab2f518721e5f87c16e84ba6be73b402edc27af8e2c8dae28dc87f157245a8cd4e34b03
+EBUILD xfce4-cpugraph-plugin-1.2.3.ebuild 818 BLAKE2B 5852db7a5334f9100c4df822d9f7c6fe5c44cf52f2638573bfaf1d56ab38a085bb4a5952842a0a80cb8d7151a05ae2d48e8a1cb00f8000033b307002b48b48f9 SHA512 1a7edfede3f7ea58a740a3882cb7361d6744e8bc687319f12cfee0f57ab2f518721e5f87c16e84ba6be73b402edc27af8e2c8dae28dc87f157245a8cd4e34b03
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch b/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch
deleted file mode 100644
index dd12aa3331eb..000000000000
--- a/xfce-extra/xfce4-cpugraph-plugin/files/xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a9b0c62d34737cc6f5e0806c8f5305c137f9f155 Mon Sep 17 00:00:00 2001
-From: Andre Miranda <andreldm@xfce.org>
-Date: Fri, 4 Oct 2019 00:41:13 -0300
-Subject: [PATCH] Allow compilation with panel 4.15
-
----
- panel-plugin/cpu.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panel-plugin/cpu.h b/panel-plugin/cpu.h
-index 71c90a2..f6d11ee 100644
---- a/panel-plugin/cpu.h
-+++ b/panel-plugin/cpu.h
-@@ -28,7 +28,7 @@
- #include "config.h"
- #endif
- 
--#include <libxfce4panel/xfce-panel-plugin.h>
-+#include <libxfce4panel/libxfce4panel.h>
- 
- #include "os.h"
- 
--- 
-GitLab
-
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.1.0.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.1.0.ebuild
deleted file mode 100644
index b7377089eb16..000000000000
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.1.0.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="A system load plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/xfce4-cpugraph-plugin-1.1.0-panel-4.15.patch" )
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.1.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.1.ebuild
index 4b4833976fe4..dd0a04c56e30 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.1.ebuild
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=x11-libs/gtk+-3.22:3
 	>=xfce-base/libxfce4ui-4.12:=
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.0.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.3.ebuild
index 05bb474023a7..45e92732fa92 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.0.ebuild
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.3.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-extra/xfce4-datetime-plugin/Manifest b/xfce-extra/xfce4-datetime-plugin/Manifest
index 3290b51647d6..eb390bd44b4f 100644
--- a/xfce-extra/xfce4-datetime-plugin/Manifest
+++ b/xfce-extra/xfce4-datetime-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-datetime-plugin-0.8.0.tar.bz2 334063 BLAKE2B e9d42a85cf83c0c8e305f6d3c0977995943d729d2e45adbff6467a89af7ba5725e9690291ea95f8a115903ab8ba282f4b0b8ed15ef115d63b5fab6f85a038c02 SHA512 936af402bfd3ef199dc05254c57201b90f9554b2d824d74d2825f16d60e9a4c1a03f25811d80bc666a05dd6b47798ef2119f458b55d612e0803f75fc583fe550
 DIST xfce4-datetime-plugin-0.8.1.tar.bz2 330734 BLAKE2B 606802f4bf23960f8829be7c83e2a17666bfa94f6ab7821713591542d476463c72b6832012d2a865cf408d606b7ebe54080e02246f070cf45bed6474b75c6051 SHA512 2671b3732e9bfca68543ababa69dd16d988ba0acf0f0c8d2eba539143f8764f561053c69de3f89441e32c3098d135ee0cdf630aed5a4db16316455bdfc98120a
-EBUILD xfce4-datetime-plugin-0.8.0.ebuild 698 BLAKE2B 2b13968b6c38ad7a5559f638453184e2771cb1ecfeb18e2554893082b56c3e043f5aa5c7b9f3a701f563d266c71f7ca0215afaa4d7c2460d6f6be5c236625085 SHA512 8852a9806c70e83b11621c7ab0e0927c8e3ca93c507cf00efb1fd3f5ca20e715f970073e856d06516cf63ac133bcd3729e46e3cb21b530f4bf3dd7f85064a1b2
-EBUILD xfce4-datetime-plugin-0.8.1.ebuild 703 BLAKE2B 08cacc9714f4797954d8a3935c6cda96b0efa77fc4893a2dd80a37f2e861e71d9620a30fafc0d76de21bd8082c18cb4845d16352353cab54d1dc8ca4fcaecbae SHA512 a74e21d75c5f96e6b4b1c261e5a2c55663cf3a9b6734e9b97a2f312f02803986cafbc92729a06826afc2f36fb21ad090c4c049fa3fad8d13484299206cfcb043
+EBUILD xfce4-datetime-plugin-0.8.1.ebuild 701 BLAKE2B 8b07fc6fb076523c73254e295989b9fc9de3a06f9732aa1d9115ff34bbb682c3f0601dd330c1b9251305ac7d5350e5fefabcfb2bf838046fb01e696eafb46322 SHA512 b4e02c98cfe68be6f575d8559d9a48a6a85b8896104b72c3b5e81a1a02ed29b5b82509c25f08f2af9c4280c8114423927f4c6d6a808a8545cb045a5bd1570409
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.0.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.0.ebuild
deleted file mode 100644
index a8e50e103339..000000000000
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.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 panel plug-in with date, time and embedded calender"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.1.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.1.ebuild
index 16d23525e0f9..de5d0e0358a5 100644
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.1.ebuild
+++ b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
 	>=xfce-base/xfce4-panel-4.12:="
diff --git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest
index ef8cb8846830..e69fcb89fb8a 100644
--- a/xfce-extra/xfce4-diskperf-plugin/Manifest
+++ b/xfce-extra/xfce4-diskperf-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-diskperf-plugin-2.6.2.tar.bz2 347244 BLAKE2B 82ef114b6ac445627d05ed99b34f128391061e5028192aaaa47e8b87f17cb89842d541585e77da4b6ec319fc50f242fe6d1fcb510048497e2b1184a8e3dfcadb SHA512 e91a888a9936f8a0279a062801d16ebe03159df479413087a01e20c15913df781378e4b4c91ecba94d71afa813c6d3a5367b11c1c6d3d62bf10fea78c4853031
 DIST xfce4-diskperf-plugin-2.6.3.tar.bz2 384330 BLAKE2B c7e9d885f42d7f007570c54bd26c7b85aac1054cdb9a0ca0119267b89387ab731807090bea49f7be05b6bae314efd2a87845c4005cd7cf31aa41f1b2b5ee4519 SHA512 fb7ffeaca14f67bb8a2423529f7040d3e51a0184a552f4636acfb4aec914da5fef95db2c710cad8cb1a3b96ef9abc308ad072b03f6e2ccc49793c0edb73dc116
-EBUILD xfce4-diskperf-plugin-2.6.2.ebuild 799 BLAKE2B e4787b162fa2521e00f64e69e92a270cb6a6e13d5de90f14000b522172400282c8affcc60f30aebe5e4d861ac8347b62d16d9bcd47ff1f1f5595c9c6112860ee SHA512 9457f35ff920871bbb924853722a7944b286b4801cb5dd2d0ef4f59d20844b9e38862df6d9bc4adb86a41f945adc73564fd1881cc3d22fbe96d6aea65e6f5f44
-EBUILD xfce4-diskperf-plugin-2.6.3.ebuild 811 BLAKE2B 8e3eccb40f8b968f2a643522294f950bce73c5f99093d1c8da6ea20676991cd5df18f62bee732876621d85ebb75ab45cf595eba467983bec5632eba5c3828b80 SHA512 8c0c684fb4f313729461f62e4695aea3034fd5c26321be75385108232f329d21c2d27602cf5f8ea110f677470512e2df7dda67c48a88b4c652229e54fd31ef17
+EBUILD xfce4-diskperf-plugin-2.6.3.ebuild 810 BLAKE2B a8ab3f6d2e2b8afc211036897f1e9402e19879a8e60642c26bb99830cb43d9dc3d9321b5e0f078ff2e0d78e8e267563e7757f7a6f0a6883c58bb52f8417966a7 SHA512 28af72826f6e1c6c005753c7a4c1d53e8d43ac9f1497b3ae258deba7899f8d0a9e2b1f78063ea2d599f1358c947459eed2d5d5621da234fc87bf97e80bdb7516
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.2.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.2.ebuild
deleted file mode 100644
index 75deb9ffb604..000000000000
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A panel plug-in for disk usage and performance statistics"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	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-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.3.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.3.ebuild
index 79c619c42b34..48decbc8848a 100644
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.3.ebuild
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-fsguard-plugin/Manifest b/xfce-extra/xfce4-fsguard-plugin/Manifest
index 49601a4d3b0a..9b74a7690e06 100644
--- a/xfce-extra/xfce4-fsguard-plugin/Manifest
+++ b/xfce-extra/xfce4-fsguard-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-fsguard-plugin-1.1.1.tar.bz2 367902 BLAKE2B 2fbd088cc2a53dc99e01fbbc880c6223bb3cb8f030cfbed5373d50b7a1e37a072f71beed2f2e84b7f0adcbce28cd0d6cc0c32356589195482c9dee143d04e46c SHA512 9b8a8c171baddc0261e4253c2e710c5d2e180e7ee669915f5a81e53778775880623af43b1638679b86d6a3e077826a69a948577a558e768fa41924ce5d1006fe
 DIST xfce4-fsguard-plugin-1.1.2.tar.bz2 402703 BLAKE2B d7d4b936510d7cdc153d47c54178aebfb9f3339f6413a1013a18301806e05cf76ff2439e7b1e00637407c113149f9e72632e66e01f287e817d93ba5af208947a SHA512 ff42f3d92292357f432a69fc401dec474b1eadabbcd7602f4453f7567faaa623d3672664c3a2baa98ea4e522c6a607b5a40327c5fea33b2d8535f15a4d511ebb
-EBUILD xfce4-fsguard-plugin-1.1.1.ebuild 818 BLAKE2B 03e7db60e96bdbfa96e155fea49915f476c0f28ec761330d4102242a88e6dbbe79cce7ddd812da5968339daa28f09500ac204f571b3c7b4b497ce6c5da7532db SHA512 aab5fb7632ad51242684942871539dd8ca1cfda98544318e85f84dda71262224ed31df463969e3a246319cafa2fa726805d88993eea67fd3b3ee8d7a514f38aa
-EBUILD xfce4-fsguard-plugin-1.1.2.ebuild 831 BLAKE2B 4582d4f649d5ddeedf427baf7dc6e13509533f0fed9d3a04fe6736a363b53be076251bc9118f3786a047c788e1e2b5049ce2dd48502e14f194627603c4da9506 SHA512 47719dee1a0e3021cc07a8e5de21d0404cc13c365ccba1044f87249525f38324d851266b35720288412c8dc4b9b9d3269d13e2a1afeb68d13042b2317b383a5d
+EBUILD xfce4-fsguard-plugin-1.1.2.ebuild 830 BLAKE2B b9cd9dec9e6d1de104198649e03caffa26dec22fb5da5e26092e45e46199623c93ffff64e5f7d7a148d024aa00bd5ddcefc5e7dce0871975b5cb9b64bd062529 SHA512 8214f3a5ae56b7fe371fa76e52906c99620edc670b29c4bdfddcba24b5c35dfcaead332fbb8f55304faa3a9a1451f9a3df8c961fc545fdc3d784f5cefe9a8456
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.1.ebuild b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.1.ebuild
deleted file mode 100644
index fa3c11cfa7f9..000000000000
--- a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A filesystem guard plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	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-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.2.ebuild b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.2.ebuild
index 062921ced400..66a7790fcf1c 100644
--- a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.2.ebuild
+++ b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-genmon-plugin/Manifest b/xfce-extra/xfce4-genmon-plugin/Manifest
index c439006c58e6..e5e6cda6f1b1 100644
--- a/xfce-extra/xfce4-genmon-plugin/Manifest
+++ b/xfce-extra/xfce4-genmon-plugin/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-genmon-plugin-4.0.2.tar.bz2 334196 BLAKE2B cd4bc651809a5421cd5938cd5b9cef13e94d81e39fd8f249348cb65921ffe0b55d68254b76f391118d33c3a00cdf331e32c730ad5a9059b1f3fc501843a0fe1a SHA512 78a9cd95a83d6ffcb512647f1c674589bf80e4ef24a3431be96fd7506c7642e42c796f7316e034083fe794ab79521d856083b12a186276a1dfe4f14dbe97149e
-DIST xfce4-genmon-plugin-4.1.0.tar.bz2 375359 BLAKE2B 2a25967f2f086861761d7bb1b1fd7c42e59a43c94925576efe4c1d4cff6e2a62892ce86bd5ac0cc0285d5c8a82edcd6b844d6fec0ea587eddbf92aea50236a23 SHA512 07d203c0d7907d6ebcf3f982dee8d87337a8a7578beb3632944ab177d5866393c382b3096e407b908999c5865a2088ef9305970ae6b93775c6703d866130cec3
 DIST xfce4-genmon-plugin-4.1.1.tar.bz2 400772 BLAKE2B 949f2012bd7037d50997e83c555a2d2b33269f233f676d8acc5a195ac194d435cf7f3f5bd1eac1352e57b0463af1f6302b602bedb6ef9c4e2582724c00b96159 SHA512 663dabcdfb9d85325be5bc000f44e6cd61f78143e6d49bc7c481d14eccc3601408e2a7bed1276de5fcb24e75af66d8765fd0dc373dc8b82c1118fb5da2673c03
-EBUILD xfce4-genmon-plugin-4.0.2.ebuild 688 BLAKE2B 51ec2f58627eb52b62ec51f010f500b8449938f0493d347a4af795dfc214dc95d419a8139cc58e73cfac09ea6f451f8478973def20aaedf974a630e98691ab1f SHA512 8a2addeaa71baef914ecd8190e4a2a16937d69781b2a88e8eb8fb2995b8fc2aaf993684727a10b776272634d6d50f56fbc4f96ef6255560530c490ab246c9a14
-EBUILD xfce4-genmon-plugin-4.1.0.ebuild 704 BLAKE2B b0083a5d64a0a768529a8bfa41bac543856d6e230a1ff1c522665cdcbfeade241fac3193f4a2530e3e84e282b8689dab130afa97112bcda5194d153a1e7276ee SHA512 1269355d1b9edf9e00a1ebe12878c0f8a40ca1aa483b055892d0d8df5ae6515e33a3ee6392968aa1f8dc3bd6ef0a959a318efc6c9283c96737cd7ad321fd5e0b
-EBUILD xfce4-genmon-plugin-4.1.1.ebuild 796 BLAKE2B 45823f1641dc31f88847d743b6eebc68420f2ae2d3e786ed7ec2950c4383b179fd2e5b7996a70ef2274a66dc68681c619dfc6b3de1d521fb8d77dcd74968e53b SHA512 9fc56dd720389cfe02007987697538ea220b6d00ebccf0158e69813c615e316e8304372eebbe13637b844c9f83fee73aa28bc680281d7f368302d299e9115408
+EBUILD xfce4-genmon-plugin-4.1.1.ebuild 794 BLAKE2B 91258b6abbc53996959865c07ec5f9ad2c163bcd26f28afc4df2c8280c8b89db35b21a078a4e9bb0b4c271814d6d19ec31c6579edb5a9b44b2f0f4f72fac4837 SHA512 ae20c2ac49bded97e075ea6a5421a92a6354978b1dab6c62d31012fffae676f4a82207ad1d9f7b1d8ecca4a1e4cc5e65bbf56e9e07026f6e597552ebb10f47be
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.2.ebuild b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.2.ebuild
deleted file mode 100644
index 3a4de96f7610..000000000000
--- a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Cyclically spawned executable output on the panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.1.0.ebuild b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.1.0.ebuild
deleted file mode 100644
index b54ea0a05185..000000000000
--- a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Cyclically spawned executable output on the panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.1.1.ebuild b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.1.1.ebuild
index 6e32a80e7996..f15a7a76005d 100644
--- a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.1.1.ebuild
+++ b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
 	>=xfce-base/xfce4-panel-4.12:="
diff --git a/xfce-extra/xfce4-kbdleds-plugin/Manifest b/xfce-extra/xfce4-kbdleds-plugin/Manifest
index f210d49f8d61..425b8254983c 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/Manifest
+++ b/xfce-extra/xfce4-kbdleds-plugin/Manifest
@@ -1,3 +1,6 @@
+AUX xfce4-kbdleds-plugin-0.2.3-xfce-4.16.patch 1345 BLAKE2B a7dea5b5923be2bb2fcd3927968519c8381d431da344848a90fbae922eea5f591e71f18865d347ed922a6fe68f9c7ce12526fc7284e6bf80c9008cd2440f62c5 SHA512 012d34319df88a963dd9b6f303d4b69c03bab73e900e55f8b54a6822fb8a8d0fdd90c4703a019eecc9902851af7f8263c175b74f88a26a715ad5a9b5aebe2b4c
 DIST xfce4-kbdleds-plugin-0.0.6.tar.bz2 265889 BLAKE2B 1b166dce725f92fe05273d427dd4d185e6a240c984e4e2503f092af222e7a08b8697b8031804490322bb156bc5109c82f38273278fff185a9039b26334541ef2 SHA512 2cc48ec04d24ff55900c511c1fbe3ce1f7c45e59a30098a3b8af292ff5b219e7050e81d22f449f77ac79129b63db20ea61cb49730c5092583b935190149e127f
+DIST xfce4-kbdleds-plugin-0.2.3.tar.bz2 321690 BLAKE2B 847bbf675b97659c86c0668ab9ce96787866734377f3fdb49d4b5f18a3735cace66279783df92fe8cfff57ff05f4f09fa3fff23e0dc89f1b2d0fbd512e5089f5 SHA512 ddedaf430226f77d03f63f4dc31518184fd808d01c6049adbf41cacc2f46c78c3ce48c5a0450c200acda4a328d9716d54f7cc225913f4761a0526710b76f0cee
 EBUILD xfce4-kbdleds-plugin-0.0.6-r4.ebuild 787 BLAKE2B e618a04e079851604474303fbc8eb3bcfd7d89f99a17752d9c68519c1bb7925a2f8176410a237e4d7000ad21f8d3424a6eb1105909b81996ffe387c9ad9e6ec8 SHA512 c41a13269584d189ca8a92083ea1e8a212b6f914fed1d98c2ebff39cda3585251e993d3cd0b4e0decfb1ba777a7a292c4348192f28c406c52ce8696150443975
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
+EBUILD xfce4-kbdleds-plugin-0.2.3.ebuild 807 BLAKE2B 16db97d2ad0d04c678bb95f73c9ed8b5f790619879198779da707720bc4e210db4314cba62d54c81878435b74a6e50de22dbc23c7844b483bcbb6be6417453ca SHA512 4dbdbb0b528e835432819ba1cb2ff09bf37737ca2a4cec6aa3c0b5a84110a492dd0b6ec6baae31254bf02e083f0689729e8bd8aa3a5d4627e2f58bb15bb9cb06
+MISC metadata.xml 344 BLAKE2B 6de54729a9d364f627bb85df691e734c33b50d27f02abca78051265dc0114c651f927fa168841cb282c2dd3ec55d415de4e893874dc7b1b554f2d7f924eb84ce SHA512 97501ad2cca54f255a95f833227d19b3924094c540bd577b717cfa19b8be11532abc8ea6fa80fec7a98e326d89752320dc47d60db5e04c280d00b3a9b5ec617c
diff --git a/xfce-extra/xfce4-kbdleds-plugin/files/xfce4-kbdleds-plugin-0.2.3-xfce-4.16.patch b/xfce-extra/xfce4-kbdleds-plugin/files/xfce4-kbdleds-plugin-0.2.3-xfce-4.16.patch
new file mode 100644
index 000000000000..8b69a019a0ae
--- /dev/null
+++ b/xfce-extra/xfce4-kbdleds-plugin/files/xfce4-kbdleds-plugin-0.2.3-xfce-4.16.patch
@@ -0,0 +1,44 @@
+diff --git a/panel-plugin/kbdleds-dialogs.c b/panel-plugin/kbdleds-dialogs.c
+index 7f751f3ef446..7e4125f2be22 100644
+--- a/panel-plugin/kbdleds-dialogs.c
++++ b/panel-plugin/kbdleds-dialogs.c
+@@ -25,7 +25,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4ui/libxfce4ui.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ #include "kbdleds.h"
+ #include "kbdleds-dialogs.h"
+diff --git a/panel-plugin/kbdleds.c b/panel-plugin/kbdleds.c
+index 9c78d402b1c7..502a2885bcea 100644
+--- a/panel-plugin/kbdleds.c
++++ b/panel-plugin/kbdleds.c
+@@ -28,7 +28,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ #include "kbdleds.h"
+ #include "kbdleds-dialogs.h"
+@@ -140,7 +140,7 @@ kbdleds_new (XfcePanelPlugin *plugin)
+   GtkWidget      *label;
+ 
+   /* allocate memory for the plugin structure */
+-  kbdleds = panel_slice_new0 (kbdledsPlugin);
++  kbdleds = g_slice_new0 (kbdledsPlugin);
+ 
+   /* pointer to plugin */
+   kbdleds->plugin = plugin;
+@@ -187,7 +187,7 @@ kbdleds_free (XfcePanelPlugin *plugin,
+     //g_free (kbdleds->setting1);
+ 
+   /* free the plugin structure */
+-  panel_slice_free (kbdledsPlugin, kbdleds);
++  g_slice_free (kbdledsPlugin, kbdleds);
+ 
+   /* free the timeout */
+   if (timeoutId) {
diff --git a/xfce-extra/xfce4-kbdleds-plugin/metadata.xml b/xfce-extra/xfce4-kbdleds-plugin/metadata.xml
index 359901b31db4..c61af41106ed 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/metadata.xml
+++ b/xfce-extra/xfce4-kbdleds-plugin/metadata.xml
@@ -5,4 +5,7 @@
     <email>xfce@gentoo.org</email>
     <name>XFCE Team</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">oco2000/xfce4-kbdleds-plugin</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.2.3.ebuild b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.2.3.ebuild
new file mode 100644
index 000000000000..df771dd85935
--- /dev/null
+++ b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.2.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A panel plug-in to show state of Caps, Num and Scroll Lock keys"
+HOMEPAGE="https://github.com/oco2000/xfce4-kbdleds-plugin"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	xfce-base/libxfce4ui:=
+	xfce-base/libxfce4util:=
+	xfce-base/xfce4-panel"
+DEPEND=${RDEPEND}
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+# https://github.com/oco2000/xfce4-kbdleds-plugin/pull/7
+PATCHES=( "${FILESDIR}/${P}-xfce-4.16.patch" )
+
+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-extra/xfce4-mount-plugin/Manifest b/xfce-extra/xfce4-mount-plugin/Manifest
index 88d3b1e0fb97..9cf5007571cc 100644
--- a/xfce-extra/xfce4-mount-plugin/Manifest
+++ b/xfce-extra/xfce4-mount-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-mount-plugin-1.1.3.tar.bz2 431182 BLAKE2B ba197ae9028b726e3b1e2b7fd68ebaec3e8e247322d916a1579681af9b004418d4738bfff05e7b947d6bcc5a1bd3cd1e0419f2e7421ae8cf7a7aeb3011658132 SHA512 10894069fd98fa0b709a3e743f0d6f9a8e9487b0de8495c3d177731190480f18b11b0179325d2ed47f80eeeaea10144ddce7f9cd60397dfb6a0db602bd4f8124
 DIST xfce4-mount-plugin-1.1.5.tar.bz2 432564 BLAKE2B 6dbdbf692847c7c236a60982adf6ac9619f8d45320c97debea44e0b865a9ac51c76b20dd80943f5fe23501d450039ab0fc4644b0ff5ed693ff169668a039441d SHA512 bf4e89c57a1f61120919a272c6f343a9fb4072a977848031784cbdf96e4bf248d878c6e28a812930daf9a0515efcae20b421e0b2db176f05b8f29d75d90a28ca
-EBUILD xfce4-mount-plugin-1.1.3.ebuild 782 BLAKE2B 019b82e753fa60728bac612bb69129026d4938bebaa99fd57193dccf2c905d8aac476a54d58970e36f1fb1d06797257d2b4dd75764dd26b10c13cf5fa3344b10 SHA512 5118dfa3c3b90019177307a34bc633e2830c09cbe0b8893d23902a81518ad7d8a1e612b84bc99bc4cc68ef14286a8f76de80cbbb7091c2d0f2b1aa626641f36b
-EBUILD xfce4-mount-plugin-1.1.5.ebuild 786 BLAKE2B da9751af5c48338b9124272f995fba62754bfb483f69262551e078698b88bf8d6e073a79837522aac8b7ffdc3ad16bff6eb8adcb096d5bc14853c8d67e47b0b3 SHA512 a229bf54830f3bc4a54dd6e252e31082af5d8d8cbd6f0e485a0e072ca06bbda8952184223c35b6c955aef8ae6e39bd1ef8cff85f4ae2591555659d437d120ef6
+EBUILD xfce4-mount-plugin-1.1.5.ebuild 784 BLAKE2B 12ef07afbfa1f1bf0848d10e79b961a88b8076b1008694e4979d9379867682ac35dead90cd8b694ffe076dbd6269d0217f82f3567aa73c806789954e3c3e100f SHA512 24843220ce319248635ba206dc31bfdd3b27fedfe07cabf509757e0a64082cc606db8d6b44b2fa8e7022718f1668574f6b634c3c234621ae491e284a705a1458
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.3.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.3.ebuild
deleted file mode 100644
index 80afde3a10a5..000000000000
--- a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="An mount plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.5.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.5.ebuild
index 279793e23d1e..f63a2799c5b0 100644
--- a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.5.ebuild
+++ b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-notes-plugin/Manifest b/xfce-extra/xfce4-notes-plugin/Manifest
index 44d332b9b7fe..08d632d0e06f 100644
--- a/xfce-extra/xfce4-notes-plugin/Manifest
+++ b/xfce-extra/xfce4-notes-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-notes-plugin-1.8.1.tar.bz2 479652 BLAKE2B ec23b362627b8bbfdf7dae69aa3217dd902f175b1899ffa07bcbcd17a34acd68ccb5c0acab65fe88a892f5a2c4e6ca7f9f6cc5ed9526a77028679a31bded455b SHA512 3e3f2513aaa5d26880d21ba31458aa8b79c1e01cac47141513d61002df9535e52ca2c14a8da6cddd54fcab3bcda6199c636cce045cea9bd4548f5fc763e069f3
 DIST xfce4-notes-plugin-1.9.0.tar.bz2 502606 BLAKE2B 2b1b2dd97301ab57363aeaa8a373c62a9e9c14bdc1eb7dd6355bb096728b05e5bee08ce8a5922c2a93f1c2b7fa7197f8aa3fb0c2a96d5eb71a7002c22eb8d13c SHA512 32ee410fa9d4dff4f73a844ac53024c39a884b48cee32faf14c1ed75200f912bd4e51a1fe3305deea9ec98a617b63a65e271437b09cb9b664498746a8095f4a1
-EBUILD xfce4-notes-plugin-1.8.1-r4.ebuild 894 BLAKE2B 670257e26a179788a7910436bacd93c46cfdf6beed7fcfa544704312d3415df97249a99e5d4892c3c362f5c98841b3de680edb74e8ce411c4b8791d95a307286 SHA512 be42460e8e4796560e0f14fb2d08714c357867adce0ce426faba9a1805424b6781451e5ae58a31851410619a854ce70961f97bd2a485cd57f7ce2275a32efec7
-EBUILD xfce4-notes-plugin-1.9.0.ebuild 868 BLAKE2B 797d66f382733fd6faa81b93fc6aea29136e13ce37366a278b8dd248e2f2d32584fb2cef56fef34a0a7130a369df3508ac905d8f2a1335862c279bddc2faef72 SHA512 556390dd61577bbd7115d9de01fa60e2f8edf48b154eb2044993900ad96bee4f099aeb4f4c12434ccfc02a0e298f9e22c8adb7f7680525950e74b6caff4aa00d
+EBUILD xfce4-notes-plugin-1.9.0.ebuild 866 BLAKE2B 140a3e39b8c7e2d9411820901b73492d8c07ca73a63eda9f458544fbcb87d767a0dbe79fae5da73f0ea1ae42254e5adf6a7e86836fb59fef543b44bb2ac04165 SHA512 98c61a9222dd478672ef29ba26c4d6584e6f3c9d99dc40eac976f6ee7e100451dbc1e992f4b06cf0f111e2d4bf96ea44b36e434f2aacc4a8db3583cbc7335eaf
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r4.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r4.ebuild
deleted file mode 100644
index aecef87fcbb1..000000000000
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Xfce4 panel sticky notes plugin"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=x11-libs/gtk+-2.20:2
-	<xfce-base/libxfce4ui-4.15:=[gtk2(+)]
-	>=xfce-base/libxfce4util-4.10:=
-	<xfce-base/xfce4-panel-4.15:=[gtk2(+)]
-	>=xfce-base/xfconf-4.10:=
-	dev-libs/libunique:1="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool"
-
-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-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.9.0.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.9.0.ebuild
index 44c7eddae053..a9b60b6ae6e3 100644
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.9.0.ebuild
+++ b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/$(ver_cut 1-2)/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.30:2
diff --git a/xfce-extra/xfce4-panel-profiles/Manifest b/xfce-extra/xfce4-panel-profiles/Manifest
index a98903245d23..111c0d40c22a 100644
--- a/xfce-extra/xfce4-panel-profiles/Manifest
+++ b/xfce-extra/xfce4-panel-profiles/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-panel-profiles-1.0.12.tar.bz2 83399 BLAKE2B 82f62b7472ae8e271a8c41151c2153e62f1589b868cd4a682f0e56acfa3aedcb6104b14ef99f776d09fe6ac854420905ce335c9d3d05d524570db70d847731d8 SHA512 cf308a1a9d68832a3b907787754791d6e8b227400d21a0bde2ed99d7afbb64c6137bbe4b7ab6ceb4c896a67ecbac29d41089c857d432467cbaba631a7ef77505
+DIST xfce4-panel-profiles-1.0.13.tar.bz2 86671 BLAKE2B 0bf2d39aa2d7d21a99a9a7245e5de9e717b628f0eded2736db70cc87c4f6e1e1d10aecdc6586c43c6355747e68a2ceb1920d5309bf38ede07c1167c590dc116f SHA512 648324e5dd95ab0a513829d7d816e2113ae677d9ad6ac9b01d73c6b4105b54d5e773150d5440ad35a37b4dc75478f40a24e0223decf940f3cf658241547ce75a
 EBUILD xfce4-panel-profiles-1.0.12.ebuild 1010 BLAKE2B 926a69171925d0e35c8adcda9ecbb828e98d00561a6cc5e3776b522a149e8de950413c3058d2ff20991bce0a2e024e5c02b4d57f859888bcb766900b7202e23a SHA512 f001516b2c340c17dc2738b0e4e710085c19aa0c557276f182e81feae1bd3aa8386cb63961da2fb9d9972ba1ce8d31ea262452ffbac7217b8624257e8964291e
+EBUILD xfce4-panel-profiles-1.0.13.ebuild 1010 BLAKE2B 4443279f9e2abcdcf063206fc654db39e35bec1b89583e36a6fcf0b5f66a3224d6c4d22ec1a2c076278b7e41855c22c3a89b0bea52e5709c5b0cb7324ac3c687 SHA512 b444db0333f4acea6a32ee570f80b16b27650bfbbca71b92f8d341a616be894e94d2213ff5c994c22cea1bb254ed396dd001d04a91c30ead3afc2eaf193817b3
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.13.ebuild b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.13.ebuild
new file mode 100644
index 000000000000..27462fad6085
--- /dev/null
+++ b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.13.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-single-r1 xdg-utils
+
+DESCRIPTION="Simple application to manage Xfce panel layouts"
+HOMEPAGE="https://git.xfce.org/apps/xfce4-panel-profiles/about/"
+SRC_URI="https://archive.xfce.org/src/apps/xfce4-panel-profiles/$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="${PYTHON_DEPS}"
+RDEPEND="${BDEPEND}
+	dev-libs/gobject-introspection
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	x11-libs/gtk+:3[introspection]
+	xfce-base/libxfce4ui[introspection]
+	xfce-base/xfce4-panel"
+
+src_configure() {
+	# home-made configure script, yay!
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--python="${EPYTHON}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 54df2bf202a5..58316a2193cc 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-power-manager-1.6.6.tar.bz2 1227814 BLAKE2B c5f9ca3ff1f7bbed8c534cbba43355a62734b6e1553f852740fe332545df910ecba07be249365f9815b2467226d67a41cdb740e99d4f547ee86abf2d014211f6 SHA512 c9377619df9ebab64ed234659e5798f47448e26fae5b19eb15bcbc9416df1afec6b4de32bc272b81531d2643a215ea46892523077017dc6b232bfe802dba6cd9
 DIST xfce4-power-manager-4.16.0.tar.bz2 1234968 BLAKE2B 0299bc293769411384b34c81c907f75ba6503db11f1636366a599938d37eda0843e1850c584c37186529c0c97eaca73bc5d488d4916087a42c5c5f68ae8787c8 SHA512 1c6ecfb7696bc13c9b11fdfb4ad4e3278de2350bbc59c84c933b28c07c1a0c55b9954794e1f57e4407d2b54ffaace9ea5baed829bf0683332cf9d12bff7e71ec
-EBUILD xfce4-power-manager-1.6.6-r1.ebuild 1579 BLAKE2B a5099e14f0e92f9259dea685d0b7bb8bc36a802ad80affb9581245bac71e47891fb9b10646ebffa75cc17215df05005ab3b5477f04be3a63bdb28fd7e3259efd SHA512 8e72c72ad54e73b2a83cee5a95257f6272611b90ad2a1ecd801fdb5f8d9ae4b97ab3d53a7e42e2f44f3e96c7e106fa913d7bad58e728f8ed46d74ef18981b082
-EBUILD xfce4-power-manager-4.16.0.ebuild 1563 BLAKE2B 4d5f66692951ec3d13cba83e56b1fc8604c4d6d48bbc0daf35151da56d15ed45264a6731325ebc1364761157b29b3a00bfb1173dbbf9623d36b470a44ae1e9c6 SHA512 d26dd6c2458221c3a63bfc3fa251733783adfb0125dc621735084b79b44b4b819a3b2a353cd694104eaec3281e85e339107812d4cc2025cc7095ff83002f4a8f
+EBUILD xfce4-power-manager-4.16.0.ebuild 1561 BLAKE2B 1b7e529266b37dfd65783c0226adb6608303c81117ecc2f9db0c817e7f946da3ef4a20b0c67e4e6338a1e6195f2c05146e50c91d69cfbff7686545db3da87454 SHA512 851864eba875fcca2f331a54afebecaa4147c8b4e45b1fa8971141e5260638809fd47309b4a874b766a6701f930636f55db752c376435f93d6118d92fdbb1a32
 MISC metadata.xml 360 BLAKE2B 74fb48a2ee62745a873e6c21670385e6f1108b6ae215e7ce6abb0f735a30559ee8cd5214bcdaaeca0a9a6b2372f1551ee7deea9018108a3f11a01c0497ec0f88 SHA512 bca73ff003a0d3845fc354775332c0edd0558ff5bcf27c562cc8c4f96e95210f197698d76b0ea898aa6ff4a12e5e22a589b62d28e196e679d4046e56f66ea744
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6-r1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6-r1.ebuild
deleted file mode 100644
index 641b2904d0af..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-DESCRIPTION="Power manager for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
-IUSE="kernel_linux networkmanager +panel-plugin policykit"
-
-COMMON_DEPEND=">=dev-libs/glib-2.42
-	>=sys-power/upower-0.99.0
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.2
-	x11-libs/libXext
-	x11-libs/libXtst
-	>=xfce-base/xfconf-4.12:=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
-	policykit? ( >=sys-auth/polkit-0.112 )"
-RDEPEND="${COMMON_DEPEND}
-	networkmanager? ( net-misc/networkmanager )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable panel-plugin xfce4panel)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if ! has_version sys-apps/systemd && ! has_version sys-auth/elogind
-	then
-		elog "Suspend/hibernate support requires a logind provider installed"
-		elog "(sys-apps/systemd or sys-auth/elogind)"
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-4.16.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-4.16.0.ebuild
index ad53dd93fac1..8fbf4cde1d50 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-4.16.0.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-4.16.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE="kernel_linux networkmanager +panel-plugin policykit"
 
 DEPEND=">=dev-libs/glib-2.50
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/Manifest b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
index 5f7e3ef6ad7d..1920e2efa9f9 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/Manifest
+++ b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-pulseaudio-plugin-0.4.3.tar.bz2 431773 BLAKE2B 2c0de4ea0ab9304b737fe4ce570bcd8427f983845fe898dbe7e053a5fe79793223df6882a931b186664d8c95d4c767daf39ba36a98dc58595ba77e8a18c13a6c SHA512 d3214b2b7c35a0a87ea60a5d843f5027d1b09f320d4d24c6bf89a8936de92226223cb4dc5368edf4c0a1aedb3b8796510981eeadee8e836e764569d9284f0efa
-EBUILD xfce4-pulseaudio-plugin-0.4.3-r1.ebuild 1492 BLAKE2B 978d0d6fd091cdbfcb81c272ee69000877c18373536cf47e0846f12a6e456f8d15562dcb0c9c6da155fae55b35f9594ac4ae07ca0bbb634ce7f9c8af8e63fac0 SHA512 71dad8d1a46a3d49c36318b46c6fa73441fa602ea2ed340189cfaab7a258bd12b30694fdfaab554cd4aadd515bba82ce5b754405490223d486bf4b0c0ea121ad
+EBUILD xfce4-pulseaudio-plugin-0.4.3-r1.ebuild 1490 BLAKE2B 8e426228fcbf844ab67ff8d2c122e5d835e0efcbe8c7c490af8db94932df469dffeef0f476cc46b70b49ff5a52f81bc3201bf3e10e3809847cb7b0c92129d9ad SHA512 6249d4780e4c8be109d7babddea05602284192522790c3ec184349a4a468dab72d285e9b48ddffd6279bd8bcae744de009b4a452f8c93d5f896a60e502dc4cda
 MISC metadata.xml 586 BLAKE2B 57900ad6e29515182780ef646d7861d3858150ab61861bf70c1a106221e20d7ca93f7bfd36e4337204a0abe32e515f60affae94342b6b76cdf6d34815e0130d8 SHA512 63bb2c2bd9a71f8d53f17cf5894039afb4592d8b5687e6daa4485a566464e3fe4f5ca45306409547f7d828488242fd760ddaa0587733f69067717ceffabba05e
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3-r1.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3-r1.ebuild
index d6241a6975f2..bd0da595269c 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3-r1.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 x86"
 IUSE="+keybinder libnotify wnck"
 
 RDEPEND=">=dev-libs/glib-2.42.0:=
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 1d2562e88702..9ffebd033df8 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-screensaver-0.1.11.tar.bz2 699642 BLAKE2B 5fbb5b5c923e82070e429fcf65c8c5b5b9b0d78cba9fd128c84490a6a0927a0620b41af7ffb7356cd13ccfe48f2e1841f90e980c4bfbd15fa8f50e0f1fed7e75 SHA512 f692e31cba00d65887b90857eb4c1075000859f85db7dac7f421cc0d9812c6e8d517fcdfcac7546a6818375f9a7222a2afb80ae7076e62953bc8dcc7af9be174
 DIST xfce4-screensaver-4.16.0.tar.bz2 687978 BLAKE2B 1656027af61a50ab97fd3d5744f0ab5f1a81353c64a2fd935a6113dbe2fce5c4b2a22c5f81f15d06d09c3b292f82afa95ce34a07facb5fffef7e6fef712cae63 SHA512 5fa0381395b48fdfb5bdd9b4cafe1ec625d0b7fb9600d59c22c42fe0248fb4b99dd18a94045df3ecdc77635f7271676329c658f25003a9d8d6f9a9a66739dbe9
-EBUILD xfce4-screensaver-0.1.11.ebuild 1771 BLAKE2B 2eebc7d87e3d6b2927414d6e227b5581ff80ad5b6b2a782e126bdf0e8ce64a0181284f52d36c8b124864d7942985222ec820a248abb215cb9a96e76f71f3e2c6 SHA512 8cdb8ae31e190e3dd55e2211bf4759b21458c239cf5afd6e3145c8612e7507e04e7eb170b38d4d326468dbdea246e9b4a416da20c5a8b1dd14141904e3da7642
-EBUILD xfce4-screensaver-4.16.0.ebuild 1782 BLAKE2B 2e1047f925629e43631ca3724fed9d0179093a836720088f26bcf5a2fede980e90ffe32d273ded1fa35a5080fb32dc82a77641f4311ed2a98fe02673ba907403 SHA512 35d81b63c433152e57683aa30e59565c3aa44d1790b867c93b1dbd7aba494d0166a9ad242f986706a07e0e2475ebeef83961153eb44b8d25d82b0c1af7e87035
+EBUILD xfce4-screensaver-4.16.0.ebuild 1781 BLAKE2B 7ceb7b284ebfb37a78ba21b76a2c281a27673729936664ba0c94b56b5d9e45d1af0e1befda4a61e326c1a6bb087221a0e157496e6680933999114306307ffcdc SHA512 23a21a6f89b7a166c0848f7123b9152712e2eaa81d75c243e2b14c51a6634223cdd4f5a4e186f858ef459a3c31e7f395a9d9d5a7aaabd812eecb4a8821701034
 MISC metadata.xml 291 BLAKE2B 533c3c70954a738e8b239f8ab6ce7b45702bf87d7151e8182ae6142cf8a1611c9d24ab4e6e95ad8d71606e802369536a669e313493e3527d6daa8d1e5a61ecdd SHA512 f86de2f82f08b0a0372ec018cdbebbf87e6c0e7e4f4e4c78c1cbeba0a2cc6ef26f17a8f84b85195961af8a690bf3eb2b45bf415be43e3d9a791e296d7f4a74e1
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild
deleted file mode 100644
index 00be17a32e50..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
-HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 x86"
-IUSE="elogind +locking opengl pam systemd"
-
-# Xrandr: optional but automagic
-RDEPEND="
-	>=dev-libs/dbus-glib-0.30
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libwnck-3.20:3
-	x11-libs/libICE:=
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXext:=
-	x11-libs/libXxf86vm:=
-	>=x11-libs/libXrandr-1.3:=
-	>=x11-libs/libxklavier-5.2:=
-	>=xfce-base/garcon-0.5.0:=
-	>=xfce-base/libxfce4ui-4.12.1:=
-	>=xfce-base/libxfce4util-4.12.1:=
-	>=xfce-base/xfconf-4.12.1:=
-	elogind? ( sys-auth/elogind )
-	locking? (
-		pam? ( sys-libs/pam )
-	)
-	opengl? ( virtual/opengl )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/dbus
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		# disable docbook for now
-		ac_cv_path_XMLTO=no
-
-		# xscreensaver dirs autodetection doesn't seem to work
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
-		--without-console-kit
-
-		$(use_with opengl libgl)
-		$(use_enable locking)
-		$(use_enable pam)
-		$(use_with elogind)
-		$(use_with systemd)
-	)
-
-	if use pam; then
-		myconf+=( --with-pam-auth-type=system )
-	fi
-
-	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-extra/xfce4-screensaver/xfce4-screensaver-4.16.0.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.16.0.ebuild
index 4b296841c5bb..454ebd874731 100644
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.16.0.ebuild
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~ppc64 x86"
 IUSE="elogind +locking opengl pam systemd"
 
 # Xrandr: optional but automagic
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index be9f2994bfdc..315bc74f9443 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-screenshooter-1.9.7.tar.bz2 536583 BLAKE2B de6376b68a7936f7ea22762449389ddd8ae1bf29f5fb062054691e4dc3f19471b63ef6201e813624cf2ec34c565ec0ac0d1de9db7d1b86296c736def5ab5023e SHA512 364594bd00172f0becb85f8643e4106b4a7b71ac5dad765850f54de011a77175801bd9e7eaab6a8bbb3b1353299fdfa25cc0a4a52d49017f9b51330377eb9add
 DIST xfce4-screenshooter-1.9.8.tar.bz2 562481 BLAKE2B b0e644cdbc7a9a237eec1aec39b9a3b2ebc67f8241f4ff5f828174011eb8bb37a231e9c9f91ccbab7031f0ed1ccd73c506743816201dd3f21330ffe69dcd43db SHA512 325697cf37075c313956621707ec9ae40a51ec85dfa65d73ccb8695a0b2d14cff0d62a9a30114b60b0404bd9ba25728bc4c350d3c2a65def6afa4a382883746a
-EBUILD xfce4-screenshooter-1.9.7.ebuild 1121 BLAKE2B 16039ff39697a796277e7303664d1e0af0781be1de04a67ccbab89f0feb73ef6d076ce0ba84297cbf0392943623b5d76b31b6ddd32a020e30bc990535a20784c SHA512 65ea209913d87288be164ff707923e0c30800d57f0df38aed17590f61d189bb211df36d8f0d17e6f384733722399027b32da7738c58f611d8d29bceb6e839b29
-EBUILD xfce4-screenshooter-1.9.8.ebuild 1134 BLAKE2B 4ea9a800a0c0449565e73b812a47ec15f6a840cbe8657921ae76ef97ef7cbc6fa8a4217f15eecc56654a0a4c829ec62f7e540e745f9efae1f1233482b596af10 SHA512 4db2cf46cc7a8c1c6017572ef1e2590ce8aca40cbde3bef3932934a97202076354706369c4dbd9dddf904632be69eef930f0bf0c73fec338baa9aa360c37a7f7
+EBUILD xfce4-screenshooter-1.9.8.ebuild 1132 BLAKE2B 3b5942baaef3fd1d9c01a80f18cdd6081d2d16aed7fd39142c9173e31fca9413dda11fedac54d8abfc33026725a645736bf2cd48abf37d9275407ac190e874ee SHA512 176f6d2e75e01e62f352ac99bfdbabc2effcf46cf0d44ca8bcf7707d0a180081b9f761ffd4650f917280deecc2a1409f64d130c6d9500693b83677696d412f1e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
deleted file mode 100644
index 6c2368f94622..000000000000
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Xfce4 screenshooter application and panel plugin"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-screenshooter"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16:=
-	>=net-libs/libsoup-2.26:=
-	>=x11-libs/gdk-pixbuf-2.16:=
-	>=x11-libs/gtk+-3.20:3=
-	dev-libs/libxml2:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/help2man
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--enable-xfixes
-	)
-
-	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-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.8.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.8.ebuild
index 32833c464944..18e3c59e80b0 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.8.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.16:=
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/Manifest b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
index f7858bb70be1..175d2c8a074c 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/Manifest
+++ b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-smartbookmark-plugin-0.5.1.tar.bz2 302735 BLAKE2B 3d80b78cefda5bd501578ac2b74734ac4e21f220b200239e6cd530c573b1e6b3f7e39e041d8def52bfb075cc8c584e09bc6c9249d3910a5bd98fa9d3d4cf82a2 SHA512 fb11d890f11751fd1b6ddd4ac351acde5a8b57cd67c0951ba655d762086be01527fbec59a2b4b7a191a1dcd1d4744929c8cad2b9ab30c83f3341e2ba06dd2596
 DIST xfce4-smartbookmark-plugin-0.5.2.tar.bz2 331765 BLAKE2B 00985170c8313b422747ae287d10c4fad6953ae1591d8f666d4beb4cf5323e3e020809f34da5228322ed396f33d43ce4608964f085724a3fcba8fc0cd2114b16 SHA512 56c5b4d366826de0b25f5665875f15d950a04ead7a3b5a7e546f27880363d47f3a1bba2c02e1f8ffd08b28cc4d4466d648740efda86ee8f378e0f8e721582b5f
-EBUILD xfce4-smartbookmark-plugin-0.5.1.ebuild 1161 BLAKE2B 2ff3e4c4dd8c7929e7ac28c81a0e8a930232b8a9824c8e3c191aab6ec99d53438918a6f352c9496344c0959f50565ec3460428d223a242797e45db8089c3a8dc SHA512 5696772d955a681ede975db46748489888453253195bda51d4cd893197a890e6ee61ab4e8da26040f35cb01df27c86446d8a3089c7fe1851d764b45bd0956289
-EBUILD xfce4-smartbookmark-plugin-0.5.2.ebuild 846 BLAKE2B 34e1bb3ccc8fd98511a1e39c260c0dad7e0ae58163040be842bcb0d37971824e674e7621ea11720ab9a86d70c4788272f5763d0c522d047ecef9604a8905a378 SHA512 e90c54e3ad481e1030b4ff40c7fe8ca8345957ae5f268bedf40a3d17619f9b75feccac6e7dd0777a4578c45da79924c47591f2db69e08aae0ac6edd0f81da8a5
+EBUILD xfce4-smartbookmark-plugin-0.5.2.ebuild 844 BLAKE2B 724e52f61a6f69410d8ceae74d1c3343daf5ceb336e4c343d28f6205a12437440d0e83af9d853a55cf2fb68afe6e579fda53553b2859299e2b2180fd2f08e885 SHA512 50869538fc9f24eb9a1f3d7a3e4ba0b4afb97f1a5fbfd4ddfc07a2addc398e577fe2d4c82b86885f02415e6b091f0aedc68564ab1736b853279f2d54a63a4dec
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.1.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.1.ebuild
deleted file mode 100644
index 0210eef60a4b..000000000000
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Smart bookmark plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	# substitute default bugtracker
-	sed -i -e '/bugs/s:bugs\.debian:bugs.gentoo:' src/smartbookmark.c || die
-	# fix build failure w/ xfce4-panel-4.15.0
-	# https://git.xfce.org/panel-plugins/xfce4-smartbookmark-plugin/commit/?id=856d73b51f5d237d3cf6792f5e9f55220e5facf1
-	sed -i -e 's@<libxfce4panel/xfce-panel-plugin\.h>@<libxfce4panel/libxfce4panel.h>@' \
-		src/smartbookmark.c || die
-	default
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.2.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.2.ebuild
index 76a123813335..079ba12aa0bb 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.2.ebuild
+++ b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index 8cd20bc6fa67..12ba6a28368f 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,6 +1,3 @@
-AUX xfce4-systemload-plugin-1.2.3-panel-4.15.patch 691 BLAKE2B a4957c90625825b4d7d96bacc9072245be6588ce80df567e91a5b6af8dfd4b9a313114195745e24e376081017070c3db3a6ba5b742e0de870d222739a3848774 SHA512 2b0c5090086588a59011138ece073d4b626e84235e0551a1d147e69271037948affe7eb708af12655f2243a57054a9677b4dfc71561a84f9d36354bb9290ecb5
-DIST xfce4-systemload-plugin-1.2.3.tar.bz2 349074 BLAKE2B 74cdc8f759824222faf5da04fd3189210883db1ad1ed138978e8cb31075a390d17f32ffa4648cace7745faadfc818878601c70b89a8da9d7e7961768a3f9caac SHA512 98985b2250bfff3ae8314f5671ec4438f4c53702cf9e1b76563cdc5d1b4b62174d6cfa559603294c1fc8fbbd5e15a833cc112c75b106a85b1e11788ded4da538
 DIST xfce4-systemload-plugin-1.2.4.tar.bz2 378644 BLAKE2B b50806925f02ce2a792cb72198bdd2cb0124e1d4ce12c91de124c9f4085e5908200a6f0c3b50fffdc1a6a5ae871eef0f04ec9687f43d8e8d5de1372d808a5fad SHA512 1f57ffe861e9906a1744a02b0b50b1dd9e755ea4d0f8b93dba7f42416cd3727834eca60129465fa6f665ac93ec43c3a5272ce9ceae5f4bb17bf180d88e87bddd
-EBUILD xfce4-systemload-plugin-1.2.3.ebuild 831 BLAKE2B 950bebaae05acdfaa3efd1a0968a35fafac3ca3eb8a58ad0ba73919d661f9fca08d6dfcf95981f3a31b0abb606a3861e3eefbd731ce017ccb994a2376d7b1a08 SHA512 74d4427d04f69b2e090f7328c49823d210ca39710e9c2c0dba8f210b248b31f45c7fe09db77622716cf13e6f32f8308293894b78bb3bda8b9f81b5c871c09aa7
-EBUILD xfce4-systemload-plugin-1.2.4.ebuild 767 BLAKE2B 2265b859248c60431b245c7ec89d0c428f6fcc2ab72c8139dd456f40d490b6077e43e969725c961ea152d6e2ef36a74eeb01d0704e03ba84486903f9c579241b SHA512 ef5b8f8833a5dfa218188f597af92169bcc09d884c13046de4ef8dd1f205b7836a033c344cc8f1ea04274450f5b712b0243117826a5f87f321e6fc2d6437e3c8
+EBUILD xfce4-systemload-plugin-1.2.4.ebuild 766 BLAKE2B e99a7541c91b727151344f3f080d2d2f2bbb39c0653b9e6475a34c4c3e8c324e5e5d716d1bb376a428374a01b9815b434b89f5866f856ec9e640ff415dac12e1 SHA512 24b3bafb5dd3d058149d1dfe66c9dac440ec3e46dfdf5ab0802bd527b9e38f023cc594e9c1a97cc8370355f1c8d38a29e1e77d1d1eb379d68910720014094846
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.2.3-panel-4.15.patch b/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.2.3-panel-4.15.patch
deleted file mode 100644
index 72bb9e848480..000000000000
--- a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.2.3-panel-4.15.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 35b50d425209773c9dd21f125b1bd3f8c3daa46b Mon Sep 17 00:00:00 2001
-From: Andre Miranda <andreldm@xfce.org>
-Date: Fri, 4 Oct 2019 00:45:46 -0300
-Subject: [PATCH] Allow compilation with panel 4.15
-
----
- panel-plugin/systemload.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
-index af75be4..c6174b8 100644
---- a/panel-plugin/systemload.c
-+++ b/panel-plugin/systemload.c
-@@ -38,7 +38,7 @@
- 
- #include <libxfce4util/libxfce4util.h>
- #include <libxfce4ui/libxfce4ui.h>
--#include <libxfce4panel/xfce-panel-plugin.h>
-+#include <libxfce4panel/libxfce4panel.h>
- 
- #ifdef HAVE_UPOWER_GLIB
- #include <upower.h>
--- 
-GitLab
-
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild
deleted file mode 100644
index 945435ae7f08..000000000000
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="System load plug-in for Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="upower"
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:=
-	upower? ( >=sys-power/upower-0.9.23 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/xfce4-systemload-plugin-1.2.3-panel-4.15.patch" )
-
-src_configure() {
-	econf $(use_enable upower)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.4.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.4.ebuild
index c597c9019c81..ba2997a28814 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.4.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="upower"
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
index 0d35e5bd0f70..e302147c9b3f 100644
--- a/xfce-extra/xfce4-taskmanager/Manifest
+++ b/xfce-extra/xfce4-taskmanager/Manifest
@@ -1,11 +1,9 @@
-DIST xfce4-taskmanager-1.2.3.tar.bz2 406223 BLAKE2B 1cf70aaa9e28765596730e7446942b74c9999ca35d6dc59644ee74804b6f12cf220f53f36c907bd1b95d038855d2cd00fae15f46637e95a609e191b3a3d05e0b SHA512 e3fbc89e4a1f6d3cd2f03388626b86129244c9d16092c74db18459efcaffc401a4aaab0588d9b96771f609bf5b17fa0a923a17d598e148b6d71efbb08aa5faf3
-DIST xfce4-taskmanager-1.4.0.tar.bz2 413749 BLAKE2B e8179656b7319b7a95b61cce1efac0a708d1133f2525c83f682b9f0ac44aa0d48e02771a35a794a2f8a5d9e6245d3e6d8f18be838e7951d5441b25d95b121a2c SHA512 24c75018d2b7789226bdf373338f8009d3972e4c64144ee004044e8dee9bb2f2e214dcd0570cbd6310ddb4f63dd423bd5d9513f46ee13f631769721a018d00fb
 DIST xfce4-taskmanager-1.4.1.tar.bz2 414574 BLAKE2B d46987fc7b243fe2c48b632079e91f7122baa77f802e3dcb06b8fcc2b9c4f3d15df9a0d630b788b70bb0b49d77e1f1983dd59ac81c5b9078e4bd49415bb2cd90 SHA512 caf5b40823f54ee963bd90446c43ee8e4838849e76ea34e566b613410d4b09585e9f234cb04808ff83441d482c56e0e84083caa1e1855be3b355c7a052c5408d
 DIST xfce4-taskmanager-1.4.2.tar.bz2 414315 BLAKE2B a2a006ce5b048e3a4f7d118976a22a1dc82c3b20fb3f5985f8487cc390daa3ede347b14ce79656929081553810dfb8acb3eb0a1884950a785813cb87066dc694 SHA512 cd7f26c7ab0e0557be52155d58c677258da8479c2a09b0e1dd4006fe0ecb2a3c82d68ecdf72c10e8b8977eac5a158fcb606027229e973edb6ea7570d040c2444
-DIST xfce4-taskmanager-1.5.0.tar.bz2 413773 BLAKE2B ce19dcbf63063cd1eced54e4b8e761c38bf26cd717c39c9d58c0b44627dad55c66777d179b0982eb1872663d3a7a93623d0f9a55f2806131a407a1156ed55050 SHA512 9af857b96cb853f5de800964417d033877a8b69aeed4f7c26fe5381d9b8663a5a19de20060d99f0f6c8d4b13b45b2a305a9310ca6301b94a7b86f7bea993fe53
-EBUILD xfce4-taskmanager-1.2.3.ebuild 881 BLAKE2B bdec47998fc0235f66b7b95d2aa7513fac641f6fab55c04f77ae63696096042a4e5d27bbdcd416c6aecd091cbe7d1dbfd41b7153f2272bd5b1c9b54f0cd0bb37 SHA512 69f511a10904634cf4fb6f8862a49b509fb1d2a247966548e2d91e29465dcebe4e8e6c7e8b02a225dcacf168c32a50c0d20fcceb14526f2bf01e09b13e575bde
-EBUILD xfce4-taskmanager-1.4.0.ebuild 725 BLAKE2B 423bc11421f15b2e7a501752d16f306ca4ec0ac41c465b1647707beb5e63afb9e0a4801ae2244c46521a11e5d19a4490af0827e3bffb04ce44f87217eeb7dd05 SHA512 15cbc47cedde5ce35b4ab8aeef4aa5acd35e23bc654ec854c529f703108cd988fd33f232c18a1aa8fa774406460b098d14cb27a90daaa1b4dcca1185fb1f14c0
-EBUILD xfce4-taskmanager-1.4.1.ebuild 719 BLAKE2B 2f5ab41fe10f653e18798c8e570040479e216f7540cd96b7e2776bf1d308b822c5242d9fa1fb26f76f217ef8def3323c85525259bf3a844aa6311b70c3df5ce1 SHA512 3716927df6c3ee1d23638e221209a009769a7463ad71336fdcfc834dc5c55e88b499e32f23aaa5d2cac3c77cfc66aa7332ac3c0a85761bf842294bc3958ffeb3
+DIST xfce4-taskmanager-1.5.1.tar.bz2 413889 BLAKE2B fa55cb4b2774f77deb34475b2b87f1054029b126794399c3a99ad4da8d18683a88e3f39169f337553ac83ed2721857ac8efaf266d8b7bd28bbb686cc1bdbacce SHA512 86f100a5fb74c0c84517039f861f3426fa5180a386c91442d33a4acbcd997395bc4ed19e8a94ebe241fdacff8bccd64dbdcbf33a0774cd4b80ea2745fde35467
+DIST xfce4-taskmanager-1.5.2.tar.bz2 413992 BLAKE2B beb31b0319144ac09e8c1288dfa593ceccd1c30cfea8ba61d37de71996b92afe5b6ea13bebb0b46fe3222822da1021853de8d3ed01bdfbb2507203ae4c59a679 SHA512 81074da8bf84a0fa9cecd2ab4d5672cb100e4c58ee66bdbaddcb5f6ac2886f615f4bed281920ed71e84fc94f8cd96577a3634b152d393a26f7cb4f62703d9683
+EBUILD xfce4-taskmanager-1.4.1.ebuild 717 BLAKE2B bea9a16029b17f22096f5aa324dfad9c35f987e80f145cfd39526dc817cfe67d2c15f00541f96dec30ac2a238b410b4136218d10e0d6916b7438f3aefb512628 SHA512 38bd846d074303c8e71ea9ec1b035b34675815733dea287b8d85683981191722894fb0c28e5aac77ab8ff67fee9b80489499a1631db5ce0b0f3b585caf02e72e
 EBUILD xfce4-taskmanager-1.4.2.ebuild 722 BLAKE2B f2af6657ac7931cb924a3c73b6e54510d9032aaf3c4861fce2de9ab0723e5573ce5e3e37326d6e15f1ab7d965d6c877f1278af37d8d82017c8fd7274efc6be63 SHA512 6846d34ba12d3679bc3ba466975964a9b001f92135514ca1b955fbb727593b892028bb81211dff551ddd64a7cf44010cbb69acf936cad52f5bb94bed6152a977
-EBUILD xfce4-taskmanager-1.5.0.ebuild 780 BLAKE2B 89f48e713481d3e03ce99f63dfb905904030752c39fdeeb58b8f8bb2f4d41346e4502ce13c6bd9c2e1092ca96e5792b6ed8f8f5d4ad6ebef075d293c291db10a SHA512 5eaffcb32a5d81a3fe556f6c8a937d7e9d8937be2dc609710b9753978c5f07c296b9be42c88342c4d8bee853f41bdd96ca44748d7dcb3d241f1829869bf18904
+EBUILD xfce4-taskmanager-1.5.1.ebuild 780 BLAKE2B 89f48e713481d3e03ce99f63dfb905904030752c39fdeeb58b8f8bb2f4d41346e4502ce13c6bd9c2e1092ca96e5792b6ed8f8f5d4ad6ebef075d293c291db10a SHA512 5eaffcb32a5d81a3fe556f6c8a937d7e9d8937be2dc609710b9753978c5f07c296b9be42c88342c4d8bee853f41bdd96ca44748d7dcb3d241f1829869bf18904
+EBUILD xfce4-taskmanager-1.5.2.ebuild 780 BLAKE2B 89f48e713481d3e03ce99f63dfb905904030752c39fdeeb58b8f8bb2f4d41346e4502ce13c6bd9c2e1092ca96e5792b6ed8f8f5d4ad6ebef075d293c291db10a SHA512 5eaffcb32a5d81a3fe556f6c8a937d7e9d8937be2dc609710b9753978c5f07c296b9be42c88342c4d8bee853f41bdd96ca44748d7dcb3d241f1829869bf18904
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.3.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.3.ebuild
deleted file mode 100644
index 17e4b274573a..000000000000
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Easy to use task manager"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-taskmanager"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	x11-libs/cairo:=
-	x11-libs/libX11:=
-	x11-libs/libXmu:=
-	x11-libs/gtk+:3=
-	x11-libs/libwnck:3="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--enable-wnck
-		# GTK+3 is required unconditionally anyway
-		--disable-gtk2
-		--disable-gksu
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.4.1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.4.1.ebuild
index 4a5c5d0672b5..95fa06c43e81 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.4.1.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.0.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.1.ebuild
index 72ca4e4b6c50..72ca4e4b6c50 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.0.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.1.ebuild
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.4.0.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.2.ebuild
index 7a1aaa7b82e8..72ca4e4b6c50 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.4.0.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit gnome2-utils
+inherit xdg-utils
 
 DESCRIPTION="Easy to use task manager"
 HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-taskmanager"
@@ -16,10 +16,12 @@ IUSE=""
 
 RDEPEND="
 	x11-libs/cairo
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libXmu
-	x11-libs/gtk+:3
-	x11-libs/libwnck:3"
+	x11-libs/libwnck:3
+	>=xfce-base/libxfce4ui-4.14:=
+	>=xfce-base/xfconf-4.14:="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/intltool
diff --git a/xfce-extra/xfce4-time-out-plugin/Manifest b/xfce-extra/xfce4-time-out-plugin/Manifest
index ce6d5eb27ab1..5a3ec67863a0 100644
--- a/xfce-extra/xfce4-time-out-plugin/Manifest
+++ b/xfce-extra/xfce4-time-out-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-time-out-plugin-1.1.1.tar.bz2 405970 BLAKE2B 0e0d94bdb80e3cd8aa3304489d8122f9e0161db57c77c80893f97bc2dc2d578d89e190c56891abcebd95cd7cf9d58e2ba768540af8817b861dded381c6550a74 SHA512 463d210eb6cfaa79c3470b44e7fb42ab44ce8fec0e403d8c71344a5bbc68af29e0da0fe759471ed873637114adf947699ecbaea1129f36e2dd6dc56db0c2ca87
+DIST xfce4-time-out-plugin-1.1.2.tar.bz2 409221 BLAKE2B 75a6f646badb936a803d8e6a8c9c25c85fa76f96fa82bae742724d3b52a68c49f81f58600a91de6ceb0f85220aa2d6b3a3ae2525a38e4f8a5fd78d4fbc6f0dfc SHA512 08e50db9daafd9a2ba60e9d5767cddba83df34d8a261df71b7bb9ae632576f4dfd6252c2a83ec8f9a037284b0adc65751ba36d54ea9d14b85906fdc85d5b86ff
 EBUILD xfce4-time-out-plugin-1.1.1.ebuild 789 BLAKE2B b0b5948009f9c02200e71aaef83d617c27a098ee5b8426f85a5c1f2f434ee425e7d585c946a3788c1c51fdbfac4c21d70deac41bce12b8569ce38da67bed7634 SHA512 813539acf4b828aabbe5483ae8224669fa10cc34ada772b6989914decf4a504d8b5d771e8148e2ea362329a11a55a1314999bb52e5cd9b3f52d86bb101640a74
+EBUILD xfce4-time-out-plugin-1.1.2.ebuild 794 BLAKE2B 54b9d803bf89f20fbee17df66e78e9aa0e20017102e73a8997146b6795e18f72fb43167416b48d29903c6eedd52dc1a5968a877f9ffd01e6f2b4e65235cdadac SHA512 c0225beec5f5fbc990424ecf204a5ec4896156d3909f6eafc74b2b1bd97ed7b41e2b7deefade0919c063c19a53853d7864be6ad7eebd3efd993a34e11a662669
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.2.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.1.2.ebuild
index 02b916c4639a..c98032bc3cce 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.2.ebuild
+++ b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.1.2.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit xdg-utils
 
-DESCRIPTION="A panel plugin for showing information about cpufreq settings"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
+DESCRIPTION="A panel plug-in to take periodical breaks from the computer"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
 SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+RDEPEND="x11-libs/libX11
+	>=xfce-base/libxfce4ui-4.12:=
 	>=xfce-base/xfce4-panel-4.12:="
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	sys-devel/gettext
 	virtual/pkgconfig"
 
 src_install() {
diff --git a/xfce-extra/xfce4-verve-plugin/Manifest b/xfce-extra/xfce4-verve-plugin/Manifest
index 2d1ae3be3e8e..6e77a549377a 100644
--- a/xfce-extra/xfce4-verve-plugin/Manifest
+++ b/xfce-extra/xfce4-verve-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-verve-plugin-2.0.0.tar.bz2 384165 BLAKE2B 7223a2f52574a41acb07ea777a00470a7b0aed027b1084f6fc706d6af07eceb801b15bf2bcdfb9988806f18189363e34f99f929911e23c7ed702ee94c1ca21d7 SHA512 b6be658f5996857e1c5696dc66f973fa5875ba95682297ad157e107abae821023cdf7101ba5f8e5358740549e392b76bf7d1dae252f43bf1a7e8716d798ed39a
 DIST xfce4-verve-plugin-2.0.1.tar.bz2 384412 BLAKE2B 3a0370b1027fef00d748de43bf420271e8d093a203a1c77dfbb8ecd093e139d35ce6f7d585558635b2f5566dc49d8c226c9d6ebe88e7a785ffeabe1a9c8f63eb SHA512 c8397bd833e2a2cf25d86bd9234bdbafed00ce0783273532a57e87a5182d26b3e84b402ed8c9fd9204d5d46fbca257fcf6601f279d9929d806a4c36338379876
-EBUILD xfce4-verve-plugin-2.0.0.ebuild 808 BLAKE2B 946c3abc662e355ae76e3c7947cef08f8eb2c9817fdda33674af962caaad6114d39df72a445bed8a71173df4d7daf2c6ed00747193154448059f2f938d83f6ce SHA512 71dd20bd87e2856e19e809d232d673dd4ae0d2467c80870240804894bade8bbb80eb8d7f0f0562332cb412bdb4ded803e5f8cd2d4ae8ff5bffa111538ceef94c
-EBUILD xfce4-verve-plugin-2.0.1.ebuild 821 BLAKE2B cc8f1fe86d1d2c59ee8d9cea96514c536f023a73d4814b980355f7aea6c2ce472bee0bf4eaed3aa5d5b2de9870804b6545ddbf4a892656c691b6c7ebfee022f3 SHA512 ee539dda34fdd31f30904a182a2f12887ccda7b811a79d623772bd9769c4ac4a40bab657f73f34845670814723a95824dd03bdb903476410bd058ca3e272bc7f
+EBUILD xfce4-verve-plugin-2.0.1.ebuild 819 BLAKE2B 2435f2e1ff8b335abe3bc048ab7653c07b3c98609e0f57f96a4dbbc89ccedfabc4116656070c69f791d639724edf755529481a64ea527cf917934e275f580931 SHA512 aa324eb383299617e507b415fe5f3c640d4cb1df270fa81fb51a629aa58a768372879efa5857dd6383f521cd0ffc624a90c2ae8b0a23da8174f7ebe58a70f9b8
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild
deleted file mode 100644
index 04213ff89ef6..000000000000
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A comfortable command line plugin for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfce4-panel-4.12:=
-	dev-libs/glib:2=
-	>=dev-libs/libpcre-5:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.1.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.1.ebuild
index ce97f1dad5ec..921ffabf14c2 100644
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.1.ebuild
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=
diff --git a/xfce-extra/xfce4-volumed-pulse/Manifest b/xfce-extra/xfce4-volumed-pulse/Manifest
index c0fef2efc8a6..f6f6b0cfb8f4 100644
--- a/xfce-extra/xfce4-volumed-pulse/Manifest
+++ b/xfce-extra/xfce4-volumed-pulse/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-volumed-pulse-0.2.3.tar.bz2 308063 BLAKE2B e64d2e668bf1a6666ce82ac4f03852abfb0346936a789ce7f89acde1734af948f628ca3c17d515e72ab292fc86525623b8aa0b4a219555d7b8729cee10889142 SHA512 da190cea2b3993717f35e1ded058613df99f8fa223a90d379d95dff0bc9d44f4fba15bd23ff1b54f11218d20518092d14a2f2b808d4984673d3bb77616c2f3e3
-EBUILD xfce4-volumed-pulse-0.2.3.ebuild 732 BLAKE2B 8d31bdae59da59ad1317b196568cb2f07e6195b3fab9b2ba53067ffe99d7ea8d8955ba03634fcf5af465db6e60f75d35913fb4801ce91761d73512166a1f551f SHA512 76397492e450d6bf709970d35e5a12b6cd8ae8f7a92272a2b2034e2f0c235a955add8149b867b092d41de73e50f670b985c10e0c7380a3e978d58cfdc72b3859
+EBUILD xfce4-volumed-pulse-0.2.3.ebuild 736 BLAKE2B ce3e776eab1f29b893c67aef047afc690528d429c060cade4309a61c85ec2235b1ce4d80ec313d93e936e815b997bd718ef7d79712ce3769800d6bf9a40fe0f5 SHA512 e306acd7d0fbbf8f8dccdb75f6d4d729181629f7b59ae617a356642d8b024a36dc5ab9d08053078573ca2c67ab5068bf65dd68c80838febd067c2fbb927b4024
 MISC metadata.xml 338 BLAKE2B 61f4640af586e5f992a5d01ee70a9179276a0e3616498d99043d0f3e6e1a6335f50586a61151b2e2a1e946d2c00a598241c9bf23b13c6fe7333054bc326ef310 SHA512 ac7c6bcb04426f25914c331e4f670839e0ba5d4e385f2478387629a7bbf6995254f44cd75516be2d1324fa5f7a98ad000144c7c6fee1582a381c28b280baa2f8
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
index 3d2bfd4c1faf..6a9fc3a318be 100644
--- a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
+++ b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="libnotify"
 
 RDEPEND=">=dev-libs/glib-2.16:2=
diff --git a/xfce-extra/xfce4-wavelan-plugin/Manifest b/xfce-extra/xfce4-wavelan-plugin/Manifest
index 37e64ee701e6..576806a7f974 100644
--- a/xfce-extra/xfce4-wavelan-plugin/Manifest
+++ b/xfce-extra/xfce4-wavelan-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-wavelan-plugin-0.6.1.tar.bz2 328287 BLAKE2B ff48a3ea2a0a3ba349545b687f0ce345055917a7da1e7e6bb829239f2e304bf4092713e40599e641d54e225a86470c292ac224f5bab479f99496d0aea00dfd73 SHA512 530758dec07b404009117038fa6bcac5aaebf9db97710cdeafadece4eb5680318023404276fae8cf1ff38fb5e9eb807f77eea23a30740674a8659404eb17aeec
 DIST xfce4-wavelan-plugin-0.6.2.tar.bz2 356954 BLAKE2B 982ffbc5f72d5771650b4e8d6c64f468bf927febca8c65d8a20258043e1c9433ee9c4631eb501e620f6a1037852494e3f66fe2700e08063ee770cedcad857475 SHA512 90e0d5f2e9add1f177f0f69e537ccdeeaf518a122feb776cb8bce139b9af6ea7d248e758ae381b69041bbdefe2d38f2162d08b25fd246d98c3a028d743892123
-EBUILD xfce4-wavelan-plugin-0.6.1.ebuild 1041 BLAKE2B 4d7eb1a2dcaa02472b048b9b198b84dbcfc36d44505d113ddd80978d42267791f7ad579c2056765f96d7805be5fbfc154f949032edd4f14f7994403d70fd94cd SHA512 17f0f1d80c79180b0c48e4d9932778ee32875fb01d699526c3c5771124e0bbe79e90a4d5bf51a0be0801d7b2fbe996bc6c8993dabd949d97ffae03195e76025a
 EBUILD xfce4-wavelan-plugin-0.6.2.ebuild 711 BLAKE2B f02f7d93320e32544c60d990dcc39c636adebe6d480072aae8ee5fdc6ef19e87887a35e626510818737d4ccd42a49c4bc457baa662f052781d8324e937699633 SHA512 8cbbb5087fd27f374747f0a77d7f88c476d6d2f9f267acbb4c0b7aa16497457cc2a553855e570d84de4e2b0045bc868d376df84aa43a4783eb52a29a0ccd8a6d
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.1.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.1.ebuild
deleted file mode 100644
index ee23f4668d69..000000000000
--- a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A panel plug-in to display wireless interface statistics"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="kernel_linux"
-
-COMMON_DEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/net-tools )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# fix build failure w/ xfce4-panel-4.15.0
-	# https://git.xfce.org/panel-plugins/xfce4-wavelan-plugin/commit/?id=c0033c32ec28bbdd5f735f9b52d212e881eb2219
-	sed -i -e 's@<libxfce4panel/xfce-panel-plugin\.h>@<libxfce4panel/libxfce4panel.h>@' \
-		panel-plugin/wavelan.c || die
-	default
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 78f2b8b64e27..eba1ad80ad69 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-whiskermenu-plugin-2.5.2.tar.bz2 175122 BLAKE2B f535b6ff9d98ebc7b305ecfc03c9389b516e4176e67f341bb4e867df13965fd8416f9281e3fbe5b0b3fe70afa395256553f92fde62d8a0627e0559241baeb690 SHA512 165d4b95808f60dbf7e3a363488af7de24abc5fc16c22e2e62954651f6445b4a2cd4561d148930355876d01327c58b453accac864bb0d4495b5be6faef223644
 DIST xfce4-whiskermenu-plugin-2.5.3.tar.bz2 175578 BLAKE2B 8641506316cacff45d88db4817b5a7d949c7f31b0b2f6748b67c54e668852653f706891d62b0e52ded51c58d59f4ba853df137fa0bad548df54399b7b174b486 SHA512 b293bfeef07ae07d2b4654de7aee795ec7790b291094dbd2655a271f9ad7c7de739b2d4b8c97aee7db85bcdf116c2f1b1150e1875ec2ba2b8bf0ec9f13561ac5
-EBUILD xfce4-whiskermenu-plugin-2.5.2.ebuild 919 BLAKE2B 6065f34d10c8960a37718e9cf6b7ef5a9f43dbfd02b11a33aa7dbabf7ce15e7b9bb6864fe49c73b07c77a77d31956228e2324e9bae859c00e070184ec88a35dd SHA512 b7a9b0f6e53288de8f8cedf623583533fc0587dabee8f10e0b3b14965efe48493f87ecca12b4a0dba75276e5d48b68e0ed9ad8edc969de1c42aa61019da667fb
 EBUILD xfce4-whiskermenu-plugin-2.5.3.ebuild 919 BLAKE2B 6065f34d10c8960a37718e9cf6b7ef5a9f43dbfd02b11a33aa7dbabf7ce15e7b9bb6864fe49c73b07c77a77d31956228e2324e9bae859c00e070184ec88a35dd SHA512 b7a9b0f6e53288de8f8cedf623583533fc0587dabee8f10e0b3b14965efe48493f87ecca12b4a0dba75276e5d48b68e0ed9ad8edc969de1c42aa61019da667fb
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.5.2.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.5.2.ebuild
deleted file mode 100644
index 82425f533fd2..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.5.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin/"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	virtual/libintl
-	x11-libs/gtk+:3
-	xfce-base/exo:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-		-DENABLE_LINK_TIME_OPTIMIZATION=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest
index 11fb432ee0c0..0e6b79c5c803 100644
--- a/xfce-extra/xfce4-xkb-plugin/Manifest
+++ b/xfce-extra/xfce4-xkb-plugin/Manifest
@@ -1,6 +1,3 @@
-AUX xfce4-xkb-plugin-0.8.1-panel-4.15.patch 633 BLAKE2B dac32f28a935af31aa7a90bc348a6a82dcaa437ae42156ef026a1e6a1a2a3e982efe56eeab1c128d1359f12ee1af18fe426b8f6af4e2800735ff2fcaa3ce39bd SHA512 cd0d6fe9d6353f26410d1e04f6e3e7e70071c7bb6025aeb4824c89911acb97dc78e8aecc018c88ad61eb5c7ffb5a4c3bb75e0f7b008b04877e8442af4756cd2f
-DIST xfce4-xkb-plugin-0.8.1.tar.bz2 842814 BLAKE2B be6dfce8e605be346dcd0a5259da980ffd4f7160a808de288bcc7c970c47c678dc6dfde8615e21042142221c6ba66d328dd741f3ce70d988c94562ec061230f2 SHA512 4f0362f429489d111544126697880cdb0a768533803a104f73802fe2c5cfbef5efbf6edd658dbb0ef788ae2a3761f1877c191637a6a06d4a5159bc8f71ad524f
 DIST xfce4-xkb-plugin-0.8.2.tar.bz2 868539 BLAKE2B 20a7a27903be434490b3328f04d57a4ceb505dc1b63e4c98d584c72e6ad0dbc742251c0d9f43ba1da869caa2924627b6cfddd969874a3f5fae8fbf90ef577da6 SHA512 3078c11e1c10195480251c455995e4342c27b06949fc754396824f03bed885f32078f4c1436d86782de031cf4f4f806b530ca53116d4bedb54dda19b68ec7062
-EBUILD xfce4-xkb-plugin-0.8.1.ebuild 1148 BLAKE2B 81514b3746a9c21f5b69aa77e60392da1ab73a81b42392cf32706655448820027b35dbeeb1ccccdadceb6175780d29dd5927f27108c42caa34331579f0d40eac SHA512 00e85399100eb8c86bcffbd7aa198f1d22db8a7ad5aef1066671e5e3ad7ce234fb82f85f92612c6b426254740d7a415b762dad2af2b498899e3ca358c74d5a97
-EBUILD xfce4-xkb-plugin-0.8.2.ebuild 1062 BLAKE2B 14407386e22e0c58198873f9b6d5578f6214db09d20d42ebc9b31db98572944f676f98f4408e811adb68c887c2c82e8774874691dae7b7ae4d9f3c35c61d96b6 SHA512 1f1540c4e74c73a11d27de33840791bf0cb8bccd93add1aedcec6fcff8d28fe7359e64123841864b61edf2c4c15ffc40d4252410e0f569ad2dba131df0254a97
+EBUILD xfce4-xkb-plugin-0.8.2.ebuild 1061 BLAKE2B 6a7030377ed9d64cb915e9ee10ee85b88d96d30e13fd90b7fe481725c5780a4b42f06136f088c3c43deb61164d3a6ed93f96d65dae20c684e3c10ed08e24d320 SHA512 5f1943efbb9b47d2313d3ec11f28fe6f16014e30c5a9b381d086f170e9d92ae0c475c8e5e91515563fdb913ea1a8a8a577353b080a940de9b1a3d5bab71e36e2
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.8.1-panel-4.15.patch b/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.8.1-panel-4.15.patch
deleted file mode 100644
index aeb1b0a2be2d..000000000000
--- a/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.8.1-panel-4.15.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7ecfb91c6b68477262111125977a8229ff142058 Mon Sep 17 00:00:00 2001
-From: Andre Miranda <andreldm@xfce.org>
-Date: Sat, 19 Oct 2019 19:23:30 -0300
-Subject: [PATCH] Fix build with panel 4.15
-
----
- panel-plugin/xkb-plugin.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panel-plugin/xkb-plugin.h b/panel-plugin/xkb-plugin.h
-index 3fe3ce5..eeb10e5 100644
---- a/panel-plugin/xkb-plugin.h
-+++ b/panel-plugin/xkb-plugin.h
-@@ -26,7 +26,7 @@
- #ifndef _XFCE_XKB_H_
- #define _XFCE_XKB_H_
- 
--#include <libxfce4panel/xfce-panel-plugin.h>
-+#include <libxfce4panel/libxfce4panel.h>
- 
- #include "xkb-xfconf.h"
- 
--- 
-GitLab
-
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
deleted file mode 100644
index de5974e72236..000000000000
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="XKB layout switching panel plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="gnome-base/librsvg:=
-	x11-libs/gtk+:3=
-	x11-libs/libwnck:3=
-	x11-libs/libX11:=
-	>=x11-libs/libxklavier-5.4:=
-	xfce-base/garcon:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/xfconf-4.12.1:="
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/setxkbmap
-	>=xfce-base/xfce4-settings-4.11"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-panel-4.15.patch
-)
-
-src_configure() {
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.2.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.2.ebuild
index 4a51bab98192..99f92837e026 100644
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.2.ebuild
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="gnome-base/librsvg:=
 	x11-libs/gtk+:3=
diff --git a/xfce-extra/xfdashboard/Manifest b/xfce-extra/xfdashboard/Manifest
index 17de85f93fd7..af52742a9c38 100644
--- a/xfce-extra/xfdashboard/Manifest
+++ b/xfce-extra/xfdashboard/Manifest
@@ -1,5 +1,3 @@
-DIST xfdashboard-0.7.5.tar.bz2 3366413 BLAKE2B 4fb9c9bd298f5e9b0f3052e1f3d488386446d37e9130e750ee09756da856d232fdc4c18fc21e9883c3df46e7cba636c82f32942b17473a5710e30006baf6a54f SHA512 5d32aa3a49e02d85ca92bee6aa37a3b743e50ca5d992128decea5846e8c9008a9f5bdb98cc0ee3e980761a6538a4867ff28410e066ef22f0aa2c2bd4c5ce1523
 DIST xfdashboard-0.8.0.tar.bz2 3341109 BLAKE2B 8787bd5069d8c4781c1b728e051e344dab227c847faf0762595079556a206b61ba4e6e45cc967f0f7267b41125bee62ff5fdf05cbbc7b3663fa785ad1fdddc16 SHA512 3bbddf079f129c8f32b764f61c75cc4efac52dff752375bdafd5537ad9c9435a5b12ead51176a684fca8fdc24f5bf44d774d8d3d6eae6942b266e1d0e4e89d62
-EBUILD xfdashboard-0.7.5.ebuild 959 BLAKE2B 7304eba0441b2b038071ca6bd06d8e716af476c83d2d4464986473e3a375b2ea6f798f9b59fc0f38a6b7697b94d9d7f35a0250f49158aeefa9b9a7e96b241171 SHA512 e85c0cc866164b16d75ba2b22f97579c3d21c1f9627322ee584bc4bacb7527d3f1e827e6b7a4d7dad08392775e721a747402b4854c749ea80e4db119d8b85907
 EBUILD xfdashboard-0.8.0.ebuild 970 BLAKE2B 9fb26980d359fc3f2b4516f50e9be9491508614b6b724b9f73e20a3adfa8277228e8a82340061390eb98386ec8a526ee2987f42addc2f865fa89340dafa57d2e SHA512 0d18609b5468352be4ace3cce3593003c141532e60ef7bbce888e5e828af515614ce66f75f93f0202bd1bc7a875c22652672ec7d043806cf78ab5fbc8396872b
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfdashboard/xfdashboard-0.7.5.ebuild b/xfce-extra/xfdashboard/xfdashboard-0.7.5.ebuild
deleted file mode 100644
index 43d8df4d9609..000000000000
--- a/xfce-extra/xfdashboard/xfdashboard-0.7.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Maybe a GNOME shell like dashboard for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfdashboard/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.2:3
-	>=media-libs/clutter-1.12:1.0=[gtk]
-	>=x11-libs/libwnck-3:3=
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXdamage:=
-	x11-libs/libXinerama:=
-	>=xfce-base/garcon-0.2.0:=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfconf-4.13:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
commit	d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree	cf61513204d97974179580065e85df5c8009087c /xfce-extra
parent	463397cf1e064185110fe57c568d73f99a06f5d1 (diff)