gentoo resync : 25.11.2020

11 files changed, 267 insertions, 346 deletions

diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 45eb106bae8a..8da43b70ae6f 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,13 +1,14 @@
 AUX gnuplot-5.0.1-fix-underlinking.patch 483 BLAKE2B 1719635d947a5d53fa5b6def65286aa1064e5a80d36d42670890bdda7dc849add342e3574dbee85f0546d953491271354c6946cc157207af700ab1cfde6d0249 SHA512 b5ac3ed830f201ba6018a81bc4860e6da0e41cc9cdc1ac8acc225bf41a0006cbd6e2f8e061ab2bd013ad55b105a02e915e256a09ca4e4faaf4791ea1c3199f28
 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.6-caca.patch 385 BLAKE2B 33607e93cf59c6774892df7588c843c9c03b2ee561a6bf5d8e58e18ef62edd5b5b2eab77360a99e94640eda81963b38a683cf5598f02f72774da81d56317250c SHA512 913e9df29f8ad3f97abd06cb9ae5d259b423f05ac96855be658d2b000227e6a578e7fd9279377353e45c929020b3f2303e28549e2096866c5d250705a4d08a7d
-DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
-DIST gnuplot-5.2.7.tar.gz 5335673 BLAKE2B 6ca3055f6bb2e032562c7f21beda0adca1087598c7bacc9ab187c7ea4a3d85e08598ddb0ff0660bca081bc17899dbb92bbfbb6acde8b7b5367f12da7a2a14b62 SHA512 f6b77e16b25e5705ea9dad4f89ed5f5a3cf95d3e4215da00be3cbfbcdeee23009e9205156399448526783f25b5b7599b674670c94c01345abafeff74f6c7de93
+AUX gnuplot-5.2.8-caca.patch 872 BLAKE2B e1aa8bf4fa17fd1d7e43a539e0691c63e647a4a6d7998b0cc01fdcacb56584fc4c5802cb236d5f2a485d3c89ff564345ec24398832e8a114432589a6ab0a01bb SHA512 7398bc7554311cec09bb4ab80e439a79e60410e376d567e858c1207051305195fdd47906db825fb281de6aa58bbbfda88ff2853ac01ea96cdd0496dbff0460db
+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
-EBUILD gnuplot-5.0.7.ebuild 5772 BLAKE2B fdf5b221701cd90e4dd63b7388cd3d0d7eb6b42e14d915d3c43e42bc26daf74b472a796f66223a7fd21ca835d0dcc42946f365f76a6dc5409e6c1c194ab70a3d SHA512 174d485b762c6402020bb3ee3112469ee71ede3a4d3ed3b14deaa6097066b9859e00ddbdb0bb384c4c5022806daae7e1b9d355643eafb6bb58e58006e19d10de
-EBUILD gnuplot-5.2.7.ebuild 5835 BLAKE2B 2e24c5555898aef38fcb45bf64cafe6a055d55377875d5d6ab60ff33a62570c71dc278b912b846349b4951bcd7dcbebc7babcb2064b3c54ebf67d403da768a33 SHA512 3549d714307ce3ab441e210a6e56ef9aa862240be2893e00254554bad570123666d1674a997eaa82582319c591f8fbb287f5d6748b1897db6426d8481c9e877f
-EBUILD gnuplot-5.2.8.ebuild 5846 BLAKE2B bab2b43ebecd6c0f7c7e5eea2755d693de289dd9e2759ad2d72e21e00aa1de6932231713b89b78b996570542cc20eafcdc154cc2b2b9f607892d4f9170b14dcc SHA512 8f76e36609bda84fb49ac2586e39824d5ac6183b3b4b92874a3fdb8e5db92e00e8b32e7e8c9a80d4a99cb982f33e15624532702ea1729a0f05310c78c931198e
-EBUILD gnuplot-5.2.9999.ebuild 5742 BLAKE2B 454aafd7166509cccd7711eeb54b2c0af3bbe136d235f5581a8d495944126f9ea4c8d201af1f02aa474a55a31bf023e5f59e61419ac44f4a7c698408b3306908 SHA512 dd5e3197892c2cc99d6fa41230286a3baa62ec67a6c5d2354ba2575ad04b6e779ae601674e11186e485ea34e7561720bbd1e87825af0f272bf14637146120939
-EBUILD gnuplot-5.3.9999.ebuild 5089 BLAKE2B 26f13dee72d3af9a555278fe3be6e5315f66b522f171e08e21fceaa2bb10b82f3895a7f57f12ad7e648b5907a0c161a997196a77655e9fa169a7a909d73d100b SHA512 06d013fc5ba85f85724b077831982e078ea9aa2db41160c6cf5d7f7b7671e5620d854af6af08d765b1ac4eb8b58e8777413e5bf72e9278f43106b04db10d62b9
+DIST gnuplot-5.4.0.tar.gz 5622595 BLAKE2B e42011fa49ba0440436a406737f03ad55359b337dce359c62c1b4f536f70ca07126cf04e3e0eef6e4b22340dfb0318f6890d7814ad55b38d60ee24a4bc570ca1 SHA512 abbb69ded9eed3a1e53caeeb7d75ee4e3532b1254640a3f38f00260e261e75f87744e3df4210b0db7c8c2acee9b25147524d5377b3f4305e2449b2e99ca58d66
+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.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.6-caca.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch
deleted file mode 100644
index 4441e4b8c036..000000000000
--- 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 000000000000..2ce464f04499
--- /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 000000000000..f92ac93ab018
--- /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/files/gnuplot-5.4.0-no-mouse.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch
new file mode 100644
index 000000000000..8133c3516edf
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch
@@ -0,0 +1,27 @@
+From cfd9ff9408949ee58be9ba5a18b74ce4562f374a Mon Sep 17 00:00:00 2001
+From: Ethan A Merritt <merritt@u.washington.edu>
+Date: Fri, 6 Nov 2020 13:06:21 -0800
+Subject: [PATCH] make sure warning message about no mouse support is non-fatal
+
+Bug #2350
+---
+ src/set.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/set.c b/src/set.c
+index a697925bc..a6acf8fc6 100644
+--- a/src/set.c
++++ b/src/set.c
+@@ -3130,7 +3130,8 @@ set_mouse()
+     PM_update_menu_items();
+ #endif
+ #else /* USE_MOUSE */
+-    c_token++;
++    while (!END_OF_COMMAND)
++	c_token++;
+     int_warn(NO_CARET, "this copy of gnuplot has no mouse support");
+ #endif /* USE_MOUSE */
+ }
+-- 
+2.29.2
+
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch
new file mode 100644
index 000000000000..aa98f27dc2b2
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch
@@ -0,0 +1,40 @@
+From 87034e509b366078b746a3a70e05aaf497e34585 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
+Date: Fri, 6 Nov 2020 13:25:02 +0100
+Subject: [PATCH] configure.ac: move PKG_PROG_PKG_CONFIG to the beginning of
+ the file
+
+Bug #2349
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67ad1396c..606242ea3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,6 +88,10 @@ AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,[
+ #include <sys/types.h>
+ #include <time.h>])
+ 
++dnl explicit call to PKG_PROG_PKG_CONFIG because the first call to
++dnl PKG_CHECK_MODULES{,_NOFAIL} may not happen
++PKG_PROG_PKG_CONFIG
++
+ AC_ARG_WITH(libcerf,dnl
+ [  --without-libcerf       build without special functions from libcerf (default enabled)],,
+   [test -z "${with_libcerf}" && with_libcerf=yes])
+@@ -759,10 +763,6 @@ AC_ARG_ENABLE(raise-console,dnl
+   fi
+ 
+ 
+-dnl explicit call to PKG_PROG_PKG_CONFIG because the first call to
+-dnl PKG_CHECK_MODULES may not happen
+-PKG_PROG_PKG_CONFIG
+-
+ dnl  wxWidgets terminal
+ 
+ dnl wxWidgets terminal needs C++
+-- 
+2.29.2
+
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
deleted file mode 100644
index baf70b0bb6a8..000000000000
--- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 cvs
-	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="HEAD"
-	ECVS_USER="anonymous"
-	ECVS_CVS_OPTIONS="-dP"
-	MY_P="${PN}"
-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 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}
-	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_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."
-
-	mv configure.in configure.ac || 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"
-		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 \
-		--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 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 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
-}
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
index 29dde10c36aa..b741e27f8423 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.2.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
index 258946aad81d..47013ca921da 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
+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/"
@@ -11,18 +13,21 @@ 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"
+	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"
+	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 compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis svga wxwidgets X"
+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? (
@@ -36,8 +41,9 @@ RDEPEND="
 			dev-tex/pgf
 			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
 	libcaca? ( media-libs/libcaca )
-	lua? ( dev-lang/lua:0 )
-	qt5? ( dev-qt/qtcore:5=
+	lua? ( ${LUA_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5=
 		dev-qt/qtgui:5=
 		dev-qt/qtnetwork:5=
 		dev-qt/qtprintsupport:5=
@@ -45,35 +51,44 @@ RDEPEND="
 		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/wxGTK:3.0-gtk3[X]
 		x11-libs/cairo
 		x11-libs/pango
-		x11-libs/gtk+:2 )
+		x11-libs/gtk+:3 )
 	X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
+
+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 )"
 
-S="${WORKDIR}/${MY_P}"
-
 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
+	"${FILESDIR}"/${P}-pkg-config.patch
+	"${FILESDIR}"/${P}-no-mouse.patch
+	"${FILESDIR}"/${P}-caca.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 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_user
+	default
 
-	if [[ -z ${PV%%*9999} ]]; then
+	if [[ ${PV##*.} = 9999 ]]; then
 		local dir
 		for dir in config demo m4 term tutorial; do
 			emake -C "$dir" -f Makefile.am.in Makefile.am
@@ -84,18 +99,6 @@ src_prepare() {
 	# 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.
@@ -113,7 +116,7 @@ src_configure() {
 	fi
 
 	if use wxwidgets; then
-		WX_GTK_VER="3.0"
+		WX_GTK_VER="3.0-gtk3"
 		setup-wxwidgets
 	fi
 
@@ -128,16 +131,12 @@ src_configure() {
 		--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) \
@@ -150,47 +149,50 @@ 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
+		if use cairo; then
 			emake -C docs pdf
 		else
-			ewarn "Cannot build figures unless cairo and gd are enabled."
+			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
-		emake -C tutorial pdf
 	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 
-	dodoc BUGS ChangeLog NEWS PGPKEYS README* RELEASE_NOTES TODO
+	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*
+		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
+		# Manual, FAQ
+		dodoc docs/gnuplot.pdf FAQ.pdf
 		# Documentation for making PostScript files
 		docinto psdoc
 		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
@@ -198,7 +200,7 @@ src_install() {
 }
 
 src_test() {
-	GNUTERM="unknown" default_src_test
+	emake check GNUTERM="dumb"
 }
 
 pkg_postinst() {
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
index 4c57d268b612..a05cfa6234c7 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+	EGIT_BRANCH="master"
 	MY_P="${PN}"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
 else
@@ -20,9 +20,11 @@ else
 	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 compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline svga wxwidgets X"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
 
 RDEPEND="
 	cairo? (
@@ -46,12 +48,11 @@ RDEPEND="
 		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/wxGTK:3.0-gtk3[X]
 		x11-libs/cairo
 		x11-libs/pango
-		x11-libs/gtk+:2 )
+		x11-libs/gtk+:3 )
 	X? ( x11-libs/libXaw )"
 
 DEPEND="${RDEPEND}"
@@ -61,21 +62,26 @@ BDEPEND="
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-langgreek
 		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"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+	"${FILESDIR}"/${P}-pkg-config.patch
+	"${FILESDIR}"/${P}-no-mouse.patch
+	"${FILESDIR}"/${P}-caca.patch
+)
+
 src_prepare() {
-	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
-	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
-	eapply_user
+	default
 
-	if [[ -z ${PV%%*9999} ]]; then
+	if [[ ${PV##*.} = 9999 ]]; then
 		local dir
 		for dir in config demo m4 term tutorial; do
 			emake -C "$dir" -f Makefile.am.in Makefile.am
@@ -86,18 +92,6 @@ src_prepare() {
 	# 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.
@@ -115,7 +109,7 @@ src_configure() {
 	fi
 
 	if use wxwidgets; then
-		WX_GTK_VER="3.0"
+		WX_GTK_VER="3.0-gtk3"
 		setup-wxwidgets
 	fi
 
@@ -130,15 +124,12 @@ src_configure() {
 		--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 regis) \
 		$(use_with X x) \
 		--enable-stats \
 		$(use_with qt5 qt qt5) \
@@ -151,34 +142,37 @@ 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
+		if use cairo; then
 			emake -C docs pdf
 		else
-			ewarn "Cannot build figures unless cairo and gd are enabled."
+			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
-		emake -C tutorial pdf
 	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 
-	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* RELEASE_NOTES TODO
+	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
@@ -190,8 +184,8 @@ src_install() {
 	fi
 
 	if use doc; then
-		# Manual, tutorial, FAQ
-		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Manual, FAQ
+		dodoc docs/gnuplot.pdf FAQ.pdf
 		# Documentation for making PostScript files
 		docinto psdoc
 		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
@@ -199,7 +193,7 @@ src_install() {
 }
 
 src_test() {
-	GNUTERM="unknown" default_src_test
+	emake check GNUTERM="dumb"
 }
 
 pkg_postinst() {
diff --git a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild
index aa399503dd8b..0b2af9540d46 100644
--- a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild
@@ -20,9 +20,11 @@ else
 	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 wxwidgets X"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
 
 RDEPEND="
 	cairo? (
@@ -47,10 +49,10 @@ RDEPEND="
 	readline? ( sys-libs/readline:0= )
 	libcerf? ( sci-libs/libcerf )
 	wxwidgets? (
-		x11-libs/wxGTK:3.0[X]
+		x11-libs/wxGTK:3.0-gtk3[X]
 		x11-libs/cairo
 		x11-libs/pango
-		x11-libs/gtk+:2 )
+		x11-libs/gtk+:3 )
 	X? ( x11-libs/libXaw )"
 
 DEPEND="${RDEPEND}"
@@ -60,21 +62,23 @@ BDEPEND="
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-langgreek
 		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"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+)
+
 src_prepare() {
-	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
-	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
-	eapply_user
+	default
 
-	if [[ -z ${PV%%*9999} ]]; then
+	if [[ ${PV##*.} = 9999 ]]; then
 		local dir
 		for dir in config demo m4 term tutorial; do
 			emake -C "$dir" -f Makefile.am.in Makefile.am
@@ -85,14 +89,6 @@ src_prepare() {
 	# 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 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.
@@ -110,7 +106,7 @@ src_configure() {
 	fi
 
 	if use wxwidgets; then
-		WX_GTK_VER="3.0"
+		WX_GTK_VER="3.0-gtk3"
 		setup-wxwidgets
 	fi
 
@@ -125,12 +121,12 @@ src_configure() {
 		--with-readline=$(usex readline gnu builtin) \
 		$(use_with bitmap bitmap-terminals) \
 		$(use_with cairo) \
-		$(use_with doc tutorial) \
 		$(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) \
@@ -156,17 +152,24 @@ src_compile() {
 			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 NEWS PGPKEYS README* RELEASE_NOTES TODO
+	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
@@ -178,8 +181,8 @@ src_install() {
 	fi
 
 	if use doc; then
-		# Manual, tutorial, FAQ
-		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Manual, FAQ
+		dodoc docs/gnuplot.pdf #FAQ.pdf
 		# Documentation for making PostScript files
 		docinto psdoc
 		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
@@ -187,7 +190,7 @@ src_install() {
 }
 
 src_test() {
-	GNUTERM="unknown" default_src_test
+	emake check GNUTERM="dumb"
 }
 
 pkg_postinst() {