gentoo resync : 25.03.2022

12 files changed, 117 insertions, 220 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 18add33f6733..b5e99dee08a5 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index ab92bb15a4cc..1822be24f422 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -3,5 +3,7 @@ AUX s25rttr-0.9.0_pre20200723-cmake_lua_version.patch 296 BLAKE2B cabdc87d6184e5
 AUX s25rttr-0.9.1-cxx-std.patch 1059 BLAKE2B 84e43db33095f8d043c76c381d7477988ababf24959acfe34032c327b1bbd51661e461fc9a5be04aa933d3c40667819eed507326ae8a903069c1903f0366acd0 SHA512 4bdd87fdbcd37c5ee96e3878fd5c690e7186697f947bff8101f36049f6ae1622f2d82944475101c280d3a983150880dcc606d91803d628d8a94e6d8a3e748918
 AUX s25rttr-0.9.1-libsamplerate.patch 1536 BLAKE2B 55fbc0c0b439d98635ca74384033dfe44649605436fec2d61bb0e24e71173572aeeff11de0eb6592e27569f6ff0840867b627cbf6362c418286be39e4e538416 SHA512 9825546d5182a0b57c352fa46b786c8725f828b94ff5504506b79a22d8bce78edc0cf3c4fa7b0c5987a6875d912e27f81be5e5282cad987ac3a730e125db1846
 DIST s25client_src_v0.9.1.tar.gz 31042856 BLAKE2B 296e61467f5ba64f2a833e3f6627844db3757604d9b239d18f3a2b42afc7f46df09ff3b9e8d8a26865e5220f8996b6e78fd4d5fe6252510bbdf8fc238de40bfc SHA512 b7478f76e0246c52a219d9ef5293d56fe682dc87bcd1269d1647417d86c5174632bf05f1fe09e91a9bf9d6738f58e1cac51abdc54df47c00d228687767e19510
+DIST s25client_src_v0.9.5.tar.gz 30305585 BLAKE2B 77857743b5a1693ed373cb048c40fed150a4bf3d59f1314ffbb268f3e03ba8db2f44c20962c390f3a8c5b5b443ee0465d5c7bf726998ddf0334a861304211db8 SHA512 4926653075c7ba01e1e4ca516c52ad1694b46557c40c418e2a1f18d0a8fac9d4b73c20adc5403365ad6ba643823ed23dff5296717b3e057c42b17f1c20feb802
 EBUILD s25rttr-0.9.1.ebuild 2796 BLAKE2B e4a57a16fecf7afc6e7e9b95813525e7a3f6c7ab9b8802a82a75bc91c25d848341d61c0fa40930a0c8e1af73ad4d7ab518c1b547055b271f60891ab89ee352bf SHA512 afb89fcca9ecb5bc89750df151caf5965be0f4d717bb36991a6c21b258d6db182fab9e311f8480cdfb5230e693e23de4058692f24e89d69d16a9c55d3386f104
+EBUILD s25rttr-0.9.5.ebuild 2636 BLAKE2B 2e193ce0ae1ad9db8b39381635a1d4dc8bd9faba7faeaf5b15f8b25a20e803cf755424c88f3c5d667c153053ad115276ae6fd254d9e1f7209fffa8a825d85472 SHA512 4538d08c64db99383a02be0bc06bca5bfc87a2087016031cc149db454d3654e37f485ed102f242159db8337ad24496954913f4398b338799b4f8e4fb2cd1d0f2
 MISC metadata.xml 348 BLAKE2B bc23c51bcd3458b4f39a6b42dd73f35060319cdae4563a4288ef2ae9dc9e2a85e8bc4b357dff37d70f20abf5d79a4a5c20fb1a8c2ab4c994dd3290ea18d49c34 SHA512 c145a48fb294eb11195885f0cd97095c7258d3286bf1cd926b5d40682aea1767c52a5a163283345fe12416659a9c7500de58993379b0ba3c743f18e172696c6f
diff --git a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild b/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
new file mode 100644
index 000000000000..47d74e0d261a
--- /dev/null
+++ b/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-3 )
+
+inherit desktop flag-o-matic lua-single toolchain-funcs xdg cmake
+
+MY_PN="s25client"
+DESCRIPTION="Open source remake of The Settlers II: Gold Edition (needs original data files)"
+HOMEPAGE="https://www.siedler25.org/"
+SRC_URI="https://github.com/Return-To-The-Roots/${MY_PN}/releases/download/v${PV}/${MY_PN}_src_v${PV}.tar.gz"
+LICENSE="GPL-2+ GPL-3 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	app-arch/bzip2
+	>=dev-libs/boost-1.73:0=[nls]
+	>=media-libs/libsamplerate-0.1.9
+	>=media-libs/libsdl2-2.0.10-r2[opengl,sound,video]
+	media-libs/libsndfile
+	media-libs/sdl2-mixer[vorbis,wav]
+	net-libs/miniupnpc
+	virtual/opengl
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( >=sys-devel/clang-5 )
+"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
+)
+
+S="${WORKDIR}/${MY_PN}_v${PV}"
+
+# Build type is checked but blank is valid.
+CMAKE_BUILD_TYPE=
+
+src_prepare() {
+	cmake_src_prepare
+	rm -v external/{kaguya,libutil}/cmake/FindLua.cmake || die
+}
+
+src_configure() {
+	if [[ -f revision.txt ]]; then
+		local RTTR_REVISION="$(< revision.txt)"
+	elif [[ -n ${COMMIT} ]]; then
+		local RTTR_REVISION="${COMMIT}"
+	else
+		die "Could not determine RTTR_REVISION."
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCCACHE_PROGRAM=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_ClangFormat=ON
+		-DCMAKE_SKIP_RPATH=ON
+		-DLUA_VERSION=$(lua_get_version)
+		-DRTTR_BUILD_UPDATER=OFF
+		-DRTTR_ENABLE_OPTIMIZATIONS=OFF
+		-DRTTR_ENABLE_SANITIZERS=$(usex test)
+		-DRTTR_ENABLE_WERROR=OFF
+		-DRTTR_INCLUDE_DEVTOOLS=OFF
+		-DRTTR_LIBDIR="$(get_libdir)"
+		-DRTTR_REVISION="${RTTR_REVISION}"
+		-DRTTR_USE_SYSTEM_LIBS=ON
+		-DRTTR_VERSION="${PV##*_pre}" # Tests expect a date for snapshots.
+	)
+
+	if use test && tc-is-gcc; then
+		# Work around libasan and libsandbox both wanting to be first.
+		append-ldflags -static-libasan
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	SDL_AUDIODRIVER=dummy \
+	SDL_VIDEODRIVER=dummy \
+	USER=$(whoami) \
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	doicon -s 64 tools/release/debian/s25rttr.png
+	make_desktop_entry "${MY_PN}" "Return to the Roots"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! has_version -r games-strategy/settlers-2-gold-data; then
+		elog "Install games-strategy/settlers-2-gold-data or manually copy the DATA"
+		elog "and GFX directories from original data files into"
+		elog "${EPREFIX}/usr/share/${PN}/S2."
+	fi
+}
diff --git a/games-strategy/triplea/Manifest b/games-strategy/triplea/Manifest
deleted file mode 100644
index 60fae348e70d..000000000000
--- a/games-strategy/triplea/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX mkdir.sh 28 BLAKE2B e23eb97930e3fd2f5860a0acd5c5a79fd43ebb6577bb79c03b369b74172ec7110b39b5324580e2392c95e5235c86a8b786c67d97adfdd6ae804e4fcc36409973 SHA512 f49b4476521ad392ab91550ce1ef150b4fe4243020f7a173a3fe0d11e31476c22c11773058d4da1a013b63cb3b7017ac8ed38d4793d921a691546481c280ad37
-AUX paths.patch 3867 BLAKE2B 18c958a16855b39e8e800c62976aba0cebb42914a8b67cf3ff09e65dc4a3f505a2a0aa6f5d97a63281300788c2e425248c4319bcc69d3daa691a96a1b0786555 SHA512 bc411daa31e6d7a56a1c762eb785547d0be2f9dfc33dc1311f43e78c9d6337c0786860b52f63c817e61bf137fc71099a4019e6441fca1b469bc4f96a79b0300a
-AUX triplea-1.8.0.9-drop-ant-check.patch 1135 BLAKE2B 664a0e9f8fcf6451af198b2f788c95ffffa3fa82b988ab271c2105172f26077a0c2d99497634dc871e35bd1b5cbcd3d4cbbd606be718f138e7ca298a121b2277 SHA512 98e41c7475792b3069a36c51646f421b62b3e9288cd934586a30d3d9f9e34011c52300b71b2e340fc334d12ce93319aa98a4bda80a67e37ab7be0ec9b213f0eb
-AUX upnplib.patch 999 BLAKE2B 4fd4113eee4b1e695b4bfcada24b57dcf1aa49b346b896926b8ef18d6dc2db8da0720d3c572cb99c6d047cfc0a9256e08ba280096fdb1780fe16492bcbfaf2c9 SHA512 2195e3aec282935bce60017e99e8211bd153165b3359636517fbe518a4630f1e4464beef57015d92e522a399eb9ea79ad75ced36c4b87388905b16705e341283
-DIST triplea_1_8_0_9_source_code_only.zip 378475905 BLAKE2B b9266467d7a919cc4d6e25d30604a21c738761f4b2a31076fd7e2c98c004c5d7b80c98231d388adae619ce29281eec4a9590c6be31fecdbf547d240f81c8951c SHA512 d117bb85d0136d85c76f091cf3b2a398ad1f8755df2cea02867be36d91c6cc98e0fc713a72a93dc74ec91c7b44959afdad5b136591a25a0080f4eabf3c8bff0d
-EBUILD triplea-1.8.0.9-r2.ebuild 2421 BLAKE2B 326f39becbc7c074bff3314f5ecbc264b863cd536b88725e3c41372ecea738937cc7cd159ab66020a03f9186c6348c1f605a43b7ad58e5096dda95d6cdc0a937 SHA512 cd968dd9b72e922ac01167580c06a5a190ab423eabdffd59e4108722c45336e1e073688915ed9fb0b4aa9ed2f359e450f0b23b2d8582a86652d423a1142c3b64
-MISC metadata.xml 331 BLAKE2B 82927a767405d0219fefdfb7d20a5d18af7e2e644392423edd6c2eb9f9801d69551f1c0cbd61db678d3c608f07fa10d87ecb7cc69a12b4149837b18b056bed9b SHA512 526dfa69982c8cb400a7d82e7ebfacdead317d0904d3e9760f6c2c3c509cf440718dafc10f5fd5e2278ca0b5ff6f3675cf440ad3926965d20f52ac674ebff01d
diff --git a/games-strategy/triplea/files/mkdir.sh b/games-strategy/triplea/files/mkdir.sh
deleted file mode 100644
index f1bd04d125c1..000000000000
--- a/games-strategy/triplea/files/mkdir.sh
+++ /dev/null
@@ -1 +0,0 @@
-mkdir -v "${HOME}/.triplea"
diff --git a/games-strategy/triplea/files/paths.patch b/games-strategy/triplea/files/paths.patch
deleted file mode 100644
index f0cd91e3abe6..000000000000
--- a/games-strategy/triplea/files/paths.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur a/src/games/strategy/engine/framework/GameRunner2.java b/src/games/strategy/engine/framework/GameRunner2.java
---- a/src/games/strategy/engine/framework/GameRunner2.java	2015-09-02 20:30:04.000000000 +0100
-+++ b/src/games/strategy/engine/framework/GameRunner2.java	2016-10-11 23:08:50.296813567 +0100
-@@ -952,9 +952,9 @@
-     // the default
-     File rootDir;
-     if (GameRunner.isMac()) {
--      rootDir = new File(new File(userHome, "Documents"), "triplea");
-+      rootDir = new File(new File(userHome, "Documents"), ".triplea");
-     } else {
--      rootDir = new File(userHome, "triplea");
-+      rootDir = new File(userHome, ".triplea");
-     }
-     return rootDir;
-   }
-diff -Naur a/src/games/strategy/engine/lobby/server/userDB/Database.java b/src/games/strategy/engine/lobby/server/userDB/Database.java
---- a/src/games/strategy/engine/lobby/server/userDB/Database.java	2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/engine/lobby/server/userDB/Database.java	2016-10-11 23:08:50.296813567 +0100
-@@ -54,7 +54,7 @@
-     if (System.getProperties().containsKey(ServerLauncher.SERVER_ROOT_DIR_PROPERTY)) {
-       root = new File(System.getProperties().getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY));
-     } else {
--      root = GameRunner2.getRootFolder();
-+      root = GameRunner2.getUserRootFolder();
-     }
-     if (!root.exists()) {
-       throw new IllegalStateException("Root dir does not exist");
-diff -Naur a/src/games/strategy/util/AccessLogFileHandler.java b/src/games/strategy/util/AccessLogFileHandler.java
---- a/src/games/strategy/util/AccessLogFileHandler.java	2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/util/AccessLogFileHandler.java	2016-10-11 23:10:31.219309604 +0100
-@@ -12,7 +12,7 @@
-   private static final String logFile;
- 
-   static {
--    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, "."));
-+    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, games.strategy.engine.framework.GameRunner2.getUserRootFolder().getAbsolutePath()));
-     if (!rootDir.exists()) {
-       throw new IllegalStateException("no dir called:" + rootDir.getAbsolutePath());
-     }
-diff -Naur a/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java b/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java
---- a/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java	2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java	2016-10-11 23:10:40.227175356 +0100
-@@ -13,7 +13,7 @@
-   private static final String logFile;
- 
-   static {
--    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, "."));
-+    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, games.strategy.engine.framework.GameRunner2.getUserRootFolder().getAbsolutePath()));
-     if (!rootDir.exists()) {
-       throw new IllegalStateException("no dir called:" + rootDir.getAbsolutePath());
-     }
-diff -Naur a/src/games/strategy/util/RotatingLogFileHandler.java b/src/games/strategy/util/RotatingLogFileHandler.java
---- a/src/games/strategy/util/RotatingLogFileHandler.java	2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/util/RotatingLogFileHandler.java	2016-10-11 23:10:46.851076636 +0100
-@@ -12,7 +12,7 @@
-   private static final String logFile;
- 
-   static {
--    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, "."));
-+    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, games.strategy.engine.framework.GameRunner2.getUserRootFolder().getAbsolutePath()));
-     if (!rootDir.exists()) {
-       throw new IllegalStateException("no dir called:" + rootDir.getAbsolutePath());
-     }
diff --git a/games-strategy/triplea/files/triplea-1.8.0.9-drop-ant-check.patch b/games-strategy/triplea/files/triplea-1.8.0.9-drop-ant-check.patch
deleted file mode 100644
index 2a41521c4aed..000000000000
--- a/games-strategy/triplea/files/triplea-1.8.0.9-drop-ant-check.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix version check failure with 1.10.9
---- a/build.xml
-+++ b/build.xml
-@@ -110,25 +110,6 @@
- 
- 	<!--checkBuildEnv -->
- 	<target name="checkBuildEnv">
--		<!-- Check ant version first (pre-1.6.5 reports java version it was built 
--			with, not what it's running under, so an ant built with 1.5 would report 
--			that even if it's currently running under < 1.5). 1.6.5 was released in June 
--			2005, so it's fairly unlikely that anyone would be using an older version, 
--			but checking it is still a good idea, and it only takes a tiny fraction of 
--			a second. -->
--		<fail message="Ant version 1.6.5 or greater is required">
--			<condition>
--				<not>
--					<or>
--						<contains string="${ant.version}" substring="1.6.5" />
--						<contains string="${ant.version}" substring="1.7" />
--						<contains string="${ant.version}" substring="1.8" />
--						<contains string="${ant.version}" substring="1.9" />
--					</or>
--				</not>
--			</condition>
--		</fail>
--		<echo message="${ant.version}" />
- 		<!-- we require jdk 1.6 or greater -->
- 		<fail
- 			message="jdk 1.6 or greater required, you are currently using: ${ant.java.version}">
diff --git a/games-strategy/triplea/files/upnplib.patch b/games-strategy/triplea/files/upnplib.patch
deleted file mode 100644
index f17b7891302a..000000000000
--- a/games-strategy/triplea/files/upnplib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur a/src/games/strategy/net/UniversalPlugAndPlayHelper.java b/src/games/strategy/net/UniversalPlugAndPlayHelper.java
---- a/src/games/strategy/net/UniversalPlugAndPlayHelper.java	2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/net/UniversalPlugAndPlayHelper.java	2016-10-11 22:10:37.287834187 +0100
-@@ -166,8 +166,8 @@
-     System.out.println("To " + m_local.getHostAddress() + ":" + internalPort);
-     boolean mapped = false;
-     try {
--      mapped = m_device.addPortMapping("TripleA Game Hosting", "TCP", null, externalPort, m_local.getHostAddress(),
--          internalPort, 0);
-+      mapped = m_device.addPortMapping("TripleA Game Hosting", null, internalPort, externalPort,
-+          m_local.getHostAddress(), 0, "TCP");
-     } catch (final IOException e) {
-       System.out.println("Port Mapping Failed! Please try to Forward Ports manually! \r\n " + e.getMessage());
-       return "Port Mapping Failed! Please try to Forward Ports manually! \r\n " + e.getMessage();
diff --git a/games-strategy/triplea/metadata.xml b/games-strategy/triplea/metadata.xml
deleted file mode 100644
index 65f298ee5bb5..000000000000
--- a/games-strategy/triplea/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">triplea</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/triplea/triplea-1.8.0.9-r2.ebuild b/games-strategy/triplea/triplea-1.8.0.9-r2.ebuild
deleted file mode 100644
index 32eb7c5cbf3c..000000000000
--- a/games-strategy/triplea/triplea-1.8.0.9-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="apple-java-extensions-bin,commons-httpclient-3,oracle-javamail,osgi-core-api,upnplib"
-inherit desktop java-pkg-2 java-ant-2
-
-MY_PV=$(ver_rs 1- _)
-DESCRIPTION="An open source clone of the popular Axis and Allies boardgame"
-HOMEPAGE="http://triplea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/triplea/${PN}_${MY_PV}_source_code_only.zip"
-S="${WORKDIR}"/${PN}_${MY_PV}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # Needs X11 maybe use virtualx.eclass
-
-DEPEND="
-	dev-java/apple-java-extensions-bin:0
-	dev-java/commons-httpclient:3
-	dev-java/oracle-javamail:0
-	dev-java/osgi-core-api:0
-	dev-java/upnplib:0
-"
-RDEPEND="
-	${DEPEND}
-	>=virtual/jre-1.8:*
-"
-DEPEND+=" >=virtual/jdk-1.8:*"
-BDEPEND="
-	app-arch/unzip
-	test? ( dev-java/ant-junit:0 )
-"
-
-PATCHES=(
-	# Use ~/.triplea, not ~/triplea.
-	# Don't write server files under /usr/share or ${PWD}.
-	# Fix to build against our packaged upnplib.
-	"${FILESDIR}"/{paths,upnplib}.patch
-	# Fix build with newer Ant
-	"${FILESDIR}"/${PN}-1.8.0.9-drop-ant-check.patch
-)
-
-src_prepare() {
-	default
-
-	java-pkg-2_src_prepare
-
-	# Remove packaged or unneeded libs. Unfortunately Apache Derby was
-	# last-rited due to packaging issues. See bug #561410.
-	find lib/* ! -name "derby-*.jar" -delete || die
-	rm -r old/ || die
-}
-
-src_compile() {
-	eant
-	echo "triplea.saveGamesInHomeDir=true" > data/triplea.properties || die
-	# The only target creating this is zip which does unjar etc
-	jar cf ${PN}.jar -C classes . || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r assets data dice_servers maps
-
-	java-pkg_dojar ${PN}.jar
-	java-pkg_newjar lib/derby-*.jar derby.jar
-
-	java-pkg_dolauncher ${PN} \
-		--main games.strategy.engine.framework.GameRunner \
-		--java_args "-Xmx256m"
-	java-pkg_dolauncher ${PN}-server -pre "${FILESDIR}"/mkdir.sh \
-		--main games.strategy.engine.lobby.server.LobbyServer \
-		--java_args "-server -Xmx64m -Dtriplea.lobby.port=3303 -Dtriplea.lobby.console=true"
-
-	newicon icons/triplea_icon.png ${PN}.png
-	newicon icons/triplea_icon.png ${PN}-server.png
-	make_desktop_entry ${PN} TripleA
-	make_desktop_entry ${PN}-server TripleA-server
-
-	dodoc changelog.txt TripleA_RuleBook.pdf
-	docinto html
-	dodoc -r doc/* readme.html
-}
diff --git a/games-strategy/ufoai/Manifest b/games-strategy/ufoai/Manifest
index 81d5dc2d56cc..c4d4b6b91a44 100644
--- a/games-strategy/ufoai/Manifest
+++ b/games-strategy/ufoai/Manifest
@@ -2,5 +2,5 @@ AUX ufoai-2.5.0_p20180603-install.patch 1097 BLAKE2B b2c1f2761429dafd2ffad037e5a
 AUX ufoai-2.5.0_p20180603-mxml3.patch 913 BLAKE2B e9d731a506bfd04d1e6fcf323c9acfcf3c895cf26dc8de308dcbc2ea62b67c643f1dcf58f8ff6087919887d0c8107ffac513c49bcd72a811238dea60edaf7dc6 SHA512 4197a7d444d1180362535f69a03bac3ab28473b1349b3c1d5daf2b360d0a7c5c00b07b6996274d08d3a52f9322f709478bd2c077c786e9501b596a6471eec74d
 DIST ufoai-2.5-data.tar 1277143040 BLAKE2B 20795ec6ebc976087f28fd0e912190bd9094494cc1b206bcc8e1956dec148cb7ab96f244db22e4836b91c0ecfae794cd206296e898015453d8ad6625d4e4ab32 SHA512 9a7be359c82cd633db657c8619cb488b5d41b9f93cd10bdeffd5896d8a1ba3bb828b5969acd14c2a69abb3f53f18113af4ca19435aea80ded94d8df68b11deec
 DIST ufoai-code-8b4533e85fdc0665889ff285e1521432084ee784.zip 33194032 BLAKE2B caebfe5ca0eaa6376659d4aa69132c29aa4af870135a769af3541bd919164d79ab9dfe8007a40bb95507a443f6f1d968bb85b1befe8b6999f9033a0d74d7a7fb SHA512 825ca6f8ac76a3a60746ac1be4406445dd18bab80372c21c2ddfcf4d999db8549614df41386e94197013bb7b4b342ac6d9be8c969b5e1be79e8ee25cf45719c6
-EBUILD ufoai-2.5.0_p20180603-r1.ebuild 3006 BLAKE2B 9471f1f3e402b788ea27976d9665f1e159feb360ffb99af3e1d76f35fa4bed822d8476c8f92225739e64a6766df597127af71236f0ce6bda9a7252f0eb407d0f SHA512 1fc7491fea3235f59235761d580661ccd6d424090b8308398813af9c05b7f68aaea35581f6206645f6017d3e36a477983908e9d303a1302c03ea836703ca4d39
+EBUILD ufoai-2.5.0_p20180603-r1.ebuild 3010 BLAKE2B 3d9a041d7af0ca564310e9db827a4dcc9d24a36720e153f1cda5165b6a00bdcf1a58f0f9b40662941b0fadb4c1c897644a950f19017dc77456f66b136e7e3d6d SHA512 9db4c7ca4e37cffa8fa21c915b5d88ea276acd27ccabd1ba113293f8e34a397f3eba7c55482f050dbd78e910fc93b8ec955edcc3b5461647c2be81e6547c870d
 MISC metadata.xml 472 BLAKE2B 4bdf68fa50e31f6df39abec4af2ff8ebb862870ef203c0403ed6b920ab63a40434e8fa66f6fe7335b82e3c509d56ded7f97dca146d44b7c91ab0f0523ab38101 SHA512 2a91f143f6c488bfd81bd0fe5e670f21b9f678b49a06b3ab701e4dadb6455f057c7c66bd3e9b6938572ccc20712ba17c371743b7b3ab65d23434f182cf362dda
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
index dea50098a4cb..cd7b93cf6ac2 100644
--- a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -113,7 +113,7 @@ src_configure() {
 
 	echo ./configure "${config[@]}"
 
-	CC=$(tc-getCC) CXX=$(tc-getCXX) \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
 	  ./configure "${config[@]}" || die "configure failed"
 }