* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/
@ 2017-11-19 11:46 Ulrich Müller
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Müller @ 2017-11-19 11:46 UTC (permalink / raw
To: gentoo-commits
commit: 87d20a9ab246fda845fad3456e412a8b32fc8895
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 11:18:34 2017 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 11:46:15 2017 +0000
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.9999.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 00000000000..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%%*9999} ]]; 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.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
index e06fd330630..ef281474464 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.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%%*9999} ]]; 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
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/
@ 2018-01-12 8:37 Ulrich Müller
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Müller @ 2018-01-12 8:37 UTC (permalink / raw
To: gentoo-commits
commit: d16bf2294acc3e5d523da4a4c0544ae7a02d4558
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 08:35:46 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 08:36:57 2018 +0000
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 00000000000..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-regis ReGIS 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%%*9999} ]]; 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 @@
<flag name="libcerf">Enable special functions from
<pkg>sci-libs/libcerf</pkg></flag>
<flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
+ <flag name="regis">Enable ReGIS terminal</flag>
</use>
<upstream>
<remote-id type="sourceforge">gnuplot</remote-id>
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/
@ 2019-07-23 7:19 Ulrich Müller
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Müller @ 2019-07-23 7:19 UTC (permalink / raw
To: gentoo-commits
commit: f799bef8d9836659126a079ed99e5510d1f08707
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 07:17:27 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 07:18:51 2019 +0000
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 <ulm <AT> 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 00000000000..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%%*9999} ]]; 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%%*9999} ]]; then
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/
@ 2020-11-06 12:57 Ulrich Müller
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Müller @ 2020-11-06 12:57 UTC (permalink / raw
To: gentoo-commits
commit: 194a3e61996a67c6cd359dc53bd78598584ab065
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 6 12:48:10 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 6 12:57:04 2020 +0000
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 <ulm <AT> 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 00000000000..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?= <ulm@gentoo.org>
+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 <sys/types.h>
+ #include <time.h>])
+
++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() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/
@ 2020-11-07 4:07 Ulrich Müller
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Müller @ 2020-11-07 4:07 UTC (permalink / raw
To: gentoo-commits
commit: 1b848fb4b8210856956b26752c71762d833e2a7b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 7 04:05:36 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 7 04:07:45 2020 +0000
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 <ulm <AT> 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.9999.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 00000000000..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 <merritt@u.washington.edu>
+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.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild
index 697da1fe767..0b2af9540d4 100644
--- a/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.5.9999.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() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/
@ 2020-12-23 11:10 Ulrich Müller
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Müller @ 2020-12-23 11:10 UTC (permalink / raw
To: gentoo-commits
commit: fdf3652cd3166e4c6770ca87f89343ee7f16fc2f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 11:09:25 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 11:09:25 2020 +0000
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 <ulm <AT> 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..00000000000
--- 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?= <ulm@gentoo.org>
-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..00000000000
--- 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 <merritt@u.washington.edu>
-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 b/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch
deleted file mode 100644
index aa98f27dc2b..00000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 87034e509b366078b746a3a70e05aaf497e34585 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
-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 <sys/types.h>
- #include <time.h>])
-
-+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.2.8.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
deleted file mode 100644
index b741e27f842..00000000000
--- a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
- EGIT_BRANCH="branch-5-2-stable"
- MY_P="${PN}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
-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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="gnuplot"
-SLOT="0"
-IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis svga wxwidgets X"
-
-RDEPEND="
- cairo? (
- 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? (
- dev-tex/pgf
- >=dev-texlive/texlive-latexrecommended-2008-r2 ) )
- libcaca? ( media-libs/libcaca )
- lua? ( dev-lang/lua:0 )
- qt5? (
- dev-qt/qtcore:5=
- dev-qt/qtgui:5=
- dev-qt/qtnetwork:5=
- dev-qt/qtprintsupport:5=
- dev-qt/qtsvg:5=
- dev-qt/qtwidgets:5= )
- readline? ( sys-libs/readline:0= )
- libcerf? ( sci-libs/libcerf )
- svga? ( media-libs/svgalib )
- wxwidgets? (
- x11-libs/wxGTK:3.0[X]
- x11-libs/cairo
- x11-libs/pango
- x11-libs/gtk+:2 )
- X? ( x11-libs/libXaw )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- virtual/pkgconfig
- doc? (
- virtual/latex-base
- dev-texlive/texlive-latexextra
- app-text/ghostscript-gpl )
- qt5? ( dev-qt/linguist-tools:5 )"
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="lisp/50${PN}-gentoo.el"
-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 "${FILESDIR}"/${PN}-5.2.8-caca.patch
- eapply_user
-
- if [[ -z ${PV%%*9999} ]]; then
- local dir
- for dir in config demo m4 term tutorial; do
- emake -C "$dir" -f Makefile.am.in Makefile.am
- done
- fi
-
- # Add special version identification as required by provision 2
- # of the gnuplot license
- sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
- DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
- for details. You can use the "pdfcairo" terminal for PDF output.'
- use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
- use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
- SVGA console graphics, gnuplot needs to be set up as setuid root.
- Please note that this is usually considered to be a security hazard.
- As root, manually "chmod u+s /usr/bin/gnuplot".'
- use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
- you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
- environment variables. See the FAQ file in /usr/share/doc/${PF}/
- for more information."
-
- eautoreconf
-
- # Make sure we don't mix build & host flags.
- sed -i \
- -e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
- -e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
- -e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
- -e 's:@CC@:$(CC_FOR_BUILD):' \
- docs/Makefile.in || die
-}
-
-src_configure() {
- if ! use latex; then
- sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
- fi
-
- if use wxwidgets; then
- WX_GTK_VER="3.0"
- setup-wxwidgets
- fi
-
- tc-export CC CXX #453174
- tc-export_build_env BUILD_CC
- export CC_FOR_BUILD=${BUILD_CC}
-
- use qt5 && append-cxxflags -std=c++11
-
- econf \
- --with-texdir="${TEXMF}/tex/latex/${PN}" \
- --with-readline=$(usex readline gnu builtin) \
- $(use_with bitmap bitmap-terminals) \
- $(use_with cairo) \
- $(use_enable compat backwards-compatibility) \
- $(use_with doc tutorial) \
- $(use_with gd) \
- "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
- "$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
- "$(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 \
- $(use_with qt5 qt qt5) \
- $(use_enable wxwidgets) \
- DIST_CONTACT="https://bugs.gentoo.org/" \
- EMACS=no
-}
-
-src_compile() {
- # Prevent access violations, see bug 201871
- export VARTEXFONTS="${T}/fonts"
-
- # We believe that the following line is no longer needed.
- # In case of problems file a bug report at bugs.gentoo.org.
- #addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
- emake all
-
- if use doc; then
- # Avoid sandbox violation in epstopdf/ghostscript
- addpredict /var/cache/fontconfig
- if use cairo && use gd; then
- emake -C docs pdf
- else
- ewarn "Cannot build figures unless cairo and gd are 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
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc BUGS ChangeLog NEWS PGPKEYS README* RELEASE_NOTES TODO
- newdoc term/PostScript/README README-ps
- newdoc term/js/README README-js
- use lua && newdoc term/lua/README README-lua
- readme.gentoo_create_doc
-
- if use examples; then
- # Demo files
- insinto /usr/share/${PN}/${GP_VERSION}
- doins -r demo
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
- fi
-
- if use doc; then
- # Manual, tutorial, FAQ
- dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
- # Documentation for making PostScript files
- docinto psdoc
- dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
- fi
-}
-
-src_test() {
- GNUTERM="unknown" default_src_test
-}
-
-pkg_postinst() {
- use latex && texmf-update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- use latex && texmf-update
-}
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
deleted file mode 100644
index 47013ca921d..00000000000
--- a/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,2,3} )
-
-inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
- EGIT_BRANCH="master"
- MY_P="${PN}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
-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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-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"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
- cairo? (
- 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? (
- dev-tex/pgf
- >=dev-texlive/texlive-latexrecommended-2008-r2 ) )
- libcaca? ( media-libs/libcaca )
- lua? ( ${LUA_DEPS} )
- qt5? (
- dev-qt/qtcore:5=
- dev-qt/qtgui:5=
- dev-qt/qtnetwork:5=
- dev-qt/qtprintsupport:5=
- dev-qt/qtsvg:5=
- dev-qt/qtwidgets:5= )
- readline? ( sys-libs/readline:0= )
- libcerf? ( sci-libs/libcerf )
- wxwidgets? (
- x11-libs/wxGTK:3.0-gtk3[X]
- x11-libs/cairo
- x11-libs/pango
- x11-libs/gtk+:3 )
- X? ( x11-libs/libXaw )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- virtual/pkgconfig
- doc? (
- virtual/latex-base
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-langgreek
- app-text/ghostscript-gpl )
- qt5? ( dev-qt/linguist-tools:5 )"
-
-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}"/${P}-pkg-config.patch
- "${FILESDIR}"/${P}-no-mouse.patch
- "${FILESDIR}"/${P}-caca.patch
-)
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
- default
-
- if [[ ${PV##*.} = 9999 ]]; then
- local dir
- for dir in config demo m4 term tutorial; do
- emake -C "$dir" -f Makefile.am.in Makefile.am
- done
- fi
-
- # Add special version identification as required by provision 2
- # of the gnuplot license
- sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
- eautoreconf
-
- # Make sure we don't mix build & host flags.
- sed -i \
- -e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
- -e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
- -e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
- -e 's:@CC@:$(CC_FOR_BUILD):' \
- docs/Makefile.in || die
-}
-
-src_configure() {
- if ! use latex; then
- sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
- fi
-
- if use wxwidgets; then
- WX_GTK_VER="3.0-gtk3"
- setup-wxwidgets
- fi
-
- tc-export CC CXX #453174
- tc-export_build_env BUILD_CC
- export CC_FOR_BUILD=${BUILD_CC}
-
- use qt5 && append-cxxflags -std=c++11
-
- econf \
- --with-texdir="${TEXMF}/tex/latex/${PN}" \
- --with-readline=$(usex readline gnu builtin) \
- $(use_with bitmap bitmap-terminals) \
- $(use_with cairo) \
- $(use_with gd) \
- "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
- "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
- $(use_with libcerf) \
- $(use_with lua) \
- $(use_with regis) \
- $(use_with X x) \
- --enable-stats \
- $(use_with qt5 qt qt5) \
- $(use_enable wxwidgets) \
- DIST_CONTACT="https://bugs.gentoo.org/" \
- EMACS=no
-}
-
-src_compile() {
- # Prevent access violations, see bug 201871
- export VARTEXFONTS="${T}/fonts"
-
- emake all
-
- if use doc; then
- # Avoid sandbox violation in epstopdf/ghostscript
- addpredict /var/cache/fontconfig
- 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
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
- newdoc term/PostScript/README README-ps
- newdoc term/js/README README-js
- use lua && newdoc term/lua/README README-lua
-
- local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
- use the "pdfcairo" terminal for PDF output.'
- use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
- use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
- you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
- environment variables. See the FAQ file in /usr/share/doc/${PF}/
- for more information."
- readme.gentoo_create_doc
-
- if use examples; then
- # Demo files
- insinto /usr/share/${PN}/${GP_VERSION}
- doins -r demo
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
- fi
-
- if use doc; then
- # Manual, FAQ
- dodoc docs/gnuplot.pdf FAQ.pdf
- # Documentation for making PostScript files
- docinto psdoc
- dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
- fi
-}
-
-src_test() {
- emake check GNUTERM="dumb"
-}
-
-pkg_postinst() {
- use latex && texmf-update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- use latex && texmf-update
-}
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
deleted file mode 100644
index a05cfa6234c..00000000000
--- a/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
- EGIT_BRANCH="master"
- MY_P="${PN}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
-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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-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"
-
-RDEPEND="
- cairo? (
- 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? (
- dev-tex/pgf
- >=dev-texlive/texlive-latexrecommended-2008-r2 ) )
- libcaca? ( media-libs/libcaca )
- lua? ( dev-lang/lua:0 )
- qt5? (
- dev-qt/qtcore:5=
- dev-qt/qtgui:5=
- dev-qt/qtnetwork:5=
- dev-qt/qtprintsupport:5=
- dev-qt/qtsvg:5=
- dev-qt/qtwidgets:5= )
- readline? ( sys-libs/readline:0= )
- libcerf? ( sci-libs/libcerf )
- wxwidgets? (
- x11-libs/wxGTK:3.0-gtk3[X]
- x11-libs/cairo
- x11-libs/pango
- x11-libs/gtk+:3 )
- X? ( x11-libs/libXaw )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- virtual/pkgconfig
- doc? (
- virtual/latex-base
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-langgreek
- app-text/ghostscript-gpl )
- qt5? ( dev-qt/linguist-tools:5 )"
-
-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}"/${P}-pkg-config.patch
- "${FILESDIR}"/${P}-no-mouse.patch
- "${FILESDIR}"/${P}-caca.patch
-)
-
-src_prepare() {
- default
-
- if [[ ${PV##*.} = 9999 ]]; then
- local dir
- for dir in config demo m4 term tutorial; do
- emake -C "$dir" -f Makefile.am.in Makefile.am
- done
- fi
-
- # Add special version identification as required by provision 2
- # of the gnuplot license
- sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
- eautoreconf
-
- # Make sure we don't mix build & host flags.
- sed -i \
- -e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
- -e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
- -e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
- -e 's:@CC@:$(CC_FOR_BUILD):' \
- docs/Makefile.in || die
-}
-
-src_configure() {
- if ! use latex; then
- sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
- fi
-
- if use wxwidgets; then
- WX_GTK_VER="3.0-gtk3"
- setup-wxwidgets
- fi
-
- tc-export CC CXX #453174
- tc-export_build_env BUILD_CC
- export CC_FOR_BUILD=${BUILD_CC}
-
- use qt5 && append-cxxflags -std=c++11
-
- econf \
- --with-texdir="${TEXMF}/tex/latex/${PN}" \
- --with-readline=$(usex readline gnu builtin) \
- $(use_with bitmap bitmap-terminals) \
- $(use_with cairo) \
- $(use_with gd) \
- "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
- "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
- $(use_with libcerf) \
- $(use_with lua) \
- $(use_with regis) \
- $(use_with X x) \
- --enable-stats \
- $(use_with qt5 qt qt5) \
- $(use_enable wxwidgets) \
- DIST_CONTACT="https://bugs.gentoo.org/" \
- EMACS=no
-}
-
-src_compile() {
- # Prevent access violations, see bug 201871
- export VARTEXFONTS="${T}/fonts"
-
- emake all
-
- if use doc; then
- # Avoid sandbox violation in epstopdf/ghostscript
- addpredict /var/cache/fontconfig
- 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
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
- newdoc term/PostScript/README README-ps
- newdoc term/js/README README-js
- use lua && newdoc term/lua/README README-lua
-
- local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
- use the "pdfcairo" terminal for PDF output.'
- use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
- use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
- you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
- environment variables. See the FAQ file in /usr/share/doc/${PF}/
- for more information."
- readme.gentoo_create_doc
-
- if use examples; then
- # Demo files
- insinto /usr/share/${PN}/${GP_VERSION}
- doins -r demo
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
- rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
- fi
-
- if use doc; then
- # Manual, FAQ
- dodoc docs/gnuplot.pdf FAQ.pdf
- # Documentation for making PostScript files
- docinto psdoc
- dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
- fi
-}
-
-src_test() {
- emake check GNUTERM="dumb"
-}
-
-pkg_postinst() {
- use latex && texmf-update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- use latex && texmf-update
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/
@ 2021-08-03 6:08 Ulrich Müller
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Müller @ 2021-08-03 6:08 UTC (permalink / raw
To: gentoo-commits
commit: a90ece3571d05bea373445881972f7c2b9f1ab79
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 3 06:04:20 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 3 06:04:20 2021 +0000
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 <ulm <AT> gentoo.org>
.../gnuplot/files/gnuplot-5.5-no-picins.patch | 18 ++++++++++++++++++
sci-visualization/gnuplot/gnuplot-5.5.9999-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 00000000000..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.9999-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
index 306871a94a9..bb22478f1dc 100644
--- a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.5.9999-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() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/
@ 2021-10-18 9:01 Ulrich Müller
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Müller @ 2021-10-18 9:01 UTC (permalink / raw
To: gentoo-commits
commit: a9bb1eef13332098b181a6b57cd60b695173d163
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 18 09:00:28 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 18 09:00:28 2021 +0000
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 <ulm <AT> 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 00000000000..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() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/
@ 2023-05-29 16:56 Ulrich Müller
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Müller @ 2023-05-29 16:56 UTC (permalink / raw
To: gentoo-commits
commit: a5ffd232dbe9f3aae4809f8d71355a97a65c2680
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 16:55:13 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 29 16:55:22 2023 +0000
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 <ulm <AT> gentoo.org>
.../gnuplot/files/gnuplot-5.5-no-picins.patch | 18 ------------------
.../gnuplot/files/gnuplot-6.1-no-picins.patch | 18 ++++++++++++++++++
...plot-5.5.9999-r1.ebuild => gnuplot-6.1.9999.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..000000000000
--- 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 000000000000..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.9999-r1.ebuild b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
similarity index 91%
rename from sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
rename to sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
index 3e5902c5070b..94b71cafa1fa 100644
--- a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-6.1.9999.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%%*9999} ]]; 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() {
@@ -128,7 +127,6 @@ src_configure() {
$(use_with bitmap bitmap-terminals) \
$(use_with cairo) \
$(use_with gd) \
- "$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
$(use_with libcerf) \
$(use_with lua) \
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/
@ 2023-10-09 19:31 Ulrich Müller
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Müller @ 2023-10-09 19:31 UTC (permalink / raw
To: gentoo-commits
commit: fbb42d862a08de57da2ed67b7b6fb6661ad706f5
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 9 19:28:27 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 9 19:30:50 2023 +0000
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 <ulm <AT> 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 000000000000..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 <peter@korsgaard.com>
+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,
+ &num_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),
+ &num_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() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/
@ 2024-08-03 9:57 Ulrich Müller
0 siblings, 0 replies; 11+ messages in thread
From: Ulrich Müller @ 2024-08-03 9:57 UTC (permalink / raw
To: gentoo-commits
commit: 3c64e056d4dbca7e76bd03c82e918235ec191189
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 3 09:52:59 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 09:57:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c64e056
sci-visualization/gnuplot: add 6.0.1
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
sci-visualization/gnuplot/Manifest | 1 +
.../gnuplot/files/gnuplot-6.0.1-watchpoints.patch | 16 ++
sci-visualization/gnuplot/gnuplot-6.0.1.ebuild | 219 +++++++++++++++++++++
sci-visualization/gnuplot/metadata.xml | 21 +-
4 files changed, 252 insertions(+), 5 deletions(-)
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 4bbc33f47f32..dc94138368c4 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,3 +1,4 @@
DIST gnuplot-5.4.10.tar.gz 5687565 BLAKE2B 879159fb4b581aa334b221632af7268047077cd48d89d1cecb0c6c9e855edd40bddfdaa8222177652d6200f81b97b0b52fe719da0641eea817e086832f07664f SHA512 fe5226a243dad62e8617d820764dc5923e76a51a68c58a666a699110f5b5be0f5e759e0586e923472a59ca6d1b30d1093d7a65e9c1d3a36fcd33a95df36ab89f
DIST gnuplot-5.4.8.tar.gz 5684061 BLAKE2B bd897b55e267f50e2f5ce8a49a3a033277577cd972c9effaaaedb0bb2e75908ce34997e389edcc4bd0db1dd8a0d937925216ed6ebf4e51d6700bac50d12e6a47 SHA512 3fe0ed783db85d95bdbc13e24ec5dc9bb6b2d85b3571cc87d3c17c94f4463fb6e681376394e0918cf3915f8f53896e6423ce76cb8b6fdbefcd6ec3e1b3b80125
DIST gnuplot-6.0.0.tar.gz 7522870 BLAKE2B 619171272c2348db1b676d6d773d34e0b9f1b219e1a43c37287e3347d8ae6147ebc2a88cea5da13f34cb608cc1c8ebf884e89b8975249fd5c19167a38a65c8df SHA512 520b9a74ac64e4d0b0f89dda55f77b27026e60b7a9208e994d321299481d0aa1f8adc91e61682534112bf739311a3d312c5abe08c12ec9bc2a7a6319b53872ea
+DIST gnuplot-6.0.1.tar.gz 7528936 BLAKE2B d385d4dc8a4af83f121bd062e014d8845078f5aeb84244f4cce7c17b7cf71c5fc66bd7b8623504ab53567b4123fc739506f7d2f8e4f8ad184258a7568f0223a2 SHA512 47e72ac444f35e22a5de111da3333c80846226d87411a3168e45a8433a258e351ad9b6f0ba21d76f2456042b755123a697b685fd2552b4bd9edc5b97fafcbc62
diff --git a/sci-visualization/gnuplot/files/gnuplot-6.0.1-watchpoints.patch b/sci-visualization/gnuplot/files/gnuplot-6.0.1-watchpoints.patch
new file mode 100644
index 000000000000..79e1b68f90dc
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-6.0.1-watchpoints.patch
@@ -0,0 +1,16 @@
+https://sourceforge.net/p/gnuplot/bugs/2727/
+
+--- a/demo/watchpoints.dem
++++ b/demo/watchpoints.dem
+@@ -7,6 +7,11 @@ if (!strstrt(GPVAL_COMPILE_OPTIONS, "+WATCHPOINTS")) {
+ exit # return to caller
+ }
+
++if (!strstrt(GPVAL_COMPILE_OPTIONS, "+LIBCERF")) {
++ print "This copy of gnuplot does not support FresnelC, FresnelS"
++ exit;
++}
++
+ # watchpoints are only active on plots "with lines" or "with linespoints"
+ #
+ set style data lines
diff --git a/sci-visualization/gnuplot/gnuplot-6.0.1.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.1.ebuild
new file mode 100644
index 000000000000..4b998be01f6a
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-6.0.1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2024 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.2-gtk3"
+
+inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
+ EGIT_BRANCH="master"
+ MY_P="${PN}"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
+else
+ MY_P="${P/_/.}"
+ SRC_URI="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz"
+ 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="amos aqua bitmap cairo doc examples +gd gpic latex libcaca libcerf lua metafont metapost qt5 readline regis tgif wxwidgets X"
+
+REQUIRED_USE="
+ doc? ( gd )
+ lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+ amos? ( dev-libs/openspecfun )
+ cairo? (
+ x11-libs/cairo
+ x11-libs/pango )
+ gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+ latex? (
+ virtual/latex-base
+ lua? (
+ dev-tex/pgf
+ >=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+ libcaca? ( media-libs/libcaca )
+ lua? ( ${LUA_DEPS} )
+ qt5? (
+ dev-qt/qtcore:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtnetwork:5=
+ dev-qt/qtprintsupport:5=
+ dev-qt/qtsvg:5=
+ dev-qt/qtwidgets:5= )
+ readline? ( sys-libs/readline:0= )
+ libcerf? ( sci-libs/libcerf )
+ wxwidgets? (
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+ x11-libs/cairo
+ x11-libs/pango
+ x11-libs/gtk+:3 )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXaw )"
+
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ virtual/latex-base
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-langgreek
+ dev-texlive/texlive-mathscience
+ app-text/ghostscript-gpl )
+ qt5? ( dev-qt/linguist-tools:5 )"
+
+IDEPEND="latex? ( virtual/latex-base )"
+
+GP_VERSION="${PV%.*}"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.1-no-picins.patch
+ "${FILESDIR}"/${PN}-6.0.0-configure.patch
+ "${FILESDIR}"/${PN}-6.0.1-watchpoints.patch
+)
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ if [[ ${PV##*.} = 9999 ]]; then
+ local dir
+ for dir in config demo m4 term tutorial; do
+ emake -C "$dir" -f Makefile.am.in Makefile.am
+ done
+ fi
+
+ # Add special version identification as required by provision 2
+ # of the gnuplot license
+ sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+ eautoreconf
+
+ # Make sure we don't mix build & host flags.
+ sed -i \
+ -e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
+ -e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
+ -e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
+ -e 's:@CC@:$(CC_FOR_BUILD):' \
+ docs/Makefile.in || die
+}
+
+src_configure() {
+ if ! use latex; then
+ sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+ fi
+
+ use wxwidgets && setup-wxwidgets
+
+ tc-export CC CXX #453174
+ tc-export_build_env BUILD_CC
+ export CC_FOR_BUILD=${BUILD_CC}
+
+ econf \
+ --with-texdir="${TEXMF}/tex/latex/${PN}" \
+ --with-readline=$(usex readline gnu builtin) \
+ $(use_with amos) \
+ $(use_with bitmap bitmap-terminals) \
+ $(use_with cairo) \
+ $(use_with gd) \
+ $(use_with gpic) \
+ "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+ $(use_with libcerf) \
+ $(use_with lua) \
+ $(use_with metafont) \
+ $(use_with metapost) \
+ $(use_with regis) \
+ $(use_with tgif) \
+ $(use_with X x) \
+ --enable-stats \
+ $(use_with qt5 qt qt5) \
+ $(use_enable wxwidgets) \
+ DIST_CONTACT="https://bugs.gentoo.org/" \
+ EMACS=no
+}
+
+src_compile() {
+ # Prevent access violations, see bug 201871
+ export VARTEXFONTS="${T}/fonts"
+
+ emake all
+
+ # pdflatex fails in titlepag.tex: "Argument of  has an extra }."
+ # Install the pre-built gnuplot.pdf instead.
+ #if use doc; then
+ # 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
+ #fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
+ newdoc term/PostScript/README README-ps
+ newdoc term/js/README README-js
+ use lua && newdoc term/lua/README README-lua
+
+ local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
+ use the "pdfcairo" terminal for PDF output.'
+ use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+ use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
+ you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+ environment variables. See the FAQ file in /usr/share/doc/${PF}/
+ for more information."
+ readme.gentoo_create_doc
+
+ if use examples; then
+ # Demo files
+ insinto /usr/share/${PN}/${GP_VERSION}
+ doins -r demo
+ rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die
+ rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die
+ fi
+
+ if use doc; then
+ # Manual, FAQ
+ dodoc docs/gnuplot.pdf #FAQ.pdf
+ # Documentation for making PostScript files
+ docinto psdoc
+ dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+ fi
+}
+
+src_test() {
+ emake check GNUTERM="dumb"
+}
+
+pkg_postinst() {
+ use latex && texmf-update
+ readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+ use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index ca422cb5f16b..160c0f25c669 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -16,12 +16,23 @@
primarily for the visual display of scientific data.
</longdescription>
<use>
- <flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
- Needed for GIF, JPEG, and PNG image output.</flag>
- <flag name="libcerf">Enable special functions from
- <pkg>sci-libs/libcerf</pkg></flag>
+ <flag name="amos">
+ Enable Amos routines for complex Airy and Bessel functions
+ (<pkg>dev-libs/openspecfun</pkg>)
+ </flag>
<flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
- <flag name="regis">Enable ReGIS terminal</flag>
+ <flag name="gd">
+ Add support for <pkg>media-libs/gd</pkg>.
+ Needed for GIF, JPEG, and PNG image output.
+ </flag>
+ <flag name="gpic">Include support for gpic terminal</flag>
+ <flag name="libcerf">
+ Enable special functions from <pkg>sci-libs/libcerf</pkg>
+ </flag>
+ <flag name="metafont">Include support for metafont terminal</flag>
+ <flag name="metapost">Include support for metapost terminal</flag>
+ <flag name="regis">Include support for ReGIS terminal</flag>
+ <flag name="tgif">Include support for tgif terminal</flag>
</use>
<upstream>
<remote-id type="sourceforge">gnuplot</remote-id>
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-08-03 9:57 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-09 19:31 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2024-08-03 9:57 Ulrich Müller
2023-05-29 16:56 Ulrich Müller
2021-10-18 9:01 Ulrich Müller
2021-08-03 6:08 Ulrich Müller
2020-12-23 11:10 Ulrich Müller
2020-11-07 4:07 Ulrich Müller
2020-11-06 12:57 Ulrich Müller
2019-07-23 7:19 Ulrich Müller
2018-01-12 8:37 Ulrich Müller
2017-11-19 11:46 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox