version bump

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

5 files changed, 144 insertions, 11 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/Manifest b/sci-geosciences/osgearth/Manifest
index 300361490a90..03d4e431a066 100644
--- a/sci-geosciences/osgearth/Manifest
+++ b/sci-geosciences/osgearth/Manifest
@@ -2,18 +2,30 @@
 Hash: SHA256
 
 AUX osgearth-2.5-cmake-options.patch 949 SHA256 ce522bc6602bc563263f11f69c5ceac1a439529c568afc06ebd3b9842c836e83 SHA512 b752320af26b49561cc5a3873db646909c734757b388d95413e261297cfb164cbc3504c01847f3a89813814adba7cb733a6b538f651d5180591515d87526fb27 WHIRLPOOL cf2bd922ae9cc7699447b39ddcd2ae8294052d03b2b0ab491f3aa49b045efb6d90a205f0124b1d65dd6cd04fc5f9dd3eff0d884557b18268e649fa1fb1f109b7
+AUX osgearth-2.6-cmake-options.patch 907 SHA256 f079b04d7d3b27a5987e1039f8743eb8a488da9375971a4f5e2f7d325c4c3a9d SHA512 f62ca6d4c9f041e3fd29c591cb408ccd17abb75d8fa49e63300786b8a257daa6a69180699d634b891bb56e25c60bd806b44e59087608d7d8480472f4b613daf2 WHIRLPOOL 1ea811208f56f76ca878f74690de758be231056c3f4b95e91eed120fd700c049097b9a43555e150d7218dd32fbef91c74128c7ef01f0ec2d41af583f33e1dd21
+AUX osgearth-2.6-disable-qt5.patch 406 SHA256 b64d2458d78c7aa3083b63868163c0c645faea5edda961506aeea371428e1719 SHA512 d41778e392bb95107dd5191e1970a35b4ce01d87445198149b39fee1e0fde038ca4a98060f5bf3060b1989c3c691bbb236b5bf7100f9d71b223bacab42804520 WHIRLPOOL 9175bbdb4123d20a3bedaa0fdc32f3a7af1e48eb3624e08af20e2221cae396bacc7de897259d8d43f809eda48e1d4cbf314d7d4856e4d102c5112cd0fcac4979
 DIST osgearth-2.5.tar.gz 49670415 SHA256 73d730fdf615318ef876179b21ff77f508efa20e4dcd8640b999a8235a811616 SHA512 74d63796b04ffbe514014a78279c4aff35f2fadab55ee88f69bb311cadc9c3edff471a27e7ee9147c5c98f91f2b90c389414c4a060c4c030cf680e7c3f0629a8 WHIRLPOOL 536bbc29bfff3f604f3c1a1c825c7f37a116e48526e046065061f081fc8465b19986068c8e61a0e7f427a082d9f4e6c764b2e4e093f48e48f52faa2aed2c1746
+DIST osgearth-2.6.tar.gz 58605003 SHA256 965c93837520ab9538038843ff83ee1903548f8be191ee211e40abb0e6c1bb4a SHA512 3120547ef639d4c1ff0404358777317c8794a493a772dc7af11b8056fd3f799a5e16358c19970862d16f6ab98f78abb3ea25c3aa113df8a3df68d54818fb03bc WHIRLPOOL 6533e5a92ee973ff1d5bfb80ab3b051279bc65e85d00f0fb9027b6fe2be06efc5bd3907516c27e7e06b4c1cb03569650bf368b5d7728b848bc86ec9666607939
 EBUILD osgearth-2.5.ebuild 1474 SHA256 b609078da731294b89bad002e02cffe444973e18b18a2934102ba8912d409ff6 SHA512 12e6dba9e06ab1256942e019ab2309d4fa00f5f5b980c9936b363dfe1a516e7291cf50a1014e8eae7bbb0371dbd500bb1e8815b1a9d4bc29c7f1a6cbadaa32cf WHIRLPOOL 6b38ca7a8086a4db7b3162dac0b61bfe261b3c06afc61b66d3b496d0a522254cd66efbd3f1edc2f0128592b65cf958cfe5f5fd4fe876b07b9ef84f7d8485105d
-MISC ChangeLog 837 SHA256 83416cc5fadd060164ddf7c5df9241000b94aa12873dfbff342e8ffd966a8d69 SHA512 ca35c567c85a634b6c341a09cfc1d1245925313b8933408bfaa3b5a3301f5525d24d5d25704f863e3465dfc4a0f9cb21a068a1ce65c993865d77a78593b69dc8 WHIRLPOOL 894f39073fa18f1bf13b4933447cee24e9d1bd71b373bc82d08ed4bc2e4d853a3637ee2db3551c51c737d2bbc88ad3deaf63e5e8f635cb56de713d1c6bddbbdc
+EBUILD osgearth-2.6.ebuild 1496 SHA256 039aedbbfb8249f16c0a8d56f8dd90c17989b31f8108842e5f2d9422621382f8 SHA512 0d85203bb513e9c186778720ee97a145f15f2dd16d7ebec1f27496874f08691f43b93d74b64b86f93b8e37ba8d7a442038a5299377e1195419bc0eb4735ca4c4 WHIRLPOOL 1180a46e78db86d9c127c7f7b79c12b9f6daca460fd75764dc7483b620f3495e8982843a930e2f4e0fcc2e6128f0ffc2d64d06546d427b3e0bbd8470b1c0a9b5
+MISC ChangeLog 1039 SHA256 f32fa1873e675f47712f8558b94c1e62c8a5402a5584acc7d59523f476153962 SHA512 5d7ac1cc7b29a9b067c12adcd9c764324d3e6a549919314a4c01684d6d7dec8e5fc05b911999b33d513742935e9b8ad73c261d3ab670d387e9ca607fdb0ac5bf WHIRLPOOL 8153c1397b35b59ae4a4fa3691999d8fa6b35b1528ac35a9870d84ffb1c0e0b164a57380cc44e7763235caecb5e8f51b7659f26b2efc85e328ae781fc5b169dc
 MISC metadata.xml 813 SHA256 b35857ec7a68147f511afd56df2da0d136b806c1ca8ea451b6137b0b83858a13 SHA512 01d4aa615795b4a914445b5d7ccb063f8c27908846b9b1ee4033ad5ab919e5923eaaef6dadb889d8457a25739dc0c0b3a82c9fa10611968576a8c32694d24f71 WHIRLPOOL a601d3fe64163062500bde8c856efd9dee17ad1084028912fd7ecfed09d93c077e8aa9f8b6167104b0caf8a4218ba490f6b20389712a3a833d22df53d56b836a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJSj133AAoJEFpvPKfnPDWzH00H/jg+RtomjEOkSvT3ciF+jpw/
-OwA8MXj0EemJZ4rGjzEMzBfvxv1ASaQ2icstkvGXn6AsVqLxCfoPqIbyW4Tvgf4J
-t6qNQjQLS0khNzTlhGDRhJmJT/jkrzt1jfTZXGxfRI/WsVWFstacL3I/0hlpGPLS
-SVF/kG15YDuTa0b+7FlakV9RnWIAHoLdkTu6U0pVKhihk4rO3zMe5fIZVIVmcnFJ
-qs+9axaVnEcdDg0EGAcx4cXZoo0bf2cUYNgysT68fynwPri5wDi8DZHgYyrSEPnD
-H25A+zhTURNEzAnrnQP8zeDOFPFIsHqthTPOrHMIO7hR6OXnuJNPj/FTWNSmZK0=
-=byp0
+iQJ8BAEBCABmBQJUOD8nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgOAEP/1ST5VnR/t94pzkhj3KfLOuL
+6PU+nfp2tqip8zwyhOnKqndeBhuoTDHew0djHuNYAUv1xk08s16hfCYKXtDnyf1/
+dyLnMAQCihtkfX5sW1ROanzhSSZWyIaFOaLJnps8bAOnR0yLF1EXCbkPwhMlE/4z
+is8wVK5mLcsc7e8vK8wn2MNISxwQn/3DblZ3meGnsGUZMWLuFaIotr3SrtjQc61P
+z574LiqkYPDefdbWboOmcpDVM7wLoXZ+9SS9RrL4sdob2J0SzhTTE0EHwnmQb0Yx
+A+ohMsK3l+j2ok88ZMa1+Jj5/p5oZK5ucIPe+xHiMpuepgnuH/35VW0ZNg+BIkR1
+Bu+OHUAkJWnHKvm2mlfYigC2mkhxESbMw+ofD0UVaxOMMyDqn4kzmc2l8qTT9tMd
+epsOGHo1sI1z9psy3jO7ZjbQJjX41co16ILOtpdiVByTl+2L77qJA5KJidHdbPCj
+YY1/BqyvxGKKSRfUZLJFnMBfVsgGrRdfMCjilczsllgJw0WqEwd4tZI6MaW/F0Lq
+giFiAgaHITP/AJaUanorN0R7Pj5UmpO4enpGOkkyxMddK44uY1DWHIjc5pVEFgW1
+dvt9zmozT2ZaOSYhJzXq5jm/Riom2TEv/0X7qPiyoayMnAKD6iM3AP2o0BRjomVL
+5NrYtQh5rh54v0eIs44x
+=t8GY
 -----END PGP SIGNATURE-----
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
+}