gentoo auto-resync : 07:05:2024 - 00:00:56

3 files changed, 22 insertions, 148 deletions

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 9adcccaadb50..056197ad9ed3 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,7 +1,6 @@
 AUX freeorion-0.5-ccache.patch 532 BLAKE2B 81decfa1898b2a3617d75a28ac27f337a9c70d6bbfa8c0b9bf32500804a42884d2c638e6969521041291eb47f006caed00703622d0a586b351da9a09e62ab56b SHA512 2fd42e72867a9dfd7e4d4daa5c7767c68a5fed70f9fe5333145fe0606f102ed89045d6e6d9c7e2976e7264545ff8c94d7f2ca20374520c752f721a0bacd9f4dc
-DIST FreeOrion_v0.4.10.2_2021-08-01.f663dad_Source.tar.gz 124836633 BLAKE2B 42224b84a7aef99e998cb025b5095365a65670a3a0a543ef323f444f1904557713dc995de6f7ccaf9a45e34f62b4c65d4977caa0f6ac7605a9978268bdef0ba1 SHA512 a0f327f5fec82cf15495828f60b59b59834efaa041919fe9f68e4428e89b729503b7e666214ea39e5c9afdfbb9efd343c5cbcb8dfc982d6f56b3a06fd898f428
+DIST FreeOrion_v0.5.0.1_Source.tar.gz 152861158 BLAKE2B 6924d4916fcd3ac93e7498b5247957a6fb62b8523aa49114e9e11ef5e3b89374966551bc14192fa7928951728ce814fb86d89365beb97aa7c2bc84408bfcadd2 SHA512 dc267231329f0615f12887f22139d57a2611f378e17e8b0f26c00efdb77e73ef737ff875350f805d34a07ca4ce0595758e4f61168878477ebbd92d0149bcdc22
 DIST FreeOrion_v0.5_Source.tar.gz 152861207 BLAKE2B 5263f9c2461db35b5283122889d0779f175af095e90eb782d21b6870193669b0307c2df95ebde78b3f762d2d0e1e1d8ec5f537bd44bf6810b9fbf76c58322172 SHA512 ec1247584d317ca0d0394d62754fd35b1d1212323e96e644c9efae422437daf63aac12c2798274993c9c29887fe73a51bfe11e9b53370dc261a0683efe312f19
-EBUILD freeorion-0.4.10.2-r1.ebuild 2895 BLAKE2B 849e43937132ee9608f0900320b5dcbf174cd75c38e88345065a16f19ca577e1861e1b71ebc011e5585f71daef2d05852d61a9c2242e9a0fe2fe8b0c6380fb0d SHA512 e2b6af475b1070b553450af6dd85059d2e69625c92d1ed1f4fc4125e0ec5deec9f322cf2e9e9704064f96a3d54c212c9e63b2c20a2f8ecd6d87f26d8d5a3de60
+EBUILD freeorion-0.5.0.1.ebuild 2780 BLAKE2B 1c87cd78d7c23c77532c15c3d6d490b21aeb5302617ce72e5854090413919eac2113b44f56a67a1ebd7f7877cd58897ad587a7048fdfcec9a832171ba483c4d5 SHA512 762b6a6d168e63dd59575c7c2f156c745bacf53f24ca4ebed013a7209b275ed76a4a3f58d91dbf1c463725d56397ab2f1155615b5c3f0ab2821710c8e43921c1
 EBUILD freeorion-0.5.ebuild 2830 BLAKE2B e8d6e5aaff4bdd23f55b18d2d805c7c312d00320b34f1cac30830cbf01a924dd5685fddb79afbd91fcaec943cca2e0663dd167b409bb8c66a26f2d840538b3fe SHA512 9e9b14526affa169ec74cbcf63abe4e5c624f3ad27f9b2e0902d936c3f7392876e04cdfb3ae6c22ff65228ce4bdec465c86b3204e8ae773a539dded8b0d73dd2
-EBUILD freeorion-9999.ebuild 2830 BLAKE2B e8d6e5aaff4bdd23f55b18d2d805c7c312d00320b34f1cac30830cbf01a924dd5685fddb79afbd91fcaec943cca2e0663dd167b409bb8c66a26f2d840538b3fe SHA512 9e9b14526affa169ec74cbcf63abe4e5c624f3ad27f9b2e0902d936c3f7392876e04cdfb3ae6c22ff65228ce4bdec465c86b3204e8ae773a539dded8b0d73dd2
 MISC metadata.xml 757 BLAKE2B 64e1e5a856369650c9d41b75f7af091c5fde43ab2992911cc81d5e4ba12d13fea5e4e82ae960e75208979aea38eeeb07d4bfebdb1eb45c035796ed854090cbe6 SHA512 5e631e52b5dbabbb6ce1cde6e416c4ed228dbf4a1ddda7899e5565c9abd5b7080894866aef375ff66cef3facd06faadcaea2ccefd8fb34d6bb461bfd32879d6e
diff --git a/games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild
deleted file mode 100644
index 0d5f61e91177..000000000000
--- a/games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit check-reqs cmake multiprocessing python-single-r1 xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
-else
-	FREEORION_BUILD_ID="2021-08-01.f663dad"
-	SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_${FREEORION_BUILD_ID}_Source.tar.gz"
-	S="${WORKDIR}/src-tarball"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Free turn-based space empire and galactic conquest game"
-HOMEPAGE="https://www.freeorion.org/"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0 LGPL-2.1+"
-SLOT="0"
-IUSE="dedicated doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-libs/boost:=[${PYTHON_USEDEP},nls,python]')
-	sys-libs/zlib:=
-	!dedicated? (
-		media-libs/freetype
-		media-libs/glew:=
-		media-libs/libglvnd[X]
-		media-libs/libogg
-		media-libs/libpng:=
-		media-libs/libsdl2[opengl,video]
-		media-libs/libvorbis
-		media-libs/openal
-	)"
-RDEPEND="
-	${DEPEND}
-	!dedicated? (
-		media-fonts/dejavu
-		media-fonts/roboto
-	)"
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-	)"
-
-freeorion_check-reqs() {
-	# cc1plus processes may suddenly use ~1.5GB all at once early on (2+GB
-	# if debug symbols) then far less for the rest, check minimal jobs*1.5
-	local CHECKREQS_MEMORY=$(($(makeopts_jobs)*1500))M
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	freeorion_check-reqs
-}
-
-pkg_setup() {
-	freeorion_check-reqs
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i 's/-O3//' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HEADLESS=$(usex dedicated)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all $(usev doc)
-}
-
-src_test() {
-	# freeoriond randomly(?) segfaults on exit, cause unknown but
-	# seems fixed by some refactoring in -9999 (excluding for now)
-	cmake_src_test -E 'SmokeTest(Game|Hostless)'
-
-	local EPYTEST_DESELECT=(
-		# broken with 3.11 but is not known to cause issues, just skip for now
-		default/python/tests/AI/test_savegame_manager.py::test_setstate_call
-	)
-
-	epytest -o cache_dir="${T}"/pytest_cache default/python/tests
-}
-
-src_install() {
-	local DOCS=( ChangeLog.md README.md )
-	cmake_src_install
-
-	use doc && dodoc -r "${BUILD_DIR}"/doc/cpp-apidoc/html
-
-	if use dedicated; then
-		rm -r "${ED}"/usr/share/freeorion/default/data/fonts || die
-	else
-		local font
-		for font in roboto/Roboto-{Bold,Regular}.ttf dejavu/DejaVuSans{-Bold,}.ttf; do
-			dosym -r /usr/share/{fonts/${font%/*},${PN}/default/data/fonts}/${font##*/}
-		done
-		rm "${ED}"/usr/share/${PN}/default/data/fonts/LICENSE.{Roboto,DejaVu} || die
-	fi
-}
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-0.5.0.1.ebuild
index 7bf2bf981654..29b1188c6e9f 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-0.5.0.1.ebuild
@@ -3,23 +3,17 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
-inherit check-reqs cmake multiprocessing python-single-r1 xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
-else
-	SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_Source.tar.gz"
-	S="${WORKDIR}/src-tarball"
-	KEYWORDS="~amd64"
-fi
+PYTHON_COMPAT=( python3_{10..12} )
+inherit check-reqs cmake flag-o-matic multiprocessing python-single-r1 xdg
 
 DESCRIPTION="Free turn-based space empire and galactic conquest game"
 HOMEPAGE="https://www.freeorion.org/"
+SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_Source.tar.gz"
+S=${WORKDIR}/src-tarball
 
 LICENSE="GPL-2+ CC-BY-SA-3.0 LGPL-2.1+"
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="+client doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -30,33 +24,30 @@ DEPEND="
 	sys-libs/zlib:=
 	client? (
 		media-libs/freetype
-		media-libs/glew:=
+		media-libs/glew:0=
 		media-libs/libglvnd
 		media-libs/libogg
 		media-libs/libpng:=
 		media-libs/libsdl2[opengl,video]
 		media-libs/libvorbis
 		media-libs/openal
-	)"
+	)
+"
 RDEPEND="
 	${DEPEND}
 	client? (
 		media-fonts/dejavu
 		media-fonts/roboto
-	)"
+	)
+"
 BDEPEND="
 	${PYTHON_DEPS}
 	doc? (
 		app-text/doxygen
 		media-gfx/graphviz
 	)
-	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/freeorion-0.5-ccache.patch"
-)
+	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
+"
 
 freeorion_check-reqs() {
 	# cc1plus processes may suddenly use ~1.5GB all at once early on (2+GB
@@ -78,12 +69,17 @@ src_prepare() {
 	cmake_src_prepare
 
 	sed -i 's/-O3//' CMakeLists.txt || die
+
+	cmake_comment_add_subdirectory check #904124
 }
 
 src_configure() {
+	filter-lto # -Werror=odr issues
+
 	local mycmakeargs=(
+		-DCCACHE_PROGRAM=no
 		-DBUILD_CLIENT_GG=$(usex client)
-		-DBUILD_CLIENT_GODOT=no # TODO, perhaps with system godot (experimental)
+		-DBUILD_CLIENT_GODOT=no # TODO? perhaps with system godot (experimental)
 		-DBUILD_TESTING=$(usex test)
 	)
 
@@ -116,8 +112,8 @@ src_install() {
 		for font in roboto/Roboto-{Bold,Regular}.ttf dejavu/DejaVuSans{-Bold,}.ttf; do
 			dosym -r /usr/share/{fonts/${font%/*},${PN}/default/data/fonts}/${font##*/}
 		done
-		rm "${ED}"/usr/share/${PN}/default/data/fonts/LICENSE.{Roboto,DejaVu} || die
+		rm -- "${ED}"/usr/share/${PN}/default/data/fonts/LICENSE.{Roboto,DejaVu} || die
 	else
-		rm -r "${ED}"/usr/share/freeorion/default/data/fonts || die
+		rm -r -- "${ED}"/usr/share/freeorion/default/data/fonts || die
 	fi
 }