Added a patch for possible missing includes, thanks Kacper Kowalik, bug #286804

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

11 files changed, 35 insertions, 462 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index acb88f1df159..886fff784d60 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.38 2009/10/11 16:28:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.39 2009/11/17 07:23:15 bicatali Exp $
+
+  17 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> -geos-2.2.1.ebuild,
+  -files/geos-2.2.1-gcc-41.patch, -geos-2.2.3.ebuild,
+  -files/geos-2.2.3-gcc43.patch, -files/geos-2.2.3-python-shared.patch,
+  -files/geos-2.2.3-swig.patch, -geos-3.1.0.ebuild, geos-3.1.1.ebuild,
+  +files/geos-3.1.1-missing-includes.patch, -files/python.i:
+  Added a patch for possible missing includes, thanks Kacper Kowalik, bug
+  #286804
 
   11 Oct 2009; Raúl Porcel <armin76@gentoo.org> geos-3.1.1.ebuild:
   sparc stable wrt #279359
diff --git a/sci-libs/geos/files/geos-2.2.1-gcc-41.patch b/sci-libs/geos/files/geos-2.2.1-gcc-41.patch
deleted file mode 100644
index abe09534d204..000000000000
--- a/sci-libs/geos/files/geos-2.2.1-gcc-41.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -ur geos-2.2.1/source/headers/geos/geom.h ../../geos-works/source/headers/geos/geom.h
---- geos-2.2.1/source/headers/geos/geom.h	2005-11-29 09:52:21.000000000 -0800
-+++ ../../geos-works/source/headers/geos/geom.h	2006-03-16 20:55:14.000000000 -0800
-@@ -358,52 +358,52 @@
- 	//double distance(Coordinate& p);
- 	static Coordinate nullCoord;
- 
--	void Coordinate::setNull() {
-+	void setNull() {
- 		x=DoubleNotANumber;
- 		y=DoubleNotANumber;
- 		z=DoubleNotANumber;
- 	}
- 
--	static Coordinate& Coordinate::getNull() {
-+	static Coordinate& getNull() {
- 		return nullCoord;
- 	}
- 
--	Coordinate::Coordinate() {
-+	Coordinate() {
- 		x=0.0;
- 		y=0.0;
- 		z=DoubleNotANumber;
- 	}
- 
--	Coordinate::Coordinate(double xNew, double yNew, double zNew) {
-+	Coordinate(double xNew, double yNew, double zNew) {
- 		x=xNew;
- 		y=yNew;
- 		z=zNew;
- 	}
- 
- #ifndef PROFILE_COORDINATE_COPIES
--	Coordinate::Coordinate(const Coordinate& c){
-+	Coordinate(const Coordinate& c){
- 		x=c.x;
- 		y=c.y;
- 		z=c.z;
- 	}
- #else
--	Coordinate::Coordinate(const Coordinate& c);
-+	Coordinate(const Coordinate& c);
- 	Coordinate &operator=(const Coordinate &c);
- #endif
- 
--	Coordinate::Coordinate(double xNew, double yNew){
-+	Coordinate(double xNew, double yNew){
- 		x=xNew;
- 		y=yNew;
- 		z=DoubleNotANumber;
- 	}
- 
--	void Coordinate::setCoordinate(const Coordinate& other) {
-+	void setCoordinate(const Coordinate& other) {
- 		x = other.x;
- 		y = other.y;
- 		z = other.z;
- 	}
- 
--	bool Coordinate::equals2D(const Coordinate& other) const {
-+	bool equals2D(const Coordinate& other) const {
- 		if (x != other.x) {
- 		return false;
- 		}
-@@ -413,7 +413,7 @@
- 		return true;
- 	}
- 
--	int Coordinate::compareTo(const Coordinate& other) const {
-+	int compareTo(const Coordinate& other) const {
- 		if (x < other.x) {
- 		return -1;
- 		}
-@@ -429,22 +429,22 @@
- 		return 0;
- 	}
- 
--	bool Coordinate::equals3D(const Coordinate& other) const {
-+	bool equals3D(const Coordinate& other) const {
- 		return (x == other.x) && ( y == other.y) && ((z == other.z)||(ISNAN(z) && ISNAN(other.z)));
- 	}
- 
--	void Coordinate::makePrecise(const PrecisionModel *precisionModel) {
-+	void makePrecise(const PrecisionModel *precisionModel) {
- 		x = precisionModel->makePrecise(x);
- 		y = precisionModel->makePrecise(y);
- 	}
- 
--	double Coordinate::distance(const Coordinate& p) const {
-+	double distance(const Coordinate& p) const {
- 		double dx = x - p.x;
- 		double dy = y - p.y;
- 		return sqrt(dx * dx + dy * dy);
- 	}
- 
--	int Coordinate::hashCode() {
-+	int hashCode() {
- 		//Algorithm from Effective Java by Joshua Bloch [Jon Aquino]
- 		int result = 17;
- 		result = 37 * result + hashCode(x);
-@@ -456,7 +456,7 @@
- 	* Returns a hash code for a double value, using the algorithm from
- 	* Joshua Bloch's book <i>Effective Java</i>
- 	*/
--	static int Coordinate::hashCode(double x) {
-+	static int hashCode(double x) {
- 		int64 f = (int64)(x);
- 		return (int)(f^(f>>32));
- 	}
diff --git a/sci-libs/geos/files/geos-2.2.3-gcc43.patch b/sci-libs/geos/files/geos-2.2.3-gcc43.patch
deleted file mode 100644
index 88605a046f28..000000000000
--- a/sci-libs/geos/files/geos-2.2.3-gcc43.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- ./source/capi/geos_c.cpp.orig	2008-07-02 17:37:37.000000000 +0100
-+++ ./source/capi/geos_c.cpp	2008-07-02 17:37:58.000000000 +0100
-@@ -15,8 +15,8 @@
-  *
-  ***********************************************************************/
- 
--#include <stdio.h>
--
-+#include <cstdio>
-+#include <cstring>
- #include <string>
- #include <iostream>
- #include <sstream>
---- ./source/index/quadtree/DoubleBits.cpp.orig	2008-07-02 17:31:56.000000000 +0100
-+++ ./source/index/quadtree/DoubleBits.cpp	2008-07-02 17:32:57.000000000 +0100
-@@ -15,6 +15,7 @@
- 
- #include <geos/indexQuadtree.h>
- #include <geos/util.h>
-+#include <cstring>
- 
- namespace geos {
- 
---- ./source/io/markup/MarkupSTL.cpp.orig	2008-07-02 17:39:57.000000000 +0100
-+++ ./source/io/markup/MarkupSTL.cpp	2008-07-02 17:41:38.000000000 +0100
-@@ -6,8 +6,10 @@
- // Use in commercial applications requires written permission
- // This software is provided "as is", with no warranty.
- 
-+#include <cstring>
- #include "MarkupSTL.h"
--#include <stdio.h>
-+#include <cstdio>
-+
- 
- using namespace std;
- 
---- ./source/io/StringTokenizer.cpp.orig	2008-07-02 17:33:49.000000000 +0100
-+++ ./source/io/StringTokenizer.cpp	2008-07-02 17:34:22.000000000 +0100
-@@ -36,6 +36,7 @@
- 
- 
- #include <geos/io.h>
-+#include <cstring>
- 
- namespace geos {
- 
---- ./source/io/ByteOrderValues.cpp.orig	2008-07-02 17:34:48.000000000 +0100
-+++ ./source/io/ByteOrderValues.cpp	2008-07-02 17:35:23.000000000 +0100
-@@ -16,6 +16,7 @@
- 
- #include <geos/io.h>
- #include <geos/util.h>
-+#include <cstring>
- 
- namespace geos {
- 
---- ./source/test/XMLTester.cpp.orig	2008-07-02 17:38:47.000000000 +0100
-+++ ./source/test/XMLTester.cpp	2008-07-02 17:39:10.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <cassert>
- #include <cctype>
- #include <cstdlib>
-+#include <cstring>
- #include <fstream>
- #include <functional>
- #include <iostream>
diff --git a/sci-libs/geos/files/geos-2.2.3-python-shared.patch b/sci-libs/geos/files/geos-2.2.3-python-shared.patch
deleted file mode 100644
index a97fac78b8c3..000000000000
--- a/sci-libs/geos/files/geos-2.2.3-python-shared.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- swig/python/setup.py.orig	2008-02-13 10:50:26.530716975 +0000
-+++ swig/python/setup.py	2008-02-13 10:50:03.453401874 +0000
-@@ -31,7 +31,7 @@
-                    include_dirs = ["../../source/headers",
-                                    "../../source/headers/geos"],
-                    libraries = ["stdc++"],
--                   extra_objects = ["../../source/geom/.libs/libgeos.a"])
-+                   extra_objects = ["../../source/geom/.libs/libgeos.so"])
- 
- # the python module, generated by SWIG from geos.i
- pymod = "geos"
diff --git a/sci-libs/geos/files/geos-2.2.3-swig.patch b/sci-libs/geos/files/geos-2.2.3-swig.patch
deleted file mode 100644
index ee7121970493..000000000000
--- a/sci-libs/geos/files/geos-2.2.3-swig.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- swig/geos.i.orig	2006-07-03 14:06:23.000000000 -0700
-+++ swig/geos.i	2006-07-03 14:11:37.000000000 -0700
-@@ -163,7 +163,6 @@
- %newobject GeometricShapeFactory::getEnvelope;
- 
- %newobject WKBReader::read;
--%newobject WKBReader::readHEX;
- %newobject WKTReader::read;
- }
- 
-@@ -183,12 +182,6 @@
- 				 geos::MultiPoint, geos::MultiLineString,
- 				 geos::MultiPolygon, geos::GeometryCollection);
- 
--%factory(geos::Geometry * geos::WKBReader::readHEX, geos::Point, 
--				 geos::LinearRing, geos::LineString,
--				 geos::Polygon, 
--				 geos::MultiPoint, geos::MultiLineString,
--				 geos::MultiPolygon, geos::GeometryCollection);
--
- %factory(geos::Geometry * geos::Geometry::downcast, geos::Point, 
- 				 geos::LinearRing, geos::LineString,
- 				 geos::Polygon, 
-@@ -294,32 +287,3 @@
- 	 objects.  So create a global factory.*/
- 
- /* Add some helper methods to geometries */
--%extend geos::Geometry {
--	static geos::GeometryFactory& factory()
--	{
--		static geos::GeometryFactory factory;
--		return factory;
--	}
--
--	static geos::WKBReader& reader()
--	{
--		#if GEOS_VERSION_MAJOR == 2
--		static geos::WKBReader reader(geos_Geometry_factory());
--		#else
--		static geos::io::WKBReader reader(geos_Geometry_factory());
--		#endif
--		return reader;
--	}
--
--	static Geometry* fromWKT(std::string wkt)
--	{
--		std::stringstream in(wkt);
--		return geos_Geometry_reader().read(in);
--	}
--	
--	static Geometry* fromHEX(std::string hex)
--	{
--		std::stringstream in(hex);
--		return geos_Geometry_reader().readHEX(in);
--	}
--};
diff --git a/sci-libs/geos/files/geos-3.1.1-missing-includes.patch b/sci-libs/geos/files/geos-3.1.1-missing-includes.patch
new file mode 100644
index 000000000000..2eaa625fee5d
--- /dev/null
+++ b/sci-libs/geos/files/geos-3.1.1-missing-includes.patch
@@ -0,0 +1,20 @@
+--- geos-3.1.1.orig/source/geomgraph/index/SegmentIntersector.cpp	2009-04-08 18:00:16.000000000 +0200
++++ geos-3.1.1/source/geomgraph/index/SegmentIntersector.cpp	2009-09-29 15:46:49.012412357 +0200
+@@ -16,6 +16,7 @@
+ 
+ 
+ #include <vector>
++#include <stdlib.h>
+ 
+ #include <geos/geomgraph/index/SegmentIntersector.h>
+ #include <geos/geomgraph/Edge.h>
+--- geos-3.1.1.orig/tests/xmltester/XMLTester.cpp	2009-04-08 18:00:36.000000000 +0200
++++ geos-3.1.1/tests/xmltester/XMLTester.cpp	2009-09-29 15:46:23.718105044 +0200
+@@ -57,6 +57,7 @@
+ #include <functional>
+ #include <stdexcept>
+ #include <cmath>
++#include <algorithm>
+ 
+ #ifdef _MSC_VER
+ #include <windows.h>
diff --git a/sci-libs/geos/files/python.i b/sci-libs/geos/files/python.i
deleted file mode 100644
index 8218e3ee72b0..000000000000
--- a/sci-libs/geos/files/python.i
+++ /dev/null
@@ -1,3 +0,0 @@
-%template(vector_GeometryP) std::vector<geos::Geometry *>;
-%template(vector_LineStringP) std::vector<geos::LineString *>;
-%template(vector_PolygonP) std::vector<geos::Polygon *>;
diff --git a/sci-libs/geos/geos-2.2.1.ebuild b/sci-libs/geos/geos-2.2.1.ebuild
deleted file mode 100644
index 4725c0e276d4..000000000000
--- a/sci-libs/geos/geos-2.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.11 2009/09/23 20:07:17 patrick Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Geometry Engine - Open Source"
-HOMEPAGE="http://geos.refractions.net"
-SRC_URI="http://geos.refractions.net/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="doc python"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-		doc? ( app-doc/doxygen )\
-		python? ( dev-lang/python dev-lang/swig )"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-gcc-41.patch
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	econf --enable-static || die "Error: econf failed"
-
-	emake || die "Error: emake failed"
-	if use python; then
-		einfo "Compilling PyGEOS"
-		cd "${S}"/swig/python
-		swig -c++ -python -modern -o geos_wrap.cxx ../geos.i
-		python setup.py build
-	fi
-}
-
-src_install(){
-	into /usr
-	make DESTDIR="${D}" install
-	dodoc AUTHORS INSTALL NEWS README TODO
-	if use doc; then
-		cd "${S}"/doc
-		make doxygen-html
-		dohtml -r doxygen_docs/html/*
-	fi
-	if use python; then
-		einfo "Intalling PyGEOS"
-		cd "${S}"/swig/python
-		python setup.py install --prefix="${D}/usr/"
-		insinto /usr/share/doc/${PF}/python
-		doins README.txt tests/*.py
-		insinto /usr/share/doc/${PF}/python/cases
-		doins tests/cases/*
-	fi
-}
diff --git a/sci-libs/geos/geos-2.2.3.ebuild b/sci-libs/geos/geos-2.2.3.ebuild
deleted file mode 100644
index 1dee295bd76b..000000000000
--- a/sci-libs/geos/geos-2.2.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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.3.ebuild,v 1.8 2009/07/28 14:45:16 bicatali Exp $
-
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
-
-inherit eutils distutils ruby toolchain-funcs
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://geos.refractions.net"
-SRC_URI="http://geos.refractions.net/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-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 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-swig.patch"
-	epatch "${FILESDIR}/${P}-python-shared.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-
-	if use python; then
-		einfo "Compilling PyGEOS"
-		cd "${S}/swig/python"
-		cp "${FILESDIR}/python.i" "${S}/swig/python/"
-		rm -f geos_wrap.cxx
-		swig -c++ -python -modern -o geos_wrap.cxx ../geos.i
-		distutils_src_compile
-	fi
-	if use ruby; then
-		einfo "Compilling Ruby bindings"
-		cd "${S}"/swig/ruby
-		swig -c++ -ruby -autorename -o geos_wrap.cxx ../geos.i
-		local CXX=$(tc-getCXX)
-		local RUBY_ARCHDIR="$(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')"
-		${CXX} ${CXXFLAGS} -I../../source/headers -I${RUBY_ARCHDIR} \
-			-fPIC -c geos_wrap.cxx
-		${CXX} ${CXXFLAGS} -shared -L"${S}"/source/geom/.libs -lgeos \
-			-lruby geos_wrap.o -o geos.so
-	fi
-}
-
-src_test() {
-	emake check || die "Trying make check without success."
-	# I think this test must be made after the PyGEOS installation
-	#export PYTHONPATH=${S}/swig/python
-	if use python; then
-		cd "${S}"/swig/python
-		python tests/runtests.py -v
-	fi
-}
-
-src_install(){
-	emake install DESTDIR="${D}" || die "emake install failed"
-
-	if use python; then
-		einfo "Installing PyGEOS"
-		cd "${S}"/swig/python
-		distutils_src_install
-		insinto /usr/share/doc/${PF}/python
-		doins README.txt tests/*.py || die
-		insinto /usr/share/doc/${PF}/python/cases
-		doins tests/cases/* || die
-	fi
-	if use ruby; then
-		local RUBY_SITEARCHDIR="$(ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')"
-		einfo "Installing Ruby bindings in ${RUBY_SITEARCHDIR}/${PN}"
-		cd "${S}"/swig/ruby
-		insinto ${RUBY_SITEARCHDIR}/${PN}
-		doins geos.so || die
-		insinto /usr/share/doc/${PF}/ruby
-		doins README.txt test/*.rb || die
-		if use doc; then
-			erubydoc
-		fi
-	fi
-	if use doc; then
-		cd "${S}"/doc
-		emake doxygen-html || die "make doxygen docs failed"
-		dohtml -r doxygen_docs/html/*  || die
-	fi
-	cd "${S}"
-	dodoc AUTHORS NEWS README TODO || die
-}
-
-pkg_postinst() {
-	if use python; then
-		python_version
-		python_mod_optimize /usr/bin
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup
-	fi
-}
diff --git a/sci-libs/geos/geos-3.1.0.ebuild b/sci-libs/geos/geos-3.1.0.ebuild
deleted file mode 100644
index 5cff05ef6f91..000000000000
--- a/sci-libs/geos/geos-3.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.2 2009/07/28 14:45:16 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="LGPL-2.1"
-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
-}
diff --git a/sci-libs/geos/geos-3.1.1.ebuild b/sci-libs/geos/geos-3.1.1.ebuild
index fff4a36553eb..94b4d583129a 100644
--- a/sci-libs/geos/geos-3.1.1.ebuild
+++ b/sci-libs/geos/geos-3.1.1.ebuild
@@ -1,8 +1,9 @@
 # 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.1.ebuild,v 1.5 2009/10/11 16:28:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.1.1.ebuild,v 1.6 2009/11/17 07:23:15 bicatali Exp $
 
 EAPI=2
+inherit eutils
 
 DESCRIPTION="Geometry engine library for Geographic Information Systems"
 HOMEPAGE="http://geos.refractions.net"
@@ -20,6 +21,10 @@ DEPEND="${RDEPEND}
 	ruby?  ( dev-lang/swig )
 	python? ( dev-lang/swig )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-missing-includes.patch
+}
+
 src_configure() {
 	econf $(use_enable python) $(use_enable ruby)
 }