gentoo resync : 31.12.2018

6 files changed, 5 insertions, 129 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 1658c241c375..446387e32509 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index b5e46bfbcaca..36f00dcae011 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,8 +1,4 @@
-DIST simgear-2018.1.1.tar.bz2 1303653 BLAKE2B 44b98c2ba8ae292c3736d04813869df528d7ca14bbdc1773e1f4bd4b7b4899b5fd8605a7ada5dcc2d5e863e82ee2f1e1d2b980d3bd775c92325ad3ca834306c3 SHA512 3de7a15dc7b60e9e7466950c1b466d0daefea84b4730a9b8cf5e26c41cece5fd03ccf57b0f3cb977093482beb734560812e347003e19e0bb4b40d81820a11563
-DIST simgear-2018.2.1.tar.bz2 1314943 BLAKE2B 60e44896d466085014020874a1be6ab3f6f87e472f985237404dffb5dfbd5c25f0d330701276e0b8d075830695872eb7521bb4eb5b0107edac5977c3aab85bf7 SHA512 6756994e0688a1f3699c33548ea90b19e99a439ea2f2002cf524629370cd1161a1556ee966fc3a781141fc7a08e7574adc0ecbe6dec67e72d631c6c4d744e4dd
 DIST simgear-2018.3.1.tar.bz2 1330322 BLAKE2B 5b350ddce726d8ea15c4a1a64a28b9e4307647378c52989231daa7b4a0e53730dc754c239660d0f5ec33189ece6629448b37f61ca7578c21c3aa4147d4565a26 SHA512 673ee76e9f4f9c9adb25a2523bad5b70a079d821391cb8fc9f9e651ad6c195356ac9a8ba18a65df365dc66990406de287099fb249ca23eefc111ebba884f7289
-EBUILD simgear-2018.1.1.ebuild 1289 BLAKE2B 6b645fd5621acc09b4a0a9862e5e5238334c8d5b6cc1a9f6b8c7d1c08154e84b04a9be2e827cf12383a805027858d7ef9bc2ca9841251b01ab28da4ad39ede61 SHA512 4deaa97b485983475f5c9a72dbe7e3b1ac4c5a0166d3c5a541ac38cc0504211289dbfa8721139fbc8da01cd6171ed99414aec13d924a5ff0c37f379c6a1cf7ed
-EBUILD simgear-2018.2.1.ebuild 1289 BLAKE2B 7765dabb2e05d3c4f948ddb60b877c3bfee627c7c72f59df5c5020a5eb4b3022b53cf098d4a57b197b4e1a5384954fc734859c2b9998ed2c81d47dc1f45be57c SHA512 d6ba94beeea257a0e19435c1d9fdc0aaa31ee4e1d7dd14c0f40e61ce07fd16ff7b37d9e957478afb1b5c88df176b437cd407a272ed69626add981924d0b85432
-EBUILD simgear-2018.3.1.ebuild 1286 BLAKE2B 5b2d53e3bc343c85432a3d630483f46ff73ff44ec453e08e7f9c26ca9bad34830e723e70a7776b068d6d185286ae8b4f4c1d7e6a87763dfe2ef5995725f6038d SHA512 acffeba8cb2e16581656ab6dcdc951bc8bf84672d602c2ce3570b0c5ba264677430915d79853bfa081f9cd38a23b1a7e60bcd1f078cb8dc6601ec138e64daa1a
-EBUILD simgear-9999.ebuild 1351 BLAKE2B 69fd6d6034053e9d026e9f91376bbb716be4c687007a031ca580f844a7ae0c3d035abbfb01d3e39eb3ed5fbc9502d0f3ef123e7c7f4566a52eb88eb23077bce4 SHA512 3735c556acf625e06391dd2c51b329cc8367449ed67d72dd0e4345a102b98b334595634ac1de1e61c05094075616a48887785f3b3f368d06181413add49a2f91
+EBUILD simgear-2018.3.1.ebuild 1287 BLAKE2B 24ab62ed87377e3768837df1142b60a7b4643aad77997f2b58499ceb9451258aa4e040b603deb14fd3281e27286c0567663a958cf558c576481364f405a094af SHA512 3fe5d0ee5312bddc9d943ba565222834611fbb64446ee3f2455e03f389876586e2f118d4077a3c859320018db2a4879fc7ec48a36b225c5ac82ea377eac8936d
+EBUILD simgear-9999.ebuild 1349 BLAKE2B be29b4a393daa27f22693d05a9c2b7ce9ae63407351131872b4c8ed7c910fd25bf9116d409e1b2bfab7d2ec5bb22c618d2e42c0e48a2a7b5f62f91c170f3679b SHA512 257ebd7d5e7904d6386b6390fa5a5f67a81c3f7c757e1a748bea159eba6380eb1216954ff34eb60d22d5d4149419533eda056f6941d2a5d0776ec234d6961115
 MISC metadata.xml 911 BLAKE2B 978dd6e83dce780a6b6250e86def3f5f3052d7c09cda9d4974ec9f63d151cb0040c9434cde00007a8821b28854d2c49c5a040e29f176d1ebb91600e97ba09f17 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8
diff --git a/dev-games/simgear/simgear-2018.1.1.ebuild b/dev-games/simgear/simgear-2018.1.1.ebuild
deleted file mode 100644
index cca44548c832..000000000000
--- a/dev-games/simgear/simgear-2018.1.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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-2018.2.1.ebuild b/dev-games/simgear/simgear-2018.2.1.ebuild
deleted file mode 100644
index c8c3453c3016..000000000000
--- a/dev-games/simgear/simgear-2018.2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 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-2018.3.1.ebuild b/dev-games/simgear/simgear-2018.3.1.ebuild
index 6c5c009057ec..4b8056c33acd 100644
--- a/dev-games/simgear/simgear-2018.3.1.ebuild
+++ b/dev-games/simgear/simgear-2018.3.1.ebuild
@@ -16,7 +16,7 @@ IUSE="+dns debug gdal openmp subversion test"
 
 COMMON_DEPEND="
 	dev-libs/expat
-	>=dev-games/openscenegraph-3.2.0
+	<dev-games/openscenegraph-3.5.6:=
 	media-libs/openal
 	net-misc/curl
 	sys-libs/zlib
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index 6ee236bee6f8..10462f88d9fc 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE="+dns debug gdal openmp subversion test"
 
 COMMON_DEPEND="
 	dev-libs/expat
-	>=dev-games/openscenegraph-3.2.0
+	<dev-games/openscenegraph-3.5.6:=
 	media-libs/openal
 	net-misc/curl
 	sys-libs/zlib