gentoo resync 08.09.2018

13 files changed, 325 insertions, 60 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index dd92b4453b18..aefb8709bd68 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 0bfbdc49602c..70d8f689cc26 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -3,8 +3,10 @@ AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f92317680
 AUX gnuplot-5.2.2-regis.patch 1171 BLAKE2B 57d2faba0f01ca27de0ff39b9b9d01faeffcbedacd240c39aa7756fffa27aa2f6d28d3cf5d24f2b6a88399ada1538676f408851957e5df026411dffb32665689 SHA512 fe9154eb6687426542fd51b42b80378e1755007e81628be6bb318a8aaabd90dc7cadb85362162e7e323a0cf60b6bcd0509bb0318888c17bb5e4330f4c00f1f6b
 DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
 DIST gnuplot-5.2.2.tar.gz 5282973 BLAKE2B a15c72aaa8d62079ea3e9f20fa9fe3aaaf6036cf8dc67a784dee79ac7bd0ad7bfac754c9583b50c46deeef2f1bcd920d1094a5d1e19a1dae75405de8c3249621 SHA512 51d5b2234dae358580cc2794ed63f8a5b950baf73edc5362f5bb18d77e8066c3c010239c3b29840db11e5936cb9381bb57193de751bd274af5547a45d6d88b0b
-EBUILD gnuplot-5.0.7.ebuild 5857 BLAKE2B 9aa0b6f0f9fdbb73bbde43d4546244843806bbe4135890dacc08f100f09ced0fc7c95827f45b503ec7a22a14a48b168da5175ad64356510a7e34cded1ca1d7ee SHA512 5d1694c12e4e23866bb306c289dbcdbb64e9c592ad0a12e5a0f71b602c8a90b0d31ea4a36a6bc3b13a5d7a6260ccaba6f4972e1838b22e7c8b24b8329a56649f
-EBUILD gnuplot-5.2.2.ebuild 5887 BLAKE2B 50212f4c30d8005e3e2eb499a1468c8c496fb8b5ec0f62eb90e8cc994fee2f14d4881e156d1b45809e6d1439db1d358527145049c97eaaca628297a2ab1e3c07 SHA512 f7ad13ad4bca41ab85a3a692d1df36cb5fe2bd482879cb9139922db209126d480d279cbbe2b29716efdf4ba2e9005ad3d2a8365f2ba911cc2f3d4760d9a6bb96
-EBUILD gnuplot-5.2.9999.ebuild 5807 BLAKE2B 3a2afe5f7ac171bd54334c94ac51d7ecf289ef19d4ff0109598e997a1174bf1451885ba885c86e03ec488cbe7ce2df9a21a26e4f1dcfd30e7dd1e7cf4aee1e27 SHA512 c197bda66704c895b49a0935bdfa20fd8e85c9460966ad621a46f0bc195e1648c3329e53d3be43dab137fb4eb9ebdb84727e82ff748e02f9aadd0e5be21909d1
-EBUILD gnuplot-5.3.9999.ebuild 5794 BLAKE2B ca534f75fe5a9c39d93b9e750ec020aecacf426bec9c1852ce21879b44cbcb3e77c2599ea52dc02b69fb20b8a94a34b97225f5c793ea820985b40017ba5ecba5 SHA512 501777c51d6fd6fb63106857a25bdfc1038bcbaed039d5e9e351f2e80043ed88d90055f611c72964f60b4fe948d562db6ebe2c1c9adf1fb10940666c1d147d42
+DIST gnuplot-5.2.4.tar.gz 5292321 BLAKE2B a2eee046de6707ffcaf1a5b175601c18da14db350095a949deed0e241d8476c177e2cecb35eab3059234231ad4be42e5e8a9e3083651313cc4b5997156813c67 SHA512 b276e379fe5e493a176750d9ccd84a8b02c8784b1d8701dc4252945a7e9e0455eebba0085d0d98824a4acf5da0def3b71ad3362803365a32e7c29f18af7854bb
+EBUILD gnuplot-5.0.7.ebuild 5791 BLAKE2B f265032ce8c78e4fa5cbffab38a55da2b4fe37b63d4d89b04a028cd79d1a6f902b61e066e6786c86acf903cb5fc9102fc68f2ae16db6de509c08f77ac8ac5875 SHA512 39806b825547a82d70ccf7cdad0473146f0a92a865b252544b24f03169f508511d9b05fc0288dfae6e8818d0db152f750be5543ada7bfcee9843b7a37a728f64
+EBUILD gnuplot-5.2.2.ebuild 5821 BLAKE2B 0770c52c8f005a8ffe9232ba0a4a60f895a0ac5d0de80475a293a941747e9b931e9cc9e320533372b8c4f9e820119a9622bbc6724b0dbdf08500eaddd5d8e5bf SHA512 104987d3025c523f4059348a928b71582e40f87151f9213e3b6c151136108d127501f52fe593e7a815ba97bd26b2d77a3154ebd73a7d50bd52a5879be4911421
+EBUILD gnuplot-5.2.4.ebuild 5818 BLAKE2B 0423a67f44464db5a0c6bf0ddaea9d9acc4b9a92af42d80f5d58be19a047cc8978b81d0cde349b7cbbf53c60964ae7e23b4dc8705d7bd9a016fdb6e093f3c597 SHA512 2c6b73072cecbb6b88d436d9a6987f817350af26da51b5e1c5752845bf5050077f086c1aba36f009c92cebdba7728ccd445c7f7ad3b2b97b01951c15114be969
+EBUILD gnuplot-5.2.9999.ebuild 5752 BLAKE2B e65c04ce1b2e05946fa3ee9d084bacf1da053fe89b07e999210dcb56ddc6dd5ff18446b514dafafd93c13d496c491646887d6d223470e44ca2989b3ecfc2daf3 SHA512 bd48a9cd5b51c97f1e614626b9a4a114dfeb771b68bdea554d94287d370433c35d1e167a06cdcb901c0e66677d205f589cd1dbbab181c17e8baa269f7beadb47
+EBUILD gnuplot-5.3.9999.ebuild 5192 BLAKE2B 80a911c85ea83eaf4dcdbe86ad90982507e725947475f3812c570398a95c8c792c676c51f0d0bfd5bdcbcb8cbcafeda610c25ffdc8d3dfe664cd073a4b69ff0f SHA512 b191a21c844774e3bb3faa99ea4ae17fc6d6fb558d1dd0369c6c5b14464ca94e23fb85c70721f0bd9746e70217093e6735f48c407193752118309f7adcc6a02e
 MISC metadata.xml 1267 BLAKE2B f3b0192ce2cd8d0fb10c2f4fb4bad9780f01746cb283c19e7ecc622c85470ed8a3b7193ca2f7abdee6fdb771719e0c0a9a8a5c7fd9320ef0dae1f1210e7e36cd SHA512 dc9f36a7f2ffb85eeafb41a2b5d0b61746ef3e1de049db18ba351108b887b4cf506ea871754918faae8b4989e5ee7dbfc9f7f48c5b9df55a3bbe782425dc0421
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
index 572f4df7f740..73a772b926f5 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
@@ -16,8 +16,6 @@ if [[ -z ${PV%%*9999} ]]; then
 	ECVS_USER="anonymous"
 	ECVS_CVS_OPTIONS="-dP"
 	MY_P="${PN}"
-	SRC_URI=""
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 x86"
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
@@ -117,7 +115,7 @@ src_configure() {
 
 	if use wxwidgets; then
 		WX_GTK_VER="3.0"
-		need-wxwidgets unicode
+		setup-wxwidgets
 	fi
 
 	tc-export CC CXX			#453174
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
index 7f889aeb5031..0f63549de71a 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
@@ -16,8 +16,6 @@ if [[ -z ${PV%%*9999} ]]; then
 	ECVS_USER="anonymous"
 	ECVS_CVS_OPTIONS="-dP"
 	MY_P="${PN}"
-	SRC_URI=""
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 x86"
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
@@ -117,7 +115,7 @@ src_configure() {
 
 	if use wxwidgets; then
 		WX_GTK_VER="3.0"
-		need-wxwidgets unicode
+		setup-wxwidgets
 	fi
 
 	tc-export CC CXX			#453174
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.4.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.4.ebuild
new file mode 100644
index 000000000000..b28e58c2381a
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.2.4.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
+	EGIT_BRANCH="branch-5-2-stable"
+	MY_P="${PN}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
+else
+	MY_P="${P/_/.}"
+	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="gnuplot bitmap? ( free-noncomm )"
+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[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 "${FILESDIR}"/${PN}-5.2.2-regis.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"
+		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; 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
+		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.2.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
index 46862f95e71c..70dc373cfd31 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,15 +9,11 @@ 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="branch-5-2-stable"
-	ECVS_USER="anonymous"
-	ECVS_CVS_OPTIONS="-dP"
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
+	EGIT_BRANCH="branch-5-2-stable"
 	MY_P="${PN}"
-	SRC_URI=""
-	KEYWORDS=""
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
@@ -116,7 +112,7 @@ src_configure() {
 
 	if use wxwidgets; then
 		WX_GTK_VER="3.0"
-		need-wxwidgets unicode
+		setup-wxwidgets
 	fi
 
 	tc-export CC CXX			#453174
diff --git a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
index e5aae89a82c2..60eb7036ba0e 100644
--- a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,15 +9,11 @@ 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"
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
+	EGIT_BRANCH="master"
 	MY_P="${PN}"
-	SRC_URI=""
-	KEYWORDS=""
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
@@ -26,7 +22,7 @@ fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
 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 wxwidgets X"
 
 RDEPEND="
 	cairo? (
@@ -49,7 +45,6 @@ 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/cairo
@@ -89,10 +84,6 @@ src_prepare() {
 	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}/
@@ -116,7 +107,7 @@ src_configure() {
 
 	if use wxwidgets; then
 		WX_GTK_VER="3.0"
-		need-wxwidgets unicode
+		setup-wxwidgets
 	fi
 
 	tc-export CC CXX			#453174
@@ -130,7 +121,6 @@ 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)")" \
@@ -138,7 +128,6 @@ src_configure() {
 		"$(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) \
@@ -151,10 +140,6 @@ 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
diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest
index 2f5f03eafef1..c090ea1eb8b4 100644
--- a/sci-visualization/kst/Manifest
+++ b/sci-visualization/kst/Manifest
@@ -2,5 +2,5 @@ AUX kst-2.0.8-gsl-2.0.patch 1253 BLAKE2B 7663fbb426f224924885554ae22517afc3d8510
 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
 DIST Kst-2.0.8.tar.gz 14527129 BLAKE2B 5330dc97bc56bf8c6120a461e078ed1bdf87c4ec41b6f6ddc13d7500fde0d1b973b42da8f38c738d133559696d89ad579c288206c7ba07bbfd22dbc2bf6f2064 SHA512 81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb
-EBUILD kst-2.0.8.ebuild 1240 BLAKE2B 726a847d8cc8e91ef3fef2a4779fc306915effd95492d4ab435d3c9622090c54a60f9763f5d009de2f7df28a6e37932ef06a3f380f109f1bd8acee02af3be031 SHA512 903985410c12e1dede2c3e0b391955deaf4dbd6cdb93c024e309dea89f48e58a8420200ac1caa485297a26476df6ef00241018f13c0c1c8ef25adc52eb81e713
+EBUILD kst-2.0.8.ebuild 1265 BLAKE2B 7b34286ac85a07cecf48552dadd52f9943ca62cc30c0bf448ac1a9b880c7e340c69b602f4dfcfea607e161bf2629ab28a9d84e101c0863f51a53450ff66e634b SHA512 0156f47ff20ce6a8488ae8729f04dccba3e7d1980645bdc98b174c9385ad27fb2d00e930b4f983dfefed1ec65cfb2c0c8ec3f1a692b438f7600d65b7c894b41d
 MISC metadata.xml 364 BLAKE2B 921c6ea44760ec3694ea9565aba0707f9b4d3e18cbd5fc9c523f1031e47dced5f96da57f1e24d68a0e5f3f7c4e1ea49a8c327c5a591928be77777a9248b8e3c1 SHA512 46ab4c2f002b9b516a49e8c678740344b3cdb79ce92ada0b22ee205fe17b54a804fcc520ae517bfc2f420870eaa28c40043007e54c4b55506e8edcdf7f958e66
diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild
index 6f068a906ed2..d5cfd61e3676 100644
--- a/sci-visualization/kst/kst-2.0.8.ebuild
+++ b/sci-visualization/kst/kst-2.0.8.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	sci-libs/netcdf-cxx:3
 "
 DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
 	test? ( dev-qt/qttest:5 )
 "
 
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index cce0b3abad25..c43bda97ad35 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,4 +1,6 @@
 DIST labplot-2.4.0-kf5.tar.xz 6038072 BLAKE2B b1116a516f3d94d331584f22aefe4e9e54c0c96e98c08a90929bea1aaf379f04437d39a8644afc7cc7feda3f43881ba552d310ca263ae3fc6db24dbc8fb57777 SHA512 5d29dd7d63d484359e73c8d82d8dbc25a069e1f33829cf75c2a2009ebae2027353ecf578b51806b5f35ae17ec472f5cbfdb4caed2637dc1ecc9229d33033d21b
+DIST labplot-2.5.0.tar.xz 11831656 BLAKE2B b6c122509874f1f7a554814b7ac9889b416d36f750ff831773aed313f9eff23abc0809f40f6f591051b287bd1a875af455f5d500ce54130c4d8ddfe5fcfa0870 SHA512 a4b285917e30b0ac00cb8c8ad6827ba3884d95fccc0511a0a317bb2d637e48e6579929c45cfb8bba737bb5a01472a2baa9d812a688730ac4fa40b23cc6625eba
 EBUILD labplot-2.4.0.ebuild 1819 BLAKE2B cc7fff4fd3848408edef1057104bdfc828e44ba9574b24b82e1d80abfa3cb6f1637b7fab3c1b994670099cc19f1800d0afca7dae31a347d9ef047de8d6147991 SHA512 444a6ce0179cd5f5528714d3d75aa85e868b906bfaf02f67a20b921703f56b00d861466c349a8171d7eab01980214ce3b93926431d5c49640f996c40e407f2e8
-EBUILD labplot-9999.ebuild 1814 BLAKE2B 42d7b509c71b70f419bf57ba2e7bed64ae4ae64007e59e0871191390feb538a4d6fc728aa5e3fbecf1b4155b29381ae0977c5ce417f14b8c78c7917bf13ffb08 SHA512 6e9038195c0b9bcf20d3aacf4c846d848df94362f4790dc17f2742688c99cb5e23a2dda382803ea596764b40376d4404e8c5765a0902891c5804b317a5802292
-MISC metadata.xml 708 BLAKE2B 253ac7d611f3bedf8046970bf9ad961fc5e0f14607f7f7263758431ca436a2f822bd7d41f0aa51c651f2b7bb6ad59ed2d2a35acd07ed73f8757599216b483170 SHA512 ff837fb6ea47422781c06001c96a0f047a8ca1ca875267c8f26f2369b57b87e86d9816a423ae17fc69c88e9f6cf730c87194267f5f645c83df710f60a99d07eb
+EBUILD labplot-2.5.0.ebuild 1787 BLAKE2B f52173bd8823f2c4230aaa590029b83cc14b16f49e830ae1ffdb97de6ab55bd7a8da70504feade41bde4be3a21b4016d4aede6977931b64924babaa311434873 SHA512 c97ca8487324750c24574ddc330b7f8358c5142372b660b106e759dc6f7548c349ee1be8fca5f6941f0c418c454405a42814f127a5096e1c9a32520fb4b25bb8
+EBUILD labplot-9999.ebuild 1864 BLAKE2B 8ecb810a66b3979d9d81292bdb2ec9c24601b7744bf465d70e929b250e2b0fe3a88088cd5e908862370f77f8f6a157e86a612a4fc7053143724246fafcf17eea SHA512 62e2ddb4d1d87d55e64f05045a5d2aca416426cf41169eaba421c750d7d7ee79d47192f08a6a0a64f5aca0a36580a1c3b3d68917644bf26533e78ce0fd4da177
+MISC metadata.xml 864 BLAKE2B 08fc970f0e9804d36cc5ccbd2b08ee9dbfac30322e5cf56b0253ac3665bced133c2d28d27c64a47cc1faa0f310e6acf8b3f8b774174cab3a2b78da1cf1f0de79 SHA512 04ad431c7e59b54a713c34f35baf3e16b585e45784a39de7bd2a42deea36f27b96d1ea27d1b7bf052934d8f02d57370663c393219fba39bffe6d4d74e07868d0
diff --git a/sci-visualization/labplot/labplot-2.5.0.ebuild b/sci-visualization/labplot/labplot-2.5.0.ebuild
new file mode 100644
index 000000000000..40f32162ebc7
--- /dev/null
+++ b/sci-visualization/labplot/labplot-2.5.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
+HOMEPAGE="https://www.kde.org/applications/education/labplot/"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE="cantor fftw fits hdf5 libcerf netcdf"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtserialport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	>=sci-libs/gsl-1.15:=
+	cantor? ( $(add_kdeapps_dep cantor) )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:= )
+	hdf5? ( sci-libs/hdf5:= )
+	libcerf? ( sci-libs/libcerf )
+	netcdf? ( sci-libs/netcdf:= )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/bison
+	sys-devel/gettext
+	x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+	!sci-visualization/labplot:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CANTOR=$(usex cantor)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_FITS=$(usex fits)
+		-DENABLE_HDF5=$(usex hdf5)
+		-DENABLE_LIBCERF=$(usex libcerf)
+		-DENABLE_NETCDF=$(usex netcdf)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	kde5_src_configure
+}
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
index 0fa0b2d7ce08..b6d50918c311 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -4,17 +4,16 @@
 EAPI=6
 
 KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
 inherit kde5
 
 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
 HOMEPAGE="https://www.kde.org/applications/education/labplot/"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 KEYWORDS=""
-IUSE="cantor fftw fits hdf5 netcdf"
-
-[[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5"
+IUSE="cantor fftw fits hdf5 libcerf netcdf root"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -22,14 +21,13 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
 	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep syntax-highlighting)
 	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtprintsupport)
@@ -37,13 +35,23 @@ COMMON_DEPEND="
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 	>=sci-libs/gsl-1.15:=
-	cantor? ( $(add_kdeapps_dep cantor) )
+	cantor? (
+		$(add_frameworks_dep kparts)
+		$(add_frameworks_dep kservice)
+		$(add_kdeapps_dep cantor)
+	)
 	fftw? ( sci-libs/fftw:3.0= )
 	fits? ( sci-libs/cfitsio:= )
 	hdf5? ( sci-libs/hdf5:= )
+	libcerf? ( sci-libs/libcerf )
 	netcdf? ( sci-libs/netcdf:= )
+	root? (
+		app-arch/lz4
+		sys-libs/zlib
+	)
 "
 DEPEND="${COMMON_DEPEND}
+	sys-devel/bison
 	sys-devel/gettext
 	x11-misc/shared-mime-info
 "
@@ -51,21 +59,16 @@ RDEPEND="${COMMON_DEPEND}
 	!sci-visualization/labplot:4
 "
 
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then
-		cmake_comment_add_subdirectory doc-translations
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_CANTOR=$(usex cantor)
 		-DENABLE_FFTW=$(usex fftw)
 		-DENABLE_FITS=$(usex fits)
 		-DENABLE_HDF5=$(usex hdf5)
+		-DENABLE_LIBCERF=$(usex libcerf)
 		-DENABLE_NETCDF=$(usex netcdf)
+		-DENABLE_ROOT=$(usex root)
+		-DENABLE_TEST=$(usex test)
 	)
 
 	kde5_src_configure
diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml
index 9e450bf9332f..150390b19845 100644
--- a/sci-visualization/labplot/metadata.xml
+++ b/sci-visualization/labplot/metadata.xml
@@ -16,5 +16,7 @@
 	<use>
 		<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="root">Enable support for CERN's ROOT file type</flag>
 	</use>
 </pkgmetadata>