| 1 |
grobian 10/09/03 18:03:12 |
| 2 |
|
| 3 |
Modified: geos-3.2.0-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix for Prefix and Darwin, bug #335811 and bug #335814 |
| 6 |
|
| 7 |
(Portage version: 2.2.01.15553-prefix/cvs/Darwin powerpc) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 sci-libs/geos/geos-3.2.0-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: geos-3.2.0-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- geos-3.2.0-r1.ebuild 27 Jun 2010 18:28:03 -0000 1.4 |
| 23 |
+++ geos-3.2.0-r1.ebuild 3 Sep 2010 18:03:12 -0000 1.5 |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild,v 1.4 2010/06/27 18:28:03 jlec Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild,v 1.5 2010/09/03 18:03:12 grobian Exp $ |
| 29 |
|
| 30 |
-EAPI=2 |
| 31 |
+EAPI=3 |
| 32 |
|
| 33 |
PYTHON_DEPEND="python? 2" |
| 34 |
SUPPORT_PYTHON_ABIS="1" |
| 35 |
@@ -34,9 +34,10 @@ |
| 36 |
src_prepare() { |
| 37 |
epatch "${FILESDIR}"/${PV}-multipy.patch \ |
| 38 |
"${FILESDIR}"/${PV}-swig2.0.patch \ |
| 39 |
- "${FILESDIR}"/${PV}-python.patch |
| 40 |
+ "${FILESDIR}"/${PV}-python.patch \ |
| 41 |
+ "${FILESDIR}"/${PV}-darwin.patch |
| 42 |
eautoreconf |
| 43 |
- echo "#!/bin/bash" > py-compile |
| 44 |
+ echo "#!${EPREFIX}/bin/bash" > py-compile |
| 45 |
} |
| 46 |
|
| 47 |
src_configure() { |
| 48 |
@@ -49,11 +50,11 @@ |
| 49 |
python_copy_sources swig/python |
| 50 |
building() { |
| 51 |
emake \ |
| 52 |
- PYTHON_CPPFLAGS="-I$(python_get_includedir)" \ |
| 53 |
+ PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \ |
| 54 |
PYTHON_LDFLAGS="$(python_get_library -l)" \ |
| 55 |
- SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \ |
| 56 |
- pyexecdir="$(python_get_sitedir)" \ |
| 57 |
- pythondir="$(python_get_sitedir)" |
| 58 |
+ SWIG_PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \ |
| 59 |
+ pyexecdir="${EPREFIX}$(python_get_sitedir)" \ |
| 60 |
+ pythondir="${EPREFIX}$(python_get_sitedir)" |
| 61 |
} |
| 62 |
python_execute_function -s --source-dir swig/python building |
| 63 |
fi |
| 64 |
@@ -70,8 +71,8 @@ |
| 65 |
installation() { |
| 66 |
emake \ |
| 67 |
DESTDIR="${D}" \ |
| 68 |
- pythondir="$(python_get_sitedir)" \ |
| 69 |
- pyexecdir="$(python_get_sitedir)" \ |
| 70 |
+ pythondir="${EPREFIX}$(python_get_sitedir)" \ |
| 71 |
+ pyexecdir="${EPREFIX}$(python_get_sitedir)" \ |
| 72 |
install |
| 73 |
} |
| 74 |
python_execute_function -s --source-dir swig/python installation |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.47 sci-libs/geos/ChangeLog |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/ChangeLog?rev=1.47&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/ChangeLog?rev=1.47&content-type=text/plain |
| 82 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/geos/ChangeLog?r1=1.46&r2=1.47 |
| 83 |
|
| 84 |
Index: ChangeLog |
| 85 |
=================================================================== |
| 86 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v |
| 87 |
retrieving revision 1.46 |
| 88 |
retrieving revision 1.47 |
| 89 |
diff -u -r1.46 -r1.47 |
| 90 |
--- ChangeLog 27 Jun 2010 18:28:03 -0000 1.46 |
| 91 |
+++ ChangeLog 3 Sep 2010 18:03:12 -0000 1.47 |
| 92 |
@@ -1,6 +1,10 @@ |
| 93 |
# ChangeLog for sci-libs/geos |
| 94 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 95 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.46 2010/06/27 18:28:03 jlec Exp $ |
| 96 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.47 2010/09/03 18:03:12 grobian Exp $ |
| 97 |
+ |
| 98 |
+ 03 Sep 2010; Fabian Groffen <grobian@g.o> |
| 99 |
+ +files/3.2.0-darwin.patch, geos-3.2.0-r1.ebuild: |
| 100 |
+ Fix for Prefix and Darwin, bug #335811 and bug #335814 |
| 101 |
|
| 102 |
27 Jun 2010; Justin Lecher <jlec@g.o> +files/3.2.0-python.patch, |
| 103 |
geos-3.2.0-r1.ebuild: |
Archives