gentoo resync : 10.09.2021

21 files changed, 159 insertions, 255 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 61ddd596129f..0324b860c354 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/dash-core-components/Manifest b/sci-visualization/dash-core-components/Manifest
index a3d4e69b8e0e..28870a712a88 100644
--- a/sci-visualization/dash-core-components/Manifest
+++ b/sci-visualization/dash-core-components/Manifest
@@ -1,3 +1,3 @@
 DIST dash-core-components-1.16.0.tar.gz 13922229 BLAKE2B 7ca8dd411e3a8714902266b11a9f39420c7455601cdcbde81ad86690846bbf574fd0c65019f69fcb0ea86f511802eee080d1e4fca1cd88b82c9898aeb5055ceb SHA512 f2648fa8331296db812e897e2976aab1ca357f81b547dda57710773b4e0ef98019f928d5a0a6add426693550fb483c04ec7e0311318cab113f10fc5dca19e197
-EBUILD dash-core-components-1.16.0.ebuild 418 BLAKE2B c09effa0fc4233d4df9c1c5a5c8de4d49c090f6bcf3ed2ba092ef336b925289d356c3ab66768697d98286d44394b8f9e8a261a91ffaf90bc8d92f7dc6d7f42dc SHA512 89a65c79dd998917eb14b2abd8e81ad3c8a2307fb8ac7977e7da0047410bdc6864a41c20af21ddc0e73ac6c2842279a0c66ae6c0e3b08f45286623efe7f6a13f
+EBUILD dash-core-components-1.16.0.ebuild 546 BLAKE2B 6490f5c01911c2a1646a3243af55b8d43b95c62b3e83a7843c9b9c7a358c03fc591ce4bdb2273e445283a83de5b92abe7c350a667f0ed8282c34e2dd9a503091 SHA512 87c44346e605114643d9373b008a004c6859f3bd93caf3bc222b2a66509d2e0dda3e535e134105f3cd20ca6fa0f4de64b794ed232ab9913af90d306435e76888
 MISC metadata.xml 584 BLAKE2B 4d1d801a849972897ebb1a93de41956ed0dc2b2bce2ba13f5daaa0b72beb16624abd58fde1c82a9464d25e14736edd855c3008f86b6a4245a037f10f6c82bda2 SHA512 17500c8c4479700b91df59655b27532dd9291366a53d44cd83f65d2046cee84f0724a0d21482a81b24cef8ecd0800d6dab26724e319df6baa475cb05cb85311a
diff --git a/sci-visualization/dash-core-components/dash-core-components-1.16.0.ebuild b/sci-visualization/dash-core-components/dash-core-components-1.16.0.ebuild
index ec2940e44a0c..8c8eac37c2de 100644
--- a/sci-visualization/dash-core-components/dash-core-components-1.16.0.ebuild
+++ b/sci-visualization/dash-core-components/dash-core-components-1.16.0.ebuild
@@ -10,6 +10,9 @@ DESCRIPTION="Core components suite for Dash"
 HOMEPAGE="https://plot.ly/dash"
 SRC_URI="https://github.com/plotly/${PN}/archive/refs/tags/v${PV}.tar.gz
 	-> ${P}.tar.gz"
+# Test execution depends on sci-visualization/dash being installed
+# but sci-visualization/dash depends on this
+RESTRICT="test"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/sci-visualization/dash-html-components/Manifest b/sci-visualization/dash-html-components/Manifest
index 1273d7fca674..50e4766e8a4e 100644
--- a/sci-visualization/dash-html-components/Manifest
+++ b/sci-visualization/dash-html-components/Manifest
@@ -1,3 +1,3 @@
 DIST dash-html-components-1.1.3.tar.gz 375680 BLAKE2B e489d8d5fe3c832ae8be82ea1eac83b8a8c8df8b6ac9ce1d122178f63c4ce355c39195bd828e503c51605ed5e774eaff38cf16da9a1c486fd0eff404cd85694f SHA512 dfcc41ef7a52f0d5cc97db9e94b00eb7707cea7c5f95e89832d1b74a1554d9d9f9c3b5df57509fe959b06c53f2a281b7070adde45d3c19003c13983a10ca2509
-EBUILD dash-html-components-1.1.3.ebuild 420 BLAKE2B bd817f2a041a61244e910f02b6c149f38dcc8cac5059a12d59669a608935835f5ceb5824f7431ceceac942aaed679a427ffbdf0d761a2914aefa66a34ecd1dad SHA512 2d1763904c9caa59ac201dcc17badb83075f2be8de6385c9dbc505eb4287122add5f8881a5cb064a78940f956a837a23637ddf22da67dd2a5c8bc042ad513461
+EBUILD dash-html-components-1.1.3.ebuild 548 BLAKE2B f778dde94a78e122ae7f116604e280a63288d779d2848eb1469a419c58fa5aa2df22e07532e5d0eb172a2ef497cde7dfd92ad41c49f341ee29408d56921411b9 SHA512 2e159c0c46a2b741f6501be522ca5c08463bcd63064cccce8c534adec6716e3ff310d4d4aa407e8d603251aafe9ca42d6fef4c92d63469ebd34696e65b336eb1
 MISC metadata.xml 541 BLAKE2B f1893cc1c298d0a321122a2346ee7f0700d3129060b5caa19e4df29f596d076339beec1109e5ac062f6291e509e2129737d02443b003ae25f8b7cdaed620725c SHA512 9e3ddf54de8e7af297378f3f3556120bbb816ceca2392120ffc8680ccc2d889d8f32e339be08877fd7605eaa4ae77a4ac835e3a7bba7fdb933f62c1045beb00f
diff --git a/sci-visualization/dash-html-components/dash-html-components-1.1.3.ebuild b/sci-visualization/dash-html-components/dash-html-components-1.1.3.ebuild
index 26ff12dc81c6..68536c49b1a1 100644
--- a/sci-visualization/dash-html-components/dash-html-components-1.1.3.ebuild
+++ b/sci-visualization/dash-html-components/dash-html-components-1.1.3.ebuild
@@ -10,6 +10,9 @@ DESCRIPTION="Vanilla HTML components for Dash"
 HOMEPAGE="https://plot.ly/dash"
 SRC_URI="https://github.com/plotly/${PN}/archive/refs/tags/v${PV}.tar.gz
 	-> ${P}.tar.gz"
+# Test execution depends on sci-visualization/dash being installed
+# but sci-visualization/dash depends on this
+RESTRICT="test"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 161ab118bbaa..5708d2a3d92c 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,10 +1,8 @@
-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 5043 BLAKE2B c1eecac9f8cf7b3d1fff64809974ca2300a3074a1c616874575301905da6d8b76280867971d06a2ca43905cc36aa1aecc1ef7a342db7e859893b33ab3bc17147 SHA512 f15357896a9b875bc4ba7d12ccb8e3549bbf4b74f5054f351839e170abc8077d9aad7b4378179cdf1563996e925f26f6373a1b734b81ec534761e6015e78dd3e
+EBUILD gnuplot-5.4.1-r2.ebuild 5042 BLAKE2B 6fa53714315ccba15617f2d1432b16954fdd1ae4149092b969d3e290ee3c6db4ec25bcde7c2df8463c8869b2a41b18498b1a7032bf5b7ca88a6f12d289363e01 SHA512 9da90847f61f7ae65c0c277c4e7acbf9a6f4526fd00910c74e1b425014d112a641ab0bc0239f6de6ffccaf3feb61991568216b75181e139f6f62e36df477f4e3
 EBUILD gnuplot-5.4.2.ebuild 5099 BLAKE2B a43d7b10e8377ae65545e76b8bb3496859a3dac91109751daae57bc88ed3b597f30a1ab8bb1da1611101fb21d476f9fe81e7802c0d312c8351e5f763016948ab SHA512 f429a3c5164f37aff218b67bf47d54218363c1c7c494f40e632681c58711a8f56f58cbc2e1701fef813e7ec9fa6f89392e1d1ac894ddde8c84208f688f86b1be
 EBUILD gnuplot-5.5.9999-r1.ebuild 5091 BLAKE2B 70e126dfefdf64242cd31672e9a783f98b0f85d45d29f5efcc0f92447258b8aa2d1185f981bec5b50eccd56777eac3fa5a35b84ee162e68104fd7156b9304baa SHA512 bd590b42775e62687c335e967cc025095847f6c1237c96ad657bc2fa910069854833d2dcc80aeff1b3b2506ce6223e3d2be76f2a720d632de46be6298e7dfd07
 MISC metadata.xml 1069 BLAKE2B 2f42ec584b402482270c5f975c6001702f2d5cf367e9f86c190af4b91d97e3c807434e1963a5e1ed856751f592cf1d28cc25897674f92894409497b173e84e8a SHA512 7433f704ff9bee279a70346522595532c221462a915acedb44be85838a472c8a064670a31f72792d10df038b96595e61788c625614a691e956840b39fc063feb
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch b/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch
deleted file mode 100644
index c39bc828f268..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.0.1-fix-underlinking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Add missing linkage against X11 libs.
-Author: Anton Gladky <gladk@debian.org>
-Last-Update: 2015-06-16
-
-Index: gnuplot-5.0.1/src/Makefile.am
-===================================================================
---- gnuplot-5.0.1.orig/src/Makefile.am
-+++ gnuplot-5.0.1/src/Makefile.am
-@@ -89,6 +89,8 @@ $(EXTRA_gnuplot_SOURCES)
- 
- if BUILD_WXWIDGETS
- gnuplot_SOURCES += wxterminal/wxt_gui.cpp
-+XLIBS = @LIBRARIES_FOR_X@
-+gnuplot_LDADD += $(XLIBS)
- endif
- 
- if BUILD_GPCAIRO
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
deleted file mode 100644
index 1b6af60e70ab..000000000000
--- a/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,2,3} )
-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 )"
-
-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
-
-	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 -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-r2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
index cd34cd70955d..5e3a9e7067f0 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
@@ -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}"
diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest
index 269a64dd7bc6..ab3a2581c951 100644
--- a/sci-visualization/kst/Manifest
+++ b/sci-visualization/kst/Manifest
@@ -1,6 +1,9 @@
+AUX kst-2.0.8-cmake-3.20.patch 1198 BLAKE2B eb0ac7abf611908f8eb2138de454be731024534e03f9bf382d1f225b17ef459bf7430bee5209be65338bc1c696f93ed2349dd3ed8576040478a289dd6d21558a SHA512 ce5053a15a4b17d4d9e7672a259236bc49fb468c989a55751f9d273604f14fb2e59137027809994bb20ebdbffa890ec82a543c5d80f7f84219fe3d6d9455a6cd
+AUX kst-2.0.8-getdata-drop-bogus-lib_debug.patch 971 BLAKE2B 9fe4fb874d6afc090740803d804a49a6a44b4760a5bba974b056ead79ca803ad2468600600d57d6748a608113085143457809b56012a6499930edde3cb5925a5 SHA512 8df586438945d5d6f3822e16ae7c6e1b25ecb56383087675d916ca7a3cff4952234125c00702c818e6da99e28969796db0ebf05cc25e4ab6863d75e2bbff168c
 AUX kst-2.0.8-gsl-2.0.patch 1253 BLAKE2B 7663fbb426f224924885554ae22517afc3d8510818e08fa9baee36daef878af4ec70ef649fa2dcb37ec47510181c40c52e10059f215cb993957cb10b50974117 SHA512 fb1495e91cc85b90b6971b27e587d07e4197c4973f75a5320cccb2938db8eec00fa0c85f44b240ca2e916b48983448c344a7c1449d99c16eba5edbbe0e6d0963
 AUX kst-2.0.8-includes.patch 581 BLAKE2B f0c631be82fbad4a816938311accdfe8474e0b80241af677a26d46d3f7d0d15130c1d18c0a6aeb7443d4bd2f368a8cfe4634efb6b4ac7b6198f32b4b005c869c SHA512 d4b0f764beff6c8f9e8d64a5152153d1d9ddc72da029f5e10b83865e2f9aa94ae59eb1678b33f653ac06b38086b5bb03aa172c79cedbe562c0f1b9c872e124a4
 AUX kst-2.0.8-qt-5.11.patch 1389 BLAKE2B 99a879ddecec135d1f1bf6da52a8410127e9a6f590f5fb6aac135258c58f3091618b928de0773fd5899d833a8d9d11ee971a3b3b1b5d85c204234fb61b31e6de SHA512 b5a38b941d40df6c5327125883a1cad27e545cf9df375d09fe4ad542e5dd104fb42859f479485df1b1bff2b6dcd6765699bd7c665d475769aea39e9e85aa1040
+AUX kst-2.0.8-qt-5.15.patch 280 BLAKE2B 433312008cab3ce87f10ae9625431d4834532b4ef930ea5724b5cae9356f41a285bef339baf349bf37c94258029ac0de31a5d1a31bea4594c938ffaaeb8d7131 SHA512 570713f6b25343e2a06176a78e3677c3a21aaf357f4262a1c47469fa973265e1f159b4ac1ae6cbe6fbe1f23624a4f8eaaa694fa451fd778f84bbef6291f5be26
 DIST Kst-2.0.8.tar.gz 14527129 BLAKE2B 5330dc97bc56bf8c6120a461e078ed1bdf87c4ec41b6f6ddc13d7500fde0d1b973b42da8f38c738d133559696d89ad579c288206c7ba07bbfd22dbc2bf6f2064 SHA512 81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb
-EBUILD kst-2.0.8-r1.ebuild 1264 BLAKE2B 8199a35bc82f32dc6ae23dc9d7c76eb4f758f26d3d6fd78e4bb02b1c2a34b30609de466c32efd4c7e9f795ce429cbc899755b5e9cfa6d659a14dab03bdfc8862 SHA512 e09a3b2f10bfc93c9cc24246a660d37be39334054d7a6f7510a617223f060cdd1dcdf4a4462fa42a2f29419dca11dbd1976f0a7951daf587e1efac5ce1c098d2
-MISC metadata.xml 364 BLAKE2B 921c6ea44760ec3694ea9565aba0707f9b4d3e18cbd5fc9c523f1031e47dced5f96da57f1e24d68a0e5f3f7c4e1ea49a8c327c5a591928be77777a9248b8e3c1 SHA512 46ab4c2f002b9b516a49e8c678740344b3cdb79ce92ada0b22ee205fe17b54a804fcc520ae517bfc2f420870eaa28c40043007e54c4b55506e8edcdf7f958e66
+EBUILD kst-2.0.8-r2.ebuild 1478 BLAKE2B ec03788f7076b48ae73547a3836b022ff646ceed00532ab3b55d685f1eabe33a28b4fd0f0a3614b414c4f3fa150f9dd5f0bcced073feae9b56fac9fca9cdf817 SHA512 1b274ec4eff240102ec174d52f62970087ba3391277a7ddc2b9c9a63e3a8994c26950be592468e9fbf529d5a5ead5ae352b4fac41c6a3a05aeb7efdf59a8e1dd
+MISC metadata.xml 363 BLAKE2B ef18d5938f2ff8a9709e5c47b0c16dc07f719f761f60c111d9e9559abecd02f31b023be24b3c9f6297b33d9e5e22ff0689b327ea0c0e71ea5422a1d32e79f942 SHA512 d434b196bed861e178d0687a2aa8c7729074666a353c09b90854970060cc0cfafb54442641de101e19231cb5229908f6c53ebb9b240476d0e4d9a7441e5abf0a
diff --git a/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch
new file mode 100644
index 000000000000..39e2df7d0a64
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch
@@ -0,0 +1,32 @@
+From 6a41644c39ffb394c350de3dacbacdffa54a0a2a Mon Sep 17 00:00:00 2001
+From: Adriaan de Groot <groot@kde.org>
+Date: Sat, 3 Apr 2021 00:47:52 +0200
+Subject: [PATCH] Fix CMake-time with CMake 3.20
+
+Having multiple else-blocks for a single if() is now a syntax
+error; they need to be elseif() with only a single
+optional else() at the end.
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 593dcb11..f965bd64 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -116,10 +116,10 @@ elseif(kst_3rdparty_download)
+         elseif(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7)
+             set(ver 4.7)
+             set(md5 de6e8dbab1bb17eee6057941fddc93e3)
+-        else(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6)
++        elseif(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6)
+             set(ver 4.6)
+             set(md5 70d8670af9c21eb8fb466654c95d8e4d)
+-        else(GCC_VERSION VERSION_GREATER 4.4)
++        elseif(GCC_VERSION VERSION_GREATER 4.4)
+             set(ver 4.4)
+             set(md5 999248fb40a44543af4dd4cd1be0ceeb)
+         else()
+-- 
+GitLab
+
diff --git a/sci-visualization/kst/files/kst-2.0.8-getdata-drop-bogus-lib_debug.patch b/sci-visualization/kst/files/kst-2.0.8-getdata-drop-bogus-lib_debug.patch
new file mode 100644
index 000000000000..07baa1a32ab1
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.0.8-getdata-drop-bogus-lib_debug.patch
@@ -0,0 +1,23 @@
+--- a/cmake/modules/FindGetdata.cmake	2014-02-13 10:41:44.000000000 +0100
++++ b/cmake/modules/FindGetdata.cmake	2021-09-07 14:32:16.248930734 +0200
+@@ -49,19 +49,9 @@
+ 		PATHS ${kst_3rdparty_dir} ${PKGGETDATA_LIBRARY_DIRS})
+ 	list(APPEND GETDATA_LIBRARIES_RELEASE ${lib_release})
+ 	list(APPEND GETDATA_LIBRARIES_BOTH optimized ${lib_release})
+-	set(lib_debug lib_debug-NOTFOUND CACHE STRING "" FORCE)
+-	FIND_LIBRARY(lib_debug ${it}d
+-		HINTS ENV GETDATA_DIR PATH_SUFFIXES lib
+-		PATHS ${kst_3rdparty_dir} ${PKGGETDATA_LIBRARY_DIRS})
+-	list(APPEND GETDATA_LIBRARIES_DEBUG ${lib_debug})
+-	list(APPEND GETDATA_LIBRARIES_BOTH debug ${lib_debug})
+ endforeach()
+ 
+-if(GETDATA_LIBRARIES_DEBUG AND GETDATA_LIBRARIES_RELEASE)
+-	set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_BOTH} CACHE STRING "" FORCE)
+-else()
+-	set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_RELEASE} CACHE STRING "" FORCE)
+-endif()
++set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_RELEASE} CACHE STRING "" FORCE)
+ 
+ endif()
+ 
diff --git a/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch
new file mode 100644
index 000000000000..97b42a6d33c2
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch
@@ -0,0 +1,10 @@
+--- a/src/widgets/gradienteditor.h	2014-02-13 09:41:44.000000000 +0000
++++ b/src/widgets/gradienteditor.h	2021-04-18 14:45:24.654148450 +0100
+@@ -16,6 +16,7 @@
+ #include <QHash>
+ #include <QWidget>
+ #include <QGradient>
++#include <QPainterPath>
+ 
+ #include "kstwidgets_export.h"
+
diff --git a/sci-visualization/kst/kst-2.0.8-r1.ebuild b/sci-visualization/kst/kst-2.0.8-r2.ebuild
index 148390c6c265..d98d0d65c25d 100644
--- a/sci-visualization/kst/kst-2.0.8-r1.ebuild
+++ b/sci-visualization/kst/kst-2.0.8-r2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit cmake-utils xdg-utils
+EAPI=8
 
 MY_P=Kst-${PV}
+inherit cmake xdg-utils
 
 DESCRIPTION="Fast real-time large-dataset viewing and plotting tool"
-HOMEPAGE="https://kst.kde.org/"
+HOMEPAGE="https://kst-plot.kde.org/ https://invent.kde.org/graphics/kst-plot"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.2"
 SLOT="0"
@@ -24,21 +24,19 @@ RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	sci-libs/cfitsio
-	sci-libs/getdata
+	sci-libs/cfitsio:=
+	sci-libs/getdata[cxx]
 	sci-libs/gsl:=
+	sci-libs/matio:=
 	sci-libs/netcdf-cxx:3
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
 	test? ( dev-qt/qttest:5 )
 "
-
-S=${WORKDIR}/${MY_P}
+BDEPEND="dev-qt/linguist-tools:5"
 
 DOCS=( AUTHORS README.kstScript )
 
@@ -46,6 +44,9 @@ PATCHES=(
 	"${FILESDIR}/${P}-includes.patch"
 	"${FILESDIR}/${P}-qt-5.11.patch"
 	"${FILESDIR}/${P}-gsl-2.0.patch"
+	"${FILESDIR}/${P}-cmake-3.20.patch" # bug 778560
+	"${FILESDIR}/${P}-getdata-drop-bogus-lib_debug.patch" # bug 593848
+	"${FILESDIR}/${P}-qt-5.15.patch" # bug 593848
 )
 
 src_configure() {
@@ -59,7 +60,7 @@ src_configure() {
 		-Dkst_test=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/sci-visualization/kst/metadata.xml b/sci-visualization/kst/metadata.xml
index 9f73ea702ac4..27e7888aa2c3 100644
--- a/sci-visualization/kst/metadata.xml
+++ b/sci-visualization/kst/metadata.xml
@@ -4,7 +4,7 @@
 	<maintainer type="project">
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
-		</maintainer>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kst</remote-id>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index 6a755059a65d..34eb58f3e828 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,4 +1,4 @@
 DIST labplot-2.8.2.tar.xz 13235168 BLAKE2B 251d7f6293ea90a1a16a33f38f3b3657051545cff4b0acc3d3009a02387c4cadb61dad31b72466f0d197b1cccac6e9095687fcc694853c2a6ef41fa1a954c6a7 SHA512 fc550ccb00c5d9966b42f3a367daaebfa94909b65f0a146e4cd75f9a4ed50d00a917fa4c5fd6b6694bf2223d75a564db49697106ea663b0e17def4ce501b09e1
 EBUILD labplot-2.8.2.ebuild 2343 BLAKE2B 9bb15fbb175a3124570d2a9c5248b61e50f5e46123bb095760689e4d5fa464b8388b1ab938f2b23ac22258c5ecb9737460c617339017981b73d9bcfd459c450d SHA512 5f355007fcd06649a419561dbd2cc1719634c01fde33d7bdde24ab022681372b4a8acb1764da56de8ad94553fc82532df52e1c68f65d33cff39fa576b53e92d5
-EBUILD labplot-9999.ebuild 2397 BLAKE2B e19109fbf49b027c4b62add3d5527e0dfd3255885584ce1a299ea1fda74a427706d4efe3267377bc85d09089656ea6eb77979cf3ca6cff132d5d55b2bb5f0a12 SHA512 2e781656089e248d8ec9c400f4954822bc7167c0a5a0f0a319345769db6b0121a7e6a36188a9c0eb47f3cc006938daf62030b40fdeabe7e910d6d947acdddab8
-MISC metadata.xml 1036 BLAKE2B d2617f7bc61890019ff32bd4c080aaacbc8e7684074ea767b106d7a6a63800abf51a5e5694ef866ad4c1c213ab5cc1cd87fd21ebb13dbf0ebada1c9216759e05 SHA512 c902491663093d6c99fadd1b4a08f06d7c76ce717e340492dc331d65f779c2cf446bebb47ffb597c983f456fdf45bfa4746601ea82be680ac68ce8f4ff94dee3
+EBUILD labplot-9999.ebuild 2617 BLAKE2B 409bad6dd79a0a7434eb4500c1bc92b507cfe281ce737f3acf7f622ce68537b1e1a3537d0f04dbd2c19292e5c1666dc67105b53fcd34eb18e92caa9ef98ed92f SHA512 ce4dc120dbd63d10a4ddd3005a7a273723c3b451986aefd8c66e2d958512f468dc9cb88a1b67c2f609d9ef3bfd47656059d626b7f592eebf2317f87ddba022cf
+MISC metadata.xml 1327 BLAKE2B b89645ce7e24b31783729126ec35348376cbae11604b8c7abaf352bfc6e2d39295004e82ed65da3be2210e557507ad9eea87e40100da55674dfc0e403b5b1819 SHA512 3ca8908ac98002fe0a20851c64a6c96f5b24eaa31de3564ea60c4b20f4a038a94b8e233f061e23938968947d457561f02935e56988d753629d16052f0447033c
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
index 03cc30d425b1..6f96d8bbb4d3 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
-HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/en/labplot2"
+HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/labplot2/"
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -19,13 +19,8 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="cantor fftw fits hdf5 libcerf netcdf root serial telemetry"
+IUSE="cantor fftw fits hdf5 libcerf markdown matio netcdf origin root serial telemetry"
 
-# not packaged: dev-qt/qtmqtt, bug 683994
-BDEPEND="
-	sys-devel/bison
-	sys-devel/gettext
-"
 DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -58,7 +53,10 @@ DEPEND="
 	fits? ( sci-libs/cfitsio:= )
 	hdf5? ( sci-libs/hdf5:= )
 	libcerf? ( sci-libs/libcerf )
+	markdown? ( app-text/discount )
+	matio? ( sci-libs/matio:= )
 	netcdf? ( sci-libs/netcdf:= )
+	origin? ( sci-libs/liborigin:2 )
 	root? (
 		app-arch/lz4
 		sys-libs/zlib
@@ -67,6 +65,11 @@ DEPEND="
 	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}"
+# not packaged: dev-qt/qtmqtt, bug 683994
+BDEPEND="
+	sys-devel/bison
+	sys-devel/gettext
+"
 
 src_configure() {
 	local mycmakeargs=(
@@ -77,7 +80,10 @@ src_configure() {
 		-DENABLE_FITS=$(usex fits)
 		-DENABLE_HDF5=$(usex hdf5)
 		-DENABLE_LIBCERF=$(usex libcerf)
+		-DENABLE_DISCOUNT=$(usex markdown)
+		-DENABLE_MATIO=$(usex matio)
 		-DENABLE_NETCDF=$(usex netcdf)
+		-DENABLE_LIBORIGIN=$(usex origin)
 		-DENABLE_ROOT=$(usex root)
 		-DENABLE_QTSERIALPORT=$(usex serial)
 		$(cmake_use_find_package telemetry KUserFeedback)
diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml
index 44b4cb39dc37..1625558de1ee 100644
--- a/sci-visualization/labplot/metadata.xml
+++ b/sci-visualization/labplot/metadata.xml
@@ -20,6 +20,9 @@
 		<flag name="cantor">Enable support for different open-source computer algebra systems via <pkg>kde-apps/cantor</pkg></flag>
 		<flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
 		<flag name="libcerf">Enable special functions from <pkg>sci-libs/libcerf</pkg></flag>
+		<flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
+		<flag name="matio">Enable support for matio (<pkg>sci-libs/matio</pkg>)</flag>
+		<flag name="origin">Enable support for reading OriginLab OPJ project files through <pkg>sci-libs/liborigin</pkg></flag>
 		<flag name="root">Enable support for CERN's ROOT file type</flag>
 		<flag name="serial">Enable support for RS232 serial ports using <pkg>dev-qt/qtserialport</pkg></flag>
 	</use>
diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
index a0c190b4875a..1e2c3c1f0889 100644
--- a/sci-visualization/opendx/Manifest
+++ b/sci-visualization/opendx/Manifest
@@ -7,9 +7,10 @@ AUX opendx-4.4.4-invalid-conversion.patch 558 BLAKE2B 073e8119b0ef2f80c5bf593ba4
 AUX opendx-4.4.4-libtool.patch 319 BLAKE2B 137d0251df4c12a889ae97f628338fa88d4fee01fa4cf4e312be0646ab1da674b1aed5028a551e953fbf08cbb7f3604d5bb3d6d94c836c3f3337d19a67d625a2 SHA512 a98d7a19f1e9c096bc9e7ffdfb9e7a6237bf3599a4f6c29aa3994a0c91653e7369626e86ea69f0d32d6b6dcecb9bc889a888fcddde81d9ca52272be49e957864
 AUX opendx-4.4.4-null.patch 584 BLAKE2B 6ad58c7c1001069c80a7e9f99059203ce8d0fc87ccf6c25d9812c51aa1eea01a325c8606947c0faaefac7e4022892e444739c47e58efcb52072961c91d65b89c SHA512 9af10aebd267b181be4ade5009987cffaeabc5e1ff68343e63f836722098ffffa813a8b0c6c514b088221dbb5c4a654dd3a756449069fa0ef8edebc8cffb35b5
 AUX opendx-4.4.4-open.patch 1671 BLAKE2B 86578e560c1e7cae30dae208cee14ce64e73362e3c5ab6495be58cf2bc3e4eee6422c0f7d58faa6d3d09ba5503783469f82e6f3a759ed79b268e666938e6c41a SHA512 a35889802f28fc7fa91e887c8c8fc9fc6c7757c877e7469f1b01835de2c8c59c3f29a52e3dc6f30587dfd45f30b0783679273af28820c0120c28733dfed12a38
+AUX opendx-4.4.4-slibtool.patch 1516 BLAKE2B b7290a6a6ef739fbc02aed39f361cf6586f0d86883684c73247b3bc4c38267557982d8de618791455ffba10ac96227e3ff2f82f2eff4895f4bca1612c06b90c7 SHA512 91ffbd3b75374d55e981fb01e4fffc5464fd8eec6097f7d4312c8043c01e9759985d75178b2aa29e7e6f2642a4783e00942347b28b10b64274ef9d3657f23300
 AUX opendx-4.4.4-szip.patch 1409 BLAKE2B aee4ce76798a95299d3d41c60f584e011f18e390bc8143968c27ea5bcfbff4ceb3119f46de7b66f96ddb820a88ab15aa4d609b693163aa182bbddbe9d89f7e76 SHA512 50084839a1033e377dda52ec12ce80030555618c9baed7ec36a7eaa5a812e014c22f6a745bb8663fd0763db1a431f0d5c21cca5fcef51dc20c17c2daa0d411a4
 AUX opendx-4.4.4-xdg.patch 712 BLAKE2B 365b4fe07e6eb7961c4ab04260246238c00a509e90ed1f5679bc3a0ac5c1953109fb73fa8e84555b18fe293bf01aa031832c2a63d6211b7049883dc550c54810 SHA512 290df3d1f5a1a2b59473062d4a4d9247b13c333af8fb33b00580823d185358d181d94acc37691c4eb4e0a7d159bdf62b6d3cbb59c5c7d29bb01073b39871b70e
 DIST dx-4.4.4.tar.gz 9676049 BLAKE2B d628d2cf7d2cae5cfd1f69c72de06529ee3df0192bcb0973916110cc795fd408c9e297d1161e8685cdd62d0c09a985f41d4b2f72ca69ae2cd74488174e392a31 SHA512 e6ef0075a696c442fd4615eb32b9ebd3f85728321a33297e3402b19bbc6210953a6599d643fc0a20bc349fbc72411326c69187223ee0e65560603d8e6f7527ee
 DIST opendx-4.4.4_p20160917-fix-c++14.patch.bz2 3162 BLAKE2B 7998a0099f197ea35543559e69a30b564521cbb0d504e90a64adde2492da2920b2ca4a96fca296ff88ef19f51ea3e0dd40337f205b8fa54133b7f9669d2086c0 SHA512 0d671e5a085b446969fbe57eb9d08e4dd103bc29058ce8c6167c3cad18f14b816a3f2cae329b194ef9827ff6590d31da95fc04176e0824f95bdf89761007bc6f
-EBUILD opendx-4.4.4-r7.ebuild 2016 BLAKE2B 0d301ba14ed712087b4bf2ad8e149ef33d70d783a56907ef3b4f148b83967079a95842d566d9f7bd83870b68fa320c015d9dc1c545507da734e9f558762625e9 SHA512 e2956ae4b88902019ae60a8127382985112b3ac13dac3cd6cc2e26ab2cc91042c042e9c74329fc280935c2319d83a06750243b26b74c567c0cd3487fc312f90e
+EBUILD opendx-4.4.4-r7.ebuild 2093 BLAKE2B e491e5df252e91fd78cbe669a9e2005fcf1e18a21e0dea4954552a8e568689f1a7eaf49241a609770373868f5abf87fdd38e4b81966fe8c9afda5475f439bd93 SHA512 a8bdd7313597179b39106003767ba3df3224b15045d5cb569fce26c00d7376307435f33ea57b8618913c8408e237a0652f0fa163d6ceaf8fae42777bf8623909
 MISC metadata.xml 1039 BLAKE2B 1bf8942dcdace2138067741cf409d8f67a9f77a3928ee7e20db7786b24447c8572c98bdd5d449ec7e15e92d974025e4f006f1de409bfc19be9580b1057b40627 SHA512 b7bbf799b059f5f101ffe34e0119dfc71f9d08be5b058621dd2cdd2f7f72d3a00d08a1c53cae4bd4cb9eb86f25ff6e15f6a61712e262ecbcf74481faaee97ee3
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-slibtool.patch b/sci-visualization/opendx/files/opendx-4.4.4-slibtool.patch
new file mode 100644
index 000000000000..964322aab9c6
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-slibtool.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/779160
+
+commit 980149800b1bc9310c404dcc822d35bd725e8b3c
+Author: orbea <orbea@riseup.net>
+Date:   Wed Apr 7 11:42:21 2021 -0700
+
+    build: Fix undefined references with slibtool.
+
+diff --git a/src/exec/dpexec/Makefile.am b/src/exec/dpexec/Makefile.am
+index 9f37d05..bd8aefe 100644
+--- a/src/exec/dpexec/Makefile.am
++++ b/src/exec/dpexec/Makefile.am
+@@ -33,6 +33,8 @@ libDPEXECclm_la_SOURCES = \
+ 	crc.c d.c exobject.c function.c license.c loader.c macro.c \
+ 	dpparse.c userinter.c utils.c optarg.c sfile.c ddx.c
+ 
++libDPEXEC_la_LIBADD = ../dxmods/libuser.la
++
+ EXTRA_DIST = local.mk dxThreadMain.cpp dxThreadMain.h tmainUtil.cpp tmainUtil.h
+ 
+ $(OBJECTS): yuiif.c yuiif.h
+diff --git a/src/exec/dxexec/Makefile.am b/src/exec/dxexec/Makefile.am
+index 9bc4260..1971965 100644
+--- a/src/exec/dxexec/Makefile.am
++++ b/src/exec/dxexec/Makefile.am
+@@ -12,10 +12,10 @@ libDXEXEC_la_CFLAGS = $(AM_CFLAGS)
+ bindir = $(libdir)/dx/bin_@ARCH@
+ bin_PROGRAMS = dxexec
+ 
+-dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \
+-	../dxmods/libDXMODSN.la ../libdx/libLIBDX.la ../libdx/mem.lo \
+-	../libdx/memory.lo ../hwrender/libHW.la ../hwrender/opengl/libOPENGL.la 
+-dxexec_LDFLAGS = @DXEXEC_EXP@
++dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la \
++	../dxmods/libDXMODSN.la ../libdx/libLIBDX.la ../libdx/libmem.la \
++	../hwrender/libHW.la ../hwrender/opengl/libOPENGL.la
++dxexec_LDFLAGS = @DXEXEC_EXP@ -no-undefined
+ dxexec_SOURCES = main.c
+ 
+ EXTRA_DIST = tmain.cpp
diff --git a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
index 024c2706ae3c..1184182477b3 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MYP=dx-${PV}
 
-inherit autotools eutils flag-o-matic
+inherit autotools desktop flag-o-matic
 
 DESCRIPTION="3D data visualization tool"
 HOMEPAGE="http://www.opendx.org/"
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-szip.patch"
 	"${FILESDIR}/${P}-null.patch"
 	"${FILESDIR}/${P}-invalid-conversion.patch"
+	"${FILESDIR}/${P}-slibtool.patch"
 	"${WORKDIR}/${PN}-4.4.4_p20160917-fix-c++14.patch"
 )
 
@@ -61,6 +62,9 @@ src_configure() {
 	# with gcc 3.3.2 I had an infinite loop on src/exec/libdx/zclipQ.c
 	append-flags -fno-strength-reduce
 
+	# bug #786627
+	append-cppflags -std=c++14
+
 	# (#82672)
 	filter-flags -finline-functions
 	replace-flags -O3 -O2