5 files changed, 22 insertions, 93 deletions
diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest
index e28812e7ead7..083f021aeaa4 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1,8 +1,5 @@
-DIST xpad-5.4.0.tar.bz2 163394 BLAKE2B 478e96b6c09748f4643d287887f8432642f42e6786e6473832328f7d1202a1a23d96f2a06859e8da096b0e6c420df06269b6c2459e67cbceb29b9f569d565931 SHA512 a20b1d16d0d9e4cb0b88c969165eb9514b69a0eaef91eca8a3fb4da08ea8a2db32891de3c8a2a4a97db21bf78f515c7b6f798c59ba155f480f866334fca7986f
-DIST xpad-5.7.0.tar.bz2 162675 BLAKE2B 2166816696d2e00a261fcc8e9483841be7803121dc3669ab35fdd014728f16a47860448dd6b754836a3dfcd0fbbd1805b87e470f96c0b692fbe3a588c81ee35f SHA512 ab9319473cbec9a7022e520e2284853270fccca88ad19e8cb52024ce79a2dd8049251009a22b97e2387de12b9e75576e50d4d17a7236cb8e0eb4c840c3400ef3
+AUX xpad-5.8.0-gettext.patch 561 BLAKE2B f4bce662f5bfb556e70e969adbbf560dec0330541ddb929f93301f7903ac3a544c49069ae90465337b4ee2b4123fb6aad62857af95b16bba0b69ffb461a405cf SHA512 448ec88f81e2bfe8466a6066807cfe51f20341082ef599617bf7687c59a5ea8010e14f2d4a728f7b476fc446bcbe49091ac3867a56732b00e00d2feb7ba9a9c5
 DIST xpad-5.8.0.tar.bz2 162732 BLAKE2B 6165e59b2d05e640f820f1f52811f214909f445adee4bfeb595fc3913493d15f4a25556b5edb006163a0c123b9953934c77cb519d0dd9f567170a0282637b43a SHA512 868dc820a172fc31f79fab5ee842e4f7e5646ae0239101bb442fc9a4a79b2c76052a70b635a9fa39fae22838df698a4a398188bc44dada63db16a756330c3cbd
-EBUILD xpad-5.4.0.ebuild 751 BLAKE2B 46bed80e7abdeb1f497454f0ec0ccc4ca6375fd603ae51897f05fba72264290ef2205e3286eda87872a8ce4e4f4f7d1c1d8d1f904a49aa859db5cf67f98d1b56 SHA512 b0a1f33dc69cada298571b79468c1a8587a5e64a2f9fd4888923ed32be26867a81cf1bac8bde1e96bb066dec9dcbc7572b4f308a47990a9a4b7f539046f4e148
-EBUILD xpad-5.7.0.ebuild 831 BLAKE2B ae5a1b56a615655ee93fb010222e6830cd60d75c33666284e0c303d8fb613ced1bc6dd83989210d5db28aa3b6dcdd47e429a89129759047eb7cc14fb8c9b1e02 SHA512 417cf945c2aceaa78c412df4961192f93cbb78f8d716affbd62a7595cd63b9c10798eb1dd4e7cd2d2b8083d357fb5694e18eef6dfa552c89b9d3b519c0b972cb
-EBUILD xpad-5.8.0-r1.ebuild 802 BLAKE2B 5ea0f85a198e17c63fb1b474687ab342d6f704989516db76dd2ad366814ef20dbca6d56b5be8a2b12522a77ed40aedf754533b45f828ff0d901dbb9826da726f SHA512 da86d727dfef2a17429a9042d9f7508c00eb449fad885474034ff41b9f498f9401363484e1500f4cfc603e4ca00ac22b81e2a33777ebfcf3c0ea96bca4691ca0
+EBUILD xpad-5.8.0-r1.ebuild 858 BLAKE2B 8de59e7daf41be008246dd6b8c98cb7797fc7b88dfec2ff419909f3fe7d10c23dbf8454c4d0f4e9f9a7499be6f03501130ce12d5defb2b4f89109e51e1086fb6 SHA512 bf2e476e3e3f047f98cbeaaa0a369c1fb2471f9887bf3359efcdde0b50fe16a242ec00d60c577285c5fd1f3d3b5b6511758328a0c8f21f09335e52da0ae4200b
 EBUILD xpad-5.8.0.ebuild 831 BLAKE2B ae5a1b56a615655ee93fb010222e6830cd60d75c33666284e0c303d8fb613ced1bc6dd83989210d5db28aa3b6dcdd47e429a89129759047eb7cc14fb8c9b1e02 SHA512 417cf945c2aceaa78c412df4961192f93cbb78f8d716affbd62a7595cd63b9c10798eb1dd4e7cd2d2b8083d357fb5694e18eef6dfa552c89b9d3b519c0b972cb
 MISC metadata.xml 553 BLAKE2B a46c921ebebf55ac68b39fd00a78cb79038c3c78977f5b1967eb7f8b3f9745a1879bf1703cd2e71abe0f9eda83b4847089da3ecd9ed0c3d8864ff37af15f4866 SHA512 a99de9e46f399383bbe225e2ef1518327e4219e2877eb3a2b56e83e9aa6f79ad18e6e999b642e24212653bb0ad3ae44c47b7bce820562746b8f55859193f9f0c
diff --git a/x11-misc/xpad/files/xpad-5.8.0-gettext.patch b/x11-misc/xpad/files/xpad-5.8.0-gettext.patch
new file mode 100644
index 000000000000..e923b8a6ddc1
--- /dev/null
+++ b/x11-misc/xpad/files/xpad-5.8.0-gettext.patch
@@ -0,0 +1,16 @@
+Require specific gettext version, as otherwise using
+>=sys-devel/gettext-0.23 may lead to a build error due
+to misaligned gettext versions.
+https://bugs.gentoo.org/945976
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,7 +52,7 @@ AC_TYPE_SIZE_T
+ # i18n / text translations
+ # The choice for version of gettext is only based on what was installed on the developers desktop (2021).
+ # If another version is more convenient, go for it.
+-AM_GNU_GETTEXT_VERSION([0.21])
++AM_GNU_GETTEXT_REQUIRE_VERSION([0.21])
+ AM_GNU_GETTEXT([external])
+ 
+ GETTEXT_PACKAGE="$PACKAGE"
diff --git a/x11-misc/xpad/xpad-5.4.0.ebuild b/x11-misc/xpad/xpad-5.4.0.ebuild
deleted file mode 100644
index cf0357f56a9e..000000000000
--- a/x11-misc/xpad/xpad-5.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A sticky note application for GTK"
-HOMEPAGE="https://launchpad.net/xpad"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.56:2
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
-	sys-devel/gettext
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[X]
-	x11-libs/gtksourceview:3.0
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/pango
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/intltool-0.31
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/x11-misc/xpad/xpad-5.7.0.ebuild b/x11-misc/xpad/xpad-5.7.0.ebuild
deleted file mode 100644
index 90ae5daec211..000000000000
--- a/x11-misc/xpad/xpad-5.7.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools xdg-utils
-
-DESCRIPTION="A sticky note application for GTK"
-HOMEPAGE="https://launchpad.net/xpad"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-
-RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
-	>=dev-libs/glib-2.58:2
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[X]
-	x11-libs/gtksourceview:4
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/intltool-0.31
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/xpad/xpad-5.8.0-r1.ebuild b/x11-misc/xpad/xpad-5.8.0-r1.ebuild
index 1f09ce2c5800..43dd732081bf 100644
--- a/x11-misc/xpad/xpad-5.8.0-r1.ebuild
+++ b/x11-misc/xpad/xpad-5.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 RDEPEND="
 	>=app-accessibility/at-spi2-core-2.46.0:2
@@ -29,6 +29,8 @@ BDEPEND=">=dev-util/intltool-0.31
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=("${FILESDIR}"/${PN}-5.8.0-gettext.patch)
+
 src_prepare() {
 	default