Fix compatibility with boost-1.5{7,8}

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

5 files changed, 107 insertions, 7 deletions

diff --git a/games-strategy/freeorion/ChangeLog b/games-strategy/freeorion/ChangeLog
index 837412f4dd72..ced20fcf1a62 100644
--- a/games-strategy/freeorion/ChangeLog
+++ b/games-strategy/freeorion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/freeorion
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/ChangeLog,v 1.16 2015/05/26 07:49:18 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/ChangeLog,v 1.17 2015/08/03 11:36:48 tomka Exp $
+
+  03 Aug 2015; Thomas Kahle <tomka@gentoo.org>
+  +files/freeorion-0.4.5_pre-boost-1.57.patch,
+  +files/freeorion-0.4.5_pre-boost-1.58.patch, freeorion-0.4.5_pre.ebuild:
+  Fix compatibility with boost-1.5{7,8}
 
   26 May 2015; Thomas Kahle <tomka@gentoo.org> freeorion-0.4.5_pre.ebuild:
   Add missing glew dependency (bug 550382)
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 580f9787f60a..34e9f246b80d 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX freeorion-0.4.5_pre-boost-1.57.patch 1052 SHA256 a50b37286a19236d148eebbd274893371d33679f46245d7a0a3bbfeb68200f04 SHA512 da1558b964a47a8e4b38169512d8f32a579a9f52d003224db94193361570d90cac408e21cb2d2d079f0f25f3e28aa88dcdd9bc3094a1373e83bbd9e7209de027 WHIRLPOOL 5a79a24d28cac0370302c987ef61ff48f02f4a988bb0b805a0bd29a7efcf6b9a6f9bf75048792c5fd29e4508463d094ae74d4a5f10f41e9f011a59562fb9990b
+AUX freeorion-0.4.5_pre-boost-1.58.patch 1816 SHA256 a99acea6a6cb03ff8a42db89d4f5f04864a044e714399160703b7cbbb0c03924 SHA512 1da6d2fecdd873e17a215e155e113ac29c0325b82a53461de7597978026412ca2fc9c94793e1888481f8d31584add0ed0f174c8010f08e3061754cb895d09fa0 WHIRLPOOL eb723d8964dbe3823a45d1bf665455e169cc67fee89d364605d16185071ed07a7fc3be3e10264babe0b5a18aa8c1b343c8a20ee96a2a5b3bb07d2ba52c41d480
 DIST freeorion-0.4.5_pre.tar.bz2 141068240 SHA256 a3d326a1fa05327cf23b14ef08672c0199fc08df15bb3679f579575115172b4a SHA512 33dc4a89264ccf8f146021d8b9dabc51f11e7869a5323effb7a783800db77f37ed27880c60c483dd83ea62bc9ea84872f53c25b4571ccdf13dc594bcb368b903 WHIRLPOOL 1229aefdc22b95c38e71a94f493026230e750948c37544f636d1a43030b96d487307a7a1885bb32d4ae697bc64f431b97323cb647eca516d3363898120528d0d
-EBUILD freeorion-0.4.5_pre.ebuild 2273 SHA256 059b6ce17c0bc745678d7d7d1dfb27a3f7019d05fc65c6b1da0bd7b1c64b519a SHA512 cdaa6372ab35fdd8ca77de008da8ec581a6520037c2668044c338d15ff2cda5311625f034316be60f44533100448015f72ed6503f39dfb2b5debcdd6dfaf25c1 WHIRLPOOL 28eb1380a168b76d53360e6c57b0ddbf41a340d2c5ab6a6044c62aaa5ea0fc7318a8819ad8a9737beb00cd91c56a0cd94139fb06311d5d0098cc02a042a97633
-MISC ChangeLog 3164 SHA256 3cf2c7b9b4a5cf4bc3859b3204648a0daf42196619284418f94af817a75f1d51 SHA512 3238ffaf20d887ae1202ee796b17c8e690514ce0f57324e3e84a3696b98007d8a96963c033642387135c8875bfdeff4aa2a5ab69e9f99ad184d9b811f881c63a WHIRLPOOL fb9599f941d48bcf01fc7c56c4230394b55488a61bbd3c53888674fabeca5529642f2cf4d4061809fc3435eaa500a2825dac84e528b1b2a74e51dd18da97d641
+EBUILD freeorion-0.4.5_pre.ebuild 2363 SHA256 13cd0a850a59bb546bbdc77edb7111e7d1740d779a9b2d2dc9274f1ea1fe3451 SHA512 31cb8bd2b96a197acbf71f87100f277dad702406502e52ecc1b2409a0dac2733a17370ea7babe0fc02d550d74ae9e7532333c5c838d4d10e05af404cc88dcc02 WHIRLPOOL 884bdc5a073dfe19cce3d1e910eb2df486d72e9148608458c7e004365323c70bf24006fde7bd532bac1591a781f6541ca98cbf32f256c3c54de079b5c7f23264
+MISC ChangeLog 3374 SHA256 18ce9858d6761ef419cff3f7952c1733da1c485208fa1a15bb5e484287fc3900 SHA512 21fa57d45d8f0cf006c93abf13ed3ff8b35b1e7f585429913897dabaf7471ad902dfaabc0c7edaae16e9bba9cb0e83a99d55628d887224911ba6b2e3ad5f3083 WHIRLPOOL 3ad2330df69a3cb6352898eb2666ab8be905f653dc1ef1d960b8a233da8a42f00d36f7d4645b48f975de7ce31aacee10b51e11c0660eb0e0ee1b2899c6d0ab8c
 MISC metadata.xml 657 SHA256 31922a4a89499c885b776d17fe427833212e76d80e78755fd202d252ee9120e4 SHA512 a00342cfa84144df06cc461da147a1211c79c6421a65dfe748e2c4ac30f4deab05eb96dc4843d2b6eb814e5df567adb3907e0e6ad0d4b2f4bf3cf387f92aff92 WHIRLPOOL aa131a7c6bcf66273a7c4d0a3a30a19bbbb135707b67359eb80a2a782b608dba169387dc479a1c72971310211ff75db0b41b9c98e50e2127251f6e088f8486ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlVkJkkACgkQid6yGVZcMrx1PAD+N8cPocl+8O7zlBh6j3V3fmD3
-tmjSO1cB91wyz5RXO7QA/jn8HMUmE2BTgZ28ZC/dvLjGOKfCNvmKhh7mPwwJgiHn
-=Qs73
+iF4EAREIAAYFAlW/UlQACgkQid6yGVZcMrwyNgD/aNqYNTLrG1zNUUCzS0lSAtA6
+L2z61P7Bk3tCWKTlrDEA/0CkkfHnqzGJppmOSMmA6TVYc4J78mSFCoLxr3d+w+Dy
+=auqK
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..73e9b4b568a4
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 000000000000..3044c81eb28f
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch
@@ -0,0 +1,57 @@
+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
index fd8738d98713..e543c94579fc 100644
--- a/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild,v 1.3 2015/05/26 07:49:18 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild,v 1.4 2015/08/03 11:36:48 tomka Exp $
 
 EAPI=5
 
@@ -45,6 +45,10 @@ 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