summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-strategy/freeorion')
-rw-r--r--games-strategy/freeorion/Manifest1
-rw-r--r--games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch32
-rw-r--r--games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch57
-rw-r--r--games-strategy/freeorion/freeorion-0.4.5_pre.ebuild97
4 files changed, 0 insertions, 187 deletions
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index afb73bab9493..a6625dd145f0 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 73e9b4b568a4..000000000000
--- 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 3044c81eb28f..000000000000
--- 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 3a41970126ca..000000000000
--- 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
-}