[gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/, games-strategy/freeorion/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/, games-strategy/freeorion/files/
@ 2016-08-21 16:06 Thomas Kahle
  0 siblings, 0 replies; 7+ messages in thread
From: Thomas Kahle @ 2016-08-21 16:06 UTC (permalink / raw
  To: gentoo-commits

commit:     fb2b8d78ac7b8c63f10efa41e259a083d08f0b60
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 21 16:05:50 2016 +0000
Commit:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 16:06:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb2b8d78

games-strategy/freeorion: remove old

Package-Manager: portage-2.3.0

 games-strategy/freeorion/Manifest                  |  1 -
 .../files/freeorion-0.4.5_pre-boost-1.57.patch     | 32 -------
 .../files/freeorion-0.4.5_pre-boost-1.58.patch     | 57 -------------
 .../freeorion/freeorion-0.4.5_pre.ebuild           | 97 ----------------------
 4 files changed, 187 deletions(-)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index afb73ba..a6625dd 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,2 +1 @@
 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/files/freeorion-0.4.5_pre-boost-1.57.patch b/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch
deleted file mode 100644
index 73e9b4b..0000000
--- a/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d963b4883c9be2911d791e7daa3ed0f495bc5181 Mon Sep 17 00:00:00 2001
-From: Dilvish-fo <dilvish.fo@gmail.com>
-Date: Sat, 11 Apr 2015 10:25:55 -0700
-Subject: [PATCH] work-around for a boost 1.57 bug (missing a shard_ptr
- serialization include)
-
----
- util/Process.h | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/util/Process.h b/util/Process.h
-index ff72445..f9927cc 100644
---- a/util/Process.h
-+++ b/util/Process.h
-@@ -3,12 +3,16 @@
- #define _Process_h_
- 
- // HACK: The following two includes work around a bug in boost 1.56,
--// which uses them without including. They can be removed once the bug is gone.
-+// which uses them without including.
- #include <boost/version.hpp>
- #if BOOST_VERSION == 105600
- #include <boost/serialization/singleton.hpp> // This
- #include <boost/serialization/extended_type_info.hpp> //This
- #endif
-+// HACK: For a similar boost 1.57 bug
-+#if BOOST_VERSION == 105700
-+#include <boost/serialization/type_info_implementation.hpp> // This
-+#endif
- 
- #include <boost/serialization/shared_ptr.hpp>
- 

diff --git a/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch b/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch
deleted file mode 100644
index 3044c81..0000000
--- a/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 8cb623ceecaf00e29f273225eb37602e26e1a6d0 Mon Sep 17 00:00:00 2001
-From: Dilvish-fo <dilvish.fo@gmail.com>
-Date: Sat, 6 Jun 2015 08:04:56 -0700
-Subject: [PATCH] workarounds for missing includes with boost 1.58
-
----
- util/Process.h     | 6 ++++++
- util/Serialize.ipp | 9 ++++++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/util/Process.h b/util/Process.h
-index f9927cc..25cec56 100644
---- a/util/Process.h
-+++ b/util/Process.h
-@@ -14,6 +14,12 @@
- #include <boost/serialization/type_info_implementation.hpp> // This
- #endif
- 
-+#if BOOST_VERSION == 105800
-+// HACK: The following two includes work around a bug in boost 1.58
-+#include <boost/serialization/type_info_implementation.hpp>
-+#include <boost/archive/basic_archive.hpp>
-+#endif
-+
- #include <boost/serialization/shared_ptr.hpp>
- 
- #include <vector>
-diff --git a/util/Serialize.ipp b/util/Serialize.ipp
-index b4027b2..c3c87db 100644
---- a/util/Serialize.ipp
-+++ b/util/Serialize.ipp
-@@ -1,17 +1,24 @@
-+// -*- C++ -*-
- #if defined(_MSC_VER) && defined(int64_t)
- #undef int64_t
- #endif
- 
- #include <boost/static_assert.hpp>
- #include <boost/detail/endian.hpp>
-+#include <boost/version.hpp>
- 
- #if BOOST_VERSION == 105600
- // HACK: The following two includes work around a bug in boost 1.56,
--// which uses them without including. They can be removed once the bug is gone.
- #include <boost/serialization/singleton.hpp> // This
- #include <boost/serialization/extended_type_info.hpp> //This
- #endif
- 
-+#if BOOST_VERSION == 105800
-+// HACK: The following two includes work around a bug in boost 1.58
-+#include <boost/serialization/type_info_implementation.hpp>
-+#include <boost/archive/basic_archive.hpp>
-+#endif
-+
- #include <boost/serialization/export.hpp>
- #include <boost/serialization/deque.hpp>
- #include <boost/serialization/list.hpp>

diff --git a/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild b/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild
deleted file mode 100644
index 3a41970..0000000
--- a/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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://dev.gentoo.org/~tomka/files/${P}.tar.bz2"
-
-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_prepare() {
-
-	epatch "${FILESDIR}/${P}-boost-1.57.patch"
-	epatch "${FILESDIR}/${P}-boost-1.58.patch"
-
-	# parse subdir sets -O3
-	sed -e "s:-O3::" -i parse/CMakeLists.txt
-
-	# 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] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/, games-strategy/freeorion/files/
@ 2016-08-21 16:06 Thomas Kahle
  0 siblings, 0 replies; 7+ messages in thread
From: Thomas Kahle @ 2016-08-21 16:06 UTC (permalink / raw
  To: gentoo-commits

commit:     4bb0ba67db279793e842530e5dee7adcbec06ea7
Author:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 21 16:04:56 2016 +0000
Commit:     Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 16:06:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bb0ba67

games-strategy/freeorion: Fix boost-1.61 compat

Fixes bug 584354, thanks Markus Oehme

Package-Manager: portage-2.3.0

 .../files/freeorion-0.4.5-boost-1.61.patch         | 137 +++++++++++++++++++++
 games-strategy/freeorion/freeorion-0.4.5-r1.ebuild | 101 +++++++++++++++
 2 files changed, 238 insertions(+)

diff --git a/games-strategy/freeorion/files/freeorion-0.4.5-boost-1.61.patch b/games-strategy/freeorion/files/freeorion-0.4.5-boost-1.61.patch
new file mode 100644
index 0000000..fbd3728
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion-0.4.5-boost-1.61.patch
@@ -0,0 +1,137 @@
+From 0a0bfecac11ec376263815f559e4b1b33ff6b4c3 Mon Sep 17 00:00:00 2001
+From: "Markus (root)" <mo@wurzel.org>
+Date: Thu, 21 Jul 2016 21:15:20 +0200
+Subject: [PATCH] Make destructors public
+
+---
+ universe/Building.h | 2 +-
+ universe/Field.h    | 2 +-
+ universe/Fleet.h    | 2 +-
+ universe/Planet.h   | 2 +-
+ universe/Ship.h     | 2 +-
+ universe/System.h   | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/universe/Building.h b/universe/Building.h
+index 2cb59b0..dec0080 100644
+--- a/universe/Building.h
++++ b/universe/Building.h
+@@ -52,6 +52,7 @@ public:
+ 
+     virtual void    ResetTargetMaxUnpairedMeters();
+     //@}
++    ~Building() {}
+ 
+ protected:
+     friend class Universe;
+@@ -68,7 +69,6 @@ protected:
+ 
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+-    ~Building() {}
+ 
+     virtual Building*       Clone(int empire_id = ALL_EMPIRES) const;   ///< returns new copy of this Building
+     //@}
+diff --git a/universe/Field.h b/universe/Field.h
+index 5b30bb3..f193710 100644
+--- a/universe/Field.h
++++ b/universe/Field.h
+@@ -39,6 +39,7 @@ public:
+ 
+     virtual void                ResetTargetMaxUnpairedMeters();
+     //@}
++    ~Field() {}
+ 
+ protected:
+     friend class Universe;
+@@ -48,7 +49,6 @@ protected:
+     
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+-    ~Field() {}
+ 
+     virtual Field*              Clone(int empire_id = ALL_EMPIRES) const;   ///< returns new copy of this Field
+     //@}
+diff --git a/universe/Fleet.h b/universe/Fleet.h
+index f133af0..ac602ac 100644
+--- a/universe/Fleet.h
++++ b/universe/Fleet.h
+@@ -129,6 +129,7 @@ public:
+     static const int            ETA_NEVER;                                  ///< returned by ETA when fleet can't reach destination due to lack of route or inability to move
+     static const int            ETA_UNKNOWN;                                ///< returned when ETA can't be determined
+     static const int            ETA_OUT_OF_RANGE;                           ///< returned by ETA when fleet can't reach destination due to insufficient fuel capacity and lack of fleet resupply on route
++    ~Fleet() {}
+ 
+ protected:
+     friend class Universe;
+@@ -150,7 +151,6 @@ protected:
+ 
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+-    ~Fleet() {}
+ 
+     virtual Fleet*          Clone(int empire_id = ALL_EMPIRES) const;  ///< returns new copy of this Fleet
+     //@}
+diff --git a/universe/Planet.h b/universe/Planet.h
+index cece39a..233d31f 100644
+--- a/universe/Planet.h
++++ b/universe/Planet.h
+@@ -176,6 +176,7 @@ public:
+     //@}
+ 
+     static int      TypeDifference(PlanetType type1, PlanetType type2);
++    ~Planet() {}
+ 
+ protected:
+     friend class Universe;
+@@ -187,7 +188,6 @@ protected:
+ 
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+-    ~Planet() {}
+ 
+     virtual Planet*         Clone(int empire_id = ALL_EMPIRES) const;  ///< returns new copy of this Planet
+     //@}
+diff --git a/universe/Ship.h b/universe/Ship.h
+index 5e9eabb..76fac51 100644
+--- a/universe/Ship.h
++++ b/universe/Ship.h
+@@ -86,6 +86,7 @@ public:
+ 
+     virtual void    ResetTargetMaxUnpairedMeters();
+     //@}
++    ~Ship() {}
+ 
+ protected:
+     friend class Universe;
+@@ -96,7 +97,6 @@ protected:
+ 
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+-    ~Ship() {}
+ 
+     virtual Ship*   Clone(int empire_id = ALL_EMPIRES) const;   ///< returns new copy of this Ship
+     //@}
+diff --git a/universe/System.h b/universe/System.h
+index c92fed4..471c27e 100644
+--- a/universe/System.h
++++ b/universe/System.h
+@@ -110,6 +110,7 @@ public:
+ 
+     virtual void            ResetTargetMaxUnpairedMeters();
+     //@}
++    ~System() {}
+ 
+ protected:
+     friend class Universe;
+@@ -133,7 +134,6 @@ protected:
+ 
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+-    ~System() {}
+ 
+     virtual System*         Clone(int empire_id = ALL_EMPIRES) const;   ///< returns new copy of this System
+     //@}
+-- 
+2.9.2
+

diff --git a/games-strategy/freeorion/freeorion-0.4.5-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.5-r1.ebuild
new file mode 100644
index 0000000..09b81dd
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.5-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 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/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
+	epatch "${FILESDIR}/${P}-boost-1.61.patch"
+
+	# 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
+		)
+
+	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
+
+	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] 7+ messages in thread

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

commit:     45364b45d8cf2d91af09c5542e9e6db6de293c68
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 09:53:59 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 04:24:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45364b45

games-strategy/freeorion: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-strategy/freeorion/Manifest                  |   1 -
 .../files/freeorion-0.4.5-boost-1.61.patch         | 137 ---------------------
 games-strategy/freeorion/freeorion-0.4.5-r1.ebuild | 100 ---------------
 games-strategy/freeorion/freeorion-0.4.5.ebuild    |  98 ---------------
 4 files changed, 336 deletions(-)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index ae869d04196..aa7542cc37f 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,2 +1 @@
-DIST freeorion-0.4.5.tar.gz 133309719 SHA256 3b99b92eeac72bd059566dbabfab54368989ba83f72e769bc94eb8dd4fe414c0 SHA512 4107b3019a19f970e7a7df595940a95ad411cbe9572c88b9561de0a2612e107bb654eb3e87a53062f6d969383f4363d7710556d6ba0ae4943c92931be9b650c1 WHIRLPOOL e7488f8d336f36df2d2bf51ab32cd3b2e62eb1c2b1e80596100806f8da1e9064556ccbfa196b77b594f58565e3466a40b7347f3962df4ebe62a1f2c8f9e429fe
 DIST freeorion-0.4.6.tar.gz 145720274 SHA256 3e3ff3a758c8a1ffa71773dff18faff2c792051bb5162758b5f5b8ea59e8e311 SHA512 0488e36286358e8db2dcfe0cdae68e4638388fd2d4c627a258cdecf0afd57e9dbac03111f7683c3ef22edecbedd197a172d177400ddbb585a50f34804a50c50a WHIRLPOOL 30d56a2ca76158168492aa0d1b3fe5a9f164afd7dc378128fe2796ce149a9d65a64cd10c41c5b6c1510773e9ead564dff452869e6c384d949cd0789a51198b6c

diff --git a/games-strategy/freeorion/files/freeorion-0.4.5-boost-1.61.patch b/games-strategy/freeorion/files/freeorion-0.4.5-boost-1.61.patch
deleted file mode 100644
index fbd37280ba4..00000000000
--- a/games-strategy/freeorion/files/freeorion-0.4.5-boost-1.61.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 0a0bfecac11ec376263815f559e4b1b33ff6b4c3 Mon Sep 17 00:00:00 2001
-From: "Markus (root)" <mo@wurzel.org>
-Date: Thu, 21 Jul 2016 21:15:20 +0200
-Subject: [PATCH] Make destructors public
-
----
- universe/Building.h | 2 +-
- universe/Field.h    | 2 +-
- universe/Fleet.h    | 2 +-
- universe/Planet.h   | 2 +-
- universe/Ship.h     | 2 +-
- universe/System.h   | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/universe/Building.h b/universe/Building.h
-index 2cb59b0..dec0080 100644
---- a/universe/Building.h
-+++ b/universe/Building.h
-@@ -52,6 +52,7 @@ public:
- 
-     virtual void    ResetTargetMaxUnpairedMeters();
-     //@}
-+    ~Building() {}
- 
- protected:
-     friend class Universe;
-@@ -68,7 +69,6 @@ protected:
- 
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
--    ~Building() {}
- 
-     virtual Building*       Clone(int empire_id = ALL_EMPIRES) const;   ///< returns new copy of this Building
-     //@}
-diff --git a/universe/Field.h b/universe/Field.h
-index 5b30bb3..f193710 100644
---- a/universe/Field.h
-+++ b/universe/Field.h
-@@ -39,6 +39,7 @@ public:
- 
-     virtual void                ResetTargetMaxUnpairedMeters();
-     //@}
-+    ~Field() {}
- 
- protected:
-     friend class Universe;
-@@ -48,7 +49,6 @@ protected:
-     
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
--    ~Field() {}
- 
-     virtual Field*              Clone(int empire_id = ALL_EMPIRES) const;   ///< returns new copy of this Field
-     //@}
-diff --git a/universe/Fleet.h b/universe/Fleet.h
-index f133af0..ac602ac 100644
---- a/universe/Fleet.h
-+++ b/universe/Fleet.h
-@@ -129,6 +129,7 @@ public:
-     static const int            ETA_NEVER;                                  ///< returned by ETA when fleet can't reach destination due to lack of route or inability to move
-     static const int            ETA_UNKNOWN;                                ///< returned when ETA can't be determined
-     static const int            ETA_OUT_OF_RANGE;                           ///< returned by ETA when fleet can't reach destination due to insufficient fuel capacity and lack of fleet resupply on route
-+    ~Fleet() {}
- 
- protected:
-     friend class Universe;
-@@ -150,7 +151,6 @@ protected:
- 
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
--    ~Fleet() {}
- 
-     virtual Fleet*          Clone(int empire_id = ALL_EMPIRES) const;  ///< returns new copy of this Fleet
-     //@}
-diff --git a/universe/Planet.h b/universe/Planet.h
-index cece39a..233d31f 100644
---- a/universe/Planet.h
-+++ b/universe/Planet.h
-@@ -176,6 +176,7 @@ public:
-     //@}
- 
-     static int      TypeDifference(PlanetType type1, PlanetType type2);
-+    ~Planet() {}
- 
- protected:
-     friend class Universe;
-@@ -187,7 +188,6 @@ protected:
- 
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
--    ~Planet() {}
- 
-     virtual Planet*         Clone(int empire_id = ALL_EMPIRES) const;  ///< returns new copy of this Planet
-     //@}
-diff --git a/universe/Ship.h b/universe/Ship.h
-index 5e9eabb..76fac51 100644
---- a/universe/Ship.h
-+++ b/universe/Ship.h
-@@ -86,6 +86,7 @@ public:
- 
-     virtual void    ResetTargetMaxUnpairedMeters();
-     //@}
-+    ~Ship() {}
- 
- protected:
-     friend class Universe;
-@@ -96,7 +97,6 @@ protected:
- 
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
--    ~Ship() {}
- 
-     virtual Ship*   Clone(int empire_id = ALL_EMPIRES) const;   ///< returns new copy of this Ship
-     //@}
-diff --git a/universe/System.h b/universe/System.h
-index c92fed4..471c27e 100644
---- a/universe/System.h
-+++ b/universe/System.h
-@@ -110,6 +110,7 @@ public:
- 
-     virtual void            ResetTargetMaxUnpairedMeters();
-     //@}
-+    ~System() {}
- 
- protected:
-     friend class Universe;
-@@ -133,7 +134,6 @@ protected:
- 
-     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
-     template <class T> friend void boost::checked_delete(T* x);
--    ~System() {}
- 
-     virtual System*         Clone(int empire_id = ALL_EMPIRES) const;   ///< returns new copy of this System
-     //@}
--- 
-2.9.2
-

diff --git a/games-strategy/freeorion/freeorion-0.4.5-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.5-r1.ebuild
deleted file mode 100644
index 05b2aef5c3f..00000000000
--- a/games-strategy/freeorion/freeorion-0.4.5-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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=""
-
-# 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/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
-	epatch "${FILESDIR}/${P}-boost-1.61.patch"
-
-	# 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
-		)
-
-	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
-
-	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
-}

diff --git a/games-strategy/freeorion/freeorion-0.4.5.ebuild b/games-strategy/freeorion/freeorion-0.4.5.ebuild
deleted file mode 100644
index bce4e134fb0..00000000000
--- a/games-strategy/freeorion/freeorion-0.4.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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=""
-
-# 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] 7+ messages in thread

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

commit:     bed9b713e4365156fa6193cfdaf2940b773c0980
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 09:52:49 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 04:24:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bed9b713

games-strategy/freeorion: Bump to 0.4.6, #596680

Big cleanup, drop games.eclass, bump to EAPI=6,
add GLEW dep (#603390)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-strategy/freeorion/Manifest                  |   1 +
 .../files/freeorion-0.4.6-boost-1.62.patch         | 123 +++++++++++++++++++++
 games-strategy/freeorion/files/freeorion.envd      |   1 +
 games-strategy/freeorion/freeorion-0.4.6.ebuild    |  83 ++++++++++++++
 4 files changed, 208 insertions(+)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index a6625dd145f..ae869d04196 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.6.tar.gz 145720274 SHA256 3e3ff3a758c8a1ffa71773dff18faff2c792051bb5162758b5f5b8ea59e8e311 SHA512 0488e36286358e8db2dcfe0cdae68e4638388fd2d4c627a258cdecf0afd57e9dbac03111f7683c3ef22edecbedd197a172d177400ddbb585a50f34804a50c50a WHIRLPOOL 30d56a2ca76158168492aa0d1b3fe5a9f164afd7dc378128fe2796ce149a9d65a64cd10c41c5b6c1510773e9ead564dff452869e6c384d949cd0789a51198b6c

diff --git a/games-strategy/freeorion/files/freeorion-0.4.6-boost-1.62.patch b/games-strategy/freeorion/files/freeorion-0.4.6-boost-1.62.patch
new file mode 100644
index 00000000000..5d5fa8bc45f
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion-0.4.6-boost-1.62.patch
@@ -0,0 +1,123 @@
+From 6b971f65dbef4614cd0c9020bcc6670d3f11b961 Mon Sep 17 00:00:00 2001
+From: geoffthemedio <geoffthemedio@gmail.com>
+Date: Thu, 20 Oct 2016 13:27:23 +0200
+Subject: [PATCH] Made Boost version-specific changes more flexible, as they
+ reportedly are needed for 1.62 as well.
+
+---
+ universe/Building.h | 4 ++--
+ universe/Field.h    | 4 ++--
+ universe/Fleet.h    | 4 ++--
+ universe/Planet.h   | 4 ++--
+ universe/Ship.h     | 4 ++--
+ universe/System.h   | 4 ++--
+ 6 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/universe/Building.h b/universe/Building.h
+index 18d4810..b34f400 100644
+--- a/universe/Building.h
++++ b/universe/Building.h
+@@ -69,11 +69,11 @@ class FO_COMMON_API Building : public UniverseObject {
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+ 
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ public:
+ #endif
+     ~Building() {}
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ protected:
+ #endif
+ 
+diff --git a/universe/Field.h b/universe/Field.h
+index f1d454e..5cf67c1 100644
+--- a/universe/Field.h
++++ b/universe/Field.h
+@@ -48,11 +48,11 @@ class FO_COMMON_API Field : public UniverseObject {
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+ 
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ public:
+ #endif
+     ~Field() {}
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ protected:
+ #endif
+ 
+diff --git a/universe/Fleet.h b/universe/Fleet.h
+index a6a1fe0..7b5121c 100644
+--- a/universe/Fleet.h
++++ b/universe/Fleet.h
+@@ -150,11 +150,11 @@ class FO_COMMON_API Fleet : public UniverseObject {
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+ 
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ public:
+ #endif
+     ~Fleet() {}
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ protected:
+ #endif
+ 
+diff --git a/universe/Planet.h b/universe/Planet.h
+index 3b3848e..267e2b1 100644
+--- a/universe/Planet.h
++++ b/universe/Planet.h
+@@ -128,11 +128,11 @@ class FO_COMMON_API Planet :
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+ 
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ public:
+ #endif
+     ~Planet() {}
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ protected:
+ #endif
+ 
+diff --git a/universe/Ship.h b/universe/Ship.h
+index 4881086..db0d5d7 100644
+--- a/universe/Ship.h
++++ b/universe/Ship.h
+@@ -104,11 +104,11 @@ class FO_COMMON_API Ship : public UniverseObject {
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+ 
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ public:
+ #endif
+     ~Ship() {}
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ protected:
+ #endif
+ 
+diff --git a/universe/System.h b/universe/System.h
+index 1563347..47ee4f1 100644
+--- a/universe/System.h
++++ b/universe/System.h
+@@ -134,11 +134,11 @@ class FO_COMMON_API System : public UniverseObject {
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+ 
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ public:
+ #endif
+     ~System() {}
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ protected:
+ #endif
+ 

diff --git a/games-strategy/freeorion/files/freeorion.envd b/games-strategy/freeorion/files/freeorion.envd
new file mode 100644
index 00000000000..182c707cb00
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion.envd
@@ -0,0 +1 @@
+LDPATH="/usr/lib64/freeorion:/usr/lib32/freeorion:/usr/lib/freeorion"

diff --git a/games-strategy/freeorion/freeorion-0.4.6.ebuild b/games-strategy/freeorion/freeorion-0.4.6.ebuild
new file mode 100644
index 00000000000..cd26c01d3e8
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.6.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"
+
+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
+}


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

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/, games-strategy/freeorion/files/
@ 2022-08-07 13:59 Ionen Wolkens
  0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2022-08-07 13:59 UTC (permalink / raw
  To: gentoo-commits

commit:     022a2c16311cedefb6608cb5cd25c3330efab6fc
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  7 13:38:59 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Aug  7 13:59:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=022a2c16

games-strategy/freeorion: drop 0.4.10.2-r0

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

 games-strategy/freeorion/Manifest                  |  1 -
 games-strategy/freeorion/files/freeorion.envd      |  1 -
 games-strategy/freeorion/freeorion-0.4.10.2.ebuild | 77 ----------------------
 3 files changed, 79 deletions(-)

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

diff --git a/games-strategy/freeorion/files/freeorion.envd b/games-strategy/freeorion/files/freeorion.envd
deleted file mode 100644
index 182c707cb002..000000000000
--- a/games-strategy/freeorion/files/freeorion.envd
+++ /dev/null
@@ -1 +0,0 @@
-LDPATH="/usr/lib64/freeorion:/usr/lib32/freeorion:/usr/lib/freeorion"

diff --git a/games-strategy/freeorion/freeorion-0.4.10.2.ebuild b/games-strategy/freeorion/freeorion-0.4.10.2.ebuild
deleted file mode 100644
index 8931083dbe88..000000000000
--- a/games-strategy/freeorion/freeorion-0.4.10.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake python-single-r1 xdg
-
-DESCRIPTION="A free turn-based space empire and galactic conquest game"
-HOMEPAGE="https://www.freeorion.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
-else
-	KEYWORDS="~amd64"
-	if [[ ${PV} = *_p* ]]; then
-		COMMIT=""
-		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN}-${COMMIT}"
-	else
-		SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN}-${PV/_/-}"
-	fi
-fi
-
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-IUSE="dedicated"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.60:=[nls,python,threads(+),${PYTHON_USEDEP}]
-	')
-	!dedicated? (
-		media-libs/freealut
-		>=media-libs/freetype-2.5.5
-		media-libs/glew:=
-		>=media-libs/libogg-1.1.3
-		media-libs/libpng:0=
-		media-libs/libsdl2[X,opengl,video]
-		>=media-libs/libvorbis-1.1.2
-		media-libs/openal
-		sci-physics/bullet:=
-		virtual/opengl
-	)
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s/-O3//" -i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_HEADLESS="$(usex dedicated)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
-}


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

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

commit:     1e41c8a67c618b551d3812c11e0f4a905692e3a4
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 20:02:56 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun May 12 20:02:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e41c8a6

games-strategy/freeorion: drop 0.5

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

 games-strategy/freeorion/Manifest                  |   1 -
 .../freeorion/files/freeorion-0.5-ccache.patch     |  18 ---
 games-strategy/freeorion/freeorion-0.5.ebuild      | 123 ---------------------
 3 files changed, 142 deletions(-)

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 855ea24f8f6f..25410153d695 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,2 +1 @@
 DIST FreeOrion_v0.5.0.1_Source.tar.gz 152861158 BLAKE2B 6924d4916fcd3ac93e7498b5247957a6fb62b8523aa49114e9e11ef5e3b89374966551bc14192fa7928951728ce814fb86d89365beb97aa7c2bc84408bfcadd2 SHA512 dc267231329f0615f12887f22139d57a2611f378e17e8b0f26c00efdb77e73ef737ff875350f805d34a07ca4ce0595758e4f61168878477ebbd92d0149bcdc22
-DIST FreeOrion_v0.5_Source.tar.gz 152861207 BLAKE2B 5263f9c2461db35b5283122889d0779f175af095e90eb782d21b6870193669b0307c2df95ebde78b3f762d2d0e1e1d8ec5f537bd44bf6810b9fbf76c58322172 SHA512 ec1247584d317ca0d0394d62754fd35b1d1212323e96e644c9efae422437daf63aac12c2798274993c9c29887fe73a51bfe11e9b53370dc261a0683efe312f19

diff --git a/games-strategy/freeorion/files/freeorion-0.5-ccache.patch b/games-strategy/freeorion/files/freeorion-0.5-ccache.patch
deleted file mode 100644
index dc289fa84ec9..000000000000
--- a/games-strategy/freeorion/files/freeorion-0.5-ccache.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,7 +30,6 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
- message(STATUS "Build type CMAKE_BUILD_TYPE set to ${CMAKE_BUILD_TYPE}")
- 
- include(UseCompilerCache)
--find_compiler_cache(PROGRAM ccache)
- 
- list(APPEND GODOT_CPP_CMAKE_VARS "CMAKE_BUILD_TYPE;CMAKE_CONFIGURATION_TYPES;CMAKE_TOOLCHAIN_FILE;PYTHON_EXECUTABLE")
- get_cmake_property(vars CACHE_VARIABLES)
-@@ -50,7 +49,6 @@ endforeach()
- 
- project(FreeOrion)
- 
--use_compiler_cache_with_xcode()
- 
- include(GNUInstallDirs)
- include(UseCodeCoverage)

diff --git a/games-strategy/freeorion/freeorion-0.5.ebuild b/games-strategy/freeorion/freeorion-0.5.ebuild
deleted file mode 100644
index 7bf2bf981654..000000000000
--- a/games-strategy/freeorion/freeorion-0.5.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] 7+ messages in thread

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

commit:     998fae593fd83b10e798c8fd9bbbad5b73ed7ac0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon May 27 15:30:44 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon May 27 15:51:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998fae59

games-strategy/freeorion: fix build+runtime w/ boost-1.85

Re-tested in a clean env and seems fine.

Hoping -fno-sa won't be permanent, but it'll do better
than an upper bound.

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

 .../files/freeorion-0.5.0.1-boost1.85.patch        | 57 ++++++++++++++++++++++
 ...-0.5.0.1.ebuild => freeorion-0.5.0.1-r1.ebuild} |  8 ++-
 2 files changed, 63 insertions(+), 2 deletions(-)

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

diff --git a/games-strategy/freeorion/freeorion-0.5.0.1.ebuild b/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild
similarity index 94%
rename from games-strategy/freeorion/freeorion-0.5.0.1.ebuild
rename to games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild
index 7f69517f40d8..60ff58559cb2 100644
--- a/games-strategy/freeorion/freeorion-0.5.0.1.ebuild
+++ b/games-strategy/freeorion/freeorion-0.5.0.1-r1.ebuild
@@ -18,10 +18,9 @@ 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-1.85:=[${PYTHON_USEDEP},nls,python]')
+	$(python_gen_cond_dep 'dev-libs/boost:=[${PYTHON_USEDEP},nls,python]')
 	sys-libs/zlib:=
 	client? (
 		media-libs/freetype
@@ -50,6 +49,10 @@ BDEPEND="
 	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-boost1.85.patch
+)
+
 freeorion_check-reqs() {
 	# cc1plus processes may suddenly use ~1.5GB all at once early on (2+GB
 	# if debug symbols) then far less for the rest, check minimal jobs*1.5
@@ -75,6 +78,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-flags -fno-strict-aliasing #932780
 	filter-lto # -Werror=odr issues
 
 	local mycmakeargs=(


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

end of thread, other threads:[~2024-05-27 15:52 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-21 16:06 [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/, games-strategy/freeorion/files/ Thomas Kahle
  -- strict thread matches above, loose matches on Subject: below --
2024-05-27 15:52 Ionen Wolkens
2024-05-12 20:25 Ionen Wolkens
2022-08-07 13:59 Ionen Wolkens
2017-03-16  4:24 NP Hardass
2017-03-16  4:24 NP Hardass
2016-08-21 16:06 Thomas Kahle

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