gentoo auto-resync : 10:04:2023 - 11:36:36

6 files changed, 161 insertions, 11 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 4c998203cb39..98e38c7d6eb0 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 93eb8ff581c6..8f67944e0ff7 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,4 +1,7 @@
+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_Source.tar.gz 152861207 BLAKE2B 5263f9c2461db35b5283122889d0779f175af095e90eb782d21b6870193669b0307c2df95ebde78b3f762d2d0e1e1d8ec5f537bd44bf6810b9fbf76c58322172 SHA512 ec1247584d317ca0d0394d62754fd35b1d1212323e96e644c9efae422437daf63aac12c2798274993c9c29887fe73a51bfe11e9b53370dc261a0683efe312f19
 EBUILD freeorion-0.4.10.2-r1.ebuild 2894 BLAKE2B fbc890f27ae6c69c37eb9e2e087eec4c87fd56ca3f015fe23f146f70c18fe308e90a13865625cb023b5440cf907abee28023dd5aa1e6811fb13582e21bef26d6 SHA512 3c19e53a11177ef18422386871534f9704cf6414ec144bb1eba40adb19df905d766184494ee8a5966685de2561df653ea68eca654ed3a4c66d73f5f1a0551304
-EBUILD freeorion-9999.ebuild 2836 BLAKE2B 34d664a50c8c9c5bdcce713b5d3d256fa33be5940563c967ca06763b77ffaae6aaebe4d160c1ea64fe7d78fae85b750ef787ff66aed55804abff59965b5914d1 SHA512 339553ea2bd89e51285bdc2da3e0c6857efd1e7181271d0e06e1a88ed3a46b3cce2ec36867a3725090d0c63e925fb5bacd9ad6d1f57e3e5853dea8f9a7226ab3
-MISC metadata.xml 691 BLAKE2B 4d245a9b603a00089a035b74f2c762a31ea43088b49f6ebc353dcdb2475acd6d6ce6517ef82d424bd543178a63f6b7e759a2d58cc75ac687171c2db7b458d5a3 SHA512 6364e00b608f0170fad58b28879a2c93c924f283301dd57616b2b97f9979bd4103279665917eb9439f4b798698ec29684ed583a1d0db509d942f9485c2e00e37
+EBUILD freeorion-0.5.ebuild 2829 BLAKE2B e4cb5113325f7509f45edb721007e92d06dd5478922a5c4686df909b1b6db4c823f4cc25083b8449a6a7da8937b741a59a149682a3f409d205d79161d2d802ea SHA512 eaca865a1e7e96baa9a99c852a474d6321d95d15c22db68e362cdc9e8fcbe6551191a802f51c8e63b63c2c63964851636ed7fa1a69852d13390e660d212dffab
+EBUILD freeorion-9999.ebuild 2829 BLAKE2B e4cb5113325f7509f45edb721007e92d06dd5478922a5c4686df909b1b6db4c823f4cc25083b8449a6a7da8937b741a59a149682a3f409d205d79161d2d802ea SHA512 eaca865a1e7e96baa9a99c852a474d6321d95d15c22db68e362cdc9e8fcbe6551191a802f51c8e63b63c2c63964851636ed7fa1a69852d13390e660d212dffab
+MISC metadata.xml 757 BLAKE2B 64e1e5a856369650c9d41b75f7af091c5fde43ab2992911cc81d5e4ba12d13fea5e4e82ae960e75208979aea38eeeb07d4bfebdb1eb45c035796ed854090cbe6 SHA512 5e631e52b5dbabbb6ce1cde6e416c4ed228dbf4a1ddda7899e5565c9abd5b7080894866aef375ff66cef3facd06faadcaea2ccefd8fb34d6bb461bfd32879d6e
diff --git a/games-strategy/freeorion/files/freeorion-0.5-ccache.patch b/games-strategy/freeorion/files/freeorion-0.5-ccache.patch
new file mode 100644
index 000000000000..dc289fa84ec9
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion-0.5-ccache.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,7 +30,6 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
+ message(STATUS "Build type CMAKE_BUILD_TYPE set to ${CMAKE_BUILD_TYPE}")
+ 
+ include(UseCompilerCache)
+-find_compiler_cache(PROGRAM ccache)
+ 
+ list(APPEND GODOT_CPP_CMAKE_VARS "CMAKE_BUILD_TYPE;CMAKE_CONFIGURATION_TYPES;CMAKE_TOOLCHAIN_FILE;PYTHON_EXECUTABLE")
+ get_cmake_property(vars CACHE_VARIABLES)
+@@ -50,7 +49,6 @@ endforeach()
+ 
+ project(FreeOrion)
+ 
+-use_compiler_cache_with_xcode()
+ 
+ include(GNUInstallDirs)
+ include(UseCodeCoverage)
diff --git a/games-strategy/freeorion/freeorion-0.5.ebuild b/games-strategy/freeorion/freeorion-0.5.ebuild
new file mode 100644
index 000000000000..4850c266029c
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 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
+	SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_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="+client 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:=
+	client? (
+		media-libs/freetype
+		media-libs/glew:=
+		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-doc/doxygen
+		media-gfx/graphviz
+	)
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/freeorion-0.5-ccache.patch"
+)
+
+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_CLIENT_GG=$(usex client)
+		-DBUILD_CLIENT_GODOT=no # TODO, perhaps with system godot (experimental)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+	cmake_src_test -j1 # avoid running 2 conflicting servers
+
+	local EPYTEST_DESELECT=(
+		# broken with 3.11 but is not known to cause issues, just skip for now
+		tests/AI/save_game_codec/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 client; then
+		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
+	else
+		rm -r "${ED}"/usr/share/freeorion/default/data/fonts || die
+	fi
+}
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 7445d5c039df..4850c266029c 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -10,8 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
 else
-	FREEORION_BUILD_ID=""
-	SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_${FREEORION_BUILD_ID}_Source.tar.gz"
+	SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_Source.tar.gz"
 	S="${WORKDIR}/src-tarball"
 	KEYWORDS="~amd64"
 fi
@@ -21,7 +20,7 @@ HOMEPAGE="https://www.freeorion.org/"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0 LGPL-2.1+"
 SLOT="0"
-IUSE="dedicated doc test"
+IUSE="+client doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -29,7 +28,7 @@ DEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep 'dev-libs/boost:=[${PYTHON_USEDEP},nls,python]')
 	sys-libs/zlib:=
-	!dedicated? (
+	client? (
 		media-libs/freetype
 		media-libs/glew:=
 		media-libs/libglvnd
@@ -41,7 +40,7 @@ DEPEND="
 	)"
 RDEPEND="
 	${DEPEND}
-	!dedicated? (
+	client? (
 		media-fonts/dejavu
 		media-fonts/roboto
 	)"
@@ -55,6 +54,10 @@ BDEPEND="
 		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
 	)"
 
+PATCHES=(
+	"${FILESDIR}/freeorion-0.5-ccache.patch"
+)
+
 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
@@ -79,7 +82,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_CLIENT_GG=$(usex !dedicated)
+		-DBUILD_CLIENT_GG=$(usex client)
 		-DBUILD_CLIENT_GODOT=no # TODO, perhaps with system godot (experimental)
 		-DBUILD_TESTING=$(usex test)
 	)
@@ -108,13 +111,13 @@ 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
+	if use client; then
 		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
+	else
+		rm -r "${ED}"/usr/share/freeorion/default/data/fonts || die
 	fi
 }
diff --git a/games-strategy/freeorion/metadata.xml b/games-strategy/freeorion/metadata.xml
index 07e33aa89255..13a031dcf42b 100644
--- a/games-strategy/freeorion/metadata.xml
+++ b/games-strategy/freeorion/metadata.xml
@@ -12,6 +12,9 @@
   Master of Orion games, but is not a clone or remake of that series
   or any other game.
   </longdescription>
+  <use>
+    <flag name="client">Build game client</flag>
+  </use>
   <upstream>
     <remote-id type="github">freeorion/freeorion</remote-id>
   </upstream>