gentoo resync : 20.03.2021

13 files changed, 302 insertions, 31 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 2893033fc2e7..20f98c1e12e5 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/g3data/Manifest b/sci-visualization/g3data/Manifest
index 5a079ec01ebe..110c4e31a433 100644
--- a/sci-visualization/g3data/Manifest
+++ b/sci-visualization/g3data/Manifest
@@ -1,3 +1,4 @@
+AUX g3data-1.5.4-desktop-QA.patch 234 BLAKE2B fea81baad83edaf330f23b9f4e5cbf1f3ee8e43ad02aa9fa87cb9f41171d658ccf8186ba882944e1849e9d2ef937c148a4d6c6a82639244a28ea00e4dcf7b26b SHA512 f938c8659de9ff868156823c8112ce849e9acfa3c1a253d77a94a366875d275d4632b1b810d3ae15dbb9d83f1dfdae18aa9aa6aae01456107596a6d8ae6e3c1b
 DIST g3data-1.5.4.tar.gz 127973 BLAKE2B 19e6e6aaa7b33a4c4aa061c76aa2465bdb305ac9023e861dc1db42821cdb83c9b8221f6a5552f37731c3fe21fedc4174d46a7d2c01732916534539d382e6fac2 SHA512 b4651eb6ba87ddb745c46520ccf2d7146d179e69a614d7c6c247b82eaf188b30e955d60e7df59419f63a304a5c5215829d3bea3cc233d2729ff599c523d852e2
-EBUILD g3data-1.5.4.ebuild 450 BLAKE2B dc5c3338f353638b120b3d8b347d0fe8bc34f0298df927811edfddd62cb57b5ed238ac9566ee6c4fcad0b69687b98be579a8e011a32dc0d64ccf5ffa27ec53cc SHA512 1762b15dcf6541f8435f213aa8407cd283e789a3f944adeec6d790d69e0343ab2bf9c89682e3a729cf0ad4252d787b4feff08bef3fd9e49036d39d5ee18db596
+EBUILD g3data-1.5.4.ebuild 468 BLAKE2B 1bffc954f10bc7532a09eb27174524aa671381e7c346e984786feaf6c28bb59585e6f9cfb296c89348ebdb89418772b9982a7455b5171f0cc19c695237954c4b SHA512 dfc505d0f0ad7bb553e99dbfee9c60c327820937da7ac4602a63b2c4b525247655496bf66af0e79c5cb07be3e31bb1055414c93f9d324a31a186a5ee329ead2d
 MISC metadata.xml 554 BLAKE2B 9cce0c1c7d04d08ab9aba11a02262e9f436388ec2e864802238c34f33563f8dd3f16a0e5ca89f05f7d0259a12913df3f7c0c81583532757b033da6bdae3c7872 SHA512 eb965b746fa8c3e8b516a11cd32ccadd20e92d3cbda0861b331da03d2172221d3d2f472a1598a1ad61005274d0863ddd0ad4ab90e42e5cececbe8c7148219285
diff --git a/sci-visualization/g3data/files/g3data-1.5.4-desktop-QA.patch b/sci-visualization/g3data/files/g3data-1.5.4-desktop-QA.patch
new file mode 100644
index 000000000000..3391659716da
--- /dev/null
+++ b/sci-visualization/g3data/files/g3data-1.5.4-desktop-QA.patch
@@ -0,0 +1,11 @@
+--- a/data/g3data.desktop
++++ b/data/g3data.desktop
+@@ -3,7 +3,7 @@
+ Name=g3data
+ Comment=Data Extraction Tool
+ Exec=g3data
+-Icon=g3data-icon.xpm
++Icon=g3data-icon
+ Terminal=false
+ Type=Application
+ Categories=GNOME;Science;Graphics;
diff --git a/sci-visualization/g3data/g3data-1.5.4.ebuild b/sci-visualization/g3data/g3data-1.5.4.ebuild
index 2a29bfeff753..aff34e279401 100644
--- a/sci-visualization/g3data/g3data-1.5.4.ebuild
+++ b/sci-visualization/g3data/g3data-1.5.4.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit autotools-utils eutils
+EAPI=7
 
 DESCRIPTION="Tool for extracting data from graphs"
 HOMEPAGE="https://github.com/pn2200/g3data"
@@ -12,8 +10,9 @@ SRC_URI="https://github.com/downloads/pn2200/g3data/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-desktop-QA.patch )
diff --git a/sci-visualization/metadata.xml b/sci-visualization/metadata.xml
index 5ac373c53d85..aa4afa65358e 100644
--- a/sci-visualization/metadata.xml
+++ b/sci-visualization/metadata.xml
@@ -22,4 +22,3 @@
 		de visualización.
 	</longdescription>
 </catmetadata>
-
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 481124d38c4a..fd5a7639ebc6 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -4,5 +4,7 @@ AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9
 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.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 5806 BLAKE2B 1b95eee4c57a64b68a872eea69b49423e854571909466e1f3e3e70b4ff5b8bcc723e08012f91abc31593583667fe1caccdbe52601265a051522ab33a26a3e555 SHA512 3e88a1dc77c0e5f9f7590db6a3a17e2510aa368b4a243e78851d9a44f3a696daab531912d2c70ef0ce25c5384a43929c29c20d3a3b0dae711da66f490163e72a
 MISC metadata.xml 873 BLAKE2B 3f48aa66e19a19e8de7959d58248e7d4d7b6ca0f9dd98b869088f15bfc483dec486c89bdd448368eb0b385735ca8cfb3462a86e93fecb13383366ced4ead4ebd SHA512 871830a5157bc1f8803cf4dbd4797a58bd87d6338a3eaa21662a2e789412bf746c30f817a485a26b4b14fa578aa15b391efe76c920db7b1c2a2f74f9bf3eceb2
diff --git a/sci-visualization/paraview/paraview-5.9.0.ebuild b/sci-visualization/paraview/paraview-5.9.0.ebuild
new file mode 100644
index 000000000000..826f9ea31de5
--- /dev/null
+++ b/sci-visualization/paraview/paraview-5.9.0.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+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
+)
+
+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/quickplot/Manifest b/sci-visualization/quickplot/Manifest
index 271b84a5090b..cec84ad42200 100644
--- a/sci-visualization/quickplot/Manifest
+++ b/sci-visualization/quickplot/Manifest
@@ -1,5 +1,6 @@
+AUX quickplot-1.0.1_rc-automake.patch 544 BLAKE2B ba3a3a2c6a8351a71a8fee0e8e9b663a7d824dd62608ba8de1678e8b1039a96365db56c329b50e82a73870bd584ae9d847bf1095eaa336438e9e2e923dc76a76 SHA512 bca9e0c2e2d7a3644ded230ef933fbc716a7ca87f62b20a47f930bf8f10a7bb7d8ba36869c4564c6370f566d6f57802b5b387e76b2d44aacd59ad544a8d73775
 DIST quickplot-0.10.6.tar.xz 445172 BLAKE2B bcb2c694cc6a3777b7d88a5fbd6562d2612f76b0fabde67562ddba44708db0674336b72f5223aa6043524e9c6cb057e518b076086f2c05370bef6eb54b07e8bf SHA512 10b5277d8d0b8febc3c663256f3912bdd9d879b3038a5fdd3a7adc223419893ee56b825f04b5bee29883f30acb3b6a329d8e314b049fef26d6220192767d4adb
 DIST quickplot-1.0.1rc.tar.gz 303055 BLAKE2B 52c8b60b0f79171358d81691f8824e39c1e3bafc1c084c3a52037e8cd1148e8bf68027ccc90593eca15fcbee0074d42ad7def1eb9d1f5c656b86e12adb6cfdcc SHA512 9cfaaafb7db379fb43b2975d588464288ac18eb21b3248fb02e5a30b0fa0950313a9818cfec23821046f9819d78255f02dff9970668a4b4ed8c4f452d6df3451
 EBUILD quickplot-0.10.6.ebuild 998 BLAKE2B 156205b729053992a6d80118c0bff6f90bbe8bdc2af9cb042fb692cf0ac8f088265331529c22566ffcb964f877c5ac062cf553d258a3ae09bbec8131860d573d SHA512 3ad72225a71f9c3e4c2c5e2f9e409ec0f30ffdc30817b46277590e314a089cfbea95cda0a874eb15baf0ff37942df0e4423c5bfebae2ec804ca455504a76f850
-EBUILD quickplot-1.0.1_rc.ebuild 1057 BLAKE2B 4b496544bf2632ba005ea519071bdc957339d3a8267905e14c025786b15fc5541c81a6d4beec3521c2c0c25890028260f1ac75e62a744b56e3a085a7e30e72cf SHA512 d02264953582e47bfa69dbe439b782bf9c8f70d9d34e8c1acaeb9f1c9ff1d5b7f659408dc4ce9dfb312eb3471c549cd5b3d25f1a299db9d4189e1d717750fba1
-MISC metadata.xml 853 BLAKE2B 96a2968fcecaddf9d143be2c33c4065b6809417d997aa1ca2fda48dbc755178d1c32d47d2e82aa507fbc614c41c9f3395de7310e61abe8bf3a9da70a915547e5 SHA512 8485d4cad78fd9161043a10a764dd494f2b9a5aded964366b3bbe519b423c793cdbabeb29c16e207a7f989339390f03beb57bd918d0df70321b7518f501bfece
+EBUILD quickplot-1.0.1_rc.ebuild 1032 BLAKE2B 825cc7a512a18099c844fd558997d2a1441b9023e1317027c06f02f8671466b09cd0d793c1ad5c6497c3f5ce043ed87f002a2ca854a73c320b80cb96699c0a91 SHA512 7ebd9fea51c58945cd0cc0c7cf06f103dbe1447a5f24412dfb3f96bb4c5f164ff2c9cb3590bc7eebce9eeb51f234ada59a55c20b6f87f5531acda8b001c5909b
+MISC metadata.xml 853 BLAKE2B 8e5a7f7a90c345657b2ae6b9460bad955899cecbdf38c9fa668f1da36a35928268368bb6339e43874733124b553ba6a2a8177a060e4dc5a9204ee3e88b5c74de SHA512 ec630df795d369d1ebbdb5cccf33b55134e6d4400d97caed721b0a02882c5cc321ac21c526b50d1556f9c4e21504a51dfbfdcb2b463ffa09d2f81d0890bf0cd9
diff --git a/sci-visualization/quickplot/files/quickplot-1.0.1_rc-automake.patch b/sci-visualization/quickplot/files/quickplot-1.0.1_rc-automake.patch
new file mode 100644
index 000000000000..e88259f0bd24
--- /dev/null
+++ b/sci-visualization/quickplot/files/quickplot-1.0.1_rc-automake.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -193,7 +193,7 @@
+ endif
+ 
+ # We look at a sndfile symbol when libquickplot runs
+-libquickplot_la_LIBADD = $(sndfile_LIBS)
++libquickplot_la_LIBADD = $(sndfile_LIBS) -lm
+ 
+ if QP_DEBUG
+ libquickplot_la_SOURCES += debug_spew.c
+@@ -336,8 +336,8 @@
+ if HAVE_LOCAL_SCREENSHOTS
+ 
+ install-exec-hook:
+-	mkdir -p $(htmldir)
+-	cp ScreenShot_* _ScreenShot_* $(htmldir)
++	mkdir -p $(DESTDIR)$(htmldir)
++	cp ScreenShot_* _ScreenShot_* $(DESTDIR)$(htmldir)
+ 
+ thumbs.htm: mk_thumbs.htm.bash
+ 	./mk_thumbs.htm.bash > $@
diff --git a/sci-visualization/quickplot/metadata.xml b/sci-visualization/quickplot/metadata.xml
index f2f18fe4b41c..dfb4c4b2cae6 100644
--- a/sci-visualization/quickplot/metadata.xml
+++ b/sci-visualization/quickplot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
index 3b95c16cf526..19ccf287fd22 100644
--- a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
+++ b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
@@ -1,49 +1,52 @@
-# 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 eutils
+inherit autotools desktop
 
 MY_P=${P/_rc/rc}
 
 DESCRIPTION="A fast interactive 2D plotter"
-HOMEPAGE="http://quickplot.sourceforge.net/ https://github.com/lanceman2/quickplot"
+HOMEPAGE="
+	http://quickplot.sourceforge.net/
+	https://github.com/lanceman2/quickplot"
 SRC_URI="https://github.com/lanceman2/${PN}/archive/${MY_P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
 
-SLOT="0"
 LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
 
 RDEPEND="
-	media-libs/libsndfile
+	media-libs/libsndfile:=
 	>=sys-libs/readline-0.6.2:0=
 	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	media-gfx/imagemagick
+DEPEND="${RDEPEND}"
+BDEPEND="
+	media-gfx/imagemagick[png]
 	virtual/pkgconfig
 	www-client/lynx"
 
-S="${WORKDIR}/${PN}-${MY_P}"
+PATCHES=( "${FILESDIR}"/${P}-automake.patch )
 
 src_prepare() {
-	sed -i \
-		-e '/libquickplot_la_LIBADD/s:$: -lm:g' \
-		-e 's/ $(htmldir)/ $(DESTDIR)$(htmldir)/g' \
-		Makefile.am || die
 	default
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--enable-developer \
-		$(use_enable static-libs static)
+		--disable-static \
+		--enable-developer
 }
 
 src_install() {
 	default
+
 	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
-	mv "${ED%/}"/usr/share/applications/quickplot{*,}.desktop || die
+	mv "${ED}"/usr/share/applications/quickplot{*,}.desktop || die
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-visualization/spyview/Manifest b/sci-visualization/spyview/Manifest
index 7ff1e7ca7ac8..0c97c6cd3e1e 100644
--- a/sci-visualization/spyview/Manifest
+++ b/sci-visualization/spyview/Manifest
@@ -1,4 +1,4 @@
 DIST spyview-2018.12.24.tgz 15461336 BLAKE2B d88cea7a91b51a695bdc6eb4146b010b196cf24c2f21f16ef47782ed99f6f3b79d2950c35267ea71ac7a14705cb8ed8a4d1e12c03be0d5d8f6ad2f816c197c77 SHA512 b73837491650ccb9cc8f70e5a80700d33c05bbbf6914c778508ba1848db67b28cca0013e142def1f47755fb1370abfd850a55e4b69cca442ba43323029fb6d05
 EBUILD spyview-2018.12.24.ebuild 1496 BLAKE2B 5c9c29fed08be17b03d07fbee9a7dda8557797c5c0f7aa766f0953cca9787fbe7d7cbc986dbcb1030c101c6607bd6574fabf5db43c2d8f5a3bfe81b010b00db6 SHA512 59b782dfaacbac334a38666ca53b2620c2892d9e819d36465943331d572cd9bc88c3bc413aeb1e81c21bc35ba3a81c079ed78dd3eb63a374b63b14979dcae9ff
 EBUILD spyview-9999.ebuild 1497 BLAKE2B 5b05fba80266c0b3f5d780ebe52726123c9906b705c28bf1432e111e9e5fd797cd0675100439115df00c6488896bd3d72441137523e8c102ae7df6e6d68f1148 SHA512 55f530164e34e493a9983aef846a1f44c11fcecb899044bfadd1f75403cb4f4c369ad10cdd395354a8dbf9fbc9b4a65a144e6dbd3d6975ace6afeb7dba34970b
-MISC metadata.xml 346 BLAKE2B 9e4069b3bc88206f33580deed7736d12cb6de27ef3a4fc88d7e4a82758eb4e683a3bb4c4f42954a426a7d9ee3707b4e4a04f1779616393cf53830d15c667bedb SHA512 51dd8374cf0d0a3e18fc12a8a549a553ea9bc0a66b18fdadf39e5f0102e4ac5ddfe403de35372d95d8e2ab06b9b530118b5977ff466952e905fe7facbf23b52f
+MISC metadata.xml 346 BLAKE2B d4d19a2baa2a88f53e3b69af4fa3e5e0b051501da45f59b623a313d071d1800063313bd338cebe0854b2b9df10511886a1b914f5f8141cbedc67a120f3a29ed8 SHA512 bc0174aaac95764c5b32e66310ae588ce5d7e3c7ae7df7702ee9a36b0ee20d1622881eefa265781042806646875bcc021da08014da2a2077ba524fa4aa4012c8
diff --git a/sci-visualization/spyview/metadata.xml b/sci-visualization/spyview/metadata.xml
index bf93f4da9f0e..f3b04df57527 100644
--- a/sci-visualization/spyview/metadata.xml
+++ b/sci-visualization/spyview/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">