gentoo resync : 29.01.2021

12 files changed, 76 insertions, 565 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index ada887d13e8f..26e34268abf8 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index fd5fff0aee7b..c06589d7bcef 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,13 +1,6 @@
 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.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
-DIST gnuplot-5.2.8.tar.gz 5340677 BLAKE2B 169f5bef44a64b3b7a5be40e28ea22ef24ebc7526fe13ab09e16495453c3922712603d63a03c3b4332368d2ae8cbe4ef57ec53e18bbb4ad2cde13e4cc534245a SHA512 513dff15236dcb58c3c5471cdaa0713242787dbf30ef860c3f69152cb87c6392e4973caff5eb178707bbb84c78548e806b2920864a37686bce49425fbfdc4e8c
 DIST gnuplot-5.4.1.tar.gz 5608076 BLAKE2B 7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d SHA512 2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121
-EBUILD gnuplot-5.2.8-r1.ebuild 5940 BLAKE2B 9d751dc53aab6962abddf00a6ed2cd3e81f4209e44c53f98557008064f161e59d9cda539b0d48a17d1162a1434733309a980bcd3a0684f9dd8281bb70c04e42e SHA512 de812a104a4af1d40b127b2cccd575dee25989b58f39d01539fb73283370b787287b2aead7e2c3016c38a2ca8370e84b39bd4d756b4941a5e7774840f20dea94
-EBUILD gnuplot-5.4.1-r1.ebuild 5128 BLAKE2B c187b29dd7f51da18774796cf0042484aa41b38008a3248d0a4702c26a987ef9296b913d67844ebc28acfc25f5153289e5d2f35247300b1f65efc285030280d4 SHA512 68fbb665f13f0c6dee4e7c454e5f50858e6fca2211c1af644ed05aedd2a63a587b05277dce5643a1e39dd2b4a809cd6fcab1d4261393af89bfafcb201a65f68c
+EBUILD gnuplot-5.4.1-r1.ebuild 5121 BLAKE2B eb8ccc8f5efc3351dc29045c2868778156c1f25495f916c2cca18434bb64a2b28159852784d81109ad219fad01c6665b9e33b7aea5367f24cd494f88b48701e9 SHA512 71c2561e1576f7859864eea33e56565a5493433b300aacfbd6d392ed049e5157b6c99d4fac3891ec7c691df2e597a5f91b176d160d9385cc02f654262d59c4d2
 EBUILD gnuplot-5.5.9999-r1.ebuild 5129 BLAKE2B d740fb7e7aed7424aa82004a7cfbfac5474117a2160e0fd39164b0adba5948dda63c81083c13ee48c94256e56edddb97add8c76041bb6cb8c71d18a1ef805df3 SHA512 876fb7792dc31c27b204ad2a30c6333905c99c03126d3edbf517dfabad870169d42df5ccce7aed3e66dde9dd699abba7a347ea4513436c1724438bca0967180d
-EBUILD gnuplot-5.5.9999.ebuild 4998 BLAKE2B c8be0e0eb2cc5ead74c2c7e5a66714c6b5e81ea534d793f29e8a272e30c087065298ebc6b32a27b39efc76ac50f7cf385b664246c2f192acf3dc9d5c3f4d0192 SHA512 ed7c483a05453c59bd100b3df785e46536468915ff5b5203c2e7c5347f5a7141d4cb5d30442f55ce8ea2eeb3ffd8aa635155d8450051ddd82ccb26cc9191fd7c
-MISC metadata.xml 1155 BLAKE2B eff192a398ceb9f9484a4fce82498a5eb657d7609c835843f964c8468c8d8a8f913e025413e4501affa15bf19c9eb7ee24153313f6d8f42b4f6f4284af081540 SHA512 1dfff9f997a870c33e455eb896949d0a379be4c20c93a92b2dc6c8495c08e98340ea1d254b40ee64c2520587869e529f7b33689fd1d157631da640179d5ed295
+MISC metadata.xml 1069 BLAKE2B 2f42ec584b402482270c5f975c6001702f2d5cf367e9f86c190af4b91d97e3c807434e1963a5e1ed856751f592cf1d28cc25897674f92894409497b173e84e8a SHA512 7433f704ff9bee279a70346522595532c221462a915acedb44be85838a472c8a064670a31f72792d10df038b96595e61788c625614a691e956840b39fc063feb
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch
deleted file mode 100644
index 613a028ee79b..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Add configure option for ReGIS support.
-https://bugs.gentoo.org/643888
-
---- gnuplot-5.2.2-orig/configure.ac
-+++ gnuplot-5.2.2/configure.ac
-@@ -1057,6 +1057,13 @@
-   AC_DEFINE(HAVE_MIF,1,
-           [ Define to include support for mif terminal ],))
- 
-+dnl ReGIS terminal
-+AC_ARG_WITH(regis,dnl
-+[  --with-regis            ReGIS terminal])
-+AS_IF([test "x${with_regis}" = "xyes"],
-+  AC_DEFINE(HAVE_REGIS,1,
-+          [ Define to include support for ReGIS terminal ],))
-+
- AC_ARG_WITH(cairo,dnl
- [  --without-cairo         cairo-based terminals (default enabled)],,
-   [test -z "${with_cairo}" && with_cairo=yes])
-@@ -1350,6 +1357,12 @@
-   AC_MSG_RESULT([  mif terminal: no   (use --with-mif to enable)])
- fi
- 
-+if test "$with_regis" = yes; then
-+  AC_MSG_RESULT([  ReGIS terminal: yes])
-+else
-+  AC_MSG_RESULT([  ReGIS terminal: no (use --with-regis to enable)])
-+fi
-+
- if test "$is_msdos" = yes; then
-   AC_MSG_RESULT([  svga terminal (MSDOS/djgpp): yes])
- fi
---- gnuplot-5.2.2-orig/src/term.h
-+++ gnuplot-5.2.2/src/term.h
-@@ -182,7 +182,7 @@
- #endif
- 
- /* REGIS graphics language */
--#ifdef VMS
-+#if defined(VMS) || defined(HAVE_REGIS)
- # include "regis.trm"
- #endif
- 
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.8-caca.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.8-caca.patch
deleted file mode 100644
index 2ce464f04499..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.8-caca.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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.2.8-double-free.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.8-double-free.patch
deleted file mode 100644
index e3da8fc40577..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.8-double-free.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index a1df2ae49952..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.8-font-syntax.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index b04efa536360..000000000000
--- a/sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2021 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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
index b77e03e04fcc..b9535e91c7e2 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
@@ -19,7 +19,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}"
diff --git a/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild
deleted file mode 100644
index b2dc905de831..000000000000
--- a/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2021 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 ~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"
-
-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
-}
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index b258754a4c25..c3e53e3e4a6c 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -16,8 +16,6 @@
   primarily for the visual display of scientific data.
 </longdescription>
 <use>
-  <flag name="compat">Enable backwards compatibility with version 4
-    syntax</flag>
   <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
diff --git a/sci-visualization/gr/Manifest b/sci-visualization/gr/Manifest
index 532ca679876b..fdfa84c7b347 100644
--- a/sci-visualization/gr/Manifest
+++ b/sci-visualization/gr/Manifest
@@ -1,4 +1,6 @@
 AUX gr-0.50.0-qt-5.15.patch 652 BLAKE2B 0d945a678acf7e457ca848da770f442caa0e64dba984c073cf394903f08548e668935d4333f574429f93f415e2b74a225573f9aa0da594bd9358c79ca4fb94c2 SHA512 fc85ff4227c257cffe05925095d54451793f899013f9123bf5cc480ea2bb5e267a5067b862feebb000cee9a34781c283ad83fc8adee3b5ec9689d12c37699a5e
 DIST gr-0.50.0.tar.gz 8612608 BLAKE2B 70f4a3c6ce1dac8556646a1632667e6e464a5048f3c44fb689709e3e8218e8d7375db6ff8ce73e11dbeda559fb27c83b7f2b42f0ab518df9b464c8443748c30e SHA512 34ca077ae729e6eda0e5df7046811c77d717f3ef0e34203d6ab3a7f4b67b3aa058a68b9b2d7d78adc8b2f0830a0298778198a6499bd3d6e5697e4b7270cb648a
+DIST gr-0.53.0.tar.gz 19267451 BLAKE2B bd243fac9df6222c4b9e3591adfcd1d37dd41628719bd7be7ab385402f0f97e21f3eb23df3ae5d2ed3e43df2b3d83ff66f4e0b478d717772b57dce5885a98721 SHA512 49eee39fd4abd62d6794a16eb023688a525f6906054610dccd85c1b7b0bed9b198d923834cbf661099f753ec40b383a911c295f781420aeead712c5712583c80
 EBUILD gr-0.50.0-r2.ebuild 1984 BLAKE2B b6f1531d964c7b12633307e7400a555f420d62eb1f3e57fd621eaaf3efb9f6794f2924503a90e17f92271be3615982d6aaa6070aaf3464e06a717e5e4f478ce0 SHA512 62916f101a242364486e08e1721ed7ee425384df24587dfed7c1e5953280dc4fe9a71dd0c6af0bac401cfdd2336700c341ce42885c457b3f90c189bd32bc1041
+EBUILD gr-0.53.0.ebuild 1937 BLAKE2B eb7718c932a535565fb7d45aadcc03a541aa81ba8fd26b97f578cca449336ab5fc816b87f5ec06bd0adf2595091581e51cf85c2d1d0c126b1860c951833bffa2 SHA512 fe855727e6fe3dc6a6d752f99d47a0e299bccc0dbeae7f7c6f13022178a5f33a42e71958b865942817d3a9148434786accf595e98ee5bfb9bd92ee678a850d93
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/sci-visualization/gr/gr-0.53.0.ebuild b/sci-visualization/gr/gr-0.53.0.ebuild
new file mode 100644
index 000000000000..dbdaaca1611b
--- /dev/null
+++ b/sci-visualization/gr/gr-0.53.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Universal framework for cross-platform visualization applications"
+HOMEPAGE="https://gr-framework.org/"
+SRC_URI="https://github.com/sciapp/gr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo ffmpeg postscript tiff truetype"
+
+DEPEND="
+	dev-qt/qtgui:5
+	media-libs/fontconfig
+	media-libs/glfw
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/qhull:=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXt
+	cairo? ( x11-libs/cairo )
+	ffmpeg? ( media-video/ffmpeg:= )
+	postscript? ( app-text/ghostscript-gpl )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_configure() {
+	use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= )
+	use postscript || mycmakeargs+=( -DGS_LIBRARY= )
+	use ffmpeg || mycmakeargs+=( -DFFMPEG_INCLUDE_DIR= )
+	use truetype || mycmakeargs+=( -DFREETYPE_LIBRARY= )
+	use tiff || mycmakeargs+=( -DTIFF_LIBRARY= )
+
+	# todo: X11 automagic
+
+	mycmakeargs+=( -DCMAKE_INSTALL_PREFIX=/usr/gr )
+	#
+	# I need to have a serious conversation with upstream.
+	# * The main consumer of this package is dev-lang/julia.
+	# * If I patch gr to install in standard locations, julia does
+	#   not find it anymore.
+	# * I can't patch julia, since the corresponding scripts are
+	#   downloaded at runtime from its package registry ...
+	#
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	find "${ED}" -name '*.a' -delete
+
+	echo "GRDIR=/usr/gr" > "${T}/99gr"
+	echo "LDPATH=/usr/gr/$(get_libdir)" >> "${T}/99gr"
+	doenvd "${T}/99gr"
+
+	[[ -f "${ED}/usr/gr/bin/gksqt" ]] && dosym ../gr/bin/gksqt /usr/bin/gksqt
+
+	elog "${P} relies on the environment variable GRDIR. If you want to use it in a running shell,"
+	elog "e.g. with dev-lang/julia, then run \"source /etc/profile\" first."
+}