gentoo resync : 15.06.2021

20 files changed, 818 insertions, 20 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index fb20adce3b4f..928214b13906 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index be8f69a8f1b2..fa1b08156a55 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -1,5 +1,8 @@
 AUX 50epix-gentoo.el 298 BLAKE2B 236677e59724ddda6cca138c5e049250798a249373558caa1d2f85b432710352d86cf4c4a90ac4556da4857d5aa4bbf2dbae816a2338808a6a79d44eed0fcd75 SHA512 7033d169194cffe4265569f1b048e9ec1929dc98257eb4fb63f486be1ab8162e80fa75fd3943c81b5f9a8eb0e13665e66852ef1f9fbf7cfaee949f5d56fbe9a3
 AUX epix-1.2.10-autotools.patch 2701 BLAKE2B 1478b23499deda305b94b26e9b680131bcecf6dc633d35187f9e9fc3fa7ee500e6b679eb6ade85564b631e7d207c3e0c0cb4ee1caf42779ff1477e1a55e5fd31 SHA512 c94beae67c28ceff6cd4445272574e6cb93f4c181cddb4023587d20e2fed1bea523891191f80b6dd8870f167cbcae2567cd014b6a20aafbb6a74624c76e54cac
+AUX epix-1.2.19-autotools.patch 2020 BLAKE2B 0b5df14c1e31526aadb6bd06ed979616c0ad91fa2555d0b77617eb37aeb902c3d9ac25dacadd3306bd0e6674bef1b9a4a75b1207b9a7ca6289635de5b94f9319 SHA512 f4d2c959031dda084d69c9c89ded0a05b4329819dd420f164a64c763c0917d0a6041ea6fb999574c0f8b640b3585f99133aca3671e02543111696fbda1d16424
 DIST epix-1.2.11_withpdf.tar.bz2 1709429 BLAKE2B db9cba5b94e27742347f8fc85366399016438681a7016077966e5048b9a178404af8305da7d170722aaac82d85283552f87fbba76b21e788fee546b0e0aebf43 SHA512 16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45
+DIST epix-1.2.19_withpdf.tar.bz2 1757443 BLAKE2B 4c7d78f27d355e078ebbe81f9c5d9b1d342f4f04d5f91260460d0559bfb7fc8204668072c06c8d493eb739c492b2935bffd24cb77cd554cd863734b7d84ff6e1 SHA512 b51821256ccaf9957562964b1342ee1656d1d8456081869797d8c704df3098d2643135767987b0673aa64a16703cb2e21deea4aef7d1598e67b9661b98245cda
 EBUILD epix-1.2.11-r3.ebuild 1520 BLAKE2B 18be4038da89c7d289e5187ac9a767acc77ea0e62a1389d168ca79d5a9e78976f11ce1fd2179067471da4c5d819016553fcefeaa21513456f309f4540c8cea41 SHA512 3f9fecddb0699610577dd3ff8215b2be5ac6abb012e8867535cd86ee67bc065268c3cf26af0fdb35963c8bf8e42df48acc1ad71a2f01cc97a13b86d1ea9739f7
+EBUILD epix-1.2.19.ebuild 1589 BLAKE2B b8362a7275984713e54a8c46fa60345d447a066bd9fb6025919ab033831e8411190e94c185aab3a9e1f2fa7a3d2d878b9994cb09530d4d50956ded8a04af7f58 SHA512 8641470529ff7bae179757304680fbf65f0d11227a376edae3a4fb380b2813326d5ae6704376324412af5556f62ac877d50d650cc9fc02430f8fa19275dfef33
 MISC metadata.xml 779 BLAKE2B 2e6405de37d7ed3e85eb865d140a599b1de484f9cc5c35eda7be384259b34bbed06aa84dffc8a5b1b05c6db18a5d0bd1b0f28c9969a8aac933582bf0d1c9cc2a SHA512 b0cb62a782873b0e2e115f18495f520f3fb5cf06052d6fdae023a65a3a40fb2eaf355ffacf0243149d9890d8f56be87dbbdaf459b05ae32b877037e7ff2bc5e9
diff --git a/sci-visualization/epix/epix-1.2.19.ebuild b/sci-visualization/epix/epix-1.2.19.ebuild
new file mode 100644
index 000000000000..9324913332a0
--- /dev/null
+++ b/sci-visualization/epix/epix-1.2.19.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common bash-completion-r1 autotools
+
+DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
+HOMEPAGE="https://mathcs.holycross.edu/~ahwang/current/ePiX.html"
+SRC_URI="https://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc emacs examples"
+
+DEPEND="
+	virtual/latex-base
+	dev-texlive/texlive-pstricks
+	dev-texlive/texlive-pictures
+	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-latexrecommended
+	emacs? ( >=app-editors/emacs-23.1:* )"
+RDEPEND="${DEPEND}"
+SITEFILE=50${PN}-gentoo.el
+
+PATCHES=(
+	"${FILESDIR}/${P}-autotools.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-epix-el
+}
+
+src_install() {
+	default
+	if use emacs; then
+		# do compilation here as the make install target will
+		# create the .el file
+		elisp-compile *.el || die "elisp-compile failed!"
+		elisp-install ${PN} *.elc *.el || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+	newbashcomp bash_completions epix
+	bashcomp_alias epix flix elaps laps
+	if use doc; then
+		dodoc doc/*gz
+		docompress -x /usr/share/doc/${PF}/manual{.pdf,.ps,_src.tar}.gz
+	fi
+	if use examples; then
+		cd samples || die
+		docinto examples
+		dodoc *.xp *.flx *c *h README
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-visualization/epix/files/epix-1.2.19-autotools.patch b/sci-visualization/epix/files/epix-1.2.19-autotools.patch
new file mode 100644
index 000000000000..403d65444f9c
--- /dev/null
+++ b/sci-visualization/epix/files/epix-1.2.19-autotools.patch
@@ -0,0 +1,78 @@
+diff --git a/Makefile.am b/Makefile.am
+index 382230e..a0ff51d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -86,11 +86,6 @@ epix elaps flix laps: %: %.in epix.el
+ 	    -e 's%@RUNTIME_COMPILER\@%$(CXX)%;' $< > $@-local
+ 	chmod a+x $@ $@-local
+ 
+-# libepix.a
+-libepix.a: $(libepix_a_OBJECTS)
+-	ar -ru libepix.a $(libepix_a_OBJECTS)
+-	$(RANLIB) libepix.a
+-
+ # object file dependencies
+ $(libepix_a_LIBADD): %.o: %.cc %.h
+ 
+diff --git a/configure.ac b/configure.ac
+index 9089c35..2d5fe60 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,6 +9,7 @@ AM_MAINTAINER_MODE
+ dnl Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_LN_S
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index c888b9a..4789c0a 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,7 @@
+ # Makefile.am for ePiX v1.x "doc" directory
+ #
+ 
+-EPIXFLAGS = --no-defaults -I.. -L.. -lepix -v
++EPIXFLAGS = --no-defaults -I.. -L.. -lepix -q
+ 
+ %.eepic: %.xp
+ 	../epix-local $(EPIXFLAGS) $<
+@@ -13,13 +13,13 @@ EEPICS = $(XPS:.xp=.eepic)
+ CLEANFILES = *~ *.aux *.dvi *.log *.out *.toc \
+ 	*.idx *.ilg *.ind \
+ 	manual_src.tar manual.pdf manual.ps \
+-	manual_src.tar.gz manual.pdf.gz manual.ps.gz manual-stamp
++	manual_src.tar.gz manual.pdf manual.ps.gz manual-stamp
+ 
+ MAINTAINERCLEANFILES = *.eepic *.aux *.dvi *.log *.out *.toc \
+ 	*.idx *.ilg *.ind
+ 
+ ## Targets ##
+-doc_DATA = manual.pdf.gz manual.ps.gz manual_src.tar.gz
++doc_DATA =
+ 
+ info_TEXINFOS = epix.texi
+ 
+@@ -42,7 +42,6 @@ manual.ps.gz: manual-stamp
+ 
+ #PDF
+ manual.pdf.gz: manual-stamp
+-	gzip -9 -c manual.pdf > manual.pdf.gz
+ 
+ epix.info: manual-stamp epix.texi
+ 	makeinfo epix.texi
+diff --git a/samples/Makefile.am b/samples/Makefile.am
+index 38bb5cd..7cd7cd4 100644
+--- a/samples/Makefile.am
++++ b/samples/Makefile.am
+@@ -7,7 +7,7 @@ FLX = $(wildcard *.flx)
+ CLEANFILES = *~ *.eepic *.eps sample_src.tar sample_src.tar.gz sample-stamp
+ 
+ ## Targets ##
+-doc_DATA = sample_src.tar.gz
++doc_DATA =
+ 
+ 
+ # tar up tex, xp, and eepic files
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index a4cda177d79a..a29b4c50a719 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,3 +1,5 @@
+AUX fityk-1.3.1-c++17.patch 12771 BLAKE2B 72c94df37767a17abe241bca6cfd3d62ca55902f1c1f4923a0cd268aa85366188bba849a03107dc953596c5c836a4e32819fd089dd07f8ceff33aad2adfde251 SHA512 bfacfc05f7d33ccc8648329c0b9c3ad72b8ad9b9a915c585128f681cf973fcb5ba8364a25067a534ac0a880bca6d4a3a733f9cba6d3d6127188bf3ffbd016e65
+AUX fityk-1.3.1-fix-gtk3.patch 887 BLAKE2B 3cb5efcda7d696c491bc5d4b4215714b19fc0e876cc59c5b37999c6950e1a26ab979cf0a4c50bd7cbe4a3bde26b4b394b07819381a6b11eff957f375a5d49f90 SHA512 a835ad7ef3ae084ac11195924eb4305cf1dcb8282fa393719c7bfd4983fcf51143744954051ee5b0dfc7956322890d1391ee5c4e3b0fcd27924cc042db5a0cdb
 DIST fityk-1.3.1.tar.bz2 1518937 BLAKE2B 6eb13646e1b5cf3fb0763bcf3e91a1877d89f14f1b986f1065fd27052e7110b357c99431a326a6c1fa2ba002300912b922cd3d5589ac5da367d2fbcee209f9a2 SHA512 4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08
-EBUILD fityk-1.3.1-r100.ebuild 1095 BLAKE2B 9b9c881a159e38b8c3d38fc9743dbc348d47517885ba046b1f6c58dc0518457ebc431d82d492eee1f7fa996b820f9fca7df39b1df5a6336b36b7fabbba80950a SHA512 7c3afc1bc38cef2597a2d29caa5b802f1bd3d8d339cccad79b5965068ca12221c90ad0d976cb0db8f2c843c1e6a593acc33df5e838df215a474ca1dc1a1fb520
+EBUILD fityk-1.3.1-r101.ebuild 1192 BLAKE2B ae3186a4293cb255425d3ca67bccf7e51176e95d7289ebd319832f9d200678ba38510b49f1d200d6ed911ab476554b67ad9edcfe1720a013a6ab6e099b24e4da SHA512 72673ebb78b8e9c17440c193312d62c928a2e7f69a69a4bdf6417829f24a325ebc9f0846b111154ea18de6f2b3d2e451b50b79745566627fd2531d8e0127010a
 MISC metadata.xml 1378 BLAKE2B a6b73be959353e2a764d5c39ae13c4fe1bc38c5c0ea5a3c2557e32825077e13d0a97504f8d79e338a65803bc98326fe25cb7e86d3aaa8c93c5d9bdce30cbec90 SHA512 38e516a5e0ec249d3ed4e54d4780830e1b53994e9dc1999c664b2f37aac0247df780522e7b25c124ffb0d9766d1292871ec0f9a238c2b3aa9994cef3581befe6
diff --git a/sci-visualization/fityk/files/fityk-1.3.1-c++17.patch b/sci-visualization/fityk/files/fityk-1.3.1-c++17.patch
new file mode 100644
index 000000000000..66c43207fbfb
--- /dev/null
+++ b/sci-visualization/fityk/files/fityk-1.3.1-c++17.patch
@@ -0,0 +1,352 @@
+Backport from
+https://github.com/wojdyr/fityk/pull/38
+
+--- a/fityk/fityk.cpp
++++ b/fityk/fityk.cpp
+@@ -129,8 +129,7 @@
+     delete p_;
+ }
+ 
+-void Fityk::execute(string const& s)  throw(SyntaxError, ExecuteError,
+-                                            ExitRequestedException)
++void Fityk::execute(string const& s)
+ {
+     try {
+         priv_->parse_and_execute_line(s);
+@@ -139,8 +138,7 @@
+     CATCH_EXECUTE_ERROR
+ }
+ 
+-string Fityk::get_info(string const& s, int dataset)  throw(SyntaxError,
+-                                                            ExecuteError)
++string Fityk::get_info(string const& s, int dataset)
+ {
+     try {
+         string result;
+@@ -152,8 +150,7 @@
+     return "";
+ }
+ 
+-realt Fityk::calculate_expr(string const& s, int dataset)  throw(SyntaxError,
+-                                                                  ExecuteError)
++realt Fityk::calculate_expr(string const& s, int dataset)
+ {
+     try {
+         Lexer lex(s.c_str());
+@@ -209,7 +206,7 @@
+     return priv_->mgr.functions()[n];
+ }
+ 
+-vector<Func*> Fityk::get_components(int dataset, char fz)  throw(ExecuteError)
++vector<Func*> Fityk::get_components(int dataset, char fz)
+ {
+     const Model *model = priv_->dk.get_model(hd(priv_, dataset));
+     const vector<int>& indexes = model->get_fz(fz).idx;
+@@ -220,7 +217,7 @@
+     return ret;
+ }
+ 
+-realt Fityk::get_model_value(realt x, int dataset)  throw(ExecuteError)
++realt Fityk::get_model_value(realt x, int dataset)
+ {
+     try {
+         return priv_->dk.get_model(hd(priv_, dataset))->value(x);
+@@ -230,7 +227,6 @@
+ }
+ 
+ vector<realt> Fityk::get_model_vector(vector<realt> const& x, int dataset)
+-                                                          throw(ExecuteError)
+ {
+     vector<realt> xx(x);
+     vector<realt> yy(x.size(), 0.);
+@@ -241,7 +237,7 @@
+     return yy;
+ }
+ 
+-const Var* Fityk::get_variable(string const& name)  throw(ExecuteError)
++const Var* Fityk::get_variable(string const& name)
+ {
+     try {
+         string vname;
+@@ -274,7 +270,6 @@
+ }
+ 
+ void Fityk::load(LoadSpec const& spec, int dataset)
+-                     throw(ExecuteError)
+ {
+     if (dataset == DEFAULT_DATASET)
+         dataset = priv_->dk.default_idx();
+@@ -290,7 +285,7 @@
+                       vector<realt> const& x,
+                       vector<realt> const& y,
+                       vector<realt> const& sigma,
+-                      string const& title)     throw(ExecuteError)
++                      string const& title)
+ {
+     try {
+         priv_->dk.data(dataset)->load_arrays(x, y, sigma, title);
+@@ -299,7 +294,6 @@
+ }
+ 
+ void Fityk::add_point(realt x, realt y, realt sigma, int dataset)
+-                                                          throw(ExecuteError)
+ {
+     try {
+         priv_->dk.data(hd(priv_, dataset))->add_one_point(x, y, sigma);
+@@ -307,7 +301,7 @@
+     CATCH_EXECUTE_ERROR
+ }
+ 
+-vector<Point> const& Fityk::get_data(int dataset)  throw(ExecuteError)
++vector<Point> const& Fityk::get_data(int dataset)
+ {
+     static const vector<Point> empty;
+     try {
+@@ -335,23 +329,21 @@
+ }
+ 
+ void Fityk::set_option_as_string(const string& opt, const string& val)
+-                                                            throw(ExecuteError)
+ {
+     priv_->mutable_settings_mgr()->set_as_string(opt, val);
+ }
+ 
+ void Fityk::set_option_as_number(const string& opt, double val)
+-                                                            throw(ExecuteError)
+ {
+     priv_->mutable_settings_mgr()->set_as_number(opt, val);
+ }
+ 
+-string Fityk::get_option_as_string(const string& opt) const  throw(ExecuteError)
++string Fityk::get_option_as_string(const string& opt) const
+ {
+     return priv_->settings_mgr()->get_as_string(opt, /*quote_str=*/false);
+ }
+ 
+-double Fityk::get_option_as_number(const string& opt) const  throw(ExecuteError)
++double Fityk::get_option_as_number(const string& opt) const
+ {
+     return priv_->settings_mgr()->get_as_number(opt);
+ }
+@@ -366,7 +358,7 @@
+     return priv_->ui()->get_input_from_user(prompt);
+ }
+ 
+-realt Fityk::get_wssr(int dataset)  throw(ExecuteError)
++realt Fityk::get_wssr(int dataset)
+ {
+     try {
+         return get_wssr_or_ssr(priv_, dataset, true);
+@@ -375,7 +367,7 @@
+     return 0.;
+ }
+ 
+-realt Fityk::get_ssr(int dataset)  throw(ExecuteError)
++realt Fityk::get_ssr(int dataset)
+ {
+     try {
+         return get_wssr_or_ssr(priv_, dataset, false);
+@@ -384,7 +376,7 @@
+     return 0.;
+ }
+ 
+-realt Fityk::get_rsquared(int dataset)  throw(ExecuteError)
++realt Fityk::get_rsquared(int dataset)
+ {
+     try {
+         if (dataset == ALL_DATASETS) {
+@@ -402,7 +394,7 @@
+     return 0.;
+ }
+ 
+-int Fityk::get_dof(int dataset)  throw(ExecuteError)
++int Fityk::get_dof(int dataset)
+ {
+     try {
+         return priv_->get_fit()->get_dof(get_datasets_(priv_, dataset));
+@@ -412,7 +404,6 @@
+ }
+ 
+ vector<vector<realt> > Fityk::get_covariance_matrix(int dataset)
+-                                                           throw(ExecuteError)
+ {
+     try {
+         vector<Data*> dss = get_datasets_(priv_, dataset);
+--- a/fityk/fityk.h
++++ b/fityk/fityk.h
+@@ -118,10 +118,8 @@
+ 
+     virtual const std::string& get_template_name() const = 0;
+     virtual std::string get_param(int n) const = 0;
+-    virtual const std::string& var_name(const std::string& param) const
+-                                                    throw(ExecuteError) = 0;
+-    virtual realt get_param_value(const std::string& param) const
+-                                                    throw(ExecuteError) = 0;
++    virtual const std::string& var_name(const std::string& param) const = 0;
++    virtual realt get_param_value(const std::string& param) const = 0;
+     virtual realt value_at(realt x) const = 0;
+ protected:
+     Func(const std::string name_) : name(name_) {}
+@@ -177,26 +175,23 @@
+     // @{
+ 
+     /// execute command; throws exception on error
+-    void execute(std::string const& s) throw(SyntaxError, ExecuteError,
+-                                             ExitRequestedException);
++    void execute(std::string const& s);
+ 
+ 
+     /// load data from file (path should be ascii or utf8, col=0 is index)
+-    void load(LoadSpec const& spec, int dataset=DEFAULT_DATASET)
+-                  throw(ExecuteError);
++    void load(LoadSpec const& spec, int dataset=DEFAULT_DATASET);
+     void load(std::string const& path, int dataset=DEFAULT_DATASET)
+-      throw(ExecuteError) { load(LoadSpec(path), dataset); }
++      { load(LoadSpec(path), dataset); }
+ 
+     /// load data from arrays
+     void load_data(int dataset,
+                    std::vector<realt> const& x,
+                    std::vector<realt> const& y,
+                    std::vector<realt> const& sigma,
+-                   std::string const& title="")  throw(ExecuteError);
++                   std::string const& title="");
+ 
+     /// add one data point to dataset
+-    void add_point(realt x, realt y, realt sigma, int dataset=DEFAULT_DATASET)
+-                                                     throw(ExecuteError);
++    void add_point(realt x, realt y, realt sigma, int dataset=DEFAULT_DATASET);
+ 
+     // @}
+ 
+@@ -220,14 +215,10 @@
+ 
+     /// @name settings
+     // @{
+-    void set_option_as_string(const std::string& opt, const std::string& val)
+-                                                         throw(ExecuteError);
+-    void set_option_as_number(const std::string& opt, double val)
+-                                                         throw(ExecuteError);
+-    std::string get_option_as_string(const std::string& opt) const
+-                                                         throw(ExecuteError);
+-    double get_option_as_number(const std::string& opt) const
+-                                                         throw(ExecuteError);
++    void set_option_as_string(const std::string& opt, const std::string& val);
++    void set_option_as_number(const std::string& opt, double val);
++    std::string get_option_as_string(const std::string& opt) const;
++    double get_option_as_number(const std::string& opt) const;
+     // @}
+ 
+     /// @name input/output
+@@ -253,12 +244,10 @@
+     // @{
+ 
+     /// return output of the info command
+-    std::string get_info(std::string const& s, int dataset=DEFAULT_DATASET)
+-                                            throw(SyntaxError, ExecuteError);
++    std::string get_info(std::string const& s, int dataset=DEFAULT_DATASET);
+ 
+     /// return expression value, similarly to the print command
+-    realt calculate_expr(std::string const& s, int dataset=DEFAULT_DATASET)
+-                                            throw(SyntaxError, ExecuteError);
++    realt calculate_expr(std::string const& s, int dataset=DEFAULT_DATASET);
+ 
+     //(planned)
+     /// returns dataset titles
+@@ -273,8 +262,7 @@
+     int get_default_dataset() const;
+ 
+     /// get data points
+-    std::vector<Point> const& get_data(int dataset=DEFAULT_DATASET)
+-                                                         throw(ExecuteError);
++    std::vector<Point> const& get_data(int dataset=DEFAULT_DATASET);
+ 
+     /// returns number of simple-variables (parameters that can be fitted)
+     int get_parameter_count() const;
+@@ -286,7 +274,7 @@
+     std::vector<Var*> all_variables() const;
+ 
+     /// returns variable $name
+-    const Var* get_variable(std::string const& name)  throw(ExecuteError);
++    const Var* get_variable(std::string const& name);
+ 
+     /// returns all %functions
+     std::vector<Func*> all_functions() const;
+@@ -295,17 +283,14 @@
+     const Func* get_function(const std::string& name) const;
+ 
+     /// returns %functions used in dataset
+-    std::vector<Func*> get_components(int dataset=DEFAULT_DATASET, char fz='F')
+-                                                         throw(ExecuteError);
++    std::vector<Func*> get_components(int dataset=DEFAULT_DATASET, char fz='F');
+ 
+     /// returns the value of the model for a given dataset at x
+-    realt get_model_value(realt x, int dataset=DEFAULT_DATASET)
+-                                                         throw(ExecuteError);
++    realt get_model_value(realt x, int dataset=DEFAULT_DATASET);
+ 
+     /// multiple point version of the get_model_value()
+     std::vector<realt>
+-    get_model_vector(std::vector<realt> const& x, int dataset=DEFAULT_DATASET)
+-                                                         throw(ExecuteError);
++    get_model_vector(std::vector<realt> const& x, int dataset=DEFAULT_DATASET);
+ 
+     /// get coordinates of rectangle set by the plot command
+     /// side is one of L(eft), R(ight), T(op), B(ottom)
+@@ -317,20 +302,20 @@
+     // @{
+ 
+     /// get WSSR for given dataset or for all datasets
+-    realt get_wssr(int dataset=ALL_DATASETS)  throw(ExecuteError);
++    realt get_wssr(int dataset=ALL_DATASETS);
+ 
+     /// get SSR for given dataset or for all datasets
+-    realt get_ssr(int dataset=ALL_DATASETS)  throw(ExecuteError);
++    realt get_ssr(int dataset=ALL_DATASETS);
+ 
+     /// get R-squared for given dataset or for all datasets
+-    realt get_rsquared(int dataset=ALL_DATASETS)  throw(ExecuteError);
++    realt get_rsquared(int dataset=ALL_DATASETS);
+ 
+     /// get number of degrees-of-freedom for given dataset or for all datasets
+-    int get_dof(int dataset=ALL_DATASETS)  throw(ExecuteError);
++    int get_dof(int dataset=ALL_DATASETS);
+ 
+     /// get covariance matrix (for given dataset or for all datasets)
+     std::vector<std::vector<realt> >
+-    get_covariance_matrix(int dataset=ALL_DATASETS)  throw(ExecuteError);
++    get_covariance_matrix(int dataset=ALL_DATASETS);
+     // @}
+ 
+     /// UiApi contains functions used by CLI and may be used to implement
+--- a/fityk/func.cpp
++++ b/fityk/func.cpp
+@@ -197,7 +197,7 @@
+     return n;
+ }
+ 
+-realt Function::get_param_value(const string& param) const  throw(ExecuteError)
++realt Function::get_param_value(const string& param) const
+ {
+     realt a;
+     if (!param.empty() && islower(param[0]))
+--- a/fityk/func.h
++++ b/fityk/func.h
+@@ -86,8 +86,7 @@
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wdeprecated"
+ #endif
+-    virtual realt get_param_value(const std::string& param) const
+-                            throw(ExecuteError); // exc. spec. is used by SWIG
++    virtual realt get_param_value(const std::string& param) const;
+ 
+     realt numarea(realt x1, realt x2, int nsteps) const;
+ 
+@@ -101,7 +100,6 @@
+     // implementation of members of Func
+     virtual const std::string& get_template_name() const { return tp_->name; }
+     virtual const std::string& var_name(const std::string& param) const
+-                        throw(ExecuteError) // exc. spec. is used by SWIG
+                         { return used_vars_.get_name(get_param_nr(param)); }
+ #ifdef __clang__
+ #pragma clang diagnostic pop
diff --git a/sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch b/sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch
new file mode 100644
index 000000000000..7b64f7f582fa
--- /dev/null
+++ b/sci-visualization/fityk/files/fityk-1.3.1-fix-gtk3.patch
@@ -0,0 +1,31 @@
+From 85ea545db65d7c6fbb94988b85f1e8cf1c9cbba5 Mon Sep 17 00:00:00 2001
+From: Marcin Wojdyr <wojdyr@gmail.com>
+Date: Sun, 17 Jan 2021 19:18:47 +0100
+Subject: [PATCH] allow building with wxGTK3 (closes #32)
+
+It works, but with some problems.
+
+The separator in wxSplitterWindow is not updated, as per:
+http://trac.wxwidgets.org/ticket/16890
+
+wxSpinCtrl is much wider (it has [+][-] instead of arrows)
+---
+ wxgui/app.cpp | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/wxgui/app.cpp b/wxgui/app.cpp
+index 526c8f14..1041eccf 100644
+--- a/wxgui/app.cpp
++++ b/wxgui/app.cpp
+@@ -8,11 +8,6 @@
+ #include <wx/filesys.h>
+ #include <wx/tooltip.h>
+ 
+-#ifdef __WXGTK3__
+-#error "Not everything is working with wxGTK3. Use default wxGTK instead, " \
+-       "based on GTK+2. If you want to test it, just remove this #error."
+-#endif
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <vector>
diff --git a/sci-visualization/fityk/fityk-1.3.1-r100.ebuild b/sci-visualization/fityk/fityk-1.3.1-r101.ebuild
index 8a9af85ba44e..541fb7bba06b 100644
--- a/sci-visualization/fityk/fityk-1.3.1-r100.ebuild
+++ b/sci-visualization/fityk/fityk-1.3.1-r101.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..3} )
-WX_GTK_VER=3.0
+WX_GTK_VER=3.0-gtk3
 
 inherit lua-single wxwidgets xdg
 
@@ -16,7 +16,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="gnuplot nlopt readline wxwidgets"
-
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 DEPEND="
@@ -30,6 +29,11 @@ RDEPEND="${DEPEND}
 	gnuplot? ( sci-visualization/gnuplot )"
 BDEPEND="dev-lang/swig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-gtk3.patch
+	"${FILESDIR}"/${P}-c++17.patch # bug 787317
+)
+
 src_configure() {
 	use wxwidgets && setup-wxwidgets
 
diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest
index c090ea1eb8b4..269a64dd7bc6 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 1265 BLAKE2B 7b34286ac85a07cecf48552dadd52f9943ca62cc30c0bf448ac1a9b880c7e340c69b602f4dfcfea607e161bf2629ab28a9d84e101c0863f51a53450ff66e634b SHA512 0156f47ff20ce6a8488ae8729f04dccba3e7d1980645bdc98b174c9385ad27fb2d00e930b4f983dfefed1ec65cfb2c0c8ec3f1a692b438f7600d65b7c894b41d
+EBUILD kst-2.0.8-r1.ebuild 1264 BLAKE2B 8199a35bc82f32dc6ae23dc9d7c76eb4f758f26d3d6fd78e4bb02b1c2a34b30609de466c32efd4c7e9f795ce429cbc899755b5e9cfa6d659a14dab03bdfc8862 SHA512 e09a3b2f10bfc93c9cc24246a660d37be39334054d7a6f7510a617223f060cdd1dcdf4a4462fa42a2f29419dca11dbd1976f0a7951daf587e1efac5ce1c098d2
 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-r1.ebuild
index d5cfd61e3676..148390c6c265 100644
--- a/sci-visualization/kst/kst-2.0.8.ebuild
+++ b/sci-visualization/kst/kst-2.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-qt/qtxml:5
 	sci-libs/cfitsio
 	sci-libs/getdata
-	sci-libs/gsl
+	sci-libs/gsl:=
 	sci-libs/netcdf-cxx:3
 "
 DEPEND="${RDEPEND}
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 94509499f354..92bae553b142 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -3,9 +3,11 @@ AUX paraview-5.3.0-fix_buildsystem.patch 797 BLAKE2B f77c72f34c13eae42a4da281f95
 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
-AUX paraview-5.9.0-gcc11-include.patch 497 BLAKE2B 9af7711767f1b241ea965968b6fd31600aa1a094a36758712ee0319e51cf4f7998ade5a756498950f3dd3077e019dfbe261de61e1f18a8a7c7a600459179e2d4 SHA512 4bbaca632abdc5f5fb1b9d5366e65245c0f40d2db73b4c8bb61460f367517a2f5b94a81db32aab96288b44bb298f7d89d874e779071a579f5026a9e4864baf62
+AUX paraview-5.9.0-gcc11-include.patch 1045 BLAKE2B 2b6b709cf081391f6b3c9c214ce7da33a8c83f187b00e803a9df651cbf6aac8a7dc7ba080f073fcbfba5266369d2f556cc4b21fe6d3ad830bd24fb3a0908aad0 SHA512 f3af80d8c59edb1625207b447e1c6975c67e8d988e9af3592597e5a2b4c39d4e6f0c6786abc0e31a6b30fa77124e9368802d5b9e4bab5453c5ed82c5b9391dbb
 DIST ParaView-v5.8.1.tar.xz 49822084 BLAKE2B 1b99392a85c19fdc02f8f9f0f055fb7efd8a0b17eedfd84005d1af9b170c34ec4eedb25700f91c3a2241ee80e271fe1e744e3a729b7726deb8f9c7a9fd2e4191 SHA512 94861c01da2f98c47e7453d072a4de34a7f52f5df280a8745b44d58d8d6a1dba42a15d0bac31895bbe25f23d993d4d356e5af1f8415137e289afd60570070248
 DIST ParaView-v5.9.0.tar.xz 62784788 BLAKE2B f07bfce50304b2bfba0de4ba3127d686cf4c32633f8c707fbb2d93c19685f7e8a119ba211e27c29b986ca5b22afab4f57c273077a1c0a7ab0abefa55c8874e28 SHA512 44d93b49449262aa3f068aa990419415c3197916a002555d914efc407ed7ccd57b15b829f0fe711afee780e5e63fb1bd072175fc382f3afd36daecc541c382d5
-EBUILD paraview-5.8.1.ebuild 6363 BLAKE2B d1682ea682bfe732b3442cc2495dfb660fc8d5603c50b5c864b7629dd918bb77d9a8dcdd1dd14a7e8bc3047d345f6fe1b71365b735a6e7093c93493dd67c9aeb SHA512 4bef374b2f19f375d21f2d548c941cd14502311e395e9dd80d050068ea25cd3d1d2d41abf4e74bcbbe34ccc55d01b81197ab9b7dc325d185a54ac0e019501fb4
-EBUILD paraview-5.9.0.ebuild 5853 BLAKE2B 83562d286dbb019a1c86d584f8a5997848e0d3943be23b905e7ef21354f6fe02b3a15b4b5fcb7b7b23032ced2bcf5f0dd2b52ce79b0f508d0554b0bac232646f SHA512 2aeb8501d4b707ab896139b8fbef344f5ba78be3bea0f84a5c0a6241cefc199228d3d31cf15fb6a4a0cc0e034289ff795c84d8b60ed036ac3a8bb26fb77e4aac
+DIST ParaView-v5.9.1.tar.xz 62835572 BLAKE2B ba15771de9d972de533627ce3e2c74fd5f25df08884680ea6f1ceea0adb513c024f58e4436691bf17b11728f8e1c09f6ce1d55d9875729169dbc5f4b38c05de8 SHA512 d424e22d962f21c32971ca0001c10c266a1768713a3d0ae9d4c73dc83260c4661326cfbed7773845cf31dedc0474096ed9d6eb8a42ab7677cdde95f9f6abd2f2
+EBUILD paraview-5.8.1.ebuild 6365 BLAKE2B 429cad83359829027fd1c9744c027ff1d40de119f4deacee26c17d31db71ef4f9b6ff1edfd7c02de5b7e005e4e8641bb85adad07f204d37e21f4a71176fc4398 SHA512 da8f39e3998bcc96dbef127bf740a1057924202080410e9c89dd65fd47612a79e9df1a0d42ff14a555faef92e1b7b4462a79b24a516abbccc81ddfa4a50f495c
+EBUILD paraview-5.9.0.ebuild 5855 BLAKE2B daa0b325a8dd965966657f670dac51f499128f25d26f1611002c0048208ace6e33a9bf1c53c26de30d4fe6dd20f318bf2b4d37698703b2efa10a7c7ce10fe2ad SHA512 ef64bce5e9d07d5a25326b45abd7b838668800ae21e773d8c3c197bc26088787b0f0d78d7c39a5f7b2589ddcd3841096c26c0c6246ad9b9399df6a52b2d1a59f
+EBUILD paraview-5.9.1.ebuild 5855 BLAKE2B daa0b325a8dd965966657f670dac51f499128f25d26f1611002c0048208ace6e33a9bf1c53c26de30d4fe6dd20f318bf2b4d37698703b2efa10a7c7ce10fe2ad SHA512 ef64bce5e9d07d5a25326b45abd7b838668800ae21e773d8c3c197bc26088787b0f0d78d7c39a5f7b2589ddcd3841096c26c0c6246ad9b9399df6a52b2d1a59f
 MISC metadata.xml 873 BLAKE2B 3f48aa66e19a19e8de7959d58248e7d4d7b6ca0f9dd98b869088f15bfc483dec486c89bdd448368eb0b385735ca8cfb3462a86e93fecb13383366ced4ead4ebd SHA512 871830a5157bc1f8803cf4dbd4797a58bd87d6338a3eaa21662a2e789412bf746c30f817a485a26b4b14fa578aa15b391efe76c920db7b1c2a2f74f9bf3eceb2
diff --git a/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch b/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch
index b9fad8c094fe..d5850073fb94 100644
--- a/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch
+++ b/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch
@@ -1,3 +1,4 @@
+https://bugs.gentoo.org/789573
 --- a/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
 +++ b/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
 @@ -25,6 +25,7 @@
@@ -18,3 +19,23 @@
  #include <set>
  #include <vector>
  
+--- a/VTK/Rendering/Core/vtkColorTransferFunction.cxx
++++ b/VTK/Rendering/Core/vtkColorTransferFunction.cxx
+@@ -21,6 +21,7 @@
+ #include <algorithm>
+ #include <cmath>
+ #include <iterator>
++#include <limits>
+ #include <set>
+ #include <vector>
+ 
+--- a/VTK/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
++++ b/VTK/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
+@@ -27,6 +27,7 @@
+ #include "vtkHyperTreeGridNonOrientedCursor.h"
+ 
+ #include <cmath>
++#include <limits>
+ 
+ vtkStandardNewMacro(vtkHyperTreeGridThreshold);
+ 
diff --git a/sci-visualization/paraview/paraview-5.8.1.ebuild b/sci-visualization/paraview/paraview-5.8.1.ebuild
index 4cdb8153c8ce..6182669ef170 100644
--- a/sci-visualization/paraview/paraview-5.8.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils
 
 MAIN_PV=$(ver_cut 0-1)
diff --git a/sci-visualization/paraview/paraview-5.9.0.ebuild b/sci-visualization/paraview/paraview-5.9.0.ebuild
index f91083500a23..48a71695238e 100644
--- a/sci-visualization/paraview/paraview-5.9.0.ebuild
+++ b/sci-visualization/paraview/paraview-5.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils
 
 MAIN_PV=$(ver_cut 0-1)
diff --git a/sci-visualization/paraview/paraview-5.9.1.ebuild b/sci-visualization/paraview/paraview-5.9.1.ebuild
new file mode 100644
index 000000000000..48a71695238e
--- /dev/null
+++ b/sci-visualization/paraview/paraview-5.9.1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+MAIN_PV=$(ver_cut 0-1)
+MAJOR_PV=$(ver_cut 1-2)
+MY_P="ParaView-v${PV}"
+
+DESCRIPTION="Powerful scientific data visualization application"
+HOMEPAGE="https://www.paraview.org"
+SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
+
+LICENSE="paraview GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost cg doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine"
+
+RESTRICT="mirror test"
+
+# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
+REQUIRED_USE="
+	python? ( mpi ${PYTHON_REQUIRED_USE} )
+	mysql? ( sqlite )
+	webengine? ( qt5 )
+	qt5? ( sqlite )
+	?? ( offscreen qt5 )"
+
+# TODO: Verify that these two are not needed any more for the catalyst
+# module:
+#  - dev-python/PyQt5
+#  - dev-qt/qtgui:5[-gles2-only]
+RDEPEND="
+	app-arch/lz4
+	dev-libs/expat
+	dev-libs/jsoncpp:=
+	dev-libs/libxml2:2
+	dev-libs/protobuf:=
+	dev-libs/pugixml
+	media-libs/freetype
+	media-libs/glew:0
+	media-libs/libpng:0
+	media-libs/libtheora
+	media-libs/tiff:0=
+	sci-libs/cgnslib
+	sci-libs/hdf5:=[mpi=]
+	>=sci-libs/netcdf-4.2[hdf5]
+	>=sci-libs/netcdf-cxx-4.2:3
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	ffmpeg? ( media-video/ffmpeg )
+	mpi? ( virtual/mpi[cxx,romio] )
+	mysql? ( dev-db/mysql-connector-c )
+	offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
+	!offscreen? ( virtual/opengl )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/constantly[${PYTHON_MULTI_USEDEP}]
+			dev-python/incremental[${PYTHON_MULTI_USEDEP}]
+			dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
+			mpi? ( dev-python/mpi4py )
+			qt5? ( dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qthelp:5
+		dev-qt/qtopengl:5[-gles2-only]
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qttest:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxmlpatterns:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	tk? ( dev-lang/tk:0= )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	boost? (
+		$(python_gen_cond_dep '
+			dev-libs/boost[mpi?,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
+	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+	"${FILESDIR}"/${PN}-5.9.0-gcc11-include.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
+	use python && python-single-r1_pkg_setup
+	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+src_prepare() {
+	# Bug #661812
+	mkdir -p Plugins/StreamLinesRepresentation/doc || die
+
+	cmake_src_prepare
+
+	# lib64 fixes
+	sed -i \
+		-e "s:/lib/python:/$(get_libdir)/python:g" \
+		VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
+	sed -i \
+		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
+		Remoting/Application/vtkInitializationHelper.cxx || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
+		-UBUILD_SHARED_LIBS
+		-DPARAVIEW_BUILD_SHARED_LIBS=ON
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+
+		# boost
+		-DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)"
+
+		# doc
+		-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)"
+
+		# examples
+		-DBUILD_EXAMPLES="$(usex examples)"
+
+		# ffmpeg
+		-DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
+		-DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
+
+		# mpi
+		-DPARAVIEW_USE_MPI="$(usex mpi)"
+		-DXDMF_BUILD_MPI="$(usex mpi)"
+		-DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)"
+
+		# mysql
+		-DVTK_MODULE_ENABLE_VTK_IOMySQL="$(usex mysql YES NO)"
+
+		# offscreen
+		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
+		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
+
+		# plugins
+		-DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)"
+
+		# python
+		-DModule_pqPython="$(usex python)"
+		-DPARAVIEW_USE_PYTHON="$(usex python)"
+
+		# qt5
+		-DPARAVIEW_USE_QT="$(usex qt5)"
+		-DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
+		-DVTK_USE_NVCONTROL="$(usex nvcontrol)"
+		-DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)"
+
+		# sqlite
+		-DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)"
+
+		# test
+		-DBUILD_TESTING="$(usex test)"
+
+		# tk
+		-DVTK_USE_TK="$(usex tk)"
+		-DVTK_GROUP_ENABLE_Tk="$(usex tk YES NO)"
+
+		# webengine
+		-DPARAVIEW_USE_QTWEBENGINE="$(usex webengine)"
+		-DVTK_GROUP_ENABLE_Web="$(usex webengine YES NO)"
+	)
+
+	if use openmp; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
+	fi
+
+	if use qt5; then
+		mycmakeargs+=(
+			-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_src_configure
+}
+
+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
+
+	# 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
+
+	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index 400800e3f687..5312b73367e1 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1,4 +1,4 @@
 AUX scidavis-build.patch 1397 BLAKE2B 70abb5dee8d3afbf4eaf88d50c8df30fb0ad34345e92d049113c5ef0e1ecf9f5d7b127166453905f79056d812128f2c427ddcb3736363591c2e3aba67ed8b3d1 SHA512 91044ad9994ffe8047529b262d578b575a559d888b17da772be10346b87c655a2c53c67ba06b7a5bb85870510de5a1c4f1f14777b5c60bbfaab4ccd545d00929
 DIST scidavis-2.4.0-gh.tar.gz 9244613 BLAKE2B 5961c1c4c28a7e290940ddefb4a7a447fb2b743528bcb96d190b2638a6b0d8807dad51ceab6392e5a3081b270149d3f3fccef8db8108dfdacc71a66c55a7509e SHA512 9797daaf3239176eb8fc346fb8e579af965cfe0881e9048c77258f1165135a124aea3ec52434cc23e117ba2077313437da65f5c694f2d8a54d312997264d9318
-EBUILD scidavis-2.4.0.ebuild 2696 BLAKE2B ffa75f5a2986635b37f3a53883a855d7cd83e49cde8b17023f2e02d980f5e2f87a29b7434e4f828aa251cedf6e2faabc27855ac6b769316b6f05636f278d82be SHA512 b8f69ab8aed52498123752940ee9c48c8339f1d4c02091fba122a23dc086b13e0791b0f4240e9a1881c9913ac161dd268aadda8689acf8b9503d67f02c0d307a
+EBUILD scidavis-2.4.0-r1.ebuild 2721 BLAKE2B ee43d94ebb50062f2a9e8ca5518fa24b7edaa58c173a5724b0c544354a4b635b4a1db9e1b7f2711fa70dac17d8aa06ae932204e4744681f1b0381a46684b9660 SHA512 2481bfc163f589c359c104db8eb3bd6bfd511fac4b899866f8625b08045fe59821cfbcf9d1034a64752d833d30c4748d76a8b57e2ec185bb8736faa52b0c9887
 MISC metadata.xml 1138 BLAKE2B 695ca203915a491dd670b060c233e18f475c5ce7e041a14fe19cb914211929324415145c30b5fa7bcdca4293c9c407a1aed89e749c0863cca5a6d37ee97ad3da SHA512 108ca45c3d0ae439968b78a402e71e2f08ce084f6e43fa4d1f63a112085ee9f32ee4fb03eec8658b8f8ff3a441565fafb1e2cd952b7f2e98a9c0f2155951a105
diff --git a/sci-visualization/scidavis/scidavis-2.4.0.ebuild b/sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild
index cd3f9366947e..44611a1ad6bc 100644
--- a/sci-visualization/scidavis/scidavis-2.4.0.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	sci-libs/gsl
+	sci-libs/gsl:=
 	sys-libs/zlib[minizip]
 	x11-libs/qwt:5
 	x11-libs/qwtplot3d
@@ -45,10 +45,11 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			dev-python/PyQt5[${PYTHON_USEDEP}]
 			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
-			dev-python/sip[${PYTHON_USEDEP}]
+			<dev-python/sip-5[${PYTHON_USEDEP}]
 		')
 	)
 "
+DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-qt/linguist-tools:5
 	test? (
diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
index c72c385af482..e506c3def835 100644
--- a/sci-visualization/veusz/Manifest
+++ b/sci-visualization/veusz/Manifest
@@ -2,6 +2,6 @@ AUX veusz.desktop 248 BLAKE2B 02c9b85f9ea12ef0ee9bf8f538788f577ab4314468e94140b8
 AUX veusz.xml 346 BLAKE2B c99688c930b3901edcf500c4a99447074a01be6abfd2be714f8c1dccd4318a0270d30f47f92636280f406ba9003540434c52683b0a8f66fb4d672e3436fdb5a1 SHA512 c4f049d4648192d932560a2e73088843ecb0a2beea2e628424488d552684a8e69b84628773a08947741690eb732901bc8ae8c52fa926d1b44bf02b9046cb569e
 DIST veusz-3.2.tar.gz 2528125 BLAKE2B 614488779d1c0e5d800f2b1c86b82615676b08af46831abd6c55653471b045f0c9d28a8cb7489cbb2391fd5f21ab2d40aa6bff4fc195426f3b07b91f6d4ee8d7 SHA512 01e1a030246a3d6811493968f2f30084b2c465195af166b7bdc4009de4c488350a4fba300acee1959310b318e8dc519f090bfca528491811ca52640c33d048bc
 DIST veusz-3.3.1.tar.gz 3249376 BLAKE2B d3113a4f5f6a2fc3460e73b6b99d6353d6a0745a0d3cc0f276a86cb6fcef369bb74ca34aa205c69e7755dbe6d6fa6dce3ff267ca075f211c8635cab0350233a5 SHA512 a2fa204a33ae0dac98907c3af88b24f322849360e30c05101bbfa6307dc8aa6fdec580f060fc9cd9921f7706db51419efe088f927d22db860419eea4e0f4e84c
-EBUILD veusz-3.2.ebuild 1857 BLAKE2B a0cee58bb99cefbcecd76394f986bbc85d5378f66317894e8dc8b9ef8eaddb864b261b753a7011f6ca56883272ca5d15d132d3f717b94e71bb09a0b14c68e9c3 SHA512 06fa5e26a34320bedd78d3fddea87d307fa2e8dbd7030d2b87e23dfcb7f5965cd8dec68c61ac932eb0dfcca0c8f6f160bb1671e4381428952daf4e44b64c4556
-EBUILD veusz-3.3.1.ebuild 1857 BLAKE2B a0cee58bb99cefbcecd76394f986bbc85d5378f66317894e8dc8b9ef8eaddb864b261b753a7011f6ca56883272ca5d15d132d3f717b94e71bb09a0b14c68e9c3 SHA512 06fa5e26a34320bedd78d3fddea87d307fa2e8dbd7030d2b87e23dfcb7f5965cd8dec68c61ac932eb0dfcca0c8f6f160bb1671e4381428952daf4e44b64c4556
+EBUILD veusz-3.2.ebuild 1860 BLAKE2B bdf1c897b75875fed7447f8d897c25802e70953473edb45de45bc85b346b058f308f25bf142d76e7f62bfc8ad18448bb8d5efcfefe74701cfea23c732a2df65e SHA512 70f8f43654017255d5957e10f2a6279454ef836bac3a79fa90c145b7168e3f08b5ac4e2686a791a087dec4282c54b834498cd3a8cd183240599d15cb53b81787
+EBUILD veusz-3.3.1.ebuild 1860 BLAKE2B bdf1c897b75875fed7447f8d897c25802e70953473edb45de45bc85b346b058f308f25bf142d76e7f62bfc8ad18448bb8d5efcfefe74701cfea23c732a2df65e SHA512 70f8f43654017255d5957e10f2a6279454ef836bac3a79fa90c145b7168e3f08b5ac4e2686a791a087dec4282c54b834498cd3a8cd183240599d15cb53b81787
 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 b16d8a6ce9c6..c335f7cf7c86 100644
--- a/sci-visualization/veusz/veusz-3.2.ebuild
+++ b/sci-visualization/veusz/veusz-3.2.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
+	<dev-python/sip-5[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "
 
diff --git a/sci-visualization/veusz/veusz-3.3.1.ebuild b/sci-visualization/veusz/veusz-3.3.1.ebuild
index b16d8a6ce9c6..c335f7cf7c86 100644
--- a/sci-visualization/veusz/veusz-3.3.1.ebuild
+++ b/sci-visualization/veusz/veusz-3.3.1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
+	<dev-python/sip-5[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "