version bump, remove old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 61 insertions, 136 deletions

diff --git a/sci-geosciences/osgearth/ChangeLog b/sci-geosciences/osgearth/ChangeLog
index 1aa4db54c65e..4a673deccf65 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.3 2013/11/03 12:02:48 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osgearth/ChangeLog,v 1.4 2013/11/22 13:36:54 hasufell Exp $
+
+*osgearth-2.5 (22 Nov 2013)
+
+  22 Nov 2013; Julian Ospald <hasufell@gentoo.org>
+  +files/osgearth-2.5-cmake-options.patch, +osgearth-2.5.ebuild,
+  -files/osgearth-2.4-FindMiniZip.cmake.patch, -osgearth-2.4.ebuild:
+  version bump, remove old
 
   03 Nov 2013; Julian Ospald <hasufell@gentoo.org> osgearth-2.4.ebuild:
   fix dev-lang/v8 dep wrt #484786
diff --git a/sci-geosciences/osgearth/Manifest b/sci-geosciences/osgearth/Manifest
index 377632050343..300361490a90 100644
--- a/sci-geosciences/osgearth/Manifest
+++ b/sci-geosciences/osgearth/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX osgearth-2.4-FindMiniZip.cmake.patch 3409 SHA256 07253c5a39de8c892f72e192de593dd2d67e05fd469b12aca1198746e00acc08 SHA512 281b282814928e6ad737f15760f627f401d04151f4a1771451b3d0781af50e169349b336b3ed09668edc911a462a2ac444fff3164b318f5f42502214a35832c2 WHIRLPOOL fecab00ca94413dfb34bc74bd569dbdd93a45770e91b728088a48cad175d5bc71aab3c19885c55bc5e07d0cfead2f1d6cd935980003f97b5d368901799dd57e1
-DIST osgearth-2.4.tar.gz 49195211 SHA256 fc832fdd310d380f643f7be2a2ca7af5afa1da2bf557a30ddcc43ba4f2f16bdd SHA512 942370e5f690b66a648b1541889ca5c150a66c11e8099f014bc7e692fc205aa4e7b9feb6007ad49f996ff858ef2fcf071d891abb71766e554dee1e5fb4059c67 WHIRLPOOL f8411f1a28071b58c6449a5a22a236eb9fde3a9cc1efdbb08a4f5cb8d320cce31a458fc31a60395026e13cafea3771bcc4d526b7d993bc12f7dcb4facbd4257f
-EBUILD osgearth-2.4.ebuild 1339 SHA256 4f808a59c54f6df886ec1e27eec99791b8e7dbdc3a424df937f4242b1c132132 SHA512 2da515d632f67fb9d9bd8474577b052ce14238aa555bac9fd52c24c67e602405c84712f0a1fdbe0dee816d73da24e1d0fd0a3b8639ec34ed6bf6a83223ac21d1 WHIRLPOOL c225ec69cb6624dff636ce528fdd116d5d7014f560d8b11fa84998b2085ea3131c1b8b19db5e235c895791dd1d6cb7a6fe240e29d9e8a04f608ed1a4134898dc
-MISC ChangeLog 595 SHA256 c8ce1986c7ac776a6e429c2740b4fd5b135483e2704ef872c9ce1dd7ef6b48b4 SHA512 a694b9876d88df509ad8abaf7db8a39b95f1b9dd43dec511d44f4600827238019ff68ec78908b5e2dd1ea0beff2095091d83b69daee803049fe9996f514d1f3d WHIRLPOOL ddb684ba40898c9236cdfed8c3c59b0cd1bf35851895230f9ab4edc75b094d32fcfa9fd4bcfae2bce05ddda5b7b25588ec294fbd9a3f1c64ec96e6e53455643c
+AUX osgearth-2.5-cmake-options.patch 949 SHA256 ce522bc6602bc563263f11f69c5ceac1a439529c568afc06ebd3b9842c836e83 SHA512 b752320af26b49561cc5a3873db646909c734757b388d95413e261297cfb164cbc3504c01847f3a89813814adba7cb733a6b538f651d5180591515d87526fb27 WHIRLPOOL cf2bd922ae9cc7699447b39ddcd2ae8294052d03b2b0ab491f3aa49b045efb6d90a205f0124b1d65dd6cd04fc5f9dd3eff0d884557b18268e649fa1fb1f109b7
+DIST osgearth-2.5.tar.gz 49670415 SHA256 73d730fdf615318ef876179b21ff77f508efa20e4dcd8640b999a8235a811616 SHA512 74d63796b04ffbe514014a78279c4aff35f2fadab55ee88f69bb311cadc9c3edff471a27e7ee9147c5c98f91f2b90c389414c4a060c4c030cf680e7c3f0629a8 WHIRLPOOL 536bbc29bfff3f604f3c1a1c825c7f37a116e48526e046065061f081fc8465b19986068c8e61a0e7f427a082d9f4e6c764b2e4e093f48e48f52faa2aed2c1746
+EBUILD osgearth-2.5.ebuild 1474 SHA256 b609078da731294b89bad002e02cffe444973e18b18a2934102ba8912d409ff6 SHA512 12e6dba9e06ab1256942e019ab2309d4fa00f5f5b980c9936b363dfe1a516e7291cf50a1014e8eae7bbb0371dbd500bb1e8815b1a9d4bc29c7f1a6cbadaa32cf WHIRLPOOL 6b38ca7a8086a4db7b3162dac0b61bfe261b3c06afc61b66d3b496d0a522254cd66efbd3f1edc2f0128592b65cf958cfe5f5fd4fe876b07b9ef84f7d8485105d
+MISC ChangeLog 837 SHA256 83416cc5fadd060164ddf7c5df9241000b94aa12873dfbff342e8ffd966a8d69 SHA512 ca35c567c85a634b6c341a09cfc1d1245925313b8933408bfaa3b5a3301f5525d24d5d25704f863e3465dfc4a0f9cb21a068a1ce65c993865d77a78593b69dc8 WHIRLPOOL 894f39073fa18f1bf13b4933447cee24e9d1bd71b373bc82d08ed4bc2e4d853a3637ee2db3551c51c737d2bbc88ad3deaf63e5e8f635cb56de713d1c6bddbbdc
 MISC metadata.xml 813 SHA256 b35857ec7a68147f511afd56df2da0d136b806c1ca8ea451b6137b0b83858a13 SHA512 01d4aa615795b4a914445b5d7ccb063f8c27908846b9b1ee4033ad5ab919e5923eaaef6dadb889d8457a25739dc0c0b3a82c9fa10611968576a8c32694d24f71 WHIRLPOOL a601d3fe64163062500bde8c856efd9dee17ad1084028912fd7ecfed09d93c077e8aa9f8b6167104b0caf8a4218ba490f6b20389712a3a833d22df53d56b836a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSdjtrAAoJEFpvPKfnPDWziBgH/A5QToD3D1UHxNRqoZLepYFT
-/F6N55HuqhV89cn5acPLgw6iGCH68a55LW2Z2sUsrd2EVKEU8EEwu6+6AdVIl8p5
-KHhVKMr10oBPqBzxC9xaNEVX5kk1nPgJH+Ztp8nS7x0MhC+JAV04M2g7xxgog2gN
-/X9V2AtY1S0nc7ZyzKrAx3FvdUsNx+McibRkkoCR2ZHZ/IMW3cmLMpgRwQ9GpKl0
-OJz3qk/BkzT6MmkKUCBQcBtwMb5rP2IHv8XkUFPQSQ1oCHTbqT26kTtdCGpkFiRu
-HDWmEtovFCNr0cCdn5Gqpvd74m55wYA8Yq8YG+AuBPECEOoNYpn/EKvBKHLBbkk=
-=3ZR9
+iQEcBAEBCAAGBQJSj133AAoJEFpvPKfnPDWzH00H/jg+RtomjEOkSvT3ciF+jpw/
+OwA8MXj0EemJZ4rGjzEMzBfvxv1ASaQ2icstkvGXn6AsVqLxCfoPqIbyW4Tvgf4J
+t6qNQjQLS0khNzTlhGDRhJmJT/jkrzt1jfTZXGxfRI/WsVWFstacL3I/0hlpGPLS
+SVF/kG15YDuTa0b+7FlakV9RnWIAHoLdkTu6U0pVKhihk4rO3zMe5fIZVIVmcnFJ
+qs+9axaVnEcdDg0EGAcx4cXZoo0bf2cUYNgysT68fynwPri5wDi8DZHgYyrSEPnD
+H25A+zhTURNEzAnrnQP8zeDOFPFIsHqthTPOrHMIO7hR6OXnuJNPj/FTWNSmZK0=
+=byp0
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/osgearth/files/osgearth-2.4-FindMiniZip.cmake.patch b/sci-geosciences/osgearth/files/osgearth-2.4-FindMiniZip.cmake.patch
deleted file mode 100644
index 326a9b8c4cba..000000000000
--- a/sci-geosciences/osgearth/files/osgearth-2.4-FindMiniZip.cmake.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-commit 422e0901ddd760b230dc378e3b9359bd6d36200a
-Author: hasufell <hasufell@gentoo.org>
-Date:   Sun Jul 21 18:59:14 2013 +0200
-
-    BUILD: fix FindMiniZip.cmake module to use pkg-config
-	https://github.com/gwaldron/osgearth/pull/340
-
-diff --git a/CMakeModules/FindMiniZip.cmake b/CMakeModules/FindMiniZip.cmake
-index c80ebbf..c8cae16 100644
---- a/CMakeModules/FindMiniZip.cmake
-+++ b/CMakeModules/FindMiniZip.cmake
-@@ -5,50 +5,65 @@
- # MINIZIP_INCLUDE_DIR, where to find the headers
- #
- 
--FIND_PATH(MINIZIP_INCLUDE_DIR zip.h
--    ${CMAKE_SOURCE_DIR}/src/3rdparty/minizip
--    $ENV{MINIZIP_DIR}/include
--    $ENV{MINIZIP_DIR}
--    $ENV{OSGDIR}/include
--    $ENV{OSGDIR}
--    $ENV{OSG_ROOT}/include
--    ~/Library/Frameworks
--    /Library/Frameworks
--    /usr/local/include
--    /usr/include
--    /sw/include # Fink
--    /opt/local/include # DarwinPorts
--    /opt/csw/include # Blastwave
--    /opt/include
--    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
--    /usr/freeware/include
--)
-+# prefer pkg-config
-+IF(UNIX)
-+	INCLUDE(FindPkgConfig)
-+	IF(PKG_CONFIG_FOUND)
-+		pkg_check_modules(MINIZIP QUIET minizip)
-+		IF(MINIZIP_FOUND)
-+			# pkgconfig does not define the singular names
-+			SET(MINIZIP_LIBRARY ${MINIZIP_LIBRARIES})
-+			SET(MINIZIP_INCLUDE_DIR ${MINIZIP_INCLUDE_DIRS})
-+			ADD_DEFINITIONS(-DOSGEARTH_HAVE_MINIZIP)
-+		ENDIF(MINIZIP_FOUND)
-+	ENDIF(PKG_CONFIG_FOUND)
-+ENDIF(UNIX)
- 
--FIND_LIBRARY(MINIZIP_LIBRARY 
--    NAMES minizip
--    PATHS
--    ${CMAKE_SOURCE_DIR}/src/3rdparty/minizip
--    $ENV{MINIZIP_DIR}/lib
--    $ENV{MINIZIP_DIR}
--    $ENV{OSGDIR}/lib
--    $ENV{OSGDIR}
--    $ENV{OSG_ROOT}/lib
--    ~/Library/Frameworks
--    /Library/Frameworks
--    /usr/local/lib
--    /usr/lib
--    /sw/lib
--    /opt/local/lib
--    /opt/csw/lib
--    /opt/lib
--    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
--    /usr/freeware/lib64
--)
--
--SET(MINIZIP_FOUND "NO")
--IF(MINIZIP_LIBRARY AND MINIZIP_INCLUDE_DIR)
--    SET(MINIZIP_FOUND "YES")
--    ADD_DEFINITIONS(-DOSGEARTH_HAVE_MINIZIP)
--ENDIF(MINIZIP_LIBRARY AND MINIZIP_INCLUDE_DIR)
-+# fallback logic
-+IF(NOT MINIZIP_FOUND)
-+	FIND_PATH(MINIZIP_INCLUDE_DIR zip.h
-+		${CMAKE_SOURCE_DIR}/src/3rdparty/minizip
-+		$ENV{MINIZIP_DIR}/include
-+		$ENV{MINIZIP_DIR}
-+		$ENV{OSGDIR}/include
-+		$ENV{OSGDIR}
-+		$ENV{OSG_ROOT}/include
-+		~/Library/Frameworks
-+		/Library/Frameworks
-+		/usr/local/include
-+		/usr/include
-+		/sw/include # Fink
-+		/opt/local/include # DarwinPorts
-+		/opt/csw/include # Blastwave
-+		/opt/include
-+		[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-+		/usr/freeware/include
-+	)
- 
-+	FIND_LIBRARY(MINIZIP_LIBRARY 
-+		NAMES minizip
-+		PATHS
-+		${CMAKE_SOURCE_DIR}/src/3rdparty/minizip
-+		$ENV{MINIZIP_DIR}/lib
-+		$ENV{MINIZIP_DIR}
-+		$ENV{OSGDIR}/lib
-+		$ENV{OSGDIR}
-+		$ENV{OSG_ROOT}/lib
-+		~/Library/Frameworks
-+		/Library/Frameworks
-+		/usr/local/lib
-+		/usr/lib
-+		/sw/lib
-+		/opt/local/lib
-+		/opt/csw/lib
-+		/opt/lib
-+		[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-+		/usr/freeware/lib64
-+	)
- 
-+	SET(MINIZIP_FOUND "NO")
-+	IF(MINIZIP_LIBRARY AND MINIZIP_INCLUDE_DIR)
-+		SET(MINIZIP_FOUND "YES")
-+		ADD_DEFINITIONS(-DOSGEARTH_HAVE_MINIZIP)
-+	ENDIF(MINIZIP_LIBRARY AND MINIZIP_INCLUDE_DIR)
-+ENDIF(NOT MINIZIP_FOUND)
diff --git a/sci-geosciences/osgearth/files/osgearth-2.5-cmake-options.patch b/sci-geosciences/osgearth/files/osgearth-2.5-cmake-options.patch
new file mode 100644
index 000000000000..a14ae658a7bd
--- /dev/null
+++ b/sci-geosciences/osgearth/files/osgearth-2.5-cmake-options.patch
@@ -0,0 +1,35 @@
+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
+@@ -115,10 +115,20 @@ FIND_PACKAGE(Sqlite3)
+ FIND_PACKAGE(ZLIB)
+ 
+ SET(V8_DIR "" CACHE PATH "set to base V8 install path")
+-FIND_PACKAGE(V8)
+-
+-FIND_PACKAGE(JavaScriptCore)
+-FIND_PACKAGE(LibNoise)
++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)
++IF (OSGEARTH_USE_LIBNOISE)
++	FIND_PACKAGE(LibNoise)
++ENDIF(OSGEARTH_USE_LIBNOISE)
+ 
+ FIND_PACKAGE(Qt4)
+ IF (QT4_FOUND)
diff --git a/sci-geosciences/osgearth/osgearth-2.4.ebuild b/sci-geosciences/osgearth/osgearth-2.5.ebuild
index 94ccaa9b997f..53ffc13da50a 100644
--- a/sci-geosciences/osgearth/osgearth-2.4.ebuild
+++ b/sci-geosciences/osgearth/osgearth-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osgearth/osgearth-2.4.ebuild,v 1.3 2013/11/03 12:02:48 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osgearth/osgearth-2.5.ebuild,v 1.1 2013/11/22 13:36:54 hasufell Exp $
 
 EAPI=5
 
@@ -18,7 +18,6 @@ IUSE="doc qt4"
 RDEPEND="
 	dev-db/sqlite:3
 	dev-games/openscenegraph[curl,qt4?]
-	=dev-lang/v8-3.18.5.14
 	dev-libs/tinyxml
 	net-misc/curl
 	sci-libs/gdal
@@ -37,12 +36,17 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-${P}
 
-PATCHES=( "${FILESDIR}"/${P}-FindMiniZip.cmake.patch )
+PATCHES=( "${FILESDIR}"/${P}-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