1 |
scarabeus 10/02/17 16:48:22 |
2 |
|
3 |
Modified: ChangeLog grass-6.4.0_rc5.ebuild |
4 |
Log: |
5 |
Slightly update grass ebuild. Synced with sci overlay + whitespace cleanup. |
6 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.76 sci-geosciences/grass/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.76&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.76&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?r1=1.75&r2=1.76 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v |
18 |
retrieving revision 1.75 |
19 |
retrieving revision 1.76 |
20 |
diff -u -r1.75 -r1.76 |
21 |
--- ChangeLog 3 Feb 2010 20:56:55 -0000 1.75 |
22 |
+++ ChangeLog 17 Feb 2010 16:48:21 -0000 1.76 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for sci-geosciences/grass |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.75 2010/02/03 20:56:55 hwoarang Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.76 2010/02/17 16:48:21 scarabeus Exp $ |
28 |
+ |
29 |
+ 17 Feb 2010; Tomáš Chvátal <scarabeus@g.o> |
30 |
+ grass-6.4.0_rc5.ebuild, +files/grass-6.4.0-html-nonviz.patch: |
31 |
+ Slightly update grass ebuild. Synced with sci overlay + whitespace |
32 |
+ cleanup. |
33 |
|
34 |
03 Feb 2010; Markos Chandras <hwoarang@g.o> grass-6.3.0.ebuild: |
35 |
Stable on amd64 wrt bug #250850 |
36 |
|
37 |
|
38 |
|
39 |
1.2 sci-geosciences/grass/grass-6.4.0_rc5.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc5.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc5.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc5.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: grass-6.4.0_rc5.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc5.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- grass-6.4.0_rc5.ebuild 28 Dec 2009 07:22:26 -0000 1.1 |
52 |
+++ grass-6.4.0_rc5.ebuild 17 Feb 2010 16:48:21 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
-# Copyright 1999-2009 Gentoo Foundation |
55 |
+# Copyright 1999-2010 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc5.ebuild,v 1.1 2009/12/28 07:22:26 nerdboy Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc5.ebuild,v 1.2 2010/02/17 16:48:21 scarabeus Exp $ |
59 |
|
60 |
EAPI="2" |
61 |
|
62 |
@@ -19,8 +19,8 @@ |
63 |
SLOT="6" |
64 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" |
65 |
|
66 |
-IUSE="ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png \ |
67 |
-postgres python readline sqlite tiff truetype wxwindows X" |
68 |
+IUSE="X ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png |
69 |
+ postgres python readline sqlite tiff truetype wxwindows" |
70 |
|
71 |
RESTRICT="strip" |
72 |
|
73 |
@@ -28,23 +28,28 @@ |
74 |
>=sys-libs/ncurses-5.3 |
75 |
>=sys-libs/gdbm-1.8.0 |
76 |
|| ( |
77 |
- sys-apps/man |
78 |
- sys-apps/man-db ) |
79 |
+ sys-apps/man |
80 |
+ sys-apps/man-db |
81 |
+ ) |
82 |
sci-libs/gdal |
83 |
>=sci-libs/proj-4.4.7 |
84 |
ffmpeg? ( media-video/ffmpeg ) |
85 |
fftw? ( sci-libs/fftw ) |
86 |
- gmath? ( virtual/blas |
87 |
- virtual/lapack ) |
88 |
+ gmath? ( |
89 |
+ virtual/blas |
90 |
+ virtual/lapack |
91 |
+ ) |
92 |
jpeg? ( media-libs/jpeg ) |
93 |
mysql? ( dev-db/mysql ) |
94 |
odbc? ( >=dev-db/unixODBC-2.0.6 ) |
95 |
opengl? ( virtual/opengl ) |
96 |
motif? ( x11-libs/openmotif ) |
97 |
png? ( >=media-libs/libpng-1.2.2 ) |
98 |
- postgres? ( || ( |
99 |
- >=virtual/postgresql-base-8.0 |
100 |
- >=virtual/postgresql-server-8.0 ) |
101 |
+ postgres? ( |
102 |
+ || ( |
103 |
+ >=virtual/postgresql-base-8.0 |
104 |
+ >=virtual/postgresql-server-8.0 |
105 |
+ ) |
106 |
) |
107 |
python? ( dev-lang/python ) |
108 |
readline? ( sys-libs/readline ) |
109 |
@@ -118,7 +123,7 @@ |
110 |
|| die "sed failed" |
111 |
|
112 |
if ! use opengl; then |
113 |
- epatch "${FILESDIR}"/${P}-html-nonviz.patch |
114 |
+ epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch |
115 |
fi |
116 |
|
117 |
# patch missing math functions (yes, this is still needed) |
118 |
@@ -141,49 +146,49 @@ |
119 |
--without-glw" |
120 |
|
121 |
if use X; then |
122 |
- if has_version ">=dev-lang/tcl-8.5"; then |
123 |
- TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5" |
124 |
- else |
125 |
- TCL_LIBDIR="/usr/$(get_libdir)/tcl8.4" |
126 |
- fi |
127 |
- myconf="${myconf} --with-tcltk --with-x \ |
128 |
- --with-tcltk-includes=/usr/include \ |
129 |
+ if has_version ">=dev-lang/tcl-8.5"; then |
130 |
+ TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5" |
131 |
+ else |
132 |
+ TCL_LIBDIR="/usr/$(get_libdir)/tcl8.4" |
133 |
+ fi |
134 |
+ myconf+=" --with-tcltk --with-x \ |
135 |
+ --with-tcltk-includes=/usr/include \ |
136 |
--with-tcltk-libs=${TCL_LIBDIR}" |
137 |
if use wxwindows; then |
138 |
- WX_GTK_VER=2.8 |
139 |
- need-wxwidgets unicode |
140 |
- myconf="${myconf} --with-python --with-wxwidgets=${WX_CONFIG}" |
141 |
+ WX_GTK_VER=2.8 |
142 |
+ need-wxwidgets unicode |
143 |
+ myconf+=" --with-python --with-wxwidgets=${WX_CONFIG}" |
144 |
else |
145 |
- # USE=python must be enabled above if wxwindows is enabled |
146 |
- myconf="${myconf} $(use_with python) --without-wxwidgets" |
147 |
+ # USE=python must be enabled above if wxwindows is enabled |
148 |
+ myconf+=" $(use_with python) --without-wxwidgets" |
149 |
fi |
150 |
else |
151 |
- myconf="${myconf} --without-tcltk --without-x" |
152 |
+ myconf+=" --without-tcltk --without-x" |
153 |
fi |
154 |
|
155 |
if use opengl; then |
156 |
- myconf="${myconf} --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib" |
157 |
+ myconf+=" --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib" |
158 |
else |
159 |
- myconf="${myconf} --without-opengl" |
160 |
+ myconf+=" --without-opengl" |
161 |
fi |
162 |
|
163 |
if use truetype; then |
164 |
- myconf="${myconf} --with-freetype \ |
165 |
- --with-freetype-includes=/usr/include/freetype2" |
166 |
+ myconf+=" --with-freetype |
167 |
+ --with-freetype-includes=/usr/include/freetype2" |
168 |
fi |
169 |
|
170 |
if use mysql; then |
171 |
- myconf="${myconf} --with-mysql --with-mysql-includes=/usr/include/mysql \ |
172 |
- --with-mysql-libs=/usr/$(get_libdir)/mysql" |
173 |
+ myconf+=" --with-mysql --with-mysql-includes=/usr/include/mysql |
174 |
+ --with-mysql-libs=/usr/$(get_libdir)/mysql" |
175 |
else |
176 |
- myconf="${myconf} --without-mysql" |
177 |
+ myconf+=" --without-mysql" |
178 |
fi |
179 |
|
180 |
if use sqlite; then |
181 |
- myconf="${myconf} --with-sqlite --with-sqlite-includes=/usr/include \ |
182 |
- --with-sqlite-libs=/usr/$(get_libdir)" |
183 |
+ myconf+=" --with-sqlite --with-sqlite-includes=/usr/include |
184 |
+ --with-sqlite-libs=/usr/$(get_libdir)" |
185 |
else |
186 |
- myconf="${myconf} --without-sqlite" |
187 |
+ myconf+=" --without-sqlite" |
188 |
fi |
189 |
|
190 |
# Old ffmpeg is gone, but new is a pita with all those include dirs, |
191 |
@@ -191,22 +196,22 @@ |
192 |
if use ffmpeg; then |
193 |
ffmlib_conf="--with-ffmpeg --with-ffmpeg-libs=/usr/$(get_libdir)" |
194 |
else |
195 |
- myconf="${myconf} --without-ffmpeg" |
196 |
+ myconf+=" --without-ffmpeg" |
197 |
fi |
198 |
|
199 |
- myconf="${myconf} --with-libs=/usr/$(get_libdir) \ |
200 |
- $(use_enable amd64 64bit) \ |
201 |
- $(use_with fftw) \ |
202 |
- $(use_with gmath blas) \ |
203 |
- $(use_with gmath lapack) \ |
204 |
- $(use_with jpeg) \ |
205 |
- $(use_enable largefile) \ |
206 |
- $(use_with motif) \ |
207 |
- $(use_with nls) \ |
208 |
- $(use_with odbc) \ |
209 |
- $(use_with png) \ |
210 |
- $(use_with postgres) \ |
211 |
- $(use_with readline) \ |
212 |
+ myconf+=" --with-libs=/usr/$(get_libdir) |
213 |
+ $(use_enable amd64 64bit) |
214 |
+ $(use_with fftw) |
215 |
+ $(use_with gmath blas) |
216 |
+ $(use_with gmath lapack) |
217 |
+ $(use_with jpeg) |
218 |
+ $(use_enable largefile) |
219 |
+ $(use_with motif) |
220 |
+ $(use_with nls) |
221 |
+ $(use_with odbc) |
222 |
+ $(use_with png) |
223 |
+ $(use_with postgres) |
224 |
+ $(use_with readline) |
225 |
$(use_with tiff)" |
226 |
|
227 |
if use ffmpeg; then |
228 |
@@ -239,12 +244,12 @@ |
229 |
mv "${D}"usr/bin/gem "${D}"usr/${MY_PM}/bin/ |
230 |
|
231 |
ebegin "Adding env.d and desktop entry for Grass6..." |
232 |
- generate_files |
233 |
- doenvd 99grass-6 |
234 |
- if use X; then |
235 |
+ generate_files |
236 |
+ doenvd 99grass-6 |
237 |
+ if use X; then |
238 |
doicon "${FILESDIR}"/grass_icon.png |
239 |
domenu ${MY_PM}-grass.desktop |
240 |
- fi |
241 |
+ fi |
242 |
eend ${?} |
243 |
} |