5 files changed, 48 insertions, 15 deletions
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 3d4d371caff7..1100464b8730 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/opengfx/Manifest b/games-misc/opengfx/Manifest
index 1779e34bd817..2d692860e43e 100644
--- a/games-misc/opengfx/Manifest
+++ b/games-misc/opengfx/Manifest
@@ -1,4 +1,4 @@
 AUX opengfx-7.1-no-which.patch 997 BLAKE2B e0757dee3b729f7885b7b3bafdf5cc5a9f9588071c71bf2295d0287b879e7b2c5f76c76e5281ea2f4b6b2c9d06396341acc02f848c19fa5b64df5f6715aae371 SHA512 b5eff66bd5e656ef677a0749d90559c5d431a1a0a1c17adcd66a704a17563bce762a20843c61dabc24fbcf8046fc5e528f4db6f9855d0fee456f0619945fb106
 DIST opengfx-7.1-source.tar.xz 9828168 BLAKE2B a1d8305744b76924400cad8503af1a20991551323adea6d0d60d9f6d5ac6311e52cb8f028eb614bbda41106823ab9b912f1fb8af02953758a2eb2912066a38e9 SHA512 55079babcd78d4a36279cb7610b6800308aca8409ed3b9fa33cd4993b0c1f988d7afe270b17930b97609c4fdf8cf4e362e17c11bd85d2ef136d042256c98483f
-EBUILD opengfx-7.1.ebuild 1124 BLAKE2B 995b1eaf2a595c4656debe98e9afff75028b2d413b9c17d6dc662af8a74dfc3555848439c372b1ec11c951e8b0447a192953012f3868a30fcccbe1e63a8ace73 SHA512 742f13ae778c819f599e9b9c06dd16c94b71fac99ed47bb353dd1d93ea74a1e812d892cb7350fb1f63be9a35285416167cbdc156b937947d6a4c7f9ab423134d
+EBUILD opengfx-7.1.ebuild 1098 BLAKE2B 88b2942558936c1ce182c0352ff9a7182e7b7f4a737a1857c33ddbe5bf5b0f41b763e20fa05844133127f8ca98955727d1de3ac4a2209118d6111518c7a1efd9 SHA512 05f28c8137492eaf26dd5276480a54cbaadde2563d002ca75b0458c54b82e3685e8ed011aae3d4386414419457ebee2a5fa822fd7a5c99761ff24d12866c1aa6
 MISC metadata.xml 327 BLAKE2B c715ce68b2db10d38dd11434102f5345515dba779726012906aabc6169681605c615866328bf8d213ff80f77a7c7a4a7bbe7c3145c18b33abd8de553059e7e75 SHA512 c5f22f130e0506a7714b27dd2858f69d52a6f11854ebd82b4116d7045a57ef74b435dfe920bbb18c99eca7b139c276a56aef4b5e28396b376dad5ceba6686127
diff --git a/games-misc/opengfx/opengfx-7.1.ebuild b/games-misc/opengfx/opengfx-7.1.ebuild
index e4437660902f..4302b32d54a5 100644
--- a/games-misc/opengfx/opengfx-7.1.ebuild
+++ b/games-misc/opengfx/opengfx-7.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} python3_13t )
 
-inherit python-any-r1
+inherit python-any-r1 toolchain-funcs
 
 DESCRIPTION="OpenGFX data files for OpenTTD"
 HOMEPAGE="https://wiki.openttd.org/en/Basesets/OpenGFX https://github.com/OpenTTD/OpenGFX"
@@ -29,31 +29,29 @@ PATCHES=(
 )
 
 src_compile() {
-	local myemakeargs=(
+	myemakeargs=(
 		GIMP=""
 		PYTHON="${EPYTHON}"
+		CC="$(tc-getCC)"
+
+		# Make logs verbose
+		_V=
+		_E=echo
 	)
 
 	emake "${myemakeargs[@]}" all
 }
 
 src_test() {
-	local myemakeargs=(
-		GIMP=""
-		PYTHON="${EPYTHON}"
-	)
-
 	emake "${myemakeargs[@]}" check
 }
 
 src_install() {
-	local myemakeargs=(
+	myemakeargs+=(
 		DO_NOT_INSTALL_README="true"
 		DO_NOT_INSTALL_LICENSE="true"
 		DO_NOT_INSTALL_CHANGELOG="true"
-		GIMP=""
 		INSTALL_DIR="${ED}/usr/share/openttd/baseset/"
-		PYTHON="${EPYTHON}"
 	)
 
 	emake "${myemakeargs[@]}" install
diff --git a/games-misc/opensfx/Manifest b/games-misc/opensfx/Manifest
index 235f8d9c76b5..330f49e7d2b0 100644
--- a/games-misc/opensfx/Manifest
+++ b/games-misc/opensfx/Manifest
@@ -1,4 +1,4 @@
 AUX opensfx-1.0.3-no-which.patch 5890 BLAKE2B f23d3fb9ba5d7ae30107b2f872fb59fa8bb5a1509680e601110f13ce0d227316fcd0f9be5d86eaf8b9e575b47929b81b692c3416d361649acaf673c12d59d671 SHA512 45a9768ce97934486f282f4f2ab3bcfaa9fc916f8978417042451b3f2847128ab4a30b8c5710cb709510168b9893cfcc0f3227e8e41ffd4d7e0ffe4cd73f6655
 DIST opensfx-1.0.3-source.tar.xz 9943616 BLAKE2B c266ec015c23d79b28e313ad3cb5a1613fe7c9674fd0192bf4a141adcd2a27594052f311710b63e6a173579ba5bebeed50799d2cb19eb3fd5b5ca28411b4b509 SHA512 a077fcb1676ba17aa5e9e2df32c2d69452fe54895e3ac64a80c2a6247aa3ea2ef37443e2391f88117768eeb3f808793c78c11727c69bb3df2fde57f67964dbff
-EBUILD opensfx-1.0.3.ebuild 649 BLAKE2B c60a6acb891315f32d89161c09042cf2b260143d3aad4d744c2e8f8fb421a0c57909291d31c54e295cbf9819bcf76e6eea41876dc95d83ea46445b2ee817cef2 SHA512 c3ab74a0064853fe309c85c8608f2ef0f9ec341ce50dce5fc7fd0d3bfa6cbcc60594de22c4798eefbe3a69146cd331aff2c3d605ccaa383437adbc64737803d4
+EBUILD opensfx-1.0.3.ebuild 1139 BLAKE2B 18393f19dab08e89eb0c1090e468269502159a12906843a577bd3f57c5bbb1d6b6413bfb90ab94705741a21b53d8b04e989938d16cb8ee3657270c5b044853c4 SHA512 dc7596213d312350c17aaf9215f98cc7163fc86775f570133accbfa45ef03752328f6b7d3530b711a3d7c322a2f48513b6dcbcee731aecda8f9c6ebf798f99bb
 MISC metadata.xml 327 BLAKE2B 15e9be4cd0ae3a5594274fb0e018d4d3bca0ef5ffa2a83dfe29b9cf615a0070d3cf47fbfbfebf32866e1f7c3fead83622c7f49ab30649d1383f3236f6a94fbe7 SHA512 b8e8dec4960aa1913b4d8ee801916755ad20e408a62aae6291a650d0abca928123add122d95646e911c54665acf5d8c6fd928a9a1800f5520ebc36a8e0a9db18
diff --git a/games-misc/opensfx/opensfx-1.0.3.ebuild b/games-misc/opensfx/opensfx-1.0.3.ebuild
index e36280e714b0..f8e89bd702e2 100644
--- a/games-misc/opensfx/opensfx-1.0.3.ebuild
+++ b/games-misc/opensfx/opensfx-1.0.3.ebuild
@@ -1,8 +1,12 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+PYTHON_COMPAT=( python3_{10..13} python3_13t )
+
+inherit python-any-r1 toolchain-funcs
+
 DESCRIPTION="OpenSFX data files for OpenTTD"
 HOMEPAGE="https://wiki.openttd.org/en/Basesets/OpenSFX https://github.com/OpenTTD/OpenSFX"
 SRC_URI="https://cdn.openttd.org/opensfx-releases/${PV}/${P}-source.tar.xz"
@@ -12,13 +16,44 @@ LICENSE="CC-BY-SA-3.0 CDDL-1.1 GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-DEPEND="games-util/catcodec"
+BDEPEND="
+	games-util/catcodec
+	games-util/grfcodec
+	${PYTHON_DEPS}
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.3-no-which.patch
 )
 
+src_compile() {
+	myemakeargs=(
+		GIMP=""
+		PYTHON="${EPYTHON}"
+		CC="$(tc-getCC)"
+
+		# Make logs verbose
+		_V=
+		_E=echo
+	)
+
+	emake "${myemakeargs[@]}" all
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" check
+}
+
 src_install() {
-	emake INSTALL_DIR="${ED}/usr/share/openttd/baseset/" install
+	myemakeargs+=(
+		DO_NOT_INSTALL_README="true"
+		DO_NOT_INSTALL_LICENSE="true"
+		DO_NOT_INSTALL_CHANGELOG="true"
+		INSTALL_DIR="${ED}/usr/share/openttd/baseset/"
+	)
+
+	emake "${myemakeargs[@]}" install
+
 	dodoc docs/{changelog.txt,readme.ptxt}
+	einstalldocs
 }