gentoo resync : 20.10.2017

3 files changed, 68 insertions, 6 deletions

diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 08750d80860f..64c7c800e155 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -4,11 +4,13 @@ DIST simgear-2016.4.4.tar.bz2 1200320 SHA256 5514fd0006bbfcdbdc0e2dab7da41eae491
 DIST simgear-2017.1.2.tar.bz2 1235662 SHA256 69c8223051b039b00038aabbb8660cecce1866e3f854dadd9543db824d232f6b SHA512 5746262873f9ca9183bf5bcfbff1493637faa68c8d070a5683f991b414b69b0e432f181394db0c39c939b3d6e433288a143eb3489a407c38f3d26c9033027404 WHIRLPOOL a6b18db36078e1e26c8915ef72a5bb890bcef7433c6c641f314533c637cbcd3a626e4146ddbf7551fc179b9b07989baba04559a0f1684c4b00e94760ddace2cb
 DIST simgear-2017.1.3.tar.bz2 1235062 SHA256 85304d985b4fc0dc00d9f7603b02d096e3c24ca4c98adc18dc9af1e2d0e3c310 SHA512 600f883ad92d37bf76d5e6beb066da340c7af927b0f2d51ce290cccaf23d1f3289b1aa31d3aa6cc17a4b9bc57c7180f03e234e08601e4169f26624678bf551aa WHIRLPOOL 377caa9327be22f10e0c45a64db7747d66dc7498b425ae5cf330544e727248b84f907b9eebb7c6b8e6a3272d1929a2b2ae1eaf8a4a542469d1e3615e9a2b7966
 DIST simgear-2017.2.1.tar.bz2 1290780 SHA256 9924592c01cb41ad66a0ff1dc43b7678ceec69fb573d3f4e4637e26c247c7a9e SHA512 168f5e3eab7cdd44643a62e1970c6329ac1121ca98e36c4134d963237e70304a20b7c8df3b438e24c204d51569d6863ef8b16098462d850f72a5f11a10ccbfd5 WHIRLPOOL dc57cb2b87ec0111b0c555b6b87bcba7ec80c34c2277978c3aac7e71a3df260b4ac32f79698b2ea6d84a3bd6a942dc163aabd80c5f5004c409a189456f812d4a
+DIST simgear-2017.3.1.tar.bz2 1302704 SHA256 0ee08550b737b249dcc91590ec0cb9c5dc9080998f6ba66a7d7209cdfce6e1f4 SHA512 339c9af78e8c0490caec69be34b54f947751a9677cbb1163e73917f6aaa8f3d965ccf8058222c48ca4249cba4bb509205143f846de84595e92abdcd93e64c901 WHIRLPOOL f26535449fd04c18e3a0f31817411f634be669c14d84b112f9d5662e56aeb800b7c801fab9113acb111c4823ed1fc25d2fc92822479d7e87ce93d6b3beaf2b8c
 EBUILD simgear-2016.4.4.ebuild 1061 SHA256 bc532b97a66e160f1728c3e984e08df008fefefbf38f1e3563f7a5caf303801a SHA512 132606587c2820bf150fe67b5a60018bc49af52ea2ae320c327301f5becd1f402b081e8985457b72c6bc7c2b13936362aef026c7337beacc8fc6592599a7c5d7 WHIRLPOOL c2e8b73fa3e3fa945aeb0a704db525cc3fe0de95ee4944fae9c511f304b66ebc6305d420e6df30b33bdce5dab78fd6588f11f7035b6df3d72147a884105f44c3
 EBUILD simgear-2017.1.2.ebuild 1062 SHA256 981a5d1aeda0c9c7282b649d9803b4ec050a9bbfcc4071b1d55a1c14a8ae463a SHA512 855947e49e07af915a63ec897ffaa504668812d4697b65a7a3431d591c25682ddbaba029c28748d67d2098e9876dee2cb45d126f9a92e4c006a0e078986cfc36 WHIRLPOOL 7e67c807f6ce9851853218ad45b8ad7d9c4ebb365644e4dcb6d1e0ed648b3b4b8edb3c0eda774ca75ca6c9f2a0792ca590c3137956bbfc053282d43349337761
 EBUILD simgear-2017.1.3.ebuild 1062 SHA256 981a5d1aeda0c9c7282b649d9803b4ec050a9bbfcc4071b1d55a1c14a8ae463a SHA512 855947e49e07af915a63ec897ffaa504668812d4697b65a7a3431d591c25682ddbaba029c28748d67d2098e9876dee2cb45d126f9a92e4c006a0e078986cfc36 WHIRLPOOL 7e67c807f6ce9851853218ad45b8ad7d9c4ebb365644e4dcb6d1e0ed648b3b4b8edb3c0eda774ca75ca6c9f2a0792ca590c3137956bbfc053282d43349337761
 EBUILD simgear-2017.2.1.ebuild 1415 SHA256 fab688c40c79ca132485c88621338d12cc4492cc02d57b300ee2da3131a2a57c SHA512 ac5c3ff2dba76fe9f071355a1347a2805b97c6b0c2f6987123d4c394ae012d4915fa8bfaae1f749cc8c69e1d6a92506faebedc97b16ee617c0a9aedb8f691cd1 WHIRLPOOL d9d33bace0c9c0c84ce9a473f96294836ded39accbbab78f7f32c76610e380e2d463e992d7012cb9af8b6838fe165d13d1132da5b90be3effbb1e9775cde2f5c
-EBUILD simgear-9999.ebuild 1350 SHA256 77ae95bb34402e2caf3b31067dfeea20d2d0e80750bacaa1d49c038da97b2902 SHA512 f2554944961cb5bb7d93088e520d6d2ef10bf3f818e1ead536bad1e2e496263f10a47c2d5324764a4e4d0a5b02bd8df2b917223c35c98aa2836bb8ab9bf2f2be WHIRLPOOL 88eedbf104b5deedb38600140901cc9d7ef35f74e8719014db15b27683f8c96a22dd7409a7f08bf63511937a0b7bd11911447dff0c4d4b633c8583e8d8e18b33
+EBUILD simgear-2017.3.1.ebuild 1289 SHA256 8bdc68c765f9f69c42ee89535cfc175e0801d3fd1afb506a33b7d289b343c872 SHA512 4deaa97b485983475f5c9a72dbe7e3b1ac4c5a0166d3c5a541ac38cc0504211289dbfa8721139fbc8da01cd6171ed99414aec13d924a5ff0c37f379c6a1cf7ed WHIRLPOOL e81bffdc7faec48115cde9cf926b0a3a84d68fe055d72d5d57057db17099406a6bf0983a80a572cc46534f13fc2c42e48bee77e5bd44ab62eedbfbbdb3ef7f8a
+EBUILD simgear-9999.ebuild 1351 SHA256 25d83b642139f559f070c13fc30162e9937f08d8d164021f7fb636cf9daa6ce4 SHA512 3735c556acf625e06391dd2c51b329cc8367449ed67d72dd0e4345a102b98b334595634ac1de1e61c05094075616a48887785f3b3f368d06181413add49a2f91 WHIRLPOOL c0cee81b0a4a32b31dc8aed9b70cf346a5287fe5f46bd11d3bfac9c4a7fe986c2232bb86bd9604f3c062dc43a84e0ac45e0ad4d187e8efef4d2b43c4a846cd2f
 MISC ChangeLog 3863 SHA256 0e3f4cffaee7dca075735c98d102a8af72b4078df93c5419fb4891f031f019bc SHA512 44d2c31a72201607d228025745618c7e793ff35683e51c086929e18df67b5ad5033c3ed8ffba58a550e611b97d512a548d325e9b7e04fc6a851045617d1e0552 WHIRLPOOL eb84bfece0d5c07f0c2fe97e994bae577bf739a6418d538b7bc1608dcf1ddf474da568218513c9c5744343ea9e7c4e47f60391281270ef6d1cfbe897fee10c92
 MISC ChangeLog-2015 11386 SHA256 e0f137c2d4af1399f5a82596819c8747c2b8a6f169f2e1aec448661c82a19f3b SHA512 3b9f8eced1e5c6d43df1bd2130a8237f706dd9a8bfa895896685f99eb44913022b3f61093951daa8c006bc3dd4ec8c1e2b5ea138c52405c68e93a6ef7aac8e17 WHIRLPOOL 26632a83550817a77ae4c23251741a7f94e47af66aa0b98235d84c5516b9b232504e19641e092a5f72043c0a8ab67c71949ecd1c9071deea3e2baab418e0c5f2
 MISC metadata.xml 911 SHA256 dc9b9526a5e3b3563022fec68811ee4dd55598d9dba1e4184bb9191541a04227 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8 WHIRLPOOL 7b3a61b3c8f9d594eca223c0048fda38698138ae2bd35807c1e4219aa336192764986a02d64a002bbc0f36eb8bde718122eec39086ac31495ac59eb07c0800a5
diff --git a/dev-games/simgear/simgear-2017.3.1.ebuild b/dev-games/simgear/simgear-2017.3.1.ebuild
new file mode 100644
index 000000000000..cca44548c832
--- /dev/null
+++ b/dev-games/simgear/simgear-2017.3.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-games/openscenegraph-3.2.0
+	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-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index 00072326c7c9..6ee236bee6f8 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -33,12 +33,12 @@ RDEPEND="${COMMON_DEPEND}
 	subversion? ( dev-vcs/subversion )
 "
 
-PATCHES=( "${FILESDIR}/simgear-2017.2.1-gdal-underlinking.patch" )
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
 pkg_pretend() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {