summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-06-26 15:33:18 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-06-26 15:33:18 +0000
commit79fa833af752aa45c5b1f17bb6c0785d39b28431 (patch)
treedf648a482537e3e05a923f5880f4c5e23e270242 /sci-libs/geos
parentFix buffer overflow with GCC 4.5 and _U_FORTIFY_SOURCE=2 wrt #324863 by Haral... (diff)
downloadhistorical-79fa833af752aa45c5b1f17bb6c0785d39b28431.tar.gz
historical-79fa833af752aa45c5b1f17bb6c0785d39b28431.tar.bz2
historical-79fa833af752aa45c5b1f17bb6c0785d39b28431.zip
Fix dependencies, set RESTRICT_PYTHON_ABIS and call python_pkg_setup() (bug #316221).
Package-Manager: portage-HEAD/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/geos')
-rw-r--r--sci-libs/geos/ChangeLog7
-rw-r--r--sci-libs/geos/Manifest14
-rw-r--r--sci-libs/geos/geos-3.2.0-r1.ebuild16
3 files changed, 19 insertions, 18 deletions
diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index e22acb819e6a..a1d2d10606f3 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/geos
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.43 2010/06/26 11:50:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.44 2010/06/26 15:33:18 arfrever Exp $
+
+ 26 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ geos-3.2.0-r1.ebuild:
+ Fix dependencies, set RESTRICT_PYTHON_ABIS and call python_pkg_setup()
+ (bug #316221).
*geos-3.2.0-r1 (26 Jun 2010)
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 18fcd595603e..023902b82982 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 3.2.0-multipy.patch 276 RMD160 a0cff4e5b14c1ed84d70860fd1a7c41efeea6e72 SHA1 55e25a3a89bbbaf8eaf1814f10f13b36597e1d94 SHA256 b2f1d11f953c456cad975afcb78a27005eb025e1beae2621c92cb139b44fef8c
AUX geos-3.1.1-missing-includes.patch 662 RMD160 8675c18376128d77c4a3c567bac38445f9e2fa5f SHA1 7a5077c737045aeff9ff5d4768284c103bd97615 SHA256 89f31ac87cc1d610317338c0eea1746f05ae9a98e88c8994dcb4ee7c81c2c61e
DIST geos-3.1.1.tar.bz2 1170244 RMD160 a3254a7a8cdfccaefaa2f438577f4ebd0c8929ac SHA1 cafb76a3e5fbcd7d9588d3fdcec8fa4fcd8b9fa4 SHA256 e93f6f3cf10af33bff2289046c66d8569ca4afc26e64c16ff067b70899cbc5d5
DIST geos-3.2.0.tar.bz2 1627924 RMD160 cdbd10d524164cd11b73a3af39ce15d021dfcaef SHA1 e6925763fb06fa6a7f358ede49bb89f96535b3ef SHA256 0a43b76429fd94fd572d79869f3ca5acdf44a9fa73844aa655016f09aaa1e6c7
EBUILD geos-3.1.1.ebuild 1281 RMD160 cb393f3abdab15786ab4d5798ac4298182dfa6bd SHA1 aeefa9f0a16c37caac8b9db7332489b1c54b6d45 SHA256 298aaee394248b3f62640e9217ae13cd446455afea94fca977f4292029c7b044
-EBUILD geos-3.2.0-r1.ebuild 2029 RMD160 37e984ce4754b2d02caf3c97cdec368cd0f88644 SHA1 1d097a5e88748bb8314919ff807b0cb40a2e3b33 SHA256 5eefd9ef002a7fc72cd1f07bd35bcfc7a63c3447a20527b07c486bfca2243b7c
+EBUILD geos-3.2.0-r1.ebuild 2090 RMD160 077be70170866a8c47fdcb3a5321cf681cfb2aca SHA1 d0b9ad87899ce4fbee1f3b44bb25928b777917b1 SHA256 9f77e0611c0e4a61a0c1eb4843cbfd7d018d4ff71aac37187f7f94f3fbf8cdf0
EBUILD geos-3.2.0.ebuild 1381 RMD160 68ab7367728165f713b182c272d962adc2f51042 SHA1 9671347677898b648d80dfca3d8387f89e90f975 SHA256 d8ca2b913d9a0d4eed724e583dbdfea15703f247b67e72d29861e2a152a127c2
-MISC ChangeLog 7547 RMD160 b6ae45e23a6a3947c6c702bb04819aa54bde7d7e SHA1 e5a910f28baf5167e0b26c9879a7c5360517d1d3 SHA256 e73a9af2b22429f547601765bb95dd63cda8b0ee50792bb3a0f405927e3d23e5
+MISC ChangeLog 7739 RMD160 d803cf02c05f24035f76856281780991ca6f971b SHA1 6846d5c5176e1ede4b9c02122f5cbaf03faeb96e SHA256 44f5ec0ca28ed38203679e9d913d32e7d4d9f919d63bb0e7b7ff48568fe74034
MISC metadata.xml 715 RMD160 eda84d8b69d36778b897e2ca30b650b36982cc8e SHA1 bb28beda5dd745138094f4f1275734e12c4c9c03 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwl6XwACgkQgAnW8HDreRZFCACgoxW9jgEPtVqv6oyfy0fUgNnJ
-MwEAn202e824ZOIew20jAUBkjdr7zalV
-=Crvv
------END PGP SIGNATURE-----
diff --git a/sci-libs/geos/geos-3.2.0-r1.ebuild b/sci-libs/geos/geos-3.2.0-r1.ebuild
index 407c60901acb..57aaf2c12241 100644
--- a/sci-libs/geos/geos-3.2.0-r1.ebuild
+++ b/sci-libs/geos/geos-3.2.0-r1.ebuild
@@ -1,11 +1,12 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild,v 1.1 2010/06/26 11:50:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild,v 1.2 2010/06/26 15:33:18 arfrever Exp $
EAPI=2
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="python? 2"
SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
inherit autotools eutils python
@@ -18,17 +19,22 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE="doc python ruby"
-RDEPEND="ruby? ( virtual/ruby )
- python? ( virtual/python )"
+RDEPEND="ruby? ( virtual/ruby )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
ruby? ( dev-lang/swig )
python? ( dev-lang/swig )"
+pkg_setup() {
+ if use python; then
+ python_pkg_setup
+ fi
+}
+
src_prepare() {
epatch "${FILESDIR}"/${PV}-multipy.patch
eautoreconf
- echo "#!/${EPREFIX}/bin/bash" > py-compile
+ echo "#!/bin/bash" > py-compile
}
src_configure() {