Bump

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

3 files changed, 100 insertions, 16 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index efe812ae872c..e84e2b7c45f5 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.65 2012/06/12 09:17:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.66 2012/06/18 08:17:25 patrick Exp $
+
+*geos-3.3.4 (18 Jun 2012)
+
+  18 Jun 2012; Patrick Lauer <patrick@gentoo.org> +geos-3.3.4.ebuild:
+  Bump
 
   12 Jun 2012; Agostino Sarubbo <ago@gentoo.org> geos-3.3.3.ebuild:
   Stable for amd64, wrt bug #420125
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index bae0a5abc864..d14f36172f49 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 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
@@ -10,18 +7,9 @@ AUX 3.2.2-gcc46.patch 6922 RMD160 48a25930dc1745be106699c69868cec3204a700d SHA1
 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
-MISC ChangeLog 10776 RMD160 cb2e50e48801d433ef513b2ad64b74675e6368c9 SHA1 d93d206f44c30cb4104291cd353a846ed89c9cce SHA256 27938092e4dd0e2c10ede0569502717f2b5910205a593ad10f38a284a677ab3c
+EBUILD geos-3.3.4.ebuild 2392 RMD160 565bfa572f7f7aacd46ef4e5caa9be941a4faf2b SHA1 57f95046d93caa119bb4ccf650334790bc185c7a SHA256 f65d98a4e89462a6afaac04dd91b96bafa64c03168860acfce0ad74486c3a70d
+MISC ChangeLog 10885 RMD160 08b335db04792a654856919643cb444de361ccb9 SHA1 b46e213f85d4028e70c2bca6b67d6d3f5ef7a342 SHA256 4de7282adbbaa30ecb3dfa09d22f9a6f1c96dcfc7b81a8808f47ae1eee98b5b6
 MISC metadata.xml 715 RMD160 eda84d8b69d36778b897e2ca30b650b36982cc8e SHA1 bb28beda5dd745138094f4f1275734e12c4c9c03 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJP1wkhAAoJEOTDgjZ80txd45UH/A9uvn6Ut/auv9wg7+5FGVGo
-U1uMntEzHpJKldPoxTzPbeAkRpRt2ju+sTssxujc2R2ytERYR8OOVII5YuNfjTto
-QKjOEfCIMGe04eZI0xt4fHDMgzfBnqLRAj2g+7g/VWumAUT0LMV9J2VuLrCnjJBB
-eLl4Z1ryUnJepYaR9ccZ8KjaWvuh8T4iastSmE3oEFl7+soGxp6JAfUH/+fXpLlW
-pcIsStqiwDlJzlvIeCiCJsegUCTmMlRlP9QIBCQFgyipjfGQmvD2Q01RcQUnrUDq
-JbJePjxf3LmRhnyoJcYo8Di4QzvpLiXSPcjITADslUud6qK67pg8wkmrqFYF77E=
-=9DY0
------END PGP SIGNATURE-----
diff --git a/sci-libs/geos/geos-3.3.4.ebuild b/sci-libs/geos/geos-3.3.4.ebuild
new file mode 100644
index 000000000000..daff1670f09f
--- /dev/null
+++ b/sci-libs/geos/geos-3.3.4.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.4.ebuild,v 1.1 2012/06/18 08:17:25 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
+}