gentoo auto-resync : 10:06:2024 - 00:08:04

8 files changed, 134 insertions, 74 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 51560a91a3ea..7fea0b1c9b94 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/darwinia/Manifest b/games-strategy/darwinia/Manifest
index bcd3f3c578ef..2c85424679a4 100644
--- a/games-strategy/darwinia/Manifest
+++ b/games-strategy/darwinia/Manifest
@@ -1,3 +1,4 @@
-DIST darwinia-full-1.4.0b9.sh 4228121 BLAKE2B f1cae61e3ad6802a1e04fc5306bfbb7194ad08df29a82a376dc7f1945ab8f1f99620653800bb2458941f2004488abf441c211bc3f6d7c65e4d3f47cb9155e5f6 SHA512 ed228943d4e70fc5799bbe7566b4fd862f2494f9d02bcd874f0d1b93d7bbc9a2c24a98fb5b8219fed20759bfe2af54d6ea33c60ddd8d8850e591a89822b41bb5
-EBUILD darwinia-1.4.0_beta9-r3.ebuild 1431 BLAKE2B 15d6291f72f9fd59e097cce0760aa0ee55dfd0cf9eb374c6aea779bb3f512b936aea531d61ceb32af2ad4df47e095b316dcfd48832da92d35a348abd59584ece SHA512 3a2d5f10962f7469c27acec66b6f6d67390646d038caa94b002860bdb09d4943a9b254e8b7de5104e1e4f2b0efdef2a6e8c357aa66d21705bb06f8f16af7b614
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+DIST darwinia_1.43_amd64.tar.gz 33905558 BLAKE2B 5894b8e33210c082d30548e74ba5c8462f30a2a410864c28de063bb66e3b1f09f3fcbd923dbc6cf36cfe7f809cd705deb539803c652d24d1b055c93c2e260ef6 SHA512 3207bec69a77979e8e8b7713cf90cad612f7b67a013de088d07a97356e21ff0a9addfe7cf7febc58f4efb8f1d746a6e495a290ec2684fdf0882f7391d0ad8470
+DIST darwinia_1.43_i386.tar.gz 34529858 BLAKE2B 1ccc3ed376bd9c8800f39ce23371c2ad36d1087c14acb539c5c5adf8f84c3aa6ffc1c9cc4cf22b95eb7385adc0c6e18a1e9864efd37bb1b9421b71dad1ca5b82 SHA512 f191590ce65b95a4449f0543198eda7a215a9e0f9e814aa91912138e7ba839c1ee2f7ab687be478965f1fbdbf7ecc201bd2abb84d4801a16a18df353d77b26c2
+EBUILD darwinia-1.43.ebuild 1148 BLAKE2B c6b05267cf9342163edd2ba9ad2796ec20f762d19de89b977cfaf52f751f8f490e72bca282df3cc0a649f224c53d35e167d888fc9e8ca4df3b0e8dfe911506f1 SHA512 3417ed6163de07120f5fead06bc8c64b64f2203cb515383dbb8ea1d40eced9152e4b75547cab6035c26aea4674b7fd34c219a31e46a30fff832326f2500bb8c6
+MISC metadata.xml 640 BLAKE2B 20f28209b32618aaa39d4aa79cb8f3b42ad6eed131818a3f329e714fb457997d3d4f2702015d1e728c75b019c8769a72f7a11632112c083ecdb45e29821b0dae SHA512 4cf90cf726e3af0996aacf31aef7ff158803d2245232a1afc8cbbd9bc0fe3aa29ddb4c827c514abf245306bf722d6a404a066f09f4d1d0784273e27b4d776372
diff --git a/games-strategy/darwinia/darwinia-1.4.0_beta9-r3.ebuild b/games-strategy/darwinia/darwinia-1.4.0_beta9-r3.ebuild
deleted file mode 100644
index d56766b9c12e..000000000000
--- a/games-strategy/darwinia/darwinia-1.4.0_beta9-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CDROM_OPTIONAL="yes"
-inherit cdrom desktop unpacker wrapper
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="The hyped indie game of the year - by the Uplink creators"
-HOMEPAGE="http://www.darwinia.co.uk/support/linux.html"
-SRC_URI="http://www.introversion.co.uk/darwinia/downloads/${PN}-full-${MY_PV}.sh"
-S="${WORKDIR}"
-
-LICENSE="Introversion"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	media-libs/libsdl[abi_x86_32(-)]
-	media-libs/libvorbis[abi_x86_32(-)]
-	sys-libs/glibc
-	sys-libs/libstdc++-v3:5
-	virtual/glu[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-"
-
-dir=/opt/${PN}
-QA_PREBUILT="${dir#1}/lib/darwinia.bin.x86"
-
-src_unpack() {
-	use cdinstall && cdrom_get_cds gamefiles/main.dat
-	unpack_makeself
-}
-
-src_install() {
-	insinto "${dir}"/lib
-	exeinto "${dir}"/lib
-
-	doins lib/{language,patch}.dat
-	doexe lib/darwinia.bin.x86 lib/open-www.sh
-
-	exeinto "${dir}"
-	doexe bin/Linux/x86/darwinia
-
-	if use cdinstall ; then
-		doins "${CDROM_ROOT}"/gamefiles/{main,sounds}.dat
-	fi
-
-	dodoc README
-	newicon darwinian.png darwinia.png
-
-	make_wrapper darwinia ./darwinia "${dir}" "${dir}"
-	make_desktop_entry darwinia "Darwinia"
-}
-
-pkg_postinst() {
-	if ! use cdinstall; then
-		ewarn "To play the game, you need to copy main.dat and sounds.dat"
-		ewarn "from gamefiles/ on the game CD to ${dir}/lib/."
-	fi
-}
diff --git a/games-strategy/darwinia/darwinia-1.43.ebuild b/games-strategy/darwinia/darwinia-1.43.ebuild
new file mode 100644
index 000000000000..166b98102578
--- /dev/null
+++ b/games-strategy/darwinia/darwinia-1.43.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+MY_P="${P/-/_}"
+
+DESCRIPTION="A digital dreamscape simulation game"
+HOMEPAGE="https://www.introversion.co.uk/introversion/"
+SRC_URI="
+	amd64? ( ${MY_P}_amd64.tar.gz )
+	x86? ( ${MY_P}_i386.tar.gz )
+"
+S="${WORKDIR}/${PN}"
+LICENSE="Introversion"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch mirror strip"
+
+RDEPEND="
+	media-libs/libglvnd[X]
+	media-libs/libogg
+	media-libs/libsdl[opengl,sound,video]
+	media-libs/libvorbis
+	virtual/glu
+"
+
+QA_PREBUILT="opt/${PN}/${PN}"
+
+pkg_nofetch() {
+		einfo "This was only available from The Humble Introversion Bundle in 2011."
+		einfo "If you bought that, then download ${A} and move"
+		einfo "it to your distfiles directory."
+}
+
+src_unpack() {
+	default
+
+	if use x86; then
+		mv ${PN^} ${PN} || die
+	fi
+}
+
+src_install() {
+	exeinto /opt/${PN}
+	newexe ${PN}.bin.x86$(usex amd64 '_64' '') ${PN}
+	dosym ../../opt/${PN}/${PN} /usr/bin/${PN}
+
+	insinto /opt/${PN}
+	doins *.dat
+
+	doicon darwinian.png
+	make_desktop_entry ${PN} ${PN^} darwinian
+
+	dodoc {changes,readme-linux}.txt
+}
diff --git a/games-strategy/darwinia/metadata.xml b/games-strategy/darwinia/metadata.xml
index 1c3ba213c494..2f4cdf1acaa2 100644
--- a/games-strategy/darwinia/metadata.xml
+++ b/games-strategy/darwinia/metadata.xml
@@ -1,8 +1,15 @@
 <?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>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		The world of Darwinia is a virtual themepark, running entirely inside a computer network
+		and populated by a sentient evolving life form called the Darwinians.
+
+		Unfortunately Darwinia has been overrun by a computer virus which has multiplied out of control.
+		Your task is to destroy the Viral Infection and save the Darwinians from extinction.
+	</longdescription>
 </pkgmetadata>
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 0155e044e805..8f27c96aac11 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,5 +1,6 @@
 AUX s25rttr-0.9.0_pre20200723-cmake_lua_version.patch 296 BLAKE2B cabdc87d6184e59f0896762f3d3434a137fed4fd1c2dae84d30dbee5d4903e68ba01c30b92d0d5290dec9b371807c317b462213a421cadd172b78b08407f66aa SHA512 074ac3e70fec0da6bd4a9602052989a8b6c26b5cfef669d6330d9177547bbeeeef2a4e6b9d83a9e9cbdf4ec33df7dcce50a862e3c9e533049ad8452df6073816
+AUX s25rttr-0.9.5-boost.patch 2155 BLAKE2B 75dd2cfb5cb4775c76033996fada2f7577f228855eca4469a3360941f337b6b05bccd65cb734e9ec02be4b7c84839570edab1480cfdb455eef5165edb4adb804 SHA512 baab52badfd10f3ff106c1303382ba320eb2ed655cdf564b8c1b1e1a21e5502258e3b770b855d4acd18e56b609e495b2e9ce1793743fd6a42d5bc69c81806091
 AUX s25rttr-0.9.5-gcc-13.patch 1527 BLAKE2B 23399f2a2d0e350d990a122195a2fbb6ece1f010ad31c7da24c3b7a4356f7cadf793149e40748c98d958ef5a3d0e401e8caeacc4b8872f66e148688e8caca9c5 SHA512 6208a550524d3a3364718a5aaa7b69205c48903394635f03339173920c2481ecd014b4f5e847ba5390a060100c848f7ebd48bd038ea99f9e17a9b72508f10799
 DIST s25client_src_v0.9.5.tar.gz 30305585 BLAKE2B 77857743b5a1693ed373cb048c40fed150a4bf3d59f1314ffbb268f3e03ba8db2f44c20962c390f3a8c5b5b443ee0465d5c7bf726998ddf0334a861304211db8 SHA512 4926653075c7ba01e1e4ca516c52ad1694b46557c40c418e2a1f18d0a8fac9d4b73c20adc5403365ad6ba643823ed23dff5296717b3e057c42b17f1c20feb802
-EBUILD s25rttr-0.9.5.ebuild 2675 BLAKE2B 962e67d0e88034b1968ced39f23c681f319439c9eb45470858766698c7653f7c6d9980dfd8e8b0448ddaab7a6528cfb1768beb901cdf0ff6ed7cfff2a661de15 SHA512 1309ccf2030e98b9bc8cc49ec895d2e7195c3cbdabb719615ed54a3206c29ac08130b83fbe00876f1a4deb371c52a3f16b91b8ff4bacdb4ec9f35c0417de1fda
+EBUILD s25rttr-0.9.5.ebuild 2713 BLAKE2B e96d000ae6b5a43233d71c4c667d80a6718fa86be07188876893b8b3198752d5c7ed1229e09dc99191402bfa4d4a671cfff9b43f84ca11e031dafce5fffc0d22 SHA512 594a0978fcf94c571e11dc8413a706d99b105cc40feddcc6683d20895d2ccdb577ccb190ddcda194a20de4956290ac3526bea3accaaff8cff2d15e44671734d4
 MISC metadata.xml 348 BLAKE2B bc23c51bcd3458b4f39a6b42dd73f35060319cdae4563a4288ef2ae9dc9e2a85e8bc4b357dff37d70f20abf5d79a4a5c20fb1a8c2ab4c994dd3290ea18d49c34 SHA512 c145a48fb294eb11195885f0cd97095c7258d3286bf1cd926b5d40682aea1767c52a5a163283345fe12416659a9c7500de58993379b0ba3c743f18e172696c6f
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.5-boost.patch b/games-strategy/s25rttr/files/s25rttr-0.9.5-boost.patch
new file mode 100644
index 000000000000..ace37abf9627
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.5-boost.patch
@@ -0,0 +1,56 @@
+From d1c6739e93a788b7ea9da7915642b2c8d6ab0656 Mon Sep 17 00:00:00 2001
+From: Alexander Grund <alexander.grund@tu-dresden.de>
+Date: Fri, 3 Feb 2023 16:30:09 +0100
+Subject: [PATCH] Fix compatibility with Boost 1.74+
+
+This has turned into an error in Boost 1.81
+Fixes #1551
+---
+ libs/s25main/network/GameClient.cpp | 8 +++++++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/libs/s25main/network/GameClient.cpp b/libs/s25main/network/GameClient.cpp
+index 84e351c08..0989d5877 100644
+--- a/libs/s25main/network/GameClient.cpp
++++ b/libs/s25main/network/GameClient.cpp
+@@ -119,7 +119,13 @@ bool GameClient::HostGame(const CreateServerInfo& csi, const boost::filesystem::
+     if(playedMapPath != map_path)
+     {
+         boost::system::error_code ignoredEc;
+-        copy_file(map_path, playedMapPath, boost::filesystem::copy_option::overwrite_if_exists, ignoredEc);
++        constexpr auto overwrite_existing =
++#if BOOST_VERSION >= 107400
++          boost::filesystem::copy_options::overwrite_existing;
++#else
++          boost::filesystem::copy_option::overwrite_if_exists;
++#endif
++        copy_file(map_path, playedMapPath, overwrite_existing, ignoredEc);
+     }
+     return GAMESERVER.Start(csi, map_path, map_type, hostPw)
+            && Connect("localhost", hostPw, csi.type, csi.port, true, csi.ipv6);
+
+From 96978da4aba9280217a5b36731c303c35819220b Mon Sep 17 00:00:00 2001
+From: Alexander Grund <Flamefire@users.noreply.github.com>
+Date: Thu, 23 May 2024 19:35:14 +0200
+Subject: [PATCH] Fix Boost.Filesystem include
+
+The directory iterator seems to have move to a different include.
+Just include all of it.
+---
+ callbacks.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/external/s25edit/callbacks.cpp b/external/s25edit/callbacks.cpp
+index 52ec86d..095c1d6 100644
+--- a/external/s25edit/callbacks.cpp
++++ b/external/s25edit/callbacks.cpp
+@@ -18,8 +18,7 @@
+ #include "CSurface.h"
+ #include "globals.h"
+ #include "helpers/format.hpp"
+-#include <boost/filesystem/operations.hpp>
+-#include <boost/filesystem/path.hpp>
++#include <boost/filesystem.hpp>
+ #include <algorithm>
+ 
+ namespace bfs = boost::filesystem;
diff --git a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild b/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
index 4986896fd623..1184da066c3a 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.5.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
@@ -11,6 +11,7 @@ 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"
+S="${WORKDIR}/${MY_PN}_v${PV}"
 LICENSE="GPL-2+ GPL-3 Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
@@ -42,10 +43,9 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
 	"${FILESDIR}"/${PN}-0.9.5-gcc-13.patch
+	"${FILESDIR}"/${PN}-0.9.5-boost.patch
 )
 
-S="${WORKDIR}/${MY_PN}_v${PV}"
-
 # Build type is checked but blank is valid.
 CMAKE_BUILD_TYPE=