gentoo resync : 18.12.2020

7 files changed, 693 insertions, 0 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 1d65d2d8ea87..195e2ae1c8ac 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index efe5b696f6e9..9d29c78c7d0d 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -2,14 +2,20 @@ AUX gnuplot-5.0.1-fix-underlinking.patch 483 BLAKE2B 1719635d947a5d53fa5b6def652
 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c
 AUX gnuplot-5.2.2-regis.patch 1171 BLAKE2B 57d2faba0f01ca27de0ff39b9b9d01faeffcbedacd240c39aa7756fffa27aa2f6d28d3cf5d24f2b6a88399ada1538676f408851957e5df026411dffb32665689 SHA512 fe9154eb6687426542fd51b42b80378e1755007e81628be6bb318a8aaabd90dc7cadb85362162e7e323a0cf60b6bcd0509bb0318888c17bb5e4330f4c00f1f6b
 AUX gnuplot-5.2.8-caca.patch 872 BLAKE2B e1aa8bf4fa17fd1d7e43a539e0691c63e647a4a6d7998b0cc01fdcacb56584fc4c5802cb236d5f2a485d3c89ff564345ec24398832e8a114432589a6ab0a01bb SHA512 7398bc7554311cec09bb4ab80e439a79e60410e376d567e858c1207051305195fdd47906db825fb281de6aa58bbbfda88ff2853ac01ea96cdd0496dbff0460db
+AUX gnuplot-5.2.8-double-free.patch 527 BLAKE2B 3c09082f1a4d87170db2c54947c19c2ffcc67ac2ec626db222b61faaf08360eb802fff011359894d5ea038b5ca3813842da2b6ca8cb207d9ddcb928c0efa7079 SHA512 127513d0332caf9bfcfbc27c60b6e45407c551ea81a60c28728de436eeb990579a7fc11bfabc813744c4715222a295d7026c01f2f72a9c96fb3b3189ce58903e
+AUX gnuplot-5.2.8-font-syntax.patch 1035 BLAKE2B b92f2467d639b2b676d249adc1e2bb1e9f4c50d3f4c38c4a92888a948abcab6f39973e64edd16376684963376666264940d93612aa782a08cbe042c97c094194 SHA512 2e888c36a4ed2a90d405e400225200d334814140d07f1c6e8a003c64af9a08a0eb6dec626c74452d487023a881ba14779bd7cba976835ac22dcc8b9a6a8aeb31
 AUX gnuplot-5.4.0-caca.patch 1292 BLAKE2B 7a3797898f5fac77c045d8ad3de9570afa1d643865c6787cc8bc59e42642a2727ec751fd53c35a1962b310da0143923ed11110ca8b3d6abe61154d01b3f2dc8a SHA512 df37756cd46b027e2127bb15e1eaf1c8cba0afc802d8ccaa32acec264a43d7e7c8f919a9709c5aa958e0c27f06e2cebe5468cb5d4b40c1dfe05a434f50361de0
 AUX gnuplot-5.4.0-no-mouse.patch 681 BLAKE2B 63472a91a53782d62373c65d9b6122c68885aeaf7a417c04e5e1c9df3a36c4461045827dc8b99b6f1f585e1f9517207d50e80cf13446e665d78f0f725099af71 SHA512 d1911a692eb3a7784272d41730a5504a1d05622a6603725827b6b3aff8cee1730fa48bbf6167d8872e9a211e1a2592801e18edffbfba2202e4573797dcaf721d
 AUX gnuplot-5.4.0-pkg-config.patch 1162 BLAKE2B e72dd15ab84baba71328b38402b786719922705772ff9105b4cb76ea368736b7e6251b5aab33f3a40e56c5b33b40de44ae62d2ee22ca75f8f00da0a325cc7cd7 SHA512 7413e8ac4b6a94184cf1214a46200738d57291ab6fa021f4395d7071eb89e2be35587bf6184c1afbd134211213fd2bc27ddaf52a4ebf5f2bd524f1490a3716eb
 DIST gnuplot-5.2.8.tar.gz 5340677 BLAKE2B 169f5bef44a64b3b7a5be40e28ea22ef24ebc7526fe13ab09e16495453c3922712603d63a03c3b4332368d2ae8cbe4ef57ec53e18bbb4ad2cde13e4cc534245a SHA512 513dff15236dcb58c3c5471cdaa0713242787dbf30ef860c3f69152cb87c6392e4973caff5eb178707bbb84c78548e806b2920864a37686bce49425fbfdc4e8c
 DIST gnuplot-5.4.0.tar.gz 5622595 BLAKE2B e42011fa49ba0440436a406737f03ad55359b337dce359c62c1b4f536f70ca07126cf04e3e0eef6e4b22340dfb0318f6890d7814ad55b38d60ee24a4bc570ca1 SHA512 abbb69ded9eed3a1e53caeeb7d75ee4e3532b1254640a3f38f00260e261e75f87744e3df4210b0db7c8c2acee9b25147524d5377b3f4305e2449b2e99ca58d66
+DIST gnuplot-5.4.1.tar.gz 5608076 BLAKE2B 7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d SHA512 2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121
+EBUILD gnuplot-5.2.8-r1.ebuild 5962 BLAKE2B c6fbfd51b779f6c806931d09ee99f76a501f3c928c3d9d0f0a6771774f0e3e5473a7d5f385c92fd656de2245834bd15c208fda1b8f9821df481e9a359038dfcc SHA512 e1519ba0dfddd8d578b4dda6f5364b9a285d043d77090b2613a533cc09260ed1dc6175527eb9098bcae5b2c0692e6cef83966642ce475232c931ed02ec17f651
 EBUILD gnuplot-5.2.8.ebuild 5846 BLAKE2B bf448f20b5754401d3cb095783bd66332585addbbd916d4b0672f0c6f8b8a5cbfdfffdcf4516463770d5ba29b7b11ad075c0d6aba046bdf8922fb2273d92b995 SHA512 6a79d97ec2b480f0da057259382466f43752693b43a314ddebdf1e0a0f511bf0ed75cc48773df2665129b9d660a84c3f3b3dd2b657d4eeac1cd0a45388fa2d71
 EBUILD gnuplot-5.4.0-r100.ebuild 5251 BLAKE2B 855f0b8c3c9d650d7b36f063e19958306695266cfa6fc5a1ea625df6794f66db42a889492234beaa953b1fd94da5616d80e91e0ec32c5edfb428b9fe97d563f7 SHA512 f64417a4934c0f14197c81340d54d3e91f79f4412829791db73fbc568ba13967e0032f1493276c13ef9d88bc224c57144f611c53ad8c1c0fe8855d4fe08c150c
 EBUILD gnuplot-5.4.0-r2.ebuild 5120 BLAKE2B 449a0b41a70da220ac7027aa149c58d19ec2273d693f5aaa6ccf8612940fa42a046c978d8dbb8d4efdfe4e2c062d1fb97fd0a4558fd88620228d2dbefce2b2a2 SHA512 b0468c83ff54e8d06803001e154718375458129196378ada36d6a5d0f7f50536f40261d8bde3fcfb4fb0a7238f7d454cc84ba61353f7361490967ff8b004567a
+EBUILD gnuplot-5.4.1-r1.ebuild 5148 BLAKE2B 7ebfabf5e0db00601122f22473eda750793f36c6733c1a510e3ef70e4bf80abce85dc9229c35e77994313924000c63d0d50154fffed77031e709898dbef6aa9e SHA512 9f8223e5bcf736ad6278624d8ed2511968fda602cbee07ccc1d4bce9aa588ef9d8494fb76b79304d467de88bad08b2c69efaac9fcb428b2f9b7bcd63c8436cbc
+EBUILD gnuplot-5.4.1.ebuild 5017 BLAKE2B 03c88ac2f8aeab5d03a4e24a57f4d7f1cec892d8c971824a34f242ffc7348224fac06d6eca44a291f64b52a2ae65ee4e61c9c8835422f5c976e9e2988abaf7d1 SHA512 4d97dd05ff4f0eb2fb987a51b344f57c12fc33ba46a5e15473bc70402312194bfa5e1b4e442f7ee623a2da59a766f3b7b0d9b75a23c1a173bdc8fe0cde1a8852
 EBUILD gnuplot-5.5.9999-r1.ebuild 5149 BLAKE2B 6b0885a3b727713236add1c07645adab0915f3c98c5dfcee15764224a5d7996cabbb1fe7128121835d261b506aca0a635d7eaf66c169125b92da112d7985a70c SHA512 a02af72ec4850f30cffbbfd36b4b1ae7bf8dd0157fdf79cc89aa78dcce3289f4f87655e02d5a91e3015b8d71269f62a3d7cb07f9ad7a6c89738e3427fea15e46
 EBUILD gnuplot-5.5.9999.ebuild 5018 BLAKE2B 436966e02c861a919c10c8c776ff7a9117aa873cc823abbe5222bd2b8f21fd3fb0ceef6d95a109e6a7aba571953104c7d460f1cfeafafe3ff8e28528e341690c SHA512 819b6bceeeaa67e455a7894279012d713994a1fa15f1aafd8423db89f0a83099d41450517a500a3890b240e5f2bb49bfd37ae8baa17cbcfac8f3f49e040587ef
 MISC metadata.xml 1155 BLAKE2B eff192a398ceb9f9484a4fce82498a5eb657d7609c835843f964c8468c8d8a8f913e025413e4501affa15bf19c9eb7ee24153313f6d8f42b4f6f4284af081540 SHA512 1dfff9f997a870c33e455eb896949d0a379be4c20c93a92b2dc6c8495c08e98340ea1d254b40ee64c2520587869e529f7b33689fd1d157631da640179d5ed295
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 000000000000..e3da8fc40577
--- /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 000000000000..a1df2ae49952
--- /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 000000000000..db8205e4f367
--- /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-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.4.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
new file mode 100644
index 000000000000..43a0e9ca7901
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1,2,3} )
+
+inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
+	EGIT_BRANCH="master"
+	MY_P="${PN}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
+else
+	MY_P="${P/_/.}"
+	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="gnuplot"
+SLOT="0"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+	ggi? ( media-libs/libggi )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	libcaca? ( media-libs/libcaca )
+	lua? ( ${LUA_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5=
+		dev-qt/qtgui:5=
+		dev-qt/qtnetwork:5=
+		dev-qt/qtprintsupport:5=
+		dev-qt/qtsvg:5=
+		dev-qt/qtwidgets:5= )
+	readline? ( sys-libs/readline:0= )
+	libcerf? ( sci-libs/libcerf )
+	wxwidgets? (
+		x11-libs/wxGTK:3.0-gtk3[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:3 )
+	X? ( x11-libs/libXaw )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-langgreek
+		app-text/ghostscript-gpl )
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV##*.} = 9999 ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am
+		done
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	eautoreconf
+
+	# Make sure we don't mix build & host flags.
+	sed -i \
+		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
+		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
+		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
+		-e 's:@CC@:$(CC_FOR_BUILD):' \
+		docs/Makefile.in || die
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	if use wxwidgets; then
+		WX_GTK_VER="3.0-gtk3"
+		setup-wxwidgets
+	fi
+
+	tc-export CC CXX			#453174
+	tc-export_build_env BUILD_CC
+	export CC_FOR_BUILD=${BUILD_CC}
+
+	use qt5 && append-cxxflags -std=c++11
+
+	econf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_with gd) \
+		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with libcerf) \
+		$(use_with lua) \
+		$(use_with regis) \
+		$(use_with X x) \
+		--enable-stats \
+		$(use_with qt5 qt qt5) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="https://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	export VARTEXFONTS="${T}/fonts"
+
+	emake all
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		if use cairo; then
+			emake -C docs pdf
+		else
+			ewarn "Cannot build figures unless cairo is enabled."
+			ewarn "Building documentation without figures."
+			emake -C docs pdf_nofig
+			mv docs/nofigures.pdf docs/gnuplot.pdf || die
+		fi
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+
+	local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
+		use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information."
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+	fi
+
+	if use doc; then
+		# Manual, FAQ
+		dodoc docs/gnuplot.pdf FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+src_test() {
+	emake check GNUTERM="dumb"
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.1.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.1.ebuild
new file mode 100644
index 000000000000..950ae5c01fca
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.4.1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
+	EGIT_BRANCH="master"
+	MY_P="${PN}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
+else
+	MY_P="${P/_/.}"
+	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="gnuplot"
+SLOT="0"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+	ggi? ( media-libs/libggi )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	libcaca? ( media-libs/libcaca )
+	lua? ( dev-lang/lua:0 )
+	qt5? (
+		dev-qt/qtcore:5=
+		dev-qt/qtgui:5=
+		dev-qt/qtnetwork:5=
+		dev-qt/qtprintsupport:5=
+		dev-qt/qtsvg:5=
+		dev-qt/qtwidgets:5= )
+	readline? ( sys-libs/readline:0= )
+	libcerf? ( sci-libs/libcerf )
+	wxwidgets? (
+		x11-libs/wxGTK:3.0-gtk3[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:3 )
+	X? ( x11-libs/libXaw )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-langgreek
+		app-text/ghostscript-gpl )
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+)
+
+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
+}