5 files changed, 73 insertions, 2 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 49ee38dee875..fd22b83acdd3 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index fe4a3d28ce9f..14f431e3e6f5 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -7,4 +7,5 @@ AUX fbpanel-7.0-python3.10.patch 410 BLAKE2B cd4c57ea9677062a127e698d248b9ec15b3
 AUX fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch 801 BLAKE2B 49a0d7217b5e44c902200d9fc4cee57d245386cbf400e21a24672b2c121578d09dd440d56f05483afbe3e6083bbe65fdafb162e35624d7bd0f7f34b1639d2737 SHA512 d4fc104faf4bc4c9ead54530c3e00e82d9ab3c356d635c824d206dd2fa64c64b8ff57594cb6fbbef9725df30f10994de3a213aff8f1eb7fc8b59cd08498e3148
 DIST fbpanel-7.0.tar.gz 3746477 BLAKE2B 6bc8ef39d44768b5fc9fc4c58ea0b89c723f0e5239198d3b1a5f6fe27252bf22c87fec5beb13fa3371af6c218e592d67d04644bd82cc62f357def610680fc2d2 SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874
 EBUILD fbpanel-7.0-r3.ebuild 1594 BLAKE2B ca3022d9414c4013249bbd131890ac677eaea8bbab3f525b3ea3efba77c2da0613134a9449013aad6c63bb9c63bdf7e36262525d79a4596fca633db6da725b19 SHA512 33fa67f1c2ff4927cc4abe7b340ed4d4c8cc50b3a82a244a52ab0757e46ea0b1caa4b5a5f332b2b591dc7ae1ba3140af44dda65e44e7cebe7bc33df543a6d58a
+EBUILD fbpanel-7.0-r4.ebuild 1627 BLAKE2B 3e7536522967c38d11ccea251d8b06a1a3d8941379a262098659acff76830ef9ed171f0ef0868519af89af4a1b64fee2425b28d1551f82fc827b73764e3df846 SHA512 a0d56795e9681f537566eb967227cc8c6d8ab9bfebd4a928f9a0522143b432199c75122f6b1fd70aace6406a21017b8ea021d6956315e2cdd7b86017159641c3
 MISC metadata.xml 252 BLAKE2B cc4fe64f3e9531d55a19098705558d2e02a395279ba605d6c598ef6b9a13cb0a17cc9cdae4f9e2ea30f34abb58f0591b3c4f11a6e42b385ee7c0855251b37f20 SHA512 22086ac1bc91a06382f92625473824dd26f60fd00cf691ad3b587f45b75aadb9f0c66bb4af93ab02fe059b00f504770c642342d81dee9f01b950b99c1f85ea9d
diff --git a/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild
new file mode 100644
index 000000000000..04f05780e684
--- /dev/null
+++ b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit edo python-any-r1 toolchain-funcs
+
+DESCRIPTION="Light-weight X11 desktop panel"
+HOMEPAGE="https://aanatoly.github.io/fbpanel/"
+SRC_URI="https://github.com/aanatoly/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT LGPL-2+ GPL-2+"	# bug #795591
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	alsa? ( media-libs/alsa-lib )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1-underlinking.patch
+	"${FILESDIR}"/${PN}-7.0-clang.patch
+	"${FILESDIR}"/${PN}-7.0-fno-common.patch
+	"${FILESDIR}"/${PN}-7.0-images.patch
+	"${FILESDIR}"/${PN}-7.0-python3-shebangs.patch
+	"${FILESDIR}"/${PN}-7.0-remove-gdk-pixbuf-xlib.h.patch
+	"${FILESDIR}"/${PN}-7.0-python3.10.patch
+)
+
+src_prepare() {
+	default
+	2to3 -n -w --no-diffs configure .config/*.py || die
+}
+
+src_configure() {
+	tc-export CC
+
+	# not autotools based
+	local confargs=(
+		V=1
+		--mandir="${EPREFIX}"/usr/share/man/man1
+		--datadir="${EPREFIX}"/usr/share/${PN}
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
+		$(usex alsa --sound --no-sound)
+	)
+
+	edo ./configure "${confargs[@]}"
+}
+
+pkg_postinst() {
+	elog "For the volume plugin to work, you need to configure your kernel"
+	elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means"
+	elog "that provide the /dev/mixer device node."
+}
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 6754798ff7b9..c7bd64496e3d 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -3,5 +3,5 @@ DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add
 DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71
 DIST xdg-utils-v1.2.1.tar.bz2 293386 BLAKE2B 9d6ce4be8c27ad5b8d0ae55ad0d8b4457b59cb1bd260884ca5bfd2cb8ed7ed68a2f5a8db6d660ceabab59cbb9880fd4f1a26cb71a8f759ec40c2f9f95bbc8a05 SHA512 d5436449fec2f4db952239ee910bfda203955c8df8cb92379f182dc36f9c82b6ceb092ccbebfd02ed00eb7ef5f6895ef745baca67906ae7490e425db27b1dbfc
 EBUILD xdg-utils-1.1.3_p20210805-r2.ebuild 2424 BLAKE2B 44c105b594dcff348860cfdb915e1b18bfc028a9bc8a0a5c8ae33f7d9e67b6bca2b15360b908a921fc1e9629569152f6adbe81ff335f07d558b8d60b3029c7c6 SHA512 c944a53cc3a5f2c81f8e33bf39aea958ae95398f862f30a21636a1729b8bd196c0d7d4766ea25a501189edbb25fc194c75f4e62913faab8cb5d4862bb77bc865
-EBUILD xdg-utils-1.2.1-r1.ebuild 2298 BLAKE2B 5c42cb9f494018eca60e2d5066147ac51d6536f1cc76def1f15de48ce82716b80260d4fd305f2f608ed67c0389594f8ca4dadc67bb8a0f59fff78f5ca627f30e SHA512 56c6a414e8a4591163ad1d3924c69597825d04dccc86b09a3e5b555233bae5aff4a54159fe56989eddd5daf50d59b9050f51425abe593f062516a6846ba7cc0e
+EBUILD xdg-utils-1.2.1-r1.ebuild 2291 BLAKE2B b475167f8817c813c3bd844d3fd8d718fcfe96b8728a776e175494850ce42c522bade72c01b18407a594bf1b8698706b14445f8cf2419fb9a0ddea06aaeb67cc SHA512 c60238c0eff9b66984548046d26ef28bbccbdcd88adbce6138021f40b5880f5761fd99e464155e526e1a1e32d2e0057090d59a0db0aaf9597145ce829db5634c
 MISC metadata.xml 319 BLAKE2B 4910953400fa3f3b0b72b8baba239a1e0c3466c38f84b6a60bc816620b789473179c151b1af68d0629ba7f79a1ea826b536f0f29678007bba025714ceb514061 SHA512 c07b03f20aeedd0ceaf7de137b76578142c703317d98ac7a57ae5143cab7523974a50aafa58e92c541d4a84ec0961b7de180d11d95c7da45f5698e3c19e7182d
diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild
index ffa605d5f864..74b50cca06a6 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dbus doc gnome X"
 REQUIRED_USE="gnome? ( dbus )"