gentoo resync : 27.03.2021

20 files changed, 414 insertions, 28 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 6609d052fe4a..e07d055be2db 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/alglib/Manifest b/sci-libs/alglib/Manifest
index d37d206ede6b..3cd8bf30d28b 100644
--- a/sci-libs/alglib/Manifest
+++ b/sci-libs/alglib/Manifest
@@ -1,5 +1,7 @@
 AUX CMakeLists.txt-3.8.2 1159 BLAKE2B bd12bd65ddc7e60d1e84b04d5c01391420accf099f17801680446856e817bd606315ee54a44b0bd559fe0a9fce35dfab8b9dfa2dd7edc406d57563ea0f77999a SHA512 193661b9f949972048132bc07b4619c2f0d38135d6f0030621cd8aabf87e9e78a6bec18cdb4fb9cb9e547fee9f4387e21ba3a02d45c41033a9c0be9221cf7d3c
 AUX alglib-3.10.0-disable-minlm-test.patch 709 BLAKE2B 160bd6a598eb9c822b16da6455bae980cf6bfd77c9889c0d2385b896ec502030741c1f6a929f48a49c73fe35e696cf83b97d72a007e91899bd61d369b195b9e9 SHA512 00d62278a65f30d97dd7df8ac20d17dbc40117c25e2cef64652f2afd0bda7c277f8600ccfa7036da8a4a4173e0f0f433d898b87c04ab6d2d89e2547f8a305ee9
 DIST alglib-3.10.0.cpp.gpl.tgz 1991101 BLAKE2B 884b80becce676285b7bc1f26ed8917c4c82f53b41c0350dfc8bff6573e2e6f12183e82fc317b54a8021b1f931eb7d5b55944902d0816f7097fdc05632128bdc SHA512 f02b3db5ab8dee841f27186b6693997c4e6876e75310b0a31a04593dbcb41d300920404e32e7aecb39c8dd15e54cfee05b725caa27397a67b453f6e64cd1ef5e
+DIST alglib-3.17.0.cpp.gpl.tgz 3065026 BLAKE2B bc939568a6bfb5e2717995e31b9d7cb485885217ff8d15c2bea3185b1ef62536766f80e02d43999c016e24b10181bddd4ad4ff27611ab19ebcc778a5cb15d55e SHA512 0e4b943b03707950813aea707ae3569ce75a22216c9a4b256b646db16609995b3b63a958b0b8fbe3d7d623d5ac03efbe7c4b1589961f2ca9cdefbd7e1cc0c721
 EBUILD alglib-3.10.0-r1.ebuild 747 BLAKE2B d308644af5f0d8cd54e3b9d97d0cfd7bb5904a6994509a2d1316710833d6f59433a021b44e01e5aa58048622f5dabcf20c2e4aa5ab5f1c1120273b45d2feeed7 SHA512 cb9cf3f23a1b13377eb15db1e6c37835eaa5ad9957cdcedaf6391725061bc0e233b8e6924edc7c0a63a3bbc3477f03a780c206538816625dcd32148424993270
+EBUILD alglib-3.17.0.ebuild 670 BLAKE2B 77d22786af5b1ebac75439c13264e494632151ee3d6333dc158c154c1f751bb6d4a10734175af90c88061644fa4d529ba3ea50531b81e0257ea42e0b00a2620f SHA512 a957a3cece3cde5d3913f68e79228408ca56c4b9ada48f57515ec0db972027eb5636a54af268dc82d6fbe0aa4771f8559a247ee93c85174478f682c26fc8ab69
 MISC metadata.xml 1592 BLAKE2B 96df655b24fc1e27a90f6a31388135e9ec14965eef850c14468797dbb19670ef4695219459b2af337613a92cc25a7eb12a1b07f95a3e1e4b058d9f9c38ded770 SHA512 e16165304d85c3201c428b46bb85006281a2faac170f6b7f2966bc683f57387a0d4b68eddd6ad2d4ed9d26af992f4f9b2616c761f0bf1102c6749a8025478844
diff --git a/sci-libs/alglib/alglib-3.17.0.ebuild b/sci-libs/alglib/alglib-3.17.0.ebuild
new file mode 100644
index 000000000000..6f520c619d21
--- /dev/null
+++ b/sci-libs/alglib/alglib-3.17.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Numerical analysis and data processing library"
+HOMEPAGE="https://www.alglib.net/"
+SRC_URI="https://www.alglib.net/translator/re/${P}.cpp.gpl.tgz"
+S="${WORKDIR}"/cpp
+
+LICENSE="GPL-2+"
+SLOT="0/3.8"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cp "${FILESDIR}"/CMakeLists.txt-3.8.2 CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	use x86 && append-cflags -ffloat-store
+	local mycmakeargs=(
+		-DBUILD_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/cmpfit/Manifest b/sci-libs/cmpfit/Manifest
index 4b09c0e907f6..ba65284ae88a 100644
--- a/sci-libs/cmpfit/Manifest
+++ b/sci-libs/cmpfit/Manifest
@@ -1,3 +1,5 @@
 DIST cmpfit-1.2.tar.gz 30431 BLAKE2B 3613fc307b0f1cd792ea9b1436109da77960dcb1985920de2c97e3b8f22d49d68358c0077dd3af5c6d2ea6e7b172d715643221b8df8f84a704688fda2f1ef51a SHA512 232a39538396f166efd9c7a9fc687e0ac8fd3090f871f54fb0c131a1ed02cc05a60904894d853d8eb76d88e70a1fbab4bce3ad0b5990408c77d5a6028a3b466c
+DIST cmpfit-1.4.tar.gz 30659 BLAKE2B f076f69e83d1eb78eda2894cded85f920cef1c95bcb60b042e98d33919e12cac62ffe4ad76ddc9ca0ef17f887289dc37b0bde969e4e04470b491b03b841bbeea SHA512 0a0c869bcf202a0dbc9fd6b6939a6382cc8701f09ca9aada90dde809135c2a8436709a84a8be53696e8d09f49f1d14f80c9d4c8c1c6cd418260939fc0ec5dced
 EBUILD cmpfit-1.2-r1.ebuild 1113 BLAKE2B 337ec245d43379a061e9ebdfe3b6f452cf9bac62f33b4c918ae599ba7bc1cf1174fd395a30e17f6eebbdd4138d9962b513c0bd865d528cee508fbe2b829b2b37 SHA512 7b5f03cdf045396ec88611dcc75e8776cb1313d707273a538cd05a10ff61c8f99c7cf5db425f1928d0950be627d0a2cee30156476c7df4ee111fd64a8dc3d54e
+EBUILD cmpfit-1.4.ebuild 896 BLAKE2B 7ee10f67c79d0ba016e53ae5e8dc79fd9fad8d97460d20fa92461976a57024ce9a9d41017d0d67cacdcb625f7d1d8b4b797eddc56f19f99d20a1883641d7a658 SHA512 e1ebcc31bf049818154cde4d96b9197444f0ceeca2c9be7752c057b12915c3c9de8e5cb98b774f7334411e60cf602f41f95f5d1425608e3975d5826bec4bf635
 MISC metadata.xml 622 BLAKE2B 28a0413ff6666359d8d905c6a057f53a489f8314b32411de6737e4876c2916a4a48f034f33278aeab54e7d6adc79af8584e40d71af7174b0b90f00ba362e740a SHA512 90f290806ede879fb12e180453c46f76e9f505e7bb61deb72a8a127a8493f08daa6f1b432288e0400b44ceef6346e5cc760940ce45ec1a8a5e5ef80305f6d9e7
diff --git a/sci-libs/cmpfit/cmpfit-1.4.ebuild b/sci-libs/cmpfit/cmpfit-1.4.ebuild
new file mode 100644
index 000000000000..ff93f77a140c
--- /dev/null
+++ b/sci-libs/cmpfit/cmpfit-1.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="MINPACK-1 Least Squares Fitting Library in C"
+HOMEPAGE="http://www.physics.wisc.edu/~craigm/idl/cmpfit.html"
+SRC_URI="http://www.physics.wisc.edu/~craigm/idl/down/${P}.tar.gz"
+
+LICENSE="public-domain minpack"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DOCS=( README DISCLAIMER )
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -fPIC -c mpfit.c -o mpfit.so || die "PIC compilation failed"
+	$(tc-getCC) ${LDFLAGS} -shared -Wl,-soname=libmpfit.so mpfit.so -lm -o libmpfit.so || die "linking failed"
+}
+
+src_test() {
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} testmpfit.c -L. -lmpfit -lm -o testmpfit || die
+	LD_LIBRARY_PATH=.:${LD_LIBRARY_PATH} ./testmpfit || die
+}
+
+src_install() {
+	dolib.so libmpfit.so
+	doheader mpfit.h
+	einstalldocs
+}
diff --git a/sci-libs/gerris/Manifest b/sci-libs/gerris/Manifest
index dc3800c4595a..c397ee431fb9 100644
--- a/sci-libs/gerris/Manifest
+++ b/sci-libs/gerris/Manifest
@@ -3,6 +3,8 @@ AUX gerris-20130531-lis-matrix-csr.patch 265 BLAKE2B d49cb13aacbae0d45092f09e10e
 AUX gerris-20130531-use-blas-lapack-system.patch 1466 BLAKE2B a3c451570d97227008a9540509155ad616ce392bf307a5f3d24124aa50e21fb95cd7ac22d788aad0ddd8597c45c50f700c4b5a5978756e884621e2a9b65145ad SHA512 4ff7f35c1d8698cc6ce2ed31708e0d05fd1cd6c8829d2ab7cc589fb5e4e1ea080df27587a7bf59ec7303c0dcfaa159da625a330a5eb5d1901ecfa45a762d41e4
 AUX gerris-20131206-DEFAULT_SOURCE-replacement.patch 728 BLAKE2B c2c6e05692d200d308dd7cd51896a06270b32e768b2e84b535858390972344998b1f64ff1c4a752211b97473064999b0737a9d4de03a1ba0ef5536af62ea511d SHA512 b1ca792b4b9ffe88964f58e12a3caff23ec3ba31f8f43136acf9adc106c57d10f75f32d2ec7a6769cdd130324e9de9a1621fc4c90be834eef330690f765159c7
 AUX gerris-20131206-lis-api-change.patch 526 BLAKE2B fedac0aa8cf763b37dd68c03f321e8ebe91caf944c51366ab3c8a1f0474eb140095af4207c208c8c9ed99bfb42a025e4437ad42da5e64cdf4986944910c3f1b6 SHA512 bba5cc317e66cbd48e80e2a1ce6cbd1f3688f77e3433c846294c56ba39591a840c2577eaffeed05553f651dc749ceaf751c2451624b71812ea2238014f456b25
+AUX gerris-20131206-respect-NM.patch 492 BLAKE2B 5c6e09a46383ac509ab5051cb5ad22c9dc047bd9c61b2dde329e6e08d171989a5b0eb21a660c6780d02ed6daea9b4ce04cfc88736e0e31c89fce9dc8420f10f8 SHA512 80989517724660605c96096881281b9b6baa1e3bfcc2207779b81b3aa582dad21fba301c96897737416dec335e74b8b47fb35813862092807e3d8fc59937927f
+AUX gerris-20131206-slibtool.patch 4424 BLAKE2B e81f8c85c9af29b6f423835809cf24829bf58268f6dce174fe93db35d56e14a5fd6dfc9b19884e5c0dab9e311b35b0fb4669b9218b8b746a4f9b3661f8993eb8 SHA512 70c89d00a8b317da4b83ea8399fa64ea86f68aaa613538fa9b17198107535a7c55fce58bff3780ebe002543f2e153c743e7f70e70f703ed22158d402adc10319
 DIST gerris-snapshot-131206.tar.gz 2841686 BLAKE2B 63618b2166e632e447f7a47dd17f2bab1820234b9a651c4fcad57250b13bbfdf98645c9525d4cebcae6ab9ef81d111fadbff9800e3144d84bf59f2248e271585 SHA512 b3855d51eea04c496d2e5f662c148560d9ab8d5dfa97e4f7d1c22c70405b9b801b46f30aa0d159b1bd6a8182f171a1649b5f510f0e13feeb55f29cafe57b45dd
-EBUILD gerris-20131206-r1.ebuild 1558 BLAKE2B 6eb4b017e887b067f14396f250d14d564da9dd93d3164837f5d7899ebacdd5116c231d22680d9485e9b4b21de7ce42738b258410b5778229b987be70e0763669 SHA512 d05592d019f0cc00bcc7eafca126be972990fa48d33cf19e5becd61948604bbd1bd1fcf05c91ba32afaec59009660541f14485de75b367ca96c7f39b88c08e55
+EBUILD gerris-20131206-r1.ebuild 1690 BLAKE2B 918c19b3e9dc7bbbe43edaabc9766cccfe50f22f7f19fef728909a817292365275c8619b8064eda22588ec839148e44cf7716418337758e3398013ee71a4b204 SHA512 48da318a751bb571ec8d7807dea4f21c001ce399bd4f1c01a676ebebcc8fbee873bff966b3ef5de0cdd577324edad487809b3250ba2c266e869bdb6afdf5f242
 MISC metadata.xml 510 BLAKE2B 24ec4c7f0735f04eb58a6382166c3552d329b7b51b1ac4b3ab4522603583c96197d4ddd5081b056b27c50cf13f5814a20cdb8f0716d7b8af8fb276f17d81916b SHA512 876a9ba57d32d3bcb0071d8644a6d050ef67df1a94b90064bd7f7e45ddf44c3efa220c1c9738279892f2c8327da26043c29f8478cfb5599e3e3eda43d99719e8
diff --git a/sci-libs/gerris/files/gerris-20131206-respect-NM.patch b/sci-libs/gerris/files/gerris-20131206-respect-NM.patch
new file mode 100644
index 000000000000..88d3e5bca87a
--- /dev/null
+++ b/sci-libs/gerris/files/gerris-20131206-respect-NM.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/725450
+--- a/doc/examples/modulesyms.sh
++++ b/doc/examples/modulesyms.sh
+@@ -7,7 +7,7 @@ for module in `cat modules.list`; do
+ 	    lib=$2/lib"$module""$dim".so
+ 	fi
+ 	if test -f $lib; then
+-	    nm -fb $lib | grep ".* T gfs_.*_class$" | grep -v "gfs_gl" | cut -d" " -f3-4
++	    ${NM:-nm} -fb $lib | grep ".* T gfs_.*_class$" | grep -v "gfs_gl" | cut -d" " -f3-4
+ 	fi
+     done
+ done | sort | uniq | sed -e 's/_class//g' -e 's/^./\U&/' -e 's/_./\U&/g' -e 's/_//g' | \
diff --git a/sci-libs/gerris/files/gerris-20131206-slibtool.patch b/sci-libs/gerris/files/gerris-20131206-slibtool.patch
new file mode 100644
index 000000000000..d28501d2869b
--- /dev/null
+++ b/sci-libs/gerris/files/gerris-20131206-slibtool.patch
@@ -0,0 +1,119 @@
+https://bugs.gentoo.org/778341
+
+commit 9213297c1717f6477c4784ead6c91864693e6b40
+Author: orbea <orbea@riseup.net>
+Date:   Fri Mar 26 15:56:31 2021 -0700
+
+    Link the .la files to fix the build with slibtool.
+
+diff --git a/modules/Makefile.am b/modules/Makefile.am
+index c66aea0..d6db7b6 100644
+--- a/modules/Makefile.am
++++ b/modules/Makefile.am
+@@ -78,24 +78,21 @@ libmap2D_la_SOURCES = map.c
+ libmap2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
+ libmap2D_la_LIBADD = $(GFS2D_LIBS) -lproj
+ 
+-KDTLIBS = -Lkdt -lkdt -lm
+-KDTDEPS = kdt/libkdt.la
++KDTLIBS = kdt/libkdt.la -lm
+ 
+ libterrain3D_la_SOURCES = terrain.c
+ libterrain3D_la_LIBADD = $(GFS3D_LIBS) $(KDTLIBS)
+-libterrain3D_la_DEPENDENCIES = $(KDTDEPS)
+ 
+ libterrain2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
+ libterrain2D_la_SOURCES = terrain.c
+ libterrain2D_la_LIBADD = $(GFS2D_LIBS) $(KDTLIBS)
+-libterrain2D_la_DEPENDENCIES = $(KDTDEPS)
+ 
+ libtide3D_la_SOURCES = tide.c
+ libtide3D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS)
+-libtide3D_la_LIBADD = $(GFS3D_LIBS) -Lfes2004 -lfes -lnetcdf $(GSL_LIBS)
++libtide3D_la_LIBADD = $(GFS3D_LIBS) fes2004/libfes.la -lnetcdf $(GSL_LIBS)
+ libtide2D_la_SOURCES = tide.c
+ libtide2D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS) -DFTT_2D=1
+-libtide2D_la_LIBADD = $(GFS2D_LIBS) -Lfes2004 -lfes -lnetcdf $(GSL_LIBS)
++libtide2D_la_LIBADD = $(GFS2D_LIBS) fes2004/libfes.la -lnetcdf $(GSL_LIBS)
+ 
+ libstokes3D_la_SOURCES = stokes.c CW263.f
+ libstokes3D_la_CFLAGS = $(AM_CFLAGS)
+@@ -105,7 +102,7 @@ libstokes2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
+ libstokes2D_la_LIBADD = $(GFS2D_LIBS)
+ 
+ libwavewatch2D_la_SOURCES = wavewatch.c
+-libwavewatch2D_la_LIBADD = $(GFS2D_LIBS) -Lwavewatch -lwavewatch
++libwavewatch2D_la_LIBADD = $(GFS2D_LIBS) wavewatch/libwavewatch.la
+ libwavewatch2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1 \
+   -DW3SRCE=`nm wavewatch/libwavewatch.a | grep w3srce | awk '{ if ($$2 == "T") print $$3; }'` \
+   -DGFSW3INIT=`nm wavewatch/libwavewatch.a | grep gfsw3_init | awk '{ if ($$2 == "T") print $$3; }'`
+@@ -119,9 +116,9 @@ libode2D_la_CFLAGS = $(AM_CFLAGS) $(ODE_CFLAGS) -DFTT_2D=1
+ libode2D_la_LIBADD = $(GFS2D_LIBS) $(ODE_LIBS)
+ 
+ rsurface2kdt_SOURCES = rsurface2kdt.c rsurface.c rsurface.h
+-rsurface2kdt_LDADD = -LRStarTree -lcSmRST $(KDTLIBS)
++rsurface2kdt_LDFLAGS = $(NO_UNDEFINED)
++rsurface2kdt_LDADD = RStarTree/libcSmRST.la $(KDTLIBS)
+ rsurface2kdt_CFLAGS = $(AM_CFLAGS)
+-rsurface2kdt_DEPENDENCIES = $(KDTDEPS)
+ 
+ noinst_LTLIBRARIES = libparticulatecommon2D.la libparticulatecommon3D.la
+ 
+@@ -210,7 +207,7 @@ libtopics2D_la_LIBADD = $(GFS2D_LIBS)
+ 
+ libculvert2D_la_SOURCES = culvert.c
+ libculvert2D_la_CFLAGS = $(AM_CFLAGS)
+-libculvert2D_la_LIBADD = $(GFS2D_LIBS) -Lculvert -lboyd87 -lm
++libculvert2D_la_LIBADD = $(GFS2D_LIBS) culvert/libboyd87.la -lm
+ libculvert2D_la_DEPENDENCIES = culvert/libboyd87.la
+ 
+ liblayered2D_la_SOURCES = layered.c
+diff --git a/modules/culvert/Makefile.am b/modules/culvert/Makefile.am
+index dff5b46..cb47591 100644
+--- a/modules/culvert/Makefile.am
++++ b/modules/culvert/Makefile.am
+@@ -8,17 +8,17 @@ libboyd87_la_SOURCES = boyd87.c boyd87.h
+ noinst_PROGRAMS = check_inlet check_outlet discharge_table
+ 
+ check_outlet_SOURCES = check_outlet.c boyd87.h
+-check_outlet_LDADD = -lboyd87 -lm
++check_outlet_LDADD = libboyd87.la -lm
+ check_outlet_CFLAGS = $(AM_CFLAGS)
+ check_outlet_DEPENDENCIES = libboyd87.la
+ 
+ check_inlet_SOURCES = check_inlet.c boyd87.h
+-check_inlet_LDADD = -lboyd87 -lm
++check_inlet_LDADD = libboyd87.la -lm
+ check_inlet_CFLAGS = $(AM_CFLAGS)
+ check_inlet_DEPENDENCIES = libboyd87.la
+ 
+ discharge_table_SOURCES = discharge_table.c boyd87.h
+-discharge_table_LDADD = -lboyd87 -lm
++discharge_table_LDADD = libboyd87.la -lm
+ discharge_table_CFLAGS = $(AM_CFLAGS)
+ discharge_table_DEPENDENCIES = libboyd87.la
+ 
+diff --git a/modules/kdt/Makefile.am b/modules/kdt/Makefile.am
+index a9e7954..376e7dd 100644
+--- a/modules/kdt/Makefile.am
++++ b/modules/kdt/Makefile.am
+@@ -13,16 +13,16 @@ libkdt_la_SOURCES = \
+ 	kdt.h
+ 
+ xyz2kdt_SOURCES = xyz2kdt.c kdt.h
+-xyz2kdt_LDADD = -lkdt -lm
++xyz2kdt_LDADD = libkdt.la -lm
+ xyz2kdt_CFLAGS = $(AM_CFLAGS)
+ xyz2kdt_DEPENDENCIES = libkdt.la
+ 
+ kdt2kdt_SOURCES = kdt2kdt.c kdt.h
+-kdt2kdt_LDADD = -lkdt -lm
++kdt2kdt_LDADD = libkdt.la -lm
+ kdt2kdt_CFLAGS = $(AM_CFLAGS)
+ kdt2kdt_DEPENDENCIES = libkdt.la
+ 
+ kdtquery_SOURCES = kdtquery.c kdt.h
+-kdtquery_LDADD = -lkdt -lm
++kdtquery_LDADD = libkdt.la -lm
+ kdtquery_CFLAGS = $(AM_CFLAGS)
+ kdtquery_DEPENDENCIES = libkdt.la
diff --git a/sci-libs/gerris/gerris-20131206-r1.ebuild b/sci-libs/gerris/gerris-20131206-r1.ebuild
index 4ddca5bec04a..cf42447323e6 100644
--- a/sci-libs/gerris/gerris-20131206-r1.ebuild
+++ b/sci-libs/gerris/gerris-20131206-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools flag-o-matic toolchain-funcs xdg
 
@@ -10,9 +10,9 @@ MY_P=${P/-20/-snapshot-}
 DESCRIPTION="Gerris Flow Solver"
 HOMEPAGE="http://gfs.sourceforge.net/"
 SRC_URI="http://gerris.dalembert.upmc.fr/gerris/tarballs/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples mpi static-libs"
@@ -32,10 +32,8 @@ RDEPEND="
 	sci-libs/fftw:3.0=
 	virtual/lapack
 	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 # buggy tests, need extra packages and require gerris to be installed
 RESTRICT=test
@@ -46,6 +44,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-20130531-use-blas-lapack-system.patch
 	"${FILESDIR}"/${PN}-20131206-lis-api-change.patch
 	"${FILESDIR}"/${PN}-20131206-DEFAULT_SOURCE-replacement.patch
+	"${FILESDIR}"/${PN}-20131206-slibtool.patch
+	"${FILESDIR}"/${PN}-20131206-respect-NM.patch
 )
 
 src_prepare() {
@@ -54,7 +54,11 @@ src_prepare() {
 }
 
 src_configure() {
-	append-cppflags "-I${EPREFIX}/usr/include/hypre"
+	# bug #725450
+	tc-export NM
+
+	append-cppflags "-I${ESYSROOT}/usr/include/hypre"
+
 	econf \
 		--enable-shared \
 		$(use_enable static-libs static) \
@@ -64,6 +68,7 @@ src_configure() {
 
 src_install() {
 	default
+
 	use examples && dodoc -r doc/examples
 
 	find "${D}" -name '*.la' -delete || die
diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest
index 3955244a48f5..1ff7f15ff30f 100644
--- a/sci-libs/hypre/Manifest
+++ b/sci-libs/hypre/Manifest
@@ -1,3 +1,5 @@
 DIST hypre-2.18.2.tar.gz 5699792 BLAKE2B 6adb343d23594adea60a4009f589285236365a5769b1d5cb66908ce83984dd48b3be929e6c7298c7b9cb1e2d67b1fe7ea641c8a160562d223edb9809977fb684 SHA512 7b343a5c8530d7f5e31cad6c940c2f154b2b954566d4fe8525d690fec41db23936a46fb642a994791de32984e696c624804fb1fde1f0c9ce026f1a6e46b9c0f4
-EBUILD hypre-2.18.2.ebuild 2751 BLAKE2B 7bbde7d8fa2035ee2304da1589f766b5e6dedf5c6859324d54ff23d8d05e740dbbaa1ca579594b98da3e4c4640890de466eddfc95a98dc383e046f12ea013637 SHA512 50f6d8c66e1c1b98ba4ca54d78e4a34f807ee6aa5cacf3e9f28cf1f355d9f777286444270eca6946daf90411bfaf92c065d7971088a178d7bec30e2c95dc9744
-MISC metadata.xml 608 BLAKE2B b38da1761e74a20f40607ae258caf7e1482dfb6b0e85a770fd63d2cfb7c7a046667a0256409836859fe34900a8e4f7f1457a16aa8325c52a2c48da2db2658e88 SHA512 63208b23e52f588f7cd1931fa47cc6c9216c0b0d1ebb7d4e4d11a20e747a7f88d9be28e79e02c057c092c7b40f9d88ea91db2fbce2b4b8dbc83a38224b3e8d9e
+DIST hypre-2.20.0.tar.gz 5971556 BLAKE2B 63cef33913f1f4c569c396dd18227ae4346807e659306521e9340789944e22dc70be3b9baec7fb1385f562b53045e5c87fcad604aa242a941199ff9fe0a0c21d SHA512 842868b494960506fa3df4e72abb42084d701ec14305f9b040b9dcb578b4bbdaa8afb079057a7e53ad721b440c72ee804775c3b8319f2d01a2f281920a9cd350
+EBUILD hypre-2.18.2-r1.ebuild 2752 BLAKE2B 6998f04eecaa6fcf81e817a63b0f99423893fb2378e67de52ab860a37bc932d5be3391a9a753920eb3b3c597496afe0b6080dec95ede32f3fe8c012267d190fe SHA512 85b026a7842e7baa0371aba406f1f0412c36234ef3c9eea8f69d8370c2d04f256631b4b2387ed4369d5ad139cfe6e21f4398b28f9f55e46bed51eccbcd8731a6
+EBUILD hypre-2.20.0.ebuild 2787 BLAKE2B a317027bf74f9b09ed5a1c98a4a258a46cb40ee4dcdca817a7b6c9a7e76b744c805f68e0555b7404ecf24a1c5c2245fe947421673cd1fcd8cbb644a0157262ef SHA512 031f2da16f164276bbbfdca3566e3000bdc8ac1eff22a045db18487264f5c3de5985ca17811c1c75b274af84abd0a04699c963dbaea4a9c471bd54af4437383d
+MISC metadata.xml 615 BLAKE2B 8bd8c87a70e3203b79255f63bf25671cbaed470d177d2dca5ba77348fcf3430482f80b06d2f48beaa24eb49664aaaf2b93410d7240f402313694031362bcf899 SHA512 51002ae26a7957688265381df0619348726b6f6a39a036421e8574dc56382b21c1b642f3f0592f8eb02b1435979adcc0936fe734f1a01080093a0802af30d205
diff --git a/sci-libs/hypre/hypre-2.18.2.ebuild b/sci-libs/hypre/hypre-2.18.2-r1.ebuild
index 2b5614b59ac8..e47dfb45334e 100644
--- a/sci-libs/hypre/hypre-2.18.2.ebuild
+++ b/sci-libs/hypre/hypre-2.18.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cmake-utils fortran-2 toolchain-funcs flag-o-matic
+inherit fortran-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="Parallel matrix preconditioners library"
 HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods"
@@ -16,24 +16,24 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples fortran int64 openmp mpi"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	sci-libs/superlu:=
 	virtual/blas
 	virtual/lapack
 	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 DOCS=( CHANGELOG COPYRIGHT README )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] &&\
-		use openmp && [[ $(tc-getCC)$ == *gcc* ]] && tc-check-openmp
+		use openmp && [[ $(tc-getCC) == *gcc* ]] && tc-check-openmp
 }
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]] && \
-		   use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp ; then
+		   use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then
 		ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
 		die "Need an OpenMP capable compiler"
 	fi
@@ -56,11 +56,11 @@ src_prepare() {
 src_configure() {
 	tc-export CC CXX
 	append-flags -Dhypre_dgesvd=dgesvd_
-	use openmp && [[ $(tc-getCC)$ == *gcc* ]] && \
+	use openmp && [[ $(tc-getCC) == *gcc* ]] && \
 		append-flags -fopenmp && append-ldflags -fopenmp
 	use mpi && CC=mpicc FC=mpif77 CXX=mpicxx
 
-	cd src
+	cd src || die
 
 	# without-superlu: means do not use bundled one
 	econf \
@@ -93,7 +93,8 @@ src_install() {
 	emake -C src install \
 		  HYPRE_INSTALL_DIR="${ED}" \
 		  HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
-		  HYPRE_INC_INSTALL="${ED}$/usr/include/hypre"
+		  HYPRE_INC_INSTALL="${ED}/usr/include/hypre"
+
 	if use examples; then
 		dodoc -r src/examples
 	fi
diff --git a/sci-libs/hypre/hypre-2.20.0.ebuild b/sci-libs/hypre/hypre-2.20.0.ebuild
new file mode 100644
index 000000000000..4fec2500afed
--- /dev/null
+++ b/sci-libs/hypre/hypre-2.20.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="Parallel matrix preconditioners library"
+HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods"
+SRC_URI="https://github.com/${PN}-space/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples fortran int64 openmp mpi"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	sci-libs/superlu:=
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG COPYRIGHT README )
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
+		tc-check-openmp
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then
+		ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
+		die "Need an OpenMP capable compiler"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# link with system superlu and propagate LDFLAGS
+	sed -e "s:@LIBS@:@LIBS@ $($(tc-getPKG_CONFIG) --libs superlu):" \
+		-e 's:_SHARED@:_SHARED@ $(LDFLAGS):g' \
+		-i src/config/Makefile.config.in || die
+
+	sed -e '/HYPRE_ARCH/s: = :=:g' \
+		-i src/configure || die
+
+	# link with system blas and lapack
+	sed -e '/^BLASFILES/d' \
+		-e '/^LAPACKFILES/d' \
+		-i src/lib/Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX
+	append-flags -Dhypre_dgesvd=dgesvd_
+
+	if use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
+		append-flags -fopenmp && append-ldflags -fopenmp
+	fi
+
+	if use mpi ; then
+		CC=mpicc
+		FC=mpif77
+		CXX=mpicxx
+	fi
+
+	cd src || die
+
+	# without-superlu: means do not use bundled one
+	econf \
+		--enable-shared \
+		--with-blas-libs="$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's/-l//g')" \
+		--with-blas-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L blas | sed -e 's/-L//g')" \
+		--with-lapack-libs="$($(tc-getPKG_CONFIG) --libs-only-l lapack | sed -e 's/-l//g')" \
+		--with-lapack-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L lapack | sed -e 's/-L//g')" \
+		--with-timing \
+		--without-superlu \
+		$(use_enable debug) \
+		$(use_enable openmp hopscotch) \
+		$(use_enable int64 bigint) \
+		$(use_enable fortran) \
+		$(use_with openmp) \
+		$(use_with mpi MPI)
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/src/lib:${LD_LIBRARY_PATH}" \
+				   PATH="${S}/src/test:${PATH}" \
+				   emake -C src check
+}
+
+src_install() {
+	emake -C src install \
+		  HYPRE_INSTALL_DIR="${ED}" \
+		  HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
+		  HYPRE_INC_INSTALL="${ED}/usr/include/hypre"
+
+	if use examples; then
+		dodoc -r src/examples
+	fi
+}
diff --git a/sci-libs/hypre/metadata.xml b/sci-libs/hypre/metadata.xml
index d245803317be..0f8ab9b1a46c 100644
--- a/sci-libs/hypre/metadata.xml
+++ b/sci-libs/hypre/metadata.xml
@@ -10,7 +10,7 @@
     solution of large systems of linear equations.
   </longdescription>
     <upstream>
-    <remote-id type="github">LLNL/hypre</remote-id>
+    <remote-id type="github">hypre-space/hypre</remote-id>
   </upstream>
   <use>
     <flag name="int64">Build the 64 bits integer library</flag>
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 65ef956fed63..1caef18eb44f 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,3 +1,5 @@
 DIST libqalculate-3.16.1.tar.gz 1756176 BLAKE2B b09e06a4d89249bb3e38a47ed47acc7598bc62e966673a1eb175641b1018021199dbbcd38266301ec8b2d3c55747378adfde3db4e25e58771be162905cb493dc SHA512 3cc7ba66493252015b9d33835188c236b10afdce5f23021a5e686609609265aed81d592815ee6a172c269a0f144a3203c954435fea8ddb82637453d5c98cd05a
+DIST libqalculate-3.17.0.tar.gz 1770500 BLAKE2B 247c74db32e63437c556dd60f00f56acf53d9ba90ea1027b34b98b455215e6c03e3ee34116b6d3989fa43b449e18b6f2ebaed67f9dff36f08dd8b38c685c6586 SHA512 b204dc44b6fdb2b72d3c85840fee38482db071f0f8241420ea24093dcdcc377c66f516c571827fbede40237618a53153a75bb7afee7f3bee7a1a71aedd779a11
 EBUILD libqalculate-3.16.1.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469
+EBUILD libqalculate-3.17.0.ebuild 1430 BLAKE2B 5ad7454423b04634dba7f119e0626a16b0a1eb84b5652293ce60a2f42c6c89faddd599deb68ee8ccdd1efaebb49f492b960762d6b298057a94a4f30e062f06f5 SHA512 fa4967817bd224a292a93ff1b0c698180f9de41fc374c1c6f9dab2654f5705d21435d8fd49a1214cf47cc669106fa53f93b6c178846ed54e2cc2d7a393aa206f
 MISC metadata.xml 412 BLAKE2B bec97c9946830a88d871c0a27f06ff42a2ed252971f616f43f4c0cfa9617ea46565153c41c2aabea921b694c6a665a097635fdcf5dd82387dc60445e14657427 SHA512 3e011ceae845d6f233e86f7d39eb4460f561720312d8a0696b87672251cf46138228ae678ab63459280dd36fda3f9f8f302d9259e49acd6606fe2e66126bffb9
diff --git a/sci-libs/libqalculate/libqalculate-3.17.0.ebuild b/sci-libs/libqalculate/libqalculate-3.17.0.ebuild
new file mode 100644
index 000000000000..94aa33f3f886
--- /dev/null
+++ b/sci-libs/libqalculate/libqalculate-3.17.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A modern multi-purpose calculator library"
+HOMEPAGE="https://qalculate.github.io/"
+SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/21"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl icu gnuplot readline"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libxml2:2
+	dev-libs/mpfr:0=
+	virtual/libiconv
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	readline? ( sys-libs/readline:0= )"
+RDEPEND="${DEPEND}
+	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/currencies.xml.in
+		data/datasets.xml.in
+		data/elements.xml.in
+		data/functions.xml.in
+		data/planets.xml.in
+		data/prefixes.xml.in
+		data/units.xml.in
+		data/variables.xml.in
+		src/defs2doc.cc
+	EOF
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with curl libcurl) \
+		$(use_with gnuplot gnuplot-call) \
+		$(use_with icu) \
+		$(use_with readline)
+}
+
+src_install() {
+	# docs/reference/Makefile.am -> referencedir=
+	emake \
+		DESTDIR="${D}" \
+		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/udunits/Manifest b/sci-libs/udunits/Manifest
index 3968cb16531e..f338a63e2f80 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1,3 +1,3 @@
 DIST udunits-2.2.28.tar.gz 1224503 BLAKE2B 64d64c609cfbada505c5e163a1e757cd25c09dd75865f255ec8f3bfc26dfafa0f2b9b9997602cb91f80ae81e1fa74bfc0f2d9f3d2d29f880c64e8785e5cbb1a8 SHA512 86146d489e1d472723e059fb15a5dd697a67568ffb5cdba17d191eb304c018bffffea708a73cce50a6c87ad33b387e5ee6653377ae0ebe9986117dfd41e9a5a1
-EBUILD udunits-2.2.28.ebuild 759 BLAKE2B 6da67644d82b2474f848903cd8413ed2ca982786b412ec065a6c12864ac67302aa2292b5b433fb0a4f2eb3b7895152e6160af661e364ff966698919fe3e3997a SHA512 40b0e8b832c09c9c60525cc18cd912b919fe4aa9a45545df00694105ef8133b1a85ffb8bfb24c2f11cb4d1894ec66f028b5926aa6942ae386ba1c20b6361188f
+EBUILD udunits-2.2.28.ebuild 817 BLAKE2B 8838266671693bfad73eb9eb8d5b0f4b218de2a9bc04ba8023119342ec55694585446d524a5fd7f60aaeb4bdfb0044dcf99268dafa06b237bf14b31c50777ca7 SHA512 e20bf66dc5a1ba3160361144b5544e8fbe007bf0238c7c4d23e45ce038c0ec279aac70e237abdd50779e4d9b5790e2c9e14d5d4fb2f19be3d20bb4ff88029178
 MISC metadata.xml 535 BLAKE2B b8b216bb211bfbd90c60f71248d5a390eb6d21bcceb13d077e128a764484b2c30a0aa7378323539acea5ff9b4c756fc51942e5988698d2de095169c7763e4316 SHA512 dcbd5fd4a61a2780193ff4875f973ec1237be15f98bc047c2f1603b1d780183b1869086ed8ab91f5832722c04f0e1d26d17cf3e60883d77e79b65f68dbc47ae9
diff --git a/sci-libs/udunits/udunits-2.2.28.ebuild b/sci-libs/udunits/udunits-2.2.28.ebuild
index d52e8de33216..bb2e12de20a3 100644
--- a/sci-libs/udunits/udunits-2.2.28.ebuild
+++ b/sci-libs/udunits/udunits-2.2.28.ebuild
@@ -25,8 +25,9 @@ src_install() {
 
 	local i
 	for i in udunits2 udunits2-{accepted,base,common,derived,prefixes}; do
-		dosym ../../udunits/"${i}".xml usr/share/doc/${PF}/"${i}".xml
+		dosym ../../../udunits/"${i}".xml usr/share/doc/${PF}/html/"${i}".xml
 	done
+	rm "${ED}/usr/share/doc/${PF}/html/*.xml" || die
 
 	# no static archives
 	find "${ED}" -name '*.la' -delete || die
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index d1b6b5ce7abb..096870f59f4a 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -9,6 +9,6 @@ DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc
 DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b
 DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588
 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
-EBUILD vtk-8.2.0-r1.ebuild 9707 BLAKE2B 272839618db0aa08fc2c0ed6cf5e703d9876190f1e3625a1a6d161eed050dc246c044224ac9a044ac8c6b45fa1960d5972ece53f9205f8533faf7c23bfc094cf SHA512 19baa307c08a2ad9137ce5c8ba8f5e7f407a12da0575d80232e653070679da88e6a8cded31f50107d247465b0784f68e4a75abdb7f28249dd293dbe729127455
-EBUILD vtk-8.2.0.ebuild 9414 BLAKE2B 903df17af4520e573fee1d3368a119e70c28964b6e0c3d3bdccaa2e4bae3f87a11747d3eb165ec3447ba6b3e6f37aebf49e7e9826445d5bdfc52bee0d3d8dcbd SHA512 99d9a843e0b93a97f62ac1632dbb3979a8d2c02d553bdee8ae6e49fd6e686431583c82b20460a432c2361b5dd2b5309f1861e560ed6a2aa7b1192bbfe7862d3b
+EBUILD vtk-8.2.0-r1.ebuild 9708 BLAKE2B c2a3febf381f2dbc8298361bfe5c832c2e4dc5eb7f0ecab1357791c464d96ee5857b50086a517315682a8e6ffad837ba0c32f70cc4541cd3c6b53ad7966e3663 SHA512 c68899d16abe366d5286b4840605e8d173141681fee3489152524a70dfdb25611a9d2934d457284b6199261f0b3c2c34a4d4b097069feaae6d234cedcdcf137a
+EBUILD vtk-8.2.0.ebuild 9415 BLAKE2B f1784bad98faef85b698e73889943c1177783bd2b356baac8b7024f536c7f64e7343a0d26c003a948fa9917f8946a7482bcddf836a0334927185f38d6d98a37a SHA512 f4c5d23f72f69994241337e0bc20a936c64d3c0d5fb785b3da72d7e6612de4f35f98dbc2e4b6e670388051952cacc1d4827a0b0ea92ce909123a35606e9dc1c7
 MISC metadata.xml 988 BLAKE2B 2533eda3936361d835dba2e30f1b1a19484facc289603d82b6c2012ee242e7778b1080d7136584c08113d7a82e0742d7bb2373984667301a4c7d52b4dbd8b087 SHA512 f4e29e15a05cfb49b24f4a8e24a6e43ac72ac0fa21ed640a70e5017263f23e21e514dedc489d963acd803407df8ee2bd2d6006c83eece795f91b4809d2ec2ff4
diff --git a/sci-libs/vtk/vtk-8.2.0-r1.ebuild b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
index 12dba470d8a1..9ab67fa0c1e0 100644
--- a/sci-libs/vtk/vtk-8.2.0-r1.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
@@ -254,7 +254,7 @@ src_configure() {
 
 	if use python; then
 		mycmakeargs+=(
-			-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
+			-DVTK_INSTALL_PYTHON_MODULES_DIR="$(python_get_sitedir)"
 			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
 			-DPYTHON_LIBRARY="$(python_get_library_path)"
 			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
index 0c4458bbb7f3..0eab965aa3f4 100644
--- a/sci-libs/vtk/vtk-8.2.0.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0.ebuild
@@ -248,7 +248,7 @@ src_configure() {
 
 	if use python; then
 		mycmakeargs+=(
-			-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
+			-DVTK_INSTALL_PYTHON_MODULES_DIR="$(python_get_sitedir)"
 			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
 			-DPYTHON_LIBRARY="$(python_get_library_path)"
 			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"