gentoo auto-resync : 11:08:2023 - 09:34:39

8 files changed, 111 insertions, 2 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 74b0b1cde4d8..702767f7c4de 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/cartridges/Manifest b/games-util/cartridges/Manifest
index 29ec98a160fd..887a1a33a7ff 100644
--- a/games-util/cartridges/Manifest
+++ b/games-util/cartridges/Manifest
@@ -3,6 +3,6 @@ DIST cartridges-1.5.6.tar.gz 1305623 BLAKE2B 20d95f2153e090db3ffee36361e8595ea3c
 DIST cartridges-2.0.4.tar.gz 1332584 BLAKE2B 07cd5f19ad74c169cd1a98136920fc8f10fda001f1cde93f26fd0a77e556f0406995efc07b54722571f468983b9af53d7db2ce95e434d91f7e10a7b5855d1b46 SHA512 892be1a587aa7ad4baed457069fdf7019472bcf0d7acf301e8aca96719ebe259f59989fc966cb32376326273406ac688a51e95bd395b5de7b63c85c031dcf15a
 DIST cartridges-2.1.1.tar.gz 1337163 BLAKE2B 6d4a67d8d6ecc035e6b3b12a7d5c9160de2af46423264c670bb7e448d00393a6dc7742ab30047eaa888689d9ad0eb5baf9657523164761cff3b71d4b23a9d551 SHA512 0963e2e5183a8cbb8c1de1fbbf9f67beda65eb7396aaf644fcc30ed79a3dd8136e5e78d3a5b065c9b6f2a4cba4e3c715e412f1cc651a555195d9af5cc6f1e22b
 EBUILD cartridges-1.5.6.ebuild 1210 BLAKE2B 601e7149b337cb55f4cb287db1fed12e8b991d9383fb45f9fa841818e3b62cdda70770d94350aadd6070a97a4fae2922da322c7d2f69788cdbf733b864929d3f SHA512 dc76fee26ca7c5a6e27c641fed1172af916b4901a98b3930246f12cb5a11cb7edbbfc2d1e2abdaeebb8f7a6341c7446636c6a1875cae8f6d5b1ea09fb6b95456
-EBUILD cartridges-2.0.4.ebuild 1211 BLAKE2B 0e60e0ea4c9e0648cf1a7ef8b19984297119434aa842b306eca685420fb52e42c9722386104c6157ec02e6833e30375564162d0575f7790047558f27c60a9cae SHA512 42c13c130ea48ceb33eeab935d66c74a3943fa742c2a3d8e562cd33810836d4038174724a296117758386abc43819d7f50eb15c30173d44d6907e3259ed61bef
+EBUILD cartridges-2.0.4.ebuild 1210 BLAKE2B 601e7149b337cb55f4cb287db1fed12e8b991d9383fb45f9fa841818e3b62cdda70770d94350aadd6070a97a4fae2922da322c7d2f69788cdbf733b864929d3f SHA512 dc76fee26ca7c5a6e27c641fed1172af916b4901a98b3930246f12cb5a11cb7edbbfc2d1e2abdaeebb8f7a6341c7446636c6a1875cae8f6d5b1ea09fb6b95456
 EBUILD cartridges-2.1.1.ebuild 1211 BLAKE2B 0e60e0ea4c9e0648cf1a7ef8b19984297119434aa842b306eca685420fb52e42c9722386104c6157ec02e6833e30375564162d0575f7790047558f27c60a9cae SHA512 42c13c130ea48ceb33eeab935d66c74a3943fa742c2a3d8e562cd33810836d4038174724a296117758386abc43819d7f50eb15c30173d44d6907e3259ed61bef
 MISC metadata.xml 760 BLAKE2B f57df1306fd66ac7c1275d2c77ced58a333f3e47a7f02ae643d8fe4bceb7f28dfc796e3898fb28eef7f6e4ee250e762ca208c662be94a12e89a098ec45d5b482 SHA512 e70a9f88c0cdb41276783878ccaf24623f8c97fafc55d88ab564604cb534b4ea7426eb50d3c9ba9ee091e7adf5bea6d68e919c0c84a496be3d8c6497394cd2b7
diff --git a/games-util/cartridges/cartridges-2.0.4.ebuild b/games-util/cartridges/cartridges-2.0.4.ebuild
index 05c8ac27f772..ed5e3c551ea4 100644
--- a/games-util/cartridges/cartridges-2.0.4.ebuild
+++ b/games-util/cartridges/cartridges-2.0.4.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/kra-mo/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index 654a722550e5..fac1c79e70e5 100644
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@@ -1,5 +1,8 @@
 AUX 6.0.6_p20210310/0001-Remove-brittle-apWrapper-code.patch 3501 BLAKE2B 2132586124cfe2232c655f5041a2ef28b46cac8e72acecd2cb9004bece074c915c0f9609455e73f2ce8d95b28c5d1ac7d4739c4264e90e1a570f33d136bd4f9d SHA512 68a7a2329dfeee4ad28562b088948ddd6457e0f6b14a63e6be376041897070c5acc756b14e158dc4631a4fb1e0197f523d8bb76272d7d39c093e49259efa700f
 AUX 6.0.6_p20210310/0002-Fix-ODR-violations.patch 1722 BLAKE2B 941c2c95b7876b8b2be39e623cbff969b0609e50a3c798acd34052f0c13bf048971fe2b07885bcdc2921e66a928ce6d11c2bee71e26602116f104725acf3d04c SHA512 e73f4ee685230128489d47f3d10f296456debd3e6a85b6ccdbecb6ceb550a59cb95cbd37b2a222883b058b15aa319221e9040c4bdda4511e74c05e26a778ea50
+AUX grfcodec-6.0.6_p20230811-no-fortify-source.patch 585 BLAKE2B 62b2ec66f6cfffd26bc69c1489d10b9bc568b5343d186300728e641ab1b2a54b13658045f8dc45a331792a204a71d5e6dbf5fbc84f3e1e1cec53ee165a2525b9 SHA512 1155b81eefe3e299907bdfc19d170b17e28c44b67554e71b21a501b6e84d4e889c354f3ab0b3e29ebb1210edede41d6b73c9a24e8b241dd6af419547b22bd298
 DIST grfcodec-6.0.6_p20210310.tar.gz 205795 BLAKE2B 24d803e208b2fc465ae71611c0c0fb2737bfa8c5a28375bc08a6220581d7b07bb2f2a390e2ddb7f4beb8a80951862473919d41bce83364af70b6dc646f0f3f8e SHA512 10f4ec28c69d87e397f0fb5b497dbefce8fcd826731d3a0a864cbbd333b7df188ab0087445644ad245aeff65a8b6563dfdfa657ac1a2248e56e296c01f7d58a8
+DIST grfcodec-6.0.6_p20230811.tar.gz 205324 BLAKE2B 00d36b6785d00edec061cc0f0a695225a78c487bc66c4521f0f3da1050304bc382ed78d1df8dff8602b35b167505388ad993c46f01ac39960c131a6f5c7264eb SHA512 95a883636720ad1fdd0a2e17cba60b6cde15b5fe0337cfe2330db75d60e9a2bdb1dea3c06bb8f8acace8989b6abaf6d1845b30c5bc5f6c76f34e5aa76f36ddd4
 EBUILD grfcodec-6.0.6_p20210310-r1.ebuild 993 BLAKE2B 1cb3e7064e2f72b373c4b0dd83d8c3f16a017dddd7a3351328e8ffdddb84f70e3aba7937eb49b47230d74684240cd91873f1434b1bc18bb7c24d08dbaabcb464 SHA512 c69963730921fe1260bb24a90ea78b9b2ea6db788f057586d12eae09f6943144ae6dca2cfec5318ea13fd45b0c83984549f941224af5b0ea23fda8ddd051ff26
+EBUILD grfcodec-6.0.6_p20230811.ebuild 1032 BLAKE2B 0852d527c7957930e1d41cdbaaf997f0728a56b6823455a00b2de872d7d7f817b9c1a9aa59a65533b87d4bb155339ba023dbe7c3bbb17e2152b6e57cb7bf840f SHA512 2e162f970d2f0961b9ab59583b4adbe461db2b8e94c6c11b4c66678fc387ef307698a4f94c1127a0d2b7de85a790735fee8e5e5c521bb4b5cf98c626a79fc187
 MISC metadata.xml 335 BLAKE2B 32e45cd9e4b4e6a0ae59d41d18ef90ca9a39389016247b71b6b1b7069a6fd1b73c92bc331d10059942aa57693a2405d90915249393e2ee9b515027f97b5fadf4 SHA512 36a58b8b3e9b793b7cc62def166dc87f24c3df029916c3226fe66f5213dcf156038a31707e81c52defbacd0a7e40fc3c5df476c93d9f1380556ac02140ef0fc2
diff --git a/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-no-fortify-source.patch b/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-no-fortify-source.patch
new file mode 100644
index 000000000000..ce71610a0cad
--- /dev/null
+++ b/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-no-fortify-source.patch
@@ -0,0 +1,19 @@
+From a6e90d5121cfd312df535d90d1b939d9f9c616a1 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Fri, 11 Aug 2023 07:59:54 +0100
+Subject: [PATCH] build: Remove -D_FORTIFY_SOURCE=2
+
+Bug: https://bugs.gentoo.org/894648
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,7 +47,6 @@ endif()
+ # it does not appear to support the $<> tags.
+ add_compile_options(
+     "$<$<CONFIG:Debug>:-D_DEBUG>"
+-    "$<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>" # FORTIFY_SOURCE should only be used in non-debug builds (requires -O1+)
+ )
+ if(MINGW)
+     add_link_options(
+-- 
+2.41.0
+
diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild b/games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild
new file mode 100644
index 000000000000..9effc99b535d
--- /dev/null
+++ b/games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake vcs-snapshot
+
+COMMIT=d5a7b850bcef30c0bfd17ceeb4a18c431770f468
+
+DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files"
+HOMEPAGE="https://github.com/OpenTTD/grfcodec"
+SRC_URI="https://github.com/OpenTTD/grfcodec/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="media-libs/libpng:="
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+PATCHES=(
+	# Bug #894648
+	"${FILESDIR}"/${P}-no-fortify-source.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		# Make sure we don't use git by accident.
+		# Build system does not care much if it's
+		# executed successfully and populates
+		# YEARS / VERSION with empty values.
+		-DGIT_EXECUTABLE=/bin/do-not-use-git-executable
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/{grfcodec,grfid,grfstrip,nforenum}
+	doman docs/*.1
+	dodoc changelog.txt docs/*.txt
+}
diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
index cbe50edd7675..a16e0462c778 100644
--- a/games-util/nml/Manifest
+++ b/games-util/nml/Manifest
@@ -1,3 +1,5 @@
 DIST nml-0.7.1.tar.gz 562101 BLAKE2B 3c29bde63048ea276d868df8aa3e13c4f1d3949c1e2c4a973e6f5f5bff7a6e57ce5c56d6605f44d91602209967cbe732f7f9031b471de3104d6c04a41582541f SHA512 a123680f89243f29ad88f2c0bc50fe7c801bd70d7cd49d71d3e5d199b1f4042e4143b71340aea3c47d938f838647016cebc0b56e39ede627497139755c9b829e
+DIST nml-0.7.4.tar.gz 569348 BLAKE2B 620f6100627d7c1cd67bbf481c96abb8be4574e0ec70cf529502980c9d8aca3660f1469fbdce99d5736d21287053b6c199a5a390f56f3704d7ceb16e6ba6582e SHA512 78a0961db3a56684fbc999f69bc5e02b9f002ba7b7a2afd39c7d4c9695b3306339ee55c4b9d711d85ca7c4c0e4d53abc71c9e0720904d44a0c388a793a28fc4b
 EBUILD nml-0.7.1.ebuild 729 BLAKE2B 37347f335b5e23c6be93eab68aba73b23f2c97615f14e1660af38818fa96f335edf232058e9a3b0d8e60fea853f9911738daff4015f294b8d7bbf2081ba178d4 SHA512 806b43f83de1c0623baf34031dcb76956f874e4e3f3a9d700e566dba484251640c51ff6c3cf952607c9e5daf6365f3874dd2487badcd37040e4d3206ca670f70
+EBUILD nml-0.7.4.ebuild 921 BLAKE2B d2203e5c78bf8d31fa16bea92aab496a4dfbbaed7401a57371e624fc63646720f422423325ca027390974a11fdb819b5a792de39d3e7bf2937f848bd04db185d SHA512 b4a678194f78f0de4fe95a2da36c6c7a16cb542ea805baacb8f4b96cd9ec4250d137dd8ba6609794b83428c3b2dfbaa6ccedd4ab32c8e42efd2fd261e5774a12
 MISC metadata.xml 330 BLAKE2B 81477cebc8e9113ac32bce37688a891827538b302fc8ffd29f551440d488b8b55e7ec0f0e45a2476f3e156ebb02a80f44c413a44a9a03de82c0ab994831cb57e SHA512 bc2460a21cc905ebbec7ad13f803bb239616b4da8100c0c1bd939f7be3d1efe9560010af271e382d08caa632382547220aa249f40212c2966ffce5dc7713d632
diff --git a/games-util/nml/nml-0.7.4.ebuild b/games-util/nml/nml-0.7.4.ebuild
new file mode 100644
index 000000000000..103717df9f3b
--- /dev/null
+++ b/games-util/nml/nml-0.7.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+DESCRIPTION="Compiler of NML files into GRF/NFO files"
+HOMEPAGE="https://github.com/OpenTTD/nml/"
+SRC_URI="https://github.com/OpenTTD/nml/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_USEDEP},zlib]
+		dev-python/ply[${PYTHON_USEDEP}]
+	')
+"
+
+src_prepare() {
+	default
+}
+
+python_test() {
+	# the tests involving sprites seem to fail when running in the ebuild,
+	#  unless --no-cache is passed.
+	emake regression NML_FLAGS='-s -c --verbosity=1 --no-cache'
+}
+
+src_install() {
+	local DOCS=( README.md docs/changelog.txt )
+	distutils-r1_src_install
+
+	doman docs/nmlc.1
+}