Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/plplot: ChangeLog plplot-5.9.6.ebuild plplot-5.9.5.ebuild
Date: Sun, 04 Jul 2010 18:27:07
Message-Id: 20100704182703.1BF1A2CE14@corvid.gentoo.org
1 jlec 10/07/04 18:27:02
2
3 Modified: ChangeLog plplot-5.9.5.ebuild
4 Added: plplot-5.9.6.ebuild
5 Log:
6 Version Bump, fixes for python ABI compatibiliy
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.29 sci-libs/plplot/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/ChangeLog?rev=1.29&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/ChangeLog?rev=1.29&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/ChangeLog?r1=1.28&r2=1.29
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v
19 retrieving revision 1.28
20 retrieving revision 1.29
21 diff -u -r1.28 -r1.29
22 --- ChangeLog 29 Jan 2010 18:11:49 -0000 1.28
23 +++ ChangeLog 4 Jul 2010 18:27:02 -0000 1.29
24 @@ -1,6 +1,12 @@
25 # ChangeLog for sci-libs/plplot
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.28 2010/01/29 18:11:49 bicatali Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.29 2010/07/04 18:27:02 jlec Exp $
29 +
30 +*plplot-5.9.6 (04 Jul 2010)
31 +
32 + 04 Jul 2010; Justin Lecher <jlec@g.o> plplot-5.9.5.ebuild,
33 + +plplot-5.9.6.ebuild, +files/plplot-5.9.6-python.patch:
34 + Version Bump, fixes for python ABI compatibiliy
35
36 29 Jan 2010; Sébastien Fabbro <bicatali@g.o> plplot-5.9.5.ebuild:
37 Fixed qt4 automagic dependencies, thanks Kacper Kowalik closing bug
38
39
40
41 1.6 sci-libs/plplot/plplot-5.9.5.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/plplot-5.9.5.ebuild?rev=1.6&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/plplot-5.9.5.ebuild?rev=1.6&content-type=text/plain
45 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/plplot-5.9.5.ebuild?r1=1.5&r2=1.6
46
47 Index: plplot-5.9.5.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.5.ebuild,v
50 retrieving revision 1.5
51 retrieving revision 1.6
52 diff -u -r1.5 -r1.6
53 --- plplot-5.9.5.ebuild 1 Feb 2010 17:41:34 -0000 1.5
54 +++ plplot-5.9.5.ebuild 4 Jul 2010 18:27:02 -0000 1.6
55 @@ -1,10 +1,13 @@
56 # Copyright 1999-2010 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.5.ebuild,v 1.5 2010/02/01 17:41:34 ssuominen Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.5.ebuild,v 1.6 2010/07/04 18:27:02 jlec Exp $
60
61 EAPI="2"
62 +
63 WX_GTK_VER="2.8"
64 -inherit eutils cmake-utils toolchain-funcs wxwidgets java-pkg-opt-2
65 +PYTHON_DEPEND="python? 2"
66 +
67 +inherit eutils cmake-utils python toolchain-funcs wxwidgets java-pkg-opt-2
68
69 DESCRIPTION="Multi-language scientific plotting library"
70 HOMEPAGE="http://plplot.sourceforge.net/"
71 @@ -17,40 +20,44 @@
72 IUSE="ada cairo doc examples fortran gd gnome java jpeg latex octave
73 pdf perl png python qhull qt4 svg svga tcl threads tk truetype wxwidgets X"
74
75 -RDEPEND="ada? ( virtual/gnat )
76 +RDEPEND="
77 + ada? ( virtual/gnat )
78 cairo? ( x11-libs/cairo[svg?,X?] )
79 java? ( >=virtual/jre-1.5 )
80 gd? ( media-libs/gd[jpeg?,png?] )
81 - gnome? ( gnome-base/libgnomeui
82 - gnome-base/libgnomeprintui
83 - python? ( dev-python/gnome-python ) )
84 + gnome? (
85 + gnome-base/libgnomeui
86 + gnome-base/libgnomeprintui
87 + python? ( dev-python/gnome-python ) )
88 latex? ( virtual/latex-base app-text/ghostscript-gpl )
89 octave? ( >=sci-mathematics/octave-3 )
90 pdf? ( media-libs/libharu )
91 perl? ( dev-perl/PDL dev-perl/XML-DOM )
92 python? ( dev-python/numpy )
93 - qt4? ( x11-libs/qt-gui:4
94 + qt4? (
95 + x11-libs/qt-gui:4
96 x11-libs/qt-svg:4 )
97 svga? ( media-libs/svgalib )
98 tcl? ( dev-lang/tcl dev-tcltk/itcl )
99 tk? ( dev-lang/tk dev-tcltk/itk )
100 - truetype? ( media-fonts/freefont-ttf
101 + truetype? (
102 + media-fonts/freefont-ttf
103 media-libs/lasi
104 gd? ( media-libs/gd[truetype] ) )
105 wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/agg[truetype?] )
106 X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )"
107 -
108 DEPEND="${RDEPEND}
109 >=dev-util/cmake-2.6
110 dev-util/pkgconfig
111 - doc? ( app-text/opensp
112 - app-text/jadetex
113 - app-text/docbook2X
114 - app-text/docbook-dsssl-stylesheets
115 - dev-perl/XML-DOM
116 - virtual/latex-base
117 - app-text/ghostscript-gpl
118 - sys-apps/texinfo )
119 + doc? (
120 + app-text/opensp
121 + app-text/jadetex
122 + app-text/docbook2X
123 + app-text/docbook-dsssl-stylesheets
124 + dev-perl/XML-DOM
125 + virtual/latex-base
126 + app-text/ghostscript-gpl
127 + sys-apps/texinfo )
128 java? ( >=virtual/jdk-1.5 dev-lang/swig )
129 python? ( dev-lang/swig )
130 qhull? ( media-libs/qhull )"
131 @@ -61,6 +68,9 @@
132 else
133 export FC="" F77=""
134 fi
135 + use wxwidgets && wxwidgets_pkg_setup
136 + use python && python_set_active_version 2
137 + use java && java-pkg-opt-2_pkg_setup
138 }
139
140 src_prepare() {
141 @@ -91,6 +101,8 @@
142 sed -i \
143 -e 's:xml/declaration:sgml:' \
144 cmake/modules/docbook.cmake || die
145 +
146 + use java && java-utils-2_src_prepare
147 }
148
149 src_configure() {
150
151
152
153 1.1 sci-libs/plplot/plplot-5.9.6.ebuild
154
155 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/plplot-5.9.6.ebuild?rev=1.1&view=markup
156 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/plplot-5.9.6.ebuild?rev=1.1&content-type=text/plain
157
158 Index: plplot-5.9.6.ebuild
159 ===================================================================
160 # Copyright 1999-2010 Gentoo Foundation
161 # Distributed under the terms of the GNU General Public License v2
162 # $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.6.ebuild,v 1.1 2010/07/04 18:27:02 jlec Exp $
163
164 EAPI="2"
165
166 WX_GTK_VER="2.8"
167 PYTHON_DEPEND="python? 2"
168
169 inherit eutils cmake-utils python toolchain-funcs wxwidgets java-pkg-opt-2
170
171 DESCRIPTION="Multi-language scientific plotting library"
172 HOMEPAGE="http://plplot.sourceforge.net/"
173 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
174
175 LICENSE="LGPL-2"
176 SLOT="0"
177 KEYWORDS="~amd64 ~x86"
178 IUSE="ada cairo doc examples fortran gd gnome java jpeg latex octave
179 pdf perl png python qhull qt4 svg svga tcl threads tk truetype wxwidgets X"
180
181 RDEPEND="
182 ada? ( virtual/gnat )
183 cairo? ( x11-libs/cairo[svg?,X?] )
184 java? ( >=virtual/jre-1.5 )
185 gd? ( media-libs/gd[jpeg?,png?] )
186 gnome? (
187 gnome-base/libgnomeui
188 gnome-base/libgnomeprintui
189 python? ( dev-python/gnome-python ) )
190 latex? ( virtual/latex-base app-text/ghostscript-gpl )
191 octave? ( >=sci-mathematics/octave-3 )
192 pdf? ( media-libs/libharu )
193 perl? ( dev-perl/PDL dev-perl/XML-DOM )
194 python? ( dev-python/numpy )
195 qt4? (
196 x11-libs/qt-gui:4
197 x11-libs/qt-svg:4 )
198 svga? ( media-libs/svgalib )
199 tcl? ( dev-lang/tcl dev-tcltk/itcl )
200 tk? ( dev-lang/tk dev-tcltk/itk )
201 truetype? (
202 media-fonts/freefont-ttf
203 media-libs/lasi
204 gd? ( media-libs/gd[truetype] ) )
205 wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/agg[truetype?] )
206 X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )"
207 DEPEND="${RDEPEND}
208 >=dev-util/cmake-2.6
209 dev-util/pkgconfig
210 doc? (
211 app-text/opensp
212 app-text/jadetex
213 app-text/docbook2X
214 app-text/docbook-dsssl-stylesheets
215 dev-perl/XML-DOM
216 virtual/latex-base
217 app-text/ghostscript-gpl
218 sys-apps/texinfo )
219 java? ( >=virtual/jdk-1.5 dev-lang/swig )
220 python? ( dev-lang/swig )
221 qhull? ( media-libs/qhull )"
222
223 pkg_setup() {
224 if use fortran; then
225 export FC=$(tc-getFC) F77=$(tc-getF77)
226 else
227 export FC="" F77=""
228 fi
229 use wxwidgets && wxwidgets_pkg_setup
230 use python && python_set_active_version 2
231 use java && java-pkg-opt-2_pkg_setup
232 }
233
234 src_prepare() {
235 # path for python independent of python version
236 epatch "${FILESDIR}"/${P}-python.patch
237
238 # remove license
239 sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
240
241 # change default install directories for doc and examples
242 sed -i \
243 -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \
244 examples/CMakeLists.txt examples/*/CMakeLists.txt || die
245 sed -i \
246 -e 's:${VERSION}::g' \
247 -e "s:doc/\${PACKAGE}:doc/${PF}:" \
248 cmake/modules/instdirs.cmake || die
249
250 # haru pdf devide does not build with HPDF_SHARED
251 sed -i \
252 -e 's:-DHPDF_SHARED::' \
253 cmake/modules/pdf.cmake || die
254
255 # default location for docbook crap
256 sed -i \
257 -e 's:xml/declaration:sgml:' \
258 cmake/modules/docbook.cmake || die
259
260 # Problem if old version is installed
261 sed "/TEST_DYNDRIVERS/s:ON:OFF:g" -i drivers/CMakeLists.txt
262
263 use java && java-utils-2_src_prepare
264 }
265
266 src_configure() {
267 # see http://www.miscdebris.net/plplot_wiki/index.php?title=CMake_options_for_PLplot
268 cmake-utils_pld() { _use_me_now PLD "$@" ; }
269
270 mycmakeargs="
271 -DUSE_RPATH=OFF
272 -DDEFAULT_ALL_DEVICES=ON
273 -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
274 $(cmake-utils_use_has python numpy)
275 $(cmake-utils_use_has qhull QHULL)
276 $(cmake-utils_use_has threads PTHREAD)
277 $(cmake-utils_use_with truetype FREETYPE)
278 $(cmake-utils_use_enable ada ada)
279 $(cmake-utils_use_enable fortran f77)
280 $(cmake-utils_use_enable java java)
281 $(cmake-utils_use_enable gnome gnome2)
282 $(cmake-utils_use_enable octave octave)
283 $(cmake-utils_use_enable perl pdl)
284 $(cmake-utils_use_enable python python)
285 $(cmake-utils_use_enable qt4 qt)
286 $(cmake-utils_use_enable tcl tcl)
287 $(cmake-utils_use_enable tcl itcl)
288 $(cmake-utils_use_enable tk tk)
289 $(cmake-utils_use_enable tk itk)
290 $(cmake-utils_pld qt4 _svgqt)
291 $(cmake-utils_pld wxwidgets _wxwidgets)
292 $(cmake-utils_pld wxwidgets _wxpng)
293 $(cmake-utils_pld pdf pdf)
294 $(cmake-utils_pld truetype psttf)
295 $(cmake-utils_pld latex pstex)
296 $(cmake-utils_pld svga linuxvga)"
297
298 use fortran && [[ $(tc-getFC) != g77 ]] && \
299 mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable fortran f95)"
300
301 use truetype && mycmakeargs="${mycmakeargs}
302 -DPL_FREETYPE_FONT_PATH:PATH=/usr/share/fonts/freefont-ttf"
303
304 if use python && use gnome; then
305 mycmakeargs="${mycmakeargs} -DENABLE_pygcw=ON"
306 else
307 mycmakeargs="${mycmakeargs} -DENABLE_pygcw=OFF"
308 fi
309 if use cairo; then
310 # memcairo buggy, see cmake/modules/drivers-init.cmake
311 mycmakeargs="${mycmakeargs}
312 -DPLD_memcairo=OFF
313 -DPLD_extcairo=OFF
314 -DPLD_pdfcairo=ON
315 -DPLD_pngcairo=ON
316 -DPLD_pscairo=ON
317 $(cmake-utils_pld svg svgcairo)
318 $(cmake-utils_pld X xcairo)"
319 else
320 mycmakeargs="${mycmakeargs}
321 -DPLD_memcairo=OFF
322 -DPLD_extcairo=OFF
323 -DPLD_pdfcairo=OFF
324 -DPLD_pngcairo=OFF
325 -DPLD_pscairo=OFF
326 -DPLD_svgcairo=OFF
327 -DPLD_xcairo=OFF"
328 fi
329 cmake-utils_src_configure
330 }
331
332 src_compile() {
333 # separate doc and normal because doc building crashes with parallel
334 cmake-utils_src_make
335 if use doc; then
336 mycmakeargs="${mycmakeargs} -DBUILD_DOC=ON"
337 mycmakeargs="${mycmakeargs} -DHAVE_DB_DTD=ON"
338 mycmakeargs="${mycmakeargs} -DHAVE_DSSSL_DTD=ON"
339 mycmakeargs="${mycmakeargs} -DHAVE_HTML_SS=ON"
340 mycmakeargs="${mycmakeargs} -DHAVE_PRINT_SS=ON"
341 cmake-utils_src_configure
342 VARTEXFONTS="${T}/fonts" cmake-utils_src_make -j1
343 fi
344 }
345
346 src_install() {
347 cmake-utils_src_install
348 use examples || rm -rf "${D}"usr/share/doc/${PF}/examples
349 }
Report Message
Find on MARC Find on Google Groups