old

Package-Manager: portage-2.2.14/cvs/Linux x86_64

4 files changed, 7 insertions, 134 deletions

diff --git a/sci-geosciences/osgearth/ChangeLog b/sci-geosciences/osgearth/ChangeLog
index c3c99479c93e..400fb555fb27 100644
--- a/sci-geosciences/osgearth/ChangeLog
+++ b/sci-geosciences/osgearth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/osgearth
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osgearth/ChangeLog,v 1.6 2014/11/25 22:54:46 hasufell Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osgearth/ChangeLog,v 1.7 2015/04/04 06:30:32 mr_bones_ Exp $
+
+  04 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/osgearth-2.5-cmake-options.patch, -osgearth-2.5.ebuild:
+  old
 
   25 Nov 2014; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   drop maintainership
diff --git a/sci-geosciences/osgearth/Manifest b/sci-geosciences/osgearth/Manifest
index ac025a0272a0..f2476ce25ad9 100644
--- a/sci-geosciences/osgearth/Manifest
+++ b/sci-geosciences/osgearth/Manifest
@@ -1,31 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
 EBUILD osgearth-2.6.ebuild 1496 SHA256 039aedbbfb8249f16c0a8d56f8dd90c17989b31f8108842e5f2d9422621382f8 SHA512 0d85203bb513e9c186778720ee97a145f15f2dd16d7ebec1f27496874f08691f43b93d74b64b86f93b8e37ba8d7a442038a5299377e1195419bc0eb4735ca4c4 WHIRLPOOL 1180a46e78db86d9c127c7f7b79c12b9f6daca460fd75764dc7483b620f3495e8982843a930e2f4e0fcc2e6128f0ffc2d64d06546d427b3e0bbd8470b1c0a9b5
-MISC ChangeLog 1127 SHA256 f5302a54fa9fb2f2223f7ada198cad28e0795d3f49d9991ba4e903b40cc327c0 SHA512 14856e6925ebd6584a3bb97a860c0a3d695a2b7053a411d926ef5187ec2ed10987e15f832dce6eb58de3ac66da870bb41ac97632e19585db826d04c651b5c9d6 WHIRLPOOL acf0aa7ce7fd7025e2b07b30953de3462762979f202725319b47fde7d402bf5461b56fc1906f74b4ffc610fb772cf036058ed81601600944404efa8120c4f187
+MISC ChangeLog 1255 SHA256 343571a4e5eeb44d15c37fd6872e79cade80e6089b299b437d5f6337aee79ce9 SHA512 32966315c90540601a63d003bbd5ef2782f51ee779e920598bf6a7dc4d97ba36eebeed41bd8282c520f6877bc5ee8972df989323442c7ca2cb6767bec8592f31 WHIRLPOOL 7447750fe60060285cd3f6558c7b69e43bea977d862de57ff221e400d094e99352fce23ca06979abe6c53046c0c2a78623ff93a26b2b32a8da87036fb186763c
 MISC metadata.xml 793 SHA256 754ec0db76076841b69a00ab79149cb1c8c441d6488e351f49ad2cd0f58759f7 SHA512 907a5959c80668b34f91f928b36e31f381bc9878e86a2b29a84408eeb44b333f1830baa43c3cc906b37aa82d5d6566ea4da789fe1a8f963877e1002ed3e55339 WHIRLPOOL 316a210f73502400715503431f9720218eba2035078de10ef045dfdb1602baf7bc196aa0cce599747a76122433a5a86de6e64b37c7eb852b67b1742773441d93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCABmBQJUdQi2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgFmEP/RUOg45T/67OCKPzTxbG0ScG
-AcgFb7kxmUoEg0DFbNpS8nKqI+oPfdNu9Te8ZMX3gufqJEZHnNYlSPQ8QavmkxQJ
-CGDFULj595ip8iz6VEVppUvJLyFOh4m6p4Ve+ZSxppj3P2K8o5dCzeOaHEZhhOwM
-75A5CnJDizJC7fwfcK1/OnMx5ExVONXtKstuh39Y7+Qif7Usw46ByrDrTRMdYJGO
-Weg2b2+QVOnxvJ6/qRsneZyEUYbdj98hPdr0LSgj3XUlCmVKNcjF8RVC17Jl0XAp
-GtUJllBv1xQnn+RVqiQFWkg3mNc6JW7YfXhVUNHpXw8QuKkxwDDLRJ4JkuNyK9vc
-zb+ozn305YmPNcRBjKb8wvkH1RuAV2ujDoNe90+nD8+WeucORmgiUfj6yDVRM9zT
-zb0BCxAC+wDYJIY8VTgxdrfFsgYXL0NlIPJxB+wySfV0D6Nfz1LiPQr9koeiexst
-wiIJuA1qkWL9/jw+ftBiPoguWkEcsXEdYFcY29Vsduwh0qgDlgUr9kj7MlljMFwK
-ojPe6SR4TvleL/0AiSLs/1Vs/Hi0oT+1sGa8nneYjV9Wox02gwNZS6smZNelELDV
-nTJ7WysGln/fxGdEdG9lPOemuozbpeQMlEgQaz7pLmsfjYvi3hQuCwNXdN0Hl+qz
-wMU+A5rFA/jOFOfo7wko
-=Tw2U
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/osgearth/files/osgearth-2.5-cmake-options.patch b/sci-geosciences/osgearth/files/osgearth-2.5-cmake-options.patch
deleted file mode 100644
index a14ae658a7bd..000000000000
--- a/sci-geosciences/osgearth/files/osgearth-2.5-cmake-options.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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.5.ebuild b/sci-geosciences/osgearth/osgearth-2.5.ebuild
deleted file mode 100644
index 53ffc13da50a..000000000000
--- a/sci-geosciences/osgearth/osgearth-2.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.5.ebuild,v 1.1 2013/11/22 13:36:54 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[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}-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
-}