| 1 |
nerdboy 11/07/05 01:00:30 |
| 2 |
|
| 3 |
Modified: gdal-1.8.0-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Reconf and python fixes, should close bug #371075 for good. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 sci-libs/gdal/gdal-1.8.0-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.8.0-r1.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.8.0-r1.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/gdal-1.8.0-r1.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: gdal-1.8.0-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.0-r1.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- gdal-1.8.0-r1.ebuild 11 Jun 2011 14:06:16 -0000 1.3 |
| 23 |
+++ gdal-1.8.0-r1.ebuild 5 Jul 2011 01:00:30 -0000 1.4 |
| 24 |
@@ -1,15 +1,15 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.0-r1.ebuild,v 1.3 2011/06/11 14:06:16 scarabeus Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.0-r1.ebuild,v 1.4 2011/07/05 01:00:30 nerdboy Exp $ |
| 29 |
|
| 30 |
EAPI="2" |
| 31 |
|
| 32 |
WANT_AUTOCONF="2.5" |
| 33 |
RUBY_OPTIONAL="yes" |
| 34 |
USE_RUBY="ruby18" |
| 35 |
-PYTHON_DEPEND="python? *:2.6" |
| 36 |
+PYTHON_DEPEND="python? 2:2.6" |
| 37 |
|
| 38 |
-inherit autotools eutils perl-module python ruby-ng toolchain-funcs |
| 39 |
+inherit autotools eutils libtool perl-module python ruby-ng toolchain-funcs |
| 40 |
|
| 41 |
DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)" |
| 42 |
HOMEPAGE="http://www.gdal.org/" |
| 43 |
@@ -57,6 +57,13 @@ |
| 44 |
AT_M4DIR="${S}/m4" |
| 45 |
MAKEOPTS+=" -j1" |
| 46 |
|
| 47 |
+pkg_setup() { |
| 48 |
+ if use python; then |
| 49 |
+ python_set_active_version 2 |
| 50 |
+ python_pkg_setup |
| 51 |
+ fi |
| 52 |
+} |
| 53 |
+ |
| 54 |
src_unpack() { |
| 55 |
# prevent ruby-ng.eclass from messing with the src path |
| 56 |
default |
| 57 |
@@ -69,8 +76,10 @@ |
| 58 |
-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \ |
| 59 |
GDALmake.opt.in || die |
| 60 |
|
| 61 |
+ # the second sed expression should fix bug 371075 |
| 62 |
sed -i \ |
| 63 |
-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \ |
| 64 |
+ -e "s:--prefix=\$(DESTDIR):--prefix=:" \ |
| 65 |
swig/python/GNUmakefile || die |
| 66 |
|
| 67 |
epatch "${FILESDIR}"/1.7.2-ruby_cflags.patch |
| 68 |
@@ -81,7 +90,11 @@ |
| 69 |
&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \ |
| 70 |
|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch |
| 71 |
|
| 72 |
- eautoreconf |
| 73 |
+ # autoheader fail |
| 74 |
+ eaclocal |
| 75 |
+ eautoconf |
| 76 |
+ eautomake |
| 77 |
+ elibtoolize |
| 78 |
} |
| 79 |
|
| 80 |
src_configure() { |
| 81 |
@@ -234,6 +247,11 @@ |
| 82 |
} |
| 83 |
|
| 84 |
pkg_postinst() { |
| 85 |
+ if use python; then |
| 86 |
+ python_need_rebuild |
| 87 |
+ python_mod_optimize $(python_get_sitedir)/${PN}.py \ |
| 88 |
+ $(python_get_sitedir)/ogr.py |
| 89 |
+ fi |
| 90 |
echo |
| 91 |
elog "Check available image and data formats after building with" |
| 92 |
elog "gdalinfo and ogrinfo (using the --formats switch)." |
| 93 |
|
| 94 |
|
| 95 |
|
| 96 |
1.112 sci-libs/gdal/ChangeLog |
| 97 |
|
| 98 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.112&view=markup |
| 99 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.112&content-type=text/plain |
| 100 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/ChangeLog?r1=1.111&r2=1.112 |
| 101 |
|
| 102 |
Index: ChangeLog |
| 103 |
=================================================================== |
| 104 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v |
| 105 |
retrieving revision 1.111 |
| 106 |
retrieving revision 1.112 |
| 107 |
diff -u -r1.111 -r1.112 |
| 108 |
--- ChangeLog 11 Jun 2011 14:06:16 -0000 1.111 |
| 109 |
+++ ChangeLog 5 Jul 2011 01:00:30 -0000 1.112 |
| 110 |
@@ -1,6 +1,13 @@ |
| 111 |
# ChangeLog for sci-libs/gdal |
| 112 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 113 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.111 2011/06/11 14:06:16 scarabeus Exp $ |
| 114 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.112 2011/07/05 01:00:30 nerdboy Exp $ |
| 115 |
+ |
| 116 |
+ 05 Jul 2011; Steve Arnold <nerdboy@g.o> gdal-1.8.0-r1.ebuild: |
| 117 |
+ This should fix the seemingly random (and unreproducible by me) install |
| 118 |
+ bug reported again here. I still can't reproduce it on any of my test |
| 119 |
+ boxes but the build log attached to this bug shows an extra DESTDIR that |
| 120 |
+ shouldn't be there (and now it isn't). Also removed a failing autoheader |
| 121 |
+ and added some additional python eclass helper functions. |
| 122 |
|
| 123 |
11 Jun 2011; Tomáš Chvátal <scarabeus@g.o> gdal-1.8.0-r1.ebuild: |
| 124 |
Build with any tiff version, but make sure it is always the external one. |
Archives