public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/files/, games-strategy/freeorion/
@ 2018-07-16  5:02 NP Hardass
  0 siblings, 0 replies; 4+ messages in thread
From: NP Hardass @ 2018-07-16  5:02 UTC (permalink / raw
  To: gentoo-commits

commit:     6ada805286db1e9e4ba661532805840618ae7973
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  3 16:01:40 2018 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Jul 16 04:57:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ada8052

games-strategy/freeorion: Backport fix for detecting SDL2 incl dir

Closes: https://bugs.gentoo.org/651762
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 ...ion-0.4.7.1-backport-sdl2-include-dir-fix.patch | 34 +++++++++
 .../freeorion/freeorion-0.4.7.1-r4.ebuild          | 85 ++++++++++++++++++++++
 2 files changed, 119 insertions(+)

diff --git a/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch b/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch
new file mode 100644
index 00000000000..f7ccdba126b
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch
@@ -0,0 +1,34 @@
+From 77bdc407d0760a529e40914d16248dce01fd4778 Mon Sep 17 00:00:00 2001
+From: O01eg <o01eg@yandex.ru>
+Date: Wed, 8 Nov 2017 16:07:57 +0300
+Subject: [PATCH] Fix #1843
+
+---
+ CMakeLists.txt    | 2 +-
+ GG/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/CMakeLists.txt	2018-06-03 11:36:04.631832409 -0400
++++ b/CMakeLists.txt	2018-06-03 11:36:20.678821846 -0400
+@@ -484,7 +484,7 @@
+         ${Boost_INCLUDE_DIRS}
+         ${OPENGL_INCLUDE_DIR}
+         ${GLEW_INCLUDE_DIRS}
+-        ${SDL_INCLUDE_DIRS}
++        ${SDL_INCLUDE_DIR}
+         ${OPENAL_INCLUDE_DIR}
+         ${OGG_INCLUDE_DIRS}
+         ${VORBIS_INCLUDE_DIRS}
+diff --git a/GG/CMakeLists.txt b/GG/CMakeLists.txt
+index 5d3c157362..c5bf3825d8 100644
+--- a/GG/CMakeLists.txt
++++ b/GG/CMakeLists.txt
+@@ -184,7 +184,7 @@ target_include_directories(GiGiSDL SYSTEM
+         ${Boost_INCLUDE_DIRS}
+         ${OPENGL_INCLUDE_DIR}
+         ${GLEW_INCLUDE_DIRS}
+-        ${SDL_INCLUDE_DIRS}
++        ${SDL_INCLUDE_DIR}
+ )
+ 
+ target_link_libraries(GiGiSDL

diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
new file mode 100644
index 00000000000..e3471161e46
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1 gnome2-utils
+
+DESCRIPTION="A free turn-based space empire and galactic conquest game"
+HOMEPAGE="http://www.freeorion.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
+	media-libs/freealut
+	media-libs/freetype
+	media-libs/glew:=
+	media-libs/libsdl2
+	>=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
+	sys-libs/zlib
+	virtual/opengl
+	!dev-games/gigi"
+	# Use bundled gigi as of freeorion-0.4.3
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-backport-sdl2-include-dir-fix.patch" )
+
+pkg_setup() {
+	# build system is using FindPythonLibs.cmake which needs python:2
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -e "s/-O3//" -i CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPEE=Release
+		-DRELEASE_COMPILE_FLAGS=""
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc ChangeLog.md
+
+	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/files/, games-strategy/freeorion/
@ 2023-04-10  5:21 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-04-10  5:21 UTC (permalink / raw
  To: gentoo-commits

commit:     caf3802e7acd436a4a2c2b6bc2991921194b51e4
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Wed Apr  5 02:06:12 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 05:20:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caf3802e

games-strategy/freeorion: add 0.5

Closes: https://bugs.gentoo.org/901231
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/30482
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/freeorion/Manifest                   |  1 +
 .../freeorion/files/freeorion-0.5-ccache.patch      | 18 ++++++++++++++++++
 .../{freeorion-9999.ebuild => freeorion-0.5.ebuild} | 21 ++++++++++++---------
 games-strategy/freeorion/freeorion-9999.ebuild      | 21 ++++++++++++---------
 games-strategy/freeorion/metadata.xml               |  3 +++
 5 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 478345ba36ff..c8383bc84536 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1 +1,2 @@
 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

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-9999.ebuild b/games-strategy/freeorion/freeorion-0.5.ebuild
similarity index 92%
copy from games-strategy/freeorion/freeorion-9999.ebuild
copy to games-strategy/freeorion/freeorion-0.5.ebuild
index 7445d5c039df..4850c266029c 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-0.5.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/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>


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/files/, games-strategy/freeorion/
@ 2025-02-26  8:47 Ionen Wolkens
  0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2025-02-26  8:47 UTC (permalink / raw
  To: gentoo-commits

commit:     c511c6caa22e64e9867ee580bc6ea545f096176f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 03:41:58 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 08:45:30 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c511c6ca

games-strategy/freeorion: drop 0.5.0.1-r1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/freeorion/Manifest                  |   1 -
 .../files/freeorion-0.5.0.1-boost1.85.patch        |  57 ---------
 .../freeorion/freeorion-0.5.0.1-r1.ebuild          | 127 ---------------------
 3 files changed, 185 deletions(-)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 7d03acdcafe5..dc3267e0dc08 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,2 +1 @@
-DIST FreeOrion_v0.5.0.1_Source.tar.gz 152861158 BLAKE2B 6924d4916fcd3ac93e7498b5247957a6fb62b8523aa49114e9e11ef5e3b89374966551bc14192fa7928951728ce814fb86d89365beb97aa7c2bc84408bfcadd2 SHA512 dc267231329f0615f12887f22139d57a2611f378e17e8b0f26c00efdb77e73ef737ff875350f805d34a07ca4ce0595758e4f61168878477ebbd92d0149bcdc22
 DIST FreeOrion_v0.5.1_Source.tar.gz 154915100 BLAKE2B 5097fed26443cd076d03af05816148bf2923b86d4719b86e4593b1bca383af222db6f105e3b4a4b531188558305140e9999a80c7550959adaa65cf08f5bb6b5e SHA512 253deba1a90bd4fa7e33423e0148b22ee5234e47007fef9cee66d617caaa5794e2a600e057574c79caa7058557d51d290c5161e9dfa3d8dabe4ebc5da85b8233

diff --git a/games-strategy/freeorion/files/freeorion-0.5.0.1-boost1.85.patch b/games-strategy/freeorion/files/freeorion-0.5.0.1-boost1.85.patch
deleted file mode 100644
index cb7f450ffc37..000000000000
--- a/games-strategy/freeorion/files/freeorion-0.5.0.1-boost1.85.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://bugs.gentoo.org/932780
-https://github.com/freeorion/freeorion/issues/4897
-
-Backport of: https://github.com/freeorion/freeorion/pull/4899/commits
---- a/GG/src/dialogs/FileDlg.cpp
-+++ b/GG/src/dialogs/FileDlg.cpp
-@@ -11,3 +11,3 @@
- #include <boost/algorithm/string/predicate.hpp>
--#include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem.hpp>
- #include <boost/format.hpp>
-@@ -217,3 +217,3 @@
-         fs::path filename_path = fs::system_complete(fs::path(m_init_filename));
--        m_files_edit->SetText(filename_path.leaf().string());
-+        m_files_edit->SetText(filename_path.filename().string());
-     }
-@@ -550,3 +550,3 @@
-         if ((s_working_dir.string() != s_working_dir.root_path().string() &&
--             !s_working_dir.branch_path().string().empty()) ||
-+             !s_working_dir.parent_path().string().empty()) ||
-             Win32Paths())
-@@ -696,6 +696,6 @@
-         if (s_working_dir.string() != s_working_dir.root_path().string() &&
--            !s_working_dir.branch_path().string().empty())
-+            !s_working_dir.parent_path().string().empty())
-         {
-             // move to new directory
--            SetWorkingDirectory(s_working_dir.branch_path());
-+            SetWorkingDirectory(s_working_dir.parent_path());
- 
---- a/util/Directories.cpp
-+++ b/util/Directories.cpp
-@@ -6,5 +6,4 @@
- #include <boost/algorithm/string/trim.hpp>
--#include <boost/filesystem/convenience.hpp>
--#include <boost/filesystem/operations.hpp>
- #include <boost/date_time/posix_time/posix_time.hpp>
-+#include <boost/filesystem.hpp>
- 
-@@ -268,3 +267,3 @@
-         fs::path binary_file = fs::system_complete(FilenameToPath(argv0));
--        bin_dir = binary_file.branch_path();
-+        bin_dir = binary_file.parent_path();
-     } catch (const fs::filesystem_error &) {
-@@ -317,3 +316,3 @@
-             fs::path binary_file = fs::system_complete(fs::path(path_text));
--            bin_dir = binary_file.branch_path();
-+            bin_dir = binary_file.parent_path();
- 
---- a/util/OptionsDB.cpp
-+++ b/util/OptionsDB.cpp
-@@ -16,4 +16,3 @@
- #include <boost/algorithm/string/predicate.hpp>
--#include <boost/filesystem/fstream.hpp>
--#include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem.hpp>
- #include <boost/range/algorithm_ext/erase.hpp>

diff --git a/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild b/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild
deleted file mode 100644
index f7d5cad3ef66..000000000000
--- a/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 )"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-libs/boost:=[${PYTHON_USEDEP},nls,python]')
-	sys-libs/zlib:=
-	client? (
-		media-libs/freetype
-		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}"/${P}-boost1.85.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
-
-	cmake_comment_add_subdirectory check #904124
-}
-
-src_configure() {
-	filter-lto # -Werror=odr issues
-
-	# TODO: drop this after boost-1.85.0-r0 been gone for some time
-	has_version =dev-libs/boost-1.85.0-r0 &&
-		append-flags -fno-strict-aliasing #932780,933289
-
-	local mycmakeargs=(
-		-DCCACHE_PROGRAM=no
-		-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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/files/, games-strategy/freeorion/
@ 2025-08-03  7:05 Ionen Wolkens
  0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2025-08-03  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     08a651bee54cc876c584720f490b59ed6654c39f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  3 06:21:58 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Aug  3 07:04:22 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08a651be

games-strategy/freeorion: add 0.5.1.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/freeorion/Manifest                  |   1 +
 .../files/freeorion-0.5.1.1-config.h-path.patch    |   8 ++
 games-strategy/freeorion/freeorion-0.5.1.1.ebuild  | 130 +++++++++++++++++++++
 3 files changed, 139 insertions(+)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index dc3267e0dc08..267bab50d168 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1 +1,2 @@
+DIST FreeOrion-v0.5.1.1_Source.tar.gz 156827341 BLAKE2B 5baf826cb68eb6f500c083bf0716e48639a21d129532be549441c713e3dff2eaaf7669e0a3a8655e76aeab8ce79fecc41f271fe73f951d4a02b8e7233462ce60 SHA512 1876eacc5c5dd3e2e3d830088cce2fbe2db40d317eaefeedaba5567dfd218f296a15305e5ec5bd9a91d7ef53a7699fe672972784a1cbd0f7003bb32cdb34b52c
 DIST FreeOrion_v0.5.1_Source.tar.gz 154915100 BLAKE2B 5097fed26443cd076d03af05816148bf2923b86d4719b86e4593b1bca383af222db6f105e3b4a4b531188558305140e9999a80c7550959adaa65cf08f5bb6b5e SHA512 253deba1a90bd4fa7e33423e0148b22ee5234e47007fef9cee66d617caaa5794e2a600e057574c79caa7058557d51d290c5161e9dfa3d8dabe4ebc5da85b8233

diff --git a/games-strategy/freeorion/files/freeorion-0.5.1.1-config.h-path.patch b/games-strategy/freeorion/files/freeorion-0.5.1.1-config.h-path.patch
new file mode 100644
index 000000000000..77b09e4f029d
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion-0.5.1.1-config.h-path.patch
@@ -0,0 +1,8 @@
+https://github.com/freeorion/freeorion/pull/5259
+--- a/GG/GG/CMakeLists.txt
++++ b/GG/GG/CMakeLists.txt
+@@ -20,3 +20,3 @@
+         ${CMAKE_CURRENT_LIST_DIR}/Clr.h
+-        ${CMAKE_CURRENT_LIST_DIR}/Config.h
++        ${CMAKE_CURRENT_BINARY_DIR}/Config.h
+         ${CMAKE_CURRENT_LIST_DIR}/Control.h

diff --git a/games-strategy/freeorion/freeorion-0.5.1.1.ebuild b/games-strategy/freeorion/freeorion-0.5.1.1.ebuild
new file mode 100644
index 000000000000..ea6151c487b8
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.5.1.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+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}/FreeOrion-v${PV}--source
+
+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 )"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/boost:=[${PYTHON_USEDEP},nls,python,zlib]')
+	client? (
+		media-libs/freetype
+		media-libs/glew:0=
+		media-libs/libglvnd
+		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}"/${P}-config.h-path.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
+
+	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?
+		-DBUILD_TESTING=$(usex test)
+
+		# temporary for doc/CMakeLists.txt which is using the old variable
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		# needs looking into but failure does not seem(?) to affect runtime,
+		# try to remove on bump
+		TestChecksum
+	)
+
+	cmake_src_test -j1 # avoid running 2 conflicting servers
+
+	local EPYTEST_DESELECT=(
+		# broken with >=3.11 but is not known to cause issues, 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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-08-03  7:05 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-26  8:47 [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/files/, games-strategy/freeorion/ Ionen Wolkens
  -- strict thread matches above, loose matches on Subject: below --
2025-08-03  7:05 Ionen Wolkens
2023-04-10  5:21 Sam James
2018-07-16  5:02 NP Hardass

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox