gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 58 insertions, 19 deletions

diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 6482054252fc..80da9c0a4034 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,11 +1,12 @@
 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c
 AUX gnuplot-6.0.0-configure.patch 401 BLAKE2B 82246d32c49730c0688b810f19984338f072896b694dcf36bc4aedcfe65112f384323c15cf9d3ee10a9200f6b3b38f5065e97fc40537e9b9c1b9daa1c4c79a8c SHA512 4d959633c82be8532eee5ec84f90aaf5863f5d5d420d37c8c14bf7adf3df39726ff8d3e9b3befb933fd6aee8b4a73410b4aad7e08538ca27739f4db61e47243b
+AUX gnuplot-6.0.1-watchpoints.patch 401 BLAKE2B 1fdb7c17fadac15e36dc35f5a1409618f99b6f53a7ee8c7b3a74ffe0c36f5da087e3faaea661bb861523e29a786cc72832b068639900ab296ef4a625af220d65 SHA512 b380fbfb3c9aa8380806f1061b6e79fbb8f9eb306ab9d031dc938c38b33d86fe5698503059f62d862bf39de2089fc3ae3f5815dacb799b38e54732d438a80173
 AUX gnuplot-6.1-no-picins.patch 628 BLAKE2B ab7ffcfecee328d4a8653af0c5cf80470ac65299b5576835db5083b01b461b359775b2b72ef87a757072cce406daa18d3b116bae2c89f8291cd4154e0a7300e4 SHA512 45f5db5745de1d96a2abf987f2d5e85a827bbd298675f4f4b1526ff96d22de12c4b8de75b86fb87447891aaa9e45b158531d1bf7386617824057b56c9de5f0c3
 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
 EBUILD gnuplot-5.4.10.ebuild 5045 BLAKE2B 34f31c96cc89f8aa0d87a88490fbf947dd6dd60cd1e783761863b2efc7435d4a7259fc5a67a0f41396cc198040304360e1f81c985d4a76b6edc1b82cc7544302 SHA512 c02c3845169bb46a9a9759b17e4c3b1bec7467147bb45c5444f41895c22457608661b12aa6d136f0b9562ed295a8b375576935134fb2ca49cf1f84c4db59bcba
 EBUILD gnuplot-5.4.8.ebuild 5045 BLAKE2B 34f31c96cc89f8aa0d87a88490fbf947dd6dd60cd1e783761863b2efc7435d4a7259fc5a67a0f41396cc198040304360e1f81c985d4a76b6edc1b82cc7544302 SHA512 c02c3845169bb46a9a9759b17e4c3b1bec7467147bb45c5444f41895c22457608661b12aa6d136f0b9562ed295a8b375576935134fb2ca49cf1f84c4db59bcba
-EBUILD gnuplot-6.0.0.ebuild 5005 BLAKE2B 17de0ee76b7dee095501cafcdfa30b00d44dab4cff1c96e2b309e3b9940fa25b6b25c8b1ab314112fc0df51e091cc231e480e8eb53d4c5e9b335d746b5e487a7 SHA512 02680b378407120980cb61cd36b2400bb1ba0583ccd3f6944c05a4d4633ce2860f7ee984c4ad3ac1ca0eededf1a675c0ab451a46d61b893c55ae57fc02c6ddf8
+EBUILD gnuplot-6.0.1.ebuild 5353 BLAKE2B 470564ed59fcf4e7a90ffee9737bcc62b9522bec76d7aef7d41e1d7b11b74cebe6d42530a53799d3529d8183938a0a8858d6ef64a406f7832eb6211e85d489cf SHA512 9055d83f90e060fded97cc45f0a83ca741d5ec068354714d634c18909ed576c87cbd5c3956ef65d27250cefb7901a8f711191cab60145378210b7110baf41cba
 EBUILD gnuplot-6.1.9999.ebuild 4962 BLAKE2B bfebc677042f2d56e3c553c19cdf0afc0c06988feb6d0a780cfb14d6b04e480e1fb2cb949650e18a5b6ba1fb8a770d46ea85702caf9507935b79e025303d1f2d SHA512 c1a8e70f0b7e82723045df2bd70c3858b4d0619923d20623a1d632e4f35be044f6b61b76c31996ad37c3a07eda026b742525474b14217e65ba22b5917ab7feea
-MISC metadata.xml 1070 BLAKE2B 92ac6f016dedc1ee0aced2792c735e692efac0b0c045b7119d6f2268ed9a7ee3c2437a4038ff45799670265e01f74d8470e3c0abf45b35980a4e761fcd802d19 SHA512 04100f29255dd4d3caf3c81a39f7d6f8ad341598e89555219ba054e980484da00835c2226f35a2b63ec5f27238a97003c7bdac28ca504aed68af0fad737beb8a
+MISC metadata.xml 1487 BLAKE2B f903fd16007f638163484d2c635c1eea3040cee929230f9c6578f190a65707ade22d7e08a7a9d2f354bafa7ed92c85b7db0182fe1b8584ce0e201665b8cadd55 SHA512 fe61bdbea5637e7eba0c1e726404068c861b151843c88da1972df2b132ff40d9e402a7b39f02750a05a233c17c572fd78ff26cadcb2f5fd9f0a9e201caa9da63
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..699585853919
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-6.0.1-watchpoints.patch
@@ -0,0 +1,17 @@
+https://sourceforge.net/p/gnuplot/bugs/2727/
+
+--- a/demo/watchpoints.dem
++++ b/demo/watchpoints.dem
+@@ -67,6 +67,12 @@
+ pause -1 "<cr> to continue"
+ 
+ reset
++
++if (!strstrt(GPVAL_COMPILE_OPTIONS, "+LIBCERF")) {
++    print "This copy of gnuplot does not support FresnelC, FresnelS"
++    exit;
++}
++
+ unset key
+ set title "Find y intercepts of a parametric function" offset 0,-1
+ set xrange [-0.1 : 0.9]
diff --git a/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.1.ebuild
index 6dc345a591ee..4b998be01f6a 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 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>