gentoo auto-resync : 17:03:2023 - 18:28:08

17 files changed, 12 insertions, 328 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 1e66ac67f2a4..f58b2ef0aa68 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index d0e1c0ad99ad..dbb7526bb725 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,5 +1,3 @@
-DIST libxfce4ui-4.18.1.tar.bz2 910047 BLAKE2B 196ded69668b27fd10d99042789e1b2b38eb1a54df6015d1c268dabbec747469d0883087c2f2dcc121f44091a4e19857d51e607ab50fe2aaa20b3b3bf10ad760 SHA512 3bd8a52755c8542ff6952bb91bf57203605991963865f3d88896850ac5b98aec649c229d8743c1d472e6ac19ada853c428c1706aad0613a951aca1c001d9977d
 DIST libxfce4ui-4.18.2.tar.bz2 901949 BLAKE2B 17bf0541646735ec54da5f322d858896fa2fd132fe93864372a67d4936b4467def749f4a0dd4f3d23ecb7a2b3843367f88ccf74b7e040e7ad6f6c15fec45055f SHA512 758466e2e3096791b99e1a00c9f499d95327581ad336fc1ab0d51e3d150206d522f44c2e6053b0032499dd0cb337510cf6940dc77499cef3ecbb484de7787457
-EBUILD libxfce4ui-4.18.1.ebuild 1733 BLAKE2B 77e3722a235e09c5e802fb57b648030baa054b269788c6f661492ecb27b08ef4e9893b491495ae5c7d14d559a32b8823f45827897a2e72f16ee21ac2286d3b5b SHA512 94534883d35f2dd5458cf58de698eb3b7596c8e032fdc60584a6bb7ec563cc2eb1607b1056876cdf19db4f99afacd52824a0f9451425da1a2a5f04ba1054394f
-EBUILD libxfce4ui-4.18.2.ebuild 1739 BLAKE2B 0da39cc9521bddbe924e82d216e2f2834daf2f0762b0c0c7e2ee6eaf0bf7f30c3a458f161f29a7a68d8b710dcbf02dcd45b7ba29e91c85ff34acccd78f658042 SHA512 c496066821e64e30df458642b5e316e569693b2589257c326f96ebef7077dca8d77e03ebd837a85406c06fab6c3b76ef7ec3fc0e1c8937cdf05d0af9f4e81c61
+EBUILD libxfce4ui-4.18.2.ebuild 1733 BLAKE2B 77e3722a235e09c5e802fb57b648030baa054b269788c6f661492ecb27b08ef4e9893b491495ae5c7d14d559a32b8823f45827897a2e72f16ee21ac2286d3b5b SHA512 94534883d35f2dd5458cf58de698eb3b7596c8e032fdc60584a6bb7ec563cc2eb1607b1056876cdf19db4f99afacd52824a0f9451425da1a2a5f04ba1054394f
 MISC metadata.xml 415 BLAKE2B 96ab20930d257e21f8cb46d95f24e7d0fe7568aba5cc097ffb9ec46a5341d58dcf366522de79d8c04b575cd0cf6b96724ed969b8d6338cb842bd50787620ea9b SHA512 9712241bf2f9bb14ac6969f02768e7c4a159f7349eff4a7c9bc8fb779955a555b4cb5770ed32203933e603acb2fa9456cd989a62e274c94320e81e820555644e
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild
deleted file mode 100644
index 93c505782b0c..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils vala
-
-DESCRIPTION="Unified widget and session management libs for Xfce"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/libxfce4ui/start
-	https://gitlab.xfce.org/xfce/libxfce4ui/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="glade +introspection startup-notification system-info vala"
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gtk+-3.24.0:3[introspection?,X]
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	>=xfce-base/libxfce4util-4.17.2:=[introspection?]
-	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-	startup-notification? ( x11-libs/startup-notification )
-	system-info? (
-		dev-libs/libgudev
-		gnome-base/libgtop
-		>=media-libs/libepoxy-1.2
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable system-info glibtop)
-		$(use_enable system-info epoxy)
-		$(use_enable system-info gudev)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.18.2.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.18.2.ebuild
index 31a8ab010145..93c505782b0c 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.18.2.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.18.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="glade +introspection startup-notification system-info vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 80181f77fa2a..d5d03d239fed 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,5 +1,3 @@
-DIST thunar-4.18.3.tar.bz2 2797232 BLAKE2B 4193273e75e6a5a1f9bc1f10934f17b2796b04a59ad2b9a01e4f95e922195a7d8912b35850cc86e91607d7aed78c613bd7776a41a7c0a1b2b60933e1930f3036 SHA512 c6795b691938044d4e15a86c50d60c3c58c203964f2f0e9e69f2432a0d5159b1a7654adb4932a81fcc1f6a89e6fd465297d72dfcb7792fd644ecbd820892a6a4
 DIST thunar-4.18.4.tar.bz2 2836333 BLAKE2B 22ab64ae14bbd15e16d314f2252f02fc8a5ae3043502bfc6a1f43c3e28e735e42d1e040db4dc9c3c7d4df6426c16233da78f30284b1679d59b9ada2cf9051fe2 SHA512 c182abc9fbde79f802c2fac01375be8b29b5da36c665f1de1c005ec09561a865c502e9741a3336ef467d05b215041b452200b063bc33d572b0857f901728d9ae
-EBUILD thunar-4.18.3.ebuild 2102 BLAKE2B 6b265e98b993a780bcd0419ca08c0cffcc77bcbc5c604a11d559d69aafb56e5f5e5540a04fdf3462127520ae1ae029edbe0ff342daf0ccba1de2e668d274c8c6 SHA512 98e689e81569705ba631225cba62c65ebd877a30909389f5e0b1efa34baf6c70190216f9e6e79a1e19534fa47fd7f4b109f77192135c57417c8d0f1344e7a6ad
-EBUILD thunar-4.18.4.ebuild 2108 BLAKE2B f5520d18862ff4c7ffc6b37237f955da368a4e37210dbea5621197354b6b10e9d621db9009c901716d094b3277f2fcb4f77b20f95d8e01ed637b5a1222fdf3e5 SHA512 aed4c181021d97d380d7ba0dc6d911487fcc76e22c737cf8db050543a7eef2f0a2e408c453011457b017723d0741de65cfdf30309772a2d6a06d61b79e81c3f5
+EBUILD thunar-4.18.4.ebuild 2102 BLAKE2B 6b265e98b993a780bcd0419ca08c0cffcc77bcbc5c604a11d559d69aafb56e5f5e5540a04fdf3462127520ae1ae029edbe0ff342daf0ccba1de2e668d274c8c6 SHA512 98e689e81569705ba631225cba62c65ebd877a30909389f5e0b1efa34baf6c70190216f9e6e79a1e19534fa47fd7f4b109f77192135c57417c8d0f1344e7a6ad
 MISC metadata.xml 373 BLAKE2B 8565ee8f50389c9ecd482437d0081ce6c9ed0ade1fffd724c2485c03c708565c91bf89a974a37a3deb541e2e0cf35a19881c8b3ee39182f26d1c522088466ff1 SHA512 b73f53699dc6b936d1baa9bffde644a86481083b4ca333b2d5148bcd03c43e9ff9577c6b35a2e40d89071158c4b4deea4d6317e40959f4344b7f974ac3d22c71
diff --git a/xfce-base/thunar/thunar-4.18.3.ebuild b/xfce-base/thunar/thunar-4.18.3.ebuild
deleted file mode 100644
index 32ba663f578e..000000000000
--- a/xfce-base/thunar/thunar-4.18.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/thunar/start
-	https://gitlab.xfce.org/xfce/thunar/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gdk-pixbuf-2.40.0
-	>=x11-libs/gtk+-3.24.0:3
-	>=xfce-base/exo-4.17.0:=
-	>=xfce-base/libxfce4ui-4.17.6:=
-	>=xfce-base/libxfce4util-4.17.2:=
-	>=xfce-base/xfconf-4.12:=
-	exif? ( >=media-libs/libexif-0.6.19:= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	pcre? ( >=dev-libs/libpcre2-10.0:= )
-	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
-	udisks? ( dev-libs/libgudev:= )
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-util/desktop-file-utils-0.20-r1
-	x11-misc/shared-mime-info
-	trash-panel-plugin? (
-		>=gnome-base/gvfs-1.18.3
-	)
-	udisks? (
-		>=gnome-base/gvfs-1.18.3[udisks,udev]
-		virtual/udev
-	)
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable udisks gudev)
-		$(use_enable libnotify notifications)
-		$(use_enable exif)
-		$(use_enable pcre pcre2)
-		$(use_enable trash-panel-plugin tpa-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "If you were using an older Xfce version and Thunar fails to start"
-	elog "with a message similar to:"
-	elog "  Failed to register: Timeout was reached"
-	elog "you may need to reset your xfce4 session:"
-	elog "  rm ~/.cache/sessions/xfce4-session-*"
-	elog "See https://bugs.gentoo.org/698914."
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/thunar/thunar-4.18.4.ebuild b/xfce-base/thunar/thunar-4.18.4.ebuild
index c3bb395fb212..32ba663f578e 100644
--- a/xfce-base/thunar/thunar-4.18.4.ebuild
+++ b/xfce-base/thunar/thunar-4.18.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
 
 DEPEND="
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index b716965443ad..243eec69aa72 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,7 +1,5 @@
-DIST xfce4-panel-4.18.1.tar.bz2 1446504 BLAKE2B b7b8c0d26d21a543af7bb05b66e4435cbb059043502f34bed27915eaf2684b324e9e9ca8407d666bf2258fb80e559e9b11e87ffea4067c9dc6a42737bc1345a4 SHA512 6c79b305676fc6f8088f5579352be1379e87cf88b4207be0c579e6ebc9661a76f8decc434ef9973e29ca363bb7a4caf980c41b1800fae7d55f47c0405dd48075
 DIST xfce4-panel-4.18.2.tar.bz2 1448776 BLAKE2B 5c6f0f3eb85348c6181a94d19331a42ba02e36fd32c747c2dd1d8d762b795e5c8f7a21d4c54765fe498f1d0604ef7229c40f625cb3350dff41c7ec32caa49072 SHA512 8f8aa29a3dc1133477bc7075a2bbb7e7811ebd26f94e9771e4b6987e4aaa2733295e3260cf5b9052545181195ddac50e93c421e4518cdd1ccf18c39c4c972712
 DIST xfce4-panel-4.19.0.tar.bz2 1485117 BLAKE2B a70654a1d8633f04310a1a9fb8554254de2f272f6fbbfede3c709a9bdc9b7d6138d5ab26ea83ccc75c9152ee0fb9d2ce7e7b174ace6369eb7d60e14db0828cec SHA512 a1c3c5f535581332c1b5e93bfecabae32cbe610d168f4452bed321466b73e4ca9ca09ca2e7c7f54cb82fe45a6102022bb30f77b57841a9bba03809b703bddf91
-EBUILD xfce4-panel-4.18.1.ebuild 1590 BLAKE2B cc1136060fcb7cfdfcf51523efee9c17af783e95ec410fe5818a22ec9a439e96afc5fabd0a54c9c26d875c5e4a0efd8bcdb26e97ef0f1f47de1b0a851ae61537 SHA512 123a616f309295e5a3a199d90c209bd22ecc7f33820bf8577976c719d872bd54a05aebb69952230784cb1270c90d3540a849e616e9e06ad7f1e4d037cfa426fb
-EBUILD xfce4-panel-4.18.2.ebuild 1596 BLAKE2B c3a1b270c82b55831e96da1a09ca5b7a4d0bc3f94968ec59619ba085bbc802bed69e1a7135d0f4dfefdb601390e90550cf67d9a56032eaf46ef18209140e4422 SHA512 66035ad611a7c795d5f362f30539bc8868b703775c9431297b37c89710f72f99fd918b15088092137e01dddafaed31599334b779f01208358f49d65b25f5a7fb
+EBUILD xfce4-panel-4.18.2.ebuild 1590 BLAKE2B cc1136060fcb7cfdfcf51523efee9c17af783e95ec410fe5818a22ec9a439e96afc5fabd0a54c9c26d875c5e4a0efd8bcdb26e97ef0f1f47de1b0a851ae61537 SHA512 123a616f309295e5a3a199d90c209bd22ecc7f33820bf8577976c719d872bd54a05aebb69952230784cb1270c90d3540a849e616e9e06ad7f1e4d037cfa426fb
 EBUILD xfce4-panel-4.19.0.ebuild 1826 BLAKE2B 0a8407966507b07e8c34073d3c88e8d46f713b8e5bf24a14a007a3f51e108468b1eefe1aac65f7b45321480debfe371bd19bec2951f2a01cde3c59354a83a46b SHA512 f20c5910fc8c732e3db02ae9f57a5f58356bfec42767d9943f6deee803ebdaee414553f202fd3fb1f7f18c1100ef5a7350b040485de633dba73c92b68f7cdb88
 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
deleted file mode 100644
index 1554ed519788..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit vala xdg-utils
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfce4-panel/start
-	https://gitlab.xfce.org/xfce/xfce4-panel/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbusmenu introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/cairo-1.16.0
-	>=x11-libs/gtk+-3.24.0:3[introspection?]
-	x11-libs/libX11
-	x11-libs/libwnck:3
-	>=xfce-base/exo-0.11.2:=
-	>=xfce-base/garcon-4.17.0:=
-	>=xfce-base/libxfce4ui-4.17.1:=
-	>=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?]
-	>=xfce-base/xfconf-4.13:=
-	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
-	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-lang/perl
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable dbusmenu dbusmenu-gtk3)
-		$(use_enable vala)
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.18.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.18.2.ebuild
index 7d772282a7b2..1554ed519788 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.18.2.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.18.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbusmenu introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfce4-power-manager/Manifest b/xfce-base/xfce4-power-manager/Manifest
index f56c601ae3ad..001eb186bbe0 100644
--- a/xfce-base/xfce4-power-manager/Manifest
+++ b/xfce-base/xfce4-power-manager/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-power-manager-4.18.0.tar.bz2 1239515 BLAKE2B 1fc2ffcde64e873693322694ef638cc1e3e0773cc3dec663a03bfb7c4833e410e96ab2726fd5b7600149257e8add17ce51da6db5f31895c66007a83ed1837e18 SHA512 5cfa5285b479a0341b4afbf3141f773ff217cd1003cee55087a33f27e392dacf4930bc08b4faa7296dfe9e738d114a56efcecca32145a4cf68856d5d6feb9d24
 DIST xfce4-power-manager-4.18.1.tar.bz2 1217727 BLAKE2B bbd2a70cdb4fbac6146a28895b17896a10aff4a8d5e32ab82852e034977e9d1872d78eca6f8181ff16c74fcdd65ef27d891682bb93ef7ea4d846ccfee07ab034 SHA512 bb84f5a35058fa4aaa8cbe871acd898afb86885172c74d4b811d5b2c1204c0f7865c8488064622c364350c47d9aaecd07f1b65b56f72a547325e6e73bc2eb4ff
 EBUILD xfce4-power-manager-4.18.0.ebuild 1614 BLAKE2B 82efd4979b75e696e36d075481a8461586945b9b4769edfbd9da931e75cdab10e09344cc643e4bb71880d73bc026cc3bfb3135259224a33cf0f2365d91821d41 SHA512 1d0e097580e2b33edb446c6036dd6a442d7beb94840b0318d3b38afae9f21a3637a028c45e6557c8e871a9b6b2e1b93e6bbbdf3a54ee231d4830e2e13e113f6e
-EBUILD xfce4-power-manager-4.18.1.ebuild 1622 BLAKE2B 240c71ad3db1747beba2963664bd159a59f5aeb479a5785464d8bbb023def9384bd821c52cd3f7e99c3672a8597c7d6c9b3a25b06b068b95b7d9e58e314e2dff SHA512 75314fb705d75893c34d1ade6bbb0fd32eac000aa04178d38e6f4e38768af30b33df1972940357325340afea22e8dfbda9a3b7868e3986fcc85ca5d98b965cad
+EBUILD xfce4-power-manager-4.18.1.ebuild 1620 BLAKE2B a8504c1bd2f57892d0137ce8ab02e7e85cef26dc861f3349c5ba77ec83ae82baed036bcb6130955f50fdab65b340701a5114311fa97d7aa1a5088e879ffa6e18 SHA512 d97810b2394e0b5d5df72fbf8eef8e9c9848cb6641cb5795e667d599039b35a5b72f920d733318dc25854783d784a9a274e4e128add7f5cbac3e224eb356798f
 MISC metadata.xml 361 BLAKE2B 0cd2ec9e6643d7379a8c37fc9ae3b3902396c94732182f4a3c7d50bef85e555c9d69b6c8ed13d127167c44e687d356b171f46d071acfa4c26b623835df9d94f6 SHA512 ca556c6a8e5df8b0e897fe64e04fdf23b23518b86db0e29568131d2d17329122f2aa012b2b2a7fb5811bd17a230c1d5a6065ce747532b4eb868cab4eb9d9dcd7
diff --git a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.1.ebuild b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.1.ebuild
index 64d8345ba8ca..7f3644cc57d8 100644
--- a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.1.ebuild
+++ b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.1.ebuild
@@ -14,7 +14,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 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="networkmanager +panel-plugin policykit"
 
 DEPEND="
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index e4adb164ca23..dc0f263b1164 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-session-4.18.0.tar.bz2 853627 BLAKE2B e2a4d2dfcdab677b738d2fc3857bb7db07a0918af5bd4977e0f04210d52d4fc94551187b0ff2e3b5289823aeba0e12dc00344043da0fed2b3b2207afda423731 SHA512 00fcae02004675a26e6d73998403cf0e3a36dfd3596315ee98567d302a10c344cc1b64dac782e02416f11f6db3c730792e8de7d2d0ea1a6e0f2b2b7dbee74f4c
 DIST xfce4-session-4.18.1.tar.bz2 872771 BLAKE2B e9c0b972e1dc2b324d15c17dd317f151d7d4d169533752222f8347be36c1d070f888993be8ef8f590fda5632f66c5a6c973ed91dd95afe06418656c8ec129d54 SHA512 6e6a55138380b6e7ce98508f4d3a52a596882b2f244a1ebd0d1a4b7dd1814c93e6e27453b500cb9178889790f067e28c7c4479b39963511d8e579831a44ef973
 EBUILD xfce4-session-4.18.0.ebuild 1511 BLAKE2B 60283009f9d1e6ae909433277c64771c426d46e6c1c6c94143a2d3f783e5a9d5366855888ef55faf9c31b7ab7f84e9c091b43e35efa754ef5ca8771a8c530a11 SHA512 659b67853f4919f2de3c97f3dbaa760901ca1ce7aad86e915fdeb2de4e03c5e2e4a46853c6d01ec991d87c76fe98a6b6b735aa569c9e684f7548b07910278434
-EBUILD xfce4-session-4.18.1.ebuild 1517 BLAKE2B ce0c77fcb148fc8c6768356840ccf61543aea92f4d8de746c983562255abbdb901ec3ac72d5737f4c0e9e938a338f5327c8c71840cfbabd4efd4e6ec463d1625 SHA512 9dea443db1c4f04845fbb527c3895e40e9a1f20c7128c752ed4f78672c40437062496d5e55031ca205ae983d196b3e7d24948bfaa9acf31d8d619bbbc1a42be4
+EBUILD xfce4-session-4.18.1.ebuild 1515 BLAKE2B bb152f448c5c289bda8d2d33e0ccbb17ba29653f1fdc441374ca1add1163d9b1d75946e5a7902482c4c5016692ced0de554278f79f02e94d74e4bca5f4da585d SHA512 aae3e333b695bd8642c45902083034f80bdf6032324a1e10d26e254e58f0be225f6273c5a0ba8c1a37e8d780fc0f989b00cb97a3f0c667bad98bf5d8134aa151
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-session/xfce4-session-4.18.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.18.1.ebuild
index d46f926906e5..ae01eb28e109 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.18.1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="nls policykit +xscreensaver"
 
 DEPEND="
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 0858fd57868d..856a76cf205a 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-settings-4.18.1.tar.bz2 1513041 BLAKE2B 83b47dbe138bd809391833a4525d01b2171dd77ad5826e90f95a181deb39350683b864242ed8708caaaefe19aac748e96ac270fa71ef25a96cdabc5311c2e639 SHA512 868d9d041c7aee621543ea54798f9758dc47719a7684d01ebb55e0193c30a0ac544df6a4961846e4b8c6d9297737be767d6f68446c4ab85870d8c0741cd07515
 DIST xfce4-settings-4.18.2.tar.bz2 1544572 BLAKE2B 8dee6855c98426aace796c7c6fe55770ca2c4c8e0c5129fd70274a0fe6589dd797eb078d79f7fd490c39cd4e1ec1dd90439c4cc030e7594aeb27c84e6e541fa2 SHA512 3371db3952f1863763b613952585873a0b8e1bd8507a64c056a918f3d16c3313e1266cb65dc341d3ce89ab281ee5a5d2cd183b6bb4078609b843524a125769b4
-EBUILD xfce4-settings-4.18.1.ebuild 1814 BLAKE2B b7a30fea90f89d256f8511926102bd1cb91ca17a9d79fe061ec0314b41cc8e99adbb93eb0e8f67e90bf03de954fcb19471983e1dfc95d45a3e7b16607519ec93 SHA512 785ba75fc52c310aca81a1dfcbf6abb87867b8e4643ce6976b75bfd41f3d36b51bea77d64a0d30ad567c2ade075efba5e6ab12736c00b8d9e1adcebb02529ce7
-EBUILD xfce4-settings-4.18.2.ebuild 1820 BLAKE2B 761df5405092625aba448eb7bb45d90c73ed61b174559c55efdfd4a561f9db2429fc963e52f9613bb1671f5d446655b66d70949a82932d065c58dc43c48a9bdd SHA512 dfd3ae579e17be8490fc1ac6c8d6fcbf110e012525b87bf30ab31ea1e69ea5ad9b38b3312523a7bd213dd6a5864ee90a136b9522d27e10f6c9b81d5894c479fe
+EBUILD xfce4-settings-4.18.2.ebuild 1814 BLAKE2B b7a30fea90f89d256f8511926102bd1cb91ca17a9d79fe061ec0314b41cc8e99adbb93eb0e8f67e90bf03de954fcb19471983e1dfc95d45a3e7b16607519ec93 SHA512 785ba75fc52c310aca81a1dfcbf6abb87867b8e4643ce6976b75bfd41f3d36b51bea77d64a0d30ad567c2ade075efba5e6ab12736c00b8d9e1adcebb02529ce7
 MISC metadata.xml 480 BLAKE2B 4aabe2bbd7da19f62794843c890648503139a81904d84f6b97f9af9634a43ad583eede1adec9704969663455d033838db3a9a825c90d6f341cea411ed89514f2 SHA512 7e1e28f50387533611b4cee185e5e91b1dcc180ebb5bf7bcbd5fa58bc8ef666ce1bba57961de19016ceaa75a6b60b70ec55cff9a2d22bdf0d4f2b9e04abf2bb7
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild
deleted file mode 100644
index 208e1b52bfa7..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfce4-settings/start
-	https://gitlab.xfce.org/xfce/xfce4-settings/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.66.0
-	media-libs/fontconfig
-	>=x11-libs/gtk+-3.24.0:3
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2:=
-	>=xfce-base/exo-4.15.1:=
-	>=xfce-base/libxfce4ui-4.17.0:=
-	>=xfce-base/libxfce4util-4.17.2:=
-	>=xfce-base/xfconf-4.13:=
-	colord? ( x11-misc/colord:= )
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	xklavier? ( >=x11-libs/libxklavier-5 )
-	!<xfce-base/exo-4.15.1
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable upower upower-glib)
-		$(use_enable input_devices_libinput xorg-libinput)
-		$(use_enable libnotify)
-		$(use_enable colord)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.18.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.18.2.ebuild
index 5ac63306b8df..208e1b52bfa7 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.18.2.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.18.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}