[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/

2023-10-09 Thread Ulrich Müller 
commit: fbb42d862a08de57da2ed67b7b6fb6661ad706f5
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Oct  9 19:28:27 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Oct  9 19:30:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbb42d86

sci-visualization/gnuplot: Fix unbalanced braces in C source

Closes: https://bugs.gentoo.org/915492
Signed-off-by: Ulrich Müller  gentoo.org>

 .../gnuplot/files/gnuplot-5.4.9-unbal-braces.patch | 31 ++
 sci-visualization/gnuplot/gnuplot-5.4.9.ebuild |  1 +
 2 files changed, 32 insertions(+)

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.9-unbal-braces.patch 
b/sci-visualization/gnuplot/files/gnuplot-5.4.9-unbal-braces.patch
new file mode 100644
index ..3261f60e61c1
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.9-unbal-braces.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/915492
+Patch from upstream branch-5-4-stable branch
+
+commit b5b668ca442e0d7399e2b432fe5fe5fb4c48a1a2
+Author: Peter Korsgaard 
+Date:   Sun Oct 1 10:20:31 2023 +0200
+
+term/post.trm: unbreak !HAVE_DEFLATE_ENCODER builds
+
+--- a/term/post.trm
 b/term/post.trm
+@@ -4000,17 +4000,16 @@ PS_image (unsigned int M, unsigned int N, coordval 
*image, gpiPoint *corner, t_i
+   cscale = 1.0;
+ 
+ #ifdef HAVE_DEFLATE_ENCODER
+-if (ps_params->level3) {
++if (ps_params->level3)
+   encoded_image = (void *)PS_encode_png_image(M, N, image, color_mode,
+   bits_per_component, max_colors, 
cscale,
+   _encoded_bytes);
+-} else {
++else
+ #endif
+   encoded_image = PS_encode_image(M, N, image, color_mode,
+   bits_per_component, max_colors, cscale,
+   (ps_params->level1 ? PS_ASCII_HEX : 
PS_ASCII85),
+   _encoded_bytes);
+-}
+ 
+ 
+ fputs("BeginImage\n", gppsfile);

diff --git a/sci-visualization/gnuplot/gnuplot-5.4.9.ebuild 
b/sci-visualization/gnuplot/gnuplot-5.4.9.ebuild
index 7a6239265ec3..f1d6a09bdf07 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.9.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.9.ebuild
@@ -80,6 +80,7 @@ TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 PATCHES=(
"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+   "${FILESDIR}"/${PN}-5.4.9-unbal-braces.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/

2023-05-29 Thread Ulrich Müller 
commit: a5ffd232dbe9f3aae4809f8d71355a97a65c2680
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon May 29 16:55:13 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon May 29 16:55:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ffd232

sci-visualization/gnuplot: Update live ebuild

Update picins removal patch. Drop ggi USE flag, following upstream.

Signed-off-by: Ulrich Müller  gentoo.org>

 .../gnuplot/files/gnuplot-5.5-no-picins.patch  | 18 --
 .../gnuplot/files/gnuplot-6.1-no-picins.patch  | 18 ++
 ...plot-5.5.-r1.ebuild => gnuplot-6.1..ebuild} | 12 +---
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch 
b/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch
deleted file mode 100644
index b27b0bd941bd..
--- a/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Do not require picins.sty.
-https://bugs.gentoo.org/577828#c4
-
 gnuplot/docs/Makefile.am
-+++ gnuplot/docs/Makefile.am
-@@ -179,9 +179,10 @@
-   $(AM_V_at)GNUPLOT_LIB=$(top_srcdir)/demo $(GNUPLOT_EXE) 
$(srcdir)/plotstyles.gnu
- rm -f gpinsetfigure.tex ; \
- ( echo "\usepackage{graphicx}" > gpinsetfigure.tex ; \
--  echo "\usepackage{picins}" >> gpinsetfigure.tex ; \
-   echo "\newcommand{\gpinsetfigure}[1]{" >> gpinsetfigure.tex ; \
--  echo "  
\parpic[r][rt]{\includegraphics[width=3in,keepaspectratio]{#1}}" >> 
gpinsetfigure.tex ; \
-+  echo "  \begin{figure}[htb]" >> gpinsetfigure.tex ; \
-+  echo "  \centering\includegraphics[width=3in,keepaspectratio]{#1}" 
>> gpinsetfigure.tex ; \
-+  echo "  \end{figure}" >> gpinsetfigure.tex ; \
-   echo "}" >> gpinsetfigure.tex ; \
- ) ; \
-   $(AM_V_GEN)touch $@

diff --git a/sci-visualization/gnuplot/files/gnuplot-6.1-no-picins.patch 
b/sci-visualization/gnuplot/files/gnuplot-6.1-no-picins.patch
new file mode 100644
index ..a0e2c8a429ab
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-6.1-no-picins.patch
@@ -0,0 +1,18 @@
+Do not require picins.sty.
+https://bugs.gentoo.org/577828#c4
+
+--- gnuplot/docs/Makefile.am
 gnuplot/docs/Makefile.am
+@@ -143,9 +143,10 @@
+   $(AM_V_at)GNUPLOT_LIB=$(top_srcdir)/demo $(GNUPLOT_EXE) 
$(srcdir)/plotstyles.gnu
+   rm -f gpinsetfigure.tex
+   printf '%s\n' '\usepackage{graphicx}' \
+-  '\usepackage{picins}' \
+   '\newcommand{\gpinsetfigure}[1]{' \
+-  '  
\parpic[r][rt]{\includegraphics[width=3in,keepaspectratio]{#1}}' \
++  '  \begin{figure}[htb]' \
++  '  \centering\includegraphics[width=3in,keepaspectratio]{#1}' \
++  '  \end{figure}' \
+   '}' > gpinsetfigure.tex
+   $(AM_V_GEN)touch $@
+   $(AM_V_at)touch figurestyle

diff --git a/sci-visualization/gnuplot/gnuplot-5.5.-r1.ebuild 
b/sci-visualization/gnuplot/gnuplot-6.1..ebuild
similarity index 91%
rename from sci-visualization/gnuplot/gnuplot-5.5.-r1.ebuild
rename to sci-visualization/gnuplot/gnuplot-6.1..ebuild
index 3e5902c5070b..94b71cafa1fa 100644
--- a/sci-visualization/gnuplot/gnuplot-5.5.-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-6.1..ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 LUA_COMPAT=( lua5-{1,2,3,4} )
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-gtk3"
 
 inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
 
@@ -20,14 +20,14 @@ if [[ -z ${PV%%*} ]]; then
 else
MY_P="${P/_/.}"
SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="gnuplot"
 SLOT="0"
-IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 
readline regis wxwidgets X"
+IUSE="aqua bitmap cairo doc examples +gd latex libcaca libcerf lua qt5 
readline regis wxwidgets X"
 REQUIRED_USE="
doc? ( gd )
lua? ( ${LUA_REQUIRED_USE} )"
@@ -37,7 +37,6 @@ RDEPEND="
x11-libs/cairo
x11-libs/pango )
gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
-   ggi? ( media-libs/libggi )
latex? (
virtual/latex-base
lua? (
@@ -79,7 +78,7 @@ GP_VERSION="${PV%.*}"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-5.5-no-picins.patch
+   "${FILESDIR}"/${PN}-6.1-no-picins.patch
 )
 
 pkg_setup() {
@@

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/

2021-10-18 Thread Ulrich Müller 
commit: a9bb1eef13332098b181a6b57cd60b695173d163
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Oct 18 09:00:28 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Oct 18 09:00:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9bb1eef

sci-visualization/gnuplot: Fix test failure on arm

Closes: https://bugs.gentoo.org/811927
Bug: https://sourceforge.net/p/gnuplot/bugs/2467/
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 .../gnuplot/files/gnuplot-5.4.2-signed-char.patch  | 27 ++
 ...nuplot-5.4.2.ebuild => gnuplot-5.4.2-r1.ebuild} |  1 +
 2 files changed, 28 insertions(+)

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch 
b/sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch
new file mode 100644
index 000..091dbbc88d8
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch
@@ -0,0 +1,27 @@
+char defaults to unsigned on ARM, causing a test failure.
+Patch from upstream.
+https://bugs.gentoo.org/811927
+https://sourceforge.net/p/gnuplot/bugs/2467/
+
+--- a/src/marching_cubes.h
 b/src/marching_cubes.h
+@@ -58,7 +58,7 @@ static const short cube_edge_flags[256]=
+  First official public domain release
+   Version 3.00 dated 8-6-94
+  */
+-static char triangle_table[256][13]=
++static signed char triangle_table[256][13]=
+ {
+ {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
+ { 8, 3, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
+--- a/src/qt_table.h
 b/src/qt_table.h
+@@ -10,7 +10,7 @@
+  * collapsed them into quadrangles.
+  * So there is room for improvement in this table.
+  */ 
+-static char qt_table[256][13] = 
++static signed char qt_table[256][13] = 
+ {
+ {  -1, -1, -1, -1,  -1, -1, -1, -1,  -1, -1, -1, -1,  -1},
+ {   8,  3,  0, -1,  -1, -1, -1, -1,  -1, -1, -1, -1,  -1},

diff --git a/sci-visualization/gnuplot/gnuplot-5.4.2.ebuild 
b/sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild
similarity index 99%
rename from sci-visualization/gnuplot/gnuplot-5.4.2.ebuild
rename to sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild
index fb9b802f333..bc1482bf104 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild
@@ -80,6 +80,7 @@ TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 PATCHES=(
"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+   "${FILESDIR}"/${P}-signed-char.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/

2021-09-07 Thread Ulrich Müller 
commit: 375d59b9b0bb8d8857c04888e620273278c23008
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Sep  7 06:46:38 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Sep  7 06:46:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=375d59b9

sci-visualization/gnuplot: Remove stale patch file

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 .../gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch  | 17 -
 1 file changed, 17 deletions(-)

diff --git 
a/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch 
b/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch
deleted file mode 100644
index c39bc828f26..000
--- a/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Add missing linkage against X11 libs.
-Author: Anton Gladky 
-Last-Update: 2015-06-16
-
-Index: gnuplot-5.0.1/src/Makefile.am
-===
 gnuplot-5.0.1.orig/src/Makefile.am
-+++ gnuplot-5.0.1/src/Makefile.am
-@@ -89,6 +89,8 @@ $(EXTRA_gnuplot_SOURCES)
- 
- if BUILD_WXWIDGETS
- gnuplot_SOURCES += wxterminal/wxt_gui.cpp
-+XLIBS = @LIBRARIES_FOR_X@
-+gnuplot_LDADD += $(XLIBS)
- endif
- 
- if BUILD_GPCAIRO

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/

2021-08-03 Thread Ulrich Müller 
commit: a90ece3571d05bea373445881972f7c2b9f1ab79
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Aug  3 06:04:20 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Aug  3 06:04:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a90ece35

sci-visualization/gnuplot: Update live ebuild to EAPI 8 and fix patch

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 .../gnuplot/files/gnuplot-5.5-no-picins.patch  | 18 ++
 sci-visualization/gnuplot/gnuplot-5.5.-r1.ebuild   | 10 +-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch 
b/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch
new file mode 100644
index 000..b27b0bd941b
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch
@@ -0,0 +1,18 @@
+Do not require picins.sty.
+https://bugs.gentoo.org/577828#c4
+
+--- gnuplot/docs/Makefile.am
 gnuplot/docs/Makefile.am
+@@ -179,9 +179,10 @@
+   $(AM_V_at)GNUPLOT_LIB=$(top_srcdir)/demo $(GNUPLOT_EXE) 
$(srcdir)/plotstyles.gnu
+ rm -f gpinsetfigure.tex ; \
+ ( echo "\usepackage{graphicx}" > gpinsetfigure.tex ; \
+-  echo "\usepackage{picins}" >> gpinsetfigure.tex ; \
+   echo "\newcommand{\gpinsetfigure}[1]{" >> gpinsetfigure.tex ; \
+-  echo "  
\parpic[r][rt]{\includegraphics[width=3in,keepaspectratio]{#1}}" >> 
gpinsetfigure.tex ; \
++  echo "  \begin{figure}[htb]" >> gpinsetfigure.tex ; \
++  echo "  \centering\includegraphics[width=3in,keepaspectratio]{#1}" 
>> gpinsetfigure.tex ; \
++  echo "  \end{figure}" >> gpinsetfigure.tex ; \
+   echo "}" >> gpinsetfigure.tex ; \
+ ) ; \
+   $(AM_V_GEN)touch $@

diff --git a/sci-visualization/gnuplot/gnuplot-5.5.-r1.ebuild 
b/sci-visualization/gnuplot/gnuplot-5.5.-r1.ebuild
index 306871a94a9..bb22478f1dc 100644
--- a/sci-visualization/gnuplot/gnuplot-5.5.-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.5.-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-LUA_COMPAT=( lua5-{1,2,3} )
+LUA_COMPAT=( lua5-{1,2,3,4} )
 WX_GTK_VER="3.0-gtk3"
 
 inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs 
wxwidgets
@@ -70,13 +70,13 @@ BDEPEND="
app-text/ghostscript-gpl )
qt5? ( dev-qt/linguist-tools:5 )"
 
+IDEPEND="latex? ( virtual/latex-base )"
+
 GP_VERSION="${PV%.*}"
-E_SITEFILE="lisp/50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
-   "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+   "${FILESDIR}"/${PN}-5.5-no-picins.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/

2020-12-23 Thread Ulrich Müller 
commit: fdf3652cd3166e4c6770ca87f89343ee7f16fc2f
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Dec 23 11:09:25 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Dec 23 11:09:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf3652c

sci-visualization/gnuplot: Remove old.

Bug: https://bugs.gentoo.org/746419
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 sci-visualization/gnuplot/Manifest |   1 -
 .../gnuplot/files/gnuplot-5.4.0-caca.patch |  46 -
 .../gnuplot/files/gnuplot-5.4.0-no-mouse.patch |  27 ---
 .../gnuplot/files/gnuplot-5.4.0-pkg-config.patch   |  40 
 sci-visualization/gnuplot/gnuplot-5.2.8.ebuild | 215 -
 .../gnuplot/gnuplot-5.4.0-r100.ebuild  | 213 
 sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild  | 206 
 7 files changed, 748 deletions(-)

diff --git a/sci-visualization/gnuplot/Manifest 
b/sci-visualization/gnuplot/Manifest
index a76b0f41f3c..5e56dc1dc99 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,3 +1,2 @@
 DIST gnuplot-5.2.8.tar.gz 5340677 BLAKE2B 
169f5bef44a64b3b7a5be40e28ea22ef24ebc7526fe13ab09e16495453c3922712603d63a03c3b4332368d2ae8cbe4ef57ec53e18bbb4ad2cde13e4cc534245a
 SHA512 
513dff15236dcb58c3c5471cdaa0713242787dbf30ef860c3f69152cb87c6392e4973caff5eb178707bbb84c78548e806b2920864a37686bce49425fbfdc4e8c
-DIST gnuplot-5.4.0.tar.gz 5622595 BLAKE2B 
e42011fa49ba0440436a406737f03ad55359b337dce359c62c1b4f536f70ca07126cf04e3e0eef6e4b22340dfb0318f6890d7814ad55b38d60ee24a4bc570ca1
 SHA512 
abbb69ded9eed3a1e53caeeb7d75ee4e3532b1254640a3f38f00260e261e75f87744e3df4210b0db7c8c2acee9b25147524d5377b3f4305e2449b2e99ca58d66
 DIST gnuplot-5.4.1.tar.gz 5608076 BLAKE2B 
7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d
 SHA512 
2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.0-caca.patch 
b/sci-visualization/gnuplot/files/gnuplot-5.4.0-caca.patch
deleted file mode 100644
index f92ac93ab01..000
--- a/sci-visualization/gnuplot/files/gnuplot-5.4.0-caca.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From f76d96206a7251d62dbbd3879bf0ad6dfe1ec486 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ulrich=20M=C3=BCller?= 
-Date: Sat, 7 Nov 2020 11:25:07 -0800
-Subject: [PATCH] Allow to build --with-caca but without mouse support
-
-EAM: slightly modified fix
-Bug #2351

- term/caca.trm | 9 +++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/term/caca.trm b/term/caca.trm
-index cf7c0d7c6..58606e2d8 100644
 a/term/caca.trm
-+++ b/term/caca.trm
-@@ -1913,8 +1913,11 @@ CACA_process_events(void)
-   CACA_result loop = CACA_loop;
-   caca_event_t ev;
-   const int event_mask =
--  CACA_EVENT_KEY_PRESS | CACA_EVENT_RESIZE |  CACA_EVENT_QUIT |
--  CACA_EVENT_MOUSE_MOTION | CACA_EVENT_MOUSE_PRESS | 
CACA_EVENT_MOUSE_RELEASE;
-+  CACA_EVENT_KEY_PRESS | CACA_EVENT_RESIZE |  CACA_EVENT_QUIT
-+#ifdef USE_MOUSE
-+  | CACA_EVENT_MOUSE_MOTION | CACA_EVENT_MOUSE_PRESS | 
CACA_EVENT_MOUSE_RELEASE
-+#endif
-+  ;
-   static int mx = 0, my = 0; /* current mouse position */
-   static unsigned long last_event_time = 0;
- 
-@@ -2579,11 +2582,13 @@ CACA_modify_plots(unsigned int operations, int plotno)
-   }
-   }
- 
-+#ifdef USE_MOUSE
-   if (changed) {
-   /* Replot only if something changed. */
-   CACA_zoom_or_replot = TRUE;
-   exec_event(GE_replot, 0, 0, 0, 0, 0);
-   }
-+#endif
- }
- 
- 
--- 
-2.29.2
-

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
deleted file mode 100644
index 8133c3516ed..000
--- a/sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cfd9ff9408949ee58be9ba5a18b74ce4562f374a Mon Sep 17 00:00:00 2001
-From: Ethan A Merritt 
-Date: Fri, 6 Nov 2020 13:06:21 -0800
-Subject: [PATCH] make sure warning message about no mouse support is non-fatal
-
-Bug #2350

- src/set.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/set.c b/src/set.c
-index a697925bc..a6acf8fc6 100644
 a/src/set.c
-+++ b/src/set.c
-@@ -3130,7 +3130,8 @@ set_mouse()
- PM_update_menu_items();
- #endif
- #else /* USE_MOUSE */
--c_token++;
-+while (!END_OF_COMMAND)
-+  c_token++;
- int_warn(NO_CARET, "this copy of gnuplot has no mouse support");
- #endif /* USE_MOUSE */
- }
--- 
-2.29.2
-

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/

2020-11-06 Thread Ulrich Müller 
commit: 1b848fb4b8210856956b26752c71762d833e2a7b
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Nov  7 04:05:36 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Nov  7 04:07:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b848fb4

sci-visualization/gnuplot: Fix test failure.

Patch from upstream.

Closes: https://bugs.gentoo.org/753314
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 .../gnuplot/files/gnuplot-5.4.0-no-mouse.patch | 27 ++
 .../gnuplot/gnuplot-5.4.0-r100.ebuild  |  6 ++---
 ...lot-5.4.0-r1.ebuild => gnuplot-5.4.0-r2.ebuild} |  6 ++---
 sci-visualization/gnuplot/gnuplot-5.5..ebuild  |  3 +--
 4 files changed, 34 insertions(+), 8 deletions(-)

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
new file mode 100644
index 000..8133c3516ed
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch
@@ -0,0 +1,27 @@
+From cfd9ff9408949ee58be9ba5a18b74ce4562f374a Mon Sep 17 00:00:00 2001
+From: Ethan A Merritt 
+Date: Fri, 6 Nov 2020 13:06:21 -0800
+Subject: [PATCH] make sure warning message about no mouse support is non-fatal
+
+Bug #2350
+---
+ src/set.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/set.c b/src/set.c
+index a697925bc..a6acf8fc6 100644
+--- a/src/set.c
 b/src/set.c
+@@ -3130,7 +3130,8 @@ set_mouse()
+ PM_update_menu_items();
+ #endif
+ #else /* USE_MOUSE */
+-c_token++;
++while (!END_OF_COMMAND)
++  c_token++;
+ int_warn(NO_CARET, "this copy of gnuplot has no mouse support");
+ #endif /* USE_MOUSE */
+ }
+-- 
+2.29.2
+

diff --git a/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild 
b/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
index 3b108facf8b..0e0cdd80bfb 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
@@ -76,7 +76,8 @@ TEXMF="${EPREFIX}/usr/share/texmf-site"
 PATCHES=(
"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
-   "${FILESDIR}"/${PN}-5.4.0-pkg-config.patch
+   "${FILESDIR}"/${P}-pkg-config.patch
+   "${FILESDIR}"/${P}-no-mouse.patch
 )
 
 pkg_setup() {
@@ -198,8 +199,7 @@ src_install() {
 }
 
 src_test() {
-   #GNUTERM="unknown" emake check   # spiderplot and isosurface tests fail
-   GNUTERM="dumb" emake check
+   emake check GNUTERM="dumb"
 }
 
 pkg_postinst() {

diff --git a/sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild 
b/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
similarity index 97%
rename from sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild
rename to sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
index 5b9eabee4ca..c064f8bbff5 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
@@ -73,7 +73,8 @@ TEXMF="${EPREFIX}/usr/share/texmf-site"
 PATCHES=(
"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
-   "${FILESDIR}"/${PN}-5.4.0-pkg-config.patch
+   "${FILESDIR}"/${P}-pkg-config.patch
+   "${FILESDIR}"/${P}-no-mouse.patch
 )
 
 src_prepare() {
@@ -191,8 +192,7 @@ src_install() {
 }
 
 src_test() {
-   #GNUTERM="unknown" emake check   # spiderplot and isosurface tests fail
-   GNUTERM="dumb" emake check
+   emake check GNUTERM="dumb"
 }
 
 pkg_postinst() {

diff --git a/sci-visualization/gnuplot/gnuplot-5.5..ebuild 
b/sci-visualization/gnuplot/gnuplot-5.5..ebuild
index 697da1fe767..0b2af9540d4 100644
--- a/sci-visualization/gnuplot/gnuplot-5.5..ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.5..ebuild
@@ -190,8 +190,7 @@ src_install() {
 }
 
 src_test() {
-   #GNUTERM="unknown" emake check   # spiderplot and isosurface tests fail
-   GNUTERM="dumb" emake check
+   emake check GNUTERM="dumb"
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/

2020-11-06 Thread Ulrich Müller 
commit: 194a3e61996a67c6cd359dc53bd78598584ab065
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Nov  6 12:48:10 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Nov  6 12:57:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=194a3e61

sci-visualization/gnuplot: Fix pkg-config call in configure.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 .../gnuplot/files/gnuplot-5.4.0-pkg-config.patch   | 40 ++
 ...nuplot-5.4.0.ebuild => gnuplot-5.4.0-r1.ebuild} |  1 +
 2 files changed, 41 insertions(+)

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
new file mode 100644
index 000..aa98f27dc2b
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch
@@ -0,0 +1,40 @@
+From 87034e509b366078b746a3a70e05aaf497e34585 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ulrich=20M=C3=BCller?= 
+Date: Fri, 6 Nov 2020 13:25:02 +0100
+Subject: [PATCH] configure.ac: move PKG_PROG_PKG_CONFIG to the beginning of
+ the file
+
+Bug #2349
+---
+ configure.ac | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67ad1396c..606242ea3 100644
+--- a/configure.ac
 b/configure.ac
+@@ -88,6 +88,10 @@ AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct 
tm.__tm_gmtoff],,,[
+ #include 
+ #include ])
+ 
++dnl explicit call to PKG_PROG_PKG_CONFIG because the first call to
++dnl PKG_CHECK_MODULES{,_NOFAIL} may not happen
++PKG_PROG_PKG_CONFIG
++
+ AC_ARG_WITH(libcerf,dnl
+ [  --without-libcerf   build without special functions from libcerf 
(default enabled)],,
+   [test -z "${with_libcerf}" && with_libcerf=yes])
+@@ -759,10 +763,6 @@ AC_ARG_ENABLE(raise-console,dnl
+   fi
+ 
+ 
+-dnl explicit call to PKG_PROG_PKG_CONFIG because the first call to
+-dnl PKG_CHECK_MODULES may not happen
+-PKG_PROG_PKG_CONFIG
+-
+ dnl  wxWidgets terminal
+ 
+ dnl wxWidgets terminal needs C++
+-- 
+2.29.2
+

diff --git a/sci-visualization/gnuplot/gnuplot-5.4.0.ebuild 
b/sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild
similarity index 99%
rename from sci-visualization/gnuplot/gnuplot-5.4.0.ebuild
rename to sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild
index a4baae2bd98..5b9eabee4ca 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.0.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild
@@ -73,6 +73,7 @@ TEXMF="${EPREFIX}/usr/share/texmf-site"
 PATCHES=(
"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+   "${FILESDIR}"/${PN}-5.4.0-pkg-config.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/

2019-07-23 Thread Ulrich Müller 
commit: f799bef8d9836659126a079ed99e5510d1f08707
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jul 23 07:17:27 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jul 23 07:18:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f799bef8

sci-visualization/gnuplot: Fix compilation with USE=caca.

Closes: https://bugs.gentoo.org/690014
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Ulrich Müller  gentoo.org>

 sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch | 13 +
 sci-visualization/gnuplot/gnuplot-5.2.6.ebuild   |  1 +
 sci-visualization/gnuplot/gnuplot-5.2.7.ebuild   |  1 +
 3 files changed, 15 insertions(+)

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch 
b/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch
new file mode 100644
index 000..4441e4b8c03
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/690014
+https://sourceforge.net/p/gnuplot/mailman/message/34342174/
+
+--- gnuplot-5.2.6-orig/configure.ac
 gnuplot-5.2.6/configure.ac
+@@ -1224,6 +1224,7 @@
+ if test "${enable_qt_ok}" = yes \
+   || test "${enable_wxwidgets_ok}" = yes \
+   || test "$GGI_SUPPORT" = yes \
++  || test "$with_caca" = yes \
+   || test "$no_x" != yes; then
+ enable_mouse=yes;
+ fi

diff --git a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild 
b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
index fbf26430056..6ee94c17ade 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
@@ -70,6 +70,7 @@ src_prepare() {
eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
eapply "${FILESDIR}"/${PN}-5.2.2-regis.patch
+   eapply "${FILESDIR}"/${PN}-5.2.6-caca.patch
eapply_user
 
if [[ -z ${PV%%*} ]]; then

diff --git a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild 
b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
index 4ea9c17d144..9ac0df288a5 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
@@ -70,6 +70,7 @@ src_prepare() {
eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
eapply "${FILESDIR}"/${PN}-5.2.2-regis.patch
+   eapply "${FILESDIR}"/${PN}-5.2.6-caca.patch
eapply_user
 
if [[ -z ${PV%%*} ]]; then

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/

2018-01-12 Thread Ulrich Müller 
commit: d16bf2294acc3e5d523da4a4c0544ae7a02d4558
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Jan 12 08:35:46 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Jan 12 08:36:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16bf229

sci-visualization/gnuplot: New regis USE flag to enable ReGIS terminal.

Closes: https://bugs.gentoo.org/643888
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../gnuplot/files/gnuplot-5.2.2-regis.patch| 43 ++
 sci-visualization/gnuplot/gnuplot-5.2.2.ebuild |  6 ++-
 sci-visualization/gnuplot/metadata.xml |  1 +
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch 
b/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch
new file mode 100644
index 000..613a028ee79
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch
@@ -0,0 +1,43 @@
+Add configure option for ReGIS support.
+https://bugs.gentoo.org/643888
+
+--- gnuplot-5.2.2-orig/configure.ac
 gnuplot-5.2.2/configure.ac
+@@ -1057,6 +1057,13 @@
+   AC_DEFINE(HAVE_MIF,1,
+   [ Define to include support for mif terminal ],))
+ 
++dnl ReGIS terminal
++AC_ARG_WITH(regis,dnl
++[  --with-regisReGIS terminal])
++AS_IF([test "x${with_regis}" = "xyes"],
++  AC_DEFINE(HAVE_REGIS,1,
++  [ Define to include support for ReGIS terminal ],))
++
+ AC_ARG_WITH(cairo,dnl
+ [  --without-cairo cairo-based terminals (default enabled)],,
+   [test -z "${with_cairo}" && with_cairo=yes])
+@@ -1350,6 +1357,12 @@
+   AC_MSG_RESULT([  mif terminal: no   (use --with-mif to enable)])
+ fi
+ 
++if test "$with_regis" = yes; then
++  AC_MSG_RESULT([  ReGIS terminal: yes])
++else
++  AC_MSG_RESULT([  ReGIS terminal: no (use --with-regis to enable)])
++fi
++
+ if test "$is_msdos" = yes; then
+   AC_MSG_RESULT([  svga terminal (MSDOS/djgpp): yes])
+ fi
+--- gnuplot-5.2.2-orig/src/term.h
 gnuplot-5.2.2/src/term.h
+@@ -182,7 +182,7 @@
+ #endif
+ 
+ /* REGIS graphics language */
+-#ifdef VMS
++#if defined(VMS) || defined(HAVE_REGIS)
+ # include "regis.trm"
+ #endif
+ 

diff --git a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild 
b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
index 9948859c483..ee0a6fd1657 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
 SLOT="0"
-IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua 
qt5 readline svga wxwidgets X"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua 
qt5 readline regis svga wxwidgets X"
 
 RDEPEND="
cairo? (
@@ -73,6 +73,7 @@ TEXMF="${EPREFIX}/usr/share/texmf-site"
 src_prepare() {
eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+   eapply "${FILESDIR}"/${PN}-5.2.2-regis.patch
eapply_user
 
if [[ -z ${PV%%*} ]]; then
@@ -138,6 +139,7 @@ src_configure() {
"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
$(use_with libcerf) \
$(use_with lua) \
+   $(use_with regis) \
$(use_with svga linux-vga) \
$(use_with X x) \
--enable-stats \

diff --git a/sci-visualization/gnuplot/metadata.xml 
b/sci-visualization/gnuplot/metadata.xml
index 8700ea95739..6442566e482 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -27,6 +27,7 @@
   Enable special functions from
 sci-libs/libcerf
   Enable dot-matrix printers and pbm terminal
+  Enable ReGIS terminal
 
 
   gnuplot

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/

2017-11-19 Thread Ulrich Müller 
commit: 87d20a9ab246fda845fad3456e412a8b32fc8895
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Nov 19 11:18:34 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Nov 19 11:46:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d20a9a

sci-visualization/gnuplot: Fix building with USE="doc".

- Do not require picins.sty.
- Build documentation without figures if cairo is disabled.

Closes: https://bugs.gentoo.org/577828
Package-Manager: Portage-2.3.14, Repoman-2.3.6

 .../gnuplot/files/gnuplot-5.0.6-no-picins.patch| 27 ++
 sci-visualization/gnuplot/gnuplot-5.0.6.ebuild | 15 
 sci-visualization/gnuplot/gnuplot-5.0..ebuild  | 15 
 3 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.0.6-no-picins.patch 
b/sci-visualization/gnuplot/files/gnuplot-5.0.6-no-picins.patch
new file mode 100644
index 000..87408aebd44
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.0.6-no-picins.patch
@@ -0,0 +1,27 @@
+Do not require picins.sty.
+https://bugs.gentoo.org/577828#c4
+
+--- gnuplot-5.0.6-orig/docs/Makefile.am
 gnuplot-5.0.6/docs/Makefile.am
+@@ -189,7 +189,6 @@
+ touch figures.idx ; \
+ rm -f pdffigures.tex ; \
+ ( echo "\usepackage{graphicx}" > pdffigures.tex ; \
+-  echo "\usepackage{picins}" >> pdffigures.tex ; \
+ ) ; \
+ TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
+ TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
+--- gnuplot-5.0.6-orig/docs/doc2tex.c
 gnuplot-5.0.6/docs/doc2tex.c
+@@ -170,9 +170,9 @@
+ case 'F': /* embedded figure */
+   if (figures) {
+   line[strlen(line)-1]=NUL;
+-  (void) 
fputs("\\parpic[r][rt]{\\includegraphics[width=3in,keepaspectratio]{",b);
++  (void) 
fputs("\\begin{figure}[htb]\n\\centering\\includegraphics[width=3in,keepaspectratio]{",b);
+   fputs(line+1, b);
+-  (void) fputs("}}\n",b);
++  (void) fputs("}\n\\end{figure}\n",b);
+   }
+   break;
+ 

diff --git a/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild 
b/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild
index cac060cf8d0..2a7de7b82e7 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild
@@ -66,10 +66,10 @@ GP_VERSION="${PV%.*}"
 E_SITEFILE="lisp/50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
-PATCHES=( "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch )
-
 src_prepare() {
-   default
+   eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+   eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+   eapply_user
 
if [[ -z ${PV%%*} ]]; then
local dir
@@ -162,7 +162,14 @@ src_compile() {
if use doc; then
# Avoid sandbox violation in epstopdf/ghostscript
addpredict /var/cache/fontconfig
-   emake -C docs gnuplot.pdf
+   if use cairo; then
+   emake -C docs pdf
+   else
+   ewarn "Cannot build figures unless cairo is enabled."
+   ewarn "Building documentation without figures."
+   emake -C docs pdf_nofig
+   mv docs/nofigures.pdf docs/gnuplot.pdf || die
+   fi
emake -C tutorial pdf
fi
 }

diff --git a/sci-visualization/gnuplot/gnuplot-5.0..ebuild 
b/sci-visualization/gnuplot/gnuplot-5.0..ebuild
index e06fd330630..ef281474464 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0..ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0..ebuild
@@ -66,10 +66,10 @@ GP_VERSION="${PV%.*}"
 E_SITEFILE="lisp/50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
-PATCHES=( "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch )
-
 src_prepare() {
-   default
+   eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+   eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+   eapply_user
 
if [[ -z ${PV%%*} ]]; then
local dir
@@ -162,7 +162,14 @@ src_compile() {
if use doc; then
# Avoid sandbox violation in epstopdf/ghostscript
addpredict /var/cache/fontconfig
-   emake -C docs gnuplot.pdf
+   if use cairo; then
+   emake -C docs pdf
+   else
+   ewarn "Cannot build figures unless cairo is enabled."
+   ewarn "Building documentation without figures."
+   emake -C docs pdf_nofig
+   mv docs/nofigures.pdf docs/gnuplot.pdf || die
+   fi
emake -C tutorial pdf
fi
 }

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/

2017-01-29 Thread David Seifert 
commit: 185c1c00f86fc01fc89af1c0170f5dba1795981c
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sun Jan 29 09:21:42 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 29 20:09:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185c1c00

sci-visualization/gnuplot: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3709

 .../gnuplot/files/gnuplot-4.6.2-gdversion.patch | 21 -
 1 file changed, 21 deletions(-)

diff --git a/sci-visualization/gnuplot/files/gnuplot-4.6.2-gdversion.patch 
b/sci-visualization/gnuplot/files/gnuplot-4.6.2-gdversion.patch
deleted file mode 100644
index a10e1cc..
--- a/sci-visualization/gnuplot/files/gnuplot-4.6.2-gdversion.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Gnuplot supports using fontconfig in gd terminals. There was a bug in
-gd-2.0.35 that prevented this from working; therefore the mechanism
-was disabled by testing the GD version. Gentoo has backported the fix
-to media-libs/gd-2.0.35-r3 so our test can be different.
-
-Patch by Bernardo Costa .
-Gentoo specific, not to be submitted upstream.
-https://bugs.gentoo.org/462996
-https://bugs.gentoo.org/363367
-
 gnuplot-4.6.2-orig/term/gd.trm
-+++ gnuplot-4.6.2/term/gd.trm
-@@ -149,7 +149,7 @@
- /* Before version 2.0.36, the libgd function gdFTUseFontConfig() didn't */
- /* do what we need.  Test for earlier versions and ignore it.   */
- #ifdef GD_MAJOR_VERSION
--#  if (GD_MINOR_VERSION > 0  ||  GD_RELEASE_VERSION > 35)
-+#  if (GD_MINOR_VERSION > 0  ||  GD_RELEASE_VERSION >= 35)
- #define gdUseFontConfig(x) gdFTUseFontConfig(x)
- #  endif
- #endif

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/

2015-12-18 Thread Ulrich Müller 
commit: 7b91a71f1073dea160d30dd851dc929bec90fadd
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Dec 18 13:44:42 2015 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Dec 18 13:52:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b91a71f

sci-visualization/gnuplot: Remove unused patch file.

Package-Manager: portage-2.2.26

 .../gnuplot/files/gnuplot-4.6.3-eldoc.patch  | 16 
 1 file changed, 16 deletions(-)

diff --git a/sci-visualization/gnuplot/files/gnuplot-4.6.3-eldoc.patch 
b/sci-visualization/gnuplot/files/gnuplot-4.6.3-eldoc.patch
deleted file mode 100644
index ad8395e..000
--- a/sci-visualization/gnuplot/files/gnuplot-4.6.3-eldoc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/459172
-
 gnuplot-4.6.3-orig/docs/Makefile.in
-+++ gnuplot-4.6.3/docs/Makefile.in
-@@ -398,9 +398,9 @@
-   @if test "$(EMACS)" != no; then \
-  test "$(top_srcdir)" = "$(top_builddir)" || echo "COPYING 
GNUPLOT.DOC" ; \
-  test "$(top_srcdir)" = "$(top_builddir)" || cp $(srcdir)/gnuplot.doc 
. ; \
-- $(EMACS) -batch -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi ; \
-+ $(EMACS) -batch -q -no-site-file -l $(srcdir)/doc2texi.el -f 
d2t-doc-to-texi ; \
-  echo "Compiling gnuplot-eldoc.el" ; \
-- $(EMACS) -batch --eval='(byte-compile-file "gnuplot-eldoc.el")' ; \
-+ $(EMACS) -batch -q -no-site-file -f batch-byte-compile 
gnuplot-eldoc.el ; \
-   else \
-  echo "No emacs found - cannot create texinfo file" ; \
-   fi