Bump

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

3 files changed, 114 insertions, 16 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index c3c2b33fa205..b775d14eb22c 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.67 2012/07/03 13:37:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.68 2012/07/17 07:43:05 patrick Exp $
+
+*geos-3.3.5 (17 Jul 2012)
+
+  17 Jul 2012; Patrick Lauer <patrick@gentoo.org> +geos-3.3.5.ebuild:
+  Bump
 
   03 Jul 2012; Brent Baude <ranger@gentoo.org> geos-3.3.4.ebuild:
   Marking geos-3.3.4 ppc for bug 420125
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 6439f516a977..274df539249f 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,15 +1,17 @@
-AUX 3.2.0-darwin.patch 645 RMD160 71b22283eb9d95c41f2e05c9a390dbbca217d73d SHA1 5aca4d9caeb6e4927667b562c6d43a65ea79b977 SHA256 e8c48222af03a8e029ecfa8ceb4634c9baeee13a628d64ba7cb5dc7b1b1dfa9f
-AUX 3.2.0-multipy.patch 276 RMD160 a0cff4e5b14c1ed84d70860fd1a7c41efeea6e72 SHA1 55e25a3a89bbbaf8eaf1814f10f13b36597e1d94 SHA256 b2f1d11f953c456cad975afcb78a27005eb025e1beae2621c92cb139b44fef8c
-AUX 3.2.0-python.patch 2121 RMD160 30628f797473067ad5feb25bd6e603bc39675e94 SHA1 adf6a6ed4398925bbaf9c401f0941f4de6a6adb0 SHA256 f8f82605f85de7a189b2272db26c6b78d78eaafccb8a3ed2662d3dce922b1235
-AUX 3.2.0-swig2.0.patch 1056 RMD160 40f4b89cec57d1db7907679ff28b967c5702b7c4 SHA1 419117b2af0759af9bf9041e76d83ad6e6f6fee7 SHA256 b322b53240760a120fb813e263c9358adc11682d99ea13c502309282fff4eb49
-AUX 3.2.2-disable_static_modules.patch 1171 RMD160 96175e5f23e26b36c935ca6b64084012c4dbb162 SHA1 02f6c861f0cfe4765c8be890237cbf28fdbc18ee SHA256 06a05800709b1daf67952cbe7c69aaf67bb66199e2e08b11c9568b1b894f8acd
-AUX 3.2.2-gcc46.patch 6922 RMD160 48a25930dc1745be106699c69868cec3204a700d SHA1 ca68cadc11397e74a5acd11ead28702e69f7e44a SHA256 ee2f1cc05f8c734f0dee64d0f36623be28ac39ac734914fc323b841c559387dd
-AUX 3.3.2-solaris-isnan.patch 359 RMD160 faf29ecd8bd96303096ea73b15898bc0e06fb9b6 SHA1 e6ff90026e2b23c626b6932859ce861979fecb2c SHA256 1886913b14a167c893d801d98f62425c1ef4da2f93341cd384ecf082d3fc36fc
-DIST geos-3.2.2.tar.bz2 1664073 RMD160 95342be083175f38c8c87b5682271253320f3d60 SHA1 6917d6d1d4e79f58d9f931bf351024709fabbc5a SHA256 24df7c2119936fe0bcaa66e0b05aa28a875e373095cc05ee7eff404330e3211c
-DIST geos-3.3.3.tar.bz2 1852272 RMD160 418edaa5498be098aa0455fd823f01009eb8aaa7 SHA1 2ecd23c38d74e5f04757dc528ec30858006fb6a7 SHA256 dfcf4bd70ab212a5b7bad21d01b84748f101a545092b56dafdc3882ef3bddec9
-DIST geos-3.3.4.tar.bz2 1861750 RMD160 e7d34c5ccc5c1d82a1ebaec36ef20c346c321608 SHA1 2ec4be729c851460daf89d0d2ab785be5ef4c5c5 SHA256 cd5400aa5f3fe32246dfed5d238c5017e1808162c865c016480b3e6c07271904
-EBUILD geos-3.2.2.ebuild 2615 RMD160 e9172cc05032b51d05b62268799d280f32b6c2de SHA1 bb0074cafcc11a13d47cf5d2caa633bf1c0aad29 SHA256 783d2af24cbaabb815288dcd209b9a2436150ce26aa5cb976a7502bbf3f66942
-EBUILD geos-3.3.3.ebuild 2387 RMD160 1d971972abd7bb72b07d0b98c5ed0d07a2bbe158 SHA1 30d9fea8a96f8dfeabfd253ea703f3a7fe862bed SHA256 6f86b1b12a60eb74acd2fc32cdca5e42b2e26d896200fe2a6258ddd92fcdb10c
-EBUILD geos-3.3.4.ebuild 2390 RMD160 38b733d0cde17837c61b7b5b23e6e361dadc6f60 SHA1 b54cf53ece3c82664eaf4a69a1e532d4197cae03 SHA256 e86b0f4cf0b5faa7ad9c69a53bf9cef78ac681219feaa07d1490b06b0c31fa80
-MISC ChangeLog 10991 RMD160 3b40d3e049ff131a5e0c9f9b1aadeddb2054fcf0 SHA1 15282a108c3312a876c032fd93d13a439ff7da8f SHA256 d00942c204c09759df1f4d420f7252be86782f5f4983573aee35443c351912da
-MISC metadata.xml 715 RMD160 eda84d8b69d36778b897e2ca30b650b36982cc8e SHA1 bb28beda5dd745138094f4f1275734e12c4c9c03 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d
+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
+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 2392 SHA256 c67a7af0aed847b47d9adf7bcd38e8a3f5fd041c9baf5d3eecd2d6df8d8e1dbe SHA512 f37a01bd1f7a738e8e3fdd9e3fec8aee1ea02cb94470e24c8d11ab5294902db4da527e253f467e7ea70fc168258ee8d56ed6d32c5e86aa7cb982adbcaefe4ff6 WHIRLPOOL fbe258f5cc689e7502d4c0114da15dbf5138590d502e432f6a68fa38aec655b5f8103693eebf5b53c0da2fd7589e6e928391dbcce99ce0633cf465f0e3038eaa
+MISC ChangeLog 11097 SHA256 dc19abc433e6771d5f5fe2b0ed6d1505192e9c449ed22691cae2b606d583c696 SHA512 bc672902b2bc055067b46176b19cb9052ded04795c26485619f605c3123d0ff69b3d17abe6e72f8d0d8e2f52fc18888836acd75a48b166bd8e5dbeb717c351e4 WHIRLPOOL 757fcb30f952e7f2ee48dc5a44f30532b22fe68e143df79da681d338c5a236b226eaddb0d258cda3d5da98b41c94f964695eed5a2ff0d3ff5eee13cb407eeaac
+MISC metadata.xml 715 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d SHA512 7161505aa45873fa8e78460be356bf516840db71987f55142bf1bcef80dbe68f7d187851fbd710c3137767fc31ec90120d4b9c9b6614f6d13fdcd8e2e3de5250 WHIRLPOOL 909e3b3888e5f759cff04edc88a8d5aca61310cb88a1ba031138d53e80f48e7103ae684b324239cbd11f3e5fe410eee8ba5cc1658cdacf398f6bc44652c770c2
diff --git a/sci-libs/geos/geos-3.3.5.ebuild b/sci-libs/geos/geos-3.3.5.ebuild
new file mode 100644
index 000000000000..bf084811402f
--- /dev/null
+++ b/sci-libs/geos/geos-3.3.5.ebuild
@@ -0,0 +1,91 @@
+# 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.1 2012/07/17 07:43:05 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
+}