public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2015-09-29 12:16 Thomas Kahle
  0 siblings, 0 replies; 37+ messages in thread
From: Thomas Kahle @ 2015-09-29 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     d0ee075d632fcf7c9657c639ca579841f61b1b12
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 29 12:05:06 2015 +0000
Commit:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 12:16:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0ee075d

games-strategy/freeorion: Bump to 0.4.5

Package-Manager: portage-2.2.20.1

 games-strategy/freeorion/Manifest               |  1 +
 games-strategy/freeorion/freeorion-0.4.5.ebuild | 99 +++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 4fb80bb..afb73ba 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1 +1,2 @@
+DIST freeorion-0.4.5.tar.gz 133309719 SHA256 3b99b92eeac72bd059566dbabfab54368989ba83f72e769bc94eb8dd4fe414c0 SHA512 4107b3019a19f970e7a7df595940a95ad411cbe9572c88b9561de0a2612e107bb654eb3e87a53062f6d969383f4363d7710556d6ba0ae4943c92931be9b650c1 WHIRLPOOL e7488f8d336f36df2d2bf51ab32cd3b2e62eb1c2b1e80596100806f8da1e9064556ccbfa196b77b594f58565e3466a40b7347f3962df4ebe62a1f2c8f9e429fe
 DIST freeorion-0.4.5_pre.tar.bz2 141068240 SHA256 a3d326a1fa05327cf23b14ef08672c0199fc08df15bb3679f579575115172b4a SHA512 33dc4a89264ccf8f146021d8b9dabc51f11e7869a5323effb7a783800db77f37ed27880c60c483dd83ea62bc9ea84872f53c25b4571ccdf13dc594bcb368b903 WHIRLPOOL 1229aefdc22b95c38e71a94f493026230e750948c37544f636d1a43030b96d487307a7a1885bb32d4ae697bc64f431b97323cb647eca516d3363898120528d0d

diff --git a/games-strategy/freeorion/freeorion-0.4.5.ebuild b/games-strategy/freeorion/freeorion-0.4.5.ebuild
new file mode 100644
index 0000000..2c49439
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.5.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-any-r1 games
+
+DESCRIPTION="A free turn-based space empire and galactic conquest game"
+HOMEPAGE="http://www.freeorion.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/FreeOrion_v0.4.5_2015-09-01.f203162_Source.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cg"
+
+# Needs it's own version of GG(dev-games/gigi) which it ships.
+# The split version dev-games/gigi is not used anymore as of 0.4.3
+RDEPEND="
+	!dev-games/gigi
+	media-libs/libsdl2
+	>=dev-libs/boost-1.47[python]
+	media-libs/freealut
+	media-libs/glew
+	media-libs/libogg
+	media-libs/libsdl[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	sci-physics/bullet
+	sys-libs/zlib
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+CMAKE_USE_DIR="${S}"
+CMAKE_VERBOSE="1"
+
+pkg_setup() {
+	# build system is using FindPythonLibs.cmake which needs python:2
+	python-any-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_unpack() {
+	default
+	mv src-tarball "${P}" || die
+	}
+
+src_prepare() {
+	# parse subdir sets -O3
+	sed -e "s:-O3::" -i parse/CMakeLists.txt
+
+	# For snapshots, the following can be used to the set revision
+	# for display in game -- update on bump!
+	# sed -i -e 's/???/8051/' CMakeLists.txt
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DRELEASE_COMPILE_FLAGS=""
+		-DCMAKE_SKIP_RPATH=ON
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	# data files
+	rm "${CMAKE_USE_DIR}"/default/COPYING || die
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r "${CMAKE_USE_DIR}"/default || die
+
+	# bin
+	dogamesbin "${CMAKE_BUILD_DIR}"/${PN}{ca,d} || die
+	newgamesbin "${CMAKE_BUILD_DIR}"/${PN} ${PN}.bin || die
+	games_make_wrapper ${PN} \
+		"${GAMES_BINDIR}/${PN}.bin --resource-dir ${GAMES_DATADIR}/${PN}/default" \
+		"${GAMES_DATADIR}/${PN}"
+
+	# lib
+	dogameslib "${CMAKE_BUILD_DIR}"/libfreeorion{common,parse}.so || die
+	dogameslib "${CMAKE_BUILD_DIR}"/libGiGi*.so || die
+
+	# other
+	dodoc "${CMAKE_USE_DIR}"/changelog.txt || die
+	newicon "${CMAKE_USE_DIR}"/default/data/art/icons/FO_Icon_32x32.png \
+		${PN}.png || die
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	# permissions
+	prepgamesdirs
+}


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2016-10-25  8:55 Thomas Kahle
  0 siblings, 0 replies; 37+ messages in thread
From: Thomas Kahle @ 2016-10-25  8:55 UTC (permalink / raw
  To: gentoo-commits

commit:     64877a0263f40fd4bc30c0add74dc7bd54a8352b
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 20:50:22 2016 +0000
Commit:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 08:55:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64877a02

games-strategy/freeorion: new maintainer np-hardass <AT> g.o

Package-Manager: portage-2.3.0

 games-strategy/freeorion/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/freeorion/metadata.xml b/games-strategy/freeorion/metadata.xml
index 8dade02..e6a9ce6 100644
--- a/games-strategy/freeorion/metadata.xml
+++ b/games-strategy/freeorion/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>tomka@gentoo.org</email>
-    <name>Thomas Kahle</name>
+    <email>np-hardass@gentoo.org</email>
+    <name>NP-hardass</name>
   </maintainer>
   <use>
     <flag name="cg">Add support for NVIDIA toolkit plugin</flag>


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2017-03-16  4:24 NP Hardass
  0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-03-16  4:24 UTC (permalink / raw
  To: gentoo-commits

commit:     6782dfe79b2a51abbdf68ef948f231d6764e8e72
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 09:48:43 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 04:24:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6782dfe7

games-strategy/freeorion: Fix metadata case

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-strategy/freeorion/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/freeorion/metadata.xml b/games-strategy/freeorion/metadata.xml
index e6a9ce65fd3..5998e412cfa 100644
--- a/games-strategy/freeorion/metadata.xml
+++ b/games-strategy/freeorion/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>np-hardass@gentoo.org</email>
+    <email>NP-Hardass@gentoo.org</email>
     <name>NP-hardass</name>
   </maintainer>
   <use>


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2017-03-16  4:24 NP Hardass
  0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-03-16  4:24 UTC (permalink / raw
  To: gentoo-commits

commit:     5a1f85311b7cd185b3bb3c10514a2bb7b1cdce11
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 09:50:01 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 04:24:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a1f8531

games-strategy/freeorion: Drop orphaned USE flag, cg

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-strategy/freeorion/freeorion-0.4.5-r1.ebuild | 4 ++--
 games-strategy/freeorion/freeorion-0.4.5.ebuild    | 4 ++--
 games-strategy/freeorion/metadata.xml              | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-0.4.5-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.5-r1.ebuild
index 68fa2169093..05b2aef5c3f 100644
--- a/games-strategy/freeorion/freeorion-0.4.5-r1.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/FreeOrion_v0.4.
 LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cg"
+IUSE=""
 
 # Needs it's own version of GG(dev-games/gigi) which it ships.
 # The split version dev-games/gigi is not used anymore as of 0.4.3

diff --git a/games-strategy/freeorion/freeorion-0.4.5.ebuild b/games-strategy/freeorion/freeorion-0.4.5.ebuild
index c438a24bd41..bce4e134fb0 100644
--- a/games-strategy/freeorion/freeorion-0.4.5.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/FreeOrion_v0.4.
 LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cg"
+IUSE=""
 
 # Needs it's own version of GG(dev-games/gigi) which it ships.
 # The split version dev-games/gigi is not used anymore as of 0.4.3

diff --git a/games-strategy/freeorion/metadata.xml b/games-strategy/freeorion/metadata.xml
index 5998e412cfa..ccd88c4f149 100644
--- a/games-strategy/freeorion/metadata.xml
+++ b/games-strategy/freeorion/metadata.xml
@@ -5,9 +5,6 @@
     <email>NP-Hardass@gentoo.org</email>
     <name>NP-hardass</name>
   </maintainer>
-  <use>
-    <flag name="cg">Add support for NVIDIA toolkit plugin</flag>
-  </use>
   <longdescription lang="en">
   FreeOrion is a free, open source, turn-based space empire and
   galactic conquest (4X) computer game being designed and built by the


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2017-04-25 18:58 NP Hardass
  0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-04-25 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     d5a2862ae8263d6a226c8acaf88e850a4d193528
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 18:57:55 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 18:58:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a2862a

games-strategy/freeorion: Bump to 0.4.7_rc2, add 9999

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-strategy/freeorion/Manifest                  |  1 +
 .../freeorion/freeorion-0.4.7_rc2.ebuild           | 83 +++++++++++++++++++++
 games-strategy/freeorion/freeorion-9999.ebuild     | 87 ++++++++++++++++++++++
 3 files changed, 171 insertions(+)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index aa7542cc37f..a4b1e956c97 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1 +1,2 @@
 DIST freeorion-0.4.6.tar.gz 145720274 SHA256 3e3ff3a758c8a1ffa71773dff18faff2c792051bb5162758b5f5b8ea59e8e311 SHA512 0488e36286358e8db2dcfe0cdae68e4638388fd2d4c627a258cdecf0afd57e9dbac03111f7683c3ef22edecbedd197a172d177400ddbb585a50f34804a50c50a WHIRLPOOL 30d56a2ca76158168492aa0d1b3fe5a9f164afd7dc378128fe2796ce149a9d65a64cd10c41c5b6c1510773e9ead564dff452869e6c384d949cd0789a51198b6c
+DIST freeorion-0.4.7_rc2.tar.gz 105944237 SHA256 6f9d2dd30609e65982fef197f4c64553e196a2c30dd9bae9db6b02758dd85191 SHA512 f703ae2e79d0ec1ba6217ff4de7fe443476ee280437f28e545286bfce7d20add5886c7275672091df2374222d03d535513a7d68db4e9bcc08bd72f1b28ca29d3 WHIRLPOOL c77c19f49c91452328c0b841f9bc127ab3c347963cd54582cd0fe587cc773565e6eec7e8cd3f1f30f7c690c24868029185e2c75bef32dcb53b25772bb1c1b0fd

diff --git a/games-strategy/freeorion/freeorion-0.4.7_rc2.ebuild b/games-strategy/freeorion/freeorion-0.4.7_rc2.ebuild
new file mode 100644
index 00000000000..1be8614838d
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.7_rc2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-any-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]
+	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"
+
+pkg_setup() {
+	# build system is using FindPythonLibs.cmake which needs python:2
+	python-any-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
+}

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
new file mode 100644
index 00000000000..a790572fcaf
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-any-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
+	RELDATE=2016-09-16
+	SHA=49f9123
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/FreeOrion_v${PV}_${RELDATE}.${SHA}_Source.tar.gz -> ${P}.tar.gz"
+	# Issue with version.cpp, TODO fix
+	#SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+
+	S="${WORKDIR}/src-tarball"
+fi
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.56[python,threads]
+	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"
+
+pkg_setup() {
+	# build system is using FindPythonLibs.cmake which needs python:2
+	python-any-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] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2017-04-26 18:43 NP Hardass
  0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-04-26 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     438e3912063d437bf8aa036f8812fdf4dd3cccde
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 18:43:09 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 18:43:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438e3912

games-strategy/freeorion: Drop 0.4.6, update 9999, #604086

Fixes building with Boost 1.63

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-strategy/freeorion/Manifest               |  1 -
 games-strategy/freeorion/freeorion-0.4.6.ebuild | 83 -------------------------
 games-strategy/freeorion/freeorion-9999.ebuild  | 10 +--
 3 files changed, 3 insertions(+), 91 deletions(-)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index a4b1e956c97..d4c501817d0 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,2 +1 @@
-DIST freeorion-0.4.6.tar.gz 145720274 SHA256 3e3ff3a758c8a1ffa71773dff18faff2c792051bb5162758b5f5b8ea59e8e311 SHA512 0488e36286358e8db2dcfe0cdae68e4638388fd2d4c627a258cdecf0afd57e9dbac03111f7683c3ef22edecbedd197a172d177400ddbb585a50f34804a50c50a WHIRLPOOL 30d56a2ca76158168492aa0d1b3fe5a9f164afd7dc378128fe2796ce149a9d65a64cd10c41c5b6c1510773e9ead564dff452869e6c384d949cd0789a51198b6c
 DIST freeorion-0.4.7_rc2.tar.gz 105944237 SHA256 6f9d2dd30609e65982fef197f4c64553e196a2c30dd9bae9db6b02758dd85191 SHA512 f703ae2e79d0ec1ba6217ff4de7fe443476ee280437f28e545286bfce7d20add5886c7275672091df2374222d03d535513a7d68db4e9bcc08bd72f1b28ca29d3 WHIRLPOOL c77c19f49c91452328c0b841f9bc127ab3c347963cd54582cd0fe587cc773565e6eec7e8cd3f1f30f7c690c24868029185e2c75bef32dcb53b25772bb1c1b0fd

diff --git a/games-strategy/freeorion/freeorion-0.4.6.ebuild b/games-strategy/freeorion/freeorion-0.4.6.ebuild
deleted file mode 100644
index cd26c01d3e8..00000000000
--- a/games-strategy/freeorion/freeorion-0.4.6.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-any-r1 gnome2-utils
-
-DESCRIPTION="A free turn-based space empire and galactic conquest game"
-HOMEPAGE="http://www.freeorion.org"
-
-RELDATE=2016-09-16
-SHA=49f9123
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/FreeOrion_v${PV}_${RELDATE}.${SHA}_Source.tar.gz -> ${P}.tar.gz"
-# Issue with version.cpp, TODO fix
-#SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/boost-1.56[python,threads]
-	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"
-
-S="${WORKDIR}/src-tarball"
-
-PATCHES=( "${FILESDIR}/${P}-boost-1.62.patch" )
-
-pkg_setup() {
-	# build system is using FindPythonLibs.cmake which needs python:2
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s/-O3//" -i CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-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
-}

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index a790572fcaf..1be8614838d 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -13,14 +13,10 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
 else
-	RELDATE=2016-09-16
-	SHA=49f9123
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/FreeOrion_v${PV}_${RELDATE}.${SHA}_Source.tar.gz -> ${P}.tar.gz"
-	# Issue with version.cpp, TODO fix
-	#SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-
-	S="${WORKDIR}/src-tarball"
+	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
 LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2017-05-07  6:36 NP Hardass
  0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-05-07  6:36 UTC (permalink / raw
  To: gentoo-commits

commit:     c959c386e968dcbb5243b9ebcd06767deff258f8
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sun May  7 06:20:13 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Sun May  7 06:36:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c959c386

games-strategy/freeorion: Bump to 0.4.7

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-strategy/freeorion/Manifest                                       | 2 +-
 .../freeorion/{freeorion-0.4.7_rc2.ebuild => freeorion-0.4.7.ebuild}    | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index d4c501817d0..6478421279c 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1 +1 @@
-DIST freeorion-0.4.7_rc2.tar.gz 105944237 SHA256 6f9d2dd30609e65982fef197f4c64553e196a2c30dd9bae9db6b02758dd85191 SHA512 f703ae2e79d0ec1ba6217ff4de7fe443476ee280437f28e545286bfce7d20add5886c7275672091df2374222d03d535513a7d68db4e9bcc08bd72f1b28ca29d3 WHIRLPOOL c77c19f49c91452328c0b841f9bc127ab3c347963cd54582cd0fe587cc773565e6eec7e8cd3f1f30f7c690c24868029185e2c75bef32dcb53b25772bb1c1b0fd
+DIST freeorion-0.4.7.tar.gz 105941741 SHA256 e840db9d9ff837a973c0f32be41a5ad29855eeac0a1541b036d0b183d6fbbaad SHA512 235389a901c056b1cee471a95664f7e5c5178b62d7206c114f2b37ca75bf8ad34b6eb6f9f8970e1556f339c32dcfe9a538a2a61cb79bd0a44c9e1ffcf5067697 WHIRLPOOL 8d5c86ef942bdffa5c9f764269c10b74a6f9b4a15e3182cacff046a22ed88620dbdd1432c3455dfb5209aa4b71b66720c594440c89cc9131c4f1241cf873a0dd

diff --git a/games-strategy/freeorion/freeorion-0.4.7_rc2.ebuild b/games-strategy/freeorion/freeorion-0.4.7.ebuild
similarity index 100%
rename from games-strategy/freeorion/freeorion-0.4.7_rc2.ebuild
rename to games-strategy/freeorion/freeorion-0.4.7.ebuild


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2017-09-13 19:48 NP Hardass
  0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-09-13 19:48 UTC (permalink / raw
  To: gentoo-commits

commit:     a2bb086b343ab701dbfb2158f6a04c1ac59fb5f5
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 16:48:29 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 19:47:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2bb086b

games-strategy/freeorion: Bump to 0.4.7.1

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 games-strategy/freeorion/Manifest                                       | 2 +-
 .../freeorion/{freeorion-0.4.7.ebuild => freeorion-0.4.7.1.ebuild}      | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 6478421279c..2581ebd4455 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1 +1 @@
-DIST freeorion-0.4.7.tar.gz 105941741 SHA256 e840db9d9ff837a973c0f32be41a5ad29855eeac0a1541b036d0b183d6fbbaad SHA512 235389a901c056b1cee471a95664f7e5c5178b62d7206c114f2b37ca75bf8ad34b6eb6f9f8970e1556f339c32dcfe9a538a2a61cb79bd0a44c9e1ffcf5067697 WHIRLPOOL 8d5c86ef942bdffa5c9f764269c10b74a6f9b4a15e3182cacff046a22ed88620dbdd1432c3455dfb5209aa4b71b66720c594440c89cc9131c4f1241cf873a0dd
+DIST freeorion-0.4.7.1.tar.gz 105942075 SHA256 924a88464e92c14aa8f6722b57f702e07d43c7257cf272150c98bc3c1124a87e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d WHIRLPOOL 87b328364320221715b1dc16154a40299229990b8726a4053ba875ca4fdc6838c354cae7d93036fbe92003e2f2158b9325715e20488e8af7c22723924ce3eec1

diff --git a/games-strategy/freeorion/freeorion-0.4.7.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1.ebuild
similarity index 100%
rename from games-strategy/freeorion/freeorion-0.4.7.ebuild
rename to games-strategy/freeorion/freeorion-0.4.7.1.ebuild


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2017-12-04  6:27 NP Hardass
  0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-12-04  6:27 UTC (permalink / raw
  To: gentoo-commits

commit:     4c0ca0dba0b26d3213e523facb17cd16437ec9ec
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 20:28:25 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Dec  4 06:27:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0ca0db

games-strategy/freeorion:  Add subslot rebuild dep for boost

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 games-strategy/freeorion/Manifest                                       | 2 +-
 .../freeorion/{freeorion-9999.ebuild => freeorion-0.4.7.1-r1.ebuild}    | 2 +-
 games-strategy/freeorion/freeorion-9999.ebuild                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 2581ebd4455..ee95a9473b3 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1 +1 @@
-DIST freeorion-0.4.7.1.tar.gz 105942075 SHA256 924a88464e92c14aa8f6722b57f702e07d43c7257cf272150c98bc3c1124a87e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d WHIRLPOOL 87b328364320221715b1dc16154a40299229990b8726a4053ba875ca4fdc6838c354cae7d93036fbe92003e2f2158b9325715e20488e8af7c22723924ce3eec1
+DIST freeorion-0.4.7.1.tar.gz 105942075 BLAKE2B f75940ac79e329fd7e03e85b1cd712ff6dcf06583ad8feff43f8b2d6e28a53c9029724d1450d26d2367bafd1d04858e3659b8e47986df96657d91526f594eb5e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r1.ebuild
similarity index 97%
copy from games-strategy/freeorion/freeorion-9999.ebuild
copy to games-strategy/freeorion/freeorion-0.4.7.1-r1.ebuild
index 1be8614838d..d0d5447656d 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.7.1-r1.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=dev-libs/boost-1.56[python,threads]
+	>=dev-libs/boost-1.56:=[python,threads]
 	media-libs/freealut
 	media-libs/freetype
 	media-libs/glew:*

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 1be8614838d..d0d5447656d 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=dev-libs/boost-1.56[python,threads]
+	>=dev-libs/boost-1.56:=[python,threads]
 	media-libs/freealut
 	media-libs/freetype
 	media-libs/glew:*


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2017-12-08  0:35 NP Hardass
  0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2017-12-08  0:35 UTC (permalink / raw
  To: gentoo-commits

commit:     cdc9faaa4d7f8fe7075cfff56e882ae81b5f8286
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  4 17:39:51 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Dec  8 00:35:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc9faaa

games-strategy/freeorion: Switch to python-single-r1 from python-any-r1

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 .../{freeorion-0.4.7.1-r1.ebuild => freeorion-0.4.7.1-r2.ebuild}    | 6 +++---
 games-strategy/freeorion/freeorion-9999.ebuild                      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r2.ebuild
similarity index 92%
rename from games-strategy/freeorion/freeorion-0.4.7.1-r1.ebuild
rename to games-strategy/freeorion/freeorion-0.4.7.1-r2.ebuild
index d0d5447656d..59dd595f13e 100644
--- a/games-strategy/freeorion/freeorion-0.4.7.1-r1.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.7.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-any-r1 gnome2-utils
+inherit cmake-utils python-single-r1 gnome2-utils
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
 HOMEPAGE="http://www.freeorion.org"
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=dev-libs/boost-1.56:=[python,threads]
+	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
 	media-libs/freealut
 	media-libs/freetype
 	media-libs/glew:*
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	# build system is using FindPythonLibs.cmake which needs python:2
-	python-any-r1_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index d0d5447656d..59dd595f13e 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-any-r1 gnome2-utils
+inherit cmake-utils python-single-r1 gnome2-utils
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
 HOMEPAGE="http://www.freeorion.org"
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=dev-libs/boost-1.56:=[python,threads]
+	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
 	media-libs/freealut
 	media-libs/freetype
 	media-libs/glew:*
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	# build system is using FindPythonLibs.cmake which needs python:2
-	python-any-r1_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2018-03-27  4:06 NP Hardass
  0 siblings, 0 replies; 37+ messages in thread
From: NP Hardass @ 2018-03-27  4:06 UTC (permalink / raw
  To: gentoo-commits

commit:     d0553488ce262d106023d7e6fe513d3fb240b58c
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 20 15:25:01 2018 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 04:05:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0553488

games-strategy/freeorion: Add subslot rebuild for glew

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../{freeorion-0.4.7.1-r2.ebuild => freeorion-0.4.7.1-r3.ebuild}      | 4 ++--
 games-strategy/freeorion/freeorion-9999.ebuild                        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r2.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild
similarity index 96%
rename from games-strategy/freeorion/freeorion-0.4.7.1-r2.ebuild
rename to games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild
index 59dd595f13e..8d750687b35 100644
--- a/games-strategy/freeorion/freeorion-0.4.7.1-r2.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
 	media-libs/freealut
 	media-libs/freetype
-	media-libs/glew:*
+	media-libs/glew:=
 	media-libs/libsdl2
 	>=media-libs/libogg-1.1.3
 	media-libs/libpng:0

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 59dd595f13e..8d750687b35 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
 	media-libs/freealut
 	media-libs/freetype
-	media-libs/glew:*
+	media-libs/glew:=
 	media-libs/libsdl2
 	>=media-libs/libogg-1.1.3
 	media-libs/libpng:0


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2019-04-23 10:05 Lars Wendler
  0 siblings, 0 replies; 37+ messages in thread
From: Lars Wendler @ 2019-04-23 10:05 UTC (permalink / raw
  To: gentoo-commits

commit:     5e99d2ca2d2cf1c7ae9933c00a01158ed548f8f6
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 23 09:35:03 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 10:05:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e99d2ca

games-strategy/freeorion: Bumped live ebuild to EAPI-7

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-strategy/freeorion/freeorion-9999.ebuild | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 8d750687b35..578e570e2ff 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-single-r1 gnome2-utils
+inherit cmake-utils python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
 HOMEPAGE="http://www.freeorion.org"
@@ -40,7 +40,8 @@ RDEPEND="
 	!dev-games/gigi"
 	# Use bundled gigi as of freeorion-0.4.3
 
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig"
 
@@ -57,12 +58,11 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPEE=Release
-		-DRELEASE_COMPILE_FLAGS=""
+		-DCMAKE_BUILD_TYPE=Release
 		-DCMAKE_SKIP_RPATH=ON
 	)
 
-	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
+	#append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
 
 	cmake-utils_src_configure
 }
@@ -74,10 +74,14 @@ src_install() {
 	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
 }


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2019-05-11  8:24 Andreas Sturmlechner
  0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2019-05-11  8:24 UTC (permalink / raw
  To: gentoo-commits

commit:     4d6145494fd1d8aed401747ebf13b33a71884ed7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 20:49:35 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 11 08:07:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d614549

games-strategy/freeorion: Add missing REQUIRED_USE

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild b/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
index de4fdff7f15..2c29c8b5c26 100644
--- a/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
@@ -28,6 +28,8 @@ LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
 IUSE="dedicated"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 BDEPEND="
 	virtual/pkgconfig
 "


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2019-05-11  8:24 Andreas Sturmlechner
  0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2019-05-11  8:24 UTC (permalink / raw
  To: gentoo-commits

commit:     3046156a2fb06292c3c7380d4332592c2f79ac18
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 20:50:41 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 11 08:07:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3046156a

games-strategy/freeorion: Sync live with 0.4.8_p20190501 changes

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-strategy/freeorion/freeorion-9999.ebuild | 70 ++++++++++++--------------
 1 file changed, 32 insertions(+), 38 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 578e570e2ff..2c29c8b5c26 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -7,43 +7,51 @@ PYTHON_COMPAT=( python2_7 )
 inherit cmake-utils python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
-HOMEPAGE="http://www.freeorion.org"
+HOMEPAGE="https://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}"
+	if [[ ${PV} = *_p* ]]; then
+		COMMIT="2a49c05796f1c92b96ce9b2aeaf0124fc8be7a77"
+		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=""
+IUSE="dedicated"
 
-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
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${RDEPEND}"
 BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/boost-1.58:=[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
+"
+DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	virtual/pkgconfig"
+"
 
 pkg_setup() {
 	# build system is using FindPythonLibs.cmake which needs python:2
@@ -60,28 +68,14 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_BUILD_TYPE=Release
 		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_HEADLESS="$(usex dedicated)"
 	)
 
-	#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_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2019-08-12 19:58 Michał Górny
  0 siblings, 0 replies; 37+ messages in thread
From: Michał Górny @ 2019-08-12 19:58 UTC (permalink / raw
  To: gentoo-commits

commit:     5c480f18167ba10d2868a4b4366b195a5dc43749
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 19:55:04 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 19:55:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c480f18

games-strategy/freeorion: Add missing PYTHON_*

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild      | 4 +++-
 games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild | 3 +--
 games-strategy/freeorion/freeorion-9999.ebuild            | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
index e3471161e46..e827e00ef9e 100644
--- a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
@@ -23,6 +23,8 @@ LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
 IUSE=""
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RDEPEND="
 	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
 	media-libs/freealut
@@ -37,11 +39,11 @@ RDEPEND="
 	sci-physics/bullet
 	sys-libs/zlib
 	virtual/opengl
+	${PYTHON_DEPS}
 	!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" )

diff --git a/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild b/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
index 2c29c8b5c26..3aea6bd3b5d 100644
--- a/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
@@ -48,10 +48,9 @@ RDEPEND="
 		virtual/opengl
 	)
 	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 "
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	# build system is using FindPythonLibs.cmake which needs python:2

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 2c29c8b5c26..3aea6bd3b5d 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -48,10 +48,9 @@ RDEPEND="
 		virtual/opengl
 	)
 	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 "
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	# build system is using FindPythonLibs.cmake which needs python:2


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2020-02-09 16:25 Michał Górny
  0 siblings, 0 replies; 37+ messages in thread
From: Michał Górny @ 2020-02-09 16:25 UTC (permalink / raw
  To: gentoo-commits

commit:     9cf4ab40d2872f143f717c1be7031df494beaa0b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 14:12:03 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:22:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cf4ab40

games-strategy/freeorion: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild                | 6 ++++--
 ...n-0.4.8_p20190501.ebuild => freeorion-0.4.8_p20190501-r1.ebuild} | 6 ++++--
 games-strategy/freeorion/freeorion-9999.ebuild                      | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
index e827e00ef9e..3811c4a2574 100644
--- a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,9 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.56:=[python,threads,${PYTHON_MULTI_USEDEP}]
+	')
 	media-libs/freealut
 	media-libs/freetype
 	media-libs/glew:=

diff --git a/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild b/games-strategy/freeorion/freeorion-0.4.8_p20190501-r1.ebuild
similarity index 92%
rename from games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
rename to games-strategy/freeorion/freeorion-0.4.8_p20190501-r1.ebuild
index 3aea6bd3b5d..5bf1f6f4f99 100644
--- a/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.8_p20190501-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 RDEPEND="
-	>=dev-libs/boost-1.58:=[python,threads,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.58:=[python,threads,${PYTHON_MULTI_USEDEP}]
+	')
 	!dedicated? (
 		media-libs/freealut
 		>=media-libs/freetype-2.5.5

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 3aea6bd3b5d..5bf1f6f4f99 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 RDEPEND="
-	>=dev-libs/boost-1.58:=[python,threads,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.58:=[python,threads,${PYTHON_MULTI_USEDEP}]
+	')
 	!dedicated? (
 		media-libs/freealut
 		>=media-libs/freetype-2.5.5


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2020-04-09 20:55 Adam Feldman
  0 siblings, 0 replies; 37+ messages in thread
From: Adam Feldman @ 2020-04-09 20:55 UTC (permalink / raw
  To: gentoo-commits

commit:     06326b0fdc05012bd0548ac53a136b0f95979c33
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 20:39:15 2020 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 20:55:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06326b0f

games-strategy/freeorion: Bump to 0.4.9

Closes: https://bugs.gentoo.org/709418
Closes: https://bugs.gentoo.org/716030
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 games-strategy/freeorion/Manifest                                   | 1 +
 .../{freeorion-9999.ebuild => freeorion-0.4.9_p20200409.ebuild}     | 6 +++---
 games-strategy/freeorion/freeorion-9999.ebuild                      | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index e8a787a9928..5427b843917 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,2 +1,3 @@
 DIST freeorion-0.4.7.1.tar.gz 105942075 BLAKE2B f75940ac79e329fd7e03e85b1cd712ff6dcf06583ad8feff43f8b2d6e28a53c9029724d1450d26d2367bafd1d04858e3659b8e47986df96657d91526f594eb5e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d
 DIST freeorion-0.4.8_p20190501.tar.gz 106506540 BLAKE2B 5442eeeaff486a5525b4282c7ef72001a935c4429fea89a720f94a033a2c29e56855605376efe22d13194ae3f49105fe26f37554d2c8d560bfb76dc69d738128 SHA512 d378c0e9b63118261bf5ac1c99190929ff0cd52b3a270e43fe2be80cc7993457bcc7b70083ff493a6b96b250e1988e40470bef410af5ce3d49644ccf934974d3
+DIST freeorion-0.4.9_p20200409.tar.gz 124663848 BLAKE2B 7468a386829498c9ca971e686bda216002b6f263fbc0f3784e7898854ad91278441579c1a3e0d1ef2d92b46747d14a17463e46d7ba16f06633e9a5d474ce3b9c SHA512 09fe8db818c3f22bac94577461d9ada082a2c8365cb524948bf13650ea368fcc55043f4df2f9701075011c890a08197e7f7bb13d8884cb41cc8e1346b8538345

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild
similarity index 91%
copy from games-strategy/freeorion/freeorion-9999.ebuild
copy to games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild
index 5bf1f6f4f99..dba94bf60f9 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 inherit cmake-utils python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	KEYWORDS="~amd64"
 	if [[ ${PV} = *_p* ]]; then
-		COMMIT="2a49c05796f1c92b96ce9b2aeaf0124fc8be7a77"
+		COMMIT="1570afb475763b13f5d2f434037ec907da812bb4"
 		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${PN}-${COMMIT}"
 	else
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.58:=[python,threads,${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.67:=[python,threads,${PYTHON_MULTI_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 5bf1f6f4f99..dba94bf60f9 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 inherit cmake-utils python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	KEYWORDS="~amd64"
 	if [[ ${PV} = *_p* ]]; then
-		COMMIT="2a49c05796f1c92b96ce9b2aeaf0124fc8be7a77"
+		COMMIT="1570afb475763b13f5d2f434037ec907da812bb4"
 		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${PN}-${COMMIT}"
 	else
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.58:=[python,threads,${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.67:=[python,threads,${PYTHON_MULTI_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2020-04-09 20:55 Adam Feldman
  0 siblings, 0 replies; 37+ messages in thread
From: Adam Feldman @ 2020-04-09 20:55 UTC (permalink / raw
  To: gentoo-commits

commit:     f28af6bf9242c492260d63db17b3b8c15eefdb1b
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 20:48:09 2020 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 20:55:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f28af6bf

games-strategy/freeorion: Drop old

Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 games-strategy/freeorion/Manifest                  |  2 -
 .../freeorion/freeorion-0.4.7.1-r4.ebuild          | 89 ----------------------
 .../freeorion/freeorion-0.4.8_p20190501-r1.ebuild  | 82 --------------------
 .../freeorion/freeorion-0.4.9_p20200409.ebuild     |  7 +-
 games-strategy/freeorion/freeorion-9999.ebuild     |  7 +-
 5 files changed, 2 insertions(+), 185 deletions(-)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 5427b843917..a13368d9c41 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,3 +1 @@
-DIST freeorion-0.4.7.1.tar.gz 105942075 BLAKE2B f75940ac79e329fd7e03e85b1cd712ff6dcf06583ad8feff43f8b2d6e28a53c9029724d1450d26d2367bafd1d04858e3659b8e47986df96657d91526f594eb5e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d
-DIST freeorion-0.4.8_p20190501.tar.gz 106506540 BLAKE2B 5442eeeaff486a5525b4282c7ef72001a935c4429fea89a720f94a033a2c29e56855605376efe22d13194ae3f49105fe26f37554d2c8d560bfb76dc69d738128 SHA512 d378c0e9b63118261bf5ac1c99190929ff0cd52b3a270e43fe2be80cc7993457bcc7b70083ff493a6b96b250e1988e40470bef410af5ce3d49644ccf934974d3
 DIST freeorion-0.4.9_p20200409.tar.gz 124663848 BLAKE2B 7468a386829498c9ca971e686bda216002b6f263fbc0f3784e7898854ad91278441579c1a3e0d1ef2d92b46747d14a17463e46d7ba16f06633e9a5d474ce3b9c SHA512 09fe8db818c3f22bac94577461d9ada082a2c8365cb524948bf13650ea368fcc55043f4df2f9701075011c890a08197e7f7bb13d8884cb41cc8e1346b8538345

diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
deleted file mode 100644
index 3811c4a2574..00000000000
--- a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.56:=[python,threads,${PYTHON_MULTI_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
-	${PYTHON_DEPS}
-	!dev-games/gigi"
-	# Use bundled gigi as of freeorion-0.4.3
-
-DEPEND="${RDEPEND}
-	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
-}

diff --git a/games-strategy/freeorion/freeorion-0.4.8_p20190501-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.8_p20190501-r1.ebuild
deleted file mode 100644
index 5bf1f6f4f99..00000000000
--- a/games-strategy/freeorion/freeorion-0.4.8_p20190501-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils 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="2a49c05796f1c92b96ce9b2aeaf0124fc8be7a77"
-		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.58:=[python,threads,${PYTHON_MULTI_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}"
-
-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_TYPE=Release
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_HEADLESS="$(usex dedicated)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
-}

diff --git a/games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild b/games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild
index dba94bf60f9..048d1b8bf69 100644
--- a/games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit cmake-utils python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
@@ -54,11 +54,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-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
 

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index dba94bf60f9..048d1b8bf69 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit cmake-utils python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
@@ -54,11 +54,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-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
 


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2020-05-09 15:31 Adam Feldman
  0 siblings, 0 replies; 37+ messages in thread
From: Adam Feldman @ 2020-05-09 15:31 UTC (permalink / raw
  To: gentoo-commits

commit:     da26980f5eabddd543500677ca180aa945ef765d
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 15:28:38 2020 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Sat May  9 15:31:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da26980f

games-strategy/freeorion: Fix missing boost[nls] dep

Closes: https://bugs.gentoo.org/721854
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 ...orion-0.4.9_p20200409.ebuild => freeorion-0.4.9_p20200409-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild b/games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild
similarity index 95%
rename from games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild
rename to games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild
index 048d1b8bf69..c1efcaa3e7c 100644
--- a/games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.67:=[python,threads,${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.67:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2020-10-06 18:12 Adam Feldman
  0 siblings, 0 replies; 37+ messages in thread
From: Adam Feldman @ 2020-10-06 18:12 UTC (permalink / raw
  To: gentoo-commits

commit:     ccd85b73ed903bd8696a15ca83a70b6b114dc96d
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 17:58:06 2020 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 18:12:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccd85b73

games-strategy/freeorion: Bump to 0.4.10.1

Closes: https://bugs.gentoo.org/show_bug.cgi?id=735768
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 games-strategy/freeorion/Manifest                            |  2 +-
 ...n-0.4.9_p20200409-r1.ebuild => freeorion-0.4.10.1.ebuild} | 12 ++++++------
 games-strategy/freeorion/freeorion-9999.ebuild               | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index a13368d9c41..4f0f36b38b3 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1 +1 @@
-DIST freeorion-0.4.9_p20200409.tar.gz 124663848 BLAKE2B 7468a386829498c9ca971e686bda216002b6f263fbc0f3784e7898854ad91278441579c1a3e0d1ef2d92b46747d14a17463e46d7ba16f06633e9a5d474ce3b9c SHA512 09fe8db818c3f22bac94577461d9ada082a2c8365cb524948bf13650ea368fcc55043f4df2f9701075011c890a08197e7f7bb13d8884cb41cc8e1346b8538345
+DIST freeorion-0.4.10.1.tar.gz 124693099 BLAKE2B d24c481e7be6f718897bb095209673f24cb7d43842f148cf1e8665254970d22449bf7a4ee4ba7a8cb3b5b515d6bed38a24e2862810959a63b29ba9d3c054e6c4 SHA512 b28a8bdc2428778480ff8404ad7d84153939f4f8b4a75f51775354e3e563f7f309d479e499ea1be8b57822d725cc57ece8dd14f2e40360ab6c07d70c917bc256

diff --git a/games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1.ebuild
similarity index 85%
rename from games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild
rename to games-strategy/freeorion/freeorion-0.4.10.1.ebuild
index c1efcaa3e7c..eaf03461b48 100644
--- a/games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.10.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-inherit cmake-utils python-single-r1 xdg
+inherit cmake python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
 HOMEPAGE="https://www.freeorion.org"
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	KEYWORDS="~amd64"
 	if [[ ${PV} = *_p* ]]; then
-		COMMIT="1570afb475763b13f5d2f434037ec907da812bb4"
+		COMMIT=""
 		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${PN}-${COMMIT}"
 	else
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.67:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.58:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	sed -e "s/-O3//" -i CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake-src_prepare
 }
 
 src_configure() {
@@ -67,11 +67,11 @@ src_configure() {
 		-DBUILD_HEADLESS="$(usex dedicated)"
 	)
 
-	cmake-utils_src_configure
+	cmake-src_configure
 }
 
 src_install() {
-	cmake-utils_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 048d1b8bf69..0b5fba26ee5 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-inherit cmake-utils python-single-r1 xdg
+inherit cmake python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
 HOMEPAGE="https://www.freeorion.org"
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	KEYWORDS="~amd64"
 	if [[ ${PV} = *_p* ]]; then
-		COMMIT="1570afb475763b13f5d2f434037ec907da812bb4"
+		COMMIT=""
 		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${PN}-${COMMIT}"
 	else
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.67:=[python,threads,${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.60:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	sed -e "s/-O3//" -i CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -67,11 +67,11 @@ src_configure() {
 		-DBUILD_HEADLESS="$(usex dedicated)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
 }


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2020-10-12  3:19 Adam Feldman
  0 siblings, 0 replies; 37+ messages in thread
From: Adam Feldman @ 2020-10-12  3:19 UTC (permalink / raw
  To: gentoo-commits

commit:     41357f256e1dacb4528a2d1f4a51e70ded235c28
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 03:17:06 2020 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 03:18:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41357f25

games-strategy/freeorion: Fix typo in eclass function calls

Somehow typoed non 9999 but not 9999
Closes: https://bugs.gentoo.org/747910
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 .../{freeorion-0.4.10.1.ebuild => freeorion-0.4.10.1-r1.ebuild}       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-0.4.10.1.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild
similarity index 97%
rename from games-strategy/freeorion/freeorion-0.4.10.1.ebuild
rename to games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild
index eaf03461b48..9cfb07f7b4e 100644
--- a/games-strategy/freeorion/freeorion-0.4.10.1.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	sed -e "s/-O3//" -i CMakeLists.txt || die
 
-	cmake-src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -67,7 +67,7 @@ src_configure() {
 		-DBUILD_HEADLESS="$(usex dedicated)"
 	)
 
-	cmake-src_configure
+	cmake_src_configure
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2021-06-18 19:18 David Seifert
  0 siblings, 0 replies; 37+ messages in thread
From: David Seifert @ 2021-06-18 19:18 UTC (permalink / raw
  To: gentoo-commits

commit:     271e40dee2ed4a7909ba121bae8973ea87de006a
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 19:16:41 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 19:16:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=271e40de

games-strategy/freeorion: Depend on dev-libs/boost:=[threads(+)]

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../{freeorion-0.4.10.1-r1.ebuild => freeorion-0.4.10.1-r2.ebuild}  | 6 +++---
 games-strategy/freeorion/freeorion-9999.ebuild                      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1-r2.ebuild
similarity index 91%
rename from games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild
rename to games-strategy/freeorion/freeorion-0.4.10.1-r2.ebuild
index 9cdce45d2d2..8fe0bd67b88 100644
--- a/games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.10.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.58:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.58:=[nls,python,threads(+),${PYTHON_MULTI_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut
@@ -46,7 +46,7 @@ RDEPEND="
 		media-libs/libsdl2[X,opengl,video]
 		>=media-libs/libvorbis-1.1.2
 		media-libs/openal
-		sci-physics/bullet
+		sci-physics/bullet:=
 		virtual/opengl
 	)
 	sys-libs/zlib

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index dc0896abe66..afe458a3f79 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.60:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.60:=[nls,python,threads(+),${PYTHON_MULTI_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut
@@ -46,7 +46,7 @@ RDEPEND="
 		media-libs/libsdl2[X,opengl,video]
 		>=media-libs/libvorbis-1.1.2
 		media-libs/openal
-		sci-physics/bullet
+		sci-physics/bullet:=
 		virtual/opengl
 	)
 	sys-libs/zlib


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2021-07-01 16:02 Adam Feldman
  0 siblings, 0 replies; 37+ messages in thread
From: Adam Feldman @ 2021-07-01 16:02 UTC (permalink / raw
  To: gentoo-commits

commit:     1c6479db3764a14009a04ae1cfd29d3e50e667b6
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  1 15:29:05 2021 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Jul  1 16:02:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c6479db

games-strategy/freeorion: Add snapshot that fixes build errors

Backporting was too complicated, so I added a snapshot

Bug: https://bugs.gentoo.org/739378
Bug: https://bugs.gentoo.org/795771
Bug: https://bugs.gentoo.org/796683
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 games-strategy/freeorion/Manifest                  |  1 +
 .../freeorion/freeorion-0.4.10.1_p20200629.ebuild  | 77 ++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 4f0f36b38b3..649be95583b 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1 +1,2 @@
 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

diff --git a/games-strategy/freeorion/freeorion-0.4.10.1_p20200629.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1_p20200629.ebuild
new file mode 100644
index 00000000000..62d5f6b9836
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.10.1_p20200629.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+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="24a08d6c597ce8afc90ccec485a937982b6c3683"
+		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.58:=[nls,python,threads(+),${PYTHON_MULTI_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}
+}


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2021-07-01 16:02 Adam Feldman
  0 siblings, 0 replies; 37+ messages in thread
From: Adam Feldman @ 2021-07-01 16:02 UTC (permalink / raw
  To: gentoo-commits

commit:     730e5b8b794efdb62b5b627af73ec33614d8a3e6
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  1 14:29:34 2021 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Jul  1 16:02:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=730e5b8b

games-strategy/freeorion: Python 3.9

Closes: https://bugs.gentoo.org/793806
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 .../{freeorion-0.4.10.1-r2.ebuild => freeorion-0.4.10.1-r3.ebuild}      | 2 +-
 games-strategy/freeorion/freeorion-9999.ebuild                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-0.4.10.1-r2.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1-r3.ebuild
similarity index 97%
rename from games-strategy/freeorion/freeorion-0.4.10.1-r2.ebuild
rename to games-strategy/freeorion/freeorion-0.4.10.1-r3.ebuild
index 8fe0bd67b88..7dc53ff3da6 100644
--- a/games-strategy/freeorion/freeorion-0.4.10.1-r2.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.10.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 inherit cmake python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index afe458a3f79..063ff13d1ae 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 inherit cmake python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2022-05-14  2:32 Sam James
  0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2022-05-14  2:32 UTC (permalink / raw
  To: gentoo-commits

commit:     6a3d146b3ff59bd2cbc624fce5add1f56ff44788
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 02:30:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 14 02:32:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3d146b

games-strategy/freeorion: EAPI 8, Python 3.10

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/freeorion/freeorion-0.4.10.2.ebuild | 6 +++---
 games-strategy/freeorion/freeorion-9999.ebuild     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-0.4.10.2.ebuild b/games-strategy/freeorion/freeorion-0.4.10.2.ebuild
index a4ce29bba4d5..8931083dbe88 100644
--- a/games-strategy/freeorion/freeorion-0.4.10.2.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.10.2.ebuild
@@ -1,9 +1,9 @@
 # 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"
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.58:=[nls,python,threads(+),${PYTHON_USEDEP}]
+		>=dev-libs/boost-1.60:=[nls,python,threads(+),${PYTHON_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut

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"


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2022-05-14  2:32 Sam James
  0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2022-05-14  2:32 UTC (permalink / raw
  To: gentoo-commits

commit:     47b0dd1c7c2e1d2c213203020493383f2b9283c3
Author:     Cengiz Gunay <cengique <AT> users <DOT> sf <DOT> net>
AuthorDate: Sun Apr  3 21:08:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 14 02:32:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47b0dd1c

games-strategy/freeorion: stable release 0.4.10.2

Tested-by: Cengiz Gunay <cengique <AT> users.sf.net>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Cengiz Gunay <cengique <AT> users.sf.net>
Closes: https://github.com/gentoo/gentoo/pull/24886
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/freeorion/Manifest                  |  1 +
 games-strategy/freeorion/freeorion-0.4.10.2.ebuild | 77 ++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 649be95583bd..44124c4f61bd 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,2 +1,3 @@
 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

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..a4ce29bba4d5
--- /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=7
+
+PYTHON_COMPAT=( python{3_8,3_9} )
+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.58:=[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}
+}


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2022-07-24 15:03 Ionen Wolkens
  0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-07-24 15:03 UTC (permalink / raw
  To: gentoo-commits

commit:     b8ea751051029922a5bba66e2560b98f70ddd5c7
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 15:02:20 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 15:02:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ea7510

games-strategy/freeorion: drop 0.4.10.1-r3, 0.4.10.1_p20200629

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

 games-strategy/freeorion/Manifest                  |  2 -
 .../freeorion/freeorion-0.4.10.1-r3.ebuild         | 77 ----------------------
 .../freeorion/freeorion-0.4.10.1_p20200629.ebuild  | 77 ----------------------
 3 files changed, 156 deletions(-)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 44124c4f61bd..4a872343e2a4 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,3 +1 @@
-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

diff --git a/games-strategy/freeorion/freeorion-0.4.10.1-r3.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1-r3.ebuild
deleted file mode 100644
index 80259c6eddb7..000000000000
--- a/games-strategy/freeorion/freeorion-0.4.10.1-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_8,3_9} )
-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.58:=[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-0.4.10.1_p20200629.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1_p20200629.ebuild
deleted file mode 100644
index eac7dfb3feb3..000000000000
--- a/games-strategy/freeorion/freeorion-0.4.10.1_p20200629.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_8,3_9} )
-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="24a08d6c597ce8afc90ccec485a937982b6c3683"
-		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.58:=[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}
-}


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2022-07-24 15:03 Ionen Wolkens
  0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-07-24 15:03 UTC (permalink / raw
  To: gentoo-commits

commit:     78a4d63c867db014625bf8ec67728c577eb876af
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 15:01:12 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 15:01:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a4d63c

games-strategy/freeorion: adopt for games@

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

 games-strategy/freeorion/metadata.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/games-strategy/freeorion/metadata.xml b/games-strategy/freeorion/metadata.xml
index fd1d1ffbb606..07e33aa89255 100644
--- a/games-strategy/freeorion/metadata.xml
+++ b/games-strategy/freeorion/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <longdescription lang="en">
   FreeOrion is a free, open source, turn-based space empire and
   galactic conquest (4X) computer game being designed and built by the


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2022-07-25  6:11 Ionen Wolkens
  0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-07-25  6:11 UTC (permalink / raw
  To: gentoo-commits

commit:     3246c00209ab6bab765ac17df147005b2e24e8ee
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 01:59:37 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 06:11:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3246c002

games-strategy/freeorion: revbump with misc ebuild updates

* run tests, but with a major exclusion until next bump (see src_test)
* use check-reqs for the early build ram usage spike
* use official release tarball for accurate Version.cpp, this also
  prevents use of git at build time for non-live
* remove unused bullet dependency (bug #846638) along with freealut
* unbundle dejavu/roboto fonts
* IUSE=doc for doxygen apidocs
* install ChangeLog.md
* drop unnecessary use of [X] on libsdl2 but keep on libglvnd for
  now as building tests is broken with =GLVND (next bump will use
  libOpenGL by default and has fixed building tests)
* drop env.d LDPATH file and use rpath as intended (formerly
  a workaround for insecure runpaths because ebuild used dobin
  rather than cmake, but hasn't been like that in a while)

Closes: https://bugs.gentoo.org/846638
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/freeorion/Manifest                  |   1 +
 .../freeorion/freeorion-0.4.10.2-r1.ebuild         | 117 +++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 4a872343e2a4..199410a08934 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-0.4.10.2.tar.gz 124720711 BLAKE2B 4f707b5296bdbc05b2b775b62f0393d1770bcf64c48f08d3332fbbb4b78e1bdc3e8111a1e421a8d0f0e03ca7454bba981809b9486d3d803e39faf042f1145059 SHA512 13832992efe17fe48615ccdf284d1e9f391c35ed518abd15276992128a02894f4b30c8fe3d950e41935efb823cf834dc430330f0bcc6c9e91f13a3dea9812628

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
+}


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2022-07-25  6:11 Ionen Wolkens
  0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2022-07-25  6:11 UTC (permalink / raw
  To: gentoo-commits

commit:     63627009500213a3f055a4f9152b61f51e8c1605
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 03:10:36 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 06:11:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63627009

games-strategy/freeorion: sync and update live

changes on top of sync with 0.4.10.2-r1:
* no longer exclude SmokeTest* (currently everything passes)
* drop [X] on libglvnd (uses libOpenGL by default now)
* swap HEADLESS for CLIENT_GG (leaving experimental GODOT off for now)

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

 games-strategy/freeorion/freeorion-9999.ebuild | 118 ++++++++++++++++---------
 1 file changed, 78 insertions(+), 40 deletions(-)

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
 }


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2023-02-08 12:32 Ionen Wolkens
  0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2023-02-08 12:32 UTC (permalink / raw
  To: gentoo-commits

commit:     3fc7c92a9670caf986a459d870f6c6f6d11e55bf
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  8 11:10:28 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Feb  8 12:31:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc7c92a

games-strategy/freeorion: enable py3.11

Upon closer look this seem to work fine now? Crashed at start when
last tried it and hadn't took the time to investigate further
(perhaps was an issue with python 3.11 betas).

Other distros are already using this with 3.11 and upstream tests
it with it too (albeit only cmake tests, they only run pytest bits
with 3.7 and 3.10 currently).

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

 games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild | 8 ++++++--
 games-strategy/freeorion/freeorion-9999.ebuild        | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild
index 6744b4443595..be201e6b862d 100644
--- a/games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-# note: py3.11 is known failing at runtime with this version
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit check-reqs cmake multiprocessing python-single-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
@@ -96,6 +95,11 @@ src_test() {
 	# 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
 }
 

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index d95c1dfd5b18..044eca4aa766 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit check-reqs cmake multiprocessing python-single-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
@@ -94,6 +94,11 @@ src_compile() {
 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
+		default/python/tests/AI/save_game_codec/test_savegame_manager.py::test_setstate_call
+	)
+
 	epytest -o cache_dir="${T}"/pytest_cache default/python/tests
 }
 


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2023-02-08 13:45 Ionen Wolkens
  0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2023-02-08 13:45 UTC (permalink / raw
  To: gentoo-commits

commit:     a28ffd1f9d3f4e4220217e998b4824e7a471935e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  8 13:22:56 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Feb  8 13:45:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a28ffd1f

games-strategy/freeorion: fix epytest deselect in live

conftest.py changed and requires dropping the default/python bit
even though pytest reports the full path in test output

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

 games-strategy/freeorion/freeorion-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 044eca4aa766..7445d5c039df 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -96,7 +96,7 @@ src_test() {
 
 	local EPYTEST_DESELECT=(
 		# broken with 3.11 but is not known to cause issues, just skip for now
-		default/python/tests/AI/save_game_codec/test_savegame_manager.py::test_setstate_call
+		tests/AI/save_game_codec/test_savegame_manager.py::test_setstate_call
 	)
 
 	epytest -o cache_dir="${T}"/pytest_cache default/python/tests


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2024-05-05 23:44 Ionen Wolkens
  0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2024-05-05 23:44 UTC (permalink / raw
  To: gentoo-commits

commit:     8338ad99feb3263b45d1ac7342126e3a06a5695b
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun May  5 20:40:22 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun May  5 23:43:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8338ad99

games-strategy/freeorion: drop 0.4.10.2-r1

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

 games-strategy/freeorion/Manifest                  |   1 -
 .../freeorion/freeorion-0.4.10.2-r1.ebuild         | 121 ---------------------
 2 files changed, 122 deletions(-)

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


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2024-05-05 23:44 Ionen Wolkens
  0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2024-05-05 23:44 UTC (permalink / raw
  To: gentoo-commits

commit:     1d963d8e8907e5c9d3ddc2795b6266e3c13b6368
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun May  5 22:10:24 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun May  5 23:43:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d963d8e

games-strategy/freeorion: add 0.5.0.1, enable py3.12

Tests pass (for me) with all python versions, albeit there is
bug #904124 that implies they may not and unsure what it is
about. Will see if CI can reproduce again with this I guess.

Other changes:
- replace ccache patch by a cmake option
- drop the check directory wrt bug #904124 to ensure no flaky
  behavior if dependencies are found
- filter-lto for now due to: DesignWnd.cpp:43:8: error: type
'struct Availability' violates the C++ One Definition Rule
  (this was an issue in 0.5 as well)

Bug: https://bugs.gentoo.org/904124
Closes: https://bugs.gentoo.org/929597
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/freeorion/Manifest                 |   1 +
 games-strategy/freeorion/freeorion-0.5.0.1.ebuild | 119 ++++++++++++++++++++++
 2 files changed, 120 insertions(+)

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

diff --git a/games-strategy/freeorion/freeorion-0.5.0.1.ebuild b/games-strategy/freeorion/freeorion-0.5.0.1.ebuild
new file mode 100644
index 000000000000..29b1188c6e9f
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.5.0.1.ebuild
@@ -0,0 +1,119 @@
+# 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}]') )
+"
+
+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? 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] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2024-05-05 23:44 Ionen Wolkens
  0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2024-05-05 23:44 UTC (permalink / raw
  To: gentoo-commits

commit:     454cc818b3c973e8cec9bd387affc0d32c454718
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun May  5 20:42:15 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun May  5 23:43:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=454cc818

games-strategy/freeorion: drop 9999

There is not much interest in maintaining live ebuilds
for games in general, maybe if this had a more dedicated
maintainer.

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

 games-strategy/freeorion/freeorion-9999.ebuild | 123 -------------------------
 1 file changed, 123 deletions(-)

diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
deleted file mode 100644
index 7bf2bf981654..000000000000
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ /dev/null
@@ -1,123 +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
-	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-text/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
-}


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2024-05-26 14:52 Ionen Wolkens
  0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2024-05-26 14:52 UTC (permalink / raw
  To: gentoo-commits

commit:     2e84fcf1c3010ecf7210ab8cf115c5c9009e89ee
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 14:49:49 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun May 26 14:51:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e84fcf1

games-strategy/freeorion: limit to <boost-1.85 for now

No need for revbump given binding operator sorts it out for us.

Bug: https://bugs.gentoo.org/932780
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/freeorion/freeorion-0.5.0.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-strategy/freeorion/freeorion-0.5.0.1.ebuild b/games-strategy/freeorion/freeorion-0.5.0.1.ebuild
index 29b1188c6e9f..7f69517f40d8 100644
--- a/games-strategy/freeorion/freeorion-0.5.0.1.ebuild
+++ b/games-strategy/freeorion/freeorion-0.5.0.1.ebuild
@@ -18,9 +18,10 @@ IUSE="+client doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
+# bug #932780 wrt boost upper bound
 DEPEND="
 	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-libs/boost:=[${PYTHON_USEDEP},nls,python]')
+	$(python_gen_cond_dep '<dev-libs/boost-1.85:=[${PYTHON_USEDEP},nls,python]')
 	sys-libs/zlib:=
 	client? (
 		media-libs/freetype


^ permalink raw reply related	[flat|nested] 37+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
@ 2024-06-01  5:32 Ionen Wolkens
  0 siblings, 0 replies; 37+ messages in thread
From: Ionen Wolkens @ 2024-06-01  5:32 UTC (permalink / raw
  To: gentoo-commits

commit:     5bcbe7a421e108bfea3b77723040f37d87741dae
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 05:28:23 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 05:31:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bcbe7a4

games-strategy/freeorion: limit boost workaround to 1.85.0

Been confirmed that the issue is in boost itself, so there's
no reason to always do this. Odds are will be fixed if there
is a -r1 too, so preemptively limit to -r0 too.

Bug: https://bugs.gentoo.org/932780
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild b/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild
index 60ff58559cb2..f7d5cad3ef66 100644
--- a/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild
+++ b/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild
@@ -78,9 +78,12 @@ src_prepare() {
 }
 
 src_configure() {
-	append-flags -fno-strict-aliasing #932780
 	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)


^ permalink raw reply related	[flat|nested] 37+ messages in thread

end of thread, other threads:[~2024-06-01  5:32 UTC | newest]

Thread overview: 37+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-25  8:55 [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/ Thomas Kahle
  -- strict thread matches above, loose matches on Subject: below --
2024-06-01  5:32 Ionen Wolkens
2024-05-26 14:52 Ionen Wolkens
2024-05-05 23:44 Ionen Wolkens
2024-05-05 23:44 Ionen Wolkens
2024-05-05 23:44 Ionen Wolkens
2023-02-08 13:45 Ionen Wolkens
2023-02-08 12:32 Ionen Wolkens
2022-07-25  6:11 Ionen Wolkens
2022-07-25  6:11 Ionen Wolkens
2022-07-24 15:03 Ionen Wolkens
2022-07-24 15:03 Ionen Wolkens
2022-05-14  2:32 Sam James
2022-05-14  2:32 Sam James
2021-07-01 16:02 Adam Feldman
2021-07-01 16:02 Adam Feldman
2021-06-18 19:18 David Seifert
2020-10-12  3:19 Adam Feldman
2020-10-06 18:12 Adam Feldman
2020-05-09 15:31 Adam Feldman
2020-04-09 20:55 Adam Feldman
2020-04-09 20:55 Adam Feldman
2020-02-09 16:25 Michał Górny
2019-08-12 19:58 Michał Górny
2019-05-11  8:24 Andreas Sturmlechner
2019-05-11  8:24 Andreas Sturmlechner
2019-04-23 10:05 Lars Wendler
2018-03-27  4:06 NP Hardass
2017-12-08  0:35 NP Hardass
2017-12-04  6:27 NP Hardass
2017-09-13 19:48 NP Hardass
2017-05-07  6:36 NP Hardass
2017-04-26 18:43 NP Hardass
2017-04-25 18:58 NP Hardass
2017-03-16  4:24 NP Hardass
2017-03-16  4:24 NP Hardass
2015-09-29 12:16 Thomas Kahle

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