[gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/

[Maciej Mrozowski]

commit:     578ff912d508ad89cf661677abff211ddaabfe66
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 01:23:23 2018 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 01:24:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=578ff912

dev-games/simgear: Restrict >=osg-3.5.6, bug 673692. Remove old.

Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-games/simgear/Manifest                |  2 --
 dev-games/simgear/simgear-2018.1.1.ebuild | 60 -------------------------------
 dev-games/simgear/simgear-2018.2.1.ebuild | 60 -------------------------------
 dev-games/simgear/simgear-2018.3.1.ebuild |  2 +-
 dev-games/simgear/simgear-9999.ebuild     |  2 +-
 5 files changed, 2 insertions(+), 124 deletions(-)

diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index f8d3fc6505b..c17226fec25 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,3 +1 @@
-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

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 cbc2832ad09..00000000000
--- a/dev-games/simgear/simgear-2018.1.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 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"
-
-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 cbc2832ad09..00000000000
--- a/dev-games/simgear/simgear-2018.2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 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"
-
-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 cbc2832ad09..4b8056c33ac 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 deebb9bbe8b..10462f88d9f 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -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