old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 6 insertions, 108 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/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
-}