gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 26 insertions, 138 deletions

diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 53bdebb7fe2f..a119c59f5153 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,8 +1,7 @@
 AUX openttd-1.11.2_dont_compress_man.patch 999 BLAKE2B 5a2e9d91cb0f60723ef198723b07793c1909e55e68493733ed3cc0ce66441be0e970b7bd8cd6ade43c0090bcc0b2d68cde6230306a55f857ca9d3c0406ccaf17 SHA512 a7b312995000abf5a4bc4418bb466aead75fc3f8dbd4ed7cc3d2914dc96beb815a4cf422e9ca24e41dbbf545dfef8c8cdeeec68f9390e2f6465d1eb80fcaf358
+AUX openttd-13.4-gcc15.patch 1029 BLAKE2B ba02b55a48e114118fe4b03d83223b55d9c638c8eaaeeaa1695201b60466d454708ae80e5087f330c4d87c419d4c93a6f3cc1dded6165731d45bbc4f3efaedf0 SHA512 992c8561e9f820a90ed6c29c5d06777f728ec6b8b8da59b0171f5a9d542f1923baea21ff3079ec06b46abbb6e194ea28b9dba3ee5d044c39dc44540a687a2737
 AUX openttd.confd-r1 376 BLAKE2B 9208c9da8c90d74d36204c2c78f14b28fa3bf5ec730e2f56b6ae163b474b2169b003fb4d869810a2404cc0ad2e0e5bf9c78417057a762e965787b955431db629 SHA512 a3ca192781b0bf4a1105f13890bc34b3d68a365637adb2254b7b048fa5a1fde80b95415711010b8144135465c2a9cd1a8822cc3bbd2e0161a728c16acb1d0509
 AUX openttd.initd-r3 1052 BLAKE2B b4f57691ef749e8aae4be2fb3cf1826b00fa609afbd1f0d863fb6177fe70e4b6254831ea5c89aa74bac9e2dfddf050656dc43790a412870add8baefeb57d9500 SHA512 5064fb633aea2d2720f189a3a5a9f07541394d7760274465bd9837ec4a04009597b984821424f234941972958754db33bc5cc174b7b075c8915fb2231dd3e6f8
-DIST openttd-13.3-source.tar.xz 7417568 BLAKE2B dbeacb0e40af76feda5fd9946a63267e4ce9f342be4479bca24e04be7dbf05453184396e2b78f62ee045d636f70f5969ee1b1f045c68961a80875f7788a570d2 SHA512 bb91755f65bd3c3f4716b6722f29bc63633e04557d427cb224f4c3aecdbd3744df4921aba3872966fc587541fe2cdaa2fd80891236a9c87826cea0a6865e2318
 DIST openttd-13.4-source.tar.xz 7428012 BLAKE2B 0ef635e40fe47185168bd13e4b8ce24a8ff9c4afe3eced6197298986127ee196a6dcb379643bbb1de9bb552e71cda5df5b5b35006ed2b43d6e33e8513b1cd550 SHA512 84f57a39c0dade44f0e6153dff7a40eec0da8e2f892ce870d5f9e037f80daa5c7c46ff786fa51c3671366dd5056504cd7ccbc1c4e5bce8b2c5575533b454c001
-EBUILD openttd-13.3.ebuild 3899 BLAKE2B 8cded051484ef6273ca0cfd9b0ea4dc21746dbae0aeee21594308775765355105809faaa11d031219374988dad7f93bfe9c0532c2005734341d5ba099363c19c SHA512 4e695e3bf8b8e327336b7d2464c0675e3ac4df84672f120f61dea2b150ccbf2aee662f1ec07eabaec94bdeefe5177eeaf6ae705cacacf132d734242c0eca80a8
-EBUILD openttd-13.4.ebuild 3899 BLAKE2B 8cded051484ef6273ca0cfd9b0ea4dc21746dbae0aeee21594308775765355105809faaa11d031219374988dad7f93bfe9c0532c2005734341d5ba099363c19c SHA512 4e695e3bf8b8e327336b7d2464c0675e3ac4df84672f120f61dea2b150ccbf2aee662f1ec07eabaec94bdeefe5177eeaf6ae705cacacf132d734242c0eca80a8
+EBUILD openttd-13.4.ebuild 3937 BLAKE2B 53859295bf075d0b27630de3f3db0e10aedbee3865671025db488414727e4752269c9b5af46971cd7999b86d23df61bb764ec08e63dc00aabd6575cc10c28e21 SHA512 6c33589696e3b9f52580fb2f8f8669d890cc425840d61eb0fed77856e9ef038563ef678777f2ff3f70b4fdd64f8392a4f34c9fcb10578a14d7ce872260231193
 MISC metadata.xml 857 BLAKE2B e65bf683a6d5beb3c99ae8d83771e5312e00cf40dbbd2dbf9545d7f7134b5df25d58057f23f5afd101a9f2e13396c57bfda59b427896455205ed6e272574f643 SHA512 fa13b5059202687ded428b6670b6a84f1187e767da4a51ef4fca435e8b0c10f900cc60ba7207d690888e442cbc27b03f8ea142e93138fa1b4da4411c13d1b6bf
diff --git a/games-simulation/openttd/files/openttd-13.4-gcc15.patch b/games-simulation/openttd/files/openttd-13.4-gcc15.patch
new file mode 100644
index 000000000000..f849d82c1ed0
--- /dev/null
+++ b/games-simulation/openttd/files/openttd-13.4-gcc15.patch
@@ -0,0 +1,22 @@
+https://github.com/OpenTTD/OpenTTD/pull/12876
+https://github.com/OpenTTD/OpenTTD/commit/db36e61807955c896267d6585de0577efd30465d
+
+From 866cd4381189658641a69bdeca86ceec15aa027d Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Mon, 22 Jul 2024 09:27:01 +0200
+Subject: [PATCH] Codechange: fix for GCC 15 two-phase lookup
+
+* GCC 15 is more aggressive about checking dependent names
+
+Bug: https://bugs.gentoo.org/936417
+--- a/src/pathfinder/yapf/yapf_road.cpp
++++ b/src/pathfinder/yapf/yapf_road.cpp
+@@ -470,7 +470,7 @@ class CYapfFollowRoadT
+ 		/* set origin (tile, trackdir) */
+ 		TileIndex src_tile = v->tile;
+ 		Trackdir src_td = v->GetVehicleTrackdir();
+-		if (!HasTrackdir(GetTrackdirBitsForRoad(src_tile, this->IsTram() ? RTT_TRAM : RTT_ROAD), src_td)) {
++		if (!HasTrackdir(GetTrackdirBitsForRoad(src_tile, Yapf().IsTram() ? RTT_TRAM : RTT_ROAD), src_td)) {
+ 			/* sometimes the roadveh is not on the road (it resides on non-existing track)
+ 			 * how should we handle that situation? */
+ 			return false;
diff --git a/games-simulation/openttd/openttd-13.3.ebuild b/games-simulation/openttd/openttd-13.3.ebuild
deleted file mode 100644
index 20010db20802..000000000000
--- a/games-simulation/openttd/openttd-13.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A clone of Transport Tycoon Deluxe"
-HOMEPAGE="https://www.openttd.org/"
-SRC_URI="https://cdn.openttd.org/openttd-releases/${PV}/${P}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="allegro cpu_flags_x86_sse debug dedicated +fluidsynth icu +lzma lzo +openmedia +png +sdl timidity +truetype +zlib"
-REQUIRED_USE="!dedicated? ( || ( allegro sdl ) )"
-
-# TODO: On master (after 13.x):
-# - icu-layoutex is gone (https://github.com/OpenTTD/OpenTTD/commit/81d4fa69990abbc18bd83d60658b0eedd66b7447)
-# - icu-le-hb looks like it might be too (https://github.com/OpenTTD/OpenTTD/issues/6922)
-RDEPEND="
-	dedicated? (
-		acct-group/openttd
-		acct-user/openttd
-		app-misc/dtach
-	)
-	!dedicated? (
-		allegro? ( media-libs/allegro:5 )
-		fluidsynth? ( media-sound/fluidsynth )
-		icu? (
-			dev-libs/icu-layoutex:=
-			dev-libs/icu-le-hb
-			>=dev-libs/icu-58.1:=
-		)
-		sdl? ( media-libs/libsdl2[sound,video] )
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib:=
-		)
-	)
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo:2 )
-	png? ( media-libs/libpng:= )
-	zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=games-util/grfcodec-6.0.6_p20210310
-	virtual/pkgconfig
-"
-PDEPEND="
-	!dedicated? (
-		openmedia? (
-			>=games-misc/openmsx-0.4.0
-			>=games-misc/opensfx-1.0.1
-		)
-	)
-	openmedia? ( >=games-misc/opengfx-0.6.1 )
-	timidity? ( media-sound/timidity++ )
-"
-
-DOCS=( docs/directory_structure.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11.2_dont_compress_man.patch"
-)
-
-src_prepare() {
-	# Drop automagic LTO usage
-	sed -i -e '/check_ipo_supported(RESULT IPO_FOUND)/d' CMakeLists.txt || die
-
-	# Don't force _FORTIFY_SOURCE via CMake
-	# (we already set it in the toolchain by default with a minimum level
-	# of _FORTIFY_SOURCE=2)
-	sed -i -e '/-D_FORTIFY_SOURCE/d' cmake/CompileFlags.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_BINDIR=bin
-		-DCMAKE_INSTALL_DATADIR=share
-		-DOPTION_DEDICATED=$(usex dedicated)
-		-DOPTION_USE_ASSERTS=$(usex debug)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Allegro=$(usex !allegro)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Freetype=$(usex !truetype)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Fontconfig=$(usex !truetype)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Fluidsynth=$(usex !fluidsynth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ICU=$(usex !icu)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibLZMA=$(usex !lzma)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LZO=$(usex !lzo)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
-		# N.B. regarding #807364 and #828984: CMAKE_DISABLE_FIND_PACKAGE_SDL is used only
-		# with USE="allegro -sdl" combination flags. There no other way to
-		# completely disable SDL1 support.
-		-DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_SDL2=$(usex !sdl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_SSE=$(usex !cpu_flags_x86_sse)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use dedicated ; then
-		newconfd "${FILESDIR}"/openttd.confd-r1 openttd
-		newinitd "${FILESDIR}"/openttd.initd-r3 openttd
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use openmedia ; then
-		elog
-		elog "OpenTTD was compiled without the 'openmedia' USE flag."
-		elog
-		elog "In order to play, you must at least install"
-		elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
-		elog "following 6 files from a version of Transport Tycoon Deluxe"
-		elog "(Windows or DOS) to shared or personal location."
-		elog "See ${EROOT}/usr/share/doc/${PF}/directory_structure.md for more info."
-		elog
-		elog "From the Windows version you need: "
-		elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-		elog "OR from the DOS version you need: "
-		elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-	fi
-}
diff --git a/games-simulation/openttd/openttd-13.4.ebuild b/games-simulation/openttd/openttd-13.4.ebuild
index 20010db20802..11d583b49c7f 100644
--- a/games-simulation/openttd/openttd-13.4.ebuild
+++ b/games-simulation/openttd/openttd-13.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -64,6 +64,7 @@ DOCS=( docs/directory_structure.md )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.11.2_dont_compress_man.patch"
+	"${FILESDIR}/${PN}-13.4-gcc15.patch"
 )
 
 src_prepare() {