gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /sci-visualization
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
40 files changed, 506 insertions, 610 deletions
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 152dbbdc3107..71452f95b51c 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index 2db9b1fd60d5..c06042cbbcd8 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,3 +1,3 @@
 DIST fityk-1.3.1.tar.bz2 1518937 BLAKE2B 6eb13646e1b5cf3fb0763bcf3e91a1877d89f14f1b986f1065fd27052e7110b357c99431a326a6c1fa2ba002300912b922cd3d5589ac5da367d2fbcee209f9a2 SHA512 4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08
-EBUILD fityk-1.3.1.ebuild 1327 BLAKE2B 3a5eb2bfe86a51256addd901c8a79d4a3d634735a5f37adbf3148724a3c2db4da454ec504a2810ef2a215eff304f3a48605b6e55faf351fb85e77cc7d674f69d SHA512 4693b15dfc6be0626f4c3c3744479aadc8c0f4e109c26c5c48d6766fcaa2157e7ca9614e4be962cfca2f3f94a0f39155d2076863f5f12cc1778c72f696e7b2dc
+EBUILD fityk-1.3.1.ebuild 1029 BLAKE2B 1d51ade0452fbf5d44a9afc06eac9044d588494a483d6cdb72019f3d7778eeb0b9ec97ddd2b3dfe38af628bf9e76d0b98197c594a7080ebc0f1984b034f33bad SHA512 f1df1a0582b529eff406ff7536fecbbd032c2b3fb46667253b11d4ea5726916a0c5383b0b421a1968eaa1080b6f41cc6b42f8850b8f822c4aac8cf866103f1f6
 MISC metadata.xml 1378 BLAKE2B a6b73be959353e2a764d5c39ae13c4fe1bc38c5c0ea5a3c2557e32825077e13d0a97504f8d79e338a65803bc98326fe25cb7e86d3aaa8c93c5d9bdce30cbec90 SHA512 38e516a5e0ec249d3ed4e54d4780830e1b53994e9dc1999c664b2f37aac0247df780522e7b25c124ffb0d9766d1292871ec0f9a238c2b3aa9994cef3581befe6
diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild b/sci-visualization/fityk/fityk-1.3.1.ebuild
index 3900bebeeb70..9a0049bb5d62 100644
--- a/sci-visualization/fityk/fityk-1.3.1.ebuild
+++ b/sci-visualization/fityk/fityk-1.3.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER=3.0
 
-inherit fdo-mime wxwidgets
+inherit wxwidgets xdg
 
 DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
 HOMEPAGE="http://fityk.nieto.pl/"
@@ -14,51 +14,34 @@ SRC_URI="https://github.com/wojdyr/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="gnuplot nlopt readline static-libs wxwidgets"
+IUSE="gnuplot nlopt readline wxwidgets"
 
-CDEPEND="
+DEPEND="
 	>=dev-lang/lua-5.1:0
 	dev-libs/boost:=
 	>=sci-libs/xylib-1
 	nlopt? ( sci-libs/nlopt )
 	readline? ( sys-libs/readline:0= )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )"
-DEPEND="${CDEPEND}
-	dev-lang/swig"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	gnuplot? ( sci-visualization/gnuplot )"
-
-pkg_setup() {
-	use wxwidgets && setup-wxwidgets
-}
+BDEPEND="dev-lang/swig"
 
 src_configure() {
-	common_confargs=(
-		--with-wx-config=wx-config-${WX_GTK_VER}
-	)
+	use wxwidgets && setup-wxwidgets
 
 	econf \
-		"${common_confargs[@]}" \
 		--disable-python \
+		--disable-static \
 		$(use_enable nlopt) \
 		$(use_enable wxwidgets GUI) \
 		$(use_with readline) \
-		$(use_enable static-libs static)
+		--with-wx-config="${WX_CONFIG}"
 }
 
 src_install() {
 	default
 
-	# No .pc file / libfityk.a has dependencies -> need .la file
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-visualization/ggobi/Manifest b/sci-visualization/ggobi/Manifest
index b156178585e2..b0c5888d3bc1 100644
--- a/sci-visualization/ggobi/Manifest
+++ b/sci-visualization/ggobi/Manifest
@@ -5,6 +5,6 @@ AUX ggobi-2.1.8-plugindir.patch 499 BLAKE2B 9e436b43ff668d49f83d718dd6b296c8ef19
 AUX ggobi-2.1.9-as-needed.patch 1716 BLAKE2B 113e51badbfedcc06265af6859256db11f1b9833e5aab336d498ca9a40bb93e495eb23fe328312878cf47e7bc2fbd5e4a25c42fb6ff5053d07879a010ac63641 SHA512 6e96f461e71630b68ba0ecc48fa94f8b7ab211cd26c95b91d65604a23c3fa13b20316e90397f857857c21cd8ddc6a8f67efcc7ec62a8d2c48c349b532aad8797
 DIST ggobi_2.1.10.orig.tar.bz2 2776784 BLAKE2B 6e5f5bfcb3b10af425a552da1f0d9eb4ba445d0eced0e5b5a20d3ea88da782f9e333005b929408baeb895a1e62d5e1500a86de5c7353b60ee8fbf950521b00c0 SHA512 40bc4a7fae992bf327d6b36c5aea7802279a3b6229242f31386e771636b4561260914a7fefb6a6337c1e1ab5a0682fbdd626389b83d9b57d0c2d050fac3723e5
 DIST ggobi_2.1.11.orig.tar.bz2 2787709 BLAKE2B e4b853f3212abda00150e6a3b3a344638225bdc564c109632c7ca2f9cb8cc41d35af9df1ee153d2ede3bd3191d9219e2bdd6bd6bc9c64f42447dfe17562361f1 SHA512 d34c6569d05d1e680101b62745012940c1e18c1588cd37b89b26b89e9eed9bab8fc53e0585a595b6cb4c9f2bb7d603ca4252cb6a6ba344bbc24e5cc5fd8a6dc1
-EBUILD ggobi-2.1.10.ebuild 1346 BLAKE2B d361c8ae82ee5bf50d8f160d11de6db4465cf9d96d3f63966b305ca8e3e6b7a8fbe8d4a80cedffe2bd6305f6ba97f1842e18cfde420ce6c7436510de981a901d SHA512 e2c29578b022c2e67d29646c6f86bfb0607a202bec21125dcee83aa24eacce30e7fb78a09c1677ed2db2466dd47113eb5adb017ae7d49e0108b8adffec6c04a9
-EBUILD ggobi-2.1.11.ebuild 1352 BLAKE2B 0c46c53f0a3ab727766e66a1868f1016a9e4b9745c62ad717effe24da17dc66d00bdfe2477713dcff425ed826e8c5ee263ccf16a43b56fe1aac4e2ff3c55a6ab SHA512 86a85a0eae27df877ac1fc5f07467a16655dd1d8132be7176bf5a62f1ac2a0afc2aede72e22432bbf17389699c4e91b930130075be1f481e9f2ca7e4f1c491f9
+EBUILD ggobi-2.1.10.ebuild 1347 BLAKE2B 844bd3ef729c8a51f678d5a8f8c824d31990122579b7a52cd0aafae3e6eebd7a70085c032ec00d7f22f6aaeb8a066cb3299d8d6d77b2a791c020184911c8dcd7 SHA512 a0cf8f06ab3645bf5e3ea006025efe1b16b56c478d39f0e47925f2a2370b04d9b6d5d1acc0638a17081dd06d8a8a06e5e7f19e290106460fd418966a3bd0a3c2
+EBUILD ggobi-2.1.11.ebuild 1353 BLAKE2B da7f9eed2fdb84aa513f5db0dbf793845dfbf0d0bb6ba74e59eb5fa13b629992f7e192794bfab4f8076c9eb995fb00c6c2bedb817698593ca3b8d66c0dd00733 SHA512 cb4a0275df15740938a54f3573941e8fd2f2f50c711b856f9b0611c7aff066c939a53c6ed7b84f94c91945a5668cecac36920868f57fa0909724935ccdc4c42e
 MISC metadata.xml 624 BLAKE2B cea18e65c4dcf76c174bd3bc9a6c6f8299ac11adfaecc60eb6ef2f4a225fb61d79e3a2d888ea2812466e773543db72afe032c13a1ffa7526669bb8e48872610e SHA512 81e5eddaf2de7b9ff5f2e3c6cf5f555586c140101fb5562419daf02127132a9a35928e95cdc4916b51715953a27a516f5dae72f2ed1a5e31110ff0cd7a1d7f16
diff --git a/sci-visualization/ggobi/ggobi-2.1.10.ebuild b/sci-visualization/ggobi/ggobi-2.1.10.ebuild
index 79dd49b4198b..1ed254c14c87 100644
--- a/sci-visualization/ggobi/ggobi-2.1.10.ebuild
+++ b/sci-visualization/ggobi/ggobi-2.1.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils autotools
+inherit eutils autotools xdg
 
 DESCRIPTION="Visualization program for exploring high-dimensional data"
 HOMEPAGE="http://www.ggobi.org/"
diff --git a/sci-visualization/ggobi/ggobi-2.1.11.ebuild b/sci-visualization/ggobi/ggobi-2.1.11.ebuild
index 658728197cf2..5c9ba5817bb7 100644
--- a/sci-visualization/ggobi/ggobi-2.1.11.ebuild
+++ b/sci-visualization/ggobi/ggobi-2.1.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils autotools
+inherit eutils autotools xdg
 
 DESCRIPTION="Visualization program for exploring high-dimensional data"
 HOMEPAGE="http://www.ggobi.org/"
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 45eb106bae8a..8da43b70ae6f 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,13 +1,14 @@
 AUX gnuplot-5.0.1-fix-underlinking.patch 483 BLAKE2B 1719635d947a5d53fa5b6def65286aa1064e5a80d36d42670890bdda7dc849add342e3574dbee85f0546d953491271354c6946cc157207af700ab1cfde6d0249 SHA512 b5ac3ed830f201ba6018a81bc4860e6da0e41cc9cdc1ac8acc225bf41a0006cbd6e2f8e061ab2bd013ad55b105a02e915e256a09ca4e4faaf4791ea1c3199f28
 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c
 AUX gnuplot-5.2.2-regis.patch 1171 BLAKE2B 57d2faba0f01ca27de0ff39b9b9d01faeffcbedacd240c39aa7756fffa27aa2f6d28d3cf5d24f2b6a88399ada1538676f408851957e5df026411dffb32665689 SHA512 fe9154eb6687426542fd51b42b80378e1755007e81628be6bb318a8aaabd90dc7cadb85362162e7e323a0cf60b6bcd0509bb0318888c17bb5e4330f4c00f1f6b
-AUX gnuplot-5.2.6-caca.patch 385 BLAKE2B 33607e93cf59c6774892df7588c843c9c03b2ee561a6bf5d8e58e18ef62edd5b5b2eab77360a99e94640eda81963b38a683cf5598f02f72774da81d56317250c SHA512 913e9df29f8ad3f97abd06cb9ae5d259b423f05ac96855be658d2b000227e6a578e7fd9279377353e45c929020b3f2303e28549e2096866c5d250705a4d08a7d
-DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
-DIST gnuplot-5.2.7.tar.gz 5335673 BLAKE2B 6ca3055f6bb2e032562c7f21beda0adca1087598c7bacc9ab187c7ea4a3d85e08598ddb0ff0660bca081bc17899dbb92bbfbb6acde8b7b5367f12da7a2a14b62 SHA512 f6b77e16b25e5705ea9dad4f89ed5f5a3cf95d3e4215da00be3cbfbcdeee23009e9205156399448526783f25b5b7599b674670c94c01345abafeff74f6c7de93
+AUX gnuplot-5.2.8-caca.patch 872 BLAKE2B e1aa8bf4fa17fd1d7e43a539e0691c63e647a4a6d7998b0cc01fdcacb56584fc4c5802cb236d5f2a485d3c89ff564345ec24398832e8a114432589a6ab0a01bb SHA512 7398bc7554311cec09bb4ab80e439a79e60410e376d567e858c1207051305195fdd47906db825fb281de6aa58bbbfda88ff2853ac01ea96cdd0496dbff0460db
+AUX gnuplot-5.4.0-caca.patch 1292 BLAKE2B 7a3797898f5fac77c045d8ad3de9570afa1d643865c6787cc8bc59e42642a2727ec751fd53c35a1962b310da0143923ed11110ca8b3d6abe61154d01b3f2dc8a SHA512 df37756cd46b027e2127bb15e1eaf1c8cba0afc802d8ccaa32acec264a43d7e7c8f919a9709c5aa958e0c27f06e2cebe5468cb5d4b40c1dfe05a434f50361de0
+AUX gnuplot-5.4.0-no-mouse.patch 681 BLAKE2B 63472a91a53782d62373c65d9b6122c68885aeaf7a417c04e5e1c9df3a36c4461045827dc8b99b6f1f585e1f9517207d50e80cf13446e665d78f0f725099af71 SHA512 d1911a692eb3a7784272d41730a5504a1d05622a6603725827b6b3aff8cee1730fa48bbf6167d8872e9a211e1a2592801e18edffbfba2202e4573797dcaf721d
+AUX gnuplot-5.4.0-pkg-config.patch 1162 BLAKE2B e72dd15ab84baba71328b38402b786719922705772ff9105b4cb76ea368736b7e6251b5aab33f3a40e56c5b33b40de44ae62d2ee22ca75f8f00da0a325cc7cd7 SHA512 7413e8ac4b6a94184cf1214a46200738d57291ab6fa021f4395d7071eb89e2be35587bf6184c1afbd134211213fd2bc27ddaf52a4ebf5f2bd524f1490a3716eb
 DIST gnuplot-5.2.8.tar.gz 5340677 BLAKE2B 169f5bef44a64b3b7a5be40e28ea22ef24ebc7526fe13ab09e16495453c3922712603d63a03c3b4332368d2ae8cbe4ef57ec53e18bbb4ad2cde13e4cc534245a SHA512 513dff15236dcb58c3c5471cdaa0713242787dbf30ef860c3f69152cb87c6392e4973caff5eb178707bbb84c78548e806b2920864a37686bce49425fbfdc4e8c
-EBUILD gnuplot-5.0.7.ebuild 5772 BLAKE2B fdf5b221701cd90e4dd63b7388cd3d0d7eb6b42e14d915d3c43e42bc26daf74b472a796f66223a7fd21ca835d0dcc42946f365f76a6dc5409e6c1c194ab70a3d SHA512 174d485b762c6402020bb3ee3112469ee71ede3a4d3ed3b14deaa6097066b9859e00ddbdb0bb384c4c5022806daae7e1b9d355643eafb6bb58e58006e19d10de
-EBUILD gnuplot-5.2.7.ebuild 5835 BLAKE2B 2e24c5555898aef38fcb45bf64cafe6a055d55377875d5d6ab60ff33a62570c71dc278b912b846349b4951bcd7dcbebc7babcb2064b3c54ebf67d403da768a33 SHA512 3549d714307ce3ab441e210a6e56ef9aa862240be2893e00254554bad570123666d1674a997eaa82582319c591f8fbb287f5d6748b1897db6426d8481c9e877f
-EBUILD gnuplot-5.2.8.ebuild 5846 BLAKE2B bab2b43ebecd6c0f7c7e5eea2755d693de289dd9e2759ad2d72e21e00aa1de6932231713b89b78b996570542cc20eafcdc154cc2b2b9f607892d4f9170b14dcc SHA512 8f76e36609bda84fb49ac2586e39824d5ac6183b3b4b92874a3fdb8e5db92e00e8b32e7e8c9a80d4a99cb982f33e15624532702ea1729a0f05310c78c931198e
-EBUILD gnuplot-5.2.9999.ebuild 5742 BLAKE2B 454aafd7166509cccd7711eeb54b2c0af3bbe136d235f5581a8d495944126f9ea4c8d201af1f02aa474a55a31bf023e5f59e61419ac44f4a7c698408b3306908 SHA512 dd5e3197892c2cc99d6fa41230286a3baa62ec67a6c5d2354ba2575ad04b6e779ae601674e11186e485ea34e7561720bbd1e87825af0f272bf14637146120939
-EBUILD gnuplot-5.3.9999.ebuild 5089 BLAKE2B 26f13dee72d3af9a555278fe3be6e5315f66b522f171e08e21fceaa2bb10b82f3895a7f57f12ad7e648b5907a0c161a997196a77655e9fa169a7a909d73d100b SHA512 06d013fc5ba85f85724b077831982e078ea9aa2db41160c6cf5d7f7b7671e5620d854af6af08d765b1ac4eb8b58e8777413e5bf72e9278f43106b04db10d62b9
+DIST gnuplot-5.4.0.tar.gz 5622595 BLAKE2B e42011fa49ba0440436a406737f03ad55359b337dce359c62c1b4f536f70ca07126cf04e3e0eef6e4b22340dfb0318f6890d7814ad55b38d60ee24a4bc570ca1 SHA512 abbb69ded9eed3a1e53caeeb7d75ee4e3532b1254640a3f38f00260e261e75f87744e3df4210b0db7c8c2acee9b25147524d5377b3f4305e2449b2e99ca58d66
+EBUILD gnuplot-5.2.8.ebuild 5846 BLAKE2B bf448f20b5754401d3cb095783bd66332585addbbd916d4b0672f0c6f8b8a5cbfdfffdcf4516463770d5ba29b7b11ad075c0d6aba046bdf8922fb2273d92b995 SHA512 6a79d97ec2b480f0da057259382466f43752693b43a314ddebdf1e0a0f511bf0ed75cc48773df2665129b9d660a84c3f3b3dd2b657d4eeac1cd0a45388fa2d71
+EBUILD gnuplot-5.4.0-r100.ebuild 5251 BLAKE2B 855f0b8c3c9d650d7b36f063e19958306695266cfa6fc5a1ea625df6794f66db42a889492234beaa953b1fd94da5616d80e91e0ec32c5edfb428b9fe97d563f7 SHA512 f64417a4934c0f14197c81340d54d3e91f79f4412829791db73fbc568ba13967e0032f1493276c13ef9d88bc224c57144f611c53ad8c1c0fe8855d4fe08c150c
+EBUILD gnuplot-5.4.0-r2.ebuild 5120 BLAKE2B 449a0b41a70da220ac7027aa149c58d19ec2273d693f5aaa6ccf8612940fa42a046c978d8dbb8d4efdfe4e2c062d1fb97fd0a4558fd88620228d2dbefce2b2a2 SHA512 b0468c83ff54e8d06803001e154718375458129196378ada36d6a5d0f7f50536f40261d8bde3fcfb4fb0a7238f7d454cc84ba61353f7361490967ff8b004567a
+EBUILD gnuplot-5.5.9999.ebuild 5018 BLAKE2B 436966e02c861a919c10c8c776ff7a9117aa873cc823abbe5222bd2b8f21fd3fb0ceef6d95a109e6a7aba571953104c7d460f1cfeafafe3ff8e28528e341690c SHA512 819b6bceeeaa67e455a7894279012d713994a1fa15f1aafd8423db89f0a83099d41450517a500a3890b240e5f2bb49bfd37ae8baa17cbcfac8f3f49e040587ef
 MISC metadata.xml 1155 BLAKE2B eff192a398ceb9f9484a4fce82498a5eb657d7609c835843f964c8468c8d8a8f913e025413e4501affa15bf19c9eb7ee24153313f6d8f42b4f6f4284af081540 SHA512 1dfff9f997a870c33e455eb896949d0a379be4c20c93a92b2dc6c8495c08e98340ea1d254b40ee64c2520587869e529f7b33689fd1d157631da640179d5ed295
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch
deleted file mode 100644
index 4441e4b8c036..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/690014
-https://sourceforge.net/p/gnuplot/mailman/message/34342174/
-
---- gnuplot-5.2.6-orig/configure.ac
-+++ gnuplot-5.2.6/configure.ac
-@@ -1224,6 +1224,7 @@
- if test "${enable_qt_ok}" = yes \
-   || test "${enable_wxwidgets_ok}" = yes \
-   || test "$GGI_SUPPORT" = yes \
-+  || test "$with_caca" = yes \
-   || test "$no_x" != yes; then
-     enable_mouse=yes;
- fi
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.8-caca.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.8-caca.patch
new file mode 100644
index 000000000000..2ce464f04499
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.2.8-caca.patch
@@ -0,0 +1,33 @@
+Patch backported from branch-5-4-stable.
+https://bugs.gentoo.org/690014
+
+--- gnuplot-5.2.8-orig/term/caca.trm
++++ gnuplot-5.2.8/term/caca.trm
+@@ -1909,8 +1909,11 @@
+ 	CACA_result loop = CACA_loop;
+ 	caca_event_t ev;
+ 	const int event_mask =
+-		CACA_EVENT_KEY_PRESS | CACA_EVENT_RESIZE |  CACA_EVENT_QUIT |
+-		CACA_EVENT_MOUSE_MOTION | CACA_EVENT_MOUSE_PRESS | CACA_EVENT_MOUSE_RELEASE;
++		CACA_EVENT_KEY_PRESS | CACA_EVENT_RESIZE |  CACA_EVENT_QUIT
++#ifdef USE_MOUSE
++		| CACA_EVENT_MOUSE_MOTION | CACA_EVENT_MOUSE_PRESS | CACA_EVENT_MOUSE_RELEASE
++#endif
++		;
+ 	static int mx = 0, my = 0; /* current mouse position */
+ 	static unsigned long last_event_time = 0;
+ 
+@@ -2577,11 +2580,13 @@
+ 		}
+ 	}
+ 
++#ifdef USE_MOUSE
+ 	if (changed) {
+ 		/* Replot only if something changed. */
+ 		CACA_zoom_or_replot = TRUE;
+ 		process_event(GE_replot, 0, 0, 0, 0, 0);
+ 	}
++#endif
+ }
+ 
+ 
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.0-caca.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.0-caca.patch
new file mode 100644
index 000000000000..f92ac93ab018
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.0-caca.patch
@@ -0,0 +1,46 @@
+From f76d96206a7251d62dbbd3879bf0ad6dfe1ec486 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
+Date: Sat, 7 Nov 2020 11:25:07 -0800
+Subject: [PATCH] Allow to build --with-caca but without mouse support
+
+EAM: slightly modified fix
+Bug #2351
+---
+ term/caca.trm | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/term/caca.trm b/term/caca.trm
+index cf7c0d7c6..58606e2d8 100644
+--- a/term/caca.trm
++++ b/term/caca.trm
+@@ -1913,8 +1913,11 @@ CACA_process_events(void)
+ 	CACA_result loop = CACA_loop;
+ 	caca_event_t ev;
+ 	const int event_mask =
+-		CACA_EVENT_KEY_PRESS | CACA_EVENT_RESIZE |  CACA_EVENT_QUIT |
+-		CACA_EVENT_MOUSE_MOTION | CACA_EVENT_MOUSE_PRESS | CACA_EVENT_MOUSE_RELEASE;
++		CACA_EVENT_KEY_PRESS | CACA_EVENT_RESIZE |  CACA_EVENT_QUIT
++#ifdef USE_MOUSE
++		| CACA_EVENT_MOUSE_MOTION | CACA_EVENT_MOUSE_PRESS | CACA_EVENT_MOUSE_RELEASE
++#endif
++		;
+ 	static int mx = 0, my = 0; /* current mouse position */
+ 	static unsigned long last_event_time = 0;
+ 
+@@ -2579,11 +2582,13 @@ CACA_modify_plots(unsigned int operations, int plotno)
+ 		}
+ 	}
+ 
++#ifdef USE_MOUSE
+ 	if (changed) {
+ 		/* Replot only if something changed. */
+ 		CACA_zoom_or_replot = TRUE;
+ 		exec_event(GE_replot, 0, 0, 0, 0, 0);
+ 	}
++#endif
+ }
+ 
+ 
+-- 
+2.29.2
+
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch
new file mode 100644
index 000000000000..8133c3516edf
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch
@@ -0,0 +1,27 @@
+From cfd9ff9408949ee58be9ba5a18b74ce4562f374a Mon Sep 17 00:00:00 2001
+From: Ethan A Merritt <merritt@u.washington.edu>
+Date: Fri, 6 Nov 2020 13:06:21 -0800
+Subject: [PATCH] make sure warning message about no mouse support is non-fatal
+
+Bug #2350
+---
+ src/set.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/set.c b/src/set.c
+index a697925bc..a6acf8fc6 100644
+--- a/src/set.c
++++ b/src/set.c
+@@ -3130,7 +3130,8 @@ set_mouse()
+     PM_update_menu_items();
+ #endif
+ #else /* USE_MOUSE */
+-    c_token++;
++    while (!END_OF_COMMAND)
++	c_token++;
+     int_warn(NO_CARET, "this copy of gnuplot has no mouse support");
+ #endif /* USE_MOUSE */
+ }
+-- 
+2.29.2
+
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch
new file mode 100644
index 000000000000..aa98f27dc2b2
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch
@@ -0,0 +1,40 @@
+From 87034e509b366078b746a3a70e05aaf497e34585 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
+Date: Fri, 6 Nov 2020 13:25:02 +0100
+Subject: [PATCH] configure.ac: move PKG_PROG_PKG_CONFIG to the beginning of
+ the file
+
+Bug #2349
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67ad1396c..606242ea3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,6 +88,10 @@ AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,[
+ #include <sys/types.h>
+ #include <time.h>])
+ 
++dnl explicit call to PKG_PROG_PKG_CONFIG because the first call to
++dnl PKG_CHECK_MODULES{,_NOFAIL} may not happen
++PKG_PROG_PKG_CONFIG
++
+ AC_ARG_WITH(libcerf,dnl
+ [  --without-libcerf       build without special functions from libcerf (default enabled)],,
+   [test -z "${with_libcerf}" && with_libcerf=yes])
+@@ -759,10 +763,6 @@ AC_ARG_ENABLE(raise-console,dnl
+   fi
+ 
+ 
+-dnl explicit call to PKG_PROG_PKG_CONFIG because the first call to
+-dnl PKG_CHECK_MODULES may not happen
+-PKG_PROG_PKG_CONFIG
+-
+ dnl  wxWidgets terminal
+ 
+ dnl wxWidgets terminal needs C++
+-- 
+2.29.2
+
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
deleted file mode 100644
index baf70b0bb6a8..000000000000
--- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
-	inherit cvs
-	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="HEAD"
-	ECVS_USER="anonymous"
-	ECVS_CVS_OPTIONS="-dP"
-	MY_P="${PN}"
-else
-	MY_P="${P/_/.}"
-	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="gnuplot"
-SLOT="0"
-IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline svga wxwidgets X"
-
-RDEPEND="
-	cairo? (
-		x11-libs/cairo
-		x11-libs/pango )
-	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
-	ggi? ( media-libs/libggi )
-	latex? (
-		virtual/latex-base
-		lua? (
-			dev-tex/pgf
-			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
-	libcaca? ( media-libs/libcaca )
-	lua? ( dev-lang/lua:0 )
-	qt5? ( dev-qt/qtcore:5=
-		dev-qt/qtgui:5=
-		dev-qt/qtnetwork:5=
-		dev-qt/qtprintsupport:5=
-		dev-qt/qtsvg:5=
-		dev-qt/qtwidgets:5= )
-	readline? ( sys-libs/readline:0= )
-	libcerf? ( sci-libs/libcerf )
-	svga? ( media-libs/svgalib )
-	wxwidgets? (
-		x11-libs/wxGTK:3.0[X]
-		x11-libs/cairo
-		x11-libs/pango
-		x11-libs/gtk+:2 )
-	X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )
-	qt5? ( dev-qt/linguist-tools:5 )"
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="lisp/50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
-	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
-	eapply_user
-
-	if [[ -z ${PV%%*9999} ]]; then
-		local dir
-		for dir in config demo m4 term tutorial; do
-			emake -C "$dir" -f Makefile.am.in Makefile.am
-		done
-	fi
-
-	# Add special version identification as required by provision 2
-	# of the gnuplot license
-	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
-	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
-		for details. You can use the "pdfcairo" terminal for PDF output.'
-	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
-	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
-		SVGA console graphics, gnuplot needs to be set up as setuid root.
-		Please note that this is usually considered to be a security hazard.
-		As root, manually "chmod u+s /usr/bin/gnuplot".'
-	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
-		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
-		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information."
-
-	mv configure.in configure.ac || die
-	eautoreconf
-
-	# Make sure we don't mix build & host flags.
-	sed -i \
-		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
-		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
-		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
-		-e 's:@CC@:$(CC_FOR_BUILD):' \
-		docs/Makefile.in || die
-}
-
-src_configure() {
-	if ! use latex; then
-		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
-	fi
-
-	if use wxwidgets; then
-		WX_GTK_VER="3.0"
-		setup-wxwidgets
-	fi
-
-	tc-export CC CXX			#453174
-	tc-export_build_env BUILD_CC
-	export CC_FOR_BUILD=${BUILD_CC}
-
-	use qt5 && append-cxxflags -std=c++11
-
-	econf \
-		--without-pdf \
-		--with-texdir="${TEXMF}/tex/latex/${PN}" \
-		--with-readline=$(usex readline gnu builtin) \
-		$(use_with bitmap bitmap-terminals) \
-		$(use_with cairo) \
-		$(use_enable compat backwards-compatibility) \
-		$(use_with doc tutorial) \
-		$(use_with gd) \
-		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
-		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
-		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
-		$(use_with libcerf) \
-		$(use_with lua) \
-		$(use_with svga linux-vga) \
-		$(use_with X x) \
-		--enable-stats \
-		$(use_with qt5 qt qt5) \
-		$(use_enable wxwidgets) \
-		DIST_CONTACT="https://bugs.gentoo.org/" \
-		EMACS=no
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	export VARTEXFONTS="${T}/fonts"
-
-	# We believe that the following line is no longer needed.
-	# In case of problems file a bug report at bugs.gentoo.org.
-	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
-	emake all
-
-	if use doc; then
-		# Avoid sandbox violation in epstopdf/ghostscript
-		addpredict /var/cache/fontconfig
-		if use cairo && use gd; then
-			emake -C docs pdf
-		else
-			ewarn "Cannot build figures unless cairo and gd are enabled."
-			ewarn "Building documentation without figures."
-			emake -C docs pdf_nofig
-			mv docs/nofigures.pdf docs/gnuplot.pdf || die
-		fi
-		emake -C tutorial pdf
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
-	newdoc term/PostScript/README README-ps
-	newdoc term/js/README README-js
-	use lua && newdoc term/lua/README README-lua
-	readme.gentoo_create_doc
-
-	if use examples; then
-		# Demo files
-		insinto /usr/share/${PN}/${GP_VERSION}
-		doins -r demo
-		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
-		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
-	fi
-
-	if use doc; then
-		# Manual, tutorial, FAQ
-		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
-		# Documentation for making PostScript files
-		docinto psdoc
-		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-}
-
-src_test() {
-	GNUTERM="unknown" default_src_test
-}
-
-pkg_postinst() {
-	use latex && texmf-update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use latex && texmf-update
-}
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
index 29dde10c36aa..b741e27f8423 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
@@ -74,7 +74,7 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
 	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
 	eapply "${FILESDIR}"/${PN}-5.2.2-regis.patch
-	eapply "${FILESDIR}"/${PN}-5.2.6-caca.patch
+	eapply "${FILESDIR}"/${PN}-5.2.8-caca.patch
 	eapply_user
 
 	if [[ -z ${PV%%*9999} ]]; then
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
index 258946aad81d..47013ca921da 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
+LUA_COMPAT=( lua5-{1,2,3} )
+
+inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
@@ -11,18 +13,21 @@ HOMEPAGE="http://www.gnuplot.info/"
 if [[ -z ${PV%%*9999} ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
-	EGIT_BRANCH="branch-5-2-stable"
+	EGIT_BRANCH="master"
 	MY_P="${PN}"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="gnuplot"
 SLOT="0"
-IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis svga wxwidgets X"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
 	cairo? (
@@ -36,8 +41,9 @@ RDEPEND="
 			dev-tex/pgf
 			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
 	libcaca? ( media-libs/libcaca )
-	lua? ( dev-lang/lua:0 )
-	qt5? ( dev-qt/qtcore:5=
+	lua? ( ${LUA_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5=
 		dev-qt/qtgui:5=
 		dev-qt/qtnetwork:5=
 		dev-qt/qtprintsupport:5=
@@ -45,35 +51,44 @@ RDEPEND="
 		dev-qt/qtwidgets:5= )
 	readline? ( sys-libs/readline:0= )
 	libcerf? ( sci-libs/libcerf )
-	svga? ( media-libs/svgalib )
 	wxwidgets? (
-		x11-libs/wxGTK:3.0[X]
+		x11-libs/wxGTK:3.0-gtk3[X]
 		x11-libs/cairo
 		x11-libs/pango
-		x11-libs/gtk+:2 )
+		x11-libs/gtk+:3 )
 	X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-langgreek
 		app-text/ghostscript-gpl )
 	qt5? ( dev-qt/linguist-tools:5 )"
 
-S="${WORKDIR}/${MY_P}"
-
 GP_VERSION="${PV%.*}"
 E_SITEFILE="lisp/50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+	"${FILESDIR}"/${P}-pkg-config.patch
+	"${FILESDIR}"/${P}-no-mouse.patch
+	"${FILESDIR}"/${P}-caca.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 src_prepare() {
-	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
-	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
-	eapply "${FILESDIR}"/${PN}-5.2.2-regis.patch
-	eapply "${FILESDIR}"/${PN}-5.2.6-caca.patch
-	eapply_user
+	default
 
-	if [[ -z ${PV%%*9999} ]]; then
+	if [[ ${PV##*.} = 9999 ]]; then
 		local dir
 		for dir in config demo m4 term tutorial; do
 			emake -C "$dir" -f Makefile.am.in Makefile.am
@@ -84,18 +99,6 @@ src_prepare() {
 	# of the gnuplot license
 	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
 
-	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
-		for details. You can use the "pdfcairo" terminal for PDF output.'
-	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
-	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
-		SVGA console graphics, gnuplot needs to be set up as setuid root.
-		Please note that this is usually considered to be a security hazard.
-		As root, manually "chmod u+s /usr/bin/gnuplot".'
-	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
-		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
-		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information."
-
 	eautoreconf
 
 	# Make sure we don't mix build & host flags.
@@ -113,7 +116,7 @@ src_configure() {
 	fi
 
 	if use wxwidgets; then
-		WX_GTK_VER="3.0"
+		WX_GTK_VER="3.0-gtk3"
 		setup-wxwidgets
 	fi
 
@@ -128,16 +131,12 @@ src_configure() {
 		--with-readline=$(usex readline gnu builtin) \
 		$(use_with bitmap bitmap-terminals) \
 		$(use_with cairo) \
-		$(use_enable compat backwards-compatibility) \
-		$(use_with doc tutorial) \
 		$(use_with gd) \
 		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
-		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
 		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
 		$(use_with libcerf) \
 		$(use_with lua) \
 		$(use_with regis) \
-		$(use_with svga linux-vga) \
 		$(use_with X x) \
 		--enable-stats \
 		$(use_with qt5 qt qt5) \
@@ -150,47 +149,50 @@ src_compile() {
 	# Prevent access violations, see bug 201871
 	export VARTEXFONTS="${T}/fonts"
 
-	# We believe that the following line is no longer needed.
-	# In case of problems file a bug report at bugs.gentoo.org.
-	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
 	emake all
 
 	if use doc; then
 		# Avoid sandbox violation in epstopdf/ghostscript
 		addpredict /var/cache/fontconfig
-		if use cairo && use gd; then
+		if use cairo; then
 			emake -C docs pdf
 		else
-			ewarn "Cannot build figures unless cairo and gd are enabled."
+			ewarn "Cannot build figures unless cairo is enabled."
 			ewarn "Building documentation without figures."
 			emake -C docs pdf_nofig
 			mv docs/nofigures.pdf docs/gnuplot.pdf || die
 		fi
-		emake -C tutorial pdf
 	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 
-	dodoc BUGS ChangeLog NEWS PGPKEYS README* RELEASE_NOTES TODO
+	dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
 	newdoc term/PostScript/README README-ps
 	newdoc term/js/README README-js
 	use lua && newdoc term/lua/README README-lua
+
+	local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
+		use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information."
 	readme.gentoo_create_doc
 
 	if use examples; then
 		# Demo files
 		insinto /usr/share/${PN}/${GP_VERSION}
 		doins -r demo
-		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
-		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
 	fi
 
 	if use doc; then
-		# Manual, tutorial, FAQ
-		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Manual, FAQ
+		dodoc docs/gnuplot.pdf FAQ.pdf
 		# Documentation for making PostScript files
 		docinto psdoc
 		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
@@ -198,7 +200,7 @@ src_install() {
 }
 
 src_test() {
-	GNUTERM="unknown" default_src_test
+	emake check GNUTERM="dumb"
 }
 
 pkg_postinst() {
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
index 4c57d268b612..a05cfa6234c7 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnuplot.info/"
 if [[ -z ${PV%%*9999} ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
-	EGIT_BRANCH="branch-5-2-stable"
+	EGIT_BRANCH="master"
 	MY_P="${PN}"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
 else
@@ -20,9 +20,11 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="gnuplot"
 SLOT="0"
-IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline svga wxwidgets X"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
 
 RDEPEND="
 	cairo? (
@@ -46,12 +48,11 @@ RDEPEND="
 		dev-qt/qtwidgets:5= )
 	readline? ( sys-libs/readline:0= )
 	libcerf? ( sci-libs/libcerf )
-	svga? ( media-libs/svgalib )
 	wxwidgets? (
-		x11-libs/wxGTK:3.0[X]
+		x11-libs/wxGTK:3.0-gtk3[X]
 		x11-libs/cairo
 		x11-libs/pango
-		x11-libs/gtk+:2 )
+		x11-libs/gtk+:3 )
 	X? ( x11-libs/libXaw )"
 
 DEPEND="${RDEPEND}"
@@ -61,21 +62,26 @@ BDEPEND="
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-langgreek
 		app-text/ghostscript-gpl )
 	qt5? ( dev-qt/linguist-tools:5 )"
 
-S="${WORKDIR}/${MY_P}"
-
 GP_VERSION="${PV%.*}"
 E_SITEFILE="lisp/50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+	"${FILESDIR}"/${P}-pkg-config.patch
+	"${FILESDIR}"/${P}-no-mouse.patch
+	"${FILESDIR}"/${P}-caca.patch
+)
+
 src_prepare() {
-	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
-	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
-	eapply_user
+	default
 
-	if [[ -z ${PV%%*9999} ]]; then
+	if [[ ${PV##*.} = 9999 ]]; then
 		local dir
 		for dir in config demo m4 term tutorial; do
 			emake -C "$dir" -f Makefile.am.in Makefile.am
@@ -86,18 +92,6 @@ src_prepare() {
 	# of the gnuplot license
 	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
 
-	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
-		for details. You can use the "pdfcairo" terminal for PDF output.'
-	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
-	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
-		SVGA console graphics, gnuplot needs to be set up as setuid root.
-		Please note that this is usually considered to be a security hazard.
-		As root, manually "chmod u+s /usr/bin/gnuplot".'
-	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
-		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
-		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information."
-
 	eautoreconf
 
 	# Make sure we don't mix build & host flags.
@@ -115,7 +109,7 @@ src_configure() {
 	fi
 
 	if use wxwidgets; then
-		WX_GTK_VER="3.0"
+		WX_GTK_VER="3.0-gtk3"
 		setup-wxwidgets
 	fi
 
@@ -130,15 +124,12 @@ src_configure() {
 		--with-readline=$(usex readline gnu builtin) \
 		$(use_with bitmap bitmap-terminals) \
 		$(use_with cairo) \
-		$(use_enable compat backwards-compatibility) \
-		$(use_with doc tutorial) \
 		$(use_with gd) \
 		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
-		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
 		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
 		$(use_with libcerf) \
 		$(use_with lua) \
-		$(use_with svga linux-vga) \
+		$(use_with regis) \
 		$(use_with X x) \
 		--enable-stats \
 		$(use_with qt5 qt qt5) \
@@ -151,34 +142,37 @@ src_compile() {
 	# Prevent access violations, see bug 201871
 	export VARTEXFONTS="${T}/fonts"
 
-	# We believe that the following line is no longer needed.
-	# In case of problems file a bug report at bugs.gentoo.org.
-	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
 	emake all
 
 	if use doc; then
 		# Avoid sandbox violation in epstopdf/ghostscript
 		addpredict /var/cache/fontconfig
-		if use cairo && use gd; then
+		if use cairo; then
 			emake -C docs pdf
 		else
-			ewarn "Cannot build figures unless cairo and gd are enabled."
+			ewarn "Cannot build figures unless cairo is enabled."
 			ewarn "Building documentation without figures."
 			emake -C docs pdf_nofig
 			mv docs/nofigures.pdf docs/gnuplot.pdf || die
 		fi
-		emake -C tutorial pdf
 	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 
-	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* RELEASE_NOTES TODO
+	dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
 	newdoc term/PostScript/README README-ps
 	newdoc term/js/README README-js
 	use lua && newdoc term/lua/README README-lua
+
+	local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
+		use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information."
 	readme.gentoo_create_doc
 
 	if use examples; then
@@ -190,8 +184,8 @@ src_install() {
 	fi
 
 	if use doc; then
-		# Manual, tutorial, FAQ
-		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Manual, FAQ
+		dodoc docs/gnuplot.pdf FAQ.pdf
 		# Documentation for making PostScript files
 		docinto psdoc
 		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
@@ -199,7 +193,7 @@ src_install() {
 }
 
 src_test() {
-	GNUTERM="unknown" default_src_test
+	emake check GNUTERM="dumb"
 }
 
 pkg_postinst() {
diff --git a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild
index aa399503dd8b..0b2af9540d46 100644
--- a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild
@@ -20,9 +20,11 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="gnuplot"
 SLOT="0"
-IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline wxwidgets X"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
 
 RDEPEND="
 	cairo? (
@@ -47,10 +49,10 @@ RDEPEND="
 	readline? ( sys-libs/readline:0= )
 	libcerf? ( sci-libs/libcerf )
 	wxwidgets? (
-		x11-libs/wxGTK:3.0[X]
+		x11-libs/wxGTK:3.0-gtk3[X]
 		x11-libs/cairo
 		x11-libs/pango
-		x11-libs/gtk+:2 )
+		x11-libs/gtk+:3 )
 	X? ( x11-libs/libXaw )"
 
 DEPEND="${RDEPEND}"
@@ -60,21 +62,23 @@ BDEPEND="
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-langgreek
 		app-text/ghostscript-gpl )
 	qt5? ( dev-qt/linguist-tools:5 )"
 
-S="${WORKDIR}/${MY_P}"
-
 GP_VERSION="${PV%.*}"
 E_SITEFILE="lisp/50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+)
+
 src_prepare() {
-	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
-	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
-	eapply_user
+	default
 
-	if [[ -z ${PV%%*9999} ]]; then
+	if [[ ${PV##*.} = 9999 ]]; then
 		local dir
 		for dir in config demo m4 term tutorial; do
 			emake -C "$dir" -f Makefile.am.in Makefile.am
@@ -85,14 +89,6 @@ src_prepare() {
 	# of the gnuplot license
 	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
 
-	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
-		for details. You can use the "pdfcairo" terminal for PDF output.'
-	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
-	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
-		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
-		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information."
-
 	eautoreconf
 
 	# Make sure we don't mix build & host flags.
@@ -110,7 +106,7 @@ src_configure() {
 	fi
 
 	if use wxwidgets; then
-		WX_GTK_VER="3.0"
+		WX_GTK_VER="3.0-gtk3"
 		setup-wxwidgets
 	fi
 
@@ -125,12 +121,12 @@ src_configure() {
 		--with-readline=$(usex readline gnu builtin) \
 		$(use_with bitmap bitmap-terminals) \
 		$(use_with cairo) \
-		$(use_with doc tutorial) \
 		$(use_with gd) \
 		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
 		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
 		$(use_with libcerf) \
 		$(use_with lua) \
+		$(use_with regis) \
 		$(use_with X x) \
 		--enable-stats \
 		$(use_with qt5 qt qt5) \
@@ -156,17 +152,24 @@ src_compile() {
 			emake -C docs pdf_nofig
 			mv docs/nofigures.pdf docs/gnuplot.pdf || die
 		fi
-		emake -C tutorial pdf
 	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 
-	dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES TODO
+	dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
 	newdoc term/PostScript/README README-ps
 	newdoc term/js/README README-js
 	use lua && newdoc term/lua/README README-lua
+
+	local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
+		use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information."
 	readme.gentoo_create_doc
 
 	if use examples; then
@@ -178,8 +181,8 @@ src_install() {
 	fi
 
 	if use doc; then
-		# Manual, tutorial, FAQ
-		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Manual, FAQ
+		dodoc docs/gnuplot.pdf #FAQ.pdf
 		# Documentation for making PostScript files
 		docinto psdoc
 		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
@@ -187,7 +190,7 @@ src_install() {
 }
 
 src_test() {
-	GNUTERM="unknown" default_src_test
+	emake check GNUTERM="dumb"
 }
 
 pkg_postinst() {
diff --git a/sci-visualization/gr/Manifest b/sci-visualization/gr/Manifest
index 1f4cc7486e47..70d8c36c113c 100644
--- a/sci-visualization/gr/Manifest
+++ b/sci-visualization/gr/Manifest
@@ -1,4 +1,4 @@
 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
-EBUILD gr-0.50.0-r1.ebuild 1932 BLAKE2B 5f0f985689446797443449d8dcf69aad1b676e200bfdd9a16c0f711e435c5a171d5a54d7b6a429c9b544dfafa5efaadacf40c299879176cb53d3585b7b9a81d4 SHA512 840fd46e829f67081c2c1a263dbe3ff77bf1ebca514f051201ed37064a6db36d5214be8210dd6bae70fc2df2f5f900bc88888459af98ab8b92b68593853804ff
+EBUILD gr-0.50.0-r2.ebuild 1976 BLAKE2B 9209a974e73feb808d15e2bde56d99d0179bb73a2b39199f4627866ce3d327ccfdec39e012a53bdd4bd7c8eeb62d06a90fc572d69b62497b0046514186b80b8a SHA512 d331f6c520d7b54dc73ae821493256eb123b724940b163154cad6bca1bd3253db2493e26baed7fe70e673ed37c02e3591743b92c16b1a67ac624776dd28ca7e2
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/sci-visualization/gr/gr-0.50.0-r1.ebuild b/sci-visualization/gr/gr-0.50.0-r2.ebuild
index ddb28dbc2466..9d42c16208c9 100644
--- a/sci-visualization/gr/gr-0.50.0-r1.ebuild
+++ b/sci-visualization/gr/gr-0.50.0-r2.ebuild
@@ -12,7 +12,7 @@ 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 X"
+IUSE="cairo ffmpeg postscript tiff truetype"
 
 DEPEND="
 	dev-qt/qtgui:5
@@ -23,12 +23,13 @@ DEPEND="
 	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 )
-	X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
@@ -67,7 +68,7 @@ src_install() {
 	echo "LDPATH=/usr/gr/$(get_libdir)" >> "${T}/99gr"
 	doenvd "${T}/99gr"
 
-	dosym ../gr/bin/gksqt /usr/bin/gksqt
+	[[ -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."
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 615b59950697..7ed92156335a 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -5,5 +5,5 @@ AUX gwyddion-2.56-automagic.patch 1522 BLAKE2B c760f952221ee4cd2e36572bef682ca45
 DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e
 DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3 SHA512 cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae
 EBUILD gwyddion-2.55-r4.ebuild 1593 BLAKE2B c814b8d1298723a73b4d3dc3c07be13a5394029c230d5964412320c7e57ce45173ce6e67ce919ede30c8f760c1315ad515bab550349796c96750439e0e0203d3 SHA512 c89856d8061168bc4800484adefbb48484bcdabe7030621935227885bd5d107ad26c506b867233705bad8b8bc3610d587256c6919e550c857e94f9cea1f9229a
-EBUILD gwyddion-2.56.ebuild 1573 BLAKE2B eb84e3b865d6afd4d96861293cd8a2174c00b85fbae975de9f4814e6c4d5a009745bab7a8524e529a56b97e83fd5d3896962acd3fd757ed8c05642ad24df267e SHA512 d545742eeccddaf671f55cd51cf7fa03031fef5e647f0c49b239461b1bc5014b6269c9c0c6df21e1ca85b6a9935c6a77f26e97355da046975213a9236f916ea4
+EBUILD gwyddion-2.56.ebuild 1648 BLAKE2B 60ecf19f3ec568a6f0d5e7dc41f3e29f4f36fd02190f3d32ef898ddeb283b699d8a864cb67268fe5ab1b9b76f29d1f8e148a63c6b5e57a76fb94a0a3659bb85e SHA512 4557739fb1a01e6b7ffbcc194f422167dc2bb6b792a27b0c827209e313acf0cc61e5b985ff54dc2dcf11235578f8b5c29361266ba7da9ee6af2373713e341edf
 MISC metadata.xml 938 BLAKE2B a6bdd3f5aa17f3846d6e44ebbb6f7e230253df851819bd3ce27be44d6e288590f149576fb2bbd8e19ad04c757d58675f6b96d57571c0c92eae8dde432a08b2ee SHA512 2e90996291b1a4ca744a87af2621e3f8afcf39660a550e82d1b018ffffc41123897a923702ba61718ca97586d95672dee8777579cc4f666e57df88e534f555b1
diff --git a/sci-visualization/gwyddion/gwyddion-2.56.ebuild b/sci-visualization/gwyddion/gwyddion-2.56.ebuild
index de98686272c3..85f881ab3d16 100644
--- a/sci-visualization/gwyddion/gwyddion-2.56.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.56.ebuild
@@ -47,6 +47,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# hack for bug 741840
+	use doc && export GTK_DOC_PATH=/usr/share/gtk-doc
+
 	econf \
 		--disable-rpath \
 		--without-kde4-thumbnailer \
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index e28eff01a708..0b3cd1c74bee 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,4 +1,4 @@
-DIST labplot-2.7.0.tar.xz 13306532 BLAKE2B 044f6f1e552b6ccbd56791e39af240c97f0c572fae66ede0bbc13e172a88b652b0c42182fa4f6742b386dfd9c17f3041180841fe531387a9f44bd9b00adb8c09 SHA512 73e10ed98694b7633e80ffa7745733392cf9ce36f45e4ef6432d661b015dd3e821ddc791223a32fa55115c68f0d82b90464080915f8bb55cd1907610151a2d0a
-EBUILD labplot-2.7.0.ebuild 2180 BLAKE2B bdfc006342f37984afb3ee2518b40f039db75ed17235cf1daecb358527f36496d43eee2f3e4bc979ad50201fd154205ea02c05f9d26dc0a9e4d54847ee9d08c5 SHA512 b040383dda9e4f1b62a36b045a18724083bc4c0fdaa9398132e06253e3786e363fbbfe3d33d88f103a562364e0709b9bebaa3e761c45e39ba400c84e59c110d6
-EBUILD labplot-9999.ebuild 2180 BLAKE2B bdfc006342f37984afb3ee2518b40f039db75ed17235cf1daecb358527f36496d43eee2f3e4bc979ad50201fd154205ea02c05f9d26dc0a9e4d54847ee9d08c5 SHA512 b040383dda9e4f1b62a36b045a18724083bc4c0fdaa9398132e06253e3786e363fbbfe3d33d88f103a562364e0709b9bebaa3e761c45e39ba400c84e59c110d6
-MISC metadata.xml 864 BLAKE2B 08fc970f0e9804d36cc5ccbd2b08ee9dbfac30322e5cf56b0253ac3665bced133c2d28d27c64a47cc1faa0f310e6acf8b3f8b774174cab3a2b78da1cf1f0de79 SHA512 04ad431c7e59b54a713c34f35baf3e16b585e45784a39de7bd2a42deea36f27b96d1ea27d1b7bf052934d8f02d57370663c393219fba39bffe6d4d74e07868d0
+DIST labplot-2.8.1.tar.xz 13203288 BLAKE2B 59699faf0abe3355ab996321203c829b3aff5d7943c2688e955c0a84807a47a1e665d630dd052d6e3c005dc78cf7c613a87ccf5ce6cc2498bb694d9de838780a SHA512 9e03e70a1c0f167626583b2480b3d00743221ae5121e4f9cdc5170f292804fb41b03369c53bc729c006c61adb446ef05496f9789a3c89ffbb3bf51bcdc79c7ba
+EBUILD labplot-2.8.1.ebuild 2318 BLAKE2B 19afffe584982eff59a846e2e21db39311416a020a9727cf32aaabe1d12eba625105382376056f3e1f81dc8c12035b9041a6c5cf965f2a93333aa38f5804e7d0 SHA512 fd2f68e5cb18384bd4ce3847b9bfca0862fb82903928b9bcb9bf9322a6a4c703a9e0a3a564ceea976a5dcb772025714046af67beba86e480bcfacc838e9424e5
+EBUILD labplot-9999.ebuild 2318 BLAKE2B 19afffe584982eff59a846e2e21db39311416a020a9727cf32aaabe1d12eba625105382376056f3e1f81dc8c12035b9041a6c5cf965f2a93333aa38f5804e7d0 SHA512 fd2f68e5cb18384bd4ce3847b9bfca0862fb82903928b9bcb9bf9322a6a4c703a9e0a3a564ceea976a5dcb772025714046af67beba86e480bcfacc838e9424e5
+MISC metadata.xml 968 BLAKE2B 559e66667254b34ec3d884d6fe1d04a08ecd5b47cda991a98771caef3dca44c2fed9b01509b82e74a5051a9b96724654108729050f70ea9bc78621fa8109d69d SHA512 da2eeb9e282fcadd6fcf51e9071619d6d1fe6ca5fa9c19bb19ff6337be48fcf0f5b394c5aab6d66580dbdd3ebfe4dc4bec5dd59cd66572b0e0554d2c14df00e9
diff --git a/sci-visualization/labplot/labplot-2.7.0.ebuild b/sci-visualization/labplot/labplot-2.8.1.ebuild
index fcf591f4a89e..4378d86effff 100644
--- a/sci-visualization/labplot/labplot-2.7.0.ebuild
+++ b/sci-visualization/labplot/labplot-2.8.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
-HOMEPAGE="https://labplot.kde.org/ https://kde.org/applications/education/org.kde.labplot2"
+HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/en/labplot2"
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="cantor fftw fits hdf5 libcerf netcdf root"
+IUSE="cantor fftw fits hdf5 libcerf netcdf root serial telemetry"
 
 # not packaged: dev-qt/qtmqtt, bug 683994
 BDEPEND="
@@ -30,7 +30,6 @@ DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtserialport-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -50,7 +49,7 @@ DEPEND="
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	>=sci-libs/gsl-1.15:=
 	cantor? (
-		>=kde-apps/cantor-19.08.0:5
+		>=kde-apps/cantor-19.12.0:5
 		>=kde-frameworks/kparts-${KFMIN}:5
 		>=kde-frameworks/kservice-${KFMIN}:5
 	)
@@ -63,6 +62,8 @@ DEPEND="
 		app-arch/lz4
 		sys-libs/zlib
 	)
+	serial? ( >=dev-qt/qtserialport-${QTMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}"
 
@@ -75,6 +76,8 @@ src_configure() {
 		-DENABLE_LIBCERF=$(usex libcerf)
 		-DENABLE_NETCDF=$(usex netcdf)
 		-DENABLE_ROOT=$(usex root)
+		-DENABLE_QTSERIALPORT=$(usex serial)
+		$(cmake_use_find_package telemetry KUserFeedback)
 		-DENABLE_TESTS=$(usex test)
 		-DENABLE_MQTT=OFF
 	)
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
index fcf591f4a89e..4378d86effff 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
-HOMEPAGE="https://labplot.kde.org/ https://kde.org/applications/education/org.kde.labplot2"
+HOMEPAGE="https://labplot.kde.org/ https://apps.kde.org/en/labplot2"
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="cantor fftw fits hdf5 libcerf netcdf root"
+IUSE="cantor fftw fits hdf5 libcerf netcdf root serial telemetry"
 
 # not packaged: dev-qt/qtmqtt, bug 683994
 BDEPEND="
@@ -30,7 +30,6 @@ DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtserialport-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -50,7 +49,7 @@ DEPEND="
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	>=sci-libs/gsl-1.15:=
 	cantor? (
-		>=kde-apps/cantor-19.08.0:5
+		>=kde-apps/cantor-19.12.0:5
 		>=kde-frameworks/kparts-${KFMIN}:5
 		>=kde-frameworks/kservice-${KFMIN}:5
 	)
@@ -63,6 +62,8 @@ DEPEND="
 		app-arch/lz4
 		sys-libs/zlib
 	)
+	serial? ( >=dev-qt/qtserialport-${QTMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}"
 
@@ -75,6 +76,8 @@ src_configure() {
 		-DENABLE_LIBCERF=$(usex libcerf)
 		-DENABLE_NETCDF=$(usex netcdf)
 		-DENABLE_ROOT=$(usex root)
+		-DENABLE_QTSERIALPORT=$(usex serial)
+		$(cmake_use_find_package telemetry KUserFeedback)
 		-DENABLE_TESTS=$(usex test)
 		-DENABLE_MQTT=OFF
 	)
diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml
index 150390b19845..5b1410adb0ef 100644
--- a/sci-visualization/labplot/metadata.xml
+++ b/sci-visualization/labplot/metadata.xml
@@ -18,5 +18,6 @@
 		<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>
+		<flag name="serial">Enable support for RS232 serial ports using <pkg>dev-qt/qtserialport</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-visualization/nonolith-connect/Manifest b/sci-visualization/nonolith-connect/Manifest
deleted file mode 100644
index e76e34b3bda9..000000000000
--- a/sci-visualization/nonolith-connect/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 1.1-cflags-respect.patch 2622 BLAKE2B 645d39bac914a7d10563e35f1c34d432f6b018a846c6242135d1cc8f0d4e12b23acb174b40484540bdececaf445bede0b2f8637737069596adad42aee374e00e SHA512 92591f3b70cbcf175f49fa79f0ffc006ff594eb57669e0abdcd2ab940615ba20d73c191fddf8e8546811954ebae1cf3a796e21e7bcbb32708e80a6f4110f59ea
-AUX 1.1-gcc6.patch 424 BLAKE2B fd24205ce5041d6b4b9d015f692713f05a2baa5a23c16dced5ad074ef3079ee23cae9cb5ddc8bb3337da4d5d94af5b6098825b415c9bf7a633f732165a4a462d SHA512 88603392957da2a20c52852b452e62a80a1115a696e91d854529fed8ed8df44c2c4213c4cc39fa738c9ccb4518769363574241bba17597572ad43e603dadb5ea
-AUX nonolith-connect.initd 353 BLAKE2B 2a5fab0951f69549adf610e0ca04dabf8a0f94efaa6c60101855cec8719fd1d393e931d6b814e9b5168b2a9034976b0f42e8e7577d9c76006a6dd26c27b4a562 SHA512 c27852ce9f6529f09b03666dda9416f28cead09e3336ef7cc099e4d84ef65c1449054fc9b72400525db0ebe8ff049db739978010dc4a0dc737786c9bdb9ee23d
-DIST nonolith-connect-1.1.tar.bz2 559686 BLAKE2B 5a5a0ee7671e20661d182eaa448b96d3f259773618f473cacd94097b80bfcaa0c28d991271bb587ae2efa425f4ce14938dff56eaeb4164dd6aa98ba24a2def8e SHA512 41fe49a21a2f773c04c8054f322d17958b3eadac82e7013c50ff73c13dc31baa4905d52c02b5270d636fbb5348aff7ca8b064a30a81e970083abd6e69f93aff9
-EBUILD nonolith-connect-1.1.ebuild 1060 BLAKE2B 90e7b02f46398bb67a1bba7baa4c2481df5d5fe25a901f144a069f2a6d1dccfd05842daebb615394b923a3d16a4184f1b743f0f01c51a81ce65c38bdc7f6dfae SHA512 0b4b1857fa97bc00778129c7a99a08f2eec1d71f4c6bc90b4381bf39031668ca430792475689ca99f149f929a45545306545abfdb2801c8d45cd151131207f70
-MISC metadata.xml 369 BLAKE2B 724eb755ee6ed5d2a6449e643514609cd04460039411064c5d54836ffa9e9114da08044ba2bf9de960fa771b7cd30dd14935ed53d40fd572f12c67b147b2a469 SHA512 b8422b3315767f81b2e038409d54bd3fe9aa9e674e1c9ec46e56056ca421e96dfbd12e35329475310f9dc91369dda6a50382132ee111adc012d746b216b51f08
diff --git a/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch b/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch
deleted file mode 100644
index c6b04c5fe339..000000000000
--- a/sci-visualization/nonolith-connect/files/1.1-cflags-respect.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -uNr nonolith-connect-1.1.ORIG/SConstruct nonolith-connect-1.1/SConstruct
---- nonolith-connect-1.1.ORIG/SConstruct	2012-03-22 10:02:11.398944187 +0000
-+++ nonolith-connect-1.1/SConstruct	2012-03-22 10:05:23.149936839 +0000
-@@ -1,7 +1,21 @@
- import sys, os, shutil
-+import SCons.Util
- 
- env = Environment()
- 
-+if os.environ.has_key('CC'):
-+   env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+   env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+   env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+   env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+   env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+if "$CCFLAGS" in env['CXXCOM']:
-+   env['CXXCOM'] = env['CXXCOM'].replace("$CCFLAGS","")
-+
- opts = Variables()
- opts.Add(BoolVariable("mingwcross", "Cross-compile with mingw for Win32", 0))
- opts.Add(BoolVariable("boost_static", "Statically link against Boost", 0))
-@@ -95,8 +109,7 @@
- sources = Glob('*.cpp') +  Glob('streaming_device/*.cpp') + ['cee/cee.cpp', 'bootloader/bootloader.cpp']
- 
- json = env.Library('json', 
--	Glob('libjson/Source/*.cpp'),
--	CCFLAGS = "-c -O3 -ffast-math -fexpensive-optimizations".split()
-+	Glob('libjson/Source/*.cpp')
- )
- 
- websocketpp = env.Library('websocketpp', ['websocketpp/src/'+i for i in [
-@@ -107,7 +120,7 @@
-                 'websocket_session.cpp',
-                 'sha1/sha1.cpp',
-                 'base64/base64.cpp'
--            ]], CCFLAGS=['-g', '-O3'])
-+            ]])
- 
- 
- libusb_cflags = []
-@@ -121,14 +134,22 @@
- 	libusb_os = ['os/poll_windows.c', 'os/windows_usb.c', 'os/threads_windows.c']
- 	libusb_cflags += ['-D OS_WINDOWS', '-DPOLL_NFDS_TYPE=unsigned int', '-D WINVER=0x0501']
- 
--libusb = env.Library('libusb_nonolith', ['libusb/libusb/'+i for i in [
-+env_libusb = env.Clone()
-+env_libusb.Append(CPPFLAGS=libusb_cflags)
-+env_libusb.Append(CFLAGS=['-Ilibusb', '-Ilibusb/libusb'])
-+
-+libusb = env_libusb.Library('libusb_nonolith', ['libusb/libusb/'+i for i in [
- 				'core.c',
- 				'descriptor.c',
- 				'io.c',
- 				'sync.c',
--			]+libusb_os], CFLAGS=['-g', '-O3', '-Ilibusb', '-Ilibusb/libusb']+libusb_cflags) 
-+			]+libusb_os]) 
- 
- 
- libs += boostlibs
- 
--env.Program('nonolith-connect', sources, LIBS=libs, CCFLAGS=['-Wall', '-g', '-O3', '-Ilibusb', '-Iwebsocketpp/src', '-shared'], FRAMEWORKS=frameworks)
-+env_main = env.Clone()
-+env_main.Append(CXXFLAGS=['-Ilibusb', '-Iwebsocketpp/src', '-Wall'])
-+#env_main.Append(LINKFLAGS=['-shared'])
-+env_main.Program('nonolith-connect', sources, LIBS=libs, FRAMEWORKS=frameworks)
-+
diff --git a/sci-visualization/nonolith-connect/files/1.1-gcc6.patch b/sci-visualization/nonolith-connect/files/1.1-gcc6.patch
deleted file mode 100644
index 815c3ca866c7..000000000000
--- a/sci-visualization/nonolith-connect/files/1.1-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- nonolith-connect-1.1/websocketpp/src/websocket_server_session.cpp.old	2016-09-25 18:13:31.820474134 -0400
-+++ nonolith-connect-1.1/websocketpp/src/websocket_server_session.cpp	2016-09-25 18:38:52.654567787 -0400
-@@ -41,8 +41,11 @@
- #include <iostream>
- #include <sstream>
- #include <string>
-+
-+#if __cplusplus < 201103L
- #include <ext/algorithm>
- using __gnu_cxx::copy_n;
-+#endif
- 
- using websocketpp::server_session;
- 
diff --git a/sci-visualization/nonolith-connect/files/nonolith-connect.initd b/sci-visualization/nonolith-connect/files/nonolith-connect.initd
deleted file mode 100644
index c8a6bd1d0414..000000000000
--- a/sci-visualization/nonolith-connect/files/nonolith-connect.initd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	after logger
-}
-
-start() {
-	ebegin "Starting nonolith-connect"
-	start-stop-daemon --start --quiet -b -m -p /var/run/nonolith-connect.pid -u nonolithd:usb --exec /usr/bin/nonolith-connect
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping nonolith-connect"
-	start-stop-daemon --stop --quiet -p /var/run/nonolith-connect.pid
-	eend $?
-}
diff --git a/sci-visualization/nonolith-connect/metadata.xml b/sci-visualization/nonolith-connect/metadata.xml
deleted file mode 100644
index 119bc9428076..000000000000
--- a/sci-visualization/nonolith-connect/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-<maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild b/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
deleted file mode 100644
index 955e544fbc61..000000000000
--- a/sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit scons-utils toolchain-funcs user
-
-DESCRIPTION="CEE (Control - Experiment - Explore) analog multitool"
-HOMEPAGE="http://www.nonolithlabs.com/cee/"
-SRC_URI="http://apps.nonolithlabs.com/download/source/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost
-	virtual/udev
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-cflags-respect.patch"
-	"${FILESDIR}/${PV}-gcc6.patch"
-)
-
-pkg_setup() {
-	tc-export CC CXX
-	enewuser nonolithd -1 -1 /dev/null usb
-}
-
-src_configure() {
-	myesconsargs=(
-		boost_static=0
-	)
-}
-
-src_compile() {
-	escons
-}
-
-src_install() {
-	dobin nonolith-connect
-	newinitd "${FILESDIR}"/nonolith-connect.initd nonolith-connect
-}
-
-pkg_postinst() {
-	einfo "Consider adding nonolith-connect to the default runlevel."
-	einfo "Please connect your CEE hardware, start nonolith-connect "
-	einfo "using the init script provided and then visit:"
-	einfo "http://apps.nonolithlabs.com/setup"
-}
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 74c6929306e7..5cdb670e448c 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -2,8 +2,9 @@ AUX paraview-4.0.1-xdmf-cstring.patch 360 BLAKE2B 919de8333b22125dd1122987f780ad
 AUX paraview-5.3.0-fix_buildsystem.patch 797 BLAKE2B f77c72f34c13eae42a4da281f954808f7db47c7765b9084a99d2e0ea6297d30092d1b3dae7ab26df7ac1e4de6559805748c0994853e2ad34c0f8f639ce732b12 SHA512 18526dc29219fd8dbc3679920ce271977cfb153a51cf217d49ba544510da23ee02f57b3ee9450ad9ee421d272a18fecdf3bd5043225cc16d04a2b115f62ce1f0
 AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9075c5751f8a64027da009679de5c3f5b941681e65df9b91b0a05a3f0201a873313d859f029596739b1c5d705a1c35ae3cc83251312774e SHA512 0c79315d28b98d4cf45bfd48198dbb3315ebf6ffbd05e9720b35e7bdea05bd98c086dbb02cd7ac6d9580f504c7d29f498244d2b30d9e2932e881261a78b020c7
 AUX paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch 1185 BLAKE2B 9573a94af926615a3e6e8e043ea5bbbbf7a7946e33bce30c9fe6475de074142043463c345cf6caed09a60a63c241cac19ca2a54383b41752441b72e0bf5d9f17 SHA512 3552ae966be577840187590c651abc98e41047cbac6b679a17779b83b37c8d1ddd1a36a6ddd6dffb01b66138d2fc8a1bd335afb3ee488d2faa60c7ec1e4323e0
+AUX paraview-5.8.1-find-xmlpatterns.patch 1343 BLAKE2B 6786f27d4a3d5539f0265d1b3426b16063e795fca57d51ac3d232e5258d4d3db1b765379607ba143a422fe8f49b12354edc51fd4f4700a709e2e4aa362e75b8c SHA512 08aa76bdb1251638d52a2871116f507cc492cf03895a1950e05a56048571edb932efebe0f7704d56cd61afadee8f1f9e7003bc02825df83550944f84265b1658
 DIST ParaView-v5.8.0.tar.xz 49789116 BLAKE2B 25689220f506221731bb5a56c647c249df0de8654a4b3347a7c09067bb5755818597bd7cfff88c2d129f448189b107079995c93599d482f7bf8b4cc6c7430e72 SHA512 43304d62c3f55bc390e68c033fb4c7dc2c0789d0dadbb98ef734b7d9de0419af4c240ce94f36e2b52c939ac950fba1d70dbd9fc3a1e6da37c7ef847b5c8682a2
 DIST ParaView-v5.8.1.tar.xz 49822084 BLAKE2B 1b99392a85c19fdc02f8f9f0f055fb7efd8a0b17eedfd84005d1af9b170c34ec4eedb25700f91c3a2241ee80e271fe1e744e3a729b7726deb8f9c7a9fd2e4191 SHA512 94861c01da2f98c47e7453d072a4de34a7f52f5df280a8745b44d58d8d6a1dba42a15d0bac31895bbe25f23d993d4d356e5af1f8415137e289afd60570070248
 EBUILD paraview-5.8.0-r3.ebuild 6343 BLAKE2B d3136156a23fd16e9a8f7fdfaf1f413819ea710930834bc530934f58248b7909e41bdf49f825d7931960053c76b088016221aa4618b4313ebabe8ec3f80ccc8c SHA512 a4ae8e081d988d834569107f4295a3a9becc3f12b9c9739280097a75543c72ccf6eb2ccee00fb892fbee64bc578d09a454c57b12bc0b63f051d0825753c453fb
-EBUILD paraview-5.8.1.ebuild 6297 BLAKE2B 44274ab639f45e19cfafe884c3cc28a224b0d88e4dc1cd3dccc4fbca21300a0384c0944a828390248dc4cd619115ad75737c5636b4f6ef505fe88733fb4088d5 SHA512 23c2b09aa00a653583297d76bd5784e9309008a37e53fbf7f14407f04ea664910c60aeaded4b9deb07b5736381b11da5fb73f9697c89b382a794f329bd7dbb78
+EBUILD paraview-5.8.1.ebuild 6365 BLAKE2B 3da5abe853e0d3276b17583dde843f4ab01251e20b29d466e1299e81d3ab10928dab1fa0d765063e2363185ea7e5037fdfe23b6a04e9b1241f072cdb0606b51f SHA512 a525ce60d1d086a059aaa2f245217a473c954d462090085d0d0c35d7aff6e81654a491d5eef3517d05bf49743045c3e310f19b6f806b61e1ce872aa71d4c8205
 MISC metadata.xml 873 BLAKE2B 3f48aa66e19a19e8de7959d58248e7d4d7b6ca0f9dd98b869088f15bfc483dec486c89bdd448368eb0b385735ca8cfb3462a86e93fecb13383366ced4ead4ebd SHA512 871830a5157bc1f8803cf4dbd4797a58bd87d6338a3eaa21662a2e789412bf746c30f817a485a26b4b14fa578aa15b391efe76c920db7b1c2a2f74f9bf3eceb2
diff --git a/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch b/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch
new file mode 100644
index 000000000000..b02107bad7a7
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch
@@ -0,0 +1,38 @@
+From 7fe2ebc709ecb3e7f3b2aa6fc124dda0622541d4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 25 Nov 2020 16:32:56 +0100
+Subject: [PATCH] Make qt_xmlpatterns_executable overridable
+
+So far this relies on fragile guessing of path or binary being in PATH.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMake/ParaViewClient.cmake | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake
+index b0dea2b328..13b59cd744 100644
+--- a/CMake/ParaViewClient.cmake
++++ b/CMake/ParaViewClient.cmake
+@@ -512,11 +512,13 @@ function (paraview_client_documentation)
+   endif ()
+ 
+   include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL)
+-  find_program(qt_xmlpatterns_executable
+-    NAMES xmlpatterns-qt5 xmlpatterns
+-    HINTS "${Qt5_DIR}/../../../bin"
+-          "${Qt5_DIR}/../../../libexec/qt5/bin"
+-    DOC   "Path to xmlpatterns")
++  if (NOT qt_xmlpatterns_executable)
++    find_program(qt_xmlpatterns_executable
++      NAMES xmlpatterns-qt5 xmlpatterns
++      HINTS "${Qt5_DIR}/../../../bin"
++            "${Qt5_DIR}/../../../libexec/qt5/bin"
++      DOC   "Path to xmlpatterns")
++  endif ()
+   mark_as_advanced(qt_xmlpatterns_executable)
+ 
+   if (NOT qt_xmlpatterns_executable)
+-- 
+2.29.2
+
diff --git a/sci-visualization/paraview/paraview-5.8.1.ebuild b/sci-visualization/paraview/paraview-5.8.1.ebuild
index fec2161a4d14..21cee95dc062 100644
--- a/sci-visualization/paraview/paraview-5.8.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils desktop gnome2-utils python-single-r1 qmake-utils toolchain-funcs
+inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils
 
 MAIN_PV=$(ver_cut 0-1)
 MAJOR_PV=$(ver_cut 1-2)
@@ -15,8 +15,8 @@ HOMEPAGE="https://www.paraview.org"
 SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
 
 LICENSE="paraview GPL-2"
-KEYWORDS="~amd64 ~x86"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine"
 
 RESTRICT="mirror test"
@@ -106,10 +106,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
 	"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
 	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+	"${FILESDIR}"/${PN}-5.8.0-w-vtk-8.2.0-qt-5.15.patch # bug 729348
+	"${FILESDIR}"/${P}-find-xmlpatterns.patch # bug 755977, downstream patch
 )
 
-CMAKE_MAKEFILE_GENERATOR="emake" #579474
-
 pkg_setup() {
 	[[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
 	use python && python-single-r1_pkg_setup
@@ -117,11 +117,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-
 	# Bug #661812
 	mkdir -p Plugins/StreamLinesRepresentation/doc || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# lib64 fixes
 	sed -i \
@@ -133,10 +132,6 @@ src_prepare() {
 }
 
 src_configure() {
-	if use qt5; then
-		export QT_SELECT=qt5
-	fi
-
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
 		-UBUILD_SHARED_LIBS
@@ -219,36 +214,37 @@ src_configure() {
 			-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
 			-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
 			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+			-Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns"
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
-		# remove wrapper binaries and put the actual executable in place
-		for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
-			if [ -f "${ED}"/usr/lib/"$i" ]; then
-				mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
-			fi
-		done
+	# remove wrapper binaries and put the actual executable in place
+	for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
+		if [ -f "${ED}"/usr/lib/"$i" ]; then
+			mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
+		fi
+	done
 
-		# set up the environment
-		echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
-		doenvd "${T}"/40${PN}
+	# set up the environment
+	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
+	doenvd "${T}"/40${PN}
 
-		newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png
-		make_desktop_entry paraview "Paraview" paraview
+	newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png
+	make_desktop_entry paraview "Paraview" paraview
 
-		use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
-	}
+	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
+}
 
-	pkg_postinst() {
-		xdg_icon_cache_update
-	}
+pkg_postinst() {
+	xdg_icon_cache_update
+}
 
-	pkg_postrm() {
-		xdg_icon_cache_update
-	}
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest
index e15cb2351a6b..d03b6838fd0e 100644
--- a/sci-visualization/pythonprop/Manifest
+++ b/sci-visualization/pythonprop/Manifest
@@ -1,3 +1,5 @@
 DIST pythonprop-0.29.tar.gz 586118 BLAKE2B ac018f147206b59fbd2295e6e72d6e1a801d6456d8a9784bdb2511b0d9dcecfa455363826680051c90e0fcc83fdc95a16c91df120efb2e70456958276967dec7 SHA512 2fbbffedc9e010fdebeed7a84d23c599a2532ae0b67e6a2ba2da6bea0dc0496cb1f71ac54650285ed35196f33e689fc3d967e3bd7c4fb16832fc484a6b777fcb
+DIST pythonprop-0.30.tar.gz 1141872 BLAKE2B 0703358221825bbeffb47cd5ff97a8de4c22ed9922347b96e359c7fbeffd6bae681a81d4938c03f4199ce583821d6e1006ce2e12aa718f50b5de69f2c0476a38 SHA512 421cade49a241d0dd38afa92e2c1874e2e6a0837ac7aeb9f4a294a2cec23e80e446e88a4de202de445cde73b9d816f4d6e487536be8c02017f1754c116fba310
 EBUILD pythonprop-0.29.ebuild 1215 BLAKE2B 12d040287abe3d190bcffa886a51306fa0bbe1edd6c7c655e48f078d4fb904808e96a7827b7e2e3ea7ff3c6256f522981b12efb88e19389544676f382b89688a SHA512 f14a3917581e04e8748584b1e0229fab65ea4365c2bd11bef6582a5a1e01279521ae55005dcca2a27df2f3f1677959680fd9ca5de0a006dd2b07be18758834f5
+EBUILD pythonprop-0.30.ebuild 1210 BLAKE2B 8dd884be316ee49fd94a1e8f0583e00ff6d08414ad20b7cee3375a01db7fb80bd2837b62b78a163f28036284581c768866984edf80cb974940f9242b27eedfb1 SHA512 e738b924a6340031f6c5f1ef70372028aa8552e0c01fc5042ad0c5d180cc8cab5d2c8b32b34f468790d343f800c51447bd663dc7239fdfadef73c5d00d8cf1bd
 MISC metadata.xml 459 BLAKE2B dbf50a4c24f4a4dc0b27d087e0f0942ef7826ed8fcb858fd9744371f906bc5e1ff727a37db157705f5ebf630e744ce21bf9fc578e59eaaa6170215066b85a681 SHA512 23f2836015bd753b0a4957be9efa3347d2f5c6b79ec041465120aa9e8e6565397ba343ea8a393273eaab3c146b8555914b4a1e8bba2a0c4596bc49833388e8f1
diff --git a/sci-visualization/pythonprop/pythonprop-0.30.ebuild b/sci-visualization/pythonprop/pythonprop-0.30.ebuild
new file mode 100644
index 000000000000..38ac7c2ed83e
--- /dev/null
+++ b/sci-visualization/pythonprop/pythonprop-0.30.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Scripts to prepare and plot VOACAP propagation predictions"
+HOMEPAGE="https://www.qsl.net/h/hz1jw/pythonprop"
+SRC_URI="https://github.com/jawatson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		sci-libs/cartopy[${PYTHON_MULTI_USEDEP}]
+		dev-python/scipy[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-python/cairocffi
+	sci-electronics/voacapl
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	app-text/rarian
+"
+
+src_prepare() {
+	eapply_user
+
+	# drop building *.pdf files
+	sed -i -e "s#docs/user/help##g" Makefile.am || die
+	# do not call update_destop_database here
+	sed -ie "s/UPDATE_DESKTOP = /UPDATE_DESKTOP = # /g" data/Makefile.am || die
+	# fix Desktop Entry
+	sed -ie "s/HamRadio/HamRadio;/g" data/voacapgui.desktop.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	python_optimize
+}
diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest
index 11abb17c0262..024fee041e2f 100644
--- a/sci-visualization/tensorboard/Manifest
+++ b/sci-visualization/tensorboard/Manifest
@@ -1,6 +1,8 @@
 DIST tensorboard-2.1.0.zip 3835182 BLAKE2B c2c7dbc1ba4b85c52df6e693e1bd425bd76fe6db7ca25582b57d9c65c68b191dcdba2623ab0560139f1cac1bdf5c7a47261daaaf51fca46f2c5bf441f832a6fd SHA512 7463ace0863b90312a62a7fa96f4eca0147e85cf46ff21729f8996a794d54e14d876d3abe083d6aa4efd8e4e1582f7d5029de367f199981a34d4057b558bc51c
 DIST tensorboard-2.2.1.zip 2950617 BLAKE2B 487ad01981f994b23cb5fca8b60d9ed5f13ba13735d2613d1f3154eec9791b4b3068fb9fd50e75e16682e09ceb8a9ed8533ca2c43b6dea73db3adaeef15a889b SHA512 e96f8853d282dc19911cf2210ece0a4d7239f37dcba82e91697c80881fbcc21f12e4ba3e7d2eea7a84c9bb5b6521bf488d93d2312e55af9ec2d2c20f135d94fa
+DIST tensorboard-2.3.0.zip 6789437 BLAKE2B 34fe0ac903f6b79fc1ddebd2fab3d64e48a4ef9bb6159494e6b3ec5444ab6ad339f5ca7e4e478ec03dc7a788bbce6a4bd3ce253640136079a7a470f01f7b3a48 SHA512 d4cfdc8dbf030c022ecd635249f643d158c92274b142cd3de93cd8877c47cf59b9aca9aab12a971b986b84c7396bed3d7a012837b08d9dee6b0e53dc56e9fcbe
 EBUILD tensorboard-2.1.0-r1.ebuild 1838 BLAKE2B 777ceecaa2c901ee2c834b34b774d0c193b733e9ec3becfa6c07ee8b96bfe8a93abd5c1826a5ed38179a8bfcbfca2054a863e5f10d31822c0d7056669a5c4faa SHA512 1fcba112f887cfcb50adb7c396533da455f47413f037563ea6692227bcfc70767900219856a6574cec8e9c1efe6b04d84aef0aeee8c77113ee7424303ada7e0d
 EBUILD tensorboard-2.2.1-r1.ebuild 1946 BLAKE2B e67025a996ecbe523410775da621b4f741fc5b514474cd24dfea0ab7428411550f56c39b42c7f5b2e25adc466008bd664ed84519e1ea069dbcd4f2731e90f3ac SHA512 6a9c8f80e9a34adcc5ccbbb4535c9855e2818cc1fc46a04d6f801ef99241d856d81f77bf4c83c0e807653854ba218d33df7d67718d8c3e25f0b9d569856ed78b
 EBUILD tensorboard-2.2.1.ebuild 1944 BLAKE2B e0503f8c67624893eb16d97cfd36f0734f1db44526391cba62b7a664f1d4e4189519547904f706d8d03024ed47c45d5d0183b82f56df589cb43347c335f03db9 SHA512 29cd974fe3c4d0fe767838b60e198ef5cb553d3596f6f02afcea4eb56ee4a6a37d91e6f3f73cf77b1a4059037ec709cbf9917b0202794dd8dc7b200f9c61fe56
+EBUILD tensorboard-2.3.0.ebuild 1946 BLAKE2B e67025a996ecbe523410775da621b4f741fc5b514474cd24dfea0ab7428411550f56c39b42c7f5b2e25adc466008bd664ed84519e1ea069dbcd4f2731e90f3ac SHA512 6a9c8f80e9a34adcc5ccbbb4535c9855e2818cc1fc46a04d6f801ef99241d856d81f77bf4c83c0e807653854ba218d33df7d67718d8c3e25f0b9d569856ed78b
 MISC metadata.xml 494 BLAKE2B 367959e934fdf8e447da9632a05ea0ada6116a7c39cf42096a3b24f0dcf0c0bfbd3263e6f3913611c27e76f629b77d1e5022fa124d7e79f03a224bd3627bb538 SHA512 b59bedcac4e07ddbb62e90df57670116ba51c3d8c6294679ba5d8f17d7adbf3644f3d203c1d1ef4fa06d7e50640148ee259a081afb807477784350b98c52da11
diff --git a/sci-visualization/tensorboard/tensorboard-2.3.0.ebuild b/sci-visualization/tensorboard/tensorboard-2.3.0.ebuild
new file mode 100644
index 000000000000..9d1a93563347
--- /dev/null
+++ b/sci-visualization/tensorboard/tensorboard-2.3.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-r1
+
+DESCRIPTION="TensorFlow's Visualization Toolkit"
+HOMEPAGE="https://www.tensorflow.org/"
+SRC_URI="https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/bleach[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.6.3[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-oauthlib-0.4.1[${PYTHON_USEDEP}]
+	dev-python/grpcio[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]"
+BDEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	eapply_user
+
+	rm -rf "${S}/${PN}/_vendor/bleach" || die
+	rm -rf "${S}/${PN}/_vendor/html5lib" || die
+	sed -i -e '/_vendor.bleach/d' -e '/_vendor.html5lib/d' "${S}/${P}.dist-info/RECORD" || die "failed to unvendor"
+
+	find "${S}/${PN}" -name '*.py' -exec sed -i \
+		-e 's/^from tensorboard\._vendor import html5lib/import html5lib/' \
+		-e 's/^from tensorboard\._vendor import bleach/import bleach/' \
+		-e 's/^from tensorboard\._vendor\.html5lib/from html5lib/' \
+		-e 's/^from tensorboard\._vendor\.bleach/from bleach/' \
+		{} + || die "failed to unvendor"
+
+	sed -i -e '/tensorboard-plugin-/d' "${S}/${P}.dist-info/METADATA" || die "failed to remove plugin deps"
+}
+
+src_install() {
+	do_install() {
+		python_domodule "${PN}"
+		python_domodule "${P}.dist-info"
+	}
+	python_foreach_impl do_install
+}
diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
index 3aa8e423c59b..99241062b078 100644
--- a/sci-visualization/veusz/Manifest
+++ b/sci-visualization/veusz/Manifest
@@ -3,5 +3,5 @@ AUX veusz.xml 346 BLAKE2B c99688c930b3901edcf500c4a99447074a01be6abfd2be714f8c1d
 DIST veusz-3.1.tar.gz 2524607 BLAKE2B ca5c5a75e02c9461e1d81dc4d2cc09865ebd4424f072616bf0a231a1f592a5c1c5aad93f713ed9ec1d9e2ad39b877a36c236b615d904295608d7990eaf59d5fb SHA512 9b940d1cc224f4729f788abe1e29352d35e69d2f78bae7f072a783d339198a8171b0f0b0a5f5af82ef0f0693550a42409956a9cc3888aa46d110d777e81941a4
 DIST veusz-3.2.tar.gz 2528125 BLAKE2B 614488779d1c0e5d800f2b1c86b82615676b08af46831abd6c55653471b045f0c9d28a8cb7489cbb2391fd5f21ab2d40aa6bff4fc195426f3b07b91f6d4ee8d7 SHA512 01e1a030246a3d6811493968f2f30084b2c465195af166b7bdc4009de4c488350a4fba300acee1959310b318e8dc519f090bfca528491811ca52640c33d048bc
 EBUILD veusz-3.1.ebuild 1720 BLAKE2B 40ede6a29139501a820ea60638b42b7ac2c1c50db77c5ae693ef48135a180f6ec84ae6b88e1a2420133fabc6ff239060adf3bd8c58d756fce6745cc900beef38 SHA512 1dd0a862d7b61ed068f1090a069e09edc7f319b1afd586eb1378837b4e60c57f608310e4ee6b88d4005b33570fd9f1927f12651263a4a0ac6971ddd7f502a3b5
-EBUILD veusz-3.2.ebuild 1726 BLAKE2B c88b8a535f6f1355c281d81f817a36be6ddc76b83485400bb0cd5badacd0df6f13b12315b6b479ff220cf9aab75bfd9d2c4f22e94ff2bccc690b2684afb74663 SHA512 60fa9067ead2bf4cee89ef91fbe05572734b4227d0ed23a82c1b063a54924927b913f490b5c396b1c4c6bfd48e56673e2bfdb4d3aef1ce18bdb8ae1ab5a16fee
+EBUILD veusz-3.2.ebuild 1728 BLAKE2B cfac2711c432dcd91ba5fa44fff91fd363c8ffeb72987321fdc88ea026ea5bca5ec012e1c0e21b82b0d72fdd930dd3eb869a4e648b28964fc7eb0b767f4a6523 SHA512 cdbe9f206e65de6c746e5ddb6a3b6d02f297d7f5e3461f03ae1bdb470e2095f3e7490318b685a26a4e1b653dd84a2e3190063b417951ac6dfa2d72ae70d1ed1b
 MISC metadata.xml 622 BLAKE2B 9a303b1d6ef443fa430401b9539bff448b1cb8db89fa8030699aa2521480c537d849aed1ffb31da8da71fb1905aa2b17b55df8d9119bbfcf4bbef2423d404dd4 SHA512 c0b26c00742acbe807f4397245dfd0fe095383d29f0b5aea27e28041ad668b221773904037caa89b19fc6a9441f256c0014f0e3c160884ef9ee01476fbc8a5f6
diff --git a/sci-visualization/veusz/veusz-3.2.ebuild b/sci-visualization/veusz/veusz-3.2.ebuild
index e3edbcbeac92..54682cc5cd73 100644
--- a/sci-visualization/veusz/veusz-3.2.ebuild
+++ b/sci-visualization/veusz/veusz-3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit desktop distutils-r1 virtualx xdg
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /sci-visualization
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)