| 1 |
arfrever 10/06/26 15:33:18 |
| 2 |
|
| 3 |
Modified: geos-3.2.0-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix dependencies, set RESTRICT_PYTHON_ABIS and call python_pkg_setup() (bug #316221). |
| 6 |
(Portage version: HEAD/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sci-libs/geos/geos-3.2.0-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: geos-3.2.0-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- geos-3.2.0-r1.ebuild 26 Jun 2010 11:50:13 -0000 1.1 |
| 22 |
+++ geos-3.2.0-r1.ebuild 26 Jun 2010 15:33:18 -0000 1.2 |
| 23 |
@@ -1,11 +1,12 @@ |
| 24 |
# Copyright 1999-2010 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $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 $ |
| 27 |
+# $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 $ |
| 28 |
|
| 29 |
EAPI=2 |
| 30 |
|
| 31 |
-PYTHON_DEPEND="2" |
| 32 |
+PYTHON_DEPEND="python? 2" |
| 33 |
SUPPORT_PYTHON_ABIS="1" |
| 34 |
+RESTRICT_PYTHON_ABIS="3.*" |
| 35 |
|
| 36 |
inherit autotools eutils python |
| 37 |
|
| 38 |
@@ -18,17 +19,22 @@ |
| 39 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" |
| 40 |
IUSE="doc python ruby" |
| 41 |
|
| 42 |
-RDEPEND="ruby? ( virtual/ruby ) |
| 43 |
- python? ( virtual/python )" |
| 44 |
+RDEPEND="ruby? ( virtual/ruby )" |
| 45 |
DEPEND="${RDEPEND} |
| 46 |
doc? ( app-doc/doxygen ) |
| 47 |
ruby? ( dev-lang/swig ) |
| 48 |
python? ( dev-lang/swig )" |
| 49 |
|
| 50 |
+pkg_setup() { |
| 51 |
+ if use python; then |
| 52 |
+ python_pkg_setup |
| 53 |
+ fi |
| 54 |
+} |
| 55 |
+ |
| 56 |
src_prepare() { |
| 57 |
epatch "${FILESDIR}"/${PV}-multipy.patch |
| 58 |
eautoreconf |
| 59 |
- echo "#!/${EPREFIX}/bin/bash" > py-compile |
| 60 |
+ echo "#!/bin/bash" > py-compile |
| 61 |
} |
| 62 |
|
| 63 |
src_configure() { |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
1.44 sci-libs/geos/ChangeLog |
| 68 |
|
| 69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/ChangeLog?rev=1.44&view=markup |
| 70 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/ChangeLog?rev=1.44&content-type=text/plain |
| 71 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/ChangeLog?r1=1.43&r2=1.44 |
| 72 |
|
| 73 |
Index: ChangeLog |
| 74 |
=================================================================== |
| 75 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v |
| 76 |
retrieving revision 1.43 |
| 77 |
retrieving revision 1.44 |
| 78 |
diff -u -r1.43 -r1.44 |
| 79 |
--- ChangeLog 26 Jun 2010 11:50:13 -0000 1.43 |
| 80 |
+++ ChangeLog 26 Jun 2010 15:33:18 -0000 1.44 |
| 81 |
@@ -1,6 +1,11 @@ |
| 82 |
# ChangeLog for sci-libs/geos |
| 83 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 84 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.43 2010/06/26 11:50:13 jlec Exp $ |
| 85 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.44 2010/06/26 15:33:18 arfrever Exp $ |
| 86 |
+ |
| 87 |
+ 26 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 88 |
+ geos-3.2.0-r1.ebuild: |
| 89 |
+ Fix dependencies, set RESTRICT_PYTHON_ABIS and call python_pkg_setup() |
| 90 |
+ (bug #316221). |
| 91 |
|
| 92 |
*geos-3.2.0-r1 (26 Jun 2010) |
Archives