gentoo resync : 20.03.2022

4 files changed, 117 insertions, 4 deletions

diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 03b9273eed9f..d78c7abe4378 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,12 +1,17 @@
 AUX simutrans-0.122.0-Fix-Makefile.patch 565 BLAKE2B accfd92e7df9458b8d347342fd268e507eb2a6f95253e34bf111639891328d5365ff9c4fa4f5e58cccb6e78ff34b69fca66439d024bb48c85e9735df285f935d SHA512 ef0469f74598359efb8ab052de754d2d4f649a636c03cc84a50d10fdebcaf6a62ce06556f8c2f2ec50b8686e2eec69b420aa7f11df29a1985e48a039d340b6d0
 AUX simutrans.desktop 191 BLAKE2B 67b06a42923aebf141cd2aec2393b1fd69ab87eccc52f6c714e9b5639452b74da0711a1bd9c7ed1ac1dc77b42d6c42c8f28cf5d2f30b1623ca3206cf6fabe9b9 SHA512 fee53e6e4b4b1d9a70a80a2fa5cd4cc4a47673f0bcb19dff73d2fed53819d08e06bba7841dc9ca25964063d68005c56228c565fce6dc43f19068458194deb744
 DIST simutrans-src-122-0.zip 4534293 BLAKE2B c4117baf82530adced1fbb60e099176b7b63ade07e10f741e19e41aedd4b65f5d7b6ab60145f3bce7ff88def9836eac88323b14aa74f2ce5f1c76eeaa6beb713 SHA512 7a044ceda9359847353c1dcd23c380d1ddcca901fd674a25b66d7bd0ede7f974525c5fc3b37781977e9946626f30b538c483166983ab8b7be9e73903dc9be0bd
+DIST simutrans-src-123-0-1.zip 4771334 BLAKE2B c83edba188225c07bea9aa50d8899a251d3b9f50160aada6839d519bc99f52ef57bd95e7cfdf8db5d6c5efffb9fd421b4b8d8283b7998a352fdd7327332244c4 SHA512 87bc96c201126bc735693dea83a320e79f4b4a0fa6940aa9a6d2f8ef6025788f941a3c816febe3dc8a23ff786a2f016df2ef8a61492bb5ed4a834c721f8fc0a1
+DIST simutrans.svg 2677 BLAKE2B c60f386b13908cda641f8cb41918f8f0b1c70f9104d14ee368d221bf013970de3aee05b009ad56af07710833218d5e15cd24c51da4dae4e964f1c877a820fce0 SHA512 317b9059a1cc863eed778f60d6c3f4569a3cee192fb6f9210aed2cf65f76f098dd5a17020de11d3beb30b9e7a1a49876c0610e7d31e24e141c6ce31747b3809a
 DIST simutrans_PAK128.german_2.0_for_ST_122.0.zip 186572954 BLAKE2B 1f21655660f947767657f79fa45f66cd434888c37596e17dbd8400ce684251c33617dc78096c34b23bad3f241cc4641029d0f12b5f09d199013582c89fa02ab3 SHA512 9e6250b333e6b31e0ad23f2629409c2b4914e5fb9cb0304baa1e70f0c268d5eca7db27d77b51f18fff57569df56eecb82c8ec9b48c3a3efacf7d47501546347d
 DIST simutrans_coalwagonfix.rar 10769 BLAKE2B 4ebb14c5585fcb09b2c9e70451a0a4f1133d1bf7a184c898463c4393026dcbaf10954430d83e64cd7430ec3e3708e0d51f04b805ac0c32656c138b001e617079 SHA512 503c795b4fdc168cc925a3b5ff385880dd28c8e3214a7c5aeb80e937378cf19b1f2408d19f2ab6ef066f47d6f6ab0955e6d5ec59981d1e76fbe3cd661b8bd22e
 DIST simutrans_language_pack-Base+texts-0.122.0.zip 1172877 BLAKE2B 6a1646d8bd1e74a54506cd32508b5dd9da3d2ce77c7920049fea6bd42c6b46b91e9b248860a352380a5f2bb1393f2bbc9b837dcb347c132c7132f6813a608212 SHA512 d87b4f65188f6efd7e277f6ae5796584e58a1302dae7246cd7b6e3c06d8cdc81c5eae647e12cdf7598230c588f66f5682d2be0e6628311343daf4bd46b441278
+DIST simutrans_language_pack-Base+texts-123.0.1.zip 1228228 BLAKE2B cf7bd6dd40f1c5a79bec73a8f3bd993fdeb8abe725b1294cef7e0fa7fe374aa18a563cfd81907d7b3a67a5898594730448b4f9038515415a8b44d99ecc5eb8ea SHA512 4d6b66f810fedaf50734d178e329592e174c48ca36611b15403075b02a3a626581993093e6fd6e6f297c973c5f928a054a557cd135fa487c79df3c2f1f6e0ea0
 DIST simutrans_pak128-2.8.1.zip 97430218 BLAKE2B 95b6788fd8e4f539b232e9de563227704f16c05951d8cd42ca3faf6b9f625d08108bda068417e9e04c14db8ee6fe860e9b8d958c703719223de770da36ee686b SHA512 c4635a446d9874fe1cf1a15a1ca8eaa50a0888c7679df540aa7509e30db6cb8f9519a27aad10dc481a7762c6c16bb5df64e18665652dcd777885adf0dae6736a
 DIST simutrans_pak128.Britain.1.18-120-3.zip 67251660 BLAKE2B 6dbebdf77985e2610f4283b1ae252a19cbfcc37cc1c6974e4132300f87c7d881bd87aba29bb01974d56d261ee6694fd81d0d4b09eb0a2854e38de6f278f91b53 SHA512 234a6c3dffa236ae98ba3372efb2e2b2808c0dcc0933ea5f339aa639e0705674435599e27228f0ee82f24af49ffbd7cb7c6c076ff6569a7ce622c6b8009c8472
 DIST simutrans_pak192.comic.0.5.zip 70896173 BLAKE2B 63557e08387802a788f8e77157674847d757a23f329aa452c9ea6c096f875d665bb2090df34886437a2d35519c83b38f03d06566bf052c1ffe3cad718c7c3dfe SHA512 f61ad804d63027e181bb99a92f48d23cf6a6f47047a1ba9e8f83383cc4e6d603c7fe260d0846613d43765d3fc933bf13ae063d8d8176f8aef41db8d6bf187773
 DIST simutrans_simupak64-122-0.zip 4537410 BLAKE2B 300d0248f4f3781578579f31056810c3f1261660b7d1eaa4ec21e735625c3b499548c560d1b1ee918fd7111ca4f872f77119cffc82014c95753520225226665b SHA512 de099d71392130e26a907f4cd30d5e714cc472cb91c606b3dc5e499653a277750cd971440351fd384c368b453704633ad4eda8ec3e6e16e9ea797080371aaa9d
-EBUILD simutrans-0.122.0-r1.ebuild 3181 BLAKE2B ac55c6d47af6ec38a4bad4360085c34932a468583ac5324fb1c7ec1e8debb267ab86e6273820687ad4f997cdfd56ab7b1da18ba65e83429a7fb2e46688538a19 SHA512 2202a7e58712dcdd25954d5b033ddb5f35576d5582b0574972f05c4210571ced4b256943308b5a778ae45d2649054597050da9160f9c8ca6a3f863f83c597bc9
-MISC metadata.xml 765 BLAKE2B 84dd5df7cd0c772c42a52c92aa0dae18c90e544e0b479e577b61fba52921f67d1c638e39576eb13ff8518b52fac53d62b519fee4cd749fdc7655394c1af2ab90 SHA512 e6e3a1434969bdc75217d1de98a11d6261169548d67e4948b01802195c1332f1edb3dbf5e3a0545a1f35190d96e28a8ad8182bb05429ca7747e9dc4b048a8bba
+DIST simutrans_simupak64-123-0.zip 5209700 BLAKE2B 432985b056d2a6ea30a63bb3ce278b6dfa7b02dde390cdbedea68e87538b6fa1626ebe8c2490d1b6e569b53ffa6952c1d72a1e41789a81f05ba3b4705f3b4c7e SHA512 0814bf1b41f8b9d458ffe124a237499f0d9e8105269b983d75c16eb87e164bfa0cd49ff153f603ed56f98e4a04edd483f765230e6e1a182c52fa09eb41c92b71
+EBUILD simutrans-0.122.0-r1.ebuild 3125 BLAKE2B 13fac2abf5c04f7fc2436ce1d329d14f43a21cb74b8b1731a226ba50d5edb560aa97aeb12a92d6ea8377b92a28e89c34f9928385b3c05dc56177aed19391b989 SHA512 1df8bb03515b2231db1f44740c5f8eac531d19775c9cc468d93c0723f35cb21aad5fbd508970bbd1ed8828adaa68f6af29713e685990757812d6d5c4b6007475
+EBUILD simutrans-123.0.1.ebuild 2468 BLAKE2B 4114d5489da75d00096da2209f7593b273b51daa059e749cbe0de916cb6af44573dd7ba515000fb64be9cd6455f792aee8dd7cfa5fd1913681ae24d088adf84e SHA512 05bf61823669869a7eca289501a7137b47116f6cde12359ecc84cd300e5dc3027bef290293dc4df14631fc97c05d4756bb1623217aeffd4ab9f033d7b9a1c331
+MISC metadata.xml 893 BLAKE2B ecca9ce53820d4e86292a0d20e303bdeeed29173d7b8d1a287bf1c49bb9b0023ac07c64051167022e1b73f75fc753fbc6ed760d2677764f040b722afb4c23eea SHA512 af270cb6ba97426870720303b7942dde9edf918df597141572e4fc097e611bd1571087341d46e286cef94a7a79333643c87b99a3c2d3871024db043ea49abcaf
diff --git a/games-simulation/simutrans/metadata.xml b/games-simulation/simutrans/metadata.xml
index 2d0e0c9220cb..5384b5810c9d 100644
--- a/games-simulation/simutrans/metadata.xml
+++ b/games-simulation/simutrans/metadata.xml
@@ -11,8 +11,10 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">simutrans</remote-id>
+		<remote-id type="github">aburch/simutrans</remote-id>
 	</upstream>
 	<use>
+		<flag name="minimal">Don't install any PakSets (scenario data)</flag>
 		<flag name="pak128">Install more detailed scenario data</flag>
 		<flag name="pak128-britain">Install British scenario data</flag>
 		<flag name="pak128-german">Install German scenario data</flag>
diff --git a/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild b/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild
index 5a5fa8c117eb..8a03e83ca8d1 100644
--- a/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild
+++ b/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SIMUPAK_192_COMIC="pak192.comic.0.5.zip"
 DESCRIPTION="A free Transport Tycoon clone"
 HOMEPAGE="https://www.simutrans.com/"
 SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
-	https://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip -> simutrans_language_pack-Base+texts-${PV}.zip
+	https://tastytea.de/files/simutrans_language_pack-Base+texts-${PV}.zip
 	mirror://sourceforge/simutrans/${SIMUPAK_64} -> simutrans_${SIMUPAK_64}
 	pak128? ( https://download.sourceforge.net/simutrans/pak128/pak128%20for%20ST%20120.4.1%20%28${SIMUPAK_128_V}%2C%20priority%20signals%20%2B%20bugfix%29/pak128.zip -> simutrans_pak128-${SIMUPAK_128_V}.zip )
 	pak128-britain? ( mirror://sourceforge/simutrans/${SIMUPAK_128_BRITAIN} -> simutrans_${SIMUPAK_128_BRITAIN} )
diff --git a/games-simulation/simutrans/simutrans-123.0.1.ebuild b/games-simulation/simutrans/simutrans-123.0.1.ebuild
new file mode 100644
index 000000000000..9b027b6b7127
--- /dev/null
+++ b/games-simulation/simutrans/simutrans-123.0.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 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="
+	mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
+	!minimal? ( mirror://sourceforge/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 ~x86"
+IUSE="minimal truetype upnp zstd"
+
+DEPEND="
+	app-arch/bzip2
+	media-libs/libpng:0
+	media-libs/libsdl2[sound,video]
+	media-sound/fluidsynth
+	sys-libs/zlib
+	truetype? ( media-libs/freetype )
+	upnp? ( net-libs/miniupnpc:= )
+	zstd? ( app-arch/zstd )
+"
+RDEPEND="
+	${DEPEND}
+	media-sound/fluid-soundfont
+"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+RESTRICT="test" # Opens the program and doesn't close it.
+
+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
+
+	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=1
+		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
+}