gentoo resync : 10.09.2021

24 files changed, 466 insertions, 382 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index a26a873f10eb..6d5b2955827e 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 9a0c2c37d2da..f9d7eedcc809 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,13 +1,9 @@
 AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09
-AUX dealii-9.2.0-fix-boost-include-file.patch 533 BLAKE2B f8aad2b17a3083da8c1aaf5461e5cf2b4aac2e78b34c46c7a3b965495a9c263687db6d75498a404be44f09bb952e7eeea0ac005da047f98ae526edd5ee8af473 SHA512 9a05e7787b7352c59e4756729ca4080f6c2a21bcd84429f2ed22d3fcd8e6d7183cb5686a7d88b0fd5868b2bfe53130d1fb2e9c3940ca0ccb8c8119a5e7532625
-DIST dealii-9.2.0-offline_documentation.tar.gz 277987911 BLAKE2B d14e15bc252f481707b04e9ca3fd05b5469035537a099466a8272fa1d56833c99d845871534df75bbb2efb29063e738700a5a2815b653cdd14b49b3a93add368 SHA512 9680731b4d837561c3682a65391b442cfb8d2a947b0e4e37cad1df83877b371997d084eac52e2bf34b190ea54996d41ddd89bee79fff24d710199417f3f345ab
-DIST dealii-9.2.0.tar.gz 24688964 BLAKE2B 60a8ede72a49cb2e658b3d6d53fb332a96f44a7fb9bb499ba54175138d49f38a9b75d9bea2eaddcaa3f50d97ce53961692b35f89578f535d32301680e6f1d68b SHA512 7c76435e45c9c302c4f95f588229f5a9b81f0450bd029729553c706a25dfd16f5c02c50fd2618d7e285d18927b63426110d2c6a074242b91cf789bd4bc77acc5
 DIST dealii-9.3.0-offline_documentation.tar.gz 342390250 BLAKE2B 5ed1e5d5f7cd6a44f0dccc4b092c241fadc430facb77ec2a9ffb30d00dc13751f0ac08e2f05960584fbb60b26b64fa070c437f392e2e62b4ba1328e4efcd0677 SHA512 ff04cf3690160119041a9dc102ece81c351c41809fe1717cbc95aa97f2f1fe2ccc36e1b4b3045b73056a54fc7e3a27d3d734908760e9c34203b566b328b104b7
 DIST dealii-9.3.0.tar.gz 24458373 BLAKE2B 27cdaee4e7ec9c170e11c5ba9bff8fd654bb2a9452df3402d5639268a6fe31565faa38d240810a0323b7253f2ed665c25fa0948c56b9924f1836531f2414bc92 SHA512 d558b5dda1067f7d995bc5f265614e3bc5e70190d24c1c61047af1ddc52fa007013c51901b9b8eacfbe8b360dffcb22aca87e0019ee09581b928e00c39198c98
 DIST dealii-9.3.1-offline_documentation.tar.gz 342389060 BLAKE2B 71b47816dd22f490168f91c667308ecf10d5733bb4e4d6f7f214dfa729f47e6f44bf32382167f2f6c864038d04c994cab7ef91ae647b4188c53995c5c2904bf3 SHA512 7ab70b7821924a4383f2d46bcb44e702858206a8444870d3e2282d726b2c1cf3009f615888206312aed34eae9595ff19664da422e33c47720cce5c5fd37c1e18
 DIST dealii-9.3.1.tar.gz 24459280 BLAKE2B c7f1d461017da24efd6f3247217fd1b889e0cbf2ac62c3fd305e03aed90d5ba82b58ceb84d34a84608b833b734e12abc77a63693aaa6eed767b4f5f157233ba0 SHA512 c3ba3e16fa4792bb4f3e85163e67b08271c84faff72c49b858a955851401adf2499e278790803061a61c4024964f6da3f0ef7b09c0370d8d0b5af16b7c3bdaef
-EBUILD dealii-9.2.0-r1.ebuild 5191 BLAKE2B bc3895d34609823b0538d30a9bb068e8844d0e86aa76565e24548d5dd27ae182c50c7a1f0e7a73dc2e175a0664e04d12366720dfd4221a2ed72272cf083d875a SHA512 7b5a428482ca1011b77aad608322d0fa403f4df1e95f60a6c69c6f16a0aceaef86bbfc73ee714b4741caa32b418edf8a10bc6f3f3c08bf20371a11de659bd063
 EBUILD dealii-9.3.0-r1.ebuild 5321 BLAKE2B 0e665c64f381364e1319d2f79c66076c5e5d8c64a0449bf47e265f210553ca379f04e4bffcd1c77b4ff7fb3d0a62560f861e6815c3daa7d285f3c90c0e107d67 SHA512 42fc31b610dd96b26c2b96e35304a4f16e65d5bdedec2a23bd4dd1220c0a6e1c9d940b6e91832dd99bfce2f743339ac4d51bf6aabd2a1c3e60278b77f2596797
 EBUILD dealii-9.3.1.ebuild 5321 BLAKE2B 9184a815e1979ef36752a2596617d17057584b073d6fa9de0c62baba62399271abb059490efe0beb35ac89d05b9960d0213887ab831abf5604fe894c2c2d5d15 SHA512 5823d35c1a2c10fb40ad6a897e517e72e206e79df1f1361461b5ae029d08d1605266a8f5a9aa3484bfc31141cef28d756b0bf7f19d09f91ab90ff3208ef63663
 EBUILD dealii-9999.ebuild 5372 BLAKE2B 629be1d6fe6a18cc64e7733f11ea2af64003c367bc3f272e5c42e2bf0ee499597dec6379fc65f571fbdd3c2d0f2fe1e14759b74a43614787f819fa353e4a10d6 SHA512 e350d34c18c3c100ac2827e1f8c22704a4b42f677b774d5d68193da72b802c8e294849783b6c9a5f1afe51f73308637e3be18b0bd9b3ae8b49a2eeda35e1335b
-MISC metadata.xml 2636 BLAKE2B 8874dd9c20a2dbd781f4a157b3639b1d66faf1b3f32dc6ac1c42fea274c0035b9632108117472b62d9161fab705f5a365aeaaaa44f555a5c2658ebd0a0fff045 SHA512 149082068c7287346a42b901501eddeea6feaaf9cc91c46681f63e63c68dd2a7e3161c3520417a44dc7eec7e673c76c6e967b5b46e898714ce65c4ea4924d25d
+MISC metadata.xml 2439 BLAKE2B 98a47021be5563a29d707d80e7c3fee23e058a94003fcfacf0acf716a58f9a5d615566d411a95bf80a9d38dff8374cfb287ebe0eebaec4b8c40d3878595328dc SHA512 678bd613d2f7854a4f3131ec89a6aa77ddff54bcad040e71a8bb786aeb8719ccee1929a21df1d82135d0df6772707575eff17398dc91d30ec0dd68c974762983
diff --git a/sci-libs/dealii/dealii-9.2.0-r1.ebuild b/sci-libs/dealii/dealii-9.2.0-r1.ebuild
deleted file mode 100644
index fa6f92f0b59e..000000000000
--- a/sci-libs/dealii/dealii-9.2.0-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib
-
-# deal.II uses its own FindLAPACK.cmake file that calls into the system
-# FindLAPACK.cmake module and does additional internal setup. Do not remove
-# any of these modules:
-CMAKE_REMOVE_MODULES_LIST=""
-
-DESCRIPTION="Solving partial differential equations with the finite element method"
-HOMEPAGE="https://www.dealii.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dealii/dealii.git"
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
-		doc? (
-			https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
-			)"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="
-	adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
-	cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
-	+lapack metis mpi muparser nanoflann opencascade p4est petsc
-	scalapack slepc +sparse static-libs sundials symengine +tbb trilinos
-"
-
-# TODO: add slepc use flag once slepc is packaged for gentoo-science
-REQUIRED_USE="
-	p4est? ( mpi )
-	slepc? ( petsc )
-	trilinos? ( mpi )"
-
-RDEPEND="dev-libs/boost
-	app-arch/bzip2
-	sys-libs/zlib
-	adolc? ( sci-libs/adolc )
-	arpack? ( sci-libs/arpack[mpi=] )
-	assimp? ( media-libs/assimp )
-	cuda? ( dev-util/nvidia-cuda-sdk )
-	ginkgo? ( sci-libs/ginkgo )
-	gmsh? ( sci-libs/gmsh )
-	gsl? ( sci-libs/gsl:= )
-	hdf5? ( sci-libs/hdf5[mpi=] )
-	lapack? ( virtual/lapack )
-	metis? (
-		>=sci-libs/metis-5
-		mpi? ( >=sci-libs/parmetis-4 )
-	)
-	mpi? ( virtual/mpi )
-	muparser? ( dev-cpp/muParser )
-	nanoflann? ( sci-libs/nanoflann )
-	opencascade? ( sci-libs/opencascade:* )
-	p4est? ( sci-libs/p4est[mpi] )
-	petsc? ( sci-mathematics/petsc[mpi=] )
-	scalapack? ( sci-libs/scalapack )
-	slepc? ( sci-mathematics/slepc[mpi=] )
-	sparse? ( sci-libs/umfpack )
-	sundials? ( <sci-libs/sundials-4:= )
-	symengine? ( >=sci-libs/symengine-0.4:= )
-	tbb? ( dev-cpp/tbb )
-	trilinos? ( sci-libs/trilinos )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] dev-lang/perl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
-	"${FILESDIR}"/${PN}-9.2.0-fix-boost-include-file.patch
-)
-
-src_configure() {
-	# deal.II needs a custom build type:
-	local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
-
-	local mycmakeargs=(
-		-DDEAL_II_PACKAGE_VERSION="${PV}"
-		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
-		-DDEAL_II_ALLOW_AUTODETECTION=OFF
-		-DDEAL_II_ALLOW_BUNDLED=OFF
-		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
-		-DDEAL_II_COMPILE_EXAMPLES=OFF
-		-DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
-		-DDEAL_II_DOCREADME_RELDIR="share/doc/${P}"
-		-DDEAL_II_COMPILE_EXAMPLES=OFF
-		-DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples"
-		-DDEAL_II_LIBRARY_RELDIR="$(get_libdir)"
-		-DDEAL_II_SHARE_RELDIR="share/${PN}"
-		-DDEAL_II_WITH_ZLIB=ON
-		-DDEAL_II_WITH_ADOLC="$(usex adolc)"
-		-DDEAL_II_WITH_ASSIMP="$(usex assimp)"
-		-DDEAL_II_WITH_ARPACK="$(usex arpack)"
-		-DDEAL_II_WITH_CUDA="$(usex cuda)"
-		-DDEAL_II_WITH_GINKGO="$(usex ginkgo)"
-		-DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
-		-DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
-		-DDEAL_II_WITH_GMSH="$(usex gmsh)"
-		-DDEAL_II_WITH_GSL="$(usex gsl)"
-		-DDEAL_II_WITH_HDF5="$(usex hdf5)"
-		-DDEAL_II_WITH_LAPACK="$(usex lapack)"
-		-DDEAL_II_WITH_METIS="$(usex metis)"
-		-DDEAL_II_WITH_MPI="$(usex mpi)"
-		-DDEAL_II_WITH_MUPARSER="$(usex muparser)"
-		-DDEAL_II_WITH_NANOFLANN="$(usex nanoflann)"
-		-DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
-		-DDEAL_II_WITH_P4EST="$(usex p4est)"
-		-DDEAL_II_WITH_PETSC="$(usex petsc)"
-		-DDEAL_II_WITH_SCALAPACK="$(usex scalapack)"
-		-DDEAL_II_WITH_SLEPC="$(usex slepc)"
-		-DDEAL_II_WITH_SUNDIALS="$(usex sundials)"
-		-DDEAL_II_WITH_SYMENGINE="$(usex symengine)"
-		-DDEAL_II_WITH_UMFPACK="$(usex sparse)"
-		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
-		-DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
-		-DDEAL_II_WITH_THREADS="$(usex tbb)"
-		-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
-	)
-
-	# Do a little dance for purely cosmetic "QA" reasons.
-	use opencascade && mycmakeargs+=( -DOPENCASCADE_DIR="${CASROOT}" )
-
-	# Do a little dance for purely cosmetic "QA" reasons. The build system
-	# does query for the highest instruction set first and skips the other
-	# variables if a "higher" variant is set
-	if use cpu_flags_x86_avx512f; then
-		mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
-	elif use cpu_flags_x86_avx; then
-		mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
-	elif use cpu_flags_x86_avx; then
-		mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc && [[ ${PV} != *9999* ]]; then
-		# copy missing images to the build directory:
-		cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
-			"${BUILD_DIR}"/doc/doxygen/deal.II || die
-		# replace links:
-		sed -i \
-			's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
-			"${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
-	fi
-	cmake-utils_src_install
-
-	# decompress the installed example sources:
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch b/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch
deleted file mode 100644
index 9fc6365d01c7..000000000000
--- a/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9c1a580139f557433a226da437382b3f4307f7c8 Mon Sep 17 00:00:00 2001
-From: Luca Heltai <luca.heltai@sissa.it>
-Date: Wed, 30 Dec 2020 09:54:02 +0100
-Subject: [PATCH] Fix boost include file.
-
----
- source/fe/mapping.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/source/fe/mapping.cc b/source/fe/mapping.cc
-index 288a9debcb..4ef3ef7714 100644
---- a/source/fe/mapping.cc
-+++ b/source/fe/mapping.cc
-@@ -20,6 +20,8 @@
- 
- #include <deal.II/grid/tria.h>
- 
-+#include <boost/geometry.hpp>
-+
- DEAL_II_NAMESPACE_OPEN
- 
- 
--- 
-2.26.3
-
diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml
index cfcb25d9e502..6bb4348a7cda 100644
--- a/sci-libs/dealii/metadata.xml
+++ b/sci-libs/dealii/metadata.xml
@@ -28,12 +28,10 @@ and extra output. If you want to get meaningful backtraces see
 		<flag name="opencascade">Add support for opencascade (<pkg>sci-libs/opencascade</pkg>)</flag>
 		<flag name="p4est">Add support for p4est (<pkg>sci-libs/p4est</pkg>)</flag>
 		<flag name="petsc">Add support for petsc (<pkg>sci-mathematics/petsc</pkg>)</flag>
-		<flag name="nanoflann">Adds support for nanoflann (<pkg>sci-libs/nanoflann</pkg>)</flag>
 		<flag name="scalapack">Add support for ScaLAPACK (<pkg>sci-libs/scalapack</pkg>)</flag>
 		<flag name="slepc">Add support for slepc (<pkg>sci-mathematics/slepc</pkg>)</flag>
 		<flag name="sparse">Add support for suitesparse (<pkg>sci-libs/suitesparse</pkg>)</flag>
 		<flag name="symengine">Add support for symengine (<pkg>sci-libs/symengine</pkg>)</flag>
-		<flag name="tbb">Add threading support with the help of the tbb library (<pkg>dev-cpp/tbb</pkg>)</flag>
 		<flag name="trilinos">Add support for trilinos (<pkg>sci-libs/trilinos</pkg>)</flag>
 		<flag name="assimp">Add support for assimp (<pkg>media-libs/assimp</pkg>)</flag>
 		<flag name="cuda">Add support for cuda (<pkg>dev-util/nvidia-cuda-sdk</pkg>)</flag>
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 5782034ecb49..5fe2041e33cb 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -8,9 +8,11 @@ DIST gdal-3.2.2.tar.gz 18959415 BLAKE2B 001347ee12c72fe4d9cfa27adb427624f80e5b16
 DIST gdal-3.2.3.tar.gz 18970990 BLAKE2B 9f2ac15b7e9d2df0393d15734030ec4777579aa01fcf2700958228b24fd50d574f3bd438c03e767549614a699c362b31f38cbb0f32ceb8056c9b55fab11ecfec SHA512 985a058a53f676f7d49a96d1a48d4f93c5da8548012bf81345afde03d8044022b210484290bca70c3d7a1ef3b0087d9e17c636b5badd1e0816c1f59b1bf21ee8
 DIST gdal-3.3.0.tar.gz 19572446 BLAKE2B afc7ce3c2191fb7607fdf3a01e7ed3e83c601fa063019015f666e0c550e4e42129b8782568f20f97422308f95b4e5c3dbd2311d562b7ec0830635e47e7c931b4 SHA512 39505c07aaf4dac587a189a979462101a7acba41e8732031540ebad02e089820658943ebb48c20f4ea56548363033b2db2f03f41c8a91ff5c5997a19b5eb999e
 DIST gdal-3.3.1.tar.gz 19582883 BLAKE2B 328ba9f3c6a2ecca8583648e5f22469d3fbabf8d8676262a15c6debe718be8329ad3899cbe5397dff2896bc9c2500b60834c6a44cd0f5b670828d86838611f0d SHA512 0eb89502f1cebd5dd899fb8f20571952462c45aba6cee1d62ccc820b2fed5202f6c7e7096bd4ca6c0cfcc2de623f00295097a7e33da6ffa5624dcb8a7a0dc682
+DIST gdal-3.3.2.tar.gz 19593819 BLAKE2B ab0919468482d080be9317f7d766ac8b7bd7a534a490a93ee29cab9ea5c68bef3827a256a6d13455d5ee8f4e6cf71a8a42fb173d1543282b04dea59c9378cf22 SHA512 ceacd101f770fecad12fec7fea5ba63c2a6d96413bdaa7f460798704fce1ff7a4f20b0b4a0785c195131aa8ee25990239a9e2da6844010b8f0c575f584d9b4a8
 EBUILD gdal-3.2.1-r1.ebuild 7498 BLAKE2B 9b79a2d74a5bfec4c52c655ab1dc1778add39a315855b6507f3d11ae43056c5530735cc56dc23b65f24fd591291f446f56ad78932691356637832194013b8204 SHA512 aa7ec568bd7c061cfc0e37030912b5ac2e4121ecb331953f03bd58c135d10dcc7bf24ecaa0a77c4597a1813e1feb0ed589657eab22363d04ca15bd0009921612
 EBUILD gdal-3.2.2.ebuild 7723 BLAKE2B 1223e7a57447dc0e948abe14863417b3dc4fbd3154b8e6b34e1eb9fa1a0adc3f2e5cd26e60f0333a19a456907f270baeab5b5c971d47b3be63626c55fa1122dd SHA512 502b3419bd6b3046733036cbe23d5b6aa277c32539c2a8819cb6b6b8a907cffa91eff81cdb75dfe7dfb5465871be4b49db8c7e631520689677c351933bf2b606
 EBUILD gdal-3.2.3.ebuild 7728 BLAKE2B 781ae5b6c49720232778e17c4f8e814961d4d14d3694cef31f19ab2d2b775fe376459aadc5e2dbb0bafda3ab31e99d667ee2805401ca28af03cdc610c477ad59 SHA512 d615affabf2762783d899264863297b5bae4e10956bdbb297f4aa0102298babbae0ab9400c0cecae1fd017f36787ce29b70d357e8ee3d6b471216291fb60a904
 EBUILD gdal-3.3.0.ebuild 7695 BLAKE2B 5e8638c7baa7d50e7e87d9a845712171151bfd1d2a5a1cc4bb3e004f7ab58a50916ed4d88db363dff71058317ed81d14b552de685e091e7b198e645126190b33 SHA512 618f06c7f1ef77c55f0309d55ed7f93ce77daf36faccf4f6ab19559c4e2536c3d21ad31b063358efe8aa3ba4079e7dbccbb26adbe6f7908f6ba0d33e8588cb09
-EBUILD gdal-3.3.1.ebuild 7644 BLAKE2B be093150fd0555c837c3e17bd90bafac258a52f5519a456fe419ca9ad4108e997f525ed5f357da1ba051ebbf54b91f39552d778fdb32893603c2dc532c246159 SHA512 c9e4bddcde00af4d602d3734049900218d9a5fa0ba07d2a9b22b632bcf08b1b0d9743044bfe4a2d0947db290a48731be44bc7636b0b5eedbd07d9649ea39d606
+EBUILD gdal-3.3.1.ebuild 7639 BLAKE2B 652fd54f5831da35e2c1c72e2a4f426aa35e3f0ff229c86206f3b46837819c58906bb9430505ce43ef84bdd9574ce8ae51f8c17e03eb0608bc4777fd8dce5996 SHA512 50d16549833be758b5e25bb689ed9f4d45d52dbf8b581fd323f2c50f0e228552e8fffdc6440c9b78102cc567e448f2a63c60a56a706737e3b2b8ac2039fd9a90
+EBUILD gdal-3.3.2.ebuild 7647 BLAKE2B 00602160f8a545b48e2ef3b3b133ca9e45a30548ad08f2d4d8024ea6cfdceb88fe930bd13066650a6db6740472dc97acc31864a87647a21ca46e8a15d3de9097 SHA512 0c26ebc878673394b981412ef95b3676ee0d7575691967ad73788bd64f5dfdf731f229320a42d72ee06ee433cef6ae908f88e9b7088f3a9753fdfd75a51a5825
 MISC metadata.xml 1495 BLAKE2B 3d9f0cc3e5169eab7ff2c59b61d9fa5b4f8edf683f6e1447c40b1b0e8d81834e2d9fc13c68979c51a710f5aca5c9cd9a1f45a13c4e4ad0ded7a0fcdc1751d54b SHA512 cd0820bd5df06ccfb6315ab4586e49f72396115d08f318038dc3af2380a1896128ccf0ba46de0cc370546f7313907844907d6d75cc705a74bf4c78d0121afc3d
diff --git a/sci-libs/gdal/gdal-3.3.1.ebuild b/sci-libs/gdal/gdal-3.3.1.ebuild
index bfcf9b5a7392..6f1591907673 100644
--- a/sci-libs/gdal/gdal-3.3.1.ebuild
+++ b/sci-libs/gdal/gdal-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/3.3"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
diff --git a/sci-libs/gdal/gdal-3.3.2.ebuild b/sci-libs/gdal/gdal-3.3.2.ebuild
new file mode 100644
index 000000000000..5a7c010cdbfd
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.3.2.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_OPTIONAL=1
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/3.3"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+	mdb? ( java )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	java? (
+		dev-java/ant-core
+		dev-lang/swig:0
+		>=virtual/jdk-1.8:*
+	)
+	perl? ( dev-lang/swig:0 )
+	python? (
+		dev-lang/swig:0
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
+	media-libs/tiff
+	>=sci-libs/libgeotiff-1.5.1-r1:=
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-3.8.0 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+	jpeg? ( virtual/jpeg:0= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	mdb? ( dev-java/jackcess:1 )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( app-text/poppler:= )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.3-soname.patch"
+	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
+)
+
+src_prepare() {
+	default
+
+	# Drop a --prefix hack in the upstream build system
+	# We don't want the line at all, so let's just drop it rather than
+	# trying to put in the right libdir value.
+	# bug #696106
+	sed -e '/\$ADD_PREFIX\/lib/d' \
+		-i configure.ac || die
+
+	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+		-i configure.ac || die
+
+	sed -e 's:^ar:$(AR):g' \
+		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
+	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+		-i swig/python/GNUmakefile || die "sed python makefile failed"
+
+	# autoconf 2.70+
+	# bug #775209
+	config_rpath_update .
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# charls - not packaged in Gentoo ebuild repository
+		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+		# bsb - legal issues
+		# ingres - same story as oracle oci
+		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+		# podofo - we use poppler instead they are exclusive for each other
+		# tiff is a hard dep
+		--includedir="${EPREFIX}"/usr/include/${PN}
+		--disable-lto
+		--disable-static
+		--disable-driver-bsb
+		--disable-driver-mrf
+		--disable-pdf-plugin
+		--enable-shared
+		--enable-driver-grib
+		--with-bash-completion="$(get_bashcompdir)"
+		--with-cpp14
+		--with-crypto
+		--with-cryptopp=no
+		--with-expat
+		--with-geotiff
+		--with-gnm
+		--with-hide-internal-symbols
+		--with-libjson-c="${EPREFIX}"/usr
+		--with-libtiff
+		--with-libtool
+		--with-libz="${EPREFIX}"/usr
+		--without-charls
+		--without-dods-root
+		--without-ecw
+		--without-fgdb
+		--without-fme
+		--without-gta
+		--without-grass
+		--without-hdf4
+		--without-idb
+		--without-ingres
+		--without-jasper
+		--without-jp2lura
+		--without-jp2mrsid
+		--without-kakadu
+		--without-kea
+		--without-libkml
+		--without-mongocxx
+		--without-mrsid
+		--without-mrsid_lidar
+		--without-msg
+		--without-rasdaman
+		--without-rasterlite2
+		--without-pcraster
+		--without-pdfium
+		--without-perl
+		--without-podofo
+		--without-python
+		--without-qhull
+		--without-sfcgal
+		--without-sosi
+		--without-teigha
+		$(use_enable debug)
+		$(use_with armadillo)
+		$(use_with aux-xml pam)
+		$(use_with curl)
+		$(use_with cpu_flags_x86_avx avx)
+		$(use_with cpu_flags_x86_sse sse)
+		$(use_with cpu_flags_x86_ssse3 ssse3)
+		$(use_with fits cfitsio)
+		$(use_with geos)
+		$(use_with gif)
+		$(use_with gml xerces)
+		$(use_with hdf5)
+		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
+		$(use_with jpeg)
+		$(use_with jpeg2k openjpeg)
+		$(use_with lzma liblzma)
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
+		$(use_with netcdf)
+		$(use_with oracle oci)
+		$(use_with odbc)
+		$(use_with ogdi ogdi "${EPREFIX}"/usr)
+		$(use_with opencl)
+		$(use_with pdf poppler)
+		$(use_with png)
+		$(use_with postgres pg)
+		$(use_with spatialite)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+		$(use_with threads)
+		$(use_with webp)
+		$(use_with xls freexl)
+		$(use_with zstd)
+	)
+
+	tc-export AR RANLIB
+
+	if use java; then
+		myconf+=(
+			--with-java=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-lib=dlopen
+			$(use_with mdb)
+		)
+	else
+		myconf+=( --without-java --without-mdb )
+	fi
+
+	if use sqlite; then
+		append-libs -lsqlite3
+	fi
+
+	# bug #632660
+	if use ogdi; then
+		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		sed -e "s: -rdynamic : :" \
+			-i GDALmake.opt || die "sed LIBS failed"
+	fi
+}
+
+src_compile() {
+	if use perl; then
+		rm "${S}"/swig/perl/*_wrap.cpp || die
+		emake -C "${S}"/swig/perl generate
+	fi
+
+	# gdal-config needed before generating Python bindings
+	default
+
+	if use java; then
+		pushd "${S}"/swig/java > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null || die
+	fi
+
+	if use python; then
+		rm -f "${S}"/swig/python/*_wrap.cpp || die
+		emake -C "${S}"/swig/python generate
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+
+	use doc && emake docs
+}
+
+src_install() {
+	local DOCS=( NEWS )
+	use doc && local HTML_DOCS=( html/. )
+
+	default
+
+	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		myinst=( DESTDIR="${D}" )
+		perl-module_src_install
+		popd > /dev/null || die
+		perl_delete_localpod
+	fi
+
+	if use python; then
+		# Don't clash with gdal's docs
+		unset DOCS HTML_DOCS
+
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		newdoc swig/python/README.rst README-python.rst
+	fi
+
+	doman "${S}"/man/man*/*
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 414b70346f5b..d6dcd60cabbc 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,10 +1,4 @@
 AUX indilib-1.9.1-fix-include.patch 732 BLAKE2B e34651a2b03e71fd5da51432fb9d3eee4523f7b0fce5322a732d462448181c3a0f134261bf66110a9456117bd7fbbf7b2228987b78843033d6f8524b141dcf13 SHA512 e31be023ccc34a4437728b73569c7599b1bd43b9e86f1c886f95884e722cdf1b8a5cb263c6934ddeb172b92cecd122d7cf7e1a59137476dd16ee31e0790cd0bd
-DIST indilib-1.8.8.tar.gz 2234987 BLAKE2B 542c77e1826002e6268be82048014cdd7db2e58d6860bf21e058775acccbca49091218c24d5910f91705aebcf592e21f9008d780f39bb0458115b073319e3949 SHA512 0598b117fa582daaaf7c71524fd40866a37fcdc47b523b2ee1ed3301701c7351b027a3aab794e2e1405aec7293ecc6705d5f7852bb472cd21f40d7e3d7733d1d
-DIST indilib-1.8.9.tar.gz 2253721 BLAKE2B 477880606867ef58e334efeb8d891996187833cdb2f6344018a47c36ad51cfe983e645d92be3e868246bc8dd730d51927834ad73efb2db5edb2ce238ae6d32f6 SHA512 7d561e3619a1ff9e4ec96c54d339f5a85b6d2f4adde57630044fa7f2a8d70c74488ab22eb6221de62c0738bb9c9d187b86b67c4e47f4f98a237d4f69731fe906
-DIST indilib-1.9.0.tar.gz 2291283 BLAKE2B 1ef715cfb388a686ad2121e1fcf2589a5d88e68e5cbdb11d72797dead63032782c32e9ae16a88304e59bb0cbb53aaefb6b919125b566958884cc252607c876d5 SHA512 7b02afb24bb2b71a7384c045af6654bb1e19f9b0fe525b31ad0ff3ecc5f1c4b9d53e4f9af225ae3845bd17d44cb7cb2274a72e331498828a2098a9984488b28e
 DIST indilib-1.9.1.tar.gz 2322783 BLAKE2B 801071bf9190e4c27b4f3bf9fa2d9a44c4e297f7ee879061636f041d138a02db23525ee411782f3303a0d82bb2fc4d9d6489e2bda18f8e011bfa0d1b33595343 SHA512 d87c341efdaa8109059741738c69b9d6fb4b5dc68c774453eab378aa3784af29e8ed8469dba968a41c584fec1556fdbf0bd65cbb8aa65c2d9e1784d82e7bcc67
-EBUILD indilib-1.8.8.ebuild 1188 BLAKE2B 5afef4724dc43ac28d5f3d0c3449dd48c2caec78a1dfdda6dc1e27f32b014a542d965a17c0cd872fc3bb01b5baf3df41665a8a356f923cf50de608c052dddec7 SHA512 744705826bf3d864f6e847fe80839e0c5aba5ec075c64d5a0995f0e6241c88bb0b37131df0ec4272a3a0ee50bef2cb6fe771fc1e802e778d1dca1ec39becfa38
-EBUILD indilib-1.8.9.ebuild 1189 BLAKE2B 60b9a949b599b8a1a9772355a68d9257501a85eb1d6155e95afc0c7766ad13564e77e669f6341377674c0b5cd5886649e402944dedee06fe975642132a48add3 SHA512 96428f3be5dafea90c4ce14da7dae749c6124bd3824500928f3f25c89c4c26dd054b07e3536f9db30140d7a539775148f7fa9da739b0ff4c2da5fa22651cdc68
-EBUILD indilib-1.9.0.ebuild 1191 BLAKE2B 1047b62c8a546e70dd5fe645eebaf6f5c5615d9beed2d9d406197f731ebd13d72b1047ace29f3988d3ea097e561b1b52d718f33b33dde4ecf97c49c07ba3faf1 SHA512 388fb2ff99e874e029fa999f934459c156d821738f3d3c4327429b7604121d50a06276dc768bc0c2d1e770132cf665f35003d2923f6adb828f2e821ff2332e05
-EBUILD indilib-1.9.1-r1.ebuild 1333 BLAKE2B 336899d9f2357e3ed1b021b6e53b259ba2c44647d89760c4c99f7af3f83e5498341147519f98181baa8db24b1a480bcfa7e00ceaa429d0de0a783a1f30d3e0c1 SHA512 a0e9e8ff4290994004e577d77dd5e77f2b02717cd9de435810b8f588fcc3700907b4996d0373d42d021bdfc1d0bf79be1d2bdbab5b2eeb92a826be5678cd5434
+EBUILD indilib-1.9.1-r1.ebuild 1330 BLAKE2B 43a126b0ef9d3ac40f7a2f3098586956d1df58501c5e4b7d67cb5006752f28b8d7c1ce7521ab51c53d47da54da329e44be020b8ba623a691ac67c4395fe2de78 SHA512 33a020e215980d154276b1382d4559fccc5e2e0ffa7a8924fb780c8d674aafbb07186c5fcc92c2a4189fe734a55680fc209278623c3318a161b8a5a46ec2ec55
 MISC metadata.xml 561 BLAKE2B 08059ed028ee0f961a58fe6e8ba141160437cee5e944bc72ad82a5731b0f187cd412ea2669a2d726d7c602a0dc8c659a79672f0e3786f502db22754076498854 SHA512 c0f2d64008a0ea23319101a2ca7e928940c81a6959544410476f80482cc560e42c991228ec96a1f8eab7d333f22a8853a40162228953a6dad6e5cdb67e8f3d7b
diff --git a/sci-libs/indilib/indilib-1.8.8.ebuild b/sci-libs/indilib/indilib-1.8.8.ebuild
deleted file mode 100644
index 7aa68380cdef..000000000000
--- a/sci-libs/indilib/indilib-1.8.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ogg test websocket"
-
-RDEPEND="
-	net-misc/curl
-	sci-libs/cfitsio:=
-	sci-libs/fftw:3.0=
-	sci-libs/gsl:=
-	sci-libs/libnova:=
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libusb:0
-	ogg? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-	websocket? ( dev-libs/boost:= )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-kernel/linux-headers )
-	test? ( >=dev-cpp/gtest-1.8.0 )
-	websocket? ( dev-cpp/websocketpp )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P/lib/}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINDI_BUILD_QT5_CLIENT=OFF
-		-DINDI_BUILD_UNITTESTS=$(usex test)
-		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
-		$(cmake_use_find_package ogg OggTheora)
-		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
-}
diff --git a/sci-libs/indilib/indilib-1.8.9.ebuild b/sci-libs/indilib/indilib-1.8.9.ebuild
deleted file mode 100644
index dd34c66f11c9..000000000000
--- a/sci-libs/indilib/indilib-1.8.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE="ogg test websocket"
-
-RDEPEND="
-	net-misc/curl
-	sci-libs/cfitsio:=
-	sci-libs/fftw:3.0=
-	sci-libs/gsl:=
-	sci-libs/libnova:=
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libusb:0
-	ogg? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-	websocket? ( dev-libs/boost:= )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-kernel/linux-headers )
-	test? ( >=dev-cpp/gtest-1.8.0 )
-	websocket? ( dev-cpp/websocketpp )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P/lib/}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINDI_BUILD_QT5_CLIENT=OFF
-		-DINDI_BUILD_UNITTESTS=$(usex test)
-		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
-		$(cmake_use_find_package ogg OggTheora)
-		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
-}
diff --git a/sci-libs/indilib/indilib-1.9.0.ebuild b/sci-libs/indilib/indilib-1.9.0.ebuild
deleted file mode 100644
index d133f7e42252..000000000000
--- a/sci-libs/indilib/indilib-1.9.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE="ogg test websocket"
-
-RDEPEND="
-	net-misc/curl
-	sci-libs/cfitsio:=
-	sci-libs/fftw:3.0=
-	sci-libs/gsl:=
-	sci-libs/libnova:=
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libusb:0
-	ogg? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-	websocket? ( dev-libs/boost:= )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-kernel/linux-headers )
-	test? ( >=dev-cpp/gtest-1.8.0 )
-	websocket? ( dev-cpp/websocketpp )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P/lib/}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINDI_BUILD_QT5_CLIENT=OFF
-		-DINDI_BUILD_UNITTESTS=$(usex test)
-		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
-		$(cmake_use_find_package ogg OggTheora)
-		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
-}
diff --git a/sci-libs/indilib/indilib-1.9.1-r1.ebuild b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
index be99265cb352..15d77f70204d 100644
--- a/sci-libs/indilib/indilib-1.9.1-r1.ebuild
+++ b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}"
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="ogg rtlsdr test websocket"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/mumps/Manifest b/sci-libs/mumps/Manifest
index c55aaaa1b224..28d31afc8af3 100644
--- a/sci-libs/mumps/Manifest
+++ b/sci-libs/mumps/Manifest
@@ -1,3 +1,3 @@
 DIST MUMPS_5.3.5.tar.gz 3940501 BLAKE2B f1767483bb23744a2c5ed11b0823c5b023377d5212abbe29a177cce5b5e51e6f2f391d7caa17022646e36c9e4b4fb4af80b03ac6cf8e89f37502ed960138bbbe SHA512 6e3bb081f38af8540ada7b4fb54c6e766739c854e2a3dd253e3e012eee05dae30064b1b4a8d7493f10691725aba4cc9e80544b0fe5b71670cb0b2726ccfc4439
-EBUILD mumps-5.3.5.ebuild 5709 BLAKE2B 9fdfaad7401159ab5213ed0ea8ce0808d27abebd624b16389796f3a1d64f079744862b0ab16884f58cc87b39da7b95909aa3ff76ff241ccb3f81d33b84fa7fb0 SHA512 09a8bbe8322a2112b591dcc5f7c5fe9dd49b9fc06c71cfed3d84e72d733dbb56b844ae202347d5c389c226b4cbe1a5d66f61323ea36f626cb6e50827c40b740f
+EBUILD mumps-5.3.5-r1.ebuild 5882 BLAKE2B 9de181284c5a7e2a4fa35600d12467855ffc94911ab497bf2c5a7fd0eba5e16a2084dbc213554a548a23363bbf411d878984c7dd47cb665c55f833851a821b5d SHA512 ed308d05f42813049013df2327e56b4838e51d1b27b54f7f34a9e334a93d53864723eb63488359fdb8feddc783aa1ddf2277d8306d737e66f378c4b166c7a29f
 MISC metadata.xml 864 BLAKE2B 78db103b861071cbad317a65db2bb1c7eafc6c3936728cf3854ea05e92210abbf552e01dcbc974dc5238fc1a432ad7ff48fab3d662ea6081ff70fd86263ac11b SHA512 c285d7ed4bd26bb603f40f9d5e4e7262aea8a2679d14f65a4f8959a9bf2c622310422790e6221708fa227cd2c3bb2f4ba140eb5f23acc71b3f1ca20c04c4711a
diff --git a/sci-libs/mumps/mumps-5.3.5.ebuild b/sci-libs/mumps/mumps-5.3.5-r1.ebuild
index 76f2dbe8d4d0..8f970661e820 100644
--- a/sci-libs/mumps/mumps-5.3.5.ebuild
+++ b/sci-libs/mumps/mumps-5.3.5-r1.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 		mpi? ( >=sci-libs/parmetis-4 )
 	)
 	mpi? ( sci-libs/scalapack )
+	!mpi? ( virtual/lapack )
 	scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] )
 "
 DEPEND="${RDEPEND}"
@@ -83,6 +84,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# We abuse LIBADD here to work around the fact that MUMPS is criminally
+	# underlinked.
 	LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord"
 	local ord="-Dpord"
 
@@ -132,6 +135,7 @@ src_configure() {
 			-e "s;^\(SCALAP\s*=\).*;\1;" \
 			-e 's;^LIBSEQNEEDED =;LIBSEQNEEDED = libseqneeded;g' \
 			Makefile.inc || die
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs lapack)"
 		export LINK="$(tc-getFC)"
 	fi
 	sed -i -e "s;^\s*\(ORDERINGSF\s*=\).*;\1 ${ord};" Makefile.inc || die
diff --git a/sci-libs/netcdf-cxx/Manifest b/sci-libs/netcdf-cxx/Manifest
index aee2c1cf5f81..f73f00dfd384 100644
--- a/sci-libs/netcdf-cxx/Manifest
+++ b/sci-libs/netcdf-cxx/Manifest
@@ -1,7 +1,8 @@
+AUX netcdf-cxx-4.3.1-slibtool.patch 1500 BLAKE2B 6cd24e0a48c27c4c5a474acb671f98c0e4357f7dc548b03939aec95fa1cfba997b3a933524ec75939c965bc62649f10866ac100993f86f39158a4868632135a8 SHA512 c26b4dd6bb7f4d8365fbe3f1bd0940443e2b10b13c64e70cb3960e092527662c8288f4122e268b26aee36169e8e53095b7b0bd89bf21e882006db545df13dd93
 DIST netcdf-cxx-4.2.tar.gz 703482 BLAKE2B a6727b7305204d2b53e6ee951c8165b03cd07f14e5d59a306445481272d0e10eb077e4bc62a2586c57652cb8273b9098ed77836f9023817d8a9e6ef51ac2cfe8 SHA512 347ddbc518ac2186868d69417342e5146e285fc3a88f7c55edc33063f5c9a6647af7e512a03b9b6a8f67a448b85a1edcdde5df707b893f6a1527821cfd78e643
 DIST netcdf-cxx-4.3.0.tar.gz 985897 BLAKE2B 89cfd85764ff8fc730c7cb4187df21a4245cd932bcf86df4edf36eb7ae636906eaafc25cfcbb3dd58bc1d346edacd7f80daa3be9a544d5d777d32ad115cfd00f SHA512 8e77333c979513721209e6b3fde31c298e18a45d7ea08123056e8120469eb8c4024d71289fab2b9182ee19ee7b6ad22bd133525bef048a497ede4aa2e9017465
 DIST netcdf-cxx-4.3.1.tar.gz 607679 BLAKE2B 68677ba72e66d351bf6d33a2584a3a1edd9da98b41ed66e3f51f8d3d358bfd84bad3e2e06403edf76d26b2c76807ae40859995d8817725e531a27680d04f2501 SHA512 404711eb80d5e78968c0f6cbdcb08855a2778d7fd94e7ee94bdc9d1cd72848ac3327613c6437a7634349f26bc463b950092a2999abb34ddab0a47ad185547d22
 EBUILD netcdf-cxx-4.2-r301.ebuild 601 BLAKE2B 1f34dc4d3e47669081a647df6da7474f5e1f37d3a67287ddf9470b6b2b729588b4dcb4acd753b0a1750cf69f1283b8d774a553e029c429a36576a42280b7a6bc SHA512 16973d6fab5e25df249f6b737e10834acd1424d2c197bd0c96deb56f388d015e8545f77c3f273c9c076a74137a2b6cfad3ab0cafc0f8052213a2347ce0d15805
 EBUILD netcdf-cxx-4.3.0.ebuild 645 BLAKE2B 92c277b2e7407e5a1bad17ee753899dadb922cea93e88a89c7938d8314c1434a267d2e2e032475260f508658462e0b9cf6233352d18e2ccb32ce6ea4b2220652 SHA512 ba13805248e038ee1932ca78c8abd99fcf3ccf6ce8cd8882fb1174f7edbb3a7286c45b3dbe396ee9971a61a39c80b9ecfa2297331a0833e71db7397bb5e0ed85
-EBUILD netcdf-cxx-4.3.1.ebuild 707 BLAKE2B 148dc629c11968093a5eb2c031a799a6d3fa9a1280dc876a8540559fdd3e6d6837e44e24caa1f9267662e7a2641ec36e156d3197a4b5d276b89a3176a2d4e34f SHA512 99857c323634f08beec46c551d9cda5f05f2e3bf7dec56745e1cc911c21374598e179ddb16ea2b98dbd7b277499163cd5f00cfdc10b2d3051c9b784c4cadbcbf
+EBUILD netcdf-cxx-4.3.1.ebuild 755 BLAKE2B fb497c0ffc15f795d2685819b5f6b93c1098502070e483d6de3482497ed4cd66275f7de323a8ec7a5a2e3cb81b44c24e06e327cfc4505ebe501dbecd4797bb66 SHA512 551957e18d605656d4e00cd31a7ec8437572c7041726340667d23981a60f4bce0031d9674e8dd5a848584916be0ff7ef44e15ff7d508043295943d995a235436
 MISC metadata.xml 838 BLAKE2B 7dfb894eff8881120e319f30baf54c41a04a1822f5d7c4db5a90cae56cdd89914ef938c1ad39601d3573d06b419c93d50efe8e563c002473c4a0b3c4f079d426 SHA512 7db14bcbc67509b05f00dcd0e0ee33281ad1d77e566c1de0362058d0fb7c3d2b82430377fb5df4bb09c3e0b9c3fee0d8ddbd9861a24e4b13e70b1151acb26c5b
diff --git a/sci-libs/netcdf-cxx/files/netcdf-cxx-4.3.1-slibtool.patch b/sci-libs/netcdf-cxx/files/netcdf-cxx-4.3.1-slibtool.patch
new file mode 100644
index 000000000000..72db4dbd2c76
--- /dev/null
+++ b/sci-libs/netcdf-cxx/files/netcdf-cxx-4.3.1-slibtool.patch
@@ -0,0 +1,42 @@
+https://github.com/Unidata/netcdf-cxx4/pull/103
+https://bugs.gentoo.org/778200
+
+From: orbea <orbea@riseup.net>
+Date: Thu, 25 Mar 2021 12:24:57 -0700
+Subject: [PATCH 1/2] cxx4: Move -lnetcdf to LIBADD so its used.
+
+--- a/cxx4/Makefile.am
++++ b/cxx4/Makefile.am
+@@ -3,15 +3,13 @@
+ 
+ # This file builds the new C++-4 interface.
+ 
+-# Point pre-preprocessor to netcdf-4 directory (libsrc4).
+-LDADD = $(top_builddir)/cxx4/libnetcdf_c++4.la  -lnetcdf
+-
+ # This is our output library.
+ lib_LTLIBRARIES = libnetcdf_c++4.la
+ 
+ # For rules updating the version info, see
+ # http://www.gnu.org/s/libtool/manual/html_node/Updating-version-info.html
+ libnetcdf_c__4_la_LDFLAGS = -version-info 2:0:1 -no-undefined
++libnetcdf_c__4_la_LIBADD = -lnetcdf
+ 
+ # These headers will be installed in the users header directory.
+ include_HEADERS = netcdf ncAtt.h ncCheck.h ncDim.h ncException.h	\
+
+From a6dd5eb862d9a845b8458591b957b07c527e0d20 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Thu, 25 Mar 2021 12:25:33 -0700
+Subject: [PATCH 2/2] plugins: Add a missing -lhdf5 linker flag.
+
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -20,6 +20,7 @@ lib_LTLIBRARIES = libh5bzip2.la
+ 
+ libh5bzip2_la_SOURCES = ${HDF5PLUGINSRC}
+ libh5bzip2_la_LDFLAGS = -module -avoid-version -shared -export-dynamic -no-undefined
++libh5bzip2_la_LIBADD = -lhdf5
+ 
+ libmisc_la_SOURCES = H5Zmisc.c H5Zutil.c h5misc.h
+ libmisc_la_LDFLAGS = -module -avoid-version -shared -export-dynamic -no-undefined -rpath ${abs_builddir}
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
index 31c7a79c7e93..11abdd911ef6 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
@@ -20,6 +20,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYP}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-slibtool.patch
+)
+
 src_configure() {
 	econf --disable-static
 }
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 6c717e4aa917..bdd268579dd0 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -2,9 +2,12 @@ AUX proj-8.1.0-test_factory-include.patch 844 BLAKE2B 612046cbc170c16362ffc4a43f
 DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
 DIST proj-8.0.1.tar.gz 5731452 BLAKE2B d2235f87bead1ec35f62b99e5236d1b6dc1a8f924555d21dec7f5e07b3d341b4b4e797dd5a3843e87d12db392716ec9bb5acae871fa2bb7a78c3404fa9487875 SHA512 cb5550a9fbccfc680bebb3b8c5ad347d53c38cb526edf4dcaa3af0eff57410b4d4d028e246954c4202a1d637e1e6f4e7a6a33e8741e8aa0a58bdfc8a5dbc68c9
 DIST proj-8.1.0.tar.gz 5786723 BLAKE2B 8960ae70beda502442548542173e3f21705c8213ba5b7b3004beca67aa16b7401db4b9778ea4abd910eae3e224b7efc73e0d67b83a3d75aaab0fead51977c9ba SHA512 0c11d43bcdf97fbb3be9238c77cc111ae6df7948dc5076b1a31350c84a60299964ea1a320edfbee0568a2d9d3c7f80eafa6322adfdf99aea5f06172d7ee53a2f
+DIST proj-8.1.1.tar.gz 5797853 BLAKE2B 5ff7640a4727db836b4ed00b36ba914b7f27e0890629dfa9c0cb477c00b74a43b6312ae45bd9fffe75e945689575def021a891110cb43dfaa2dff03624f479c2 SHA512 1f18ad83bae40c6c910900a062bd41c331838add6eebb7e83b4784e4e06fbf48706cee24aadbefe0f138f081ecc02e93a2b6fd45a84806e1372bf2997dafa852
+DIST proj-data-1.7.tar.gz 585899744 BLAKE2B 4d5c81ed64a1ee20b8bd7abf0426ced747e9050d8d7548815365d35884dd3952252a716df9d38986e4bb2e450436df206ce7b51dca77ee35a681e4028b11a54f SHA512 03865e972cc5898b3995582e5a5b8d129609b89ef9a077fa775aaf0b2f4a6002605cd657443840d83ffd5f56233d7d248e3442f7d0efdddfd0f90f2959831310
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
 EBUILD proj-7.2.1.ebuild 1215 BLAKE2B 26a84ff93fefa9b88ab8017fa58da6ec89f037beb788bb11e3302bcf38ae578a846416ef23094b9a32ca8be447ee4e3a0d865f66db7c97cb30499930c48237b0 SHA512 b854fcbb1879b5bc161a06f853a5705c32705539bc0a3572d8b9df38cb7707e201e075e148e48534768dbacd550ebfa3ab836dbb387fa15e630e86e740e87a33
 EBUILD proj-8.0.1.ebuild 1431 BLAKE2B 17e47bd41495796fb1d2c4017fc5ffd074e04dc35acc0e8884aadb157247b91bb4a5efb076fd3c96c3310c4066571afbf385ab73a0b0ee596d22017bfd42ce4d SHA512 fd310ac894ddaac7298bfba6c0308ff6ec496e264b25f584d1024f31ed140af2f25025731779b811b0be7cc3fe26183f17de8fe9ba088a889f57a3e66f66a9a6
 EBUILD proj-8.1.0-r1.ebuild 1498 BLAKE2B fbbdb247cd29bf471e0ba6e2a5fe6b7e171c31e626ba2718e05ed2154643719d239cf4e2e20539134c45c31cfebff26b5bea98d88ce707a61fa30e4cefd08eed SHA512 d3578c54ee71ab99f6994df2aebdbe8b7f33284160ff14a684f7582a6fc9b1008a4ba77a6e04a3ab54c5648d93ae2d243c434bfeda26068d8cc39aab12d0996b
+EBUILD proj-8.1.1.ebuild 1298 BLAKE2B 2880810174ab266045211695a1af20a32289675766f0557eeef14d63a153c1dd3748ff0fb458b5965928507e6182d8e6a7ce077a236e315b9b4dbbafd0fd49cc SHA512 d0bc55182ee6c3f83fd5d1c97a53d80d864eeabdc018862cfbaa18db7bec2eef75b24965120cdbacf4c3ab9ebc8a05868c86fc4cfad152622c16f50bfd9963b4
 MISC metadata.xml 449 BLAKE2B e29aeb78ff28d336ffbe19913702d656299183b1657c09deaf12f3f8c263867e9facbef4ee626f78e667f3f6ad5cebb0c490e84247fe784bc3fbf68c5418692e SHA512 a1b14653a4388d42e3e08ddabd3734e5987bf41092dd699788ed1a4b8819da831f602b48dd3ad64dbb9fc1bbc0005623456744a6b5a3fcd3313d844bf3bc6886
diff --git a/sci-libs/proj/proj-8.1.1.ebuild b/sci-libs/proj/proj-8.1.1.ebuild
new file mode 100644
index 000000000000..7c632133dcfb
--- /dev/null
+++ b/sci-libs/proj/proj-8.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+PROJ_DATA="proj-data-1.7.tar.gz"
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj.org/"
+SRC_URI="
+	https://download.osgeo.org/proj/${P}.tar.gz
+	https://download.osgeo.org/proj/${PROJ_DATA}
+"
+
+LICENSE="MIT"
+# SONAME in 8.1.1 is actually 23 (in 8.1.0, was 22)
+# It's far less confusing to just increment it again here (so N+1)
+SLOT="0/24"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="curl test +tiff"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+	curl? ( net-misc/curl )
+	tiff? ( media-libs/tiff )"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd "${S}"/data || die
+	mv README README.DATA || die
+
+	unpack ${PROJ_DATA}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOCDIR="${EPREFIX}"/usr/share/${PF}
+		-DBUILD_TESTING=$(usex test)
+		-DENABLE_CURL=$(usex curl)
+		-DBUILD_PROJSYNC=$(usex curl)
+		-DENABLE_TIFF=$(usex tiff)
+	)
+
+	use test && mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	cd data || die
+	dodoc README.DATA
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest
index 9a691e791d4a..f99602106634 100644
--- a/sci-libs/stellarsolver/Manifest
+++ b/sci-libs/stellarsolver/Manifest
@@ -1,3 +1,5 @@
 DIST stellarsolver-1.5.tar.gz 9113711 BLAKE2B 3fe4489df71bbfa4d75f02a8a0ea26202165a7fe321b626fedceccce52122502be0040a47347abdd4e52b3c3402451f10d79b8258db53d6da029bd20dd02c279 SHA512 eb1d8b8b94a4a4d165b49cd55ffef5e0ae32e7da1bb6b3e061421ba1a5a27ec30438b789c5c56bad22b512de9bf091aeb24b991c9a146cc852b22a9ca97cf3ce
+DIST stellarsolver-1.8.tar.gz 9117094 BLAKE2B fbfb08e1225c4285b5ce6f88372c1076fcfa622f63b093ffb0261e81c14f6901788b5bc6d6246008024df3a5ad7a96c07908633fa42453df5f57eeae4b1ada8d SHA512 08aa0647507874c9dfe032c10f7e583a54ca18302bc92731147875100c3f0903e03083ee71af851b2497898211ff8903477dfb56e61360a792a388d14d226db1
 EBUILD stellarsolver-1.5.ebuild 604 BLAKE2B 204afb23c920a8dc249ba0430422fe56f472704bd805d166ad1a36420a858d035de9107dc37da10ec8608e352020f28bff7171ac478469cf7b13b4b68f9abce8 SHA512 cdccdd3a8112c43fb3110ce69099205ee5a729111a4fe4c1a01973296c59b9b5c7a03dd2cd5858d190c288dd8904ea8f378fecfb05bc02fb1f36974078614d22
+EBUILD stellarsolver-1.8.ebuild 606 BLAKE2B b2482938a190e2479bd0f689b247036e11fe0576ff2cb3b593244ec791ff41e95aa8be1e987fbc42e29e9b1db04a3a26d3e5bd4ac95f4707399369850848c091 SHA512 679eab652ee1646ec71ee2a6b2601f233d6495f57e78222354916a9f5c7215b0ffb4e51e029fb00d04fabc6ec002b8428dd3a81d01c4186f63177a004077db57
 MISC metadata.xml 463 BLAKE2B 8dd851c4028e50249e1a8cc248cda30667219515ae3eff692bdf60accfdd410072e06f112567592534628b4c27a228e2ff609324a2fb8b0f249eb9d27bbdfca5 SHA512 1214fa61273b29819b5746c2076230ce71c994621a8a0e195afcf72f4f7f60e945978f3ad123a3282c593ca1202435ea606fe06a7c20a8775500e13b95de4634
diff --git a/sci-libs/stellarsolver/stellarsolver-1.8.ebuild b/sci-libs/stellarsolver/stellarsolver-1.8.ebuild
new file mode 100644
index 000000000000..21d2375cc427
--- /dev/null
+++ b/sci-libs/stellarsolver/stellarsolver-1.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Cross-platform Sextractor and Astrometry.net-Based internal astrometric solver"
+HOMEPAGE="https://github.com/rlancaste/stellarsolver"
+SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sci-libs/cfitsio:=
+	sci-libs/gsl:=
+	sci-astronomy/wcslib:=
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 16ad699f7a9e..a4705521b308 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -17,5 +17,5 @@ DIST VTKLargeData-9.0.3.tar.gz 247523270 BLAKE2B f4011292957454da5d8c9e515bcd097
 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
 DIST vtkDocHtml-9.0.3.tar.gz 132650096 BLAKE2B 45fc1a6942df3e79e500a552c3b3cda2099b9451191559d471e3a2e785a8c52b2c6273cfd2cc4a3f3f65582e607d9414475f58d243fde96a4f985bed479e53db SHA512 9b5fef43f3c2b92aa1fe6a9ba9458d6677874b09b167654db7f26df6feffdc34ed1a8fb4e59d64b75625063a774af77fe57f275903602a5f7daa74e1a2e71800
 EBUILD vtk-8.2.0-r4.ebuild 10333 BLAKE2B 834bac0a4f2a2ebb770a67b62dab0240c45588ddebf5939e4e0557441750c8a83cb76ecee02a3841673e2749ffd628ea8e611f9327c214c01a95eeb5dd23fd75 SHA512 26c1bf583d835717950cd0f5842eb358ed31728484c906b9122e5cb72b72f0255f73f6a52974d098eebe2af6af9a72aa4b369148cf47d1ca994ebd6dfcd3f68a
-EBUILD vtk-9.0.3.ebuild 14489 BLAKE2B 959b7accc51be3a2b8b6995fc1bf7c0a700c754270bd99764cc0540bb669f2ce62d0226a4db4a0b973381834aa01651e1d838074534c39e2582be8384c8f94c4 SHA512 b83b1fdce20db83441959c16ac2d777c718880c5844a67a4b1ffc1d6b2d91b66ce53a149054292b5f8423fc5f999e04e1a54ddc1bde91598b45e229d815608ef
+EBUILD vtk-9.0.3.ebuild 14283 BLAKE2B 484ba28b3e2d882e5d43f90b059ee01615ecc336191c22a91c1671dcbb59306f4a09d00e282aa450b78802bbd74e18aaa7e9da6ff4c6245cec1971ee7ffe5f56 SHA512 729e598a695b87e52d1e5c219a67982a6ff2a6a0d88c4165771f6126d5cd1b04e4a222b8acfb1625c10dc8d36a8a8ce162e42f0081c807c6aa6211565970e0cc
 MISC metadata.xml 1404 BLAKE2B d55945785c3e374227585ec5adb6cf9ad652c111cf4de2572179ea7f88df21b281bd02f841f9acdea72e034e4504cfe204833c44a265690ef4966bcf574bc0d0 SHA512 1d15b7c59d735c84915288dec1166ab9e48cfbe42d050bb4cc74e6c878a54c1e31da0e7edca5ffcbcb7d50de77d849b3df6ff68e07495e1c549217f87b0708c1
diff --git a/sci-libs/vtk/vtk-9.0.3.ebuild b/sci-libs/vtk/vtk-9.0.3.ebuild
index df3fa636198a..b6d4fdcea024 100644
--- a/sci-libs/vtk/vtk-9.0.3.ebuild
+++ b/sci-libs/vtk/vtk-9.0.3.ebuild
@@ -195,15 +195,6 @@ src_prepare() {
 			-i Utilities/Doxygen/CMakeLists.txt || die
 	fi
 
-	if use test; then
-		if use java; then
-			eapply "${FILESDIR}/${P}-0004-disable-failing-java-test.patch"
-		fi
-		if use examples; then
-			eapply "${FILESDIR}/${P}-0005-disable-failing-tests.patch"
-		fi
-	fi
-
 	cmake_src_prepare
 
 	if use cuda; then