gentoo auto-resync : 25:07:2022 - 08:55:56

4 files changed, 198 insertions, 41 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index a6b39f3dbbc6..fc7905f31def 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 1facfb6dbddf..82e73d475d11 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,5 +1,7 @@
 AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
+DIST FreeOrion_v0.4.10.2_2021-08-01.f663dad_Source.tar.gz 124836633 BLAKE2B 42224b84a7aef99e998cb025b5095365a65670a3a0a543ef323f444f1904557713dc995de6f7ccaf9a45e34f62b4c65d4977caa0f6ac7605a9978268bdef0ba1 SHA512 a0f327f5fec82cf15495828f60b59b59834efaa041919fe9f68e4428e89b729503b7e666214ea39e5c9afdfbb9efd343c5cbcb8dfc982d6f56b3a06fd898f428
 DIST freeorion-0.4.10.2.tar.gz 124720711 BLAKE2B 4f707b5296bdbc05b2b775b62f0393d1770bcf64c48f08d3332fbbb4b78e1bdc3e8111a1e421a8d0f0e03ca7454bba981809b9486d3d803e39faf042f1145059 SHA512 13832992efe17fe48615ccdf284d1e9f391c35ed518abd15276992128a02894f4b30c8fe3d950e41935efb823cf834dc430330f0bcc6c9e91f13a3dea9812628
+EBUILD freeorion-0.4.10.2-r1.ebuild 2781 BLAKE2B 863e1971a1bac6376b80b1e3fe27933ba3e2e3d7dc209393b338732761fd13aa160c8e038862cf94b8f5f518f7af5c527b289546c0a81e526f312c3cbeca96a9 SHA512 1595bd88caa459626b4fef586610cb45a127b6b16bcbd33a88a42f9ae877c8f19b8c6fb41034506fae2aa86cf5065999b006ff03a657e8760cda8ff9a24ed701
 EBUILD freeorion-0.4.10.2.ebuild 1594 BLAKE2B e0be1845c4e2f23e9b2a7a1e2566e3178b97393c18e72d46dc4f85bc9dc30cae47738c9d123bf2cec82941acb33b872618fd2c4b99b10a4824743203d79c81a3 SHA512 4b694bf3a9a03efb68b14f725c4ad350bcfd257aa26555c5126c6814c113d8834613410ae73d1e1c690b497ace08e2c67e19973b049e78156331ebf0096e611b
-EBUILD freeorion-9999.ebuild 1594 BLAKE2B e0be1845c4e2f23e9b2a7a1e2566e3178b97393c18e72d46dc4f85bc9dc30cae47738c9d123bf2cec82941acb33b872618fd2c4b99b10a4824743203d79c81a3 SHA512 4b694bf3a9a03efb68b14f725c4ad350bcfd257aa26555c5126c6814c113d8834613410ae73d1e1c690b497ace08e2c67e19973b049e78156331ebf0096e611b
+EBUILD freeorion-9999.ebuild 2661 BLAKE2B 3aa46ff73164a76edc38952f96ac95b478284fef8fb77939b479034968dbfe91adff7ca4f4d9ca506159acc7b07dd7150b80acd1f028b7ee4891cd4d6bb01e81 SHA512 a0c04978b94d8248836d7c5e33a016162bb870ab57455113a7a43955b012f21b85f67dfcf3699200988f35f2c015a605fa6e71866751fbcb27a4b2a68f045643
 MISC metadata.xml 691 BLAKE2B 4d245a9b603a00089a035b74f2c762a31ea43088b49f6ebc353dcdb2475acd6d6ce6517ef82d424bd543178a63f6b7e759a2d58cc75ac687171c2db7b458d5a3 SHA512 6364e00b608f0170fad58b28879a2c93c924f283301dd57616b2b97f9979bd4103279665917eb9439f4b798698ec29684ed583a1d0db509d942f9485c2e00e37
diff --git a/games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild
new file mode 100644
index 000000000000..3d3075568e67
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# note: py3.11 is known failing at runtime with this version
+PYTHON_COMPAT=( python3_{8..10} )
+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-doc/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)'
+
+	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-9999.ebuild
index 8931083dbe88..d725cfe38806 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -4,74 +4,112 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake python-single-r1 xdg
-
-DESCRIPTION="A free turn-based space empire and galactic conquest game"
-HOMEPAGE="https://www.freeorion.org"
+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=""
+	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"
-	if [[ ${PV} = *_p* ]]; then
-		COMMIT=""
-		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN}-${COMMIT}"
-	else
-		SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN}-${PV/_/-}"
-	fi
 fi
 
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-IUSE="dedicated"
+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 )"
 
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.60:=[nls,python,threads(+),${PYTHON_USEDEP}]
-	')
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/boost:=[${PYTHON_USEDEP},nls,python]')
+	sys-libs/zlib:=
 	!dedicated? (
-		media-libs/freealut
-		>=media-libs/freetype-2.5.5
+		media-libs/freetype
 		media-libs/glew:=
-		>=media-libs/libogg-1.1.3
-		media-libs/libpng:0=
-		media-libs/libsdl2[X,opengl,video]
-		>=media-libs/libvorbis-1.1.2
+		media-libs/libglvnd
+		media-libs/libogg
+		media-libs/libpng:=
+		media-libs/libsdl2[opengl,video]
+		media-libs/libvorbis
 		media-libs/openal
-		sci-physics/bullet:=
-		virtual/opengl
-	)
-	sys-libs/zlib
+	)"
+RDEPEND="
+	${DEPEND}
+	!dedicated? (
+		media-fonts/dejavu
+		media-fonts/roboto
+	)"
+BDEPEND="
 	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
 
-src_prepare() {
-	sed -e "s/-O3//" -i CMakeLists.txt || die
+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=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_HEADLESS="$(usex dedicated)"
+		-DBUILD_CLIENT_GG=$(usex !dedicated)
+		-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
+
+	epytest -o cache_dir="${T}"/pytest_cache default/python/tests
+}
+
 src_install() {
+	local DOCS=( ChangeLog.md README.md )
 	cmake_src_install
 
-	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
+	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
 }