gentoo resync : 25.11.2020

5 files changed, 38 insertions, 207 deletions

diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 2950d98bca34..689f424d0dd5 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,9 +1,8 @@
+AUX openttd-1.10.3-icu68.patch 766 BLAKE2B 8d2ad4ddd3fbce89195982a5bcac5fd119d51cba58b9a5b6b90edf8c04041313eaf54167232aab1fdf112cadac1cf0190973cd2a807273544086f8e75226a91f SHA512 f52ed0b0e8e692c481cce579697f329a6f1495bcda834ae1566de9ec7f2cb3b791428d6c6b828d2d9d201572b5a6981d64e936fb33334c7e74d9e56e92d150a7
 AUX openttd-1.9.0-cflags.patch 1418 BLAKE2B 4c279bca0360d202d183488f61a19a5abc768cf55c2bb1ebaaa58ecd59f61584d4865bd7fc91260f14bd750b623884b88b6900e1c9cb89c007b32534e62ab510 SHA512 df1eeca21325b09c849191f7a60d0be1eee107a40b3cbb846f5c845d560f61a847ac66c427772c8e980d2ab2f51ccaa539938dd36c143f9af558293f9cf5c755
 AUX openttd-1.9.0-dont_compress_manpages.patch 1137 BLAKE2B aa03bf141f1dac450b90ad9b54f4022dc981e041f40cd5ad9b7b522910788fcf30c85ac8ee3ba480c76df67f11b8258de7fe785259796b67bebc1a49ce1ed6e3 SHA512 0985a5826dddfb9a03bfc686de5ae2a36362d635865fde9ec2ee340672556d82517db94197d7de04630ba7558bee5ad4543debafd46e5dfd2bbec2eaa9354a18
 AUX openttd.initd-r1 306 BLAKE2B d36e2f405a1b8808c708edd0c66e23d9976c2f5ef0fc2af3430bb8ba287c237dffe3d11cde6428b8ab668886ac4ff5eb4bc4fe5b39f205da4bf3d7773f66f7ef SHA512 bd04f9d812d5d68eebd953e9a667e5138d8e440139eb9c07f8da089495774b7d45e3b23bfb2af38ed053b333d4ead5f4be5c5fa877ad9f9bb0effee5c4a499dc
-DIST openttd-1.10.2-source.tar.xz 6766904 BLAKE2B 959d3ba98022d3fd3ddb15844bc2d6f5eb54b470e2dfebdcd784428c1773585c116dd739bd6718879ac6d6ac6942737cd51b71bc77d6d82991fdcea1bc8aec1a SHA512 03de85449a458c76c07d8a28c34f72bc95ab0652c666e5925da43746cdd4e95b0d66360b6e214d1df33f11b5346da2e3b9ca6832ac6628c7d6e5e0a791881683
 DIST openttd-1.10.3-source.tar.xz 6815924 BLAKE2B f700304e723fe5c3fa9781432a387e061595bbc8de42f565ad57ac265d9e4bc14cbc659a3f6551019bfb31b8b56b180c272c6753a12b4cd2e13016a98dfe1679 SHA512 d1cd535e8e49f0ac147704341287af1b16bde6725fd9152dd36dcb780559b400da8bb31c4e8eb665a0d11e9b1f5bf8a96be0f97f7a85bd967eec534fdd3dd0d4
-EBUILD openttd-1.10.2.ebuild 4994 BLAKE2B 58e971daf9226546e8da2309f4f7cb9022fe0a9762d21754a0a9be1b17b539390314d89d2716473c7578003998f5aaa7c962ff663d480dfbb7de2ead8487efb9 SHA512 5889dcf77f942f7b6d9e6450756d29d5c7a616e1e97d0ea6439828bd84a106cba72a2ce6a26b21116d1a70523be9db72156cfe0c95719869da6904ae0d833eaa
-EBUILD openttd-1.10.3.ebuild 4994 BLAKE2B 58e971daf9226546e8da2309f4f7cb9022fe0a9762d21754a0a9be1b17b539390314d89d2716473c7578003998f5aaa7c962ff663d480dfbb7de2ead8487efb9 SHA512 5889dcf77f942f7b6d9e6450756d29d5c7a616e1e97d0ea6439828bd84a106cba72a2ce6a26b21116d1a70523be9db72156cfe0c95719869da6904ae0d833eaa
-EBUILD openttd-9999.ebuild 4994 BLAKE2B 58e971daf9226546e8da2309f4f7cb9022fe0a9762d21754a0a9be1b17b539390314d89d2716473c7578003998f5aaa7c962ff663d480dfbb7de2ead8487efb9 SHA512 5889dcf77f942f7b6d9e6450756d29d5c7a616e1e97d0ea6439828bd84a106cba72a2ce6a26b21116d1a70523be9db72156cfe0c95719869da6904ae0d833eaa
+EBUILD openttd-1.10.3.ebuild 4960 BLAKE2B c0938b7f7e90ec22636942540f1afc2f5eaea2e57904064cff32eb1f021229aa312f84a24394023b8238cb22a14785b1d907659a15fbc9a152477f511ec60b4c SHA512 cd7c4a81cc53e58efc372d80c11322c49d1448054be30a352a8c45b4fb2d45c288a7da79c2ff31eb6d858400eb61f2416ba89b24f16445f9d8695a90d37f648f
+EBUILD openttd-9999.ebuild 4928 BLAKE2B 4c0524725573054c4209e67c8c668e04a175ffdf739dae514b2a34f754dc7722cab8b58382b60e89296300a199af40f29960f26e8c5cc208351f3d0e99c78982 SHA512 84b23f11ff8823944ebca485e98f94985e6dde85af65f49c750d861f280d808b9cdf2e409c2e7f126f3f0576fe4d2bbf9a9de72a575a417a09b2cb6c9d6beeda
 MISC metadata.xml 752 BLAKE2B 85476f4dbf68d94a5d95e35cff935edfe35caee4bd2a253c7bad747b0915b80f0f7009bf78e419417a05345210bed17dff8f82ce603480c96781323d7d5a89fd SHA512 ddb1fbbe98d5e0bc1e23385b38502603819b89bd1d9285b0193a55efe2263b8ab6e045c7befdc908303eea27de8c9148dbcc8e7b6c035b267f5c8ff0f16b4b56
diff --git a/games-simulation/openttd/files/openttd-1.10.3-icu68.patch b/games-simulation/openttd/files/openttd-1.10.3-icu68.patch
new file mode 100644
index 000000000000..9596ab66606a
--- /dev/null
+++ b/games-simulation/openttd/files/openttd-1.10.3-icu68.patch
@@ -0,0 +1,28 @@
+From 842e0ed5e3220a0e5ab19e7b0892c9c72c230ae7 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 30 Oct 2020 18:45:20 +0100
+Subject: [PATCH] Fix: build with icu-68.1
+
+icu-68.1 removed public macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/gfx_layout.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp
+index 584a71273..ebd1afaa8 100644
+--- a/src/gfx_layout.cpp
++++ b/src/gfx_layout.cpp
+@@ -116,7 +116,7 @@ void Font::getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const
+ 
+ le_bool Font::getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const
+ {
+-	return FALSE;
++	return false;
+ }
+ 
+ /**
+-- 
+2.29.2
+
diff --git a/games-simulation/openttd/openttd-1.10.2.ebuild b/games-simulation/openttd/openttd-1.10.2.ebuild
deleted file mode 100644
index acf83d2f9551..000000000000
--- a/games-simulation/openttd/openttd-1.10.2.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg
-
-MY_PV="${PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
-HOMEPAGE="https://www.openttd.org/"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD.git"
-else
-	SRC_URI="https://proxy.binaries.openttd.org/openttd-releases/${MY_PV}/${MY_P}-source.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aplaymidi debug dedicated iconv icu +lzma lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
-RESTRICT="test" # needs a graphics set in order to test
-
-RDEPEND="!dedicated? (
-		media-libs/libsdl2[sound,video]
-		icu? (
-			dev-libs/icu-layoutex
-			dev-libs/icu-le-hb
-			>=dev-libs/icu-58.1:=
-		)
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib:=
-		)
-	)
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo:2 )
-	iconv? ( virtual/libiconv )
-	png? (
-		media-libs/libpng:0
-		sys-libs/zlib:=
-	)
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig"
-PDEPEND="
-	!dedicated? (
-		openmedia? (
-			games-misc/openmsx
-			games-misc/opensfx
-		)
-		aplaymidi? ( media-sound/alsa-utils )
-		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
-	)
-	openmedia? ( >=games-misc/opengfx-0.4.7 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0-cflags.patch
-	"${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch
-)
-
-src_configure() {
-	local myopts=(
-		--binary-dir="bin"
-		--disable-strip
-		--doc-dir="share/doc/${PF}"
-		--install-dir="${D}"
-		--menu-group="Game;Simulation;"
-		--prefix-dir="${EPREFIX}/usr"
-		$(use_with cpu_flags_x86_sse sse)
-		$(use_with iconv)
-		$(use_with lzma)
-		$(use_with lzo liblzo2)
-		$(use_with png)
-		$(usex debug '--enable-debug=3' '')
-		# there is an allegro interface available as well as sdl, but
-		# the configure for it looks broken so the sdl interface is
-		# always built instead.
-		--without-allegro
-
-		--without-fluidsynth
-	)
-
-	if use dedicated ; then
-		myopts+=( --enable-dedicated )
-	else
-		myopts+=(
-			$(usex aplaymidi '--with-midi=/usr/bin/aplaymidi' '')
-			$(use_with truetype freetype)
-			$(use_with icu)
-			--with-sdl
-		)
-	fi
-	if use png || { use !dedicated && use truetype; } || use zlib ; then
-		myopts+=( --with-zlib )
-	else
-		myopts+=( --without-zlib )
-	fi
-
-	# configure is a hand-written bash-script, so econf will not work.
-	# It's all built as C++, upstream uses CFLAGS internally.
-	CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" ./configure ${myopts[@]} || die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-	if use dedicated ; then
-		newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} || die
-	fi
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use lzo ; then
-		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
-		elog "required, disabling it does mean that loading old savegames"
-		elog "or scenarios from ancient versions (~0.2) will fail."
-		elog
-	fi
-
-	if use dedicated ; then
-		ewarn "Warning: The init script will kill all running openttd"
-		ewarn "processes when triggered, including any running client sessions!"
-	else
-		if use aplaymidi ; then
-			elog "You have emerged with 'aplaymidi' for playing MIDI."
-			elog "This option is for those with a hardware midi device,"
-			elog "or who have set up ALSA to handle midi ports."
-			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
-			elog "Available ports can be listed by using 'aplaymidi -l'."
-		else
-			if ! use timidity ; then
-				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
-				elog "in USE. Music may or may not work in-game. If you happen"
-				elog "to have timidity++ installed, music will work so long"
-				elog "as it remains installed, but OpenTTD will not depend on it."
-			fi
-		fi
-		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 ~/.openttd/data/ or"
-			elog "${GAMES_DATADIR}/${PN}/data/."
-			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"
-			elog
-			elog "File names are case sensitive, but should work either with"
-			elog "all upper or all lower case names"
-			elog
-			elog "In addition, in-game music will be unavailable: for music,"
-			elog "install games-misc/openmsx, or use the in-game download"
-			elog "functionality to get a music set"
-			elog
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/games-simulation/openttd/openttd-1.10.3.ebuild b/games-simulation/openttd/openttd-1.10.3.ebuild
index acf83d2f9551..bd35f84f89bf 100644
--- a/games-simulation/openttd/openttd-1.10.3.ebuild
+++ b/games-simulation/openttd/openttd-1.10.3.ebuild
@@ -41,7 +41,7 @@ RDEPEND="!dedicated? (
 	lzo? ( dev-libs/lzo:2 )
 	iconv? ( virtual/libiconv )
 	png? (
-		media-libs/libpng:0
+		media-libs/libpng:0=
 		sys-libs/zlib:=
 	)
 	zlib? ( sys-libs/zlib:= )"
@@ -62,6 +62,7 @@ PDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.0-cflags.patch
 	"${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch
+	"${FILESDIR}"/${P}-icu68.patch
 )
 
 src_configure() {
@@ -104,7 +105,8 @@ src_configure() {
 
 	# configure is a hand-written bash-script, so econf will not work.
 	# It's all built as C++, upstream uses CFLAGS internally.
-	CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" ./configure ${myopts[@]} || die
+	CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" \
+	./configure ${myopts[@]} || die
 }
 
 src_compile() {
@@ -120,10 +122,6 @@ src_install() {
 	rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
 pkg_postinst() {
 	xdg_pkg_postinst
 
@@ -177,7 +175,3 @@ pkg_postinst() {
 		fi
 	fi
 }
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/games-simulation/openttd/openttd-9999.ebuild b/games-simulation/openttd/openttd-9999.ebuild
index acf83d2f9551..d3e0bdea7018 100644
--- a/games-simulation/openttd/openttd-9999.ebuild
+++ b/games-simulation/openttd/openttd-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND="!dedicated? (
 	lzo? ( dev-libs/lzo:2 )
 	iconv? ( virtual/libiconv )
 	png? (
-		media-libs/libpng:0
+		media-libs/libpng:0=
 		sys-libs/zlib:=
 	)
 	zlib? ( sys-libs/zlib:= )"
@@ -104,7 +104,8 @@ src_configure() {
 
 	# configure is a hand-written bash-script, so econf will not work.
 	# It's all built as C++, upstream uses CFLAGS internally.
-	CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" ./configure ${myopts[@]} || die
+	CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" \
+	./configure ${myopts[@]} || die
 }
 
 src_compile() {
@@ -120,10 +121,6 @@ src_install() {
 	rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
 pkg_postinst() {
 	xdg_pkg_postinst
 
@@ -177,7 +174,3 @@ pkg_postinst() {
 		fi
 	fi
 }
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}