gentoo resync : 25.10.2021

6 files changed, 60 insertions, 9 deletions

diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild
index 5d9e67d4a9fb..046224a20d14 100644
--- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild
+++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild
@@ -44,6 +44,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
+	eapply "${FILESDIR}/${PN}-Install-EmptyEpsilon.desktop.patch"
 	eapply "${FILESDIR}/${PN}-Make-CMake-call-find_package-glm.patch"
 	eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \
 		   "${FILESDIR}/SeriousProton-Unbundle-json11.patch"
diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest
index 1cd180e3724e..eeface646e30 100644
--- a/games-simulation/EmptyEpsilon/Manifest
+++ b/games-simulation/EmptyEpsilon/Manifest
@@ -1,6 +1,7 @@
+AUX EmptyEpsilon-Install-EmptyEpsilon.desktop.patch 1170 BLAKE2B e844399b993374b05a6ebe80d66b0845f2170aaf2a40a51fdc6991d15a175fa5e8654787d7722154844fae4bfb399faf1c0367cc9bd9d99cc2998a715039c491 SHA512 d64d1b6cfcd9bed65b03a065f91e838c124bed00d98de71a69493e2725c8411be1d8d3f3559af53f94cfd7d867fa8b23521333cd53b2004fe8b24f441904f000
 AUX EmptyEpsilon-Make-CMake-call-find_package-glm.patch 1056 BLAKE2B 9522b7e2b45531ebd82e1f454a889ccd4c688adcbcdb753ca3c0c23ee2f0b94ed9537956bbbd8faca8305065017daf178278d5c14661d68de24d9c008339d6f2 SHA512 c6ccddf2a9f6fc7342428d5c197bec6fc01f24e3c9c9aa19bbccedba3c16bd825f59566fb0239b64bdd3914abfd584382742544f79c4266eef6e4ee7aabf3238
 AUX SeriousProton-Unbundle-json11.patch 722 BLAKE2B ab12cf044d38bc78eac3d4fdd7f3c9db062784177e848ca62135b356fec88be9876fa98f23d1195e3c3a2ef791166cb3c0fe220bce9c53a667b628a2e3602eb4 SHA512 da912f148738a409dd1eee4a8a926930ed31220c9b6477eb8a89da797dd659e2a576ca44875410cbc46c86f7d5b6e44037ed3f44c8d7ecd5a4680f12f626f013
 DIST EmptyEpsilon-2021.06.23.tar.gz 285211647 BLAKE2B 813b7e02ff7f046b7f28139063441eb421861b720c7b55d25930d3a418211fefdce7ac0e6ab705b4afe52df58f85a9298ff3e6be883a841e6eb9f7037eca297b SHA512 209ea68d99ef5ef53f1e3484d6471cafc01d4cb6505609a5b41d468387147127b4b4bbc20af75404d2cdef3d3cfb37bbb7f6fb3ae336d2f7e264e9c470ad7764
 DIST SeriousProton-2021.06.23.tar.gz 1181117 BLAKE2B 433280b7f6994bed0b86ffc4135a1e91bd9521c508b875332d17dc041da6b77a4260de784b6b75e79aab072d6bc68108a8b6b4949d674670f1d13ed1abe90d7e SHA512 4519801c30cd87436704023090ce39299573b02637a86b0d5c6ac0f4e99b4bddc6724b2b660edfd29d33a908b67268409a8c47dab7b5d59958a5abd52d5610bf
-EBUILD EmptyEpsilon-2021.06.23.ebuild 1957 BLAKE2B 9c88c669ee835bbf244392a85c334cac0cb9470605af2f196f9141476ebc6f7ca918a51025206b5b9bac3ee3ff93bb1e7250e1911bda3ccc213f1849fa6a17ee SHA512 bad61aca9a503fb24c47fdcdf7ce008e2c6ba6f92de4c8546dd1218e4991a365bf617db3f2bab9a0ebf366a8ef263cc91c7073705da9283c236701e8ce378de3
+EBUILD EmptyEpsilon-2021.06.23-r1.ebuild 2020 BLAKE2B 0ff793513fc4f9ae446fb85d7ff6fb1fe455272341e5baf26f96a0a7aed911a317e8a89e80fdfedd81140d0f1bc47f9f4da4abaf0a5a39eb3ad3895ad25e07cd SHA512 e16a364466342dcb21a796c367c5c4a7c2007d81b4ce93dc3a122e0aba1523a696e083ca1bed73ff802412a22acb1c7f65cdd9999bfbbbf5122fac43b96f353f
 MISC metadata.xml 246 BLAKE2B e270b04a529da44d267eaf5bfd160569fc99a3521dfc6495e0a4db19c98e5b9badf77774cc80c7be905f3e97b1c75784bc7b4cb6bfe659d726a47c7ae70e7bfb SHA512 7e2151bbca24beeefd585e18d6c1108442b2d9197679876bb180da3d4896602e83ea701432ff67fc61cccfa9bf642a01a62d87bacf32c55e0a54336c7c5a2c53
diff --git a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch
new file mode 100644
index 000000000000..4730bcbabb25
--- /dev/null
+++ b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch
@@ -0,0 +1,45 @@
+From c34c773ab5a403c288d7eecd971ae5b0d9eecfa0 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Thu, 21 Oct 2021 10:33:28 +0200
+Subject: [PATCH] Install EmptyEpsilon.desktop
+
+Fixes #405.
+
+See also https://bugs.gentoo.org/818697
+---
+ CMakeLists.txt       | 5 +++++
+ EmptyEpsilon.desktop | 9 +++++++++
+ 2 files changed, 14 insertions(+)
+ create mode 100644 EmptyEpsilon.desktop
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cb3e32c0e6ed..b630668aecd9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -711,3 +711,8 @@ set(CPACK_INSTALL_CMAKE_PROJECTS
+ )
+ 
+ include(CPack)
++
++if(UNIX AND NOT APPLE)
++  install(FILES EmptyEpsilon.desktop DESTINATION "share/applications")
++  install(FILES logo.png DESTINATION "share/icons" RENAME "EmptyEpsilon.png")
++endif()
+diff --git a/EmptyEpsilon.desktop b/EmptyEpsilon.desktop
+new file mode 100644
+index 000000000000..07cc109b578d
+--- /dev/null
++++ b/EmptyEpsilon.desktop
+@@ -0,0 +1,9 @@
++[Desktop Entry]
++Name=EmptyEpsilon
++GenericName=EmptyEpsilon
++Comment=Spaceship bridge simulator game
++Exec=EmptyEpsilon
++Icon=EmptyEpsilon
++Terminal=false
++Type=Application
++Categories=Game;Simulation;
+-- 
+2.33.1
+
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 56b2e2ee24f9..4e0f84146b0c 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index e101225c16b6..d791c89e87b6 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,5 +1,5 @@
 AUX openttd-1.11.2_dont_compress_man.patch 999 BLAKE2B 5a2e9d91cb0f60723ef198723b07793c1909e55e68493733ed3cc0ce66441be0e970b7bd8cd6ade43c0090bcc0b2d68cde6230306a55f857ca9d3c0406ccaf17 SHA512 a7b312995000abf5a4bc4418bb466aead75fc3f8dbd4ed7cc3d2914dc96beb815a4cf422e9ca24e41dbbf545dfef8c8cdeeec68f9390e2f6465d1eb80fcaf358
 AUX openttd.initd-r1 306 BLAKE2B d36e2f405a1b8808c708edd0c66e23d9976c2f5ef0fc2af3430bb8ba287c237dffe3d11cde6428b8ab668886ac4ff5eb4bc4fe5b39f205da4bf3d7773f66f7ef SHA512 bd04f9d812d5d68eebd953e9a667e5138d8e440139eb9c07f8da089495774b7d45e3b23bfb2af38ed053b333d4ead5f4be5c5fa877ad9f9bb0effee5c4a499dc
-DIST openttd-1.11.2-source.tar.xz 6783972 BLAKE2B c71fd98a480566aede29f84afbd100b6d0dfa80311860907a7287d2d5bed74bd492c2b1012cd83f45fe68d60fb0c2378e1384530a84c28bd7fbd907b45110491 SHA512 9a6364bf19627db9f8ec58bfa85fa3a8febf1109f3b5fb9053bef810ac2d0c41df91b58f0b253dd45320a29cae2e8485df794afa7b5240f19759f98fd65c35ea
-EBUILD openttd-1.11.2-r1.ebuild 2900 BLAKE2B 9acc275789e8c4e6ca1529cc0ed6b71b2adc680deaf695765b9090d354e335c8f86e6c0000c6dc6e89287729da14a6eb2944c502f150d108e86a89c27313ce69 SHA512 16a3663850a3b52a9a626d005930d943a1a549667599b15f2ad9418c033dd908ff7fe877afeeeb6724e9831bd925cce223679fb3b874e237d0e9173f1eb4fe18
+DIST openttd-12.0-source.tar.xz 7307832 BLAKE2B 12ffd0978e1f735f4a1d9eb63876a6f4a38867f11e5cbfbb7386f34564ef8b79f394b782c99f28e8a65196b7311aee28427d0485abd2e16dd69f36beb40fa3b1 SHA512 a1042fe52892cf301d3a2c7e972d9c091829638119d2ca9b55165a6b5568660f178e808db4b0bf2d3e4538dbdaea7b0683d4de9333defbcd95e109d591c05a78
+EBUILD openttd-12.0.ebuild 3126 BLAKE2B b018c78c0ee734a613b4a57714d2ac692dc3ba47033b5d9a0803c6ef9ef608a27e1557ed391a905a17b7a9dbceda1f8b01adaad78c552641d060fd51c5256f14 SHA512 9700cb64038e6ef17227862a11d794d499c6e372cba8ad01f4d830513fb4acb02595694174ddd995a98997c8698af355e6b7af2a438715c086163a84d1711cd9
 MISC metadata.xml 857 BLAKE2B e65bf683a6d5beb3c99ae8d83771e5312e00cf40dbbd2dbf9545d7f7134b5df25d58057f23f5afd101a9f2e13396c57bfda59b427896455205ed6e272574f643 SHA512 fa13b5059202687ded428b6670b6a84f1187e767da4a51ef4fca435e8b0c10f900cc60ba7207d690888e442cbc27b03f8ea142e93138fa1b4da4411c13d1b6bf
diff --git a/games-simulation/openttd/openttd-1.11.2-r1.ebuild b/games-simulation/openttd/openttd-12.0.ebuild
index 104f633add0a..73990ea5a054 100644
--- a/games-simulation/openttd/openttd-1.11.2-r1.ebuild
+++ b/games-simulation/openttd/openttd-12.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
-IUSE="allegro cpu_flags_x86_sse dedicated +fluidsynth icu +lzma lzo +openmedia +png +sdl timidity +truetype zlib"
+IUSE="allegro cpu_flags_x86_sse dedicated +fluidsynth icu +lzma lzo +openmedia +png +sdl timidity +truetype +zlib"
 REQUIRED_USE="!dedicated? ( || ( allegro sdl ) )"
 
 RESTRICT="test" # needs a graphics set in order to test
@@ -39,7 +39,8 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	zlib? ( sys-libs/zlib:= )"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND=">=games-util/grfcodec-6.0.6_p20210310
+	virtual/pkgconfig"
 PDEPEND="
 	!dedicated? (
 		openmedia? (
@@ -52,7 +53,7 @@ PDEPEND="
 
 DOCS=( docs/directory_structure.md )
 PATCHES=(
-	"${FILESDIR}/${P}_dont_compress_man.patch"
+	"${FILESDIR}/${PN}-1.11.2_dont_compress_man.patch"
 )
 
 src_configure() {
@@ -61,13 +62,16 @@ src_configure() {
 		-DCMAKE_INSTALL_DATADIR=share
 		-DOPTION_DEDICATED=$(usex dedicated)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Allegro=$(usex !allegro)
-		-DCMAKE_DISABLE_FIND_PACKAGE_FREETYPE=$(usex !truetype)
+		-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_LibLZMA=$(usex !lzma)
 		-DCMAKE_DISABLE_FIND_PACKAGE_LZO=$(usex !lzo)
 		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
+		# N.B. regarding #807364: 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)