gentoo auto-resync : 20:08:2024 - 12:25:59

4 files changed, 11 insertions, 126 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 6533e5e2eade..1b53b725d0e3 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 24d920dd1ae8..e1dc0df8fb77 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -2,17 +2,12 @@ AUX simutrans-123.0.1-silence-svn-and-git-errors.patch 1006 BLAKE2B 4724c1cb5830
 AUX simutrans-124.0-disable-svn-check.patch 630 BLAKE2B 3fb6f777c52fc5a369c411375b44a0fc37fa14adc0e8b4a06d2f5201cf10fee268179f28e5c87bec61db3e2c03ab29939a4967f44a23e5defe312691e6d3a19b SHA512 f72d5f3ec3c960fe6fed9852904ac644bbf8e63a713e95006386c796337352b655575961b43f458c979094259b257b18c3832f08a9013b75d12a701b7dfb7a21
 AUX simutrans-124.1-fix-miniupnpc-api.patch 1881 BLAKE2B 316f282a9d1f5f2793e7bceca33ef4913455779fdf84042fcf1ca6ae9119a8972f89c1778fdc396ed4885860d17ff93e440de4584b35f04ee6982ddc16828fec SHA512 b9b02251201848a1e8b522d113209b092e1edae12824be3d247f5aa0ff931446620d13be8d861e33bbdb68c608cffe2e87ed5052d88cb8ebb7b0f305e2fb70be
 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-src-124-1.zip 5965405 BLAKE2B 15e9365df40d9e26f50b63d2e2e2d6f4e03bc5111a28ca3fbe454cfd7339ebbbf3fb99f8f060604f7ca6861fb4220aa9aa0bcd275d98abea6825cbb08956e814 SHA512 f2c95e67ed90a44044264d81dbd1b8db7999a3f192bbfb09f775404924b7583bbf12e1a5841c1e8968ed9bba1bdaff0ca4c913aee83eba5b247c8860a3801c0e
-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-src-124-2-1.zip 5463858 BLAKE2B 034dabd8a74a9dc9d57f72d92179a27c97a718a27470938d4054283d45e0d6b3a9bb34e31ec3b2574e90e1f9d1ebf27a2343ee760818ebc8b109f758fc45a131 SHA512 e8cd229a08e52542f0760227889f0db30017f43ddf44789770a6d6fe9e76d6b82288d2174381e4ab22391cacad97201dc10bc83d1e51a8947b82c5a013450d35
 DIST simutrans_language_pack-Base+texts-124.1.zip 1234798 BLAKE2B a2a3aed3783156fa8738087107898d284d867109ad0f50d0435efb391fca9fe1f3d14e225e21deb199e213148abeece4eb47257f3e1c91d0b82d3680fae34d4f SHA512 3007662f6e3132966a2bff1384bf32fba9cf6a55df5cd4e337b08c67d7397ad13fd924831709415c015b72a7f7ae0bba432fa13e23c87f14709cd7e0dfa7b939
-DIST simutrans_simupak64-123-0.zip 5209700 BLAKE2B 432985b056d2a6ea30a63bb3ce278b6dfa7b02dde390cdbedea68e87538b6fa1626ebe8c2490d1b6e569b53ffa6952c1d72a1e41789a81f05ba3b4705f3b4c7e SHA512 0814bf1b41f8b9d458ffe124a237499f0d9e8105269b983d75c16eb87e164bfa0cd49ff153f603ed56f98e4a04edd483f765230e6e1a182c52fa09eb41c92b71
-DIST simutrans_simupak64-124-0.zip 5084196 BLAKE2B a306f71a41fce6c0dc7c2bcd80717ffd4de88e021d145321e98c8bc5cab9c5ce92b5cd1c33e06ae660f7b6810963397733c137636aa64d74e3e22df804e18bf0 SHA512 d757e29a311d3a344f9816d4313cadaecf44f196209969be30732bfd51a954e87c9333aab3e4d2eb6ea2bca70e1beb23fa364e51a651316146378b12e4821a3c
+DIST simutrans_language_pack-Base+texts-124.2.1.zip 1234798 BLAKE2B a2a3aed3783156fa8738087107898d284d867109ad0f50d0435efb391fca9fe1f3d14e225e21deb199e213148abeece4eb47257f3e1c91d0b82d3680fae34d4f SHA512 3007662f6e3132966a2bff1384bf32fba9cf6a55df5cd4e337b08c67d7397ad13fd924831709415c015b72a7f7ae0bba432fa13e23c87f14709cd7e0dfa7b939
 DIST simutrans_simupak64-124-1.zip 5095713 BLAKE2B fdb31043917bd9736cacc6f17a06e0b440a79e077491333491d700bb45b0ec4097d8a13ef34b1a94001cb06c4732250e856b59f7b7faf1537c94860367e16a20 SHA512 fb434104aaf485f78becd99e075fa11d58e59b5e2ee5dfc592b21aec6906f01951bce20181fcb1dacb44ea1d390b4241f1935b4b978474292409c6cf1b6bc849
-EBUILD simutrans-123.0.1-r2.ebuild 2680 BLAKE2B d167d7f686219f0bad82206882ea028a177902eb1479605c5b6a5f1c5bc1ddc14c74c13fd493e40c491a5109e89fd461cfbfb67a3aaf896ef0038c954e2e7609 SHA512 faa3aa806d97ca6e2f6d8f1cbd059225afa458b0fa8632df7850ac4903a533c6f932c252433533927f8f9c94f07cbf60f9373a86d78b61b2fc7db99e8c5a9b48
-EBUILD simutrans-124.0.ebuild 2888 BLAKE2B 5a0c0b4232eb3e5cd1e412b707ade01da66bc951c8833f7d0bdcfe33938e3415278e51c1a6669f70b1110939209d5ac6a7ced79972b4a76e68bf5d118dcc9608 SHA512 8e8fbc904025b5a5719f054d6b7ca2d3c9220899830f14e2efc276bfc3eb5b57cd9aff06da28af69feaab5ceabd34d3e679f37efac55a3a0cbeb9fe8200c7250
+DIST simutrans_simupak64-124-2.zip 5092179 BLAKE2B d953368405ff560eafc25eaa5412a72f3ad7b2344ee9e3ada09922d0291768fb710c4ec9a4ebc0823ac84a4226178c81befaf11c958d771bb15f6f7c7c344f6d SHA512 f2edd7ca15966d7c0284637c3f90d335fd34202d8120e92297de4cc451a6c9c543532e3d5ea38181f59e70db4a6d0bae4da0c240556391e3d5872e782e6bb73d
 EBUILD simutrans-124.1.ebuild 2817 BLAKE2B 6320f9a3b4f0679198636a718a652b3115ed7be902df1ebda368106bd6bc25428b198c1767e66108ae5dbd7c9ab099a265665e41d5849012e76011c59b4105ec SHA512 1022d9062db1e7170a7394f95a40310bfa030068f47b4537073cdf75057f6a85c9c125bc43ae14dea50bcf51f59ef50e7eaad080cfc9f07092681fbf40336784
+EBUILD simutrans-124.2.1.ebuild 2835 BLAKE2B f087634f4ceebabf83baf40428ff0b4b9843874445f38778d688dafc10f4a542083216e6c75f855ed344799a52d9ba10b37751919ef9822c25ed0f5183d82fc4 SHA512 ab3d95134980619aaf5f0fbc29ccf6385f3222761b39e4f1df3c1b394aae2806e9b335dde54a9784abcabf64bde29df1d01429d83c940e479535be19c36582c3
 MISC metadata.xml 1122 BLAKE2B 5a9a8e476877c1058b8fb512d9c3e31e7c279e4562c2f7d305cb13f7de837e56e1ee8d0277db3bba50f2b460631ceaf8f1116864e12fa1f19425f20c171da3a0 SHA512 c4f1fbace7721d83b64ed39597f5ef3669cf5791a157af3d86e5a2ca242f42ac09aa4d68c7f0fdd3c1ec50cf45ebd92e618b2ae20e90bf795b9168a1fe361dcf
diff --git a/games-simulation/simutrans/simutrans-123.0.1-r2.ebuild b/games-simulation/simutrans/simutrans-123.0.1-r2.ebuild
deleted file mode 100644
index 4c3b32b2f157..000000000000
--- a/games-simulation/simutrans/simutrans-123.0.1-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools desktop flag-o-matic optfeature 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"
-
-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
-"
-S=${WORKDIR}
-
-# 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 +midi truetype upnp zstd"
-
-DEPEND="
-	app-arch/bzip2
-	media-libs/libpng:0=
-	media-libs/libsdl2[sound,video]
-	sys-libs/zlib
-	midi? ( media-sound/fluidsynth:=[sdl] )
-	truetype? ( media-libs/freetype )
-	upnp? ( <net-libs/miniupnpc-2.2.8:= )
-	zstd? ( app-arch/zstd )
-"
-RDEPEND="
-	${DEPEND}
-	midi? ( media-sound/fluid-soundfont )
-"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-RESTRICT="test" # Opens the program and doesn't close it.
-
-PATCHES=( "${FILESDIR}"/${PN}-123.0.1-silence-svn-and-git-errors.patch )
-
-src_unpack() {
-	unpack "simutrans-src-${MY_PV}.zip"
-	use minimal || unpack "simutrans_${MY_PAK_64}"
-
-	# Bundled text files are incomplete, bug #580948
-	cd "${S}/simutrans/text" || die
-	unpack "simutrans_language_pack-Base+texts-${PV}.zip"
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	strip-flags # bug #293927
-	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
-
-	cat > config.default <<-EOF || die
-		BACKEND=sdl2
-		OSTYPE=linux
-		OPTIMISE=0
-		STATIC=0
-		MULTI_THREAD=1
-		USE_UPNP=$(usex upnp 1 0)
-		USE_FREETYPE=$(usex truetype 1 0)
-		USE_ZSTD=$(usex zstd 1 0)
-		USE_FLUIDSYNTH_MIDI=$(usex midi 1 0)
-		VERBOSE=1
-		FLAGS := -DREVISION="${MY_SVN_REVISION}"
-
-		HOSTCC = $(tc-getCC)
-		HOSTCXX = $(tc-getCXX)
-	EOF
-}
-
-src_install() {
-	newbin build/default/sim ${PN}
-	insinto usr/share/${PN}
-	doins -r simutrans/*
-	doicon "${DISTDIR}"/${PN}.svg
-	domenu "${FILESDIR}"/${PN}.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
-}
diff --git a/games-simulation/simutrans/simutrans-124.0.ebuild b/games-simulation/simutrans/simutrans-124.2.1.ebuild
index 897eb3f3b8d1..3775cbd70c54 100644
--- a/games-simulation/simutrans/simutrans-124.0.ebuild
+++ b/games-simulation/simutrans/simutrans-124.2.1.ebuild
@@ -6,9 +6,10 @@ EAPI=8
 inherit autotools desktop flag-o-matic toolchain-funcs xdg
 
 MY_PV=${PV//./-}
-MY_PAK_64="simupak64-${MY_PV}.zip"
+MY_PAK_64="simupak64-124-2.zip" # NOTE: usually this is ${MY_PV}
 # Required for network games, published in release announcement on the forums
-MY_SVN_REVISION="11164"
+# <https://forum.simutrans.com/index.php/board,3.0.html>
+MY_SVN_REVISION="11366"
 
 DESCRIPTION="A free Transport Tycoon clone"
 HOMEPAGE="https://www.simutrans.com/"
@@ -17,7 +18,7 @@ SRC_URI="
 	!minimal? ( https://downloads.sourceforge.net/simutrans/${MY_PAK_64} -> simutrans_${MY_PAK_64} )
 	https://tastytea.de/files/gentoo/simutrans_language_pack-Base+texts-${PV}.zip
 "
-S="${WORKDIR}/simutrans"
+S="${WORKDIR}/trunk"
 
 # NOTE: get the latest language pack from:
 # https://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
@@ -51,17 +52,15 @@ RESTRICT="test" # Opens the program and doesn't close it.
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-124.0-disable-svn-check.patch
-	"${FILESDIR}"/${PN}-124.1-fix-miniupnpc-api.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’"
+	cd trunk/simutrans || die "could not cd to ‘simutrans’"
 	use minimal || unpack "simutrans_${MY_PAK_64}"
 
 	# Bundled text files are incomplete, bug #580948
-	cd simutrans/text || die "could not cd to ‘simutrans/text’"
+	cd text || die "could not cd to ‘simutrans/text’"
 	unpack "simutrans_language_pack-Base+texts-${PV}.zip"
 }
 
@@ -103,7 +102,7 @@ src_install() {
 	insinto usr/share/${PN}
 	doins -r simutrans/*
 	doicon src/simutrans/${PN}.svg
-	newmenu src/simutrans/.desktop simutrans.desktop
+	domenu src/linux/simutrans.desktop
 }
 
 pkg_postinst() {