9 files changed, 237 insertions, 164 deletions
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 7c5b0a08fb39..eb0c631adc11 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index 190e3d11d553..def9ccef6e11 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -1,8 +1,5 @@
 AUX 50epix-gentoo.el 298 BLAKE2B 236677e59724ddda6cca138c5e049250798a249373558caa1d2f85b432710352d86cf4c4a90ac4556da4857d5aa4bbf2dbae816a2338808a6a79d44eed0fcd75 SHA512 7033d169194cffe4265569f1b048e9ec1929dc98257eb4fb63f486be1ab8162e80fa75fd3943c81b5f9a8eb0e13665e66852ef1f9fbf7cfaee949f5d56fbe9a3
-AUX epix-1.2.10-autotools.patch 2701 BLAKE2B 1478b23499deda305b94b26e9b680131bcecf6dc633d35187f9e9fc3fa7ee500e6b679eb6ade85564b631e7d207c3e0c0cb4ee1caf42779ff1477e1a55e5fd31 SHA512 c94beae67c28ceff6cd4445272574e6cb93f4c181cddb4023587d20e2fed1bea523891191f80b6dd8870f167cbcae2567cd014b6a20aafbb6a74624c76e54cac
 AUX epix-1.2.19-autotools.patch 2020 BLAKE2B 0b5df14c1e31526aadb6bd06ed979616c0ad91fa2555d0b77617eb37aeb902c3d9ac25dacadd3306bd0e6674bef1b9a4a75b1207b9a7ca6289635de5b94f9319 SHA512 f4d2c959031dda084d69c9c89ded0a05b4329819dd420f164a64c763c0917d0a6041ea6fb999574c0f8b640b3585f99133aca3671e02543111696fbda1d16424
-DIST epix-1.2.11_withpdf.tar.bz2 1709429 BLAKE2B db9cba5b94e27742347f8fc85366399016438681a7016077966e5048b9a178404af8305da7d170722aaac82d85283552f87fbba76b21e788fee546b0e0aebf43 SHA512 16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45
 DIST epix-1.2.19_withpdf.tar.bz2 1757443 BLAKE2B 4c7d78f27d355e078ebbe81f9c5d9b1d342f4f04d5f91260460d0559bfb7fc8204668072c06c8d493eb739c492b2935bffd24cb77cd554cd863734b7d84ff6e1 SHA512 b51821256ccaf9957562964b1342ee1656d1d8456081869797d8c704df3098d2643135767987b0673aa64a16703cb2e21deea4aef7d1598e67b9661b98245cda
-EBUILD epix-1.2.11-r3.ebuild 1520 BLAKE2B 18be4038da89c7d289e5187ac9a767acc77ea0e62a1389d168ca79d5a9e78976f11ce1fd2179067471da4c5d819016553fcefeaa21513456f309f4540c8cea41 SHA512 3f9fecddb0699610577dd3ff8215b2be5ac6abb012e8867535cd86ee67bc065268c3cf26af0fdb35963c8bf8e42df48acc1ad71a2f01cc97a13b86d1ea9739f7
 EBUILD epix-1.2.19.ebuild 1477 BLAKE2B f1b458cdf291afa763f6c16bfc1dbc324830e028fe39ce7688243e91a9dd300c850204f442cb521ea82f5e6c84b48fe06da230d524e26307b3865ff9c6490c1c SHA512 6f2305b8c80ae42171eb3f2cba0e5ad61c3bdcb970b9c74e57beba7e731c6eb98fff7ff08f8e88498fe22f30df1f0c3e82ae6a851ce09d36044eb79738e44e15
 MISC metadata.xml 779 BLAKE2B 2e6405de37d7ed3e85eb865d140a599b1de484f9cc5c35eda7be384259b34bbed06aa84dffc8a5b1b05c6db18a5d0bd1b0f28c9969a8aac933582bf0d1c9cc2a SHA512 b0cb62a782873b0e2e115f18495f520f3fb5cf06052d6fdae023a65a3a40fb2eaf355ffacf0243149d9890d8f56be87dbbdaf459b05ae32b877037e7ff2bc5e9
diff --git a/sci-visualization/epix/epix-1.2.11-r3.ebuild b/sci-visualization/epix/epix-1.2.11-r3.ebuild
deleted file mode 100644
index 747862885521..000000000000
--- a/sci-visualization/epix/epix-1.2.11-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp-common bash-completion-r1 autotools epatch
-
-DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
-HOMEPAGE="https://mathcs.holycross.edu/~ahwang/current/ePiX.html"
-SRC_URI="https://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc emacs examples"
-
-DEPEND="
-	virtual/latex-base
-	dev-texlive/texlive-pstricks
-	dev-texlive/texlive-pictures
-	dev-texlive/texlive-latexextra
-	dev-texlive/texlive-latexrecommended
-	emacs? ( >=app-editors/emacs-23.1:* )"
-RDEPEND="${DEPEND}"
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.10-autotools.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-epix-el
-}
-
-src_install() {
-	default
-	if use emacs; then
-		# do compilation here as the make install target will
-		# create the .el file
-		elisp-compile *.el || die "elisp-compile failed!"
-		elisp-install ${PN} *.elc *.el || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	newbashcomp bash_completions epix
-	bashcomp_alias epix flix elaps laps
-	if use doc; then
-		dodoc doc/*gz
-	fi
-	if use examples; then
-		cd samples || die
-		docinto examples
-		dodoc *.xp *.flx *c *h README
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-visualization/epix/files/epix-1.2.10-autotools.patch b/sci-visualization/epix/files/epix-1.2.10-autotools.patch
deleted file mode 100644
index 03f93cd26c9c..000000000000
--- a/sci-visualization/epix/files/epix-1.2.10-autotools.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -Nur epix-1.2.10.orig/configure.ac epix-1.2.10/configure.ac
---- epix-1.2.10.orig/configure.ac	2012-11-29 21:04:20.411280150 -0800
-+++ epix-1.2.10/configure.ac	2012-11-29 21:14:00.462163755 -0800
-@@ -9,6 +9,7 @@
- dnl Checks for programs.
- AC_PROG_CXX
- AC_PROG_LN_S
-+AM_PROG_AR
- AC_PROG_RANLIB
- AC_PROG_MAKE_SET
- AC_PROG_INSTALL
-diff -Nur epix-1.2.10.orig/doc/Makefile.am epix-1.2.10/doc/Makefile.am
---- epix-1.2.10.orig/doc/Makefile.am	2012-11-29 21:04:20.414280167 -0800
-+++ epix-1.2.10/doc/Makefile.am	2012-11-29 21:04:30.491329674 -0800
-@@ -1,7 +1,7 @@
- # Makefile.am for ePiX v1.x "doc" directory
- #
- 
--EPIXFLAGS = --no-defaults -I.. -L.. -lepix -v
-+EPIXFLAGS = --no-defaults -I.. -L.. -lepix -q
- 
- %.eepic: %.xp
- 	../epix-local $(EPIXFLAGS) $<
-@@ -13,13 +13,13 @@
- CLEANFILES = *~ *.aux *.dvi *.log *.out *.toc \
- 	*.fdx *.flg *.fnd *.idx *.ilg *.ind \
- 	epix.info epix.info.bz2 manual_src.tar manual.pdf manual.ps \
--	manual_src.tar.gz manual.pdf.gz manual.ps.gz manual-stamp
-+	manual_src.tar.gz manual.pdf manual.ps.gz manual-stamp
- 
- MAINTAINERCLEANFILES = *.eepic *.aux *.dvi *.log *.out *.toc \
- 	*.fdx *.flg *.fnd *.idx *.ilg *.ind
- 
- ## Targets ##
--doc_DATA = manual.pdf.gz manual.ps.gz manual_src.tar.gz
-+doc_DATA = 
- 
- info_TEXINFOS = epix.texi
- 
-@@ -42,8 +42,7 @@
- 	gzip -9 -c manual.ps > manual.ps.gz
- 
- #PDF
--manual.pdf.gz: manual-stamp
--	gzip -9 -c manual.pdf > manual.pdf.gz
-+manual.pdf: manual-stamp
- 
- epix.info: manual-stamp epix.texi
- 	makeinfo epix.texi 2>&1 >/dev/null
-diff -Nur epix-1.2.10.orig/Makefile.am epix-1.2.10/Makefile.am
---- epix-1.2.10.orig/Makefile.am	2012-11-29 21:04:20.415280173 -0800
-+++ epix-1.2.10/Makefile.am	2012-11-29 21:05:52.489734436 -0800
-@@ -56,7 +56,7 @@
- 
- EPIX_CONFFILES = bash_completions $(EPIX_EL)
- 
--EPIX_NOTEFILES = AUTHORS BUGS ChangeLog COPYING INSTALL NEWS POST-INSTALL \
-+EPIX_NOTEFILES = AUTHORS BUGS ChangeLog NEWS POST-INSTALL \
- 	README THANKS VERSION
- 
- EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \
-@@ -85,11 +85,6 @@
- 	    -e 's%@RUNTIME_COMPILER\@%$(CXX)%;' $< > $@-local
- 	chmod a+x $@ $@-local
- 
--# libepix.a
--libepix.a: $(libepix_a_OBJECTS)
--	ar -ru libepix.a $(libepix_a_OBJECTS)
--	$(RANLIB) libepix.a
--
- # object file dependencies
- $(libepix_a_LIBADD): %.o: %.cc %.h
- 
-diff -Nur epix-1.2.10.orig/samples/Makefile.am epix-1.2.10/samples/Makefile.am
---- epix-1.2.10.orig/samples/Makefile.am	2012-11-29 21:04:20.416280179 -0800
-+++ epix-1.2.10/samples/Makefile.am	2012-11-29 21:04:30.491329674 -0800
-@@ -7,7 +7,7 @@
- CLEANFILES = *~ *.eepic *.eps sample_src.tar sample_src.tar.gz sample-stamp
- 
- ## Targets ##
--doc_DATA = sample_src.tar.gz
-+doc_DATA =
- 
- 
- # tar up tex, xp, and eepic files
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 477817067f55..7f5c89e95517 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,7 +1,10 @@
 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.5-no-picins.patch 830 BLAKE2B 8e0a303ff5306f3afa07a585b220fe65440432c455710fc5abd67f7afe73dc923e5b796a3dc184f2195709a9def277933678c05c804cebd9686a6b0353f9a53b SHA512 9ca6c6f53a4940cda8634078556052be966a7f62d1b33566ce42dad066265b65970034f38c0abff66230531b49af4feda5301f6af270b0dd622b28b251b3cf5a
 DIST gnuplot-5.4.1.tar.gz 5608076 BLAKE2B 7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d SHA512 2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121
+DIST gnuplot-5.4.2.tar.gz 5640202 BLAKE2B 42bdbe569a4dcd9e65010aff3d0b7428f1c3485bc64429ac0f2c4f157d43c4d640aa2b191430428ec01cb289bd1d43eb95b4167b5b9d236002d54e48b45c0a2a SHA512 e69ca74335cdd69c6013a254ac785dc67cc82713308460971cf6e0a66438716d8892a37344611d1841563efbc4b2b8c5692c13c7b06cff4f30f8d43e2ddfd7d4
 EBUILD gnuplot-5.4.1-r1.ebuild 5059 BLAKE2B 1dcb458413bc167a7a1329f2d1fac9c6a25959ca8aafc4f38c2b73753fab7e4627a54d13bd166a40307b1e75e5cd8289b5b8028339181b9587b1d3e5ce102bce SHA512 b5e459e9e8fa0332e92e190dad95ce1f26abfa8f9d4f1982853a8c546cd6ef492132363624065b4a3457f9fae4ae03a90c06a9be8597407c20d46e741aa55701
-EBUILD gnuplot-5.4.1-r2.ebuild 5099 BLAKE2B 13d76018e6800afca391f71a1820a322b57ef0e61fd4a38a1a04258a185ea01d97edc18f621842b799b5f9fd24101379d785fd58a3d751029cb777da2245afeb SHA512 a912f8ca065989a4861539ffda711960df8804ca7fc84c50891f8454104ef539be2d47299ec938667a0fdceaa2ba8dde58963ed1c2d1e9c883c2f8bf5d97f3d2
-EBUILD gnuplot-5.5.9999-r1.ebuild 5100 BLAKE2B 951612f52afede49d5a93e906c063c70e5f97342f5586aa124ea79525d73b10faef7c346f5f32a7b5f48b0357d9a02ed9b25af20c26f3b42262e29439a55402f SHA512 edbfda82aacefeea9d37ecd2ec7520b5e36d1a5b2d15c9c83ebb5002f485d223e0243e45799306772a7d57a15a07282d9e03d369c793f198e8fef7214c304f01
+EBUILD gnuplot-5.4.1-r2.ebuild 5032 BLAKE2B f227bcfb3aef159975741fcbcc0b4bf0c1940ed2a61a2f0567345b5a8076437bcf6149ba692bf5aa7fe71e0ce60ed739ebd4a52858efee706b39659158bff3b0 SHA512 5def29205ad1b282712504fee79e6af6775ecd50efae33b02a632ae3919250f50ae0f4db83966a011d1b77e7445c0c42f621ecd3a74428899d5fdcc14a12616e
+EBUILD gnuplot-5.4.2.ebuild 5043 BLAKE2B 278deea5ef23c753a9b73a42a7ec98973262539fda381c140346664748f6c8e54f88c3d352785328dc704ada430767c1f7d738d421b50240f49a525ca08dbc7b SHA512 1d9a0e53ec54380aa4a78d8f20a91ad781408f20207f7b34e709d8d5d73b49c9d383bdd9827381fd814cef31fc62ae63766e0fd7332f7445cfd30a814349be79
+EBUILD gnuplot-5.5.9999-r1.ebuild 5042 BLAKE2B ad1833f11cd70e7539d65162194801c762aeb18e55f2a8195644d5608527d4bea9d96371f663e04b96d6e939e80b8197eaf19213bf7617f04595ec9733c3f781 SHA512 17a5acb1030671a56a9bfa8c7d46ed6b3f892258b3eb313946e6da1d3f9cb37fcc696e65d7d57a3aa7b5d8c8071c4369d1ab3de40b2704bd9dcee60299e3e4a4
 MISC metadata.xml 1069 BLAKE2B 2f42ec584b402482270c5f975c6001702f2d5cf367e9f86c190af4b91d97e3c807434e1963a5e1ed856751f592cf1d28cc25897674f92894409497b173e84e8a SHA512 7433f704ff9bee279a70346522595532c221462a915acedb44be85838a472c8a064670a31f72792d10df038b96595e61788c625614a691e956840b39fc063feb
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch b/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch
new file mode 100644
index 000000000000..b27b0bd941bd
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch
@@ -0,0 +1,18 @@
+Do not require picins.sty.
+https://bugs.gentoo.org/577828#c4
+
+--- gnuplot/docs/Makefile.am
++++ gnuplot/docs/Makefile.am
+@@ -179,9 +179,10 @@
+ 	$(AM_V_at)GNUPLOT_LIB=$(top_srcdir)/demo $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu
+ 	  rm -f gpinsetfigure.tex ; \
+ 	  ( echo "\usepackage{graphicx}" > gpinsetfigure.tex ; \
+-	    echo "\usepackage{picins}" >> gpinsetfigure.tex ; \
+ 	    echo "\newcommand{\gpinsetfigure}[1]{" >> gpinsetfigure.tex ; \
+-	    echo "  \parpic[r][rt]{\includegraphics[width=3in,keepaspectratio]{#1}}" >> gpinsetfigure.tex ; \
++	    echo "  \begin{figure}[htb]" >> gpinsetfigure.tex ; \
++	    echo "  \centering\includegraphics[width=3in,keepaspectratio]{#1}" >> gpinsetfigure.tex ; \
++	    echo "  \end{figure}" >> gpinsetfigure.tex ; \
+ 	    echo "}" >> gpinsetfigure.tex ; \
+ 	  ) ; \
+ 	$(AM_V_GEN)touch $@
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
index 1dd56629fad6..bb76d9370665 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-{1,2,3} )
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
+inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
@@ -20,7 +20,7 @@ if [[ -z ${PV%%*9999} ]]; then
 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -75,7 +75,6 @@ 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
 )
 
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.2.ebuild
new file mode 100644
index 000000000000..128d9bc70f61
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.4.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 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.0-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="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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:${WX_GTK_VER}[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 )"
+
+IDEPEND="latex? ( virtual/latex-base )"
+
+GP_VERSION="${PV%.*}"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+PATCHES=(
+	"${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
+
+	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 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 "${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/gnuplot-5.5.9999-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
index 306871a94a96..f2904c7651db 100644
--- a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-LUA_COMPAT=( lua5-{1,2,3} )
+LUA_COMPAT=( lua5-{1,2,3,4} )
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
+inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
@@ -70,13 +70,13 @@ BDEPEND="
 		app-text/ghostscript-gpl )
 	qt5? ( dev-qt/linguist-tools:5 )"
 
+IDEPEND="latex? ( virtual/latex-base )"
+
 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}"/${PN}-5.5-no-picins.patch
 )
 
 pkg_setup() {