gentoo resync : 05.02.2020

6 files changed, 9 insertions, 97 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 6b26b2fe4eaf..588fdae5d8c9 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 23a8b5def01c..a0f7844e46e3 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,7 +1,4 @@
-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 1314 BLAKE2B 0485c1449a200501a3a0e131cdf635ad1eefef6e248949dfc5e84f681c1d343c8f3ff58145c43ed7f8dc6741dd8639a958971f85c3338894e792f1a97764cc96 SHA512 20859deae75d9f1376c92c6fc676b63c7bb07f6b96af74df889988296869972c4f7f9e6f37be39a92f124d1c0b748b82bca2aba4c7d9542079388813b9f5b35c
-EBUILD simgear-2018.3.2.ebuild 1549 BLAKE2B e48fc988a80b03d69a7912775c425b5e65c4c599708a12097fca3df552a9cd7999bbf780d05e999f94538996e51281868080d28190ddad4448be2669e4b20d13 SHA512 07faeb145de1e6d9ea73164c3eaff52b3fe9a5a7748dd323c68cd40b890a4f044efdd8f1db555339853d0442480e7d878f07b5fed7de472e62e1a9d7c4b6cc5f
-EBUILD simgear-9999.ebuild 1562 BLAKE2B 9ecebf8fdf6bb351e04c93f15c95b7726520309c766dd3763d55fd79a65fe51e89fbdad6ff023fe66b4355e8a6499957006f55909fb2a237ae25a1e8f77fa28f SHA512 0f4b65966ee92f4adedcb3a1069bba128545006133f2e35aca87794c45966d38c67d753f8a3230000bf8a3a67143a1afeb8fd4bf80b10b1757fc928db693dc6c
+DIST simgear-2019.1.1.tar.bz2 1370523 BLAKE2B 2f61b2b4b7716b7f15852ff68bee6b749b7daa04caa27927a53eb6d6e4346c46c835938c95436250da767efd2e8043aacc0cb444b37dacde78acada98ffdb4e8 SHA512 83fe4330cf27b9298719f53f2fccde2af77bacdc6f430cc22c8bdfb475fe9b6e01578c1225af21e4e1433c7d2f2b00427454064f942359ba4c1e9896e7fe05d2
+EBUILD simgear-2019.1.1.ebuild 1507 BLAKE2B 6a94f26bf11de1a7d8160adf11e440f0339ee298d26d85b1beaacffb50d34c27074a60f548c71361e266459e078aef90b705287b78cf3f5bd17ef81d6d196709 SHA512 22e009d885f399c9d7ef8c7b5045704fe41beb167ab1b855209838db6221fc0ddb69a050dca67ccd1c3a18ffd5ff38a362413efa21b3dcf68815efa24adae82f
+EBUILD simgear-9999.ebuild 1569 BLAKE2B 78dde565fdae2256180db5a43b0d0bccd4f6df31bf3662a1214967e814c8e2411df0408f0dff9060b294837ae2f741000fad0f1f59f4226d6441ecccfcf206e7 SHA512 dc1c40f9f239b4bb17360bca606d9093a0a780424559123ba5c19ffc58894584f6c3bed08da225f5db95872876ca66e44dad6d0f31dc0d9693cab70ce0ab5482
 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
deleted file mode 100644
index 2372c8c58adf..000000000000
--- a/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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.1.ebuild b/dev-games/simgear/simgear-2018.3.1.ebuild
deleted file mode 100644
index e962b042089b..000000000000
--- a/dev-games/simgear/simgear-2018.3.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dns debug gdal openmp subversion test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	<dev-games/openscenegraph-3.5.6:=
-	media-libs/openal
-	net-misc/curl
-	sys-libs/zlib
-	virtual/opengl
-	dns? ( net-libs/udns )
-	gdal? ( sci-libs/gdal )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.44
-"
-RDEPEND="${COMMON_DEPEND}
-	subversion? ( dev-vcs/subversion )
-"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DNS=$(usex dns)
-		-DENABLE_GDAL=$(usex gdal)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PKGUTIL=ON
-		-DENABLE_RTI=OFF
-		-DENABLE_SIMD=ON
-		-DENABLE_SOUND=ON
-		-DENABLE_TESTS=$(usex test)
-		-DSIMGEAR_HEADLESS=OFF
-		-DSIMGEAR_SHARED=ON
-		-DSYSTEM_EXPAT=ON
-		-DSYSTEM_UDNS=ON
-		-DUSE_AEONWAVE=OFF
-		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-games/simgear/simgear-2018.3.2.ebuild b/dev-games/simgear/simgear-2019.1.1.ebuild
index ddfbba35e91b..e4f8accb9c67 100644
--- a/dev-games/simgear/simgear-2018.3.2.ebuild
+++ b/dev-games/simgear/simgear-2019.1.1.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=6
@@ -15,9 +15,10 @@ SLOT="0"
 IUSE="cpu_flags_x86_sse2 +dns debug gdal openmp subversion test"
 RESTRICT="!test? ( test )"
 
+# TODO aeonwave
 COMMON_DEPEND="
 	dev-libs/expat
-	<dev-games/openscenegraph-3.5.6:=
+	dev-games/openscenegraph
 	media-libs/openal
 	net-misc/curl
 	sys-libs/zlib
@@ -32,8 +33,6 @@ RDEPEND="${COMMON_DEPEND}
 	subversion? ( dev-vcs/subversion )
 "
 
-PATCHES=( "${FILESDIR}/${P}-boost-1.69.patch" )
-
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index 0c7c4ce703be..14feded1bd5a 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-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=6
@@ -17,9 +17,10 @@ SLOT="0"
 IUSE="cpu_flags_x86_sse2 +dns debug gdal openmp subversion test"
 RESTRICT="!test? ( test )"
 
+# TODO aeonwave
 COMMON_DEPEND="
 	dev-libs/expat
-	<dev-games/openscenegraph-3.5.6:=
+	dev-games/openscenegraph
 	media-libs/openal
 	net-misc/curl
 	sys-libs/zlib