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>

Reply via email to