gentoo auto-resync : 28:08:2022 - 14:56:07

7 files changed, 52 insertions, 143 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 51d0ebf7eb77..cba0eec10e75 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index f421f88ef951..8de6892b3b0f 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,17 +1,8 @@
-AUX simutrans-0.122.0-Fix-Makefile.patch 565 BLAKE2B accfd92e7df9458b8d347342fd268e507eb2a6f95253e34bf111639891328d5365ff9c4fa4f5e58cccb6e78ff34b69fca66439d024bb48c85e9735df285f935d SHA512 ef0469f74598359efb8ab052de754d2d4f649a636c03cc84a50d10fdebcaf6a62ce06556f8c2f2ec50b8686e2eec69b420aa7f11df29a1985e48a039d340b6d0
+AUX simutrans-123.0.1-silence-svn-and-git-errors.patch 1006 BLAKE2B 4724c1cb58302410d81d4e37ec5b3640a47977bd9b999222791fee9df4d2b08c001e81701cfaf0afd80385b1d1837d584d7555e0fdcf8a8d74720461c1795898 SHA512 b36e4c1433b371ff3b13cbd5c9ec0f7bcd83a0bb95586d38eb6326163699af36513dc4086c66de43084a2a784984ce7a838c46cd5e24b6715c45da8d27882abd
 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
 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-r1.ebuild 2480 BLAKE2B e2660ce32a59cc701abe70012990662f23500132e46f2b355e2e0c50d80b772e19cd499437ca4a6c332977b235fba6c71437bf2f69a2e76051fb5c12c56c68af SHA512 67892202857faedfe90b121adba16292d21581eb2e146ffa828ee001cbf181ece1d1ef7ba58ff83b39c3c311fbc12619104586c31605616ce6755148f73f3c77
-MISC metadata.xml 893 BLAKE2B ecca9ce53820d4e86292a0d20e303bdeeed29173d7b8d1a287bf1c49bb9b0023ac07c64051167022e1b73f75fc753fbc6ed760d2677764f040b722afb4c23eea SHA512 af270cb6ba97426870720303b7942dde9edf918df597141572e4fc097e611bd1571087341d46e286cef94a7a79333643c87b99a3c2d3871024db043ea49abcaf
+EBUILD simutrans-123.0.1-r1.ebuild 2603 BLAKE2B 7c99652319ef2fd930608ae69e00dbc1fa5f8f5480a5ae9873f2f8638648e10d5768e27c4b71551dc7568b58d96260ddce628339f7a1aae9a8e777723276dbd4 SHA512 f7f9498178c1a1933561b9537a5ddbccf15d2671a3da6bb059f9c515cc51ba88423b22f39c57f8833ef5341027146d427705af79c8090664e9e9ce47ac627d01
+MISC metadata.xml 628 BLAKE2B 385d58995f521a16433f4568081cc44f4ae43d757f11a7adfccbeb512f316f298143c83d4c0228ed61450be4dde2c403133a82e3493c2078c1aa551638fb4a50 SHA512 a5fad160578740a5c17c307577219e2285f6fdac07022dde3127743ace8735092a3881b10a0655f58223e66792983046060d386cacbf437625d061d0994c35b1
diff --git a/games-simulation/simutrans/files/simutrans-0.122.0-Fix-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.122.0-Fix-Makefile.patch
deleted file mode 100644
index 5effe170758b..000000000000
--- a/games-simulation/simutrans/files/simutrans-0.122.0-Fix-Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile	2020-10-15 08:32:29.000000000 +0200
-+++ b/Makefile	2020-10-23 17:59:29.008159331 +0200
-@@ -17,8 +17,7 @@
- SDL_CONFIG      ?= sdl-config
- SDL2_CONFIG     ?= pkg-config sdl2
- #SDL2_CONFIG     ?= sdl2-config
--FREETYPE_CONFIG ?= freetype-config
--#FREETYPE_CONFIG ?= pkg-config freetype2
-+FREETYPE_CONFIG ?= pkg-config freetype2
-
- BACKENDS      = allegro gdi sdl sdl2 mixer_sdl mixer_sdl2 posix
- OSTYPES       = amiga beos freebsd haiku linux mingw mac openbsd
-@@ -91,8 +90,6 @@
-       endif
-     endif
-   endif
--else
--  CFLAGS += -O
- endif
-
- ifdef DEBUG
diff --git a/games-simulation/simutrans/files/simutrans-123.0.1-silence-svn-and-git-errors.patch b/games-simulation/simutrans/files/simutrans-123.0.1-silence-svn-and-git-errors.patch
new file mode 100644
index 000000000000..05d40c5cd5e0
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans-123.0.1-silence-svn-and-git-errors.patch
@@ -0,0 +1,46 @@
+From 51b78d7e6021ed7787991d6122da52293fbafa89 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Sun, 7 Aug 2022 18:33:46 +0200
+Subject: [PATCH] silence svn and git errors
+
+---
+ Makefile     | 2 +-
+ configure.ac | 9 ++-------
+ 2 files changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 69f2b8a..c683b8a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -254,7 +254,7 @@ else
+   endif
+ endif
+ 
+-GIT_HASH := $(shell git rev-parse --short=7 HEAD 2>/dev/null 1>/dev/null; echo $$?)
++GIT_HASH := 
+ ifneq ($(GIT_HASH),)
+   GIT_HASH := $(shell git rev-parse --short=7 HEAD)
+   $(info Git hash is 0x$(GIT_HASH))
+diff --git a/configure.ac b/configure.ac
+index e776f6b..41cd584 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -141,13 +141,8 @@ 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.35.1
+
diff --git a/games-simulation/simutrans/metadata.xml b/games-simulation/simutrans/metadata.xml
index 5384b5810c9d..bdfc12b3f89d 100644
--- a/games-simulation/simutrans/metadata.xml
+++ b/games-simulation/simutrans/metadata.xml
@@ -15,9 +15,5 @@
 	</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>
-		<flag name="pak192-comic">Install comic-like scenario data</flag>
 	</use>
 </pkgmetadata>
diff --git a/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild b/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild
deleted file mode 100644
index 8a03e83ca8d1..000000000000
--- a/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic xdg
-
-MY_PV=${PV/0./}
-MY_PV=${MY_PV//./-}
-SIMUPAK_64="simupak64-${MY_PV%-[0-9]*}-0.zip"
-SIMUPAK_128_V="2.8.1"
-SIMUPAK_128_BRITAIN="pak128.Britain.1.18-120-3.zip"
-SIMUPAK_128_GERMAN="PAK128.german_2.0_for_ST_122.0.zip"
-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://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} )
-	pak128-german? ( mirror://sourceforge/simutrans/${SIMUPAK_128_GERMAN} -> simutrans_${SIMUPAK_128_GERMAN} )
-	pak192-comic? (
-		mirror://sourceforge/simutrans/${SIMUPAK_192_COMIC} -> simutrans_${SIMUPAK_192_COMIC}
-		https://www.dropbox.com/s/3wwyrajrr2oqzo6/coalwagons.rar?dl=1 -> simutrans_coalwagonfix.rar
-	)"
-S=${WORKDIR}
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pak128 +pak128-britain +pak128-german +pak192-comic truetype upnp zstd"
-
-RDEPEND="
-	app-arch/bzip2
-	app-arch/zstd
-	media-libs/libpng:0
-	media-libs/libsdl2[sound,video]
-	media-libs/sdl-mixer[midi]
-	sys-libs/zlib
-	truetype? ( media-libs/freetype )
-	upnp? ( net-libs/miniupnpc:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unrar
-	app-arch/unzip
-	virtual/imagemagick-tools[png]
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/simutrans-0.122.0-Fix-Makefile.patch" )
-
-src_unpack() {
-	unpack "simutrans-src-${MY_PV}.zip"
-	unpack "simutrans_${SIMUPAK_64}"
-	use pak128 && unpack "simutrans_pak128-${SIMUPAK_128_V}.zip"
-	use pak128-britain && unpack "simutrans_${SIMUPAK_128_BRITAIN}"
-	use pak128-german && unpack "simutrans_${SIMUPAK_128_GERMAN}"
-	if use pak192-comic; then
-		unpack "simutrans_${SIMUPAK_192_COMIC}"
-		cd simutrans/pak192.comic || die
-		unpack "simutrans_coalwagonfix.rar" # Fixes invisible wagons.
-	fi
-
-	# 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
-
-	cat > config.default <<-EOF || die
-		BACKEND=mixer_sdl
-		OSTYPE=linux
-		MULTI_THREAD=1
-		USE_UPNP=$(usex upnp 1 0)
-		USE_FREETYPE=$(usex truetype 1 0)
-		USE_ZSTD=$(usex zstd 1 0)
-		VERBOSE=1
-		STATIC=0
-	EOF
-
-	# make it look in the install location for the data
-	sed -i -e "s:argv\[0\]:\"/usr/share/${PN}/\":" simmain.cc || die
-}
-
-src_compile() {
-	default
-
-	# Convert icon to PNG for Desktop Entry.
-	convert simutrans.ico simutrans.png || die
-}
-
-src_install() {
-	newbin build/default/sim ${PN}
-	insinto /usr/share/${PN}
-	doins -r simutrans/*
-	doicon simutrans.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
diff --git a/games-simulation/simutrans/simutrans-123.0.1-r1.ebuild b/games-simulation/simutrans/simutrans-123.0.1-r1.ebuild
index 368ac8ebd062..72b9bcc3eaab 100644
--- a/games-simulation/simutrans/simutrans-123.0.1-r1.ebuild
+++ b/games-simulation/simutrans/simutrans-123.0.1-r1.ebuild
@@ -48,6 +48,8 @@ BDEPEND="
 "
 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}"
@@ -62,6 +64,7 @@ src_prepare() {
 	xdg_environment_reset
 
 	strip-flags # bug #293927
+	append-flags -fno-strict-aliasing # bug #859229
 
 	eautoreconf