Adding metadata

4 files changed, 54 insertions, 17 deletions

diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 4bbc33f47f32..f1bb6a6f42f6 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,3 +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
+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.0.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.1.ebuild
index d264b1c81e65..d2f38758103c 100644
--- a/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-6.0.1.ebuild
@@ -27,12 +27,14 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="gnuplot"
 SLOT="0"
-IUSE="aqua bitmap cairo doc examples +gd latex libcaca libcerf lua qt5 readline regis wxwidgets X"
+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 )
@@ -83,6 +85,7 @@ 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() {
@@ -128,13 +131,18 @@ src_configure() {
 	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) \
@@ -149,16 +157,18 @@ src_compile() {
 
 	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
+	# 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() {
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 290f15c2fb24..81b2a2513634 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -19,12 +19,23 @@
   <remote-id type="cpe">cpe:/a:gnuplot:gnuplot</remote-id>
  </upstream>
  <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>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file