Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/
Date: Wed, 23 Dec 2020 11:10:06
Message-Id: 1608721765.fdf3652cd3166e4c6770ca87f89343ee7f16fc2f.ulm@gentoo
1 commit: fdf3652cd3166e4c6770ca87f89343ee7f16fc2f
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 23 11:09:25 2020 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 23 11:09:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf3652c
7
8 sci-visualization/gnuplot: Remove old.
9
10 Bug: https://bugs.gentoo.org/746419
11 Package-Manager: Portage-3.0.12, Repoman-3.0.2
12 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
13
14 sci-visualization/gnuplot/Manifest | 1 -
15 .../gnuplot/files/gnuplot-5.4.0-caca.patch | 46 -----
16 .../gnuplot/files/gnuplot-5.4.0-no-mouse.patch | 27 ---
17 .../gnuplot/files/gnuplot-5.4.0-pkg-config.patch | 40 ----
18 sci-visualization/gnuplot/gnuplot-5.2.8.ebuild | 215 ---------------------
19 .../gnuplot/gnuplot-5.4.0-r100.ebuild | 213 --------------------
20 sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild | 206 --------------------
21 7 files changed, 748 deletions(-)
22
23 diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
24 index a76b0f41f3c..5e56dc1dc99 100644
25 --- a/sci-visualization/gnuplot/Manifest
26 +++ b/sci-visualization/gnuplot/Manifest
27 @@ -1,3 +1,2 @@
28 DIST gnuplot-5.2.8.tar.gz 5340677 BLAKE2B 169f5bef44a64b3b7a5be40e28ea22ef24ebc7526fe13ab09e16495453c3922712603d63a03c3b4332368d2ae8cbe4ef57ec53e18bbb4ad2cde13e4cc534245a SHA512 513dff15236dcb58c3c5471cdaa0713242787dbf30ef860c3f69152cb87c6392e4973caff5eb178707bbb84c78548e806b2920864a37686bce49425fbfdc4e8c
29 -DIST gnuplot-5.4.0.tar.gz 5622595 BLAKE2B e42011fa49ba0440436a406737f03ad55359b337dce359c62c1b4f536f70ca07126cf04e3e0eef6e4b22340dfb0318f6890d7814ad55b38d60ee24a4bc570ca1 SHA512 abbb69ded9eed3a1e53caeeb7d75ee4e3532b1254640a3f38f00260e261e75f87744e3df4210b0db7c8c2acee9b25147524d5377b3f4305e2449b2e99ca58d66
30 DIST gnuplot-5.4.1.tar.gz 5608076 BLAKE2B 7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d SHA512 2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121
31
32 diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.0-caca.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.0-caca.patch
33 deleted file mode 100644
34 index f92ac93ab01..00000000000
35 --- a/sci-visualization/gnuplot/files/gnuplot-5.4.0-caca.patch
36 +++ /dev/null
37 @@ -1,46 +0,0 @@
38 -From f76d96206a7251d62dbbd3879bf0ad6dfe1ec486 Mon Sep 17 00:00:00 2001
39 -From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@g.o>
40 -Date: Sat, 7 Nov 2020 11:25:07 -0800
41 -Subject: [PATCH] Allow to build --with-caca but without mouse support
42 -
43 -EAM: slightly modified fix
44 -Bug #2351
45 ----
46 - term/caca.trm | 9 +++++++--
47 - 1 file changed, 7 insertions(+), 2 deletions(-)
48 -
49 -diff --git a/term/caca.trm b/term/caca.trm
50 -index cf7c0d7c6..58606e2d8 100644
51 ---- a/term/caca.trm
52 -+++ b/term/caca.trm
53 -@@ -1913,8 +1913,11 @@ CACA_process_events(void)
54 - CACA_result loop = CACA_loop;
55 - caca_event_t ev;
56 - const int event_mask =
57 -- CACA_EVENT_KEY_PRESS | CACA_EVENT_RESIZE | CACA_EVENT_QUIT |
58 -- CACA_EVENT_MOUSE_MOTION | CACA_EVENT_MOUSE_PRESS | CACA_EVENT_MOUSE_RELEASE;
59 -+ CACA_EVENT_KEY_PRESS | CACA_EVENT_RESIZE | CACA_EVENT_QUIT
60 -+#ifdef USE_MOUSE
61 -+ | CACA_EVENT_MOUSE_MOTION | CACA_EVENT_MOUSE_PRESS | CACA_EVENT_MOUSE_RELEASE
62 -+#endif
63 -+ ;
64 - static int mx = 0, my = 0; /* current mouse position */
65 - static unsigned long last_event_time = 0;
66 -
67 -@@ -2579,11 +2582,13 @@ CACA_modify_plots(unsigned int operations, int plotno)
68 - }
69 - }
70 -
71 -+#ifdef USE_MOUSE
72 - if (changed) {
73 - /* Replot only if something changed. */
74 - CACA_zoom_or_replot = TRUE;
75 - exec_event(GE_replot, 0, 0, 0, 0, 0);
76 - }
77 -+#endif
78 - }
79 -
80 -
81 ---
82 -2.29.2
83 -
84
85 diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch
86 deleted file mode 100644
87 index 8133c3516ed..00000000000
88 --- a/sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch
89 +++ /dev/null
90 @@ -1,27 +0,0 @@
91 -From cfd9ff9408949ee58be9ba5a18b74ce4562f374a Mon Sep 17 00:00:00 2001
92 -From: Ethan A Merritt <merritt@××××××××××××.edu>
93 -Date: Fri, 6 Nov 2020 13:06:21 -0800
94 -Subject: [PATCH] make sure warning message about no mouse support is non-fatal
95 -
96 -Bug #2350
97 ----
98 - src/set.c | 3 ++-
99 - 1 file changed, 2 insertions(+), 1 deletion(-)
100 -
101 -diff --git a/src/set.c b/src/set.c
102 -index a697925bc..a6acf8fc6 100644
103 ---- a/src/set.c
104 -+++ b/src/set.c
105 -@@ -3130,7 +3130,8 @@ set_mouse()
106 - PM_update_menu_items();
107 - #endif
108 - #else /* USE_MOUSE */
109 -- c_token++;
110 -+ while (!END_OF_COMMAND)
111 -+ c_token++;
112 - int_warn(NO_CARET, "this copy of gnuplot has no mouse support");
113 - #endif /* USE_MOUSE */
114 - }
115 ---
116 -2.29.2
117 -
118
119 diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch
120 deleted file mode 100644
121 index aa98f27dc2b..00000000000
122 --- a/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch
123 +++ /dev/null
124 @@ -1,40 +0,0 @@
125 -From 87034e509b366078b746a3a70e05aaf497e34585 Mon Sep 17 00:00:00 2001
126 -From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@g.o>
127 -Date: Fri, 6 Nov 2020 13:25:02 +0100
128 -Subject: [PATCH] configure.ac: move PKG_PROG_PKG_CONFIG to the beginning of
129 - the file
130 -
131 -Bug #2349
132 ----
133 - configure.ac | 8 ++++----
134 - 1 file changed, 4 insertions(+), 4 deletions(-)
135 -
136 -diff --git a/configure.ac b/configure.ac
137 -index 67ad1396c..606242ea3 100644
138 ---- a/configure.ac
139 -+++ b/configure.ac
140 -@@ -88,6 +88,10 @@ AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,[
141 - #include <sys/types.h>
142 - #include <time.h>])
143 -
144 -+dnl explicit call to PKG_PROG_PKG_CONFIG because the first call to
145 -+dnl PKG_CHECK_MODULES{,_NOFAIL} may not happen
146 -+PKG_PROG_PKG_CONFIG
147 -+
148 - AC_ARG_WITH(libcerf,dnl
149 - [ --without-libcerf build without special functions from libcerf (default enabled)],,
150 - [test -z "${with_libcerf}" && with_libcerf=yes])
151 -@@ -759,10 +763,6 @@ AC_ARG_ENABLE(raise-console,dnl
152 - fi
153 -
154 -
155 --dnl explicit call to PKG_PROG_PKG_CONFIG because the first call to
156 --dnl PKG_CHECK_MODULES may not happen
157 --PKG_PROG_PKG_CONFIG
158 --
159 - dnl wxWidgets terminal
160 -
161 - dnl wxWidgets terminal needs C++
162 ---
163 -2.29.2
164 -
165
166 diff --git a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
167 deleted file mode 100644
168 index b741e27f842..00000000000
169 --- a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
170 +++ /dev/null
171 @@ -1,215 +0,0 @@
172 -# Copyright 1999-2020 Gentoo Authors
173 -# Distributed under the terms of the GNU General Public License v2
174 -
175 -EAPI=7
176 -
177 -inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
178 -
179 -DESCRIPTION="Command-line driven interactive plotting program"
180 -HOMEPAGE="http://www.gnuplot.info/"
181 -
182 -if [[ -z ${PV%%*9999} ]]; then
183 - inherit git-r3
184 - EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
185 - EGIT_BRANCH="branch-5-2-stable"
186 - MY_P="${PN}"
187 - EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
188 -else
189 - MY_P="${P/_/.}"
190 - SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
191 - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
192 -fi
193 -
194 -LICENSE="gnuplot"
195 -SLOT="0"
196 -IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis svga wxwidgets X"
197 -
198 -RDEPEND="
199 - cairo? (
200 - x11-libs/cairo
201 - x11-libs/pango )
202 - gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
203 - ggi? ( media-libs/libggi )
204 - latex? (
205 - virtual/latex-base
206 - lua? (
207 - dev-tex/pgf
208 - >=dev-texlive/texlive-latexrecommended-2008-r2 ) )
209 - libcaca? ( media-libs/libcaca )
210 - lua? ( dev-lang/lua:0 )
211 - qt5? (
212 - dev-qt/qtcore:5=
213 - dev-qt/qtgui:5=
214 - dev-qt/qtnetwork:5=
215 - dev-qt/qtprintsupport:5=
216 - dev-qt/qtsvg:5=
217 - dev-qt/qtwidgets:5= )
218 - readline? ( sys-libs/readline:0= )
219 - libcerf? ( sci-libs/libcerf )
220 - svga? ( media-libs/svgalib )
221 - wxwidgets? (
222 - x11-libs/wxGTK:3.0[X]
223 - x11-libs/cairo
224 - x11-libs/pango
225 - x11-libs/gtk+:2 )
226 - X? ( x11-libs/libXaw )"
227 -
228 -DEPEND="${RDEPEND}"
229 -
230 -BDEPEND="
231 - virtual/pkgconfig
232 - doc? (
233 - virtual/latex-base
234 - dev-texlive/texlive-latexextra
235 - app-text/ghostscript-gpl )
236 - qt5? ( dev-qt/linguist-tools:5 )"
237 -
238 -S="${WORKDIR}/${MY_P}"
239 -
240 -GP_VERSION="${PV%.*}"
241 -E_SITEFILE="lisp/50${PN}-gentoo.el"
242 -TEXMF="${EPREFIX}/usr/share/texmf-site"
243 -
244 -src_prepare() {
245 - eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
246 - eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
247 - eapply "${FILESDIR}"/${PN}-5.2.2-regis.patch
248 - eapply "${FILESDIR}"/${PN}-5.2.8-caca.patch
249 - eapply_user
250 -
251 - if [[ -z ${PV%%*9999} ]]; then
252 - local dir
253 - for dir in config demo m4 term tutorial; do
254 - emake -C "$dir" -f Makefile.am.in Makefile.am
255 - done
256 - fi
257 -
258 - # Add special version identification as required by provision 2
259 - # of the gnuplot license
260 - sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
261 -
262 - DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
263 - for details. You can use the "pdfcairo" terminal for PDF output.'
264 - use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
265 - use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
266 - SVGA console graphics, gnuplot needs to be set up as setuid root.
267 - Please note that this is usually considered to be a security hazard.
268 - As root, manually "chmod u+s /usr/bin/gnuplot".'
269 - use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
270 - you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
271 - environment variables. See the FAQ file in /usr/share/doc/${PF}/
272 - for more information."
273 -
274 - eautoreconf
275 -
276 - # Make sure we don't mix build & host flags.
277 - sed -i \
278 - -e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
279 - -e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
280 - -e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
281 - -e 's:@CC@:$(CC_FOR_BUILD):' \
282 - docs/Makefile.in || die
283 -}
284 -
285 -src_configure() {
286 - if ! use latex; then
287 - sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
288 - fi
289 -
290 - if use wxwidgets; then
291 - WX_GTK_VER="3.0"
292 - setup-wxwidgets
293 - fi
294 -
295 - tc-export CC CXX #453174
296 - tc-export_build_env BUILD_CC
297 - export CC_FOR_BUILD=${BUILD_CC}
298 -
299 - use qt5 && append-cxxflags -std=c++11
300 -
301 - econf \
302 - --with-texdir="${TEXMF}/tex/latex/${PN}" \
303 - --with-readline=$(usex readline gnu builtin) \
304 - $(use_with bitmap bitmap-terminals) \
305 - $(use_with cairo) \
306 - $(use_enable compat backwards-compatibility) \
307 - $(use_with doc tutorial) \
308 - $(use_with gd) \
309 - "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
310 - "$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
311 - "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
312 - $(use_with libcerf) \
313 - $(use_with lua) \
314 - $(use_with regis) \
315 - $(use_with svga linux-vga) \
316 - $(use_with X x) \
317 - --enable-stats \
318 - $(use_with qt5 qt qt5) \
319 - $(use_enable wxwidgets) \
320 - DIST_CONTACT="https://bugs.gentoo.org/" \
321 - EMACS=no
322 -}
323 -
324 -src_compile() {
325 - # Prevent access violations, see bug 201871
326 - export VARTEXFONTS="${T}/fonts"
327 -
328 - # We believe that the following line is no longer needed.
329 - # In case of problems file a bug report at bugs.gentoo.org.
330 - #addwrite /dev/svga:/dev/mouse:/dev/tts/0
331 -
332 - emake all
333 -
334 - if use doc; then
335 - # Avoid sandbox violation in epstopdf/ghostscript
336 - addpredict /var/cache/fontconfig
337 - if use cairo && use gd; then
338 - emake -C docs pdf
339 - else
340 - ewarn "Cannot build figures unless cairo and gd are enabled."
341 - ewarn "Building documentation without figures."
342 - emake -C docs pdf_nofig
343 - mv docs/nofigures.pdf docs/gnuplot.pdf || die
344 - fi
345 - emake -C tutorial pdf
346 - fi
347 -}
348 -
349 -src_install() {
350 - emake DESTDIR="${D}" install
351 -
352 - dodoc BUGS ChangeLog NEWS PGPKEYS README* RELEASE_NOTES TODO
353 - newdoc term/PostScript/README README-ps
354 - newdoc term/js/README README-js
355 - use lua && newdoc term/lua/README README-lua
356 - readme.gentoo_create_doc
357 -
358 - if use examples; then
359 - # Demo files
360 - insinto /usr/share/${PN}/${GP_VERSION}
361 - doins -r demo
362 - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
363 - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
364 - fi
365 -
366 - if use doc; then
367 - # Manual, tutorial, FAQ
368 - dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
369 - # Documentation for making PostScript files
370 - docinto psdoc
371 - dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
372 - fi
373 -}
374 -
375 -src_test() {
376 - GNUTERM="unknown" default_src_test
377 -}
378 -
379 -pkg_postinst() {
380 - use latex && texmf-update
381 - readme.gentoo_print_elog
382 -}
383 -
384 -pkg_postrm() {
385 - use latex && texmf-update
386 -}
387
388 diff --git a/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
389 deleted file mode 100644
390 index 47013ca921d..00000000000
391 --- a/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
392 +++ /dev/null
393 @@ -1,213 +0,0 @@
394 -# Copyright 1999-2020 Gentoo Authors
395 -# Distributed under the terms of the GNU General Public License v2
396 -
397 -EAPI=7
398 -
399 -LUA_COMPAT=( lua5-{1,2,3} )
400 -
401 -inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
402 -
403 -DESCRIPTION="Command-line driven interactive plotting program"
404 -HOMEPAGE="http://www.gnuplot.info/"
405 -
406 -if [[ -z ${PV%%*9999} ]]; then
407 - inherit git-r3
408 - EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
409 - EGIT_BRANCH="master"
410 - MY_P="${PN}"
411 - EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
412 -else
413 - MY_P="${P/_/.}"
414 - SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
415 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
416 -fi
417 -
418 -S="${WORKDIR}/${MY_P}"
419 -
420 -LICENSE="gnuplot"
421 -SLOT="0"
422 -IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
423 -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
424 -
425 -RDEPEND="
426 - cairo? (
427 - x11-libs/cairo
428 - x11-libs/pango )
429 - gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
430 - ggi? ( media-libs/libggi )
431 - latex? (
432 - virtual/latex-base
433 - lua? (
434 - dev-tex/pgf
435 - >=dev-texlive/texlive-latexrecommended-2008-r2 ) )
436 - libcaca? ( media-libs/libcaca )
437 - lua? ( ${LUA_DEPS} )
438 - qt5? (
439 - dev-qt/qtcore:5=
440 - dev-qt/qtgui:5=
441 - dev-qt/qtnetwork:5=
442 - dev-qt/qtprintsupport:5=
443 - dev-qt/qtsvg:5=
444 - dev-qt/qtwidgets:5= )
445 - readline? ( sys-libs/readline:0= )
446 - libcerf? ( sci-libs/libcerf )
447 - wxwidgets? (
448 - x11-libs/wxGTK:3.0-gtk3[X]
449 - x11-libs/cairo
450 - x11-libs/pango
451 - x11-libs/gtk+:3 )
452 - X? ( x11-libs/libXaw )"
453 -
454 -DEPEND="${RDEPEND}"
455 -
456 -BDEPEND="
457 - virtual/pkgconfig
458 - doc? (
459 - virtual/latex-base
460 - dev-texlive/texlive-latexextra
461 - dev-texlive/texlive-langgreek
462 - app-text/ghostscript-gpl )
463 - qt5? ( dev-qt/linguist-tools:5 )"
464 -
465 -GP_VERSION="${PV%.*}"
466 -E_SITEFILE="lisp/50${PN}-gentoo.el"
467 -TEXMF="${EPREFIX}/usr/share/texmf-site"
468 -
469 -PATCHES=(
470 - "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
471 - "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
472 - "${FILESDIR}"/${P}-pkg-config.patch
473 - "${FILESDIR}"/${P}-no-mouse.patch
474 - "${FILESDIR}"/${P}-caca.patch
475 -)
476 -
477 -pkg_setup() {
478 - use lua && lua-single_pkg_setup
479 -}
480 -
481 -src_prepare() {
482 - default
483 -
484 - if [[ ${PV##*.} = 9999 ]]; then
485 - local dir
486 - for dir in config demo m4 term tutorial; do
487 - emake -C "$dir" -f Makefile.am.in Makefile.am
488 - done
489 - fi
490 -
491 - # Add special version identification as required by provision 2
492 - # of the gnuplot license
493 - sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
494 -
495 - eautoreconf
496 -
497 - # Make sure we don't mix build & host flags.
498 - sed -i \
499 - -e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
500 - -e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
501 - -e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
502 - -e 's:@CC@:$(CC_FOR_BUILD):' \
503 - docs/Makefile.in || die
504 -}
505 -
506 -src_configure() {
507 - if ! use latex; then
508 - sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
509 - fi
510 -
511 - if use wxwidgets; then
512 - WX_GTK_VER="3.0-gtk3"
513 - setup-wxwidgets
514 - fi
515 -
516 - tc-export CC CXX #453174
517 - tc-export_build_env BUILD_CC
518 - export CC_FOR_BUILD=${BUILD_CC}
519 -
520 - use qt5 && append-cxxflags -std=c++11
521 -
522 - econf \
523 - --with-texdir="${TEXMF}/tex/latex/${PN}" \
524 - --with-readline=$(usex readline gnu builtin) \
525 - $(use_with bitmap bitmap-terminals) \
526 - $(use_with cairo) \
527 - $(use_with gd) \
528 - "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
529 - "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
530 - $(use_with libcerf) \
531 - $(use_with lua) \
532 - $(use_with regis) \
533 - $(use_with X x) \
534 - --enable-stats \
535 - $(use_with qt5 qt qt5) \
536 - $(use_enable wxwidgets) \
537 - DIST_CONTACT="https://bugs.gentoo.org/" \
538 - EMACS=no
539 -}
540 -
541 -src_compile() {
542 - # Prevent access violations, see bug 201871
543 - export VARTEXFONTS="${T}/fonts"
544 -
545 - emake all
546 -
547 - if use doc; then
548 - # Avoid sandbox violation in epstopdf/ghostscript
549 - addpredict /var/cache/fontconfig
550 - if use cairo; then
551 - emake -C docs pdf
552 - else
553 - ewarn "Cannot build figures unless cairo is enabled."
554 - ewarn "Building documentation without figures."
555 - emake -C docs pdf_nofig
556 - mv docs/nofigures.pdf docs/gnuplot.pdf || die
557 - fi
558 - fi
559 -}
560 -
561 -src_install() {
562 - emake DESTDIR="${D}" install
563 -
564 - dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
565 - newdoc term/PostScript/README README-ps
566 - newdoc term/js/README README-js
567 - use lua && newdoc term/lua/README README-lua
568 -
569 - local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
570 - use the "pdfcairo" terminal for PDF output.'
571 - use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
572 - use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
573 - you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
574 - environment variables. See the FAQ file in /usr/share/doc/${PF}/
575 - for more information."
576 - readme.gentoo_create_doc
577 -
578 - if use examples; then
579 - # Demo files
580 - insinto /usr/share/${PN}/${GP_VERSION}
581 - doins -r demo
582 - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
583 - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
584 - fi
585 -
586 - if use doc; then
587 - # Manual, FAQ
588 - dodoc docs/gnuplot.pdf FAQ.pdf
589 - # Documentation for making PostScript files
590 - docinto psdoc
591 - dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
592 - fi
593 -}
594 -
595 -src_test() {
596 - emake check GNUTERM="dumb"
597 -}
598 -
599 -pkg_postinst() {
600 - use latex && texmf-update
601 - readme.gentoo_print_elog
602 -}
603 -
604 -pkg_postrm() {
605 - use latex && texmf-update
606 -}
607
608 diff --git a/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
609 deleted file mode 100644
610 index a05cfa6234c..00000000000
611 --- a/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
612 +++ /dev/null
613 @@ -1,206 +0,0 @@
614 -# Copyright 1999-2020 Gentoo Authors
615 -# Distributed under the terms of the GNU General Public License v2
616 -
617 -EAPI=7
618 -
619 -inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
620 -
621 -DESCRIPTION="Command-line driven interactive plotting program"
622 -HOMEPAGE="http://www.gnuplot.info/"
623 -
624 -if [[ -z ${PV%%*9999} ]]; then
625 - inherit git-r3
626 - EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
627 - EGIT_BRANCH="master"
628 - MY_P="${PN}"
629 - EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
630 -else
631 - MY_P="${P/_/.}"
632 - SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
633 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
634 -fi
635 -
636 -S="${WORKDIR}/${MY_P}"
637 -
638 -LICENSE="gnuplot"
639 -SLOT="0"
640 -IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
641 -
642 -RDEPEND="
643 - cairo? (
644 - x11-libs/cairo
645 - x11-libs/pango )
646 - gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
647 - ggi? ( media-libs/libggi )
648 - latex? (
649 - virtual/latex-base
650 - lua? (
651 - dev-tex/pgf
652 - >=dev-texlive/texlive-latexrecommended-2008-r2 ) )
653 - libcaca? ( media-libs/libcaca )
654 - lua? ( dev-lang/lua:0 )
655 - qt5? (
656 - dev-qt/qtcore:5=
657 - dev-qt/qtgui:5=
658 - dev-qt/qtnetwork:5=
659 - dev-qt/qtprintsupport:5=
660 - dev-qt/qtsvg:5=
661 - dev-qt/qtwidgets:5= )
662 - readline? ( sys-libs/readline:0= )
663 - libcerf? ( sci-libs/libcerf )
664 - wxwidgets? (
665 - x11-libs/wxGTK:3.0-gtk3[X]
666 - x11-libs/cairo
667 - x11-libs/pango
668 - x11-libs/gtk+:3 )
669 - X? ( x11-libs/libXaw )"
670 -
671 -DEPEND="${RDEPEND}"
672 -
673 -BDEPEND="
674 - virtual/pkgconfig
675 - doc? (
676 - virtual/latex-base
677 - dev-texlive/texlive-latexextra
678 - dev-texlive/texlive-langgreek
679 - app-text/ghostscript-gpl )
680 - qt5? ( dev-qt/linguist-tools:5 )"
681 -
682 -GP_VERSION="${PV%.*}"
683 -E_SITEFILE="lisp/50${PN}-gentoo.el"
684 -TEXMF="${EPREFIX}/usr/share/texmf-site"
685 -
686 -PATCHES=(
687 - "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
688 - "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
689 - "${FILESDIR}"/${P}-pkg-config.patch
690 - "${FILESDIR}"/${P}-no-mouse.patch
691 - "${FILESDIR}"/${P}-caca.patch
692 -)
693 -
694 -src_prepare() {
695 - default
696 -
697 - if [[ ${PV##*.} = 9999 ]]; then
698 - local dir
699 - for dir in config demo m4 term tutorial; do
700 - emake -C "$dir" -f Makefile.am.in Makefile.am
701 - done
702 - fi
703 -
704 - # Add special version identification as required by provision 2
705 - # of the gnuplot license
706 - sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
707 -
708 - eautoreconf
709 -
710 - # Make sure we don't mix build & host flags.
711 - sed -i \
712 - -e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
713 - -e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
714 - -e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
715 - -e 's:@CC@:$(CC_FOR_BUILD):' \
716 - docs/Makefile.in || die
717 -}
718 -
719 -src_configure() {
720 - if ! use latex; then
721 - sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
722 - fi
723 -
724 - if use wxwidgets; then
725 - WX_GTK_VER="3.0-gtk3"
726 - setup-wxwidgets
727 - fi
728 -
729 - tc-export CC CXX #453174
730 - tc-export_build_env BUILD_CC
731 - export CC_FOR_BUILD=${BUILD_CC}
732 -
733 - use qt5 && append-cxxflags -std=c++11
734 -
735 - econf \
736 - --with-texdir="${TEXMF}/tex/latex/${PN}" \
737 - --with-readline=$(usex readline gnu builtin) \
738 - $(use_with bitmap bitmap-terminals) \
739 - $(use_with cairo) \
740 - $(use_with gd) \
741 - "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
742 - "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
743 - $(use_with libcerf) \
744 - $(use_with lua) \
745 - $(use_with regis) \
746 - $(use_with X x) \
747 - --enable-stats \
748 - $(use_with qt5 qt qt5) \
749 - $(use_enable wxwidgets) \
750 - DIST_CONTACT="https://bugs.gentoo.org/" \
751 - EMACS=no
752 -}
753 -
754 -src_compile() {
755 - # Prevent access violations, see bug 201871
756 - export VARTEXFONTS="${T}/fonts"
757 -
758 - emake all
759 -
760 - if use doc; then
761 - # Avoid sandbox violation in epstopdf/ghostscript
762 - addpredict /var/cache/fontconfig
763 - if use cairo; then
764 - emake -C docs pdf
765 - else
766 - ewarn "Cannot build figures unless cairo is enabled."
767 - ewarn "Building documentation without figures."
768 - emake -C docs pdf_nofig
769 - mv docs/nofigures.pdf docs/gnuplot.pdf || die
770 - fi
771 - fi
772 -}
773 -
774 -src_install() {
775 - emake DESTDIR="${D}" install
776 -
777 - dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
778 - newdoc term/PostScript/README README-ps
779 - newdoc term/js/README README-js
780 - use lua && newdoc term/lua/README README-lua
781 -
782 - local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
783 - use the "pdfcairo" terminal for PDF output.'
784 - use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
785 - use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
786 - you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
787 - environment variables. See the FAQ file in /usr/share/doc/${PF}/
788 - for more information."
789 - readme.gentoo_create_doc
790 -
791 - if use examples; then
792 - # Demo files
793 - insinto /usr/share/${PN}/${GP_VERSION}
794 - doins -r demo
795 - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
796 - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
797 - fi
798 -
799 - if use doc; then
800 - # Manual, FAQ
801 - dodoc docs/gnuplot.pdf FAQ.pdf
802 - # Documentation for making PostScript files
803 - docinto psdoc
804 - dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
805 - fi
806 -}
807 -
808 -src_test() {
809 - emake check GNUTERM="dumb"
810 -}
811 -
812 -pkg_postinst() {
813 - use latex && texmf-update
814 - readme.gentoo_print_elog
815 -}
816 -
817 -pkg_postrm() {
818 - use latex && texmf-update
819 -}