public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/, sci-visualization/gnuplot/files/
@ 2015-10-24 10:40 Pacho Ramos
  0 siblings, 0 replies; 7+ messages in thread
From: Pacho Ramos @ 2015-10-24 10:40 UTC (permalink / raw
  To: gentoo-commits

commit:     3dd650209ec5171800181837c16cd4ec884968f8
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 10:39:49 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 10:39:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dd65020

sci-visualization/gnuplot: Support wxGTK:3.0 (#562486)

Package-Manager: portage-2.2.23

 .../files/gnuplot-5.0.1-fix-underlinking.patch     |  17 ++
 sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild  | 199 +++++++++++++++++++++
 2 files changed, 216 insertions(+)

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
new file mode 100644
index 0000000..c39bc828
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch
@@ -0,0 +1,17 @@
+Description: Add missing linkage against X11 libs.
+Author: Anton Gladky <gladk@debian.org>
+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

diff --git a/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
new file mode 100644
index 0000000..f49a707
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit autotools cvs
+	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
+	ECVS_MODULE="gnuplot"
+	ECVS_BRANCH="branch-5-0-stable"
+	ECVS_USER="anonymous"
+	ECVS_CVS_OPTIONS="-dP"
+	MY_P="${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	MY_P="${P/_/.}"
+	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	inherit autotools
+fi
+
+LICENSE="gnuplot bitmap? ( free-noncomm )"
+SLOT="0"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3[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 )
+	qt4? ( >=dev-qt/qtcore-4.5:4
+		>=dev-qt/qtgui-4.5:4
+		>=dev-qt/qtsvg-4.5:4 )
+	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}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		app-text/ghostscript-gpl )"
+
+S="${WORKDIR}/${MY_P}"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+src_prepare() {
+	# Fix underlinking
+	epatch "${FILESDIR}"/${P}-fix-underlinking.patch
+
+	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
+		#eautoreconf
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	# hacky workaround
+	# Please hack the buildsystem if you like
+	if use prefix && use qt4; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+	fi
+
+	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.'
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+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"
+		need-wxwidgets unicode
+	fi
+
+	tc-export CC CXX			#453174
+
+	econf \
+		--without-pdf \
+		--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 svga linux-vga) \
+		$(use_with X x) \
+		--enable-stats \
+		$(use_with qt4 qt qt4) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="https://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	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
+		emake -C docs gnuplot.pdf
+		emake -C tutorial pdf
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
+	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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/, sci-visualization/gnuplot/files/
@ 2020-11-07 23:08 Ulrich Müller
  0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Müller @ 2020-11-07 23:08 UTC (permalink / raw
  To: gentoo-commits

commit:     c2075d9f92611c4cbcb875bbf94cfbf75309c43a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  7 23:06:46 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Nov  7 23:07:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2075d9f

sci-visualization/gnuplot: Fix build with USE=libcaca.

Compilation failed with USE="libcaca -ggi -wxwidgets -X".
Fixed in 5.4.0-r2 and patch backported to 5.2.8.

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

 .../gnuplot/files/gnuplot-5.2.6-caca.patch         | 13 ------
 .../gnuplot/files/gnuplot-5.2.8-caca.patch         | 33 ++++++++++++++++
 .../gnuplot/files/gnuplot-5.4.0-caca.patch         | 46 ++++++++++++++++++++++
 sci-visualization/gnuplot/gnuplot-5.2.8.ebuild     |  2 +-
 .../gnuplot/gnuplot-5.4.0-r100.ebuild              |  1 +
 sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild  |  1 +
 6 files changed, 82 insertions(+), 14 deletions(-)

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch
deleted file mode 100644
index 4441e4b8c03..00000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/gnuplot-5.2.8-caca.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.8-caca.patch
new file mode 100644
index 00000000000..2ce464f0449
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.2.8-caca.patch
@@ -0,0 +1,33 @@
+Patch backported from branch-5-4-stable.
+https://bugs.gentoo.org/690014
+
+--- gnuplot-5.2.8-orig/term/caca.trm
++++ gnuplot-5.2.8/term/caca.trm
+@@ -1909,8 +1909,11 @@
+ 	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;
+ 
+@@ -2577,11 +2580,13 @@
+ 		}
+ 	}
+ 
++#ifdef USE_MOUSE
+ 	if (changed) {
+ 		/* Replot only if something changed. */
+ 		CACA_zoom_or_replot = TRUE;
+ 		process_event(GE_replot, 0, 0, 0, 0, 0);
+ 	}
++#endif
+ }
+ 
+ 

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.0-caca.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.0-caca.patch
new file mode 100644
index 00000000000..f92ac93ab01
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.0-caca.patch
@@ -0,0 +1,46 @@
+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/gnuplot-5.2.8.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
index 29dde10c36a..b741e27f842 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
@@ -74,7 +74,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 "${FILESDIR}"/${PN}-5.2.8-caca.patch
 	eapply_user
 
 	if [[ -z ${PV%%*9999} ]]; then

diff --git a/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
index 0e0cdd80bfb..47013ca921d 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
@@ -78,6 +78,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
 	"${FILESDIR}"/${P}-pkg-config.patch
 	"${FILESDIR}"/${P}-no-mouse.patch
+	"${FILESDIR}"/${P}-caca.patch
 )
 
 pkg_setup() {

diff --git a/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
index c064f8bbff5..a05cfa6234c 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
@@ -75,6 +75,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
 	"${FILESDIR}"/${P}-pkg-config.patch
 	"${FILESDIR}"/${P}-no-mouse.patch
+	"${FILESDIR}"/${P}-caca.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/, sci-visualization/gnuplot/files/
@ 2020-12-16  9:03 Ulrich Müller
  0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Müller @ 2020-12-16  9:03 UTC (permalink / raw
  To: gentoo-commits

commit:     c7fe851fe3634cd5485acf66107f8646bcaf0dcd
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 08:41:13 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 08:47:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7fe851f

sci-visualization/gnuplot: Backport security fixes to version 5.2.8.

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>

 .../gnuplot/files/gnuplot-5.2.8-double-free.patch  |  21 ++
 .../gnuplot/files/gnuplot-5.2.8-font-syntax.patch  |  36 ++++
 sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild  | 217 +++++++++++++++++++++
 3 files changed, 274 insertions(+)

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.8-double-free.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.8-double-free.patch
new file mode 100644
index 00000000000..e3da8fc4057
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.2.8-double-free.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/746419
+
+This backports the following commit from upstream git:
+
+commit 591c0f804b5a78421d28edf2adcd429c914bbca1
+Author: Ethan A Merritt <merritt@u.washington.edu>
+Date:   Wed Sep 9 11:00:59 2020 -0700
+
+    successive failures of "set print <foo>" could cause double-free
+    Bug #2312
+
+--- gnuplot-5.2.8-orig/src/command.c
++++ gnuplot-5.2.8/src/command.c
+@@ -1867,6 +1867,7 @@
+ #endif
+ 	    if (0 > fclose(print_out))
+ 		perror(print_out_name);
++	print_out = stderr;
+     }
+ 
+     free(print_out_name);

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.8-font-syntax.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.8-font-syntax.patch
new file mode 100644
index 00000000000..a1df2ae4995
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.2.8-font-syntax.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/746419
+
+This backports and consolidates the following commits from upstream git:
+
+commit a7205eda482948a0408b0ed29cdde89593feedc7
+Author: Ethan A Merritt <merritt@u.washington.edu>
+Date:   Sat Sep 12 10:18:10 2020 -0700
+
+    Better error handling for faulty font syntax
+
+    Commit 660e2fbd failed to deal with an error detected at the final character
+    of a text string.
+
+    Bugs #2303 #2308
+
+commit 660e2fbd681cb47acd42595f050fb2f938194b0e
+Author: Ethan A Merritt <merritt@u.washington.edu>
+Date:   Tue Sep 1 17:57:37 2020 -0700
+
+    Better error handling for faulty font syntax
+
+    A missing close-quote in an enhanced text font specification could
+    cause a segfault.
+    Bug #2303
+
+--- gnuplot-5.2.8-orig/src/term.c
++++ gnuplot-5.2.8/src/term.c
+@@ -2361,7 +2361,7 @@
+ 			    ++p;
+ 			if (*p != *start_of_fontname) {
+ 			    int_warn(NO_CARET, "cannot interpret font name %s", start_of_fontname);
+-			    p = start_of_fontname;
++			    break;
+ 			}
+ 			start_of_fontname++;
+ 			end_of_fontname = p++;

diff --git a/sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild
new file mode 100644
index 00000000000..4b0aee82945
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild
@@ -0,0 +1,217 @@
+# 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 "${FILESDIR}"/${PN}-5.2.8-double-free.patch
+	eapply "${FILESDIR}"/${PN}-5.2.8-font-syntax.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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/, sci-visualization/gnuplot/files/
@ 2021-01-24 17:28 Ulrich Müller
  0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Müller @ 2021-01-24 17:28 UTC (permalink / raw
  To: gentoo-commits

commit:     15cfbdc1ba0a05a7a32ecbcfe8d7bfb31d02933f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 11:13:28 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 17:28:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15cfbdc1

sci-visualization/gnuplot: Remove old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 sci-visualization/gnuplot/Manifest                 |   1 -
 .../gnuplot/files/gnuplot-5.2.2-regis.patch        |  43 ----
 .../gnuplot/files/gnuplot-5.2.8-caca.patch         |  33 ----
 .../gnuplot/files/gnuplot-5.2.8-double-free.patch  |  21 --
 .../gnuplot/files/gnuplot-5.2.8-font-syntax.patch  |  36 ----
 sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild  | 217 ---------------------
 sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild  | 203 -------------------
 sci-visualization/gnuplot/metadata.xml             |   2 -
 8 files changed, 556 deletions(-)

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

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch
deleted file mode 100644
index 613a028ee79..00000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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/files/gnuplot-5.2.8-caca.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.8-caca.patch
deleted file mode 100644
index 2ce464f0449..00000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.8-caca.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Patch backported from branch-5-4-stable.
-https://bugs.gentoo.org/690014
-
---- gnuplot-5.2.8-orig/term/caca.trm
-+++ gnuplot-5.2.8/term/caca.trm
-@@ -1909,8 +1909,11 @@
- 	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;
- 
-@@ -2577,11 +2580,13 @@
- 		}
- 	}
- 
-+#ifdef USE_MOUSE
- 	if (changed) {
- 		/* Replot only if something changed. */
- 		CACA_zoom_or_replot = TRUE;
- 		process_event(GE_replot, 0, 0, 0, 0, 0);
- 	}
-+#endif
- }
- 
- 

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.8-double-free.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.8-double-free.patch
deleted file mode 100644
index e3da8fc4057..00000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.8-double-free.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/746419
-
-This backports the following commit from upstream git:
-
-commit 591c0f804b5a78421d28edf2adcd429c914bbca1
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Wed Sep 9 11:00:59 2020 -0700
-
-    successive failures of "set print <foo>" could cause double-free
-    Bug #2312
-
---- gnuplot-5.2.8-orig/src/command.c
-+++ gnuplot-5.2.8/src/command.c
-@@ -1867,6 +1867,7 @@
- #endif
- 	    if (0 > fclose(print_out))
- 		perror(print_out_name);
-+	print_out = stderr;
-     }
- 
-     free(print_out_name);

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.8-font-syntax.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.8-font-syntax.patch
deleted file mode 100644
index a1df2ae4995..00000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.8-font-syntax.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/746419
-
-This backports and consolidates the following commits from upstream git:
-
-commit a7205eda482948a0408b0ed29cdde89593feedc7
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Sat Sep 12 10:18:10 2020 -0700
-
-    Better error handling for faulty font syntax
-
-    Commit 660e2fbd failed to deal with an error detected at the final character
-    of a text string.
-
-    Bugs #2303 #2308
-
-commit 660e2fbd681cb47acd42595f050fb2f938194b0e
-Author: Ethan A Merritt <merritt@u.washington.edu>
-Date:   Tue Sep 1 17:57:37 2020 -0700
-
-    Better error handling for faulty font syntax
-
-    A missing close-quote in an enhanced text font specification could
-    cause a segfault.
-    Bug #2303
-
---- gnuplot-5.2.8-orig/src/term.c
-+++ gnuplot-5.2.8/src/term.c
-@@ -2361,7 +2361,7 @@
- 			    ++p;
- 			if (*p != *start_of_fontname) {
- 			    int_warn(NO_CARET, "cannot interpret font name %s", start_of_fontname);
--			    p = start_of_fontname;
-+			    break;
- 			}
- 			start_of_fontname++;
- 			end_of_fontname = p++;

diff --git a/sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild
deleted file mode 100644
index b04efa53636..00000000000
--- a/sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2021 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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-gtk3[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 "${FILESDIR}"/${PN}-5.2.8-double-free.patch
-	eapply "${FILESDIR}"/${PN}-5.2.8-font-syntax.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-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_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.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild
deleted file mode 100644
index b2dc905de83..00000000000
--- a/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2021 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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
-)
-
-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/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index b258754a4c2..c3e53e3e4a6 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -16,8 +16,6 @@
   primarily for the visual display of scientific data.
 </longdescription>
 <use>
-  <flag name="compat">Enable backwards compatibility with version 4
-    syntax</flag>
   <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


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/, sci-visualization/gnuplot/files/
@ 2022-07-28 17:37 Ulrich Müller
  0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Müller @ 2022-07-28 17:37 UTC (permalink / raw
  To: gentoo-commits

commit:     9fb85b467b6f9e1d65538305262787be6f2d1f3b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 17:35:48 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 17:37:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb85b46

sci-visualization/gnuplot: drop 5.4.2-r1

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

 sci-visualization/gnuplot/Manifest                 |   1 -
 .../gnuplot/files/gnuplot-5.4.2-signed-char.patch  |  27 ---
 sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild  | 210 ---------------------
 3 files changed, 238 deletions(-)

diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 4e69a3716d6b..5eb28bf74fbd 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,3 +1,2 @@
-DIST gnuplot-5.4.2.tar.gz 5640202 BLAKE2B 42bdbe569a4dcd9e65010aff3d0b7428f1c3485bc64429ac0f2c4f157d43c4d640aa2b191430428ec01cb289bd1d43eb95b4167b5b9d236002d54e48b45c0a2a SHA512 e69ca74335cdd69c6013a254ac785dc67cc82713308460971cf6e0a66438716d8892a37344611d1841563efbc4b2b8c5692c13c7b06cff4f30f8d43e2ddfd7d4
 DIST gnuplot-5.4.3.tar.gz 5656008 BLAKE2B 44745bfc23f3c9f2d27499e0c1430ac32d7995fd12210d83996b87cd989cfdeca75848f0407ce25271f86b866405e726a56523c88a80a476015423cafb32b501 SHA512 fc35ab68a992acc8e35402c89cb7704c0efe117ec1fb272739d4378289d6c5a2e8f4b747b339fca916e559453547f2405863fb52038576883f0d5643a7220b5e
 DIST gnuplot-5.4.4.tar.gz 5639573 BLAKE2B 739849d123836c6c982c72a292274d55808cfecd34a36143ecc454b11215951d28efda1815b15048316e96a2f046789b35b8324c53655f2ac1361653235a23b6 SHA512 ec2f4f34e119a79adeaf2bc3ec1e9335147bd8808d6e689844b891b60319b6d0f627d8ec1b90c4df6bae5e6ed6373c51e1fb70373258c32b93cfc4b2ed821cb9

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
deleted file mode 100644
index 091dbbc88d8a..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild
deleted file mode 100644
index f86d2ca20b28..000000000000
--- a/sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2021 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"
-
-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="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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="
-	doc? ( gd )
-	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:${WX_GTK_VER}[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
-		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}-5.0.6-no-picins.patch
-	"${FILESDIR}"/${P}-signed-char.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 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 "${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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/, sci-visualization/gnuplot/files/
@ 2023-11-16 20:14 Ulrich Müller
  0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Müller @ 2023-11-16 20:14 UTC (permalink / raw
  To: gentoo-commits

commit:     1726a8b9f72b13054cd212e731c7d8282bfee130
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 20:11:41 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 20:14:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1726a8b9

sci-visualization/gnuplot: drop 5.4.9

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

 sci-visualization/gnuplot/Manifest                 |   1 -
 .../gnuplot/files/gnuplot-5.4.9-unbal-braces.patch |  31 ---
 sci-visualization/gnuplot/gnuplot-5.4.9.ebuild     | 208 ---------------------
 3 files changed, 240 deletions(-)

diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index d92054840906..0c2fe0043f50 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -2,4 +2,3 @@ DIST gnuplot-5.4.10.tar.gz 5687565 BLAKE2B 879159fb4b581aa334b221632af7268047077
 DIST gnuplot-5.4.4.tar.gz 5639573 BLAKE2B 739849d123836c6c982c72a292274d55808cfecd34a36143ecc454b11215951d28efda1815b15048316e96a2f046789b35b8324c53655f2ac1361653235a23b6 SHA512 ec2f4f34e119a79adeaf2bc3ec1e9335147bd8808d6e689844b891b60319b6d0f627d8ec1b90c4df6bae5e6ed6373c51e1fb70373258c32b93cfc4b2ed821cb9
 DIST gnuplot-5.4.6.tar.gz 5655661 BLAKE2B a4e42679c9942936bc4692ba71a17c748002e0ce216b7980a79866d6f4090ff012b7079a8a1fb1b7d91c5df86afa8b2cb9f8c0b458184a4e0044cf7fbe715e45 SHA512 a78333f7c0ed3429b24fcdeb6296e67fb760e6f8ffc0801a6b379fcb12ae7e80cebe65a2655cb3530c2a2d4083adc34060c9a7cbe67ce98b660682c0edba174b
 DIST gnuplot-5.4.8.tar.gz 5684061 BLAKE2B bd897b55e267f50e2f5ce8a49a3a033277577cd972c9effaaaedb0bb2e75908ce34997e389edcc4bd0db1dd8a0d937925216ed6ebf4e51d6700bac50d12e6a47 SHA512 3fe0ed783db85d95bdbc13e24ec5dc9bb6b2d85b3571cc87d3c17c94f4463fb6e681376394e0918cf3915f8f53896e6423ce76cb8b6fdbefcd6ec3e1b3b80125
-DIST gnuplot-5.4.9.tar.gz 5686930 BLAKE2B 5695739d67f04a3f993a8ce1515fd94f833811830d26fce036abaabcbb0d9b0acd6b8f78a876fc1befb552209b6f25dda2de02b1cec97d12f0a8d42e73e4306c SHA512 4269c1193585088a66684c0302e2e80d09386b55d1fcb0b578295106737b740bd227ec791e73259960b523d5cec2623cdf9f4607002fb4327e659b073861244c

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
deleted file mode 100644
index 3261f60e61c1..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.4.9-unbal-braces.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index f1d6a09bdf07..000000000000
--- a/sci-visualization/gnuplot/gnuplot-5.4.9.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# 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.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="mirror://sourceforge/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="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
-REQUIRED_USE="
-	doc? ( gd )
-	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:${WX_GTK_VER}[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
-		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}-5.0.6-no-picins.patch
-	"${FILESDIR}"/${PN}-5.4.9-unbal-braces.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 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
-		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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/, sci-visualization/gnuplot/files/
@ 2024-02-08  7:59 Ulrich Müller
  0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Müller @ 2024-02-08  7:59 UTC (permalink / raw
  To: gentoo-commits

commit:     ec9f92bc36763308366a320b140bb94132471baa
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  8 07:40:37 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 07:58:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec9f92bc

sci-visualization/gnuplot: add 6.0.0

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

 sci-visualization/gnuplot/Manifest                 |   1 +
 .../gnuplot/files/gnuplot-6.0.0-configure.patch    |  11 ++
 sci-visualization/gnuplot/gnuplot-6.0.0.ebuild     | 206 +++++++++++++++++++++
 3 files changed, 218 insertions(+)

diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 37af373773a6..4bbc33f47f32 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/sci-visualization/gnuplot/files/gnuplot-6.0.0-configure.patch b/sci-visualization/gnuplot/files/gnuplot-6.0.0-configure.patch
new file mode 100644
index 000000000000..463dccab8c90
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-6.0.0-configure.patch
@@ -0,0 +1,11 @@
+--- gnuplot-6.0.0/configure.ac
++++ gnuplot-6.0.0/configure.ac
+@@ -1024,7 +1024,7 @@
+                [ Define to support defining a function as a here document])
+    )
+ 
+-Enable parsing of deprecated syntax
++dnl Enable parsing of deprecated syntax
+ AC_ARG_ENABLE(backward-compatibility,dnl
+ [  --enable-backward-compatibility       enable some deprecated syntax ],
+   [if test "$enableval" = yes; then

diff --git a/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild
new file mode 100644
index 000000000000..245e5266df6c
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild
@@ -0,0 +1,206 @@
+# 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="mirror://sourceforge/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="aqua bitmap cairo doc examples +gd latex libcaca libcerf lua qt5 readline regis wxwidgets X"
+REQUIRED_USE="
+	doc? ( gd )
+	lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+	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/libXaw )"
+
+DEPEND="${RDEPEND}"
+
+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
+)
+
+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 bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_with gd) \
+		"$(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
+		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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-02-08  7:59 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-16 20:14 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/, sci-visualization/gnuplot/files/ Ulrich Müller
  -- strict thread matches above, loose matches on Subject: below --
2024-02-08  7:59 Ulrich Müller
2022-07-28 17:37 Ulrich Müller
2021-01-24 17:28 Ulrich Müller
2020-12-16  9:03 Ulrich Müller
2020-11-07 23:08 Ulrich Müller
2015-10-24 10:40 Pacho Ramos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox