gentoo auto-resync : 11:08:2022 - 14:19:56

5 files changed, 0 insertions, 204 deletions

diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 051e588e34f0..e7c389bbe278 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,9 +1,4 @@
-AUX s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch 548 BLAKE2B 0cd4b3cf3fb5b016c3ca01e21ff245042237efb47aa08e8f57fb0b861c7c325b97d0c699de39f2218343f7de3bb7cfc9eee4610a9d4c1d5c8430c77d35a7c649 SHA512 220642d300abd18efb2f69c7b41825341d0985f6d493f03311b557f0e5a81db5284bf4c0868ad8bb09edfa84100cb59309bea1baba94e0abf6b0d4b553336215
 AUX s25rttr-0.9.0_pre20200723-cmake_lua_version.patch 296 BLAKE2B cabdc87d6184e59f0896762f3d3434a137fed4fd1c2dae84d30dbee5d4903e68ba01c30b92d0d5290dec9b371807c317b462213a421cadd172b78b08407f66aa SHA512 074ac3e70fec0da6bd4a9602052989a8b6c26b5cfef669d6330d9177547bbeeeef2a4e6b9d83a9e9cbdf4ec33df7dcce50a862e3c9e533049ad8452df6073816
-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 2643 BLAKE2B 9f0353e995f6d3399081eef6aced76dd16cba52cfe7dd14cdaff1add6abd91720ec884daa4f04a0f3b20c8f94ca8752e01aaca2f4994f3f4c24b77a4ae39aa75 SHA512 c4667ed0d1e2a1f8c08914569d235ca8d971411de864db98bd235005f811dd4df90920d2b90a1f1de4ed7cf925c609c2fa856a911d3e8cea3ae7844d40b2c33f
 MISC metadata.xml 348 BLAKE2B bc23c51bcd3458b4f39a6b42dd73f35060319cdae4563a4288ef2ae9dc9e2a85e8bc4b357dff37d70f20abf5d79a4a5c20fb1a8c2ab4c994dd3290ea18d49c34 SHA512 c145a48fb294eb11195885f0cd97095c7258d3286bf1cd926b5d40682aea1767c52a5a163283345fe12416659a9c7500de58993379b0ba3c743f18e172696c6f
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch
deleted file mode 100644
index 9a69797ea27a..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/Return-To-The-Roots/s25client/pull/1431
-
-From: Sam James <sam@gentoo.org>
-Date: Thu, 19 Aug 2021 02:41:42 +0100
-Subject: [PATCH] Fix build with Boost 1.77 (missing <algorithm> include)
-
-Closes: https://bugs.gentoo.org/808767
---- a/libs/s25main/convertSounds.cpp
-+++ b/libs/s25main/convertSounds.cpp
-@@ -20,6 +20,7 @@
- #include <libsiedler2/ArchivItem_Sound_Wave.h>
- #include <libsiedler2/loadMapping.h>
- #include <s25util/StringConversion.h>
-+#include <algorithm>
- #include <cmath>
- #include <samplerate.hpp>
- #include <sstream>
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.1-cxx-std.patch b/games-strategy/s25rttr/files/s25rttr-0.9.1-cxx-std.patch
deleted file mode 100644
index cb5ecdf28220..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.9.1-cxx-std.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5db419d044149ab3760c1588b44536febab5d657 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 11 Sep 2021 08:41:57 +0100
-Subject: [PATCH] Set C++ standard (to C++14) using CMake
-
-Not adding the -std flag broke builds with GCC 11 until the code was
-fixed up recently. This should prevent this sort of thing from
-happening in future. It also ensures that the compiler is actually new
-enough.
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8ab991c97..b55c545a2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -22,6 +22,9 @@ if(DEFINED CMAKE_TOOLCHAIN_FILE)
-     message(STATUS "Used Toolchain definition file '${CMAKE_TOOLCHAIN_FILE}'")
- endif()
- 
-+set(CMAKE_CXX_STANDARD 14)
-+set(CXX_STANDARD_REQUIRED ON)
-+
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" "${CMAKE_SOURCE_DIR}/external/libutil/cmake")
- if(CMAKE_VERSION VERSION_LESS 3.14)
-     list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/external/libutil/cmake/cmake_3.14")
--- 
-2.32.0
-
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.1-libsamplerate.patch b/games-strategy/s25rttr/files/s25rttr-0.9.1-libsamplerate.patch
deleted file mode 100644
index 41d6d90e5fd8..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.9.1-libsamplerate.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 16cb06c99f78a21b1be2bc681c1f1d85a6caddca Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 10 Sep 2021 22:59:51 +0100
-Subject: [PATCH] Fix bad channel count handling with libsamplerate 0.2.0
-
-Since libsndfile/libsamplerate@26d92c369394bcd0b0cea488890edce1a0d757d5,
-initialising libsamplerate with 0 channels or less causes a SIGABRT. We
-therefore need to handle this in the C++ wrapper classes.
----
- libs/libsamplerate/include/samplerate.hpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libs/libsamplerate/include/samplerate.hpp b/libs/libsamplerate/include/samplerate.hpp
-index d0af34317..23e243d91 100644
---- a/libs/libsamplerate/include/samplerate.hpp
-+++ b/libs/libsamplerate/include/samplerate.hpp
-@@ -152,6 +152,8 @@ class State : public detail::StateBase
- {
-     static SRC_STATE* createOrThrow(Converter converter, int channels)
-     {
-+        if (channels <= 0)
-+            throw std::runtime_error("Channel count must be >= 1.");
-         int error;
-         auto* state = src_new(static_cast<int>(converter), channels, &error);
-         if(!state)
-@@ -174,6 +176,8 @@ class StateCallback : public detail::StateBase
- {
-     static SRC_STATE* createOrThrow(Converter converter, int channels, src_callback_t func, void* data)
-     {
-+        if (channels <= 0)
-+            throw std::runtime_error("Channel count must be >= 1.");
-         int error;
-         auto* state = src_callback_new(func, static_cast<int>(converter), channels, &error, data);
-         if(!state)
--- 
-2.32.0
-
diff --git a/games-strategy/s25rttr/s25rttr-0.9.1.ebuild b/games-strategy/s25rttr/s25rttr-0.9.1.ebuild
deleted file mode 100644
index 1cf08d68bd4e..000000000000
--- a/games-strategy/s25rttr/s25rttr-0.9.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 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-boost-1.77-missing-include.patch
-	"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
-	"${FILESDIR}"/${PN}-0.9.1-libsamplerate.patch
-	"${FILESDIR}"/${PN}-0.9.1-cxx-std.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
-}