gentoo resync : 29.12.2022

3 files changed, 83 insertions, 4 deletions

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 4a6192becebd..54d0189326ad 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,7 +1,9 @@
 AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
 DIST freeorion-0.4.10.1.tar.gz 124693099 BLAKE2B d24c481e7be6f718897bb095209673f24cb7d43842f148cf1e8665254970d22449bf7a4ee4ba7a8cb3b5b515d6bed38a24e2862810959a63b29ba9d3c054e6c4 SHA512 b28a8bdc2428778480ff8404ad7d84153939f4f8b4a75f51775354e3e563f7f309d479e499ea1be8b57822d725cc57ece8dd14f2e40360ab6c07d70c917bc256
 DIST freeorion-0.4.10.1_p20200629.tar.gz 142041599 BLAKE2B a9c14409f31f5ad4d8db95fa33e8f1adb35f7b2a74ea7f173365c7d09979b9a3aa7981ee9deec0427c64844da14ecc323ee54e3331217e2978b49eb86a7a18fb SHA512 b2d4f52e968852569d549c03eca2545b7adac560e5716a21da612dc363b23d790c4481fbd5762f1f1f8da9a8e04894e247ce19363cd96cc2001728912e027d9a
+DIST freeorion-0.4.10.2.tar.gz 124720711 BLAKE2B 4f707b5296bdbc05b2b775b62f0393d1770bcf64c48f08d3332fbbb4b78e1bdc3e8111a1e421a8d0f0e03ca7454bba981809b9486d3d803e39faf042f1145059 SHA512 13832992efe17fe48615ccdf284d1e9f391c35ed518abd15276992128a02894f4b30c8fe3d950e41935efb823cf834dc430330f0bcc6c9e91f13a3dea9812628
 EBUILD freeorion-0.4.10.1-r3.ebuild 1594 BLAKE2B 34fd78d2c505ccf80a8b7bc4873f6fcd99ddb1c4ccbba52c3ac205d8129c5b7efa3c85b5f37c1be6a0d8bd3eb9d24090dd3ed0d80693aa80a51c75f68194ab66 SHA512 684c49ce0cdfbeef1442cd84e916ea0183e478d377a48e3af6e7d0f0af7f4aa29f1473249be38b9409b748a5b11cdee7691c0aa4d5b8f4bb2548d8bab7510700
 EBUILD freeorion-0.4.10.1_p20200629.ebuild 1634 BLAKE2B b6e07e04ac314e80b458df46da95e865b027904dd4c0d6a1b1df50521af576789f7d1f06234dd6645baff4dad30b339067229ad1192b48274e6f70eaa62ef1c1 SHA512 2bb509e552355f52290b728bd248234e1d7f33e8a09ce2d85c81c3f1276eb5629087ef6532750e0a4ce47ddff8955a79cbd01d0a284b65935948462f94e74c63
-EBUILD freeorion-9999.ebuild 1594 BLAKE2B d2c0148504ce2855c0da99e74cc5b3539d5a3427992a28aa03b507ecda8848b1d7670623f8ca71d2ec79eb309ef607a6d69d12d175c95fb6cf44e4d21ee3606a SHA512 ff9412d58ff52e19d771ee84b8088a5d95b1eb0dbb0b2f180e509c7bb8b45b810503d742a418dafa2afc25d658da05da110c38ff76555bdb62baed9c8f335e81
+EBUILD freeorion-0.4.10.2.ebuild 1594 BLAKE2B e0be1845c4e2f23e9b2a7a1e2566e3178b97393c18e72d46dc4f85bc9dc30cae47738c9d123bf2cec82941acb33b872618fd2c4b99b10a4824743203d79c81a3 SHA512 4b694bf3a9a03efb68b14f725c4ad350bcfd257aa26555c5126c6814c113d8834613410ae73d1e1c690b497ace08e2c67e19973b049e78156331ebf0096e611b
+EBUILD freeorion-9999.ebuild 1594 BLAKE2B e0be1845c4e2f23e9b2a7a1e2566e3178b97393c18e72d46dc4f85bc9dc30cae47738c9d123bf2cec82941acb33b872618fd2c4b99b10a4824743203d79c81a3 SHA512 4b694bf3a9a03efb68b14f725c4ad350bcfd257aa26555c5126c6814c113d8834613410ae73d1e1c690b497ace08e2c67e19973b049e78156331ebf0096e611b
 MISC metadata.xml 685 BLAKE2B 5507a5682e7bc9409868b8c1fff7847616260cc0bff41f85a6f75a73477c159294956f6bd60d8ed48d47121d46a9baf675e48f28b3f886aea0a32b77f0405820 SHA512 c963491c8070ad1a99c3f84ba7b02c9bce4eaff29ee58f4037733e61e41e414ed59890a2a68845e343d7d2a59757b81e6e115789132c67d2ed67b846d17d5319
diff --git a/games-strategy/freeorion/freeorion-0.4.10.2.ebuild b/games-strategy/freeorion/freeorion-0.4.10.2.ebuild
new file mode 100644
index 000000000000..8931083dbe88
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.10.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
+else
+	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"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.60:=[nls,python,threads(+),${PYTHON_USEDEP}]
+	')
+	!dedicated? (
+		media-libs/freealut
+		>=media-libs/freetype-2.5.5
+		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/openal
+		sci-physics/bullet:=
+		virtual/opengl
+	)
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s/-O3//" -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_HEADLESS="$(usex dedicated)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
+}
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 46bf4ce29f60..8931083dbe88 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python{3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"