gentoo resync : 25.04.2020

86 files changed, 628 insertions, 3307 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index fe78b3cf8cd0..4e703a1c8e0a 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/brial/Manifest b/sci-libs/brial/Manifest
index 31a2bfb2bbe3..957ab7326ff0 100644
--- a/sci-libs/brial/Manifest
+++ b/sci-libs/brial/Manifest
@@ -1,3 +1,3 @@
 DIST brial-1.2.8.tar.bz2 1228732 BLAKE2B f9bdfc9416381f3436c555861806a7ea4680e706729b6de9c2b06ea2908090b87b745fe5ce2d94ba9d5832a78067e4848f8ef113b7d8dc22557b6d95b7dad707 SHA512 a94acba140d976dd070b5214c537fb3dba89fc2309addc566b8f0a031328f2d4c2bb3c38c2cb5565c7ff2ca0c5f7f56ca120899d15c768887d3b61a18b3e05be
-EBUILD brial-1.2.8.ebuild 981 BLAKE2B 1afbbc177eac3082e2ed4ffaeb56e62d53067897e26be76f381be19384528cee71f8183ff0d50a146cc3f65d8f7b3b0c54cb99ddcec9c8bcc446fea5ece4fb34 SHA512 71614bcf0bf367288ae14e91b84a6ab4c9dc203ea208f837139590c84ace60e0e74928f16d83a4fa73206d28ba23ff7d1e2dd8d4ff0e8d691882b828831c4f9d
+EBUILD brial-1.2.8.ebuild 979 BLAKE2B 1c72e16b99e8f3512b3b16bb4c30525c09772e7702029f43a3b1ad10b7e1d218cf72af004003b867eb486b0731d924ddd1de5edc66eb5f1b28e3f1da924ea596 SHA512 65aa634cb876a4ac84fc04ac33c66157d8c8dd727b88a2018c935be54adebfa4fa9d77ff352933e6731e30c1352b62ff1b68d5b436a823fe9d2e8b0c58983c40
 MISC metadata.xml 1046 BLAKE2B 34c6f471ca6fbc4538cf3a2dc71bd19d4201656f326166b2589be3126f73f5ff34d190c2ff42154a067457a9da6f05067e782c9dc340357895ca016be6983183 SHA512 550a191f11f7812c363d419e8bed69fdd70e69b3a94e6fba838be9bc04050977edaab34ab0c0ef9c589e6478cdf2d40ba631983f6a2f411e51b9f3964bb48db5
diff --git a/sci-libs/brial/brial-1.2.8.ebuild b/sci-libs/brial/brial-1.2.8.ebuild
index 8949ea5ef31b..69b0340dc6fe 100644
--- a/sci-libs/brial/brial-1.2.8.ebuild
+++ b/sci-libs/brial/brial-1.2.8.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 ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index f2633613ce59..e56c3d7fe4cd 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,3 +1,3 @@
 DIST cartopy-0.18.0_beta1.tar.gz 14215372 BLAKE2B 5bb1e98f18fdf57c0459202bfe77d4e4a476a3008e2f21a77cf643711cc3c438626915c31ee48886e980466f952985503987e3ed571295e2beb6c12754b382c4 SHA512 95d3bd87e57bea89eb2c25d6a709285ba59fb0f994abc3b37faf29b272b73647d0bc8979a25b1480f48bb55c957f4183ac3c3ad49b830ce686e931227c797abe
-EBUILD cartopy-0.18.0_beta1.ebuild 1662 BLAKE2B 89c8c5c01c35b087b53f482bcdba0486b41d5de7d3a0a1abec623c287ca65b92d53c33a1766c532b1be34071c4bb38940cbcf2e80509fafbb2b01c5fc10e5ea7 SHA512 30e66e5d966dec99a83603f2447d3c9db054e45a54e55427df29f81b9348ff6772e9bd351f7f0a070b69c5d6b09c0eef0d1ec4109ecea23e9354e526f04f466a
+EBUILD cartopy-0.18.0_beta1.ebuild 1666 BLAKE2B c6dce73d39a0d0278e00362fa7475048e0e64061f2fe02a66863972e1782a9ebe09d24a76cb4f4d86349675d73603a064df38e9c6a7c43122bbeef625334ffcb SHA512 4206796d8def5cc9bf36f260ea5df748af6fe04b6ce24d777cd409b8b4d41255b15a15c5d4a5a20888a833ee50330ca86ac703ddf82183985d91ff96f4697b0d
 MISC metadata.xml 602 BLAKE2B 92e179b5503c84c6e567e7adb48917ca6140a7c04a0f5613b5aa3a9c19623d61abed95c325b41ca0d5a99b046c2891511796de49c3117c4ce9c969069bb2c5f0 SHA512 8677cb5685dee0b5868c1b14ffc13ac93e3b26ab741ceb684c7c48caf02f159a7a6613402e0396b9b0bc256c39b6446cbb7779521324447d96ed524fb8ca664d
diff --git a/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild b/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild
index 01048dc6aca8..0be07b470778 100644
--- a/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 virtualx
 
 MY_PV=${PV/_beta/b}
diff --git a/sci-libs/cddlib/Manifest b/sci-libs/cddlib/Manifest
index c117673df379..79a9f0b72419 100644
--- a/sci-libs/cddlib/Manifest
+++ b/sci-libs/cddlib/Manifest
@@ -1,11 +1,3 @@
-AUX cdd_both_reps.c 6439 BLAKE2B bc370bafb19869bd72c2926dda0c9216a4fc768f60fd1ca01404d87880de23fad738846fb69b08ed38870df481d1af9d2faefd2b97ecb24bfa80c84c27c9e5d1 SHA512 5aaf99344a823f908ffb54dc5fa153a865f11c7a4fdcde8773627de794a55f376f78f8cc19e40f6e62aceeec2d855aedcf43b0d332dc3c7231356a43b6a6715e
-AUX cddlib-094g-add-cdd_both_reps-binary.patch 1210 BLAKE2B f0e8c1cae6cb108b3a77a5ab629550115acf21320fc0b288ff86f1ccb9df617ee4caaf20349270d27f66d965b94fad8b0a2f18ba344bb5b6e384554c3aa0060f SHA512 c69c6d2ebbfbf132a287032ac1470fcce0c0d1e000dd96501f271ff200034567056d3948626023722c83082289f40122b0eacf35d10d2497f36ab226a9316348
-AUX cddlib-094h-add-cdd_both_reps-binary.patch 1601 BLAKE2B 9d4d3784a758bb9b6d156550cd56b6e1b39fb3b82e5002344c3c3d8025ca6f3b57201a414cf98f3fec9a88b8268ff4427a6bc2ba96e91df06f6618faaf4573d7 SHA512 ccd75d42aa3bb1f753197fd3be7a6561f0bf419396cfbd42a6072b9d27955c5d80eff71622c6b54b26ed6cbe03544ae3bf61e0773c5630f1ce964845e71f7015
-AUX cddlib-094h-enforce-no-gmp.patch 1155 BLAKE2B e2111bd137f5f85c964023f63fe3b9da8bf0c5b5915051422faed4246d240006c87dd05de214a6f13f2ce4a7d1f804168d90020d32080ad121386d7207d37d4c SHA512 113f4d9cf812c46663a87e1c22c56e41717ac93b1e022f99ad011917cf96cd25ada7670e3270a40f3b9dbdf8e88e6cefe9fcc03971f0cf17488c9a59a1612de6
 DIST cddlib-0.94j.tar.gz 1364746 BLAKE2B 60e81fccf8abd8d60fb7261d1d2d61b7ad2b60285e7dfa760905e2cb5b01f1570c27920728c12fc6994135e4b29ba8e1709066ddf2e2eff00f8f48b093ebd43e SHA512 b82d5e06538a29143a79f7ba7287a1784292e28f086071041e500fd81387a30c3fca6fae9049752f57b62d50b385d73681276d42d24941e3a43893da00452ea6
-DIST cddlib-094g.tar.gz 1383388 BLAKE2B c26f201f0369a931d672b192d6fab775210d2758e980cf867cf64f34d2ff3b23d862942507ae497c37723cdfe0c7beb55fe5d6cbe02349f576349579adbd4166 SHA512 e1053c6e34f79add53b2880c7664f9c20c0a6de636aa5de4c6a9dfc4d1d241221601c37d15e1833bcd5b1162512c3fbaed4046f771bc0a1e5753b713d6840b77
-DIST cddlib-094h.tar.gz 1678116 BLAKE2B 619e26745c04338d97fb4ce2997c23a16017ed19e14dda24c9ef90b84253d5540361b4ccd68eafb65b6380cff95b58e9ec2bf587643e71084cd47ed87bdffbc9 SHA512 22160c88832b78dd568b58c1e097e4c6006f82580f1114a3ef03fc10bde98132337d5b555306b58b65aac6fea1534d9e09725907808c969de16c2dfc75f80204
-EBUILD cddlib-094g.ebuild 1014 BLAKE2B e53740d143751c2a96efa2613e5d1df912805b44cb690f576c5bf036fcece1f708a92fbbc9cf5f20c05e66dce158b2e2a88fd65e4f33534fe25c15d156727c8f SHA512 f59749d1d10d844dfd97eafbbb1a752424f26af88652ff52d6f8a1fac2f1849051184a68c03f6bc82f548d0b550f12623c9ecce6c1e0aea2b1a9683779e57ef9
-EBUILD cddlib-094h.ebuild 1138 BLAKE2B 32ac8a7b2bca079879d021dfc9537f3a54fa912543a42479e1c951b45c84ce79e643c3369eaab07bb5bdcf430b90d6beb9cc62352e4275af4aac8cd207273c58 SHA512 c2e6fc69ceb8b0866f5713d906b7f9d97907ae7e5dc363d903f8b2dc7507156b8869f74bc0b60270ae80a34e6be109bc2796e8adf1caa608baf5f4e113a9e91a
-EBUILD cddlib-094j.ebuild 1397 BLAKE2B 7ee4d9bccb7761758c4ea58aa236e1c74fe8ff2a72a76c10cd2738e0f7cc831bb1bee5b3ff543085343dba1b4deaa00254f55473c0a0367a5858c1efc100e9dd SHA512 2b2b5b386dfdd1e26204f5c5cf78963cc51bcad91d394df9e6c95db815dd975761d485de720e0f4bd11c00abf89cd07173032d8204378c8dc23137ed715605db
+EBUILD cddlib-094j.ebuild 1396 BLAKE2B 032b697c46fd170dea85951451389f30fafe5ec67cee387583514bc8cff83ee8e5bf570308078f14deb88d42821bfaae6f8f847aa4e8df83827a00f81f413f2b SHA512 3fe5afeedefabaae12a1becc1ec735020802cf4b4b8184591a4b51c34147b087fbcf1a4a46c246ddf84a7dd320c056f70d6739a13c76d662776755e9dc125c74
 MISC metadata.xml 1817 BLAKE2B 3a75a0a27708d31cf58ec067ad25ffce663b3d52f90dd2437ce529bb4babf49a6e0461eee6841ef836f37caa2f7e4f62a762ea61094213fe10f9cd1e16951d99 SHA512 a50ed995ba248cf59ae3b2c2d5a8f91df9b08bd03cb48a14de0eabc79b44091d425b41d980952ac3eea6182e12ca235985f347bb67ac109993a47a545d1c4289
diff --git a/sci-libs/cddlib/cddlib-094g.ebuild b/sci-libs/cddlib/cddlib-094g.ebuild
deleted file mode 100644
index 6a37b6d4ec1e..000000000000
--- a/sci-libs/cddlib/cddlib-094g.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="C implementation of the Double Description Method of Motzkin et al"
-HOMEPAGE="http://www.ifor.math.ethz.ch/~fukuda/cdd_home/"
-SRC_URI="ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-DEPEND=">=dev-libs/gmp-4.2.2:0="
-RDEPEND="${DEPEND}"
-
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( ChangeLog README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-add-cdd_both_reps-binary.patch
-)
-
-src_prepare() {
-	autotools-utils_src_prepare
-
-	cp "${FILESDIR}"/cdd_both_reps.c "${S}"/src/ \
-		|| die "failed to copy source file"
-	ln -s "${S}"/src/cdd_both_reps.c "${S}"/src-gmp/cdd_both_reps.c \
-		|| die "failed to make symbolic link to source file"
-}
-
-src_install() {
-	use doc && DOCS+=( doc/cddlibman.pdf doc/cddlibman.ps )
-
-	autotools-utils_src_install
-}
diff --git a/sci-libs/cddlib/cddlib-094h.ebuild b/sci-libs/cddlib/cddlib-094h.ebuild
deleted file mode 100644
index 217d76f23f08..000000000000
--- a/sci-libs/cddlib/cddlib-094h.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils ltprune
-
-DESCRIPTION="C implementation of the Double Description Method of Motzkin et al"
-HOMEPAGE="https://www.inf.ethz.ch/personal/fukudak/cdd_home/"
-SRC_URI="ftp://ftp.math.ethz.ch/users/fukudak/cdd/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs tools"
-
-DEPEND="dev-libs/gmp:0="
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-add-cdd_both_reps-binary.patch
-	"${FILESDIR}"/${P}-enforce-no-gmp.patch
-)
-
-src_prepare() {
-	default
-	sed -e 's|localdebug=dd_TRUE|localdebug=dd_FALSE|g' \
-		-i lib-src/cddlp.c -i lib-src-gmp/cddlp.c -i lib-src-gmp/cddlp_f.c || die
-	cp "${FILESDIR}"/cdd_both_reps.c src || die
-	ln -s "${S}"/src/cdd_both_reps.c "${S}"/src-gmp/cdd_both_reps.c || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use tools || rm "${ED}"/usr/bin/*
-	use static-libs || prune_libtool_files --all
-	use doc && dodoc doc/cddlibman.pdf
-}
diff --git a/sci-libs/cddlib/cddlib-094j.ebuild b/sci-libs/cddlib/cddlib-094j.ebuild
index dfcea92f0e38..e53e3ec982f7 100644
--- a/sci-libs/cddlib/cddlib-094j.ebuild
+++ b/sci-libs/cddlib/cddlib-094j.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${MY_P}.tar.g
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs tools"
 
 DEPEND="dev-libs/gmp:0"
diff --git a/sci-libs/cddlib/files/cdd_both_reps.c b/sci-libs/cddlib/files/cdd_both_reps.c
deleted file mode 100644
index 3de4247e3016..000000000000
--- a/sci-libs/cddlib/files/cdd_both_reps.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* cdd_both_reps.c: compute reduced H and V representation of polytope
-   by Volker Braun <vbraun@stp.dias.ie>
-   
-   The input is taken from stdin and can be either a 
-   H or V representation, not necessarily reduced.
-
-   based on testcdd1.c, redcheck.c, and of course the cdd library
-   written by Komei Fukuda, fukuda@ifor.math.ethz.ch
-   Standard ftp site: ftp.ifor.math.ethz.ch, Directory: pub/fukuda/cdd
-*/
-
-/*  This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "setoper.h"
-#include "cdd.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <math.h>
-#include <string.h>
-
-
-
-
-
-void compute_adjacency(dd_MatrixPtr Rep, dd_ErrorType* err_ptr)
-{
-  dd_SetFamilyPtr AdjacencyGraph;
-  if (*err_ptr != dd_NoError) return;
-
-  switch (Rep->representation) {
-  case dd_Inequality: 
-    printf("Facet graph\n");
-    break;
-  case dd_Generator: 
-    printf("Vertex graph\n");
-    break;
-  case dd_Unspecified:
-    printf("unknown representation type!\n");
-  default:
-    printf("This should be unreachable!\n");
-    exit(2);
-  }
-
-  /* Output adjacency of vertices/rays/lines */
-  if (Rep->rowsize > 0) {  /* workaround for bug with empty polyhedron */
-    /* compute adjacent vertices/rays/lines */
-    AdjacencyGraph = dd_Matrix2Adjacency(Rep, err_ptr);
-    if (*err_ptr == dd_NoError) {
-      dd_WriteSetFamily(stdout,AdjacencyGraph);
-      dd_FreeSetFamily(AdjacencyGraph);
-    }
-  } else {
-    printf("begin\n");
-    printf("  0    0\n");
-    printf("end\n");
-  }
-
-  printf("\n");
-}
-
-
-void minimal_Vrep_Hrep(dd_MatrixPtr M, 
-		       dd_MatrixPtr* Vrep_ptr, dd_MatrixPtr* Hrep_ptr, 
-		       dd_ErrorType* err_ptr)
-{
-  dd_PolyhedraPtr poly;
-  dd_rowindex newpos;
-  dd_rowset impl_linset,redset;
-  dd_MatrixPtr Vrep, Hrep;
-
-  if (*err_ptr != dd_NoError) return;
-
-   /* compute the second representation */
-  poly = dd_DDMatrix2Poly(M, err_ptr);
-  if (*err_ptr != dd_NoError) return;
-
-  if (*err_ptr == dd_NoError) {
-    /* compute canonical H-representation */
-    Hrep = dd_CopyInequalities(poly);
-    if (Hrep->rowsize > 0) {  /* workaround for bug with empty matrix */
-      dd_MatrixCanonicalize(&Hrep, &impl_linset, &redset, &newpos, err_ptr);
-      if (*err_ptr == dd_NoError) {
-	set_free(redset);
-	set_free(impl_linset);
-	free(newpos);
-      }
-    }
-    if (*err_ptr == dd_NoError) (*Hrep_ptr) = Hrep;
-  }
-
-  if (*err_ptr == dd_NoError) {
-    /* compute canonical V-representation */
-    Vrep = dd_CopyGenerators(poly);
-    if (Vrep->rowsize > 0) {  /* workaround for bug with empty matrix */
-      dd_MatrixCanonicalize(&Vrep, &impl_linset, &redset, &newpos, err_ptr);
-      if (*err_ptr == dd_NoError) {
-	set_free(redset);
-	set_free(impl_linset);
-	free(newpos);
-      }
-    }
-    if (*err_ptr == dd_NoError) (*Vrep_ptr) = Vrep;
-  }
-
-  dd_FreePolyhedra(poly);
-}
-
-
-void print_both_reps(dd_MatrixPtr Vrep, dd_MatrixPtr Hrep)
-{
-  /* Output V-representation */
-  dd_WriteMatrix(stdout,Vrep);
-  printf("\n");
-
-  /* Output H-representation */
-  dd_WriteMatrix(stdout,Hrep);
-  printf("\n");
-}
-
-
-void compute_both_reps(dd_MatrixPtr M, dd_ErrorType* err_ptr)
-{
-  dd_MatrixPtr Vrep, Hrep;
-  minimal_Vrep_Hrep(M, &Vrep, &Hrep, err_ptr);
-  if (*err_ptr != dd_NoError) return;
-
-  print_both_reps(Vrep, Hrep);
-  dd_FreeMatrix(Hrep);
-  dd_FreeMatrix(Vrep);
-}
-
-
-void compute_all(dd_MatrixPtr M, dd_ErrorType* err_ptr)
-{
-  dd_MatrixPtr Vrep, Hrep;
-  minimal_Vrep_Hrep(M, &Vrep, &Hrep, err_ptr);
-  if (*err_ptr != dd_NoError) return;
-
-  print_both_reps(Vrep, Hrep);
-  compute_adjacency(Vrep, err_ptr);
-  compute_adjacency(Hrep, err_ptr);
-  dd_FreeMatrix(Hrep);
-  dd_FreeMatrix(Vrep);
-}
-
-
-
-void usage(char *name)
-{
-  printf("No known option specified, I don't know what to do!\n"
-	 "Usage:\n"
-	 "%s --option\n"
-	 "where --option is precisely one of the following:\n\n"
-	 "  --all: Compute everything.\n"
-	 "    This will compute minimal H-,V-representation and vertex and facet graph.\n"
-	 "\n"
-	 "  --reps: Compute both a minimal H- and minimal V-representation.\n"
-	 "\n"
-	 "  --adjacency: Compute adjacency information only.\n"
-	 "    The input is assumed to be a minimal representation, as, for example, computed\n"
-	 "    by --reps. Warning, you will not get the correct answer if the input\n"
-	 "    representation is not minimal! The output is the vertex or facet graph,\n"
-	 "    depending on the input.\n"
-	 "\n"
-	 "The input data is a H- or V-representation in cdd's ine/ext format and\n"
-	 "is in each case read from stdin.\n", 
-	 name);
-}
-
-
-enum command_line_arguments { ALL, REPS, ADJACENCY };
-
-
-int parse_arguments(char* arg, enum command_line_arguments* option)
-{
-  if (strcmp(arg,"--all")==0) {
-    *option = ALL;
-    return 0;
-  }
-  if (strcmp(arg,"--reps")==0) {
-    *option = REPS;
-    return 0;
-  }
-  if (strcmp(arg,"--adjacency")==0) {
-    *option = ADJACENCY;
-    return 0;
-  }
-  printf("Unknown option: %s\n", arg);
-  return 1;
-}
-
-
-int main(int argc, char *argv[])
-{
-  dd_ErrorType err=dd_NoError;
-  dd_MatrixPtr M;
-  enum command_line_arguments option;
-
-  if (argc!=2 || parse_arguments(argv[1],&option)) {
-    usage(argv[0]);
-    return 0;
-  } 
-
-  dd_set_global_constants(); 
-
-  /* Read data from stdin */
-  M = dd_PolyFile2Matrix(stdin, &err);
-  if (err != dd_NoError) {
-    printf("I was unable to parse the input data!\n");
-    dd_WriteErrorMessages(stdout,err);
-    dd_free_global_constants();
-    return 1;
-  }
-
-  switch (option) {
-  case ALL:
-    compute_all(M,&err);
-    break;
-  case REPS:
-    compute_both_reps(M,&err);
-    break;
-  case ADJACENCY:
-    compute_adjacency(M,&err);
-    break;
-  default:
-    printf("unreachable option %d\n", option);
-    exit(3); /* unreachable */
-  }
-  
-  /* cleanup */
-  dd_FreeMatrix(M);
-  if (err != dd_NoError) {
-    dd_WriteErrorMessages(stdout,err);
-  }
-
-  dd_free_global_constants();
-  return 0;
-}
-
-
-
diff --git a/sci-libs/cddlib/files/cddlib-094g-add-cdd_both_reps-binary.patch b/sci-libs/cddlib/files/cddlib-094g-add-cdd_both_reps-binary.patch
deleted file mode 100644
index 3aa5912b7460..000000000000
--- a/sci-libs/cddlib/files/cddlib-094g-add-cdd_both_reps-binary.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- src-gmp/Makefile.am	2009-01-26 09:30:16.000000000 +0000
-+++ src-gmp/Makefile.am	2009-10-04 10:36:17.000000000 +0100
-@@ -11,7 +11,8 @@
- testcdd2_gmp \
- testlp1_gmp \
- testlp2_gmp \
--testlp3_gmp
-+testlp3_gmp \
-+cdd_both_reps_gmp 
- #cddmathlink
- 
- scdd_gmp_SOURCES                   = simplecdd.c
-@@ -27,6 +28,7 @@
- testlp1_gmp_SOURCES                = testlp1.c
- testlp2_gmp_SOURCES                = testlp2.c
- testlp3_gmp_SOURCES                = testlp3.c
-+cdd_both_reps_gmp_SOURCES          = cdd_both_reps.c
- # cddmathlink_SOURCES                = cddmathlink.c cddmlio.h cddmlio.c
- 
- LDADD        = ../lib-src-gmp/libcddgmp.la
---- src/Makefile.am	2009-01-26 09:30:03.000000000 +0000
-+++ src/Makefile.am	2009-10-04 10:36:17.000000000 +0100
-@@ -11,7 +11,8 @@
- testcdd2 \
- testlp1 \
- testlp2 \
--testlp3
-+testlp3 \
-+cdd_both_reps 
- #cddmathlink
- 
- scdd_SOURCES                   = simplecdd.c
-@@ -27,6 +28,7 @@
- testlp1_SOURCES                = testlp1.c
- testlp2_SOURCES                = testlp2.c
- testlp3_SOURCES                = testlp3.c
-+cdd_both_reps_SOURCES          = cdd_both_reps.c
- # cddmathlink_SOURCES                = cddmathlink.c cddmlio.h cddmlio.c
- 
- LDADD        = ../lib-src/libcdd.la
-
diff --git a/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch b/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch
deleted file mode 100644
index ba9a909abb19..000000000000
--- a/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up cddlib-094g/src-gmp/Makefile.am.orig cddlib-094g/src-gmp/Makefile.am
---- cddlib-094g/src-gmp/Makefile.am.orig	2012-07-05 13:30:30.982562213 -0400
-+++ cddlib-094g/src-gmp/Makefile.am	2012-07-05 13:31:14.576563881 -0400
-@@ -11,7 +11,8 @@ testcdd1_gmp \
- testcdd2_gmp \
- testlp1_gmp \
- testlp2_gmp \
--testlp3_gmp
-+testlp3_gmp \
-+cdd_both_reps_gmp 
- #cddmathlink
- 
- scdd_gmp_SOURCES                   = simplecdd.c
-@@ -27,6 +28,7 @@ testcdd2_gmp_SOURCES               = tes
- testlp1_gmp_SOURCES                = testlp1.c
- testlp2_gmp_SOURCES                = testlp2.c
- testlp3_gmp_SOURCES                = testlp3.c
-+cdd_both_reps_gmp_SOURCES          = cdd_both_reps.c
- # cddmathlink_SOURCES                = cddmathlink.c cddmlio.h cddmlio.c
- 
- LDADD        = ../lib-src-gmp/libcddgmp.la
-diff -up cddlib-094g/src-gmp/Makefile.in.orig cddlib-094g/src-gmp/Makefile.in
-diff -up cddlib-094g/src/Makefile.am.orig cddlib-094g/src/Makefile.am
---- cddlib-094g/src/Makefile.am.orig	2012-07-05 13:34:07.449570501 -0400
-+++ cddlib-094g/src/Makefile.am	2012-07-05 13:34:32.128571446 -0400
-@@ -11,7 +11,8 @@ testshoot \
- testcdd2 \
- testlp1 \
- testlp2 \
--testlp3
-+testlp3 \
-+cdd_both_reps
- #cddmathlink
- 
- scdd_SOURCES                   = simplecdd.c
-@@ -27,6 +28,7 @@ testcdd2_SOURCES               = testcdd
- testlp1_SOURCES                = testlp1.c
- testlp2_SOURCES                = testlp2.c
- testlp3_SOURCES                = testlp3.c
-+cdd_both_reps_SOURCES          = cdd_both_reps.c
- # cddmathlink_SOURCES                = cddmathlink.c cddmlio.h cddmlio.c
- 
- LDADD        = ../lib-src/libcdd.la
diff --git a/sci-libs/cddlib/files/cddlib-094h-enforce-no-gmp.patch b/sci-libs/cddlib/files/cddlib-094h-enforce-no-gmp.patch
deleted file mode 100644
index bab20025a793..000000000000
--- a/sci-libs/cddlib/files/cddlib-094h-enforce-no-gmp.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Don't link against gmp in the non-gmp version
- Using AC_CHECK_LIB will add -lgmp to all children, but we don't want this
- for the non-gmp variants. Instead, add -lgmp explicitly in gmp variants.
-Author: Ximin Luo <infinity0@debian.org>
-Forwarded: TBD
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/configure.in
-+++ b/configure.in
-@@ -14,8 +14,6 @@
- dnl AC_CHECK_LIB(g, main)
- dnl Replace `main' with a function in -lstdc:
- dnl AC_CHECK_LIB(stdc, main)
--dnl look for gmp:
--AC_CHECK_LIB(gmp, main)
- 
- dnl Checks for header files.
- AC_HEADER_STDC
---- a/lib-src-gmp/Makefile.am
-+++ b/lib-src-gmp/Makefile.am
-@@ -25,4 +25,4 @@
- setoper.h
- 
- AM_CPPFLAGS = -I$(gmpincludedir) -DGMPRATIONAL
--AM_LDFLAGS = -version-info 0:0:0
-+AM_LDFLAGS = -lgmp -version-info 0:0:0
---- a/src-gmp/Makefile.am
-+++ b/src-gmp/Makefile.am
-@@ -32,7 +32,7 @@
- # cddmathlink_SOURCES                = cddmathlink.c cddmlio.h cddmlio.c
- 
- LDADD        = ../lib-src-gmp/libcddgmp.la
--AM_LDFLAGS   = -L$(gmplibdir)
-+AM_LDFLAGS   = -lgmp -L$(gmplibdir)
- INCLUDES     = -I../lib-src-gmp
- INCLUDES    += -I$(gmpincludedir)
- AM_CPPFLAGS  = -DGMPRATIONAL
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 0e9e8120302d..4da6bab71a19 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,5 +1,5 @@
 DIST ceres-solver-1.12.0.tar.gz 5008861 BLAKE2B 52b3954dde96386bd031543ab9d7370368f58f76f1dec9d24ef10803da787cc96f40a1c775626fde832b70ebd94cf4274c70a8fb4bd7e1bcf040e119cbec09f8 SHA512 485eece0471cf05d31b5dd7e133e23115a334a4ed557a3c1bd0b715a063f840738af8f507e935522a0dae90ce6851984c0002a25e9b445b90889792f68a05571
 DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc SHA512 a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6
 EBUILD ceres-solver-1.12.0.ebuild 2400 BLAKE2B 40d628872950995e250c6ad5ddac436e2c9b8fc9e4ad25c93d66851930370dabdcfad93ad1ca70c0b37a201ded641b2e547bb95b14a11418f910403c6c2d502e SHA512 e84db68bd83234e6ee272a07bb40a4a41ae225b61aaa7ecc42dd4b8a6996f0d72cf2805a3c69bd45db271f5b9974e2aa36eb52bf51070c93b0b753839f728b42
-EBUILD ceres-solver-1.14.0.ebuild 2323 BLAKE2B 1379ac818581c2b62926381bfec1c8b13cd838ae43c65fd77cd1495b1650d32cf9d132cfc8695329e711a2bf1863cb330c76a3727ff527b9115c5ed7a321c440 SHA512 80ed6b5071c06d10c0ccd68bf1fa5a4a79ef21e1a31c1e9263cca52d33c4bb8c2e23b66d09f47e32cecb314bb179eca51a9d49c233ea88a37c846ad91bb351c5
+EBUILD ceres-solver-1.14.0.ebuild 2322 BLAKE2B 86586d0e78b7a3bcd892ddc78ebfba929a50c17ff162f0063ff6c01101c29dfe75559c6b1172dfa3b75ea2afc8bf544682f1b1a7503c2abc2c80d91088101de3 SHA512 f4636950774524f3201ac63abb60ed76ab0380f0e765eb82d4aee3f82d577aba74d0fd7619e77b32989ed39c552393e6048b30a1af16d59d4b13f6c3d66087a6
 MISC metadata.xml 1525 BLAKE2B 46de33a7fa6513877e2427442e918d8e39871a6b6b8a15a18d14dcedd55c42bfb1bdeab7e1cc57c0ac03ba06d5c3628dd666b6f0787eac5c9dc75785e2a9e471 SHA512 4c95aef23ce327f9cd11b53638e1b6485eb789cd296ad8a571278b65c9001465f56c97b97db6e2c4a4ed76336f0e33684958adef593d74193cb73930e7ea5ad2
diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
index d40b75690c4b..c7c0bfab6404 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ceres-solver.org/${P}.tar.gz"
 
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cxsparse doc examples gflags lapack openmp +schur sparse test"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )"
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 4d1f21927951..5a5bd941abf5 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,18 +1,7 @@
-AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b63e1c9b2814acc307e0b5082e7326f495102d10c4b2bdc86b17b7f4ae8ae11231c99215d87fc59217115f0fd92fc96f0 SHA512 16ed7bbd5569166c80cf4d8beba81195a177ee36bcd7e14ca6d00e3add6fe57c7980cbe1853747325443699daa331fc23e53fc86150b6c7cf871ef4812936c39
 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-2.4.1-poppler-0.75.patch 5452 BLAKE2B 7cb3b1e84f2f1ff91af49cb4292047f055aeff5a45c8f0d4c440c99d2ab746d32500f11c040f0eaba72b8da9122ab5fc3b5d50dc082c60281354652ab65fff9f SHA512 7482a8a160f514c31c11d101e1f8a2c32dcc862b3c7bc76ac11712bca7c3088975b4fefae33a6d68a847a5e54982b8d02d6bdc8dee27dd0d5efea0f6d28590ed
-AUX gdal-2.4.1-poppler-0.76.patch 699 BLAKE2B 132ff0a3046734e851d12379d049b2e4fdbefcd4bb6949ddf9fa18b856b1ae20d2a2ec9dbcc0d973097cd2ba5f6e72e852b26a93997ffe4b428fe79d44b5c1cf SHA512 09cdd963dbc5e09d211663f54b1cef72eeeda7484ad10b08862907df60aefc068d840e80d4fd0aa0776a03edca89e8affb8b614c4db02085e854bb4a14342d4f
-AUX gdal-2.4.1-poppler-0.82.patch 2322 BLAKE2B a07590bdd3d910b6da8e99989f648251d891fe170ec5b6954d34a3986ce949f2c428f184d8ffbe6292cf6fb7915753db7e81b4993c71fe2b1e4016745c8595fd SHA512 9aca4c69c1df413666d58d75e9b235cc7039224e400188e982b5e9de22773b20829c09eb467069c9e56ea79aa4de2f0e1267d2ed4cd8bb1be7e0432f2c7297c2
-AUX gdal-2.4.1-poppler-0.83-1.patch 993 BLAKE2B 8ecf716c8f64c6ee51be6cc8e1ebfe242d5fc2d4b8f5ec2b116c52137bc3bfbec24b7260533f610777f106e8fc5d302828ba615435568342025ba365f68f52e6 SHA512 3ff3f08c18cd9980e947948b19ea229608bbc2e59dba39c40d374d417104155b956e4077c0ef4f0dfd0625c1af54f9cdc19d812345495716c82690f3e2beff2b
-AUX gdal-2.4.1-poppler-0.83-2.patch 1501 BLAKE2B 3b85001fe0e9c01bf97cd94da3ce063c5b43aa5c6e258dbe3f81d6d179fb668597945ac2c5c66a8f84c2235f40a66bd12ebb811d9b5f0d56dcd5d3aa5beeea59 SHA512 953b8f819275f882820e0346617b522d35da4a756ecdb889e3862a7526addcf1794f9d1f9c4fcf70b4876fe20e0b3127827df48fe50d841c07f89a8f6bf9356c
-AUX gdal-2.4.1-swig-4.patch 4239 BLAKE2B d3bfc88aa79fa94015816cd6e620b7520c765379668542dc1fa5c20192898e9e25fcd1a4cc7aed98fca8d07dc1e0a06b6bcd60fa19049af738f061f7537a7129 SHA512 7db4206ce24a35b4b71859310cc4218fd02c3c2900892fc51950d7ddb90b5e743dc42fe4fe545404063ffeb2f0eaa4319f616a200ed3e92723ed04db4300f7c0
 AUX gdal-3.0.2-complete.patch 3533 BLAKE2B 5b62041f4be9f8a846f35f8d54e4cf6eb5d0902a009197d1d994e500a0e23e57149dff28d7baa20817d40db103b37c93b7ab88f54b12f7e2b324dc1d5c6f61e5 SHA512 c7ade447b857977f8949de2d44dde34ab581b11603afbb9f1e2fcaffa65941aa037a69a34b1915d33f1cde6bfec92ff91859b80bfdc06a27cdcc25733c9b60a1
 AUX gdal-3.0.2-datadir.patch 2516 BLAKE2B 5d67889e468cee04f780e9f15cb167d27dbf955db9464155170afdcd2fc72744ab699c8a7de34872b1dd085268f7ee80a54d73397503919955f6898f0b161560 SHA512 327f2a7e6b2d2665153350a6419bec9396b51f6374bcffb8101986f740363b47ae2db9c2fb7b6e3c0f512bdfd502a1abb531be178d27b4138948018cd1564532
-DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61 SHA512 b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
-DIST gdal-2.4.3.tar.gz 14726748 BLAKE2B 104c29912a96b03d0913be40f91a844b2f04f1e972b1ae8764bd277e7d51960b45d4a67a8f9240130de7ce8752f69f4172ca9a54bb11e70635aa55b6c6924cb5 SHA512 e532ce86c92724300ab443c42dd8cec0e74e41411a54d30222f98faa10623b31e616eda44da8f406ed01f3fc3c72c76e8ceb80c1dff733f8efcaa2e2e18132f6
 DIST gdal-3.0.4.tar.gz 14379480 BLAKE2B 1ced7f791608be2ea1aede8705826135a015a3bf376af087b10e0b17a6884c141df4b24654eeac136afd959c1360ce0cf1f1312438093ca305fa38a242d7e364 SHA512 bc5032a123a2cc90145fef8b467a4c9b78ddf7b4d850ceaae8350aacc3f6f23e13dd52219844a2b930b59d000854d3f2cce117643d62ead176b71939f4760ce9
-EBUILD gdal-2.4.1-r1.ebuild 8176 BLAKE2B 0ccaedec2cdd24e0b572483595445ade24d1dada60540137840d4e6947d238ff675dff191aaa6dbb569736721d71f297cb2c7cfcec709a872194f07313dfedd8 SHA512 f8642e106d247e8e5ba7b8d89fbad81cb767655fd6ebcb1ae6f0cabb8b75de83d48108c37d9805cc040861288cb696843dc0e609eff1cea7c0c55f3f769f1b19
-EBUILD gdal-2.4.3.ebuild 8098 BLAKE2B 6af448cbf507f843f9732149e6b94caeadd3114df9d03082d3ff345f0182be58b9521c2b5f337dbd97e6dbaf0b12723c038ea8ae283cfbb5b7d17b0d81e8794f SHA512 21587d67b306a5adfb357f9299bb8fc537d5c3a5bf1c2c903a7f041f6d1b6602a88e5ecfd3446080f274b94b2e00a31bb422bb3df4dae322f11b0c06230d2f48
 EBUILD gdal-3.0.4-r1.ebuild 7305 BLAKE2B 91aeba00048f346e542a228020fa6bc8c6f4e6f55c3b2b581a175669889b415f66c6120166dfadde0a0b230bb02fe813f0b6fef1affb334c89cdfc49ca95b5ea SHA512 a98c91005dc6714352a2ca5f18f8487aca49ab3240abde0f30035b6ec48408f7e3d4a1d714b0d414060c23c3c366834e577546f2944154b275045e4c58772d48
 MISC metadata.xml 1420 BLAKE2B 1887e48a94b0d8596913fda0e102c0e23768e1fe9df32f8f0387c5966d9e9b1e0bdd6d06f6d281660494c871d887ed20d4254f1aaa9b23cda9830f7a4810ef00 SHA512 be3a0fdc46e1b022fce052908ce7f43399f1be9d4f4b1cf23e3cca8e43d6280d1f8f820fe1d0ac1d65d2dacde1ddc859c1ce3b8d067e0f6114ab3900abc419eb
diff --git a/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch b/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch
deleted file mode 100644
index 620b05fecbd1..000000000000
--- a/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fixes Gentoo-bug #641866
-
---- a/scripts/GNUmakefile
-+++ b/scripts/GNUmakefile
-@@ -6,5 +6,5 @@
- 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`; \
-+		$(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=completionsdir bash-completion` ; \
-+		cp gdal-bash-completion.sh $(DESTDIR)`pkg-config --variable=completionsdir bash-completion`/gdal.sh; \
- 	fi
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch
deleted file mode 100644
index 49824022b3be..000000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 5c12d11614a325317ceaa7c0567070b3e4188275 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 26 Mar 2019 12:43:59 +0100
-Subject: [PATCH] Add support for Poppler 0.75.0 (fixes #1388)
-
----
- gdal/frmts/pdf/pdfio.h       |  5 ---
- gdal/frmts/pdf/pdfobject.cpp | 59 ++++++++----------------------------
- 2 files changed, 12 insertions(+), 52 deletions(-)
-
-diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
-index 7ae15c88aa3..ec13b8fe94c 100644
---- a/frmts/pdf/pdfio.h
-+++ b/frmts/pdf/pdfio.h
-@@ -93,11 +93,6 @@ class VSIPDFFileStream final: public BaseStream
-         virtual void       close() override;
- 
-     private:
--        /* getChars/hasGetChars added in poppler 0.15.0
--         * POPPLER_BASE_STREAM_HAS_TWO_ARGS true from poppler 0.16,
--         * This test will be wrong for poppler 0.15 or 0.16,
--         * but will still compile correctly.
--         */
-         virtual GBool hasGetChars() override;
-         virtual int getChars(int nChars, Guchar *buffer) override;
- 
-diff --git a/frmts/pdf/pdfobject.cpp b/frmts/pdf/pdfobject.cpp
---- a/frmts/pdf/pdfobject.cpp
-+++ b/frmts/pdf/pdfobject.cpp
-@@ -1195,7 +1195,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
-         return oIter->second;
- 
- #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
--    Object o = m_poDict->lookupNF(((char*)pszKey));
-+    auto&& o(m_poDict->lookupNF(((char*)pszKey)));
-     if (!o.isNull())
-     {
-         int nRefNum = 0;
-@@ -1204,7 +1204,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
-         {
-             nRefNum = o.getRefNum();
-             nRefGen = o.getRefGen();
--            Object o2 = m_poDict->lookup((char*)pszKey);
-+            Object o2(m_poDict->lookup((char*)pszKey));
-             if( !o2.isNull() )
-             {
-                 GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE);
-@@ -1215,7 +1215,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
-         }
-         else
-         {
--            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE);
-+            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o.copy())), TRUE);
-             poObj->SetRefNumAndGen(nRefNum, nRefGen);
-             m_map[pszKey] = poObj;
-             return poObj;
-@@ -1329,7 +1329,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
-         return m_v[nIndex];
- 
- #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
--    Object o = m_poArray->getNF(nIndex);
-+    auto&& o(m_poArray->getNF(nIndex));
-     if( !o.isNull() )
-     {
-         int nRefNum = 0;
-@@ -1338,7 +1338,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
-         {
-             nRefNum = o.getRefNum();
-             nRefGen = o.getRefGen();
--            Object o2 = m_poArray->get(nIndex);
-+            Object o2(m_poArray->get(nIndex));
-             if( !o2.isNull() )
-             {
-                 GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE);
-@@ -1349,7 +1349,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
-         }
-         else
-         {
--            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE);
-+            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o.copy())), TRUE);
-             poObj->SetRefNumAndGen(nRefNum, nRefGen);
-             m_v[nIndex] = poObj;
-             return poObj;
-@@ -1416,8 +1416,6 @@ int GDALPDFStreamPoppler::GetLength()
- 
- char* GDALPDFStreamPoppler::GetBytes()
- {
--    /* fillGooString() available in poppler >= 0.16.0 */
--#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
-     GooString* gstr = new GooString();
-     m_poStream->fillGooString(gstr);
- 
-@@ -1427,7 +1425,12 @@ char* GDALPDFStreamPoppler::GetBytes()
-         char* pszContent = (char*) VSIMalloc(m_nLength + 1);
-         if (pszContent)
-         {
--            memcpy(pszContent, gstr->getCString(), m_nLength);
-+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
-+            const char* srcStr = gstr->c_str();
-+#else
-+            const char* srcStr = gstr->getCString();
-+#endif
-+            memcpy(pszContent, srcStr, m_nLength);
-             pszContent[m_nLength] = '\0';
-         }
-         delete gstr;
-@@ -1438,41 +1441,6 @@ char* GDALPDFStreamPoppler::GetBytes()
-         delete gstr;
-         return nullptr;
-     }
--#else
--    int i;
--    int nLengthAlloc = 0;
--    char* pszContent = nullptr;
--    if( m_nLength >= 0 )
--    {
--        pszContent = (char*) VSIMalloc(m_nLength + 1);
--        if (!pszContent)
--            return nullptr;
--        nLengthAlloc = m_nLength;
--    }
--    m_poStream->reset();
--    for(i = 0; ; ++i )
--    {
--        int nVal = m_poStream->getChar();
--        if (nVal == EOF)
--            break;
--        if( i >= nLengthAlloc )
--        {
--            nLengthAlloc = 32 + nLengthAlloc + nLengthAlloc / 3;
--            char* pszContentNew = (char*) VSIRealloc(pszContent, nLengthAlloc + 1);
--            if( pszContentNew == nullptr )
--            {
--                CPLFree(pszContent);
--                m_nLength = 0;
--                return nullptr;
--            }
--            pszContent = pszContentNew;
--        }
--        pszContent[i] = (GByte)nVal;
--    }
--    m_nLength = i;
--    pszContent[i] = '\0';
--    return pszContent;
--#endif
- }
- 
- #endif // HAVE_POPPLER
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch
deleted file mode 100644
index f15e540932d1..000000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8958528f9b5737581afa7249b0e16f2ff89d727e Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 21 Apr 2019 12:19:56 +0200
-Subject: [PATCH] PDF: add support for Poppler 0.76.0
-
----
- gdal/frmts/pdf/pdfsdk_headers.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h
-index 41e48ae91d6..1f77429bf9b 100644
---- a/frmts/pdf/pdfsdk_headers.h
-+++ b/frmts/pdf/pdfsdk_headers.h
-@@ -55,7 +55,10 @@
- #else
- typedef unsigned char Guchar;
- #endif
-+
-+#if !(POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 76)
- #include <goo/GooList.h>
-+#endif
- 
- /* begin of poppler xpdf includes */
- #include <poppler/Object.h>
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch
deleted file mode 100644
index 740856814f86..000000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 22 Oct 2019 13:11:57 +0200
-Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
-
----
- gdal/frmts/pdf/pdfdataset.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 15537ca7fd7..8f944c40d30 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev
-         virtual void drawChar(GfxState *state, double x, double y,
-                               double dx, double dy,
-                               double originX, double originY,
--                              CharCode code, int nBytes, Unicode *u, int uLen) override
-+                              CharCode code, int nBytes,
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
-+                              const
-+#endif
-+                              Unicode *u, int uLen) override
-         {
-             if (bEnableText)
-                 SplashOutputDev::drawChar(state, x, y, dx, dy,
-From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 29 Sep 2019 23:55:18 +0200
-Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
-
----
- gdal/frmts/pdf/pdfdataset.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 3d68f92abe8..b3db5374227 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -265,7 +265,12 @@ class GDALPDFOutputDev : public SplashOutputDev
- 
-         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
-                                int width, int height, GfxImageColorMap *colorMap,
--                               GBool interpolate, int *maskColors, GBool inlineImg) override
-+                               GBool interpolate,
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
-+                               const
-+#endif
-+                               int *maskColors,
-+                               GBool inlineImg) override
-         {
-             if (bEnableBitmap)
-                 SplashOutputDev::drawImage(state, ref, str,
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch
deleted file mode 100644
index f077f4632386..000000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1f8fa16f58cfe0364099ddad0e1d86522d8de41a Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 13 Nov 2019 14:07:22 +0100
-Subject: [PATCH] PDF: fix build against Poppler 0.83.0dev
-
----
- gdal/frmts/pdf/pdfdataset.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 8f944c40d30..88017953de5 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -4267,7 +4267,13 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
-         CPLMutexHolderD(&hGlobalParamsMutex);
-         /* poppler global variable */
-         if (globalParams == nullptr)
-+        {
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
-+            globalParams.reset(new GlobalParams());
-+#else
-             globalParams = new GlobalParams();
-+#endif
-+        }
- 
-         globalParams->setPrintCommands(CPLTestBool(
-             CPLGetConfigOption("GDAL_PDF_PRINT_COMMANDS", "FALSE")));
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch
deleted file mode 100644
index 74614e925f6d..000000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7318576fc7037412b755f038f8148f2d299587aa Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 26 Nov 2019 14:33:32 +0100
-Subject: [PATCH] PDF: fix to build against latest Poppler master (0.83dev)
-
----
- gdal/frmts/pdf/pdfio.cpp | 3 +++
- gdal/frmts/pdf/pdfio.h   | 7 ++++++-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/frmts/pdf/pdfio.cpp b/frmts/pdf/pdfio.cpp
-index 917e92330ae..c0b9dad93cb 100644
---- a/frmts/pdf/pdfio.cpp
-+++ b/frmts/pdf/pdfio.cpp
-@@ -170,6 +170,9 @@ getStart_ret_type VSIPDFFileStream::getStart()
- /************************************************************************/
- 
- StreamKind VSIPDFFileStream::getKind()
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
-+                                        const
-+#endif
- {
-     return strFile;
- }
-diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
-index aa34ab7210d..23344d33f77 100644
---- a/frmts/pdf/pdfio.h
-+++ b/frmts/pdf/pdfio.h
-@@ -81,7 +81,12 @@ class VSIPDFFileStream final: public BaseStream
-         virtual void       setPos(setPos_offset_type pos, int dir = 0) override;
-         virtual void       moveStart(moveStart_delta_type delta) override;
- 
--        virtual StreamKind getKind() override;
-+        virtual StreamKind getKind()
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
-+            const
-+#endif
-+            override;
-+
-         virtual GooString *getFileName() override;
- 
-         virtual int        getChar() override;
diff --git a/sci-libs/gdal/files/gdal-2.4.1-swig-4.patch b/sci-libs/gdal/files/gdal-2.4.1-swig-4.patch
deleted file mode 100644
index 9d104e60f60a..000000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-swig-4.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 7a2c9f9348e1bf6bd95033d0b4da09a243fd9e6d Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 8 Jul 2019 14:34:55 +0200
-Subject: [PATCH] Python bindings: add compatibility with SWIG 4.0 (based on
- patch by @perestoronin, fixes #1702)
-
----
- gdal/swig/include/gdal_array.i                  |  6 ++++++
- gdal/swig/include/python/typemaps_python.i      |  9 ++++++++-
- gdal/swig/python/extensions/gdal_array_wrap.cpp | 15 ++++++++++++++-
- gdal/swig/python/extensions/gdal_wrap.cpp       |  9 ++++++++-
- 4 files changed, 36 insertions(+), 3 deletions(-)
-
-diff --git a/swig/include/gdal_array.i b/swig/include/gdal_array.i
-index c4f6f19b610..bf053eb2476 100644
---- a/swig/include/gdal_array.i
-+++ b/swig/include/gdal_array.i
-@@ -899,12 +899,18 @@ retStringAndCPLFree* GetArrayFilename(PyArrayObject *psArray)
-     }
- 
-     /* Keep a reference to the VirtualMem object */
-+%#if SWIGVERSION >= 0x040000
-+%#define obj0 swig_obj[0]
-+%#endif
- %#if NPY_API_VERSION >= 0x00000007
-     PyArray_SetBaseObject(ar, obj0);
- %#else
-     PyArray_BASE(ar) = obj0;
- %#endif
-     Py_INCREF(obj0);
-+%#if SWIGVERSION >= 0x040000
-+%#undef obj0
-+%#endif
-     Py_DECREF($result);
-     $result = (PyObject*) ar;
- }
-diff --git a/swig/include/python/typemaps_python.i b/swig/include/python/typemaps_python.i
-index 5c9f36ab278..9266422e9c4 100644
---- a/swig/include/python/typemaps_python.i
-+++ b/swig/include/python/typemaps_python.i
-@@ -2104,7 +2104,14 @@ DecomposeSequenceOf4DCoordinates( PyObject *seq, int nCount, double *x, double *
- %#if PY_VERSION_HEX >= 0x02070000
-   /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* pdatatype, int* preadonly)*/
-   Py_buffer *buf=(Py_buffer*)malloc(sizeof(Py_buffer));
--  if (PyBuffer_FillInfo(buf,  obj0,  *($1), *($2), *($4), PyBUF_ND)) {
-+
-+  if (PyBuffer_FillInfo(buf,
-+%#if SWIGVERSION >= 0x040000
-+                        swig_obj[0],
-+%#else
-+                        obj0,
-+%#endif
-+                        *($1), *($2), *($4), PyBUF_ND)) {
-     // error, handle
-   }
-   if( *($3) == GDT_Byte )
-diff --git a/swig/python/extensions/gdal_array_wrap.cpp b/swig/python/extensions/gdal_array_wrap.cpp
-index 807e12dd4a0..4435803e6d9 100644
---- a/swig/python/extensions/gdal_array_wrap.cpp
-+++ b/swig/python/extensions/gdal_array_wrap.cpp
-@@ -4598,7 +4598,14 @@ SWIGINTERN PyObject *_wrap_VirtualMem_GetAddr(PyObject *SWIGUNUSEDPARM(self), Py
- #if PY_VERSION_HEX >= 0x02070000
-     /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* pdatatype, int* preadonly)*/
-     Py_buffer *buf=(Py_buffer*)malloc(sizeof(Py_buffer));
--    if (PyBuffer_FillInfo(buf,  obj0,  *(arg2), *(arg3), *(arg5), PyBUF_ND)) {
-+    
-+    if (PyBuffer_FillInfo(buf,
-+    #if SWIGVERSION >= 0x040000
-+        swig_obj[0],
-+    #else
-+        obj0,
-+    #endif
-+        *(arg2), *(arg3), *(arg5), PyBUF_ND)) {
-       // error, handle
-     }
-     if( *(arg4) == GDT_Byte )
-@@ -5597,12 +5604,18 @@ SWIGINTERN PyObject *_wrap_VirtualMemGetArray(PyObject *SWIGUNUSEDPARM(self), Py
-     }
-     
-     /* Keep a reference to the VirtualMem object */
-+#if SWIGVERSION >= 0x040000
-+#define obj0 swig_obj[0]
-+#endif
- #if NPY_API_VERSION >= 0x00000007
-     PyArray_SetBaseObject(ar, obj0);
- #else
-     PyArray_BASE(ar) = obj0;
- #endif
-     Py_INCREF(obj0);
-+#if SWIGVERSION >= 0x040000
-+#undef obj0
-+#endif
-     Py_DECREF(resultobj);
-     resultobj = (PyObject*) ar;
-   }
-diff --git a/swig/python/extensions/gdal_wrap.cpp b/swig/python/extensions/gdal_wrap.cpp
-index 37cb635339e..f2f014fd0b5 100644
---- a/swig/python/extensions/gdal_wrap.cpp
-+++ b/swig/python/extensions/gdal_wrap.cpp
-@@ -15238,7 +15238,14 @@ SWIGINTERN PyObject *_wrap_VirtualMem_GetAddr(PyObject *SWIGUNUSEDPARM(self), Py
- #if PY_VERSION_HEX >= 0x02070000
-     /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* pdatatype, int* preadonly)*/
-     Py_buffer *buf=(Py_buffer*)malloc(sizeof(Py_buffer));
--    if (PyBuffer_FillInfo(buf,  obj0,  *(arg2), *(arg3), *(arg5), PyBUF_ND)) {
-+    
-+    if (PyBuffer_FillInfo(buf,
-+    #if SWIGVERSION >= 0x040000
-+        swig_obj[0],
-+    #else
-+        obj0,
-+    #endif
-+        *(arg2), *(arg3), *(arg5), PyBUF_ND)) {
-       // error, handle
-     }
-     if( *(arg4) == GDT_Byte )
diff --git a/sci-libs/gdal/gdal-2.4.1-r1.ebuild b/sci-libs/gdal/gdal-2.4.1-r1.ebuild
deleted file mode 100644
index ee52cca2e4d8..000000000000
--- a/sci-libs/gdal/gdal-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,322 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
-
-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/2.3"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libxml2:=
-	media-libs/tiff:0=
-	sci-libs/libgeotiff:=
-	sys-libs/zlib:=[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-2.2.1 )
-	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="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.7:* )"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.7:* )
-	perl? ( dev-lang/swig:0 )
-	python? (
-		dev-lang/swig:0
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="
-	mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${P}-poppler-0.75.patch"
-	"${FILESDIR}/${P}-poppler-0.76.patch"
-	"${FILESDIR}/${P}-swig-4.patch" # bug 689110
-	"${FILESDIR}/${P}-poppler-0.82.patch"
-)
-
-src_prepare() {
-	# fix datadir and docdir placement
-	sed -e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		-i "${S}"/GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		-i "${S}"/swig/python/GNUmakefile || die
-
-	# Fix spatialite/sqlite include issue
-	sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		-i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# updated for newer swig (must specify the path to input files)
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-	sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-		-i swig/python/setup.cfg || die "sed python setup.cfg failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# bug 619148
-	append-cxxflags -std=c++14
-
-	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-pdf-plugin
-		--disable-static
-		--enable-shared
-		--with-expat
-		--with-cryptopp=no
-		--with-geotiff
-		--with-grib
-		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}/usr/"
-		--with-libtiff
-		--with-libtool
-		--with-libz="${EPREFIX}/usr/"
-		--with-gnm
-		--without-bsb
-		--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-mrf
-		--without-rasdaman
-		--without-rasterlite2
-		--without-pcraster
-		--without-pdfium
-		--without-podofo
-		--without-qhull
-		--without-sde
-		--without-sfcgal
-		--without-sosi
-		--without-teigha
-		--disable-lto
-		$(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 yreleased 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 perl)
-		$(use_with png)
-		$(use_with postgres pg)
-		$(use_with python)
-		$(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 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() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		myinst=( DESTDIR="${D}" )
-		perl-module_src_install
-		popd > /dev/null || die
-		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
-			-i GDALmake.opt || die
-	fi
-
-	use perl && perl_delete_localpod
-
-	local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
-	use doc && HTML_DOCS=( html/. )
-
-	default
-
-	python_install() {
-		distutils-r1_python_install
-		python_doscript scripts/*.py
-	}
-
-	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.txt README-python.txt
-
-		insinto /usr/share/${PN}/samples
-		doins -r swig/python/samples/
-	fi
-
-	doman "${S}"/man/man*/*
-	find "${ED}" -name '*.la' -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-2.4.3.ebuild b/sci-libs/gdal/gdal-2.4.3.ebuild
deleted file mode 100644
index 77fa8dd5ff87..000000000000
--- a/sci-libs/gdal/gdal-2.4.3.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_OPTIONAL=1
-inherit autotools 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/2.3"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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="
-	doc? ( app-doc/doxygen )
-	java? ( >=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:=
-	media-libs/tiff:0=
-	sci-libs/libgeotiff:=
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-2.2.1 )
-	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-0.85.0:= )
-	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.2.3-bashcomp-path.patch # bug 641866
-	"${FILESDIR}"/${PN}-2.4.1-swig-4.patch # bug 689110
-	"${FILESDIR}"/${PN}-2.4.1-poppler-0.82.patch
-	"${FILESDIR}"/${PN}-2.4.1-poppler-0.83-{1,2}.patch # bug 703790
-)
-
-src_prepare() {
-	# fix datadir and docdir placement
-	sed -e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		-i GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		-i swig/python/GNUmakefile || die
-
-	# Fix spatialite/sqlite include issue
-	sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		-i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# updated for newer swig (must specify the path to input files)
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-	sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-		-i swig/python/setup.cfg || die "sed python setup.cfg failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# bug 619148
-	append-cxxflags -std=c++14
-
-	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-pdf-plugin
-		--disable-static
-		--enable-shared
-		--with-expat
-		--with-cryptopp=no
-		--with-geotiff
-		--with-grib
-		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}"/usr/
-		--with-libtiff
-		--with-libtool
-		--with-libz="${EPREFIX}"/usr/
-		--with-gnm
-		--without-bsb
-		--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-mrf
-		--without-rasdaman
-		--without-rasterlite2
-		--without-pcraster
-		--without-pdfium
-		--without-podofo
-		--without-qhull
-		--without-sde
-		--without-sfcgal
-		--without-sosi
-		--without-teigha
-		--disable-lto
-		$(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 yreleased 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 perl)
-		$(use_with png)
-		$(use_with postgres pg)
-		$(use_with python)
-		$(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 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() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		myinst=( DESTDIR="${D}" )
-		perl-module_src_install
-		popd > /dev/null || die
-		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
-			-i GDALmake.opt || die
-	fi
-
-	use perl && perl_delete_localpod
-
-	local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
-	use doc && HTML_DOCS=( html/. )
-
-	default
-
-	python_install() {
-		distutils-r1_python_install
-		python_doscript scripts/*.py
-	}
-
-	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/iml/Manifest b/sci-libs/iml/Manifest
index e9dcaebdb8e6..098d27e0b0c7 100644
--- a/sci-libs/iml/Manifest
+++ b/sci-libs/iml/Manifest
@@ -1,4 +1,4 @@
 AUX iml-1.0.4-use-any-cblas-implementation.patch 865 BLAKE2B 5167ab1a5f82e5fce596dd3f7cdb3a711f0fd5c86fefc6a36574bcbc63e464115895e43d81eba3d4d04bd016266817440098eed18fab04b30bc45dee37497ffd SHA512 36181f90032b6f4d786d50b327cb342d5c8f4431dd556e4267e99b02e92161adbb9c23d7815e1764d8f237b1f008b2abebc27bdc422ba7296144999f0cde3c19
 DIST iml-1.0.5.tar.bz2 391757 BLAKE2B 5895b353269ce19e17e2522f78eb705c89a47ed3c6cce54d1b7ab3003f59d0a13050b30ce9cedbf38392c737c169740b6c2433f1a74856b0f9d4e6e007ebf804 SHA512 b5a85982636035cc50acba7dcff5478c6271be3669313f01915b2761302d4c77617c0dd7932daf74433098670d3ffdb2ef19eb24450b40709750a0b7c8f797f1
-EBUILD iml-1.0.5.ebuild 713 BLAKE2B 1bc188017da5870454c3c2af732322abac825d2920929110352ce23f7824e59d742efd42d92cab683410f2bde44f76c1324f645ddf99bb5eb1f6536dc7df7492 SHA512 794f836b7f892034aeff8fc69be433cde98ab1e8aa1733faee2bf37cd724797e35bfa96dcb921674df72ed0dd2973f37af6c0fbf0be7109681efce34d58b4ba2
+EBUILD iml-1.0.5.ebuild 694 BLAKE2B 3e0329fc29f93d0538b87ad0f90b596428b8f829b2440b611612345e416c011c9962e34a298555538b76ad4809cc604b2ddab0947201add33faf0e50288d47ad SHA512 96f492c55e946e361006df7c4a224976d46603a4cc1accdf7bbc925460ff1d893e9ff8be6c33134319660d80ac112f119914efd2cd64d8a1bf4f4b665c47bb0b
 MISC metadata.xml 434 BLAKE2B 91cfe59fd89e32d7dda5fbb31ecccc46762c6e00cd8de2cbaa8509829d22d1e03f58eb143d72cd9a0c0294a5692643a372c810ecaaaa6d07b61a2818eb10ff91 SHA512 9d2059a19a31ac1393cb69aa28af0cabf1a6da3ee75f7edfea880b506dc8ff764be013e99b4b82fd8819c1552fde80caf15f5f022a0272701800482c2bd81006
diff --git a/sci-libs/iml/iml-1.0.5.ebuild b/sci-libs/iml/iml-1.0.5.ebuild
index 25907543c005..29bfa917676e 100644
--- a/sci-libs/iml/iml-1.0.5.ebuild
+++ b/sci-libs/iml/iml-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,16 +6,14 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="Integer Matrix Library"
-HOMEPAGE="http://www.cs.uwaterloo.ca/~astorjoh/iml.html"
-SRC_URI="http://www.cs.uwaterloo.ca/~astorjoh/${P}.tar.bz2"
+HOMEPAGE="https://www.cs.uwaterloo.ca/~astorjoh/iml.html"
+SRC_URI="https://www.cs.uwaterloo.ca/~astorjoh/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
-RESTRICT="mirror"
-
 DEPEND="virtual/cblas"
 RDEPEND="${DEPEND}"
 
diff --git a/sci-libs/kim-api/Manifest b/sci-libs/kim-api/Manifest
index 3e06802c42a6..49175204b4c0 100644
--- a/sci-libs/kim-api/Manifest
+++ b/sci-libs/kim-api/Manifest
@@ -1,3 +1,5 @@
+DIST kim-api-2.1.3.txz 296492 BLAKE2B 707ae2eaeaa737865d9b4f48a7f1ed53fb6453fc3680dee3b5b41f315b60710dfa9546105bc871cf1a4667644434e4a8eab0c95976feef3bed73ff8401613ac3 SHA512 efbc0214234b43a65ed40d23d8faa5264ac1dbd056e9e340548ea7ee5dc530f9cfb2d85a1d9d47fba9dfc7aa660a8ec20374daf4aa8ee605e7c097ae2a12512d
 DIST kim-api-v1.8.2.tgz 1634997 BLAKE2B ab2db24b9bb619aac3fdad6868d36d9615f0b08a8325613cd311d32dadab2f23105fe92b73e32c442d0f64364fde32d1293cc063637ff49eb49760a46bcb4f4b SHA512 fed930d147bfbb7936548eb129fcc403df90d1a8010f0fd5b85eaa35c1529d76c9c7c10b098b8eb74d9878e6d3ba0fad3c10d2a3e5bc9b673841a2abc290bac3
 EBUILD kim-api-1.8.2.ebuild 642 BLAKE2B 8aee22e3c2032ca6df812a1c548420e84296d5a4ed78a499b61f5703ef0d40427b64fdedd705834df508251091ca5ba0f7ef74ed7d4cf59558fd88c1bdd45cee SHA512 3a6a1f11f40af004330ebb4a55edcd12a93249e8c816f695e5a42044096e864c23154dbdb4d0f024d8882e538ef29269fb0c3ab56f4b516ce79b7f5408530405
+EBUILD kim-api-2.1.3.ebuild 374 BLAKE2B 8f6f1d0939521bc8f4ed2143020fb658a19b6837252418894964ee72b1878214bddfad6ba85af0927241e7a75b85c91c332c6950fab29233f5efce17058f2815 SHA512 d6fbbaedcd990985797c6501685183124db9c92045966b93aa3f0e9def9ef53cf18e2edea5777db1912e64dad2e9240cefd8b655b28c887bf6b0f7f629bf26d6
 MISC metadata.xml 367 BLAKE2B cc3fc8e9dbc98eef49a88d43c68b358b5d2f658316247637a9a3925de3784eb2e82de849e0a49217d5b49be74c280b81a66abbfdd9310fd18b77d67451a480c2 SHA512 455c79e8837ba1ed980967e3236d4a0ac0edbd1b88b056a06d715894e03e7fc802079440752e60a06c9ce4acb62fd68d4020a7847a154a14065afd995257f685
diff --git a/sci-libs/kim-api/kim-api-2.1.3.ebuild b/sci-libs/kim-api/kim-api-2.1.3.ebuild
new file mode 100644
index 000000000000..e4d877d225c2
--- /dev/null
+++ b/sci-libs/kim-api/kim-api-2.1.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Application Programming Interface for atomistic simulations"
+HOMEPAGE="https://openkim.org"
+SRC_URI="https://s3.openkim.org/${PN}/${P}.txz"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index b13b3f8edbe9..7e3f04987287 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,7 +1,4 @@
-AUX libgeodecomp-0.5.0_pre20200314-hpx.patch 9844 BLAKE2B 4f2fb08bdac5396bcc0fa6af26db15ee819bdeb541eb639d5de88158b57ac2acbba2bf021ce569bbfd60e42da481095cb9826912da67f53d01250f4d05f32395 SHA512 66fc7262a4f6a4cb84d5488bcf50e67fe0f62b4a24301bd7b4143b949f22ca1d5cd5dfb93be0e27221c2201d268eafda5099765ca812413b314d88b2b7c64fa6
-AUX libgeodecomp-0.5.0_pre20200314-libdir.patch 1070 BLAKE2B 6cd368ad278e879a07ea655207ef19010dbceadeccb3434689c98054a9157893c916e76ca4a16a2f7b343a395b2ecc05754e0bdf114b37f61eb598cf84d34cb4 SHA512 db9cd6a601771727ba66b629f6b15f03bfe8440e91df307f8c44e3706e6b07273b8cbbd88696c5f14261993a2e9a6c12d9931ef7293e68e7961ca0bc774afe48
-AUX libgeodecomp-0.5.0_pre20200314-mpi.patch 13752 BLAKE2B ed5e2cafc0c8777e30ecf7e3b896aab1226b110c948e984dabf15d0bb85fa931f6991e1c108e55bab4016131c6f142d589500004e4ac76cb840c41eb975f41ea SHA512 b33ddbe1e0293e14b9f6b2a982cf8717d5c6dbceb34c476a5896c2eb3776ecbac9e219f11b9aea6a10a108b1fae3a2b373976e7636ff80b0f381b6bd4e1b0722
-AUX libgeodecomp-0.5.0_pre20200314-warnings.patch 1111 BLAKE2B 2a06ca14fa8d12b1c1d6f56bedb5937c8e7aed00fa6c5f7bed42978c94164f17c00a1b71542b12348013c0ae9d30545c9ccebeac81e42af3c7ae9b583554bd21 SHA512 6c152fb43ae26f69dc0963f51a99e41d39ed2056cd88fd6771e516b64cdd77ae918d9726c9a1be72154c8a434b266bdba749c54cc13dfb768a8b9044c18ddc75
-DIST libgeodecomp-0.5.0_pre20200314.tar.gz 1506929 BLAKE2B 078a0d3384963b0d3b5e5885d794b4feb6493ab3c4d4df068c300769f6bd8ee1d695accec0f4a702b218d725cc68889450d7d4fbddd495387e75a6804bbd8de9 SHA512 5bc23ce68d91d3cb8ec753a09efc4d7c46aab3c307c529f2f2e09593d14bcb027532aeea32ba99ce524cc6dfb248e983a040f482a47784f5da6fb07aac06a859
-EBUILD libgeodecomp-0.5.0_pre20200314.ebuild 1767 BLAKE2B fafc8b73b2efe3269df78d720a5a5be895081859f768b609c0b683f4f62c1434eb1cc4e72c1060a6da6f2edeb8b4a1591461789152f44a851cba6f8244dcbb5f SHA512 bf7c98a48962e5e30d3713d850b0631133c4ab31110fb5f7d8f0fc4861838c4fe042c1993624a3863fbfb12dfab927178e29de1906bc9e0fa5284efc2635c844
+AUX libgeodecomp-0.5.0_pre20200420-mpi.patch 13752 BLAKE2B ed5e2cafc0c8777e30ecf7e3b896aab1226b110c948e984dabf15d0bb85fa931f6991e1c108e55bab4016131c6f142d589500004e4ac76cb840c41eb975f41ea SHA512 b33ddbe1e0293e14b9f6b2a982cf8717d5c6dbceb34c476a5896c2eb3776ecbac9e219f11b9aea6a10a108b1fae3a2b373976e7636ff80b0f381b6bd4e1b0722
+DIST libgeodecomp-0.5.0_pre20200420.tar.gz 1507078 BLAKE2B 64d5c9a138c54175ce049a1a02def90553bca617b22c9ac5fa93cd66aebfd7892f5a458f2d3eb3dd987d3c897cbb338b64cb64af7447f6ae74b41d02a762888e SHA512 0e1caa011641fba5af3c32f165fc95ced578ebeb45cb7ef56f1ede416f2e6aef532569a85339e48b43b0050bbfb60ffa1760604577c07137590445a87e691c70
+EBUILD libgeodecomp-0.5.0_pre20200420.ebuild 1673 BLAKE2B c83553fc11313cad76f3b726cbdfc0326a5c545665d448553302b8309a228ad483c0a924d84322fff514f27e0097e3df3e9ca4f56ba7a371487d647b5bbf6099 SHA512 9046846474befbd1aaa2d8351295d222fed3e1901912e9b683c0236a38f2fcb894b35154d1dec86499b3083baa2d04351261cde288eafe55ed0ca4eb3d51adb7
 MISC metadata.xml 1345 BLAKE2B d6cb11021ade1a8c9007bf7a57c1e9355e19331498b66f746405bbd52dd5562656e827ab1db290190c37b283f579512609cf730d0ea27f6c31629d7e1fc38266 SHA512 f377ab4249dc9bb3dc2518e7d86ad6c2b44cd1249474480a5a71aa5b944c220ddc1608a8171d1abeaffa3d4628f4f327956cfb412ac14336f75705b7d8fe0fd9
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch
deleted file mode 100644
index 9f71ea087c69..000000000000
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-From fe581cc24805288c6c1a9b26a4b72748906f16c8 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Thu, 26 Mar 2020 15:58:46 +0100
-Subject: [PATCH] hpx: Remove use of deprecated header
-
-The current hpx version is v1.4. Remove the usage of deprecated hpx headers and
-make it compile again.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- src/libgeodecomp/communication/hpxreceiver.h             | 5 ++---
- src/libgeodecomp/communication/hpxserializationwrapper.h | 8 ++++----
- .../communication/test/parallel_hpx_4/hpxreceivertest.h  | 5 ++---
- src/libgeodecomp/geometry/coord.h                        | 4 ++--
- src/libgeodecomp/io/mocksteerer.h                        | 5 +++++
- src/libgeodecomp/io/mockwriter.h                         | 5 +++++
- src/libgeodecomp/misc/clonable.h                         | 2 +-
- src/libgeodecomp/misc/nonpodtestcell.h                   | 2 +-
- src/libgeodecomp/parallelization/hpxsimulator.cpp        | 2 +-
- src/libgeodecomp/parallelization/hpxsimulator.h          | 9 ++++-----
- src/libgeodecomp/storage/displacedgrid.h                 | 4 ++--
- src/libgeodecomp/storage/grid.h                          | 4 ++--
- src/libgeodecomp/storage/patchprovider.h                 | 3 ++-
- .../storage/test/unit/reorderingunstructuredgridtest.h   | 4 ++--
- 14 files changed, 35 insertions(+), 27 deletions(-)
-
-diff --git a/src/libgeodecomp/communication/hpxreceiver.h b/src/libgeodecomp/communication/hpxreceiver.h
-index 1a0baf9bbdee..beb657b88bbc 100644
---- a/src/libgeodecomp/communication/hpxreceiver.h
-+++ b/src/libgeodecomp/communication/hpxreceiver.h
-@@ -10,10 +10,9 @@
- 
- #include <hpx/include/components.hpp>
- #include <hpx/include/lcos.hpp>
--#include <hpx/lcos/broadcast.hpp>
--#include <hpx/lcos/local/receive_buffer.hpp>
-+#include <hpx/collectives/broadcast.hpp>
-+#include <hpx/local_lcos/receive_buffer.hpp>
- #include <hpx/runtime/get_ptr.hpp>
--#include <hpx/util/unwrapped.hpp>
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
- #include <libgeodecomp/misc/stringops.h>
- 
-diff --git a/src/libgeodecomp/communication/hpxserializationwrapper.h b/src/libgeodecomp/communication/hpxserializationwrapper.h
-index 5ebf06c4cf7c..0afb145840a6 100644
---- a/src/libgeodecomp/communication/hpxserializationwrapper.h
-+++ b/src/libgeodecomp/communication/hpxserializationwrapper.h
-@@ -10,10 +10,10 @@
-  * just pull in this header.
-  */
- #include <libgeodecomp/communication/hpxserialization.h>
--#include <hpx/runtime/serialization/map.hpp>
--#include <hpx/runtime/serialization/serialize.hpp>
--#include <hpx/runtime/serialization/shared_ptr.hpp>
--#include <hpx/runtime/serialization/vector.hpp>
-+#include <hpx/serialization/map.hpp>
-+#include <hpx/serialization/serialize.hpp>
-+#include <hpx/serialization/shared_ptr.hpp>
-+#include <hpx/serialization/vector.hpp>
- 
- #endif
- 
-diff --git a/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h b/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h
-index ab16a0947546..b2f9c6d47559 100644
---- a/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h
-+++ b/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h
-@@ -1,9 +1,8 @@
- #include <cxxtest/TestSuite.h>
- #include <hpx/hpx.hpp>
--#include <hpx/lcos/broadcast.hpp>
-+#include <hpx/collectives/broadcast.hpp>
- #include <hpx/runtime/components/component_factory.hpp>
--#include <hpx/runtime/serialization/serialize_buffer.hpp>
--#include <hpx/util/unwrapped.hpp>
-+#include <hpx/serialization/serialize_buffer.hpp>
- #include <libgeodecomp/communication/hpxreceiver.h>
- #include <libgeodecomp/misc/stringops.h>
- 
-diff --git a/src/libgeodecomp/geometry/coord.h b/src/libgeodecomp/geometry/coord.h
-index 5df21310d3ee..8772980c52df 100644
---- a/src/libgeodecomp/geometry/coord.h
-+++ b/src/libgeodecomp/geometry/coord.h
-@@ -10,8 +10,8 @@
- #ifdef LIBGEODECOMP_WITH_HPX
- #include <libgeodecomp/misc/cudaboostworkaround.h>
- #include <hpx/config.hpp>
--#include <hpx/runtime/serialization/array.hpp>
--#include <hpx/runtime/serialization/serialize.hpp>
-+#include <hpx/serialization/array.hpp>
-+#include <hpx/serialization/serialize.hpp>
- #endif
- 
- // For Intel MPI we need to source mpi.h before stdio.h:
-diff --git a/src/libgeodecomp/io/mocksteerer.h b/src/libgeodecomp/io/mocksteerer.h
-index 4ab2d28c5097..e20d0d5bb6bf 100644
---- a/src/libgeodecomp/io/mocksteerer.h
-+++ b/src/libgeodecomp/io/mocksteerer.h
-@@ -4,6 +4,11 @@
- #include <sstream>
- #include <libgeodecomp/io/steerer.h>
- 
-+#ifdef LIBGEODECOMP_WITH_HPX
-+#include <hpx/include/threads.hpp>
-+#include <hpx/concurrency/spinlock.hpp>
-+#endif
-+
- namespace LibGeoDecomp {
- 
- namespace MockSteererHelpers {
-diff --git a/src/libgeodecomp/io/mockwriter.h b/src/libgeodecomp/io/mockwriter.h
-index 4d6d13c93acb..36cb7e1e1ae6 100644
---- a/src/libgeodecomp/io/mockwriter.h
-+++ b/src/libgeodecomp/io/mockwriter.h
-@@ -8,6 +8,11 @@
- #include <libgeodecomp/misc/clonable.h>
- #include <libgeodecomp/misc/testcell.h>
- 
-+#ifdef LIBGEODECOMP_WITH_HPX
-+#include <hpx/include/threads.hpp>
-+#include <hpx/concurrency/spinlock.hpp>
-+#endif
-+
- #include <sstream>
- 
- namespace LibGeoDecomp {
-diff --git a/src/libgeodecomp/misc/clonable.h b/src/libgeodecomp/misc/clonable.h
-index 8162513826b8..a1dccbf94bd3 100644
---- a/src/libgeodecomp/misc/clonable.h
-+++ b/src/libgeodecomp/misc/clonable.h
-@@ -5,7 +5,7 @@
- 
- #ifdef LIBGEODECOMP_WITH_HPX
- #include <libgeodecomp/misc/cudaboostworkaround.h>
--#include <hpx/runtime/serialization/base_object.hpp>
-+#include <hpx/serialization/base_object.hpp>
- #endif
- 
- namespace LibGeoDecomp {
-diff --git a/src/libgeodecomp/misc/nonpodtestcell.h b/src/libgeodecomp/misc/nonpodtestcell.h
-index 66453ce80ba7..1618c8359b90 100644
---- a/src/libgeodecomp/misc/nonpodtestcell.h
-+++ b/src/libgeodecomp/misc/nonpodtestcell.h
-@@ -11,7 +11,7 @@
- #endif
- 
- #ifdef LIBGEODECOMP_WITH_HPX
--#include <hpx/runtime/serialization/set.hpp>
-+#include <hpx/serialization/set.hpp>
- #endif
- 
- namespace LibGeoDecomp {
-diff --git a/src/libgeodecomp/parallelization/hpxsimulator.cpp b/src/libgeodecomp/parallelization/hpxsimulator.cpp
-index 6e2fb6c78519..0329d6815913 100644
---- a/src/libgeodecomp/parallelization/hpxsimulator.cpp
-+++ b/src/libgeodecomp/parallelization/hpxsimulator.cpp
-@@ -3,7 +3,7 @@
- 
- #include <libgeodecomp/parallelization/hpxsimulator.h>
- #include <hpx/include/lcos.hpp>
--#include <hpx/lcos/broadcast.hpp>
-+#include <hpx/collectives/broadcast.hpp>
- 
- namespace LibGeoDecomp {
- namespace HpxSimulatorHelpers {
-diff --git a/src/libgeodecomp/parallelization/hpxsimulator.h b/src/libgeodecomp/parallelization/hpxsimulator.h
-index 1ccdf883e915..15b5a3628f9d 100644
---- a/src/libgeodecomp/parallelization/hpxsimulator.h
-+++ b/src/libgeodecomp/parallelization/hpxsimulator.h
-@@ -6,11 +6,10 @@
- 
- #include <libgeodecomp/misc/cudaboostworkaround.h>
- #include <hpx/config.hpp>
--#include <hpx/runtime/serialization/set.hpp>
--#include <hpx/runtime/serialization/string.hpp>
--#include <hpx/runtime/serialization/vector.hpp>
--#include <hpx/include/lcos.hpp>
--#include <hpx/lcos/broadcast.hpp>
-+#include <hpx/serialization/set.hpp>
-+#include <hpx/serialization/string.hpp>
-+#include <hpx/serialization/vector.hpp>
-+#include <hpx/collectives/broadcast.hpp>
- 
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
- #include <libgeodecomp/geometry/partitions/stripingpartition.h>
-diff --git a/src/libgeodecomp/storage/displacedgrid.h b/src/libgeodecomp/storage/displacedgrid.h
-index 5c72e520ce48..a8831053fedc 100644
---- a/src/libgeodecomp/storage/displacedgrid.h
-+++ b/src/libgeodecomp/storage/displacedgrid.h
-@@ -19,8 +19,8 @@
- #ifdef LIBGEODECOMP_WITH_HPX
- #include <libgeodecomp/misc/cudaboostworkaround.h>
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
--#include <hpx/runtime/serialization/input_archive.hpp>
--#include <hpx/runtime/serialization/output_archive.hpp>
-+#include <hpx/serialization/input_archive.hpp>
-+#include <hpx/serialization/output_archive.hpp>
- #endif
- 
- namespace LibGeoDecomp {
-diff --git a/src/libgeodecomp/storage/grid.h b/src/libgeodecomp/storage/grid.h
-index 6e218696f625..821b02002c87 100644
---- a/src/libgeodecomp/storage/grid.h
-+++ b/src/libgeodecomp/storage/grid.h
-@@ -26,8 +26,8 @@
- #ifdef LIBGEODECOMP_WITH_HPX
- #include <libgeodecomp/misc/cudaboostworkaround.h>
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
--#include <hpx/runtime/serialization/input_archive.hpp>
--#include <hpx/runtime/serialization/output_archive.hpp>
-+#include <hpx/serialization/input_archive.hpp>
-+#include <hpx/serialization/output_archive.hpp>
- #endif
- 
- namespace LibGeoDecomp {
-diff --git a/src/libgeodecomp/storage/patchprovider.h b/src/libgeodecomp/storage/patchprovider.h
-index 71fda8091e95..66aa67f214fa 100644
---- a/src/libgeodecomp/storage/patchprovider.h
-+++ b/src/libgeodecomp/storage/patchprovider.h
-@@ -2,7 +2,8 @@
- #define LIBGEODECOMP_STORAGE_PATCHPROVIDER_H
- 
- #ifdef LIBGEODECOMP_WITH_HPX
--#include <hpx/lcos/local/spinlock.hpp>
-+#include <hpx/include/threads.hpp>
-+#include <hpx/synchronization/spinlock.hpp>
- #include <mutex>
- #endif
- 
-diff --git a/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h b/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h
-index d89146a4bf69..7cb5203dae44 100644
---- a/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h
-+++ b/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h
-@@ -19,8 +19,8 @@
- #ifdef LIBGEODECOMP_WITH_HPX
- #include <libgeodecomp/misc/cudaboostworkaround.h>
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
--#include <hpx/runtime/serialization/input_archive.hpp>
--#include <hpx/runtime/serialization/output_archive.hpp>
-+#include <hpx/serialization/input_archive.hpp>
-+#include <hpx/serialization/output_archive.hpp>
- #endif
- 
- using namespace LibGeoDecomp;
--- 
-2.24.1
-
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-libdir.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-libdir.patch
deleted file mode 100644
index d76930d83ca1..000000000000
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-libdir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b03cef449361bef6d65f40382227714e0e0980c3 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Fri, 21 Feb 2020 19:47:51 +0100
-Subject: [PATCH] cmake: Fix library installation directory
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- src/CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b82d667087ba..f4ea6b379ec7 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -335,11 +335,12 @@ endif()
- target_link_libraries(geodecomp ${LIBGEODECOMP_LINK_LIBRARIES})
- 
- #============= 6. INSTALLER CONFIG ===================================
-+include(GNUInstallDirs)
- install(
-   TARGETS geodecomp
-   EXPORT ${PACKAGE_NAME}-targets
--  ARCHIVE DESTINATION lib
--  LIBRARY DESTINATION lib)
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- install(FILES "${CMAKE_BINARY_DIR}/${PACKAGE_NAME}/config.h" DESTINATION include/${PACKAGE_NAME})
- install(FILES libgeodecomp.h DESTINATION include)
--- 
-2.24.1
-
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch
deleted file mode 100644
index 2a7acd0c655b..000000000000
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 87e1918e13fa3f3124e945a0ea12cfb339ddf303 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Thu, 26 Mar 2020 16:05:02 +0100
-Subject: [PATCH] hpx: receiver: Remove std::move() call
-
-This fixes the following warning:
-
-|/home/kurt/git/libgeodecomp/src/libgeodecomp/communication/hpxreceiver.h:138:29: warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
-|  138 |         return std::move(vec);
-
-The compiler should be smart enough to optimize the correct way :).
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- src/libgeodecomp/communication/hpxreceiver.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libgeodecomp/communication/hpxreceiver.h b/src/libgeodecomp/communication/hpxreceiver.h
-index beb657b88bbc..28de314d5ef5 100644
---- a/src/libgeodecomp/communication/hpxreceiver.h
-+++ b/src/libgeodecomp/communication/hpxreceiver.h
-@@ -135,7 +135,7 @@ public:
-             vec << receiver->get(i).get();
-         }
- 
--        return std::move(vec);
-+        return vec;
-     }
- 
- private:
--- 
-2.24.1
-
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-mpi.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200420-mpi.patch
index 1a1164e342be..1a1164e342be 100644
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-mpi.patch
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200420-mpi.patch
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild
index 90abc7144a36..d269428d5cd1 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake cuda virtualx
 
-MY_COMMIT="09529db4b3f458f93a0240be578d1da6f1c2dc21"
+MY_COMMIT="69c5573ac7b2b654d649e8902fad73b05bf33644"
 
 DESCRIPTION="An auto-parallelizing library to speed up computer simulations"
 HOMEPAGE="
@@ -23,7 +23,7 @@ BDEPEND="
 		app-doc/doxygen
 		app-text/texlive
 		media-gfx/graphviz
-		)"
+	)"
 RDEPEND="dev-libs/boost"
 DEPEND="${RDEPEND}
 	~dev-libs/libflatarray-0.4.0_pre20200314
@@ -42,12 +42,9 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/libgeodecomp-${MY_COMMIT}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-hpx.patch"
-	"${FILESDIR}/${P}-libdir.patch"
-	"${FILESDIR}/${P}-mpi.patch"
-	"${FILESDIR}/${P}-warnings.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-mpi.patch" )
+
+DOCS=( README )
 
 src_prepare() {
 	cmake_src_prepare
@@ -76,8 +73,7 @@ src_compile() {
 }
 
 src_install() {
-	DOCS=( README )
-	use doc && HTML_DOCS=( doc/html/* )
+	use doc && local HTML_DOCS=( doc/html/* )
 	cmake_src_install
 }
 
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 89f0601f0d14..a07b16c66c0a 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,9 +1,5 @@
-DIST libsc-1.0.tar.gz 257930 BLAKE2B b67ee98d8a31dcd09af70783a253b7289657c51e345c59b6551ab8be3a2067ce20d75c3f6323f4113501d57baf31d95c5a40b025c77f37a693616ae2bb118266 SHA512 bf5af600e9cbd4038b1bd40c88776b21be5d474e34f9aacf287b890d262a22dc50ca27982c2eb9adba9735c8d9bb1fc31de2a27b24cdab534e3b2f610d76db7d
-DIST libsc-1.1.tar.gz 263643 BLAKE2B 827c0e01154983dd309301c6ecfa380d3489b5b764f131c2df2554b002a6c726a44272963cef4b4a853af5fb4c9ba98c77b01e107fc555432317662d985de2a9 SHA512 a3d8bea406a1987e68e88dd587aebe28c796f2a5bddfc381b34b5eb1448e0ac23889cc6f97fc1e4010289f83996180db42cbb001d0518360349b993dd37d4579
 DIST libsc-2.0.tar.gz 296392 BLAKE2B b5e1ca5cf6802ed38c32db5e7a77aec2fc636d88f2562314088dc16d13a0dccd24706276b05f8ddd70bc3769270a378c0089873fb2a21ebc93d6ca2622d7a58e SHA512 e4cfe42a1c1fe17412e1ffb6ebebe1f760861a7fb707a6f8fd01cdebda96b166ee05e7ff034f3b9e30de5e9baa82c9a2cebe93d40772dbd206603321de40559c
 DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
-EBUILD libsc-1.0-r1.ebuild 1571 BLAKE2B b3dbc3fad12f34b060355d616ad2db42e3688162cc18c503cabb1259413e2760ad54962a0f1f75716d951cf4b6c8bc3387f8cc7971212d2d34698067a37b1171 SHA512 dbbeae919faa3fdfa0637959ba7e6ab99bc39d9ac21e9abaa82225fb257c2c88d6ede9a5cdd810e7b2a4d27f90725c1dd58e7ed720fa48ce61fce0b53e1a80b3
-EBUILD libsc-1.1-r1.ebuild 1598 BLAKE2B 1057a3d9f155c557c3b37627214a9cb476965db670847e25ac879b38209edd9cc10c49d65652e7bb186e67eeea9f7633b0eb664a7dbc2cabbcbe5164574588cd SHA512 98fdac0a94e856e5f2b3d87d276c73a2b5aafd1a7c0bce485b874dbb7cfe38ed5555bb8413f75252f93110d917d07477b9d4c8e3e581f16ceb39409f65a7cecb
 EBUILD libsc-2.0.ebuild 2105 BLAKE2B 27cea0578aaf9ae971a98435f3cc9e7349de5e9c9bf75efd54b370c2f94b9b49b2ce416aefb7a7e57708ff7ea6cfe6733ef2b7ffa3a9605b247bb12ea8afc854 SHA512 0002f1222d5ed89e1123e563d5687eb92cc762a62531255e69ba343791e07c62c1a7d6a4cefe0e63b8e54c662f35d2b71bb16ff083099114aa611f8c324bc508
 EBUILD libsc-2.2.ebuild 2102 BLAKE2B 89ab98266cc11cf4aee9ca900758d1e42bb7fecb61b1a99c62228eedc3d9d44fa4ca7d287fed93b7bba91fee80cb1c8a590f5be3b280156bc0be4488809c8b6a SHA512 b7290fa7078dc8957edfcd545787b57698cb62219a3df13b5e8165bdaec8bbd5900d5e2459fe654c462a5ad0c3ffd7618c6fc27b719aaa81d4670499e98312cc
 EBUILD libsc-9999.ebuild 2105 BLAKE2B 27cea0578aaf9ae971a98435f3cc9e7349de5e9c9bf75efd54b370c2f94b9b49b2ce416aefb7a7e57708ff7ea6cfe6733ef2b7ffa3a9605b247bb12ea8afc854 SHA512 0002f1222d5ed89e1123e563d5687eb92cc762a62531255e69ba343791e07c62c1a7d6a4cefe0e63b8e54c662f35d2b71bb16ff083099114aa611f8c324bc508
diff --git a/sci-libs/libsc/libsc-1.0-r1.ebuild b/sci-libs/libsc/libsc-1.0-r1.ebuild
deleted file mode 100644
index 6b3cdada5358..000000000000
--- a/sci-libs/libsc/libsc-1.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Support for parallel scientific applications"
-HOMEPAGE="http://www.p4est.org/"
-SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples mpi romio static-libs"
-
-REQUIRED_USE="romio? ( mpi )"
-
-RDEPEND="
-	dev-lang/lua:*
-	sys-apps/util-linux
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi[romio?] )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-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 romio mpiio)
-		$(use_enable static-libs static)
-		--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"
-}
diff --git a/sci-libs/libsc/libsc-1.1-r1.ebuild b/sci-libs/libsc/libsc-1.1-r1.ebuild
deleted file mode 100644
index 970f493e0ddc..000000000000
--- a/sci-libs/libsc/libsc-1.1-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 autotools eutils toolchain-funcs
-
-DESCRIPTION="Support for parallel scientific applications"
-HOMEPAGE="http://www.p4est.org/"
-SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples mpi romio static-libs"
-
-REQUIRED_USE="romio? ( mpi )"
-
-RDEPEND="
-	dev-lang/lua:*
-	sys-apps/util-linux
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi[romio?] )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-AUTOTOOLS_AUTORECONF=true
-
-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 romio mpiio)
-		$(use_enable static-libs static)
-		--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"
-}
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index d6d75f96c220..408cebcf2e8a 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,4 +1,7 @@
 AUX linux-gpib-modules-4.2.0_rc1-reallydie.patch 737 BLAKE2B 198c078a168071e04efcfdad11bf93c2682ab2f2160d7f93fc9c49fdcd2cbbe9174be53502fa5a2c0eedf448e0f438130646cfe902673383925156244a80bf5d SHA512 96b7e459da514f4a4f84e746a3121baa0076c479ad435fd182a90714aeec21d32dcdbb6871deacab532c722e89970aa7cbccbcbea494195dfa86c7ebb95142d9
+AUX linux-gpib-modules-4.3.0-kernel53.patch 1426 BLAKE2B 56d84daf8ca2f31db5e10a1f20b6d1fe5fed3efa98454e620ea7067378f408da2aa4db57ab062fdd139321b6e8bd738d22bfed1a61b2c5732fd4fbd10a39e299 SHA512 1cba793dc51957068a9613d9952937b1b58582d3833bd1e0c7e9ce6f3f2c54e827d67444bdaf413404c4b96aa3cfe4ce7faf7cb0f07ead7fdfe9eb3521dd3b27
 DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
+DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
 EBUILD linux-gpib-modules-4.2.0.ebuild 1661 BLAKE2B 436455065ff0dd8a122800474d2afe27b2cffa5929acce605d9534b3a7fbefdce7a824639d60b6f80b5dfbd7128180a68c3fec7154828d96770248b646b974d5 SHA512 decedb321adf082dfdfe1dc6bf2ac3607c3efee166f74c39faa62931906929be86fbe8241d07c17f16b29de0d9aa0d0546f5e4f38326a64e2bd8fa99dff35a4f
+EBUILD linux-gpib-modules-4.3.0.ebuild 1401 BLAKE2B 24089b6de2e97f47539476c2e578ad7723dc0cfa60cc74a2605df827e77f11a938086846b536d538e8ef8fee86b35896a770f81ef8a60236b81b7d332aefebf7 SHA512 aa38c6c37e35b673217b21743b6d5db12963aac6b5c1a801793308265210aad3190d4ed20edaf4c69e9a51d95e140147fe85a2e839c73fbcc6d034ae305ce94b
 MISC metadata.xml 638 BLAKE2B 6367f8fe90e75e2a3593d5d79ae09e6c75fa990ae037b58cba80ecdc4f7023a5b116ee2d6eadcdd6960133cd08a5103ebd1870906e2136af064a048603bb2562 SHA512 0bce2e72363ccdec78efa46158bade5135cae3d2d7b97de6836c4708f5823f2c1539f7441f0382061c4e0c4c7b5b1498bc5a4be6949b7dea015c873381010744
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
new file mode 100644
index 000000000000..e650ccb5ed15
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch
@@ -0,0 +1,37 @@
+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/linux-gpib-modules-4.3.0.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild
new file mode 100644
index 000000000000..0625c4d14816
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild
@@ -0,0 +1,73 @@
+# 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/Manifest b/sci-libs/linux-gpib/Manifest
index 9b1e39eba206..738a70440902 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,10 +1,8 @@
 AUX linux-gpib-3.2.16-perl.patch 471 BLAKE2B a4cd09e10bd539b1ccb06e0272df923f52a196853c37276242fbb7545bc53915c751e2df1da8d13611e014e8ec4faf6f94746509d1d08c3aca127ce5ba2ebc14 SHA512 0ad75078406a8eb6fc09470be108464dcb3e7601d7a3c0813f1c6ba1d9e8f3895dea4da37f5d4928e6ea398a3aeea315a63bb6009a5fa211bba592093a776d10
-AUX linux-gpib-3.2.21-build.patch 1676 BLAKE2B 150957cb30830a633a454e42f914642427ae7af325dae6363705d87f64d439d2d95dde7e6b1c34ed2b8f5e6f6a898ca118bc1d6b8eddfabd511ce68ba5063f89 SHA512 df4229ee1ef181a9b58bf888cc85575feddb881d5d5c1f9dd43c14a7dd903a8854d898bd7d16f5cf2874133a9b5993fd59546fa1024421f66e10be62a6206f89
-AUX linux-gpib-4.0.3-reallydie.patch 621 BLAKE2B 367ea6a50513b86591e5dfe60df11a4bf5c380181197fe623d929d76af8610ace2d9f19f7918b39ae2608833a2579053bbb1a03d8bc8a7f8086e4254eaaf2546 SHA512 919229d276d5fddaa28c4ae7f9c8871966839cfb37be50903e92f43a5781345acfe512e6f07e90a55197cbf3fffb866695b308546a3fae88f480df9cf2e994a6
-AUX linux-gpib-4.0.4_rc2-kernel-4.11.0.patch 387 BLAKE2B 38516ea8a9ca5dd3dc32cfd605bd68100726bbcc8d96fa457caabfb91cbc17ce37e61194ac32e573acc797d71c448454d03e6202ec331cb25c056f8ee7b78829 SHA512 6f6b25695ae81671a93e8b86978ea1ef9e71ba5a38d14ad95b9a6aa59704bb2d6a8064c1ac006b1e7c4740d059184d4d4cefef88a2fd0c2a09406f64f6597187
+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.1.0.tar.gz 1529480 BLAKE2B b49df07f15d0f91b9d475052993421979d6776ef15aaa9b7e49632db9018f0cbd9ff38d12e2afa9e8027202e450dfc487ac9e2e6ab719086646d983cc41b3482 SHA512 037ed9e484a83caccb15d2d142eef6f1eec356ae972480ca7a676a318d3e9f844fc1911c1b30869b4bb14ef0b4cd10587a803426df9145966bafe22ca7316bd8
 DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
-EBUILD linux-gpib-4.1.0.ebuild 6103 BLAKE2B a6624f370aa722e84c410a3bb2fa497a9fb43d56b4c5eeda3fe76ad77fe1fa4aa2f5e3ea8c92dbee63bbc9a328123446f7cd014cd20afc3d3800bebb18a09b05 SHA512 e53e2a0b156e409aedb6a0d22b050a79b2374cf2f3546b39c30ae265511920e3f70697521e6dc2be57eb57cfcd2fd96f4134dc7b4dd101a893a634e3492d14d3
+DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
 EBUILD linux-gpib-4.2.0.ebuild 4612 BLAKE2B 615e338921fc8e4ee0d8e1b05de672fda188304c2d7c32b5a69e61e8beca401fb41026f96c84b64c8342377f88377b63a23d63e3975cec5ba65a7f2a80a464f2 SHA512 ed9f110809fd08dfdac987d9dafc475207e4d58c4c72878c40dfe2b538fcfcb73bc51865a3cd4cd37f23900db24cdc3d0b699ed11b8774b21f241754219e6a30
-MISC metadata.xml 688 BLAKE2B 405c816eb10feec819da0e5994c2ebe1e73ae4882cecf9f619bf30674b9ff499ae044cca42bad687d97cf3aef2a70eb826d5b07695cbde0c164a00cbac576e0a SHA512 d5af868c802d6c01b8267038cc5bdffc61677403ecb88cdfaf97f31d6b80d1e9318bcd507199d6a850df221cda2baf2869a1de4d732cde75a4aea2ec54f944b8
+EBUILD linux-gpib-4.3.0.ebuild 4812 BLAKE2B 7935aa4744316215aa91f057cbb5b7efd49d12eec852d0ee1ed176b6c4dc4929c8c6c7b0d716d21706020d12bf00c9f46cd28894a272516266a07a8f3571f005 SHA512 13b3fa6233b0c85a96ea9280af8f1ecadadc7265587e7349b1da713ccab2f981baa44c685f9bf3a24549e6eb1b3417899f151fb72f0467c4a65d713bca36d463
+MISC metadata.xml 547 BLAKE2B 1d0da80dd999dc402dbcdc80628e1fe97ec648b806cbd17cf20f6cbc33279afad81f71728e944a600108f28f90a61111e6bd9c36c7908a557d6cca6e41cdc759 SHA512 a88766b0372a88d090c032b45a973cf087a2172b088396fd1706a7c3818d6bf220de26848cb844d2ed555e3067bda6a00ffff598e0a0a59009ce33b3230b68a1
diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build.patch
deleted file mode 100644
index 86ce197ba821..000000000000
--- a/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ruN linux-gpib-3.2.21.orig/drivers/Makefile.am linux-gpib-3.2.21/drivers/Makefile.am
---- linux-gpib-3.2.21.orig/drivers/Makefile.am	2014-12-13 11:27:55.000000000 +0100
-+++ linux-gpib-3.2.21/drivers/Makefile.am	2014-12-17 17:51:47.152588400 +0100
-@@ -28,39 +28,13 @@
- 		CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/drivers/gpib/include -I@abs_top_srcdir@/include" \
- 		SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
- 
--install-data-hook: device-file-check /etc/gpib.conf
-+install-data-hook: /etc/gpib.conf
- 	$(MAKE) -C $(LINUX_SRCDIR) V=1 modules_install\
- 		CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/driver/include -I@abs_top_srcdir@/include" \
- 		SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)" INSTALL_MOD_DIR="gpib"
--	$(DEPMOD) -a
--
--/dev/gpib0:
--	groupadd gpib || echo "group gpib exists"
--	for i in `seq 0 15`; \
--	do \
--		mknod -m u=rw,g=rw,o= /dev/gpib$${i} c $(IBMAJOR) $${i} || exit 1; \
--		chown root:gpib /dev/gpib$${i}; \
--	done
--
--.PHONY : device-file-check
--device-file-check: /dev/gpib0
--	@if [ ! -c /dev/gpib0 ]; then \
--		if [ -a /dev/gpib0 ]; then \
--			echo "A file or directory called /dev/gpib0 exists but it is not" \
--				"a character device.  Delete or move it and try again."; \
--			exit 1; \
--		fi; \
--	fi
--	@ls -l /dev/gpib0 | grep -q "$(IBMAJOR)"; \
--	if [ $$? != 0 ]; then \
--		echo "/dev/gpib0 has the wrong major number. " \
--			"Delete your /dev/gpibX files and try again."; \
--		exit 1; \
--	fi
- 
- #should move this to util/templates Makefile.am when it exists
- /etc/gpib.conf:
--	$(INSTALL_DATA) -D $(top_srcdir)/util/templates/gpib.conf /etc/gpib.conf
- 
- #make sure compiled files, etc don't make it into distribution tarballs
- dist-hook:
diff --git a/sci-libs/linux-gpib/files/linux-gpib-4.0.3-reallydie.patch b/sci-libs/linux-gpib/files/linux-gpib-4.0.3-reallydie.patch
deleted file mode 100644
index e19f8d36755b..000000000000
--- a/sci-libs/linux-gpib/files/linux-gpib-4.0.3-reallydie.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: drivers/Makefile.am
-===================================================================
---- a/drivers/Makefile.am	(revision 1602)
-+++ b/drivers/Makefile.am	(working copy)
-@@ -15,10 +15,8 @@
- 
- -include $(top_srcdir)/util/linux_flags/flags
- 
--#ignore errors from kernel's make modules in all-local, to avoid failure of make install
--#on nfs filesystem with root_squash
- all-local:
--	-$(MAKE) -C $(LINUX_SRCDIR) V=1 modules\
-+	$(MAKE) -C $(LINUX_SRCDIR) V=1 modules\
- 		CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/drivers/gpib/include -I@abs_top_srcdir@/include" \
- 		SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
- 
diff --git a/sci-libs/linux-gpib/files/linux-gpib-4.0.4_rc2-kernel-4.11.0.patch b/sci-libs/linux-gpib/files/linux-gpib-4.0.4_rc2-kernel-4.11.0.patch
deleted file mode 100644
index c3a9764924c2..000000000000
--- a/sci-libs/linux-gpib/files/linux-gpib-4.0.4_rc2-kernel-4.11.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- linux-gpib-4.0.4rc2.orig/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c 2016-06-22 09:48:47.000000000 +0100
-+++ linux-gpib-4.0.4rc2/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c  2017-05-02 00:59:04.509950834 +0100
-@@ -37,6 +37,7 @@
- #include <linux/file.h>
- #include <linux/timer.h>
- #include <linux/delay.h>
-+#include <linux/sched/signal.h>
- #include <asm/uaccess.h>
-
- #include "gpibP.h"
diff --git a/sci-libs/linux-gpib/files/linux-gpib-4.3.0-perl.patch b/sci-libs/linux-gpib/files/linux-gpib-4.3.0-perl.patch
new file mode 100644
index 000000000000..b969435cd9c1
--- /dev/null
+++ b/sci-libs/linux-gpib/files/linux-gpib-4.3.0-perl.patch
@@ -0,0 +1,9 @@
+diff -ruN linux-gpib-user-4.3.0.orig/language/Makefile.am linux-gpib-user-4.3.0/language/Makefile.am
+--- linux-gpib-user-4.3.0.orig/language/Makefile.am	2019-08-23 11:30:12.000000000 +0300
++++ linux-gpib-user-4.3.0/language/Makefile.am	2020-04-18 16:15:15.558426112 +0300
+@@ -73,4 +73,4 @@
+ 	$(do_subst) < $(srcdir)/perl/Makefile.PL.in >perl/Makefile.PL
+ 
+ perl/Makefile: perl/Makefile.PL
+-	-(cd perl && $(PERL) Makefile.PL)
++	-(cd perl && $(PERL) Makefile.PL PREFIX=$(EPREFIX)/usr INSTALLDIRS=vendor INSTALLMAN3DIR='none' DESTDIR="$(DESTDIR)" )
diff --git a/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild
index eb8b21c8f17b..7e91689d224e 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild
@@ -3,22 +3,22 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
-inherit linux-info readme.gentoo-r1 versionator eutils linux-mod autotools perl-functions python-single-r1 toolchain-funcs udev user
+inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
 
-MY_PV=${PV/_/}
-
-DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
+DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
 HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/${PN}-${MY_PV}.tar.gz
+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="isa pcmcia static debug guile perl php python tcl doc firmware"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="pcmcia static guile perl php python tcl doc firmware"
+
+S="${WORKDIR}/${PN}-user-${PV}"
 
 COMMONDEPEND="
 	sys-libs/readline:=
@@ -28,7 +28,10 @@ COMMONDEPEND="
 	php? ( dev-lang/php:= )
 	python? ( ${PYTHON_DEPS} )
 	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}
+	acct-group/gpib
+	~sci-libs/linux-gpib-modules-${PV}
+"
 DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
 	doc? ( app-text/docbook-sgml-utils )
@@ -37,72 +40,54 @@ DEPEND="${COMMONDEPEND}
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.21-build.patch
-	"${FILESDIR}"/${PN}-3.2.16-perl.patch
-	"${FILESDIR}"/${PN}-4.0.3-reallydie.patch
+	"${FILESDIR}"/${PN}-4.3.0-perl.patch
 )
 
-S=${WORKDIR}/${PN}-${MY_PV}
-
 pkg_setup() {
 	use perl && perl_set_version
 	use python && python_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
-
-	# https://sourceforge.net/p/linux-gpib/bugs/43/
-	if use pcmcia && kernel_is -ge 2 6 38; then
-		die "pcmcia support is broken on kernels newer 2.6.38"
-	fi
+src_unpack() {
+	default
+	unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz"
 }
 
 src_prepare() {
 	default
-	kernel_is ge 4 11 0 && eapply "${FILESDIR}"/${PN}-4.0.4_rc2-kernel-4.11.0.patch
 	eautoreconf
 }
 
 src_configure() {
-	set_arch_to_kernel
 	econf \
-		$(use_enable isa) \
-		$(use_enable pcmcia) \
 		$(use_enable static) \
-		$(use_enable debug driver-debug) \
 		$(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) \
-		--with-linux-srcdir=${KV_DIR}
+		$(use_enable doc documentation)
 }
 
 src_compile() {
-	set_arch_to_kernel
 	FIRM_DIR=/usr/share/usb
 	emake \
 		DESTDIR="${D}" \
 		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
-		UDEV_RULES_DIR="${D}$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
+		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() {
-	set_arch_to_kernel
 	FIRM_DIR=/usr/share/usb
 	emake \
 		DESTDIR="${D}" \
 		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
-		UDEV_RULES_DIR="${D}/$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
+		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
@@ -124,23 +109,10 @@ src_install() {
 	newins util/templates/gpib.conf gpib.conf.example
 
 	if use pcmcia; then
-		dodir /etc/pcmcia
 		insinto /etc/pcmcia
 		doins "${S}"/etc/pcmcia/*
 	fi
 
-	if use firmware; then
-		insinto "${FIRM_DIR}"/agilent_82357a
-		doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_82357a/*
-
-		insinto "${FIRM_DIR}"/ni_gpib_usb_b
-		doins "${WORKDIR}"/gpib_firmware-2006-11-12/ni_gpib_usb_b/*
-
-		insinto /usr/share/linux-gpib/hp_82341
-		# do not install precompiled generate_firmware
-		doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/{*.bin,README}
-	fi
-
 	# fix rules files
 	local f
 	find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
@@ -149,6 +121,14 @@ src_install() {
 	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
@@ -193,24 +173,6 @@ gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bi
 	readme.gentoo_create_doc
 }
 
-pkg_preinst() {
-	linux-mod_pkg_preinst
-	use perl && perl_set_version
-	enewgroup gpib
-}
-
 pkg_postinst() {
-	linux-mod_pkg_postinst
 	readme.gentoo_print_elog
-
-	local v
-		for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 3.2.21-r1 ${v}; then
-			ewarn "sci-libs/linux-gpib-3.2.21-r1 introduces incompatible changes to the kernel"
-			ewarn "interface. You may need to reboot to make sure the newly built driver modules"
-			ewarn "are used (some of the driver modules cannot be unloaded)."
-			ewarn "If you do not do this, every gpib call will just result in an error message."
-			break
-		fi
-	done
 }
diff --git a/sci-libs/linux-gpib/metadata.xml b/sci-libs/linux-gpib/metadata.xml
index 18c6ece75d7b..0943a596eef1 100644
--- a/sci-libs/linux-gpib/metadata.xml
+++ b/sci-libs/linux-gpib/metadata.xml
@@ -11,7 +11,6 @@
   </maintainer>
   <use>
     <flag name="firmware">Install firmware</flag>
-    <flag name="isa">Build ISA kernel modules; from 3.12 on the setting is ignored and the decision based on the kernel configuration</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">linux-gpib</remote-id>
diff --git a/sci-libs/m4ri/Manifest b/sci-libs/m4ri/Manifest
index e8a7aadfd155..504098b33c09 100644
--- a/sci-libs/m4ri/Manifest
+++ b/sci-libs/m4ri/Manifest
@@ -1,9 +1,7 @@
 AUX m4ri-20200115-libm_underlinking.patch 2352 BLAKE2B 1c391a5d359585e8d6ffb6fa39900b214d20cc089af728a0ece4d521da0b339a31e5e1c19517506602413bf5c2f035fb45c8045459ede2a9ec84d344127f064f SHA512 d95150bab2c2954eea205bc027ec3a018f4267e19224665781273c093c12e35516a741275e3fa658f2076e7dee98d0463ed4ce0cc876def2f48a31039425df83
 AUX m4ri-20200115-memory_violation.patch 2905 BLAKE2B 08cdf9f22307f8477dd6dc5980d496cc56f4a7d625d83db77f1928417a1ba388c6a84c4866276bdad7ec4742b4dc102262e6f90c89a24423494e9877064f39d6 SHA512 70a32c5ec8e4c936b530e85d48d93e6f5d49122df658528c0fd74b3d812d25eef4d9826de3d01127bb717ecbdc20be23079d5805e3d767d225cd1cf24c321fde
-DIST m4ri-20140914.tar.gz 457978 BLAKE2B eadba6d1a751cb49cef25cc7726d87aa5746b23ad0a3b9bd274735a71da43ec4751fb655f91f3748f082369875508db365595f8443d77ae9645b3e4199d4f204 SHA512 efdd4ffa194d2d2b64a23a833420926613e74072ce62b2b06d768d157e134a615d88b93ed08d9f51f0fd14d686fd068523d1dc2c7cd9fb87108c96a4a11f4643
 DIST m4ri-20200115.tar.gz 510562 BLAKE2B 4522793ab61dd97dae5c8d82a4457364f437040c9c45c355007a3150bfebb5264e336b19a7416f62b5ef937480f15079d9c0e9711dd26a6f7c6f5ce66d699296 SHA512 4791576878097077bcda768c03a43ec9a5b05c29adaa9c5f1e737e798b3fc7d027f830183d57db7b8b6b75b25e01fb522eb8b2e5359efcb05054fc341cbb403c
 DIST m4ri-20200125.tar.gz 511132 BLAKE2B 637dbf7f17b84dc5fc91c9d8f501fa223cfacd687cb953ce3b9c4716e9a6d39318ef168c2ec8a4b5eeb469a4b46abbcd8802aaf694991d82deb20c832843c3ab SHA512 212ea58a93b792c1901f62411b06cd1a2ee60b3506c987e45ded73c146f2fa6baf5461b1dcabf31a5771ab5a44eab050d64714f7a5fca3df2d141d0d80c6c51a
-EBUILD m4ri-20140914.ebuild 1480 BLAKE2B f9e7fbf9bce01522e8f4030f4f9150b0549da6e294f97feb7ffa55511040c73ceab0011568637c1acf6f1e4b9a80a03b49b6d31e81b65fc6930e6903de6e47ba SHA512 4a4dad70150f202b5e746730453643952416fbe18d52b519087875b7af2eea17855ddaad18c5bc857d86160d78d2238fae0dbba97a40a13bb6cdfbff859c96ff
 EBUILD m4ri-20200115.ebuild 1339 BLAKE2B 0bb3afb8b5596445b3d4835ed247116805f7e2e70b14af9d481d90ddd3c0f0089cf5e7cef311f454e2389141d66729a7c352c3b0b29f38b6851dc474d71a500a SHA512 9129b34ebed40010465129235e33843c14596f99dbd183401c9d7ba4ce60550506703028168447174ba37313d0ad4ab6abc3f1084b95df1a06e8bfd13defccbb
 EBUILD m4ri-20200125.ebuild 1170 BLAKE2B 20962682e9164b8da028392dc1f014939cbb44bdc051abfb5ec560d1a673dcfcbc7b767bd9f9f3753b2282f02d8ca4ecbf162f6969767ed88fc34a531a2197f3 SHA512 88c0c6931f03dc57d97879705d792ef8e504eb536af6a8c66c04207b33c0b1ceb318bd889d7a22ab2ada4b72325a436f3dd4e4f441bcef7d12216723abdf052d
 MISC metadata.xml 1159 BLAKE2B 4a51b94a6a8d48e39412d90a249ef2038bcaac90653cbc187226842f33f5a8c75704b2671dc5fc63650cf4a57f77d7724409eca8d5822c7689eda3e5386902da SHA512 40d6e3dce814e11ced9da6874af71022dad66ff1b0511024a9033706f1b43ce741f418086d9beb276e09578db2acc1708758f71cdb168384d59f85627505e643
diff --git a/sci-libs/m4ri/m4ri-20140914.ebuild b/sci-libs/m4ri/m4ri-20140914.ebuild
deleted file mode 100644
index fb7d533eca6f..000000000000
--- a/sci-libs/m4ri/m4ri-20140914.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Method of four russian for inversion (M4RI)"
-HOMEPAGE="https://bitbucket.org/malb/m4ri"
-
-# We use the SageMath tarball instead of the one from bitbucket because
-# the bitbucket releases don't contain the "make dist" stuff and we
-# would need autotools.eclass to generate it.
-SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug openmp cpu_flags_x86_sse2 png static-libs test"
-RESTRICT="!test? ( test )"
-
-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 )
-
-pkg_pretend() {
-	use openmp && tc-check-openmp
-}
-
-src_configure() {
-	# when using openmp and -O0 the testsuite fails
-	# https://github.com/cschwan/sage-on-gentoo/issues/475
-	use openmp && replace-flags -O0 -O1
-
-	# kiwifb: cachetune option is not available, because it kills (at
-	# least my) X when I switch from yakuake to desktop
-	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/matio/Manifest b/sci-libs/matio/Manifest
index 2d018a108fbb..a5aec541abbd 100644
--- a/sci-libs/matio/Manifest
+++ b/sci-libs/matio/Manifest
@@ -1,7 +1,3 @@
-DIST matio-1.5.13.tar.gz 10037903 BLAKE2B 8817fa3a1c050a84951c706922b32c5ed082ec057a35cb7fa20cc4d977316208a61604fcb6c0e09c96f592294a65d57a8a95844d15821987bdd337564345e778 SHA512 2db430dd47b8ceed850aaadf36c0fd3b405ba32db3eb2d5be320d007754983e2538ab99338d3ae8d69e8a531818c3bde0807c1f4a505eff7dd25d4a77934b737
-DIST matio-1.5.16.tar.gz 10050153 BLAKE2B de643c11371a931853c2d60347431a1fc3c46f80d5e3083376e634999ea9d10bb1f5f547ed9844654dcb8ff6ff9492d037b26f693cbced04228a6c5d603c0a86 SHA512 38039ddc897b9e44677af08d996dde960355b6d8c5598000fbb23dda5501361d1c2a9e82f0f3e6c1309f0784943976259e5d39d1030f00db323e1756e5bd144a
 DIST matio-1.5.17.tar.gz 10066268 BLAKE2B 0852d1861bb4c43acd8a34d7114d29b7e15aa00e6f995d8516d22ff9420268cf7de7b82e08ee33978891bdfd02fcf3f8441aa1466e66e112a21f01abd6f3f0e0 SHA512 af8ff11c7c44fea9ea6886e381f49ef9186946f3def98ad9695f2d5d1df045c35e8f4ceac12a44be397f7bbd708b4803762b5ce54c45b60a9f446d551c04f5d2
-EBUILD matio-1.5.13.ebuild 976 BLAKE2B 3ad88b53997bc9c025f37f2173258064263867f27f24f41fb6037ef6971647285083096a77fc32bb6fa4ee99f1708e5d0ea814208e7fea62690331a3fbecf995 SHA512 bb866a2f22dc160bbecae2d9a2168275203dd5c5abe5eaafef27c5f28ecdce11a30ecc3fb562160b43946e1ee1f5390e74c835a7bb7c2c08cb8a1fe76d40c314
-EBUILD matio-1.5.16.ebuild 976 BLAKE2B 3ad88b53997bc9c025f37f2173258064263867f27f24f41fb6037ef6971647285083096a77fc32bb6fa4ee99f1708e5d0ea814208e7fea62690331a3fbecf995 SHA512 bb866a2f22dc160bbecae2d9a2168275203dd5c5abe5eaafef27c5f28ecdce11a30ecc3fb562160b43946e1ee1f5390e74c835a7bb7c2c08cb8a1fe76d40c314
 EBUILD matio-1.5.17.ebuild 964 BLAKE2B 75bcdba772c7aa2c951f942f31c7bc7dc89ffc25fe516d5dc5af505e0b8f5e4a4be001bd82081a476c88f7db174c1c9fa75de6bab19fc7e4e3f823cad7f28db1 SHA512 698c744736765b074707d6db5dbe1a60eee70f11e518c0afea55e97baf0bb624067300daea45d982cc331baa108fdd7a923b30097e80963d687815ae1d3a863e
 MISC metadata.xml 591 BLAKE2B f3e23baf2a3e7bd304987be8296034faf78988c95b4d9fbb9eedc7e8cc6efa0c1479a4ed48ecc10d9b0aee6c92603f4436e8d6b34811b227e86a5f822f47adf3 SHA512 d6f20bbc3bff29f3d163909acb1aa6f3cc6557c5717c3ee9771ef17fbd14fe17836f26c2b2dc4defb4223cdeb5b978ef13c4d4a294a1ac11f0559e2518d58009
diff --git a/sci-libs/matio/matio-1.5.13.ebuild b/sci-libs/matio/matio-1.5.13.ebuild
deleted file mode 100644
index d9f308de9508..000000000000
--- a/sci-libs/matio/matio-1.5.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for reading and writing matlab files"
-HOMEPAGE="https://sourceforge.net/projects/matio/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0/4" # subslot = soname version
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples hdf5 sparse static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	hdf5? ( sci-libs/hdf5 )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	doc? ( virtual/latex-base )"
-
-src_configure() {
-	econf \
-		$(use_enable hdf5 mat73) \
-		$(use_enable sparse extended-sparse) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	use doc && emake -C documentation pdf
-}
-
-src_install() {
-	default
-
-	use doc && dodoc documentation/matio_user_guide.pdf
-	if use examples; then
-		docinto examples
-		dodoc test/test*
-		insinto /usr/share/${PN}
-		doins share/test*
-	fi
-
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/sci-libs/matio/matio-1.5.16.ebuild b/sci-libs/matio/matio-1.5.16.ebuild
deleted file mode 100644
index d9f308de9508..000000000000
--- a/sci-libs/matio/matio-1.5.16.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for reading and writing matlab files"
-HOMEPAGE="https://sourceforge.net/projects/matio/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0/4" # subslot = soname version
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples hdf5 sparse static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	hdf5? ( sci-libs/hdf5 )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	doc? ( virtual/latex-base )"
-
-src_configure() {
-	econf \
-		$(use_enable hdf5 mat73) \
-		$(use_enable sparse extended-sparse) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	use doc && emake -C documentation pdf
-}
-
-src_install() {
-	default
-
-	use doc && dodoc documentation/matio_user_guide.pdf
-	if use examples; then
-		docinto examples
-		dodoc test/test*
-		insinto /usr/share/${PN}
-		doins share/test*
-	fi
-
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index 1e3a9b92604b..6b938f4a80df 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -1,10 +1,13 @@
 AUX metis-4.0.1-autotools.patch 2561 BLAKE2B b7de3a41b69cba384f9763724e56186067fdf59a667c9379624c4603ad63778e7b5c73f1e5124fed7c21e91b2798b56d6fbeac032df779d7cf92135cf964f19e SHA512 7e3a5137105e2d6343de864e4f21fb1716d03124842b547c8b4b7e33d096db60b47f33a7a040baa2ddeb0d9de03a0bbb249a2af054cc2beeb4e0a8e12531892b
 AUX metis-5.1.0-datatype.patch 388 BLAKE2B 038a62dd53d383c9c8f62067bf2f93a13f269f386ec898f2831df34a493379ce2c982d5bb97cad9f9571eab2e1d49d5cc58fa1f608ce6def9125c098913ec8c1 SHA512 0b7b10b0d0c958573668f847c2765435a1d9da22fe063430f75fb6ea005ce687d1eaa06879f3c494ea96b6877c1a94df5aa9e538bf02832af3a765cd7687a843
 AUX metis-5.1.0-multilib.patch 579 BLAKE2B 3e9edf7809a43026bfc7a320b1ff37f2e00a04dbdbcb8c3acb62016d8c41b4e68301ab3053fa1fb0fcb2a6bf3b48818175fdbf4b4fe2a23c0b4cb814d512f092 SHA512 5aa179b6de17ac24eb25ddc9377b5adea7b794405ba332de23096daac9231ab5c603268a24ad9219b3a9c598b9cdad33082f31a2cdc957b784d09d92e50f4941
+AUX metis-5.1.0-remove-GKlib-O3.patch 267 BLAKE2B ef39556238377c12a311685ca96188f8b4c3db1398b55941d273592ff40cad49d3ec5c7606177edacad25af4684d9ae65dacaa9a7ca9ad957d326b874b87f3cf SHA512 8b4f4eb0753063e64533e0101b9e78bf2a711e6b2d080607ab06025ad681788225abe7555db28edee00a98ba41badc41341bb3cec2bd654fc738d63d78867968
 AUX metis-5.1.0-shared-GKlib.patch 590 BLAKE2B 63a10fd00f21cff949660c598fa4519432559965c72f31c35d2a726dbbdfb9d2591c99e92c9520c2021e8ce0c485aa9834445e9f5dfe388f93106e49eee562af SHA512 3157e364f56661c7bc896016b2cda83658f2b00fe7c936e732e80e366ccf6421a1ab6f95d5a74fdb790f4ec8789d048aab9d68b0ccf1eb03f94621f78adb1a3a
 DIST metis-4.0.3.tar.gz 522624 BLAKE2B a09d15de35deb0a41bc7f54254effc68d977349e015b77c5523ed60343f5b7cc737c79b2f9420c42d7a60819c23322ad34770d1dcb93f0f1dea461bca3e7c831 SHA512 3d1388120c9c94bac6a20e2d38d6022c241bb6094cf71e31decf019d5500d2037716c6d615c5db69b536348a54e43f321c33ecfa25335fa6c84e412be227e332
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
 EBUILD metis-4.0.3-r1.ebuild 842 BLAKE2B 436b4eef63e9e4b8c48c7ce2c989c6614354acfc5f5a6dfa920b78915aea3e808ad3a99b39c16748011f100e4165f05ff7ff95e438261930786c3e4f35991c2d SHA512 8518a8b773bafaaa98c4f238c183ccaf88be585b88e6dec1efaa2eb609832e633097943560438b080934668eb968e3b669c14aa20017512faa91f2a92e7f122a
+EBUILD metis-4.0.3-r2.ebuild 868 BLAKE2B 6120a07d9c342b296c2e6e6c7df8862982ff732afd6dd96cee3b190b80f18c4077507e1059ff1be3f573cd1b7469aaa2fdc822f2c3fbf2b035796860b463c2af SHA512 987f89de9887e7a5e0aeb29de9f2fcd9d057785becf7e9f7ed31a238ba39aff3f6db6b6699c0428d9d88361c4b4e2655e39e850dd8dd402057873813ec16784c
 EBUILD metis-5.1.0-r2.ebuild 1905 BLAKE2B 4bffcbb4a902c84b843a7398491242ec6a6c37a3c9a9353e28b4debad79edf95332db9578cd098b5469c8a9d144a05d4864333a29f888f46c061dd125bf59579 SHA512 7c2b0b9cece1f4842babea6cf02492584b79eb965acffe9135f43372ceabb3a87fa3514e29fb1edf061b579196a0664ee8ae5e133375e7793d06fb529b9bae5d
 EBUILD metis-5.1.0-r3.ebuild 1936 BLAKE2B ef3740f53f426b5ab9e241963a5a1401e776008a311b999297b2ec267bf59902efaff5d21a0ded45084de967de9b7ee14fd6a9ecdcf12d9601fac9b59f26747f SHA512 c42713219592ce941c56230c7b7181053c41d80ad476671115909e09ea02d7d631b485874ab348712f9867c2c0a2b4c11e13b71db4667f0591b09e694248167d
+EBUILD metis-5.1.0-r4.ebuild 1485 BLAKE2B b109c425982dbda5ca90f00acf3eba98d49ea1d4763550afe862f8036d81d3314ab3be27a349fa876f5710f2b7ad3d20cd44b4c1150d625c8c3592449ae6c302 SHA512 985ccd3091af2f4fd844a05d2650658d20d715fce071f0f51d14ac2c26befb880291d2dadf19ed46c070159eb09d4e47bdbc00f26082b59da5b0f1be8027a722
 MISC metadata.xml 618 BLAKE2B 862f647c5562ab3d781bd3cb6a4ec1470cd45941043bbf1b9d09d41c5ad528546e338663400d322d8b1cb6b57e33910a9520b818a81c376451af0da6c037aa34 SHA512 7f46d28a97805eddd9d547ba66263cd395be46b495f4a9651312cfb421714b614d2c7415142c929c99386d32799fe78ea10110471b702487be4072b981ca17ee
diff --git a/sci-libs/metis/files/metis-5.1.0-remove-GKlib-O3.patch b/sci-libs/metis/files/metis-5.1.0-remove-GKlib-O3.patch
new file mode 100644
index 000000000000..507395867fcc
--- /dev/null
+++ b/sci-libs/metis/files/metis-5.1.0-remove-GKlib-O3.patch
@@ -0,0 +1,11 @@
+--- a/GKlib/GKlibSystem.cmake
++++ b/GKlib/GKlibSystem.cmake
+@@ -20,7 +20,7 @@
+ elseif(MINGW)
+   set(GKlib_COPTS "-DUSE_GKREGEX")
+ else()
+-  set(GKlib_COPTS "-O3")
++  set(GKlib_COPTS "")
+   set(GKlib_COPTIONS "-DLINUX -D_FILE_OFFSET_BITS=64")
+ endif(MSVC)
+ if(CYGWIN)
diff --git a/sci-libs/metis/metis-4.0.3-r2.ebuild b/sci-libs/metis/metis-4.0.3-r2.ebuild
new file mode 100644
index 000000000000..ca26fa871dcb
--- /dev/null
+++ b/sci-libs/metis/metis-4.0.3-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fortran-2
+
+DESCRIPTION="A package for unstructured serial graph partitioning"
+HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/metis/"
+SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/OLD/${P}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+RESTRICT="mirror bindist"
+
+RDEPEND="!sci-libs/parmetis"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.0.1-autotools.patch )
+
+src_prepare() {
+	default
+	sed -i -e "s/4.0.1/${PV}/" configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	use doc && dodoc Doc/manual.ps
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/metis/metis-5.1.0-r4.ebuild b/sci-libs/metis/metis-5.1.0-r4.ebuild
new file mode 100644
index 000000000000..5f62daa4aff8
--- /dev/null
+++ b/sci-libs/metis/metis-5.1.0-r4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake fortran-2
+
+DESCRIPTION="A package for unstructured serial graph partitioning"
+HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/metis/"
+SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc openmp"
+
+RDEPEND="!sci-libs/parmetis"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-datatype.patch
+	"${FILESDIR}"/${P}-shared-GKlib.patch
+	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${P}-remove-GKlib-O3.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGKLIB_PATH="${S}"/GKlib
+		-DSHARED=yes
+		-DOPENMP=$(usex openmp)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cd graphs || die
+	local PATH="${BUILD_DIR}"/programs/:${PATH}
+
+	ndmetis mdual.graph || die
+	mpmetis metis.mesh 2 || die
+	gpmetis test.mgraph 4 || die
+	gpmetis copter2.graph 4 || die
+	graphchk 4elt.graph || die
+}
+
+src_install() {
+	cmake_src_install
+	dodoc manual/manual.pdf
+
+	cat >> "${T}"/metis.pc <<- EOF || die
+		prefix=${EPREFIX}/usr
+		exec_prefix=\${prefix}
+		libdir=\${exec_prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+
+		Name: METIS
+		Description: Software for partioning unstructured graphes and meshes
+		Version: ${PV}
+		Cflags: -I\${includedir}/metis
+		Libs: -L\${libdir} -lmetis
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${T}"/metis.pc
+}
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index fc1a00bafd29..1110c86f5e08 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,15 +1,7 @@
-AUX ogdi-3.2.0-acinclude.patch 508 BLAKE2B 97ab24d0f836b3da111f88455734e681f203932c98ec85319e49843575e4ed224d04f319a7fd6069c9ea6b08ece00838c82236a9425e90e9262fbe144c1d5765 SHA512 6782744a2d7ae0e2a11d6b600777e10891c4ff68f2e32d205b8e96b79dcbdde4d863a25ed263705df54e48ed1fedeffcee085ec12fc769fe53a22f7cb863441c
-AUX ogdi-3.2.0-aclocal.patch 2048 BLAKE2B 91fe93c2ab1adb8d9561411a3668f093ba6922586f9401d7abbc449fea057ba6315595604eba123fa8149d608358f15d6ff1c4c2b4765c41377c2c91ddb77a57 SHA512 a63e00f5e1706169311d43e00c2baa78d017eee728dd1bafad10aa3d9f7332ecdb5bfea1b24df888dd06d9de1f09339da68ea8ed663e9f1fa97665459b2099f1
 AUX ogdi-3.2.0-endianess.patch 1028 BLAKE2B 25ea3bb0991b201bbfae2597ae622e2cd0a18749d274e6553e7dcd31cd2befb15f2bea1dd073f8d6d3bac568aeafbdaac6b04b7fcb0597733a97ea926bbd9a49 SHA512 3a4ee5ee69f27fbad6170f1e3142a70ba529bd81a9b3209d1cb005a2ebf1c04f782194f20e8a046a19ec817c81ee04a9f7ab192321f8dc9590f4f8823c71d38e
-AUX ogdi-3.2.0-fpic.patch 896 BLAKE2B ef7056cd60c3cb046137b7dc6bfea37fe711c9b41feb5c1bb40acd1b5fc8fb63178149e6d72c4a89940d45b4164d7cd93e26f003c845ce59862096fbcfb1e87e SHA512 71b429563254762a485ac05b9efdb4da29bc1c909b19d830b06a680722eee0991f0448d1885c9c96dad53e4a821257404f8b95bbb0d54a8fbca2300987d9f244
-AUX ogdi-3.2.0-ldflags.patch 700 BLAKE2B 6a2b494e35644dfa544ed000c4b3139b03a495e6a782bc8ad42fb1038b89b6e436222a1425b8a6ac7ca70e7680beadba4996de600202454e0e13c8f31b18ed63 SHA512 0d1c8c9bbff63abcfb713c4a2df627e9b00278eb00e89e3aecbeb87a6f9d4196687fd4eb5829248c352dd41f16db4060285bf4e1ea75df2f7c3f51dc314446d8
 AUX ogdi-3.2.0-optimisation.patch 247 BLAKE2B 097d0e9615352512f5322b7e11826fe4352728f020b76c4c7dcbb58c6cc9903165ac49ec442c773a97bb575271f37e88a5f22951aae507afa0483c6b512d5488 SHA512 894dd439f0599e68117a82e461e75e5e48efde1bcd165fde727339b3d5855a17fab1f721663154a8d8626e38607237d8136e41a57b6b390f061762dd317b2e3c
-AUX ogdi-3.2.0-rpc.patch 11640 BLAKE2B 86809477603e9842e9c80e59b83769ef7a67e05aa5fd8db5795639aa0387a3f7324405bf4ea532a522154f88a4fd29469b7bdbef3285771b4c54c625c33f32a0 SHA512 b16647603aec1a2bc5fdcdf17234d78c62d882777187ba4896d7ea7ef96025c663f585866fa70e432700faa1963c2d2643f6b83791a90f4c38fc1e426b84889a
 AUX ogdi-3.2.0-tcl.patch 320 BLAKE2B 4cf742b86210f4b78f9cfd304e6ed928fdeb26aebc541d3de3017939b75f08ec47676e5c91466a9ec667830b7cebacd334878cb30ba4d0937ab9f5408bb1333f SHA512 19f08d16caab2cc456b608f89f100830de6c2b7d13336240a9738c5435fe6065a946c4929dab386889363d392dd701dc5be5c1a1d6b589c31721caa5fddf97b8
-AUX ogdi-3.2.0_beta2-subdirs.patch 905 BLAKE2B 69db0794449ca68b61ba8723585a2d055836f2bfd031023073b515a326ca04215833c9ab1ef1d73f1bd5392a56d2479ba71d9a24fea42f5a41f239a3ec6c55db SHA512 b6e6f50dafdb6aea991b8ece37953a9910b3fa790dcb68108ba7316c81de3cffae1413afb9d9126457550fa46bded8a7613c8be27fcd9956c8c17b5b64065732
 AUX ogdi-4.1.0-subdirs.patch 600 BLAKE2B b42bfc9fbd88e729a604d53d72464af1e91c47f765c29ea18001118b63b14ac35e2e2ad4afef5da8e03a97f5703aaec4c435451b5012c6a16d8e1db48aeab572 SHA512 b3557d0b2e1b55231988401474d0242296c66199731998487301e39849410a4c55f4c50de8ee70c2a44619198d9049a23207c2046989a210915c742172897b87
-DIST ogdi-3.2.0.tar.gz 976004 BLAKE2B 535f05b3145c49ce72adcd86cd9ded1c8d8d12e051feb4e1898d8ddabbff1cf27f609326ccdb3a1cbff523b277f99e9d8c3678d2ed565dd81e6c5d956ed2dcca SHA512 b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0
 DIST ogdi-4.1.0.tar.gz 848818 BLAKE2B d037d7a1b97e0db4b714e94a46c04e7126b5ab520e9cf54ffaba5f3e8ffa694690f4863ce257a4f56a3a596ae3ce430eb8f656f700a9287455b9f540299c6b1a SHA512 abfc409bfa5ea2f81a90c16361fe6cdc2b2ee39775c22ceb74b13b171aa04d6d6eaffe398cae0ef91dcde8509e5cc25100eedeffdad358e090b78e118d386859
-EBUILD ogdi-3.2.0-r1.ebuild 1730 BLAKE2B 0414eebbe445021de0a41e17ae77f5b954d025c90c3f4e74708e941793d3bd5cb171a329897b06b0652fa01dc4e036cadb4199ee56a7b6503a8ca38cd74d1b74 SHA512 8602a2c3ed67233f23006739206a471e72fed4a8d370150bbaa7d3f7e9f3a0567eca246d7ec47db96767237538a42962cfc3dbee12ba9cd317d4479590931a93
-EBUILD ogdi-4.1.0.ebuild 1294 BLAKE2B c93e6386c764d4b884e78538cdecd14d1dcf95835db25eefca763a23f103c3b6131c8ac8587c3da015d471f7f8b5b39d28900afee227b63ac6226e7fcb88f79f SHA512 54f53ef1b5c73f1b4908257e1554f04c6ec4cead60c7c5ecca092bf34d153682f9f1556b59931ed2d6dfd0487e7b43b969bb18f1cbef1f5a5791aad32431ddfe
+EBUILD ogdi-4.1.0.ebuild 1292 BLAKE2B 0afbdc5e6e7e21aecaaac7f1f94d4709f945e24c4bf7f624519e820704d3aed3e22b0f496137870892d125620f6f31d8865d6c4bb34373dca0da763a8db0debc SHA512 bad62a8b25c92ef7a2544a80cd3e54312d38aafe68b54415966b1288fca0e710faee7591bd06bbd6b8feb53d59be58507afee3bd015081e6746df0de18175af3
 MISC metadata.xml 337 BLAKE2B 01ea83d967f6073198b6a96775ed63b603dcd4736a3a3faa8d8e5e891d2b4fb25ef436425fe51be91d4d81702f392c7f28274738b7d672a82d681159e28b87dd SHA512 958474862734f915497c1e574254cd2152009f436b59dd57be9bcd5ad0ae2949dba1f6275ad3a68b3a6d60863093df2bf2bcfffdea51b591e9c1864231899221
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch b/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch
deleted file mode 100644
index 6952e7d349df..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 9e56a8be9e228b466d6464f09349a8ea2c3ec637 Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Tue, 28 Nov 2017 23:23:11 +0100
-Subject: [PATCH 2/6] Rename aclocal.m4 to acinclude.m4 to prevent clash with
- actual aclocal generated file
-
----
- aclocal.m4 => acinclude.m4 | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename aclocal.m4 => acinclude.m4 (100%)
-
-diff --git a/aclocal.m4 b/acinclude.m4
-similarity index 100%
-rename from aclocal.m4
-rename to acinclude.m4
--- 
-2.15.0
-
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch b/sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch
deleted file mode 100644
index bc39b7753d3b..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 2f8d760ac4470e22f2f4965aa3282ea21ffa1f17 Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Tue, 28 Nov 2017 23:21:39 +0100
-Subject: [PATCH 3/6] Apply stricter quoting to macros defined in acinclude.m4
-
-Refer to the automake manual for details on why recent versions of aclocal are
- more strict:
- https://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal
----
- acinclude.m4 | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 163a446..9d3308e 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -1,4 +1,4 @@
--AC_DEFUN(AC_COMPILER_WFLAGS,
-+AC_DEFUN([AC_COMPILER_WFLAGS],
- [
- 	# Remove -g from compile flags, we will add via CFG variable if
- 	# we need it.
-@@ -8,17 +8,17 @@ AC_DEFUN(AC_COMPILER_WFLAGS,
- 	# check for GNU compiler, and use -Wall
- 	if test "$GCC" = "yes"; then
- 		C_WFLAGS="-Wall"
--		AC_DEFINE(USE_GNUCC)
-+		AC_DEFINE([USE_GNUCC])
- 	fi
- 	if test "$GXX" = "yes"; then
- 		CXX_WFLAGS="-Wall"
--		AC_DEFINE(USE_GNUCC)
-+		AC_DEFINE([USE_GNUCC])
- 	fi
--	AC_SUBST(CXX_WFLAGS,$CXX_WFLAGS)
--	AC_SUBST(C_WFLAGS,$C_WFLAGS)
-+	AC_SUBST([CXX_WFLAGS],$CXX_WFLAGS)
-+	AC_SUBST([C_WFLAGS],$C_WFLAGS)
- ])
- 
--AC_DEFUN(AC_COMPILER_PIC,
-+AC_DEFUN([AC_COMPILER_PIC],
- [
- 	echo 'void f(){}' > conftest.c
- 	if test -z "`${CC-cc} -fPIC -c conftest.c 2>&1`"; then
-@@ -33,8 +33,8 @@ AC_DEFUN(AC_COMPILER_PIC,
- 	fi
- 	rm -f conftest*
- 
--	AC_SUBST(CXX_PIC,$CXX_PIC)
--	AC_SUBST(C_PIC,$C_PIC)
-+	AC_SUBST([CXX_PIC],$CXX_PIC)
-+	AC_SUBST([C_PIC],$C_PIC)
- ])
- 
- dnl
-@@ -42,7 +42,7 @@ dnl Try to find something to link shared libraries with.  Use "c++ -shared"
- dnl in preference to "ld -shared" because it will link in required c++
- dnl run time support for us. 
- dnl
--AC_DEFUN(AC_LD_SHARED,
-+AC_DEFUN([AC_LD_SHARED],
- [
-   echo 'void g(); int main(){ g(); return 0; }' > conftest1.c
- 
-@@ -88,7 +88,7 @@ AC_DEFUN(AC_LD_SHARED,
-   fi
-   rm -f conftest* libconftest* 
- 
--  AC_SUBST(LD_SHARED,$LD_SHARED)
-+  AC_SUBST([LD_SHARED],$LD_SHARED)
- ])
- 
- 
--- 
-2.15.0
-
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch b/sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch
deleted file mode 100644
index a9cad1ef8a7a..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a4a7fdb81c7b78159541d1e027275b8b4893cc4a Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Tue, 28 Nov 2017 23:03:34 +0100
-Subject: [PATCH 5/6] Compile everything with -fPIC if required
-
-Previously only objects directly compiled for shared objects were compiled
- with -fPIC, but static objects linked into shared objects also need this flag.
----
- config/generic.mak.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/generic.mak.in b/config/generic.mak.in
-index 699166b..3b671d7 100644
---- a/config/generic.mak.in
-+++ b/config/generic.mak.in
-@@ -35,7 +35,7 @@ AR		= ar cr
- # Compilation and linking flags
- #
- SHLIB_CFLAGS	= @C_PIC@
--COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1
-+COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@
- 
- SHLIB_LDFLAGS	= -shared 
- COMMON_LDFLAGS  = $(OPTIMIZATION) 
--- 
-2.15.0
-
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch b/sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch
deleted file mode 100644
index a21a12d354fa..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 216529de46898bdeda075f084f4f62c796bfef87 Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Tue, 28 Nov 2017 23:53:03 +0100
-Subject: [PATCH 4/6] Respect LDFLAGS provided to ./configure
-
----
- config/generic.mak.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/generic.mak.in b/config/generic.mak.in
-index 699166b..86b7fa2 100644
---- a/config/generic.mak.in
-+++ b/config/generic.mak.in
-@@ -38,7 +38,7 @@ SHLIB_CFLAGS	= @C_PIC@
- COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1
- 
- SHLIB_LDFLAGS	= -shared 
--COMMON_LDFLAGS  = $(OPTIMIZATION) 
-+COMMON_LDFLAGS  = $(OPTIMIZATION) @LDFLAGS@
- 
- RPC_INCLUDES = @RPC_INCLUDES@
- 
--- 
-2.15.0
-
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch b/sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch
deleted file mode 100644
index 1569003d4e4d..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 52b4a972c164d6900584f147ba4bf73f02e0bbe7 Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Tue, 28 Nov 2017 23:25:41 +0100
-Subject: [PATCH 6/6] Fall back to libtirpc if libc does not provide rpc/rpc.h
-
----
- config/generic.mak.in |   4 +-
- configure             | 245 +++++++++++++++++++++++++++++++++++++++++++++++++-
- configure.in          |   6 ++
- ogdi-config.in        |   4 +-
- ogdi.pc.in            |   4 +-
- 5 files changed, 255 insertions(+), 8 deletions(-)
-
-diff --git a/config/generic.mak.in b/config/generic.mak.in
-index 3b671d7..6ff7e33 100644
---- a/config/generic.mak.in
-+++ b/config/generic.mak.in
-@@ -35,7 +35,7 @@ AR		= ar cr
- # Compilation and linking flags
- #
- SHLIB_CFLAGS	= @C_PIC@
--COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@
-+COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@ @RPC_CFLAGS@
- 
- SHLIB_LDFLAGS	= -shared 
- COMMON_LDFLAGS  = $(OPTIMIZATION) 
-@@ -61,7 +61,7 @@ INST_BIN	= @bindir@
- #
- #RPC_LINKLIB	= -lrpcsvc -lnsl -lsocket
- #RPC_LINKLIB	=	-ldl -ldbmalloc
--RPC_LINKLIB	=	@LIBS@
-+RPC_LINKLIB	=	@LIBS@ @RPC_LIBS@
- 
- #
- # Endian definition, could be little or big
-diff --git a/configure b/configure
-index d7acc10..c6459e0 100755
---- a/configure
-+++ b/configure
-@@ -634,6 +634,8 @@ PROJ_INCLUDE
- PROJ_SETTING
- BIG_ENDIAN
- RPC_INCLUDES
-+RPC_LIBS
-+RPC_CFLAGS
- EGREP
- GREP
- CPP
-@@ -643,6 +645,9 @@ CXX_PIC
- C_WFLAGS
- CXX_WFLAGS
- HAVE_ICONV
-+PKG_CONFIG_LIBDIR
-+PKG_CONFIG_PATH
-+PKG_CONFIG
- OBJEXT
- EXEEXT
- ac_ct_CC
-@@ -714,7 +719,12 @@ CFLAGS
- LDFLAGS
- LIBS
- CPPFLAGS
--CPP'
-+PKG_CONFIG
-+PKG_CONFIG_PATH
-+PKG_CONFIG_LIBDIR
-+CPP
-+RPC_CFLAGS
-+RPC_LIBS'
- 
- 
- # Initialize some variables set by options.
-@@ -1343,7 +1353,14 @@ Some influential environment variables:
-   LIBS        libraries to pass to the linker, e.g. -l<library>
-   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-               you have headers in a nonstandard directory <include dir>
-+  PKG_CONFIG  path to pkg-config utility
-+  PKG_CONFIG_PATH
-+              directories to add to pkg-config's search path
-+  PKG_CONFIG_LIBDIR
-+              path overriding pkg-config's built-in search path
-   CPP         C preprocessor
-+  RPC_CFLAGS  C compiler flags for RPC, overriding pkg-config
-+  RPC_LIBS    linker flags for RPC, overriding pkg-config
- 
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -2867,6 +2884,126 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- 
-+
-+
-+
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+	if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_PKG_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+  ac_pt_PKG_CONFIG=$PKG_CONFIG
-+  # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $ac_pt_PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_pt_PKG_CONFIG" = x; then
-+    PKG_CONFIG=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    PKG_CONFIG=$ac_pt_PKG_CONFIG
-+  fi
-+else
-+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+fi
-+
-+fi
-+if test -n "$PKG_CONFIG"; then
-+	_pkg_min_version=0.9.0
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	else
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+		PKG_CONFIG=""
-+	fi
-+fi
-+
-+
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
- if ${ac_cv_lib_dl_dlopen+:} false; then :
-@@ -3045,7 +3182,6 @@ HAVE_ICONV=$HAVE_ICONV
- 
- 
- 
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3443,6 +3579,111 @@ fi
- done
- 
- 
-+for ac_header in rpc/rpc.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_rpc_h" "$ac_includes_default"
-+if test "x$ac_cv_header_rpc_rpc_h" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_RPC_RPC_H 1
-+_ACEOF
-+
-+else
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtirpc" >&5
-+$as_echo_n "checking for libtirpc... " >&6; }
-+
-+if test -n "$RPC_CFLAGS"; then
-+    pkg_cv_RPC_CFLAGS="$RPC_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_RPC_CFLAGS=`$PKG_CONFIG --cflags "libtirpc" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$RPC_LIBS"; then
-+    pkg_cv_RPC_LIBS="$RPC_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_RPC_LIBS=`$PKG_CONFIG --libs "libtirpc" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        RPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtirpc" 2>&1`
-+        else
-+	        RPC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtirpc" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$RPC_PKG_ERRORS" >&5
-+
-+	as_fn_error $? "Package requirements (libtirpc) were not met:
-+
-+$RPC_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables RPC_CFLAGS
-+and RPC_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details." "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables RPC_CFLAGS
-+and RPC_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details" "$LINENO" 5; }
-+else
-+	RPC_CFLAGS=$pkg_cv_RPC_CFLAGS
-+	RPC_LIBS=$pkg_cv_RPC_LIBS
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+fi
-+fi
-+
-+done
-+
-+
- for ac_header in rpc/pmap_clnt.h float.h dlfcn.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-diff --git a/configure.in b/configure.in
-index 68b1c92..d5fe134 100644
---- a/configure.in
-+++ b/configure.in
-@@ -23,6 +23,7 @@ fi
- 
- dnl Checks for programs.
- AC_PROG_CC
-+PKG_PROG_PKG_CONFIG
- 
- dnl We always want to check /usr/local for stuff.
- dnl LIBS="$LIBS -L/usr/local/lib"
-@@ -38,6 +39,11 @@ AC_COMPILER_WFLAGS
- AC_COMPILER_PIC
- AC_LD_SHARED
- 
-+dnl ---------------------------------------------------------------------------
-+dnl	Do we have rpc/rpc.h
-+dnl ---------------------------------------------------------------------------
-+AC_CHECK_HEADERS([rpc/rpc.h],,
-+	[PKG_CHECK_MODULES([RPC], [libtirpc])])
- 
- dnl ---------------------------------------------------------------------------
- dnl	Do we have rpc/pmap_clnt.h, float.h, dlfcn.h?
-diff --git a/ogdi-config.in b/ogdi-config.in
-index f3c9a03..c6dfc50 100644
---- a/ogdi-config.in
-+++ b/ogdi-config.in
-@@ -13,8 +13,8 @@ exec_prefix="@exec_prefix@"
- libdir="@libdir@"
- includedir="@includedir@/ogdi"
- libs="-logdi"
--all_libs="-logdi -lproj -lexpat -lz"
--I_opts="-I${includedir}"
-+all_libs="-logdi -lproj -lexpat -lz @RPC_LIBS@"
-+I_opts="-I${includedir} @RPC_CFLAGS@"
- L_opts=""
- R_opts=""
- cppflags=""
-diff --git a/ogdi.pc.in b/ogdi.pc.in
-index 8b919de..1f290d9 100644
---- a/ogdi.pc.in
-+++ b/ogdi.pc.in
-@@ -6,7 +6,7 @@ includedir=@includedir@
- Name: ogdi
- Description: Open Geographic Datastore Interface
- Version: @OGDI_VERSION@
--Cflags: -I${includedir}/ogdi
-+Cflags: -I${includedir}/ogdi @RPC_CFLAGS@
- Libs: -L${libdir} -logdi
--Libs.private: -lproj -lexpat -lz
-+Libs.private: -lproj -lexpat -lz @RPC_LIBS@
- 
--- 
-2.15.0
-
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-subdirs.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-subdirs.patch
deleted file mode 100644
index c98390c440de..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-subdirs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN ogdi-3.2.0.beta2.old/makefile ogdi-3.2.0.beta2/makefile
---- ogdi-3.2.0.beta2.old/makefile	2011-06-17 12:45:53.171219473 +0200
-+++ ogdi-3.2.0.beta2/makefile	2011-06-17 12:46:34.013708870 +0200
-@@ -17,7 +17,7 @@
- #
- # Sub-directories that need to be built
- #
--subdirs	= external vpflib ogdi contrib
-+subdirs	= vpflib ogdi contrib
- 
- ifneq ($(PROJ_SETTING),external)
- subdirs := proj $(subdirs) 
-diff -urN ogdi-3.2.0.beta2.old/ogdi/makefile ogdi-3.2.0.beta2/ogdi/makefile
---- ogdi-3.2.0.beta2.old/ogdi/makefile	2011-06-17 12:45:53.174219434 +0200
-+++ ogdi-3.2.0.beta2/ogdi/makefile	2011-06-17 12:47:38.814898744 +0200
-@@ -15,7 +15,7 @@
- #
- # Sub-directories that need to be built
- #
--subdirs	= include c-api glutil attr_driver datum_driver driver gltpd examples
-+subdirs	= include c-api glutil attr_driver datum_driver driver gltpd
- 
- #
- # Default target to build everything in all sub-directories
diff --git a/sci-libs/ogdi/ogdi-3.2.0-r1.ebuild b/sci-libs/ogdi/ogdi-3.2.0-r1.ebuild
deleted file mode 100644
index 7de1803045b3..000000000000
--- a/sci-libs/ogdi/ogdi-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${P/_/.}
-inherit toolchain-funcs
-
-DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
-HOMEPAGE="http://ogdi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="
-	net-libs/libtirpc
-	dev-libs/expat
-	>=sci-libs/proj-4.9.0:=
-	<sci-libs/proj-6.0.0:=
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( ChangeLog NEWS README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.0_beta2-subdirs.patch
-	"${FILESDIR}"/${P}-acinclude.patch
-	"${FILESDIR}"/${P}-aclocal.patch
-	"${FILESDIR}"/${P}-endianess.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-optimisation.patch
-	"${FILESDIR}"/${P}-rpc.patch
-	"${FILESDIR}"/${P}-tcl.patch
-)
-
-src_prepare() {
-	default
-	rm -r external || die
-	sed 's:O2:O9:g' -i configure || die
-}
-
-src_configure() {
-	export TOPDIR="${S}"
-	export TARGET=$(uname)
-	export CFG="release"
-	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
-
-	econf \
-		--with-projlib="-L${EPREFIX}/usr/$(get_libdir) -lproj" \
-		--with-expat \
-		--with-zlib
-}
-
-src_compile() {
-	# bug #299239
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		SHLIB_LD="$(tc-getCC)"
-}
-
-src_install() {
-	mv "${S}"/bin/${TARGET}/*.so* "${S}"/lib/Linux/. || die "lib move failed"
-	dobin "${S}"/bin/${TARGET}/*
-	insinto /usr/include
-	doins ogdi/include/ecs.h ogdi/include/ecs_util.h
-	dolib.so lib/${TARGET}/lib*
-	use static-libs && dolib.a lib/${TARGET}/static/*.a
-#	dosym libogdi31.so /usr/$(get_libdir)/libogdi.so
-	einstalldocs
-}
diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
index a355b84b1d17..8c064938d77e 100644
--- a/sci-libs/ogdi/ogdi-4.1.0.ebuild
+++ b/sci-libs/ogdi/ogdi-4.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libogdi/ogdi/releases/download/${PN}_${PV//./_}/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 81e7b71addd6..b6d04a128612 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,14 +1,8 @@
-DIST libsc-1.0.tar.gz 257930 BLAKE2B b67ee98d8a31dcd09af70783a253b7289657c51e345c59b6551ab8be3a2067ce20d75c3f6323f4113501d57baf31d95c5a40b025c77f37a693616ae2bb118266 SHA512 bf5af600e9cbd4038b1bd40c88776b21be5d474e34f9aacf287b890d262a22dc50ca27982c2eb9adba9735c8d9bb1fc31de2a27b24cdab534e3b2f610d76db7d
-DIST libsc-1.1.tar.gz 263643 BLAKE2B 827c0e01154983dd309301c6ecfa380d3489b5b764f131c2df2554b002a6c726a44272963cef4b4a853af5fb4c9ba98c77b01e107fc555432317662d985de2a9 SHA512 a3d8bea406a1987e68e88dd587aebe28c796f2a5bddfc381b34b5eb1448e0ac23889cc6f97fc1e4010289f83996180db42cbb001d0518360349b993dd37d4579
 DIST libsc-2.0.tar.gz 296392 BLAKE2B b5e1ca5cf6802ed38c32db5e7a77aec2fc636d88f2562314088dc16d13a0dccd24706276b05f8ddd70bc3769270a378c0089873fb2a21ebc93d6ca2622d7a58e SHA512 e4cfe42a1c1fe17412e1ffb6ebebe1f760861a7fb707a6f8fd01cdebda96b166ee05e7ff034f3b9e30de5e9baa82c9a2cebe93d40772dbd206603321de40559c
 DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
-DIST p4est-1.0.tar.gz 695027 BLAKE2B 1b4c21e0ada4928da4fbf94e80e123ad39a1b4701f6019d0e49073b68c90662a277302a07cad22bb1d71a72a47cde8e1cbbfd4475dd7542bcee1c0474bb4addf SHA512 781240bbca2779f4076c310575ad99e8b526ecf6a3da8b7b5f096615bbfb570dd0556e607797715b69c95c6dd73baf837f1c632be763efae835941107f1fe3df
-DIST p4est-1.1.tar.gz 1241423 BLAKE2B 3bb767f062a204abee4af64351981609c818c9b1f6bc5fa738161f706e5c9aebe208a4fc76010a2a05d6936070952e938b6ee632bd3ccc6676776fd60d451ef8 SHA512 11eb576a16a4cc959eff8894d6cb11d8bae092951be9cf9d71b538825bdf675af7fd77d79505b9e896ec1810c1f8e9391447a79263c6d2e33fef780e97d07f29
 DIST p4est-2.0.tar.gz 1296762 BLAKE2B 1d755ec72905da069b9c91182a437c59107189402eb26444cf7fc1755b81bdbfad9aa25802720df401e8d434e5ac67e68b1d7dd5bf312f881017925498ad7514 SHA512 05f8a95ad431bd36fd3e48ca9360de0f90d1af7dfc77601cd46766898a9bc82b9157e22bdb6135e7003f59c7ecc4cd9ad34b89de25ba3c6f11a86d46cac8592c
 DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
-EBUILD p4est-1.0.ebuild 2365 BLAKE2B 1c859cfd29f8a65d7b3771359259bbeeb233bd72bb30e53d8842d86b0022aea22acdcecf9fc67e5f8e5b2295b47fe2f0cf95dd59080eeabff84ed279f21600a5 SHA512 d90f20fc2875784e32ef6525d188840c302b7ed3f48a1f0cdeed3333a5cfef3b07d1fa449168d3a4693ed79d3d5572b8cd764460bff6a079a2f8404002124ebe
-EBUILD p4est-1.1.ebuild 2365 BLAKE2B 1c859cfd29f8a65d7b3771359259bbeeb233bd72bb30e53d8842d86b0022aea22acdcecf9fc67e5f8e5b2295b47fe2f0cf95dd59080eeabff84ed279f21600a5 SHA512 d90f20fc2875784e32ef6525d188840c302b7ed3f48a1f0cdeed3333a5cfef3b07d1fa449168d3a4693ed79d3d5572b8cd764460bff6a079a2f8404002124ebe
-EBUILD p4est-2.0.ebuild 2835 BLAKE2B c90b355211b4c3303a972b1f9b052ed36eff9168cb008e4f248fa96054865ef1beac8355a6cbf3df56dc80258a23af38cc40dbb77cd24b447fc98a8683836ef6 SHA512 28f0ddeb51b7da3524b01200619774a25bb10eb9391628cfcff11cf3f75dcbee6816c4d20e7ba807019f24efb267ea57fd5d50a9f4124dc52355aa88919a4b82
-EBUILD p4est-2.2.ebuild 2835 BLAKE2B 337234ce3eb5049ce91495e3270f25a7d553fc9fe8ab4f740253eafeea9f874aa34308f72f0090434a9a6a3781500da89db39f5e3e119af9d9350755940b1888 SHA512 0d7932a46330cde69e49429bc52950b3657d2357d43d8814eed7363f662cbeb904c1177296b079fa1586dce85822a9bd66c8cedc85dc5ba1848b27e8af272654
-EBUILD p4est-9999.ebuild 2838 BLAKE2B 3e4d0259a61a05405dade87c061706d4f429a9d0401425c3c7470decfffa694918126b241c6168c2c8ead0375af969ec60c085540c447a04b5e3c7ca9034c7f3 SHA512 be1c6511203483fe643f22caa9f4b0ae9301a293a10bac44483fc790d80c9e0208d99c69e4a0319b9114ace71693815c0b174172b0af80790b09b12cfc8af2ca
+EBUILD p4est-2.0.ebuild 2852 BLAKE2B f76d5c34ef6cc894c203f8cea806a934b4d2fd75b04fc77121a0cf9e4d219d2e4bc123659496cd7a295f117677f253184c86d48aff7a8bb3edfbefb1de121f78 SHA512 5babffa664c28d8ce18a3e84ffd82c0720ff7a184b97497adcb1bb829dd0d7c5dbcf767b77d9f474fe8504b264057c7cd799aff8682dd987287791534f46820b
+EBUILD p4est-2.2.ebuild 2852 BLAKE2B e9b030229282277c77989e811debabf283f6ae45e6ec00457e6dc754c65f0ff34f7da98ac1d551cb7147acf61c54735aba65aab72cba56f18185dafbb4deab9b SHA512 73c4556abdd88d936ba07e7d53caa557f6b06132d346fdccafd17409e1fde5527908a89c9a9f58b879df60316fab6f00f0364c7a63008498494340fd3d06f356
+EBUILD p4est-9999.ebuild 2852 BLAKE2B f76d5c34ef6cc894c203f8cea806a934b4d2fd75b04fc77121a0cf9e4d219d2e4bc123659496cd7a295f117677f253184c86d48aff7a8bb3edfbefb1de121f78 SHA512 5babffa664c28d8ce18a3e84ffd82c0720ff7a184b97497adcb1bb829dd0d7c5dbcf767b77d9f474fe8504b264057c7cd799aff8682dd987287791534f46820b
 MISC metadata.xml 932 BLAKE2B 25927e97d0092f9fbab6dd7c35f0b2d6b568f1a9790fb1d31917a42946cea1305f9b31aa7cf5773a2b1588b94aab482de2ebfb9aa867af14b8bba2765be2faea SHA512 9c3b0cc4f9f95cf8f4c7d0e250fbc2934e80563ac98b131031d5ba66122a47b9435027f452aeee2df0e917098c7f626513001a30f57952bfaaece21fc9dcc1c1
diff --git a/sci-libs/p4est/p4est-1.0.ebuild b/sci-libs/p4est/p4est-1.0.ebuild
deleted file mode 100644
index 266da27018f1..000000000000
--- a/sci-libs/p4est/p4est-1.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# The build system currently fails with everything newer than 1.11.
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
-HOMEPAGE="http://www.p4est.org/"
-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"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE="debug doc examples mpi romio static-libs +vtk-binary"
-REQUIRED_USE="romio? ( mpi )"
-
-RDEPEND="
-	~sci-libs/libsc-${PV}[mpi=,romio=,static-libs=]
-	dev-lang/lua:*
-	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 )
-
-src_prepare() {
-	default
-
-	# Inject libsc to get  all parts of the build system...
-	rmdir "${S}/sc" || die "rmdir failed"
-	mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
-
-	# 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/libsc\.la/libsc\.so/" \
-		"${S}"/configure || die "sed failed"
-}
-
-src_configure() {
-	# avoid underlinkage
-	LDFLAGS="${LDFLAGS} -lsc"
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable mpi)
-		$(use_enable romio mpiio)
-		$(use_enable static-libs static)
-		$(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/p4est/p4est-1.1.ebuild b/sci-libs/p4est/p4est-1.1.ebuild
deleted file mode 100644
index 266da27018f1..000000000000
--- a/sci-libs/p4est/p4est-1.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# The build system currently fails with everything newer than 1.11.
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
-HOMEPAGE="http://www.p4est.org/"
-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"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE="debug doc examples mpi romio static-libs +vtk-binary"
-REQUIRED_USE="romio? ( mpi )"
-
-RDEPEND="
-	~sci-libs/libsc-${PV}[mpi=,romio=,static-libs=]
-	dev-lang/lua:*
-	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 )
-
-src_prepare() {
-	default
-
-	# Inject libsc to get  all parts of the build system...
-	rmdir "${S}/sc" || die "rmdir failed"
-	mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
-
-	# 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/libsc\.la/libsc\.so/" \
-		"${S}"/configure || die "sed failed"
-}
-
-src_configure() {
-	# avoid underlinkage
-	LDFLAGS="${LDFLAGS} -lsc"
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable mpi)
-		$(use_enable romio mpiio)
-		$(use_enable static-libs static)
-		$(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/p4est/p4est-2.0.ebuild b/sci-libs/p4est/p4est-2.0.ebuild
index 62bc613a2602..8fd68ca09b10 100644
--- a/sci-libs/p4est/p4est-2.0.ebuild
+++ b/sci-libs/p4est/p4est-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -73,9 +73,8 @@ src_prepare() {
 		"${S}"/configure || die "sed failed"
 
 	sed -i \
-		"s/libsc\.la/libsc\.so/" \
+		"s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
 		"${S}"/configure || die "sed failed"
-
 }
 
 src_configure() {
diff --git a/sci-libs/p4est/p4est-2.2.ebuild b/sci-libs/p4est/p4est-2.2.ebuild
index 8cd883fb0d28..32ae041f931a 100644
--- a/sci-libs/p4est/p4est-2.2.ebuild
+++ b/sci-libs/p4est/p4est-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -73,9 +73,8 @@ src_prepare() {
 		"${S}"/configure || die "sed failed"
 
 	sed -i \
-		"s/libsc\.la/libsc\.so/" \
+		"s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
 		"${S}"/configure || die "sed failed"
-
 }
 
 src_configure() {
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index a54c8b564e3e..8fd68ca09b10 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -73,9 +73,8 @@ src_prepare() {
 		"${S}"/configure || die "sed failed"
 
 	sed -i \
-		"s/libsc\.la/libsc\.so/" \
+		"s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
 		"${S}"/configure || die "sed failed"
-
 }
 
 src_configure() {
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index cc3cf5bab54e..6ef3bb7d5691 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,14 +1,8 @@
-DIST proj-4.9.2-org_proj4_PJ.h 2960 BLAKE2B f5f367910490fb781a7ddb512e8eaae2d6de4fd1f5b8e9e1dc1b189959a57499174f6b1e90476f10cb4cb8860e069061eb8b507fbbb46b3e1e394df43f67561e SHA512 db2c2b8920ef1c0c56395480dd514e372d5385839ac553a36c92431f5662bb8ec47706489b5c12e0c4308967da58fc94b29a957ede627274ab685ab647151f2c
-DIST proj-4.9.2.tar.gz 874816 BLAKE2B a59a405298a7c8d5bcf3e1a29c5949b466fed5c3745d0f6d631fff3282f6135d6be21cd75c9b377692f4fb98ae6e10e75867fdeab868fdb49c1578073cd7e802 SHA512 34a506742bb27cbc7f5ee91ee7f8c7a27d0f5644a1dcfd11b1e59120040804b1621ddfa4212bff45a1c3fb85511e48ece21612e86033139bafbb50c165e77cda
-DIST proj-5.2.0.tar.gz 1398188 BLAKE2B 37a3a8ed78fd65342f33859662a38f85c3087409db9f00eb031feb5a2527a056e5f0debd97b47f9d08ba6575af2c41d9051de0865e1ad8bd88c956358e519d77 SHA512 f773117d22309d4ee8dbedc2a7b6ba27e8cd032e1bd0af3c98f270bf7b7ab3353be0b04d91202a1f137fc45164c8e8a52712bb06281948008160d08f9f9074ba
 DIST proj-6.2.1.tar.gz 2698759 BLAKE2B 69867c05ef727df63351bbb8bc787d039c6a333a6e28b5fbbd1814fd9ca3ec279dd58ee7f0f79c3601ced270b6fa38619120e58f4407c49890a74996bbf88da5 SHA512 1e8632a9c6fa00c0354473f60d81e4644f173b42f6613856ba03e2404f429864fd5052aacba945ccd265173397bed2abdbe325320b54bc7b1c4a75ad95395a89
 DIST proj-6.3.0.tar.gz 2758388 BLAKE2B 33f9d6ce6aa885667b7c1337abd218ee802581320880288f948378073d04c46118927147794ce6c97616c906c683c33bf10984d08463faea214ffbe80b12d62b SHA512 679fd2e57f27feeb956d2a8843cb9028895a78f0dac104c920cc9060afade434b953fb381fed350e5c8ac15cd796f795220e0f1ad276a4f7482d6e7f5681d06e
-DIST proj-datumgrid-1.5.zip 2250131 BLAKE2B c83b5bab72b790c70fbf3b95782ba4e8e93e2accc93a0a8c06667908dc437de44aa3623799f685e020269090be103bac568fe6a9d73ce128b8af024ec1ca8442 SHA512 9d9a935b3e984721a1ceafac49c139d3c5d9923c5bcef5f57fec8028a043c86e7de8bad9c200fa38cd6d1bf27b32dd0126597d42fee793d055e686f090604bf3
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.4.tar.gz 26115747 BLAKE2B 3dfb5c19362f9d9cdfc4ee5469e536b97d963a5ac3bcf6652ef5935ec393f4035bc15abc444d62cfa477478faabd66a8effe64dbb8eb26b7d73a717b4eae2e53 SHA512 4043c0791af086541a3e08f7ad667b25968ed25e6595c1f047e1272f52838d28ab4010a076f9524882f97d7aa9104769c0b9cdf17394915c5b70b0dc13e019ee
 DIST proj-datumgrid-europe-1.5.tar.gz 187195036 BLAKE2B 0f88922435793930e21ace8488e0d1cd6a6325880f90d61a91d1592e51191514db7fc93e08c4a6c51699e3eb43762786d11eea425c181a8d3f73ec5ad7848092 SHA512 456a8c27dad7ef8fc1790ef822e7e8dcbc69b79e0a28df8c6b58d24b0ef4a3221cebd8e911a0d84b7f00694247b0fb8f4361a38d7369f921da000c838812f389
-EBUILD proj-4.9.2.ebuild 1284 BLAKE2B 59769bb31fdea258a0149af00ba5e73f599705d51b32d1584368388bfd68ad4fe5af297a25bcb544fe0b9fca6a413a3fbf3cc939d46de756cfaa76ff65e98fce SHA512 5bda300c624a6f79cb7c5a8274f3f1be0b4f7ca9e0351c409f86154ffa975109f5147737b8ec1cb0581d52d2c297d5e1581ae4d7cfbe670d9bc2e85fe81ea16c
-EBUILD proj-5.2.0.ebuild 912 BLAKE2B 17615cadc426d50a728b460b8b24c82536049dda4cec04500e0e066043f339eff685b52669e58dc6475f77a1c7fb8d8d39fb233af941f800fb6e85472c4ab1ee SHA512 753932af1fd02f1ba414d712a54ac6bc5ea9e86f9585cb5c899b48b6791389624bd746cd9fdef09e298e745627aea696a8bada0a7d23b17c4e0596640f89ce19
 EBUILD proj-6.2.1.ebuild 1118 BLAKE2B efc31b3a18898c9fbf064d556a51b660bfabb2db0d08352d01367a2f1c88376d993dfeeee67556d5d65b57e22997e150a9ab80b90d497bf7d2a65487ea8b1108 SHA512 88101056c9660c8c088fc05592fbcb7c258c837aaad55971f4d7939c1ae79b51bb5069b963b8c6cfbedbfb4a54a0b9ce7324c6b056a8f4883e01e273b5bddde4
 EBUILD proj-6.3.0.ebuild 1123 BLAKE2B 27a3e1372aa2c62063b16caf2d9479d8d67092f9a6e3a0f7a1a3f7f2b52bb08694a358567d36fb96c8c4a5e1fca3ef24f8eded6834f3a0f9c787bb8ba3d204f1 SHA512 7f4a6c73f17a96e95848a81be7c3821deae554719db75ae02649b2430bb5b3e73b1c27e80cf66841820c59de825a9caed11d39c707c29d988641554db7787872
 MISC metadata.xml 513 BLAKE2B 4068b4ddcb4e95578df8da19650ab86b4dbfdba294a3d03f10ada37a578a2113b0d71720545c269b1c097d3a37dbc66ee0cdfe61889466171c109413088707fd SHA512 e841ea4fb30d3632fecca7d584121fce35dff2b23ad8a1feeb98a47f0a3b1d78f57a05b0d303aeff47f981f5b7feb831deb14644ab6615644c0a8593a6e321b3
diff --git a/sci-libs/proj/proj-4.9.2.ebuild b/sci-libs/proj/proj-4.9.2.ebuild
deleted file mode 100644
index 48d355b835f9..000000000000
--- a/sci-libs/proj/proj-4.9.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-opt-2 flag-o-matic ltprune
-
-DESCRIPTION="Proj.4 cartographic projection software"
-HOMEPAGE="http://trac.osgeo.org/proj/"
-SRC_URI="
-	http://download.osgeo.org/proj/${P}.tar.gz
-	http://download.osgeo.org/proj/${PN}-datumgrid-1.5.zip
-	http://trac.osgeo.org/proj/export/2647/trunk/proj/src/org_proj4_PJ.h -> ${P}-org_proj4_PJ.h
-"
-
-LICENSE="MIT"
-SLOT="0/9"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="java static-libs"
-
-RDEPEND=""
-DEPEND="
-	app-arch/unzip
-	java? ( >=virtual/jdk-1.5 )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"/nad || die
-	mv README README.NAD || die
-	cp "${DISTDIR}/${P}-org_proj4_PJ.h" "${S}/src/org_proj4_PJ.h" || die
-	unpack ${PN}-datumgrid-1.5.zip
-}
-
-src_configure() {
-	if use java; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		append-cflags "$(java-pkg_get-jni-cflags)"
-	fi
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with java jni)
-}
-
-src_install() {
-	default
-	cd nad || die
-	dodoc README.{NAD,NADUS}
-	insinto /usr/share/proj
-	insopts -m 755
-	doins test27 test83
-	insopts -m 644
-	doins pj_out27.dist pj_out83.dist
-	prune_libtool_files
-}
diff --git a/sci-libs/proj/proj-5.2.0.ebuild b/sci-libs/proj/proj-5.2.0.ebuild
deleted file mode 100644
index d08ae8605580..000000000000
--- a/sci-libs/proj/proj-5.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
-
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj4.org/"
-SRC_URI="
-	http://download.osgeo.org/proj/${P}.tar.gz
-	http://download.osgeo.org/proj/${DATUMGRID}
-"
-
-LICENSE="MIT"
-SLOT="0/13"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="static-libs"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"/nad || die
-	mv README README.NAD || die
-	unpack ${DATUMGRID}
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--without-jni
-}
-
-src_install() {
-	default
-	cd nad || die
-	dodoc README.{NAD,DATUMGRID}
-	insinto /usr/share/proj
-	insopts -m 755
-	doins test27 test83
-	insopts -m 644
-	doins pj_out27.dist pj_out83.dist
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/pyshp/Manifest b/sci-libs/pyshp/Manifest
index ffb25b4972fa..6ecb99b2636e 100644
--- a/sci-libs/pyshp/Manifest
+++ b/sci-libs/pyshp/Manifest
@@ -1,4 +1,6 @@
 DIST pyshp-1.2.0.tar.gz 58993 BLAKE2B f7cb69976b6dd089be45d7984765f803ce94300dc19df1b99a11ba876365f49659fb37a5ebfa36ebe3ce6de4df9f0b80f628160ace9b11a66a247f9a57ac0a80 SHA512 c77e19f258ba9d2e2c480b82c342d2bbeae4b5855627aa98777fbf590e904d50045edecaa0e5ec2e03ddaaf49bf7261944fb77bcd26bf6d21e50c90c30cd0b43
+DIST pyshp-2.1.0.tar.gz 215360 BLAKE2B 2b32a3db242b90f801abdbc31f3c930bc40c3ad0606433d90f62c6b9af3c0459e8c8467d60aec1075368779e5a4fffa9e3985e1875d82edf732faf982359c605 SHA512 ab0c7832f7e480ec3cdbf94ec29f84b590486625bde3d5cf465e5dc6ddca02998b99510b6c14d5ba005816c5b091044badc1e68988fd971f9e18266096ad86cb
 EBUILD pyshp-1.2.0.ebuild 590 BLAKE2B 331661c6e5e7cb380fa36822c7ae6f9c3b1e2a3b36362ee7c6cb25ac3f52c3b196a19f93968657a07f435ea95c77bfaf9296fa598a2689c2ef518ca73cd2c36c SHA512 03ff5d90f4b896fe0d40f783a24879b2f33a725d3d9d67c6cac60a21542cfe530f48e5aaa8304a32405fee603048c3e5a72026b235b028cf82f5bb1ce16f6f45
+EBUILD pyshp-2.1.0.ebuild 549 BLAKE2B 34a54b03e748fae8daad52154dce55d32be41d1638242c183210007015945eba8acb5ba6a09c8d274334543e4ee8c939f669079555b748f7e8e8afff38612914 SHA512 7dfcab869adfc8aca9c706c2e63f9b80baa4f61efa59f0c10299644a7fccc9c867dee781e4c52914b8eeca6961ccf6b85793fd2ca1210e369689a477086041c0
 EBUILD pyshp-9999.ebuild 590 BLAKE2B 331661c6e5e7cb380fa36822c7ae6f9c3b1e2a3b36362ee7c6cb25ac3f52c3b196a19f93968657a07f435ea95c77bfaf9296fa598a2689c2ef518ca73cd2c36c SHA512 03ff5d90f4b896fe0d40f783a24879b2f33a725d3d9d67c6cac60a21542cfe530f48e5aaa8304a32405fee603048c3e5a72026b235b028cf82f5bb1ce16f6f45
-MISC metadata.xml 240 BLAKE2B 3e95a8539eb32738e34078f4ed5c3820536fd4fc86c9e3d4d0116cd543b0c874774124b8154b6da763417e05d373b41ace9dafb190190089b42c290453cf0727 SHA512 7f9d2935d53cdaf4f9daed93507c2f0ec213c0b3db5ae35d6612885913dbcfb4f62f78a057c0b894d1adb7360735e76e2cbfccd64f358a392df5b78fcc156101
+MISC metadata.xml 327 BLAKE2B 48f3a2409f354b39c05d8111f78f1bce40425f79db30c83d345f81a081d2098bdf42dfc49e47854ec788cf75841cb9427a5c2eb9b71dd139f3fbe398e1380346 SHA512 3b9fdbf92fc5ad41b8afe4b315bad42806062c974b37496875fcc861af525905cc8d4b81e0a4d20d3e9333ea38c57c7aae6764c64537ef9e27386a53168299b4
diff --git a/sci-libs/pyshp/metadata.xml b/sci-libs/pyshp/metadata.xml
index 512ca5c34a9e..3da8982993cc 100644
--- a/sci-libs/pyshp/metadata.xml
+++ b/sci-libs/pyshp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>tomjbe@gentoo.org</email>
+    <name>Thomas Beierlein</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pyshp</remote-id>
   </upstream>
diff --git a/sci-libs/pyshp/pyshp-2.1.0.ebuild b/sci-libs/pyshp/pyshp-2.1.0.ebuild
new file mode 100644
index 000000000000..5499cd13c879
--- /dev/null
+++ b/sci-libs/pyshp/pyshp-2.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Pure Python read/write support for ESRI Shapefile format"
+HOMEPAGE="https://pypi.org/project/pyshp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" shapefile.py || die
+}
diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest
index 8eb22f1d8f16..4e52237ef4f1 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -3,6 +3,6 @@ DIST SPQR-1.2.3.tar.gz 1090017 BLAKE2B 7ecd180f2147229bea7d9230c5f645c1d835e7260
 DIST spqr-1.3.1.tar.bz2 1115795 BLAKE2B 027509745cd336d3ccff27a4f36e51493fb9008fabb84448ba559b561269861be97d86ec841674c2bc944eb86623675b223947fcccf0716052a899ce17850d32 SHA512 1c7644da2bb7a14b9bc26066b84355626ce5d7c396afe5ce496ae72a5ef54431dc817178bfe7dd69ddf586b661c44066ee0850c91dba846a32787d52607749bf
 DIST spqr-2.0.9.tar.bz2 2161068 BLAKE2B a662983d2543a65ce36a367749db5585308acb56b016f69a35c46a84e9c12a678f57a3cfd459cc2e887fff2819b00f99981efaadb73831f1b4c54cbef5e1c367 SHA512 54b203e0d68b266473b8a2b7b3b3a55476df54a3ebd5748b70faa7bad1d0a5a7387197f0674ba5f9a5d45887daa736117f8d6ffbbc2eb02482b3374a3babf721
 EBUILD spqr-1.2.3-r1.ebuild 909 BLAKE2B bf187af15da7e38f9b79f089768236f04c8794373d043b1fc13562ce0c5466bd80777bc0299973003306b87db45a7a9f3b2a4fdf6161ee2e11df2f3219d5de58 SHA512 752f56b943603df13cdfa90c428eb379adf004f893b1fd966193b6a650c07c0af1a8236f6d015fd451b848bddc5a9f18b408adcbd521c76f0e90792ebb585cbc
-EBUILD spqr-1.3.1.ebuild 761 BLAKE2B e874a05510fc3861c6a81325d30719cf97b5993bfa94b9570da483c3e7b05282fa83e1c2481103f815c3aab873ec36de269aaa4d52071322974621f3f0a93f3f SHA512 8807c16ef052643a607115e0fd612d65c2e97621fcd0ed4b200e4befae529051d70dd22e6f4d92b65fd32299d00ad001f05326139a64fc19c2b5fabd968e54b4
+EBUILD spqr-1.3.1.ebuild 752 BLAKE2B a96d5e8a948366fef4cc7fa2ba7d618f19f1bd17998a162e7501fe75fead8c697efe96cb0f78ed7a9329aa6d73bffea3106bdae9aeba489df92634c21b5ec98e SHA512 b97e9f20ceae34ce31edeed18eeaf1d809fbdaf883e5496ebd277f6c11b46fc139375cfca13718661fa36b127909a6e61cd9ee62d3b2b728d2dd402eb3593c97
 EBUILD spqr-2.0.9.ebuild 1009 BLAKE2B 5ed65ca626a6d99698c233a4c6b51f407b3633cb0767f26ceeda068544e634fbdac2724af53f6f7fc91bc383d7db7c5fc9aa425b3e4fe88676ccb66c66af03bb SHA512 9d56736bfa422cf6e4b580ea03e34441ad5e8ffc42a26416990e851f3759f1b101942e5badf5eb2154e2915c67fc8f08e9d373c7422b94dd3ecc868ab8ce0650
 MISC metadata.xml 962 BLAKE2B b7d87c2d66c17b1d3071b8b0a17e39fe77897a9af7e79caf784cd1c370c70467010718ad3ef60314dc6f0db5703b4a0035294fac5fc2552e9bb595132b7991ed SHA512 a8cbc5b0168b847b814c54b874d159fcfd349780d9b64907ffdb1d572babbee8b64f422328fa583ba9f7e0a60846249385acbccf5db2944f7c05bcd33f4ce757
diff --git a/sci-libs/spqr/spqr-1.3.1.ebuild b/sci-libs/spqr/spqr-1.3.1.ebuild
index 9489d6068380..a22737b28bfa 100644
--- a/sci-libs/spqr/spqr-1.3.1.ebuild
+++ b/sci-libs/spqr/spqr-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc metis static-libs tbb"
 RDEPEND="
 	virtual/lapack
diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest
index 6bfeaa2d8a53..9f1d16a04ad2 100644
--- a/sci-libs/trilinos/Manifest
+++ b/sci-libs/trilinos/Manifest
@@ -1,4 +1,7 @@
 DIST trilinos-12.14.1-patches-r0.tar.xz 6448 BLAKE2B f852a4612c400ddfb6dcecb476e0b9b2cd0f38ac9cd74fd09fc1f99ccb2588a4703f8c8514689c81d23aa218aff3cdcbe9b5205becea8936723d6e339705d54d SHA512 206bd08f0a5b7f7107e60c9e9c1a15fa7e74916bacb5399cccdd936b426768834ff24424ea77e8d1706afa98d88bb5a098b3b0203039024a3b5f5388c4a9735b
 DIST trilinos-12.14.1.tar.gz 129036436 BLAKE2B e7401df2ff8408a7af4a8e90d93b1929df65228c4f5cf3c754d20ebdfa8f3835800f540e87c1198e0baf2fefe0920618ae497f59373720754ab0c9dc1da93136 SHA512 dfff0e0582cb5ad12614dd53e9635572c8d1ee86d96f432f5a6e046af63edb13f6bfa3037204ab89fbb0d27e9be9bd9661d47efb41ab2a6e421bca5eba6b6a87
+DIST trilinos-12.18.1-patches-r0.tar.xz 6236 BLAKE2B fdcdedde68ef855aa98671223ad2c42467284ad7ca364e2b5ca715094a6efacc463f2d1812ee63ac980ca87dbe16bb2ac04835f52efa1df34651a608cb5407e9 SHA512 e6db2be4642b8f9797b0be6dd05641ae469dd5117b1b04da54ed955bd56473d6aaa69d59dfd7869db1e7059d2d9b2cb2d9269dd5ef863663eabb90c5c256b987
+DIST trilinos-12.18.1.tar.gz 152007573 BLAKE2B 5dc2ee432d777712fb4ca1dc2d7ad68015f523fdbcbd4f55388a89d31c0946a1c5031b3e8f906952cf6b2f4f16928e6da5f17b1f6ee0f0e5669cfce5c8a09367 SHA512 e2a57df57e8e98ed97bbde9c1e768738f0eaccc32466aff6daa308573a860b3debee89bd570c113ca0f6a6458ff562aa6596ddf657236c368b7b2e26a4b4466b
 EBUILD trilinos-12.14.1.ebuild 6148 BLAKE2B d8ef14be03e34742e59292426af03336fb3997f3e50b02e0d6a9d6114a5d67c7d3530e93f44e645e247f395343b1a3045383714f8408a41a0434cf125f6006c5 SHA512 b96f197cfd8435366940237eba40dd8cd48e950e6c814ebcb18b6c04125f374d4475cecaea3c25a2ec60b3685e3db2d52ac025a9f6031111c67039cfa00be2d8
+EBUILD trilinos-12.18.1.ebuild 6246 BLAKE2B bfe81f4d33fc4035d9819ea3d71ac06622bf537b62bce54c2d2edecf4d44553ad9cf13285c67fd06298a3bfe82fb4e45bddc4cd171a8fed5bd271c62d21248f3 SHA512 3dcbd870dffd32ef820c32d1e0ddbb95416337dd01f838dee0ff6f24e0ba6e14ee2e1f295e4947e0b7c5966f5a1f99ef4db16e80acc749c294b96bdb5d7d8b7d
 MISC metadata.xml 2778 BLAKE2B 45cb2a647a1730c9b6b21271364b5f4acaf145f6ae33db356d0b9be7584705c29a645d3f96abfe0a9b87540ae55ab586ec202191776f4472b66291c274b9f24b SHA512 c58e98197353efe1c6fef038dd53d4a938e85aa66fc53f00cab0133d8ee89c629eead55c270c88583778b193f0a85b498c7235fc3f1e8f45a1abfff2d5f0cbec
diff --git a/sci-libs/trilinos/trilinos-12.18.1.ebuild b/sci-libs/trilinos/trilinos-12.18.1.ebuild
new file mode 100644
index 000000000000..605b4f2f2d09
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-12.18.1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake-utils toolchain-funcs multilib toolchain-funcs
+
+DESCRIPTION="Scientific library collection for large scale problems"
+HOMEPAGE="http://trilinos.sandia.gov/"
+MY_PV="${PV//\./-}"
+PATCHSET="r0"
+SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+
+IUSE="
+	adolc arprec boost clp cuda eigen glpk gtest hdf5 hwloc hypre
+	matio metis mkl mumps netcdf petsc qd scalapack scotch sparse
+	superlu taucs tbb test threads tvmet yaml zlib X
+"
+
+# TODO: fix export cmake function for tests
+RESTRICT="test"
+
+RDEPEND="
+	sys-libs/binutils-libs
+	virtual/blas
+	virtual/lapack
+	virtual/mpi
+	adolc? ( sci-libs/adolc )
+	arprec? ( sci-libs/arprec )
+	boost? ( dev-libs/boost )
+	clp? ( sci-libs/coinor-clp )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
+	eigen? ( dev-cpp/eigen:3 )
+	glpk? ( sci-mathematics/glpk )
+	gtest? ( dev-cpp/gtest )
+	hdf5? ( sci-libs/hdf5[mpi] )
+	hypre? ( sci-libs/hypre )
+	hwloc? ( sys-apps/hwloc )
+	matio? ( sci-libs/matio )
+	mkl? ( sci-libs/mkl )
+	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
+	mumps? ( sci-libs/mumps )
+	netcdf? ( sci-libs/netcdf )
+	petsc? ( sci-mathematics/petsc )
+	qd? ( sci-libs/qd )
+	scalapack? ( sci-libs/scalapack )
+	scotch? ( sci-libs/scotch )
+	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
+	superlu? ( sci-libs/superlu )
+	taucs? ( sci-libs/taucs )
+	tbb? ( dev-cpp/tbb )
+	tvmet? ( dev-libs/tvmet )
+	yaml? ( dev-cpp/yaml-cpp )
+	zlib? ( sys-libs/zlib )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
+
+PATCHES=(
+	"${WORKDIR}"/patches
+)
+
+trilinos_conf() {
+	local dirs libs d
+	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
+	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
+		libs="${libs};${d:2}"
+	done
+	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
+	dirs=""
+	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+		-DCMAKE_SKIP_INSTALL_RPATH=ON
+		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
+		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
+		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
+		-DTrilinos_ENABLE_ALL_PACKAGES=ON
+		-DTrilinos_ENABLE_PyTrilinos=OFF
+		-DTrilinos_ENABLE_SEACASChaco=OFF
+		-DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
+		-DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)"
+		-DTrilinos_ENABLE_TESTS="$(usex test)"
+		-DZoltan2_ENABLE_Experimental=ON
+		-DTPL_ENABLE_BinUtils=ON
+		-DTPL_ENABLE_BLAS=ON
+		-DTPL_ENABLE_LAPACK=ON
+		-DTPL_ENABLE_MPI=ON
+		-DTPL_ENABLE_ADOLC="$(usex adolc)"
+		-DTPL_ENABLE_AMD="$(usex sparse)"
+		-DTPL_ENABLE_ARPREC="$(usex arprec)"
+		-DTPL_ENABLE_BLACS="$(usex scalapack)"
+		-DTPL_ENABLE_BoostLib="$(usex boost)"
+		-DTPL_ENABLE_Boost="$(usex boost)"
+		-DTPL_ENABLE_Clp="$(usex clp)"
+		-DTPL_ENABLE_CSparse="$(usex sparse)"
+		-DTPL_ENABLE_CUDA="$(usex cuda)"
+		-DTPL_ENABLE_CUSPARSE="$(usex cuda)"
+		-DTPL_ENABLE_Eigen="$(usex eigen)"
+		-DTPL_ENABLE_GLPK="$(usex glpk)"
+		-DTPL_ENABLE_gtest="$(usex gtest)"
+		-DTPL_ENABLE_HDF5="$(usex hdf5)"
+		-DTPL_ENABLE_HWLOC="$(usex hwloc)"
+		-DTPL_ENABLE_HYPRE="$(usex hypre)"
+		-DTPL_ENABLE_Matio="$(usex matio)"
+		-DTPL_ENABLE_METIS="$(usex metis)"
+		-DTPL_ENABLE_MKL="$(usex mkl)"
+		-DTPL_ENABLE_MUMPS="$(usex mumps)"
+		-DTPL_ENABLE_Netcdf="$(usex netcdf)"
+		-DTPL_ENABLE_PARDISO_MKL="$(usex mkl)"
+		-DTPL_ENABLE_PETSC="$(usex petsc)"
+		-DTPL_ENABLE_Pthread="$(usex threads)"
+		-DTPL_ENABLE_QD="$(usex qd)"
+		-DTPL_ENABLE_SCALAPACK="$(usex scalapack)"
+		-DTPL_ENABLE_Scotch="$(usex scotch)"
+		-DTPL_ENABLE_SuperLU="$(usex superlu)"
+		-DTPL_ENABLE_TAUCS="$(usex taucs)"
+		-DTPL_ENABLE_TBB="$(usex tbb)"
+		-DTPL_ENABLE_Thrust="$(usex cuda)"
+		-DTPL_ENABLE_TVMET="$(usex tvmet)"
+		-DTPL_ENABLE_UMFPACK="$(usex sparse)"
+		-DTPL_ENABLE_X11="$(usex X)"
+		-DTPL_ENABLE_yaml-cpp="$(usex yaml)"
+		-DTPL_ENABLE_Zlib="$(usex zlib)"
+		-DML_ENABLE_SuperLU:BOOL=OFF
+	)
+
+	use eigen && \
+		mycmakeargs+=(
+		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
+	)
+	use hypre && \
+		mycmakeargs+=(
+		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
+	)
+	use scotch && \
+		mycmakeargs+=(
+		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
+	)
+
+	# cxsparse is a rewrite of csparse + extras
+	use sparse && \
+		mycmakeargs+=(
+		-DCSparse_LIBRARY_NAMES="cxsparse"
+	)
+
+	# mandatory blas and lapack
+	trilinos_conf blas BLAS
+	trilinos_conf lapack LAPACK
+	use superlu && trilinos_conf superlu SuperLU
+	use metis && trilinos_conf metis METIS
+
+	# blacs library is included in scalapack these days
+	if use scalapack; then
+		trilinos_conf scalapack SCALAPACK
+		mycmakeargs+=(
+			-DBLACS_LIBRARY_NAMES="scalapack"
+			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
+		)
+	fi
+
+	#
+	# Make sure we use the compiler wrappers in order to build trilinos.
+	#
+	export CC=mpicc CXX=mpicxx && tc-export CC CXX
+
+	#
+	# cmake-utils eclass patches the base directory CMakeLists.txt
+	# which does not work for complex Trilinos CMake modules
+	#
+	CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Clean up the mess:
+	mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
+	if [ -f "${ED}"/lib/exodus.py ]; then
+		mv "${ED}"/lib/exodus.py "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
+	fi
+	if [[ $(get_libdir) != lib ]]; then
+		mv "${ED}"/usr/lib/pkgconfig "${ED}/usr/$(get_libdir)"
+	fi
+
+	#
+	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
+	# has a chance to pick up the libraries...
+	#
+	cat >> "${T}"/99trilinos <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
+	PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin"
+	EOF
+	doenvd "${T}"/99trilinos
+}
diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest
index 4c9aecea6939..b9068a5c95e3 100644
--- a/sci-libs/umfpack/Manifest
+++ b/sci-libs/umfpack/Manifest
@@ -1,5 +1,5 @@
 DIST umfpack-5.6.2.tar.bz2 780204 BLAKE2B 9e0f4abe92139e3cd6604be63d7fea0ffe50e0669081cafe07eef5d16a4c99493ace16a36a13470d617944cef2c505a3feadb5324e0add4a7f7fe6cbaa732fd3 SHA512 7b206235e837e84885c871322c1f0d4378a048008d9c110bd96204e9bc1bd9c72c6909da513fd78b6225fddc7b91e1ceebf1a5147e99943b3f0fff48682403dc
 DIST umfpack-5.7.9.tar.bz2 772026 BLAKE2B 6d6dc1ba47b8f473884c1cb17d3eaa363d88281512e33586a0af0c2bcb7a523272bef4d8da0a29e2a5a84c8f0cd0ee6830ec10247971db63b4c319e6fa9a3c42 SHA512 5ad57467b5b7e4579f3cc9e2e7c92a0262ac2ef991a606d079b749b66e10da60aceaa4b0e741c116f8866da23c0f7c06368fe2b08d66d51383683f0dcbeddba3
 EBUILD umfpack-5.6.2.ebuild 869 BLAKE2B d838942a6fd5ff1af5d10bd2015b3931f8f2e56009e4f5cd7d89ee38dd4fbb5fa5806c01ce597882310f7d5315d3c5386970661939bd31bbb9b4437ee833cf6f SHA512 4d94dbe622115b30d2bc3d9bf5ed7fbd65cae24361311b7fb52814c357dea1d6e7f3d66ae776ed937eed6cf4a813333bde0a6edc1acaa6603bde2c1331e96ca3
-EBUILD umfpack-5.7.9.ebuild 901 BLAKE2B 26be1959f341ac9e72af4c5c02cd8a78958afb08baef2f5cd9a441ff2c9415e0857623fa8af10375d588a363b2969a12185dceba21b8b8a472eecc0ce4c95ad1 SHA512 ca812bb607681debab766f35e6d48cbe476092a672a01b3e6815738ea3e4f136d694e256a543e049f031cd63c2832d739e35e8876df26af3acd9dc327a528298
+EBUILD umfpack-5.7.9.ebuild 907 BLAKE2B 9b14efb61d8cd1c147581f4fadbedf643c61ad35d8e2bb51abe4c22b0842bc61386fda00f061ba6d7477cb2db31b0b3df405998696aa012b5fb43fcd420b950d SHA512 4accd648f6259dcafc64e54126b05d82e272c9f3f46c81cea4baa77c0da25482784a4b3cc4eba46f56685545477ed4fe52f6616a28d6cf5c3c81f10efead48d2
 MISC metadata.xml 667 BLAKE2B 1e0018ea7f7433ce19bfc6e364a30731e5e02f657502f721513da4191752b97c7a3d8352707e1036f0e5fe81ffb81ed3862cc2b213ca89e80067a06a82e5b078 SHA512 c204d7f86f2338f9571a46773c251dab31caa3d5bfbe4ae87326466026616d80737435d8cdbf0ae8cb5e109d8b52a5b6ccba09f8b52f38dfe9058049ef541007
diff --git a/sci-libs/umfpack/umfpack-5.7.9.ebuild b/sci-libs/umfpack/umfpack-5.7.9.ebuild
index 3c62f3d82bb4..debdb6cbfa73 100644
--- a/sci-libs/umfpack/umfpack-5.7.9.ebuild
+++ b/sci-libs/umfpack/umfpack-5.7.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc +cholmod static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 3a031cb310f9..b7ff3152171f 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -3,11 +3,13 @@ DIST votca-tools-1.4.1.tar.gz 103152 BLAKE2B 73dc726ea899ceb65d0406f3795f1df79a6
 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.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 1211 BLAKE2B d49fc0a98bfaf61cee9b1c38f058687591b81319788b578e91db513f76d452fec9e2116e503b22539f84bc0e567434d144b6ad22d3c62bd819b0fa817a7ccdea SHA512 920a37e44b7ad3d1e655843b22646d87f376bb93cbb99f7241ff538183b1d4df7aeb6ede66f04fee423bd112c651185d837423024fd1cdfde7350018b83ebde7
 EBUILD votca-tools-1.4.ebuild 1182 BLAKE2B 2077617efbf04198cf2a0f53bbf07f87897a8420ec6ad9e1774c821e7e3789421a253b79e9f09e85abfdf1523ebba02400233199cee5d7966a03b97db4477155 SHA512 48eb152df0bc0ad1481179977c0a8b6947180d9978961024a57674414326eb370182c02f5fda3a902a03a14fe3f0e60f666787eb16729412426ee83f1a074613
 EBUILD votca-tools-1.5.1.ebuild 1124 BLAKE2B d8bbb47af7f2b160f83719246b8c1c1e435970790aa1ec3922085959354347c61a845013a32da9edcbcad19c66e7dd25fd0fa8c2b908f795827c324452413183 SHA512 9219e23530a0f55cc4159f250e251c49ce61a8514b05d0d4eca7f224b340e0bcc313e82b57fb647141f683607be545044495da2eea956ea197cae029f52a5662
 EBUILD votca-tools-1.5.ebuild 1122 BLAKE2B e6ca1c6354b17eae1f1574de117b2fe421965e05376ac2d13cff50814e5b2987fbac645be133037cf31b08513e09f96fba94cb02a82bab06c60a667b9147d75c SHA512 2482328a8306a0126c7ab17250be2ab91e823a1ae248e3d4bf15b27bf1f313b3277a132ba4e52362c92f1d4096a00f7b5e657afaa6de464866b551c5976c4be5
+EBUILD votca-tools-1.6.ebuild 817 BLAKE2B 07c6d4667bf74c45a962fea7ad7af4d3e40910d7fb4c38713e30193c9d58d2553c693b28db361f7c0b7d16df2d05636fedc648a18934b77bd6f7faeefebb6b5c SHA512 4be6e932cb3a573465c907956d79f6f85c3f2d38bd867ce8488afdafdc4e005c3d953f5e8cfdc4a422ff16e39a8d844ed5e84e53e1155a800ab3844ffbd8a32c
 EBUILD votca-tools-1.6_rc1.ebuild 854 BLAKE2B ee6c6234021d9a903a611fe75c64c612ea8c3c35c048c0663dfbff91d289410966d9aef8ca2533895b33d734d7333e7bb3dba9ae88db3b387dbee199bef2c2e5 SHA512 137867d077e0c84d49a76553f00e2182350643822c6961103aba45810b236e2333f3a9092b5572cb1588d658e0c1111aa2ffdc83e6b679d84af2d7c885fbb0da
 EBUILD votca-tools-9999.ebuild 817 BLAKE2B 07c6d4667bf74c45a962fea7ad7af4d3e40910d7fb4c38713e30193c9d58d2553c693b28db361f7c0b7d16df2d05636fedc648a18934b77bd6f7faeefebb6b5c SHA512 4be6e932cb3a573465c907956d79f6f85c3f2d38bd867ce8488afdafdc4e005c3d953f5e8cfdc4a422ff16e39a8d844ed5e84e53e1155a800ab3844ffbd8a32c
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-1.6.ebuild b/sci-libs/votca-tools/votca-tools-1.6.ebuild
new file mode 100644
index 000000000000..6088d1e095d9
--- /dev/null
+++ b/sci-libs/votca-tools/votca-tools-1.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 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 ~x86-macos"
+	S="${WORKDIR}/${P#votca-}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	KEYWORDS=""
+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
+}