version bump

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

4 files changed, 86 insertions, 16 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index 4342687f7e47..75dabc7bf242 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,12 @@
 # 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.82 2013/09/30 17:12:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.83 2013/10/21 00:26:42 titanofold Exp $
+
+*geos-3.4.2 (21 Oct 2013)
+
+  21 Oct 2013; Aaron W. Swenson <titanofold@gentoo.org>
+  +files/3.4.2-solaris-isnan.patch, +geos-3.4.2.ebuild:
+  version bump
 
   30 Sep 2013; Agostino Sarubbo <ago@gentoo.org> geos-3.4.1.ebuild:
   Stable for x86, wrt bug #485974
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 6a8d9467d2a7..7a7859d3a684 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,30 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 3.2.0-darwin.patch 645 SHA256 e8c48222af03a8e029ecfa8ceb4634c9baeee13a628d64ba7cb5dc7b1b1dfa9f SHA512 baf2bf17c87ae0297d75cf72e4df0ffb98fcc7e5e07f5d45493ebb813593b79705c9aa3d2d0fd90546fbb3edd9a3f58e7544c67f40912c3303986f202137c889 WHIRLPOOL 6f5d74143e1d9e47a96f8db25cfec44610a2b25ff2793eaa4f99f3cb920bc4edc4487e8a9e5a5e9561f81851271b5da232d580bfaec3fd73b732df628a0eca5c
 AUX 3.2.0-python.patch 2121 SHA256 f8f82605f85de7a189b2272db26c6b78d78eaafccb8a3ed2662d3dce922b1235 SHA512 2d84deffc40ca0413c0f1ef9d23ef1bc1e33c7ce41770342b0de57a208600a9643bb1b7177c625c1669fe05438ba031d5a16fbb4e0c76bce072c59aed7ffb104 WHIRLPOOL 2db970b6f4cd8f2ee9b05488435020916027de431984b0333b1988c79652aa470e45ac10d44ba06b47a80ddfc438429e97ea7bed657d0900b23b5335a7c31718
 AUX 3.3.2-solaris-isnan.patch 359 SHA256 1886913b14a167c893d801d98f62425c1ef4da2f93341cd384ecf082d3fc36fc SHA512 4dad8deff44535b6d23e560b64e793c42dbdb483873c88962fc5dc978c8809d2e028d8ee13dbba7aed816667b8103983f6059cd957acef9b08e9c2e1364cf4c4 WHIRLPOOL 10c3637dcceb1f113061fc54cad415d70c030c279742854126e9398a5c023b2625446292c5e005a07e14aea72f478e0fdc52135ba8a0da9044e6679e8ac24193
 AUX 3.4.1-solaris-isnan.patch 554 SHA256 7dc8439ab286975dc31a53abdf37ee6ec52a610973aa15a08b17665467131852 SHA512 5b2f2301e5b0f1b2ee498276fc91bb06f57979a8d5030bc75be5f77e25f2942a5046204939c90ab7ccb03a23329b5c2ff0c5e5ead52b67b8beccba4e8b6eaa4d WHIRLPOOL 3eb86c48955fa6b537d22a52e60a3df2c7d8b51543fc4654a69ffa6658815b599835d2d0853846f6f12aeff3edea22bcc668ef21b7b54721cb520d76cc9c3635
+AUX 3.4.2-solaris-isnan.patch 575 SHA256 88221c77c0ab08a4c000cede7528ebacc6ec1535ca00a9bcb0a01f11853cad39 SHA512 efa2730f178814e8d98318347e7a8313327679a5c861ef2a844ce821c5854f4dd56e0cc2c52fa5866fb4214b0d9aa8614b1f1ebaa62f0427e69221a93106aa45 WHIRLPOOL bab6b200b942bb83d8a9a298f9c658b48a35b4abd308c6eb77f43359424de029fe2387ab74030b2a5b440a38202e300b0971895535d11b3a8b9158ecf9fc4b42
 DIST geos-3.3.8.tar.bz2 1820064 SHA256 ebecd4d1a71bcc28e5e883296cd8c52a80d5596335e74728f320989734fa503b SHA512 6b53b0ea2e8260fd23f9ce1d71b142f223584699db6f244db6532d69051f0ccf5a65c30fdcdfc25bed1693bb0b3a6313eee59be3cd84dc0c92a858007cead63b WHIRLPOOL acf7e8ac4fda79e498f8d2a9a9a3a84a51d5f9b0a1d1dc9af58730f9258f1a9efe999761b6c91afd0807d76325dcb262e0b794191317469607b51596ca53a44f
 DIST geos-3.4.1.tar.bz2 1813303 SHA256 d07ac375f3edd12425d6ce5a96db9739d5ff358cbdf60c6804f7a9e565af8ff2 SHA512 69d02630856f63bd0617db383b9936ad07e94d2b2fda4a3865657057626887439b52fd7b74602d529aff5cf8c7fbfea72672ccde807395b2dc1cc73c93c2567b WHIRLPOOL 35a6673a98d1fa1f10113c8cfef4dc32ba9b68dcc23e5522252870c2591537f80841913105425bd23ebecaa63d520ceccbfe7824a00e70e9c1461aa919bf2469
+DIST geos-3.4.2.tar.bz2 1813726 SHA256 15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53 SHA512 c335608ff5e719ec6f3a6edc157c11fe5aaf9a813bf3c4b1e8a05de7a52584f6f64d5c42e646410c09a2e3cdfd3f8f994bedba37fc60454bbaa7c25ba1d36c9b WHIRLPOOL 5090bb4a4413b4c6fa00651058acfd5cb98bb8a2e68b1175baaf4ade6c737792239a08a6f9f3831c963e896469f9e9a4c1410bdddfb152638f1e72cbdb7c05e0
 EBUILD geos-3.3.8-r1.ebuild 2399 SHA256 ea40b83031197259c2151bcca51d7e0de70615631845cc3c7fb6c5d914262c9d SHA512 7cb6c40abaeacb1ada5ebfd44354489a04052308ea7c75ccd2fb888805f71d438793274e4c56efc799b385a40a6e475a878b85417027dfb883b8a81b50ebe440 WHIRLPOOL d161fa07a1edf35e21c502b011c3fb93b9afa1aa9ed3e20d133ac5f8563779d31c303d6b04ed12f37dacf71fc9494c37384f7cd35dc04cb907acd23991acec75
 EBUILD geos-3.4.1.ebuild 1449 SHA256 58cfdf8d197ce740130fe05f7f70829180afdcef085b9507e12e2af7abf2b8cb SHA512 20eeeba8ce5d40cac46e747c183a1b6f81741690de37f1ae530a20a24738a565c8d7c6dc9a001178937599560474b945f9f8b8b605ddd40425394ba284497c97 WHIRLPOOL 0a4dac9bef2a517c191a6528c74772c9af8e9410a13c652d43081000ce5e67c1454ce574464431dc1c0e2cc5ed4864512d2e0e3aa8b9628c52721f15e12bee7d
-MISC ChangeLog 13111 SHA256 f6014ae6e643e71365d30b7c1ea8c8ecf4209206c2769acf4d8cae8ed7f7a0ab SHA512 ca218525feaa9722c89fd193419d20a9ebb38475ba2709915f8c1e6c96cf537a1d386917eb21c394957ad73fef8569f2eb0dad001d006bf9601f8c0609425dc2 WHIRLPOOL 748f8be478931e4c9076cc338e7607680ed2e01f0467ba358d5772ba1a2e97666c547b710a174a33e0186b49312044b6fcdc4524c6e379b9692495fac6bd185b
+EBUILD geos-3.4.2.ebuild 1459 SHA256 9b41ef3d8e49c65d23bcc23aefb0b49a8bdd4bccc31c3b4496ce5e7399a943f3 SHA512 84f262ec36408d2ec46678444feb3b5e77cedaf8ee02f89a22955bccab9c2bb628185f86b30cca33889e113080898f018ac4b51d76a1feeec2cef8e96e6aab97 WHIRLPOOL c71933a616de6ead48eb5188312fe4b6a3f7746ce700c0837f2ab14d6c0bbdf1572deea37531db7398e3519bee8f6fc84549b489f631eb59559c78d2ed455c5c
+MISC ChangeLog 13273 SHA256 4892a7ea303a6d4e1ebda829fd0603df9a12024f650a8eec1b6a78e2dc8cbe39 SHA512 c90aef92e112cd17b82eaf0247ad2c882f40ffc185f66033a3892ca1db6b89351b1323628b11ff0e05b1e59ad274fbbadd08e8014c7fbfa7efc523e3c6b25cf6 WHIRLPOOL 0544631c163d33df6d9a3df786ccf33592419e1d5b09aa2735df778bd36b7f492a208c3dbc921a8624db0a78830782bc63244b7e7224f12d53b5c89602e4de06
 MISC metadata.xml 715 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d SHA512 7161505aa45873fa8e78460be356bf516840db71987f55142bf1bcef80dbe68f7d187851fbd710c3137767fc31ec90120d4b9c9b6614f6d13fdcd8e2e3de5250 WHIRLPOOL 909e3b3888e5f759cff04edc88a8d5aca61310cb88a1ba031138d53e80f48e7103ae684b324239cbd11f3e5fe410eee8ba5cc1658cdacf398f6bc44652c770c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSSbELAAoJELp701BxlEWfPxEQAKylwUU6+bEGAD9eVCi/tj+s
-y7V6y4fs3LlrMVMtozYFjccFaApBbUIMBxLyYbj9lShphkBNIJeK8QHXmyGUZGsW
-Jg2NSEtIE1zGJoZJtE6JFWR4NIQWKYvCk7sJeBnn451ggl2Uo0mqjQLvGwi1K6xj
-4eLTwbTb+TBet8xuB8CKVQnGgzlNnV22og9AvRk3Hi3pZv0nT2pRC5Ac/8fXlLuO
-+naciTK+jTcwYgi/R3tSON4TpiajOoF6RbuRQaexYpVgE7IQBVkw7t7vgecF8iNM
-G1X+U27pDp3rOJ32crgIoNPakIdqOtwg5jE59YccJLjBGPDaKG1L6yJKxgOea32v
-RxQjn8VgQomo8B5mCPd2nXxdwQ/N9zAyKa/tRCmZHofFLXmUK2w4wKeje+yMdasO
-PubbJB/rmjAV+3cuFd67CrqKP1nGhIsr9LzNYp94GpIwf/HKOdr+eOzfeoTDZmDS
-RROJMlcRqapZElwJo9zb1VjRE5Avibr3eTMwofUAjiyIm+JF2SB87pSK/hj9c5pK
-Mp75ybdmdob/FzF5xTc9MSFb7ZhnH9EUSH3gHH86LQ4VQGemHAu9uHrdnkFsXfx3
-4FlVA//KTM0c9w1XDGmI8JajefcwMMCb2ZecLyPGg3WJAIeslsXO9xBeAUHgBDfj
-vwX1cSvvi5o2j9JmFIXV
-=k3V1
+iF4EAREIAAYFAlJkdM4ACgkQVxOqA9G7/aCMYwD9FFL1Y5YNVwVj/OyO+s0XW90L
+DJvWfvuhyAI/lB6486MA+wbTQchXCVqhzyMDHKN+zJ/FMyfJz7JASLoi2ME5FGuY
+=tlnH
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/geos/files/3.4.2-solaris-isnan.patch b/sci-libs/geos/files/3.4.2-solaris-isnan.patch
new file mode 100644
index 000000000000..a66d36f6587d
--- /dev/null
+++ b/sci-libs/geos/files/3.4.2-solaris-isnan.patch
@@ -0,0 +1,14 @@
+diff -Naruw geos-3.4.2.orig/include/geos/platform.h.in geos-3.4.2/include/geos/platform.h.in
+--- geos-3.4.2.orig/include/geos/platform.h.in	2013-08-25 15:10:32.000000000 +0000
++++ geos-3.4.2/include/geos/platform.h.in	2013-10-20 23:45:29.891690795 +0000
+@@ -98,8 +98,9 @@
+    // It does leave a version in std.
+ #  define ISNAN(x) (std::isnan(x))
+ # elif (defined(__sun) || defined(__sun__)) && defined(__SUNPRO_CC)
++#  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.4.2.ebuild b/sci-libs/geos/geos-3.4.2.ebuild
new file mode 100644
index 000000000000..aed409ab85fc
--- /dev/null
+++ b/sci-libs/geos/geos-3.4.2.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.2.ebuild,v 1.1 2013/10/21 00:26:42 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.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
+
+	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 {} +
+}