Gentoo Archives: gentoo-commits

From: "Steve Arnold (nerdboy)" <nerdboy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/gdal: gdal-1.4.2.ebuild gdal-1.5.0-r1.ebuild ChangeLog gdal-1.3.1.ebuild gdal-1.3.2.ebuild
Date: Sun, 12 Oct 2008 02:38:19
Message-Id: E1KoqqW-00088I-6E@stork.gentoo.org
1 nerdboy 08/10/12 02:38:16
2
3 Modified: gdal-1.4.2.ebuild gdal-1.5.0-r1.ebuild ChangeLog
4 gdal-1.3.1.ebuild gdal-1.3.2.ebuild
5 Log:
6 Added die to sed invocations
7 (Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 x86_64)
8
9 Revision Changes Path
10 1.5 sci-libs/gdal/gdal-1.4.2.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.4.2.ebuild?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.4.2.ebuild?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.4.2.ebuild?r1=1.4&r2=1.5
15
16 Index: gdal-1.4.2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.4.2.ebuild,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -u -r1.4 -r1.5
22 --- gdal-1.4.2.ebuild 21 May 2008 19:01:41 -0000 1.4
23 +++ gdal-1.4.2.ebuild 12 Oct 2008 02:38:16 -0000 1.5
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2008 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.4.2.ebuild,v 1.4 2008/05/21 19:01:41 dev-zero Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.4.2.ebuild,v 1.5 2008/10/12 02:38:16 nerdboy Exp $
29
30 inherit eutils libtool distutils toolchain-funcs
31
32 @@ -102,7 +102,8 @@
33 fi
34
35 # Fix doc path just in case
36 - sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" GDALmake.opt.in
37 + sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" \
38 + GDALmake.opt.in || die "sed gdalmake.opt failed"
39
40 econf ${pkg_conf} ${use_conf} || die "econf failed"
41 # parallel makes fail on the ogr stuff (C++, what can I say?)
42
43
44
45 1.5 sci-libs/gdal/gdal-1.5.0-r1.ebuild
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.5.0-r1.ebuild?rev=1.5&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.5.0-r1.ebuild?rev=1.5&content-type=text/plain
49 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.5.0-r1.ebuild?r1=1.4&r2=1.5
50
51 Index: gdal-1.5.0-r1.ebuild
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.0-r1.ebuild,v
54 retrieving revision 1.4
55 retrieving revision 1.5
56 diff -u -r1.4 -r1.5
57 --- gdal-1.5.0-r1.ebuild 21 May 2008 19:01:41 -0000 1.4
58 +++ gdal-1.5.0-r1.ebuild 12 Oct 2008 02:38:16 -0000 1.5
59 @@ -1,6 +1,6 @@
60 # Copyright 1999-2008 Gentoo Foundation
61 # Distributed under the terms of the GNU General Public License v2
62 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.0-r1.ebuild,v 1.4 2008/05/21 19:01:41 dev-zero Exp $
63 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.0-r1.ebuild,v 1.5 2008/10/12 02:38:16 nerdboy Exp $
64
65 WANT_AUTOCONF="2.5"
66 inherit autotools distutils eutils perl-module toolchain-funcs
67 @@ -122,7 +122,8 @@
68 fi
69
70 # Fix doc path just in case
71 - sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" GDALmake.opt.in
72 + sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" \
73 + GDALmake.opt.in || die "sed gdalmake.opt failed"
74
75 econf ${pkg_conf} ${use_conf} || die "econf failed"
76
77 @@ -132,9 +133,9 @@
78
79 if useq python; then
80 sed -i -e "s#library_dirs = #library_dirs = /usr/$(get_libdir):#g" \
81 - swig/python/setup.cfg
82 + swig/python/setup.cfg || die "sed python setup.cfg failed"
83 sed -i -e "s:$(DESTDIR)$(prefix):$(DESTDIR)$(INST_PREFIX):g" \
84 - swig/python/GNUmakefile
85 + swig/python/GNUmakefile || die "sed python GNUmakefile failed"
86 fi
87
88 if useq perl ; then
89
90
91
92 1.46 sci-libs/gdal/ChangeLog
93
94 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.46&view=markup
95 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/ChangeLog?rev=1.46&content-type=text/plain
96 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/ChangeLog?r1=1.45&r2=1.46
97
98 Index: ChangeLog
99 ===================================================================
100 RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v
101 retrieving revision 1.45
102 retrieving revision 1.46
103 diff -u -r1.45 -r1.46
104 --- ChangeLog 7 Aug 2008 06:34:27 -0000 1.45
105 +++ ChangeLog 12 Oct 2008 02:38:16 -0000 1.46
106 @@ -1,6 +1,11 @@
107 # ChangeLog for sci-libs/gdal
108 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
109 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.45 2008/08/07 06:34:27 ulm Exp $
110 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.46 2008/10/12 02:38:16 nerdboy Exp $
111 +
112 + 12 Oct 2008; Steve Arnold <nerdboy@g.o> gdal-1.3.1.ebuild,
113 + gdal-1.3.2.ebuild, gdal-1.4.2.ebuild, gdal-1.5.0-r1.ebuild:
114 + Added die to sed invocations (although what this hs to do with perl I'm
115 + not quite sure...
116
117 07 Aug 2008; Ulrich Mueller <ulm@g.o> metadata.xml:
118 Add USE flag description to metadata wrt GLEP 56.
119
120
121
122 1.17 sci-libs/gdal/gdal-1.3.1.ebuild
123
124 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild?rev=1.17&view=markup
125 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild?rev=1.17&content-type=text/plain
126 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild?r1=1.16&r2=1.17
127
128 Index: gdal-1.3.1.ebuild
129 ===================================================================
130 RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild,v
131 retrieving revision 1.16
132 retrieving revision 1.17
133 diff -u -r1.16 -r1.17
134 --- gdal-1.3.1.ebuild 21 May 2008 19:01:41 -0000 1.16
135 +++ gdal-1.3.1.ebuild 12 Oct 2008 02:38:16 -0000 1.17
136 @@ -1,6 +1,6 @@
137 # Copyright 1999-2008 Gentoo Foundation
138 # Distributed under the terms of the GNU General Public License v2
139 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild,v 1.16 2008/05/21 19:01:41 dev-zero Exp $
140 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild,v 1.17 2008/10/12 02:38:16 nerdboy Exp $
141
142 inherit eutils libtool distutils toolchain-funcs
143
144 @@ -99,7 +99,8 @@
145 fi
146
147 # Fix doc path just in case
148 - sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" GDALmake.opt.in
149 + sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" \
150 + GDALmake.opt.in || die "sed gdalmake.opt failed"
151
152 econf ${pkg_conf} ${use_conf} || die "econf failed"
153 # parallel makes fail on the ogr stuff (C++, what can I say?)
154
155
156
157 1.7 sci-libs/gdal/gdal-1.3.2.ebuild
158
159 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.3.2.ebuild?rev=1.7&view=markup
160 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.3.2.ebuild?rev=1.7&content-type=text/plain
161 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/gdal-1.3.2.ebuild?r1=1.6&r2=1.7
162
163 Index: gdal-1.3.2.ebuild
164 ===================================================================
165 RCS file: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.2.ebuild,v
166 retrieving revision 1.6
167 retrieving revision 1.7
168 diff -u -r1.6 -r1.7
169 --- gdal-1.3.2.ebuild 21 May 2008 19:01:41 -0000 1.6
170 +++ gdal-1.3.2.ebuild 12 Oct 2008 02:38:16 -0000 1.7
171 @@ -1,6 +1,6 @@
172 # Copyright 1999-2008 Gentoo Foundation
173 # Distributed under the terms of the GNU General Public License v2
174 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.2.ebuild,v 1.6 2008/05/21 19:01:41 dev-zero Exp $
175 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.2.ebuild,v 1.7 2008/10/12 02:38:16 nerdboy Exp $
176
177 inherit eutils libtool distutils toolchain-funcs
178
179 @@ -102,7 +102,8 @@
180 fi
181
182 # Fix doc path just in case
183 - sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" GDALmake.opt.in
184 + sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" \
185 + GDALmake.opt.in || die "sed gdalmake.opt failed"
186
187 econf ${pkg_conf} ${use_conf} || die "econf failed"
188 # parallel makes fail on the ogr stuff (C++, what can I say?)