gentoo auto-resync : 09:06:2024 - 00:08:13

7 files changed, 77 insertions, 31 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 7802f566999c..318a0b698dc2 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 2ff011d28e49..0e6152f23271 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -14,7 +14,7 @@ DIST openrct2-opensound-1.0.5.zip 4012384 BLAKE2B 7ddb1437d7e68373f05bd60d77f039
 DIST openrct2-replays-0.0.79.zip 1934633 BLAKE2B 4b5c4d96be91055ceff8f5f5f1a894cc2544659983e61ac2f42d655229357b6a368553c1ee45d147cb360c8d54bb0ca78b61a9716efa8d1d7f37cd7c5ba50fa7 SHA512 04acde4d60c8fa949b298dd15e38fe0421659357fa214dffb0577574e0b0ac218a01ce998f4e12e3ab13a88fbbba8096392462fda29c68a6215bc0875aaae9b2
 DIST openrct2-title-sequences-0.4.6.zip 2547725 BLAKE2B 5f7b36cd1372106923000775307ea7ff8c142c3b1d026d84b86f255a629b0a2ac16a682300999789229a8833d4c7327c858c04710ecddfb97af1858ff121a5c4 SHA512 bd7d0f25047540572be75a4a8886e8dabdceb7a3e11fdeb5473b66fe804d829acdb763d34ec7cfa656df9bc527268a3e0e7ca09c699995804b22ff2a529ad5da
 EBUILD openrct2-0.4.10.ebuild 4573 BLAKE2B 867f2bfc95b1cfbe218b8434bd68cf52477d8efca31c249f853b6e98941bab9af609ed3a82ad9d3e4c3d1d32901265ebe047db58b169ebc63533386a28d183aa SHA512 ce4a63ce78abd0fa6db12a17945831f2e11dcd9698cf65e329bca0813e7954bd33322c0f5b6e5b3460905551793962e843079b36108a4e7cbfc2f20e5ae5f9d0
-EBUILD openrct2-0.4.11.ebuild 4570 BLAKE2B 388c45d38fe1e6a4767afbbcff10c992974d3e9c48f54f20d77d488dcc6f4ee6dd6edaad305cee7d16b7bdb85beddc52267da66cd5d2a88b60bf1e86a60c0551 SHA512 ed3ac37744f9a0090f6c24f461bab0da80528a3404b99f62bbd66b64be2815c1fe2b9abf16196b4876ade572ec671fe3e92b35a56e5e6d57ea300bbe3560c6af
+EBUILD openrct2-0.4.11.ebuild 4569 BLAKE2B c8acb52052512c4c1e56f2d1a741cd21ac1ebe565b5d1c866c11baadf7b1cbe31ebf80ad6aa23952b1191adc8c057309ae80475214419501b7afda613eff4cc9 SHA512 e47d36a6d6c144cde1ee78b47dc4fc6bfb3f0461ae372819f19fd6a93943d2ff0f8c6479cb832c6a273e133b5d218cc3c0a000d006687b3937c149e362ef024f
 EBUILD openrct2-0.4.9.ebuild 4569 BLAKE2B 257d141303de05a806cb242ce226fcf6d23dc634a72fce12fbd31d417ed84fbb8cc670e54df8dfc48cc7cf35137b6adf7343b9a99d4e894f23fe28d2a1fa939b SHA512 5c52f34f314ed8954b3ee767b08b9a02ac7e17c758ee060b2ff45e118701257c7ec5b04b97c39d86baf11b9be32b0c956978fae8fd863c767f1afb8ea8185997
 EBUILD openrct2-9999.ebuild 4497 BLAKE2B f8c99d23967baaa31f71fa56cc6aa837a0f48550f4a4e1a4a4e808ad981549afd7e9d5509b95ab9315cb60fcafe0264f7f472b7cc43c308ca9a0f3736eca81f8 SHA512 dc5868701825d8c69676598bff9624e0eeffa1c3e4868ea7dc39364211733caa9cb21c2ef756158b26d344ec4ea410e5962e6a00b8e34be1381eadb31fe120f4
 MISC metadata.xml 1200 BLAKE2B 7a2ca04e6e757efd12cbf00558372a19d10833fbd11d105f14bf68662ea6c64cbac3b01b4f5abba1473c4c184cceeadc26b38ef91e9edc3a40ee94415f868ff6 SHA512 97c181f7f3d97bf8ef90c1666497397c8ad87b23b536d1be6af7133e85e1e331813ee2247b3e0dfe887c0328f0b35184f1e9738ba7a7bb53b80813c23565c61e
diff --git a/games-simulation/openrct2/openrct2-0.4.11.ebuild b/games-simulation/openrct2/openrct2-0.4.11.ebuild
index 0c6c414cedc5..e6877c1e023d 100644
--- a/games-simulation/openrct2/openrct2-0.4.11.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.11.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
 RESTRICT="!test? ( test )"
 
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 1a7ec99786fb..7187dbf6308d 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,9 +1,13 @@
 AUX simutrans-123.0.1-silence-svn-and-git-errors.patch 1006 BLAKE2B 4724c1cb58302410d81d4e37ec5b3640a47977bd9b999222791fee9df4d2b08c001e81701cfaf0afd80385b1d1837d584d7555e0fdcf8a8d74720461c1795898 SHA512 b36e4c1433b371ff3b13cbd5c9ec0f7bcd83a0bb95586d38eb6326163699af36513dc4086c66de43084a2a784984ce7a838c46cd5e24b6715c45da8d27882abd
+AUX simutrans-124.0-disable-svn-check.patch 630 BLAKE2B 3fb6f777c52fc5a369c411375b44a0fc37fa14adc0e8b4a06d2f5201cf10fee268179f28e5c87bec61db3e2c03ab29939a4967f44a23e5defe312691e6d3a19b SHA512 f72d5f3ec3c960fe6fed9852904ac644bbf8e63a713e95006386c796337352b655575961b43f458c979094259b257b18c3832f08a9013b75d12a701b7dfb7a21
 AUX simutrans.desktop 191 BLAKE2B 67b06a42923aebf141cd2aec2393b1fd69ab87eccc52f6c714e9b5639452b74da0711a1bd9c7ed1ac1dc77b42d6c42c8f28cf5d2f30b1623ca3206cf6fabe9b9 SHA512 fee53e6e4b4b1d9a70a80a2fa5cd4cc4a47673f0bcb19dff73d2fed53819d08e06bba7841dc9ca25964063d68005c56228c565fce6dc43f19068458194deb744
 DIST simutrans-src-123-0-1.zip 4771334 BLAKE2B c83edba188225c07bea9aa50d8899a251d3b9f50160aada6839d519bc99f52ef57bd95e7cfdf8db5d6c5efffb9fd421b4b8d8283b7998a352fdd7327332244c4 SHA512 87bc96c201126bc735693dea83a320e79f4b4a0fa6940aa9a6d2f8ef6025788f941a3c816febe3dc8a23ff786a2f016df2ef8a61492bb5ed4a834c721f8fc0a1
+DIST simutrans-src-124-0.zip 5464505 BLAKE2B c50d6dd67dcc8e8166a016e2b7258e8e4aa4c515b08c31b81b239b7bd26013bf23ba9638329e1becf76473a20a1e6280e49a2c2d5af97d16d2f2422317dc9251 SHA512 1d4f00c41061240e1b14e61178640f1b914bb819edfe174210f4f04cfde2b0b1dd414a30ba19618a8362d387b1c7ec9bfe9a64275b3ec2409b6b1d44aee62412
 DIST simutrans.svg 2677 BLAKE2B c60f386b13908cda641f8cb41918f8f0b1c70f9104d14ee368d221bf013970de3aee05b009ad56af07710833218d5e15cd24c51da4dae4e964f1c877a820fce0 SHA512 317b9059a1cc863eed778f60d6c3f4569a3cee192fb6f9210aed2cf65f76f098dd5a17020de11d3beb30b9e7a1a49876c0610e7d31e24e141c6ce31747b3809a
 DIST simutrans_language_pack-Base+texts-123.0.1.zip 1228228 BLAKE2B cf7bd6dd40f1c5a79bec73a8f3bd993fdeb8abe725b1294cef7e0fa7fe374aa18a563cfd81907d7b3a67a5898594730448b4f9038515415a8b44d99ecc5eb8ea SHA512 4d6b66f810fedaf50734d178e329592e174c48ca36611b15403075b02a3a626581993093e6fd6e6f297c973c5f928a054a557cd135fa487c79df3c2f1f6e0ea0
+DIST simutrans_language_pack-Base+texts-124.0.zip 1234798 BLAKE2B a2a3aed3783156fa8738087107898d284d867109ad0f50d0435efb391fca9fe1f3d14e225e21deb199e213148abeece4eb47257f3e1c91d0b82d3680fae34d4f SHA512 3007662f6e3132966a2bff1384bf32fba9cf6a55df5cd4e337b08c67d7397ad13fd924831709415c015b72a7f7ae0bba432fa13e23c87f14709cd7e0dfa7b939
 DIST simutrans_simupak64-123-0.zip 5209700 BLAKE2B 432985b056d2a6ea30a63bb3ce278b6dfa7b02dde390cdbedea68e87538b6fa1626ebe8c2490d1b6e569b53ffa6952c1d72a1e41789a81f05ba3b4705f3b4c7e SHA512 0814bf1b41f8b9d458ffe124a237499f0d9e8105269b983d75c16eb87e164bfa0cd49ff153f603ed56f98e4a04edd483f765230e6e1a182c52fa09eb41c92b71
-EBUILD simutrans-123.0.1-r1.ebuild 2629 BLAKE2B 99d9b29e257eb579de2380885c5adda41832f645b55a5525d50012b31753d5afde38f299e16932b58f1a590e02229608aa144d3d9f4014f7a4b721bc11d75110 SHA512 84366dc857857b29636b3b8a9f61d7c10bb4bfb84b8a155431060f1f678112954fbe217803198e8815b95d948f72741209567f87843c7efc9213df8b945851d3
+DIST simutrans_simupak64-124-0.zip 5084196 BLAKE2B a306f71a41fce6c0dc7c2bcd80717ffd4de88e021d145321e98c8bc5cab9c5ce92b5cd1c33e06ae660f7b6810963397733c137636aa64d74e3e22df804e18bf0 SHA512 d757e29a311d3a344f9816d4313cadaecf44f196209969be30732bfd51a954e87c9333aab3e4d2eb6ea2bca70e1beb23fa364e51a651316146378b12e4821a3c
 EBUILD simutrans-123.0.1-r2.ebuild 2673 BLAKE2B 32da98ed858d4f11136813e3973817af3f3ffa1e4e57d48127548fc0b078fb0d7ace4cbbea6cd9fb304de1a045809541dff2ca83a792e6e137e9cb2c6e11c52d SHA512 9145ad35f2e303e85a04eee884ca7f195c90682c34aababa2330f773f518c61d66c422a3d3e6f4a5b7360064df7b62319a56b9a81af99172e4868423ae4e3674
-MISC metadata.xml 727 BLAKE2B aadf184ae179289b362407eb887a9793b6ade5ce7f5247dd612069ddff76584e2c4449a2a9fbc17afa1a3df43ddab4f3270ff1ffc4337308969d73dec4eb46a1 SHA512 7a9b8f845bdc2ac7d521c89ee4069d29d1e900cac24cf23efca438d8f8ea5d9b3c5d020f93c59e5ca595a8a1dfddb62eea8f6f2a1ae3f0f690d6755191bac991
+EBUILD simutrans-124.0.ebuild 2836 BLAKE2B e4bff211b8347131657da5ab176b1642454d75360e2e836f7b8b9d0c2036a8575ba6e67c0e926a6095d3b7144e10d2e286cc6c0418ea311f26fe721abd4a7e4a SHA512 e6f2d85b0cb35e1f1c3cef861cd9882110d0148302fb7adf3e702c9fe3d8b0d4e58a83bc08cf21edd96ac3ddbbe0908ea5af28aafc646ce37ab2a8576a5afd8b
+MISC metadata.xml 1122 BLAKE2B 5a9a8e476877c1058b8fb512d9c3e31e7c279e4562c2f7d305cb13f7de837e56e1ee8d0277db3bba50f2b460631ceaf8f1116864e12fa1f19425f20c171da3a0 SHA512 c4f1fbace7721d83b64ed39597f5ef3669cf5791a157af3d86e5a2ca242f42ac09aa4d68c7f0fdd3c1ec50cf45ebd92e618b2ae20e90bf795b9168a1fe361dcf
diff --git a/games-simulation/simutrans/files/simutrans-124.0-disable-svn-check.patch b/games-simulation/simutrans/files/simutrans-124.0-disable-svn-check.patch
new file mode 100644
index 000000000000..889378aba76b
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans-124.0-disable-svn-check.patch
@@ -0,0 +1,33 @@
+From 1064daf38a99d67a78b1117a289fc72349f1fad9 Mon Sep 17 00:00:00 2001
+From: tastytea <gentoo@tastytea.de>
+Date: Thu, 9 May 2024 12:59:04 +0200
+Subject: [PATCH] disable svn check
+
+---
+ configure.ac | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c611af3..b8e3efa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -145,13 +145,9 @@ else
+ fi
+ 
+ 
+-# are we in a svn?
+-if svn info
+-then
+-	AC_SUBST(svn, 1)
+-else
+-	AC_SUBST(svn, 0)
+-fi
++# we are not in an svn
++AC_SUBST(svn, 0)
++
+ 
+ 
+ #switch off assembler on 64 bit (MISSING: Check for GNU Assembler and i86)
+-- 
+2.43.2
+
diff --git a/games-simulation/simutrans/metadata.xml b/games-simulation/simutrans/metadata.xml
index e4089ed1e978..6644d41a4ecb 100644
--- a/games-simulation/simutrans/metadata.xml
+++ b/games-simulation/simutrans/metadata.xml
@@ -17,4 +17,11 @@
 		<flag name="minimal">Don't install any PakSets (scenario data)</flag>
 		<flag name="midi">support for background MIDI music via <pkg>media-sound/fluidsynth</pkg></flag>
 	</use>
+	<longdescription lang="en">
+		Simutrans is a freeware and open-source transportation simulator. Your
+		goal is to establish a successful transport company. Transport
+		passengers, mail and goods by rail, road, ship, and even air.
+		Interconnect districts, cities, public buildings, industries and tourist
+		attractions by building a transport network you always dreamed of.
+	</longdescription>
 </pkgmetadata>
diff --git a/games-simulation/simutrans/simutrans-123.0.1-r1.ebuild b/games-simulation/simutrans/simutrans-124.0.ebuild
index 75fc169c0a7c..87559c0abb1b 100644
--- a/games-simulation/simutrans/simutrans-123.0.1-r1.ebuild
+++ b/games-simulation/simutrans/simutrans-124.0.ebuild
@@ -3,44 +3,45 @@
 
 EAPI=8
 
-inherit autotools desktop flag-o-matic optfeature toolchain-funcs xdg
+inherit autotools desktop flag-o-matic toolchain-funcs xdg
 
 MY_PV=${PV//./-}
-MY_PAK_64="simupak64-123-0.zip"
-# Required for network games, published in release announcement.
-MY_SVN_REVISION="10421"
+MY_PAK_64="simupak64-${MY_PV}.zip"
+# Required for network games, published in release announcement on the forums
+MY_SVN_REVISION="11164"
 
 DESCRIPTION="A free Transport Tycoon clone"
 HOMEPAGE="https://www.simutrans.com/"
 SRC_URI="
 	https://downloads.sourceforge.net/simutrans/simutrans-src-${MY_PV}.zip
 	!minimal? ( https://downloads.sourceforge.net/simutrans/${MY_PAK_64} -> simutrans_${MY_PAK_64} )
-	https://tastytea.de/files/simutrans_language_pack-Base+texts-${PV}.zip
-	https://github.com/aburch/simutrans/raw/9c84822/simutrans.svg
+	https://tastytea.de/files/gentoo/simutrans_language_pack-Base+texts-${PV}.zip
 "
-S=${WORKDIR}
+S="${WORKDIR}/simutrans"
 
-# NOTE: Get the latest language pack from:
+# NOTE: get the latest language pack from:
 # https://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
 
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="minimal truetype upnp zstd"
+IUSE="minimal +midi fontconfig upnp zstd"
 
 DEPEND="
 	app-arch/bzip2
-	media-libs/libpng:0
+	media-libs/freetype
+	media-libs/libpng:0=
 	media-libs/libsdl2[sound,video]
-	media-sound/fluidsynth[sdl]
 	sys-libs/zlib
-	truetype? ( media-libs/freetype )
+	midi? ( media-sound/fluidsynth:=[sdl] )
+	fontconfig? ( media-libs/fontconfig )
 	upnp? ( net-libs/miniupnpc:= )
 	zstd? ( app-arch/zstd )
 "
 RDEPEND="
 	${DEPEND}
-	media-sound/fluid-soundfont
+	midi? ( media-sound/fluid-soundfont )
+	!<games-simulation/simutrans-paksets-${PV}
 "
 BDEPEND="
 	app-arch/unzip
@@ -48,14 +49,16 @@ BDEPEND="
 "
 RESTRICT="test" # Opens the program and doesn't close it.
 
-PATCHES=( "${FILESDIR}"/${PN}-123.0.1-silence-svn-and-git-errors.patch )
+PATCHES=( "${FILESDIR}"/${PN}-124.0-disable-svn-check.patch )
 
 src_unpack() {
 	unpack "simutrans-src-${MY_PV}.zip"
+	mv simutrans-Nightly simutrans || die "renaming directory failed"
+	cd simutrans || die "could not cd to ‘simutrans’"
 	use minimal || unpack "simutrans_${MY_PAK_64}"
 
 	# Bundled text files are incomplete, bug #580948
-	cd "${S}/simutrans/text" || die
+	cd simutrans/text || die "could not cd to ‘simutrans/text’"
 	unpack "simutrans_language_pack-Base+texts-${PV}.zip"
 }
 
@@ -67,26 +70,25 @@ src_prepare() {
 	append-flags -fno-strict-aliasing # bug #859229
 
 	eautoreconf
-
-	# Make it look for the data in the right directory.
-	sed -i -e "s:argv\[0\]:\"/usr/share/${PN}/\":" simmain.cc || die
 }
 
 src_configure() {
 	default
 
+	# NOTE: some flags need to be 0, some need to be empty to turn them off
 	cat > config.default <<-EOF || die
 		BACKEND=sdl2
 		OSTYPE=linux
 		OPTIMISE=0
 		STATIC=0
+		WITH_REVISION=${MY_SVN_REVISION}
 		MULTI_THREAD=1
-		USE_UPNP=$(usex upnp 1 0)
-		USE_FREETYPE=$(usex truetype 1 0)
-		USE_ZSTD=$(usex zstd 1 0)
-		USE_FLUIDSYNTH_MIDI=1
+		USE_UPNP=$(usex upnp 1 '')
+		USE_FREETYPE=1
+		USE_ZSTD=$(usex zstd 1 '')
+		USE_FONTCONFIG=$(usex fontconfig 1 '')
+		USE_FLUIDSYNTH_MIDI=$(usex midi 1 '')
 		VERBOSE=1
-		FLAGS := -DREVISION="${MY_SVN_REVISION}"
 
 		HOSTCC = $(tc-getCC)
 		HOSTCXX = $(tc-getCXX)
@@ -97,13 +99,13 @@ src_install() {
 	newbin build/default/sim ${PN}
 	insinto usr/share/${PN}
 	doins -r simutrans/*
-	doicon "${DISTDIR}"/${PN}.svg
-	domenu "${FILESDIR}"/${PN}.desktop
+	doicon src/simutrans/${PN}.svg
+	newmenu src/simutrans/.desktop simutrans.desktop
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	optfeature_header "Since 123.0 this ebuild only installs the Pak64 PakSet. You can install"
-	optfeature "other PakSets" games-simulation/simutrans-paksets
+	elog "Since 124.0 simutrans allows you to download PakSets to your home directory,"
+	elog "therefore games-simulation/simutrans-paksets has been deprecated."
 }