Version bump

Package-Manager: portage-2.2_rc26/cvs/Linux x86_64

6 files changed, 61 insertions, 212 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/Manifest b/sci-libs/geos/Manifest
index 5e61185fdb19..400aeecf4e12 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -5,23 +5,22 @@ AUX geos-2.2.1-gcc-41.patch 2888 RMD160 579e1c58ed74c66c75fbb01de9e397d277804cd8
 AUX geos-2.2.3-gcc43.patch 1832 RMD160 6051db64dd2de9a5da44204f7a8b27440fc930a5 SHA1 5aaf43d2c27ad02b56c072b45a05b940e842663b SHA256 c207803a9719c85011e58a2b9aec3965bcccc8a0cafa7e68cd4a5e59acbfbb4a
 AUX geos-2.2.3-python-shared.patch 536 RMD160 3dc56f244988f165898ea76974f4d21218fcdd00 SHA1 c5db575b04bc2d6e35317284ba1f028d8ce5dc4d SHA256 c3a1a71c73975c65686b389333a5e80fb33b119f0e98fe11374c33999ada50df
 AUX geos-2.2.3-swig.patch 1505 RMD160 56801a93aaf6ddedfd97efb2eeadb04361a5adfd SHA1 9138909c61943ac00a7c89ee2e999f544f137866 SHA256 871e86801a64bbb6b5fbafa8bed23e6f9fa513f0a5d88f919aaedb64219961ce
-AUX geos-3.0.0-gcc43.patch 3764 RMD160 8ff07118ac9b12ba3ec644700e5312dc9405a50b SHA1 ce0857415469ccb519ee94bce0f7ede2f5ed3de2 SHA256 993cae213c49abba58f1cdf4eacf2a3b97b36b522e2c6dfa5c93ad1193016be8
 AUX geos-3.0.3-test.patch 274 RMD160 919c05b2056a51559c75022a0db39335646e6cc9 SHA1 db35fa6dd41180c594a89b63fcc4a6ae6ec02948 SHA256 afa8b391466c8de647d0652c5b629045470c78989da22222fe4859b5a0efed07
 AUX python.i 179 RMD160 b64f637b8d475f94f1e1319c700d6571dea7d410 SHA1 d0a92c5cbd888da380d1db847aa0004e46bfebb1 SHA256 ca71e5951088ffa7d571183eb0a9c0309b16305f451dc7a19fce91e91bca3a09
 DIST geos-2.2.1.tar.bz2 533286 RMD160 f3ea1cbf3cf6c107acc9e0b43d77a0dbf0b65b25 SHA1 756aed7cb5b6b4e49e2d137e33d67637c4503ea5 SHA256 c6f3e555897457d9f7e8dc26535fabbf393777689e897b7e365d71f22ee8d378
 DIST geos-2.2.3.tar.bz2 554802 RMD160 968de157f96f41aa71d5ef7c28c7186e8db0939e SHA1 c5da21829255e3625f7c2482c9220234cc5d9f90 SHA256 c781f0973dcfac7a4a3a4da1e7dbf49c5cd549f8841a3c4cd8f8feaa50b408a7
-DIST geos-3.0.0.tar.bz2 1091475 RMD160 195fb24de2f67d515f629f1dcb3dccec7711bdac SHA1 71090220351c8ae7bb147d74145fa5daf83e3c26 SHA256 baa86c5125a349504e3890312e68ab3bf3601489cefe9ceb9f659e34bbe5eb4f
 DIST geos-3.0.3.tar.bz2 1075288 RMD160 3bc8b3f58b6fccaad12855e2c86faf1fb4ddca4c SHA1 f580057d7345db4897451a8b97128b4b5c3ff0ef SHA256 f33010a7757ff8e0260601597611dc5c70c7916b3bdcb8d7b82dfac52410b3df
-EBUILD geos-2.2.1.ebuild 1430 RMD160 8e63ade6bc905a46112de26db5c8129277bd7fb0 SHA1 0c5c68089d3d0ca7351e1260001edeebb94aa9b4 SHA256 7bf213cef09ec8701436b9745703ff8483e254a80763f102a7f88ae3bdcd2811
+DIST geos-3.1.0.tar.bz2 1200085 RMD160 45807500e8a46e5d31e9a3cc5245f1720cd2ae16 SHA1 a36b462e4afac91d7aacef9944bff0706ea64168 SHA256 c31aa52575f79e617e616f6a11d8ea636c1eb2d555f8ab2baee227c8322cf38a
+EBUILD geos-2.2.1.ebuild 1378 RMD160 92549c1a202e24918254f5d034fa0f241a96a499 SHA1 a96d4050c78ba6646545a7dca14baaa56e2c9df3 SHA256 c1a9c810701e7cc6cb787f42b7c8ce53bcc2b128dba43ef3f6dc0dac1b5af2d6
 EBUILD geos-2.2.3.ebuild 2919 RMD160 af9502c821e144563acc963b23c71887686a7342 SHA1 554ca47c24c5f94a7208fa2c10dbd59e01418cd3 SHA256 077b4c6a559f03f496a2bb399266ed357e3c04636e62e9d501a404bb1a2fa924
-EBUILD geos-3.0.0.ebuild 1268 RMD160 f6395809c3570a08366d2b46a98493fe20f5f678 SHA1 8c6d19bf4deff9146c2fb2bf59775fe98f6f66a4 SHA256 a4648bd011272b95475ac94c7c0d75a5cc606ea25e61611a3ccea33fa1600dc9
 EBUILD geos-3.0.3.ebuild 1231 RMD160 295e2bade12ed793cc6fc8cbdd1aff7a04442c4e SHA1 820a3a333d6b1af99c2fe69f4a30579123792b73 SHA256 a3697b512b2481b6c3a493316be6b267afbe39d5597bcae0426f9905bf525a76
-MISC ChangeLog 5626 RMD160 193e26e984b903dabb99e9d03fd9fa2b79639fe5 SHA1 99fefb7801f6f238a766595f1bc5a2a6b73e7e2a SHA256 8b6c5d8e2e7fa5bff91d660ce54cca0e78d951ae7b548d306f6d6648a5bfb98a
+EBUILD geos-3.1.0.ebuild 1036 RMD160 24ac7dd43576a04a4ca37e3cef4f7a782c61c51a SHA1 27393e7b5715bcb233f715009a2aa7b7ab47a1ef SHA256 d5ece2f1931b29edeaf55211579e3c0f16c87972cd8a734dc7bb062351c865fb
+MISC ChangeLog 5797 RMD160 9c4cac5aba10d04dfba70c5e1acbd7c2e98d409a SHA1 7b96a6cab5049b23f49c71b9921404f7b4ddb3a8 SHA256 a5acac8991d5e831c284205f66e4b7417f94622acbd38ea24631ac4edea5aa4d
 MISC metadata.xml 715 RMD160 eda84d8b69d36778b897e2ca30b650b36982cc8e SHA1 bb28beda5dd745138094f4f1275734e12c4c9c03 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkkuhmIACgkQ1ycZbhPLE2D3BgCgnDLKnjQJW0Vm7AweDXCOCzlX
-ZgQAnjd69tRTmSdHHoxMdtyQtBDPWqOn
-=Sl5P
+iEYEARECAAYFAknMxuUACgkQ1ycZbhPLE2C/LwCfeYQnRI0xF+BGyzSbujla9gxN
+iD0An2oH33imwN2Pb0zLjp+aflC/8A7q
+=fmPz
 -----END PGP SIGNATURE-----
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
+}