version bump

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

4 files changed, 123 insertions, 2 deletions

diff --git a/sci-geosciences/osgearth/ChangeLog b/sci-geosciences/osgearth/ChangeLog
index 4a673deccf65..b41e0c7fa171 100644
--- a/sci-geosciences/osgearth/ChangeLog
+++ b/sci-geosciences/osgearth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/osgearth
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osgearth/ChangeLog,v 1.4 2013/11/22 13:36:54 hasufell Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osgearth/ChangeLog,v 1.5 2014/10/10 20:18:46 hasufell Exp $
+
+*osgearth-2.6 (10 Oct 2014)
+
+  10 Oct 2014; Julian Ospald <hasufell@gentoo.org> +osgearth-2.6.ebuild,
+  +files/osgearth-2.6-cmake-options.patch,
+  +files/osgearth-2.6-disable-qt5.patch:
+  version bump
 
 *osgearth-2.5 (22 Nov 2013)
 
diff --git a/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch b/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch
new file mode 100644
index 000000000000..389609bd6c42
--- /dev/null
+++ b/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch
@@ -0,0 +1,30 @@
+commit d92cee4d9870fab08fdfadf9ab0bfb4658a09aa3
+Author: hasufell <hasufell@gentoo.org>
+Date:   Fri Nov 22 14:06:34 2013 +0100
+
+    add cmake options
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 34cd375..dbb4cb4 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -129,8 +129,17 @@
+ 
+ # JavaScript Engines:
+ SET(V8_DIR "" CACHE PATH "set to base V8 install path")
+-FIND_PACKAGE(V8)
+-FIND_PACKAGE(JavaScriptCore)
++OPTION(OSGEARTH_USE_V8 "Enable to use V8 JavaScript engine" ON)
++IF(OSGEARTH_USE_V8)
++	FIND_PACKAGE(V8)
++ENDIF(OSGEARTH_USE_V8)
++
++OPTION(OSGEARTH_USE_JAVASCRIPTCORE "Enable use of JavaScriptCore" ON)
++OPTION(OSGEARTH_USE_LIBNOISE "Enable use of LibNoise" ON)
++
++IF (OSGEARTH_USE_JAVASCRIPTCORE)
++	FIND_PACKAGE(JavaScriptCore)
++ENDIF (OSGEARTH_USE_JAVASCRIPTCORE)
+ 
+ SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape")
+ IF (WITH_EXTERNAL_DUKTAPE)
diff --git a/sci-geosciences/osgearth/files/osgearth-2.6-disable-qt5.patch b/sci-geosciences/osgearth/files/osgearth-2.6-disable-qt5.patch
new file mode 100644
index 000000000000..ba43aceb1ed6
--- /dev/null
+++ b/sci-geosciences/osgearth/files/osgearth-2.6-disable-qt5.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,10 +146,6 @@
+     FIND_PACKAGE(Duktape)
+ ENDIF (WITH_EXTERNAL_DUKTAPE)
+ 
+-FIND_PACKAGE(Qt5Core QUIET)
+-FIND_PACKAGE(Qt5Widgets QUIET)
+-FIND_PACKAGE(Qt5Gui QUIET)
+-FIND_PACKAGE(Qt5OpenGL QUIET)
+ IF ( Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Gui_FOUND AND Qt5OpenGL_FOUND )
+     SET(QT_INCLUDES ${Qt5Widgets_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS})
+ ELSE()
diff --git a/sci-geosciences/osgearth/osgearth-2.6.ebuild b/sci-geosciences/osgearth/osgearth-2.6.ebuild
new file mode 100644
index 000000000000..f8e8bb05c02e
--- /dev/null
+++ b/sci-geosciences/osgearth/osgearth-2.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osgearth/osgearth-2.6.ebuild,v 1.1 2014/10/10 20:18:46 hasufell Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Dynamic map generation toolkit for OpenSceneGraph"
+HOMEPAGE="http://osgearth.org/"
+SRC_URI="https://github.com/gwaldron/osgearth/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc qt4"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-games/openscenegraph-3.2.1[curl,qt4?]
+	dev-libs/tinyxml
+	net-misc/curl
+	sci-libs/gdal
+	sci-libs/geos
+	sys-libs/zlib[minizip]
+	virtual/opengl
+	x11-libs/libX11
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
+
+S=${WORKDIR}/${PN}-${P}
+
+PATCHES=( "${FILESDIR}"/${P}-{disable-qt5,cmake-options}.patch )
+
+src_configure() {
+	# V8 disabled due to
+	# https://github.com/gwaldron/osgearth/issues/333
+	local mycmakeargs=(
+		-DWITH_EXTERNAL_TINYXML=ON
+		$(cmake-utils_use qt4 OSGEARTH_USE_QT)
+		-DOSGEARTH_USE_V8=OFF
+		-DOSGEARTH_USE_JAVASCRIPTCORE=OFF
+		-DOSGEARTH_USE_LIBNOISE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc ; then
+		emake -C "${S}"/docs man html info
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc ; then
+		dohtml -r "${S}"/docs/build/html/*
+		doman "${S}"/docs/build/man/*
+		doinfo "${S}"/docs/build/texinfo/*.info*
+	fi
+}