gentoo resync : 22.12.2021

14 files changed, 93 insertions, 233 deletions

diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 66b6c01750fb..bafd2834bdc9 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index 8b522ff60a84..3f1e868d2748 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-sensors-plugin-1.4.1.tar.bz2 471543 BLAKE2B a5cc58c7c8a68b78dca7c810083daa69a43e265161e2dcfd2b99ee16fa40583c0e5a6f1e31cb6d3ad23f8a0cccacd52ca7d44623a32951b185614404f917c7a6 SHA512 d3f335e1f18fe748648be07ace6a88eb9f95222dd4d8dd4f6e5cbb3b7c69bd93b02fdbe12b9f08e65fbf7ba8461d7a685467f9e62c0682c85b3699fae5b7ed33
 DIST xfce4-sensors-plugin-1.4.2.tar.bz2 508525 BLAKE2B 619bfbc8d4453697cee2c5d5a669edee1a455e899a50229c77bf1b41661e06d7811a09e446e84e5cf62b9c24d7244f3eec74eb14fe7ccc4bcf49a25b14df9d18 SHA512 0b036ca6b040f1f97576917c944e19b9b5803c4e98f1d21435c0a5598701c9bff053e014f03edd09dbb9232e5c932c014719999a0e972e5e3db8330665c0217c
-EBUILD xfce4-sensors-plugin-1.4.1.ebuild 1489 BLAKE2B 1793fa7dc6faa9c225df6f636cd8d5a07441b4b0dc07ef2d2fb0647c2110baa90cc773fbfae8118d93f92dac5002a8bccfe8bc3e1bf38ce7456de0d128184200 SHA512 b24a9a066f727238e418c9b05486cae11ccc7b98d4628523ddc94011cd22b8843723ad6b408b50b50090374a718703219e553cf2c4aca289717ed6b6ff85235c
-EBUILD xfce4-sensors-plugin-1.4.2.ebuild 1515 BLAKE2B 3be75fddfa925eaf22372862e8b9fac17dd556f6024437b6bd59da07782decb0089d32ab05d55ffe5676d47c99fe31e9f60390b28906ca090518fde3dbd13171 SHA512 c573d8de8c3d69230f4c10eae32be478c29c7d66c3648f186bb303b15bcfb7fad39ba30dfb5747cf9d6001acdfff33621d5c838955fd766f272adc9b81effc17
+EBUILD xfce4-sensors-plugin-1.4.2.ebuild 1513 BLAKE2B 36e20ad2bdad000e559efd129257a4eee807ad0b6e0e606c784f06595d65989dea709dbdf5da462657580ac67c6b33de06cfffd101a0b1388bb6b70b0b54168b SHA512 1c7faeb65208648703479833efe530f2607d6ca304e4f9dbf21edb23140f3eb28b6be1c814722810f6a9c773b493a596c58b402b7320acc9db887ac3437a33b3
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.1.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.1.ebuild
deleted file mode 100644
index f8590f230a57..000000000000
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A panel plug-in for acpi, lm-sensors and hddtemp sensors"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="+acpi hddtemp libnotify lm-sensors video_cards_nvidia"
-
-REQUIRED_USE="|| ( hddtemp lm-sensors acpi )"
-
-RDEPEND=">=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:=
-	hddtemp? (
-		app-admin/hddtemp
-		|| (
-			net-analyzer/openbsd-netcat
-			net-analyzer/netcat
-		)
-	)
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
-DEPEND=${RDEPEND}
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable lm-sensors libsensors)
-		$(use_enable hddtemp)
-		$(use_enable hddtemp netcat)
-		$(use_enable acpi procacpi)
-		$(use_enable acpi sysfsacpi)
-		$(use_enable video_cards_nvidia xnvctrl)
-		$(use_enable libnotify notification)
-		--disable-pathchecks
-	)
-
-	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-sensors-plugin/xfce4-sensors-plugin-1.4.2.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.2.ebuild
index dbc447ba9919..b5422dcc8299 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.2.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.2.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 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="+acpi hddtemp libnotify lm-sensors video_cards_nvidia"
 
 REQUIRED_USE="|| ( hddtemp lm-sensors acpi )"
diff --git a/xfce-extra/xfce4-vala/Manifest b/xfce-extra/xfce4-vala/Manifest
deleted file mode 100644
index e96f142bb8e6..000000000000
--- a/xfce-extra/xfce4-vala/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xfce4-vala-4.10.3.tar.bz2 88023 BLAKE2B fb5ec9ae0cf14d0f28c49ee04288a9fb78d512f2619e3fb52fd7ceca743763ab12a2e504fdcac78ff3c37b2e8c1aa43acd082b1101f10a2e881eac4655684367 SHA512 ef5d6c67d53edc428ed10e59c21a1264a0d6d06efbea531a15f2eb1309e632e3cd275657aeb01c5723f437b9c319b922055598f97b0ee7db45853beef4f4d987
-EBUILD xfce4-vala-4.10.3-r7.ebuild 855 BLAKE2B f0ece3cdc207916fb8b9690d58bb790f3b40c1c4aee49dce9a33ef36b35fe2a0683769c1c97bf27862690b8cc206bfb164a33d1249c8c5997a034184246c1e1a SHA512 f27389a711479e308cdf1eb5943e66bfa8db954c75ac2cf601b63c941433c9f2c2463158c77b2d18f72514ae0644b32a2e8d36f63d4259c6dd288224214df282
-MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-vala/metadata.xml b/xfce-extra/xfce4-vala/metadata.xml
deleted file mode 100644
index 2b8ef06e9a39..000000000000
--- a/xfce-extra/xfce4-vala/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r7.ebuild b/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r7.ebuild
deleted file mode 100644
index c8e8d4cdf7ad..000000000000
--- a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION=0.44
-VALA_MAX_API_VERSION=${VALA_MIN_API_VERSION}
-VALA_USE_DEPEND=vapigen
-inherit vala
-
-DESCRIPTION="Vala bindings for the Xfce desktop environment"
-HOMEPAGE="https://wiki.xfce.org/vala-bindings"
-SRC_URI="https://archive.xfce.org/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="$(vala_depend)
-	>=xfce-base/exo-0.10:=
-	>=xfce-base/garcon-0.2:=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=
-	>=xfce-base/xfconf-4.10:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	local myconf=(
-		"--with-vala-api=${VALA_MIN_API_VERSION}"
-	)
-
-	vala_src_prepare
-	econf "${myconf[@]}"
-}
diff --git a/xfce-extra/xfce4-wavelan-plugin/Manifest b/xfce-extra/xfce4-wavelan-plugin/Manifest
index 5d1e9b9bf239..a61525bb6b93 100644
--- a/xfce-extra/xfce4-wavelan-plugin/Manifest
+++ b/xfce-extra/xfce4-wavelan-plugin/Manifest
@@ -1,3 +1,5 @@
+AUX xfce4-wavelan-plugin-0.6.2-close-definition.patch 1551 BLAKE2B d4d13dc82bcc990562b2fd40207e0ecf39b51fbc157eff92ce726e34708691531da3fa35d9c3245f00a1ae5b738ee35d12019c9adb24b455c15b256bbceacf5d SHA512 ad15a7fcae2a3254d59c5a856d6e3e4a523748ad58edae3aeec1bb7044dd025c0d7dab83f756715813a64f32ddd94ba73deddef5f846198fd8c35c36ca3a01f9
 DIST xfce4-wavelan-plugin-0.6.2.tar.bz2 356954 BLAKE2B 982ffbc5f72d5771650b4e8d6c64f468bf927febca8c65d8a20258043e1c9433ee9c4631eb501e620f6a1037852494e3f66fe2700e08063ee770cedcad857475 SHA512 90e0d5f2e9add1f177f0f69e537ccdeeaf518a122feb776cb8bce139b9af6ea7d248e758ae381b69041bbdefe2d38f2162d08b25fd246d98c3a028d743892123
+EBUILD xfce4-wavelan-plugin-0.6.2-r1.ebuild 770 BLAKE2B e86b511684118cceb4dc7f70d5add5ef17af4bce03fa6037cc76eb52f30b642b7ac3fa5bdb2cf57202021527355c88a6fb5bdf0e702ddb1c5fbc7fe6c2ea72e2 SHA512 7622bbc0ec3c23032aecada9821e38a10533fecf60405c9d3212e8fa248f13b95d4b02209c37a4f3a3ee58b03711d84db71cd7df3e9286ca6ce0f3f5916fed79
 EBUILD xfce4-wavelan-plugin-0.6.2.ebuild 711 BLAKE2B f02f7d93320e32544c60d990dcc39c636adebe6d480072aae8ee5fdc6ef19e87887a35e626510818737d4ccd42a49c4bc457baa662f052781d8324e937699633 SHA512 8cbbb5087fd27f374747f0a77d7f88c476d6d2f9f267acbb4c0b7aa16497457cc2a553855e570d84de4e2b0045bc868d376df84aa43a4783eb52a29a0ccd8a6d
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.6.2-close-definition.patch b/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.6.2-close-definition.patch
new file mode 100644
index 000000000000..bc27e2c12afc
--- /dev/null
+++ b/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.6.2-close-definition.patch
@@ -0,0 +1,55 @@
+https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/merge_requests/4
+https://bugs.gentoo.org/799827
+
+From: Olaf Hering <olaf@aepfle.de>
+Date: Fri, 25 Jun 2021 19:37:09 +0200
+Subject: [PATCH] remove bogus close function
+
+Just close the file descriptor, instead of doing shutdown.
+
+Not doing so was already wrong in 2006.
+
+wi_linux.c:83:1: error: conflicting types for 'close'
+ close(int fd)
+ ^~~~~
+In file included from /usr/include/glib-2.0/gio/gcredentials.h:32:0,
+                 from /usr/include/glib-2.0/gio/gio.h:46,
+                 from /usr/include/xfce4/libxfce4util/xfce-gio-extensions.h:28,
+                 from /usr/include/xfce4/libxfce4util/libxfce4util.h:40,
+                 from wi_linux.c:32:
+/usr/include/unistd.h:353:12: note: previous declaration of 'close' was here
+ extern int close (int __fd);
+            ^~~~~
+make[2]: *** [Makefile:525: libwavelan_la-wi_linux.lo] Error 1
+make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/xfce4-wavelan-plugin-20210505T194034.7ba466b/panel-plugin'
+
+Signed-off-by: Olaf Hering <olaf@aepfle.de>
+--- a/panel-plugin/wi_linux.c
++++ b/panel-plugin/wi_linux.c
+@@ -31,6 +31,7 @@
+ 
+ #include <libxfce4util/libxfce4util.h>
+ 
++#include <unistd.h>
+ #include <math.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -79,17 +80,9 @@ wi_open(const char *interface)
+   return(device);
+ }
+ 
+-static void
+-close(int fd)
+-{
+-  shutdown(fd, SHUT_RDWR);
+-}
+-
+ void
+ wi_close(struct wi_device *device)
+ {
+-  g_return_if_fail(device != NULL);
+-
+   close(device->socket);
+   g_free(device);
+ }
+GitLab
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.2-r1.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..d68780f3c4e9
--- /dev/null
+++ b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+DEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/xfce4-panel-4.12:="
+RDEPEND="${DEPEND}
+	kernel_linux? ( sys-apps/net-tools )"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-close-definition.patch
+)
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index d15738056411..bfe2253894b4 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-whiskermenu-plugin-2.6.1.tar.bz2 179186 BLAKE2B f1b2880144bee2de3213f540e30da19050eab5cd9b00c03e55bd7ce69ff09460362a2251d183effcad5da85a30641db263546f0b65b11ffa94aa23257e298f7a SHA512 69d98dc992c6ec89c79cac63fba29cffa1546c8c836896418ee300126be5dbd1a106d40e25d11de5c5d88c2f5d99ce5f0dc509c0d549d2bfe89d56aa1d5b82a2
-DIST xfce4-whiskermenu-plugin-2.6.2.tar.bz2 179280 BLAKE2B f87db28d5824219abb742eae1ee82a8821511e0231068994db2995d1fc7194f9c5699b95ec59ccf0864e873d31e7303176b3f9ca8c3306d3aeb81220e2f98c18 SHA512 0c6b1cec79f11a874eba38b8531e253c3114298d472b6bc306238dfacb9f5d01f98383439043de9c8717dee43bb0643dd453c9be1527c3efa04fb2d0d0041e61
-DIST xfce4-whiskermenu-plugin-2.7.0.tar.bz2 183403 BLAKE2B 6ea6edf474c532d4dd8407f2dc786d21d458f5f859f575a2c8f77f38c1d243056e2c6d9635e6b0fa782c759f8eb42f2fe8f58d90da6d9f5229c924896bb7685a SHA512 40e8458eaf98bca1c72fe9c6e74471dc197666277470edecd6051fb62ab4ad72822d8de75552bd602ec5774fe9964fb69f68c28481469c6f86f29db4fd257baf
-EBUILD xfce4-whiskermenu-plugin-2.6.1.ebuild 998 BLAKE2B f53d62e0c8064050f81123fe068be96d2b6d490b08c6007622dae45aa8ece5b12f6560a3ca7de6785f95213cd74c2f1b0c1fe3668cf4ebfaf97b80be98cbf0d9 SHA512 072eac23a45e2985528fa525e70995b02ba023c0a29f390e8e4da282d8924868a2b27ea76b59e0430005dc6dbc8ee40011f1a12668c9771e3bdf66a42345d6dc
-EBUILD xfce4-whiskermenu-plugin-2.6.2.ebuild 993 BLAKE2B 9a513dd5878851c6eb04f5c1d035e85d9cbc95f29ee95fec57d49985d586e7669d425ebf9bf7613990801a9547b8022da06c029bd97595c4819d1800fb68c107 SHA512 58df2e6bd9a05a19cda626534e88872bf7b5500be6337c4efb32b3ff0d38734a6ef80faf504de51a894054d42ab26731017b00057eedbeed52d600cb132f1cd8
-EBUILD xfce4-whiskermenu-plugin-2.7.0.ebuild 993 BLAKE2B 9a513dd5878851c6eb04f5c1d035e85d9cbc95f29ee95fec57d49985d586e7669d425ebf9bf7613990801a9547b8022da06c029bd97595c4819d1800fb68c107 SHA512 58df2e6bd9a05a19cda626534e88872bf7b5500be6337c4efb32b3ff0d38734a6ef80faf504de51a894054d42ab26731017b00057eedbeed52d600cb132f1cd8
+DIST xfce4-whiskermenu-plugin-2.7.1.tar.bz2 183687 BLAKE2B 609a802fa4a13e860f9f2e374acaa520bc443f881532015b296236a034797784a14989e3f8f54cfcba1f3e36d25844f8308e5ece14e01616f390f409bd6514b1 SHA512 40a1124ad8bcb51a21cab20cde8079fdce31d57ade3da787235554391e5eb9ec747c646f46f84f9ecadacf124446bf80a7aec8138415b68ed064e02371aa7c0a
+EBUILD xfce4-whiskermenu-plugin-2.7.1.ebuild 991 BLAKE2B 6ecd37193c910f993c9354312ce069fb844f66683789a4441725a02986feaa261185ad8f673d8af640730787a7141c82171ec203a851912e466fe27d482ea315 SHA512 dd46f72c977b09e6c0502ae66a3a863a213de294074ba5d8b74aa5d78a694d29d79be44b010599e1d7e321ad7785e6abe9da0c1636de4db5390b6b23a71b4131
 MISC metadata.xml 2114 BLAKE2B 301868122902e577bed6e790601a192b839d3345d601e87403d5651aa99a260b7c80d9bb16a6f273a3a06531f091b3a2416eeb4cb0453692d00c17cf5478df24 SHA512 f5e4445fca8f8ae4cb1aa681108256584729ef6073e531f23729bb7880d839c3d29995480e21eabcd453f1f3368fb41d078b5091bb691d0879215ad6e3e1eb3a
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.6.1.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.6.1.ebuild
deleted file mode 100644
index 18e51d5aca5f..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.6.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-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 ~riscv 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
-"
-
-# upstream does fancy stuff in other build types
-CMAKE_BUILD_TYPE=Debug
-
-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-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.0.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.0.ebuild
deleted file mode 100644
index a535ab4e79d4..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-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
-"
-
-# upstream does fancy stuff in other build types
-CMAKE_BUILD_TYPE=Debug
-
-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-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.6.2.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.1.ebuild
index a535ab4e79d4..841b6b7bd8a7 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.6.2.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="