gentoo resync : 03.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
commit: d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree: cf61513204d97974179580065e85df5c8009087c /sci-libs
parent: 463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
223 files changed, 1363 insertions, 5944 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index d6547e35b24e..9a2bd870a042 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index edd962ba78d5..26d03a9cf5e4 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,7 +1,3 @@
 DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
-DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c
-DIST armadillo-9.850.1.tar.xz 4715832 BLAKE2B 41256d8f54ec1f2d4f7cfdf58bd67e66cc2ffbe0f1daf259a4d76e0816d89708fa5528d57b244000393404108c8d0d613d03321f14e5653163d0c1cc6ec7e273 SHA512 b2b9f0290f8f39a687db71a02b127086d5ff22cee77fba5211da2ea8a8d8a5edc256b31b7fce8e98aa1955a84c63e488adcd22f8cd070015a6fcd4b4f1cb37c7
-EBUILD armadillo-10.2.0.ebuild 3514 BLAKE2B 8fcf3eeb1c06d0d4c9cdf64dcd0856a48c320c84b001d3813cb0c54a488eefba3ab2efb57173e3101a267c09d331faef0b9d34a25c1b0faee2706affd3e3fd01 SHA512 dccc8e0116de10becb4a5776b4d4227f72f80261b3ba4c1d24e9e0d84a8d8ec04a9cc561782f2fe6a60d8e84b2481f62e16e56af813d5f0b563ed50e53232ef5
-EBUILD armadillo-8.300.2.ebuild 3400 BLAKE2B 477f6db643c60d915b556574868181bf6b5613c0c6f99ac42f31440aa6ade6447e82f7e241103cfdc6a848223d6dd5dcd170dabecd429535ab7724fec68d6eaf SHA512 096f51d270472bbed4ebcce4bf899644966d31154ce18eacc8c77d70afd6e9ad31d8e02435a0e7413005dfb1a2a844f402169c1cf4457b98ba0d760daa763d37
-EBUILD armadillo-9.850.1.ebuild 3536 BLAKE2B 125f7f318e388cd5036b5c54e3833e30ee18a2d0fa5a41655e01091e09c635a7fc5866bb2af838bd8acf65b000474d609d285f5fd16a6b65ab7d62ae70199974 SHA512 14c2e7c284bf97801f633098efdcf49f711ce71315c7e7af2ee113ee8e5eea4d5412ba5318309abf3d62dd0a7203ed774de05fac60d2f49ade488e28937b5d7c
-MISC metadata.xml 1537 BLAKE2B 5116cb259f8e27fb11430cc2b3ab3a351afcefa0734e7997c962596aab226cfdd052ba3186ea068d8d31d501520d063037185909bcf02de72f57b4c8dfd86e31 SHA512 206e3f8912bd753837b0e8301c1db0f94e3480d0f50ba83c1b9a4be44498507ccade8f0b317c3bf2baa8aa782a93c88806ddbe710eed9d8fecb135494c26bc71
+EBUILD armadillo-10.2.0.ebuild 3511 BLAKE2B 348bdfbf3adefd3c633a5208e6ecd2ee14be9806a50b571d6805cb7288d517ae214571b17edc7fa991cd4612cda2f6d23815fdbfa9731f7a88875428f98efc14 SHA512 29cc6caa4fc7d65d3420013ae072c1b2a2d6b07407cb2223ab02741c3dd0cb863791d3df69f450379113c408e559e21f70870bbd8b3f0aa19790b059dffd5816
+MISC metadata.xml 1455 BLAKE2B dd2a5e02b716e914005267eebf95de988339833b69e4fcd5f7f32d69beb9e04530aebbd4c338350c842f818ba10074debaa3f2a39300367ed65104f25a0bc924 SHA512 1ece1eaac64e507c4b7a706997a9dc70dc50b7930526b5c16336db5b3558c5066e6935064a2816c0f21455487bccf3a8d4a95d4b5f0e6fd9434a9cc1ae46fd50
diff --git a/sci-libs/armadillo/armadillo-10.2.0.ebuild b/sci-libs/armadillo/armadillo-10.2.0.ebuild
index baaa3579072c..eee69808e267 100644
--- a/sci-libs/armadillo/armadillo-10.2.0.ebuild
+++ b/sci-libs/armadillo/armadillo-10.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( lapack )"
diff --git a/sci-libs/armadillo/armadillo-8.300.2.ebuild b/sci-libs/armadillo/armadillo-8.300.2.ebuild
deleted file mode 100644
index 1ff6d1fd7a2c..000000000000
--- a/sci-libs/armadillo/armadillo-8.300.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0/8"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( lapack )"
-
-#	atlas? ( sci-libs/atlas[lapack] )
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	superlu? ( >=sci-libs/superlu-5.2 )
-"
-
-DEPEND="${RDEPEND}
-	arpack? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	hdf5? ( sci-libs/hdf5 )
-	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DARMA_EXTRA_DEBUG="$(usex debug)"
-		-DARMA_USE_MKL_ALLOC="$(usex mkl)"
-		-DARMA_USE_TBB_ALLOC="$(usex tbb)"
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	else
-		mycmakeargs+=(
-			-DARPACK_FOUND=OFF
-		)
-	fi
-#	if use atlas; then
-#		local c=atlas-cblas l=atlas-clapack
-#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-#		mycmakeargs+=(
-#			-DCBLAS_FOUND=ON
-#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-#			-DCLAPACK_FOUND=ON
-#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-#		)
-#	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	else
-		mycmakeargs+=(
-			-DBLAS_FOUND=OFF
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DHDF5_FOUND=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-		)
-	else
-		mycmakeargs+=(
-			-DHDF5_FOUND=OFF
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	else
-		mycmakeargs+=(
-			-DLAPACK_FOUND=OFF
-		)
-	fi
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
-			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
-		)
-	else
-		mycmakeargs+=(
-			-DSuperLU_FOUND=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.txt
-	use doc && dodoc *pdf *html
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/armadillo/armadillo-9.850.1.ebuild b/sci-libs/armadillo/armadillo-9.850.1.ebuild
deleted file mode 100644
index 1450070b53ca..000000000000
--- a/sci-libs/armadillo/armadillo-9.850.1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( lapack )"
-
-#	atlas? ( sci-libs/atlas[lapack] )
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	superlu? ( >=sci-libs/superlu-5.2 )
-"
-
-DEPEND="${RDEPEND}
-	arpack? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	hdf5? ( sci-libs/hdf5 )
-	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-"
-
-src_prepare() {
-	# avoid the automagic cmake macros...
-	sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die
-
-	# ... except for mkl, since without a license it's hard to figure out what to do there
-	if use mkl; then
-		sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	else
-		mycmakeargs+=(
-			-DARPACK_FOUND=OFF
-		)
-	fi
-#	if use atlas; then
-#		local c=atlas-cblas l=atlas-clapack
-#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-#		mycmakeargs+=(
-#			-DCBLAS_FOUND=ON
-#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-#			-DCLAPACK_FOUND=ON
-#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-#		)
-#	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	else
-		mycmakeargs+=(
-			-DBLAS_FOUND=OFF
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DDETECT_HDF5=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-			-DHDF5_INCLUDE_DIRS=/usr/include
-		)
-	else
-		mycmakeargs+=(
-			-DDETECT_HDF5=OFF
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	else
-		mycmakeargs+=(
-			-DLAPACK_FOUND=OFF
-		)
-	fi
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
-			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
-		)
-	else
-		mycmakeargs+=(
-			-DSuperLU_FOUND=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md
-	use doc && dodoc *pdf *html
-	if use examples; then
-		docinto /usr/share/doc/${PF}/examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index b2dad09a9172..3daa0eb96588 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -9,32 +9,28 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription lang="en">
-  Armadillo is a C++ linear algebra library (matrix maths) aiming
-  towards a good balance between speed and ease of use. Integer,
-  floating point and complex numbers are supported, as well as a
-  subset of trigonometric and statistics functions. Various matrix
-  decompositions are provided through optional integration with LAPACK
-  and ATLAS libraries. 
-  A delayed evaluation approach is employed (during compile time) to
-  combine several operations into one and reduce (or eliminate) the
-  need for temporaries. This is accomplished through recursive
-  templates and template meta-programming.
-</longdescription>
+    Armadillo is a C++ linear algebra library (matrix maths) aiming
+    towards a good balance between speed and ease of use. Integer,
+    floating point and complex numbers are supported, as well as a
+    subset of trigonometric and statistics functions. Various matrix
+    decompositions are provided through optional integration with LAPACK
+    and ATLAS libraries. 
+    A delayed evaluation approach is employed (during compile time) to
+    combine several operations into one and reduce (or eliminate) the
+    need for temporaries. This is accomplished through recursive
+    templates and template meta-programming.
+  </longdescription>
   <use>
     <flag name="arpack">
-    Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition
-  </flag>
+      Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition
+    </flag>
     <flag name="mkl">
-    Use matrix allocation from the Intel MKL <pkg>sci-libs/mkl</pkg>
-  </flag>
-    <flag name="tbb">
-    Use matrix allocation from the Threads Building Blocks
-    <pkg>dev-cpp/tbb</pkg>
-  </flag>
+      Use matrix allocation from the Intel MKL <pkg>sci-libs/mkl</pkg>
+    </flag>
     <flag name="superlu">
-    Use SuperLU for sparse linear equation solving
-    <pkg>sci-libs/superlu</pkg>
-  </flag>
+      Use SuperLU for sparse linear equation solving
+      <pkg>sci-libs/superlu</pkg>
+    </flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">arma</remote-id>
diff --git a/sci-libs/blis/Manifest b/sci-libs/blis/Manifest
index dbabd4eb855d..98c4e45f46a2 100644
--- a/sci-libs/blis/Manifest
+++ b/sci-libs/blis/Manifest
@@ -3,5 +3,5 @@ AUX blis-0.6.0-blas-provider.patch 581 BLAKE2B bde52a363fa6a7b26da98ae6cf8af0631
 AUX blis-0.6.0-rpath.patch 384 BLAKE2B f5a0390384d30d2929fcb5ff22424770dc3b6a4b9e3796b675a0237d9a1971c358463d5a98aee2f4851396b81b85f67d49e8015e94ce433d2b3a6f7f17e54b15 SHA512 626acf971adfdcee9d8578283f64f2e4e5dad14da4a6d38b7198635c775823312b54cd1b11e3f4a79e79716358f1f4260d5b88be74705ae6ec4eb3fd4ce2723a
 AUX cblas.lds 205 BLAKE2B ab2c41b571dbb9b55e36fa5afe4344ed9ef33454f6b7a5cda0726aa7f98a61dcef3065976cc02ab593aad94c5d6c0a23efce726da30673bd06cf57b64e826b93 SHA512 23008248e2b2c221a9ce36c2aca3e2acf58a6d434ffde498a058689af5d16d6e87ab56900508bb0403c5f5a1fc9366b202a7fc44a42d04c409197ec1ec164408
 DIST blis-0.6.0.tar.gz 5107257 BLAKE2B cd589ad1216486e8bb0cf574cc096c1e1f2bb9587b182c2bcff44db322468d9f027323c0bf2d22ea0fabb1902dc047d2bf62253ef1c2797fc3de9ba53d7fc34a SHA512 74e9da5146f7986cbd11651d7cd0837562a1603c667b9e6d3f79b5057443de657b60d7463cb2d64daf3eff7d33fc05a64e6d8eb807f4cabe0c3121517924a206
-EBUILD blis-0.6.0.ebuild 2677 BLAKE2B a1bcf696d5b63f71822d7727a6a5e98285419a66b8226c972c20ec76ca33fda7c38f351ccc16675492b1e4d4514b6a3a13c1c286a264f01924d77d0466a0f51d SHA512 0bb95a702d7dced43cd0fc29010ed1b6180c688c0ae31cdb7b1ba8b9ee248387faf97c63f9d6fa508ab1311ca82af4ea492984033c90fecf937bd63ba28a3de7
+EBUILD blis-0.6.0.ebuild 2655 BLAKE2B 88cfec3304d3cd5c642f738b5cbb6a3417b9b210522e66a27491e383e956f054dc46f897a0d1d3de5762cc7c1f2c2015eae01d737570453170341157f67e0d5c SHA512 ad8782822a00d827aeb1cc0f730abc7373812999f1e24071f73638107906b8b60ff87f54579adea89c6c18d6fa8a3f73d15dd63febda2aa4d5f08fe5a47c9c2f
 MISC metadata.xml 1608 BLAKE2B c8026b4a933bd7f14e7c446ea5d4bda580532252e52194b058d97daaa38969c661d5dbd86d230f44d2c77d52798962ca2953b1d88490fe284629777e763a5ee7 SHA512 b7ce333449f22acb746fed9913850e226e2e6bd6573537996f43f402b055f20b5ca5fe511eda8aa220939dd8194937eb65e8bec34bf61280ddf90722563ab037
diff --git a/sci-libs/blis/blis-0.6.0.ebuild b/sci-libs/blis/blis-0.6.0.ebuild
index c8cf8bfe37e8..dab2e5c96017 100644
--- a/sci-libs/blis/blis-0.6.0.ebuild
+++ b/sci-libs/blis/blis-0.6.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
+
+PYTHON_COMPAT=( python3_{7..9} )
 inherit python-any-r1
 
 DESCRIPTION="BLAS-like Library Instantiation Software Framework"
@@ -12,19 +13,23 @@ SRC_URI="https://github.com/flame/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="openmp pthread serial static-libs eselect-ldso doc 64bit-index"
-REQUIRED_USE="?? ( openmp pthread serial ) ?? ( eselect-ldso 64bit-index )"
+IUSE="doc eselect-ldso openmp pthread serial 64bit-index"
+REQUIRED_USE="
+	?? ( openmp pthread serial )
+	?? ( eselect-ldso 64bit-index )"
 
-RDEPEND="eselect-ldso? ( !app-eselect/eselect-cblas
-						 >=app-eselect/eselect-blas-0.2 )"
+DEPEND="
+	eselect-ldso? (
+		!app-eselect/eselect-cblas
+		>=app-eselect/eselect-blas-0.2
+	)"
 
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-rpath.patch"
-	"${FILESDIR}/${P}-blas-provider.patch"
+	"${FILESDIR}"/${P}-rpath.patch
+	"${FILESDIR}"/${P}-blas-provider.patch
 )
 
 src_configure() {
@@ -53,7 +58,7 @@ src_configure() {
 		--enable-verbose-make \
 		--prefix="${BROOT}"/usr \
 		--libdir="${BROOT}"/usr/$(get_libdir) \
-		$(use_enable static-libs static) \
+		--disable-static \
 		--enable-blas \
 		--enable-cblas \
 		"${BLIS_FLAGS[@]}" \
@@ -63,8 +68,8 @@ src_configure() {
 
 src_compile() {
 	DEB_LIBBLAS=libblas.so.3 DEB_LIBCBLAS=libcblas.so.3 \
-			   LDS_BLAS="${FILESDIR}"/blas.lds LDS_CBLAS="${FILESDIR}"/cblas.lds \
-			   default
+	LDS_BLAS="${FILESDIR}"/blas.lds LDS_CBLAS="${FILESDIR}"/cblas.lds \
+	default
 }
 
 src_test() {
diff --git a/sci-libs/bliss/Manifest b/sci-libs/bliss/Manifest
index c3bfb54ed04a..54db577fb2cc 100644
--- a/sci-libs/bliss/Manifest
+++ b/sci-libs/bliss/Manifest
@@ -4,6 +4,5 @@ AUX bliss-0.73-error.patch 14317 BLAKE2B b053cf310604c57fb4a51d3c9dee8f780b7ad55
 AUX bliss-0.73-rehn.patch 1669 BLAKE2B 6e109c0bc59c0000603dd59467b989a572f502aa352a4b09cec85a608f90163175cb4babcfbc8495a246e8a3406186feeda366131c3c637a9aab93d9c698d36e SHA512 ae70ebcd3d9ef2f744e951dfb9cc2b48bee741ee7ead557a0fdfdacbd1895b015bb9a8da986fa36b084d4c92f7a28adad1df14c0814847d84c46f73cb69123b7
 AUX bliss-0.73.1.in 1482 BLAKE2B 740fc9aa59ab9ea7819a1785aa3f0609774f0b89b08ffe3276b002f0f55eb5332ffda4952a54aa91f621ec533e1cf08b734a9686ca727e528a311d209401782c SHA512 7eb1d08f9c40358ef986d8fe31d42eb90dc57879cb399f45dcf5df85eecdc6fd86208f1bf06c21a6875e5a3fb5a634d818edd75ce2ccd855910feeb22b714f4b
 DIST bliss-0.73.zip 94108 BLAKE2B 836184b31fa28db3328c21e7563366a93cf1645b02b96e185838e3c2513393b1d0a54783ca14c6d7f1a1d5055800bc3d7acde3c584e61e66c9ab93936824353b SHA512 30f505945c577d8bcb265a349f5bc9d4dcd96555fa3add285199cdd95ea2710f04409008ff06432daffab62c132e884845eae7f823191407906202862509e05d
-EBUILD bliss-0.73-r1.ebuild 1043 BLAKE2B 764f07e6857243a5d043718b3c70ee3a76809c581f514ff000ba22d6278e2561aa1f039a546d41494301fe148395ab29ced93fd9e57f58c572c975da8b9d657a SHA512 81c15201073a7151be82baeb4438f9677332c30b89f9154c55e62e4438caa8992558f307f60f068d53f216bddbf9b9fa7006d44bb1afbba29db4d7ca562b0b46
 EBUILD bliss-0.73-r2.ebuild 1072 BLAKE2B 33e191a48064d3a02b3626f004e2a803d998dfa21d0e1fd699d71b70756f85e1d7d43a0f4425bab89820b24657f5fee0f2fd703bcf782ead4c9fd281444cdb60 SHA512 5c059e2681445fc77f9828c508ef832d0072410c984c9962b391501744c70df8b9e4ce8c31d820071aa4279d1a45c781463a7322add743d955235bcffd0a42a0
 MISC metadata.xml 257 BLAKE2B e4f657523a349a531d465953f61a55f61c3d1262af149695624b6f601aa464e39a1bceec34b26d97804e441ac6b45e48f930006a77e60e031a3e321b8297ed4a SHA512 ac9b4b4f3ef6a190cf1465bfac8aaf69c9c7b91e2cf3876e19a0b39264accaae12e301a2059bacff7781d0fb1f40499cb2930be0cd3f7ef9cb1a40d266ad059f
diff --git a/sci-libs/bliss/bliss-0.73-r1.ebuild b/sci-libs/bliss/bliss-0.73-r1.ebuild
deleted file mode 100644
index de9e1f385274..000000000000
--- a/sci-libs/bliss/bliss-0.73-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-SRC_URI="http://www.tcs.hut.fi/Software/${PN}/${P}.zip"
-DESCRIPTION="Compute Automorphism Groups and Canonical Labelings of Graphs"
-HOMEPAGE="http://www.tcs.hut.fi/Software/bliss/"
-
-LICENSE="LGPL-3"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gmp static-libs"
-
-RDEPEND="gmp? ( dev-libs/gmp:0= )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( app-doc/doxygen )"
-
-#patches from http://pkgs.fedoraproject.org/cgit/rpms/bliss.git/tree/
-PATCHES=(
-	"${FILESDIR}"/${P}-error.patch
-	"${FILESDIR}"/${P}-rehn.patch
-	"${FILESDIR}"/${P}-autotools.patch
-)
-
-src_prepare() {
-	default
-	cp "${FILESDIR}/${P}.1.in" "${PN}.1.in" || die
-	rm Makefile || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with gmp) $(use_enable static-libs static)
-}
-
-src_compile() {
-	emake all $(usex doc html "")
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete
-	use doc && dodoc -r html
-}
diff --git a/sci-libs/brial/Manifest b/sci-libs/brial/Manifest
index a440211f61ec..5648d214bba2 100644
--- a/sci-libs/brial/Manifest
+++ b/sci-libs/brial/Manifest
@@ -1,5 +1,3 @@
 DIST brial-1.2.10.tar.bz2 1229830 BLAKE2B a1cfe4fcd19824d04388bbab1130a9d07e5920fb05ea1686424f1e0193c6f5d29300bba66bdf7ac59665cbceed3f6ff84fbb5a95311858196a0fbdecda5a2cc7 SHA512 163d9f3703271f412d20ec165d713280d9b46c50b66eed0b15385c6d94569e0ea5d7e84c3b6715d51197e97be4062325551402c844f70235a4aa1cebc5e9d3a1
-DIST brial-1.2.8.tar.bz2 1228732 BLAKE2B f9bdfc9416381f3436c555861806a7ea4680e706729b6de9c2b06ea2908090b87b745fe5ce2d94ba9d5832a78067e4848f8ef113b7d8dc22557b6d95b7dad707 SHA512 a94acba140d976dd070b5214c537fb3dba89fc2309addc566b8f0a031328f2d4c2bb3c38c2cb5565c7ff2ca0c5f7f56ca120899d15c768887d3b61a18b3e05be
-EBUILD brial-1.2.10.ebuild 972 BLAKE2B 4130821312dfdb49170b21b18d7a4d3d3106618519f4e67d8c0d1a6dcf444ad4a1b1db04323ecb84190648079dd872a16e494c9c90e4e138ba635ec71dd41f54 SHA512 f5fafa09f47ecc7e00b691ba62f01c3a3ac12e9ce17b2daa6aa67e46c2f33d0ddbfe78732c1fa7b2a181128412f247750d66293312cefd40fdf3c1f7b071ed50
-EBUILD brial-1.2.8.ebuild 968 BLAKE2B d012afb4bdba5a8c49167340b1f40c21e6f7dfc74422373e418ca33506b1d439f8c9b7fe6aaa67e0b37a56d4741565521a317ed338a2e48a7683a7b43301f985 SHA512 8b180e2256f46ca9e4919aaab683f72880d9d61d7a7d686e3a5ddd973b7c5707f8be426f08149809d16ecaf5865bd1f39b4b264efefa4cfa31265927d7dbe27a
+EBUILD brial-1.2.10.ebuild 970 BLAKE2B ae79af15e21e3fdadad31ba2e52ba8b99cf65588bcc8620caee53e85cb8bb28d862b2abf48ada6a9569da64ff2a4f4c0839d78f287117c1bfa9027c2f5134bad SHA512 f732502fd186fe0f12faef1a1f3fc8fc2a2bdd3f166e36dd8ed8d6264708e00ff0519795f8b4b0bb72af03367cd48f9af6481236f927eb528bf1e13abf86ec85
 MISC metadata.xml 1046 BLAKE2B 34c6f471ca6fbc4538cf3a2dc71bd19d4201656f326166b2589be3126f73f5ff34d190c2ff42154a067457a9da6f05067e782c9dc340357895ca016be6983183 SHA512 550a191f11f7812c363d419e8bed69fdd70e69b3a94e6fba838be9bc04050977edaab34ab0c0ef9c589e6478cdf2d40ba631983f6a2f411e51b9f3964bb48db5
diff --git a/sci-libs/brial/brial-1.2.10.ebuild b/sci-libs/brial/brial-1.2.10.ebuild
index 8abd8547852e..926f7639d6bd 100644
--- a/sci-libs/brial/brial-1.2.10.ebuild
+++ b/sci-libs/brial/brial-1.2.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2"
 # The top-level license is GPL2+, but cudd/LICENSE is BSD.
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/brial/brial-1.2.8.ebuild b/sci-libs/brial/brial-1.2.8.ebuild
deleted file mode 100644
index 26e826d9b26f..000000000000
--- a/sci-libs/brial/brial-1.2.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A C++ library for polynomials over boolean rings"
-HOMEPAGE="https://github.com/BRiAl/BRiAl"
-SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2"
-
-# The top-level license is GPL2, but cudd/LICENSE is BSD.
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="png static-libs"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="dev-libs/boost
-	sci-libs/m4ri[png=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup(){
-	tc-export PKG_CONFIG
-}
-
-src_configure(){
-	# with-boost-libdir added to deal with some rather quirky setups
-	# see https://github.com/cschwan/sage-on-gentoo/issues/551
-	econf \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable static-libs static)
-}
-
-src_install(){
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index bc2cfebe21ad..61d987304361 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -3,7 +3,7 @@ AUX cantera_2.4.0_env.patch 3559 BLAKE2B 07af1b751b653b1c92288286b9c82ef230ea0df
 AUX cantera_2.4.0_env_python_install_prefix.patch 943 BLAKE2B 06bc4ac2cc4aaa212325c3883b9cead668ed294f23a2ac768f28e593916d07f2322e21846b97b40e336dfc742ed45a9b95f8f49531cd82d2055499f810e13c2f SHA512 a7ebfd8f9a6fa406d5a5847ad98e91aa9cbf53d194ec87d8479b88ad322df13308947fae61574ebd6254eeaa1bcb49a4cd3e30db2981cebcbf13241ab8e050d6
 AUX cantera_2.4.0_sundials4.patch 8410 BLAKE2B dbee09305610bb0d74c1569d694782194c0cb3daf06b581fa385021faed9d54d8f900747bdcac64b0322dcc82fee20bc330b71bee1aa90fe9df68efc335427b7 SHA512 ec4b80b761c3d18cc03bb87ec59b7c860b6818c3a5503f3f7c759f0bfde7cc6c5ded3c64294f9844e28a649754f4a1c158738bc5a7c923bd4808a78c6a59c91a
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
-DIST cantera-2.5.0.tar.gz 2479888 BLAKE2B be3dd9ae1b0d9b555b9ddd6ad78a2a6a675844903e4c10ef5e4a09c66d5ca01f81f49f35ee195597d71140dcc4da9750e82f71c6553b5f0ef8a122bf63b86cc1 SHA512 4f1763a74a4a938c6d4512ab574bcbbb84ea6e8c9814c612e6ff6cba0bec1209252ef7c21004e0df98a84279cf66bd137220233dad0ebbcfc89e9a273d753478
+DIST cantera-2.5.1.tar.gz 2492422 BLAKE2B b48c5d12fc2b69d309759afd20b55dc2533c23ccba840109cf7a85c4ebb8306eb48d9f007914184a9d409f7bf296814fe09e6e62a29cf8384edd954fdff2af4e SHA512 8cd65f6b86b3009f22ec243cb7cb833e26919c4925fd15fba8fb98aad2180d8c0fe7550e13efeb7cce55abab06d9400230d59c9c43b4d3be6b0575b1164a56bc
 EBUILD cantera-2.4.0-r5.ebuild 3069 BLAKE2B 39717e82093e45822879a61834b49b64bab571b850d3e2efccc09e8f2667d9729edea788afb15fc056030d1239ff25bff7e6868ebd62000acd7efc72c3c55e4f SHA512 df6942fc36890820efc815873423b63aea4448b180b201c6ce4e85c4ae9cd67e54f21935de4a9351581f8913ae732c7c85bdb6348ed8dfe0da43cc503e1c1537
-EBUILD cantera-2.5.0.ebuild 3181 BLAKE2B ec3cecba3ad0e08452d05ea6fb4d9177ecd28cd7a659c9eeabd6581610337f420a3901f53aebca3e5f02281e56180ee718faeed838554bf9914578641db78efd SHA512 99cc3da4810d27094a1f3a996caebfaed47033945d03d0e10ceade5654690d49989d7b082112873ef1ebefe597f4c5cd7c7f74577aae83e2d3d3769f15e2cd4a
-MISC metadata.xml 803 BLAKE2B c0444a2aa286283ff4f6e391482b338b64bf369691113a140c3bd5b391498a343c57987be260f4a4f72c9ed3013b2b7ee461f2e5771dc8a7fdfb88e4e64771c5 SHA512 2601b121f8e7ee11f1228c0b2fdbe90657a1cd944a2a6e385a1b73448d4d1f4da3f4d17c6afbb078feab1a26c2dbf4fd7d1901916e32e02fb0c397abf6852653
+EBUILD cantera-2.5.1.ebuild 3309 BLAKE2B c2719033675b6e1162ad13ff7499562932933c1ed21839cb3998fa1946697f939357a32a5d5c097ec01c38dbcf3b6ad782ef62d76d0602efbadb935b13cb05f5 SHA512 315c10d38a537fd5fe1166bd7018cd889f187b6f587fda0c8e2be42d14cd9904b2cef6605fa061e6f9df8f8a08042147a09e3bd6e46428e543400beb4eefe99b
+MISC metadata.xml 811 BLAKE2B 52b5f914f5af7495269fb62525bf94bf8b6a7b6a09c9e3046940d37d0b85772ccbc2e09eda36872525ef926126494425934adf7c2156e50001b314d8f44539a7 SHA512 2e8609d78f13315c06339cae35c4036677fbc372f09ea43dff7e7be670218990a6871650f3407b55d8679f94f6f0cd19c48e76bc37bf4bd9172b91ccc6ae3c2d
diff --git a/sci-libs/cantera/cantera-2.5.0.ebuild b/sci-libs/cantera/cantera-2.5.1.ebuild
index 5f3b8c1280bd..71ba0f78c0f2 100644
--- a/sci-libs/cantera/cantera-2.5.0.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1.ebuild
@@ -58,7 +58,7 @@ DEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${P}_env.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.5.0_env.patch" )
 
 pkg_setup() {
 	fortran-2_pkg_setup
@@ -117,6 +117,9 @@ src_install() {
 		# Run the byte-compile of modules
 		python_optimize "${D}/$(python_get_sitedir)/${PN}"
 	fi
+
+	# We install static libs unconditionally here
+	# See https://github.com/gentoo/gentoo/pull/10017#discussion_r229210565
 }
 
 pkg_postinst() {
diff --git a/sci-libs/cantera/metadata.xml b/sci-libs/cantera/metadata.xml
index 5ee7890c1369..cc02172de85c 100644
--- a/sci-libs/cantera/metadata.xml
+++ b/sci-libs/cantera/metadata.xml
@@ -17,6 +17,6 @@
     <flag name="cti">Install CTI tools (ck2cti, ck2yaml, ctml_writer) for conversion of Chemkin files to Cantera format</flag>
   </use>
   <upstream>
-    <remote-id type="github">cantera</remote-id>
+    <remote-id type="github">cantera/cantera</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/ccfits/Manifest b/sci-libs/ccfits/Manifest
index bcb8834657b9..144146f7b918 100644
--- a/sci-libs/ccfits/Manifest
+++ b/sci-libs/ccfits/Manifest
@@ -1,6 +1,4 @@
 AUX ccfits-2.2-makefile.patch 710 BLAKE2B 8368c98ecc0b9c7e2d56ab43473a8b3d83d16e6683e5f58da6e3a25ccaa5353404ae6b8e3c457aee99ca5b6af3ee228973ea2d0aa9d990aa8853032e204ea63c SHA512 ea4553b9a794131fe1b90172d49623bb97c6d78c52a3cdbdd43c8bb3ec23ae535081a981f83c61d425fc9fe1b6258e7ef78cea580f7df302893840ab3a35e7e5
-DIST CCfits-2.4.tar.gz 1792643 BLAKE2B 5304789d01278884faa9765be3f22e03e7a37370f0f3996045a663d5793a1686ce4c2d379227bae57bee5643ac398242223cb0300337f4ad67b662679019e92e SHA512 b12d455bb6dd631056e02a12e996d3bf0b6169f8922011e4b64f979b08d2ab8f405e14947c6f5d26ad18bf2f5764854a84987ae105944515f533fe6b0b4ef7be
 DIST CCfits-2.5.tar.gz 1416358 BLAKE2B 4c525761f98bdb133f8d0c5fd582db5326dda84dc103a7c816cdf8d1a1fa02ac5b8e9c9431629304e3eaf21b4ec9767796c8b2cc8d22dd877a2e043084cae683 SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5
-EBUILD ccfits-2.4-r1.ebuild 918 BLAKE2B 2f817e91add7ee23a1575355b4978ff241be1bba2fed999f59b24a1bd04248d0d48856ee4390cb874542aec83f1c0724cba27d0ffb39f976eced8b5c81728303 SHA512 bc7f26b5dbad51c16f35fc3f5892523eba313cfefdfd9687f408d5fea1961cd69a1badffc416469dfae30b927da5d5dd01f241747fd7ccad8e05af2f1351866e
-EBUILD ccfits-2.5.ebuild 859 BLAKE2B 2b00b9e3fc988db20fbe2023c614d089b426d1bb0ad0727e9fbaec89eb61c88940a91b202034b83d2c2e091ee79c06d3db29796764c050b89edb22680b62a080 SHA512 35adc47118a47e76b324f352496f5d047763b1a7c02f2a46f908f1e14647b55dff7b45a142704c29b943a2246472bde508d6e204120356e13fa4e364bb1e393e
+EBUILD ccfits-2.5.ebuild 857 BLAKE2B 79284aa94e87dea6da937cc40a1d5df881c7a9e3580e45589df5a01465832e1bdfde735645882ca18ff76f0c967b407b3a274db1b72eb4559d0a174e4a830ccf SHA512 1f54a64b7aba19bc36be0dfe7e36b3526950ef8ddd6c33860514108194e347021480ecb710befb7f1d2c8bd3c3ede2b0b477640064c3dff2d6dd8ca807f2df34
 MISC metadata.xml 639 BLAKE2B 6cccb8d66f9dcde2f82383b919dcf67122a8d27f24641b262899831bc60b19b4cf433df5e1d05fcd2a140b20bfbb5a1add4bee162ba7574834a50c455f983a85 SHA512 163801f94ad9076cf5306b4f06682fc7186e724704b4ad1e5dfca871fc770ed0b06827caa2aa83eeebc7bb65b5bbc27f254431d6472735abb30f0872eeccf721
diff --git a/sci-libs/ccfits/ccfits-2.4-r1.ebuild b/sci-libs/ccfits/ccfits-2.4-r1.ebuild
deleted file mode 100644
index 56d8533e3fd9..000000000000
--- a/sci-libs/ccfits/ccfits-2.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MYPN=CCfits
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="C++ interface for cfitsio"
-HOMEPAGE="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/"
-SRC_URI="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND=">=sci-libs/cfitsio-3.080"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYPN}"
-
-DOCS=( CHANGES README.INSTALL )
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-makefile.patch # avoid building cookbook by default and no rpath
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	AT_M4DIR=config/m4 eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	if use doc; then
-		DOCS+=( *.pdf )
-		HTML_DOCS=( html/. )
-	fi
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/ccfits/ccfits-2.5.ebuild b/sci-libs/ccfits/ccfits-2.5.ebuild
index c2dbe59e5bce..4dcbba0d8ac3 100644
--- a/sci-libs/ccfits/ccfits-2.5.ebuild
+++ b/sci-libs/ccfits/ccfits-2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/${MYP}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=sci-libs/cfitsio-3.080"
diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index f77eadce2b75..3b1d0e20ce38 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -1,15 +1,6 @@
 AUX 50cdf 124 BLAKE2B 93acfc3dd493c8518497ed7dafa35cc61f66501bd9d7c4db1f4072cdda9742f2927b5f388dde26d33e76d4d33405a8a92fbf133a1ed729ce8cba21458f552123 SHA512 4fe515d03379f2b6e1723c771f73e65be9f67365a46e75dbeb3358bbdc6f3446b91efd989363bf229b7ae93a446ddedeefd883a0d59d28c1480a10a8994eeadc
 AUX cdf-3.2-soname.patch 738 BLAKE2B 4c6a94feeefa623e88622b6dfd76581ef6d0c0d91c376e597bfa1e0130a734ea6dd40ad5235272788d7338220710d26e634639383d8cf5cdbd1901778484a580 SHA512 f3bb09e43b3b36ed346dc7690cc0c75a28e8dcfb2c1ebbf8a0577abdc2d15bbcbce7b0da9c5de23ef65e669bd118692db498aef230e9395dd4b67dba48258a8d
-AUX cdf-3.4-Makefile.patch 3838 BLAKE2B fdfe3253212c96b1848989a07fdcd3bc830f614414b1f47d9ccc11964b8fa2c4f9cc435f29b418bfd6f461aef0db5b8c004f9cecc83357a10e34cf81ea924452 SHA512 f8eb1b78b5a8e466dff38fa8108ac7316bd171e50e7e9125a99b10482994f02b86656d2d3e34a29c1a384beab6c0fd97ddf6e4697c18657d189620a9efcd1e47
 AUX cdf-3.5.0.2-Makefile.patch 3973 BLAKE2B 2106f52abb639b4f31f08372de81db5cb96dbdccd0a55821605e659b7f85fad554cd8d4212fa4b9e6fd6225e5f3fd6c98e76d7aa7c2fe05dd96ea49d3c8444fe SHA512 9842d43d8e2910f8d7cc00c27711f84cde622ab69084ce1c798625475034b73db857410d6fc1311933512bb3a235cfe2fb0808d2eebfc6165e3962e04aaed4e1
-DIST cdf34_1-dist-cdf.tar.gz 1045465 BLAKE2B f6889584e6c1d26c66d0c17d1e44d63ae2b966ec97e6c1d40fe3ef819225f96c9bad1d000529a9f91f88f6dbcbbf6043bf432203f0d60d48c57941224ca25ec0 SHA512 d68e39b521402256205196f09ec9742b7fdcd1d59fb3251b5eb50812fee52f9ae193c39d342b3dcc467d03911972e4e19f1cf157ac102eae6cc77cb6abacac44
-DIST cdf34_1-dist-java.tar.gz 713180 BLAKE2B c5c8aabb7c3a9a7f3fee3cb9205b4c66d147c5862d0b1f415d8de56f44a06b6b1e00a89bb143ca8868fe65a58423792ae89fdf0a40635bfa49c0b9a05233b573 SHA512 1b95110e6ff455cb379370a74b4160098b5dbd3bef8a3854634caad40d93fde9bc804e4f10187cfeb232f9b9a28a69ce6de6caba969c64dc21b89b339e01e112
-DIST cdf34crm.pdf 1693915 BLAKE2B 77869347ff02105a104d3762118103e9bc5edaf931f1228e3a79f70c8f30b0eaefc091c7c61d0868fa735e987941f8d11200ef9717a77e4649b846ba8de02192 SHA512 cbc8a4b6237632147de24c0eecaaff0f7fa6551eec08f68ebc72c79aff71a99608c309874bd07e9dca6203868171159556a29a7669ecb7e45e60a5cef8d81cb4
-DIST cdf34frm.pdf 1968381 BLAKE2B 163f091927702e3ce72c8ca8d24c19a80e995daec21ef8a7a4906570939234f0576de3269a7b02c8023a3a165016084ad2e3d69684eef1b55e98a0e56d0cbde0 SHA512 c5402db80c05192430e1ca7142d356a8224c52f128fe8c1be937767623c12a7ed55d7afaa0955a00e9ebcace87ba5fed977fc8020a71cdac40fb44326c5f8f65
-DIST cdf34ifd.pdf 415359 BLAKE2B dd928ca68fcfa0239af12e08196293406cda14f87fd1647e48900b9a61cdc13855ac554340c7d3cf3a50fdb7ff03e5957fb9fc966256b7ed27007b97a859cc6f SHA512 1ab42f8677fbbb7cb477c6cbbfe632a8569c6a78fee07dd32c42f549b7d451faaf0ca61ba03f2ea5ba4de2a3a71cc40e4de6ca3dcf86b7caef7594cefc9f2246
-DIST cdf34jrm.pdf 3505200 BLAKE2B 9ae6029f702cc06f4b1fae2d288378a5e7cdee47ef6c1c4d0d24071bead3d94a9d964d39e759eaaeeeb09fe010aede00feb5d9339b6a554f64de92a1df98db35 SHA512 1609f609f7f455bb4749f5f948183f066bc7b6a1367082fccfed669a9768d8c6d8e46f39680e0e99b4accd030c262af92deff9f832e2789ea191874c107df94c
-DIST cdf34prm.pdf 1062987 BLAKE2B 5dc0d5e70d6ae802cf80fab6082d8f77ae1c957c236d133930ccb0c08179889c3011cc6cafe7253df795eb66f08e6be65631bbc10fc4385a9097e7b0d8e9e9ea SHA512 f4e95ce93c896147e4c3074caa8a4d564aadebc8e741c6e593a9377fc0fb0e6f3225c2cd9962900a144418a5b445f462fe12d1178857c3f229f2650da4030587
-DIST cdf34ug.pdf 1307731 BLAKE2B 365711a1d8384dea8017826e753460a5d93295e893540ebf5e300ced8b253316f721edb10effae24a24c857a301edb080da2977d5482f5f6ae540b39fc89a14d SHA512 78c4891690494131f1a8793e1e0dbb9aa0d021b88d04489385156dcc25a218555acad3ec727265aa2b749e24c9a66601ad0698ad201bc6f16b74c9266aae4a0f
 DIST cdf350crm.pdf 2139671 BLAKE2B fbfcc12d919ca07beb1df621f967bbe69b33d0c403613e1b12c01354e53e86f93920104d24dab4f3d1260d72f5e6de663ae3a87ef310dfabf46af2c216424f07 SHA512 382c3cfd73b7c75a017f0c563c61473fccc11ca344f33f4f5a543f4c339a52879400532dbff9956ae8c2b7706f63223132666c3154ad7ada281cd4418e48b4dd
 DIST cdf350frm.pdf 2194293 BLAKE2B 40b269a7987a1522ec7f92eae8efba1117993e459df574afe89d5325d21c3e685a5ed09216bfa56e22f40e831c99bf6d69faa14b9d3a1014d1cbceba43dc3bc9 SHA512 1c1db067f42b56ddb01399821103ced7207da1dc191f62f7acf6776a05c15a992f7be060790233e1b94444724aedb6f83ba687f60b7a20b4988f9d591b40d481
 DIST cdf350jrm.pdf 4009791 BLAKE2B 5b0ea4fcfe2237b4105707d2a3a9945e13333c4ee073d7d9a5a2b839a250308697aa9291aa1e224b886f821235b4d6c4f5f5304a1ad61d45436e1dc4f2b0425a SHA512 cf42de6d94168337936403fc2e504b03fdd676ae8daf8020186d3261bc7331822d47b7c509c804ca5fd637af3696308d09c5db102aaa546138d0630c3df999c3
@@ -18,6 +9,5 @@ DIST cdf350ug.pdf 1396156 BLAKE2B 39f3e3b0441ef103c9131b3c5523c5a387eb785d545c68
 DIST cdf35_0-dist-cdf.tar.gz 1137065 BLAKE2B df3235338e63686dd0446663b8738618c45c4e86c858b4f41d3326ebf14d391ecce43309cf5d6a3db4a9f9e53820bf8a73acb77549a0432594859b24acb7eb84 SHA512 f26bd1e298494563cb30c52751bd175124814dca2fe2c05ae056d6c2ad905fb5ddc7da35888c6a07d69914f52481cb4e9fcab9684c9a8a0ca4b80ca449ad3406
 DIST cdf35_0-dist-java.tar.gz 724055 BLAKE2B 563542821106b040bb0eaefa303cbda46ace5a127cda1936c55e5eaf3b395eb67073a622e84d1bfc33cb65faa4b51710008cfbae86fd680e5cca2c80dbc5162b SHA512 2e69447e9c36ced39a6bfcd1f2a5dfa7c36c04e9a5acac12952c1b415c5191471efbf2cc432b5b31eb37c8ee31bda3e27bce0fa266c5549fb1b0ab86c4dd6c4f
 DIST cdf35ifd.pdf 560458 BLAKE2B c44722d30c4217b492fe140833ae9c58721040b629cf414fe8d9d7d44433b3f62241d621d4b6d634f54e4f0ecb4c026b66a1e752a1d868b0861eed54d4a95bee SHA512 018a524f7fc8dc5b8b3512ed8bdea42bae141eb65d24b4fbbdac6ecebaeac5c458caf3a476fc4b7c0313b17441cbe7dce32d1002f9344d056cd46853ee3cd438
-EBUILD cdf-3.4.1.ebuild 3160 BLAKE2B 0be079f14b31d8cbd32fcf2f470716deb8a116d6a4705f4fee268edfce9ce9d1678726b33fdf1ccdc16daac4f3f05d8bfa466ab3e5a1e105bcc29e52df982cf1 SHA512 f05585881ae9906dac47d63e06647bfb11e087d05e5a4d5f437bbfec0b99647a22f2a64bc2fbb1c9c5e62656ce64a23244b1db59bc1a6f060e20e827e60a2dc1
-EBUILD cdf-3.5.0.2.ebuild 3177 BLAKE2B 3a643b73c40ea6ccfdd1545bcfbc80e8ed1857fee18118e4764fcfb6be67502d3cb09fa810d93f7d66af28277a9b46111528747c612b97b2d49003837629a1ae SHA512 57269d226912eb305dc88908de46da821a2393cf803b60674be4995037d579863a0e12d6f408dfc15fc70c3ecc951664bc13d6e6bd27a0c547c79e0ab82f8396
+EBUILD cdf-3.5.0.2.ebuild 3171 BLAKE2B aa123eaf3bb93f76d8654427eabf289cade23af0a34392d1657856247cb3936758a9ca42fd689241e612a369d335d42dc095de9311258e4b357b2501bcb62f76 SHA512 45fb170eb5a323f35c8c83029af361b231f06a959e0b0f48de6b74a783ee5dafcee2d8156bc8b6c818c0fc55ee29fa320d877e715f2b7c3c634cd5771ee95388
 MISC metadata.xml 1025 BLAKE2B b93e6e8c52f2ac85ac66c6aa1a9a4075c11d6d6ae4c28e540a33b2964f911e5c118510f0b57d25ead76aa3bf07be70b309af1079425bf786c18f70e00930c143 SHA512 26992a8b0ce0aff229d7dc4e87440dc15e0a0143ef88ba6d910a8e4f6372803ae8e3bd007a53b554509220bdb41fe8a804f9b606a4dca47f03d88d39f2164549
diff --git a/sci-libs/cdf/cdf-3.4.1.ebuild b/sci-libs/cdf/cdf-3.4.1.ebuild
deleted file mode 100644
index fcc6e3d4c3d6..000000000000
--- a/sci-libs/cdf/cdf-3.4.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-opt-2 multilib toolchain-funcs versionator
-
-MY_DP="${PN}$(get_version_component_range 1)$(get_version_component_range 2)"
-MY_P="${MY_DP}_$(get_version_component_range 3)"
-
-DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
-HOMEPAGE="https://cdf.gsfc.nasa.gov"
-SRC_BASE="ftp://cdaweb.gsfc.nasa.gov/pub/${PN}/dist/${MY_P}/unix"
-
-SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
-	java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz )
-	doc? (
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}crm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}frm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}prm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ug.pdf
-		java? ( ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}jrm.pdf )
-	)"
-
-LICENSE="CDF"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples java ncurses static-libs"
-
-RDEPEND="
-	java? ( >=virtual/jre-1.5:= )
-	ncurses? ( sys-libs/ncurses:0= )
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}-dist"
-
-src_prepare() {
-	# respect cflags, remove useless scripts
-	epatch \
-		"${FILESDIR}"/${PN}-3.4-Makefile.patch \
-		"${FILESDIR}"/${PN}-3.2-soname.patch
-	# use proper lib dir
-	sed -i \
-		-e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \
-		Makefile || die "sed failed"
-}
-
-src_compile() {
-	PV_SO=${PV:0:1}
-	emake \
-		OS=linux \
-		CC=$(tc-getCC) \
-		ENV=gnu \
-		SHARED=yes \
-		SHAREDEXT_linux=so.${PV_SO} \
-		CURSESLIB_linux_gnu="$(usex ncurses "$($(tc-getPKG_CONFIG) --libs ncurses)" "")" \
-		CURSES=$(usex ncurses) \
-		${myconf} \
-		all
-
-	if use java; then
-		export CDF_BASE="${S}"
-		export CDF_LIB="${S}/src/lib"
-		cd cdfjava/jni
-		$(tc-getCC) \
-			${CFLAGS} -fPIC \
-			-I${CDF_BASE}/src/include \
-			-I$(java-config -O)/include \
-			-I$(java-config -O)/include/linux \
-			-c cdfNativeLibrary.c \
-			-o cdfNativeLibrary.o \
-			|| die "compiling java lib failed"
-		$(tc-getCC) \
-			${LDFLAGS} \
-			-shared cdfNativeLibrary.o \
-			-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
-			-L${CDF_LIB} -lcdf -lm \
-			-o libcdfNativeLibrary.so.${PV_SO} \
-			|| die "linking java lib failed"
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	dodir /usr/bin /usr/$(get_libdir)
-	# -j1 (fragile non-autotooled make)
-	emake -j1 \
-		INSTALLDIR="${ED}/usr" \
-		SHAREDEXT=so.${PV_SO} \
-		install
-	dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/libcdf.a
-	dodoc Release.notes CHANGES.txt Welcome.txt
-	doenvd "${FILESDIR}"/50cdf
-
-	if use doc; then
-		dodoc "${DISTDIR}"/${MY_DP}{crm,frm,ifd,prm,ug}.pdf
-		use java && dodoc "${DISTDIR}"/${MY_DP}jrm.pdf
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins samples/*
-	fi
-
-	if use java; then
-		cd cdfjava || die
-		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
-		dosym libcdfNativeLibrary.so.${PV_SO} \
-			/usr/$(get_libdir)/libcdfNativeLibrary.so
-		java-pkg_dojar */*.jar
-		if use examples; then
-			insinto /usr/share/doc/${PF}/examples/java
-			doins examples/*
-		fi
-	fi
-}
diff --git a/sci-libs/cdf/cdf-3.5.0.2.ebuild b/sci-libs/cdf/cdf-3.5.0.2.ebuild
index 2a56dc164bf6..0742117a90c6 100644
--- a/sci-libs/cdf/cdf-3.5.0.2.ebuild
+++ b/sci-libs/cdf/cdf-3.5.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
 
 LICENSE="CDF"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples java ncurses static-libs"
 
 RDEPEND="
diff --git a/sci-libs/cdf/files/cdf-3.4-Makefile.patch b/sci-libs/cdf/files/cdf-3.4-Makefile.patch
deleted file mode 100644
index 4a6c0a0ef266..000000000000
--- a/sci-libs/cdf/files/cdf-3.4-Makefile.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -Nur cdf34_1-dist.orig/Makefile cdf34_1-dist/Makefile
---- cdf34_1-dist.orig/Makefile	2012-06-19 06:05:21.000000000 -0700
-+++ cdf34_1-dist/Makefile	2012-08-03 10:11:38.672992055 -0700
-@@ -715,17 +715,17 @@
- "PIC=$(PIC_$(OS)_$(ENV))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
- "LDx=$(LD_$(OS)_$(ENV))" \
--"COPTIONS=$(UCOPTIONS) $(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSshr_$(OS)_$(ENV))" \
- "SHAREDEXT=$(SHAREDEXT_$(OS))" \
--"LDOPTIONS=$(LDOPTIONS_$(OS)_$(ENV))" \
-+"LDOPTIONS=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))" \
- "AROPTIONS=$(AROPTIONS_$(OS))" \
- "RANLIB=$(RANLIB_$(OS))" \
- all
- 	@cd $(TOOLSsrcDIR); $(MAKE) \
- "CURSES=$(AND.$(CURSES).$(CURSES_$(OS)_$(ENV)))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
--"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
- "CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))" \
-@@ -735,9 +735,9 @@
- "FCx=$(FC_$(OS))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
- "SHARED=$(AND.$(SHARED).$(SHARED_$(OS)))" \
--"FOPTIONS=$(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
-+"FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
- "FOPTIONSld=$(FOPTIONSld_$(OS)) $(FOPTIONSld_$(OS)_$(ENV))" \
--"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
- "SHAREDEXT=$(SHAREDEXT_$(OS))" \
-@@ -773,12 +773,17 @@
- install.all: install.definitions install.include install.lib \
- 	     install.tools install.help_ notify.user copy.leapseconds
- 
--install.definitions: create.bin copy.definitions change.definitions
-+install.definitions: create.bin
- install.include: create.include copy.include
- install.tools: create.bin copy.tools
- install.help_: create.help copy.help
- 
- install.lib: create.lib copy.lib.a
-+	@if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \
-+	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
-+	 else \
-+	   $(NULL) ; \
-+	 fi
- 	@if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \
- 	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
- 	 else \
-@@ -884,8 +889,8 @@
- 	      cp $(INCsrcDIR)/cdfconfig.h $(INSTALLDIR)/include
- 
- copy.lib.so:
--	@echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
--	      cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
-+	@echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
-+	      cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
- 
- copy.lib.sl:
- 	@echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib
-@@ -1964,15 +1969,15 @@
- show.supported:
- 	@echo SHARED is $(SUPPORTED.$(SHARED_$(OS)))
- 	@echo CURSES is $(SUPPORTED.$(CURSES_$(OS)_$(ENV)))
--	@echo FOPTIONS=$(FOPTIONS_$(OS))
-+	@echo FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS))
- 	@echo FOPTIONSld=$(FOPTIONSld_$(OS))
- 	@echo SHAREDEXT=$(SHAREDEXT_$(OS))
--	@echo LDOPTIONSlibcdf=$(LDOPTIONS_$(OS)_$(ENV))
-+	@echo LDOPTIONSlibcdf=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))
- 	@echo RANLIB=$(RANLIB_$(OS))
- 	@echo FCx=$(FC_$(OS))
- 	@echo CCx=$(CC_$(OS)_$(ENV))
- 	@echo PIC=$(PIC_$(OS)_$(ENV))
--	@echo COPTIONS=$(COPTIONS_$(OS)_$(ENV))
-+	@echo COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))
- 	@echo COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))
- 	@echo CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))
- 	@echo SYSLIBSexe=$(SYSLIBSexe_$(OS)_$(ENV))
-diff -Nur cdf34_1-dist.orig/src/tools/Makefile cdf34_1-dist/src/tools/Makefile
---- cdf34_1-dist.orig/src/tools/Makefile	2012-06-15 09:22:16.000000000 -0700
-+++ cdf34_1-dist/src/tools/Makefile	2012-08-03 10:11:38.685992724 -0700
-@@ -35,10 +35,10 @@
- INCLUDEcdf= ../include
- 
- CC=$(CCx)
--CFLAGS=$(COPTIONS) -I$(INCLUDEcdf)
--CFLAGSld=$(COPTIONSld)
-+CFLAGS:=$(CFLAGS) $(COPTIONS) -I$(INCLUDEcdf)
-+CFLAGSld=$(LDFLAGS) $(COPTIONSld)
- 
--LIBCDFa=../lib/libcdf.a 
-+LIBCDFa=../lib/libcdf.so.3
- LIBs1=$(LIBCDFa) $(SYSLIBS)
- LIBs2=$(LIBCDFa) $(CURSESLIB) $(SYSLIBS)
- 
diff --git a/sci-libs/cgcode/Manifest b/sci-libs/cgcode/Manifest
index 7d980534be11..bca3a8b8b0e0 100644
--- a/sci-libs/cgcode/Manifest
+++ b/sci-libs/cgcode/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0-gentoo.patch 2363 BLAKE2B 80c0ea8dce38494c2b21fc79ff9f7e8121e4d529015a496d9af7acb87f0a50e39e0338af6884d7e662005d064fa9ca8e0893ed45e746cc44b3b2730f47750917 SHA512 2daaf89d275a325404ec6804389a45fe02361e4e517a146dd329b9155a2200b4151bb559f4aad87055ed5d6da4227e0a30683ba82cfa1bb5f54c6cc40a76aea7
 DIST cgcode-1.0.tar.gz 77941 BLAKE2B bb062991d4bca842225b357a4bfd24edd2293ace224de141dc5782da82b3fb357d79cc8e06d90b948a8016fd726559469ab032b87cd8a678f10188079804295c SHA512 df76a2f8a0c00924af3d6933487a363fe23ded8281b392d40f240074c8643219f99dda9b6b6d515a281827d657a27ab06416ce152e65c5fead7549bb96be9621
-EBUILD cgcode-1.0-r2.ebuild 773 BLAKE2B 3733a46c4cede015ca3b55bd59a652ab8f26c619475148e12746ad0c93080f83ee6e57c6a122d8ea04578bb85c44edd423f4adc432e5a4829267ee6d6f428563 SHA512 a2bae62a4a82aca54d10e4ccbe941deb78f59eaa743458ff620729f298debeaf9af093e39e1260a8a7f594328980ec8081dc44c24a8d258b322362c4fa3fce23
+EBUILD cgcode-1.0-r2.ebuild 878 BLAKE2B 4265f193d1e375a4c23d82e34a69d145a4d2fe0932d22f179414ba1ed300d49ebeee561e996e449388bd6a3c971aec2dbb0d047935a73c6cad52b51e4e201600 SHA512 31d3f9af7fb4fea53253abf72ba84b85cfbbb3cc0ab9c404d8ccf2252e846b4a5f03aabc5aafd5308b61dea7d0b5bc8486206949997dddd9ee7abd2923464dbb
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/cgcode/cgcode-1.0-r2.ebuild b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
index 90160c444ea9..931a56954eb3 100644
--- a/sci-libs/cgcode/cgcode-1.0-r2.ebuild
+++ b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils fortran-2 toolchain-funcs
+inherit eutils fortran-2 flag-o-matic toolchain-funcs
 
 DESCRIPTION="Conjugate gradient Codes for large sparse linear systems"
 HOMEPAGE="http://fetk.org/codes/cgcode/index.html"
@@ -23,6 +23,10 @@ S="${WORKDIR}"/${PN}
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
 
+	# GCC 10 workaround
+	# bug #722000
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
 	cat >> make.inc <<- EOF
 	F77 = $(tc-getFC)
 	FFLAGS = ${FFLAGS}
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 04af77d253da..663c80ef12fc 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,5 +1,5 @@
 DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab
 DIST cholmod-3.0.14.tar.bz2 696981 BLAKE2B 855927c18833235b3f0835bfba455d83957b9161c0ee885c2d31d126f0f473067f55bcf2cfa163c72efb5de573589ffa54b484a8cf89bc44c9dbf64d43fda5d9 SHA512 f8c12fc3c8787be38bca6c6f84a8279c1380fbe4fabbfba754235fdb042d7050bfb7b5a21ea87ef59dbd5184d28e8cb7667966c38f5dcad78fe8d47111896a3c
 EBUILD cholmod-3.0.13.ebuild 1660 BLAKE2B 6f53739a8ea19773b34526ece750fe0e8c2d3ffa221058b4e201bbe6180c55535c9edf902b4a8c576343e5e22cbd3cbb03dd4594a6455d438cacd81450f1f0c0 SHA512 bbd5b01ef11bddcb0d10bea1917ce1b25c6d64321ecae25c63f5070d392f71c62e687847bbae1cc41fccf36db3295dffdf284f47d17de8979f550830037bebd8
-EBUILD cholmod-3.0.14.ebuild 1638 BLAKE2B 968001fa093308f7eb371f2fb950df835b15993f6bffbe5e16c84f2dd10aa6580c718a7135f1fef79222a738c4f7adf693a29aa066742492fdcaa07c54e74241 SHA512 9e65c66adece13aebef04a6ba4c746f149e0c61c5c20ce2875a3b58a1a7321eb6b3078416fb138325e61a115901bfa9ba5ad32e05e9cf3702ee7ecd49e2758da
+EBUILD cholmod-3.0.14.ebuild 1635 BLAKE2B 9e662356e5f6d8c240ea96103c50571b0731806b5bc98ac43af836bd844c7cbe17a06e8de50ce5c1b9b461457a212e991335f9a15dbab1288959b206dced4154 SHA512 c83648e864f4897ce8b6516231f97bddf627ae93f1a472e5dd1a3f096d2fbff3f42d8d61910658be4a74077311b4fc52b000c1c1213566de393b57f85c21ed31
 MISC metadata.xml 807 BLAKE2B e5a0fd3e5c5466397e9972ece2046b051f3b8fba8141e9e3a91b8ea474007b8a38998c16b3462e362d3713748620e41d2e35196d53d815c0865df7a494b3c104 SHA512 84f642bfb6676da3f9c66dddd635661c259e6182bf12c567655961c902189183570889630988f582c6913ddfa621944f0db4c22c7e9b8a715d1da8fb2fdd64f4
diff --git a/sci-libs/cholmod/cholmod-3.0.14.ebuild b/sci-libs/cholmod/cholmod-3.0.14.ebuild
index 891701b68217..30450952421b 100644
--- a/sci-libs/cholmod/cholmod-3.0.14.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc +lapack +matrixops +modify +partition"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/cifparse-obj/Manifest b/sci-libs/cifparse-obj/Manifest
index db1326592083..0843364823e6 100644
--- a/sci-libs/cifparse-obj/Manifest
+++ b/sci-libs/cifparse-obj/Manifest
@@ -1,11 +1,5 @@
-AUX cifparse-obj-7.025-gcc4.3.patch 3926 BLAKE2B 707f17d0e497be6ff547485352fb41f17e0a6dc4731e42c1949171059a7738dfe634f3cc7546be4cebb7400ecb6a9316b8b4eb0c0ec9ffa9df48502e9b4df111 SHA512 4ae441c3b576817e0302f69cceb1dd04f17bfff5226c888557732c49f4dac336d12014dc699e2703a248597eb04a118c2037a3defc18e0e3aed1fa73dd5ba892
-AUX cifparse-obj-7.025-gcc4.7.patch 2339 BLAKE2B 048f51e364d20c5f976991e3ed811e8cdbc044d255429bfe46a74d45a2547783d728a2abf0afad0bee2393407a14974a3d5446615eef95acac7dd02e6fa747c7 SHA512 f4ca881116a0bfb5688d441f0a29abd81fc173bb496b6640128054fc2307b88a5a02d4ebcc6c9203af091302a104474b0767f9373c334955a691a865853efd03
 AUX cifparse-obj-7.025-gcc5_6.patch 524 BLAKE2B 5cf4ce9f5c0615636b5701cd64613e01f0ac130ba4166fd12a8b92d7ffffc368fd5666ebdd8ac9cd983359a97ed4294e6f66e0984b3c826c56ecfa8b130cadef SHA512 f2469b15eb74192b61b78c165249e8b953c58d0f7478d38f1bebf8c2c884e95ad42ba18af23b1ea7e4915979b5d4f70c2637e083a14a2c40e20f83a09acf616e
-AUX cifparse-obj-7.025-makefile.patch 4405 BLAKE2B f94195c9256df856ac91df87eb033c2fbef3f5e3f6b558761d1cf09f8bb0db02432a3a2063950f9d7490a1d7894921ae3490379472296b4eabd66b72b8842c46 SHA512 8e74758f8ff8993a6e304a0cf80e59f60d0d162aee8f3a798552534f51055406d35c2bc1c6b91b6d9e41ff2d2666ea1d5580c71a66f1c3485c7e86deee169c69
-AUX cifparse-obj-7.025-strncasecmp-declaration.patch 477 BLAKE2B 51d1da67dfbac2c38b463dbd713d36f7dda93fab6b5bc13f29b62cbbd06de05453053906d95bbad20a9144db6f7fe1340ab306d1a10d32c8d477dcfaf3a0f3a4 SHA512 536e1f22c82cc88a0f3e24e5785b393ac7b602eb60f05da581afe7f79a7921e3f9e60463f9fec0190d3b85bc222ccc9782380f3c12dbd85172da7d2ccef5e5d0
 AUX cifparse-obj-7.105-makefile.patch 3790 BLAKE2B 11372dceab4e570e420bf639020769a1b1fb6f956a4ff75befcbb0016053d616cf271946ae0e6bb5667dffef863baa246f75fc34d36e80ddeb7e7c17a5befae7 SHA512 310f13e88f7dfb19ac2bdc003a2ab2f095583a90694d27232c1ab15a298bc88313e89590e062274da10d5eaba53f6bfcb3341d1d4f7d1c388520c75643364d61
-DIST cifparse-obj-v7.025-prod-src.tar.gz 928484 BLAKE2B 4f510f4826e235ecd87d81d51ceef84b717bb0c174f4a263cae44765bd0ddb35e2bb6edce1c5cadcf18c5e9892630f43cda2ca004f09d84dc44499d457eef5c1 SHA512 bf5d6b55592aca8678396eb9819f5bd7bff4d912410590dfb750c9ad85bdcdbd251425c45b67e2db027a8ce8d028b77c91edcc5333279ed1190f6049c01f5cc9
 DIST cifparse-obj-v7.105-prod-src.tar.gz 931151 BLAKE2B c362fc528e0c88b41ef8433c6d0235ae0bd4055c8c1704d2f1be8ba8aa27a7526b3d19172f2a4ffda79c323140a54dcb2b0a2eb78f30780473c9bcfb2ab6c6f9 SHA512 d626aa055bdd6762eda4b5b04121f37fff3bc09460b12cd6cb80566545d23e5c08a8ad54fa184076932d2cff38aa9d91fa659fbe9a70d4a07b8b1677c28549f4
-EBUILD cifparse-obj-7.025-r1.ebuild 1192 BLAKE2B 00bf1757aa801008cd85c3b736417e25dacf7ebdb5432811b74e49b410ed78bd65b5e566bec925dc6b88c28ca4b2c811a8fdd673213704eaedf64292c73e984c SHA512 f2e308f1a1c9c5943a0be7fe1a835e0ade61f236db1a7ddfe6ec50c18faeb417fd81a07e772d18630dead95b214dfd77f5b374c5bee5536bc05afd8b385c6544
-EBUILD cifparse-obj-7.105.ebuild 1126 BLAKE2B e978f7d66b56875b85e22e56ea01141067006f0c91bdbab7416a72daaeedb5e2730827ef53d07a2362d5a16a26c77e7ef0a25ec8701db72403d09dc3e465f659 SHA512 8bb79d8f7232fb56fd6b7bf920c079c0e47f849f1cb2071fb17f23d912850c1543d34430a301041011fa9fe4f37f543a46e7754014269e510b1c90e52c82127e
+EBUILD cifparse-obj-7.105.ebuild 1123 BLAKE2B f288c503e0d8aca32b17d762c77f121ef1108417e3dde60b17e5833f2348cc953d8f0e16f5dcb04c4d93e6b6245c76d14c6ad4b4999f80fb26c6a52793069f84 SHA512 7216b6dce971619f3cd346ae7ad88ea6f56f1e5b4d241d4bb7b7ab1fa119710ebd664bbe0598d9f6d1dd7f909f33e8f870c2051551c727661f3f2f4e3fcfcef3
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild b/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
deleted file mode 100644
index 44d186a798cc..000000000000
--- a/sci-libs/cifparse-obj/cifparse-obj-7.025-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-MY_P="${PN}-v${PV}-prod-src"
-
-DESCRIPTION="Provides an object-oriented application interface to information in mmCIF format"
-HOMEPAGE="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/index.html"
-SRC_URI="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/source/${MY_P}.tar.gz"
-
-LICENSE="PDB"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-gcc4.3.patch \
-		"${FILESDIR}"/${P}-gcc4.7.patch \
-		"${FILESDIR}"/${P}-gcc5_6.patch \
-		"${FILESDIR}"/${PN}-7.025-strncasecmp-declaration.patch
-
-	sed \
-		-e "s:^\(CC=\).*:\1$(tc-getCC):g" \
-		-e "s:^\(CCC=\).*:\1$(tc-getCXX):g" \
-		-e "s:^\(F77=\).*:\1${FORTRANC}:g" \
-		-e "s:^\(F77_LINKER=\).*:\1${FORTRANC}:g" \
-		-e "s:-static::g" \
-		-i "${S}"/etc/make.* || die "Failed to fix makefile"
-}
-
-src_compile() {
-	# parallel make fails
-	emake -j1
-}
-
-src_install() {
-	dolib.a lib/*
-	insinto /usr/include/${PN}
-	doins include/*
-}
diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
index 45524a9bd5cb..c575c3c692e2 100644
--- a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
+++ b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/source/${MY_P}.tar.gz"
 
 LICENSE="PDB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.3.patch b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.3.patch
deleted file mode 100644
index 1715f493a6e0..000000000000
--- a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.3.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -Naur cifparse-obj-v7.025-prod-src/cif-file-v1.0/src/CifFile.C cifparse-obj-v7.025-prod-src.new/cif-file-v1.0/src/CifFile.C
---- cifparse-obj-v7.025-prod-src/cif-file-v1.0/src/CifFile.C	2008-02-06 07:17:50.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/cif-file-v1.0/src/CifFile.C	2008-09-03 09:36:41.000000000 -0400
-@@ -153,6 +153,7 @@
- // VLAD - Carefully examine all methods that accept with, for cases where
- // with is 0. This may happen if the value is empty !!
- 
-+#include <algorithm>
- #include "GenString.h"
- #include "CifString.h"
- #include "regex.h"
-diff -Naur cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest3.C cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest3.C
---- cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest3.C	2008-02-06 07:17:51.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest3.C	2008-09-03 09:40:12.000000000 -0400
-@@ -1,4 +1,5 @@
- #include <iostream>
-+#include <cstdlib>
- #include "GenString.h"
- #include "CifFile.h"
- 
-diff -Naur cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest7.C cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest7.C
---- cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest7.C	2008-02-06 07:17:51.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest7.C	2008-09-03 09:40:42.000000000 -0400
-@@ -3,6 +3,7 @@
- */
- #include "CifFile.h"
- #include <iostream>
-+#include <cstdlib>
- 
- void FillTestTable(ISTable *s);
- void TwoCifFileObj();
-diff -Naur cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest8.C cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest8.C
---- cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/FOtest8.C	2008-02-06 07:17:51.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/FOtest8.C	2008-09-03 09:41:06.000000000 -0400
-@@ -1,6 +1,7 @@
- /* Test for reading binary files of two different versions*/
- #include "CifFile.h"
- #include <iostream>
-+#include <cstdlib>
- 
- 
- #define FALSE 0
-diff -Naur cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/SdbReader.C cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/SdbReader.C
---- cifparse-obj-v7.025-prod-src/cifparse-test-v1.0/src/SdbReader.C	2008-02-06 07:17:51.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/cifparse-test-v1.0/src/SdbReader.C	2008-09-03 09:41:50.000000000 -0400
-@@ -1,4 +1,5 @@
- #include <iostream>
-+#include <cstdlib>
- #include "CifFile.h"
- 
- 
-diff -Naur cifparse-obj-v7.025-prod-src/common-v4.5/src/GenString.C cifparse-obj-v7.025-prod-src.new/common-v4.5/src/GenString.C
---- cifparse-obj-v7.025-prod-src/common-v4.5/src/GenString.C	2008-02-06 07:17:49.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/common-v4.5/src/GenString.C	2008-09-03 09:32:17.000000000 -0400
-@@ -138,7 +138,7 @@
- POSSIBILITY THEREOF. 
- */
- 
--
-+#include <cstring>
- // Needed, since some platforms do not define std:: elsewhere
- #include <ctype.h>
- 
-diff -Naur cifparse-obj-v7.025-prod-src/tables-v8.0/src/ISTable.C cifparse-obj-v7.025-prod-src.new/tables-v8.0/src/ISTable.C
---- cifparse-obj-v7.025-prod-src/tables-v8.0/src/ISTable.C	2008-02-06 07:17:50.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/tables-v8.0/src/ISTable.C	2008-09-03 09:35:57.000000000 -0400
-@@ -150,6 +150,8 @@
- #include <sstream>
- #include <iostream>
- #include <iomanip>
-+#include <algorithm>
-+#include <climits>
- 
- #include "Exceptions.h"
- #include "GenString.h"
-diff -Naur cifparse-obj-v7.025-prod-src/tables-v8.0/src/ITTable.C cifparse-obj-v7.025-prod-src.new/tables-v8.0/src/ITTable.C
---- cifparse-obj-v7.025-prod-src/tables-v8.0/src/ITTable.C	2008-02-06 07:17:50.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/tables-v8.0/src/ITTable.C	2008-09-03 09:35:29.000000000 -0400
-@@ -150,6 +150,8 @@
- #include <sstream>
- #include <iostream>
- #include <iomanip>
-+#include <algorithm>
-+#include <climits>
- 
- #include "Exceptions.h"
- #include "GenString.h"
diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.7.patch b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.7.patch
deleted file mode 100644
index b828ae618caa..000000000000
--- a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.7.patch
+++ /dev/null
@@ -1,64 +0,0 @@
- common-v4.5/src/mapped_ptr_vector.C |   14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/common-v4.5/src/mapped_ptr_vector.C b/common-v4.5/src/mapped_ptr_vector.C
-index 0ffff35..993d0b9 100644
---- a/common-v4.5/src/mapped_ptr_vector.C
-+++ b/common-v4.5/src/mapped_ptr_vector.C
-@@ -256,12 +256,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(T* inP,
-     _vector.push_back(inP);
- 
-     typename tIndex::value_type valuePair(inP->GetName(),
--      make_pair(_vector.size() - 1, fileIndex));
-+      std::make_pair(_vector.size() - 1, fileIndex));
- 
-     _index.insert(valuePair);
- 
-     _currentName = inP->GetName();
--    _currentIndices = make_pair(_vector.size() - 1, fileIndex);
-+    _currentIndices = std::make_pair(_vector.size() - 1, fileIndex);
- 
- }
- 
-@@ -274,12 +274,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(const string& name,
-     _vector.push_back(NULL);
- 
-     typename tIndex::value_type valuePair(name,
--      make_pair(_vector.size() - 1, fileIndex));
-+      std::make_pair(_vector.size() - 1, fileIndex));
- 
-     _index.insert(valuePair);
- 
-     _currentName = name;
--    _currentIndices = make_pair(_vector.size() - 1, fileIndex);
-+    _currentIndices = std::make_pair(_vector.size() - 1, fileIndex);
- }
- 
- 
-@@ -447,7 +447,7 @@ void mapped_ptr_vector<T, StringCompareT>::erase(const string& name)
-     if (is_equal(_currentName, name, keyComp))
-     {
-         _currentName.clear();
--        _currentIndices = make_pair(_vector.size(), (unsigned int)0);
-+        _currentIndices = std::make_pair(_vector.size(), (unsigned int)0);
-     }
- 
- }
-@@ -532,7 +532,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic
-     if (_vector.empty())
-     {
-         // Empty container. Return invalid index.
--        return(make_pair(_vector.size(), (unsigned int)0));
-+        return(std::make_pair(_vector.size(), (unsigned int)0));
-     }
- 
-     typename tIndex::key_compare keyComp = _index.key_comp();
-@@ -556,7 +556,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic
-         else
-         {
-             // Not found. Return invalid index.
--            return(make_pair(_vector.size(), (unsigned int)0));
-+            return(std::make_pair(_vector.size(), (unsigned int)0));
-         } 
-     }
-     
diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-makefile.patch b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-makefile.patch
deleted file mode 100644
index 9e9a61788ddf..000000000000
--- a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-makefile.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -Naur cifparse-obj-v7.025-prod-src/etc/make.platform.gnu3 cifparse-obj-v7.025-prod-src.new/etc/make.platform.gnu3
---- cifparse-obj-v7.025-prod-src/etc/make.platform.gnu3	2008-02-06 07:17:49.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/etc/make.platform.gnu3	2008-09-03 09:18:55.000000000 -0400
-@@ -107,8 +107,8 @@
- C_WARNINGS=$(WARNINGS)
- 
- # C compiler flags
--CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
--CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-+CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
-+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-                $(INCLUDES) 
- 
- ## C++ compiler
-@@ -128,13 +128,13 @@
- EXT=C
- 
- # C++ compiler flags
--C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-+C++FLAGS=$(CXX_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-         $(INCLUDES)
--C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-+C++FLAGS_NONANSI=$(CXX_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-                  $(DEFINES) $(INCLUDES)
- # C++FLAGS_RELAXED should be set to avoid warnings reported by third party
- # source code that is not maintained by PDB
--C++FLAGS_RELAXED=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) $(DEFINES) \
-+C++FLAGS_RELAXED=$(CXX_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) $(DEFINES) \
-         $(INCLUDES)
- 
- ## Fortran compiler
-@@ -144,7 +144,7 @@
- F77=f77
- 
- # Fortran compiler flags
--FFLAGS=-O -u
-+FFLAGS=$(F_OPT)
- 
- # Additional Fortran libraries
- F77LIBS=
-@@ -157,7 +157,7 @@
- STATIC_LINKING=-static
- 
- # Linker flags
--LDFLAGS=$(ABI) -w $(STATIC_LINKING)
-+LDFLAGS=$(ABI) -w $(STATIC_LINKING) $(LD_OPT)
- LDFLAGS_NO_STATIC=$(ABI) -w
- 
- # Fortran linker
-diff -Naur cifparse-obj-v7.025-prod-src/etc/make.platform.gnu4 cifparse-obj-v7.025-prod-src.new/etc/make.platform.gnu4
---- cifparse-obj-v7.025-prod-src/etc/make.platform.gnu4	2008-02-06 07:17:49.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/etc/make.platform.gnu4	2008-09-03 09:20:16.000000000 -0400
-@@ -107,12 +107,12 @@
- C_WARNINGS=$(WARNINGS)
- 
- # C compiler flags
--CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
--CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-+CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
-+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
-                $(INCLUDES) 
- 
- ## C++ compiler
--## This part defines C++ compiler information
-+
- 
- # C++ compiler executable
- CCC=g++
-@@ -128,13 +128,13 @@
- EXT=C
- 
- # C++ compiler flags
--C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-+C++FLAGS=$(CXX_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
-         $(INCLUDES)
--C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-+C++FLAGS_NONANSI=$(CXX_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
-                  $(DEFINES) $(INCLUDES)
- # C++FLAGS_RELAXED should be set to avoid warnings reported by third party
- # source code that is not maintained by PDB
--C++FLAGS_RELAXED=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) $(DEFINES) \
-+C++FLAGS_RELAXED=$(CXX_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) $(DEFINES) \
-         $(INCLUDES)
- 
- ## Fortran compiler
-@@ -144,7 +144,7 @@
- F77=f77
- 
- # Fortran compiler flags
--FFLAGS=-O -u
-+FFLAGS=$(F_OPT)
- 
- # Additional Fortran libraries
- F77LIBS=
-@@ -157,7 +157,7 @@
- STATIC_LINKING=-static
- 
- # Linker flags
--LDFLAGS=$(ABI) -w $(STATIC_LINKING)
-+LDFLAGS=$(ABI) -w $(STATIC_LINKING) $(LD_OPT)
- LDFLAGS_NO_STATIC=$(ABI) -w
- 
- # Fortran linker
-diff -Naur cifparse-obj-v7.025-prod-src/Makefile cifparse-obj-v7.025-prod-src.new/Makefile
---- cifparse-obj-v7.025-prod-src/Makefile	2008-02-06 07:17:48.000000000 -0500
-+++ cifparse-obj-v7.025-prod-src.new/Makefile	2008-09-03 09:19:12.000000000 -0400
-@@ -62,7 +62,7 @@
- 		echo "------------------------------------------------------------"; \
- 		echo "**** Making $$libdir ****"; \
- 		echo "------------------------------------------------------------"; \
--		(cd $$libdir && $(MAKE) -f $(MAKEFILE) "OPT=-O" install) || exit 1; \
-+		(cd $$libdir && $(MAKE) -f $(MAKEFILE) C_OPT="${CFLAGS}" CXX_OPT="${CXXFLAGS}" F_OPT="${FFLAGS}" LD_OPT="${LDFLAGS}" install) || exit 1; \
- 	done
- 
- debug:
diff --git a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-strncasecmp-declaration.patch b/sci-libs/cifparse-obj/files/cifparse-obj-7.025-strncasecmp-declaration.patch
deleted file mode 100644
index 9222ff27699e..000000000000
--- a/sci-libs/cifparse-obj/files/cifparse-obj-7.025-strncasecmp-declaration.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Remove incorrect prototypes of the 'strcasecmp' and 'strncasecmp' functions.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594054
-
---- a/misclib-v2.2/include/ndb_misclib.h
-+++ b/misclib-v2.2/include/ndb_misclib.h
-@@ -167,10 +167,6 @@
- #define NDB_MSG_BUFFER_LEN    200000
- 
- 
--#if !defined(HAVE_STRCASECMP)
--int strcasecmp (const char *s1, const char *s2);
--int strncasecmp (const char *s1, const char *s2, unsigned int n);
--#endif 
- /*
-  *   ndb_misclib.c prototypes
-  */
diff --git a/sci-libs/coinor-alps/Manifest b/sci-libs/coinor-alps/Manifest
index a9e1a410a711..ccf97e781142 100644
--- a/sci-libs/coinor-alps/Manifest
+++ b/sci-libs/coinor-alps/Manifest
@@ -1,3 +1,3 @@
-DIST Alps-1.5.4.tgz 5691940 BLAKE2B 9a1d78d8957a4fd2156d35ba348f7db442bf6f6128031b9dd0d2b0c1176e5eb408208d3c90fb8563c39efbf0f4aaa9daea705f25ed711a922ab32f1e1d0b8027 SHA512 eace2f0e3dde682ee92b8e185ba6ea226a681dbcecb5fcf5258334e6deed89705b2c61821896b07323459fbd8575a31fa91c3342becbc9f6173efdf094d39555
-EBUILD coinor-alps-1.5.4.ebuild 1448 BLAKE2B 3e078b99faf76bfd2dcacbc71b402f23e31077b4b0a9baf59efc5b5bcc59a1291b2a4c2199bb97d452478f0968a5c09392ecbe503060624c65856a565b04753d SHA512 ab8e3c40a679cdbd5ba0e1dcfd74f2ca6ab67a37d4c9f9f85af7aacd083a2013a85075b61ca8b1fc74b9bdfc1a7a76b99ea39221eee7c03db095b9a882418bd4
-MISC metadata.xml 682 BLAKE2B 4333709b145e1a154188403881f2ac6f32562460edd086ad8f5f805a8cc26f4ec4aa3bf996140a2f221ed01cfb27f4545c2de3a2de1180eb8c4b95fbac7035d4 SHA512 c25cfee7ccc30ca49382c3f142cdf7aa26ab0b6bd4e9fae86e618b45ec03c13b81ebd4cb7567fae51ea64113aec47b7d8ba341722c5f41af595437a2193e1fb7
+DIST coinor-alps-1.5.7.tar.gz 893834 BLAKE2B af881b9bd7db8b323ba7c7bd82f9180d3685a1b3d3b30b7b20c0d9c5d539caa8fb13e11b866f4f61e9baaf98d32e17953b3bdb408c32fc6aea20e3d83be57078 SHA512 7c3d838bfa8366f0a440dfe1cc9fbff1ca23e6528c3d89348fb4df8bab50b1a7c666523cde20ecd9f09ad54e599ffed1e6ed48631078dbd4d6885e2b10e9e495
+EBUILD coinor-alps-1.5.7.ebuild 1241 BLAKE2B 8a499ada926dd90156c76b101316a9ca5c1589a4e3f0c832ec01d7b0ba912a3f8772f0b6319cdd01f2e0391f5613d1279d18e1aed87adbdeeb79306dac5a3325 SHA512 0c50faa75cf3228b9fe7edaf21048c7f4e98c6751d66e1cbaf55c49ab9d2d6d1bd0ce4a9565001fa28accbaee2763bda80c6f6b661e027756f55674c691e11e7
+MISC metadata.xml 766 BLAKE2B ff46d416d89804d29fc2479d7a0e11e818a13f29182d42a688ce8a29242db830872d8a9b3e903dcabc6155e38a9eb83283392d5e36800872b7fbcf40e43e2493 SHA512 f2eaa0678859a3a7bf8b353c4da7870b7e850926c6dc28c5108161dc2d5adf1a0a753ab08367967afea9f065932ddd2ac73103abeb7cd42d394f9d91b5ec40db
diff --git a/sci-libs/coinor-alps/coinor-alps-1.5.4.ebuild b/sci-libs/coinor-alps/coinor-alps-1.5.4.ebuild
deleted file mode 100644
index fec354dd49a5..000000000000
--- a/sci-libs/coinor-alps/coinor-alps-1.5.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-
-MYPN=Alps
-
-DESCRIPTION="COIN-OR Framework for implementing parallel graph search algorithms"
-HOMEPAGE="https://projects.coin-or.org/CHiPPS/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="CPL-1.0"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-utils:=
-	sci-libs/coinor-clp:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample sci-libs/coinor-cgl )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	default
-	# as-needed fix
-	# hack to avoid eautoreconf (coinor has its own weird autotools)
-	sed -i \
-		-e 's:\(libAlps_la_LIBADD.*=\).*:\1 @ALPSLIB_LIBS@:g' \
-		src/Makefile.in || die
-	# bug for later versions of subversions
-	sed -i \
-		-e 's/xexported/xexported -a "x$svn_rev_tmp" != "xUnversioned directory"/' \
-		configure || die
-}
-
-src_configure() {
-	PKG_CONFIG_PATH+="${ED}"/usr/$(get_libdir)/pkgconfig
-	export PKG_CONFIG_PATH
-	econf \
-		--enable-dependency-linking \
-		$(use_with doc dot) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake all $(usex doc doxydoc "")
-}
-
-src_install() {
-	default
-	use examples && dodoc -r examples/
-	use doc && dodoc -r doxydoc/html/
-
-	prune_libtool_files --all
-}
diff --git a/sci-libs/coinor-alps/coinor-alps-1.5.7.ebuild b/sci-libs/coinor-alps/coinor-alps-1.5.7.ebuild
new file mode 100644
index 000000000000..d4c00fae9301
--- /dev/null
+++ b/sci-libs/coinor-alps/coinor-alps-1.5.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR Framework for implementing parallel graph search algorithms"
+HOMEPAGE="https://projects.coin-or.org/CHiPPS/"
+SRC_URI="https://github.com/coin-or/CHiPPS-ALPS/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CHiPPS-ALPS-releases-${PV}/Alps"
+
+LICENSE="EPL-1.0"
+SLOT="0" # formerly 0/3, upstream went from so.3 to so.0
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sci-libs/coinor-utils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-cgl )"
+
+src_prepare() {
+	default
+	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
+	sed -i '/--libs.*addlibs.txt/d' Makefile.in || die
+}
+
+src_configure() {
+	econf $(use_with doc dot)
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc '')
+}
+
+src_test() {
+	# Needed given "make check" is a noop and it skips the working one.
+	emake test
+}
+
+src_install() {
+	default
+	dodoc -r examples
+	use doc && dodoc -r doxydoc/html
+
+	# Duplicate or irrelevant files.
+	rm -r "${ED}"/usr/share/coin/doc || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-alps/metadata.xml b/sci-libs/coinor-alps/metadata.xml
index a41a7280a461..6034b7e66d97 100644
--- a/sci-libs/coinor-alps/metadata.xml
+++ b/sci-libs/coinor-alps/metadata.xml
@@ -13,4 +13,7 @@
 		layer of a hierarchy consisting of implementations of various tree
 		search algorithms for specific problem types.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/CHiPPS-ALPS</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-bcp/Manifest b/sci-libs/coinor-bcp/Manifest
index 6c60d01b189c..f11f4dfc112a 100644
--- a/sci-libs/coinor-bcp/Manifest
+++ b/sci-libs/coinor-bcp/Manifest
@@ -1,3 +1,3 @@
-DIST Bcp-1.3.8.tgz 7086225 BLAKE2B 755aeafb9412ed94c7227e6986c2a7e5a26e4bea8084bcd09b517cd9794fe456195cb664f8d341625e8a86552c6ed1ab470c99c8a567d34be9be06ead51cbff4 SHA512 c599cc60df37cab32cfbf24522efaababbdd2de6144c316390f5e0481863ffd6aec016f97188a610ae6aca8d4e5b1b8088a35bc81bd3448fadb1727a9e9663dd
-EBUILD coinor-bcp-1.3.8.ebuild 1214 BLAKE2B 4aeff992510b6bf9deed2de04431272801ddb562762ef74fd0f19af520c34edbbdbdb16397cbc494d9c97d9196e488b4c059475c0a41875f769f27bf67efdc8f SHA512 db07289455d303fd2887b0c782a1733c78f9383d4d2f17d4a5ba7e7c5edfc33e7befffe40eb72ad00f06da4ba1909dcc98d41934b77315c60f1f49bd3f79f760
-MISC metadata.xml 678 BLAKE2B 36e740bad7d43c6b0ceee608d4fc36d05ea7d48b17be36cca19ee17650286243c7af2990b71348ac8e3ceeb0b8e023bbbfd993e536da93896718770e20b2c4e0 SHA512 87b752c9aee7c212f00c4af9b4fb8b11ef7135dfada88f190528f339ad0a63570e2d57add7c81fecb8a65833039705fab2ac6bad8433eef66100a4f7f3967c05
+DIST coinor-bcp-1.4.4.tar.gz 1983573 BLAKE2B 79265c0336ca719b417825df2f27e88c08c314e599693e8886170fe69755b3272aa05469bfc069660c979e4a273ca63a25fc4d3a86a695838039121fa98a14bd SHA512 066ad631a67ccf33eebc175451f4734cbf190cb4fd9866dec987d80688a69400b76415de65ee9399b1a8ccfdf3bf3af307245610481a6d673598bc157c3963bc
+EBUILD coinor-bcp-1.4.4.ebuild 1286 BLAKE2B cacfeb014ef35c6c25d7296bce2bb975d686a1ae1ee79fba63ff3f20734283aa2b597a25994ddde5083de9a9b1b74eecb8a90de77c88a24593b7c18a323918db SHA512 6a7e1253bb1635ac0811c64162a915c5ed15d4868d561cbcbdcdd5183145e87799a6c5204136eb3303080436e2039e6552cd1e6a9cddcaf87df9c26c901f7600
+MISC metadata.xml 754 BLAKE2B 42bb77241c68a9f2e81c4a50350fd25d42ccbab57cefc743ea0eea119b6ef530d512c89fcfc598a1f0b5ddb67ae8477c93cb61b7bddd7c242bff20acff4c57d3 SHA512 9dc6b85158dfe5ccb8820338f45c8ee1b1b7ce926ec7a41b3dae25210b99de72b87d8560e7f4a1a0772a35f5cabc2fa261fc0044e0d4c5c826f0c61034b8b6cd
diff --git a/sci-libs/coinor-bcp/coinor-bcp-1.3.8.ebuild b/sci-libs/coinor-bcp/coinor-bcp-1.3.8.ebuild
deleted file mode 100644
index 3d6c69d92d7a..000000000000
--- a/sci-libs/coinor-bcp/coinor-bcp-1.3.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=Bcp
-
-DESCRIPTION="COIN-OR Branch-Cut-Price Framework"
-HOMEPAGE="https://projects.coin-or.org/Bcp/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="CPL-1.0"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-cgl:=
-	sci-libs/coinor-clp:=
-	sci-libs/coinor-vol:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-		$(use_with doc dot)
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && newdoc doc/man.pdf manual.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild b/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild
new file mode 100644
index 000000000000..b4b5f58fbe9e
--- /dev/null
+++ b/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR Branch-Cut-Price Framework"
+HOMEPAGE="https://projects.coin-or.org/Bcp/"
+SRC_URI="https://github.com/coin-or/Bcp/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Bcp-releases-${PV}/Bcp"
+
+LICENSE="CPL-1.0"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:=
+	sci-libs/coinor-vol:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+
+src_prepare() {
+	default
+	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
+	sed -i '/--libs.*addlibs.txt/d' Makefile.in || die
+}
+
+src_configure() {
+	econf $(use_with doc dot)
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc '')
+}
+
+src_test() {
+	# Unneeded for Bcp given, while "make check" exists, it fails unlike
+	# other coinor-*'s noop. Kept as safety not to lose tests in bumps.
+	emake test
+}
+
+src_install() {
+	default
+	dodoc -r examples
+	use doc && dodoc -r doxydoc/html
+
+	# Duplicate or irrelevant files.
+	rm -r "${ED}"/usr/share/coin/doc || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-bcp/metadata.xml b/sci-libs/coinor-bcp/metadata.xml
index 62cd7e19b452..c3a5ce296e0c 100644
--- a/sci-libs/coinor-bcp/metadata.xml
+++ b/sci-libs/coinor-bcp/metadata.xml
@@ -13,4 +13,7 @@
 		the implementational effort. involved with implementing a branch and
 		bound framework from scratch.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/Bcp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-bcps/Manifest b/sci-libs/coinor-bcps/Manifest
index e9b6b95e5933..92b072e9d654 100644
--- a/sci-libs/coinor-bcps/Manifest
+++ b/sci-libs/coinor-bcps/Manifest
@@ -1,3 +1,3 @@
-DIST Bcps-0.93.10.tgz 6270009 BLAKE2B 45372ae18a3f4a7e75d4f71fa6ba411317fc282415390f6e11181543bdac254c5820e8544ffd6c43e8dcb507a8dc5329a42b9cbfc23256a395cc73bc3a8d631b SHA512 4e9348dc1bf75fd9afb74078b55ae0f9a84a99236886552256d7548013c8af4695a4fcc2787ffb0228eba2a870b1cb78c068234048c8650f7d504e1e8d17c549
-EBUILD coinor-bcps-0.93.10.ebuild 1155 BLAKE2B 57ddeff64a875581b70de517d015751a3a204b41b66c9ef4408c56cd9c760052734865f8bf30d91db2c76c124c68b58aa38c6a0cd0b0306af4597354b2db1b61 SHA512 59506eac73eca4c2cba6e3dde394b29a58d1926ab4ff541bb1346eefd5104f276150c05509967f48c702c219187bd7a10cbd0c9270d2a34bfcbad746f6f7349b
-MISC metadata.xml 671 BLAKE2B 5c13062c4b3e8ac21ee50eb9b1741b1f67f9877a570a85d1567753a8c8fac9c512db08d56be24488b8408d695a167783c9b02d1e74798c925e36bad47fca1e6b SHA512 612c469ad5d853a412574afdbe2ba78d7d4db8bbca7eaf6bbffe1ba558d9ec40d005a94f775f72947742835d1210bdba98de7a6457342e59ae40ebdec9c497d6
+DIST coinor-bcps-0.94.5.tar.gz 701818 BLAKE2B 3f01e0fac2e892a3cf59e7dba78c58a23f465f48b0a44be933acfb7d59e84012bed3e05f2f8d1b3c578ad24f4f9c23af9d5e7d54e47b45b0500d389dcfbcf47f SHA512 b53a2ad62a832d4beb0ce2b5c7fd0e81eeb01b9039c0b78ce849adb94b44ad2300aad0f6357ecbcf41f5a5bb427508bde931667dfe40eaa83de50e3d696e3211
+EBUILD coinor-bcps-0.94.5.ebuild 1331 BLAKE2B 565c9bce7cb749a97a81cb9c1162057596967b7e3d3059c9df184bd2edf7f107dcd0b6f8470f1587774baaafc210fd2078b13b5b60d7260d00acd3a4c7fc1b36 SHA512 ad3d08e930776efdc63153914b8fed2d4c4c56d12155433982bbd35a5183d74a2b03d68cb3ef6006bfda2c2ac1d401a9cc241e82bdf3692e6c0b8cf0e2a43423
+MISC metadata.xml 757 BLAKE2B b206c0d30857beffeb00e9a28d84492a3cdde77ccb08d63a9a47ea11b4174fd1be408a8f8541dc59400ad649f801c061e8501bd98c35e3b6f7e1dcd980ca1b8c SHA512 4c7f0ba678b8a704a7b45662802fbc82d4a5735faa27851ae65c3d368e2cb23a23d5ec70ad03a083f0bd98813da7becffa4cf797ea282e70bb32229591e2435b
diff --git a/sci-libs/coinor-bcps/coinor-bcps-0.93.10.ebuild b/sci-libs/coinor-bcps/coinor-bcps-0.93.10.ebuild
deleted file mode 100644
index 6e388e55c64b..000000000000
--- a/sci-libs/coinor-bcps/coinor-bcps-0.93.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=Bcps
-
-DESCRIPTION="COIN-OR BiCEPS data handling library"
-HOMEPAGE="https://projects.coin-or.org/CHiPPS/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="CPL-1.0"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-utils:=
-	sci-libs/coinor-clp:=
-	sci-libs/coinor-alps:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-bcps/coinor-bcps-0.94.5.ebuild b/sci-libs/coinor-bcps/coinor-bcps-0.94.5.ebuild
new file mode 100644
index 000000000000..7776577f7aa2
--- /dev/null
+++ b/sci-libs/coinor-bcps/coinor-bcps-0.94.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR BiCePS data handling library"
+HOMEPAGE="https://projects.coin-or.org/CHiPPS/"
+SRC_URI="https://github.com/coin-or/CHiPPS-BiCePS/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CHiPPS-BiCePS-releases-${PV}/Bcps"
+
+LICENSE="EPL-1.0"
+SLOT="0" # formerly 0/1, upstream went from so.1 to so.0
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+# Note: 0.99.x branch needs to-be-released >=coinor-alps-1.5.8
+RDEPEND="
+	sci-libs/coinor-alps:=
+	sci-libs/coinor-utils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? (
+		sci-libs/coinor-cgl
+		sci-libs/coinor-sample
+	)"
+
+src_prepare() {
+	default
+	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
+	sed -i '/--libs.*addlibs.txt/d' Makefile.in || die
+}
+
+src_configure() {
+	econf $(use_with doc dot)
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc '')
+}
+
+src_test() {
+	# Needed given "make check" is a noop and it skips the working one.
+	emake test
+}
+
+src_install() {
+	default
+	dodoc -r examples
+	use doc && dodoc -r doxydoc/html
+
+	# Duplicate or irrelevant files.
+	rm -r "${ED}"/usr/share/coin/doc || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-bcps/metadata.xml b/sci-libs/coinor-bcps/metadata.xml
index 48ae1fc01754..e489508d975e 100644
--- a/sci-libs/coinor-bcps/metadata.xml
+++ b/sci-libs/coinor-bcps/metadata.xml
@@ -13,4 +13,7 @@
 		management layer built on top of ALPS for implementing
 		relaxation-based branch and bound algorithms.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/CHiPPS-BiCePS</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-blis/Manifest b/sci-libs/coinor-blis/Manifest
index 88e1185b600b..747516997f33 100644
--- a/sci-libs/coinor-blis/Manifest
+++ b/sci-libs/coinor-blis/Manifest
@@ -1,3 +1,3 @@
-DIST Blis-0.93.10.tgz 10612207 BLAKE2B aaef129ca4de7aba8131c46d7619accd8087abb13e183e9caafdada20636b2d5769b88c0195db0194bbd2d60ada4209609716e8b08436f8c43e62807b325ff68 SHA512 ef4c1b7704353e9d2628401d9a47e72d0b26d485ac3951b03fe84fdc98cfbee8e3b9f3412411eca693c8e00bdf97798e08c4dabcf5b8646bbe3d8481c237820e
-EBUILD coinor-blis-0.93.10.ebuild 1179 BLAKE2B fd0bec6dd7b45a6c0417fcbfb39e798addbd01cf9c22c5458e9c0f9422dccec3586481849f2a6b8942f38b4934a092530ecb4f627bd63b5ba9fbdfd538ac7aae SHA512 55ef45de4333bed8cef1dd89cd7ab4ad2b22c889fa2ad8bb56c7ee063c4ba65dd504afc78b28ec7002e3c9cae642e953fe1bddec008bee40f4c86eb7001f0833
-MISC metadata.xml 630 BLAKE2B 2f5b67704950cbc977352b076cf2f558287846bcb67f7994d5bf2ef1e57143e2b4018a5b9de75ef50f40b1d6a2221b4f99a9900e2db31ae37025a77228601017 SHA512 48ea2c95c268345c59ea61a97ccaf0cf93b1ba1e383e64434c5189ae7a81382810df85397e33a2fb3e354c8e44187dca835de82d14e11fcbbc2a74740889e775
+DIST coinor-blis-0.94.8.tar.gz 4186086 BLAKE2B 6be1ea6f27913cf128947225b2d03b071ee20bc35f49ea319f5ed8ed77d2d89fac0a66bf2b5204ec4194c1a8444033c7ee797ac5c0adbc0572f9195d9a357735 SHA512 5b401eaf7b80af6cb724606655c38811918e92ae89d2f4a1fd5f318bdc8fa1463175a106c2f3ab43bf5eda677a6d7bbdb8a0f8bc0155135108a10bbcbb93070b
+EBUILD coinor-blis-0.94.8.ebuild 1376 BLAKE2B c28410fabc54e620a84081153cd6fc8163248ff12ac2a7047092bc4962bbb4b26321a149210f8ccc256c9a76e62383c7253ae75ad26eff5d148044ab8c613985 SHA512 6ecaa682ad457e3581a0791adb6a32153c4f1c7f097b7b11e458e6388f48076354c2b3bf95ba2e6dbdcdc831ffd563277bc4e251d8fe91094790b3f6951c91a9
+MISC metadata.xml 714 BLAKE2B a37253b4638242f83a37fcc1774c3c6790b4cf1548bb96576f716749de62ac0539dba05c13f81048db92551c059831d5f08b39357f370fa51d33decc33e8096d SHA512 26e7495770b7f416c96a10b9640c61d827a5f196604cf9e45f639abf97a23f326097dc4458e3a4a191b38b986c4ac8ed6e6349c6caed0ab9499ab116963f0522
diff --git a/sci-libs/coinor-blis/coinor-blis-0.93.10.ebuild b/sci-libs/coinor-blis/coinor-blis-0.93.10.ebuild
deleted file mode 100644
index 3757864db1e7..000000000000
--- a/sci-libs/coinor-blis/coinor-blis-0.93.10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=Blis
-
-DESCRIPTION="COIN-OR BiCePS Linear Integer Solver"
-HOMEPAGE="https://projects.coin-or.org/CHiPPS/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="CPL-1.0"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-utils:=
-	sci-libs/coinor-bcps:=
-	sci-libs/coinor-clp:=
-	sci-libs/coinor-alps:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-blis/coinor-blis-0.94.8.ebuild b/sci-libs/coinor-blis/coinor-blis-0.94.8.ebuild
new file mode 100644
index 000000000000..dcc2f33bd47e
--- /dev/null
+++ b/sci-libs/coinor-blis/coinor-blis-0.94.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR BiCePS Linear Integer Solver"
+HOMEPAGE="https://projects.coin-or.org/CHiPPS/"
+SRC_URI="https://github.com/coin-or/CHiPPS-BLIS/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CHiPPS-BLIS-releases-${PV}/Blis"
+
+LICENSE="EPL-1.0"
+SLOT="0" # formerly 0/1, upstream went from so.1 to so.0
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-libs/coinor-alps:=
+	sci-libs/coinor-bcps:=
+	sci-libs/coinor-cgl:=
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+
+src_prepare() {
+	default
+	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
+	sed -i '/--libs.*addlibs.txt/d' Makefile.in || die
+
+	gzip -d examples/data/{,hard/}*.gz || die
+}
+
+src_configure() {
+	econf $(use_with doc dot)
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc '')
+}
+
+src_test() {
+	# Needed given "make check" is a noop and it skips the working one.
+	emake test
+}
+
+src_install() {
+	default
+	dodoc -r examples
+	use doc && dodoc -r doxydoc/html
+
+	# Duplicate or irrelevant files.
+	rm -r "${ED}"/usr/share/coin/doc || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-blis/metadata.xml b/sci-libs/coinor-blis/metadata.xml
index 4e7c3e8303e2..545a08d9a3c7 100644
--- a/sci-libs/coinor-blis/metadata.xml
+++ b/sci-libs/coinor-blis/metadata.xml
@@ -12,4 +12,7 @@
 		layers. The BiCePS Linear Integer Solver (BLIS) is a concretization
 		of the BiCePS layer for solving mixed-integer linear programs.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/CHiPPS-BLIS</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-bonmin/Manifest b/sci-libs/coinor-bonmin/Manifest
index 8a78418c1ea3..c4ee4df34f0d 100644
--- a/sci-libs/coinor-bonmin/Manifest
+++ b/sci-libs/coinor-bonmin/Manifest
@@ -1,3 +1,3 @@
-DIST Bonmin-1.7.4.tgz 12320747 BLAKE2B 779881abf98dcf1c0b6a22e2d7fe11c2075ac50a64afcfae735bbb221614ce247c9f918c5cac7d0772784512ff2135fedeb26295c5e5d3979ebb8e435cfdac21 SHA512 290b1b49e467ab8ce7fc6908d8aa76a3b1ba61f63f44427d3bdd8ff2bed4aa6ef28396f0be59e108038173ea670405b50d3c32636aacdee2c5787765bce763a4
-EBUILD coinor-bonmin-1.7.4.ebuild 1457 BLAKE2B cf9cecfb6cf4b937bc59cf350231df15b5cc8b2883a7b02e34ba243cb24648c63a3811aab22fedafceef6fcd24d24edd18a2b7aba5322f86fa2756140f7771dc SHA512 c1f9c49ed3ed777b7611906dd6acd0becc7fca3118cc8e8275929dfc512fd803f4be1cc662f3f4cde3d58b9595c93949e84e39e095b29d3d176bc10483a10578
-MISC metadata.xml 537 BLAKE2B e099b92290e42b63acc75aab2354cb3295e83f39396f960d338f46e72be7bd0ad3aec8bd6492b595d1b5133d0ea2e7b10aa110553346814e1584eb48153ffa28 SHA512 813db781e346f940d3110f0340208d1400cef20b2dc55b4faafc75c4d71ec0ad3d6cab7638d5afd4e8db7cca1e146bd72f15d45d6e25305961b75e86152377d3
+DIST coinor-bonmin-1.8.8.tar.gz 1336718 BLAKE2B 3b72852d54b62274dc347758ae6c3fe0a2b1c04c39c3b01d87aa28fcc8593a3d80945b2e88aabd4db03da31c426396302a2def44aac8a07e6101cd5331321ed1 SHA512 66c3b07e743b6f352b4760e32c774268606deda4143e597c3be81068237dd5021210dec46e53ae0930f480db18bfbaaf284cbdb3d20f07e6d8543968509f8999
+EBUILD coinor-bonmin-1.8.8.ebuild 1214 BLAKE2B d5f9d73a7e339c62626c0cfb3c0f027238460ce52d8caa5c595f993bb64d10fa155650d52662675f67d30ffe854b141ef2a686510191b055f72c11d5b582f7b2 SHA512 a0cf3764bcc28fd12fa5cddc25f3218e64db979f4cb55898ee16a59d9af92d708b42bad272c4033cb735422cfbf6bb70b7dbf235ee03e4efa005b1b14e435125
+MISC metadata.xml 559 BLAKE2B 57535814ad85e572b2c5f3fcb5820b662c04205d3977495e1a710049e2dc9cecc84d1b197663f1695692a31ec90a3e9382c876d6bc92c12fd37d2a5922b94b0c SHA512 937e95bbd109b346c74c066f18958a36588f272a21228dc2292dbf5c46dab30d95f6e093101299d3e58de33832116123b95fc96b444e89315f6e39be93992182
diff --git a/sci-libs/coinor-bonmin/coinor-bonmin-1.7.4.ebuild b/sci-libs/coinor-bonmin/coinor-bonmin-1.7.4.ebuild
deleted file mode 100644
index fb052c19bcd7..000000000000
--- a/sci-libs/coinor-bonmin/coinor-bonmin-1.7.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=Bonmin
-
-DESCRIPTION="COIN-OR Basic Open-source Nonlinear Mixed INteger programming"
-HOMEPAGE="https://projects.coin-or.org/Bonmin/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="CPL-1.0"
-SLOT="0/4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples glpk static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-cbc:=
-	sci-libs/coinor-clp:=
-	sci-libs/ipopt:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(usex doc doc "")
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	autotools-utils_src_install
-	# add missing include files needed from coinor-couenne and others
-	insinto /usr/include/coin
-	doins \
-		src/Interfaces/BonCurvatureEstimator.hpp \
-		src/Interfaces/BonExitCodes.hpp \
-		src/Algorithms/QuadCuts/BonLinearCutsGenerator.hpp
-
-	use doc && dodoc doc/BONMIN_UsersManual.pdf
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.ebuild b/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.ebuild
new file mode 100644
index 000000000000..7ec47de50280
--- /dev/null
+++ b/sci-libs/coinor-bonmin/coinor-bonmin-1.8.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR Basic Open-source Nonlinear Mixed INteger programming"
+HOMEPAGE="https://projects.coin-or.org/Bonmin/"
+SRC_URI="https://github.com/coin-or/Bonmin/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Bonmin-releases-${PV}/Bonmin"
+
+LICENSE="EPL-1.0"
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-libs/coinor-cbc:=
+	sci-libs/coinor-cgl:=
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:=
+	sci-libs/ipopt:=
+	virtual/blas"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		virtual/latex-base
+	)
+	test? ( sci-libs/coinor-sample )"
+
+src_configure() {
+	econf $(use_with doc dot)
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc '')
+}
+
+src_test() {
+	# Needed given "make check" is a noop and it skips the working one.
+	emake test
+}
+
+src_install() {
+	default
+	dodoc -r examples doc/BONMIN_UsersManual.pdf
+	use doc && dodoc -r doxydoc/html
+
+	# Duplicate or irrelevant files.
+	rm -r "${ED}"/usr/share/coin/doc || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-bonmin/metadata.xml b/sci-libs/coinor-bonmin/metadata.xml
index fde4b95c383c..8f8219cb4317 100644
--- a/sci-libs/coinor-bonmin/metadata.xml
+++ b/sci-libs/coinor-bonmin/metadata.xml
@@ -9,8 +9,8 @@
   BONMIN (Basic Open-source Nonlinear Mixed INteger programming) is an
   open-source code for solving general MINLP (Mixed Integer NonLinear
   Programming) problems.
-</longdescription>
-  <use>
-    <flag name="glpk">Undocumented USE</flag>
-  </use>
+  </longdescription>
+  <upstream>
+    <remote-id type="github">coin-or/Bonmin</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-couenne/Manifest b/sci-libs/coinor-couenne/Manifest
index 0d68efa49715..58beefdf2093 100644
--- a/sci-libs/coinor-couenne/Manifest
+++ b/sci-libs/coinor-couenne/Manifest
@@ -1,3 +1,3 @@
-DIST Couenne-0.4.7.tgz 12487353 BLAKE2B 795a1d04ee6186e519d57a59ccc7dfa77ec28717b3e3f75d1ed6513438e869d69970c27dc0de758d421e7f5c5f2dfb3308270b185c05b44ef214c760b1f25e39 SHA512 ae87ebee778d6782fffe9e6f6c7c8f604140f6134e29824f89e4f87bb86ac00ac1b2d8de274b23de16078a48a1444fbe7960b15ffefdc1798dca8972a8946deb
-EBUILD coinor-couenne-0.4.7.ebuild 1421 BLAKE2B 2a14a91b62dade3a3f07721226c56d25ef77bd69a25440d090575ab7d13b5be99291e31a5da3bc04c134c62eda7014f9ea32286f90f8fed2dc6d7c13eac59bce SHA512 e22e2f68e03dbe3f28a0ee59561c5b7d78431ebcf86bc7d59a97cd39aceeaf216643bf1481f2e06cfd63bc35b84f0e7e5644c55705e25c1b9b2e8a0d4f3d5054
-MISC metadata.xml 620 BLAKE2B 82e4ce9c1f106653d4a3d8a235206950db10283e0c2a02802587a86f0845520b09cbc3731075a90607c51dacec6788bbca8d06ef181e9f4240ef166491c7159e SHA512 6b6a008f16e4bb3e20ae8cdf3c081236c9896346cc8c7dc73acea97fb0b51891764bf9747baac6719229b29e0c7086d9ed9a6c797d6717ef702d7336aee3703c
+DIST coinor-couenne-0.5.8.tar.gz 1321163 BLAKE2B 841a4af3d76fd308ef5abe481157fa1ecf307e7fae03fa0cb931483be74443febc7eb1ba7e85f47c3dca5d5447a74ae86dc0f3dbeb6c0f0032f543861462e0a1 SHA512 bf474503bd77be6536f9d00b40ff45041b3976ea2167d64e667fa580aa8ed6a383861ec67d57eec83623b6542f7779ed7d50d9b72347c3f77ef36a194a3f9e71
+EBUILD coinor-couenne-0.5.8.ebuild 1239 BLAKE2B 866b7bd28743c54d0d9c59a7079db03cf8da7601410068bef3b86f77fa65d6d6abd14251e0b4fc242d16a357597c8130f9302204bc1aa805f12a71c1a9ab6495 SHA512 e1f6aa8fbc30fa79471083dbfd533d75e49ff2b8d71cb606fdf45e305e31749186790a0c594027304b0bde60cb7dddb1615769338036206947026e9a3d5cd258
+MISC metadata.xml 700 BLAKE2B 945c3aafd3cc6b2280c64b664cc9a49ccc5be8b9d6dd33c4bb4730c7367e1ad15b25f9fefb968b69f29f2b5cf1e57d8cae3f990db8948d8436385bea67e34212 SHA512 641fa4e5a9bd4f66e42aa86960141e3de0d8f68bc9b01d8235a6be90c1b2c60a262221b0253a366491ed161b8acf114df8549affbc30acd250b89ca3d65105fc
diff --git a/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild b/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild
deleted file mode 100644
index 02c94288b5aa..000000000000
--- a/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=Couenne
-
-DESCRIPTION="COIN-OR Convex Over and Under ENvelopes for Nonlinear Estimation"
-HOMEPAGE="https://projects.coin-or.org/Couenne/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sci-libs/coinor-bonmin:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	# resolve as-needed
-	# circular dependencies between libCouenne and libBonCouenne :(
-	pushd "${BUILD_DIR}"/src > /dev/null
-	rm libCouenne.la main/libBonCouenne.la || die
-	emake LIBS+=" -Lmain/.libs -lBonCouenne" libCouenne.la
-	emake -C main
-	popd > /dev/null
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dodoc doc/couenne-user-manual.pdf
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-}
diff --git a/sci-libs/coinor-couenne/coinor-couenne-0.5.8.ebuild b/sci-libs/coinor-couenne/coinor-couenne-0.5.8.ebuild
new file mode 100644
index 000000000000..fd0fc656ee41
--- /dev/null
+++ b/sci-libs/coinor-couenne/coinor-couenne-0.5.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fortran-2
+
+DESCRIPTION="COIN-OR Convex Over and Under ENvelopes for Nonlinear Estimation"
+HOMEPAGE="https://projects.coin-or.org/Couenne/"
+SRC_URI="https://github.com/coin-or/Couenne/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Couenne-releases-${PV}/Couenne"
+
+LICENSE="EPL-1.0"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	sci-libs/coinor-bonmin:=
+	sci-libs/coinor-cbc:=
+	sci-libs/coinor-cgl:=
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:=
+	sci-libs/ipopt:=
+	virtual/blas"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		virtual/latex-base
+	)"
+
+src_prepare() {
+	default
+	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
+	sed -i '/--libs.*addlibs.txt/d' Makefile.in || die
+}
+
+src_configure() {
+	econf $(use_with doc dot)
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc '')
+}
+
+src_install() {
+	default
+	dodoc doc/couenne-user-manual.pdf
+	use doc && dodoc -r doxydoc/html
+
+	# Duplicate or irrelevant files.
+	rm -r "${ED}"/usr/share/coin/doc || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-couenne/metadata.xml b/sci-libs/coinor-couenne/metadata.xml
index d2e462bb6357..521131367170 100644
--- a/sci-libs/coinor-couenne/metadata.xml
+++ b/sci-libs/coinor-couenne/metadata.xml
@@ -12,4 +12,7 @@
 		Programming (MINLP) problems. The purpose of Couenne is to find global
 		optima of nonconvex MINLPs.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/Couenne</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-cppad/Manifest b/sci-libs/coinor-cppad/Manifest
index 337428a0889f..a299487a17eb 100644
--- a/sci-libs/coinor-cppad/Manifest
+++ b/sci-libs/coinor-cppad/Manifest
@@ -1,5 +1,4 @@
-AUX coinor-cppad-20140519-boost.patch 2799 BLAKE2B 973de79d9d4b33ac7c35758eb8bde7d59fdda8ed84380ffb46f56e179de589e3a9378cdb02246f6525047a7b08a67b6caa1476f354e84d06727dfc29ba327112 SHA512 fe3af84b635aeefc30dedee488914f1de00d139756b2fa5c1f39c95b3886860c88ce02d8aaea6d0ec467f135bf17e8f2ce6df427fdd4d11188dbfe1a080cc014
-AUX coinor-cppad-20140519-dash.patch 7659 BLAKE2B 2bbf233f1d5081d29c5520612892c26bee210bcda651e8009ec928bf4063a2779e8590278dc38f5cceec3135be79ad825831ef4e8abd624f3f435d439371981b SHA512 a1aa44e9949d67823492f0296ba51ebdbb2f201855903a9571dfb686b6a42ac3756c577167ee7e8cf664872db0d570ec7576085d0f9d6642b78096708f83cf04
-DIST cppad-20140519.gpl.tgz 2208236 BLAKE2B 5d53891ef3b458c3914f5d59f6656290be2811fbc84ca3f9bd253ce4620b1a4b00397e1beed694cdc5284a1f74441b68520b861c90d158c4eee11d1f8927b362 SHA512 8f47e545bc76f66edccb9ea083ddebcb5852fa1807d727b6e1f445ca74731e74f7614a1d33b48c6eafbc5129b319e513594b415ee838bdc634f9c00a6d9a22af
-EBUILD coinor-cppad-20140519-r1.ebuild 1169 BLAKE2B ce2fde6a966575d7893b13414c0ee0c6bfeacbe1a3a4b5ca7ad47fc17ec3369108748b03f490e0e8cd7710ab2b30145529d75eb2521202595642a986fcf49edd SHA512 1c9681cb5e7ab7d3d0b7136994acc37f4bf3acd733b80033263b47f8b887e0d727ca062372a55722b83e641f3fdcff134cb85b29b91d6d2a771073cbb5ad3095
-MISC metadata.xml 730 BLAKE2B d2a7b1e486d64f316b3f021d12c109f2779136607438dee059eb3c70f30bf0ba82475f0b49ce8e6d9f5187aec520abc265df769c2b44c6c7f1a8937481e13a1d SHA512 4803e579d3c8d6f83a7ad08658025fe7e366eab3996ba36d6352ef2bf1a36a5b2dce608731604f25a73f23e9ab45a6b100a542ce001408184e799f1def985634
+AUX coinor-cppad-20210000.5-pkgconfig.patch 811 BLAKE2B 353b7a5d6d87019e8e81fe60711f10681ae94ff14e47150514e628e640be97fd5a31aa0de656e77786c35d368979f3428b85dd582a01ad396d003505f2f02405 SHA512 6ca51f3c2f0e51d833939a460b2e121cf1bb4fd3df0f9988a2861f56659423ca55e1960ae654ee6632167e694d7a29b18fa32fcfd9e61a0c4c8c05b0d3cfb83c
+DIST coinor-cppad-20210000.5.tar.gz 1663397 BLAKE2B 3ce4f5733641fac16ac00b6e49cb74e2237502eac32f592190491ddd5dcb8a41f340c1eed8529dbdecb343f7a791d4fc5ddc1e21ce9f9706f28608ac3a5e965a SHA512 40cbe8dc32af9bb3b92cdd4c81e6f75424ece701df9251d4c63652998ca4cb8d50057e190a16e51333d168299f33ff2353074fa7f24f2cec29f68db53f6ae17c
+EBUILD coinor-cppad-20210000.5.ebuild 1643 BLAKE2B 29e321f75047abac2c41bb7c2ca58a0535d46dab6585a3676c98b420b5359195014ae5a506f489443e477c21aa861cd6e68f6a4f85a918ced4efdf051a23abd2 SHA512 1ec8e3f21ef3f2735f2b61641c12c9e9e31901f6adf882c1f4d9bc6e3cf50e6d0c3bbe543e8d696a15e81686db7f5d7b329fa7ce617af519a197e09107904ec6
+MISC metadata.xml 1071 BLAKE2B 32463cc6a30f237e30d56a17414ed990f83de53ddbb0e55b7637937ccb9c2583f3a70a56af16057f4a7f9450e051af24bfebac4d4397db07caffccbffa79e6ba SHA512 1cb70b2272f589c46787e0f3aad8fc75313a7be3f70fded2f01531ae6ab8bbca91fa5f38b3f216af04ee92fbd51c426c89f6ee09bd354a5fda651c9a8d293f7d
diff --git a/sci-libs/coinor-cppad/coinor-cppad-20140519-r1.ebuild b/sci-libs/coinor-cppad/coinor-cppad-20140519-r1.ebuild
deleted file mode 100644
index 537f051053f1..000000000000
--- a/sci-libs/coinor-cppad/coinor-cppad-20140519-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib
-
-MYP=cppad-${PV}
-
-DESCRIPTION="COIN-OR C++ Algorithmic Differentiation"
-HOMEPAGE="https://projects.coin-or.org/CppAD/"
-SRC_URI="http://www.coin-or.org/download/source/CppAD/${MYP}.gpl.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	dev-libs/boost[threads]
-	sci-libs/adolc:0=
-	sci-libs/ipopt:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dash.patch
-	"${FILESDIR}"/${P}-boost.patch
-	)
-
-src_configure() {
-	local myeconfargs=( $(use doc Documentation) )
-	autotools-utils_src_configure CXX_FLAGS="${CXXFLAGS}"
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use doc; then
-		./build.sh doxygen || die
-	fi
-}
-
-src_test() {
-	autotools-utils_src_test check test
-}
-
-src_install() {
-	use doc && HTML_DOC=( "${BUILD_DIR}"/doxydocs/html/. )
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r example/*
-	fi
-}
diff --git a/sci-libs/coinor-cppad/coinor-cppad-20210000.5.ebuild b/sci-libs/coinor-cppad/coinor-cppad-20210000.5.ebuild
new file mode 100644
index 000000000000..b0f442dd2f2c
--- /dev/null
+++ b/sci-libs/coinor-cppad/coinor-cppad-20210000.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake" # needed for tests
+inherit cmake
+
+DESCRIPTION="COIN-OR C++ Algorithmic Differentiation"
+HOMEPAGE="https://projects.coin-or.org/CppAD/"
+SRC_URI="https://github.com/coin-or/CppAD/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CppAD-${PV}"
+
+LICENSE="EPL-2.0"
+SLOT="0/${PV}" # soname is bumped every versions
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="adolc doc eigen ipopt"
+
+# adolc currently can't build tests and ipopt fails them.
+RESTRICT="adolc? ( test ) ipopt? ( test )"
+
+# No need for RDEPEND.
+DEPEND="
+	dev-libs/boost[threads]
+	adolc? ( sci-libs/adolc )
+	eigen? ( dev-cpp/eigen )
+	ipopt? ( sci-libs/ipopt )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-pkgconfig.patch )
+
+src_prepare() {
+	cmake_src_prepare
+	# Gentoo uses coin/ rather than coin-or/ for includes.
+	sed -i 's/<coin-or/<coin/' \
+		cppad_ipopt/src/cppad_ipopt_nlp.hpp \
+		include/cppad/ipopt/solve_callback.hpp || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dcmake_install_libdirs=$(get_libdir)
+		-Dinclude_adolc=$(usex adolc)
+		-Dinclude_cppadcg=no
+		-Dinclude_eigen=$(usex eigen)
+		-Dinclude_ipopt=$(usex ipopt)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		bin/doxyfile.sh ${PV} dox.log doc && doxygen doxyfile || die
+	fi
+}
+
+src_test() {
+	cmake_build check
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc -r doc/html
+
+	# Remove superfluous .pc file.
+	rm -r "${ED}"/usr/share/pkgconfig || die
+}
diff --git a/sci-libs/coinor-cppad/files/coinor-cppad-20140519-boost.patch b/sci-libs/coinor-cppad/files/coinor-cppad-20140519-boost.patch
deleted file mode 100644
index 7a4d3ae83aca..000000000000
--- a/sci-libs/coinor-cppad/files/coinor-cppad-20140519-boost.patch
+++ /dev/null
@@ -1,79 +0,0 @@
- configure.ac | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 033621f..87e129a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -550,13 +550,14 @@ dnl check for boost thread library
- AC_LANG_PUSH([C++])
- LDFLAGS_save=$LDFLAGS
- CXXFLAGS_save=$CXXFLAGS
-+LIBS_save=$LIBS
- boost_thread_found='no'
- if test "$BOOST_DIR" != '' ; then
- 	CXXFLAGS="-I$BOOST_DIR/include $CXXFLAGS"
- fi
- if test "$BOOST_DIR" = '' && test "$boost_thread_found" = 'no' ; then
--	bthread_lib='-lboost_thread-mt'
--	LDFLAGS="$LDFLAGS_save $bthread_lib"
-+	bthread_lib='-lboost_thread-mt -lboost_system'
-+	LIBS="$LIBS_save $bthread_lib"
- 	AC_LINK_IFELSE(
- 		[AC_LANG_PROGRAM(
- 			[# include <boost/thread.hpp>],
-@@ -568,7 +569,7 @@ if test "$BOOST_DIR" = '' && test "$boost_thread_found" = 'no' ; then
- fi
- if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
- 	bthread_lib="$BOOST_DIR/lib/libboost_thread-mt.so"
--	LDFLAGS="$LDFLAGS_save $bthread_lib"
-+	LIBS="$LIBS_save $bthread_lib"
- 	AC_LINK_IFELSE(
- 		[AC_LANG_PROGRAM(
- 			[# include <boost/thread.hpp>],
-@@ -580,7 +581,7 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
- fi
- if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
- 	bthread_lib="$BOOST_DIR/lib/libboost_thread-mt.a"
--	LDFLAGS="$LDFLAGS_save $bthread_lib"
-+	LIBS="$LIBS_save $bthread_lib"
- 	AC_LINK_IFELSE(
- 		[AC_LANG_PROGRAM(
- 			[# include <boost/thread.hpp>],
-@@ -591,8 +592,8 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
- 	)
- fi
- if test "$BOOST_DIR" = '' && test "$boost_thread_found" = 'no' ; then
--	bthread_lib='-lboost_thread'
--	LDFLAGS="$LDFLAGS_save $bthread_lib"
-+	bthread_lib='-lboost_thread -lboost_system'
-+	LIBS="$LIBS_save $bthread_lib"
- 	AC_LINK_IFELSE(
- 		[AC_LANG_PROGRAM(
- 			[# include <boost/thread.hpp>],
-@@ -604,7 +605,7 @@ if test "$BOOST_DIR" = '' && test "$boost_thread_found" = 'no' ; then
- fi
- if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
- 	bthread_lib="$BOOST_DIR/lib/libboost_thread.so"
--	LDFLAGS="$LDFLAGS_save $bthread_lib"
-+	LIBS="$LIBS_save $bthread_lib"
- 	AC_LINK_IFELSE(
- 		[AC_LANG_PROGRAM(
- 			[# include <boost/thread.hpp>],
-@@ -616,7 +617,7 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
- fi
- if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
- 	bthread_lib="$BOOST_DIR/lib/libboost_thread.a"
--	LDFLAGS="$LDFLAGS_save $bthread_lib"
-+	LIBS="$LIBS_save $bthread_lib"
- 	AC_LINK_IFELSE(
- 		[AC_LANG_PROGRAM(
- 			[# include <boost/thread.hpp>],
-@@ -636,6 +637,7 @@ else
- fi
- LDFLAGS=$LDFLAGS_save
- CXXFLAGS=$CXXFLAGS_save
-+LIBS=$LIBS_save
- AC_LANG_POP([C++])
- #
- dnl --------------------------------------------------------------------------
diff --git a/sci-libs/coinor-cppad/files/coinor-cppad-20140519-dash.patch b/sci-libs/coinor-cppad/files/coinor-cppad-20140519-dash.patch
deleted file mode 100644
index fe0b210f1075..000000000000
--- a/sci-libs/coinor-cppad/files/coinor-cppad-20140519-dash.patch
+++ /dev/null
@@ -1,215 +0,0 @@
- configure.ac | 56 ++++++++++++++++++++++++++++----------------------------
- 1 file changed, 28 insertions(+), 28 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9e917dd..033621f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -194,7 +194,7 @@ AC_ARG_WITH(sparse_list,
- )
- AC_MSG_RESULT([$sparse_list])
- if test "$sparse_set" = "yes" ; then
--	if test "$sparse_list" == "yes" ; then
-+	if test "$sparse_list" = "yes" ; then
- 		AC_MSG_ERROR([cannot --with both sparse_set and sparse_list])
- 	fi
- 	AC_SUBST(cppad_internal_sparse_set, sparse_set)
-@@ -374,7 +374,7 @@ AC_SUBST(cppad_max_num_threads, [$max_num_threads])
- dnl type used for addresses in AD tapes [ default = unsigned int ] -----------
- AC_MSG_CHECKING([TAPE_ADDR_TYPE])
- AC_ARG_VAR(TAPE_ADDR_TYPE, [type used for addresses in AD tapes])
--if test "$TAPE_ADDR_TYPE" == "" ; then
-+if test "$TAPE_ADDR_TYPE" = "" ; then
- 	addr_t="unsigned int"
- else
- 	addr_t="$TAPE_ADDR_TYPE"
-@@ -382,22 +382,22 @@ fi
- AC_SUBST(cppad_tape_addr_type, [$addr_t])
- AC_MSG_RESULT([$addr_t])
- ok="no"
--if test "$addr_t" == "size_t" ; then
-+if test "$addr_t" = "size_t" ; then
- 	ok="yes"
- fi
--if test "$addr_t" == "int" ; then
-+if test "$addr_t" = "int" ; then
- 	AC_MSG_WARN(
- 		[TAPE_ADDR_TYPE=int is for CppAD developers (not users)]
- 	)
- 	ok="yes"
- fi
--if test "$addr_t" == "unsigned int" ; then
-+if test "$addr_t" = "unsigned int" ; then
- 	ok="yes"
- fi
--if test "$addr_t" == "unsigned short int" ; then
-+if test "$addr_t" = "unsigned short int" ; then
- 	ok="yes"
- fi
--if test "$ok" == "no" ; then
-+if test "$ok" = "no" ; then
-   	AC_MSG_ERROR(
- 		[$addr_t is not a valid choice for TAPE_ADDR_TYPE]
- 	)
-@@ -406,7 +406,7 @@ fi
- dnl type used for tape identifier [ default = unsigned int ] -----------
- AC_MSG_CHECKING([TAPE_ID_TYPE])
- AC_ARG_VAR(TAPE_ID_TYPE, [type used for addresses in AD tapes])
--if test "$TAPE_ID_TYPE" == "" ; then
-+if test "$TAPE_ID_TYPE" = "" ; then
- 	tape_id_t="unsigned int"
- else
- 	tape_id_t="$TAPE_ID_TYPE"
-@@ -414,22 +414,22 @@ fi
- AC_SUBST(cppad_tape_id_type, [$tape_id_t])
- AC_MSG_RESULT([$tape_id_t])
- ok="no"
--if test "$tape_id_t" == "size_t" ; then
-+if test "$tape_id_t" = "size_t" ; then
- 	ok="yes"
- fi
--if test "$tape_id_t" == "int" ; then
-+if test "$tape_id_t" = "int" ; then
- 	AC_MSG_WARN(
- 		[TAPE_ID_TYPE=int is for CppAD developers (not users)]
- 	)
- 	ok="yes"
- fi
--if test "$tape_id_t" == "unsigned int" ; then
-+if test "$tape_id_t" = "unsigned int" ; then
- 	ok="yes"
- fi
--if test "$tape_id_t" == "unsigned short int" ; then
-+if test "$tape_id_t" = "unsigned short int" ; then
- 	ok="yes"
- fi
--if test "$ok" == "no" ; then
-+if test "$ok" = "no" ; then
-   	AC_MSG_ERROR(
- 		[$tape_id_t is not a valid choice for TAPE_ID_TYPE]
- 	)
-@@ -447,7 +447,7 @@ AC_SUBST(cppad_has_rvalue, 0)
- dnl Determine if size_t has same size as unsigned int 
- AC_CHECK_SIZEOF([size_t])
- AC_CHECK_SIZEOF([unsigned int])
--if test "$ac_cv_size_t" == "$ac_cv_unsigned_int" ; then
-+if test "$ac_cv_size_t" = "$ac_cv_unsigned_int" ; then
- 	AC_SUBST(cppad_size_t_same_unsigned_int, 1)
- else
- 	AC_SUBST(cppad_size_t_same_unsigned_int, 0)
-@@ -485,8 +485,8 @@ AC_PROG_RANLIB
- dnl AC_PROG_CXX([compiler-search-list]) outputs CXX as C++ compiler to use
- AC_PROG_CXX
- AC_MSG_CHECKING([whether using Microsoft C++ compiler])
--AM_CONDITIONAL(CppAD_MS_COMPILER, test "$CXX" == "cl" || test "$CXX" == "icl")
--if test "$CXX" == "cl" || test "$CXX" == "icl"; then
-+AM_CONDITIONAL(CppAD_MS_COMPILER, test "$CXX" = "cl" || test "$CXX" = "icl")
-+if test "$CXX" = "cl" || test "$CXX" = "icl"; then
- 	AC_MSG_RESULT([yes])
- else
- 	AC_MSG_RESULT([no])
-@@ -531,7 +531,7 @@ AC_CHECK_LIB(
- 	[pthread="no"]
- )
- AM_CONDITIONAL(CppAD_PTHREAD, test "$pthread" = "yes")
--if test "$pthread" == "yes" ; then
-+if test "$pthread" = "yes" ; then
- 	AC_SUBST(PTHREAD_LIB,"-lpthread")
- else
- 	AC_SUBST(PTHREAD_LIB,"")
-@@ -554,7 +554,7 @@ boost_thread_found='no'
- if test "$BOOST_DIR" != '' ; then
- 	CXXFLAGS="-I$BOOST_DIR/include $CXXFLAGS"
- fi
--if test "$BOOST_DIR" == '' && test "$boost_thread_found" == 'no' ; then
-+if test "$BOOST_DIR" = '' && test "$boost_thread_found" = 'no' ; then
- 	bthread_lib='-lboost_thread-mt'
- 	LDFLAGS="$LDFLAGS_save $bthread_lib"
- 	AC_LINK_IFELSE(
-@@ -566,7 +566,7 @@ if test "$BOOST_DIR" == '' && test "$boost_thread_found" == 'no' ; then
- 		[boost_thread_found='no']
- 	)
- fi
--if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
-+if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
- 	bthread_lib="$BOOST_DIR/lib/libboost_thread-mt.so"
- 	LDFLAGS="$LDFLAGS_save $bthread_lib"
- 	AC_LINK_IFELSE(
-@@ -578,7 +578,7 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
- 		[boost_thread_found='no']
- 	)
- fi
--if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
-+if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
- 	bthread_lib="$BOOST_DIR/lib/libboost_thread-mt.a"
- 	LDFLAGS="$LDFLAGS_save $bthread_lib"
- 	AC_LINK_IFELSE(
-@@ -590,7 +590,7 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
- 		[boost_thread_found='no']
- 	)
- fi
--if test "$BOOST_DIR" == '' && test "$boost_thread_found" == 'no' ; then
-+if test "$BOOST_DIR" = '' && test "$boost_thread_found" = 'no' ; then
- 	bthread_lib='-lboost_thread'
- 	LDFLAGS="$LDFLAGS_save $bthread_lib"
- 	AC_LINK_IFELSE(
-@@ -602,7 +602,7 @@ if test "$BOOST_DIR" == '' && test "$boost_thread_found" == 'no' ; then
- 		[boost_thread_found='no']
- 	)
- fi
--if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
-+if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
- 	bthread_lib="$BOOST_DIR/lib/libboost_thread.so"
- 	LDFLAGS="$LDFLAGS_save $bthread_lib"
- 	AC_LINK_IFELSE(
-@@ -614,7 +614,7 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
- 		[boost_thread_found='no']
- 	)
- fi
--if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
-+if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
- 	bthread_lib="$BOOST_DIR/lib/libboost_thread.a"
- 	LDFLAGS="$LDFLAGS_save $bthread_lib"
- 	AC_LINK_IFELSE(
-@@ -627,7 +627,7 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
- 	)
- fi
- AM_CONDITIONAL(CppAD_BTHREAD, test "$boost_thread_found" = 'yes')
--if test "$boost_thread_found" == 'yes' ; then
-+if test "$boost_thread_found" = 'yes' ; then
- 	AC_SUBST(BTHREAD_LIB,"$bthread_lib")
- 	AC_MSG_RESULT([boost::thread library... yes])
- else
-@@ -650,12 +650,12 @@ fi
- AC_SUBST(CPPAD_IPOPT_LD_PATH, "$IPOPT_LD_PATH")
- #
- AC_SUBST(CPPAD_IPOPT_LIBS, "$IPOPT_LIBS -lipopt")
--if test "$have_pkg_config" == "yes"; then
-+if test "$have_pkg_config" = "yes"; then
- 	dnl set CPPAD_IPOPT_LIBS
- 	PKG_CONFIG_PATH="$IPOPT_DIR/lib/pkgconfig:$IPOPT_DIR/share/pkgconfig"
- 	PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$IPOPT_DIR/lib64/pkgconfig"
- 	export PKG_CONFIG_PATH
--	if pkg-config --libs ipopt >& /dev/null ; then
-+	if pkg-config --libs ipopt > /dev/null 2>&1 ; then
- 		CPPAD_IPOPT_LIBS=`pkg-config --libs ipopt`
- 	else
- 		dnl check for blas library
-@@ -696,7 +696,7 @@ dnl
- AC_SUBST(cppad_description, "Differentiation of C++ Algorithms")
- AC_SUBST(cppad_version, ${PACKAGE_VERSION} )
- AC_SUBST(cppad_url, "http://www.coin-or.org/CppAD")
--if test "$prefix" == "NONE" ; then
-+if test "$prefix" = "NONE" ; then
- 	cppad_cflags_value="-I$HOME/include"
- 	cppad_libs_value="-L$HOME/lib"
- else
-@@ -707,7 +707,7 @@ if test "$POSTFIX_DIR" != "" ; then
- 	cppad_cflags_value="$cppad_cflags_value/$POSTFIX_DIR"
- 	cppad_libs_value="$cppad_libs_value/$POSTFIX_DIR"
- fi
--if test "$IPOPT_DIR" == "" ; then
-+if test "$IPOPT_DIR" = "" ; then
- 	cppad_libs_value=""
- 	cppad_requires_value=""
- else
diff --git a/sci-libs/coinor-cppad/files/coinor-cppad-20210000.5-pkgconfig.patch b/sci-libs/coinor-cppad/files/coinor-cppad-20210000.5-pkgconfig.patch
new file mode 100644
index 000000000000..0483eea52ec4
--- /dev/null
+++ b/sci-libs/coinor-cppad/files/coinor-cppad-20210000.5-pkgconfig.patch
@@ -0,0 +1,26 @@
+Fix pkg-config file generation, backported from upstream commit:
+https://github.com/coin-or/CppAD/commit/6d10b8d
+with an additional fix to not have -l-lcppad_lib
+--- a/pkgconfig/CMakeLists.txt
++++ b/pkgconfig/CMakeLists.txt
+@@ -124,3 +124,3 @@
+ # cppad_includedir
+-LIST(GET cmake_install_libdirs 0 cppad_includedir)
++LIST(GET cmake_install_includedirs 0 cppad_includedir)
+ #
+@@ -161,2 +161,3 @@
+     ${CMAKE_CURRENT_BINARY_DIR}/cppad.pc
++    @ONLY
+ )
+--- a/pkgconfig/cppad.pc.in
++++ b/pkgconfig/cppad.pc.in
+@@ -17,3 +17,3 @@
+ prefix=@cppad_prefix@
+-exec_prefix=$(prefix)
++exec_prefix=${prefix}
+ includedir=${prefix}/@cppad_includedir@
+@@ -30,3 +30,3 @@
+ Cflags:                -I${includedir}
+-Libs:                  -L{libdir} -l@cppad_lib_list@
++Libs:                  -L${libdir} @cppad_lib_list@
+ Requires:
diff --git a/sci-libs/coinor-cppad/metadata.xml b/sci-libs/coinor-cppad/metadata.xml
index 0edc1f35c6e9..be6da625a6d1 100644
--- a/sci-libs/coinor-cppad/metadata.xml
+++ b/sci-libs/coinor-cppad/metadata.xml
@@ -13,5 +13,13 @@
   function values, CppAD generates an algorithm that computes
   corresponding derivative values (of arbitrary order using either
   forward or reverse mode).
-</longdescription>
+  </longdescription>
+  <use>
+    <flag name="adolc">Add support for ADOL-C (<pkg>sci-libs/adolc</pkg>)</flag>
+    <flag name="eigen">Add support for Eigen (<pkg>dev-cpp/eigen</pkg>)</flag>
+    <flag name="ipopt">Add support for IPOPT (<pkg>sci-libs/ipopt</pkg>)</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">coin-or/CppAD</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-dip/Manifest b/sci-libs/coinor-dip/Manifest
index 1cb9dce125fa..05c95cf6f935 100644
--- a/sci-libs/coinor-dip/Manifest
+++ b/sci-libs/coinor-dip/Manifest
@@ -1,3 +1,3 @@
-DIST Dip-0.9.8.tgz 10557241 BLAKE2B 1fcddbe4b7e8ae0450fcf97473428c0a36b751bbf5b91ab45c362ca0590d390d8c0b5b4b273ed41f7e9432423c59b9a4f8536ff34b0c9c0f1c11ced779ddb38c SHA512 7dfb51f63aab36fe7e894be5f17f8b614bfdf9be1a14b8f8b2ee555dcb8392f82b13d20481d60423d3d375a2e52eebe0439e696e3b3a7dfdd18223829835d361
-EBUILD coinor-dip-0.9.8.ebuild 1186 BLAKE2B ba0f78baa1c151a10761da40ec82417108960405168aa90587fa1e72542a680bd118bdb647d8b2681e5d6e0987f86d8705f731b4e1318b5cde10af0a6626956a SHA512 3c41767e1472c682dfd3816c3072b3505f36c51d51a53c34ee07188676434259fcdc85a9d8db2d161545e4f9b786bff1f52d1ad3e066b3cac3d3d302af675afe
-MISC metadata.xml 722 BLAKE2B e4d55f25c10c60ad3da175feff1a5d2f9f3307dff701d8f98d83d0be32b21eac18432b7e104ed4570dbae3af4f8da6a10a6bbe4489727c6091ed5c3352d7e496 SHA512 b58f6dc52e8ff8793e843986b8ca71551eb8624e78e4122549306d68b4bb4c41cc6d86c40df697ed5e0bf1f9f829e01ebd57295526e3ef217cd4185cc9d443cb
+DIST coinor-dip-0.95.0.tar.gz 5213061 BLAKE2B 6f40e5d20832b0463e302519da168a30bdeea011a45047acb9dbe904763fc94ccaffbee3599b6f959e0eea5e40a0456771012707b9daafc50875194a1ff9967e SHA512 a9ea2bc23d625fa19e11943f46b3bf2db49aa894fe336c8de4a9a0c735e1569bd8bef015fd671eb856ee39a334adf06c95e2708bd69c4735d5f6bf994c9e41a2
+EBUILD coinor-dip-0.95.0-r1.ebuild 1313 BLAKE2B 905ec39fbafd8a632533826c8c06b1d8c70704b28b17575bc19431eca6517b6c04207b9ba5184bf10aa4c6c8920c9d6f52f004aaa3251a43bea7bd835dacfa08 SHA512 c1069c63cad11b9c38ba9f99198b0ad44b132d49b29e481b041cbbb82923f7eaf366e48e6fb2358b4cc3d601556ae37d43ae92e7cba8543a2ff84ce89a5e57d0
+MISC metadata.xml 798 BLAKE2B 44623c203a56df6ad4a5fedd020357ea090f71597bc503fc0dc233b5abcb9f98bfab9c90c14b45eaa2cf204d8f8aa4e3979f96140f82f973107d88f5aa1eec75 SHA512 174a513d37e350d66a8b6cd9774abc0a49952b58b8ab641292b67352cfe047be37a16bbaa621524dcf39e6e43c062a5d45fdab47da9950415367913f93168c82
diff --git a/sci-libs/coinor-dip/coinor-dip-0.9.8.ebuild b/sci-libs/coinor-dip/coinor-dip-0.9.8.ebuild
deleted file mode 100644
index c67282ce4ec6..000000000000
--- a/sci-libs/coinor-dip/coinor-dip-0.9.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=Dip
-
-DESCRIPTION="COIN-OR Decomposition in Integer Programming library"
-HOMEPAGE="https://projects.coin-or.org/Dip/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-alps:=
-	sci-libs/coinor-cbc:=
-	sci-libs/coinor-cgl:=
-	sci-libs/coinor-clp:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild b/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild
new file mode 100644
index 000000000000..d19f69dd1fb7
--- /dev/null
+++ b/sci-libs/coinor-dip/coinor-dip-0.95.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR Decomposition in Integer Programming library"
+HOMEPAGE="https://projects.coin-or.org/Dip/"
+SRC_URI="https://github.com/coin-or/Dip/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Dip-releases-${PV}/Dip"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-libs/coinor-alps:=
+	sci-libs/coinor-cbc:=
+	sci-libs/coinor-cgl:=
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-osi:=
+	>=sci-libs/coinor-symphony-5.6:=
+	sci-libs/coinor-utils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+
+src_prepare() {
+	default
+	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
+	sed -i '/--libs.*addlibs.txt/d' Makefile.in || die
+}
+
+src_configure() {
+	econf $(use_with doc dot)
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc '')
+}
+
+src_test() {
+	# Needed given "make check" is a noop and it skips the working one.
+	emake test
+}
+
+src_install() {
+	default
+	dodoc -r examples
+	use doc && dodoc -r doxydoc/html
+
+	# Duplicate or irrelevant files.
+	rm -r "${ED}"/usr/share/coin/doc || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-dip/metadata.xml b/sci-libs/coinor-dip/metadata.xml
index a2333b002b3c..3e01e7eaf8d9 100644
--- a/sci-libs/coinor-dip/metadata.xml
+++ b/sci-libs/coinor-dip/metadata.xml
@@ -14,4 +14,7 @@
 		Dantzig-Wolfe decomposition, Lagrangian relaxation, and various
 		cutting plane methods.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/Dip</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-flopcpp/Manifest b/sci-libs/coinor-flopcpp/Manifest
index 99555c9bf549..6b899213a165 100644
--- a/sci-libs/coinor-flopcpp/Manifest
+++ b/sci-libs/coinor-flopcpp/Manifest
@@ -1,3 +1,3 @@
-DIST FlopC++-1.1.7.tgz 6631744 BLAKE2B a6666480b800819b2132c6375483c35542bfd177201cd6cdd9b6ab36c42ef5d66308bf049ba0e7d7891cec32656e9fc0e4684c04e4628b5de3758be277d55142 SHA512 40f59cb34f61f6ff1759a90909a81d724a562ee9dbfe91628ad8df1b8049afff254ceeb56f1e68a48d035e6d3a140744b8ebd8815ee39c9f01e17860c904942d
-EBUILD coinor-flopcpp-1.1.7.ebuild 1382 BLAKE2B 1662117b6d6ffb9ad74162d8305888652d7aa2966af1d0b327f0e9219252a2c8c2bc793cbd1d780b8c876fc4f1b77d9826bc7b490a2eb325b206ac86a55817ce SHA512 8b84a8e6653ae8d3c371c354122ae41e307d93ab88699b5e8d6530951aed4b65b9ece3350aaf892e6eaf14db2674e9ad781b058ec52e1e52498eae758e092c50
-MISC metadata.xml 735 BLAKE2B b3578f22e5451e2c0ec193c0c19d7ea70b201746cdee54fa177acc11c03ecd6960e0abcc0ea756772109e05eae5b8bb8199d6cc3e6e547f5423b7e57a4143a29 SHA512 9ab407889f53ed69636badf75e10cc6be2514cf76517445dc7504af851ea69d0b9987584c71337b959bb3b728daa91173ee7f35513ee725f0b85e9882cbd2662
+DIST coinor-flopcpp-1.2.5.tar.gz 615614 BLAKE2B ff356ca41ed7639c2916c55f04ae561abfaeef041bd04730d0ca774cb6506f023c1c31e3463d93a34f41d534fb189cb794a20daa155dbdf43303c22272a6c986 SHA512 45d9e5b976d2fb26be34d5e201a7aed24ec8717472902f4848c353a12f17488903b00e6675e2a3e90ac0da58581afb6fd48d3869b8fd7ce962cef98622755d7d
+EBUILD coinor-flopcpp-1.2.5.ebuild 1078 BLAKE2B fb4bd8f2e53192a4fc47b8dcbcffec5ce9ad9d4c96784fc803d49b7d2ea0f148447ca92b78be769068de8dcdecbe49d4e7156e3a0c89961441bfe83f87d7df39 SHA512 ad005c75d22db501307ddf8d1356c0c6fe6ae3e6f32db6055d27a44f29c04fe69ad849d4f9627df4af7f83aa5e440c1e0887e2f40e49d9358eb26b315c6748c9
+MISC metadata.xml 815 BLAKE2B f467772000234f3feb2b5c96f8afee65402481432083426eb95033e24912486da56fef315141e02e5cf0028f8b0288b9873d19a83640c081fb24fb9c6013b9be SHA512 2eb8771dbf8c4c1af0f2feacf88a56e63a7990d561c526df6ed01e5d69ae34b95ed95e00621343ea83d3d32fce5738fdd3040942cb0211c81218d387b9cdedb9
diff --git a/sci-libs/coinor-flopcpp/coinor-flopcpp-1.1.7.ebuild b/sci-libs/coinor-flopcpp/coinor-flopcpp-1.1.7.ebuild
deleted file mode 100644
index 015c0264ae52..000000000000
--- a/sci-libs/coinor-flopcpp/coinor-flopcpp-1.1.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=FlopC++
-
-DESCRIPTION="COIN-OR algebraic modeling language for linear optimization"
-HOMEPAGE="https://projects.coin-or.org/FlopC++/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
-
-RDEPEND="
-	sci-libs/coinor-cgl:=
-	sci-libs/coinor-clp:=
-	sci-libs/coinor-osi:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-S="${WORKDIR}/${MYPN}-${PV}/FlopCpp"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-		$(use_with doc dot)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use doc; then
-		cd "${WORKDIR}/${MYPN}-${PV}/doxydoc" || die
-		doxygen doxygen.conf || die
-	fi
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${WORKDIR}/${MYPN}-${PV}/doxydoc/html/")
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-flopcpp/coinor-flopcpp-1.2.5.ebuild b/sci-libs/coinor-flopcpp/coinor-flopcpp-1.2.5.ebuild
new file mode 100644
index 000000000000..9139e3120b48
--- /dev/null
+++ b/sci-libs/coinor-flopcpp/coinor-flopcpp-1.2.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR algebraic modeling language for linear optimization"
+HOMEPAGE="https://projects.coin-or.org/FlopC++/"
+SRC_URI="https://github.com/coin-or/FlopCpp/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/FlopCpp-releases-${PV}/FlopCpp"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+src_prepare() {
+	default
+	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
+	sed -i '/--libs.*addlibs.txt/d' Makefile.in || die
+}
+
+src_configure() {
+	econf $(use_with doc dot)
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc '')
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	default
+	dodoc -r examples
+	use doc && dodoc -r doxydoc/html
+
+	# Duplicate or irrelevant files.
+	rm -r "${ED}"/usr/share/coin/doc || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-flopcpp/metadata.xml b/sci-libs/coinor-flopcpp/metadata.xml
index 696dc5c9016a..f3edc8d69d42 100644
--- a/sci-libs/coinor-flopcpp/metadata.xml
+++ b/sci-libs/coinor-flopcpp/metadata.xml
@@ -14,4 +14,7 @@
 		preserved, while embedding linear optimization models in software
 		applications is facilitated.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/FlopCpp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-mp/Manifest b/sci-libs/coinor-mp/Manifest
index e97d4658fd4d..c5ad0bcabf94 100644
--- a/sci-libs/coinor-mp/Manifest
+++ b/sci-libs/coinor-mp/Manifest
@@ -1,3 +1,3 @@
-DIST CoinMP-1.7.6.tgz 10343849 BLAKE2B a99fe1f5413bc458b0cfde53606041ecdec45c6ba9b866f083b85dafa04ef9aa2a52aec6ce2f5d6463e2cf9d609567d3079c10490412dcc5bd9c69942982f261 SHA512 1612d43d52d0ee29b4e6ca328e1535c59722dfd5c7a7e0811a4180ad6033ef27111ced6497f9d5cea816c047a4e11c2aed6d1936feac8ded797eeec55d9539ce
-EBUILD coinor-mp-1.7.6.ebuild 1351 BLAKE2B c4e2bccedbc64404be150311a07233edfd2ec658bb93f6cada46ed2036492cebb0ed746d43ae5cd0616e4a43c45a54fc752cec436bec8b386e94de1b2359f551 SHA512 ea2ef701b4e46d53f25d0d8585c79ebef718fdc77d65ad71fa8b43131dd9d540b87e7afa913a827a1494c40bbbb299c46b6a59cd9bfad8377453c7a35b433b59
-MISC metadata.xml 548 BLAKE2B 7629540fe896c9bb67cae8cb96df766a9c2ce36bb4d0da5fa27df91b256caf8fbacdee67225eae02e54feb903fb509f1eb6af719101575e460e24b9fd07b4258 SHA512 e87020fb255c6461b1aa6fe25ad66621c8a680fac287818d13a3089ff3b858c9f5a768ebf08e620d97700f83119bf426655c2b910529ffdc8907104f522dee04
+DIST coinor-mp-1.8.4.tar.gz 4142865 BLAKE2B 4f3f37378a13236ccab60ed0d9ec0e6716d7df8c264ec26f69e3117aaccf87cbdff42415cd4d86b936ba0fea87681592a66fef610f95ade68f5ea6cd185f4999 SHA512 ecb7761407df0a8d40ac2416fdbdfe62bb5e78f3cc4859e45c0912e6d06ca9b2d4bdf5fda2204bb1813d45289db9e8dbc48cce171950e8c3881d4a3fb3402fab
+EBUILD coinor-mp-1.8.4.ebuild 1057 BLAKE2B 7ccada7d30cb707d943cf3248d1bfb719a0cecb69e9c6ef3ab597110a95b25660dc10a607eb02a7499c69ec7bee7b46b51d7869be01ae0e606774cfbe3621234 SHA512 2c314d09c633ef7aa24dec8bc39b6688b1e7785969f8010a852275a5728f57754abf217adfffed5c5e3bf5e6e5caf6b1a49780fdde40ebad6403ca6a647873e9
+MISC metadata.xml 633 BLAKE2B f0022b8860f163b0e4bd3c2a28972d5df2cc8988374675b75de70a6a47de19f450bc323d538c4f2a1d9a88ef9abb4bf508bde96165f8e7a0e4f99ecb30724789 SHA512 dbd84ea46d73b20bc36556c53f1cbfb1ce17aecb52ddf11aea61787a7dde4b3c27aa39cd3013ead610d90f582391b1873c5cbf042b9f954a5a6e03ba543c56e5
diff --git a/sci-libs/coinor-mp/coinor-mp-1.7.6.ebuild b/sci-libs/coinor-mp/coinor-mp-1.7.6.ebuild
deleted file mode 100644
index f8d827e01c64..000000000000
--- a/sci-libs/coinor-mp/coinor-mp-1.7.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=CoinMP
-
-DESCRIPTION="COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL"
-HOMEPAGE="https://projects.coin-or.org/CoinMP/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs"
-
-RDEPEND="sci-libs/coinor-cbc:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	sed -i \
-		-e '/^addlibsdir/s/$(DESTDIR)//' \
-		-e 's/$(addlibsdir)/$(DESTDIR)\/$(addlibsdir)/g' \
-		-e 's/$(DESTDIR)$(DESTDIR)/$(DESTDIR)/g' \
-		Makefile.in || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-		--datadir=/usr/share
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	autotools-utils_src_install
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/coinor-mp/coinor-mp-1.8.4.ebuild b/sci-libs/coinor-mp/coinor-mp-1.8.4.ebuild
new file mode 100644
index 000000000000..6abaee7ca4e8
--- /dev/null
+++ b/sci-libs/coinor-mp/coinor-mp-1.8.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL"
+HOMEPAGE="https://projects.coin-or.org/CoinMP/"
+SRC_URI="https://github.com/coin-or/CoinMP/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CoinMP-releases-${PV}/CoinMP"
+
+LICENSE="CPL-1.0"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	sci-libs/coinor-cbc:=
+	sci-libs/coinor-cgl:=
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
+	# Also installation of unneeded files in a double ${D}.
+	sed -i '/--libs.*addlibs.txt/d; s/ install-addlibsDATA//' \
+		Makefile.in || die
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	default
+	dodoc -r examples
+
+	# Duplicate or irrelevant files.
+	rm -r "${ED}"/usr/share/coin/doc || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-mp/metadata.xml b/sci-libs/coinor-mp/metadata.xml
index 5fbc1079f58b..3ca43d16de05 100644
--- a/sci-libs/coinor-mp/metadata.xml
+++ b/sci-libs/coinor-mp/metadata.xml
@@ -10,5 +10,8 @@
   MP is a C-API interface library that supports most of the
   functionality of the CLP (Coin LP), CBC (Coin Branch-and-Cut), and
   CGL (Cut Generation Library) projects.
-</longdescription>
+  </longdescription>
+  <upstream>
+    <remote-id type="github">coin-or/CoinMP</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-netlib/Manifest b/sci-libs/coinor-netlib/Manifest
index ec6563d2dd75..936927464ce0 100644
--- a/sci-libs/coinor-netlib/Manifest
+++ b/sci-libs/coinor-netlib/Manifest
@@ -1,3 +1,3 @@
-DIST Netlib-1.2.6.tgz 3960587 BLAKE2B db4554656814fe68dcf1db88c6d3deb7a3d6bf0da64e4911df0eb2c3f052f7d4dcbc3f74a09035d7d8f2b3ca207a0c874271f7b3bac46dc9bb3dece712a6e2f5 SHA512 545de8928377fedec44844e0eca02f8aaa0701bcae99ecb0494a01c7f838c6561d66497dde8302a908252198fe2a0b7656241ef26e75d9682f3f4ad1f706b23a
-EBUILD coinor-netlib-1.2.6.ebuild 431 BLAKE2B 6c4d16948cdfe188fc195db7927ff47a904f0ed1236b7f1e052dfacc80ffb0c0c84c74983b1b2d87a15e565502179135dedf0e679940d371a1f4ec70c9a39599 SHA512 81c5c0c9b159f5f11fdf1e93ec73891a6c94c8ed05f858fc95f063bf6dcede5680f6f2b8b5e9574e67aa954a2319207a8e78b5abe29b710665f7baebb9e07165
-MISC metadata.xml 253 BLAKE2B e769e1636e1375309c31bf26fcfdcb1ef46b7a69346fd59011620907237204b3b7ced37cb3450c502f5b19aa1adf36f291412ee47e242ecbfc18c26bfa478f42 SHA512 819062e1ccefa39fc7f577279b08e781b9631eb14b7794db691ab92263c013ca432d279ac08671b19c80f7effb8c67528e5221278c573dd29dc0354bbff4a77e
+DIST coinor-netlib-1.2.9.tar.gz 3958648 BLAKE2B cbfceeb602c9482adb2463399dee180da8867b40775fbba4ca5824149a06971580fac51b32009238e33334ae88c7846ea9a0e1ce7d148a9c3b90a2d6dcc09216 SHA512 def9da137840ba40df4e9dc57114b0ae09dc020446f3f12d05d2d5d812e98880b206873b04581b0268535c4c113e86fb40aaf3fb3169ff47634152744184be66
+EBUILD coinor-netlib-1.2.9.ebuild 423 BLAKE2B efd078c2d96ed478ed338ce7bc6806bcb21af626eca5235c0a6410e043d80f5baf11a59602cb1796146ad5393966bf8647f8aa90ccd6c05c29e7b10902bd8587 SHA512 ec15f0857814fad14ce9541aa3c26f8a99d8dc677b37e17c007016cde41336023e500e7cd0b9d2da6a444a59fe09727212c68740c5edcaf034a95f928bf269bf
+MISC metadata.xml 343 BLAKE2B 15f9e5f32af0759cbe436fe83a6c46653f25557854238aa215a5c811ceb64080430767d98be153f4c5201d4601b3e50616b73c23e2ea33c7c2ac4dc28a143080 SHA512 f17a4bfbae9b2d77e3f116f5492c39ec1be5bcbfd14e4bad9c0eddb16ace6e782201e168c3eceb71e5eda18348cbb855b2cc59ef253d40b97112fef4d4adee83
diff --git a/sci-libs/coinor-netlib/coinor-netlib-1.2.6.ebuild b/sci-libs/coinor-netlib/coinor-netlib-1.2.6.ebuild
deleted file mode 100644
index 4eedeac9aa82..000000000000
--- a/sci-libs/coinor-netlib/coinor-netlib-1.2.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-MYPN=Netlib
-
-DESCRIPTION="COIN-OR netlib models"
-HOMEPAGE="https://projects.coin-or.org/svn/Data/Netlib"
-SRC_URI="http://www.coin-or.org/download/source/Data/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MYPN}-${PV}"
diff --git a/sci-libs/coinor-netlib/coinor-netlib-1.2.9.ebuild b/sci-libs/coinor-netlib/coinor-netlib-1.2.9.ebuild
new file mode 100644
index 000000000000..a90f44470498
--- /dev/null
+++ b/sci-libs/coinor-netlib/coinor-netlib-1.2.9.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR netlib models"
+HOMEPAGE="https://projects.coin-or.org/svn/Data/Netlib/"
+SRC_URI="https://github.com/coin-or-tools/Data-Netlib/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Data-Netlib-releases-${PV}"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/sci-libs/coinor-netlib/metadata.xml b/sci-libs/coinor-netlib/metadata.xml
index ae9640ffb9f1..8069fbe2d1ab 100644
--- a/sci-libs/coinor-netlib/metadata.xml
+++ b/sci-libs/coinor-netlib/metadata.xml
@@ -5,4 +5,7 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">coin-or-tools/Data-Netlib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-smi/Manifest b/sci-libs/coinor-smi/Manifest
index f5ad2e6d7ad8..6bd684d60e00 100644
--- a/sci-libs/coinor-smi/Manifest
+++ b/sci-libs/coinor-smi/Manifest
@@ -1,3 +1,3 @@
-DIST Smi-0.93.4.tgz 4907130 BLAKE2B 329cd05ee42cf2fe0928a9fd9049c0a296632bf6c30bc6ca86f62066ee425982a853223581110b4e3e4d7a6a049e06bbb366802b1a18d175e1dc2a1a38772e9b SHA512 9439b7421475cf5d0c85f529305657e04d1ebb3eca28399b0df0352b52df315e9dceb3f1410ada0b7a6f9447b0e383116fb208d6447994ce1611f019fcace007
-EBUILD coinor-smi-0.93.4.ebuild 1518 BLAKE2B 68bdc3379e2dca73bc1a47774655084c335b58b9c3cd9b812fb8f4d1ce70cbb38d23d8f1a2227e2260a8ba330caf3a48980bb29faacf972d60167999706d1f62 SHA512 3cdb67da05994f6d03ae0322c7aad18f5af03ebbb24429127abafbcfaba52a525980269db786c11c443195cb1843dc9ed4813f21eed6b7deaa9f20a2f6e84ecf
-MISC metadata.xml 982 BLAKE2B 2f74ba28cece6fa9fe493d79148ce7614e4682c440639e70583f103b606337873fb25a6bc6a685f1e0e1477aff7bc28655ca301a4fca8535c0f7de2e23a8fbf5 SHA512 5d702c7b51072d12118cefb565d266bbe5c7f3c5f3a664a48d1d8a5685d1fa5671b939485cc243bcf4af1e75e306a5797a30a046b6199418b201be474f713db2
+DIST coinor-smi-0.96.1.tar.gz 653402 BLAKE2B 7a81d0c67168ecd7059a814af7ba8fea57c8bc0316db95ea6a8a8a1717d7584ecfafe623b7de6b66908b5f85bc02cd0b1d1781fb7145c901efe6a8ddeb92afe6 SHA512 cadb4c89c0a385b762fab985a6a8880dd659feb4496e39826f337a9a323ea5de1fbed51f4b414b1f6eb36fbd02292ed42a1d216bf54d27f2d5bb242012b571c9
+EBUILD coinor-smi-0.96.1.ebuild 1175 BLAKE2B 82c3e29480e9ad2744563c76df3844d022fdd75132e2c85cf396bfaadfe8e49a0e4f6614b5b9e092061c36fd0ee22088ed8612b2169b71a163df3341b054b1a1 SHA512 2e54895c537c415fbbb6a932ec786bb7f30fafef3564a55e158f893961ecb4227b73359213b1a317bd02d90534856fabcf6117f2d803358b8217658637c662df
+MISC metadata.xml 1058 BLAKE2B 66093d02a6f2f09b5c4266ca455cdc5de44893926dc365613e65eb3b97a337c5991e809a9c3cdc0ac3bb3daa0fb911412be904778e1457e91c72a3ba405e4aed SHA512 b3401bdccca15aab188044cf9c3853afed76188f5b3e0f46d2a6675349c8103925e842512ae38850722000e4fdb3a1258dd9cd7b2ce02c49353fb6b169e70c86
diff --git a/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild b/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild
deleted file mode 100644
index 903528f79728..000000000000
--- a/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-inherit autotools-utils multilib
-
-MYPN=Smi
-
-DESCRIPTION="COIN-OR Stochastic modelling interface"
-HOMEPAGE="https://projects.coin-or.org/Smi/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="CPL-1.0"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-cbc:=
-	sci-libs/coinor-cgl:=
-	sci-libs/coinor-clp:=
-	sci-libs/coinor-flopcpp:=
-	sci-libs/coinor-osi:=
-	sci-libs/coinor-utils:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use doc; then
-		cd "${WORKDIR}/${MYPN}-${PV}/doxydoc" || die
-		doxygen doxygen.conf || die
-	fi
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${WORKDIR}/${MYPN}-${PV}/doxydoc/html/")
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples flopcpp_examples
-	fi
-}
diff --git a/sci-libs/coinor-smi/coinor-smi-0.96.1.ebuild b/sci-libs/coinor-smi/coinor-smi-0.96.1.ebuild
new file mode 100644
index 000000000000..e91f6006f743
--- /dev/null
+++ b/sci-libs/coinor-smi/coinor-smi-0.96.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR Stochastic modelling interface"
+HOMEPAGE="https://projects.coin-or.org/Smi/"
+SRC_URI="https://github.com/coin-or/Smi/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Smi-releases-${PV}/Smi"
+
+LICENSE="CPL-1.0"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-flopcpp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+src_prepare() {
+	default
+	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
+	sed -i '/--libs.*addlibs.txt/d' Makefile.in || die
+}
+
+src_configure() {
+	econf $(use_with doc dot)
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc '')
+}
+
+src_test() {
+	# Needed given "make check" is a noop and it skips the working one.
+	emake test
+}
+
+src_install() {
+	default
+	dodoc -r examples flopcpp_examples
+	use doc && dodoc -r doxydoc/html
+
+	# Duplicate or irrelevant files.
+	rm -r "${ED}"/usr/share/coin/doc || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-smi/metadata.xml b/sci-libs/coinor-smi/metadata.xml
index a09571668d51..79fdb8913b5e 100644
--- a/sci-libs/coinor-smi/metadata.xml
+++ b/sci-libs/coinor-smi/metadata.xml
@@ -18,4 +18,7 @@
 		generation, interacting with solvers to obtain solution information,
 		etc.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">coin-or/Smi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/coinor-symphony/Manifest b/sci-libs/coinor-symphony/Manifest
index 7a49eaae19fe..c3f662bf6fd5 100644
--- a/sci-libs/coinor-symphony/Manifest
+++ b/sci-libs/coinor-symphony/Manifest
@@ -1,3 +1,3 @@
-DIST SYMPHONY-5.5.7.tgz 7628863 BLAKE2B 8578cc341a2114642911bff68cf260dd6c5974b70ef3deebf9f7ea51f580be809dd1224a18dbd0744e9acf3b1ce9d5bdf90a1e97b53bcd01529978a816e26c6c SHA512 a3ce66b0b1373c58024ce6840277423a1a3684af8e3179a777fbb33a8d266849ae1cde694a527c3776ff67ce0a5ae3c2bfe0dc29f4e0b3ca51ddc2b299eefb24
-EBUILD coinor-symphony-5.5.7.ebuild 2076 BLAKE2B 0b6b9a1188ca24c7e6bfa2a1531a6e5a84b5eacacfb42a382f094681c2232e5a8d38e816b844064f2d7d81936708911a19baba4427959d50ffbfdb4e0f65f9cc SHA512 9f04d98147000697dbcd21cc1bd7a1d95dd0ba36998d4f42f8099788817b86f0ee6df2758b9632c5bd6bd0c047b82f052dfd4f7bed9c39e3e1aa3aecf09d2848
-MISC metadata.xml 830 BLAKE2B ef49e73859bb88cc97b1df0614c299e9596bdab25dfd6b10a64c230dc49d038abdd8d68fb2d9fe9a8d7161722fed4acab654720f8aac3d2c7ed05c9d7f49a9ed SHA512 292f30da8c4b2a847665c848a10b33259c4bb7d89cc9363e75fb167bdbc73e0465697dc9c9979337af438f6f2a9ebba2e51dc32bcd2272ceae741c010e17041d
+DIST coinor-symphony-5.6.17.tar.gz 1848015 BLAKE2B 0e1222f51809fb836530000348351d0e2a0928ec898a11ec21d2b0cad88a2ee4a635bc91a6d92607af67cf7d44a7187683528dd2a37b288fee1b2d947058d7b1 SHA512 eb0022184b1d0325729bb8f5390093ff1cfdfc87edf1dfdf20e62f07830c69604ec373b69c6de13755611a8e96f79ee8d1009efde0a35c9e7c0fab6652375ff7
+EBUILD coinor-symphony-5.6.17.ebuild 1719 BLAKE2B e2651d17cea9d6301adcc9f8db54bfa0599630f0e13dca8fc35a8a0f94695cd8a586c51cffef50d0236290bc82c5e60b0c85af0fc06162e198f2c7f7dd77f559 SHA512 e8a254986c175c8cde751c55f8170ff931e433303614b0bdc39b60bd3e1e6db76226ae1b64cc7a6f8e6525033ac197a3185620583191651d0ff91fd6db920d46
+MISC metadata.xml 909 BLAKE2B 0e3de2ce45799ab39397f233b7c3f39642f9e011b6d8fea52fdc5ed9bf9a080ccf9ea53869eb83ac242d23092742432be4473ca436e1bd75dcaec98b6f369dfd SHA512 6406a6d362d4ebac06db82c53167d57c6fa45a3eddd77915ed55299778940e8a7e8445f099f8c2ff4b3ba6eed1410c600ce8d7fb5672703136644adfd5f31763
diff --git a/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild b/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild
deleted file mode 100644
index 02a341b4b79d..000000000000
--- a/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=SYMPHONY
-
-DESCRIPTION="COIN-OR solver for mixed-integer linear programs"
-HOMEPAGE="https://projects.coin-or.org/SYMPHONY/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="EPL-1.0"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples glpk static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-cgl:=
-	sci-libs/coinor-clp:=
-	sci-libs/coinor-dylp:=
-	sci-libs/coinor-osi:=
-	sci-libs/coinor-utils:=
-	sci-libs/coinor-vol:=
-	glpk? ( sci-mathematics/glpk:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )
-	test? ( sci-libs/coinor-sample )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-coin-instdir="${ED}"/usr
-	)
-	if use glpk; then
-		myeconfargs+=(
-			--with-glpk-incdir="${EPREFIX}"/usr/include
-			--with-glpk-lib=-lglpk )
-	else
-		myeconfargs+=( --without-glpk )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	# hack for parallel build, to overcome not patching Makefile.am above
-	autotools-utils_src_compile -C src libSym.la
-	autotools-utils_src_compile
-	if use doc; then
-		pushd Doc /dev/null
-		pdflatex Walkthrough && pdflatex Walkthrough
-		# does not compile and doc is online
-		#pdflatex man && pdflatex man
-		popd > /dev/null
-	fi
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	# hack for parallel install, to overcome not patching Makefile.am above
-	autotools-utils_src_install -C src install-am
-	autotools-utils_src_install
-	use doc && dodoc Doc/Walkthrough.pdf
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r Examples/*
-	fi
-}
diff --git a/sci-libs/coinor-symphony/coinor-symphony-5.6.17.ebuild b/sci-libs/coinor-symphony/coinor-symphony-5.6.17.ebuild
new file mode 100644
index 000000000000..2d7ceecd23b2
--- /dev/null
+++ b/sci-libs/coinor-symphony/coinor-symphony-5.6.17.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COIN-OR solver for mixed-integer linear programs"
+HOMEPAGE="https://projects.coin-or.org/SYMPHONY/"
+SRC_URI="https://github.com/coin-or/SYMPHONY/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/SYMPHONY-releases-${PV}/SYMPHONY"
+
+LICENSE="EPL-1.0"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc glpk test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-libs/coinor-cgl:=
+	sci-libs/coinor-clp:=
+	sci-libs/coinor-dylp:=
+	sci-libs/coinor-osi:=
+	sci-libs/coinor-utils:=
+	sci-libs/coinor-vol:=
+	glpk? ( sci-mathematics/glpk:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		dev-tex/latex2html
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	test? (
+		sci-libs/coinor-netlib
+		sci-libs/coinor-sample
+	)"
+
+src_prepare() {
+	default
+	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
+	sed -i '/--libs.*addlibs.txt/d' Makefile.in || die
+
+	# Fix manual color errors.
+	sed -i 's/usenames/usenames,dvipsnames/' Doc/man.tex || die
+}
+
+src_configure() {
+	econf $(usex glpk --with-glpk-lib=-lglpk --without-glpk)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		pushd Doc >/dev/null || die
+		pdflatex Walkthrough || die
+		pdflatex man || die
+		popd >/dev/null || die
+	fi
+}
+
+src_test() {
+	# Needed given "make check" is a noop and it skips the working one.
+	emake test
+}
+
+src_install() {
+	default
+	use doc && dodoc Doc/*.pdf
+
+	# Other coinor-* use lowercase e, stay in-line with them.
+	docinto examples
+	dodoc -r Examples/.
+
+	# Duplicate or irrelevant files.
+	rm -r "${ED}"/usr/share/coin/doc || die
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-symphony/metadata.xml b/sci-libs/coinor-symphony/metadata.xml
index 6933ca7ddab6..cecafbcc0904 100644
--- a/sci-libs/coinor-symphony/metadata.xml
+++ b/sci-libs/coinor-symphony/metadata.xml
@@ -18,4 +18,7 @@
   <flag name="glpk">Enable GNU Linear Programming Kit
   <pkg>sci-mathematics/glpk</pkg> support</flag>
 </use>
+<upstream>
+  <remote-id type="github">coin-or/SYMPHONY</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sci-libs/exodusii/Manifest b/sci-libs/exodusii/Manifest
index 08f7e0036d85..1b4e77fbf623 100644
--- a/sci-libs/exodusii/Manifest
+++ b/sci-libs/exodusii/Manifest
@@ -1,4 +1,4 @@
 AUX exodusii-6.09-multilib.patch 2891 BLAKE2B 0bca9f2e768b409f1683c3d1925add553f86a9fca393551b98fefac1d4cc9913d50be4660bd4c62474a95f2aae129480533d2a51aaa2083cb5461b91c8655f7f SHA512 189047d12455c539308b8eeb81334d980f847d68b96df7cef442f8d552404e5c70f42a3e3649d62cc7db395ae2ca2f6988ee0638eebf52b3cab9c3bf964d5fc2
 DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516
-EBUILD exodusii-6.09.ebuild 1223 BLAKE2B 711f3b8b71c596f20c5358b1e345ee58040609e634f23ee495b254380dae06d871b354610db1de3eaeaad8a59c78edf83f1c6d15807cf94e6cd26e82df9a5218 SHA512 02a036b731650ed9d92a42fd9e8ffbe9d73b52865cedeb7a7d2b10b1765d0c583c83890b2c379da2ce9009116350e2fc188db6866f6200b65ce9e2683f991dc1
+EBUILD exodusii-6.09.ebuild 1244 BLAKE2B ba6ea2ad259ec1c9cdab1b4cd7730243e5cdde2188eca9d16f30523083ab1235a182fcef06b9f660506e23477f3e2077a66676aaa5a7dc5df0277fa03411d1d6 SHA512 cdffb599828a88c2f4cccbc27f20dc6c026a1830370b37316079251b2a647a8a1504886f2825561c330377214797e1199624a634778190c18d6f0d7ba5f147bd
 MISC metadata.xml 603 BLAKE2B 99e4fc167e1cf5e96571a2024a8b217083a200fa3850d09c2d520939a87608ecc70708dd302f1c292338aa4c07d0a586c77da80392f85c16e2fb122f98c86cee SHA512 9d703efe9fbf4d49438d83bcdca60db2cd9a40f0b853fcf8cd796d9f96d304c84825c9e2cb26ba98f1893e3e85ddd1af8a5e15c4c4e179d6de25b1df98be3a55
diff --git a/sci-libs/exodusii/exodusii-6.09.ebuild b/sci-libs/exodusii/exodusii-6.09.ebuild
index e866e4c029f8..cfa73bffceca 100644
--- a/sci-libs/exodusii/exodusii-6.09.ebuild
+++ b/sci-libs/exodusii/exodusii-6.09.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+CMAKE_MAKEFILE_GENERATOR="emake"
 FORTRAN_NEEDED="test"
-inherit cmake-utils fortran-2
-
 MY_PN="${PN%ii}"
 MY_P="${MY_PN}-${PV}"
+inherit cmake fortran-2
 
 DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
 HOMEPAGE="https://github.com/certik/exodus"
 SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}/${MY_PN}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="sci-libs/netcdf[hdf5]"
@@ -24,12 +26,10 @@ DEPEND="${RDEPEND}
 	test? ( app-shells/tcsh )
 "
 
-S="${WORKDIR}"/${MY_P}/${MY_PN}
-
 PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if ! use test; then
 		sed -e 's:Fortran::g' -i CMakeLists.txt || die
@@ -46,7 +46,7 @@ src_configure() {
 		-DBUILD_TESTING=$(usex test)
 	)
 	export NETCDF_DIR="${EPREFIX}/usr/"
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 1b7bcb93e453..747138e59ad3 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -5,10 +5,8 @@ AUX fftw-2.1.5-no-test.patch 1028 BLAKE2B 878780d275d1454edff28c6834c118981e8ecb
 AUX fftw-2.1.5-parallel-tests.patch 3720 BLAKE2B 6b18c68e121035c517cf8eae245d32a1b99f51fc01f3baa0b96351f0a0833714c89798fc06b231c3acda6131cb6e0fe9782a0d1c34c76eac04eee8d0b9144857 SHA512 2e02c69dcbae6c11b8bdf0edb1a49c9754c9a599438e1073eb2bcff04c52c38c1e76eb352f21957a0518d61ee2e32d302e5624e234d28344fc99036313394d3e
 AUX fftw-2.1.5-texinfo5.1.patch 596 BLAKE2B f45dcfef53cfb374c2022e88632934b48f2a19e5e75734a5c7d7901b8464403ceb675efcf6e43b00f10779776a8e9789956bb77e937b754c0a070e15821f4877 SHA512 71dd3c13784f9bd1b518827a6784e2619145377cbc88764c69830519096f61863140b90c8138d6a65e3994487cb12cd06baba826d48735c2cbddc1d2320a4214
 DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
-DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf
 EBUILD fftw-2.1.5-r9.ebuild 3135 BLAKE2B 096f800cef6610c63107d3103c55e7f43c1d62db9ed84d7a346c81f36f49e94a39482d5929be23c7296f100a394c1d6ade83a9965926d69bab2c9b1c7078c8a4 SHA512 fd9ea101212d4fa2e602d00114ce71e2525174a9162f4ed26ae9086b5d021fe1ab10f010d4c95e0e452ca93b79d01347ad4cff72cc866415fa1c64bd2dac1fcb
-EBUILD fftw-3.3.8-r1.ebuild 4631 BLAKE2B eb2025e5b4a8a8c2d0aa26fbdc2f2475fcf877b2f6d19533016d5bef0108f4afdef8161b296a2b0b25bd4a28a60285e664b614f61bd0278fcdc8831a9df5edcf SHA512 bfaa6b2d5c30153378e13fa1910baa514b4243bdd441a3165e74ead0e5035e928c9952494933c488f25cf6df23fc681f9ca26aa0316b0dedba44741e1aa9564f
-EBUILD fftw-3.3.9.ebuild 4056 BLAKE2B 4f9b66a6e0bc43d429e285b3d091d3b686bfb02b3526d82d6f96c8928dd51083b777f18234c215b23a85c4be67a2deea2a6fa862ecd9baaa5e47d2b4b68f26f8 SHA512 764d54e5c6542e85224da496627ab7f421a32cc1a8cc40126623cb85617b62101d0889e9ec89b59e112b0b4723d2f48383fe05d4a11779171a2895a8b9660898
+EBUILD fftw-3.3.9.ebuild 4054 BLAKE2B 11a7746384d1a61d24b66deffa2e20a0e030cecbba14d138196ba99a72d4d37248771607ca2a33af41d42103ca09365c1d66a0b226469eefabd94f1b0baa7f17 SHA512 8e2b8522398387550289b4cdd46ce959ca94577c8b94a5c3d63b676acd0225782210e694efea2423a67c49ffd1bcc2a7d4fdc4a22d816120dd65140f50d0beba
 EBUILD fftw-9999.ebuild 4062 BLAKE2B 2cdb80fdc4d24ea3af6ec1ffc2b73450c76e735130d22e8e01cb479d3c24b5f2bd4926a947a937340988447863bf7d1b222702a337139f5fc1e437556f7f5137 SHA512 0e44b6d0f2262ec0978ab00b909f0b2d6b4c92e0a6a5cc10e9e3317d2b9c7e1d4654315f618ed18f46aa68eeaaadfff29a7a38ef8a71c52435a1012307bbbe47
-MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
+MISC metadata.xml 1081 BLAKE2B ef31000f7d7f02b98d2b982ecfdf9e1560fbce84098b4b1ff8964e35be53b4ac0a4b098c03f07557316de988b6791949fef7e4900d23e9d922293143e42ec1e2 SHA512 bcbac3f302c6c064782c8567a33f2b67f7a03e3efc02e8a2fc8f023286ea91c93b943b92ad7ddd48ec5a6cc5c33f8f2b6c35d985b6f8b361b41f5e9bcf243bfc
diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
deleted file mode 100644
index ae84f01be618..000000000000
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-MY_P=${PN}-${PV/_p/-pl}
-
-if [[ ${PV} = *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-else
-	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="3.0/3"
-IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	quad? ( sys-devel/gcc[fortran] )
-	test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-HTML_DOCS=( doc/html/. )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if ! tc-is-gcc; then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix info file for category directory
-	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	# jlec reported USE=quad on abi_x86_32 has too few registers
-	# stub Makefiles
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
-		mkdir -p "${BUILD_DIR}/tests" || die
-		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-		return 0
-	fi
-
-	local myconf=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-		$(use_enable fortran)
-		$(use_enable zbus mips-zbus-timer)
-		$(use_enable threads)
-		$(use_enable openmp)
-	)
-	case "${MULTIBUILD_ID}" in
-		single-*)
-			# altivec, sse, single-paired only work for single
-			myconf+=(
-				--enable-single
-				$(use_enable cpu_flags_ppc_altivec altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse sse)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable neon)
-				$(use_enable mpi)
-			)
-			;;
-
-		double-*)
-			myconf+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable mpi)
-			)
-			;;
-
-		longdouble-*)
-			myconf+=(
-				--enable-long-double
-				$(use_enable mpi)
-			)
-			;;
-
-		quad-*)
-			# quad does not support mpi
-			myconf+=(
-				--enable-quad-precision
-			)
-			;;
-
-		*)
-			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
-			;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)"
-}
-
-src_configure() {
-	# upstream does not append proper -m flags
-	# https://bugs.gentoo.org/698572
-	use cpu_flags_x86_avx2 && append-flags -mavx2
-
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake -C tests smallcheck
-}
-
-src_test() {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	# local testbase="perl check.pl --nthreads=1 --estimate"
-	#     ${testbase} -${p}d || die "Failure: $n"
-
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant multilib-minimal_src_install
-	dodoc CONVENTIONS
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto faq
-		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
-	fi
-
-	local x
-	for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
-		local u
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
-		done
-	done
-
-	# fftw uses pkg-config to record its private dependencies
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 7b33de00082e..32ce75db90af 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index 38679de9df3e..c884ae1bb936 100644
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -17,10 +17,10 @@
   <use>
     <flag name="float">Link default library to single precision instead of
     double (symlinks only and fftw-2.1)</flag>
-    <flag name="quad">Build quadruple precision lib</flag>
     <flag name="zbus">Adds support for ZBus cycle-counter of mips</flag>
   </use>
   <upstream>
+    <remote-id type="github">FFTW/fftw3</remote-id>
     <remote-id type="freecode">fftw</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 795ee701b2cc..205f5ac88bb2 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,12 +1,5 @@
 AUX gdal-2.2.3-soname.patch 2031 BLAKE2B adc05d4e426083af16c153011d1bccb2a6d7334eac2911faffdc373765cd21a69505928b14cf9896b7f7b23acefc574abd5c85d20b6376aee6a7bb87d775d30b SHA512 8d4cf1f7a69002c7d2789a5abb3c4d10a0d687566e8acd2ea208e994870eff2cb03975812c435eaa0dc13e1e2f42e2151dcb23ea0470242b1e79aa6892a13cdd
 AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6
-AUX gdal-3.0.2-complete.patch 3533 BLAKE2B 5b62041f4be9f8a846f35f8d54e4cf6eb5d0902a009197d1d994e500a0e23e57149dff28d7baa20817d40db103b37c93b7ab88f54b12f7e2b324dc1d5c6f61e5 SHA512 c7ade447b857977f8949de2d44dde34ab581b11603afbb9f1e2fcaffa65941aa037a69a34b1915d33f1cde6bfec92ff91859b80bfdc06a27cdcc25733c9b60a1
-AUX gdal-3.0.2-datadir.patch 2516 BLAKE2B 5d67889e468cee04f780e9f15cb167d27dbf955db9464155170afdcd2fc72744ab699c8a7de34872b1dd085268f7ee80a54d73397503919955f6898f0b161560 SHA512 327f2a7e6b2d2665153350a6419bec9396b51f6374bcffb8101986f740363b47ae2db9c2fb7b6e3c0f512bdfd502a1abb531be178d27b4138948018cd1564532
-AUX gdal-3.0.4-poppler-20.08.patch 1857 BLAKE2B 676b951dae6a374e2897549ff604fb8e7d49bae5aa1d5b51f808a6e9098f951eacc5d5ce736ab2346da2fb2d8c1c12592d8011d1f1d379321a5bc535f7b876b4 SHA512 a1e3d63885cceee3dc56febcbd8837818e956207b9fe9da3409b19d972ee338a0c22b7ad8694f742a94fdf5c26597099a5cfaf8d5212f641b32174bbdd31fd8c
-DIST gdal-3.0.4.tar.gz 14379480 BLAKE2B 1ced7f791608be2ea1aede8705826135a015a3bf376af087b10e0b17a6884c141df4b24654eeac136afd959c1360ce0cf1f1312438093ca305fa38a242d7e364 SHA512 bc5032a123a2cc90145fef8b467a4c9b78ddf7b4d850ceaae8350aacc3f6f23e13dd52219844a2b930b59d000854d3f2cce117643d62ead176b71939f4760ce9
-DIST gdal-3.2.0.tar.gz 18928960 BLAKE2B b6cd2f2700cc26c8dd585667cd7b2e3bd9b78d294b3fa397edc1f4fa326d29dfc29e9646c6f655bcb88f7fa4c80662008fe78ba8460d9fb974fc6ae5dc310061 SHA512 695f32856effc1811931f8722dc1105d78f305ce582a6ba33bf4e1848657a57ad658f3d904c0af48e2c47e48d5d84afbe2c46a3774df43d58b1827fce9bd368f
 DIST gdal-3.2.1.tar.gz 18953600 BLAKE2B b47994849bcf6bc2b2f53daabb85ef99cdc9ce2a06134bc591652bf7e5304d503701d2b07cae520ca71ad6238dd0b073d2034743e59b072fc5eb50c13bc143e6 SHA512 152dd97464a8242ea1da7a3a215b1d3326bab5aa4b0884fcab6880da460577c80075f87ea7b9513d796e899e98b40701c0b6a63f1e5275607905480ec547e688
-EBUILD gdal-3.0.4-r1.ebuild 7347 BLAKE2B 240cd24cb20f44e7802d3f6e46586d3f2a2fdb7371288abb2a05c39cc3f91a5a333a513d1bea2d9438732ef6f69890fbef48abaa76665df82a72ba67074ba610 SHA512 510216239bcb4002353734ee7b30a90a92c0e74dba61d9d6f0d6e93cc85590769588c30c25df4dca9a284a099c18be1636542de65e9b90a2619a953ec379be88
-EBUILD gdal-3.2.0-r1.ebuild 7200 BLAKE2B 264c323a56333986ce1f4d6b949e07da2ddcb40e4b7593231d8ac16af2cc7f5a7c94c0769af8940fe6efaaac4c03524d011f266f51aa7498da2f8a7f8d511e3a SHA512 9b9d61185fafa97b0805ba358ed331edc755e8fbce5a6672e10b76161ab9677c065cdabe55bf9dd2bd9a21cf7cd8167b69bf1ed5b8740c2bd73a8c8513ac3284
 EBUILD gdal-3.2.1-r1.ebuild 7221 BLAKE2B 5d0322c1869f37dbdd0e39884acc0c17c939f442fa3dd1a0ad98cd735cb02b034fa6c33bcffb7f204c5e6081f5b785578757e800d46c9c3225008e4380a7a9a0 SHA512 855ccb9d188a6c5c91a2da2074f78425c908615cc488dcedb631aa4784f69b8a144f77369b01401f59d5cd83a7bae96237c45b12f3075091d56e9a7ef9a66525
 MISC metadata.xml 1495 BLAKE2B 3d9f0cc3e5169eab7ff2c59b61d9fa5b4f8edf683f6e1447c40b1b0e8d81834e2d9fc13c68979c51a710f5aca5c9cd9a1f45a13c4e4ad0ded7a0fcdc1751d54b SHA512 cd0820bd5df06ccfb6315ab4586e49f72396115d08f318038dc3af2380a1896128ccf0ba46de0cc370546f7313907844907d6d75cc705a74bf4c78d0121afc3d
diff --git a/sci-libs/gdal/files/gdal-3.0.2-complete.patch b/sci-libs/gdal/files/gdal-3.0.2-complete.patch
deleted file mode 100644
index 5d6716c7280c..000000000000
--- a/sci-libs/gdal/files/gdal-3.0.2-complete.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/GDALmake.opt.in b/GDALmake.opt.in
-index fd8e8f374d..655c004c56 100644
---- a/GDALmake.opt.in
-+++ b/GDALmake.opt.in
-@@ -63,6 +63,7 @@ INST_INCLUDE	=	@includedir@
- INST_DATA 	=	@datadir@
- INST_LIB	=	@libdir@
- INST_BIN	=	@bindir@
-+INST_BASH_COMPLETION	=	@bashcompdir@
- INST_PYMOD      =       @pymoddir@
- INST_DOCS	=	@exec_prefix@/doc
- INST_MAN	=	@mandir@
-diff --git a/GNUmakefile b/GNUmakefile
-index 92467d6cf6..6d5e7d9fc0 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -229,7 +229,9 @@ endif
- ifneq ($(BINDINGS),)
- 	(cd swig; $(MAKE) install)
- endif
-+ifdef INST_BASH_COMPLETION
- 	(cd scripts; $(MAKE) install)
-+endif
- 	for f in LICENSE.TXT data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
- 	$(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB)
- 	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/pkgconfig
-diff --git a/configure.ac b/configure.ac
-index 93ddca84d9..5d0e7ab8be 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1187,6 +1187,24 @@ if test "$am_func_iconv" = "yes"; then
-     AC_DEFINE_UNQUOTED(ICONV_CPP_CONST,$ICONV_CPP_CONST, [For.cpp files, define as const if the declaration of iconv() needs const.])
- fi
- 
-+dnl ---------------------------------------------------------------------------
-+dnl Bash completions
-+dnl ---------------------------------------------------------------------------
-+
-+AC_ARG_WITH([bash-completion],
-+  AS_HELP_STRING([--with-bash-completion[=ARG]],
-+    [Install Bash completions (ARG=yes or path)]),,)
-+
-+if test "x$with_bash_completion" = "xno" -o "x$with_bash_completion" = "x"; then
-+  AC_MSG_NOTICE([Bash completions not requested])
-+elif test "x$with_bash_completion" = "xyes"; then
-+  PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], ,
-+    bashcompdir="${sysconfdir}/bash_completion.d")
-+  AC_SUBST(bashcompdir)
-+else
-+  AC_SUBST(bashcompdir, $with_bash_completion)
-+fi
-+
- dnl ---------------------------------------------------------------------------
- dnl PROJ.6 related stuff
- dnl ---------------------------------------------------------------------------
-diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
-index 8f039e469a..511fbb499c 100644
---- a/scripts/GNUmakefile
-+++ b/scripts/GNUmakefile
-@@ -1,10 +1,20 @@
- include  ../GDALmake.opt
- 
-+PROGRAMS := gdal2tiles.py gdal2xyz.py gdaladdo gdalbuildvrt gdal_calc.py \
-+            gdalchksum.py gdalcompare.py gdal-config gdal_contour gdaldem \
-+            gdal_edit.py gdalenhance gdal_fillnodata.py gdal_grid \
-+            gdalident.py gdalimport.py gdallocationinfo gdalmanage \
-+            gdal_merge.py gdalmove.py gdal_polygonize.py gdal_proximity.py \
-+            gdal_rasterize gdal_retile.py gdalserver gdal_sieve.py \
-+            gdalsrsinfo gdaltindex gdaltransform gdal_translate gdalwarp \
-+            ogr2ogr ogrinfo ogrlineref ogrmerge.py ogrtindex
-+
- completion:
- 	PATH=$(GDAL_ROOT)/swig/python/scripts:$(GDAL_ROOT)/apps:$(PATH) python completionFinder.py gdal-bash-completion.sh
- 
- install:
--	if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
--		$(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
--		cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
--	fi
-+	$(INSTALL_DIR) $(DESTDIR)$(INST_BASH_COMPLETION) ; \
-+	$(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo; \
-+	for p in $(PROGRAMS); do \
-+		ln -rs $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo $(DESTDIR)$(INST_BASH_COMPLETION)/$$p; \
-+	done
diff --git a/sci-libs/gdal/files/gdal-3.0.2-datadir.patch b/sci-libs/gdal/files/gdal-3.0.2-datadir.patch
deleted file mode 100644
index 95c525ca1b8e..000000000000
--- a/sci-libs/gdal/files/gdal-3.0.2-datadir.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
-index 655c004c56..7d8f3708d6 100644
---- a/GDALmake.opt.in
-+++ b/GDALmake.opt.in
-@@ -56,18 +56,23 @@ GNM_ENABLED = @GNM_ENABLED@
- OSX_FRAMEWORK_PREFIX = /Library/Frameworks/GDAL.framework
- OSX_VERSION_FRAMEWORK_PREFIX = ${OSX_FRAMEWORK_PREFIX}/Versions/@GDAL_VERSION_MAJOR@.@GDAL_VERSION_MINOR@
- 
-+PACKAGE = @PACKAGE@
-+
- prefix		=	@prefix@
- exec_prefix	=	@exec_prefix@
-+datarootdir	=	@datarootdir@
-+docdir	=	@docdir@
-+htmldir	=	@htmldir@
- INST_PREFIX	=	@exec_prefix@
- INST_INCLUDE	=	@includedir@
--INST_DATA 	=	@datadir@
-+INST_DATA 	=	@datadir@/gdal
- INST_LIB	=	@libdir@
- INST_BIN	=	@bindir@
- INST_BASH_COMPLETION	=	@bashcompdir@
- INST_PYMOD      =       @pymoddir@
--INST_DOCS	=	@exec_prefix@/doc
-+INST_DOCS	=	@htmldir@
- INST_MAN	=	@mandir@
--INST_HTML	=	$(HOME)/www/gdal
-+INST_WEB	=	$(HOME)/www/gdal
- 
- CPPFLAGS	:= @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION
- CFLAGS		= @CFLAGS@ @C_WFLAGS@ $(USER_DEFS)
-diff --git a/gdal/configure.ac b/gdal/configure.ac
-index 5d0e7ab8be..afef88fdbd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,6 +33,7 @@ define([AC_CACHE_SAVE], )
- 
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(GDALmake.opt.in)
-+AC_SUBST(PACKAGE, gdal)
- AC_CONFIG_MACRO_DIR(m4)
- AC_CONFIG_HEADERS([port/cpl_config.h:port/cpl_config.h.in])
- AH_BOTTOM([#include "cpl_config_extras.h"])
-@@ -5167,25 +5168,6 @@ export BINTRUE
- 
- AC_SUBST(BINTRUE,$BINTRUE)
- 
--dnl ---------------------------------------------------------------------------
--dnl If datadir is set to @prefix@/share, the modify it to be
--dnl @prefix@/share/gdal.  I wish we could default this.
--dnl ---------------------------------------------------------------------------
--if test "$datadir" = '${prefix}/share' ; then
--  datadir='${prefix}/share/gdal'
--fi
--
--if test "$datadir" = '${datarootdir}' \
--     -a "$datarootdir" = '${prefix}/share' ; then
--  datarootdir='${prefix}/share/gdal'
--fi
--
--dnl ---------------------------------------------------------------------------
--dnl By default mandir is $datarootdir/man which would be
--dnl /usr/local/share/gdal/man but we want man pages in /usr/local/man.
--dnl ---------------------------------------------------------------------------
--mandir='${prefix}/man'
--
- dnl ---------------------------------------------------------------------------
- dnl Capture GDAL_PREFIX for the cpl_config.h include file.
- dnl ---------------------------------------------------------------------------
diff --git a/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch b/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch
deleted file mode 100644
index 0fd8051c365c..000000000000
--- a/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2b863dbabdc2a7d724f9fdf3e6ff20a142b619f6 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 3 Aug 2020 14:52:25 +0200
-Subject: [PATCH] Unix build: fix detection of minor version number of Poppler
- with the new YY.MM.X numbering scheme (fixes #2823) (#2825)
-
-Authored-by: @chris2553
----
- a/configure    | 4 ++--
- b/configure.ac | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index 4d618db8149..69d46182a26 100755
---- a/configure
-+++ b/configure
-@@ -40824,8 +40824,8 @@ $as_echo "yes" >&6; }
- fi
-     if test "$POPPLER_VERSION" != ""; then
-         HAVE_POPPLER=yes
--        POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([0-9]*\)'`
--        POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[0-9]*\.\([0-9]*\)'`
-+        POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1`
-+        POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'`
-         POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"`
-     fi
- else
-diff --git a/configure.ac b/configure.ac
-index 0f4124e6431..7f337e77c1d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4966,8 +4966,8 @@ if test "$with_poppler" != "no" -a "$with_poppler" != ""; then
-             [POPPLER_VERSION=`$PKG_CONFIG --modversion poppler`], [POPPLER_VERSION=])
-     if test "$POPPLER_VERSION" != ""; then
-         HAVE_POPPLER=yes
--        POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([[0-9]]*\)'`
--        POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
-+        POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1`
-+        POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'`
-         POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"`
-     fi
- else
diff --git a/sci-libs/gdal/gdal-3.0.4-r1.ebuild b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
deleted file mode 100644
index 5040e2ae9298..000000000000
--- a/sci-libs/gdal/gdal-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# 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_{7,8,9} )
-DISTUTILS_OPTIONAL=1
-inherit autotools bash-completion-r1 perl-module distutils-r1 flag-o-matic java-pkg-opt-2 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.0"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="armadillo +aux-xml curl 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.7:*
-	)
-	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
-	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.7:* )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${PN}-3.0.2-complete.patch"
-	"${FILESDIR}/${PN}-3.0.2-datadir.patch"
-	"${FILESDIR}/${P}-poppler-20.08.patch" # bug 735828
-)
-
-src_prepare() {
-	default
-
-	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"
-
-	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-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-epsilon
-		--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-sde
-		--without-sfcgal
-		--without-sosi
-		--without-teigha
-		$(use_enable debug)
-		$(use_with armadillo)
-		$(use_with aux-xml pam)
-		$(use_with curl)
-		$(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
-		tc-export PKG_CONFIG
-		append-cflags $(${PKG_CONFIG} --cflags libtirpc)
-		append-cxxflags $(${PKG_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
-
-		insinto /usr/share/${PN}/samples
-		doins -r swig/python/samples/.
-	fi
-
-	doman "${S}"/man/man*/*
-	find "${D}" -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/gdal/gdal-3.2.0-r1.ebuild b/sci-libs/gdal/gdal-3.2.0-r1.ebuild
deleted file mode 100644
index a76c981acc84..000000000000
--- a/sci-libs/gdal/gdal-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# 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_{7,8,9} )
-DISTUTILS_OPTIONAL=1
-inherit autotools bash-completion-r1 perl-module distutils-r1 flag-o-matic java-pkg-opt-2 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.2"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="armadillo +aux-xml curl 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.7:*
-	)
-	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
-	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.7:* )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-)
-
-src_prepare() {
-	default
-
-	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"
-
-	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-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-epsilon
-		--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 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
-		tc-export PKG_CONFIG
-		append-cflags $(${PKG_CONFIG} --cflags libtirpc)
-		append-cxxflags $(${PKG_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
-
-		insinto /usr/share/${PN}/samples
-		doins -r swig/python/samples/.
-	fi
-
-	doman "${S}"/man/man*/*
-	find "${D}" -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/geos/Manifest b/sci-libs/geos/Manifest
index 5b973fb67b8d..97622eb0edb3 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,5 +1,7 @@
 DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
 DIST geos-3.9.0-r1.tar.bz2 4710957 BLAKE2B dab0f4e0bfb1bd244c2faf5ee6149b65d142eea78e87490025f90b672eee0d25d4ba9bc4c3b223e78ea0c9d34625b4750c7ba03852e5ea9540ad5c479d84b995 SHA512 1081f2aa20e671450953f7bb53b17c703804a1c9f4987c9da0987ff24339af5811b2c8b79c8e438d04ca38e4d06164dc5a4206f266f7efc19af3f9d9ea8f71f8
+DIST geos-3.9.1-r1.tar.bz2 4761372 BLAKE2B af1597d9372b18a2f280d82941949518cd8edb9296e9647aa3949c9e10fdd1b6ef500298471ec469d711ab0569eabd8fc3fb0a8f7e9bd48f91150cfdcaea65a8 SHA512 7ea131685cd110ec5e0cb7c214b52b75397371e75f011e1410b6770b6a48ca492a02337d86a7be35c852ef94604fe9d6f49634c79d4946df611aaa4f5cbaee28
 EBUILD geos-3.8.1.ebuild 1102 BLAKE2B 6b6a901ab393f6501c8ecbd6195e57c76bf7165b79d892049535212d16d3961a1abf82154e897a7172768551a44396e33cc95ec500949863024ffb06185bada0 SHA512 deb6a39dc4cdf5529243b89be65fdaba5cd85905860575cab33202d9c52e511b677e0e72c280867939cd081d4a6787959def3798689913ef15afc988774641fe
-EBUILD geos-3.9.0-r2.ebuild 1079 BLAKE2B 4342a48c7009b291e3f57be9869e753b5fa8e1eee85937ddffd21341c1fab398e71b30e2a142ac5cedc7867e105fb7e620263737d6ebbd9cb5e509d8e275e4f3 SHA512 26881b455e21855cb5985f1c5bd66669b468fac53ad861a63cb9096d5dde0e6bbe6cbf0e37341342d2338994dfa6655675ae190ba93fdf938ffcdea39a42d20a
+EBUILD geos-3.9.0-r2.ebuild 1074 BLAKE2B ac3bcf9766564e0b2a9fd45bd0a8ececbd00a6067ab2a3ecc67c8d37af427f41c299d423bcf71ddb4697196cc61870be4659343067794411b33a164afdf73ea7 SHA512 0bdd9ba61a2b9e22199f59ebc15b8506b676d5cf967c34d794796c9331842b5e05461791e5caa13b7ed4f42e6dd4af4c72ff219ce2aa5f805f6c9926b68db8fc
+EBUILD geos-3.9.1.ebuild 1079 BLAKE2B 4342a48c7009b291e3f57be9869e753b5fa8e1eee85937ddffd21341c1fab398e71b30e2a142ac5cedc7867e105fb7e620263737d6ebbd9cb5e509d8e275e4f3 SHA512 26881b455e21855cb5985f1c5bd66669b468fac53ad861a63cb9096d5dde0e6bbe6cbf0e37341342d2338994dfa6655675ae190ba93fdf938ffcdea39a42d20a
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.9.0-r2.ebuild b/sci-libs/geos/geos-3.9.0-r2.ebuild
index 69116e672afc..b08ecee5c7de 100644
--- a/sci-libs/geos/geos-3.9.0-r2.ebuild
+++ b/sci-libs/geos/geos-3.9.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.osgeo.org/geos/${PN}-${PV}.tar.bz2 -> ${PN}-${PV}-r1.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc static-libs"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/geos/geos-3.9.1.ebuild b/sci-libs/geos/geos-3.9.1.ebuild
new file mode 100644
index 000000000000..69116e672afc
--- /dev/null
+++ b/sci-libs/geos/geos-3.9.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Geometry engine library for Geographic Information Systems"
+HOMEPAGE="https://trac.osgeo.org/geos/"
+
+# Arrow can be removed at next version bump. Upstream mistakenly
+# released rc1 as 3.9.0. So, we need(ed) a new Manifest entry to get the
+# real 3.9.0
+SRC_URI="https://download.osgeo.org/geos/${PN}-${PV}.tar.bz2 -> ${PN}-${PV}-r1.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc static-libs"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+RESTRICT="test"
+
+src_configure() {
+	local myeconfargs=(	$(use_enable static-libs static) )
+	use arm && myeconfargs+=( --disable-inline ) # bug 709368
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake -C doc doxygen-html
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/doxygen_docs/html/. )
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/getdata/Manifest b/sci-libs/getdata/Manifest
index 344fba3668c5..7d9a7017b15a 100644
--- a/sci-libs/getdata/Manifest
+++ b/sci-libs/getdata/Manifest
@@ -1,4 +1,4 @@
 AUX getdata-0.9.0-remove-python-test.patch 257 BLAKE2B bc60176d361d2cb891742c0ee8b443d0cb5c1350478bec1047e56d6a38b50021096ad8bab6ed4b1205744785f002227b22a80a4ab888c4bd52d517de8503e12b SHA512 7a8b5e8e1f2164fca9caba81c7b24f705c6caac036f8f2a3c6dd436961311e4dc34aa6a669eb0bd9e50fb50c09a8b22d32fe04961085c983a29da00e438cbc7c
 DIST getdata-0.9.0.tar.xz 920652 BLAKE2B d5f0659474dfab9f4e589a28a7788b5a51de3c0064b58de37bdb11dad27b56daa05d8e705da743c5da271bd8c4e1343ac6ac41adfdfabfcaef0006e46c45d2bf SHA512 28d720141e34cc56a5166594d0a6ac293144d123706988ed170e40dd9d7aaf13b920305e8bd8343ecd7cbe43eee5d83720e3e5f5d2da0cdccdc1444725cc6844
-EBUILD getdata-0.9.0-r3.ebuild 1275 BLAKE2B 0d18feb7fd1d5860a4f2693795d5913479ed3a482a5d020b34c0f2bda4be0d58323f9e0a3fa9abbe708c02d6c7cb8acfdf8d2e21e59c61d7078d69d365b7ac32 SHA512 de0a81c35c94c1c1185dadda617ea21a817584fcf7c32655563599ccbadab3ea134eeb82bbbb29056ce9808c084eb69cde107ff38c4834f296eea25f7b6cb988
+EBUILD getdata-0.9.0-r3.ebuild 1383 BLAKE2B 931c18c18d5574dc15f5c2f84273a8e8f7a5acc7186008bd220ac5000c476412b8ffb47bf6030090a71ed45b0acb4e5a7a06c88cf587ec1593de5e2fd089f288 SHA512 71f543bc927435e080df36db6ec59e7bafa0033bb4763207425e0832549e32cd638b4b89d1c6c22c79455d62de5cbf84dd4b18c320a028d43ae17e7c3f62a096
 MISC metadata.xml 660 BLAKE2B 74c050abc2e0978cc5c7d16625a6858f9a0a22d9c4ce4fbf0c303cb3361ef460d5d50d09845e5c8b9be82a73b22e9d159a554fec12f5dd7058602c99b7b5073d SHA512 d821e374438aad1beb22199383ebbc8a48247867b08370f08c370e02d7abaf7273a62e750a9ed3befc5e9674489a2a8e56453a6dad09a363a514986a79eb7460
diff --git a/sci-libs/getdata/getdata-0.9.0-r3.ebuild b/sci-libs/getdata/getdata-0.9.0-r3.ebuild
index 9282f0156853..118a1e4daced 100644
--- a/sci-libs/getdata/getdata-0.9.0-r3.ebuild
+++ b/sci-libs/getdata/getdata-0.9.0-r3.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
 
 FORTRAN_STANDARD="95"
 FORTRAN_NEEDED=fortran
-inherit autotools fortran-2
+inherit autotools fortran-2 flag-o-matic
 
 DESCRIPTION="Reference implementation of the Dirfile, format for time-ordered binary data"
 HOMEPAGE="http://getdata.sourceforge.net/"
@@ -31,6 +31,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# GCC 10 workaround
+	# bug #723076
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
 	econf \
 		--disable-idl \
 		--disable-matlab \
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index c5f2a49289de..f81b97622a32 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -3,6 +3,5 @@ AUX hdf-4.2.11-fix-szip-detection.patch 896 BLAKE2B 6e703621ffed66b6757a500cf24c
 AUX hdf-4.2.13-fix-xdr-configure.patch 376 BLAKE2B 611e5b37016750ad408a0cf8d73827e4974248747c1a21206149ededbfe8cfd087c862f321e55a23b5d7187b202ac6256edee84c9dee3cad6357081a7ae86d75 SHA512 dd99f0c0a5fe858a717c1373c75c84867383511e91fb5c703353feb22410ea561f84fe03c5c7578d27817a74579516e60331f5d14a1ad3ea38ab1376e396b5c8
 AUX hdf-4.2.13-linux-tirpc.patch 972 BLAKE2B a95350ef2364e3ff08aa79d12e458853bebe610cd8376f6b6a0483f0962fca1a131be1b09cf3cc1447e1fb3b2fded9567a1a3755dbf5f195b0f70ae124bed3c9 SHA512 9901bdacab3e82632637d18fd08714876a990ceb4573261cc0e1e03a5e4e422c50c460a594d46b0434c9c7b96c1bf57de1aa52bbb59e525298eeacf22e8b41b1
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
-EBUILD hdf-4.2.13-r1.ebuild 1825 BLAKE2B d9a3ab5d47884442462115561ab2871ee537ec1ae8cc7f1babd4fb9773218bd41dcfbac49bd3bdf958df50e4fe2bad6e562eaad049d0062d6a6f4395bcc5bf6e SHA512 8f3b3373867dc97da0a1422de930b9b6ea709a830e69bb97a1be1c7294b48501222d6518d448a4f92254ea1c77b849da7ea1d6dbae739dee78a4065f5674bf3b
-EBUILD hdf-4.2.13.ebuild 1711 BLAKE2B a35ac70c77523f3bd60aedf15d4bcdf05a2d2b7d061d0ec4553a1b761566e6388f2b9d141f53bcb5bef44fb34d0cfb189031cde7bb6baca440089a251d3da6c9 SHA512 332a2a73a35a3970c18a43b1fbe139f94c8a6f0b84a37249c1a1d7b2a8fd010454bd22e64e4284d22c8fed314e5067ede2dfe25532f691a640f31ca1d4b63af9
+EBUILD hdf-4.2.13-r1.ebuild 1920 BLAKE2B 5122f7010fd75a545ef87057b72ca67911f01c67ead8911b643c76808bebc1051c96fe781eb37cc40fb31d066d0eda767c77d39ec5aee25aecb3653b155de300 SHA512 f809f598f273fded8a747d9d9da4955cb5221e6132f3666a8ad86b461fa69f3b7b9d25f11a6413c127156a7b478604abaf2c2d3e92fbbaf750f7c9804c1dfc58
 MISC metadata.xml 859 BLAKE2B c5c33f1a444d0af6287dac495443be05de5a2b8d9c55d4bf9aeb80ebc28f1391612510771848277fa1467097ab480b9b1dc306af587d2621e4a1d16c6bdc91a5 SHA512 2a38d2fbd5672f4465cba6da9f74c6ef95068be26514acc3d2949049f8461265e2ce7c6751d1853218ac4a4b62746e355faa9f2e0d7d8d6dc2faf17d8e40fceb
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index ae60cc865d33..7937f8032bdf 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,10 +41,14 @@ src_prepare() {
 	default
 	sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
 	eautoreconf
-	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
 }
 
 src_configure() {
+	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
+	# GCC 10 workaround
+	# bug #723014
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
 	econf \
 		--enable-shared \
 		--enable-production=gentoo \
diff --git a/sci-libs/hdf/hdf-4.2.13.ebuild b/sci-libs/hdf/hdf-4.2.13.ebuild
deleted file mode 100644
index feefb99d01aa..000000000000
--- a/sci-libs/hdf/hdf-4.2.13.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
-
-MYP=${P/_p/-patch}
-
-DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
-SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
-
-SLOT="0"
-LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples fortran szip static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( szip )"
-
-RDEPEND="
-	sys-libs/zlib
-	virtual/jpeg:0
-	szip? ( virtual/szip )"
-DEPEND="${RDEPEND}
-	test? ( virtual/szip )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.11-fix-szip-detection.patch
-	"${FILESDIR}"/${PN}-4.2.11-enable-fortran-shared.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
-	eautoreconf
-	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--enable-production=gentoo \
-		--disable-netcdf \
-		$(use_enable fortran) \
-		$(use_enable static-libs static) \
-		$(use_with szip szlib) \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files --all
-	dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
-	cd "${ED}"usr
-	if use examples; then
-		mv  share/hdf4_examples share/doc/${PF}/examples || die
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		rm -r share/hdf4_examples || die
-	fi
-	mv bin/ncgen{,-hdf} || die
-	mv bin/ncdump{,-hdf} || die
-	mv share/man/man1/ncgen{,-hdf}.1 || die
-	mv share/man/man1/ncdump{,-hdf}.1 || die
-}
diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest
index eb5a604af10e..5b3735ff0e57 100644
--- a/sci-libs/hipSPARSE/Manifest
+++ b/sci-libs/hipSPARSE/Manifest
@@ -1,3 +1,3 @@
 DIST hipSPARSE-4.0.tar.gz 271756 BLAKE2B d774632c145a842c5dd97df6e0c1c3b3fc6986a5d3e000564b3b9b4f8a9c72bc01b360baf93a82f8a70a85b8ee1833f4e767a48021d3869391000551ed00e614 SHA512 78c9501e6f9f8b0727d2f2207814048f8c784b2b06797559d6f639244cb1439e9218a46c582a6b337b15791519f0bcb9e0f42c17bff00c096c797c96cc7660ae
-EBUILD hipSPARSE-4.0.0-r1.ebuild 1139 BLAKE2B f121839a28ad5d73c51175ac4b0d071e315165010ac02cb3659658d55c13ac7b679d9b347bac747c1ecb00f5f486e1129f287346a92cda0c738ff468ff8d2b18 SHA512 2637a62410ca0084fa15ebd46507615cfba7a6b10a91326dae41ff7b9b35a1e0fcc11f160885d6333c37956e1b8a5f96191792d03406f923bad50f43f884059c
+EBUILD hipSPARSE-4.0.0-r2.ebuild 1140 BLAKE2B 9344f8e3678a855fca42b5c14fae5d0973ed3f8922836182d9327d1724e92feca6072933df181228ef95cc4993fc8a7797ebf31fac8a5a95eabe8f3de9165ac5 SHA512 e682f1acb67c282c638fd7594b0268a3dc7a33b71fe667f8bd38fc90449660367f94d1964037c0fbe3dd162e5c8a5a4aa941ec72a7353c2f629ed9f07ca06d6b
 MISC metadata.xml 588 BLAKE2B 28ef304a020639fe4677a6fac7d4bd56a544406d05feab9c11567d98c00fc612d4f2bd89b95df4850d0a892bfadd01e38356c35df7ecd4e3ea156482e50eb0f8 SHA512 491b454e61d5aae073bcf5a591dcddc7267bb929bdc686c5d811310025dd94ab8b5ad65abbec1b2ab5e9d91eff204b5e97c163a0e6c5f9af9ad7a245fcad4b4b
diff --git a/sci-libs/hipSPARSE/hipSPARSE-4.0.0-r1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-4.0.0-r2.ebuild
index 6db7fd375008..83afe36617b3 100644
--- a/sci-libs/hipSPARSE/hipSPARSE-4.0.0-r1.ebuild
+++ b/sci-libs/hipSPARSE/hipSPARSE-4.0.0-r2.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 RDEPEND=">=dev-util/rocminfo-$(ver_cut 1-2)
 		 =dev-util/hip-$(ver_cut 1-2)*
 		 =sci-libs/rocSPARSE-${PV}*"
-DEPEND="${RDPEND}"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/hipSPARSE-rocm-${PV}"
 
diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest
index 828d22ba8190..9a403ce85ae2 100644
--- a/sci-libs/ignition-math/Manifest
+++ b/sci-libs/ignition-math/Manifest
@@ -1,6 +1,4 @@
 AUX includes.patch 361 BLAKE2B 08417f2e2e3a39f03d714952fc1a5aa7eb73e42783d5d2db631d6406e1644d74e99c3f42eb0424d96dfea808e25c3902b5fb5f31a5c3108860ead1434fe82de5 SHA512 497ca00f1250b4d8dcbf5031ddfdd3c82c8bb6e8ab8c2735c3f32233b8840cdc1195a41be1fc5c5dff4a5d2b385c01f6f31302b8c8edb44e9ef50f3c2a0ea566
-DIST ignition-math6_6.4.0.tar.gz 515870 BLAKE2B d975edfa2e23560784adef1d66e7613c822a65bcc8b20d33aa030a570fdf3b19043eb6750e93728f2ff5e8ee14ab047a1420bf9991ea6519ec7399235e262ba1 SHA512 8a6e672ef6de591d25200f288deaaa16cc43e3c90804ee5ead0f06345036afbfa40acb531eb5b6a1fa80bd34c0c5964662cc0659d8bed2c811ad7c776d6f77cb
 DIST ignition-math6_6.5.0.tar.gz 539313 BLAKE2B 0ec7b5a4e8eac4161fd2df607c18f905bbfb12923373e2c74e435da8cd98926feac7e6b5434f7a335888a273757786872cc7cc3d0dd4f1e342a5ce488f07420d SHA512 ea8702339ffa1a76bb8aded17c83a620568edec472bf0722997a7f907ed07ead0d2e89356055835f9ee6dcc462066bdbc67cf07c01e0efe4e1b8fb3e4d2407fa
-EBUILD ignition-math-6.4.0.ebuild 640 BLAKE2B 1354647fd977e8a4c20c3edbdcb37ca6a95c79ab7810c6faeaea9b20bf502bb6fc820f694f4d3c9d9f222121abe57fc3daddae05241994022e7f675027110571 SHA512 c487f37df1701f960377ba8513f56312cc8334552ec7323006c59fcd5e109ae4d865bd379728f872ebbba764c2aab3266a52ee5acae477890170d313dc74e19f
 EBUILD ignition-math-6.5.0.ebuild 640 BLAKE2B 1354647fd977e8a4c20c3edbdcb37ca6a95c79ab7810c6faeaea9b20bf502bb6fc820f694f4d3c9d9f222121abe57fc3daddae05241994022e7f675027110571 SHA512 c487f37df1701f960377ba8513f56312cc8334552ec7323006c59fcd5e109ae4d865bd379728f872ebbba764c2aab3266a52ee5acae477890170d313dc74e19f
 MISC metadata.xml 342 BLAKE2B 6b306ac4d7ec4a09c238f7b8c048589b7937b8a1e1e0573658ece2217054cb8a47da6e77d75439472dce378a4f4b1390ce8517352aa486db323a594f2a576131 SHA512 8969e6c2df55cfae7cc21640498871d7049499d146d06b13057701e742e9ef6f2c5124acd144b9e7f0974ea39032e89402252e32192242697555c64d90eb4b4a
diff --git a/sci-libs/ignition-math/ignition-math-6.4.0.ebuild b/sci-libs/ignition-math/ignition-math-6.4.0.ebuild
deleted file mode 100644
index ab724f9e7b7c..000000000000
--- a/sci-libs/ignition-math/ignition-math-6.4.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-inherit cmake vcs-snapshot
-
-DESCRIPTION="A small, fast, and high performance math library for robot applications"
-HOMEPAGE="https://ignitionrobotics.org/libraries/math"
-SRC_URI="https://github.com/ignitionrobotics/ign-math/archive/${PN}6_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="6/6"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-util/ignition-cmake:2"
-BDEPEND="
-	dev-util/ignition-cmake:2"
-
-S="${WORKDIR}/${PN}6_${PV}"
-PATCHES=( "${FILESDIR}/includes.patch" )
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 40c000664d8b..94d3363ad9fe 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,5 @@
 DIST indilib-1.8.7.tar.gz 2195976 BLAKE2B 3c206e5775b9c16d44cf28b6fa70b186ee9c46c2e6ec639ebf39a97ba553314108481c0dd3ee29ed5297667e9691169bc4aefeee9ef290ee22b1c57967509afa SHA512 bb128ab0641f023039f32d2e3bdf9dfd5e54638bbce252e5f393fd5b2375df0311c472663e78dd498896db8f4669b21f231a095fed639710dc8cba4bb3bf2eb8
 DIST indilib-1.8.8.tar.gz 2234987 BLAKE2B 542c77e1826002e6268be82048014cdd7db2e58d6860bf21e058775acccbca49091218c24d5910f91705aebcf592e21f9008d780f39bb0458115b073319e3949 SHA512 0598b117fa582daaaf7c71524fd40866a37fcdc47b523b2ee1ed3301701c7351b027a3aab794e2e1405aec7293ecc6705d5f7852bb472cd21f40d7e3d7733d1d
 EBUILD indilib-1.8.7.ebuild 1190 BLAKE2B 5fde02e5411c6e4b92d5c9d95b1b3290fa46fec3eea21683a02385f7c77d569081693e874525ba2835d1daf120be0c457b9f95bdc8ec235c33bd8b09d07f39c4 SHA512 1d06a00f91a0197f9509d9d42ec3447fb3d1871edaa2daa4355f5a73fc94fad67362620d659f4bc71ccb0587d89bbe73815b1c7b726d4a9f34a774c1839f3c4e
-EBUILD indilib-1.8.8.ebuild 1192 BLAKE2B 25b550018dd7ac9374e69666e69995edb133802609904ef526ece7a8d0b60645c0bd57c282a2a3cd4e48e1ff3daf164db9c9eb35cae8ec9393cd2b4e2dfa3277 SHA512 da09509560050f9f8eadcd28ee79da820cb489f2eede8f2e0343671fe7db5cbf932debbad09ee335d54432a8140f1268ed8a8d989d41154b891e7ddb4c203de8
+EBUILD indilib-1.8.8.ebuild 1190 BLAKE2B 5fde02e5411c6e4b92d5c9d95b1b3290fa46fec3eea21683a02385f7c77d569081693e874525ba2835d1daf120be0c457b9f95bdc8ec235c33bd8b09d07f39c4 SHA512 1d06a00f91a0197f9509d9d42ec3447fb3d1871edaa2daa4355f5a73fc94fad67362620d659f4bc71ccb0587d89bbe73815b1c7b726d4a9f34a774c1839f3c4e
 MISC metadata.xml 460 BLAKE2B b6ebdd49fefcbbb015e5856f0ad42682b5eda153b38b3d64f949d2c41274df269f292f25d5eb3be37a7acb039bab2d3d3b7744cfe7959472fe03425b53bd4282 SHA512 ff04501f56765165645695dda25db6bff677a6f676d3fa1d005ec0bc6fae7413e0fdd87d800b321fdd7a98f1d0cc829daa5a3d4d3bff849b6e164a5768c79c84
diff --git a/sci-libs/indilib/indilib-1.8.8.ebuild b/sci-libs/indilib/indilib-1.8.8.ebuild
index e6ee5b9fd220..4e40a58230d2 100644
--- a/sci-libs/indilib/indilib-1.8.8.ebuild
+++ b/sci-libs/indilib/indilib-1.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="ogg test websocket"
 
 RDEPEND="
diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest
index 0026e50ef4ce..49c6e633bf53 100644
--- a/sci-libs/keras-preprocessing/Manifest
+++ b/sci-libs/keras-preprocessing/Manifest
@@ -1,5 +1,3 @@
 DIST Keras_Preprocessing-1.1.2.tar.gz 163598 BLAKE2B 94d0bac41ac140015a5d46453c99e1180c8c06d8fab4d6707890b1f24466d287f6da54d66b395e5e50c7aac67cc0abc8153fbfbeb4ffb0e79561bca528a6b81b SHA512 aae4d52accdfb9df260070336b1c5a628e57563978f7cb299aa67a6265f26eb44deb803cef795616a5e94cd8bcd2b9aa067570258fff96642b88cc0c701c3cec
-DIST keras-preprocessing-1.1.0.tar.gz 50631 BLAKE2B 235a1a7d296684e5405c6472026a53b1930923e74065529ba6921e91bf8849d35c02378f8eeabc4f532a4e25937e8fd8f712a59067c5b358afe10b88e1531fcb SHA512 68c71e82ea2139d3db4142c86a2c404e4d65a9a881f72b07b4ccf28733b93a9e4837f91534a20c3ca5128600d8b885cc8723181d96c9045d5280ad7f84091cbb
-EBUILD keras-preprocessing-1.1.0-r1.ebuild 593 BLAKE2B 9f5c9aa2407c54751c87c5370dc338dae36c219342caccad0189d8973347473dd6eac8256a2e145c2dab41751615530c51b71b382a93c955c6c491b35e4075f5 SHA512 4c3cdf767ceae052a9bfcbd3020ff6d85364956bd39dc19022db920e9d0ab79b73addf1451a5833ef3480d620a53484eca46a19001433f50573440162ac3cbdf
-EBUILD keras-preprocessing-1.1.2.ebuild 671 BLAKE2B 7c2b7854b6515e007e89152bd72b174cc8720e38b84c1207e95e063c270bb96ccb4d02a74db78f1c5b2d60ba5bea62efedbf368879bf4af671d78b8bdb43f60a SHA512 b544f3dcab79336c6fbd6e3945bd7d434f852ded86d53606cb006ada0d8c5a0a5785f65c1965443ec80c3adfcbe092f916f178ffdb7cebc838ac348a32bb8470
+EBUILD keras-preprocessing-1.1.2.ebuild 669 BLAKE2B bf3053948a2aef2ea1078661344681ce981db36c3db416e5a63e249dca87558725a94631b2dab6e68c217f40d4b49ad4e87ac258875dab2cc098455a8259821b SHA512 c01486e5bddfd491fd8a69f3e8e065c7d9492ce08ff34da3603944123f0ffd79bb0afcfe2b857c6a884493ff4237fbcc9fb58d5e27756fe1f11472b2e347f18d
 MISC metadata.xml 585 BLAKE2B a2f92ac4e2b9af055313a13de9bcbaee7ab7ca2efa4790c82027aece4b629bfa7a73c5ed0286b0f24f1853330057527009afe6ab1722f19d9c504a9d0737e827 SHA512 371cc3f5897bd28c62642a8857a22e775e24aa917bc0e58bb4de4e0a2a6580174ba35cfda2e8dd83599e2180fdfb3f11a953e7076c6d87073e1465b145b115e9
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0-r1.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0-r1.ebuild
deleted file mode 100644
index abce51ef75f4..000000000000
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models"
-HOMEPAGE="https://keras.io/"
-SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
index bafcdfd8cd2d..9b72af9e2845 100644
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://files.pythonhosted.org/packages/source/${MY_PN::1}/${MY_PN}/${M
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/sci-libs/libbraiding/Manifest b/sci-libs/libbraiding/Manifest
index b41a185a1ed9..7516ec89c8d1 100644
--- a/sci-libs/libbraiding/Manifest
+++ b/sci-libs/libbraiding/Manifest
@@ -1,3 +1,5 @@
 DIST libbraiding-1.0.tar.gz 377140 BLAKE2B 93520ca1af05dfe77028d3a8d94e94fb4b387662c0f71048db5aa8b1dcc4115996be2ac95108c01a574095cdaba97db1997a65e98a64f87230dda4ae1b6bd8cb SHA512 0fb389d4483b665165bf9ef8dc770b51884eb4ab576c4ca06944080d87ddae806bcf4ebee1fd586f97de171d2ec79c89aeef86ffdeac10eed49ffd0541989ee6
+DIST libbraiding-1.1.tar.gz 377161 BLAKE2B 48a80823f15920fce17c7d67cdc0a7e851855a4d6dfa5e9e461c8ce408c9c73d8aeeeacd27ac1c5f33c4436e8174c6ae9be275a71187d3a9887d37cf3bc8b8db SHA512 3032a290d0c7c0c13519136e111500a9e22f36ae7f9cc36df5a22670f18ebbce03a01e72c81e556ef4f6eea1ccf10e90ba6a9343be4a229e420e2f7da6289115
 EBUILD libbraiding-1.0.ebuild 787 BLAKE2B 70a7d79780f451145b298c1a2955cef6e7c6a105241c5833284cf4e65933b0dbf9e057c7af8b6cb677403ca5303ed2a261abc8347bdbc84732c16a86e4fad24b SHA512 07133513b88cd231bc8ae369b9b7d2913bc0837b73a5ff0793c04e6f5792296f0d0edf7a1329af95a36c96071997871b58b11109177a9e4821fb32fc17e4d6b2
+EBUILD libbraiding-1.1.ebuild 640 BLAKE2B e8fd24a60100f8bac017e9e014add0b1c8a3393194a0984ee372de4ea3a5f6b7d02726b4a0290a8c1a0a633b0362dcfe273117a2fd1b8f687c19adbd1a6d68a9 SHA512 e1ad717b61ed8609edb2561d59c13f43f021f9cd15af1d871b352afac1b12ee11e9004deaa8ad1d41646a01cfb955b95920ae759a410a78e65a87ef1ff571bfa
 MISC metadata.xml 1009 BLAKE2B 8dff16992db4a93811825eba4e52e60025c0981e8f1faf2077ae78800d730777e73239146e3356ab4cbc39c94c117715a2ebaccdf1e1a23e3a864bcc06b50a8b SHA512 f6fd4fbe425042627258bf02be878c40834858521daa8feba891ce04990910ba256dec5e550c69cf0791564c8eeef1219f6d0ffabc2dbcc879ee8a44c25a324d
diff --git a/sci-libs/libbraiding/libbraiding-1.1.ebuild b/sci-libs/libbraiding/libbraiding-1.1.ebuild
new file mode 100644
index 000000000000..890bf6aaa4cd
--- /dev/null
+++ b/sci-libs/libbraiding/libbraiding-1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Expose the functionality of cbraid as a shared library"
+HOMEPAGE="https://github.com/miguelmarco/libbraiding"
+
+SRC_URI="https://github.com/miguelmarco/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+# A few source headers still say GPLv2, but I believe that to be an
+# oversight: https://github.com/jeanluct/cbraid/issues/4
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/libecpint/Manifest b/sci-libs/libecpint/Manifest
index 7d279477f7aa..d8d84281a3f8 100644
--- a/sci-libs/libecpint/Manifest
+++ b/sci-libs/libecpint/Manifest
@@ -1,5 +1,3 @@
-DIST libecpint-1.0.4.tar.gz 1313698 BLAKE2B 63f7ce2001ae9bdc975af083735f82fd03e133e880061d3c8659bf18d8236d09a7337049977cea6867a4e0e586d4112ccef6a8ee098903869111551364f614fb SHA512 ff38b598351e4499cd2d270a15e8c2dedcb0a6bc6aafcfc7a88ed8053199356e209bdb630713370aacbc3bba2a169050520405f7003feea7b064140d6d5337b6
 DIST libecpint-1.0.5.tar.gz 1313876 BLAKE2B 279618262bc32928964d559bda3f2d6235340bf807abb755c676a20ea6712d36d80a84a2522dd16d19290f5d622e47c4c0a34b549ffdb628f6c07372a5109981 SHA512 ad68599c1a220556ebb265968da6701596cf2388aa422100b80863bd8f73eaa1be5a2349c0db8c8864c3c8cf57151fe3d4520a3670f3b40ce147195079886d86
-EBUILD libecpint-1.0.4.ebuild 639 BLAKE2B 30cf652bae08190de475985309283cfeb1d549edff2bb4ccb6bd0c5dbbd982569acc5f744472ae43b11688337294399b2cd3c05950c2d299f53446a39b355d5e SHA512 11f3b36e2ee2983ff361e7d77b38b1a4e7d22a21d33c9169447a57f8dcf37296bc95711130b3a2c1e9e86ec521fb977dc2cfa6c0c58f8dfc13addcf0dc3b44a1
 EBUILD libecpint-1.0.5.ebuild 639 BLAKE2B 30cf652bae08190de475985309283cfeb1d549edff2bb4ccb6bd0c5dbbd982569acc5f744472ae43b11688337294399b2cd3c05950c2d299f53446a39b355d5e SHA512 11f3b36e2ee2983ff361e7d77b38b1a4e7d22a21d33c9169447a57f8dcf37296bc95711130b3a2c1e9e86ec521fb977dc2cfa6c0c58f8dfc13addcf0dc3b44a1
 MISC metadata.xml 636 BLAKE2B 4ef2fae4bda3d954677ec576703eb777c947212819c38ef1181c50f4bd7e128c342547d4c35e61ecac57852f21108265410034e2a71f546b8101a587e9428840 SHA512 c74b750861f6bd26d0f6aef880d055cc418216e4e8a17b45bfe51caee453ff0214fe7557b59b38f71dfcf13063ebf0c93ed4c29efdbeb5528172abf087d7e60c
diff --git a/sci-libs/libecpint/libecpint-1.0.4.ebuild b/sci-libs/libecpint/libecpint-1.0.4.ebuild
deleted file mode 100644
index 47004ee7019c..000000000000
--- a/sci-libs/libecpint/libecpint-1.0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Efficient evaluation of integrals over ab initio effective core potentials"
-HOMEPAGE="https://github.com/robashaw/libecpint"
-SRC_URI="https://github.com/robashaw/libecpint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/pugixml"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBECPINT_BUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 6319987d144f..df8a356525b0 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -3,5 +3,5 @@ AUX libgeotiff-1.5.1-proj-6.2-tests.patch 2102 BLAKE2B 643afa6f1a39a1990307c5041
 DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893 SHA512 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
 DIST libgeotiff-1.6.0.tar.gz 537175 BLAKE2B 4b1430c9e80cdd4193f474484b295c151ecb9a654248e08527046f1aa35cfab0be59980edad2cc6ae90c1a7b0e03d46fd203affd5b01c83e0fd4435d5e56b2d3 SHA512 4c59598140d6c435a25aff6520e07a01a0153cac526df3b3e1366d5edc43cd82b15099da79ee8a2fb916e858f5a5d7421cfbf96bb485c91fac9e19c7209b7418
 EBUILD libgeotiff-1.5.1-r1.ebuild 1326 BLAKE2B 6049afbf19b1aaa323ca2403984f207de3c7830e9664b0b7ed774149c3a9976ac902f8aa545250fd8a344ed5a9b6c5b18e8092d864849d77647ebb3633b54d05 SHA512 f7a3143274f2ce1c692c53dc1359c0c1bfd347f9325f42bc975fb1f7afbe19de9620b26bea721a45602f3b4db06946032eb11267afa144519179d602fba1bb08
-EBUILD libgeotiff-1.6.0.ebuild 1280 BLAKE2B b170ade2d47ab4bfccf9fd88b2b3e49a901678a4278d0afd7e9db9f397b4a61cb11818585af23ff1e633efe7a53106453af486e1cd2ff367feafb087caf9e75a SHA512 0620077f80bbd090f0b05505ea535da74c92ce11f6ab0eb7e37fe447993a6689eb4ec8a2e82520ffe7a6f186889f3ac68266f5d8e07e28704a0cd4543d910063
+EBUILD libgeotiff-1.6.0.ebuild 1275 BLAKE2B e6e3c64b34370e20cbe23fbbc75a0ad1315392cc2bec54c560091462a39682a81b3cabe0cbfb3d25769dbb68685d6de0b579f174e120d040ad8ae56c735b23af SHA512 04e1cd4f46a175ae4a70759bee7b38de253cc51ac3d8cf1fc7d55198e9da4adb46e33eb3dd7330a20535e1be56c00a58e26992013485b6e02856dfd33035cf95
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/libgeotiff-1.6.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.6.0.ebuild
index 0826b31d2196..e8b6bced15be 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.6.0.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug doc static-libs"
 
 BDEPEND="
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index 9d0c99be91f0..9c30d0424b33 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -1,7 +1,6 @@
 AUX libint-1.1.6-as-needed.patch 2733 BLAKE2B 9ffec6e80030c1226387f51fb3e0409d22521d4af8747943430eeab85f8b3bd9c2b18394ef1b08a0818931e120198c3811fc79d326d4e307f820d5192ebf78e2 SHA512 69281b26c69f5cae1e33f53c58b8a7b383ae83fa8309db03a505e6df3ca018acdf5e4998b42c9d4d1cfda2eaaf36903c1a39211664358506a90cde7e1012ee8d
 DIST libint-1.1.6.tar.gz 256404 BLAKE2B c754e25f0c3bc6c52eb434beafd2cb794a2e715003ee9409d76e8ae06e0ce19a42a9331ad4db9be2745d6820e7248210d10b4c004146e99192fd16fd2c31966d SHA512 cb39d73e89431c324e32d4a71593fe913c7ae2132677d4600e63ce1ed99e8e431758f0aa3d130991da841e98a1064fa931eb0e82dbe80af4c0ece10ee3a4f2d7
 DIST libint-2.6.0.tar.gz 24743255 BLAKE2B 3ab7baba012828485c6c8425bce100e1ab50d2a3c8443ea2ef5cf173d58d8aa211a07e837b10a7f89d7e57f2e15b9384060bbf7b9885f32e9426525e65e15960 SHA512 56343c64b0dfb829702f4bb2fe14a04ad063acd7cb8b5a21cd1a45a830944c1ee98c888c9a28d6746b1bc17459aefcfb0aafe6ef310bfe554056212ad19e43ef
-EBUILD libint-1.1.6.ebuild 955 BLAKE2B 3b9e1a5074e9d8ff91ad97b7682a0cd658abe256c331c9b270056148aba64fd0e0eb9a0f93388b25d880c9ef017408e768888fe5463900e8264f85e0c843645a SHA512 53f1b0ffc316cb021f05ca6432c24ea8c316bcb87f02149a7a0f8b6401c845d13a5f20b4fa954eee0c25c32b5325bc1f01de8ac183492c9b6f36994c7fddc491
-EBUILD libint-2.6.0-r2.ebuild 1410 BLAKE2B c7711ab08a0479791d75e93906b328d469fcaedbc34f53a9fa6e92f4bfaf0cef9dc84c5f61407ac73ace663cf1d586da8380be268ff3632421f9154d9096b7ed SHA512 d65fc01982c69a7a291f1481e3c2e2aedda5f0401a54949748011288acac9478d68a48027714390072ba34fdc22eb741df69addf3c52431db45f2576ee93c94d
-EBUILD libint-2.6.0.ebuild 1141 BLAKE2B a2c257f44c010d68f80b14e32b7f260d0019daa9b30f0bdffd691e51875dcf74b076d8f9d5700aa666588944b210429b9e3598f3494a3b33f23dda30e65279a4 SHA512 96e8d062ac2237fc357a6d93161ac364491c0be9a91da5ca11ef66f65492667658cef1c82d98185b4d93554e91bf11d3c51fbf18be5cf04e4ed2847a0f071b08
+EBUILD libint-1.1.6.ebuild 874 BLAKE2B 334ebcd9d4a9a076197af69a0ce563173ba550917c4edb5427010355873716d2210d46e978e97078926cf280914129ff61fdf8d399f743d182bad68145cdb542 SHA512 0a8a04f2416c199d9c346d02cd11011cf3558f04d9c141a67b073cd9ecf2b77cace9ff8eda1b3a6e611a018ad235e5febd6a62e2d1a809444952a191c2f20210
+EBUILD libint-2.6.0-r2.ebuild 1408 BLAKE2B 7cca957dcd7de7df144a8350885cfce49f908f2b5da4359cd6e8bb18400f619fd8d05fe50a00259a62f49c33a056405a889129c4300531753c920a149339f791 SHA512 d9751f547c86c9e55df05791a93f86acc08f3e6fd4854dd45e667bdab6dcf107d38f1a9e19c8680836d24bef357a2de92c25fb8088a08d995988bb6b51d3d546
 MISC metadata.xml 612 BLAKE2B bc2b11edd30d0db99860d1d005c56c428c75be96224fa3285fd3cde6f35af0f142b445254214af00308a29ee8965505a8dfe14ffb2e80b57ca42ef20c91bf100 SHA512 db9172c0e887d45f42914159eae83c0f11b40fbafac31395c782ff959cdccad8a62a8d468cec66d6e362cd8ea09aa3b05057d19fff8a1f94b9bd472be97d04b0
diff --git a/sci-libs/libint/libint-1.1.6.ebuild b/sci-libs/libint/libint-1.1.6.ebuild
index 760d266a7811..f3a93eaaacdf 100644
--- a/sci-libs/libint/libint-1.1.6.ebuild
+++ b/sci-libs/libint/libint-1.1.6.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils fortran-2 toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators -)"
+MY_PV="$(ver_rs 0- -)"
+inherit autotools fortran-2 toolchain-funcs
 
 DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
 HOMEPAGE="https://github.com/evaleev/libint"
 SRC_URI="https://github.com/evaleev/libint/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
 
-SLOT="1"
 LICENSE="GPL-2"
+SLOT="1"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
@@ -24,7 +21,8 @@ PATCHES=( "${FILESDIR}"/${P}-as-needed.patch )
 
 src_prepare() {
 	mv configure.{in,ac} || die
-	autotools-utils_src_prepare
+	default
+	eautoreconf
 }
 
 src_configure() {
@@ -36,5 +34,5 @@ src_configure() {
 		--with-cc-optflags="${CFLAGS}"
 		--with-cxx-optflags="${CXXFLAGS}"
 	)
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
 }
diff --git a/sci-libs/libint/libint-2.6.0-r2.ebuild b/sci-libs/libint/libint-2.6.0-r2.ebuild
index 0297d5bfea81..a07d7360830c 100644
--- a/sci-libs/libint/libint-2.6.0-r2.ebuild
+++ b/sci-libs/libint/libint-2.6.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs doc"
 
 DEPEND="
diff --git a/sci-libs/libint/libint-2.6.0.ebuild b/sci-libs/libint/libint-2.6.0.ebuild
deleted file mode 100644
index 774bdc758b4a..000000000000
--- a/sci-libs/libint/libint-2.6.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils fortran-2 toolchain-funcs
-
-DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
-HOMEPAGE="https://github.com/evaleev/libint"
-SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs doc"
-
-DEPEND="
-	dev-libs/boost
-	dev-libs/gmp[cxx]
-	doc? (
-		dev-texlive/texlive-latex
-		dev-tex/latex2html
-	)"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-cxx=$(tc-getCXX) \
-		--with-cxx-optflags="${CXXFLAGS}" \
-		--with-cxxgen-optflags="${CXXFLAGS}" \
-		--with-cxxdepend=$(tc-getCXX) \
-		--with-ranlib=$(tc-getRANLIB) \
-		--with-ar=$(tc-getAR) \
-		--with-ld=$(tc-getLD) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}"
-
-	use doc && emake html pdf
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		DOCS=( doc/progman/progman.pdf )
-		HTML_DOCS=( doc/progman/progman/*.{html,png,css} )
-		einstalldocs
-	fi
-}
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 6a760f8e4336..1b30a824025e 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,5 +1,3 @@
-DIST libqalculate-3.15.0.tar.gz 1747863 BLAKE2B eed4cf8f11546b80e9556cfdf09e48d8c4c29948e6bdc02b3f9efd9aa6dce8e6c5eecf440bf4b6243ddcdb59cb7176f1eb054a3ef73cc91444d86ed7645f3a37 SHA512 b8f2af83218a3f90326cb7f679b71cac328cf0591178ed718920cd491d682cf7341c702934b3a232bea5a67ec2d2e09b4321a7ac938c5bc1e221bee086ae4c36
 DIST libqalculate-3.16.1.tar.gz 1756176 BLAKE2B b09e06a4d89249bb3e38a47ed47acc7598bc62e966673a1eb175641b1018021199dbbcd38266301ec8b2d3c55747378adfde3db4e25e58771be162905cb493dc SHA512 3cc7ba66493252015b9d33835188c236b10afdce5f23021a5e686609609265aed81d592815ee6a172c269a0f144a3203c954435fea8ddb82637453d5c98cd05a
-EBUILD libqalculate-3.15.0-r1.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469
-EBUILD libqalculate-3.16.1.ebuild 1430 BLAKE2B 5ad7454423b04634dba7f119e0626a16b0a1eb84b5652293ce60a2f42c6c89faddd599deb68ee8ccdd1efaebb49f492b960762d6b298057a94a4f30e062f06f5 SHA512 fa4967817bd224a292a93ff1b0c698180f9de41fc374c1c6f9dab2654f5705d21435d8fd49a1214cf47cc669106fa53f93b6c178846ed54e2cc2d7a393aa206f
+EBUILD libqalculate-3.16.1.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469
 MISC metadata.xml 412 BLAKE2B 6cb8a434ec8e0eaa50982720079db60a5a2211c9d67852712351e9d6698edb1d70058f8f093ecf7b93fb7f853b1f1c138bc0871a6751975d35c24c622510dde5 SHA512 b6c55b741bda2a497dae278d47c6931611cbda132e08deb16a9c4efef59c7cb18bc464e7d242380b7afde2af4ab6f8e7f72b7db4ed3fd6b8f4cdc9c0359550ce
diff --git a/sci-libs/libqalculate/libqalculate-3.15.0-r1.ebuild b/sci-libs/libqalculate/libqalculate-3.15.0-r1.ebuild
deleted file mode 100644
index 35672fd3c7e3..000000000000
--- a/sci-libs/libqalculate/libqalculate-3.15.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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/libqalculate/libqalculate-3.16.1.ebuild b/sci-libs/libqalculate/libqalculate-3.16.1.ebuild
index 94aa33f3f886..35672fd3c7e3 100644
--- a/sci-libs/libqalculate/libqalculate-3.16.1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.16.1.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot readline"
 
 DEPEND="
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index ad707598ac68..57da135a45c0 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -2,6 +2,5 @@ AUX libsc-2.2-autoconf_lua_version.patch 1310 BLAKE2B 5d6ced3339ced04b9681cb4940
 AUX libsc-9999_20201220-autoconf_lua_version.patch 1449 BLAKE2B 7212839168ab69f115cd177fa998cb8352f9c0abb06c4a89916a1e14b5d99695d15602700f891a8985f74ba19114e62da152bda3c74810d7b307762dadff837a SHA512 4993bc99cd7e88ee4fc523b14d859745fbc06ff3e89a80a96a2f33ba64e782c2c25ffd5620b93537056b17fe02a2648de54eee276174147d776c6747230b476c
 DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
 EBUILD libsc-2.2-r100.ebuild 2298 BLAKE2B 7fe4e4c2c9a414c0fb9b9767b51eeeb7eb037829f93a0a29e4f71b8398f31ac10683a2ad478b28409da714fa59ff4e5ad93421c7977053f893b375bea0b16802 SHA512 119f54c96a01ad9798093f7fdced4299acdd11f6b420971234522f4e5a85ed7beced81ff65681cf07451ea8ec888fd599ebc1cdcaa9067cd43cc528826e92d0e
-EBUILD libsc-2.2.ebuild 2090 BLAKE2B 77c5bea45fba7f23d7f390e3f09f118b8fa0eea85b426e51d630ac625e8c78a74f460c6256fead68b3e38751d263ff4631e55cd77326726823623d17d21d4a3f SHA512 d7abc00a430d61cb59b74e32931ac7d736ce2371390e7c64e1e3270f401bb0b92a6202c1522533a1c2bfe82b4675ef1d2fa7a1c2ed5bd77ef2f849aa957d884d
 EBUILD libsc-9999.ebuild 2308 BLAKE2B 42c7dbf970bd4d5528e5861a91234559814559d0cc1f3b9a0fd744f40fb0862f02f30859fe60c70733777d46aca74499b12359df74e2f49aa8d35f9fcb7e2edc SHA512 78b49ae6dece4e83a8482229e05c27f56af54f3e369940691c3625ba5218e9dab63cda2ae4f30a57b0f7221669e849e2924493cfd1d892747b2f6b1903bd1403
 MISC metadata.xml 712 BLAKE2B c1586f49aaa6c7d9a7bb45d1bbfc823efbc80e1032db8d6e4fc53bde10fe6a4d43b6f8e448f33683c6f47897a9ea575272678a50e63308f74b8e60ceb8e9bea2 SHA512 b00a3c5abc40f77724fa766c7b4cc386eec78a81396f6014eab6fb66618c9d11f08687b6f8d73bc24cc3b2deed8e88f44d69b4f7afe31ebbbad9308a99c586c2
diff --git a/sci-libs/libsc/libsc-2.2.ebuild b/sci-libs/libsc/libsc-2.2.ebuild
deleted file mode 100644
index 8499c7762d61..000000000000
--- a/sci-libs/libsc/libsc-2.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs eutils
-
-DESCRIPTION="Support for parallel scientific applications"
-HOMEPAGE="http://www.p4est.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="debug examples mpi openmp romio static-libs threads"
-
-REQUIRED_USE="romio? ( mpi )"
-
-RDEPEND="
-	dev-lang/lua:0=
-	sys-apps/util-linux
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi[romio?] )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-AUTOTOOLS_AUTORECONF=true
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
-		tc-has-openmp || \
-			die "Please select an openmp capable compiler like gcc[openmp]"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable mpi)
-		$(use_enable openmp openmp)
-		$(use_enable romio mpiio)
-		$(use_enable static-libs static)
-		$(use_enable threads pthread)
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		docinto examples
-		dodoc -r example/*
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		# Remove compiled example binaries in case of -examples:
-		rm -r "${ED}"/usr/bin || die "rm failed"
-	fi
-
-	# Remove ac files, bug #619806
-	rm -r "${ED}"/usr/share/aclocal || die "rm failed"
-
-	# Fix wrong installation paths:
-	dodir /usr/share/libsc
-	mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed"
-	rmdir "${ED}"/etc/ || die "rmdir failed"
-	mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed"
-	rmdir "${ED}"/usr/share/ini || die "rmdir failed"
-}
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 7d08c88d3c11..93f3847cbd4f 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -2,7 +2,7 @@ AUX libsigrok-0.5.2-check-0.15.patch 917 BLAKE2B 39d042e99dc5a71fa79def033f7a306
 AUX libsigrok-0.5.2-ruby-swig-docs.patch 3085 BLAKE2B 865f38a8230762f58620c06b91dda8bfda405057c6733ef8dc27dbc7094817709ce03a3db1904e4c4ce3ecbdc82da6d16c5719a3f93410a84f07cd4c4018a9ea SHA512 aa3fd492f736c0fe7af1c2ba4e41307731589cef78c480426113dcbae8abbf0ecc07bdc5e1b251103d5aa813f120c5ff7f76dd6d5e577ca8f2b9f29eac008025
 AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
-EBUILD libsigrok-0.5.2-r1.ebuild 3910 BLAKE2B f3648f208bf06482fc0281ad7cdc7df7ad1189e617bd7707c3a3646775b56dbbc5677896b6af42447443da156578c363154e23dd8b8234140d1802ea0594b99c SHA512 26affea65ba2b436bd7cfbd682fb05ebfe11ff750afa84f98e4eb953fedce174ac1f91bb7d30558ed7957f98643320233809f7afd6e71e9b1eb7d7bd05931b8b
+EBUILD libsigrok-0.5.2-r1.ebuild 3908 BLAKE2B a2e0b8cc23c4a9163b1ff42767a6ead7963189303933ddcf080b412a5ecdc8491a97ca68c4d29130bd0368a804deea7a0ba02835dffbf8bb4132f0f93d82a65f SHA512 6520270af9805d35688716911e2f6efa25c882d1059cf4b61fa94d3d8ca4ae011a915e21db08f71e74fd1842bfd9517def4b4b0c432161fa887db50540eb95bb
 EBUILD libsigrok-0.5.2.ebuild 3906 BLAKE2B 6b6479940c2d0659bdfed3e10dfae089c844761c0995f1c1ef120a3a47bdb35c80d0d820ff6d48704efe88b0ccb6263e8c550947fed9ac4e211f3d7ad9385bcc SHA512 4a4a782540cc7448d25524c67cb3f54ebd9909e98765ed8964d8f09d697de3eeb75f8ae7377916d04f91a53607f18e6ffbb2d853c76b6154cda9c1ac1ef9d2df
 EBUILD libsigrok-9999.ebuild 3672 BLAKE2B 4a1bcd64fd6263dc72ad8b7910e339ea89d88961aef4155f03cbded8ab5825df07b13273de207bf79fe255a12224b57875e2631b8588a2059a7ed627d6436a91 SHA512 992c54ae4a331ea971966b68cd25451b07ead5b7a4534de2b05bc7f2774904a66f0e3fbb6cf2c81cbab50a50c2284f2cbdfda1e7c6ea49dbe66cac3ac01aa0bf
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
index 94476c1a5af5..23601315e40f 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index f976d28e9645..ffbb5ebeb81a 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -1,7 +1,5 @@
-DIST libxc-2.2.3.tar.gz 734714 BLAKE2B c5c4c3aec3373b8b481de8ec1779366b6916899e0b77964cbde0e83904b351e009b14a3ff64e9f020640e6ebf68d78828615b8abf83a46fdf86ea16480083643 SHA512 bfcd88c1946e459227e9b1a32c513f0e68ae7a5497925ac6e692085542526ebad9fe2cd5722077c839c06dbaaceca601c7f615ee6936e638eb150a9d68278d5a
 DIST libxc-5.1.0.tar.gz 42951890 BLAKE2B 32ce8d15547882455e01cbf9d4ee8780b97059d5b710f25b799779a5efe7326c376a53111102f3d5e0853bb89ba1f4dd9c2f219cfb4d3f91a2f6e1100f8fb47a SHA512 615b82290e87a48484f6dbe41cd8f1538ba6201b99fc97be2db64b66232fa4349fe6cebfb51566098db3cabd7aff662bb7ace43a811507bff2e93afd03d56ce4
 DIST libxc-5.1.1.tar.gz 43264474 BLAKE2B 887dc11a6385559edc5e2e62f3e00b16ff5695e1c384196bc3efe5aceff0a223d5f69fafaa08290bdf72f95390cb82d43e541ffaf6c4569e850eed3cb63aa5f6 SHA512 467ff09c39df30ccd50447dda5bbfe9e5f3e8f2876e069b6c16d49b3cfcc8b45316640f5b16c56ff7645355be9ec4dc571c794a17accb7731cd22bcce53f8b99
-EBUILD libxc-2.2.3.ebuild 1397 BLAKE2B f4340eb57cc1fcd055320ac514be7126fc67070653c19a14c16a6ed7268a0964efbd1a2182b5138ca246b1c43a92e2404edb844e16ebda33518f579443a8ae2c SHA512 5f676f34ae91e59146d9cf868074ea3cb5de617e313b31379432532f8047dd3516e2ebdb80afb6c9977bd1f2776e939d4a7f6f17fd7e5fe86da54df3db0416ec
-EBUILD libxc-5.1.0.ebuild 754 BLAKE2B cf5a8a44a213a26f36dec2f3e117a67673bfe6c40fb010979e36400dd6f4453338b0d72bc9598791634a5ee58c9a159a743b184015b622b037d37c9ed9802683 SHA512 0030d324b01722be1f626eea903b3c7668eee887c95af75c191ab30b997c218a2006e55c33ce90d1cdd8fc480065eea69b4ac649a2dea367191317a49328a43b
-EBUILD libxc-5.1.1.ebuild 734 BLAKE2B f70b99de4e20a3a804e313df8cab0a19f4a49302e95cae04b0eaf903aab77360de15b0973e2da77d9c8683e67b6e763ccaa203b94eb75edbbf44dc0b99c6bcb8 SHA512 363fe83ad3db822e421f154c03d9909e63a8425066fb861540f55b65c1de73740a83523f374ad976c8b63508d06ba7a5466775f9e80d1de501a75007e99561ae
+EBUILD libxc-5.1.0.ebuild 752 BLAKE2B 37da5534623ea30c51c80d269d9132de218329f5960abe52d8f2ed5b135cc2eb0b8749f63b89b82fbdeba28bf2c9802747bbbd7006a8ba4262bc17f16b6649d4 SHA512 43452f6781c300ada25e69d2459b4e9f6f80a770b035e5f3737a80161864cfca4cec74c0c9f495749037b735d183a59e0d5e4db9a550a5e0ba80d2500224df13
+EBUILD libxc-5.1.1.ebuild 754 BLAKE2B cf5a8a44a213a26f36dec2f3e117a67673bfe6c40fb010979e36400dd6f4453338b0d72bc9598791634a5ee58c9a159a743b184015b622b037d37c9ed9802683 SHA512 0030d324b01722be1f626eea903b3c7668eee887c95af75c191ab30b997c218a2006e55c33ce90d1cdd8fc480065eea69b4ac649a2dea367191317a49328a43b
 MISC metadata.xml 1339 BLAKE2B 4c98e1fa7345593b8f160ba4ad84ea3a5eb321437715137e94a1926b92a53ce87c41b27e8fd0edb5c479293e24f9049956100f0070ae7a27550144ff697b63ac SHA512 95e03f10949c2a2350063cc1666bc232f166b10669f5b1d050da91b6119b8280d69aca0f35527ab938c71666bb78019640426ab0acab18bd335e6fff2345e128
diff --git a/sci-libs/libxc/libxc-2.2.3.ebuild b/sci-libs/libxc/libxc-2.2.3.ebuild
deleted file mode 100644
index 377fce27feed..000000000000
--- a/sci-libs/libxc/libxc-2.2.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils flag-o-matic fortran-2 multilib
-
-MY_P=${P//_/-}
-
-DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
-HOMEPAGE="https://octopus-code.org/wiki/Libxc"
-SRC_URI="https://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="fortran static-libs -test"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e "s:${PN}.f90:${PN}.F90:g" \
-		-i src/Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( $(use_enable fortran) )
-	autotools-utils_src_configure
-}
-
-## Upstream recommends not running the test suite because it requires
-## human expert interpretation to determine whether output is an error or
-## expected under certain circumstances. Nevertheless, experts might want the option.
-# The autotools src_test function modified not to die. Runs emake check in build directory.
-src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null || die
-	make check || ewarn "Make check failed. See above for details."
-	einfo "emake check done"
-	popd > /dev/null || die
-}
-
-src_install() {
-	autotools-utils_src_install
-
-}
diff --git a/sci-libs/libxc/libxc-5.1.0.ebuild b/sci-libs/libxc/libxc-5.1.0.ebuild
index 884100437a30..3415aac3fa0e 100644
--- a/sci-libs/libxc/libxc-5.1.0.ebuild
+++ b/sci-libs/libxc/libxc-5.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/libxc/libxc/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="fortran test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libxc/libxc-5.1.1.ebuild b/sci-libs/libxc/libxc-5.1.1.ebuild
index bade5f34f401..884100437a30 100644
--- a/sci-libs/libxc/libxc-5.1.1.ebuild
+++ b/sci-libs/libxc/libxc-5.1.1.ebuild
@@ -33,6 +33,7 @@ src_configure() {
 
 src_install() {
 	default
+	dodoc ChangeLog.md
 
 	# no static archives
 	find "${ED}" -name '*.la' -type f -delete || die
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 0701d1dcf505..2a2ff1ed4002 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,11 +1,5 @@
-AUX linux-gpib-modules-4.3.0-kernel53.patch 1426 BLAKE2B 56d84daf8ca2f31db5e10a1f20b6d1fe5fed3efa98454e620ea7067378f408da2aa4db57ab062fdd139321b6e8bd738d22bfed1a61b2c5732fd4fbd10a39e299 SHA512 1cba793dc51957068a9613d9952937b1b58582d3833bd1e0c7e9ce6f3f2c54e827d67444bdaf413404c4b96aa3cfe4ce7faf7cb0f07ead7fdfe9eb3521dd3b27
-AUX linux-gpib-modules-4.3.2-returntype.patch 2451 BLAKE2B bc366bf772147aab165273bf1a20c65a6664cef8ff1069c22069a14d1907486074a6b2602ac99c0d6b283c7a187051592e0cba1d04af06af88e6c4c0d88bc779 SHA512 24891ccfd5a73224702f9b5dd1469083999951689761d9bf5c6eb84445d54e73381b4f6b05703401df1908f5f23557f1cf62dcdce0c81272483f96ca39d722bf
-DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
-DIST linux-gpib-4.3.2.tar.gz 1377406 BLAKE2B 57ec8b3788606ffb42d204ad0e2476c432bc82f929b1854c6a1d48c73f48a149716d05b13906b4597a4bf03e4c10a0ffe2c66e6de8cf9a5891b86c3d459713fc SHA512 bf9963d885e0c974f41eed96359501bd41c7d4f051026f64d835e52f1031f39e6bba6ce976a27e660a8b36087e56b81205206066c68b42db9a1d578d351a8f8b
 DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
 DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
-EBUILD linux-gpib-modules-4.3.0-r1.ebuild 1400 BLAKE2B 99ec5d7cbb6ddd7e12808423d73783376c61c49e1be2e719667398095110a9ae8bd532a5429428f99b8c93e97e0b679bb83f4c249ae4328ded1805e5e17db5ef SHA512 f6f81aadcafad9758707dfc3cec89f94d289a9ae243d0fbf03e886749304444cbce26fd76c914395e23c1df7037e612ceb9684009321d6f6c45d38d945c2cd5d
-EBUILD linux-gpib-modules-4.3.2-r1.ebuild 1396 BLAKE2B 638e0139519a31e5b49168be5da7dde18558bffa0fc44b35e3555e2d29bb65ca6b34c6d66e5eea11d59808ae51c90271904cfb352d6a60c6e2457e1636eeefe4 SHA512 d24837c4683527363011be674382c5471f759a46211068aa10fb21de6becf4cdece89858805a5d5aac64b7220cdd4f495f2ab832e5a140b108e44f67d5b12fa5
-EBUILD linux-gpib-modules-4.3.3-r1.ebuild 1346 BLAKE2B 453e184d956a71b41db687f010b9725d38ca812986568f14bd98a944a7a9e41ffe458d68e38ff39b384286a0229d39b62cf36c1d2497e544085799d8d3274bcb SHA512 0f822dd05016faf6be35047abf0a9f4f3580e770679d245253ddaef6f32f148be1fe6f9060283680559f6714b5da904a12ef4ecaad957ff611858abcd6117d2d
+EBUILD linux-gpib-modules-4.3.3-r1.ebuild 1345 BLAKE2B 5c52c4e59e407c34a390783ffdd4c32bb3119f8d4fbf5fabe33cd724029a0549081feab3e0f194607bafe40556359b7025f61d6c3e74b3381907427887c0d72f SHA512 ed908311a79d77acb579a93536978f07a059de92a2d77dbb9c664f95c7429d74f4c84eefe33de5622c6925a668c9b23cdd36a526b36376f0aa205b7d9b6ddd0c
 EBUILD linux-gpib-modules-4.3.4.ebuild 1346 BLAKE2B 8b66209430fb62453785e8747c3ec988e20000137b034c1f28e3e85a306e0d68b2dfaffc8ff0d011f9f3c870004f10b32f25b75024063678f96b0b6ad7305380 SHA512 d57b9489fff12bbbc1838a628227e71e42d3dcc611885e02f2caf1e7b95666f29b01c7e602ef704c36fd48ce8740ed0a86b6927d1a501446092d028c641923a8
 MISC metadata.xml 480 BLAKE2B 1a8b338e4e8ebe5e8f9a4457cee52af1997664818100f2f4a3d7d36c1381825e48b5def55047b0e3ca063eb396ee83a7b173980801f10b3d99535c2efb77486d SHA512 947365f6269816228b3e0bf5f6109a7ca58dfe25929a419449e5d8d7789b9b008ae289f1f74831a3de3cb26f7ce05983801e8722102c9609e80c2f6fbd2d8b7b
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch
deleted file mode 100644
index e650ccb5ed15..000000000000
--- a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: linux-gpib-kernel/compat/include/linux/device.h
-===================================================================
---- linux-gpib-kernel/compat/include/linux/device.h	(revision 1867)
-+++ linux-gpib-kernel/compat/include/linux/device.h	(revision 1868)
-@@ -144,4 +144,10 @@
- 
- #endif // LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
-+#define DRIVER_FIND_DEVICE_DATA_TYPE void *
-+#else
-+#define DRIVER_FIND_DEVICE_DATA_TYPE const void *
-+#endif
-+
- #endif // __COMPAT_LINUX_DEVICE_H_
-Index: linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c
-===================================================================
---- linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c	(revision 1867)
-+++ linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c	(revision 1868)
-@@ -982,7 +982,7 @@
- }
- 
- /* Match callback for driver_find_device */
--static int fmh_gpib_device_match(struct device *dev, void *data)
-+static int fmh_gpib_device_match(struct device *dev, DRIVER_FIND_DEVICE_DATA_TYPE data)
- {
- 	const gpib_board_config_t *config = data;
- 	
-@@ -1014,7 +1014,7 @@
- 	struct platform_device *pdev;
- 	
- 	board->dev = driver_find_device(&fmh_gpib_platform_driver.driver,
--		NULL, (void*)config, &fmh_gpib_device_match);
-+		NULL, (DRIVER_FIND_DEVICE_DATA_TYPE)config, &fmh_gpib_device_match);
- 	if(board->dev == NULL)
- 	{
- 		printk("No matching fmh_gpib_core device was found, attach failed.");
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch
deleted file mode 100644
index 88aa18081574..000000000000
--- a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://sourceforge.net/p/linux-gpib/code/1901/
-
-Index: linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c
-===================================================================
---- linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c	(revision 1900)
-+++ linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c	(revision 1901)
-@@ -114,15 +114,15 @@
- 	fluke_private_t *priv = board->private_data;
- 	return nec7210_update_status( board, &priv->nec7210_priv, clear_mask );
- }
--void fluke_primary_address(gpib_board_t *board, unsigned int address)
-+int fluke_primary_address(gpib_board_t *board, unsigned int address)
- {
- 	fluke_private_t *priv = board->private_data;
--	nec7210_primary_address(board, &priv->nec7210_priv, address);
-+	return nec7210_primary_address(board, &priv->nec7210_priv, address);
- }
--void fluke_secondary_address(gpib_board_t *board, unsigned int address, int enable)
-+int fluke_secondary_address(gpib_board_t *board, unsigned int address, int enable)
- {
- 	fluke_private_t *priv = board->private_data;
--	nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
-+	return nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
- }
- int fluke_parallel_poll(gpib_board_t *board, uint8_t *result)
- {
-Index: linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c
-===================================================================
---- linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c	(revision 1900)
-+++ linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c	(revision 1901)
-@@ -100,15 +100,15 @@
- 	fmh_gpib_private_t *priv = board->private_data;
- 	return nec7210_update_status( board, &priv->nec7210_priv, clear_mask );
- }
--void fmh_gpib_primary_address(gpib_board_t *board, unsigned int address)
-+int fmh_gpib_primary_address(gpib_board_t *board, unsigned int address)
- {
- 	fmh_gpib_private_t *priv = board->private_data;
--	nec7210_primary_address(board, &priv->nec7210_priv, address);
-+	return nec7210_primary_address(board, &priv->nec7210_priv, address);
- }
--void fmh_gpib_secondary_address(gpib_board_t *board, unsigned int address, int enable)
-+int fmh_gpib_secondary_address(gpib_board_t *board, unsigned int address, int enable)
- {
- 	fmh_gpib_private_t *priv = board->private_data;
--	nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
-+	return nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
- }
- int fmh_gpib_parallel_poll(gpib_board_t *board, uint8_t *result)
- {
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0-r1.ebuild
deleted file mode 100644
index 388a9a97a8c8..000000000000
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="debug"
-
-COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}
-	acct-group/gpib
-	!<sci-libs/linux-gpib-4.2.0_rc1
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/linux-gpib-kernel-${PV}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3.0-kernel53.patch"
-)
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is -lt 2 6 8; then
-		die "Kernel versions older than 2.6.8 are not supported."
-	fi
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	my_gpib_makeopts=''
-	use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
-
-	my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		docdir=/usr/share/doc/${PF}/html \
-		${my_gpib_makeopts}
-}
-
-src_install() {
-	set_arch_to_kernel
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		DEPMOD="/bin/true" \
-		docdir=/usr/share/doc/${PF}/html \
-		${my_gpib_makeopts} \
-		install
-
-	dodoc ChangeLog AUTHORS README* NEWS
-}
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild
deleted file mode 100644
index 031ea6766820..000000000000
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug"
-
-COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}
-	acct-group/gpib
-	!<sci-libs/linux-gpib-4.2.0_rc1
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/linux-gpib-kernel-${PV}
-
-PATCHES=(
-	"${FILESDIR}/${P}-returntype.patch"
-)
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is -lt 2 6 8; then
-		die "Kernel versions older than 2.6.8 are not supported."
-	fi
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	my_gpib_makeopts=''
-	use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
-
-	my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
-}
-
-src_compile() {
-	set_arch_to_kernel
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		docdir=/usr/share/doc/${PF}/html \
-		${my_gpib_makeopts}
-}
-
-src_install() {
-	set_arch_to_kernel
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		DEPMOD="/bin/true" \
-		docdir=/usr/share/doc/${PF}/html \
-		${my_gpib_makeopts} \
-		install
-
-	dodoc ChangeLog AUTHORS README* NEWS
-}
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
index 5b209c4c2813..a5c44ee72549 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="debug"
 
 COMMONDEPEND=""
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 38959c6acf2f..3e453617b30c 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,11 +1,7 @@
 AUX linux-gpib-4.3.0-perl.patch 546 BLAKE2B 9695c1a9f48a2a8bcb5f5998c40eb909e6b1b3624defe87a08bc4b91b34f53e8176531678dff3d4810b0b85b811eb477795c0dffe0275b864c0e4d4bac9b0ea9 SHA512 21bf64366d4b68dcfc2f4fa932480f8ff6af62bf792fe90c0dd0330606c3b95c073040dfa87bd1e277391a02ad324612d58b6d618d83c637b3df60c638289d06
 DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af
-DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
-DIST linux-gpib-4.3.2.tar.gz 1377406 BLAKE2B 57ec8b3788606ffb42d204ad0e2476c432bc82f929b1854c6a1d48c73f48a149716d05b13906b4597a4bf03e4c10a0ffe2c66e6de8cf9a5891b86c3d459713fc SHA512 bf9963d885e0c974f41eed96359501bd41c7d4f051026f64d835e52f1031f39e6bba6ce976a27e660a8b36087e56b81205206066c68b42db9a1d578d351a8f8b
 DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
 DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
-EBUILD linux-gpib-4.3.0.ebuild 4791 BLAKE2B 8e0d7ea05b242b60a6c60798cf60ab75b2e5915782ab0f8d269fcbd74e353fbbc358ca3bc0c42a4fe51e4fb6965e618a2caf74849ebf00ab769e075001f7c502 SHA512 aa12ce276ffc241ef5c60659ea52b15a3b2186b3869e17ac74ac9e30ebd2b38bb59d62920e2c4381c1d90783b8f9d187f2d0eb1237f70a74fff391201febfdfe
-EBUILD linux-gpib-4.3.2.ebuild 4792 BLAKE2B 1c733c05bd35cab2576b903f0fc0327fc8b28ecd774600b918b209e58288fdab14a5e915531d1de7f87e660c6957463d9c8823a0ef170be0992138fa370b5502 SHA512 37829bf5264ed12bbc98d721d80728632b91e00334f6e69711824810725a007f73f52174cb8e8c4d14d255f3e58d249fef638186c75b603ba3018290a72b0e3a
-EBUILD linux-gpib-4.3.3.ebuild 4792 BLAKE2B 1c733c05bd35cab2576b903f0fc0327fc8b28ecd774600b918b209e58288fdab14a5e915531d1de7f87e660c6957463d9c8823a0ef170be0992138fa370b5502 SHA512 37829bf5264ed12bbc98d721d80728632b91e00334f6e69711824810725a007f73f52174cb8e8c4d14d255f3e58d249fef638186c75b603ba3018290a72b0e3a
+EBUILD linux-gpib-4.3.3.ebuild 4791 BLAKE2B 6cfd15ace01acb85c7e79fd8b743e2ed21ded765e12ddcb0be99ec6502d8e1203bd9b26155185ed3c4392bd4549f9ac0b547ed65f1e600785e0117fb0ac40c22 SHA512 ed878490eca99e6a248eeef1d0634e8a575995066d1f501f093ff5a9c8052517a1b99e4f378699b83d1a34c0646d80d7b023f8dd707c03d5d223dd36530e3e9e
 EBUILD linux-gpib-4.3.4.ebuild 4798 BLAKE2B 98352a097c293f77d0dd897294a45d6a5b24097aa96884b0aa4377d543ae0d5463cd0988d02a3285b3b1aa065e888be69145d34256beb176020cffc6d75f2f74 SHA512 c48021a17547e256e25fda080c03d0fa31948d746a5bc27c9d888a35b40d09285187a25cc8868a2660b72eb1011f66dd73bc9bc7010c0a1375eb6930de46c66f
 MISC metadata.xml 547 BLAKE2B 1d0da80dd999dc402dbcdc80628e1fe97ec648b806cbd17cf20f6cbc33279afad81f71728e944a600108f28f90a61111e6bd9c36c7908a557d6cca6e41cdc759 SHA512 a88766b0372a88d090c032b45a973cf087a2172b088396fd1706a7c3818d6bf220de26848cb844d2ed555e3067bda6a00ffff598e0a0a59009ce33b3230b68a1
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild
deleted file mode 100644
index 9f44a9c23e67..000000000000
--- a/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
-
-DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
-	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="pcmcia static guile perl php python tcl doc firmware"
-
-S="${WORKDIR}/${PN}-user-${PV}"
-
-COMMONDEPEND="
-	sys-libs/readline:=
-	tcl? ( dev-lang/tcl:0= )
-	guile? ( dev-scheme/guile:12 )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:= )
-	python? ( ${PYTHON_DEPS} )
-	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}
-	acct-group/gpib
-	~sci-libs/linux-gpib-modules-${PV}
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	perl? ( virtual/perl-ExtUtils-MakeMaker )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0-perl.patch
-)
-
-pkg_setup() {
-	use perl && perl_set_version
-	use python && python_setup
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static) \
-		$(use_enable guile guile-binding) \
-		$(use_enable perl perl-binding) \
-		$(use_enable php php-binding) \
-		$(use_enable python python-binding) \
-		$(use_enable tcl tcl-binding) \
-		$(use_enable doc documentation)
-}
-
-src_compile() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html install
-
-	if use perl; then
-		einfo "Installing perl module"
-		cd "${S}"/language/perl || die
-		DESTDIR=${D} emake install
-		perl_fix_packlist
-		perl_delete_emptybsdir
-		cd "${S}" || die
-	fi
-
-	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
-	udev_dorules 99-gpib.rules
-
-	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
-
-	insinto /etc
-	newins util/templates/gpib.conf gpib.conf
-	newins util/templates/gpib.conf gpib.conf.example
-
-	if use pcmcia; then
-		insinto /etc/pcmcia
-		doins "${S}"/etc/pcmcia/*
-	fi
-
-	# fix rules files
-	local f
-	find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
-		grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
-		sed -i -e "s:${D}:/:g" "${f}"
-	done
-
-	DOC_CONTENTS="
-As the udev rules were changed and refactored in this release it is
-necessary to remove any manually installed pre-4.3.0 gpib udev rules files
-in /etc/udev/rules.d/. The files to remove are:
-\n
-	99-agilent_82357a.rules\n
-	99-gpib-generic.rules\n
-	99-ni_usb_gpib.rules\n
-\n
-You need to run the 'gpib_config' utility to setup the driver before
-you can use it. In order to do it automatically you can add to your
-start script something like this (supposing the appropriate driver
-is loaded on the startup):
-\n
-		gpib_config --minor 0
-\n
-To give a user access to the computer's gpib board you will have to add
-them to the group 'gpib' or, you could change the permissions on the device
-files /dev/gpib[0-15] to something you like better, using 'chmod'
-\n
-Edit /etc/gpib.conf to match your interface board, and any devices you wish
-to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for
-more information.
-\n
-"
-
-	if use pcmcia; then
-		DOC_CONTENTS+='
-For PCMCIA cards:\n
-All files needed for a PCMCIA board were copied to /etc/pcmcia.
-You may wish to edit the options passed to the gpib_config call in the
-/etc/pcmcia/linux-gpib-pcmcia script.
-You may need to send a SIGHUP signal to the cardmgr daemon to force it
-to reload the files in /etc/pcmcia \(alternatively you could use your
-pcmcia init.d script to restart the cardmgr, or you could just reboot\).
-The driver module will be loaded as needed by the cardmgr.
-
-'
-	fi
-
-	if use firmware; then
-		DOC_CONTENTS+='
-For Agilent \(HP\) 82341C and 82341D cards:
-The firmware for these boards is uploaded by passing the appropriate
-firmware file from /usr/share/linux-gpib/hp_82341 directory to
-gpib_config using the -I or --init-data command line option. Example:\n
-gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
-'
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.2.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.2.ebuild
deleted file mode 100644
index 73b3efa1d020..000000000000
--- a/sci-libs/linux-gpib/linux-gpib-4.3.2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
-
-DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
-	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="pcmcia static guile perl php python tcl doc firmware"
-
-S="${WORKDIR}/${PN}-user-${PV}"
-
-COMMONDEPEND="
-	sys-libs/readline:=
-	tcl? ( dev-lang/tcl:0= )
-	guile? ( dev-scheme/guile:12 )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:= )
-	python? ( ${PYTHON_DEPS} )
-	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}
-	acct-group/gpib
-	~sci-libs/linux-gpib-modules-${PV}
-"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	perl? ( virtual/perl-ExtUtils-MakeMaker )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0-perl.patch
-)
-
-pkg_setup() {
-	use perl && perl_set_version
-	use python && python_setup
-}
-
-src_unpack() {
-	default
-	unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static) \
-		$(use_enable guile guile-binding) \
-		$(use_enable perl perl-binding) \
-		$(use_enable php php-binding) \
-		$(use_enable python python-binding) \
-		$(use_enable tcl tcl-binding) \
-		$(use_enable doc documentation)
-}
-
-src_compile() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html install
-
-	if use perl; then
-		einfo "Installing perl module"
-		cd "${S}"/language/perl || die
-		DESTDIR=${D} emake install
-		perl_fix_packlist
-		perl_delete_emptybsdir
-		cd "${S}" || die
-	fi
-
-	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
-	udev_dorules 99-gpib.rules
-
-	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
-
-	insinto /etc
-	newins util/templates/gpib.conf gpib.conf
-	newins util/templates/gpib.conf gpib.conf.example
-
-	if use pcmcia; then
-		insinto /etc/pcmcia
-		doins "${S}"/etc/pcmcia/*
-	fi
-
-	# fix rules files
-	local f
-	find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
-		grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
-		sed -i -e "s:${D}:/:g" "${f}"
-	done
-
-	DOC_CONTENTS="
-As the udev rules were changed and refactored in this release it is
-necessary to remove any manually installed pre-4.3.0 gpib udev rules files
-in /etc/udev/rules.d/. The files to remove are:
-\n
-	99-agilent_82357a.rules\n
-	99-gpib-generic.rules\n
-	99-ni_usb_gpib.rules\n
-\n
-You need to run the 'gpib_config' utility to setup the driver before
-you can use it. In order to do it automatically you can add to your
-start script something like this (supposing the appropriate driver
-is loaded on the startup):
-\n
-		gpib_config --minor 0
-\n
-To give a user access to the computer's gpib board you will have to add
-them to the group 'gpib' or, you could change the permissions on the device
-files /dev/gpib[0-15] to something you like better, using 'chmod'
-\n
-Edit /etc/gpib.conf to match your interface board, and any devices you wish
-to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for
-more information.
-\n
-"
-
-	if use pcmcia; then
-		DOC_CONTENTS+='
-For PCMCIA cards:\n
-All files needed for a PCMCIA board were copied to /etc/pcmcia.
-You may wish to edit the options passed to the gpib_config call in the
-/etc/pcmcia/linux-gpib-pcmcia script.
-You may need to send a SIGHUP signal to the cardmgr daemon to force it
-to reload the files in /etc/pcmcia \(alternatively you could use your
-pcmcia init.d script to restart the cardmgr, or you could just reboot\).
-The driver module will be loaded as needed by the cardmgr.
-
-'
-	fi
-
-	if use firmware; then
-		DOC_CONTENTS+='
-For Agilent \(HP\) 82341C and 82341D cards:
-The firmware for these boards is uploaded by passing the appropriate
-firmware file from /usr/share/linux-gpib/hp_82341 directory to
-gpib_config using the -I or --init-data command line option. Example:\n
-gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
-'
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild
index 73b3efa1d020..eeecbc6b2319 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="pcmcia static guile perl php python tcl doc firmware"
 
 S="${WORKDIR}/${PN}-user-${PV}"
diff --git a/sci-libs/m4ri/Manifest b/sci-libs/m4ri/Manifest
index 27ad83505fa3..75f878d04667 100644
--- a/sci-libs/m4ri/Manifest
+++ b/sci-libs/m4ri/Manifest
@@ -1,7 +1,3 @@
-AUX m4ri-20200115-libm_underlinking.patch 2352 BLAKE2B 1c391a5d359585e8d6ffb6fa39900b214d20cc089af728a0ece4d521da0b339a31e5e1c19517506602413bf5c2f035fb45c8045459ede2a9ec84d344127f064f SHA512 d95150bab2c2954eea205bc027ec3a018f4267e19224665781273c093c12e35516a741275e3fa658f2076e7dee98d0463ed4ce0cc876def2f48a31039425df83
-AUX m4ri-20200115-memory_violation.patch 2905 BLAKE2B 08cdf9f22307f8477dd6dc5980d496cc56f4a7d625d83db77f1928417a1ba388c6a84c4866276bdad7ec4742b4dc102262e6f90c89a24423494e9877064f39d6 SHA512 70a32c5ec8e4c936b530e85d48d93e6f5d49122df658528c0fd74b3d812d25eef4d9826de3d01127bb717ecbdc20be23079d5805e3d767d225cd1cf24c321fde
-DIST m4ri-20200115.tar.gz 510562 BLAKE2B 4522793ab61dd97dae5c8d82a4457364f437040c9c45c355007a3150bfebb5264e336b19a7416f62b5ef937480f15079d9c0e9711dd26a6f7c6f5ce66d699296 SHA512 4791576878097077bcda768c03a43ec9a5b05c29adaa9c5f1e737e798b3fc7d027f830183d57db7b8b6b75b25e01fb522eb8b2e5359efcb05054fc341cbb403c
 DIST m4ri-20200125.tar.gz 511132 BLAKE2B 637dbf7f17b84dc5fc91c9d8f501fa223cfacd687cb953ce3b9c4716e9a6d39318ef168c2ec8a4b5eeb469a4b46abbcd8802aaf694991d82deb20c832843c3ab SHA512 212ea58a93b792c1901f62411b06cd1a2ee60b3506c987e45ded73c146f2fa6baf5461b1dcabf31a5771ab5a44eab050d64714f7a5fca3df2d141d0d80c6c51a
-EBUILD m4ri-20200115.ebuild 1328 BLAKE2B 1cec674c12674f27301baf2b8acef7d34133d2962523849c5bff05c0947d0665e3f5b896af53c26e08e5f48c21ddd5d7a9e62455bc57b4a9a06d5e21b44f1ad5 SHA512 af3d833be19a5e04880b62839d182e26965f5571977eb5185c1de1f66720562a23d5e93118a3ec61fbf9172f3f2d5b16eb7fadf5903d65249f7a4700e3777e8f
-EBUILD m4ri-20200125.ebuild 1158 BLAKE2B f273f9b212be83c0f3e7abe99fbe13dfd8d0256a734cc70b86644a1630faa645f8855e73244e5be049631a5943f46e93f4416245e2fa9cb38ada97f38991ef6c SHA512 a90dbfa0439ecd28c3413090ea288b56b75abf163b1e68e207f5288d237a62a8853447e496440454bc5e04f03fc1a9015371561a988c2032a711e1ad0d69bf75
+EBUILD m4ri-20200125.ebuild 1156 BLAKE2B 57c77e1d4b1314d2f3b1e2886a2a8173285d6bfc6eb92b2a162ab57d646b17185830e4f878c2c56d863a705265aa94c98f123051ce09efd492b193673f384f0f SHA512 5e9d34aaca2ad3f99edcd13a3525a9f9e0fb7692c8cdf3c08c3af4ef3ef5e8fa8998d87861c8739727b2f2fe6914658ef0dafcb8a2e9ef8c792a6ad008ac7f98
 MISC metadata.xml 1159 BLAKE2B 4a51b94a6a8d48e39412d90a249ef2038bcaac90653cbc187226842f33f5a8c75704b2671dc5fc63650cf4a57f77d7724409eca8d5822c7689eda3e5386902da SHA512 40d6e3dce814e11ced9da6874af71022dad66ff1b0511024a9033706f1b43ce741f418086d9beb276e09578db2acc1708758f71cdb168384d59f85627505e643
diff --git a/sci-libs/m4ri/files/m4ri-20200115-libm_underlinking.patch b/sci-libs/m4ri/files/m4ri-20200115-libm_underlinking.patch
deleted file mode 100644
index 8d9d2738c087..000000000000
--- a/sci-libs/m4ri/files/m4ri-20200115-libm_underlinking.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From be6c249e7838bd838174db5c2bb98bf63b026b83 Mon Sep 17 00:00:00 2001
-From: François Bissey <frp.bissey@gmail.com>
-Date: Tue, 21 Jan 2020 11:24:50 +1300
-Subject: [PATCH] Detect and use LIBM to link libm4ri in all cases.
-
----
- Makefile.am       | 2 +-
- configure.ac      | 6 +++++-
- m4ri.pc.in        | 2 +-
- tests/Makefile.am | 2 +-
- 4 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e317d06..416d9f1 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -58,7 +58,7 @@ pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = m4ri.pc
- 
- libm4ri_la_LDFLAGS = -release 0.0.$(RELEASE) -no-undefined
--libm4ri_la_LIBADD = $(LIBPNG_LIBADD)
-+libm4ri_la_LIBADD = $(LIBPNG_LIBADD) $(LIBM)
- 
- SUBDIRS = . tests
- DIST_SUBDIRS = $(SUBDIRS) bench
-diff --git a/configure.ac b/configure.ac
-index 39de702..520154d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,7 +15,7 @@ AC_CONFIG_MACRO_DIR([m4])
- dnl Compiling with per-target flags (test_elimination.c) requires AM_PROG_CC_C_O.
- AM_PROG_CC_C_O
- 
--AC_PROG_LIBTOOL
-+LT_INIT
- 
- AC_PROG_INSTALL
- 
-@@ -26,6 +26,10 @@ if test "$ac_cv_prog_cc_c99" = "no"; then
-   AC_MSG_ERROR([C99 support is required but not found.])
- fi
- 
-+# Find and set LIBM on the platform.
-+LT_LIB_M
-+AC_SUBST(LIBM)
-+
- # SSE2 support
- AC_ARG_ENABLE([sse2],
-         AS_HELP_STRING([--disable-sse2], [don't use SSE2 instruction set.]),
-diff --git a/m4ri.pc.in b/m4ri.pc.in
-index 5044de7..07597bd 100644
---- a/m4ri.pc.in
-+++ b/m4ri.pc.in
-@@ -7,5 +7,5 @@ Name: M4RI
- Description: Dense linear algebra over GF(2).
- Version: @PACKAGE_VERSION@
- Requires: @M4RI_USE_PNG_PC@
--Libs: -L${libdir} -lm4ri @RAW_LIBPNG@ -lm
-+Libs: -L${libdir} -lm4ri @RAW_LIBPNG@ @LIBM@
- Cflags: -I${includedir} @SIMD_CFLAGS@ @OPENMP_CFLAGS@
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index c9839a2..069e360 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -15,7 +15,7 @@ DEFINES =
- AM_CFLAGS = -I$(TOPSRCDIR) -I$(TOPBUILDDIR) -D_XOPEN_SOURCE=600 $(DEFINES) @OPENMP_CFLAGS@ @PAPI_CFLAGS@
- 
- STAGEDIR := $(realpath -s $(TOPBUILDDIR)/.libs)
--AM_LDFLAGS = -L$(STAGEDIR) -Wl,-rpath,$(STAGEDIR) -lm4ri -lm @PAPI_LDFLAGS@ @PAPI_LIBS@ -no-install
-+AM_LDFLAGS = -L$(STAGEDIR) -Wl,-rpath,$(STAGEDIR) -lm4ri $(LIBM) @PAPI_LDFLAGS@ @PAPI_LIBS@ -no-install
- 
- test_smallops_SOURCES = test_smallops.c testing.c testing.h
- 
--- 
-2.10.5
-
diff --git a/sci-libs/m4ri/files/m4ri-20200115-memory_violation.patch b/sci-libs/m4ri/files/m4ri-20200115-memory_violation.patch
deleted file mode 100644
index b74be3b4bf8f..000000000000
--- a/sci-libs/m4ri/files/m4ri-20200115-memory_violation.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From e2fb0dcb70a97972fa1576a528cb01458f57a85d Mon Sep 17 00:00:00 2001
-From: "Martin R. Albrecht" <martinralbrecht@googlemail.com>
-Date: Sun, 19 Jan 2020 17:44:57 -0800
-Subject: [PATCH] fix memory violation
-
-fixes #72
----
- m4ri/mzd.c        |  2 +-
- tests/test_misc.c | 42 ++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 43 insertions(+), 1 deletion(-)
-
-diff --git a/m4ri/mzd.c b/m4ri/mzd.c
-index 861905c..922dc3c 100644
---- a/m4ri/mzd.c
-+++ b/m4ri/mzd.c
-@@ -1894,7 +1894,7 @@ mzd_t *mzd_submatrix(mzd_t *S, mzd_t const *M, rci_t const startrow, rci_t const
-   } else {
-     wi_t j;
-     for(rci_t i=0; i<nrows; i++) {
--      for(j=0; j+m4ri_radix<=ncols; j+=m4ri_radix)
-+      for(j=0; j+m4ri_radix<ncols; j+=m4ri_radix)
-         S->rows[i][j/m4ri_radix] = mzd_read_bits(M, startrow+i, startcol+j, m4ri_radix);
-       S->rows[i][j/m4ri_radix] &= ~S->high_bitmask;
-       S->rows[i][j/m4ri_radix] |= mzd_read_bits(M, startrow+i, startcol+j, ncols - j) & S->high_bitmask;
-diff --git a/tests/test_misc.c b/tests/test_misc.c
-index a9a9547..b1a2e32 100644
---- a/tests/test_misc.c
-+++ b/tests/test_misc.c
-@@ -76,6 +76,31 @@ int test_png(rci_t m, rci_t n) {
-   return ret;
- }
- 
-+int test_submatrix(const rci_t m, const rci_t n, const rci_t lowr, const rci_t lowc, const rci_t highr, const rci_t highc) {
-+  printf("submatrix: m: %4d, n: %4d, (%4d, %4d, %4d, %4d)", m, n, lowr, lowc, highr, highc);
-+  assert(highr-lowr > 0);
-+  assert(highc-lowc > 0);
-+  mzd_t *M = mzd_init(m, n);
-+  mzd_randomize(M);
-+  mzd_t *S = mzd_init(highr-lowr, highc-lowc);
-+  mzd_submatrix(S, M, lowr, lowc, highr, highc);
-+  int ret = 0;
-+  for(rci_t i=0; i<highr-lowr; i++) {
-+    for(rci_t j=0; j<highc-lowc; j++) {
-+      ret += (mzd_read_bit(M, lowr+i, lowc+j) ^ mzd_read_bit(S, i, j));
-+    }
-+  }
-+
-+  mzd_free(M);
-+  mzd_free(S);
-+
-+  if(ret==0) {
-+    printf(" ... passed\n");
-+  } else {
-+    printf(" ... FAILED\n");
-+  }
-+  return ret;
-+}
- 
- int main(int argc, char *argv[]) {
-   int status = 0;
-@@ -99,6 +124,23 @@ int main(int argc, char *argv[]) {
-   status += test_png(126,12);
-   status += test_png(128,200);
- 
-+  status += test_submatrix(2, 127, 1, 1, 2, 127);
-+  status += test_submatrix(2, 128, 1, 1, 2, 128);
-+  status += test_submatrix(2, 129, 1, 1, 2, 129);
-+  status += test_submatrix(2, 130, 1, 1, 2, 130);
-+  status += test_submatrix(2, 131, 1, 1, 2, 131);
-+
-+  status += test_submatrix(2, 63, 1, 1, 1, 63);
-+  status += test_submatrix(2, 64, 1, 1, 1, 64);
-+  status += test_submatrix(2, 65, 1, 1, 1, 65);
-+  status += test_submatrix(2, 66, 1, 1, 1, 66);
-+  status += test_submatrix(2, 67, 1, 1, 1, 67);
-+
-+  status += test_submatrix(2, 127, 1, 63, 2, 127);
-+  status += test_submatrix(2, 128, 1, 64, 2, 128);
-+  status += test_submatrix(2, 129, 1, 65, 2, 129);
-+  status += test_submatrix(2, 130, 1, 66, 2, 130);
-+
-   if (!status) {
-     printf("All tests passed.\n");
-   } else {
--- 
-2.10.5
-
diff --git a/sci-libs/m4ri/m4ri-20200115.ebuild b/sci-libs/m4ri/m4ri-20200115.ebuild
deleted file mode 100644
index bfa4cd0d8535..000000000000
--- a/sci-libs/m4ri/m4ri-20200115.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Method of four russian for inversion (M4RI)"
-HOMEPAGE="https://bitbucket.org/malb/m4ri"
-SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug openmp cpu_flags_x86_sse2 png static-libs"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="png? ( media-libs/libpng:= )"
-RDEPEND="${DEPEND}"
-
-# NEWS and ChangeLog are empty as of 2020-01-01, and README.md
-# didn't make it into the release tarball.
-DOCS=( AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20200115-memory_violation.patch
-	"${FILESDIR}"/${PN}-20200115-libm_underlinking.patch
-)
-
-pkg_pretend() {
-	use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# when using openmp and -O0 the testsuite fails
-	# https://github.com/cschwan/sage-on-gentoo/issues/475
-	# Still current as of 20200115
-	use openmp && replace-flags -O0 -O1
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable openmp) \
-		$(use_enable png) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/m4ri/m4ri-20200125.ebuild b/sci-libs/m4ri/m4ri-20200125.ebuild
index 71b98664df90..3dfda8659c37 100644
--- a/sci-libs/m4ri/m4ri-20200125.ebuild
+++ b/sci-libs/m4ri/m4ri-20200125.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug openmp cpu_flags_x86_sse2 png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index 055c12201bb7..521ae0c8b19e 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -6,5 +6,5 @@ AUX mpir-2.7.2-ABI-multilib.patch 3902 BLAKE2B 915c6dabaf88115869eb34de98b6739fc
 DIST mpir-2.6.0.tar.lzma 2472231 BLAKE2B ec768fb78317220d677fac24609fdc4db1315e3c5594d7e098a0f502c38eb8dcf69bac5317c3b7afd629c089504856bb686aa4de65ad54b4f728325e100db44f SHA512 e2608beeb72651c9b2e47f8fb2bcf672f8c74e2cd622e17cd19b12100b66e929ee31d102d2901816379b23aee1a3ea3a854e3e10ebffe2a6e4772748858f911d
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
 EBUILD mpir-2.6.0-r2.ebuild 1722 BLAKE2B 0d356fc5762aa25d8dff40d72ad031201d6a1c01fd10107f815ae2cb4f6abbb5b2806b9097f87f916ea892f246d0ccf9e0f00cfc88b65f7b1d8ab4eab775e0ad SHA512 43d1bc825f15e4386a163860ff62917ccdffc7cc3d1ed4cc767e101ca78f86a6212fa618b92439d7f308108c4e71bb55d2a2cb7738d8b275b6714e6ac3e21b6c
-EBUILD mpir-3.0.0.ebuild 1861 BLAKE2B 96176019bfcf1bd0aa11a9c830b53c2d2f1da620adc6503fc4a7ada7cc776a5d287d20514f7f58975f09bb8964aa8319b1342955358aee5bf65d1a6f5b7cff58 SHA512 b17b67253c8f5c43ee9627848ec0604b3d0cce93a50204966ef65d53df7ad1184a879a24ad66c99d407bf7070333e1d0f4b4ee4494db9ee98dd0f79ba23702b1
+EBUILD mpir-3.0.0.ebuild 1856 BLAKE2B 0e5f0afec36820e738bb55c29f2b4c8bde95cdcc174b3e59785fec634d67e3f20b0825e66a61523260d051d5147948a063a291fa3ec91ae67276569c64681910 SHA512 d94ef0692a8b2181765554a4bedad899b3abe292c135f2bd9b77652881cfa2389c0fe9895129b46abd4d216cc2fed9d0b4ce5b8e5cb04e1394dd9b04fd57e196
 MISC metadata.xml 792 BLAKE2B 9c0bea642d53a6afb0abeecefcc940c012b5cecf8c6e98fdf69eb718f63ea8e7c7f913fa1cd8360240b5f355e3742a5ccae00166690cf8a83226ad636342d279 SHA512 811f781a961982955ba036f719ec5cce3def93190fb786ef3c3a60f1b54f9b7638d8083cf0f273174002da7d358d25e8764de591d7b587b41198c48c52908fcc
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0.ebuild
index cdefac106b6a..28e0345af632 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection static-libs"
 
 DEPEND="
diff --git a/sci-libs/nemesis/Manifest b/sci-libs/nemesis/Manifest
index 8cf7c806ed8c..ced06511df28 100644
--- a/sci-libs/nemesis/Manifest
+++ b/sci-libs/nemesis/Manifest
@@ -1,4 +1,4 @@
 AUX nemesis-6.09-multilib.patch 1617 BLAKE2B 706800577f7ff5865e54502bbe2fb18d64a6c247880c30a1101ede1d27edb5fc3b6e7ffdd6d04c1e84e3b6c29b65042fb0839906ca81fee6971fbd2ea566738e SHA512 4b9b21b67a85c3f4a69a97de1676cd0c8fbc1285737412d0996822d8e1a0e19700e1c5e4990a0dc7cc92db5315415fc8af1d1f3a8a9dfe4fb11cf5cf13e59f27
 DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516
-EBUILD nemesis-6.09.ebuild 899 BLAKE2B 7419ff1d1fe6b888363f0220b014880553aee7fd6f55893c457cd9aaf26e0cf1982209ccb919c39734e1ba6cf3a32ace853c5772f32f0fb1859503556573594f SHA512 537f625ed53c0f361af88f4ddec033b06f25321a2717c4bbc3235f1c38949bf1f9a6ad0aa55eabae652ebe2ef7a9b3e07cbbdd3ade17705305ef01092da479dd
+EBUILD nemesis-6.09.ebuild 856 BLAKE2B 86be3798e9165e48e4bf98bbd041cb5d2a6741d186ba9d0309813dd16078b3acc6e99aead01888d9c0da58fc7ba247c7f4d0f4426a20e8e17c2ae3d1f25a58b7 SHA512 1c521375a4b42eb63594ba0a6be097f7c05e0a7060d08155f329c77b71d6ea6e3278ebda58a5e9e24bae3a2ef6af640bb44546f7877ee7bc1e0117f55ecfdd4e
 MISC metadata.xml 1055 BLAKE2B 3ba3589e0f67d44da504eff1e008e0b6ac9b43b9e8eceac9089de61c8333b41b2c04db33bcfc6e3d52e1d083778bd49fdb2702154cebb0fca38e055a44f3b2ed SHA512 bf7702146727a7449c7a0988d64f0036809e3688801a2cca42a8f7a442e4f1f204c0101e50c3ffc98e4a04ee13cc01105c12bad3a480a0179574ae4d1ff6ac14
diff --git a/sci-libs/nemesis/nemesis-6.09.ebuild b/sci-libs/nemesis/nemesis-6.09.ebuild
index 3e18bd12f610..b975520655ce 100644
--- a/sci-libs/nemesis/nemesis-6.09.ebuild
+++ b/sci-libs/nemesis/nemesis-6.09.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
-
-MY_PN="exodus"
-MY_P="${MY_PN}-${PV}"
+MY_P="exodus-${PV}"
+inherit cmake
 
 DESCRIPTION="Enhancement to the EXODUSII finite element database model"
 HOMEPAGE="https://github.com/certik/exodus"
 SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}/${PN}
 
 LICENSE="BSD"
 SLOT="0"
@@ -19,16 +18,15 @@ IUSE="static-libs"
 
 DEPEND="
 	sci-libs/exodusii
-	sci-libs/netcdf"
+	sci-libs/netcdf
+"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/${MY_P}/${PN}
-
 PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
 
 src_prepare() {
-	find ../exodus -delete || die
-	cmake-utils_src_prepare
+	rm -r ../exodus || die
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -37,7 +35,7 @@ src_configure() {
 	)
 	export NETCDF_DIR="${EPREFIX}/usr/"
 	export EXODUS_DIR="${EPREFIX}/usr/"
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/sci-libs/netcdf-cxx/Manifest b/sci-libs/netcdf-cxx/Manifest
index b118e414a117..7ea706eaad50 100644
--- a/sci-libs/netcdf-cxx/Manifest
+++ b/sci-libs/netcdf-cxx/Manifest
@@ -1,11 +1,7 @@
-AUX netcdf-cxx-4.2-config.patch 829 BLAKE2B cd4285ce14647bc1822ac474b3a632fcacfb377d22e34be931741f67b4c071866689311d6d40e9cd86866b5c396605f2ec8e53a2308344ed201fccdf11722789 SHA512 80d0a436103c8408898c065079f3988f706505bace1567a9eff1f5964cac3a09a97f8449b9dcd5bd994d1e3c6e9dfb646d8fcdfb0c5f659cdc64e0800234810f
-DIST netcdf-cxx-4.2.1.tar.gz 456547 BLAKE2B e973f064ad40c0d0cb76766f3b1639d16ed7eaae73d8e55db011645fc0d4e6f8949a60aeb9d47a4f8e88b3c5b2d486d42442e417908a2194b8b9a5e720ba2ff5 SHA512 d51ab1cbda74db5f7b074799d2407d0214d1c920af780ae3bb7a47b3708e45f721be7eec61902e035968a9df5019a7b2b5a10f236f6bab4cb47a26e4e7867adb
 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-r300.ebuild 609 BLAKE2B 9e47eb431106ee5e8dd5401bc367b9208785f0588bd3e5fb7ba674a18b806cf212875ab10a5fd6d91971d73a9147ef113894e58cc9d6015e9bf5e509b0ef5de7 SHA512 0d3e37ec51bceb183f0efd2e7922e36922fb7a6c1a07f915efeb9fd967c57b4061ac7801c59ad5eac0a445125b7ac119a6e1977c469d66421d0f41b438e3b202
-EBUILD netcdf-cxx-4.2.1-r1.ebuild 730 BLAKE2B 777504e25979d68ef5e0acaaf1416fd7b336d86511c84cb0f23bfafa5eee1f72711428ee72a27318684446ccd8a388a024c5069615fd20aeb7bdd8e2d992e020 SHA512 03c7b49c8cdc252a2f76a5019cbd2323eed57b1d184bc29c4d2095533d7e4bf82a40484fe16e299bcd54cafcf4dd934433fe51028c792c270f1f07b4eac4415a
-EBUILD netcdf-cxx-4.2.1.ebuild 754 BLAKE2B a8defcffabafa13894b9ae70e3fb8d64a4e5eedec56336f9df961872b1b3bf0fea8dae7254adde67204905b547d8973ce978f7bd03b4152eab8f281ebc998b81 SHA512 cd2bade6d82df307186bb3a0bf5cdaee00798d222e843eb3e71943b3f67839543dccb309df7fec5feab37d32b83ba3186d771cf2aa9952a528962bc671c5b910
-EBUILD netcdf-cxx-4.3.0.ebuild 679 BLAKE2B d414cf3febdf7faca2999c2ff5fc4a9957f3b9d206097e8ebd690597839707820245e2d844d4ff6d127cbce3bce243bb998a4b3db3428f0df1aadf8913ef48da SHA512 a7f23db13baf8222812948a976404e956027c0aa23be49eeb40a018df6ac8f744e3afa130fb0a6dec7ffcaf0e5ad46f72d66a72bd3af6f813c683bb2a0695145
+EBUILD netcdf-cxx-4.2-r300.ebuild 616 BLAKE2B ba1024cdc714085a5984779fd274d4c5a9af57c44823a14cbf4cb453ce0a0588c92006baaca28416fda1b5e9e07a78c551f083a534d6882047900d989d5a0d21 SHA512 e9da1886babc4ecca8736fd5c587e2068c59bdacc5093f0b276cf0db4427af8d7d02373df7e42bc5d9c7255290974742e1d2fa6bbbcc504d1cd1314a6b005daa
+EBUILD netcdf-cxx-4.3.0.ebuild 677 BLAKE2B 0d544400e444b2e794545189fbdd1206de049bd9a6d8083be7eb4b2120b0b65a77461e7ce1dfa599240c4f1759e09f920e028490b0d86b9ddcce150613d5c030 SHA512 6cb81dde09c8206222c85ad9ffface7e6f554836f3ccf3ea7fc5fa95b571d0a9f3675d9a0a0e400d9d4d30f105945b97744d6397f7111b1a73b22abe6d2c3778
 EBUILD netcdf-cxx-4.3.1.ebuild 700 BLAKE2B 754efa5707393af0aa7063aa679d2902b1b4a4e075cb04eb0a1bc95098bc531a058651d0dfa37ddaec2e1b79ceb6e71d4530037953620bc100c62dc2d958c5d3 SHA512 228ea6396dc0c677b908f6acae8bab342af442cc464d6b1da97a72fda9fcf7fe7281a3b88cb1192f7ec8661c8a0d8f3a05a1d31db52eff887663d6e9176610d2
 MISC metadata.xml 838 BLAKE2B 7dfb894eff8881120e319f30baf54c41a04a1822f5d7c4db5a90cae56cdd89914ef938c1ad39601d3573d06b419c93d50efe8e563c002473c4a0b3c4f079d426 SHA512 7db14bcbc67509b05f00dcd0e0ee33281ad1d77e566c1de0362058d0fb7c3d2b82430377fb5df4bb09c3e0b9c3fee0d8ddbd9861a24e4b13e70b1151acb26c5b
diff --git a/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch b/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch
deleted file mode 100644
index 50b6b478bdb1..000000000000
--- a/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- netcdf-cxx4-4.2.1/ncxx4-config.in.orig	2013-01-10 10:47:00.595224631 -0800
-+++ netcdf-cxx4-4.2.1/ncxx4-config.in	2013-01-10 10:49:22.856926765 -0800
-@@ -5,7 +5,7 @@
- 
- prefix=@prefix@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=@libdir@
- includedir=${prefix}/include
- 
- cc="@CC@"
-@@ -13,7 +13,7 @@
- fc="@FC@"
- cflags=" -I${includedir} @CPPFLAGS@" 
- fflags="@FFLAGS@ @MOD_FLAG@${includedir}"
--libs="-L${libdir} @NC_LIBS@"
-+libs="-L${libdir} @NC_LIBS@ -lnetcdf"
- flibs="-L${libdir} @NC_FLIBS@"
- has_dap="@HAS_DAP@"
- has_nc2="@HAS_NC2@"
---- netcdf-cxx4-4.2.1/netcdf-cxx4.pc.in.orig	2013-01-10 10:46:50.995177250 -0800
-+++ netcdf-cxx4-4.2.1/netcdf-cxx4.pc.in	2013-01-10 10:49:45.030036161 -0800
-@@ -10,4 +10,4 @@
- Version: @PACKAGE_VERSION@
- Libs: -L${libdir} @NC_LIBS@
- Cflags: -I${includedir}
--
-+Requires: netcdf
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r300.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r300.ebuild
index 35eed157f022..a15d37a2a1d2 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r300.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r300.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://www.unidata.ucar.edu/downloads/netcdf/ftp/${P}.tar.gz"
 
 LICENSE="UCAR-Unidata"
 SLOT="3"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples static-libs"
 
 RDEPEND=">=sci-libs/netcdf-4.2:0="
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1-r1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1-r1.ebuild
deleted file mode 100644
index fa311868cb0b..000000000000
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-
-MYP=${PN}4-${PV}
-
-DESCRIPTION="C++ library for netCDF"
-HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs"
-
-RDEPEND=">=sci-libs/netcdf-4.2:=[hdf5]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2-config.patch"
-)
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use examples && dodoc -r examples
-	prune_libtool_files
-}
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1.ebuild
deleted file mode 100644
index b1bb22728e01..000000000000
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-MYP=${PN}4-${PV}
-
-DESCRIPTION="C++ library for netCDF"
-HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs"
-
-RDEPEND=">=sci-libs/netcdf-4.2:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2-config.patch )
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-src_test() {
-	autotools-utils_src_test -j1
-}
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild
index c64a6ff9763c..e029c4ea6b3b 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="UCAR-Unidata"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="examples static-libs"
 
 RDEPEND=">=sci-libs/netcdf-4.2:=[hdf5]"
diff --git a/sci-libs/netcdf-fortran/Manifest b/sci-libs/netcdf-fortran/Manifest
index 51f6d907abc9..860f2fe1f746 100644
--- a/sci-libs/netcdf-fortran/Manifest
+++ b/sci-libs/netcdf-fortran/Manifest
@@ -1,3 +1,3 @@
 DIST netcdf-fortran-4.4.3.tar.gz 1286951 BLAKE2B 6e68505359328bac4155065419cb9c2fb2df0de875210c0eb9a4e63312b2ec272d63ecfa73b5dcebe7cf75b58a184d1a0ccb2c06c45869d3f4573590d610d9e0 SHA512 94f51b4be889d6a9d6a86e3fcb2639ac58288969160d0f334ed6965e3c9cbacff7289b1fc54ed06e6ec8b845b19f5c409fbdcab432c8edf5c96efde887920924
-EBUILD netcdf-fortran-4.4.3.ebuild 823 BLAKE2B 3861caacfc024a84ee7acf6cabb20eaee4ef25e455d56423b6d254f9ad3fbacef92d6f4d480bae6b58bd095ee31aff15ea2be1b4a54b2d8bbc359a9ab736f733 SHA512 5565b2c5e10a62fe9cec2d96196ebcdc7ea9391a6d6176f8ea8074cb738326e2185e4d53ebd1fe37fb2677f690b48a3df3699e5adc1c822b33363430e2b6bf82
+EBUILD netcdf-fortran-4.4.3.ebuild 931 BLAKE2B 0091bba50b61f0c9315ce3d3220195cc26d782d6c490c53c179d40f940b32584c1334d0fd44aa12358481393eb48a1767e249d7bc2f328794df1db5c1c935570 SHA512 ee851f193d86e017e33a64cc699bbb7128fd8ce90cd8e323362ffb647030a3de7fdc360a4a520c4e5ff678f1b9f07d5a52d7f27b6c871453fc57dca9c1fa1ca2
 MISC metadata.xml 838 BLAKE2B 321e0b4dff6a06c50482f2614daee76c38498d83ed34aebc47e485e04e09e523199a8959f077cbfeb50111478ce4213932d6854212f9c7d5e9b6167d559a4ccb SHA512 9e4f8789f36ab7442f11f60145510bb4a74a7182027845caa6e0b014713311f821808eb48877a860e1c5328d2383481a5616156432f5a7e3fe78f0e3440890da
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.ebuild
index b4fd58838d7b..07be294b26c9 100644
--- a/sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.ebuild
+++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.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
 
 FORTRAN_STANDARD="77 90"
 
-inherit autotools eutils fortran-2 ltprune
+inherit autotools eutils fortran-2 flag-o-matic ltprune
 
 DESCRIPTION="Scientific library and interface for array oriented data access"
 HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
@@ -30,6 +30,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# GCC 10 workaround
+	# bug #723274
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
 	econf $(use_enable static-libs static)
 }
 
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index c3bab9ee6c3b..1ee0cc041503 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,8 +1,5 @@
-AUX netcdf-4.3.2-HDF5-1.8.13+-compat.patch 5258 BLAKE2B ef4afcaf5f9139c6db2898e8e6339e77de8534218c7e00a6b16ff68bdaeb470a96b06493637a6b7734bc00a4813f21a4fd179bc12d1cf156a04ee651380bfc5e SHA512 aa54ec936aff884b105217a8c87f5d7722b8b76a4bdd8b8804366c6509abba9962fdcdbfda2361662fec3732be1a1c2b7a2ae8abea1862d2ad7fd3b0f3828f59
-DIST netcdf-4.3.2.tar.gz 5013938 BLAKE2B 7acef16284bf8586750bdeb03da3e2e2a1c543b80423269eb2542d179e1b52dd51e30584a13f604e75c295ae9ff993c814183fbb5a78ad1141c62f8dbdda6525 SHA512 9cb9c761bf1e17a37601c37000fdc0bb654afcf111e5ac2fb7dcf037c6aa827e66beb29d5c661edc50ea3f84849f3dee387aab9e85ef81a9b6ca3f36e45debdd
-DIST netcdf-4.6.1.tar.gz 18201700 BLAKE2B 2dab9add736d0db3ad91fb1ccda63c200fe5a2c6e56e2dd5b76375f6535807c6f462623d1709235f03e0940b66a8c2d1c3fd896b042b8b0004c87f038852befb SHA512 e290b10e763f9f6ef56b5224f834834853de7c21347ef6a078a2e7d819757fc8069814431784d0a0387ba2ce1f01776556e3051f9465829da0ffd3849571cd61
+AUX netcdf-4.7.4-big-endian-build.patch 1892 BLAKE2B 9209f042f86e4eb7d3c1359ff8c1c033eab2762aa6bf5b7a8f8e513ac52eddb2039c1728d77a2e038985a8612a04ba5654d27c872f92bcd54dde4237dc427288 SHA512 5d6cf04597897faed7ecdd4c8c182f3d22082569cbb726b25d8e922c853dbe4e7e8105c9470faaed50e254072f9411ebfc9aabc480858a0bd7fd8d77a9a2e87c
+AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec974c98951a41c0025041f9ee67d92c7bfe57887f5ac8d8beb2426e2c095fc06cf4b29046a9b29873b125d681b169c9613b6 SHA512 72575f890615a05a6f1beeebfd3edcd367fe148be017a32847b0a7db96c594e6bb5d01acd865257b25410e0a22699b1beef2c54748ccb09ea5e41009f4e0f9ee
 DIST netcdf-4.7.4.tar.gz 19711158 BLAKE2B b49532e6f87b458e7f5654f70ec932d6c8c81272c97ce44df3d27bb61b01d3e005f918b959ce12e42e26f7c12309ab72eeb57a35216d20ab5761837db65741a4 SHA512 15922818fdd71be285eb7dd2fc9be2594fe9af979de3ed316465636c7bbdaec65eb151ca57ef8b703e6a360cdba036b8f9bc193ddff01ff7ce4214c0a66efa79
-EBUILD netcdf-4.3.2-r1.ebuild 1499 BLAKE2B 7bfd5e8ac228a24e707089b4c0c7853051804b368c588080a1abf6080c2e81470a18814b4a999660e2e4af229b5ab68fe6d2d8f08e4f3a4bbc7a85446003d82d SHA512 63d12e90ba69030eda48a8d2c905f6cd2337b9cf9d1aa96856c4e45227f65bcb113a3aba0d0d1f7a5781a23fdbcdf0aa34c9322a4feb2b5533e591c85ca234de
-EBUILD netcdf-4.6.1-r1.ebuild 1339 BLAKE2B 93c0f23f0abfa4d52bd4de02f67a7521400ad82c91ade18d6c09e18fe8fb9b4e053ee7864fa0e21b472df0d813680d74c91589c9049da100191646fea03553ba SHA512 6d3b500df1de3f15a694b8162d1bc52cd4d91428a57946db1f9fa1a81adb911feb9710cf57b96693388994ad301d5600c08eb00cfcfd4aa9979815078302bc55
-EBUILD netcdf-4.7.4.ebuild 1425 BLAKE2B 66579ba0c24b480c9cd0254daf6f166bfcb687925610ff6f25169632583f562184af9c39d10d376c5fcdfc3fc7a5cde644482b5c765e201692f3341da24e0c0f SHA512 fd5f93864cbfa93dffb46b7d1ab8a6f6ffd605de1818cd076df7098d58bfce6f88658eb1edc7663d88d25e2ad6afc65347470839969ed1dead1450fae79be966
+EBUILD netcdf-4.7.4.ebuild 1539 BLAKE2B 0a4d13dcd179454a032f51a0abcfc21b77a7faa34dbbdeb9e26d815d4100c380c147ea1a39f929590aa896ee46c90eb7a706867db1b8b904b28aecb7e3cb2ad9 SHA512 5ad6b406b811bb58d167ec792965da5c2ed5f0ead5411e8dcc4ec6acf6880513c3b228867c7d5e2fd29050478e09422e9e4363690dce7dc0564b54624a4c2e94
 MISC metadata.xml 1064 BLAKE2B 7980e918eb2d2f438aeb5deb4a678c2e324606b40e8d04e592df7d24492bdfbc548082f6fa372c168b09597c3511df15a046cd8f6d746db3d9aeae31cf3604ac SHA512 2aaa7a6c4659ff3daf81bdb63541ce08359f43bb7007f38dea333d0a05fc920e6780b79a9b0f79fec59d4e05a005efd3642acaedcd3223a21d5aa919110545dd
diff --git a/sci-libs/netcdf/files/netcdf-4.3.2-HDF5-1.8.13+-compat.patch b/sci-libs/netcdf/files/netcdf-4.3.2-HDF5-1.8.13+-compat.patch
deleted file mode 100644
index 783a5b06e991..000000000000
--- a/sci-libs/netcdf/files/netcdf-4.3.2-HDF5-1.8.13+-compat.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 435d8a03ed28bb5ad63aff12cbc6ab91531b6bc8 Mon Sep 17 00:00:00 2001
-From: Quincey Koziol <quincey@koziol.cc>
-Date: Wed, 7 May 2014 08:45:15 -0500
-Subject: [PATCH] Account for the HDF5 library not having the MPI-POSIX VFD
- configured in.
-
----
- RELEASE_NOTES.md         |  2 ++
- libsrc4/nc4file.c        | 40 ++++++++++++++++++++++++++++++++++++++++
- nc_test4/tst_nc4perf.c   |  5 +++++
- nc_test4/tst_parallel3.c |  5 +++++
- 4 files changed, 52 insertions(+)
-
-diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
-index 27f228c..1a69d17 100644
---- a/RELEASE_NOTES.md
-+++ b/RELEASE_NOTES.md
-@@ -9,6 +9,8 @@ This file contains a high-level description of this package's evolution. Release
- 
- ### 4.3.3-rc1 Released TBD
- 
-+* When the NC_MPIPOSIX flag is given for parallel I/O access and the HDF5 library does not have the MPI-POSIX VFD configured in, the NC_MPIPOSIX flag is transparently aliased to the NC_MPIIO flag within the netCDF-4 library.
-+
- ## 4.3.2 Released 2014-04-23
- 
- * As part of an ongoing project, the Doxygen-generated netcdf documentation has been reorganized.  The goal is to make the documentation easier to parse, and to eliminate redundant material.  This project is ongoing.
-diff --git a/libsrc4/nc4file.c b/libsrc4/nc4file.c
-index ec3bb0c..5c957be 100644
---- a/libsrc4/nc4file.c
-+++ b/libsrc4/nc4file.c
-@@ -308,12 +308,21 @@ nc4_create_file(const char *path, int cmode, MPI_Comm comm, MPI_Info info,
- 	 if (H5Pset_fapl_mpio(fapl_id, comm, info) < 0)
- 	    BAIL(NC_EPARINIT);
-       }
-+#ifdef USE_PARALLEL_POSIX
-       else /* MPI/POSIX */
-       {
- 	 LOG((4, "creating parallel file with MPI/posix"));
- 	 if (H5Pset_fapl_mpiposix(fapl_id, comm, 0) < 0)
- 	    BAIL(NC_EPARINIT);
-       }
-+#else /* USE_PARALLEL_POSIX */
-+      /* Should not happen! Code in NC4_create/NC4_open should alias the
-+       *        NC_MPIPOSIX flag to NC_MPIIO, if the MPI-POSIX VFD is not
-+       *        available in HDF5. -QAK
-+       */
-+      else /* MPI/POSIX */
-+         BAIL(NC_EPARINIT);
-+#endif /* USE_PARALLEL_POSIX */
- 
-       /* Keep copies of the MPI Comm & Info objects */
-       if (MPI_SUCCESS != MPI_Comm_dup(comm, &nc4_info->comm))
-@@ -465,6 +474,17 @@ NC4_create(const char* path, int cmode, size_t initialsz, int basepe,
-       )
-       return NC_EINVAL;
- 
-+#ifndef USE_PARALLEL_POSIX
-+/* If the HDF5 library has been compiled without the MPI-POSIX VFD, alias
-+ *      the NC_MPIPOSIX flag to NC_MPIIO. -QAK
-+ */
-+   if(cmode & NC_MPIPOSIX)
-+   {
-+      cmode &= ~NC_MPIPOSIX;
-+      cmode |= NC_MPIIO;
-+   }
-+#endif /* USE_PARALLEL_POSIX */
-+
-    cmode |= NC_NETCDF4;
- 
-    /* Apply default create format. */
-@@ -2168,12 +2188,21 @@ nc4_open_file(const char *path, int mode, MPI_Comm comm,
- 	 if (H5Pset_fapl_mpio(fapl_id, comm, info) < 0)
- 	    BAIL(NC_EPARINIT);
-       }
-+#ifdef USE_PARALLEL_POSIX
-       else /* MPI/POSIX */
-       {
- 	 LOG((4, "opening parallel file with MPI/posix"));
- 	 if (H5Pset_fapl_mpiposix(fapl_id, comm, 0) < 0)
- 	    BAIL(NC_EPARINIT);
-       }
-+#else /* USE_PARALLEL_POSIX */
-+      /* Should not happen! Code in NC4_create/NC4_open should alias the
-+       *        NC_MPIPOSIX flag to NC_MPIIO, if the MPI-POSIX VFD is not
-+       *        available in HDF5. -QAK
-+       */
-+      else /* MPI/POSIX */
-+         BAIL(NC_EPARINIT);
-+#endif /* USE_PARALLEL_POSIX */
- 
-       /* Keep copies of the MPI Comm & Info objects */
-       if (MPI_SUCCESS != MPI_Comm_dup(comm, &nc4_info->comm))
-@@ -2640,6 +2669,17 @@ NC4_open(const char *path, int mode, int basepe, size_t *chunksizehintp,
-        (mode & NC_MPIIO && mode & NC_MPIPOSIX))
-       return NC_EINVAL;
- 
-+#ifndef USE_PARALLEL_POSIX
-+/* If the HDF5 library has been compiled without the MPI-POSIX VFD, alias
-+ *      the NC_MPIPOSIX flag to NC_MPIIO. -QAK
-+ */
-+   if(mode & NC_MPIPOSIX)
-+   {
-+      mode &= ~NC_MPIPOSIX;
-+      mode |= NC_MPIIO;
-+   }
-+#endif /* USE_PARALLEL_POSIX */
-+
- 
-    /* Depending on the type of file, open it. */
- 
-diff --git a/nc_test4/tst_nc4perf.c b/nc_test4/tst_nc4perf.c
-index 47af70e..3528b82 100644
---- a/nc_test4/tst_nc4perf.c
-+++ b/nc_test4/tst_nc4perf.c
-@@ -244,6 +244,11 @@ int test_pio_4d(size_t cache_size, int facc_type, int access_flag, MPI_Comm comm
-    return 0;
- }
- 
-+/* Note: When the MPI-POSIX VFD is not compiled in to HDF5, the NC_MPIPOSIX
-+ *      flag will be aliased to the NC_MPIIO flag within the library, and
-+ *      therefore this test will exercise the aliasing, with the MPI-IO VFD,
-+ *      under that configuration. -QAK
-+ */
- #define NUM_MODES 2
- #define NUM_FACC 2
- #define NUM_CHUNK_COMBOS_2D 3
-diff --git a/nc_test4/tst_parallel3.c b/nc_test4/tst_parallel3.c
-index 27f9c98..9fa534f 100644
---- a/nc_test4/tst_parallel3.c
-+++ b/nc_test4/tst_parallel3.c
-@@ -129,6 +129,11 @@ int main(int argc, char **argv)
-    if (mpi_rank == 0)
-       SUMMARIZE_ERR;
- 
-+/* Note: When the MPI-POSIX VFD is not compiled in to HDF5, the NC_MPIPOSIX
-+ *      flag will be aliased to the NC_MPIIO flag within the library, and
-+ *      therefore this test will exercise the aliasing, with the MPI-IO VFD,
-+ *      under that configuration. -QAK
-+ */
-    if (mpi_rank == 0)
-       printf("*** Testing parallel IO for raw-data with MPIPOSIX-IO (driver)...");
-    facc_type = NC_NETCDF4|NC_MPIPOSIX;
--- 
-2.0.3
-
diff --git a/sci-libs/netcdf/files/netcdf-4.7.4-big-endian-build.patch b/sci-libs/netcdf/files/netcdf-4.7.4-big-endian-build.patch
new file mode 100644
index 000000000000..edad05a21e64
--- /dev/null
+++ b/sci-libs/netcdf/files/netcdf-4.7.4-big-endian-build.patch
@@ -0,0 +1,63 @@
+https://github.com/DennisHeimbigner/netcdf-c/commit/6f86660da86f279cad1f2804cf3242767de27630.patch
+https://github.com/Unidata/netcdf-c/issues/1687
+https://bugs.gentoo.org/772863
+
+From 6f86660da86f279cad1f2804cf3242767de27630 Mon Sep 17 00:00:00 2001
+From: Dennis Heimbigner <dmh@ucar.edu>
+Date: Fri, 3 Apr 2020 20:15:34 -0600
+Subject: [PATCH] Fix missing forward declarations
+
+re: issue https://github.com/Unidata/netcdf-c/issues/1687
+
+static functions are being used before decl and it causes
+errors. Only occurs when BIG_ENDIAN is defined.
+Solution is to add the forward declarations.
+---
+ libdispatch/dfilter.c       | 4 ++++
+ nc_test4/tst_filterparser.c | 5 +++++
+ plugins/H5Zutil.c           | 1 +
+ 3 files changed, 10 insertions(+)
+
+diff --git a/libdispatch/dfilter.c b/libdispatch/dfilter.c
+index 893846457..0e490a3d6 100644
+--- a/libdispatch/dfilter.c
++++ b/libdispatch/dfilter.c
+@@ -40,6 +40,10 @@ Unified filter related code
+ 
+ /* Forward */
+ static int gettype(const int q0, const int q1, int* unsignedp);
++#ifdef WORDS_BIGENDIAN
++static void byteswap8(unsigned char* mem);
++static void byteswap4(unsigned char* mem);
++#endif
+ 
+ const struct LegalFormat {
+     const char* tag;
+diff --git a/nc_test4/tst_filterparser.c b/nc_test4/tst_filterparser.c
+index 7d02f2bc7..b32094a25 100644
+--- a/nc_test4/tst_filterparser.c
++++ b/nc_test4/tst_filterparser.c
+@@ -122,6 +122,11 @@ static const char* spectype[] = {"i", "b", "ub", "s", "us", "i", "ui", "i", "i",
+ 
+ static int nerrs = 0;
+ 
++#ifdef WORDS_BIGENDIAN
++static void byteswap8(unsigned char* mem);
++static void byteswap4(unsigned char* mem);
++#endif
++
+ static void
+ mismatch(size_t i, unsigned int *params, const char* tag)
+ {
+diff --git a/plugins/H5Zutil.c b/plugins/H5Zutil.c
+index cb36dc96c..86dfb0cfa 100644
+--- a/plugins/H5Zutil.c
++++ b/plugins/H5Zutil.c
+@@ -4,6 +4,7 @@
+  */
+ 
+ 
++#include "config.h"
+ #include <hdf5.h>
+ 
+ /*
diff --git a/sci-libs/netcdf/files/netcdf-4.7.4-big-endian-test.patch b/sci-libs/netcdf/files/netcdf-4.7.4-big-endian-test.patch
new file mode 100644
index 000000000000..cdc39a6a7729
--- /dev/null
+++ b/sci-libs/netcdf/files/netcdf-4.7.4-big-endian-test.patch
@@ -0,0 +1,16 @@
+Fixes ncdump_tst_netcdf4 test failure on big endian.
+https://github.com/Unidata/netcdf-c/issues/1896
+diff --git a/ncdump/tst_special_atts.c b/ncdump/tst_special_atts.c
+index 9655b86..e71cb7e 100644
+--- a/ncdump/tst_special_atts.c
++++ b/ncdump/tst_special_atts.c
+@@ -145,6 +145,10 @@ main(int argc, char **argv)
+    /* Set _Storage as compact */
+    if (nc_def_var_chunking(ncid, var6id, NC_COMPACT, NULL)) ERR;
+    if (nc_def_var_chunking(ncid, var7id, NC_COMPACT, NULL)) ERR;
++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++   if (nc_def_var_endian(ncid, var6id, NC_ENDIAN_LITTLE)) ERR;
++   if (nc_def_var_endian(ncid, var7id, NC_ENDIAN_LITTLE)) ERR;
++#endif
+ 
+    if (nc_enddef(ncid)) ERR;
diff --git a/sci-libs/netcdf/netcdf-4.3.2-r1.ebuild b/sci-libs/netcdf/netcdf-4.3.2-r1.ebuild
deleted file mode 100644
index e880b9a4ebf8..000000000000
--- a/sci-libs/netcdf/netcdf-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Scientific library and interface for array oriented data access"
-HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0/7"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dap? ( net-misc/curl:0= )
-	hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= )
-	hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )"
-DEPEND="${RDEPEND}"
-# doc generation is missing many doxygen files in tar ball
-#	doc? ( app-doc/doxygen[dot] )"
-
-REQUIRED_USE="test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )"
-
-PATCHES=( "${FILESDIR}/${P}-HDF5-1.8.13+-compat.patch" )
-
-src_configure() {
-	#	--docdir="${EPREFIX}"/usr/share/doc/${PF}
-	#	$(use_enable doc doxygen)
-	local myeconfargs=(
-		--disable-examples
-		--disable-dap-remote-tests
-		$(use_enable dap)
-		$(use_enable hdf hdf4)
-		$(use_enable hdf5 netcdf-4)
-		$(use_enable tools utilities)
-	)
-	if use mpi; then
-		export CC=mpicc
-		myeconfargs+=( --enable-parallel )
-		use test && myeconfargs+=( --enable-parallel-tests )
-	fi
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test -j1
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild b/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
deleted file mode 100644
index d7770061f7a7..000000000000
--- a/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-
-DESCRIPTION="Scientific library and interface for array oriented data access"
-HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0/13"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dap? ( net-misc/curl:0= )
-	hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= )
-	hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )"
-DEPEND="${RDEPEND}"
-# doc generation is missing many doxygen files in tar ball
-#	doc? ( app-doc/doxygen[dot] )"
-
-REQUIRED_USE="test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )"
-
-S="${WORKDIR}/${PN}-c-${PV}"
-
-src_configure() {
-	local myconf
-	if use mpi; then
-		export CC=mpicc
-	fi
-	econf "${myconf}" \
-		--disable-examples \
-		--disable-dap-remote-tests \
-		$(use_enable dap) \
-		$(use_enable hdf hdf4) \
-		$(use_enable hdf5 netcdf-4) \
-		$(use_enable static-libs static) \
-		$(use_enable tools utilities)
-}
-
-src_test() {
-	# fails parallel tests: bug #621486
-	emake check -j1
-}
-
-src_install() {
-	default
-	use examples && dodoc -r examples
-	prune_libtool_files
-}
diff --git a/sci-libs/netcdf/netcdf-4.7.4.ebuild b/sci-libs/netcdf/netcdf-4.7.4.ebuild
index 8f99b01c1bde..428737d15aaa 100644
--- a/sci-libs/netcdf/netcdf-4.7.4.ebuild
+++ b/sci-libs/netcdf/netcdf-4.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,10 +8,11 @@ inherit cmake
 DESCRIPTION="Scientific library and interface for array oriented data access"
 HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
 SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-c-${PV}"
 
 LICENSE="UCAR-Unidata"
 SLOT="0/18"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+dap doc examples hdf +hdf5 mpi szip test tools"
 RESTRICT="!test? ( test )"
 
@@ -33,7 +34,10 @@ REQUIRED_USE="
 	szip? ( hdf5 )
 	mpi? ( hdf5 )"
 
-S="${WORKDIR}/${PN}-c-${PV}"
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7.4-big-endian-build.patch"
+	"${FILESDIR}/${PN}-4.7.4-big-endian-test.patch"
+)
 
 src_prepare() {
 	# skip test that requires network
diff --git a/sci-libs/numkit/Manifest b/sci-libs/numkit/Manifest
index 257a0faa1687..76ca56723b3e 100644
--- a/sci-libs/numkit/Manifest
+++ b/sci-libs/numkit/Manifest
@@ -1,3 +1,3 @@
 DIST numkit-1.1.2.tar.gz 243442 BLAKE2B e5d1e4d85b7646acf47a1e332cbb08f849272ada30bcd65fc5995cd000683f802eb882603e4e7043b159d30ca73395988b83c1fc16d6303ea32731bfdea12db5 SHA512 694a56f64282bbbffed975eabeb2716ac924fbf47f5fb62934ba3b57e6415e5f4b079345fd4eee670990fbf7abe1f945b98472aba034d8c7ff259676da58c034
-EBUILD numkit-1.1.2.ebuild 757 BLAKE2B d438941e1f1545ebd13cd433e3ebbe06949778af3d4b7c98a1302dcdd5fa66ff202d4796762cc8611eb49fca8405b7d3874b5f6f0c368050a377ffa34657b489 SHA512 8451084ca7e04af6c7b2cf2533b6f66cb1ebddcc13aea1ab3c98225ec240d8ee0e3f0e4dc76d753acf7a66a19cb0e5645e87a876db84b0c31f1c503219169b53
-MISC metadata.xml 474 BLAKE2B 7467f534225c3c84437c0306f716e64c9740607a9c18afae941af472c867fb29e3bf8e7371caaabd200a0a583c6502f5c6dc2dc6efa8508b91e15a372c90048f SHA512 7df51b689b986305f1a266361661871f2f0da60e1bda3c77d98f1f45d9ba4e2614930f283e2ef73fe861e519931fbc8b1724f2692c4759ddfa78e9cc89b1efeb
+EBUILD numkit-1.1.2.ebuild 590 BLAKE2B b60c810a6be9d4c13695f104b4536cad3a04d815894119dae236a0628568e68f55387da441b693c83509294a7cd6c4524f5132ed25f01dca97629e4183c92fc3 SHA512 00fc9b4763a9440043d9d6e8ed2c19f13f2c52e0792451277a5411e2b7a19a8898927dcb86116d01bbad69246cf8623db9a2c5546f7187d366d3ae502472b3e7
+MISC metadata.xml 499 BLAKE2B 83ab2423aa356c0686f49774f471f0bf32cfd00cd654c67bd0e36e3b5bac68f779df6921c3e9c6152788a2bae0e24e21c9255c483befbafdb0ac7c65649ed6b2 SHA512 7af6a40ad292056abf1e7d41b3b50c930a44070e1b64e33a26005d3dfcc452fa328e6ffe1fc47a048d600c0d4d935e05e57b6b97b6aeacbe81ef39d4a377ce8f
diff --git a/sci-libs/numkit/metadata.xml b/sci-libs/numkit/metadata.xml
index f38dc92dab52..a8fbd089f373 100644
--- a/sci-libs/numkit/metadata.xml
+++ b/sci-libs/numkit/metadata.xml
@@ -9,6 +9,7 @@
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">Becksteinlab/numkit</remote-id>
   </upstream>
diff --git a/sci-libs/numkit/numkit-1.1.2.ebuild b/sci-libs/numkit/numkit-1.1.2.ebuild
index 54e7b6e882bf..57d46a51a3f2 100644
--- a/sci-libs/numkit/numkit-1.1.2.ebuild
+++ b/sci-libs/numkit/numkit-1.1.2.ebuild
@@ -3,27 +3,17 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI="https://github.com/Becksteinlab/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	scm_eclass=vcs-snapshot
-	SRC_URI="https://github.com/Becksteinlab/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit eutils distutils-r1 ${scm_eclass}
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
 
 DESCRIPTION="Numerical first aid kit (with numpy/scipy)"
 HOMEPAGE="https://numkit.readthedocs.io"
+S="${WORKDIR}/${PN}-release-${PV}"
+SRC_URI="https://github.com/Becksteinlab/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/sci-libs/oce/Manifest b/sci-libs/oce/Manifest
index 084a5f6595b7..32e4cc943630 100644
--- a/sci-libs/oce/Manifest
+++ b/sci-libs/oce/Manifest
@@ -1,4 +1,4 @@
 AUX oce-0.18.3-test-fix.patch 1273 BLAKE2B 40c3fec8e3d5b703c39a2eee32d663e6dc7c6a1bad6a9885608679cb86f8047d6a50e1f625beac50dca045393f0d0290b5ca9d56a7498ba869a4af5028eb1fa0 SHA512 822bee12ee259801a3a242d3877fa3c6dd07043f65857d635a4790cdfd936be4016d1441e4dd3b8e7ff1cd1d187d1ab8fc7634e39376e91d06d8666d38632689
 DIST OCE-0.18.3.tar.gz 24633768 BLAKE2B c1923fb6310ea30318251fedac371655a575bf4dfcc4c38e7c748d316416e08c33a3f27bd5db7f5b437265cf2f518651d69a6920f9f487dc7e0065a6406c653f SHA512 6fdeb6ca4ce25361379872ccc465799d4a43407974c4f626b32df695e582b9e553cce17af6a6a7ff46ebed9b813d910ad23eb308a5356dabb9b9bbd4f42a8636
-EBUILD oce-0.18.3-r2.ebuild 1753 BLAKE2B 082fa7ed288dadee1c41b1101b2b7b39f25a2a8bd7885c48b41d2e6e47cc5be27fdab6a0b93a1a802a284c9875a429544c54ef3d3feebfafe474f3ce4cb431a8 SHA512 5b7f1ca1b72a45dc034ca6440ce9eb7474acd880947097a6fe14b2889992ddc844cfe0d89905883bc0eed3b9858a6af76342aa51cd4943be0231b8b9810515f7
+EBUILD oce-0.18.3-r2.ebuild 1760 BLAKE2B 73690120aff4616da8871bd00b97dfb34d28b9930c96537676a993072e9890c274015764b14011ad2477143467b8f74a923101d215a4302728fbb80722cf3a66 SHA512 100e2136db0a32eb63b8038515624b59ba52f62eda067893f3603ba1effeaffa7b5d1a59cf84af6f455f4cc24321c31c075b58b27e4cb2d43226213177fe3129
 MISC metadata.xml 900 BLAKE2B aec66b3c98aaaadf1727f4522a79ad01e8d195ac62799a5112a2d61ca9d916635ff110f99840f97ebad81a1324780d15218757c1b982536ae9e14945699e6b5b SHA512 86a44a573579df2416b949b62fe931172681f36bf7af9f90f7224e3fc433cb7091c3ef757581337aa87d80962a4800fa03e005e5360233f570f7d926553735ba
diff --git a/sci-libs/oce/oce-0.18.3-r2.ebuild b/sci-libs/oce/oce-0.18.3-r2.ebuild
index 1ff4e66c4a60..11a072de0d62 100644
--- a/sci-libs/oce/oce-0.18.3-r2.ebuild
+++ b/sci-libs/oce/oce-0.18.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpaviot/oce/archive/OCE-$PV.tar.gz"
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="examples freeimage gl2ps +openmp tbb vtk"
 REQUIRED_USE="?? ( openmp tbb )"
 
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 74a1547e4b8a..70e4c0fa2c60 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,6 +1,9 @@
+AUX opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch 1104 BLAKE2B 6feb1d9a4f4424a1e2df6d3056d73308effd5b53d805a0e14de65a4b7d72c767ba6666df738484ee036bc9b054674d0a714e58874f4426ba7deb81269ee183e5 SHA512 f12ad8bfe9adf5fa89db6dc789a9627facad1e78a4ca448637cd4f61c6ec738967f96c7d0aea01276aa45dff9a51cd1f0d28de4061a6df2137cf4be470aa6329
 AUX opencascade-7.4.0-find-qt.patch 3349 BLAKE2B 6520b3242927c86c4958f81f8a94e8976fb2cd262318ee7fd7e1362bb95d0d665bbf909108a0526e4d251af045f734a58ee6cfae631b14b139e1a70f7666beb3 SHA512 8d7a758f749794430267e473b6048386bb3b9e4274091f5a5662bfcbaf2c76cdf0c3c2fac4d6e8f03ea300bfe3d0258cb23b8f184de62f153d12a41746f02e75
+AUX opencascade-7.4.0-fix-flow-control-nesting.patch 787 BLAKE2B 929674b6c804411934adbbbf31eba4dc6cd52e15cb9959982c1770244f1edbfc7ff94c832e7e20516f18ef8548488464e15ee1b5d3de70022e9bd1213272c143 SHA512 1ba3f8ab5d62d42d17adc72c371e1a2c0f3d8e996a3f1dfaec1e1a248504592a5ccc27a651640de24f3e47402d4129f77943f3df7117215eacf98f44fa8678ba
 AUX opencascade-7.4.0-fix-install.patch 7870 BLAKE2B 4842ad5123a06a53b81ca80e4152434ee6d78a9eb5436a7a9f899651fcdb45a6f403f31bd6e4225611c1085fb91eb7a5640e5bb3fd49b71295ad0868b8e018dd SHA512 5315e82bd03a8782df8c72bbfb334d9cf739dd53f3aa22649f087c1b8b7fa5f88f7a80850c1f2e0c9dffd80a77dd99fd36e9674463535cbf48b896596c24f38e
+AUX opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch 1973 BLAKE2B cac9a795d91fc55de7fc6b3c9a7f1138b8d8320e1be6879d7de4e63132a0a4e729be2dafd281e64fd52f8e05790dcb8c41bed22b8bc159b32952ad7ef79aa9da SHA512 9dfac105d41775578b6ea51fc74cbf35f9627a10bdfb35f768c09d47d7d06b11d667f231653029d297d40c82444b82d50b3bcd7d3a4520989e416d83eaaaee5e
 AUX opencascade-7.4.0.env.in 4611 BLAKE2B 3593cd4e05d33e466a975cf4641c56cd8e686310a148cc684591d3e08f8c4efd86e4df13500f11845e425b056b9c2c42f0f27a2a4d8cea524dc8fbb1c7dad703 SHA512 25f65e2b1e91fa78313334dab7d19b115bb7ff97ccefe7d18c45ab1817e12e10fdbe36babcb22e2a0d52bf7a0fbbdd2937523b773ddbb37635c1dd0d14de6253
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
-EBUILD opencascade-7.4.0-r3.ebuild 3874 BLAKE2B 08c690ed3ebef44cb620757cf3357d05a322696424d6038198ed9792d8fc647f7285d4a45e70981165a1f81961c02cd9c5fee6f0a17bfb6b88eea5ea4c4bdfe0 SHA512 d8e3d70a0b1affe0e2947470e1325d94d17d5ab678c83dff2c331339b39abe5607a90d236897766642c45efc59c302c6d448ac4869fc49e29c6b29755e2dc3ea
+EBUILD opencascade-7.4.0-r4.ebuild 3947 BLAKE2B feacae0802130f77a0c39405b4c1b440723b49c5427b6405a35ceb27c2dbaaaf9fbbcc18155571b3b7e392df475c7f358c828817a3b8821e1b7a8db292fa3a9c SHA512 b7e7dc4577c07501988c24f969093e53608d8cbdaae94ea69072c9c54c13f5efaa15aa6eeda2bcd054567ad262f655fa43e92c38f90966bac128e98bb56f8025
 MISC metadata.xml 895 BLAKE2B 1bc5b6431a2030a95949553a9b132b051c77fefa9833e853c1fc7baeea33a469ec2dd3abbb4dd5f539a2176af76cc503e0c3ee03ad4c095b5bee9fbf24ff3cb8 SHA512 c226019e5bd05ff4792821202d62bb052846ae46b298495b68aebf63c4b573461ddeca90d6d8b01982ee2e8fbbc4a4a53a6aa756f056738ab8e8240fe1433469
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch b/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch
new file mode 100644
index 000000000000..0d4015cabd78
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch
@@ -0,0 +1,30 @@
+From 2ddba09ea491ae5d18b074a2d1126d44c0a2b1f6 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 9 Feb 2021 22:26:14 +0100
+Subject: [PATCH] [Gentoo-specific] avoid pre-stripping files
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ adm/cmake/occt_defs_flags.cmake | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake
+index 5484c675..4e513ab5 100644
+--- a/adm/cmake/occt_defs_flags.cmake
++++ b/adm/cmake/occt_defs_flags.cmake
+@@ -137,12 +137,6 @@ elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+   set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+ endif()
+ 
+-# Optimize size of binaries
+-if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW)
+-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+-endif()
+-
+ if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
+   set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
+   set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
+-- 
+2.30.0
+
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch
new file mode 100644
index 000000000000..7e2bb1d7b2ab
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch
@@ -0,0 +1,31 @@
+From e69c42386239bcc08143607df12b8bb3f1ff14ba Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 24 Feb 2021 20:06:02 +0100
+Subject: [PATCH] adm/cmake/vtk.cmake: fix flow control nesting
+
+Fix an unbalanced nesting of flow control statements
+for >=cmake-3.20.0
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ adm/cmake/vtk.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake
+index c5692fd6..00b7ff4a 100644
+--- a/adm/cmake/vtk.cmake
++++ b/adm/cmake/vtk.cmake
+@@ -156,8 +156,8 @@ if (VTK_FOUND)
+             endif()
+           endif()
+         endif()
+-      endif()
+-    endforeach()
++      endforeach()
++    endif()
+   endif()
+ 
+   if (3RDPARTY_VTK_INCLUDE_DIRS)
+-- 
+2.30.1
+
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch
new file mode 100644
index 000000000000..aacb642019ff
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch
@@ -0,0 +1,41 @@
+From cefaa5bddedcb90a06d6ef8f0837a11619e5d87e Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 9 Feb 2021 20:58:43 +0100
+Subject: [PATCH] fix issue with cmake path variables
+
+Thanks to Fabio Rossi for reporting the issue.
+Upstream bug: https://tracker.dev.opencascade.org/view.php?id=32035
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ adm/templates/OpenCASCADEConfig.cmake.in | 14 +-------------
+ 1 file changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
+index 4937103b..db99a8d1 100644
+--- a/adm/templates/OpenCASCADEConfig.cmake.in
++++ b/adm/templates/OpenCASCADEConfig.cmake.in
+@@ -16,19 +16,7 @@ set (OpenCASCADE_MINOR_VERSION       "@OCC_VERSION_MINOR@")
+ set (OpenCASCADE_MAINTENANCE_VERSION "@OCC_VERSION_MAINTENANCE@")
+ set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
+ 
+-# Compute the installation prefix from this OpenCASCADEConfig.cmake file 
+-# location, by going up one level + one level if "cmake" + one level if "lib".
+-# This is made to support different locations of CMake files:
+-# - in UNIX style: $INSTALL_DIR/lib/cmake/opencascade-<version>
+-# - in Windows style: $INSTALL_DIR/cmake
+-get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
+-  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+-endif()
+-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$")
+-  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+-endif()
++set (OpenCASCADE_INSTALL_PREFIX "$ENV{CASROOT}")
+ 
+ # Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data
+ set (OpenCASCADE_BINARY_DIR   "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@")
+-- 
+2.30.0
+
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
index a6957289df15..2c5adfb7524f 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO:
@@ -16,7 +16,7 @@ SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/ta
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 # gl2ps
 IUSE="debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk"
 
@@ -25,7 +25,6 @@ REQUIRED_USE="
 	?? ( optimize tbb )
 "
 
-#	gl2ps? ( x11-libs/gl2ps )
 RDEPEND="
 	app-eselect/eselect-opencascade
 	dev-cpp/eigen
@@ -50,7 +49,10 @@ RDEPEND="
 		dev-qt/qtxml:5
 	)
 	tbb? ( dev-cpp/tbb )
-	vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
+	vtk? (
+		>=sci-libs/vtk-8.1.0[rendering]
+		<sci-libs/vtk-9
+	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -74,6 +76,9 @@ S="${WORKDIR}/occt-V${MY_PV}"
 PATCHES=(
 	"${FILESDIR}/${P}-find-qt.patch"
 	"${FILESDIR}/${P}-fix-install.patch"
+	"${FILESDIR}/${P}-fix-issue-with-cmake-path-variables.patch"
+	"${FILESDIR}/${P}-Gentoo-specific-avoid-pre-stripping-files.patch"
+	"${FILESDIR}/${P}-fix-flow-control-nesting.patch"
 )
 
 pkg_setup() {
@@ -84,8 +89,6 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	use java && java-pkg-opt-2_src_prepare
-	sed -e 's/\/lib\$/\/'$(get_libdir)'\$/' \
-		-i adm/templates/OpenCASCADEConfig.cmake.in || die
 }
 
 src_configure() {
@@ -97,18 +100,17 @@ src_configure() {
 		-DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${P}/ros"
 		-DINSTALL_DIR_DOC="/usr/share/doc/${PF}"
 		-DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
-#		-DINSTALL_DOC_Overview=$(usex doc)
 		-DINSTALL_SAMPLES=$(usex examples)
 		-DINSTALL_TEST_CASES=NO
 		-DUSE_D3D=no
 		-DUSE_FFMPEG=$(usex ffmpeg)
 		-DUSE_FREEIMAGE=$(usex freeimage)
-#		-DUSE_GL2PS=$(usex gl2ps)
 		-DUSE_GLES2=$(usex gles2)
 		-DUSE_TBB=$(usex tbb)
 		-DUSE_VTK=$(usex vtk)
 	)
 
+	use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
 	use examples && mycmakeargs+=( -DBUILD_SAMPLES_QT=$(usex qt5) )
 
 	cmake_src_configure
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index cd216ad42be5..1cdf55bdf802 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,6 +1,5 @@
 DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
 DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
 EBUILD p4est-2.2-r100.ebuild 2915 BLAKE2B 6e0ee7cf6d138405fd861e1e79f826b8c99687b27ec57038453c5c94c1828a638c879c08cdf2640d881e76c3f261b3d4f8104d71bf63e537f196deb1fe463310 SHA512 2b1dcfbc8e9d44d129bc84ac10a4c7df977cb358e9f61a82a73c194ab72fe00c199a124da259776c70cacb19565653fd3f7be6c71c5cf96f66ada9024444a4fa
-EBUILD p4est-2.2.ebuild 2840 BLAKE2B db998099af9ee8abce0db818860c1053bcaa29dbff49b41d1012ec1dbb346d0f55661476b9a79281042e653d65c47e3dd692cabdcd40bd2d13ffe380de3b638c SHA512 91b5ca7fac23bc37e0a88ee93988d056aa6b7b48d735ab97e7b8c254d03d3d7cd77e05fe1ad9c4063492162cbec07119480d40d69103ea9f9ae66278064dd558
 EBUILD p4est-9999.ebuild 2915 BLAKE2B 2ac4c1cfb81d43042c356a94633109f3b3dd0429985b896e60c92dcc945b4a68469a604cdf94900209aff4e38f26f99b5121c369dcca8c075503890284b570e1 SHA512 e7e16243bcbc9eb850509a64ddf9b40782e5403ecf41506fa4353e48263eef5edcd6839038f44b9dd4781f1053f6776b7996cd90253b175a09a2cdb853de0924
 MISC metadata.xml 932 BLAKE2B 25927e97d0092f9fbab6dd7c35f0b2d6b568f1a9790fb1d31917a42946cea1305f9b31aa7cf5773a2b1588b94aab482de2ebfb9aa867af14b8bba2765be2faea SHA512 9c3b0cc4f9f95cf8f4c7d0e250fbc2934e80563ac98b131031d5ba66122a47b9435027f452aeee2df0e917098c7f626513001a30f57952bfaaece21fc9dcc1c1
diff --git a/sci-libs/p4est/p4est-2.2.ebuild b/sci-libs/p4est/p4est-2.2.ebuild
deleted file mode 100644
index ea4cbc69d918..000000000000
--- a/sci-libs/p4est/p4est-2.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# The build system currently fails with everything newer than 1.11.
-WANT_AUTOMAKE=1.11
-
-inherit autotools toolchain-funcs eutils
-
-DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
-HOMEPAGE="http://www.p4est.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="
-		https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-# TODO petsc
-IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
-REQUIRED_USE="romio? ( mpi )"
-
-RDEPEND="
-	~sci-libs/libsc-${PV}[mpi=,openmp=,romio=,static-libs=,threads=]
-	dev-lang/lua:0=
-	sys-apps/util-linux
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi[romio=] )"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/automake:1.11
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
-		tc-has-openmp || \
-			die "Please select an openmp capable compiler like gcc[openmp]"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Inject libsc to get  all parts of the build system...
-	if ! [[ ${PV} = *9999* ]]; then
-		rmdir "${S}/sc" || die "rmdir failed"
-		mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
-	fi
-
-	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version
-
-	AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
-	eautoreconf
-
-	sed -i \
-		"s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \
-		"${S}"/configure || die "sed failed"
-
-	sed -i \
-		"s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
-		"${S}"/configure || die "sed failed"
-}
-
-src_configure() {
-	# avoid underlinkage
-	LDFLAGS="${LDFLAGS} -lsc"
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable mpi)
-		$(use_enable openmp)
-		$(use_enable romio mpiio)
-		$(use_enable static-libs static)
-		$(use_enable threads pthread)
-		$(use_enable vtk-binary)
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		--with-sc="${EPREFIX}/usr"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	use doc && dodoc -r doc/*
-
-	if use examples
-	then
-		docinto examples
-		dodoc -r example/*
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		# Remove compiled example binaries in case of -examples:
-		rm -r "${ED}"/usr/bin || die "rm failed"
-	fi
-
-	# Fix wrong installation paths:
-	dodir /usr/share/p4est
-	mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
-	mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
-	rmdir "${ED}"/etc/ || die "rmdir failed"
-}
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index c6db3ae2a12d..39404ff1b087 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -3,5 +3,5 @@ AUX pastix-5.2.2.22-nosmp-undefined-variable.patch 494 BLAKE2B 06a9e3933d0a181f5
 DIST pastix_5.2.2.22.tar.bz2 2664470 BLAKE2B b1fbd12bf2c882aa8fd2c4891a6890df4bdc4488cedca2a7861e676ec5678063927f2e4a4edc47aa7ca0422b283f8f012aa1032af7212fe39f4c55e7f0f7adc4 SHA512 15ecdb10b5229e40f744c1ad54be7cac6560cb92e90df1937c90ca7da290df6bdb6f24a1e1c54197731b9df3e0dcc0b9fa39750479fcf03a0c08c304c5b9df70
 DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
 EBUILD pastix-5.2.2.22-r1.ebuild 3653 BLAKE2B 2fde445d7fa06f9c7f38fd61d23550df25a3c5b414eb309c7b2a5ebaac6ff844052e8cf612ba5d6e308c970e6d2d5d317b52a62365bec4fecd2e70614595fbf5 SHA512 884c7d5eec941cc2fc55597a62d674ec239a62ea3d66ec9811671b2841dcb0723937298abc9599011fc431bc8cf2c27aea9ea396936e78edccd4e8d4c19d57bb
-EBUILD pastix-5.2.3.ebuild 3337 BLAKE2B 1d89f156e99b6a5d1fafeccfabe22d49b81fccd4d34229326627d3236f711fb2cf03e4024904d8270e0340e15af5ea29df54cc09146f7b53877cfae53d908639 SHA512 53dc6e0f18dfb4ce263fcab1b8d88338dd6eebb4eabd204c45d9d04fbab6e32870a0b1fb19140977a35c49156955b67a1e58166c527c7b284dd831c4cbce6675
+EBUILD pastix-5.2.3.ebuild 3335 BLAKE2B 93748a732327fb5c04ecfa1aa722f781da2c44afdad104be4d7248960e3a463f40ba41940c4ed40ea362834c353308df02ee3e412660e200115d7a912bd11547 SHA512 817fe4a38ddfdf1d6240a47f311f6a98931fc3c77e8562bc5091056155da22d3373c2bc55b0a4a6d877534e80a770c7320008329447633839f67c0e30ed79b6c
 MISC metadata.xml 1055 BLAKE2B 237a5db431f2c60ea448c9627f943e88a7fd50509884af078c1de5b9ed51317806d815cf8f8ad9c1f85272077438df2d8c76e26fa9a1c9133bb17f3b1cd056ed SHA512 42f9f1f03c4a2df46918ef461d814ca3c0e80e0fa5420327a45d6ca7ec87dd3f14ad0e5a4384b49aebae971578a425b475fa0e1ed6b73370afb743222765bfde
diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild
index 427056e89502..f304384adf9f 100644
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ b/sci-libs/pastix/pastix-5.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}.
 
 LICENSE="CeCILL-C"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi +smp starpu static-libs"
 
 RDEPEND="
diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index 43797b961cb4..d280d6749593 100644
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -5,5 +5,5 @@ AUX pgplot-libpng15.patch 374 BLAKE2B 975eed22e5f2c4ff7bd169224eee766b5438ad25dd
 AUX pgplot-makemake.patch 7901 BLAKE2B 65b6d9fa41667d95376530315269872a25fc9445753e0f7b57ebe02feb3bfbf8deb75e977c771a09c4bf7851e5a9d392c145916c054ebd5624309487a4756fad SHA512 a29bc78eb17397c8fc3a0ec0f8dcec28d5d3f1345b16b90c05aad6459c9b312b63d04e55882b99c47ab22e7b3e16ee3e437c684fb5f50a43aaecd5fc6915689a
 AUX pgplot-tk86.patch 1863 BLAKE2B 23abf5177049d19ce782ff68987689fe9e6cac0267bd664c681bb1bd94a11da1898ed6c639d0a3773d64f43502c588352304e593672940fdf83e42ac00219ab2 SHA512 32abe4409cc1b63bf807a3544c36c163c6278dbe3dfd50ce24c6c65da6e22c8d8c0992217bab44c3e3105a11a6cad9b721c1ed8efe6835b46686072f40b83468
 DIST pgplot522.tar.gz 1197397 BLAKE2B 9eafde628373abdbda7adeb365b107618197aa5884d16b27f42b20c7957efa9b09d64adbcbc311ec92b974427355f8410a35c3f12969d240e8e25f3a72cae82b SHA512 03a075c84506ead1d665a7105cd41c7cfbe19d12094cb36fb7459a0f6ee0df0638543b7eca92aaf80677984cc47a07b968f854db8eaa90ec605f78d89c615d1f
-EBUILD pgplot-5.2.2-r7.ebuild 4346 BLAKE2B 982b2bcf89e297515faeee32daca24196887678acbd593c3b79d1da7aab612ab5335d10fad649acdadbc81abcae9b5a0f59fd030de7508877acdce192852f0ac SHA512 11c7ed1c02b84d22f5b14be00fc28e20a6ccff136a60b35f7c1b7db7bf4b0eb31884c0a04bfb6cb939366b60d443de02791831b7f06fd894ead4edffbec18eaa
+EBUILD pgplot-5.2.2-r7.ebuild 4454 BLAKE2B df2e8e95be83c99e010ba1174334731943f5686bc7d4fd066b8a564a0d363690a7e1d09d2e18e55d9a1067d43fc3d7f3cf0cfb2d49a68779e62e73b6e75b247f SHA512 b64553222a0af73f20f36ecfb9254c8fbf57c0031299f0607c768577a244ee0e7d740da4ff8768241f5209241241dfc819aa3ec3e6920e68229a6c725bbc8c51
 MISC metadata.xml 622 BLAKE2B 666fe62f8627ba218e6b54badfc8fd497c4a166a9fbe6a5252461ef226beed6cb6bdf38f070563e86468e2fd617e30d9643646a918881912f555680ef1b2edc3 SHA512 09372d4c73ac5f4222ac4c47df1ff138bc1266740552b4592fc3765b5a6391f1dbadf58a5cfc0985eb6000709ab57a5bb3ecaf24cfe59213caaaaf70536227f7
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
index 43b17b8974b1..b1c5b83d6d54 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils fortran-2 toolchain-funcs
+inherit eutils fortran-2 flag-o-matic toolchain-funcs
 
 MY_P="${PN}${PV//.}"
 
@@ -78,6 +78,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# GCC 10 workaround
+	# bug #722190
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
 	./makemake . linux
 	# post makefile creation prefix hack
 	sed -i -e "s|/usr|${EPREFIX}/usr|g" makefile || die
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index d6ca2eaf358d..7af9f529f57c 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -6,6 +6,5 @@ AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbf
 AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3
 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4
 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
-EBUILD plplot-5.15.0-r1.ebuild 7251 BLAKE2B 466a30c45f93c2824ce782c41184ad6667d6944be5ef0eca19b9d6d7d71b3d1de68cfe1c0ea06baffd4ed9bceeb700b40586c116e82b6b17835095cbbcef64bd SHA512 35cd4cab3ecf0cf8a35848110b3e54750692eda9b27937951f6781aeca32e59a45048d67abc47741e71a0004220e43c37516dcd0f040339ed382d8cbcdbac215
 EBUILD plplot-5.15.0-r100.ebuild 7402 BLAKE2B fd9b5db1e3c87ef4ec0695262c19173285922f15a9b76620f458457e788a7334fec088a8d6fceb2a41d8f573317344b321dee3e6d0e97b8d429d10444d6b6035 SHA512 c06d0f15302fac5cd36b32bcd194774651f6a806765cadf06437063c31d22754fef9fb0502f23b93b880af8774b03584a62b175de5d2a5d2a86b3dda394f24d6
 MISC metadata.xml 1420 BLAKE2B dc6f6e5f857b508989abed1b3769f42b7fb6de047d6b42f2614fa0c6cbabf9e7924185c94f1e5296cb34b3b51db1d580594add1592d26ed30239510b83ca1a42 SHA512 9af98d19c793ce18e7ee8c6f1a4346455008c907905c2fab8551d074429b8feab8b86161dca63943066bf0b238646e3b5d3d0161a57d313208ae1b155e6a212d
diff --git a/sci-libs/plplot/plplot-5.15.0-r1.ebuild b/sci-libs/plplot/plplot-5.15.0-r1.ebuild
deleted file mode 100644
index fe1ce68f2a09..000000000000
--- a/sci-libs/plplot/plplot-5.15.0-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER=3.0-gtk3
-FORTRAN_NEEDED=fortran
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit cmake-utils flag-o-matic fortran-2 java-pkg-opt-2 python-single-r1 toolchain-funcs virtualx wxwidgets
-
-DESCRIPTION="Multi-language scientific plotting library"
-HOMEPAGE="http://plplot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/14" # SONAME of libplplot.so
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf
-	png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( dynamic )
-	test? ( latex )
-	tk? ( tcl )
-"
-
-RESTRICT="
-	!test? ( test )
-	octave? ( test )
-"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:0=[svg?,X] )
-	gd? ( media-libs/gd:2=[jpeg?,png?] )
-	java? ( >=virtual/jre-1.5:* )
-	latex? (
-		app-text/ghostscript-gpl
-		virtual/latex-base
-	)
-	lua? ( dev-lang/lua:0= )
-	ocaml? (
-		dev-lang/ocaml
-		dev-ml/camlidl
-		cairo? ( dev-ml/cairo-ocaml[gtk] )
-	)
-	octave? ( sci-mathematics/octave:0= )
-	pdf? ( media-libs/libharu:0= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			qt5? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	qhull? ( media-libs/qhull:0= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtprintsupport:5
-	)
-	shapefile? ( sci-libs/shapelib:0= )
-	tcl? (
-		dev-lang/tcl:0=
-		dev-tcltk/itcl:0=
-		tk? (
-			dev-lang/tk:0=
-			dev-tcltk/itk
-		)
-	)
-	truetype? (
-		media-fonts/freefont
-		media-libs/lasi:0=
-		gd? ( media-libs/gd:2=[truetype] )
-	)
-	wxwidgets? (
-		x11-libs/wxGTK:${WX_GTK_VER}=[X]
-		x11-libs/agg:0=[truetype?]
-	)
-	X? (
-		x11-libs/libX11:0=
-		x11-libs/libXau:0=
-		x11-libs/libXdmcp:0=
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? (
-		>=virtual/jdk-1.5
-		dev-lang/swig
-	)
-	ocaml? ( dev-ml/findlib )
-	octave? ( >=dev-lang/swig-3.0.12 )
-	python? ( dev-lang/swig )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.6-python.patch
-
-	# Fedora patches
-	"${FILESDIR}"/${PN}-5.15.0-ocaml-rpath.patch
-	"${FILESDIR}"/${PN}-5.15.0-ieee.patch
-	"${FILESDIR}"/${PN}-5.15.0-multiarch.patch
-	"${FILESDIR}"/${PN}-5.15.0-ocaml.patch
-	"${FILESDIR}"/${PN}-5.12.0-safe-string.patch
-	"${FILESDIR}"/${PN}-5.15.0-QPainterPath-include.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	use wxwidgets && need-wxwidgets unicode
-	cmake-utils_src_prepare
-
-	# avoid installing license
-	sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
-
-	# prexify hard-coded /usr/include in cmake modules
-	sed -i \
-		-e "s:/usr/include:${EPREFIX}/usr/include:g" \
-		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:/usr/share:${EPREFIX}/usr/share:g" \
-		cmake/modules/*.cmake || die
-
-	# change default install directories for doc and examples
-	local f
-	while IFS="" read -d $'\0' -r f; do
-		sed -i -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' "${f}" || die
-	done < <(find "${S}" -name CMakeLists.txt -print0)
-
-	sed -i \
-		-e 's:${VERSION}::g' \
-		-e "s:doc/\${PACKAGE}:doc/${PF}:" \
-		cmake/modules/instdirs.cmake || die
-
-	java-utils-2_src_prepare
-}
-
-src_configure() {
-	# - don't build doc, it pulls in a whole stack of horrible dependencies
-	# - Bindings:
-	#   * Ada is a mess in Gentoo, don't use
-	#   * D has been removed from Gentoo, don't use
-	#   * Qt4 has been disabled, as it is deprecated and unsupported upstream
-	# - DPLD_* drivers need to use ON/OFF instead of the usex defaults yes/no, as
-	#   the testsuite performs a string comparison to determine which tests to run
-
-	# Octave bindings now require C++11 support, #609980
-	append-cxxflags -std=c++11
-
-	local mycmakeargs=(
-		# The build system does not honour CMAKE_INSTALL_LIBDIR as a
-		# relative dir, which is against the spirit of GNUInstallDirs, #610066
-		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
-
-		## Features
-		-DBUILD_DOC=OFF
-		-DBUILD_DOX_DOC=OFF
-		-DUSE_RPATH=OFF
-		-DPREBUILT_DOC=$(usex doc)
-		-DHAVE_SHAPELIB=$(usex shapefile)
-		-DWITH_FREETYPE=$(usex truetype)
-		-DPL_HAVE_PTHREAD=$(usex threads)
-		-DPL_HAVE_QHULL=$(usex qhull)
-		-DPLPLOT_USE_QT5=$(usex qt5)
-
-		## Tests
-		-DBUILD_TEST=$(usex test)
-
-		## Bindings
-		-DENABLE_ada=OFF
-		-DENABLE_d=OFF
-		-DENABLE_ocaml=$(usex ocaml)
-		-DENABLE_pyqt4=OFF
-		-DENABLE_cxx=$(usex cxx)
-		-DENABLE_DYNDRIVERS=$(usex dynamic)
-		-DENABLE_fortran=$(usex fortran)
-		-DENABLE_java=$(usex java)
-		-DENABLE_lua=$(usex lua)
-		-DENABLE_octave=$(usex octave)
-		-DENABLE_python=$(usex python)
-		-DENABLE_qt=$(usex qt5)
-		-DENABLE_tcl=$(usex tcl)
-		-DENABLE_itcl=$(usex tcl)
-		-DENABLE_tk=$(usex tk)
-		-DENABLE_itk=$(usex tk)
-		-DENABLE_wxwidgets=$(usex wxwidgets)
-
-		## Drivers
-		-DPLD_cgm=OFF
-		-DPLD_gif=OFF
-		-DPLD_jpeg=OFF
-		-DPLD_plmeta=OFF
-		-DPLD_png=OFF
-		-DPLD_pstex=OFF
-		-DPLD_wxpng=OFF
-		-DPLD_mem=ON
-		-DPLD_null=ON
-		-DPLD_wingcc=ON
-		# Cairo
-		$(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON")
-		-DPLD_epscairo=$(usex cairo ON OFF)
-		-DPLD_extcairo=$(usex cairo ON OFF)
-		-DPLD_memcairo=$(usex cairo ON OFF)
-		-DPLD_pdfcairo=$(usex cairo ON OFF)
-		-DPLD_pngcairo=$(usex cairo ON OFF)
-		-DPLD_pscairo=$(usex cairo ON OFF)
-		-DPLD_svgcairo=$(usex cairo ON OFF)
-		-DPLD_xcairo=$(usex cairo ON OFF)
-		# LaTeX
-		-DPLD_ps=$(usex latex ON OFF)
-		# PDF
-		-DPLD_pdf=$(usex pdf ON OFF)
-		# Qt
-		-DPLD_aqt=$(usex qt5 ON OFF)
-		-DPLD_bmpqt=$(usex qt5 ON OFF)
-		-DPLD_epsqt=$(usex qt5 ON OFF)
-		-DPLD_extqt=$(usex qt5 ON OFF)
-		-DPLD_jpgqt=$(usex qt5 ON OFF)
-		-DPLD_memqt=$(usex qt5 ON OFF)
-		-DPLD_pdfqt=$(usex qt5 ON OFF)
-		-DPLD_pngqt=$(usex qt5 ON OFF)
-		-DPLD_ppmqt=$(usex qt5 ON OFF)
-		-DPLD_qtwidget=$(usex qt5 ON OFF)
-		-DPLD_svgqt=$(usex qt5 ON OFF)
-		-DPLD_tiffqt=$(usex qt5 ON OFF)
-		# SVG
-		-DPLD_svg=$(usex svg ON OFF)
-		# Tk
-		-DPLD_ntk=$(usex tk ON OFF)
-		-DPLD_tk=$(usex tk ON OFF)
-		-DPLD_tkwin=$(usex tk ON OFF)
-		# Truetype
-		-DPLD_psttf=$(usex truetype ON OFF)
-		# Wx
-		-DPLD_wxwidgets=$(usex wxwidgets ON OFF)
-		# X
-		-DPLD_xfig=$(usex X ON OFF)
-		-DPLD_xwin=$(usex X ON OFF)
-	)
-
-	use truetype && mycmakeargs+=(
-		-DPL_FREETYPE_FONT_PATH="${EPREFIX}"/usr/share/fonts/freefont
-	)
-	use shapefile && mycmakeargs+=(
-		-DSHAPELIB_INCLUDE_DIR="${EPREFIX}"/usr/include/libshp
-	)
-	use ocaml && mycmakeargs+=(
-		-DOCAML_INSTALL_DIR="$(ocamlc -where)"
-	)
-	use python && mycmakeargs+=(
-		-DENABLE_pyqt5=$(usex qt5)
-	)
-
-	cmake-utils_src_configure
-
-	# clean up bloated pkg-config files (help linking properly on prefix)
-	sed -i \
-		-e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \
-		-e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \
-		-e "s:${LDFLAGS}::g" \
-		"${BUILD_DIR}"/pkgcfg/*pc || die
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		rm -r "${ED%/}"/usr/share/doc/${PF}/examples || die
-	fi
-
-	if use java; then
-		java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
-		java-pkg_regso "${EPREFIX}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so
-	fi
-}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 825a280982e1..49517aa5637b 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,9 +1,7 @@
-DIST proj-7.0.1.tar.gz 5312488 BLAKE2B 421a3b5324ab7c952a8b45036e6db2c8cfc1fd2db3d050d2e644cb1c1c78fe669a20c6d8428debf75233a975a989e3ad2ce6a83cd944825641ffd3107cc44a02 SHA512 034d1b916980c80fe9f8e67d2897814e611920af3e852f152fcd9e3fc4ec8cbc39bbd8f8296949a3c3f5e6708bb9d84e61c4cba9c01476a3888448135e97dc33
-DIST proj-7.1.1.tar.gz 5509592 BLAKE2B f745df3ef276b8a3213aff5ed92890f9c8f4b82a61a1e55fd013925befb018f01d7e60264dc996ea5aa9630b3ee3c149a7f37ca87d89c9df2f29367d4b26b19b SHA512 9f092318835006ffe864bb54ac456054196d30ff367546b41f1e49a5f1cc99a4b0b19e3d09c0ce7a336d1562df5784805560e7f725380411b1013a6baf90cf56
 DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
+DIST proj-8.0.0.tar.gz 5722153 BLAKE2B a79626b62f5a9bdfb5395b32fee889e9ed003679926d499c169f896c5a8cd9495173cf156f4c780522dd31f79b71928d1c2add790176fb452c7267210c380816 SHA512 4195fd26075787465e578f86398e224957cddba743e2b090b65c877a6bfbc91b3b36d5acf9883bd2fc215a5aebd0b9f3188ee0e0926aa86d37f9753042fb3d75
 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.0.1.ebuild 1208 BLAKE2B 9512e12fc93cbd4e17be6c8e3f222e7e1a62f5b73d7e1233bc7701c429f9d5877837a6eba03587a4e8bea26eaa921a4dd4686adf0412200e932de14b90878364 SHA512 9e6b0a2343b2cce7b0cb00063380f0df9012b746c56d9a7cf12b3c0f1d23bd53e0e3071c0e0b01b21d6a816de54ad52afb391a31ac2a1e83d02445c674d17bf8
-EBUILD proj-7.1.1.ebuild 1213 BLAKE2B 96a64b1e5f39515d4caa5c7cbc46c01297b0220b6f85aa5dee6f52f4a69505fd3495d9a01aadb97f661a6d51709df523709dde99c1d12ecaed27abc8c91a06d8 SHA512 861d267b0f82d55223b569b1655af44c65d687d5f8a9c86e519f4bcbce17f6c9c7dab35a3ab9b51a7cb7b3690df1d001b9ec3dec4768301d44a6231540978cc9
 EBUILD proj-7.2.1.ebuild 1209 BLAKE2B ac70d263aab2b700dcfc7f8564b81607a31c3387ed6f39770fb7583c063428680a8ef5d0dcba6e786fbce847d2791bb8285b983f662a161b171a6755b2e72a16 SHA512 ce8e0b02dad6ce6de1620328fd6e65c478eafcc81dd55b3551a4452425840d4226fa43c02f7310a3ed9779ddf1d14e00f83a35a459869dcb18eae45c29cffa94
-MISC metadata.xml 374 BLAKE2B d6d3066273af3324fb5ebf6b0d3b0f49c4e78a88c7cbd7689e9d9ec6841033a03bb5f219c62be88320b2fee6c712079e54a5368125d7a33b301ae1263aec98e9 SHA512 34124c295beb66129e72963474508d26f1482919447bde9ed3af89f2123dffcf98037760aab2b589cc0a5dad23183fa0c28ecc3c4322a1ddfb926fb4ba52c8ad
+EBUILD proj-8.0.0.ebuild 1432 BLAKE2B 575e8654d3d429d2a52b2c47aec7ed086367aaaf5f0b2f1898997b0ba43a6badd8a37092105cc1fa22bdd4744ec8ddc5c8e9ad2475b3df2a51a12b13000b8bdd SHA512 e82e8453b99c349caec34eb2e474cc433af88f35fb47ee451561d757b86361e509bfd84879472f7b7b8eb628440cf8bb4b3c559d9201d9b85b99d85fd8c069e0
+MISC metadata.xml 449 BLAKE2B e29aeb78ff28d336ffbe19913702d656299183b1657c09deaf12f3f8c263867e9facbef4ee626f78e667f3f6ad5cebb0c490e84247fe784bc3fbf68c5418692e SHA512 a1b14653a4388d42e3e08ddabd3734e5987bf41092dd699788ed1a4b8819da831f602b48dd3ad64dbb9fc1bbc0005623456744a6b5a3fcd3313d844bf3bc6886
diff --git a/sci-libs/proj/metadata.xml b/sci-libs/proj/metadata.xml
index 434e5e60f525..e36b505c0918 100644
--- a/sci-libs/proj/metadata.xml
+++ b/sci-libs/proj/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="europe">Install the PROJ collection of European grids and init-files</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">OSGeo/PROJ</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/proj/proj-7.0.1.ebuild b/sci-libs/proj/proj-7.0.1.ebuild
deleted file mode 100644
index e7f70f68ee19..000000000000
--- a/sci-libs/proj/proj-7.0.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
-EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
-
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj4.org/"
-SRC_URI="
-	https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${DATUMGRID}
-	europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
-"
-
-LICENSE="MIT"
-SLOT="0/19"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="curl europe static-libs test +tiff"
-REQUIRED_USE="test? ( !europe )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	curl? ( net-misc/curl )
-	tiff? ( media-libs/tiff )
-"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"/data || die
-	mv README README.DATA || die
-	unpack ${DATUMGRID}
-	use europe && unpack ${EUROPE_DATUMGRID}
-}
-
-src_configure() {
-	econf \
-		$(use_with curl) \
-		$(use_enable static-libs static) \
-		$(use_enable tiff)
-}
-
-src_install() {
-	default
-	cd data || die
-	dodoc README.{DATA,DATUMGRID}
-	use europe && dodoc README.EUROPE
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/proj/proj-7.1.1.ebuild b/sci-libs/proj/proj-8.0.0.ebuild
index 7709f61d762f..c6a3966a2684 100644
--- a/sci-libs/proj/proj-7.1.1.ebuild
+++ b/sci-libs/proj/proj-8.0.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit cmake
+
 DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
 EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
 
@@ -15,9 +17,9 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-SLOT="0/19"
+SLOT="0/22"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="curl europe static-libs test +tiff"
+IUSE="curl europe test +tiff"
 REQUIRED_USE="test? ( !europe )"
 
 RESTRICT="!test? ( test )"
@@ -27,27 +29,40 @@ RDEPEND="
 	curl? ( net-misc/curl )
 	tiff? ( media-libs/tiff )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
 
 src_unpack() {
 	unpack ${P}.tar.gz
+
 	cd "${S}"/data || die
 	mv README README.DATA || die
+
 	unpack ${DATUMGRID}
 	use europe && unpack ${EUROPE_DATUMGRID}
 }
 
 src_configure() {
-	econf \
-		$(use_with curl) \
-		$(use_enable static-libs static) \
-		$(use_enable tiff)
+	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() {
-	default
+	cmake_src_install
+
 	cd data || die
 	dodoc README.{DATA,DATUMGRID}
 	use europe && dodoc README.EUROPE
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/sci-libs/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index d293f3e16786..8a5f790829fd 100644
--- a/sci-libs/qrupdate/Manifest
+++ b/sci-libs/qrupdate/Manifest
@@ -1,5 +1,5 @@
 AUX qrupdate-1.1.1-Makefiles.patch 2350 BLAKE2B 9d1e21e0118f1fd47699c94e242fb53df5e6fa26b85a56bd13718ce409ade64e618a858fab780a2c927f4ef988273a883872d5ecca57b62b90b16f132dce5bae SHA512 40945650175668ab5155c330a5e6be20059e90d8bb5f47173d14b385710703693b1c5fb77bc01f08328e064301e2fc0c90438a9fac7f6f1222e6b35835137682
 AUX qrupdate-1.1.2-install.patch 1263 BLAKE2B e9d18cda34264374e9456a2c3ed5f849bafe8ef461e1577e1cda4b04695f2c8ef03d0ef47d2d9ba6a56db7251b8a37cafc061a47b751e7947a94f1479df2a2d0 SHA512 3274d57666b2f453f50f0b5244c9f3dd5ea29a2fc05233dedfd43940945744a675d3bbd50e3a1aef7ec8613df16f97c05e0983c711db63364f8b45125e246bb8
 DIST qrupdate-1.1.2.tar.gz 49734 BLAKE2B e5bf9fb39f6c97ee4b4084e664f929d95bee407f9f11ea4dc6da2bdb06d1694eddc1f2f52e5f673f22d097d11addb293b6dc0fd7c30d09acc84dd050fd1d72e9 SHA512 cc4e466ea91958e15c66be82b0c4c8ad813fbe4643f21259a9cb3ca8e0a411dd764bb2397ece848a7045f322d30316801d1540c4ebf7912030bef6995b44917c
-EBUILD qrupdate-1.1.2-r1.ebuild 1277 BLAKE2B ab4919a083f5ed78ca8cff239a80231cea6ebfdd0c1db89bd2dd516858cb69bef3364c8444133eff6d08b7b5316cd483e9a68865d7debdc4c011d615f6c009d4 SHA512 cf1417278be63c8211df93a1706debffd5f7f1b6d47acd5c90f5336c6e2bab8b2e5da8e37e1cf64ba794289c7a360aef1090fb95e50108d040f0b154ca1b05e1
+EBUILD qrupdate-1.1.2-r1.ebuild 1386 BLAKE2B b8fcc8d906a957da8c5ad11cef3a22b8d0d8794f2ca92e757cf2a37805967e3bcf2cafaa138a0af825aadcd402039808900d53bcb6ee8741a7734e25723b9b74 SHA512 02406718772f29e69727e7b92472d831297554506b70fc8676d8f2758aee9b2968ad621b9a6043c67900fc263107b60a8595ce9b7d83d6591312ebcc21e859c0
 MISC metadata.xml 331 BLAKE2B 7cb0302f290048b91c8777184229fa2f0af2647f5cd1d4f9f88f7afc0168b4c51a4ab01b08cfb695be567838f1a6025cf47e2e43df67d434cf676c47c537cc3e SHA512 59818fe84d5fc4b73f29b45e14152e52d7d4afeaef9200e862e2414213b8c05bd63119befabc3a68b67b0aced7e60ab0fe3f7e657966a58a44d751571c4828df
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
index 12576510a909..556683f3f338 100644
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils fortran-2 multilib versionator toolchain-funcs
+inherit eutils fortran-2 flag-o-matic multilib versionator toolchain-funcs
 
 DESCRIPTION="Library for updating of QR and Cholesky decompositions"
 HOMEPAGE="https://sourceforge.net/projects/qrupdate"
@@ -22,6 +22,11 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.1.1-Makefiles.patch \
 		"${FILESDIR}"/${PN}-1.1.2-install.patch
+
+	# GCC 10 workaround
+	# bug #741524
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
 	sed -i Makeconf \
 		-e "s:gfortran:$(tc-getFC):g" \
 		-e "s:FFLAGS=.*:FFLAGS=${FFLAGS}:" \
diff --git a/sci-libs/scikits/Manifest b/sci-libs/scikits/Manifest
deleted file mode 100644
index bc217078da82..000000000000
--- a/sci-libs/scikits/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scikits.example-0.1.tar.gz 2401 BLAKE2B 4c67adb2e74be9c94d68e99bf44017eb75c054608b69045523c5cfeee18edb01384640e8ed3cba4765bc181e7dfb9a2e70d1a97ad2b6176d2df7112172adce55 SHA512 9e5534a9f12f5a11e7f9d7c3d4f16cdbfa34293b29882e6bc9ec597b6e7ac306cc65e2b197da8c0bfc8e319b01db31f34b06018b5420c3ad68e8cc3f490259e1
-EBUILD scikits-0.1-r2.ebuild 754 BLAKE2B b1b37ecbe91fa38dc19f4eab86796eeca0b36fc61dc8bfa74c5969398493c3ba23bebe177672f9bc20d8b15b6e24b279a861449e3bc8c67aa3b1df72b9032351 SHA512 e16a61bcd9a7ffa45bcbb715269920cc2ef317e4d9160358d6f787fe3e66ceac97ca9c18dab89c3f418d6aef06804c4659bec7fa4b8bf0b83012e010a1721646
-MISC metadata.xml 341 BLAKE2B 0fabc7259ef405a99a200a7150ae82fb8435cccccd845ad17ac4ba782097dac4f3b8bd12476268102b7c222a258caa97c613e623d294a46015b051f777370355 SHA512 15f7eceb096968dda17a2c584857aeb53f445101c8caee162a0004891c5c3d9f96c621996ce6f1f75ff3a47a319c460f9e05918abfec363d4db79877cc172991
diff --git a/sci-libs/scikits/metadata.xml b/sci-libs/scikits/metadata.xml
deleted file mode 100644
index 932faaabfe47..000000000000
--- a/sci-libs/scikits/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">scikits.example</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-libs/scikits/scikits-0.1-r2.ebuild b/sci-libs/scikits/scikits-0.1-r2.ebuild
deleted file mode 100644
index b170e75892b8..000000000000
--- a/sci-libs/scikits/scikits-0.1-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-r1
-
-DESCRIPTION="Common files for python scikits"
-HOMEPAGE="http://projects.scipy.org/scipy/scikits"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}.example/${PN}.example-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	python_moduleinto scikits
-	python_foreach_impl python_domodule scikits.example*/scikits/__init__.py
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r scikits.example*/*
-	fi
-}
diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest
index ac2c1d68ffcf..9a691e791d4a 100644
--- a/sci-libs/stellarsolver/Manifest
+++ b/sci-libs/stellarsolver/Manifest
@@ -1,3 +1,3 @@
 DIST stellarsolver-1.5.tar.gz 9113711 BLAKE2B 3fe4489df71bbfa4d75f02a8a0ea26202165a7fe321b626fedceccce52122502be0040a47347abdd4e52b3c3402451f10d79b8258db53d6da029bd20dd02c279 SHA512 eb1d8b8b94a4a4d165b49cd55ffef5e0ae32e7da1bb6b3e061421ba1a5a27ec30438b789c5c56bad22b512de9bf091aeb24b991c9a146cc852b22a9ca97cf3ce
-EBUILD stellarsolver-1.5.ebuild 606 BLAKE2B 2b6ed213e1b19613ea92a6b8527581a331bd9d25f6f081abf4e2f2183ddff9ca7e6157353d151fdd17297da637e4512e79ce90200560cb195351d4fc21829743 SHA512 8e8dc2e66d4b4185d51ac6875534c1e1cc56ebffa6d2038f76a854eea79f18df9f4f60490eaa52d5d0acefe202bd9300aca72d9e1cf7803db5c593277a32f97a
+EBUILD stellarsolver-1.5.ebuild 604 BLAKE2B 204afb23c920a8dc249ba0430422fe56f472704bd805d166ad1a36420a858d035de9107dc37da10ec8608e352020f28bff7171ac478469cf7b13b4b68f9abce8 SHA512 cdccdd3a8112c43fb3110ce69099205ee5a729111a4fe4c1a01973296c59b9b5c7a03dd2cd5858d190c288dd8904ea8f378fecfb05bc02fb1f36974078614d22
 MISC metadata.xml 463 BLAKE2B 8dd851c4028e50249e1a8cc248cda30667219515ae3eff692bdf60accfdd410072e06f112567592534628b4c27a228e2ff609324a2fb8b0f249eb9d27bbdfca5 SHA512 1214fa61273b29819b5746c2076230ce71c994621a8a0e195afcf72f4f7f60e945978f3ad123a3282c593ca1202435ea606fe06a7c20a8775500e13b95de4634
diff --git a/sci-libs/stellarsolver/stellarsolver-1.5.ebuild b/sci-libs/stellarsolver/stellarsolver-1.5.ebuild
index ff0cde6a60c7..f3665c5dfa9f 100644
--- a/sci-libs/stellarsolver/stellarsolver-1.5.ebuild
+++ b/sci-libs/stellarsolver/stellarsolver-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 36b6cd67110e..ddbf24376d15 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -3,5 +3,5 @@ AUX sundials-5.2.0-fix-license-install-path.patch 468 BLAKE2B e2c9963f3c528cbe84
 DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
 DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
 EBUILD sundials-3.2.1.ebuild 2122 BLAKE2B 14b9cb8eaef1bb2a8dd749a5be242f7a026a040d316828aee9f6aab481df29fb5102862bacfbe7fd83c4ba74b10f633b3e76a754dcb2eccf7ae7d634d1886ff6 SHA512 e076b7de37302cd96f6c4b01931e02d4627b69514c69b1a8275373ac11196a6b19602a96f56c1be527ee1ed501dd4fd0df2517bda45d9721f15a6ba05e3fe606
-EBUILD sundials-5.2.0.ebuild 2090 BLAKE2B a02305f8d4c2cd72d2bac2cbceb687f3b87e5067cfc06cd6501d83da25e51081c95dabd4831bff0b16010298eb66f042cc0602307071e0c31b5ddd802fc515de SHA512 ace0de38a616892fa1dc9d91ec7dbd37a2278d7418345f4e7bdb61f455ca79a83e1e4a4c8dcea832cd7e1877590a02faf24f210e1369ce810a16f80904116cf8
+EBUILD sundials-5.2.0.ebuild 2181 BLAKE2B 105f2ddbd0d5ac00d4bce9a7b797eb8ea6cb9ee34f53db9a5e311cb2a8e1c6ce07f1c148f709db7dc08fdca506be63603dc81f84e28f879d5f4f764fa05d86f4 SHA512 a55f211ab31db02a3a43e3a2d0b8c6ed05a9a3f8fc91039c2b3f531d1ea87a9d80342d9a06819dec430db43f7bc240d9b53a61d63eb39c9c26ea1b00ee2b0e10
 MISC metadata.xml 1059 BLAKE2B 48ccadfac9b7ea4203334ffdadaa76ab3164273835c727e76085db3a5afc179404eb21c74aad77ceb368397377afb0efa27d798c849eab2ffc35153cd4fe7588 SHA512 47da8b9edc993c480a045642ad2746ff6180e54e1ad368823fd81b0d217e72c31394d7575cb4c2d5e5cfea065dffb01751bc8b1088f0f1a6feaaea15c2c7fb8f
diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild
index aa14eeb5320d..3d60a524cc2c 100644
--- a/sci-libs/sundials/sundials-5.2.0.ebuild
+++ b/sci-libs/sundials/sundials-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD="77 90"
 # if FFLAGS and FCFLAGS are set then should be equal
 
-inherit cmake fortran-2 toolchain-funcs
+inherit cmake fortran-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="Suite of nonlinear solvers"
 HOMEPAGE="https://computation.llnl.gov/projects/sundials"
@@ -38,6 +38,13 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	# bug #707240
+	append-cflags -fcommon
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	mycmakeargs+=(
 		-DBUILD_SHARED_LIBS=ON
diff --git a/sci-libs/udunits/Manifest b/sci-libs/udunits/Manifest
index d192bec64b46..3968cb16531e 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1,6 +1,3 @@
-AUX udunits-2.1.15-autotools.patch 1850 BLAKE2B dc1e48bff93de3764f488bd276b46fe7061399468c621ffb249d50218bceefb52d6e3d59284544173d9b4e340fa2d0d13c2fb04a850ad2bb8faf8f51df622f99 SHA512 bd4371d0ac9c54d2d4e8a3a0e908b38350bcb729c364de6da93da2fa580abd0f7e48cb3b902a67a9ab84fcff043dad554529cbfb5b26f48eb1f8ba87c43236db
-DIST udunits-2.1.24.tar.gz 1059344 BLAKE2B a28f13e886d4db875078ffee7577f4e17712987b0d87df586e037c1f9a0986ad206ea8bf648920269890d458a6b65250c896f4ea9ec2e8e7bfbe6e1692967530 SHA512 71af2aa62300dd6a2c58318d75cb9182433a208e28446725334a3a80195ebdae77aebe66e6c4e12b53b675501cf3295de2960d1e8beb1496a547d4eed0cde98e
 DIST udunits-2.2.28.tar.gz 1224503 BLAKE2B 64d64c609cfbada505c5e163a1e757cd25c09dd75865f255ec8f3bfc26dfafa0f2b9b9997602cb91f80ae81e1fa74bfc0f2d9f3d2d29f880c64e8785e5cbb1a8 SHA512 86146d489e1d472723e059fb15a5dd697a67568ffb5cdba17d191eb304c018bffffea708a73cce50a6c87ad33b387e5ee6653377ae0ebe9986117dfd41e9a5a1
-EBUILD udunits-2.1.24-r1.ebuild 982 BLAKE2B 5a66df0b348ed6fa1710ea9e0bcdbf86c417823069bc43c69c5770fdc9ec1eb2bac633e6b745f8a8e191ef5e1ed6acf9ca533ce8fc66610a693a50803b8255a7 SHA512 f010b9473546525158f03e4c01be1cee97cb975efd61e6c062e6bc637ded915ebe02e99c1c1d647b84102b52ee9e27188b976d74e64ad22a444a18c428335d79
-EBUILD udunits-2.2.28.ebuild 762 BLAKE2B 2a61a82a852129dd67f777c4472737011081cc647313b9113155ea0adc888b348e4b53393e44499e4c19aeeb9fadd5f6675f9828a6575209156d3b2f93e742c3 SHA512 8ecab523a21dcc8dec7da6fa7d872b7d3d07d1bbfb24ef60cdb53759ca0f38dbdc9a760254af7421716a1d31a10316793ffa87b8460cd401676c9eecc0a7601e
+EBUILD udunits-2.2.28.ebuild 759 BLAKE2B 6da67644d82b2474f848903cd8413ed2ca982786b412ec065a6c12864ac67302aa2292b5b433fb0a4f2eb3b7895152e6160af661e364ff966698919fe3e3997a SHA512 40b0e8b832c09c9c60525cc18cd912b919fe4aa9a45545df00694105ef8133b1a85ffb8bfb24c2f11cb4d1894ec66f028b5926aa6942ae386ba1c20b6361188f
 MISC metadata.xml 535 BLAKE2B b8b216bb211bfbd90c60f71248d5a390eb6d21bcceb13d077e128a764484b2c30a0aa7378323539acea5ff9b4c756fc51942e5988698d2de095169c7763e4316 SHA512 dcbd5fd4a61a2780193ff4875f973ec1237be15f98bc047c2f1603b1d780183b1869086ed8ab91f5832722c04f0e1d26d17cf3e60883d77e79b65f68dbc47ae9
diff --git a/sci-libs/udunits/files/udunits-2.1.15-autotools.patch b/sci-libs/udunits/files/udunits-2.1.15-autotools.patch
deleted file mode 100644
index 31c67656a815..000000000000
--- a/sci-libs/udunits/files/udunits-2.1.15-autotools.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 728e587..3c84c1b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,11 +6,11 @@
- #
- ## Process this file with automake to produce Makefile.in
- if COND_EXPAT
--    SUBDIRS		= expat lib prog
-+    SUBDIRS		= lib prog
- else
-     SUBDIRS		= lib prog
- endif
--DIST_SUBDIRS		= expat lib prog test
-+DIST_SUBDIRS		= lib prog test
- info_TEXINFOS		= udunits2.texi
- udunits2_TEXINFOS	= success.texi failure.texi make.texi
- EXTRA_DIST = \
-diff --git a/configure.ac b/configure.ac
-index 097f6eb..091e673 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13,7 +13,7 @@ AC_INIT(UDUNITS, 2.1.15, support-udunits@unidata.ucar.edu)
- AC_CONFIG_SRCDIR([lib/converter.c])
- AC_CONFIG_AUX_DIR([.])
- AM_INIT_AUTOMAKE([foreign subdir-objects])
--AC_CONFIG_HEADERS([config.h expat/expat_config.h])
-+AC_CONFIG_HEADERS([config.h])
- 
- CFLAGS_COVERAGE=''
- LIBS_COVERAGE=''
-@@ -37,7 +37,7 @@ AC_ARG_ENABLE([debug],
-     CFLAGS="-g${CFLAGS:+ $CFLAGS}"
-     debug=true ;;
-   no)
--    CFLAGS="-O${CFLAGS:+ $CFLAGS}"
-+    CFLAGS="${CFLAGS:+ $CFLAGS}"
-     debug=false ;;
-   *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
- esac],
-@@ -110,20 +110,12 @@ AM_CONDITIONAL([HAVE_CUNIT], [test "$LD_CUNIT"])
- AC_C_CONST
- AC_TYPE_SIZE_T
- 
--# Needed for the Expat subpackage:
--AC_C_BIGENDIAN([byteorder=4321], [byteorder=1234])
--AC_DEFINE_UNQUOTED([BYTEORDER], [$byteorder],
--    [Define to 4321 for big-endian and 1234 for little-endian])
--AC_DEFINE([XML_CONTEXT_BYTES], 1024,
--    [How much context to retain around the current parse point.])
--
- # Checks for library functions.
- AC_CHECK_FUNCS([floor memmove memset modf pow strcasecmp strdup strpbrk])
- 
- AC_PROG_LIBTOOL
- 
- AC_CONFIG_FILES([Makefile
--		 expat/Makefile
-                  lib/Makefile
-                  lib/xmlFailures/Makefile
-                  lib/xmlSuccesses/Makefile
diff --git a/sci-libs/udunits/udunits-2.1.24-r1.ebuild b/sci-libs/udunits/udunits-2.1.24-r1.ebuild
deleted file mode 100644
index 4ab59d99c971..000000000000
--- a/sci-libs/udunits/udunits-2.1.24-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils fortran-2
-
-DESCRIPTION="Library for manipulating units of physical quantities"
-HOMEPAGE="https://www.unidata.ucar.edu/software/udunits/"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="UCAR-Unidata"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# respect user's flags, compile with system libexpat
-	epatch "${FILESDIR}"/${PN}-2.1.15-autotools.patch
-	rm -rf expat || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	doinfo udunits2.info prog/udunits2prog.info
-	dodoc CHANGE_LOG ANNOUNCEMENT
-	dodoc udunits2.pdf prog/udunits2prog.pdf
-	docinto html
-	dodoc udunits2.html prog/udunits2prog.html
-}
diff --git a/sci-libs/udunits/udunits-2.2.28.ebuild b/sci-libs/udunits/udunits-2.2.28.ebuild
index 9db08c0372bf..d52e8de33216 100644
--- a/sci-libs/udunits/udunits-2.2.28.ebuild
+++ b/sci-libs/udunits/udunits-2.2.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
 
 LICENSE="UCAR-BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/expat"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 61d38c558b4a..89eb52f24c60 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -1,23 +1,10 @@
-AUX 197.patch 1238 BLAKE2B c268890151942f8f5a285897d37626431b79963f7e0271d220be3de6903fd6557aebb706ad58f7e340acd0e331d49a957743f23a3b201f3d3c53a8e7a52da969 SHA512 6a65808d3b7e0e9ac928249949d2f807e420e871d35da58344baf822eab74395a91fa8d90efe5d4b649b1851c7eb0281e89037cb869e0bc6bc2ab6a2164bb604
-DIST votca-tools-1.4.1.tar.gz 103152 BLAKE2B 73dc726ea899ceb65d0406f3795f1df79a6184d65e50e95be3768678a2d006b75e487dbe3df5d44be4b5ba3899aeeb01ed63b51755bd46b546b017ccc0406d38 SHA512 19165be7c9903cb664051a6556f9fd689b02af71156f040960008e8d74e4a32adfe283c67eb7b53c8bdc6ae6f72516ad0b674d9f2b3354ca50f082b1651dafef
-DIST votca-tools-1.4.tar.gz 103102 BLAKE2B a398d20b628148ec753ee1e59353e272dbda93848be11ecccaf2153385ebcac62c7b819c4ef0b9b1a7cfc7dfd85136d042726cc996af79a4dad64375f5aa9f6c SHA512 7c4bf2e2ba8cf795f03879138787db3875f48db56b88394c98b18cef0ae90e636d8aafff42eb62a408df06a91583e37e59b33440e83de9f4338295e9ccfc9be5
 DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B ab68b38241d2c065939cf0b2e08603eaaccf613454bb64056c3d3d03472501e2079408ce856fbcc7243d51d035acec0b52c9767e2d687234296c7858f1a46fa4 SHA512 c8fe4baee0f4586dbe1a9f5b7c33b7d6b16ef0ebc35b50febfdcb049b09cd150dec3a5e9b98b43430db66f866dd01c1776f6777f01d227246c9d7b7ca879ea72
-DIST votca-tools-1.5.tar.gz 129464 BLAKE2B 2ab72758cc7c9bed5a49c924f7f0a93dc562a43cefbcc84f393656fd6c6b165152114eab48131db4d42008472d01103b5abba6ae0cf12779fe1ffacbcd65dc11 SHA512 fdee932c861742961937bdb88a1ace8caa4041c38ce80ece3b27e8a4b624248c21bf9be63b157565d1114047d3895c8b959f95b4fa49225c0cd1b2e708ef54f0
-DIST votca-tools-1.6.1.tar.gz 110141 BLAKE2B 948908a3aedb360d63aaf4077de366fb8dad7b5c97cd4532458a67e90e6e0271ba4ef30a23be264f426a1f860708592360982f283346d0a4788111719d3a8ee9 SHA512 e7dc03df46670f83139c0283824a630d8bec6cda5da156bc09e35e3c373f1cc65359ddb912e6bf19431a588acc5569ad57000045083d155fcc15c93980cfd26e
 DIST votca-tools-1.6.2.tar.gz 109808 BLAKE2B 1eebb2950004ec5b0a0494904b35f5dc539a5a93e36d40ffdfba911632e48ef9431bfd8d6305c0b5f516c70cff8156976efa6d216ae061a77e018047e543beee SHA512 03139591e934ae97b6c0ddcd0fa9480b4b9d28c05882489b9067b9519727a97a1589a645c3d9ad959d65fa622e3845e8d1d5141f210e2704907d7d6f0bff2abc
-DIST votca-tools-1.6.3.tar.gz 109937 BLAKE2B 4cc6a0f061c3455ff326eada36c5b66e31aedbc6aac297db42a128940c17d81dbd41e47c7c9af012ab5b24a7fe9f12575bf3563fd566d62492d1c79f1887db02 SHA512 2bc780f7b852e0d63ef1a6ff697c75aa67666121b8192a965442b62167fe33f69b0d4c18fb6b255326d02ba3cffd02c6af8f5d67364fafd9de597897ab30e349
 DIST votca-tools-1.6.4.tar.gz 109929 BLAKE2B 8bc55fcd0a021002f11d412440a369a169c3c62ae5978781010de0a05502e43ed1ccbe5066e3d46ac8ef6fd0c1471baca70d35f6468ccbfd480dc0fa6f2b5047 SHA512 7a334071086e755960a3bd938c1baa1979c4cc9cd8f865af00540fa45365bf1c3153ffb8a5a5948618c47ebafcda9ecc62850d44ea06b7f35ac4587bd423439a
 DIST votca-tools-1.6.tar.gz 109824 BLAKE2B e030899e210e0f3030d43796a468ea20a573fe7ee62fbfde53e2e6865a9c0657d92ed06ddc44ebfa1c37c6142c865e97380e00570070351d75c403ead6fcfd19 SHA512 0159bc10066e05da8ba0f70e3c70d8cb4cd7b07ebd58edff1ccfeb86504af855eb5cae7184200e5c8ee3a3f6b6b85ec46a045f00dc8e681073ae8fdbbfc3965a
-DIST votca-tools-1.6_rc1.tar.gz 128577 BLAKE2B d9270739c00f945ff4af24e45a529e73ff0da596956791991f03b5586134d16b5fec077b3859dcd685de96a334f419f5f82ede7df60614482c9fddc61a01ca8d SHA512 42b0eae148bb93293ac16e193d2595aaa850dcee0dcaab1f6cf0ca8e36a95a1719a03243d421fbfb1034c81baf2ef294768a86530f0d69b59862df95846241ed
-EBUILD votca-tools-1.4.1.ebuild 1173 BLAKE2B 452b971cfbdf9d9dbb92588582a8a7d459d450f2a97c9b6fc6d7a17995d3c753bc994a3c5bf69253e3957ad1921c3633a4ba1559bb1374f26dec03506ebfb0b6 SHA512 f2b9da544fb94e9d070d446fd51a7c82f6a600863c4f95b7e188c05aa32c6b2318c7bff5d5c515a6db635014cbd6285f560a5e8f59ee74c3f8a3cbe56a4a958d
-EBUILD votca-tools-1.4.ebuild 1146 BLAKE2B d79c8ac1f7d87cb0bebb695ea8203d10d9b31149106d0e662756e5418efb2fb10039576b2336897278602723d75c30d3fc1c701544777f08df08493929396f53 SHA512 cf2b14e11099541a0caf293def4b85140db624e1c42d1059fef0aad0f1ef4b8507a982df723820ea5f2a97bd461cbc3a21e03e69e179383e7e995159358a89ae
 EBUILD votca-tools-1.5.1.ebuild 1094 BLAKE2B cc03fda70f27211323b8b0c2d33020dcd4aedb972316d2a1ee6a04a29b414fd44f935ac31fcfd014b4de77e6f0b29136caeaca061ebdbbd3144080b01f723680 SHA512 fee06ff16f050880612fa4aa981dd56b85c437eaf4204f39489a2c19bc8dbb555fed94f2a39732083ac487923db391fccbccb4d3954ee33c822b9cfb5efd1db8
-EBUILD votca-tools-1.5.ebuild 1093 BLAKE2B 660f6d829bcd4dfb2452aa14d2b6c0e83a8040c521c384da7fee212b81c302c1e4fe0501055c35258ec472d4ab471a188122511bdaef74bbdd2953a98135f7e8 SHA512 5bb2f35360e2cf95eee2d459b4d63209c6f717ea5b1bed43840588cef9224df54d3b08d09bdf844c47e5f47f6e7d11551cc73d153c50ba1481c4e8d2505e8ed1
-EBUILD votca-tools-1.6.1.ebuild 793 BLAKE2B 02619b72e9e90ee754d3d9bf555eccd03c2368ef8310da9e4af7d9696b06c31cd78dbe60135896ff6deddc3764105f928e3fa317e2c37df92a430d8c9bea5629 SHA512 79eaa407e2ad83084996614c012ad36c22a6724a7c290512a754190a4ea03951794cc9a4f021f7159bf81030b29aa47fa4032278ee69b7d5a05fab2eec23b8e0
-EBUILD votca-tools-1.6.2.ebuild 781 BLAKE2B 55f7f405ce7d2c20c1569c3f11f7b2817721860fa8dfb97c27ab6407287fd175bf64d13ad200fc0563ba9b988f5a77d565994ce340498957442003a93cdb6826 SHA512 c0ef05e4042683f3f8773899f35c25080dd01403381a7436026f30a730437f0aa321a485cd81b355120a8427c90db4d4bf21c571d42fe6a3525c3e583a82da62
-EBUILD votca-tools-1.6.3.ebuild 781 BLAKE2B 55f7f405ce7d2c20c1569c3f11f7b2817721860fa8dfb97c27ab6407287fd175bf64d13ad200fc0563ba9b988f5a77d565994ce340498957442003a93cdb6826 SHA512 c0ef05e4042683f3f8773899f35c25080dd01403381a7436026f30a730437f0aa321a485cd81b355120a8427c90db4d4bf21c571d42fe6a3525c3e583a82da62
-EBUILD votca-tools-1.6.4.ebuild 781 BLAKE2B 55f7f405ce7d2c20c1569c3f11f7b2817721860fa8dfb97c27ab6407287fd175bf64d13ad200fc0563ba9b988f5a77d565994ce340498957442003a93cdb6826 SHA512 c0ef05e4042683f3f8773899f35c25080dd01403381a7436026f30a730437f0aa321a485cd81b355120a8427c90db4d4bf21c571d42fe6a3525c3e583a82da62
+EBUILD votca-tools-1.6.2.ebuild 779 BLAKE2B 41bed9d7eec490310d705c56a0cbd4b6d05f782ccd7fd8d5c445bd0a0c31061e4adb5d306043878d33f5892ae5b9430cce07e56a0050a29cf3faf5b49e9c9a54 SHA512 57ec416136cf2e081d5f25563b95069c8a5f49230696570a3d7ef94c36b5230cc3fc2b2c63d2c34f76ead351b64de042bfd6bb92bb92729b3f294480eb9bd676
+EBUILD votca-tools-1.6.4.ebuild 751 BLAKE2B 93b51e936ac594d3cc8a0c8f5d4051ca6d5c573ea4250cfc0d74a5cf92d5177d0e498c2d4719ce5ef2dab324a2325a7eb710ae093387abab38acf7a28c22f78d SHA512 7f2cc20a627410d51c9e5a48b3690b87de4a64deb044c21fd8b9bf27498b4f2d695af57d810f8025feb09e6787a737087ec05d3f3cd46b846659538237d610ff
 EBUILD votca-tools-1.6.ebuild 791 BLAKE2B 230efde0d632b6eb4d92bcac6211903fe659fb5fc1bb7e36a44c708cfde6d0b06992b17574ab80ab8a32f46637550277e42856c565f9382ece2c479d0db7a238 SHA512 8df3be66989c8cee86badd3e3b67ef80b11748c92a46cef11b9eb8a34a569ac9a33b3cf643bb4cbcf67b4b39f1875caa7cc2858a27e7541dac6e179e96b55a53
-EBUILD votca-tools-1.6_rc1.ebuild 830 BLAKE2B 25b8879a63f19110b30bf48f53a1726c6a27e1f09f53b58d3f2892e5d4dbab787497f0141f62041fd7aa35b78b9955ed94d438623e937015952b284be5725f39 SHA512 f27a45391cd9001c9325182bb680cd09e15058393d3759f51643fa4fa030dbb4bbbaf346ac37436aa7fb74025b0dbebf649df6fdb344869994fbbc4472948c3f
-EBUILD votca-tools-9999.ebuild 781 BLAKE2B 55f7f405ce7d2c20c1569c3f11f7b2817721860fa8dfb97c27ab6407287fd175bf64d13ad200fc0563ba9b988f5a77d565994ce340498957442003a93cdb6826 SHA512 c0ef05e4042683f3f8773899f35c25080dd01403381a7436026f30a730437f0aa321a485cd81b355120a8427c90db4d4bf21c571d42fe6a3525c3e583a82da62
+EBUILD votca-tools-9999.ebuild 751 BLAKE2B 93b51e936ac594d3cc8a0c8f5d4051ca6d5c573ea4250cfc0d74a5cf92d5177d0e498c2d4719ce5ef2dab324a2325a7eb710ae093387abab38acf7a28c22f78d SHA512 7f2cc20a627410d51c9e5a48b3690b87de4a64deb044c21fd8b9bf27498b4f2d695af57d810f8025feb09e6787a737087ec05d3f3cd46b846659538237d610ff
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/files/197.patch b/sci-libs/votca-tools/files/197.patch
deleted file mode 100644
index a0e4245c7635..000000000000
--- a/sci-libs/votca-tools/files/197.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 32c497808d3ff52a25cd0367c602f57577d56352 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Thu, 5 Dec 2019 07:16:02 -0700
-Subject: [PATCH] VOTCA_TOOLSConfig.cmake.in: only add VOTCA::votca_compare
- once
-
----
- src/libtools/VOTCA_TOOLSConfig.cmake.in | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtools/VOTCA_TOOLSConfig.cmake.in b/src/libtools/VOTCA_TOOLSConfig.cmake.in
-index c69c0426..b129913f 100644
---- a/src/libtools/VOTCA_TOOLSConfig.cmake.in
-+++ b/src/libtools/VOTCA_TOOLSConfig.cmake.in
-@@ -2,8 +2,10 @@ include(CMakeFindDependencyMacro)
- find_dependency(Eigen3 NO_MODULE)
- find_dependency(Boost 1.53.0 REQUIRED COMPONENTS program_options)
- include("${CMAKE_CURRENT_LIST_DIR}/VOTCA_TOOLS_Targets.cmake")
--add_executable(VOTCA::votca_compare IMPORTED)
--set_property(TARGET VOTCA::votca_compare PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_BINDIR@/votca_compare")
-+if(NOT TARGET VOTCA::votca_compare)
-+  add_executable(VOTCA::votca_compare IMPORTED)
-+  set_property(TARGET VOTCA::votca_compare PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_BINDIR@/votca_compare")
-+endif()
- if(@MKL_FOUND@)
-   if(NOT TARGET MKL::MKL)
-     add_library(MKL::MKL UNKNOWN IMPORTED)
diff --git a/sci-libs/votca-tools/votca-tools-1.4.1.ebuild b/sci-libs/votca-tools/votca-tools-1.4.1.ebuild
deleted file mode 100644
index 087be457b5c6..000000000000
--- a/sci-libs/votca-tools/votca-tools-1.4.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils eutils multilib
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#votca-}"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc +fftw +gsl sqlite"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	fftw? ( sci-libs/fftw:3.0 )
-	gsl? ( sci-libs/gsl )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.7.6.1[dot] )
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
-
-DOCS=( NOTICE )
-
-src_configure() {
-	mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_GSL=$(usex '!gsl')
-		-DWITH_FFTW=$(usex fftw)
-		-DWITH_SQLITE3=$(usex sqlite)
-		-DWITH_RC_FILES=OFF
-		-DLIB=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use doc; then
-		cd "${CMAKE_BUILD_DIR}"
-		cmake-utils_src_make html
-		dodoc -r share/doc/html
-	fi
-}
diff --git a/sci-libs/votca-tools/votca-tools-1.4.ebuild b/sci-libs/votca-tools/votca-tools-1.4.ebuild
deleted file mode 100644
index eedb6ccd9dec..000000000000
--- a/sci-libs/votca-tools/votca-tools-1.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils eutils multilib
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc +fftw +gsl sqlite"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	fftw? ( sci-libs/fftw:3.0 )
-	gsl? ( sci-libs/gsl )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.7.6.1[dot] )
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
-
-DOCS=( NOTICE )
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_GSL=$(usex gsl)
-		-DWITH_FFTW=$(usex fftw)
-		-DWITH_SQLITE3=$(usex sqlite)
-		-DWITH_RC_FILES=OFF
-		-DLIB=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use doc; then
-		cd "${CMAKE_BUILD_DIR}"
-		cmake-utils_src_make html
-		dodoc -r share/doc/html
-	fi
-}
diff --git a/sci-libs/votca-tools/votca-tools-1.5.ebuild b/sci-libs/votca-tools/votca-tools-1.5.ebuild
deleted file mode 100644
index 4701fe391d39..000000000000
--- a/sci-libs/votca-tools/votca-tools-1.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils eutils multilib
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc +fftw sqlite"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-cpp/eigen-3.3
-	fftw? ( sci-libs/fftw:3.0 )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.7.6.1[dot] )
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
-
-DOCS=( NOTICE )
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_FFTW=$(usex fftw)
-		-DWITH_SQLITE3=$(usex sqlite)
-		-DWITH_RC_FILES=OFF
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use doc; then
-		cd "${CMAKE_BUILD_DIR}"
-		cmake-utils_src_make html
-		dodoc -r share/doc/html
-	fi
-}
diff --git a/sci-libs/votca-tools/votca-tools-1.6.1.ebuild b/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
deleted file mode 100644
index bc03e7abcd6a..000000000000
--- a/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils eutils multilib
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-cpp/eigen-3.3
-	sci-libs/fftw:3.0"
-
-DEPEND="${RDEPEND}
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
-
-DOCS=( NOTICE )
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_RC_FILES=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/votca-tools/votca-tools-1.6.2.ebuild b/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
index ba77bc97616b..251300265923 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
@@ -9,7 +9,7 @@ inherit cmake eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.6.3.ebuild b/sci-libs/votca-tools/votca-tools-1.6.3.ebuild
deleted file mode 100644
index ba77bc97616b..000000000000
--- a/sci-libs/votca-tools/votca-tools-1.6.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake eutils multilib
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-cpp/eigen-3.3
-	sci-libs/fftw:3.0"
-
-DEPEND="${RDEPEND}
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
-
-DOCS=( NOTICE )
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_RC_FILES=OFF
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/votca-tools/votca-tools-1.6.4.ebuild b/sci-libs/votca-tools/votca-tools-1.6.4.ebuild
index ba77bc97616b..21ffc1d3bbaf 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.4.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.4.ebuild
@@ -3,40 +3,40 @@
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="ninja"
+inherit cmake
 
-inherit cmake eutils multilib
-
-if [ "${PV}" != "9999" ]; then
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	inherit git-r3
+else
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
 fi
 
 DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
+HOMEPAGE="https://www.votca.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
+	>=dev-cpp/eigen-3.3
 	dev-libs/boost:=
 	dev-libs/expat
-	>=dev-cpp/eigen-3.3
-	sci-libs/fftw:3.0"
-
-DEPEND="${RDEPEND}
+	sci-libs/fftw:3.0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DOCS=( NOTICE )
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_RC_FILES=OFF
 	)
 	cmake_src_configure
diff --git a/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild b/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
deleted file mode 100644
index eee887d01e48..000000000000
--- a/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils eutils multilib
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-cpp/eigen-3.3
-	sci-libs/fftw:3.0"
-
-DEPEND="${RDEPEND}
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
-
-DOCS=( NOTICE )
-
-PATCHES=( "${FILESDIR}/197.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_RC_FILES=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index ba77bc97616b..21ffc1d3bbaf 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -3,40 +3,40 @@
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="ninja"
+inherit cmake
 
-inherit cmake eutils multilib
-
-if [ "${PV}" != "9999" ]; then
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	inherit git-r3
+else
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
 fi
 
 DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
+HOMEPAGE="https://www.votca.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
+	>=dev-cpp/eigen-3.3
 	dev-libs/boost:=
 	dev-libs/expat
-	>=dev-cpp/eigen-3.3
-	sci-libs/fftw:3.0"
-
-DEPEND="${RDEPEND}
+	sci-libs/fftw:3.0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DOCS=( NOTICE )
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_RC_FILES=OFF
 	)
 	cmake_src_configure
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 9bc180e998e4..d1b6b5ce7abb 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 9700 BLAKE2B 51c9282960ee7a10abefecfa69ebe6674b5e09372db86db3bbeb57b9f689cb9d1480ceb0f81b851f567a4d512bc973f8206f04a2253d0c32b4ab0c693d584f19 SHA512 62480910f60c8ec9a4e78cdd0ecabfaebdb2935c44aded72bb99ba8ae5d95ba82df7705dbb225c208b10767dcc9a5d93e1486f26574cd1985b1df2853ff1305f
+EBUILD vtk-8.2.0-r1.ebuild 9707 BLAKE2B 272839618db0aa08fc2c0ed6cf5e703d9876190f1e3625a1a6d161eed050dc246c044224ac9a044ac8c6b45fa1960d5972ece53f9205f8533faf7c23bfc094cf SHA512 19baa307c08a2ad9137ce5c8ba8f5e7f407a12da0575d80232e653070679da88e6a8cded31f50107d247465b0784f68e4a75abdb7f28249dd293dbe729127455
 EBUILD vtk-8.2.0.ebuild 9414 BLAKE2B 903df17af4520e573fee1d3368a119e70c28964b6e0c3d3bdccaa2e4bae3f87a11747d3eb165ec3447ba6b3e6f37aebf49e7e9826445d5bdfc52bee0d3d8dcbd SHA512 99d9a843e0b93a97f62ac1632dbb3979a8d2c02d553bdee8ae6e49fd6e686431583c82b20460a432c2361b5dd2b5309f1861e560ed6a2aa7b1192bbfe7862d3b
 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 b3c0061ee4e6..12dba470d8a1 100644
--- a/sci-libs/vtk/vtk-8.2.0-r1.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi
 	odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
 	video_cards_nvidia views web +X xdmf2"
diff --git a/sci-libs/xdmf2/Manifest b/sci-libs/xdmf2/Manifest
index 1dc1a7205d22..ba22d3ec6ab3 100644
--- a/sci-libs/xdmf2/Manifest
+++ b/sci-libs/xdmf2/Manifest
@@ -2,5 +2,5 @@ AUX xdmf2-1.0_p141226-cannot-find-hdf5-bug-591302.patch 1675 BLAKE2B f1a2674d987
 AUX xdmf2-1.0_p141226-cmake-3.12.patch 422 BLAKE2B 904de870ce6e7cb9aaa4454dbecd47447048eee08e7826869e09e7f294570e0dd235f011ccc775a1c4369bb4e6e890d8279c2102ce1c85f8488815c185be891e SHA512 e9fbf5caeffcccd12d9112cc4afc2485cea89105743d69483c08e931e84cb5d48facf67017b49c20a9c0f3087dbac974fa6eb2b0b76714ad207c1bbb20fd9518
 AUX xdmf2-1.0_p141226-module.patch 452 BLAKE2B 1611edbdf962ba25b72dab702044b7c7299abe5d92757c333827f08eb643fd17661739a4c0f7c0e759c516d9eeba794733145bdb03ef6779d1a9ef6e315fc5db SHA512 9a9e05001f1d8ea8250a7bb9231a43e8cceeface61fb125330b6255a1ba452650a80cb6592a69fdecc04212752c0d1fa195151b13c88262c40a36ca566a33dcd
 DIST xdmf2-1.0_p141226.tar.xz 267096 BLAKE2B 230ed73cc0521f04ff519c0050559ccf3837b915a196336de4b439cf05cae02220270a81290a6aac70e04095695b853e7de35613fba39cef6a90e93e6c99a3f9 SHA512 031b947ccd942c39cb40504e939f03bc9e3190ae1a7baf8325809decf70a040e860b43d5bc9debfcf2f3838f5f0d7a9c77c92561c89fc0d632306e140b136db9
-EBUILD xdmf2-1.0_p141226-r4.ebuild 1157 BLAKE2B 885458fae20420a493700308c7202d322bf0386f122a883bb819cfbf354572a79000debdaa3f54b2d9c7456bc89dca363766c3f0396ebf4ee0fcce0abe09f6f4 SHA512 a8dfc99e35d20c39412c6a6770b0bea351baa86e69405217251254f56b68518b3bb3f7eda099870a182651c4a67292d55e7d39048a2dc3bf6e3f9cc06ae8e682
+EBUILD xdmf2-1.0_p141226-r4.ebuild 1164 BLAKE2B 0d0641977281062054e281bb3509f48bf65c4954a610a679329bb8a7758592b014193fb7d48df145615f14699a647bfa7151c90fbe88e9f8287cedd42f2447ea SHA512 2d851f34991949e0a40365bc921c12fc6cbc18fb8ede9e243431cccd2b2388d4917686605682b4276f6a395ae481942b132fd5fd24707990fd5c147c13838b58
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild
index 36177a862d6a..dcb07730f55c 100644
--- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild
+++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="VTK"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
commit	d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree	cf61513204d97974179580065e85df5c8009087c /sci-libs
parent	463397cf1e064185110fe57c568d73f99a06f5d1 (diff)