gentoo resync : 21.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-21 10:20:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-21 10:20:03 +0100
commit: 6f8038813c460b4f0572d5ef595cdfa94af3a94d (patch)
tree: 3509e94070265053394b7f2e30a779d7e60c2064 /sci-libs
parent: eccb70a7f91b2d22582587f26d1a28bb31408b45 (diff)
39 files changed, 75 insertions, 963 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 6157e704dae1..5ba2f5870436 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 8f611dd79a76..bba5c1fa88c5 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,3 +1,3 @@
 DIST amd-2.3.1.tar.bz2 339970 BLAKE2B b84b7b690deb6a1fcfdbbec403a3e5267cd4e1cf851312a56bbd48ac92a732f789365e2191f6b74f49173bc6c008ebd5f6b528a99a9abdc6a2777f3a6a7305b8 SHA512 19b8c010e0f7a5a96e60fe52904b2b548fb89dfaf9d6f99184df955a732ec3edef04acff01a82a909e030c3bf78c9eccfe0c329731edb29f4b936507e39d885e
-EBUILD amd-2.3.1.ebuild 753 BLAKE2B 1a060d8c9b8775086b62737d218e11961f8bca84f1d50f674b28b52f6dbcbff41e8b1169b5e6d19eaf40810487d90d8f48cffe034d09e1ae024c73a513c975cc SHA512 522ad0a25ffd9e457367d1203a4512c7d67190a6dfd47837e7f83fd5139814554e5d187dd6df4b642be6b9bab72a856c36aee4330a440afa7e4cd2a609f95abd
+EBUILD amd-2.3.1.ebuild 749 BLAKE2B a177b927baf19577dcccd023253fdad63880da2bcf1dcfb3cb68e2d5ad3f358cc380d841aa8e401e180258d9b4261173c14245591b57213784290b4f3fcffe82 SHA512 951aebcac813960e845f0f5f7bb5464b4e5e44ca0b7899bb5b1943f1518af5e0fe9f5073a372357329705674968eba9c7b9619e9a0eb654fa53eb34572c4372a
 MISC metadata.xml 492 BLAKE2B ac6367af33dd797e703e3370d6369db5286b11f862b5387258e9edd860554049c7d9e2bf2186c86e24a7fc29c3f1122f330c0a3cf0420f13085757cff0a388b3 SHA512 1c53658e87337e1e43149c363c901dabfdde52b647891d8026a7ce9ddcd5e36b0121948d169d446e5a78d05c26301bd4f8c7c06665506ebc0999c259b709a6b6
diff --git a/sci-libs/amd/amd-2.3.1.ebuild b/sci-libs/amd/amd-2.3.1.ebuild
index 0a269ccff930..9cfa1f72fcdd 100644
--- a/sci-libs/amd/amd-2.3.1.ebuild
+++ b/sci-libs/amd/amd-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 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="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc fortran static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 2796a5feff2b..697fa311ebd4 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,5 +1,5 @@
 DIST ceres-solver-1.11.0.tar.gz 3944965 BLAKE2B cafae018abde9b8085f7e8841a6a720ef52cd40178a43c3050b6b20465bc9675cc326a6bc405572a235758c5f2f99e936375f711bf5c4b121acfe0c0641713c6 SHA512 4941538e6ec31e2ee56a24446748dc5d6dd02ba9c151e4320a2db943fd1a377455b0ee23d56780e1f05322b30e25057145c540fde901d7fd2244ec630a73527c
 DIST ceres-solver-1.12.0.tar.gz 5008861 BLAKE2B 52b3954dde96386bd031543ab9d7370368f58f76f1dec9d24ef10803da787cc96f40a1c775626fde832b70ebd94cf4274c70a8fb4bd7e1bcf040e119cbec09f8 SHA512 485eece0471cf05d31b5dd7e133e23115a334a4ed557a3c1bd0b715a063f840738af8f507e935522a0dae90ce6851984c0002a25e9b445b90889792f68a05571
 EBUILD ceres-solver-1.11.0.ebuild 2386 BLAKE2B a10b3bfd896a22a1b9898d1bae44bd6812e599afbc3ef4b5d9824dec772eb1a8363ed021e01e77064fbd4731e2f82ddcb80a2d78ce1ba21290f460790357b068 SHA512 f35ebac140fe5e9be8ed07513bc7b50c97a28730c639448634cc03f49df3845239d368c25f1964e9381bf0fee220cdca0e26c35024d334ca7fece2935038ad8f
-EBUILD ceres-solver-1.12.0.ebuild 2397 BLAKE2B 317da75883fcbaf4b3075779c2aacec4cbf5f8cd0db770a6e46acbfdba9c35a1e8d24d71136f7f9e144369c78b51fddce3f8a81130316fc3ef20eb980d16f6f1 SHA512 4b738ccb269423c735cde7c59305e640abad88d646494054ae206364c8b857464e759f1b3d45809ca5412359429ee3d2dab21c6c382c3970204e3b6fbf338d32
+EBUILD ceres-solver-1.12.0.ebuild 2393 BLAKE2B e83b837f75a6a6162f9b3e96d4821c380b787cdb2d84dd657b4a5f91449ae7e561827ff52cb92453ba1b4f5cf66d92d55eba6678c83c976c3b0c3fb1ae5bda3a SHA512 4c4f780482bb31015db872f5a856117778282572ceafe889ebfbb4503cdff07079ce4eed122ee145a665515ffbb7334a854c8c4ca657a58b7219ead76ff7a87d
 MISC metadata.xml 1525 BLAKE2B 46de33a7fa6513877e2427442e918d8e39871a6b6b8a15a18d14dcedd55c42bfb1bdeab7e1cc57c0ac03ba06d5c3628dd666b6f0787eac5c9dc75785e2a9e471 SHA512 4c95aef23ce327f9cd11b53638e1b6485eb789cd296ad8a571278b65c9001465f56c97b97db6e2c4a4ed76336f0e33684958adef593d74193cb73930e7ea5ad2
diff --git a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
index a77aaf09933b..e2f4c1ef0813 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="${HOMEPAGE}/${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 c++11 doc examples gflags lapack openmp +schur sparse test"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )"
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 344608836207..64488aaba7e8 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,4 +1,4 @@
 AUX cholmod-1.7.4-parmetis32.patch 702 BLAKE2B 241d68fa25ac2ab3f9a425702559736fb15657eda82c5ba0a413174c146c09e0be167746f866a64189d027892d180445adcf92f55fc913c9bff0085f87051c94 SHA512 a1694a7f42f10c7619e23817e93f76df35bc208200918b74a6dd68bb4662d57ce2f3665be424ad4b5c8a4ea9c3957676c48716aa0e47d9fb19337dc43e759ecc
 DIST cholmod-2.1.2.tar.bz2 656458 BLAKE2B 83a574ad7d3755428d8d732f3f60b07908b8315d73d5a3d3aaf9aac50b54590c532389dd90efc569e67639993095706eb546e72313b735e35af34a1fea398be2 SHA512 7aca97de4c60ff2d7a76a776be4c2d61243a159a51b9e147fa2480f2aaf61a5d966eb0f1cb57c0145510437f6c478fa30384b741709d0a02432b74ada3e78089
-EBUILD cholmod-2.1.2.ebuild 1781 BLAKE2B 4fefd52e696a325edcf03866f18f459568ec0c2e41593cbd49485f20303206acb97a35c67eb2ede6cb893f9a41c4b0a15be2c0639e18815654611052566bc35a SHA512 d0ce97878df14b01fa42b3c01b1976509918a4fb52403101ea4db3843d0e670619147d88d5b14b604ab1e66213eef10cad459d6f8e7b03e3b1e06006ea5d65cb
+EBUILD cholmod-2.1.2.ebuild 1780 BLAKE2B 73126e0ffc14c8f6b28b884e7e285319bcb32dfa6ebd165d08fedfc7fdfdd301f1ccb13d8781260c15d9a3bf5f84596342d5366d65214a1469227f10bdd1ac87 SHA512 42ae9c8bbc6621b5a209cf35110c265a519e8fee5edb04a65ea0102621d0e10ef9e7b239f64575ba9245e33feee40256a613c38fe0b66e39d27488b85e77b2a0
 MISC metadata.xml 603 BLAKE2B ce6355915a22fd4bb81f619a1b946f83b971b43caf86929441452938c1bee5971c5f95d0349d13d740efcf51883015334db167d2fab49c8954ac6af1d5ca3348 SHA512 da9db58edeab0b40813e47567cbaa4e54ae8aa9f4cdc89cd87f1e35bb65991c305bc955e6aba744d322c6375de0e8ba1253415814175cf1f4bc2a01de2e11d22
diff --git a/sci-libs/cholmod/cholmod-2.1.2.ebuild b/sci-libs/cholmod/cholmod-2.1.2.ebuild
index 2f32156ec941..36dc9631c3b1 100644
--- a/sci-libs/cholmod/cholmod-2.1.2.ebuild
+++ b/sci-libs/cholmod/cholmod-2.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="minimal? ( LGPL-2.1 ) !minimal? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cuda doc lapack metis minimal static-libs"
 
 RDEPEND="
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index b1ca9de478f2..8564a60eec9d 100644
--- a/sci-libs/colamd/Manifest
+++ b/sci-libs/colamd/Manifest
@@ -1,3 +1,3 @@
 DIST colamd-2.8.0.tar.bz2 304819 BLAKE2B a2c4b67ad8d20b0cb136f579a367bf53b0e692596550b9e22908628f4d0bce00e2ddeb9aa0dfe6d1f204e79332be99c97366df2ba555ab881d4ba01c42a721e6 SHA512 36b2e50e01ad44f04f084ebcdcfb7d9d1d1712c6f53c8bce9f46ce39edc418aa64b8e67489fb06cb95d86658fd9f9bad89217a5f9f4777181f0f0e9b58c04aee
-EBUILD colamd-2.8.0.ebuild 578 BLAKE2B fabef242802b0f673d6cf80fae76eab1409c518a129a26251ca302ed6b1f1f7b5cb484f6da75719c88a93137471cfbf9dd71a559eea41e93816db4eacd60a7c6 SHA512 db23ca1688b50525288cc28556d444e3706a15cbf3cc24093a10867e46983636bd5c438355e424d83f83ea4432641baca039540846b047752b4768648b7f9106
+EBUILD colamd-2.8.0.ebuild 574 BLAKE2B 4ba66c06184d68b5e46aa4aac61c81935772660d233792e96d230cda5a2030e844466909a20f166247cdcbf417b97fd8058291f326591951f992b8b6880697f1 SHA512 81dae869abb86226ab6227b388ef8ea430289503706a6df80fe5e4676d18821d6690a31b02ecb88514378cddbd4ea44a5310b34a57131b82c3758959522da303
 MISC metadata.xml 827 BLAKE2B d1b92027b2b820c67cb091e71c22c5ebcfe8e560968b8cf76f5cb61b6c26a71b66f4801343a531fbc8941b5b678bff44e2ab3aa6bec49db9b0264ea2273ac816 SHA512 367258fb10bcde8e5136c541ef1e134c4e882b296c45300c8d70945222c0730572b1dc116b80057c3a9d6a64c175fb86915847522000740d9a39e6fcd8eb5004
diff --git a/sci-libs/colamd/colamd-2.8.0.ebuild b/sci-libs/colamd/colamd-2.8.0.ebuild
index 6bafb95e19d9..8db300ccfa2d 100644
--- a/sci-libs/colamd/colamd-2.8.0.ebuild
+++ b/sci-libs/colamd/colamd-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index b866551b3423..23a5597c49c6 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1,8 +1,7 @@
+AUX flann-1.9.1-cmake-3.11-1.patch 663 BLAKE2B 7162cb27a4ba6e13ac6f65752224e53be4988b3bb2ab5b8a9afbbed69a262a36c394d445fbb006afe7edbc5c9e90c339a88040eb7bee4c5c6c3209e1ba21b4ef SHA512 6d5032c30c0509951aaa5afc3f24a423d275224f67e14e0c4defbbda92ec659cef86fcfa65d72265d000f8010f0117ca2b8905f2c6f496aeef74a98dee9ffa08
 AUX flann-1.9.1-cmake-3.11.patch 2998 BLAKE2B 85c6b6feb800ab1a21af86a4001b0056fda416a6b61147f614670968cca13fa2b63d06673a11a2ef72b6f0d0876539ccb68134f4817975d4b796b66a716e606d SHA512 5cdffa2da3538965c0d20fb091a13124cdc301669b622ca35a131680db8abb58cf8e02f1366604a19a5cd10dd67f14861caa1c12da3154d82d576cb8052a4b87
 AUX flann-1.9.1-cuda-9.patch 850 BLAKE2B f193a6fd25a1d2cd45201d547fb444393cb82f344da6f5d1e2a012599170a412b261f6cf35d8943da7e96fd9f204991580d5ea045b43e2aa33ea5ad9fa9307d4 SHA512 0b5cad7b928319b922bdaa27d07fd38f1c359799ef9c217b6c1979f8ac9a86706e7ad1547f484aeb1db449a37693d18b2710b877483266915a869372c29ee1e4
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
-EBUILD flann-1.9.1-r1.ebuild 2242 BLAKE2B c36832b645ca46e3aa622882cca34b644d8b667def8b900f1e5eea83fa0d55677f65c14c4a17134f080b4b7fe863023a71a7aeac72385bc25a9c2a4048fb33bb SHA512 08de8ba5d423999f8403104be8efbd678e6c4981790a314e717944d6f5ca714cf97219efa445894145acc47d896ce11a49867e19c654b6c403db3b55700b5ab0
-EBUILD flann-1.9.1-r2.ebuild 2305 BLAKE2B 2a84c0364635d870ffb9b1c1dbc0f266f98323c265e8e7a7a1b833724f9a3df5eddf9a46237f6aebef4b8f186bc94b90d2ca36247fded5401d94e0692400060b SHA512 832a5bf708f07390653e0a8ff336a244861c99b8bb138d2f61f7a8cedcf5093d82a23c7684b927ff04e176c2737a2da6a22b545fec6df9904f349bc40d4cbf1b
-EBUILD flann-1.9.1.ebuild 2183 BLAKE2B 8de25772b012bbbe70e13db8876688ee283d1dada1978bb9c982d1f1bc26f3daea9adaf7f12663d1a0590c03730e6da604f10bfa356a8728262681c7173af13a SHA512 7f5ff08c1fe83379577043d01b2c7cda91b4a44237cd65aa1e2cb36e10331238efdc40a9d1698b41d3ff493ac50cfa61cfc5ccae33d5cb9a03e47a94458dd05c
+EBUILD flann-1.9.1-r2.ebuild 2328 BLAKE2B 7561d9f02e10301add3c59c756c52380f2ecf66ced64cdfebd77852275275f2c1fd2f9899dde69ec5f72f024b09896d5dbd5afb0b644a1fbb3e4cc2fddaabb13 SHA512 8221d601cdc3a2899af889f74122a04f37e556f19bd52f743df234a644ee16b555cdd18927a37585800ed51a2b073609f8f3397b641f82df3b12d5c08e521c14
 EBUILD flann-9999.ebuild 2215 BLAKE2B bb8f804a838a8c6b1702666a92cca7ce919523b7c8590a6f816ae3ec2d8b85c44ecc237f55bd498c8e6e296388c7b1cfcb6338b7a2361a5eaef869f2987b85f4 SHA512 9d2c22c2e45bc73cd982a7d75f77ec05b0533a60dc1125cd5127aec43d74f990b81690a1e47fd67cabc2ed5da500dded79c4dd8c79dc138db6c2a36d10bac0a0
 MISC metadata.xml 971 BLAKE2B 5cffd393d18c3719d8b61069dbc84f4ce4e16e6746637b1203dcba3719fb672d8db082afa93add6be9ebc4203df85391d20eb824a7a9ea3550b37295186538ff SHA512 b8416b149e26ede6d3f207d7e48316a8b880436c40c4ed5610953ceda0fee4e5b97f1b99f778678514dd115c257fb419b365ed46fdd90a19d444bca8e3e0fe03
diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
new file mode 100644
index 000000000000..4cf8f3a990fc
--- /dev/null
+++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
@@ -0,0 +1,11 @@
+--- a/src/cpp/CMakeLists.txt	2019-02-14 21:58:41.567625108 +0100
++++ b/src/cpp/CMakeLists.txt	2019-02-14 21:59:04.017920926 +0100
+@@ -34,7 +34,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AN
+     target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
+ 
+     if (BUILD_CUDA_LIB)
+-	    cuda_add_library(flann_cuda SHARED "")
++	    cuda_add_library(flann_cuda SHARED "empty.cpp")
+         set_target_properties(flann_cuda PROPERTIES LINKER_LANGUAGE CXX)
+         target_link_libraries(flann_cuda -Wl,-whole-archive flann_cuda_s -Wl,-no-whole-archive)
+         set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA)
diff --git a/sci-libs/flann/flann-1.9.1-r1.ebuild b/sci-libs/flann/flann-1.9.1-r1.ebuild
deleted file mode 100644
index fcb4ef999dff..000000000000
--- a/sci-libs/flann/flann-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils cuda flag-o-matic toolchain-funcs
-
-DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
-HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
-SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc examples mpi openmp octave static-libs"
-
-RDEPEND="
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-	mpi? (
-		sci-libs/hdf5[mpi]
-		dev-libs/boost:=[mpi]
-	)
-	!mpi? ( !sci-libs/hdf5[mpi] )
-	octave? ( >=sci-mathematics/octave-3.6.4-r1 )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( dev-tex/latex2html )"
-# TODO:
-# readd dependencies for test suite,
-# requires multiple ruby dependencies
-
-PATCHES=(
-	"${FILESDIR}"/flann-1.9.1-cmake-3.11.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	# bug #302621
-	use mpi && export CXX=mpicxx
-	# produce pure octave files
-	# octave gentoo installation for .m files respected
-	sed -i \
-		-e 's/--mex//' \
-		-e 's/\.mex/\.oct/' \
-		-e '/FILES/s/${MEX_FILE}//' \
-		-e 's:share/flann/octave:share/octave/site/m:' \
-		-e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \
-		src/matlab/CMakeLists.txt || die
-	use cuda && cuda_src_prepare
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-
-	# python bindings are split
-	# off into dev-python/pyflann
-	local mycmakeargs=(
-		-DBUILD_C_BINDINGS=ON
-		-DBUILD_PYTHON_BINDINGS=OFF
-		-DPYTHON_EXECUTABLE=
-		-DDOCDIR=share/doc/${PF}
-		-DBUILD_CUDA_LIB=$(usex cuda)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_DOC=$(usex doc)
-		-DBUILD_TESTS=OFF
-		-DBUILD_MATLAB_BINDINGS=$(usex octave)
-		-DUSE_MPI=$(usex mpi)
-		-DUSE_OPENMP=$(usex openmp)
-	)
-	use cuda && mycmakeargs+=(
-		-DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\""
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if ! use static-libs; then
-		find "${D}" -name 'lib*.a' -delete || die
-	fi
-}
diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild
index b628b93c4ced..f6ffdd259b22 100644
--- a/sci-libs/flann/flann-1.9.1-r2.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc examples mpi openmp octave static-libs"
 
 BDEPEND="
@@ -33,7 +33,7 @@ RDEPEND="${DEPEND}"
 # requires multiple ruby dependencies
 
 PATCHES=(
-	"${FILESDIR}"/${P}-cmake-3.11.patch
+	"${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030
 	"${FILESDIR}"/${P}-cuda-9.patch
 )
 
diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild
deleted file mode 100644
index 98e3f17c9fdc..000000000000
--- a/sci-libs/flann/flann-1.9.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils cuda flag-o-matic toolchain-funcs
-
-DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
-HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
-SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc examples mpi openmp octave static-libs"
-
-RDEPEND="
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-	mpi? (
-		sci-libs/hdf5[mpi]
-		dev-libs/boost:=[mpi]
-	)
-	!mpi? ( !sci-libs/hdf5[mpi] )
-	octave? ( >=sci-mathematics/octave-3.6.4-r1 )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( dev-tex/latex2html )"
-# TODO:
-# readd dependencies for test suite,
-# requires multiple ruby dependencies
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	# bug #302621
-	use mpi && export CXX=mpicxx
-	# produce pure octave files
-	# octave gentoo installation for .m files respected
-	sed -i \
-		-e 's/--mex//' \
-		-e 's/\.mex/\.oct/' \
-		-e '/FILES/s/${MEX_FILE}//' \
-		-e 's:share/flann/octave:share/octave/site/m:' \
-		-e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \
-		src/matlab/CMakeLists.txt || die
-	use cuda && cuda_src_prepare
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-
-	# python bindings are split
-	# off into dev-python/pyflann
-	local mycmakeargs=(
-		-DBUILD_C_BINDINGS=ON
-		-DBUILD_PYTHON_BINDINGS=OFF
-		-DPYTHON_EXECUTABLE=
-		-DDOCDIR=share/doc/${PF}
-		-DBUILD_CUDA_LIB=$(usex cuda)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_DOC=$(usex doc)
-		-DBUILD_TESTS=OFF
-		-DBUILD_MATLAB_BINDINGS=$(usex octave)
-		-DUSE_MPI=$(usex mpi)
-		-DUSE_OPENMP=$(usex openmp)
-	)
-	use cuda && mycmakeargs+=(
-		-DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\""
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if ! use static-libs; then
-		find "${D}" -name 'lib*.a' -delete || die
-	fi
-}
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index cf98462cae1b..16fa3310a4ab 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,16 +1,12 @@
 AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b63e1c9b2814acc307e0b5082e7326f495102d10c4b2bdc86b17b7f4ae8ae11231c99215d87fc59217115f0fd92fc96f0 SHA512 16ed7bbd5569166c80cf4d8beba81195a177ee36bcd7e14ca6d00e3add6fe57c7980cbe1853747325443699daa331fc23e53fc86150b6c7cf871ef4812936c39
 AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d
 AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6
-AUX gdal-2.3.1-poppler-0.69.0.patch 12775 BLAKE2B 27fe38cb5db58961e1f9f4aef9eddbf396dd364dd1c14bb61fefe4eb16397b75a56edd1b7e3225ccb30ecb2da1f5a5ddc669c9dd984807d5e92fb76c9b83e0b5 SHA512 84eb0107abc9030e34bd953d1b8218a15c35432c0dc687e4d52b97c66cda44e842b53d2819cd998921fe5e90830ce063aa242fe933f0675b1c649fb1c5e44ecc
-AUX gdal-2.3.1-poppler-0.71.0.patch 2770 BLAKE2B d856ebd2cc1077b39303ca0300ff5a27d1d9981c4f557bb935a0a2ddf7372ef3ae25b59c8f87a103eaf8be0eb467741b1191032889efb5f98a8bb09be1254ab5 SHA512 9c8fc013b191fc579517389928c2d0c4c2f769f188b26fa86b192dc6e7223c799f579095d0765ffe2c6f7158a661b384cb36e92e7bc8c1d5af236d24fe41281d
 AUX gdal-2.3.1-poppler-0.72.0.patch 2377 BLAKE2B c70dbfba879ecba9956b27e56ffe6fcbb076b9f6ed127eedc201c8d47cf527109374e98e2c31107f9ff14dace67556bffeff8651ae01161f2cb9e78732585846 SHA512 985a44492c585c1c8066feb7810b135535ccc87abf86996f64806e53952e7dd96c02649e072a1329aefab80c03d2d6069c829d36c4ea1471493cfb3af26eb69e
 AUX gdal-2.3.1-poppler-0.73.0.patch 906 BLAKE2B c71bf66068f19e80f38907d3f5ffd24e73ae4be99f720cc852ba8aad2f6999a020d59e068ed8a173c6f84e97471c1f6937f82d2519a166282216995cb8db69bb SHA512 0e846ec7c5ddf44144949018ae70063df1043f9dc2730bb189e794ffb40bd91869bd6f5939bd40fc88b18fb53f20151e286610a8db6e9292ba1c5ccc4065148f
 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
-DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
 DIST gdal-2.4.0.tar.gz 14533664 BLAKE2B ec10a4a9ba438a758131c1b80286b27ee17f1f270e77af61d70ed4149d63b9224c98db9c55156075ebd86b5f0875c626d87df3779f0b981895ff1c00786f908e SHA512 9517b23009621ed2622a460dc813b30de726d293531c6f107fb308a31e45a143e67e71aa3af3d1faed554ad516a35924973d714c63ee41445ac8d3b2da61dd10
 DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61 SHA512 b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
-EBUILD gdal-2.3.1.ebuild 8396 BLAKE2B 9f1237ca5566fcbf9cd96d8625fab6378e177659a5df2016c8b3a6f91ef6294a9ae1fcf1e9daa37f464ba77376a183a1be551831b1e3b07f4462a582999d381b SHA512 5c90139465932d1b503e26a401afaecd4388e3e34b8db86505931cd4aac1702457a91fedc5557ab5bc5d31c46a86d03a9cf8046d315800dc4529e1fbd7ec4bf6
 EBUILD gdal-2.4.0.ebuild 8297 BLAKE2B b04defd05cdadb3d7ebc78b5b5389e8cdbbd66287d6e0388476b87d749920152862b65d4ce6cc8f4af2c2711a4e35c68e9a52e3e8791ec081600e540788ea3a3 SHA512 e1832e54c9582bcba56db4f5a95dd400787b9cb7ccb0e607662fda1a3ee73cb9d0d99e6a42e9406f6b52a27d6ba8a472b0a602fbe87009ec85ee250a170a9f56
-EBUILD gdal-2.4.1.ebuild 8117 BLAKE2B 2d056d0c11b0c3ccf54800dbd2764641bb80c910679357e36eff8e9d7a0da527ea839f37df0ea01a26d4ec27b84140a69dd2963aed3104853009a9b4b23b8046 SHA512 82eb5e04061c799ae95781d4c9b2515bacc5d09b00e95c9f4038d150fed74df704b2197775051e484a88d6178a6f94b0bfe2c6ad3141b3177744223a7394b657
+EBUILD gdal-2.4.1.ebuild 8114 BLAKE2B b46ff7f7ad7e97114320a30dfdea588deaafdc92a2eb42b4e41a3e47e9e7ab3bac240700f8872df0b75ed2d3959ecb0bf99a77215583d5ffb5eb7197fcd15e1d SHA512 d5b3873326328d4dcbbc31ae059b498091422e1d0841af9e2107fda7297a95394fa64a11b1b288723426255d8bdbad53d8181f36f02bc5d54eafbc4211a47c2e
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch
deleted file mode 100644
index a89970074b06..000000000000
--- a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-From 0c0b9ea5a5d6bbef938de8a77c5b00cb228b902d Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Fri, 12 Oct 2018 19:02:40 +0200
-Subject: [PATCH] Add support for Poppler 0.69 (fixes #1004)
-
----
- GDALmake.opt.in          |  1 +
- configure                | 61 ++++++++++++++++++++++++++---------
- configure.ac             | 56 +++++++++++++++++++++++---------
- frmts/pdf/GNUmakefile    |  4 +++
- frmts/pdf/makefile.vc    |  6 +++-
- frmts/pdf/pdfdataset.cpp | 12 +++++++
- nmake.opt                |  2 ++
- 7 files changed, 111 insertions(+), 31 deletions(-)
-
-diff --git a/GDALmake.opt.in b/GDALmake.opt.in
-index 30749ae982a..f9ab41fd124 100644
---- a/GDALmake.opt.in
-+++ b/GDALmake.opt.in
-@@ -481,6 +481,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS = @POPPLER_BASE_STREAM_HAS_TWO_ARGS@
- POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@
- POPPLER_0_23_OR_LATER = @POPPLER_0_23_OR_LATER@
- POPPLER_0_58_OR_LATER = @POPPLER_0_58_OR_LATER@
-+POPPLER_0_69_OR_LATER = @POPPLER_0_69_OR_LATER@
- POPPLER_INC = @POPPLER_INC@
- POPPLER_PLUGIN_LIB = @POPPLER_PLUGIN_LIB@
- 
-diff --git a/configure b/configure
-index 050bc79ac97..a8472ba8c2d 100755
---- a/configure
-+++ b/configure
-@@ -669,6 +669,7 @@ PODOFO_INC
- HAVE_PODOFO
- POPPLER_PLUGIN_LIB
- POPPLER_INC
-+POPPLER_0_69_OR_LATER
- POPPLER_0_58_OR_LATER
- POPPLER_0_23_OR_LATER
- POPPLER_0_20_OR_LATER
-@@ -34798,6 +34799,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
- POPPLER_0_20_OR_LATER=no
- POPPLER_0_23_OR_LATER=no
- POPPLER_0_58_OR_LATER=no
-+POPPLER_0_69_OR_LATER=no
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler" >&5
- $as_echo_n "checking for poppler... " >&6; }
-@@ -34840,24 +34842,51 @@ $as_echo "yes" >&6; }
- 
-         CHECK_OTHER_POPPLER_VERSION=yes
- 
--        # And now we check if we have Poppler >= 0.58.0
--        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have new API (>= 0.58.0)" >&5
-+        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OptionalContent has API >= 0.69.0" >&5
-+$as_echo_n "checking if OptionalContent has API >= 0.69.0... " >&6; }
-+            rm -f testpoppler.*
-+            echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp
-+            echo 'int main(int argc, char** argv) {' >> testpoppler.cpp
-+            echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp
-+            echo 'ocg.getOCGs().size();' >> testpoppler.cpp
-+            echo 'return 0; }' >> testpoppler.cpp
-+            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-+                POPPLER_0_69_OR_LATER=yes
-+                POPPLER_0_58_OR_LATER=yes
-+                POPPLER_0_23_OR_LATER=yes
-+                POPPLER_0_20_OR_LATER=yes
-+                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
-+                POPPLER_HAS_OPTCONTENT=yes
-+                CHECK_OTHER_POPPLER_VERSION=no
-+                { $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; }
-+            fi
-+        fi
-+
-+        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
-+            # And now we check if we have Poppler >= 0.58.0
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have new API (>= 0.58.0)" >&5
- $as_echo_n "checking if Object does have new API (>= 0.58.0)... " >&6; }
--        rm -f testpoppler.*
--        echo '#include <poppler/Object.h>' > testpoppler.cpp
--        echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
--        if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
--            POPPLER_0_58_OR_LATER=yes
--            POPPLER_0_23_OR_LATER=yes
--            POPPLER_0_20_OR_LATER=yes
--            POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
--            POPPLER_HAS_OPTCONTENT=yes
--            CHECK_OTHER_POPPLER_VERSION=no
--            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+            rm -f testpoppler.*
-+            echo '#include <poppler/Object.h>' > testpoppler.cpp
-+            echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
-+            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-+                POPPLER_0_58_OR_LATER=yes
-+                POPPLER_0_23_OR_LATER=yes
-+                POPPLER_0_20_OR_LATER=yes
-+                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
-+                POPPLER_HAS_OPTCONTENT=yes
-+                CHECK_OTHER_POPPLER_VERSION=no
-+                { $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
-+            else
-+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-+            fi
-         fi
- 
-         if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
-@@ -34962,6 +34991,8 @@ POPPLER_0_23_OR_LATER=$POPPLER_0_23_OR_LATER
- 
- POPPLER_0_58_OR_LATER=$POPPLER_0_58_OR_LATER
- 
-+POPPLER_0_69_OR_LATER=$POPPLER_0_69_OR_LATER
-+
- POPPLER_INC=$POPPLER_INC
- 
- POPPLER_PLUGIN_LIB=$POPPLER_PLUGIN_LIB
-diff --git a/configure.ac b/configure.ac
-index 4b8ab911cec..0c588e04f03 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4496,6 +4496,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
- POPPLER_0_20_OR_LATER=no
- POPPLER_0_23_OR_LATER=no
- POPPLER_0_58_OR_LATER=no
-+POPPLER_0_69_OR_LATER=no
- 
- AC_MSG_CHECKING([for poppler])
- 
-@@ -4536,21 +4537,45 @@ if test "$with_poppler" != "no" -a "$with_poppler" != ""; then
- 
-         CHECK_OTHER_POPPLER_VERSION=yes
- 
--        # And now we check if we have Poppler >= 0.58.0
--        AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)])
--        rm -f testpoppler.*
--        echo '#include <poppler/Object.h>' > testpoppler.cpp
--        echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
--        if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
--            POPPLER_0_58_OR_LATER=yes
--            POPPLER_0_23_OR_LATER=yes
--            POPPLER_0_20_OR_LATER=yes
--            POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
--            POPPLER_HAS_OPTCONTENT=yes
--            CHECK_OTHER_POPPLER_VERSION=no
--            AC_MSG_RESULT([yes])
--        else
--            AC_MSG_RESULT([no])
-+        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
-+            AC_MSG_CHECKING([if OptionalContent has API >= 0.69.0])
-+            rm -f testpoppler.*
-+            echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp
-+            echo 'int main(int argc, char** argv) {' >> testpoppler.cpp
-+            echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp
-+            echo 'ocg.getOCGs().size();' >> testpoppler.cpp
-+            echo 'return 0; }' >> testpoppler.cpp
-+            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-+                POPPLER_0_69_OR_LATER=yes
-+                POPPLER_0_58_OR_LATER=yes
-+                POPPLER_0_23_OR_LATER=yes
-+                POPPLER_0_20_OR_LATER=yes
-+                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
-+                POPPLER_HAS_OPTCONTENT=yes
-+                CHECK_OTHER_POPPLER_VERSION=no
-+                AC_MSG_RESULT([yes])
-+            else
-+                AC_MSG_RESULT([no])
-+            fi
-+        fi
-+
-+        if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
-+            # And now we check if we have Poppler >= 0.58.0
-+            AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)])
-+            rm -f testpoppler.*
-+            echo '#include <poppler/Object.h>' > testpoppler.cpp
-+            echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
-+            if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-+                POPPLER_0_58_OR_LATER=yes
-+                POPPLER_0_23_OR_LATER=yes
-+                POPPLER_0_20_OR_LATER=yes
-+                POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
-+                POPPLER_HAS_OPTCONTENT=yes
-+                CHECK_OTHER_POPPLER_VERSION=no
-+                AC_MSG_RESULT([yes])
-+            else
-+                AC_MSG_RESULT([no])
-+            fi
-         fi
- 
-         if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
-@@ -4635,6 +4660,7 @@ AC_SUBST(POPPLER_BASE_STREAM_HAS_TWO_ARGS, $POPPLER_BASE_STREAM_HAS_TWO_ARGS)
- AC_SUBST(POPPLER_0_20_OR_LATER, $POPPLER_0_20_OR_LATER)
- AC_SUBST(POPPLER_0_23_OR_LATER, $POPPLER_0_23_OR_LATER)
- AC_SUBST(POPPLER_0_58_OR_LATER, $POPPLER_0_58_OR_LATER)
-+AC_SUBST(POPPLER_0_69_OR_LATER, $POPPLER_0_69_OR_LATER)
- AC_SUBST(POPPLER_INC, $POPPLER_INC)
- AC_SUBST(POPPLER_PLUGIN_LIB, $POPPLER_PLUGIN_LIB)
- 
-diff --git a/frmts/pdf/GNUmakefile b/frmts/pdf/GNUmakefile
-index 2c332d2798f..6a267f529b2 100644
---- a/frmts/pdf/GNUmakefile
-+++ b/frmts/pdf/GNUmakefile
-@@ -34,6 +34,10 @@ ifeq ($(POPPLER_0_58_OR_LATER),yes)
- CPPFLAGS +=  -DPOPPLER_0_58_OR_LATER
- endif
- 
-+ifeq ($(POPPLER_0_69_OR_LATER),yes)
-+CPPFLAGS +=  -DPOPPLER_0_69_OR_LATER
-+endif
-+
- ifeq ($(HAVE_PODOFO),yes)
- CPPFLAGS +=  -DHAVE_PODOFO
- endif
-diff --git a/frmts/pdf/makefile.vc b/frmts/pdf/makefile.vc
-index b4fa14d0a18..ad76d3de70c 100644
---- a/frmts/pdf/makefile.vc
-+++ b/frmts/pdf/makefile.vc
-@@ -14,7 +14,7 @@ OBJ = $(OBJ) ..\..\ogr\ogrsf_frmts\mem\ogrmemdatasource.obj ..\..\ogr\ogrsf_frmt
- EXTRAFLAGS =  -I..\vrt -I..\mem -I..\..\ogr\ogrsf_frmts\mem $(POPPLER_EXTRAFLAGS) $(PODOFO_EXTRAFLAGS) $(PDFIUM_EXTRAFLAGS)
- 
- !IFDEF POPPLER_ENABLED
--POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) $(POPPLER_0_23_OR_LATER_FLAGS) $(POPPLER_0_58_OR_LATER_FLAGS) -DHAVE_POPPLER
-+POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) $(POPPLER_0_23_OR_LATER_FLAGS) $(POPPLER_0_58_OR_LATER_FLAGS) $(POPPLER_0_69_OR_LATER_FLAGS) -DHAVE_POPPLER
- 
- !IFDEF POPPLER_HAS_OPTCONTENT
- POPPLER_HAS_OPTCONTENT_FLAGS = -DPOPPLER_HAS_OPTCONTENT
-@@ -36,6 +36,10 @@ POPPLER_0_23_OR_LATER_FLAGS = -DPOPPLER_0_23_OR_LATER
- POPPLER_0_58_OR_LATER_FLAGS = -DPOPPLER_0_58_OR_LATER
- !ENDIF
- 
-+!IFDEF POPPLER_0_69_OR_LATER
-+POPPLER_0_69_OR_LATER_FLAGS = -DPOPPLER_0_69_OR_LATER
-+!ENDIF
-+
- !ENDIF
- 
- !IFDEF PODOFO_ENABLED
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index ee89fd07564..1a56f57ee06 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -3440,10 +3440,16 @@ void PDFDataset::FindLayersPoppler()
-     }
-     else
-     {
-+#ifdef POPPLER_0_69_OR_LATER
-+        for( const auto& refOCGPair: optContentConfig->getOCGs() )
-+        {
-+            auto ocg = refOCGPair.second.get();
-+#else
-         GooList* ocgList = optContentConfig->getOCGs();
-         for(int i=0;i<ocgList->getLength();i++)
-         {
-             OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i);
-+#endif
-             if( ocg != nullptr && ocg->getName() != nullptr )
-             {
-                 const char* pszLayerName = (const char*)ocg->getName()->getCString();
-@@ -3472,10 +3478,16 @@ void PDFDataset::TurnLayersOnOffPoppler()
-     {
-         int i;
-         int bAll = EQUAL(pszLayers, "ALL");
-+#ifdef POPPLER_0_69_OR_LATER
-+        for( const auto& refOCGPair: optContentConfig->getOCGs() )
-+        {
-+            auto ocg = refOCGPair.second.get();
-+#else
-         GooList* ocgList = optContentConfig->getOCGs();
-         for(i=0;i<ocgList->getLength();i++)
-         {
-             OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i);
-+#endif
-             ocg->setState( (bAll) ? OptionalContentGroup::On : OptionalContentGroup::Off );
-         }
- 
-diff --git a/nmake.opt b/nmake.opt
-index 682d766d93e..1eb049038c8 100644
---- a/nmake.opt
-+++ b/nmake.opt
-@@ -639,6 +639,7 @@ OCI_INCLUDE =	-I$(ORACLE_HOME)\oci\include
- # Uncomment POPPLER_0_20_OR_LATER = YES for Poppler >= 0.20.0
- # Uncomment POPPLER_0_23_OR_LATER = YES for Poppler >= 0.23.0
- # Uncomment POPPLER_0_58_OR_LATER = YES for Poppler >= 0.58.0
-+# Uncomment POPPLER_0_69_OR_LATER = YES for Poppler >= 0.69.0
- #POPPLER_ENABLED = YES
- #POPPLER_CFLAGS = -Ie:/kde/include -Ie:/kde/include/poppler
- #POPPLER_HAS_OPTCONTENT = YES
-@@ -646,6 +647,7 @@ OCI_INCLUDE =	-I$(ORACLE_HOME)\oci\include
- #POPPLER_0_20_OR_LATER = YES
- #POPPLER_0_23_OR_LATER = YES
- #POPPLER_0_58_OR_LATER = YES
-+#POPPLER_0_69_OR_LATER = YES
- #POPPLER_LIBS = e:/kde/lib/poppler.lib e:/kde/lib/freetype.lib e:/kde/lib/liblcms-1.lib advapi32.lib gdi32.lib
- 
- # Uncomment for PDF support
diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.71.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.71.0.patch
deleted file mode 100644
index 90ee94d06216..000000000000
--- a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.71.0.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Description: Add support for Poppler 0.71.0.
-Author: Even Rouault <even.rouault@spatialys.com>
-Origin: https://github.com/OSGeo/gdal/commit/4cc0215b8f2cef3582265cdfaf16589390697706
-Bug: https://github.com/OSGeo/gdal/issues/1121
-Bug-Debian: https://bugs.debian.org/915722
-
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -2593,18 +2593,25 @@ static void PDFDatasetErrorFunctionCommo
- }
- 
- #ifdef POPPLER_0_20_OR_LATER
--static void PDFDatasetErrorFunction(CPL_UNUSED void* userData, CPL_UNUSED ErrorCategory eErrCategory,
-+
-+static void PDFDatasetErrorFunction(void* /* userData*/,
-+                                    ErrorCategory /* eErrCategory */,
- #ifdef POPPLER_0_23_OR_LATER
-                                     Goffset nPos,
- #else
-                                     int nPos,
- #endif
--                                    char *pszMsg)
-+#ifdef POPPLER_0_71_OR_LATER
-+                                    const char *pszMsg
-+#else
-+                                    char *pszMsg
-+#endif
-+                                   )
- {
-     CPLString osError;
- 
-     if (nPos >= 0)
--        osError.Printf("Pos = %d, ", (int)nPos);
-+        osError.Printf("Pos = " CPL_FRMT_GUIB ", ", static_cast<GUIntBig>(nPos));
-     osError += pszMsg;
-     PDFDatasetErrorFunctionCommon(osError);
- }
-@@ -4442,7 +4449,7 @@ GDALDataset *PDFDataset::Open( GDALOpenI
- #ifdef HAVE_POPPLER
-     if (bUseLib.test(PDFLIB_POPPLER))
-     {
--        PDFRectangle* psMediaBox = poPagePoppler->getMediaBox();
-+        const auto* psMediaBox = poPagePoppler->getMediaBox();
-         dfX1 = psMediaBox->x1;
-         dfY1 = psMediaBox->y1;
-         dfX2 = psMediaBox->x2;
-@@ -4780,14 +4787,12 @@ GDALDataset *PDFDataset::Open( GDALOpenI
-     GooString* poMetadata = poCatalogPoppler->readMetadata();
-     if (poMetadata)
-     {
--        char* pszContent = poMetadata->getCString();
-+        const char* pszContent = poMetadata->getCString();
-         if (pszContent != nullptr &&
-             STARTS_WITH(pszContent, "<?xpacket begin="))
-         {
--            char *apszMDList[2];
--            apszMDList[0] = pszContent;
--            apszMDList[1] = nullptr;
--            poDS->SetMetadata(apszMDList, "xml:XMP");
-+            const char * const apszMDList[2] = { pszContent, nullptr };
-+            poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP");
-         }
-         delete poMetadata;
-     }
---- a/frmts/pdf/pdfio.h
-+++ b/frmts/pdf/pdfio.h
-@@ -58,6 +58,15 @@
- #define makeSubStream_object_type Object*
- #endif
- 
-+// Detect Poppler 0.71 that no longer defines GBool
-+#ifdef POPPLER_0_69_OR_LATER
-+#ifndef initObj
-+#define POPPLER_0_71_OR_LATER
-+#define GBool bool
-+#define gFalse false
-+#endif
-+#endif
-+
- class VSIPDFFileStream: public BaseStream
- {
-     public:
diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
deleted file mode 100644
index da763e365dc3..000000000000
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-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://www.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 ~sparc 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
-	# fixed in 2.4.0:
-	"${FILESDIR}/${P}-poppler-0.69.0.patch"
-	"${FILESDIR}/${P}-poppler-0.71.0.patch" # bug 674556
-)
-
-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
-
-	# fixed in git master or what will become 2.4.1:
-	has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${P}-poppler-0.72.0.patch"
-	has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${P}-poppler-0.73.0.patch"
-
-	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-php
-		--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.1.ebuild b/sci-libs/gdal/gdal-2.4.1.ebuild
index ac9b89603d03..1c59333d4d32 100644
--- a/sci-libs/gdal/gdal-2.4.1.ebuild
+++ b/sci-libs/gdal/gdal-2.4.1.ebuild
@@ -15,7 +15,7 @@ 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc 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="
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 181f59950e2e..5df3c87b477d 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -5,7 +5,7 @@ DIST gsl-1.16.tar.gz 3534080 BLAKE2B 1c55a41e5ed57b57f671074240d23416aa8f23e3cc2
 DIST gsl-2.3-cblas.patch.bz2 12036 BLAKE2B ddad801cc42f925581e2e4995292f3eab0d2faf70c43c3b205fcf521b98e426df1d0824ed7d98b2c4cc89bbc4068fd45f2595dc02d23bded5c702b5a01bbfdb2 SHA512 37b867a21e60cd96c453ae24139bcf16c00c85bb6d5a3dcece81185fd9af5870c5167d2fa3c74cffce55bfb84f72be34d28ea94e0889904f8dda8687f66b4d23
 DIST gsl-2.4.tar.gz 5916715 BLAKE2B f22c07b2d5759a383e05b8bfdba70071672cc27f12ff2a8c755451fe7e10c8e2d80e3fcc601508c5e9942e4cfd05e51c43ba96666326b760e4390eb0c2552886 SHA512 12442b023dd959e8b22a9c486646b5cedec7fdba0daf2604cda365cf96d10d99aefdec2b42e59c536cc071da1525373454e5ed6f4b15293b305ca9b1dc6db130
 DIST gsl-2.5.tar.gz 7303881 BLAKE2B 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997c1111f980a5e4cb50d110ca626fe810c44be70180 SHA512 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a
-EBUILD gsl-1.16.ebuild 3086 BLAKE2B 19da52fb104356017ae3cbc824783962ac6262c85496a26f9f5a4e4486a17309b0647e386c98a5e8010efcc82c0fe8cf57cf45d0e9a78a52c113edf4a9323d8c SHA512 47658615b8c9dcb1b43f46f1994d1befa73ca79c737a4acff17061e9413191337522d12c2ee274992e6244304d5479d59f45f573f3d400fdaccbcc419d44a1a8
+EBUILD gsl-1.16.ebuild 3092 BLAKE2B e213441308cddca756b5de778f78f40d73e1b9cf4e951bb1e1bb0efbe3602284adad4a4bee6231cdada74d1a5ae05e9ead4a9634c2b4d35a3dd11cb3ddae7652 SHA512 d5dffee6c9ee7c1c66d9517251e397eb7af212c2a649b48aff22b88a5871276e8076c785242fb49fe25d6e101a53268b7a10438350d0d5ffaba82abae27d6286
 EBUILD gsl-2.4.ebuild 3201 BLAKE2B b3277c57be36d13fd4d84c8821226cb12ade83582570f20f70daa0b7683c17839445cd9a2c0b9c7ddd6361159f7d49809d01fcd5f889d8cb38ebe0d6478b9b7b SHA512 07784db20ac72dd1004f0736facbf196db0c648c0a8dc1574f4c6eef4fb3970508408a39d072cb2c050e2bae8bcc95d928dcec964e08e2d554eee1440a769b5a
 EBUILD gsl-2.5.ebuild 3194 BLAKE2B 823b1a827c2150b9b48750c10830eace9ed615e2d0620054ebee0c5837dd3241941e3a0dd231792e6b72ef7abe5895b806cb3021ccdac52a96bb5ec7d5dbe3f4 SHA512 c52751657d62ae714bb4526e50ad485f78ecf0b7af1169fba7f2940f5821bd9792a51d24a15b3ea5d2d66af79d9dd08256eb5ffeab5c4668c7d2c7407d9a837b
 MISC metadata.xml 1190 BLAKE2B b9015dc09464b327144a546a0e9dae6e1c5eaf3ce118a24b7ad1853f09af1952284f754aada2436d7e1a1df82638720492445d8f015ccb1cec05c78dd718fc26 SHA512 f56ec87aeb8f257480a631748db79c78193797e1ecd586dbbd78f31a01fbbd3341fa67ffd3244e5dba352478ee552184d6a1d9b5ef5d54d67b038215090eca00
diff --git a/sci-libs/gsl/gsl-1.16.ebuild b/sci-libs/gsl/gsl-1.16.ebuild
index b09b5db24967..553e95089128 100644
--- a/sci-libs/gsl/gsl-1.16.ebuild
+++ b/sci-libs/gsl/gsl-1.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas )"
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 71b611aad372..4e5f4eb19b27 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -6,6 +6,6 @@ DIST hdf5-1.10.1.tar.bz2 11769617 BLAKE2B 66ad762aed90cea9e58a9735bf0e189d78befc
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
 DIST hdf5-1.8.18.tar.bz2 10081294 BLAKE2B cf0d0c8a41576bcf816460eaabcfab29cfffba240721a64fe584c42fbb322470f29fb93c8513f7bbdedeeb392c2fe64cd3261b47b47de5b01828dae0b1929cd3 SHA512 01f6d14bdd3be2ced9c63cc9e1820cd7ea11db649ff9f3a3055c18c4b0fffe777fd23baad536e3bce31c4d76fe17db64a3972762e1bb4d232927c1ca140e72b2
 EBUILD hdf5-1.10.1.ebuild 2808 BLAKE2B 79eb6b5c889d717f6a8391ce334baa0878971256460be4d6bde00726078f4a944c2e4843867c767fa25cf346cca9f7f2cf58f0c918d17bd4cf050a11ba17c396 SHA512 29b39083a7fc5400490c81a5c6ad9bc76485c5ac67f983a45524010b1d72e99cca6e218b1dd052c000bfd7bd7397ec770e6d62ca0d5e313ac3c3c2253387e758
-EBUILD hdf5-1.10.5.ebuild 2660 BLAKE2B 02eb512d9b204c31ec26bd0b61a9ab0d0b40c63505a07928aebc78185d765d4e551b0905fd5b0fa7c84feb117b0f909edb17f2803729ec55b80f26ecec43c3ff SHA512 bdde7e485f7dab120051b22ece32fdbd7ec943c859d37b007847789aa68cbf7153dc38dbf077e56415334743a6843457c94eb6a1883ea9a494ada48ded0781d7
+EBUILD hdf5-1.10.5.ebuild 2657 BLAKE2B 53d78c9ea1f0421a6e421000989715645e325f7fbe2794a6f8615fad7df2cb680cdd99ef357b00de387777e0ad02c80fd4864a0bad602d2d0991a162c44e7704 SHA512 63495b13b81c7e07c6d564b56ddd252a633263a4d35be0375a6b660fd86f0de87303388211dfca115f71220d9e33c7bfc741f4337f1d8a3bfca3f7d737fd139d
 EBUILD hdf5-1.8.18.ebuild 3366 BLAKE2B 5ea79bd8cfd5664c92de2cfb62c826500b1847290684a9ad3a1bda7ac2aa33d2d428b59ce9f7f1bfb17637472742804ddb98f9018386ebfbdff33c2023d942e4 SHA512 54e66dc074fd9b0fe9ad23f23234fc20e79c6ed9e9759d6964cb8e4d3e79321c08b4539a814f2fae2c935bb9358549115a884b8f55719fb77744fd26ad680867
 MISC metadata.xml 822 BLAKE2B ab9bf739575f9758fa521e9640438b345379373884ffd25a021a15589b7016d519f01d4d4d39dc5c8efbd271fbeb89d584b3d627e2b0d90cecf55d36747447cf SHA512 5e6cb47fcf2e704887a375f527b447075a36a51225cc2bdf10892bff5cce548599dd6f04a36ae2e31f691bd635dd6cc5d1455729e05923a8992d95fb27716164
diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
index 1e8158a6d6bd..0060a1d2ac2a 100644
--- a/sci-libs/hdf5/hdf5-1.10.5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran +hl mpi static-libs szip threads zlib"
 
 REQUIRED_USE="
diff --git a/sci-libs/libaec/Manifest b/sci-libs/libaec/Manifest
index 8049ccfc0002..0fe7b8b3df0b 100644
--- a/sci-libs/libaec/Manifest
+++ b/sci-libs/libaec/Manifest
@@ -5,5 +5,5 @@ DIST libaec-1.0.2.tar.gz 767910 BLAKE2B 4d843839b21d93a7ae0f90627217978d1d7262df
 EBUILD libaec-0.3.2.ebuild 861 BLAKE2B 02da5f244313ee6e63b45786c993bafac01aa4e25599a9c6669fb00cef636cd36cb1210cf4e138ec7554812ae4e8cf325bb7d324155754c391403bf7ae6016ac SHA512 98665305d25602202a33013af317ce7c12e65a5c37520db0e7f62b57bed70df064356d4a79cdedc7d8c119fec6bad06f327cc9f4ce95b46bf069f15d14dc63f6
 EBUILD libaec-1.0.0.ebuild 867 BLAKE2B 41f44e86d7298b6d2693e95f99bd5a7562bd070b76118baeddb226c30b8ff6fdf67d437cc1fc40d93adc61529b34a9e919724b99542ee397cc0617a0171cd73c SHA512 14b5bd5e53710b28b53110cf3720754425220d1a58635da560945a3c2c6aec609adcad5bc5992aec1366e14a6ac3a3d1f200e4a7ee3543b1153835dc21ec1c02
 EBUILD libaec-1.0.1.ebuild 727 BLAKE2B e798ca2aa12bb996cfdcbb1a4d6f93be758e0fd6656ec5b69f5aabad5fe99171bfeace01fb20da536f57691375192d16177c9869c87fb5b2aec2629fbb48cc67 SHA512 c265ab4b16211ff6af0b166b070642f6f3c37ef06b48da3d9dc4d1ba16c955909be9c94a1428d9cace53cac3df099bc5a86091ec110b1c1fa9e382d6919095bb
-EBUILD libaec-1.0.2.ebuild 717 BLAKE2B 2e5aaf14ee3bf9231cfea99f7b3ae76590a92f5c87a1eb8bfb414a2a9d855277291f459a9296a40f39faac08feca69046c8f05eb17f8b5eb7202f3f20a2f8351 SHA512 94203dc5bfcc4c4a361996595b474a3f6f5262497baf3ca542434205d7902c1d64b694d1be4ae6a06036ec2f5099991866807e52e4f52027643eb83b343de5d2
+EBUILD libaec-1.0.2.ebuild 713 BLAKE2B 371bb02593580c81beeec9f1f0adac65274e79da6625294438c983c881a93dd35e8980de44947b43421b122aeacabd4ca9ff8726c1a4142a50f8d77885ff8692 SHA512 101f39b27c011559c63d7072a47b6546ca4edaeae0aa2fd5024384c7cd5cfd8ad8fa645f07b2baef22f1ea2678ba0670154d2636f34329d6c757c19d77912487
 MISC metadata.xml 719 BLAKE2B d8294233ada6c2318c05d70c6062e7b7db0b0bab38410e9bd0c7d6f9834d1515cb138095d555f27f36c829fbbf7c83c141c1ce74213fba849da8704adf63889d SHA512 f0197c0cf374cb0771e4b2e3bfcc80f639d3e660943df1cab79eec68b515a605855f792b0b1627d24409cfb6cc2890ca7e96f4aace01639106ee50e14574ccf6
diff --git a/sci-libs/libaec/libaec-1.0.2.ebuild b/sci-libs/libaec/libaec-1.0.2.ebuild
index 99c1467eeb98..410594b49bbf 100644
--- a/sci-libs/libaec/libaec-1.0.2.ebuild
+++ b/sci-libs/libaec/libaec-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+szip"
 
 DEPEND=""
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index 88a153e63d7d..a7d3e9ca9d1e 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -3,6 +3,6 @@ DIST libcerf-1.3.tgz 385600 BLAKE2B ffc0671cd86866c3bc7c488251a60ce1339064954a24
 DIST libcerf-1.4.tgz 386065 BLAKE2B dc33523ba37133dd210e9aeb2ebaf75b630032ff7acfabc4e4c81f04ea27063929dd9a5793b4160d8a33efb34333011c0ce72e1713a884d64103a01a0745e7ef SHA512 93d7b03898c0f88e436947b204db7fb5097dc901928aedde48bf0a04552e1c041fdfcdbe6318fdc21508e1349b6c205f557660550e72d6e86b078d9d0dde0faa
 DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
 EBUILD libcerf-1.3.ebuild 620 BLAKE2B 261a0d3b341ba163968d3139272c334b3d9014cab43edcb31d19052c6411ee1d1809f238b9449f19adb2d25f081f8f140e68d2f172a68970fe032d05b743b704 SHA512 f2911dde75cc0e1450d3099e50efcd4454056f778f67dbad83bc98c93efbcfeecc4b08003790db7690c56c12d41be3ae89729b0b251e978d1c79422384be3fd7
-EBUILD libcerf-1.4.ebuild 719 BLAKE2B b44629ab4c27e2a6d04a7c7144e5d933f997f8402490078541094e67576350c6bd8b6ce4f383fa034000e10ef9b3f44afce5bdf5aed59e0e99811b0d2eeab729 SHA512 073b66a02b7d8358905cb6a9b6f6bfc3b52e0c2a5453ac403ae8839dc6ef4a83c6376232fd00fba48d6625a5df0c49cffe1f3e693dac8366c56e8620b3e8a8b2
+EBUILD libcerf-1.4.ebuild 718 BLAKE2B ee5b6ad87be49bcee3ff1a942b19ec6b1ff1bb3b39fa25d0b91ec75d83121bbd28ed62dbbf4fd73c9b7ac4b7c2f3a3b22805f441948fbce1d48ebefe93b67599 SHA512 3b7e679d0538a1a34d147c4b0596e1269271be6d3feaaf5ea95cc240004d5ff529a5a1642e2e7994058a58d9c7d8948697f2df3a51b14d5f9042f8ce044629aa
 EBUILD libcerf-1.5.ebuild 804 BLAKE2B 69c58fedf460c869985bcf4f136244cd7b12146f83a04b0e98096e0f46fb98210f872f9cdd18e206dfb2508927413f35ded82b8bdd1838ff64893f9abc25312d SHA512 21d58649a22a8989bce795494f6f13ea536b3e3241bcbde520db15c0bcfa6a6d0e5682840f54fb3a123e8d98e7aba89eb32ca8c7cc1276b3e7841e3fa701ce7b
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcerf/libcerf-1.4.ebuild b/sci-libs/libcerf/libcerf-1.4.ebuild
index ea2fb0f59b84..bbfc6adc3233 100644
--- a/sci-libs/libcerf/libcerf-1.4.ebuild
+++ b/sci-libs/libcerf/libcerf-1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
 
 src_install() {
diff --git a/sci-libs/libmed/Manifest b/sci-libs/libmed/Manifest
index fb849d855760..2d3b68c78ba3 100644
--- a/sci-libs/libmed/Manifest
+++ b/sci-libs/libmed/Manifest
@@ -2,12 +2,11 @@ AUX libmed-3.3.1-cmake-fortran.patch 588 BLAKE2B 7fbd1619692702edb395402d30ee5ae
 AUX libmed-3.3.1-disable-python-compile.patch 1242 BLAKE2B 5c0a500376665cea4429820b3c41eac1d8bf25b1a172a236327e74768891ca1ec7ed143e0d7c803eac5194a6b762538731c068aca53cc5f2b8071d9b0ce08b57 SHA512 29dd13933412b19a4bb003d2337cfd3d35bedff430325809947d41b276690a3413976b39487e4577ad74a6c6ca1c611e63ee09873f0ea2acae1a21475a6bb2e5
 AUX libmed-3.3.1-mpi.patch 608 BLAKE2B 61c26f3cce21aa92d72f07227076afc477fb5cb94590b2587f5a57dfc662e7a619de84708bf71f7c22f159ca6943991bd8c5f767f2ba1953494f31133dff784d SHA512 f77833448dcf0d7d0949d96d1433cc36956765f4aefd9ff2f03add9ee8451069c3840a5bae054be094a2711631be947d32ea3321b7f79a719e3e5ea2a06fd8cf
 AUX libmed-4.0.0-cmakelist.patch 2421 BLAKE2B 38991513aabbb8237a8b0d9456d9bb76f38cffecff9b1b4c906c0f9d17abd6c02ec150420403d8c1b36310b871f5354e100d1038d5620f6ba8719074e0ccd665 SHA512 405669dedc95b3776a2f4f6d64f8a608c914adb7d0666690f1f8b4a0598d6d85c7398622f50c50ead0295ee965fa993c36eb9e4217985079b528714682ea8b5d
-AUX libmed-4.0.0-hdf5-1.8-support.patch 735 BLAKE2B 675ef189ed25e2366b1be89dcb253ecf81dcf61ca4af623a73830701baf2012134e2718d924c4554861768498016d7c4224ebc6110de56184b2c4e9d7c320583 SHA512 2eb7d3ec57afeecf8e78c6df094187989cc4336e9eed7a8145975a5a7f31c7aef5c7a3cbad358402cee4c3b47d63b546a74e4e0d4108ea036b2613ce91fa914d
 AUX libmed-4.0.0-installdoc.patch 1045 BLAKE2B ddc44d986743a4bf1fa59ab20d34835117f2213283ad13ce1e8e16358b87fe64888facb2f32da76a025cc283a5d942554700cc8816c25cb6f0eeaa54970f1f9a SHA512 486eb41af086d2dc92463aa8f64f074f70a39920b4954e4c272bc6b92c960efe198255975b7c594ff801be43e9eb6a31d007f55451901107db90ed6b3389eee6
 AUX libmed-4.0.0-tests.patch 819 BLAKE2B c6352475b917d4300d15eaa8742c44ed609768265beb37d6a4128e52cfcda9b7971e8d770045944e94dfa9c40dd756dba854c6dd793639c3dad4497bba34b651 SHA512 4b13a8dc40d7d666b7853b47df7c432a796bc905b714cdecc22bc242597eddb6c18a13eae0c39b8a00a4b07d710332c413ac5c358ffff7cb19378a8adb12221c
 DIST libmed-3.3.1-r1-gentoo.tar.bz2 36127 BLAKE2B c112215932ac5c84cc75911c20712fcf428a8fc6e8adfd497066315fbc99a70816e0276196ff6366f34eeb3bf6d40586a735dd35cc13579640d7128f563fbf2b SHA512 e55dc96b8282dfba0dc9746dba7ef2ea8616d5617deabd3164d0134ca680e27c2a121432ae22f38fc53a52ffb0ac66a9a17c131488a9d01a757601afbcdc0bff
 DIST med-3.3.1.tar.gz 43379218 BLAKE2B 101033a766b3b8f184de8b18437a020129da3a11fd947742c30d8b9d274542e7445f1ee1d5827194a1ebc02c701ea6911105102f7b61c24d9d07bb15dbfe45f7 SHA512 f1eba3bc69520b862bdab89ce76694f91ed0e6be42c037df8ec655b6314e8ae776083d5ead61fb34097eb8440302969229d1859b6d8fcce51e7551b75d8ebf5f
 DIST med-4.0.0.tar.gz 47849098 BLAKE2B 0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63 SHA512 2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7
 EBUILD libmed-3.3.1-r1.ebuild 2959 BLAKE2B affec9e8225346068e8efae6aac6565aec3e2e7e03d49f7c29283002bd302d9f7c82cb01ec35900937cbc49bb3a4875ab170d20cc9ab9bccfa9ee64299e93dc4 SHA512 41d3458105c5847461b8e7077361fa735bb157e4eca8bc9853748a7ff3f1993ddf476a32663f75ebffb2c304bd962b8e180885d59702dbc6dd1022b1deceb706
-EBUILD libmed-4.0.0.ebuild 3003 BLAKE2B 4727e86ebbd16a04ebde8749d9f4eb12703f572743eddcb3b4977b99e852ac6cdc9d805bee315dc8d483cb01476a4a4cf9f30508f821dc79d60ed03c5895696b SHA512 45bea97ffb92f7123140def57cd0b3d3d336dc0a88b604f4a6cb1601d3e8b1f1c467182fa9515ebf42491b6539cbfdb4bd4b4c48148497c9ddab90c737a41bb5
-MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25
+EBUILD libmed-4.0.0-r1.ebuild 3018 BLAKE2B 0c9a76d5168b930d3f747026a1969724b6907d1777d89fdf1dd5b8166839468b45e0606870dc823125673c7dc328c389bcec60ffefd9d4e2e90d1d7b68b1cf5c SHA512 159fae6c4a5c82ad146fb0188d93c120d6a6b036cbe71c012adef0f45a248f165968dcf56d9ffdf910add49d9fe47b7560202126040716661e43c446ab58df50
+MISC metadata.xml 379 BLAKE2B d8dc23452e0bc847d6d828192f2665cc74924abb6e5057db84a2a7bd6a1e4b1daa047e7db5694e00b07b1c21666f0fca8d4c374fb3be0f1ce3dbf3742f3b7f93 SHA512 5bc38cad4d81652ac0f16779036d8a3ab1772e504c4d17b614aca53c845518c56f0baa3bf02aa186bb988d6942945b4b5355ade3544f9c0c5da367c9bf0a645f
diff --git a/sci-libs/libmed/files/libmed-4.0.0-hdf5-1.8-support.patch b/sci-libs/libmed/files/libmed-4.0.0-hdf5-1.8-support.patch
deleted file mode 100644
index 72838c3dee90..000000000000
--- a/sci-libs/libmed/files/libmed-4.0.0-hdf5-1.8-support.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./config/cmake_files/medMacros.cmake	2019-01-09 17:16:00.951884862 +0100
-+++ ./config/cmake_files/medMacros.cmake.new	2019-01-09 17:18:48.753888600 +0100
-@@ -396,10 +396,10 @@
-     ##
-     ## Requires 1.10.x version
-     ##
--    IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
--        MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
--    ENDIF()
-+    #IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
-+    #    MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
-+    #ENDIF()
-     ##
-     ##
- 
diff --git a/sci-libs/libmed/libmed-4.0.0.ebuild b/sci-libs/libmed/libmed-4.0.0-r1.ebuild
index 94a5e5bd221d..832a6c7398fd 100644
--- a/sci-libs/libmed/libmed-4.0.0.ebuild
+++ b/sci-libs/libmed/libmed-4.0.0-r1.ebuild
@@ -8,8 +8,10 @@ EAPI=7
 CMAKE_MAKEFILE_GENERATOR=emake
 
 FORTRAN_NEEDED=fortran
-# NOTE:The build for multiple python versions should be possible but complecated for the build system
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+# NOTE:The build for multiple python versions should be possible but
+# complicated for the build system
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit cmake-utils fortran-2 python-single-r1
 
@@ -22,17 +24,16 @@ SRC_URI="http://files.salome-platform.org/Salome/other/${MY_P}.tar.gz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc fortran mpi python static-libs test"
+IUSE="doc fortran mpi python test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="
-	sci-libs/hdf5[fortran=,mpi=]
+	>=sci-libs/hdf5-1.10.0[fortran=,mpi=]
 	mpi? ( virtual/mpi[fortran=] )
 	python? ( ${PYTHON_DEPS} )
 "
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-2.0.9:0 )
-"
+DEPEND="${RDEPEND}"
+BDEPEND="python? ( >=dev-lang/swig-2.0.9:0 )"
 
 S="${WORKDIR}"/${MY_P}
 
@@ -40,13 +41,12 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.3.1-cmake-fortran.patch"
 	"${FILESDIR}/${PN}-3.3.1-disable-python-compile.patch"  # managed by function of python eclass
 	"${FILESDIR}/${PN}-3.3.1-mpi.patch"
-	"${FILESDIR}/${P}-hdf5-1.8-support.patch"
 	"${FILESDIR}/${P}-cmakelist.patch"
 	"${FILESDIR}/${P}-tests.patch"  # disable a few tests not running
 	"${FILESDIR}/${P}-installdoc.patch"
 )
 
-DOCS=( AUTHORS COPYING COPYING.LESSER ChangeLog NEWS README TODO )
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -68,16 +68,17 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		# as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen,
+		# so let's avoid rebuilding it because it will be different
+		-DMEDFILE_BUILD_DOC=OFF
 		-DMEDFILE_BUILD_FORTRAN=$(usex fortran)
-		-DMEDFILE_BUILD_STATIC_LIBS=$(usex static-libs)
 		-DMEDFILE_BUILD_PYTHON=$(usex python)
+		-DMEDFILE_BUILD_SHARED_LIBS=ON
+		-DMEDFILE_BUILD_STATIC_LIBS=OFF
 		-DMEDFILE_BUILD_TESTS=$(usex test)
+		-DMEDFILE_DOC_DIRECTORY="${EPREFIX}"/usr/share/doc/${PF}/html   # custom var created by patches
 		-DMEDFILE_INSTALL_DOC=$(usex doc)
 		-DMEDFILE_USE_MPI=$(usex mpi)
-		-DMEDFILE_DOC_DIRECTORY="${EPREFIX}"/usr/share/doc/${PF}/html   # custom var created by patches
-		# as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen, 
-		# so let's avoid rebuilding it because it will be different
-		-DMEDFILE_BUILD_DOC=OFF
 	)
 	cmake-utils_src_configure
 }
@@ -90,7 +91,9 @@ src_install() {
 	use python && python_optimize
 
 	# Prevent test executables being installed
-	use test && rm -rf "${D}"/usr/bin/{testc,testf,testpy}
+	if use test; then
+		rm -r "${ED}"/usr/bin/{testc,testf,testpy} || die "failed to delete test executables"
+	fi
 }
 
 src_test() {
diff --git a/sci-libs/libmed/metadata.xml b/sci-libs/libmed/metadata.xml
index 11287d1296cc..e54fc02c2ba5 100644
--- a/sci-libs/libmed/metadata.xml
+++ b/sci-libs/libmed/metadata.xml
@@ -2,7 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>fordfrog@gentoo.org</email>
-		<name>Miroslav Šulc</name>
+		<email>waebbl@gmail.com</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<description>Proxy Maintainer Team</description>
 	</maintainer>
 </pkgmetadata>
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index 13360a9aafea..16e428a2f644 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -2,6 +2,6 @@ DIST libxc-2.1.3.tar.gz 750044 BLAKE2B 6d6bb348bd8f7e25d6a3857fc40f0d7d3a7fe22c0
 DIST libxc-2.2.3.tar.gz 734714 BLAKE2B c5c4c3aec3373b8b481de8ec1779366b6916899e0b77964cbde0e83904b351e009b14a3ff64e9f020640e6ebf68d78828615b8abf83a46fdf86ea16480083643 SHA512 bfcd88c1946e459227e9b1a32c513f0e68ae7a5497925ac6e692085542526ebad9fe2cd5722077c839c06dbaaceca601c7f615ee6936e638eb150a9d68278d5a
 DIST libxc-3.0.0.tar.gz 8388775 BLAKE2B e82a7310c583c39b6c2313668a5d3a3d5ae7bf71ad450e9ac6241d1601bf1bb429abf98787f7e0c3c252e881c381b895e277d18619b57c46f2f910d7e079941c SHA512 42173341f917c2aed6954f76885d2a9149d7212d2525becf77072b9878753c28d752b5cf6b2c79c90a88d8aa033f0aa94fa9753eb67108e9325cee6919cece52
 EBUILD libxc-2.1.3.ebuild 1400 BLAKE2B ccf6c433ccfb77c19b49ddef89b53db5eaee87f8204e66e94752be41e26940fce8e45c9af73374ea04ae8a27353366be778859dd6b8f2f4c8c7f39e83262b660 SHA512 ed74981ed5f5ab997e4bf34145be37aee881355a8dc60cae8e86561bb7b9f64b2926ba491e826d4d76fb11f51dfd01a63f9da7f50e73f2825d34a32360d2a14e
-EBUILD libxc-2.2.3.ebuild 1400 BLAKE2B ccf6c433ccfb77c19b49ddef89b53db5eaee87f8204e66e94752be41e26940fce8e45c9af73374ea04ae8a27353366be778859dd6b8f2f4c8c7f39e83262b660 SHA512 ed74981ed5f5ab997e4bf34145be37aee881355a8dc60cae8e86561bb7b9f64b2926ba491e826d4d76fb11f51dfd01a63f9da7f50e73f2825d34a32360d2a14e
+EBUILD libxc-2.2.3.ebuild 1396 BLAKE2B e8f167d5c9dd82cc35c70a6dd857d995aeb6a46e02326b0e0470c3ff743728f9850823bb0714e3e7768a8872dbc34778ed54ce7cbd3cfb36f9dde63799f0af01 SHA512 1a483af5997d54e1137080a276f590119cae49098799dc2df82abf2b5635a2766d14d3f92cd685a9f40ffd82394d6623338457160a844cfbaed105a4727d3b34
 EBUILD libxc-3.0.0.ebuild 1400 BLAKE2B ccf6c433ccfb77c19b49ddef89b53db5eaee87f8204e66e94752be41e26940fce8e45c9af73374ea04ae8a27353366be778859dd6b8f2f4c8c7f39e83262b660 SHA512 ed74981ed5f5ab997e4bf34145be37aee881355a8dc60cae8e86561bb7b9f64b2926ba491e826d4d76fb11f51dfd01a63f9da7f50e73f2825d34a32360d2a14e
 MISC metadata.xml 1339 BLAKE2B 4c98e1fa7345593b8f160ba4ad84ea3a5eb321437715137e94a1926b92a53ce87c41b27e8fd0edb5c479293e24f9049956100f0070ae7a27550144ff697b63ac SHA512 95e03f10949c2a2350063cc1666bc232f166b10669f5b1d050da91b6119b8280d69aca0f35527ab938c71666bb78019640426ab0acab18bd335e6fff2345e128
diff --git a/sci-libs/libxc/libxc-2.2.3.ebuild b/sci-libs/libxc/libxc-2.2.3.ebuild
index 527f29e46918..819d15daee4d 100644
--- a/sci-libs/libxc/libxc-2.2.3.ebuild
+++ b/sci-libs/libxc/libxc-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 IUSE="fortran static-libs -test"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/sci-libs/suitesparseconfig/Manifest b/sci-libs/suitesparseconfig/Manifest
index 8eaec5b3f9ee..29424c747489 100644
--- a/sci-libs/suitesparseconfig/Manifest
+++ b/sci-libs/suitesparseconfig/Manifest
@@ -1,3 +1,3 @@
 DIST suitesparseconfig-4.2.1.tar.bz2 256308 BLAKE2B 74993d9a43117e9b71e21856c7b27d4aa6627c64a4235d7d37efa282a0a8e54fa8c6d6aea1cd447902ab8b18bfff1aa1e0d67a6b86d86c2feaf6a9f716ac2f0f SHA512 2363f8adb962d1f932b4390ac54e7203b5eec6005f9275dc155a4b178fd5259ddd42dc34c663a4c82546452c0f1e05619522567a69be1a58efc5d032b6d7a61d
-EBUILD suitesparseconfig-4.2.1-r1.ebuild 717 BLAKE2B 5f2f259053ed326cdbc3d81c595b478bd03c7b9572a18f7955d028ce644882afa069b2bea323e1412a99366efbbd662c5ae16af80fa0abe8a405b753ac6a2b0a SHA512 bbdffc49a61da602baae039a67d6807ca527cad7ff786b5cada1a999fc6dd7f4f2a4cd4cb8da1e82de135d1efb328859efca90ff6bdb7453046cb398caf6e873
+EBUILD suitesparseconfig-4.2.1-r1.ebuild 713 BLAKE2B 4a5f4dd231f0bbae7afbfe38d765a7da85f7281f84644a23e966ab36b8aee9f77feb8a88b08aa8d7fbfdfa7f6c635c79668833a8486a191375aeb0d24b20b7f5 SHA512 511c6417e766ce4c05f7616c9decf4766f022486c530a22f649425981e97e9e2979635036e66e2655ae85dcbf5e20c94e8f8a8c471701066649099e2c676487b
 MISC metadata.xml 476 BLAKE2B f583e4dc6801797ee1572a38f1e4aaaac0811a709ce56a28d8e1f4f13f60f62a702b034809edc488d0b91920f8c5d40d48226213837d92a3e496cf65a6061c04 SHA512 fbbcd2de1d7b23e4eb45d8102fe76aa4251b83ce2b1fd7ef9cb599c7716ff662b8182060ce7b350ed3541b39483cf72c7c9ac810db1fe739f82406606412acb8
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
index 04632e4581ef..da76bae6e389 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest
index 1a1e9f4abc60..4252ef9328df 100644
--- a/sci-libs/umfpack/Manifest
+++ b/sci-libs/umfpack/Manifest
@@ -1,3 +1,3 @@
 DIST umfpack-5.6.2.tar.bz2 780204 BLAKE2B 9e0f4abe92139e3cd6604be63d7fea0ffe50e0669081cafe07eef5d16a4c99493ace16a36a13470d617944cef2c505a3feadb5324e0add4a7f7fe6cbaa732fd3 SHA512 7b206235e837e84885c871322c1f0d4378a048008d9c110bd96204e9bc1bd9c72c6909da513fd78b6225fddc7b91e1ceebf1a5147e99943b3f0fff48682403dc
-EBUILD umfpack-5.6.2.ebuild 895 BLAKE2B 0b0281893bd89c8f30bea0ac7696e8379fd10543f77a8bd5c7f866f7b0c9332b3dea8b67cbe0883a750cd28aba3356354dfb89a30b4f65a2fd1ea1b2ac62a307 SHA512 c57ce9c3d4f1e651bc6934db872d535bf86e3ad240e01ce0fe16085901ec444e1d1a42b8ae93ff401e9b7a7aa274a3056d5266f30b7001742c79204e53a22d36
+EBUILD umfpack-5.6.2.ebuild 891 BLAKE2B b4c8b86e3aec5c88a52b4a139e95d20dac66af209fdd971342b616e6bf6f55a720c2b1022f985e4583da2208406d3f7fcaec1a0c3a6fd71ffb511a502e7a4bfa SHA512 826744cc24fe44d6a0e63e078df67a771a4f94aa24aee3e1348c51e1d7f18c4f1ea19c358ba88d5ece425c5cf9f358f2c407ecdb64dea6a473edfddaf2c84762
 MISC metadata.xml 667 BLAKE2B 1e0018ea7f7433ce19bfc6e364a30731e5e02f657502f721513da4191752b97c7a3d8352707e1036f0e5fe81ffb81ed3862cc2b213ca89e80067a06a82e5b078 SHA512 c204d7f86f2338f9571a46773c251dab31caa3d5bfbe4ae87326466026616d80737435d8cdbf0ae8cb5e109d8b52a5b6ccba09f8b52f38dfe9058049ef541007
diff --git a/sci-libs/umfpack/umfpack-5.6.2.ebuild b/sci-libs/umfpack/umfpack-5.6.2.ebuild
index a554bfb1cddb..a364af07817f 100644
--- a/sci-libs/umfpack/umfpack-5.6.2.ebuild
+++ b/sci-libs/umfpack/umfpack-5.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 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="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc +cholmod static-libs"
 
 RDEPEND="
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 3b15cdc23337..79837a526cdc 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -3,6 +3,6 @@ DIST votca-tools-1.4.tar.gz 103102 BLAKE2B a398d20b628148ec753ee1e59353e272dbda9
 DIST votca-tools-1.5.tar.gz 129464 BLAKE2B 2ab72758cc7c9bed5a49c924f7f0a93dc562a43cefbcc84f393656fd6c6b165152114eab48131db4d42008472d01103b5abba6ae0cf12779fe1ffacbcd65dc11 SHA512 fdee932c861742961937bdb88a1ace8caa4041c38ce80ece3b27e8a4b624248c21bf9be63b157565d1114047d3895c8b959f95b4fa49225c0cd1b2e708ef54f0
 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.ebuild 1118 BLAKE2B d0a35124322cd249fb57a49151889005a9e3da80d6a0c9196bedccbb34228857865820613aa5a706fed9a5a1657e08efceaa61022703836f97b5ca957675093b SHA512 95780c5025941d1c124fd8ae277360d3654217b7135993669fc50d7873a6b72d7d3f4d9518a99e96688be1efdfdf9b736a820f68120ff8b113d018185866b157
+EBUILD votca-tools-1.5.ebuild 1122 BLAKE2B e6ca1c6354b17eae1f1574de117b2fe421965e05376ac2d13cff50814e5b2987fbac645be133037cf31b08513e09f96fba94cb02a82bab06c60a667b9147d75c SHA512 2482328a8306a0126c7ab17250be2ab91e823a1ae248e3d4bf15b27bf1f313b3277a132ba4e52362c92f1d4096a00f7b5e657afaa6de464866b551c5976c4be5
 EBUILD votca-tools-9999.ebuild 1118 BLAKE2B d0a35124322cd249fb57a49151889005a9e3da80d6a0c9196bedccbb34228857865820613aa5a706fed9a5a1657e08efceaa61022703836f97b5ca957675093b SHA512 95780c5025941d1c124fd8ae277360d3654217b7135993669fc50d7873a6b72d7d3f4d9518a99e96688be1efdfdf9b736a820f68120ff8b113d018185866b157
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-1.5.ebuild b/sci-libs/votca-tools/votca-tools-1.5.ebuild
index a0839fa8779c..c6ba3a67b075 100644
--- a/sci-libs/votca-tools/votca-tools-1.5.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.5.ebuild
@@ -9,12 +9,12 @@ 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"
+	KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-macos"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS=""
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Votca tools library"
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-21 10:20:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-21 10:20:03 +0100
commit	6f8038813c460b4f0572d5ef595cdfa94af3a94d (patch)
tree	3509e94070265053394b7f2e30a779d7e60c2064 /sci-libs
parent	eccb70a7f91b2d22582587f26d1a28bb31408b45 (diff)