gentoo resync : 02.06.2019

3 files changed, 28 insertions, 1 deletions

diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index cdf8ce2f1975..d3731a594f52 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,6 +1,7 @@
+AUX simgear-2018.3.2-boost-1.69.patch 669 BLAKE2B 76d25e88ebc6b47ea60ad59771d95b1f676a781424bacd9ce3e56ff41810fea000437bdd9dea6bad176cada9a70d1f0c6105f9394461cd29c3fa603b87334661 SHA512 92387eec8cadacfbb6d3ed3e827abdba49a6f9699dad665eac17ec3099423bb38e3ae28894ffe92670f9e823020ee88279f8f96f71acfcfff03f9502f76d8636
 DIST simgear-2018.3.1.tar.bz2 1330322 BLAKE2B 5b350ddce726d8ea15c4a1a64a28b9e4307647378c52989231daa7b4a0e53730dc754c239660d0f5ec33189ece6629448b37f61ca7578c21c3aa4147d4565a26 SHA512 673ee76e9f4f9c9adb25a2523bad5b70a079d821391cb8fc9f9e651ad6c195356ac9a8ba18a65df365dc66990406de287099fb249ca23eefc111ebba884f7289
 DIST simgear-2018.3.2.tar.bz2 1329982 BLAKE2B cc4ee90e0a76db5212ca3bb8f422376d9fd91c261c4aaee1aa0c2dc7438ed589866bdde009fd44c727ae87d7365d4aea67da0cfd32ff26d47e81eb9c027ddf0b SHA512 3f60df34f22ea84bdb3e0aa0e2c0b73b2fddf15d17ea985aee254bf4c269b7447976629a7e4b022c460c7c406940d0b2669b723c6b899499d064cfe91546f0ba
 EBUILD simgear-2018.3.1.ebuild 1287 BLAKE2B 24ab62ed87377e3768837df1142b60a7b4643aad77997f2b58499ceb9451258aa4e040b603deb14fd3281e27286c0567663a958cf558c576481364f405a094af SHA512 3fe5d0ee5312bddc9d943ba565222834611fbb64446ee3f2455e03f389876586e2f118d4077a3c859320018db2a4879fc7ec48a36b225c5ac82ea377eac8936d
-EBUILD simgear-2018.3.2.ebuild 1473 BLAKE2B bfc47edecae046092dd64493fa574961c274cfed77b2ffe23821ff741407593b83e49398a4b8b85a0de069e90e31478eaa281ad4de6ad0b45d9efc79565d42d9 SHA512 bec365a0b3dd69204a5d66ce74254d4a9b1869f5f4c5712dccfb2312a74ce034ae52455bc0f1096b36cc78146e6b022b5bc403a6db49a7d75a9c7b2c33ca934b
+EBUILD simgear-2018.3.2.ebuild 1522 BLAKE2B da14df468a2b45f76db471237ea0e2cf4d3ec717f97b9bd4acf875d8f2857c6be01ebc71301ca4c589a80c0d16e21aa42dd2b59667856206ebeb5c00c43cfcc5 SHA512 b8f4ebcef5fa3f63837d77c1d318e93805c959a30e4305849eedf9ded103325520e16d3be1b5c7a0f229d679b5becbb733000198e137fc951c4c8ce4f7d38bf3
 EBUILD simgear-9999.ebuild 1535 BLAKE2B cabc0460fe4527432239370e2e9e9c4585071a9efb2771a8d5100fda599e07d7a2b3351932eea6d82ee54dc4e43b6fbe233adbbeebe12c39f643920b3c498b7f SHA512 2b0998e84aca57859e563e823161ef1dcc7e1079f0363d7a9a18517439ae98160dfdf754d22365cfacb65df5803d83ffa1a0da73eee37c255be550d449d7d225
 MISC metadata.xml 911 BLAKE2B 978dd6e83dce780a6b6250e86def3f5f3052d7c09cda9d4974ec9f63d151cb0040c9434cde00007a8821b28854d2c49c5a040e29f176d1ebb91600e97ba09f17 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8
diff --git a/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch b/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch
new file mode 100644
index 000000000000..2372c8c58adf
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch
@@ -0,0 +1,24 @@
+From c1ac1fb93dace81b2a60f9d1f5d6d20298c8b9bb Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice@bellet.info>
+Date: Fri, 1 Feb 2019 09:29:40 +0100
+Subject: [PATCH] fix for boost 1.69
+
+---
+ simgear/nasal/cppbind/NasalHash.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx
+index aac672fd..2ee7d044 100644
+--- a/simgear/nasal/cppbind/NasalHash.hxx
++++ b/simgear/nasal/cppbind/NasalHash.hxx
+@@ -23,6 +23,7 @@
+ #include "to_nasal.hxx"
+ 
+ #include <simgear/structure/map.hxx>
++#include <boost/core/enable_if.hpp>
+ #include <boost/iterator/iterator_facade.hpp>
+ 
+ namespace nasal
+-- 
+2.20.1
+
diff --git a/dev-games/simgear/simgear-2018.3.2.ebuild b/dev-games/simgear/simgear-2018.3.2.ebuild
index a65b51665aac..ead30a3c496f 100644
--- a/dev-games/simgear/simgear-2018.3.2.ebuild
+++ b/dev-games/simgear/simgear-2018.3.2.ebuild
@@ -31,6 +31,8 @@ RDEPEND="${COMMON_DEPEND}
 	subversion? ( dev-vcs/subversion )
 "
 
+PATCHES=( "${FILESDIR}/${P}-boost-1.69.patch" )
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }