Version bump. Clean out old versions and related patch files.

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)

12 files changed, 82 insertions, 726 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index 33eb03a78614..b197cb2a3cc6 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.78 2013/04/12 07:08:26 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.79 2013/08/19 14:24:56 titanofold Exp $
+
+*geos-3.4.1 (19 Aug 2013)
+
+  19 Aug 2013; Aaron W. Swenson <titanofold@gentoo.org>
+  +files/3.4.1-solaris-isnan.patch, -files/3.2.0-multipy.patch,
+  -files/3.2.0-swig2.0.patch, +geos-3.4.1.ebuild,
+  -files/3.2.2-disable_static_modules.patch, -files/3.2.2-gcc46.patch,
+  -geos-3.2.2.ebuild, -geos-3.3.3.ebuild, -geos-3.3.4.ebuild,
+  -geos-3.3.5.ebuild, -geos-3.3.7.ebuild:
+  Version bump. Clean out old versions and related patch files.
 
   12 Apr 2013; Vicente Olivert Riera <vincent@gentoo.org> geos-3.3.8-r1.ebuild:
   x86 stable, wrt bug #436432
diff --git a/sci-libs/geos/files/3.2.0-multipy.patch b/sci-libs/geos/files/3.2.0-multipy.patch
deleted file mode 100644
index 652b0f64d871..000000000000
--- a/sci-libs/geos/files/3.2.0-multipy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/swig/Makefile.am b/swig/Makefile.am
-index 765744d..ed40831 100644
---- a/swig/Makefile.am
-+++ b/swig/Makefile.am
-@@ -6,7 +6,7 @@ if ENABLE_RUBY
-   MAYBERUBY = ruby
- endif
- 
--SUBDIRS = $(MAYBEPYTHON) $(MAYBERUBY)
-+SUBDIRS = $(MAYBERUBY)
- 
- EXTRA_DIST = \
- 	geos.i 
diff --git a/sci-libs/geos/files/3.2.0-swig2.0.patch b/sci-libs/geos/files/3.2.0-swig2.0.patch
deleted file mode 100644
index ac0aaed0b225..000000000000
--- a/sci-libs/geos/files/3.2.0-swig2.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/325725
-
---- macros/ac_pkg_swig.m4
-+++ macros/ac_pkg_swig.m4
-@@ -25,4 +25,7 @@
- dnl @version 2004-09-20
- dnl @license GPLWithACException
-+dnl
-+dnl Fixed by Sandro Santilli to consider 2.0.0 > 1.3.37 (2010-06-15)
-+dnl
- 
- AC_DEFUN([AC_PROG_SWIG],[
-@@ -68,7 +71,7 @@
-                                 [available_patch=0]
-                         fi
--                        if test $available_major -ne $required_major \
--                                -o $available_minor -ne $required_minor \
--                                -o $available_patch -lt $required_patch ; then
-+			[required_full=`printf %2.2d%2.2d%2.2d%2.2d $required_major $required_minor $required_patch]`
-+			[available_full=`printf %2.2d%2.2d%2.2d%2.2d $available_major $available_minor $available_patch]`
-+                        if test $available_full -lt $required_full; then
-                                 AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
-                                 SWIG=''
-
diff --git a/sci-libs/geos/files/3.2.2-disable_static_modules.patch b/sci-libs/geos/files/3.2.2-disable_static_modules.patch
deleted file mode 100644
index 6df8da74bad5..000000000000
--- a/sci-libs/geos/files/3.2.2-disable_static_modules.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- swig/python/Makefile.am
-+++ swig/python/Makefile.am
-@@ -18,9 +18,9 @@
- _geos_la_SOURCES = geos_wrap.cxx 
- 
- # Only need to grab the capi header files
--_geos_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_builddir)/capi
-+_geos_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_builddir)/capi -shared
- # Specify -module and -avoid-version so we can create a file called geos.dll/so which is what Python wants
--_geos_la_LDFLAGS = -no-undefined -module -avoid-version
-+_geos_la_LDFLAGS = -no-undefined -module -avoid-version -shared
- _geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la $(PYTHON_LDFLAGS)
- 
- 
---- swig/ruby/Makefile.am
-+++ swig/ruby/Makefile.am
-@@ -22,10 +22,10 @@
- geos_la_LIBADD =  $(top_builddir)/capi/libgeos_c.la -l$(RUBY_SO_NAME)
- 
- # Only need to grab the capi header files
--geos_la_CPPFLAGS = -I$(top_builddir)/capi
-+geos_la_CPPFLAGS = -I$(top_builddir)/capi -shared
- 
- # Specify -module and -avoid-version so we can create a file called geos.dll/so which is what Ruby wants
--geos_la_LDFLAGS = -no-undefined  -module -avoid-version -L$(RUBY_LIB_DIR)
-+geos_la_LDFLAGS = -no-undefined  -module -avoid-version -shared -L$(RUBY_LIB_DIR)
- 
- if ENABLE_SWIG
- 
diff --git a/sci-libs/geos/files/3.2.2-gcc46.patch b/sci-libs/geos/files/3.2.2-gcc46.patch
deleted file mode 100644
index ac91a0a26e7a..000000000000
--- a/sci-libs/geos/files/3.2.2-gcc46.patch
+++ /dev/null
@@ -1,194 +0,0 @@
- .../geos/geom/CoordinateArraySequenceFactory.h     |    1 +
- .../headers/geos/geom/CoordinateSequenceFactory.h  |    1 +
- .../geos/index/chain/MonotoneChainBuilder.h        |    1 +
- .../geos/operation/overlay/OverlayNodeFactory.h    |    2 ++
- .../geos/operation/valid/SimpleNestedRingTester.h  |    1 +
- source/headers/geos/planargraph/DirectedEdgeStar.h |    1 +
- source/headers/geos/planargraph/Node.h             |    2 ++
- .../geos/simplify/DouglasPeuckerLineSimplifier.h   |    1 +
- source/headers/geos/simplify/TaggedLineString.h    |    1 +
- .../geos/simplify/TaggedLineStringSimplifier.h     |    1 +
- source/index/bintree/Bintree.cpp                   |    1 +
- source/index/bintree/Node.cpp                      |    2 ++
- source/index/bintree/Root.cpp                      |    1 +
- source/index/strtree/AbstractNode.cpp              |    1 +
- 14 files changed, 17 insertions(+), 0 deletions(-)
-
-diff --git a/source/headers/geos/geom/CoordinateArraySequenceFactory.h b/source/headers/geos/geom/CoordinateArraySequenceFactory.h
-index 1f19e09..bef5bfc 100644
---- a/source/headers/geos/geom/CoordinateArraySequenceFactory.h
-+++ b/source/headers/geos/geom/CoordinateArraySequenceFactory.h
-@@ -23,6 +23,7 @@
- #include <geos/geom/CoordinateSequenceFactory.h> // for inheritance
- 
- #include <geos/inline.h>
-+#include <cstddef>
- 
- // Forward declarations
- namespace geos {
-diff --git a/source/headers/geos/geom/CoordinateSequenceFactory.h b/source/headers/geos/geom/CoordinateSequenceFactory.h
-index 6441d94..008e183 100644
---- a/source/headers/geos/geom/CoordinateSequenceFactory.h
-+++ b/source/headers/geos/geom/CoordinateSequenceFactory.h
-@@ -23,6 +23,7 @@
- 
- #include <geos/export.h>
- #include <vector>
-+#include <cstddef>
- 
- //#include <geos/geom/Coordinate.h>
- #include <geos/inline.h>
-diff --git a/source/headers/geos/index/chain/MonotoneChainBuilder.h b/source/headers/geos/index/chain/MonotoneChainBuilder.h
-index 7c27e83..e273713 100644
---- a/source/headers/geos/index/chain/MonotoneChainBuilder.h
-+++ b/source/headers/geos/index/chain/MonotoneChainBuilder.h
-@@ -22,6 +22,7 @@
- 
- #include <geos/export.h>
- #include <vector>
-+#include <cstddef>
- 
- // Forward declarations
- namespace geos {
-diff --git a/source/headers/geos/operation/overlay/OverlayNodeFactory.h b/source/headers/geos/operation/overlay/OverlayNodeFactory.h
-index 12fb81c..568d05d 100644
---- a/source/headers/geos/operation/overlay/OverlayNodeFactory.h
-+++ b/source/headers/geos/operation/overlay/OverlayNodeFactory.h
-@@ -23,6 +23,7 @@
- #include <geos/export.h>
- 
- #include <vector>
-+#include <cstddef>
- 
- #include <geos/geomgraph/NodeFactory.h> // for inheritance
- 
-@@ -46,6 +47,7 @@ namespace overlay { // geos::operation::overlay
-  */
- class GEOS_DLL OverlayNodeFactory: public geomgraph::NodeFactory {
- public:
-+	OverlayNodeFactory() {}
- 	geomgraph::Node* createNode(const geom::Coordinate &coord) const;
- 	static const geomgraph::NodeFactory &instance();
- };
-diff --git a/source/headers/geos/operation/valid/SimpleNestedRingTester.h b/source/headers/geos/operation/valid/SimpleNestedRingTester.h
-index b8888ac..7ab726d 100644
---- a/source/headers/geos/operation/valid/SimpleNestedRingTester.h
-+++ b/source/headers/geos/operation/valid/SimpleNestedRingTester.h
-@@ -24,6 +24,7 @@
- #include <geos/export.h>
- 
- #include <vector>
-+#include <cstddef>
- 
- // Forward declarations
- namespace geos {
-diff --git a/source/headers/geos/planargraph/DirectedEdgeStar.h b/source/headers/geos/planargraph/DirectedEdgeStar.h
-index cc36ca7..a8e1f68 100644
---- a/source/headers/geos/planargraph/DirectedEdgeStar.h
-+++ b/source/headers/geos/planargraph/DirectedEdgeStar.h
-@@ -20,6 +20,7 @@
- #include <geos/export.h>
- 
- #include <vector>
-+#include <cstddef>
- 
- // Forward declarations
- namespace geos {
-diff --git a/source/headers/geos/planargraph/Node.h b/source/headers/geos/planargraph/Node.h
-index 579b203..06b978c 100644
---- a/source/headers/geos/planargraph/Node.h
-+++ b/source/headers/geos/planargraph/Node.h
-@@ -23,6 +23,8 @@
- #include <geos/planargraph/DirectedEdgeStar.h> // for inlines
- #include <geos/geom/Coordinate.h> // for composition
- 
-+#include <cstddef>
-+
- // Forward declarations
- namespace geos {
- 	namespace planargraph { 
-diff --git a/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h b/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
-index 5dd0412..1e32838 100644
---- a/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
-+++ b/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
-@@ -23,6 +23,7 @@
- #include <geos/export.h>
- #include <vector>
- #include <memory> // for auto_ptr
-+#include <cstddef>
- 
- // Forward declarations
- namespace geos {
-diff --git a/source/headers/geos/simplify/TaggedLineString.h b/source/headers/geos/simplify/TaggedLineString.h
-index 49af2ba..2025a31 100644
---- a/source/headers/geos/simplify/TaggedLineString.h
-+++ b/source/headers/geos/simplify/TaggedLineString.h
-@@ -29,6 +29,7 @@
- #include <geos/export.h>
- #include <vector>
- #include <memory>
-+#include <cstddef>
- 
- // Forward declarations
- namespace geos {
-diff --git a/source/headers/geos/simplify/TaggedLineStringSimplifier.h b/source/headers/geos/simplify/TaggedLineStringSimplifier.h
-index 8ab8507..ad4cd75 100644
---- a/source/headers/geos/simplify/TaggedLineStringSimplifier.h
-+++ b/source/headers/geos/simplify/TaggedLineStringSimplifier.h
-@@ -28,6 +28,7 @@
- #include <geos/export.h>
- #include <vector>
- #include <memory>
-+#include <cstddef>
- 
- // Forward declarations
- namespace geos {
-diff --git a/source/index/bintree/Bintree.cpp b/source/index/bintree/Bintree.cpp
-index 66a5ebc..25be163 100644
---- a/source/index/bintree/Bintree.cpp
-+++ b/source/index/bintree/Bintree.cpp
-@@ -18,6 +18,7 @@
- #include <geos/index/bintree/Root.h>
- #include <geos/index/bintree/Interval.h>
- #include <vector>
-+#include <cstddef>
- 
- namespace geos {
- namespace index { // geos.index
-diff --git a/source/index/bintree/Node.cpp b/source/index/bintree/Node.cpp
-index a879bc9..ae5e952 100644
---- a/source/index/bintree/Node.cpp
-+++ b/source/index/bintree/Node.cpp
-@@ -20,6 +20,8 @@
- #include <geos/index/bintree/Key.h>
- #include <geos/index/bintree/Interval.h>
- 
-+#include <cstddef>
-+
- namespace geos {
- namespace index { // geos.index
- namespace bintree { // geos.index.bintree
-diff --git a/source/index/bintree/Root.cpp b/source/index/bintree/Root.cpp
-index 0f2de89..19b05fe 100644
---- a/source/index/bintree/Root.cpp
-+++ b/source/index/bintree/Root.cpp
-@@ -20,6 +20,7 @@
- #include <geos/index/quadtree/IntervalSize.h>
- 
- #include <cassert>
-+#include <cstddef>
- 
- namespace geos {
- namespace index { // geos.index
-diff --git a/source/index/strtree/AbstractNode.cpp b/source/index/strtree/AbstractNode.cpp
-index bd07cf4..16ad808 100644
---- a/source/index/strtree/AbstractNode.cpp
-+++ b/source/index/strtree/AbstractNode.cpp
-@@ -18,6 +18,7 @@
- 
- #include <vector>
- #include <cassert>
-+#include <cstddef>
- 
- using namespace std;
- 
diff --git a/sci-libs/geos/files/3.4.1-solaris-isnan.patch b/sci-libs/geos/files/3.4.1-solaris-isnan.patch
new file mode 100644
index 000000000000..f4cb2aee9ad0
--- /dev/null
+++ b/sci-libs/geos/files/3.4.1-solaris-isnan.patch
@@ -0,0 +1,14 @@
+diff -Naruw geos-3.4.1.orig/include/geos/platform.h.in geos-3.4.1/include/geos/platform.h.in
+--- geos-3.4.1.orig/include/geos/platform.h.in	2013-08-17 14:08:04.000000000 +0000
++++ geos-3.4.1/include/geos/platform.h.in	2013-08-18 22:00:59.412676805 +0000
+@@ -96,8 +96,9 @@
+    // It does leave a version in std.
+ #  define ISNAN(x) (std::isnan(x))
+ # elif defined(__sun) || defined(__sun__)
++#  define _XOPEN_SOURCE 600     // force iso/math_c99
+ #  include <math.h>
+-#  define ISNAN(x) (::isnan(x))
++#  define ISNAN(x) (std::isnan(x))
+ # endif
+ #endif
+ 
diff --git a/sci-libs/geos/geos-3.2.2.ebuild b/sci-libs/geos/geos-3.2.2.ebuild
deleted file mode 100644
index 9f0b2941ad5f..000000000000
--- a/sci-libs/geos/geos-3.2.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.2.ebuild,v 1.12 2012/02/20 15:27:40 patrick Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit autotools eutils python
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc python ruby static-libs"
-
-RDEPEND="ruby? ( dev-lang/ruby:1.8 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	ruby?  ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/3.2.0-multipy.patch \
-		"${FILESDIR}"/3.2.0-swig2.0.patch \
-		"${FILESDIR}"/3.2.0-python.patch \
-		"${FILESDIR}"/3.2.0-darwin.patch \
-		"${FILESDIR}"/${PV}-disable_static_modules.patch \
-		"${FILESDIR}"/${PV}-gcc46.patch
-	eautoreconf
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ruby) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use python; then
-		python_copy_sources swig/python
-		building() {
-			emake \
-				PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				PYTHON_LDFLAGS="$(python_get_library -l)" \
-				SWIG_PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-				pythondir="${EPREFIX}$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir swig/python building
-	fi
-	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"
-	if use python; then
-		python_copy_sources swig/python
-		installation() {
-			emake \
-			DESTDIR="${D}" \
-			pythondir="${EPREFIX}$(python_get_sitedir)" \
-			pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-			install
-		}
-		python_execute_function -s --source-dir swig/python installation
-		python_clean_installation_image
-	fi
-
-	dodoc AUTHORS NEWS README TODO || die
-	if use doc; then
-		cd "${S}/doc"
-		dohtml -r doxygen_docs/html/* || die
-	fi
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize geos/geos.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup geos/geos.py
-}
diff --git a/sci-libs/geos/geos-3.3.3.ebuild b/sci-libs/geos/geos-3.3.3.ebuild
deleted file mode 100644
index d1480a01803d..000000000000
--- a/sci-libs/geos/geos-3.3.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.3.3.ebuild,v 1.3 2012/06/12 09:17:16 ago Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-inherit autotools eutils python
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc php python ruby static-libs"
-
-RDEPEND="php? ( dev-lang/php:5.3[-threads] )
-	ruby? ( dev-lang/ruby )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	php? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )"
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/3.2.0-python.patch \
-		"${FILESDIR}"/3.2.0-darwin.patch \
-		"${FILESDIR}"/3.3.2-solaris-isnan.patch
-	eautoreconf
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ruby) \
-		$(use_enable php) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake
-	if use python; then
-		emake -C swig/python clean
-		python_copy_sources swig/python
-		building() {
-			emake \
-				PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				PYTHON_LDFLAGS="$(python_get_library -l)" \
-				SWIG_PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-				pythondir="${EPREFIX}$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir swig/python building
-	fi
-	use doc && emake -C "${S}/doc" doxygen-html
-}
-
-src_install() {
-	default
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-				pythondir="${EPREFIX}$(python_get_sitedir)" \
-				install
-		}
-		python_execute_function -s --source-dir swig/python installation
-		python_clean_installation_image
-	fi
-	use doc && dohtml -r "${S}/doc" doxygen_docs/html/*
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize geos/geos.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup geos/geos.py
-}
diff --git a/sci-libs/geos/geos-3.3.4.ebuild b/sci-libs/geos/geos-3.3.4.ebuild
deleted file mode 100644
index 15412f7262ce..000000000000
--- a/sci-libs/geos/geos-3.3.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.3.4.ebuild,v 1.2 2012/07/03 13:37:59 ranger Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-inherit autotools eutils python
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc php python ruby static-libs"
-
-RDEPEND="php? ( dev-lang/php:5.3[-threads] )
-	ruby? ( dev-lang/ruby )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	php? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )"
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/3.2.0-python.patch \
-		"${FILESDIR}"/3.2.0-darwin.patch \
-		"${FILESDIR}"/3.3.2-solaris-isnan.patch
-	eautoreconf
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ruby) \
-		$(use_enable php) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake
-	if use python; then
-		emake -C swig/python clean
-		python_copy_sources swig/python
-		building() {
-			emake \
-				PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				PYTHON_LDFLAGS="$(python_get_library -l)" \
-				SWIG_PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-				pythondir="${EPREFIX}$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir swig/python building
-	fi
-	use doc && emake -C "${S}/doc" doxygen-html
-}
-
-src_install() {
-	default
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-				pythondir="${EPREFIX}$(python_get_sitedir)" \
-				install
-		}
-		python_execute_function -s --source-dir swig/python installation
-		python_clean_installation_image
-	fi
-	use doc && dohtml -r "${S}/doc" doxygen_docs/html/*
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize geos/geos.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup geos/geos.py
-}
diff --git a/sci-libs/geos/geos-3.3.5.ebuild b/sci-libs/geos/geos-3.3.5.ebuild
deleted file mode 100644
index d1e21a9913e8..000000000000
--- a/sci-libs/geos/geos-3.3.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.3.5.ebuild,v 1.2 2012/08/11 15:24:48 maekke Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-inherit autotools eutils python
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc php python ruby static-libs"
-
-RDEPEND="php? ( dev-lang/php:5.3[-threads] )
-	ruby? ( dev-lang/ruby )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	php? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )"
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/3.2.0-python.patch \
-		"${FILESDIR}"/3.2.0-darwin.patch \
-		"${FILESDIR}"/3.3.2-solaris-isnan.patch
-	eautoreconf
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ruby) \
-		$(use_enable php) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake
-	if use python; then
-		emake -C swig/python clean
-		python_copy_sources swig/python
-		building() {
-			emake \
-				PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				PYTHON_LDFLAGS="$(python_get_library -l)" \
-				SWIG_PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-				pythondir="${EPREFIX}$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir swig/python building
-	fi
-	use doc && emake -C "${S}/doc" doxygen-html
-}
-
-src_install() {
-	default
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-				pythondir="${EPREFIX}$(python_get_sitedir)" \
-				install
-		}
-		python_execute_function -s --source-dir swig/python installation
-		python_clean_installation_image
-	fi
-	use doc && dohtml -r "${S}/doc" doxygen_docs/html/*
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize geos/geos.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup geos/geos.py
-}
diff --git a/sci-libs/geos/geos-3.3.7.ebuild b/sci-libs/geos/geos-3.3.7.ebuild
deleted file mode 100644
index 55da55f087a4..000000000000
--- a/sci-libs/geos/geos-3.3.7.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.3.7.ebuild,v 1.1 2013/02/02 06:04:19 patrick Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-inherit autotools eutils python
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc php python ruby static-libs"
-
-RDEPEND="php? ( dev-lang/php:5.3[-threads] )
-	ruby? ( dev-lang/ruby )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	php? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )"
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/3.2.0-python.patch \
-		"${FILESDIR}"/3.2.0-darwin.patch \
-		"${FILESDIR}"/3.3.2-solaris-isnan.patch
-	eautoreconf
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ruby) \
-		$(use_enable php) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake
-	if use python; then
-		emake -C swig/python clean
-		python_copy_sources swig/python
-		building() {
-			emake \
-				PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				PYTHON_LDFLAGS="$(python_get_library -l)" \
-				SWIG_PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-				pythondir="${EPREFIX}$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir swig/python building
-	fi
-	use doc && emake -C "${S}/doc" doxygen-html
-}
-
-src_install() {
-	default
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-				pythondir="${EPREFIX}$(python_get_sitedir)" \
-				install
-		}
-		python_execute_function -s --source-dir swig/python installation
-		python_clean_installation_image
-	fi
-	use doc && dohtml -r "${S}/doc" doxygen_docs/html/*
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize geos/geos.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup geos/geos.py
-}
diff --git a/sci-libs/geos/geos-3.4.1.ebuild b/sci-libs/geos/geos-3.4.1.ebuild
new file mode 100644
index 000000000000..608ad5e8c1ab
--- /dev/null
+++ b/sci-libs/geos/geos-3.4.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.4.1.ebuild,v 1.1 2013/08/19 14:24:56 titanofold Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{6,7} )
+inherit autotools eutils python-single-r1 python-utils-r1
+
+DESCRIPTION="Geometry engine library for Geographic Information Systems"
+HOMEPAGE="http://trac.osgeo.org/geos/"
+SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc php python ruby static-libs"
+
+RDEPEND="
+	php? ( >=dev-lang/php-5.3[-threads] )
+	ruby? ( dev-lang/ruby )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	php? ( dev-lang/swig )
+	python? ( dev-lang/swig ${PYTHON_DEPS} )
+	ruby? ( dev-lang/swig )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/3.4.1-solaris-isnan.patch
+	eautoreconf
+	echo "#!${EPREFIX}/bin/bash" > py-compile
+}
+
+src_configure() {
+	econf \
+		$(use_enable python) \
+		$(use_enable ruby) \
+		$(use_enable php) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake
+
+	use doc && emake -C "${S}/doc" doxygen-html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	use doc && dohtml -r doc/doxygen_docs/html/*
+	use python && python_optimize "${D}$(python_get_sitedir)"/geos/
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}