Version bump, bug 405281. Original ebuild by Julian Ospald.

(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)

6 files changed, 78 insertions, 83 deletions

diff --git a/dev-games/simgear/ChangeLog b/dev-games/simgear/ChangeLog
index dd4137623c6a..0672fe5ac65e 100644
--- a/dev-games/simgear/ChangeLog
+++ b/dev-games/simgear/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-games/simgear
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.51 2012/07/10 04:52:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.52 2012/08/27 23:57:39 reavertm Exp $
+
+*simgear-2.8.0 (27 Aug 2012)
+
+  27 Aug 2012; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/simgear-2.8.0-underlinking.patch, +simgear-2.8.0.ebuild,
+  -files/simgear-1.9.1-gcc44.patch, -simgear-1.9.1.ebuild,
+  -simgear-2.0.0.ebuild:
+  Version bump, bug 405281. Original ebuild by Julian Ospald.
 
   10 Jul 2012; Michael Weber <xmw@gentoo.org> simgear-2.4.0.ebuild:
   ppc stable (bug 405665)
diff --git a/dev-games/simgear/files/simgear-1.9.1-gcc44.patch b/dev-games/simgear/files/simgear-1.9.1-gcc44.patch
deleted file mode 100644
index 96e6a1c8c702..000000000000
--- a/dev-games/simgear/files/simgear-1.9.1-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- simgear/debug/logstream.hxx.old	2009-05-20 16:27:26.000000000 +0200
-+++ simgear/debug/logstream.hxx	2009-05-20 16:27:59.000000000 +0200
-@@ -30,6 +30,7 @@
- #ifdef _MSC_VER
- #  include <windows.h>
- #endif
-+#include <cstdio>
- 
- #include <streambuf>
- #include <ostream>
diff --git a/dev-games/simgear/files/simgear-2.8.0-underlinking.patch b/dev-games/simgear/files/simgear-2.8.0-underlinking.patch
new file mode 100644
index 000000000000..a1a4d75c9917
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2.8.0-underlinking.patch
@@ -0,0 +1,17 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Aug 24 15:16:41 UTC 2012
+Subject: build system
+
+fix underlinking
+
+--- simgear/CMakeLists.txt
++++ simgear/CMakeLists.txt
+@@ -54,7 +54,7 @@
+     set_property(TARGET SimGearCore PROPERTY VERSION   ${SIMGEAR_VERSION})
+     set_property(TARGET SimGearCore PROPERTY SOVERSION ${SIMGEAR_SOVERSION})
+ 
+-    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY})
++    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY} pthread)
+     install(TARGETS SimGearCore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+     if(LIBSVN_FOUND)
diff --git a/dev-games/simgear/simgear-1.9.1.ebuild b/dev-games/simgear/simgear-1.9.1.ebuild
deleted file mode 100644
index 4ecd619a63e6..000000000000
--- a/dev-games/simgear/simgear-1.9.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-1.9.1.ebuild,v 1.7 2011/02/26 13:31:55 armin76 Exp $
-EAPI=2
-
-inherit eutils
-
-MY_P="SimGear-${PV/_/-}"
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="mirror://simgear/Source/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/plib-1.8.5
-	dev-games/openscenegraph
-	>=dev-libs/boost-1.34.0
-	media-libs/openal
-	media-libs/freealut"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc NEWS AUTHORS TODO
-}
diff --git a/dev-games/simgear/simgear-2.0.0.ebuild b/dev-games/simgear/simgear-2.0.0.ebuild
deleted file mode 100644
index 5ceac6c7f3d7..000000000000
--- a/dev-games/simgear/simgear-2.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-2.0.0.ebuild,v 1.3 2011/02/26 13:31:57 armin76 Exp $
-EAPI=2
-
-inherit eutils
-
-MY_P="SimGear-${PV/_/-}"
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="mirror://simgear/Source/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/plib-1.8.5
-	dev-games/openscenegraph
-	>=dev-libs/boost-1.37.0
-	media-libs/openal
-	media-libs/freealut"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf --with-jpeg-factory
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc NEWS AUTHORS TODO
-}
diff --git a/dev-games/simgear/simgear-2.8.0.ebuild b/dev-games/simgear/simgear-2.8.0.ebuild
new file mode 100644
index 000000000000..4d2bf64898ea
--- /dev/null
+++ b/dev-games/simgear/simgear-2.8.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-2.8.0.ebuild,v 1.1 2012/08/27 23:57:39 reavertm Exp $
+
+EAPI=4
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+SRC_URI="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="debug jpeg subversion test"
+
+COMMON_DEPEND="
+	>=dev-games/openscenegraph-3.0.1
+	media-libs/freealut
+	media-libs/openal
+	sys-libs/zlib
+	virtual/opengl
+	jpeg? ( virtual/jpeg )
+	subversion? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.37
+	>=media-libs/plib-1.8.5
+"
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_RTI=OFF
+		-DSIMGEAR_HEADLESS=OFF
+		-DSIMGEAR_SHARED=ON
+		$(cmake-utils_use jpeg JPEG_FACTORY)
+		$(cmake-utils_use_enable subversion LIBSVN)
+		$(cmake-utils_use_enable test TESTS)
+	)
+	cmake-utils_src_configure
+}