4 files changed, 48 insertions, 8 deletions
diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index bc1b57bf85a2..55b91bf4ddbf 100644
--- a/games-sports/Manifest.gz
+++ b/games-sports/Manifest.gz
diff --git a/games-sports/ultimatestunts/Manifest b/games-sports/ultimatestunts/Manifest
index 7d8d857f5c71..8dca54c9291c 100644
--- a/games-sports/ultimatestunts/Manifest
+++ b/games-sports/ultimatestunts/Manifest
@@ -1,5 +1,6 @@
 AUX ultimatestunts-0.7.7-gcc-4.7.patch 457 BLAKE2B 0491753a7462b51ff03ffed3e2174638ff2229440eea9a4cb770e8ddcc5305d4700fe03ddc7b290496db4edcfd25c2954deb6076197e27d1712580c3da8c9bb6 SHA512 19fe87b1c4fde66803b299e5db5d8ac6112ba07ea334720cadee59ce5f238564b37af7f863bb4bab7b9ca780169e293ca2ab2defad3ce79f3123c8b956cb6c32
+AUX ultimatestunts-0.7.7-intl.patch 1357 BLAKE2B 3de60a6bedf2ed1b68bc863f36924878bd491257bc35e617de34ecf49ae1380fdaf80af480a224e6905d352c3f8946cbebf0211bca364d05e3913d620b6e4402 SHA512 8e0dfbf4c79a8e60b2fa4d052a52593359c37078214243189accb2c1df995b0c307e59dcb2ca594ce5f7e577f1cb8cb7afbebb7bd545fddf7cc8bb7db8abe979
 AUX ultimatestunts-0.7.7-paths.patch 764 BLAKE2B 3f96f5593078269886bcd4a7528803ee55f4969f9c0843645a88bc436548d046e35adab028bc1b279ae2ec2bf54e45dedf96bca8e5f0e361aa9c8247b0243763 SHA512 da896527c8a76fad854270b38219b646689016c03c4800f89800b36f419ca210d8e5d524ef9a95beb9eef342c22edab7f70e0f28e6f14e4cf4b38ef23771080f
 DIST ultimatestunts-srcdata-0771.tar.gz 47449346 BLAKE2B 7d2a82b525eed254424e14e5ab0bffb560f16980f9abf569138f4cba576fc4a823e1e3ca62791acd57b55822d06b0969e5be1d8bfcd7ecc779b5f53150649827 SHA512 c532d1434570775da8e0b8156659f96dcfbdf82890f07aebbe398bdcf2039a11c832ead8106c8522af1a4a847f685727dc6f7739443a99858621995452ce4741
-EBUILD ultimatestunts-0.7.7-r2.ebuild 1296 BLAKE2B 682ecf684866a68375040d8f4451a4047c8218bcf87b0bbf57ed0dc3cea4fc0d48a3f3e8e5940dcc09d2e9efb1f51f2980d595ac34e50291e74fc57fad39ea57 SHA512 7d72c4d86d5e43a2d98d4201fc7f675d48f8e963092376987ae0353367f1018abde615e719b70a5b43825c144c78e01d889820dba0487dba9f8223061a6ade5b
+EBUILD ultimatestunts-0.7.7-r3.ebuild 1491 BLAKE2B d686ced17b55698bf1e7a226b463111005f344e9650fb118bc3f94b013edf9c848f55a5b97355c24dbcea6e9527a5cbfe1b08726aed53dcca9094442f94fce56 SHA512 635971e8d52292cdba7e49351864f8dac44abf116391c0e6cc120fa7fd8fab7749de1c64a135cc9a3446ac05e044e423d7b8ee311c83661ba6d94dabdc784779
 MISC metadata.xml 338 BLAKE2B 883974a93f3bd6f0e5a6d93a86338edfdab2d38e52e4076d16fdc06fb0c4ed6d6379c7c71e88f5641a7d750b1b700f4c3e131773862878e2a6ea8697ef69d04c SHA512 6d404abbbb20f74163135a67fb2bfdad69688fa09b67992bc1d20141da95f5ef584118de9140d6784d569fce765dee20a43b75d5c5b5e506fb6e1b6198e33ddd
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.7.7-intl.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.7.7-intl.patch
new file mode 100644
index 000000000000..009badabd1e7
--- /dev/null
+++ b/games-sports/ultimatestunts/files/ultimatestunts-0.7.7-intl.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/944445
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,7 +5,7 @@ CFLAGS=-Wall
+ 
+ AUTOMAKE_OPTIONS = foreign 1.9
+ 
+-SUBDIRS = intl po data shared simulation graphics stuntsserver stuntsai stunts3dedit trackedit ultimatestunts
++SUBDIRS = po data shared simulation graphics stuntsserver stuntsai stunts3dedit trackedit ultimatestunts
+ 
+ ultimatestunts.conf: ultimatestunts.conf.in Makefile
+ 	sed 's,@usdatadir\@,$(usdatadir),;s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),' < $< > $@
+--- a/configure.ac
++++ b/configure.ac
+@@ -243,8 +243,8 @@ dnl -------------------
+ dnl i18n
+ dnl -------------------
+ AC_LANG_PUSH(C)
+-AM_GNU_GETTEXT
+-AM_GNU_GETTEXT_VERSION
++AM_GNU_GETTEXT(external)
++AM_GNU_GETTEXT_REQUIRE_VERSION(0.22.1)
+ AC_LANG_POP(C)
+ 
+ dnl ------------------
+@@ -277,7 +277,7 @@ AC_SUBST(sdllibs)
+ dnl usdatadir is used as the data file install location
+ AC_SUBST(usdatadir)
+ 
+-AC_CONFIG_FILES([Makefile intl/Makefile po/Makefile.in data/Makefile shared/Makefile simulation/Makefile graphics/Makefile stuntsserver/Makefile stuntsai/Makefile stunts3dedit/Makefile trackedit/Makefile ultimatestunts/Makefile])
++AC_CONFIG_FILES([Makefile po/Makefile.in data/Makefile shared/Makefile simulation/Makefile graphics/Makefile stuntsserver/Makefile stuntsai/Makefile stunts3dedit/Makefile trackedit/Makefile ultimatestunts/Makefile])
+ AC_OUTPUT
+ 
+ 
diff --git a/games-sports/ultimatestunts/ultimatestunts-0.7.7-r2.ebuild b/games-sports/ultimatestunts/ultimatestunts-0.7.7-r3.ebuild
index dccd476bea79..e73e1515285e 100644
--- a/games-sports/ultimatestunts/ultimatestunts-0.7.7-r2.ebuild
+++ b/games-sports/ultimatestunts/ultimatestunts-0.7.7-r3.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit desktop flag-o-matic vcs-clean
+inherit autotools desktop flag-o-matic toolchain-funcs vcs-clean
 
 MY_P=${PN}-srcdata-$(ver_rs 1- '')1
 
 DESCRIPTION="Remake of the famous Stunts game"
 HOMEPAGE="http://www.ultimatestunts.nl/"
 SRC_URI="https://downloads.sourceforge.net/ultimatestunts/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -26,13 +27,12 @@ RDEPEND="
 	virtual/glu
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
+BDEPEND=">=sys-devel/gettext-0.21.1"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-paths.patch
 	"${FILESDIR}"/${P}-gcc-4.7.patch
+	"${FILESDIR}"/${P}-intl.patch
 )
 
 src_prepare() {
@@ -40,6 +40,10 @@ src_prepare() {
 
 	esvn_clean
 	append-cppflags $(sdl-config --cflags)
+
+	# The bundled version is ancient, https://bugs.gentoo.org/944445
+	rm -r intl/ || die
+	eautoreconf
 }
 
 src_configure() {
@@ -57,8 +61,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake -C trackedit libtrackedit.a
-	emake
+	emake -C trackedit libtrackedit.a AR=$(tc-getAR)
+	emake AR=$(tc-getAR)
 }
 
 src_install() {