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

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

13 files changed, 90 insertions, 745 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/Manifest b/sci-libs/geos/Manifest
index 7bc8861a8025..ca03bece082d 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -2,30 +2,19 @@
 Hash: SHA256
 
 AUX 3.2.0-darwin.patch 645 SHA256 e8c48222af03a8e029ecfa8ceb4634c9baeee13a628d64ba7cb5dc7b1b1dfa9f SHA512 baf2bf17c87ae0297d75cf72e4df0ffb98fcc7e5e07f5d45493ebb813593b79705c9aa3d2d0fd90546fbb3edd9a3f58e7544c67f40912c3303986f202137c889 WHIRLPOOL 6f5d74143e1d9e47a96f8db25cfec44610a2b25ff2793eaa4f99f3cb920bc4edc4487e8a9e5a5e9561f81851271b5da232d580bfaec3fd73b732df628a0eca5c
-AUX 3.2.0-multipy.patch 276 SHA256 b2f1d11f953c456cad975afcb78a27005eb025e1beae2621c92cb139b44fef8c SHA512 d0c6cff3d9e484c2a8abc6537f9eddb0230f7c94426a465e9c99250c795fec474722794ca3533bcd3f04a32c8143e6d51b92490a1c1b52216e4f4276221fe54e WHIRLPOOL 5fd11d587e7c014e9da2003d0199463b7fafe19457b3d520cf949e9b631d1232b0018a5d0831390de127c80183bd6703e3d06657f87dd58610d97e656eec110e
 AUX 3.2.0-python.patch 2121 SHA256 f8f82605f85de7a189b2272db26c6b78d78eaafccb8a3ed2662d3dce922b1235 SHA512 2d84deffc40ca0413c0f1ef9d23ef1bc1e33c7ce41770342b0de57a208600a9643bb1b7177c625c1669fe05438ba031d5a16fbb4e0c76bce072c59aed7ffb104 WHIRLPOOL 2db970b6f4cd8f2ee9b05488435020916027de431984b0333b1988c79652aa470e45ac10d44ba06b47a80ddfc438429e97ea7bed657d0900b23b5335a7c31718
-AUX 3.2.0-swig2.0.patch 1056 SHA256 b322b53240760a120fb813e263c9358adc11682d99ea13c502309282fff4eb49 SHA512 4dfcc4565101dc2bbaec5a17f880464e44a173c87469ad5a997a4451a79490148cd15252b24966a2443b6817ef58922e389a80607689d56e5a9742d94060b8c5 WHIRLPOOL 9fb7dad5d4639172a23bf31b7156536e07430f1013dc12fc5a6935a04f29f813012e9f28e50823317d75015ec4e4c6a9851abc4d42c20fc7fd95c74d1e27c722
-AUX 3.2.2-disable_static_modules.patch 1171 SHA256 06a05800709b1daf67952cbe7c69aaf67bb66199e2e08b11c9568b1b894f8acd SHA512 be6917ce4f285f208359766cfe5df70f7aa258e062a847be56d4208e55dd8258dab92ecd352e643d4d0f81e8cb62344a36ce70ef81ac13c71b55df47f4884133 WHIRLPOOL 869e45e9f0996fee791c70bb3cc4cc265e25d36ed9f37ff7cf06c5f1c2e67940ea38f8ec17a56341d49d8a09a3ed3e7394825d8dc44693d3d40de4b9bf0db79b
-AUX 3.2.2-gcc46.patch 6922 SHA256 ee2f1cc05f8c734f0dee64d0f36623be28ac39ac734914fc323b841c559387dd SHA512 a08d01af4991c5c93377ccae1ab11bfbe8c252fc156cd5db49809b3d2e7c3f350a2b0b64e1eb617f3ed60012295683431e5947d5e3317fa29c791612a7fff360 WHIRLPOOL 7a2b2763bb812481192f91a371cbaf17cbd0007eb2033ba872fe19ea9e0b290bf059c0b971f6326069ac6fb150cf35b5157d373bf38e1e079806224366b471a8
 AUX 3.3.2-solaris-isnan.patch 359 SHA256 1886913b14a167c893d801d98f62425c1ef4da2f93341cd384ecf082d3fc36fc SHA512 4dad8deff44535b6d23e560b64e793c42dbdb483873c88962fc5dc978c8809d2e028d8ee13dbba7aed816667b8103983f6059cd957acef9b08e9c2e1364cf4c4 WHIRLPOOL 10c3637dcceb1f113061fc54cad415d70c030c279742854126e9398a5c023b2625446292c5e005a07e14aea72f478e0fdc52135ba8a0da9044e6679e8ac24193
-DIST geos-3.2.2.tar.bz2 1664073 SHA256 24df7c2119936fe0bcaa66e0b05aa28a875e373095cc05ee7eff404330e3211c
-DIST geos-3.3.3.tar.bz2 1852272 SHA256 dfcf4bd70ab212a5b7bad21d01b84748f101a545092b56dafdc3882ef3bddec9
-DIST geos-3.3.4.tar.bz2 1861750 SHA256 cd5400aa5f3fe32246dfed5d238c5017e1808162c865c016480b3e6c07271904 SHA512 1bf00448b84fe3143aea0b9918585dfcc11e69a5297b5640b325744e9b8a815004af9eac3748216c73cf34e8f620f791a858f0453dc4e95334e379d11f5dc7f4 WHIRLPOOL d57cde4f2383daa6ccb35e0c39adb56839da2bb69ddbc183be212ded24b619c7bbed18b079dc8d987008fa194bd7201c93fec599e57f769d436888724943b7bb
-DIST geos-3.3.5.tar.bz2 1788415 SHA256 3b513fbe2d155364d61e76d9c250d6d8e75b5166783a233596c744373cb5874f SHA512 357dd0d24e569f4a8448397daa814dccfe7487e36d8958652eac42177a757386c7cd0a98403b35a714244035f4265542380348e75fb946222ebf71bdf6b1906f WHIRLPOOL c7a154a5ec7dbf3551a970d2f5dcc306cac55907b62f7f86ffddffce6c5b4abb88ecc827a04cc293da3bd183169839bfda4f79f9837bd4bb55e8ba3df76b958f
-DIST geos-3.3.7.tar.bz2 1820984 SHA256 fd01c21b54a3c48cac3e7885f26d4ca10ea9944238776b8ce03489e5e45c592b SHA512 bd9fcb20b0d90973c931daa2c8c25e51be637084bd789c19fdf8ccb3e2c35ed4fc35a607bcfbbb4c33243d83dc3a71cc423112369bc7a036f63be4ebca63d3eb WHIRLPOOL e8c95e7cfb528c98ddf5cadff5e63cd10286bf772e5b310a355b2723c0c5a9b8dbc447fc2f11fcfafd05bdcb1911c9c255ea9a177f5ef80811b48dbe87c5b885
+AUX 3.4.1-solaris-isnan.patch 554 SHA256 7dc8439ab286975dc31a53abdf37ee6ec52a610973aa15a08b17665467131852 SHA512 5b2f2301e5b0f1b2ee498276fc91bb06f57979a8d5030bc75be5f77e25f2942a5046204939c90ab7ccb03a23329b5c2ff0c5e5ead52b67b8beccba4e8b6eaa4d WHIRLPOOL 3eb86c48955fa6b537d22a52e60a3df2c7d8b51543fc4654a69ffa6658815b599835d2d0853846f6f12aeff3edea22bcc668ef21b7b54721cb520d76cc9c3635
 DIST geos-3.3.8.tar.bz2 1820064 SHA256 ebecd4d1a71bcc28e5e883296cd8c52a80d5596335e74728f320989734fa503b SHA512 6b53b0ea2e8260fd23f9ce1d71b142f223584699db6f244db6532d69051f0ccf5a65c30fdcdfc25bed1693bb0b3a6313eee59be3cd84dc0c92a858007cead63b WHIRLPOOL acf7e8ac4fda79e498f8d2a9a9a3a84a51d5f9b0a1d1dc9af58730f9258f1a9efe999761b6c91afd0807d76325dcb262e0b794191317469607b51596ca53a44f
-EBUILD geos-3.2.2.ebuild 2615 SHA256 783d2af24cbaabb815288dcd209b9a2436150ce26aa5cb976a7502bbf3f66942 SHA512 bd2d43953cb62c0c05006cbe6711f5df1c84415b191541f1ca540943ac34f1f96adf3755f8c4ecae087ab235a7b3f7944eb01777e90983c5d8b5a5744c0c7be8 WHIRLPOOL 5162308a4d610f5c5e6e60f0c68fb2fadcd8068bbfbd3a8295389407deac5260193c314a943ebcf71ae2782490e2c6eef629ac4e2e91beb4d5e1ce8b54273576
-EBUILD geos-3.3.3.ebuild 2387 SHA256 6f86b1b12a60eb74acd2fc32cdca5e42b2e26d896200fe2a6258ddd92fcdb10c SHA512 69af94bf79933b44cf7ddf9469fb1dcbcb7e9ae58582527b36f34f1f3c4ea294929d839e9d74875b5a941f60c709f361a0241c2ab1336b91eecbb7c3dbcf186a WHIRLPOOL 9166eace73334a0e05e2720d5b7150219fbd86f1127dd17d21a9dfe41244abfde9ab6087b5c16b7ea5a8d08b49e8e1b24052afa8feecaa68f7f7ef203fa3f82a
-EBUILD geos-3.3.4.ebuild 2390 SHA256 e86b0f4cf0b5faa7ad9c69a53bf9cef78ac681219feaa07d1490b06b0c31fa80 SHA512 383de8632d4a05b731439315a458574d4ed4f8c8bb3ba8d3ac3123edfba7718cf33a0f8a77918fa62fe0ea343929b772758d01ae600932cfd1822540ce1b538c WHIRLPOOL fa8b3efa5b3381db3e2c5784edb766a26e956e1242fb12befe58f0599a0118bb9bcafb7635ecf4829be94e1e97eaa22422072b4cd3fe7f1d2d1e22a7ed8f38e4
-EBUILD geos-3.3.5.ebuild 2390 SHA256 36312ff5c69290bca176aeb43e68b9b8b633f3ade3718b956427b5383ad4c9e2 SHA512 c8f669f5c1d51ac9607d79dcaf373723404dcbdf81f6b35ed2911592d7aa962248124ec16216a19e8ca3a1e79cc6b5fe003d7dbd71cd4fb2afcb0bf9f7ae0355 WHIRLPOOL fde0abe816e16bdcb38295a4dbc0dc05bc0125a7cd7f78eeb49d6ad495d5fe4b9b39504aa5b12adb17277da3e05202f68f355f01cb5d916015bc115bcb121746
-EBUILD geos-3.3.7.ebuild 2392 SHA256 fcbe3483f1b78c5c629354e7b233f8eecb4f8d9a95aafccc5cbd11efafb37733 SHA512 c8e58aab73a2427636ba8e32430e946872ece7427ac1baeef21000ef4d65f06debf5b73487c1a33d54a2161e1a773fea044dbdab342680b90a84c4f525169dfa WHIRLPOOL 3cf158a3f219f5a1f274228ec381ab20016e1cacfbf79d48d298d016a685ded2c17fd43909226c3653ee876f6ae41ea3edd9039c76104a27de2681106927cabf
+DIST geos-3.4.1.tar.bz2 1813303 SHA256 d07ac375f3edd12425d6ce5a96db9739d5ff358cbdf60c6804f7a9e565af8ff2 SHA512 69d02630856f63bd0617db383b9936ad07e94d2b2fda4a3865657057626887439b52fd7b74602d529aff5cf8c7fbfea72672ccde807395b2dc1cc73c93c2567b WHIRLPOOL 35a6673a98d1fa1f10113c8cfef4dc32ba9b68dcc23e5522252870c2591537f80841913105425bd23ebecaa63d520ceccbfe7824a00e70e9c1461aa919bf2469
 EBUILD geos-3.3.8-r1.ebuild 2399 SHA256 ea40b83031197259c2151bcca51d7e0de70615631845cc3c7fb6c5d914262c9d SHA512 7cb6c40abaeacb1ada5ebfd44354489a04052308ea7c75ccd2fb888805f71d438793274e4c56efc799b385a40a6e475a878b85417027dfb883b8a81b50ebe440 WHIRLPOOL d161fa07a1edf35e21c502b011c3fb93b9afa1aa9ed3e20d133ac5f8563779d31c303d6b04ed12f37dacf71fc9494c37384f7cd35dc04cb907acd23991acec75
-MISC ChangeLog 12367 SHA256 6c24000d8eef8afb627dec2c36b73bf51e27cf0629c00ae9cf6783e5d7a4e704 SHA512 fe9200efe231cacc3b2721b691a3b6e832a5106f850ba9c3149e449ed5f478c413db862bbb6672d482fcce6e6e556f53e914840dc1e180a041067289a671d3bc WHIRLPOOL efde35a3b66779d2ea4131fed1b0f7a5213b27a03100e0ba892c1905b182d0f088f57bdf14226058cf75479f9a208b44f486c096c8ddea1d8d9a13d16f1bd6db
+EBUILD geos-3.4.1.ebuild 1459 SHA256 c6aae34979628da49e85e9153b6ff6595e2322e7c7db5978fd62a35a95aaae3c SHA512 d168dd5b9f58b75654af1ca8111d2cc9f2343fb758c0277187bf50db09dd1ba1fe01d5f38ba747e051d691a1c6a31abf3fa4e0003d5529d1ff433a4bfefce57c WHIRLPOOL cb1bcf1636ad4b4d9af8c00128d2ed69f28e50332d90275ffd0acbec7f391c7d444dd2471c0429aa25bb5a01327e921065915153e3ddc3964d71959a449d45d8
+MISC ChangeLog 12807 SHA256 c2ada1a508fd0869565b6e461a63306631ea8fc36857086cf2d0db0e17db1b92 SHA512 8bad7d624a787d173e7d83a84e74c8d7471c94af7157a82a0a19a5818529a2feab637e973cd1c064d5e54ee57bc67d5927bf9f299dc62396187730147d310d06 WHIRLPOOL 26becfea25b9f7310fdae5b27b10187281f5237ff215a359a63d02a8bed8b7322fd3a2a74c62413ceb928787752e07897e13ddb3e0cc154d4bb5eafab4a35f68
 MISC metadata.xml 715 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d SHA512 7161505aa45873fa8e78460be356bf516840db71987f55142bf1bcef80dbe68f7d187851fbd710c3137767fc31ec90120d4b9c9b6614f6d13fdcd8e2e3de5250 WHIRLPOOL 909e3b3888e5f759cff04edc88a8d5aca61310cb88a1ba031138d53e80f48e7103ae684b324239cbd11f3e5fe410eee8ba5cc1658cdacf398f6bc44652c770c2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlFnsucACgkQWunnsum7y6jmegCfXz/Gow0hSeISEfv1quPszl+g
-DykAoJtUlRgFWeCM1hwYP6lhU+YnYNth
-=z6h6
+iF4EAREIAAYFAlISKr8ACgkQVxOqA9G7/aCV9AEAm3w6CaRpjS/ctGuRv0R2UQaM
+B6xRAYhhbm9QmBKRIhEA/3BuNcfcP3vnFOxPAHpUSdmSIoHGtTDOqU0bd9S1uE03
+=3BVe
 -----END PGP SIGNATURE-----
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 {} +
+}