Version bump

(Portage version: 2.2_rc26/cvs/Linux x86_64)

5 files changed, 53 insertions, 203 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index 6c290d3bf942..766f3c6fde52 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/geos
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.31 2008/11/27 11:36:57 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.32 2009/03/27 12:30:19 bicatali Exp $
+
+*geos-3.1.0 (27 Mar 2009)
+
+  27 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/geos-3.0.0-gcc43.patch, -geos-3.0.0.ebuild, +geos-3.1.0.ebuild:
+  Version bump
 
 *geos-3.0.3 (27 Nov 2008)
 
diff --git a/sci-libs/geos/files/geos-3.0.0-gcc43.patch b/sci-libs/geos/files/geos-3.0.0-gcc43.patch
deleted file mode 100644
index c14c6023504e..000000000000
--- a/sci-libs/geos/files/geos-3.0.0-gcc43.patch
+++ /dev/null
@@ -1,141 +0,0 @@
---- geos-3.0.0.orig/source/planargraph/DirectedEdge.cpp
-+++ geos-3.0.0/source/planargraph/DirectedEdge.cpp
-@@ -21,6 +21,7 @@
- #include <cmath>
- #include <sstream>
- #include <vector>
-+#include <typeinfo>
- 
- using namespace std;
- using namespace geos::geom;
---- geos-3.0.0.orig/source/precision/SimpleGeometryPrecisionReducer.cpp
-+++ geos-3.0.0/source/precision/SimpleGeometryPrecisionReducer.cpp
-@@ -30,6 +30,7 @@
- #include <geos/geom/LinearRing.h>
- 
- #include <vector>
-+#include <typeinfo>
- 
- using namespace std;
- using namespace geos::geom;
---- geos-3.0.0.orig/source/io/ByteOrderValues.cpp
-+++ geos-3.0.0/source/io/ByteOrderValues.cpp
-@@ -22,6 +22,7 @@
- #include <geos/util.h>
- 
- #include <cassert>
-+#include <cstring>
- 
- namespace geos {
- namespace io { // geos.io
---- geos-3.0.0.orig/source/io/StringTokenizer.cpp
-+++ geos-3.0.0/source/io/StringTokenizer.cpp
-@@ -17,6 +17,7 @@
- #include <geos/io/StringTokenizer.h>
- 
- #include <string>
-+#include <cstdlib>
- 
- using namespace std;
- 
---- geos-3.0.0.orig/source/operation/buffer/OffsetCurveSetBuilder.cpp
-+++ geos-3.0.0/source/operation/buffer/OffsetCurveSetBuilder.cpp
-@@ -41,6 +41,7 @@
- #include <vector>
- #include <memory>
- #include <cassert>
-+#include <typeinfo>
- 
- #ifndef GEOS_DEBUG
- #define GEOS_DEBUG 0
---- geos-3.0.0.orig/source/operation/distance/ConnectedElementPointFilter.cpp
-+++ geos-3.0.0/source/operation/distance/ConnectedElementPointFilter.cpp
-@@ -20,6 +20,7 @@
- #include <geos/geom/Polygon.h>
- 
- #include <vector>
-+#include <typeinfo>
- 
- using namespace std;
- using namespace geos::geom;
---- geos-3.0.0.orig/source/geomgraph/GeometryGraph.cpp
-+++ geos-3.0.0/source/geomgraph/GeometryGraph.cpp
-@@ -45,6 +45,7 @@
- #include <vector>
- #include <memory> // auto_ptr
- #include <cassert>
-+#include <typeinfo>
- 
- #ifndef GEOS_DEBUG
- #define GEOS_DEBUG 0
---- geos-3.0.0.orig/source/index/quadtree/DoubleBits.cpp
-+++ geos-3.0.0/source/index/quadtree/DoubleBits.cpp
-@@ -22,6 +22,7 @@
- #include <geos/util/IllegalArgumentException.h>
- 
- #include <string>
-+#include <cstring>
- 
- #if __STDC_IEC_559__
- #define ASSUME_IEEE_DOUBLE 1
---- geos-3.0.0.orig/source/headers/geos/noding/FastNodingValidator.h
-+++ geos-3.0.0/source/headers/geos/noding/FastNodingValidator.h
-@@ -25,6 +25,7 @@
- 
- #include <cassert>
- #include <string>
-+#include <memory>
- 
- // Forward declarations
- namespace geos {
---- geos-3.0.0.orig/source/headers/geos/noding/IntersectionAdder.h
-+++ geos-3.0.0/source/headers/geos/noding/IntersectionAdder.h
-@@ -19,6 +19,7 @@
- #include <vector>
- #include <iostream>
- #include <cmath> // for abs()
-+#include <cstdlib> // for abs()
- 
- #include <geos/inline.h>
- 
---- geos-3.0.0.orig/doc/example.cpp
-+++ geos-3.0.0/doc/example.cpp
-@@ -31,6 +31,7 @@
- #include <vector>
- #include <sstream>
- #include <iomanip>
-+#include <cstdlib>
- #include <geos/geom/PrecisionModel.h>
- #include <geos/geom/GeometryFactory.h>
- #include <geos/geom/Geometry.h>
---- geos-3.0.0.orig/tests/xmltester/markup/MarkupSTL.h
-+++ geos-3.0.0/tests/xmltester/markup/MarkupSTL.h
-@@ -65,6 +65,7 @@
- #include <string>
- #include <map>
- #include <vector>
-+#include <cstring>
- 
- #ifdef _DEBUG
- #define _DS(i) (i?&(m_strDoc.c_str())[m_aPos[i].nStartL]:0)
---- geos-3.0.0.orig/tests/xmltester/XMLTester.cpp
-+++ geos-3.0.0/tests/xmltester/XMLTester.cpp
-@@ -57,6 +57,7 @@
- #include <functional>
- #include <stdexcept>
- #include <cmath>
-+#include <cstring>
- 
- #ifdef _MSC_VER
- #include <windows.h>
---- geos-3.0.0.orig/tests/bigtest/TestSweepLineSpeed.cpp
-+++ geos-3.0.0/tests/bigtest/TestSweepLineSpeed.cpp
-@@ -88,7 +88,7 @@
- //	cout << "n Pts: " << nPts << "   Executed in " << totalTime << endl;
- }
- 
--int main(int /* argC */, char* /* argV[] */) {
-+int main(int /* argC */, char** /* argV */) {
- 
- 	GeometryFactory *fact=new GeometryFactory();
- 
diff --git a/sci-libs/geos/geos-2.2.1.ebuild b/sci-libs/geos/geos-2.2.1.ebuild
index 0d47740323c4..f975f9e12cb5 100644
--- a/sci-libs/geos/geos-2.2.1.ebuild
+++ b/sci-libs/geos/geos-2.2.1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-2.2.1.ebuild,v 1.9 2008/05/29 17:51:17 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-2.2.1.ebuild,v 1.10 2009/03/27 12:30:19 bicatali Exp $
 
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
 inherit eutils autotools
 
 DESCRIPTION="Geometry Engine - Open Source"
@@ -42,7 +40,7 @@ src_compile() {
 src_install(){
 	into /usr
 	make DESTDIR="${D}" install
-	dodoc AUTHORS COPYING INSTALL NEWS README TODO
+	dodoc AUTHORS INSTALL NEWS README TODO
 	if use doc; then
 		cd "${S}"/doc
 		make doxygen-html
diff --git a/sci-libs/geos/geos-3.0.0.ebuild b/sci-libs/geos/geos-3.0.0.ebuild
deleted file mode 100644
index 6bdb65d3df6b..000000000000
--- a/sci-libs/geos/geos-3.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.0.0.ebuild,v 1.3 2008/04/17 14:16:54 bicatali Exp $
-
-inherit eutils
-
-MY_P=${PN}-${PV/_/}
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://geos.refractions.net"
-SRC_URI="http://geos.refractions.net/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc python ruby"
-
-RDEPEND="ruby? ( virtual/ruby )
-	python? ( virtual/python )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )\
-	ruby?  ( >=dev-lang/swig-1.3.29 )
-	python? ( >=dev-lang/swig-1.3.29 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-}
-
-src_compile() {
-	local myconf
-
-	if ! use python && ! use ruby ; then
-		myconf="--disable-swig"
-	fi
-
-	econf ${myconf} \
-		$(use_enable python) \
-		$(use_enable ruby) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	into /usr
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README TODO || die
-	if use doc; then
-		cd "${S}/doc"
-		emake doxygen-html || die "doc generation failed"
-		dohtml -r doxygen_docs/html/*
-	fi
-}
diff --git a/sci-libs/geos/geos-3.1.0.ebuild b/sci-libs/geos/geos-3.1.0.ebuild
new file mode 100644
index 000000000000..254934a40b31
--- /dev/null
+++ b/sci-libs/geos/geos-3.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.1.0.ebuild,v 1.1 2009/03/27 12:30:19 bicatali Exp $
+
+EAPI=2
+
+DESCRIPTION="Geometry engine library for Geographic Information Systems"
+HOMEPAGE="http://geos.refractions.net"
+SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc python ruby"
+
+RDEPEND="ruby? ( virtual/ruby )
+	python? ( virtual/python )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	ruby?  ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+src_configure() {
+	econf $(use_enable python) $(use_enable ruby)
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use doc; then
+		cd "${S}/doc"
+		emake doxygen-html || die "doc generation failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS NEWS README TODO
+	if use doc; then
+		cd "${S}/doc"
+		dohtml -r doxygen_docs/html/* || die
+	fi
+}