gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /sci-libs
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
112 files changed, 571 insertions, 956 deletions
diff --git a/sci-libs/Fiona/Fiona-1.5.1.ebuild b/sci-libs/Fiona/Fiona-1.5.1.ebuild
deleted file mode 100644
index c44224221cdd..000000000000
--- a/sci-libs/Fiona/Fiona-1.5.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OGR's neat, nimble, no-nonsense API"
-HOMEPAGE="https://pypi.org/project/Fiona/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sci-libs/gdal-1.8
-	dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/scriptname.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/sci-libs/Fiona/Fiona-1.7.6.ebuild b/sci-libs/Fiona/Fiona-1.7.6.ebuild
index f31861694fc7..738754fc605a 100644
--- a/sci-libs/Fiona/Fiona-1.7.6.ebuild
+++ b/sci-libs/Fiona/Fiona-1.7.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/Fiona/Fiona-9999.ebuild b/sci-libs/Fiona/Fiona-9999.ebuild
index 9874a5fd2758..b8c6c34d180c 100644
--- a/sci-libs/Fiona/Fiona-9999.ebuild
+++ b/sci-libs/Fiona/Fiona-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 git-r3
 
diff --git a/sci-libs/Fiona/Manifest b/sci-libs/Fiona/Manifest
index 98479f4ea1b9..6690b604c54f 100644
--- a/sci-libs/Fiona/Manifest
+++ b/sci-libs/Fiona/Manifest
@@ -1,8 +1,6 @@
 AUX scriptname-1.7.6.patch 362 BLAKE2B ad8c36ebdc49654181dd2f70c468deaaf57ec5c9a36662d89e1b7e767f9e6ef20f61a3a5ef149ffb3674a1d78c210e552f38e041806df67eaec04c085856bb1c SHA512 2c5e5c6c08274f75fe5306c8318a375a81ec08a3c3978cd8412c2cbe16bd5790b821bb0fce85d37f9af6238cc0f8e96740e9e72c66c213a74ad43d0e9ef916b8
 AUX scriptname.patch 353 BLAKE2B 7b135a729d5a15362a9b7ad3b15617f1002da72932627856041c66be8b3556848e978e45d023e40e11a08ec44e267d5f6ababae2823e07b578680443a2ca3710 SHA512 f9a0c51fbdc5bf99eb9a2b94c0f27f7f6fef7ebab94d9e575f34594e31dcb624e4c327e147e5b4955b5434b54cd2179b985bc64a9410bdb792b93f45375838c9
-DIST Fiona-1.5.1.tar.gz 1117361 BLAKE2B 4a2ecd9bcf8152c66a167eef58ecd116452118b888a18b9aadc5fa07ba9fe4cfd4b367c422e5176a3b2e7f9b1e146c6940c332c063d52eabd63b02426864af96 SHA512 06a2f091138b455355aa24bdd3cace48a3ccbbcb8b680f8009862a9ef3bdc217b68ba4596c51caaa9d09d2fad606a581d50f2fc9f2d0636bfec459e2022546a7
 DIST Fiona-1.7.6.tar.gz 641013 BLAKE2B f8cadfaad300306f2d6c5f306d842366807c23db59e96309911f05608a956bb088700da88b9a22e27af0af3decc396b1fe66815007945a39aa193c31c4769155 SHA512 a988772cd8d9cf7ee6862b87c91d18d5caf78f81c35c018e815dfb0000502a0768d9ce6c580a8ef9a9a652c64c4b6027685d597766f851563a70db07db0de4f3
-EBUILD Fiona-1.5.1.ebuild 726 BLAKE2B be630a302d5b67497483632da780317412da02bf45ab89b8fcd3c994e97fa9cdbd3d1fbb2185b8522d4008bffb37d027458d9dbb843766712315891b0eb433aa SHA512 ae3fee3c2218f2353c1173355876c0dd62a434fad2999cb765e676e2894b5cc15c64edb60508e694a433ce338f51924f220c153df74515b470c0d7c566b0cf83
-EBUILD Fiona-1.7.6.ebuild 857 BLAKE2B c03aac23e53f4d0cbb1404a8408df19fad552752b6da1f2cbac9c0850fee92e49cb19a68f1f63ac43a29b54d5c165ed2d0318fa9f7eb9d1efdaa04b5ef208b26 SHA512 4d7378045bb67c8fbb226ff8a4b65cd58c58079afdec07c8bd9c00b585f6e6305f0b6680c811f3958d8aa9cdcf819d76dd62a1f09df4b3b91af2ed216f9f3929
-EBUILD Fiona-9999.ebuild 746 BLAKE2B f772fee9bbafd9aacf15264457f18c7237316f770d9a7a0c9edac9e1dba5be48f28fcd3bc932d156eab401eab765482a3364662afc3309eee60cde9a875e2df6 SHA512 7ada2f06a6140ed9241a38988a494d8a84f4601a6845836d476ab34ddcad209d8ac510a651dac3329b88bd4525f24d5f7027319461b0668f03734a9999bfa0f5
+EBUILD Fiona-1.7.6.ebuild 851 BLAKE2B a8e14399b02996b9959f3d51c5a0d74526b33049430c699bbffdf7210552f9fe3749358417854c0ddd22d5f5bc7290cee422544bcf0b5b39398c5ccfb9d18390 SHA512 20e701715fc9630f8819307ed54339e1a9e148d6d561fa9d0f6c19191b4130eb65ea7975a3e1a4315e373d8ebecf727e095ec7ac33e7de8e0b324c725ae2f334
+EBUILD Fiona-9999.ebuild 736 BLAKE2B c2997f636beb6cc686c1cbc4b43e5ee6d0e79da1073595eb3f53107a99ccc879b24af40a02f767e8d9fcc744ae24dd355048eac6ae96b08ea531d2891c96a0a9 SHA512 785cab04a06b2af87ea084788c32591efcd0e7b3e3d18b6788240b190d94320f32f14321c99a5d378d6e4a7deee50ec98c9702c8ce8a9ade5459fdfc0223041b
 MISC metadata.xml 240 BLAKE2B 010e6f1f4b61059c3ae02f9b2a777d806a527c907b6f50f2143f7e9468c8083e60e0b0c01b1008eace030563421825e894f8f479cb27bed072f8f6f3295bbe66 SHA512 a4cc37701e25a2f50b06a3609f98173bf00df77bbabcfe38c8c60c4a488c5971b34f26cdcbf03c34eca4aa3a567b6242f597742a6f5575b1e74978a6fc249a91
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 9c64c497efda..7adab8525bd5 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/Rtree/Manifest b/sci-libs/Rtree/Manifest
index d22f9c888506..e3af13b49435 100644
--- a/sci-libs/Rtree/Manifest
+++ b/sci-libs/Rtree/Manifest
@@ -1,5 +1,3 @@
-DIST Rtree-0.8.2.tar.gz 55813 BLAKE2B fd7391ef92c61a9d502d03376e1eef157dcfec77d3d46642d1b14bbe3a5021880641cbc741dd85e8b3b3d66a019db0a2eb638cfa76d109102459544969877eba SHA512 c0c1091c21e92022540a0aed09c00f3b2b6abb2869757e0cb7a68a120e3a289f275cea824a72172ea5b327696a67024894f5f01354f0cd5ec5b05d9b3ec130e0
 DIST Rtree-0.8.3_p20180802.tar.gz 48893 BLAKE2B bd0745e8e5051a772c2d50fe35712dc661737f32f6af382579dbbffc7467c21ef73bbeb794489da9891e50497b6f8775b1a670185453d54881e6dc8496fef539 SHA512 10c35a1d00369b3a30c486830d7cecdae6bd9bbc2ab9ea7f398227bc46b116783b1486cc75759eb27d7b25439400cbc39b55e6f58c686caec45bbc8436c6067c
-EBUILD Rtree-0.8.2.ebuild 454 BLAKE2B a50e623faa35666ea8cd369e0efe9bff0468720975003492fe3c9f2ba71c0d0bd64fc483bc65da40e9bf25dde0680d1f36e185406b386324c5e09b6c8b9aad35 SHA512 90f6cda1e3031dc10b87fb35c0857dc4258842f8503bc0303d9be077a1bf9bd69d048d5b6ab07a89ba3cc9786bc56ac494dd1027c08f8086cb72ab90079bc47f
-EBUILD Rtree-0.8.3_p20180802.ebuild 687 BLAKE2B 5f931cc3d08d1057f0a0379cbe7aafe03dfdbee432257644b923b0a8e3c28df9544595ddc41fd0c4bf3e4bb05212baff59ea12ad8b7d6f5f31b098643c1bb4db SHA512 4ac8b7590938f3569290a94f13ec7c86f6b2bc58aaa6231b5954d49839ea67d3501d3fdd8da9f18e18d0085922b1189a4d2d90cd8e3cf58f260fca5bc68009df
+EBUILD Rtree-0.8.3_p20180802.ebuild 677 BLAKE2B 63182b2364e40bfccfd82b80ed5e9f7d552e276d53d002023572d6791b2ceb6d84c50921c6ee1315b9c17d80e694c22c37f407edc4f44e8817f22e768329db72 SHA512 35f3477cb35cb9b37683d51d08d72336d3bd526600acdfd5e28dc07972468f638633c0880b6b9a43a3735087e1a4a806362c33802d9ebe20fdbfdd406d21c088
 MISC metadata.xml 297 BLAKE2B dc79464a861da2bba0e4d63ef427f0a6d1300ba196b4739ccc8c1827cda2714fe4222c5cac032f6fb80ed0e557ee851bb763c83bb107283b7840dbb8651779d7 SHA512 37da09df732badd85eea558b74949850f08be3039d813e94e33240a68a58fbd13fb9a469382cc234fa399f32a0aa796c0ed11fae44cb00c77735bc1f3df7223f
diff --git a/sci-libs/Rtree/Rtree-0.8.2.ebuild b/sci-libs/Rtree/Rtree-0.8.2.ebuild
deleted file mode 100644
index 011ac348bf09..000000000000
--- a/sci-libs/Rtree/Rtree-0.8.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="R-Tree spatial index for Python GIS"
-HOMEPAGE="https://pypi.org/project/Rtree/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sci-libs/libspatialindex
-	sci-libs/scipy"
-DEPEND="dev-python/setuptools"
diff --git a/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild b/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
index fbba424b40b0..0832cb96d361 100644
--- a/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
+++ b/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
index e99b2b545f81..481add333454 100644
--- a/sci-libs/Shapely/Manifest
+++ b/sci-libs/Shapely/Manifest
@@ -1,6 +1,4 @@
 AUX Shapely-1.6.4_p2-test_operations.patch 722 BLAKE2B 661659bc1d2f8c8a5d6b77f0ca746024aa9724f2c25047d8203d591a4f793982d4cf9bebaa6abcaf48c0cf1b266ef941b986897d26bece39519f8fcaf5dcaf96 SHA512 c1e9eda0cf8dbfbcee2d6994f470559507c754fa2bf03973ac692ca6bd2fcf62ce05e15116515877e8900a89c55c6b2bf6e70b74e2cfced8d3852608901b34db
-DIST Shapely-1.5.17.tar.gz 180663 BLAKE2B 1a41de8c264989abeac27fe9b63abd81ad6f03f0eecd313131d04190b8bbebc6c6bd6b45b1782fbfd163025cda4977b7e93a24a711c76fddfaedb0fe880cea53 SHA512 eea241942ffbf377001445fab4017c9a2746d6bc0baa6c801a08ca95e608bbdaea7ad9568f00cbecdb559e634402bc6d213ebccb4074e59325e1cc4b3771626d
 DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f
-EBUILD Shapely-1.5.17-r1.ebuild 1065 BLAKE2B 23d868a3e15b0572ba4423ebaa84c4ac8633cbe325772b9a90d22cf9fa65f610eda28274616b945fcf139e7d4c103260f84218d20374307d52ed5ad1028df5cb SHA512 9740ff9620ba8cac0c56da082adbe497a8dfb1863b7f089ac1725982a12e7debf118471a54895d90c72111d8c5055d0926cb9394b82309cd6de722abb6bb0dfc
-EBUILD Shapely-1.6.4_p2-r1.ebuild 1231 BLAKE2B bcaa4b3dee9e05d924cd7f6f9fdfb17f410d16e7e7210e446e7a126da16a1e91f3998da71305cf5fe0888071fcd05cc9b131c3a8ee5acfb847017df76bb7a8bc SHA512 57cfa44501741647624ad7e0f3b97c327058a40d1dd351454105644559232835ede3ea855c544158fb8998c5a58b7a36218abb09f45f1154cf724ba8c89c1d31
+EBUILD Shapely-1.6.4_p2-r1.ebuild 1230 BLAKE2B 29cb26d4278e745a60a2ade9de8aa9017bc717334f6c1ca8a29a994260fab52a5d8854cfc080813b5192ce7d5d3f37408f85a2382ec61b43c7e7deacba5d122a SHA512 890f69a44cd91c69c1e486c4c8b6e8a3388a213b15de9249770abd4df98272e46a0ec8383b1ab916f1f66b6e98fa1cc3ebcc9b7a1e8d37c8a3c7df86ba59eae9
 MISC metadata.xml 242 BLAKE2B 5314a9f3c3a7dd475d215dc1be8c4fba1947504699ae6658044a1f8d05fa860798ebb24aed8b881a16a89f8eb84d554e2f9a738a2193668807173888bc187f56 SHA512 0d12ba53a623b64840750891b600f6fc2b4f857f8766557c54cf7a0ef473320b0bc09bab1d50d6ce2c8284fcf7a10b3aa1df8d43d9b10274101e82e1a7b1db94
diff --git a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
deleted file mode 100644
index 692e04da131a..000000000000
--- a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sci-libs/geos-3.3
-	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# fix install path for Cython definition file
-	sed -i \
-		-e "s|\(data_files.*\)'shapely'|\1'share/shapely'|" \
-		setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}/lib" || die
-	cp -r "${S}/tests" . || die
-	py.test tests || die
-}
diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
index 036aee50103f..236a29449e75 100644
--- a/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
+++ b/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="BSD"
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 1c63bcc71571..106e8b55ab18 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 737 BLAKE2B 0699478b969b6bbea406c17b480c23923f902351874df4a584a31a390cc539d439b0b90fda7b740f939f7796dff14761d38a34a13d154b9539e418514b21e14e SHA512 695c0a475c01437652281b833149d9b67831a35ca2f712d56d8c5f6bf2b96f0df26523a783794da2483b6ce2ac782151f9b848fa75a7d6cdb0eca5c865175a22
+EBUILD amd-2.3.1.ebuild 738 BLAKE2B b6f557d8909ff6cbe12ade846ea9a5c1908a52d89a5ccdf0d6804e20af0c9cd42650c8a088c86d865cf32755ccc5564109cefc9560f2a54e3636c1b56dc2ed42 SHA512 e72855f609abc209e165756fe431c5579016c12f3c998fe704f88efe1ce4c57f3930c82752c82f985816a6c26d62919845228ad0dfa652e70556730fb2624f03
 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 959b52ab18ee..3175fa90e7f2 100644
--- a/sci-libs/amd/amd-2.3.1.ebuild
+++ b/sci-libs/amd/amd-2.3.1.ebuild
@@ -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-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 fortran static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/blas-reference/Manifest b/sci-libs/blas-reference/Manifest
index 98cb340b22cd..05f080c969c2 100644
--- a/sci-libs/blas-reference/Manifest
+++ b/sci-libs/blas-reference/Manifest
@@ -7,7 +7,7 @@ AUX lapack-reference-3.7.0-fix-build-system.patch 1598 BLAKE2B 9128036fc47dae239
 DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
 DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
 DIST lapack-lite-3.1.1.tgz 5332509 BLAKE2B 5a8ea98e9956f2bc1fc8dbb1ede18178d43d1f418e324f2798daf2197a2f7f7a1841ea0a0d68f1affa3c9c0a37b024f82222bd2fd6072ca827c70c9c441191c7 SHA512 492b932ef313339ce6b4e63ac8f778489e6870b0eb85f7b086f3c844e75f98e7f85382c7556dfa368ab8320b6f02d1df8ccfcb40b5c0b7c2d74518b7c309e75c
-EBUILD blas-reference-20070226-r4.ebuild 1940 BLAKE2B 871e9130311777e232c98be3d85262d233a061d295aac74bdd8799367fe8d3c26ca5b7c6c8389413a7c4e85c15d204aa39da3af5c85ad89d7c4470267cbbaed2 SHA512 c1f7be09d3224b0647e19c2d80c9a59dc48d33eb9161734e49fbec90a254dd6415954d71e2aef0657ddad2d5d63666b0a49423ab9d65303822061211865a791f
+EBUILD blas-reference-20070226-r4.ebuild 1941 BLAKE2B 6fa0b099e4199dd59c7fb0496e037812c92bfbaa6bc53ceac6d674c3ddc87770d4cb86051611b3835041fd6b161f51a2ef30b3b0f8073099fcb60bfee4265fbe SHA512 ec5a5238a6706f149491de305be25028fe3dac18bc1d12d4f9fd3646a2c1180f78d448729609ef78a91948b3063b501d760d5083b21c87896728edfa9f9ff287
 EBUILD blas-reference-20151113-r1.ebuild 2443 BLAKE2B ebf191ba5e0f495e61c38b65c49a86e4658011c199d3f042835b87f1e503ccfc73cc128539a95c7482bfaa7d664bd97ced90a3f1a357e0c31f49dbbae424cfd5 SHA512 91aca3db676aafb985e6ce3591a16363a2ded2f5758d2af56cf1c01d432fa3aad347e74b962b52c4ae993528e3837ca3fffb840852a78fb9da43b465e537f67a
 EBUILD blas-reference-20161223.ebuild 2679 BLAKE2B 8cce508ef59b33e6ff6ac50ee14ce0ca5252dbc61820da38349eab2cf3819d658ed89f9f22a284ec77bb2c831707af2a00323ea3f4933b2f0e0450ff9ec8c517 SHA512 dd96d61e86fcea2d01e76ce902ebb45b2e6dc30ea9a737fbdf5b28486c951944b1728f7c135a893fca6645efceb9d2b1633025e261875ea55bb6b1ae8682b241
 MISC metadata.xml 801 BLAKE2B 68ea5978073c01c861253ffd064179a25dc63771c9cabc0b3de200e5333c93a5d55caf8cde1234b643007b690b2a96fa207314117f790b367bd089c997722676 SHA512 78ca8d7459ba5bc81f5f821d9020023d01610d1fd55157bf566890a5c80ff8f83ca1139304319ee41b04f04b559c9e377037c04a1fbdd8dfde3e62f7ca6ff9fe
diff --git a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
index 0ed74089f93f..b0157d4a1996 100644
--- a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 DEPEND="app-eselect/eselect-blas"
diff --git a/sci-libs/cblas-reference/Manifest b/sci-libs/cblas-reference/Manifest
index cc36ab0fadd4..c9aeeea7eb60 100644
--- a/sci-libs/cblas-reference/Manifest
+++ b/sci-libs/cblas-reference/Manifest
@@ -6,7 +6,7 @@ AUX lapack-reference-3.7.0-fix-build-system.patch 1598 BLAKE2B 9128036fc47dae239
 DIST cblas.tgz 197694 BLAKE2B a9a6feff0198cc62b2a9fd75740e9cebbecd36adff7a1fb3ea57942846d428dcbdb9b266d4510b67bc077b13fe833c063e4784278755513c3abddc66884f5e36 SHA512 8edc4f939d36e6bb9bcbc4ffe414b6c991192ef2e76ec4eda16d3578591185d31e46be5e747d74c740411db6bd2c2d414a18f73193d4a288e8c7e4b83cb0895d
 DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
 DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
-EBUILD cblas-reference-20030223-r6.ebuild 1838 BLAKE2B cb6eba127fdb08da90a61487fcc28eb023caae4f8c7b643195af641bdc7a9709884b0f370ccb32a5777531b498da1e8111375ea87df6eb89f81923d21e4240a8 SHA512 0bce009bda53ed7f60887fe349254583fe0ff49b55681bb1c2b3ee81a37573176f64330ea323b27b618667242eb3155f82c8ee73c0b7122649e1004632f30382
+EBUILD cblas-reference-20030223-r6.ebuild 1839 BLAKE2B d69c62dec5581ab778e54960e71346da7725d9e9cbf9d33a9cc1ee6e8366aa07380433464fd087e201bf0bd92e4d9712f787c701ae7c03a239d84bc287dbad55 SHA512 9f6450d24284f172b5934c813a9d65d0ec45a05558e97eddb52b0c97127af5248f48bdc0cfc99ebaee6955c6760065529ccc67dcfc91494baae05f6d243c7c67
 EBUILD cblas-reference-20151113-r2.ebuild 2634 BLAKE2B 40af8c3d632edae615a825040bbbd319f91ad186aca1916003dbfe88df29af20aaf4074ac83cb7e4556ac01b01c482f283063865b5afac2d7e02f4e35fb4e4b2 SHA512 d48b02af0a0db8ea90fb5fdcf00d4a7605162ef0f04e6ad70d042feb9fdb4816d41d2bcdff097fdd51df3145b38977cca4c6a9544fd4ec5cd7afeab702797d34
 EBUILD cblas-reference-20161223.ebuild 2641 BLAKE2B 3ac89dc9764fb98b8165832201c5d0643c2f807294eb4ab95b865557b06eee3885504885be9f3516b026677422345c4113c5ec3a80fb9e713a504094c4ac17fb SHA512 62247d478a4187d8b972471b5227e6e6e567feb74806bd271096f98a883a321e2471a53f4905a3206611b22117e6fd00004fd522fc8fc713cc9810b83a1e29fd
 MISC metadata.xml 836 BLAKE2B b355702b31b2de0e8c98cbd84338da58a19821c32b2e9cc039e0ea2f6a416be88ba4b4480b1f769c1311b1902092b8cfbe218ad67d48863932961a99b1ef15d2 SHA512 5e3394b15042b221806f47a96bc5b1bb09a004f9dc30639595c6a3264c7c92af3fec769b87a1702eba2f8a7c06580e7c62cbe22577ce93e35886c9db1aa309b3
diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
index 2977a22e7406..af08581997eb 100644
--- a/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
+++ b/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.netlib.org/blas/blast-forum/${MyPN}.tgz"
 SLOT="0"
 LICENSE="public-domain"
 IUSE=""
-KEYWORDS="alpha amd64 hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	virtual/blas
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 32d38ec31bca..fbd12a332ebe 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,5 +1,5 @@
 DIST cfitsio-3.360.tar.gz 4104894 BLAKE2B 7a84177c28679db5c27d0586cb6959a0663918a84d46ced9aea6ef7e6bdd32955946807efd4cd852e55128dbc887c4a2135b2eba26847b265011bfd6df049335 SHA512 158819b4a3a29c29a5f017283e2b20067420994e881d202dbf3ba199c9e564dc1e74f8be5ce84f78107126d2a8688cc55cc7ed284540ca647e44cdc3b0b02072
 DIST cfitsio-3.410.tar.gz 4194529 BLAKE2B 31250b9add5b6a85c919c33251d127117ceab81c2243e0b9f8bbe2ef0fd09c85a938b7525338bc718a9b3035efa3660ecffa17ec79e3e278c8014e727f23473b SHA512 cc1de2a4314e7c82bdd6855e11dea4e18dc4e7bcb27b0d15b884cbaeb4acd3b1e12dadd17ab83c7917570934913f89337035470ee4921e7b62409a81052d70cd
-EBUILD cfitsio-3.360.ebuild 1466 BLAKE2B 2fb223fb28e174080819389a09174685a77cb4ac1f96015e15932b16d81e059f908fa4052b7bee6fb1db20497eafa312e6fb92f2499b7cf01eb29af1ce052a02 SHA512 d0b05587db82dae7c49250b9e4a426b7d12c6a1c904210da1b08d0dbb0db44ae01cb53f0c28adba97f5487f74bcdc7c1c19b9c4286dcb3ea232a2e77c64b7068
-EBUILD cfitsio-3.410.ebuild 1590 BLAKE2B b4bec4603d86823e19d85676bb180611e90f48d798b8888934dd8d2d78c4e6a42cb5af47d2a30a5434f3121e2d57e4199a53ed3b3903dd2f59c6d307138f47c8 SHA512 caa9b4805389dd41b9489389be2eddf82bdc17ac47e73cdb96ec1f1938428a1cf1072eeae664dcdce8f13dc3ac84ad892a38e7c4be6f483f34f736dd352190e1
+EBUILD cfitsio-3.360.ebuild 1467 BLAKE2B d293143b5a8a5f6257e99d2cedc555b18a8ca695224ba012be32fbbf14d2d36b5a78a3b3121bee6f27e1d0df0c82f655261c40d764908c6f1bf0c85d332b2d72 SHA512 b8b17553f620abc44258094c6b22e937803c27cc61588c3ea42fed01de9c2824f84f6e895342039a6f9485df70a9b88fd589f60b6204cde9d8e4183dafa1de28
+EBUILD cfitsio-3.410.ebuild 1591 BLAKE2B d8b587822d9cb32a73c6a61e5919e52927e52b0bb1492c4bd8636470da3c04eb22dd6dae006b94123f286a1d1c5243cf7e8c29f3dabc77cb705e2bd4f4b72afb SHA512 52a31286b65bd8789dcd3eae6dcccc92fa74b3f381cf314667352514109c8b6d06d3d34b2f0fdd0d2153a137c91ac41e380f904764fc1be92808927c5cce744b
 MISC metadata.xml 840 BLAKE2B 6f024cc96a9da7bef155b5138d55b518a1ae917af045cd2970227ca1993461659eea8883dc3b6b9e4d3d2aaa5c49b4900e122dbb83a437aa3d94351c333934d7 SHA512 946044116d9a865e3b7e883b41f7d74a3f54c72cd857aed4dcb454cfe559385004b3e55562a306bfa3347cfc035a5af9a5aaa8a4d8dc7fe154b8d0dae7a7390b
diff --git a/sci-libs/cfitsio/cfitsio-3.360.ebuild b/sci-libs/cfitsio/cfitsio-3.360.ebuild
index 4449edae4bf9..40499c303edd 100644
--- a/sci-libs/cfitsio/cfitsio-3.360.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.360.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples fortran static-libs +tools threads"
 
 RDEPEND="sys-libs/zlib"
diff --git a/sci-libs/cfitsio/cfitsio-3.410.ebuild b/sci-libs/cfitsio/cfitsio-3.410.ebuild
index 5642876b34f3..e1e225911d7e 100644
--- a/sci-libs/cfitsio/cfitsio-3.410.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.410.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="bzip2 doc examples fortran static-libs +tools threads"
 
 RDEPEND="
diff --git a/sci-libs/cln/Manifest b/sci-libs/cln/Manifest
index 943304a6380a..ae594fbd2d21 100644
--- a/sci-libs/cln/Manifest
+++ b/sci-libs/cln/Manifest
@@ -1,6 +1,8 @@
 AUX cln-1.3.2-arm.patch 340 BLAKE2B e66f245944e4a21f87c64d6c79f8b11fd55d8733fbc3af146a5bf632903a2dac12c1650bb29a04541eab2867b1ede5a73390f5796780d4f55bf6a5bd005c856c SHA512 b16e00091ade3f77f54a88130a5953a8d677cbcc124a89e632266313b42c042cda57da4bececdc4740c1dce366a06593ad5cec21bf047ea43ea4927d2e08e020
 DIST cln-1.3.3.tar.bz2 1300229 BLAKE2B ca7985771d300b2bf0a1e5d6acda90de2596e0a8910c293500c8c218578814a82867ac24b641d3e3a36897a1a0ebf09a136ba6d64c7a1ed61133aa0b89ecacea SHA512 ee829cd03a2d36215a4d4e76cc0aa6c5abe6ff967ed366d752da1dc0c47dbec56e0521e92fb35574c038305fb767991c5c7fd12ad03583080da3f923fbfecdaf
 DIST cln-1.3.4.tar.bz2 1281348 BLAKE2B 7681ae5a421f2992e16b48541b46aceb988d697d95d2457fbe2f8c0f7e8ca95e6fbfb0fc309ea29a4669bc3d4fdf9c670fdf25b202019457ffba392f15bf2fa4 SHA512 2178a64b4388b3018c3847f6fb192ea51eb9c8618302986d7706accef17184e3333ddeca218d726f93f3b985598952ad58d705c9081201985611e383f788a631
-EBUILD cln-1.3.3.ebuild 1314 BLAKE2B bbf7144633883662e7e88c64dea465e041f7e76d6aecf67bfb45bce59ada1f48ec5676d7fecc9949bf95a6a318d072217ff43f9ce35087fa365b9a950aa39bf3 SHA512 929485e55198c118c4e0f71474708a1aacae9d1cd43cc17d6e513d19988d0be5717d619a1ca18f9125e3fb8340019822f0a6def39f98b3f3256a3f9f800fb0cf
-EBUILD cln-1.3.4.ebuild 1297 BLAKE2B 01921ae544e01c406ad4d008de4df2a78234e9e14dbf4596f41139cd431de26d28c5d189843bcc9d272e617eada8cfea8a847132680b7d6c3e92fa77ae19bbe1 SHA512 6db83ec560633c56939582f1198b07e7dc517f959246f6b813160ffd05b2a7b24aff1cb8ba2852082f6cf6919a1db0c53dc2dd54ffb36918fd0710c3d3025ee5
+DIST cln-1.3.6.tar.bz2 1330815 BLAKE2B 89ddd0079ac746b262dac01ae0fc1ceb250956c530883d93430e62866e09fdd964c4f96edb21260f9aa40f739450996e1bf21503a30cc02fffaba08a1bd45264 SHA512 a32a1449c5f0edac1444e58f500ef1a72ffab8dad65125082eff0995cc9855b45f38b89c7f754e3d4487756a8cd3f7db1e534865b8d0384fd28246f444ed7d14
+EBUILD cln-1.3.3.ebuild 1315 BLAKE2B af042fd1f60119ea6ad03091d803f32c3b38b5de1b8bc56d0429318e2374fe8c7c65973c484639cded1281f483d277b2b35581b320e6d62d2508b89dfe4d7575 SHA512 487ce82283640f1c774a234c786898394a0c73621954d5a321a3c2194c189a17212f6945c9c3c8a25865d0715f9117d96015dd7d9659b0ed1f3d6b23aa2b6cf1
+EBUILD cln-1.3.4.ebuild 1298 BLAKE2B f6a2c119b23eabac6875c52b15c3df4f50663629b357419b0fd10ec95b9cacfb57e84f618b4bed42fa2ff6b931afe05a3b9be151925e64cd87e6cd69d7544474 SHA512 d9575aa78dbd4c9cb851d93b185881cb2a55b67b6f9752f2c50169b75033512908c11b2088ab47258c4062a9111fcd6f9f5cda62aaa92806c1b5a496c202a3fc
+EBUILD cln-1.3.6.ebuild 1147 BLAKE2B cdf9324cbd7b95faab24660077181bc417ac9a4644c240dcd23647dcfcc6a1f0203699556e7385237a9e5fb68e04e78f920f39709c6e9987e9918a5f651b5efe SHA512 46d0bc6dbe8fde09d7998139d8b5d6ae4d2d99bd8a90c6ceb46ba64d7a7eff467314fbd7e0781c08b9415e4f16c593e1c418f6d2b23295ceedc752085cc526fb
 MISC metadata.xml 702 BLAKE2B 597b40fd2f7f11ef4e6ec7d0c523d2eeedb9a2cf6d2a663616dc45e891368136b38cb7760c588a7fee0880d6bcab6acace1771ad4d108ea6d52eff0abbb7e08f SHA512 4b6ddc8f558bc777963dcf271584ba59ba3d8cc3c2c95260a5680eab2a436dca894a2318f5bacdd9c9da68e6c22323d4ef2829b9bb1de0db2467f20ac204d95b
diff --git a/sci-libs/cln/cln-1.3.3.ebuild b/sci-libs/cln/cln-1.3.3.ebuild
index 481ff951164b..eb72fb34ffb2 100644
--- a/sci-libs/cln/cln-1.3.3.ebuild
+++ b/sci-libs/cln/cln-1.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs"
 
 RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/cln/cln-1.3.4.ebuild b/sci-libs/cln/cln-1.3.4.ebuild
index 8a92dc7cd71a..f37cdaa4394d 100644
--- a/sci-libs/cln/cln-1.3.4.ebuild
+++ b/sci-libs/cln/cln-1.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs"
 
 RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/cln/cln-1.3.6.ebuild b/sci-libs/cln/cln-1.3.6.ebuild
new file mode 100644
index 000000000000..d8f58d811919
--- /dev/null
+++ b/sci-libs/cln/cln-1.3.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Class library (C++) for numbers"
+HOMEPAGE="https://www.ginac.de/CLN/"
+SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs"
+
+RDEPEND="dev-libs/gmp:0="
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base )"
+
+pkg_setup() {
+	use sparc && append-cppflags -DNO_ASM
+	use hppa && append-cppflags -DNO_ASM
+	use arm && append-cppflags -DNO_ASM
+}
+
+src_prepare() {
+	default
+	# avoid building examples
+	# do it in Makefile.in to avoid time consuming eautoreconf
+	sed -i \
+		-e '/^SUBDIRS.*=/s/examples doc benchmarks/doc/' \
+		Makefile.in || die
+}
+
+src_compile() {
+	default
+	if use doc; then
+		pushd doc > /dev/null
+		export VARTEXFONTS="${T}/fonts"
+		emake html pdf
+		DOCS=( doc/cln.pdf )
+		HTML_DOCS=( doc/cln.html )
+	fi
+}
+
+src_install () {
+	default
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc examples/*.cc
+	fi
+}
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index 3ab4a72307dd..b7fe89a50e54 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 562 BLAKE2B 7e73609a71e4606f2c2b052354629ff69681185c4407bc8c400a670488cd1bf87053b45c19df7e886792286d9e8491c27bcee11f95dc412b6f154df7a6408e7b SHA512 ab6202c425befbf3acf784900482f7142cd1300df5bc167c7b01e368ec3e91c9409560b913e9b86e687b220e99df86273c266adca35be79a0b8c124452649922
+EBUILD colamd-2.8.0.ebuild 563 BLAKE2B c6146759f546e6b2c00488732db5229f26ee59792b74089b06eeec26fb7c5c9378281b5b2e6a6061e3d7738d0c1aafbdd1eaaeff3aab45c2af97aab749a16eab SHA512 070b6c62e17a8030f7ef2968e22932ffc249f7b077b9e246a15b6523fd29c3f22fdb052ac638264ca7a5977df43edce1c548d5e5e8ffd2292516eb077f38d66b
 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 7ffab8b96f62..bba3a4984978 100644
--- a/sci-libs/colamd/colamd-2.8.0.ebuild
+++ b/sci-libs/colamd/colamd-2.8.0.ebuild
@@ -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-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/djbfft/Manifest b/sci-libs/djbfft/Manifest
index 7fe01b8e10aa..b0a2b0c4bddd 100644
--- a/sci-libs/djbfft/Manifest
+++ b/sci-libs/djbfft/Manifest
@@ -2,5 +2,5 @@ AUX djbfft-0.76-gcc3.patch 1176 BLAKE2B a5a3301b5aefad844fc08fb8172b6b9be1f538f3
 AUX djbfft-0.76-headers.patch 995 BLAKE2B 8611ff8c7ca92d82e349476346d05fbe797e28395b01a659a48714febd3895c7301ed78b2b1c0a162b2ef15deec6d70a23581df89a543c32c88e138903ac87a7 SHA512 651ef26ef1ae00a5e10b512cef6cd741e77035dbdc792fdc7d215026ff4c3304ac0f1fd4c0e58debeb1bca2620a1002c67c1115b3590cf8f5b2453eb7a370684
 AUX djbfft-0.76-shared.patch 3722 BLAKE2B 4b0367156c0904dad032ea218679355ab4b2d6fd7bbf2a6a8cb17778e959c40db689e9c7fe36e90d344cf9d49d53d70a7cdb481b5d409ec208d46ede6c51f7e1 SHA512 58bc4d65553a6642a1b9a25a5b57974325f201dcec5758c7bf4c86da6b0a9fa018f1099af98234e7fbcbe29b398ac22d40c25069b9b987b41f547630f2799c1a
 DIST djbfft-0.76.tar.gz 80092 BLAKE2B de87fe1e2b0af64fa631b9b72e418bdd464f30b5680bc903a241d0525a48180f55d1cbc99e54dd81d3133a0f6dbba99cf55771304b4b1b62d8388aa15fa9c7e2 SHA512 f23e5f80d2737476feea4ed65d7d022c4ca74748a2ff7b3b9338fdea4f72b4009d1c5909325382647feab837bec078231eddc3fc3bd0b5ae3346690e5edef530
-EBUILD djbfft-0.76-r2.ebuild 1792 BLAKE2B 48e52ebd4b26115824a96d9e69b3be435bad0fafd45e30ab5446cc04c529020623c552abb21d599d6680477a848539482695e669140da5ebab02797dad293ea6 SHA512 8348afe5972f3695667362faa9b2ae17ee74fee968411f6d0c636106d81209d5cfaf51f08586261a7cc0c43325cb6e71c8cb3af66d589a0f84c03bfc0e55a565
+EBUILD djbfft-0.76-r2.ebuild 1793 BLAKE2B 0e6a892984ce2dfbfb3c64ab882d2f6c074984f8055ef3fcaf3e45392efda09e73334a8cdaeefe89fb43ccd5b0026fc7d9f6162c1116f1da33bfe01741373b3c SHA512 f0e7dbc2b74edf822fffb035fe452379c169dc393e251526677e4774d9cfede6c25a4130c97ce2601d12f777cb32a2cdcc1247067709de7028d6bedccedb38c9
 MISC metadata.xml 840 BLAKE2B 134f5c3b883159a7ff105730fff872b30cdc091c29ea434d1f1a672b0e65c3410ac596060bc5e98a5be3d5fd41b753867e3e35e8159315390a38045aa7ee479c SHA512 988a23596f952d9f9b874cfa7582fafda0ab2df81a03498c068665b968cf49d3fa7eb7977a09a5e2410c0432bc0addc2cf3a97f4089a6b43a7a16a67d2552d6a
diff --git a/sci-libs/djbfft/djbfft-0.76-r2.ebuild b/sci-libs/djbfft/djbfft-0.76-r2.ebuild
index e4b47a6ec5db..25213a994209 100644
--- a/sci-libs/djbfft/djbfft-0.76-r2.ebuild
+++ b/sci-libs/djbfft/djbfft-0.76-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://cr.yp.to/djbfft/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 DOCS=( CHANGES README TODO VERSION )
 
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 8426ef1ee942..8b4dbb4fd1f9 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -7,8 +7,8 @@ AUX fftw-2.1.5-texinfo5.1.patch 596 BLAKE2B f45dcfef53cfb374c2022e88632934b48f2a
 DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
 DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f8216f497694ea1fccc43b6a53fc02d39e17f97c56d15d03410b2005e6c693cb4b639399aac0f6ebdc63fed32d2e SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472
 DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
-EBUILD fftw-2.1.5-r9.ebuild 3148 BLAKE2B c6b8afd87370e5f46aa702cebf74f7daaed6234ec175e013046a9bf13c8168a3a8b223c8bd72cba2aabbee19f9a246bdf1954865945a90a94afdb4de21e09936 SHA512 bced55608e2635cb945ff22ccdcfd1aab37313edbf64728f53fc6653cde54c7863f2dee32f8a198205c46906363a1503ad604f2a3d47f79fdd97634a67caed59
-EBUILD fftw-3.3.6_p2.ebuild 4457 BLAKE2B 7557f51209e37ccce47ffe3b22a78d14d88945f68c5bb234d2e6748a6809e63b1a2ad27a2d476ed43ded24d434d43bb8dd0dad54b9904466af3d70031bd01ad1 SHA512 ca833e3e838c18c91f7e708c0ffaad9df11b372d3b1c4d8753ce434bd8c3cae505a02b70dd339755e6d6ef6b35b58f84ce94cc2ac670fd3e8ff8eb62fcde1dd1
+EBUILD fftw-2.1.5-r9.ebuild 3149 BLAKE2B 62fa8e27cc10085f720e175140e7fc7cebb26ca12181a0cfe2957e862b27c7c78eeb0b3d6764f94aa28d5ab2b9a0c217e89e42c20f04e28942208a2dc5373d36 SHA512 c8fd3a539034265b0cab84c82ec199391df3f9e337c8be4f78bbf827c86bb9ec32f7c51570ed81c194db4be5d74c5e9884a1384cc1919a63dba992c3bc3e943d
+EBUILD fftw-3.3.6_p2.ebuild 4458 BLAKE2B b393ae083fa3ddad0cef2f5c8ca003c56eb6e24f22082e1b4767c13cd8411e9ae01fa9a3ab573f220964904feea7bd23fd68368c82e460533b2c77a2204ed249 SHA512 80c29d7774180a3fbbf33337ffc2a821c5835eece6f1fad74199791742232d8a70e626af5dbd2088b9927185ee93eda401a8c334128ed89b055bc3b8c3c85c59
 EBUILD fftw-3.3.8.ebuild 4487 BLAKE2B 3f88b09f0973e09ebd253128086307354e03d091cc8095dbcd2672582dec2fdeca3965324a1ce6860aba9500397a2a1ce494547793073557981238b41b7f501a SHA512 4998722cd488e98041d4a8ec4bf3a0888358c5558a44da0e1dbd9be9b1e42d7ce0ebb9c18179d48b324b3ffaaea2473b350b407d5f7af3ad44515176dfd72d30
 EBUILD fftw-9999.ebuild 4678 BLAKE2B 360cf9fa16bcbb3492929e3a6465a3b3898c55c2e20e3b6c26694f8d7e9f9d3254c08c7d9565f9ab41314a7a51328443dec05d61ba0ac86da5e9724feb30b52a SHA512 66d7f5c3f94060b8ec0932eca34c5b858182a658e0a2cc67e003492180ff76a40d417b496ae31d25e47b5f399f7dc2f9efd304270e5bc208763bdad7adfa577f
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
index f31547f583eb..1dcaaf92ff3d 100644
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org"
 SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 LICENSE="GPL-2+"
 SLOT="2.1"
diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index 69891e2d3d37..494be96f9b49 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest
index ce7ff66d9150..1f0147c1d68e 100644
--- a/sci-libs/fplll/Manifest
+++ b/sci-libs/fplll/Manifest
@@ -1,3 +1,5 @@
+DIST fplll-5.3.2.tar.gz 1284989 BLAKE2B 66d022c1a6acb3f029c871bebf4925ec5f9447af71829c6d52f2065155bf75f075965a41918722d095546ca18e8e87a85f181a76f5e42abd20c8de8165210bab SHA512 eacd990c468b1d919e1d6cc04f99656d982d5a3807970e0a1dd910a2703eb5b8eff913bc5c0e45790a547bb7aa71189fb9022024186bb84ee04d8602c9980ac2
 DIST libfplll-4.0.4.tar.gz 413519 BLAKE2B afeea5a813d3d5b1b7fe3e81d5a8e9bce66ee4f8a3d265dacaa0ba7ff2f632f0f533182027322e2fd17645f5bc5816b266b167da0e36a00a38f73e794e22a522 SHA512 81cf61118f0dadca8fd82cc58df2fb5f0dc3ddd15a9b5de95a7777e0ece77d8f6a6d50d14ba7fdd6be6697cf375fac2e60792c94cc65f5a181c427dea84d552d
 EBUILD fplll-4.0.4.ebuild 699 BLAKE2B 01dfbd79f44fda5d78257847f921639fc76b2d50f24362a5b7d1086004221d3956246d8d0357c9eb53701ea5b953d27c8cea555de3774bac78fbec653542b5ca SHA512 182361c2baee4f47ab8e8da716631f242f1be5d0f915cf1aef4addc5a17b5755ac21346dfb9b1fa404039975a73508edb5e9aad160d164c515b242218dd33898
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD fplll-5.3.2.ebuild 685 BLAKE2B 340d7ff679520ac9244439854cb3932c449a5cae6e9b0f6342c8146b6b515f4b440829ee12ef17ad440a37a0924398e6a87a5f28546b4f693119bc3c51b95e5a SHA512 0520db7cb4714ab0965beea69fad3966e20bbd0545f55c1a9c7af0212bb67f8c2aadc8d855381d0cb3a1203fc665ac678222f2fb4c3972ee866e3ff7577944c4
+MISC metadata.xml 731 BLAKE2B 64e80fd07c1887f4478cbd116254222a26b79a90037007fe4c99e3bef59036168de165468d3c4c39c2e4c7dae5392aa51de6d4b3cf97d76c7c6687d7cfb0685c SHA512 0ff3088ed94924291b47ffbe624f54b493755f941ab59fe23f67eae01d8e79ac4c8699ce23db4ffd8bc9012290da379b19dd4a0772a9e0e2c6312387a93e01b7
diff --git a/sci-libs/fplll/fplll-5.3.2.ebuild b/sci-libs/fplll/fplll-5.3.2.ebuild
new file mode 100644
index 000000000000..13f7fa295ee2
--- /dev/null
+++ b/sci-libs/fplll/fplll-5.3.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Implementations of the floating-point LLL reduction algorithm"
+HOMEPAGE="https://github.com/fplll/fplll"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+BDEPEND=""
+DEPEND="dev-libs/gmp:0
+	dev-libs/mpfr:0"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# Support for --with-qd is problematic at the moment.
+	# https://github.com/fplll/fplll/issues/405
+	econf $(use_enable static-libs static)
+}
+
+src_install(){
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/fplll/metadata.xml b/sci-libs/fplll/metadata.xml
index 6f49eba8f496..51b421021524 100644
--- a/sci-libs/fplll/metadata.xml
+++ b/sci-libs/fplll/metadata.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <!--
+      mjo: François maintained this package in the sage-on-gentoo overlay
+      long before I moved it into ::gentoo. You don't need an ACK from me
+      to merge his changes.
+  -->
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+
+  <upstream>
+    <remote-id type="github">fplll/fplll</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index bae5a41ea627..cc3c551cdb12 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -7,9 +7,12 @@ AUX gdal-2.4.1-poppler-0.82.patch 2322 BLAKE2B a07590bdd3d910b6da8e99989f648251d
 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.1-r2.ebuild 8218 BLAKE2B 7e7698933dbbf6044c4fa55eb933664fe3650ed3b64b36e4053efa688870e19bfb41fc17a378c86563147326b295dbce59b13bdd9c5b04e42fb4207f62884704 SHA512 fbf469b9278e075e47b4fb66c472e57f04ce5189b897adf650205dd3566122da6bdcd4c274da44275a6acca9cc95881c2629d6ede197630fd8e1f49880a170be
-EBUILD gdal-2.4.3.ebuild 8094 BLAKE2B c4c019b3ddf2c7cc7da69ee8b701c9c9ba67a863d372d7e417f349527cd364ecfecdcb4a232f726db1849dbf3d954ec2ecb23733de224f95a97bb021acb39144 SHA512 23f1b6fa1129c3f0e95a9f21ed51c928e95e739f34146190a62b14254d7fd812a61fdc62cfb7c5b3d54865b027596fb6e1d67511f61d0b67c31194a05d9b28fa
+EBUILD gdal-2.4.3.ebuild 8091 BLAKE2B a77324f0c7ae3a4d36239af63ab15a366f9969e1b590c3c5d9e37fbe4b9419c4e6c1bab0b284c9932b2b73570d77e07f01f29d27d46d7eabe80a477144d41145 SHA512 18f4314bc98dd44b1b42e863334b6049f2520d6cfed2ad7612efe8562211f927bc33a8f6a9a2bbbc07a8cffa0ced25cb235ff17ea61d46c86c5832c2de0cae9b
+EBUILD gdal-3.0.4.ebuild 7310 BLAKE2B 5507f941cdb6bab04d9d70766fb70f806506bccd71ca13965d3c1b4af007e0d30ad9b9e836297df979a11df161b1580d1f4bff505b4424e04456ca88e9b8a522 SHA512 5dbac49df9b665e3defd56e664f48b429729489b054cd8443388adbeefc689870f095760b50d3417c879d5a2a606bd70a1847e42adcdf2f8c34d58821114449b
 MISC metadata.xml 1420 BLAKE2B 1887e48a94b0d8596913fda0e102c0e23768e1fe9df32f8f0387c5966d9e9b1e0bdd6d06f6d281660494c871d887ed20d4254f1aaa9b23cda9830f7a4810ef00 SHA512 be3a0fdc46e1b022fce052908ce7f43399f1be9d4f4b1cf23e3cca8e43d6280d1f8f820fe1d0ac1d65d2dacde1ddc859c1ce3b8d067e0f6114ab3900abc419eb
diff --git a/sci-libs/gdal/files/gdal-3.0.2-complete.patch b/sci-libs/gdal/files/gdal-3.0.2-complete.patch
new file mode 100644
index 000000000000..5d6716c7280c
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.0.2-complete.patch
@@ -0,0 +1,84 @@
+diff --git a/GDALmake.opt.in b/GDALmake.opt.in
+index fd8e8f374d..655c004c56 100644
+--- a/GDALmake.opt.in
++++ b/GDALmake.opt.in
+@@ -63,6 +63,7 @@ INST_INCLUDE	=	@includedir@
+ INST_DATA 	=	@datadir@
+ INST_LIB	=	@libdir@
+ INST_BIN	=	@bindir@
++INST_BASH_COMPLETION	=	@bashcompdir@
+ INST_PYMOD      =       @pymoddir@
+ INST_DOCS	=	@exec_prefix@/doc
+ INST_MAN	=	@mandir@
+diff --git a/GNUmakefile b/GNUmakefile
+index 92467d6cf6..6d5e7d9fc0 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -229,7 +229,9 @@ endif
+ ifneq ($(BINDINGS),)
+ 	(cd swig; $(MAKE) install)
+ endif
++ifdef INST_BASH_COMPLETION
+ 	(cd scripts; $(MAKE) install)
++endif
+ 	for f in LICENSE.TXT data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
+ 	$(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB)
+ 	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/pkgconfig
+diff --git a/configure.ac b/configure.ac
+index 93ddca84d9..5d0e7ab8be 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1187,6 +1187,24 @@ if test "$am_func_iconv" = "yes"; then
+     AC_DEFINE_UNQUOTED(ICONV_CPP_CONST,$ICONV_CPP_CONST, [For.cpp files, define as const if the declaration of iconv() needs const.])
+ fi
+ 
++dnl ---------------------------------------------------------------------------
++dnl Bash completions
++dnl ---------------------------------------------------------------------------
++
++AC_ARG_WITH([bash-completion],
++  AS_HELP_STRING([--with-bash-completion[=ARG]],
++    [Install Bash completions (ARG=yes or path)]),,)
++
++if test "x$with_bash_completion" = "xno" -o "x$with_bash_completion" = "x"; then
++  AC_MSG_NOTICE([Bash completions not requested])
++elif test "x$with_bash_completion" = "xyes"; then
++  PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], ,
++    bashcompdir="${sysconfdir}/bash_completion.d")
++  AC_SUBST(bashcompdir)
++else
++  AC_SUBST(bashcompdir, $with_bash_completion)
++fi
++
+ dnl ---------------------------------------------------------------------------
+ dnl PROJ.6 related stuff
+ dnl ---------------------------------------------------------------------------
+diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
+index 8f039e469a..511fbb499c 100644
+--- a/scripts/GNUmakefile
++++ b/scripts/GNUmakefile
+@@ -1,10 +1,20 @@
+ include  ../GDALmake.opt
+ 
++PROGRAMS := gdal2tiles.py gdal2xyz.py gdaladdo gdalbuildvrt gdal_calc.py \
++            gdalchksum.py gdalcompare.py gdal-config gdal_contour gdaldem \
++            gdal_edit.py gdalenhance gdal_fillnodata.py gdal_grid \
++            gdalident.py gdalimport.py gdallocationinfo gdalmanage \
++            gdal_merge.py gdalmove.py gdal_polygonize.py gdal_proximity.py \
++            gdal_rasterize gdal_retile.py gdalserver gdal_sieve.py \
++            gdalsrsinfo gdaltindex gdaltransform gdal_translate gdalwarp \
++            ogr2ogr ogrinfo ogrlineref ogrmerge.py ogrtindex
++
+ completion:
+ 	PATH=$(GDAL_ROOT)/swig/python/scripts:$(GDAL_ROOT)/apps:$(PATH) python completionFinder.py gdal-bash-completion.sh
+ 
+ install:
+-	if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
+-		$(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
+-		cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
+-	fi
++	$(INSTALL_DIR) $(DESTDIR)$(INST_BASH_COMPLETION) ; \
++	$(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo; \
++	for p in $(PROGRAMS); do \
++		ln -rs $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo $(DESTDIR)$(INST_BASH_COMPLETION)/$$p; \
++	done
diff --git a/sci-libs/gdal/files/gdal-3.0.2-datadir.patch b/sci-libs/gdal/files/gdal-3.0.2-datadir.patch
new file mode 100644
index 000000000000..95c525ca1b8e
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.0.2-datadir.patch
@@ -0,0 +1,69 @@
+diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
+index 655c004c56..7d8f3708d6 100644
+--- a/GDALmake.opt.in
++++ b/GDALmake.opt.in
+@@ -56,18 +56,23 @@ GNM_ENABLED = @GNM_ENABLED@
+ OSX_FRAMEWORK_PREFIX = /Library/Frameworks/GDAL.framework
+ OSX_VERSION_FRAMEWORK_PREFIX = ${OSX_FRAMEWORK_PREFIX}/Versions/@GDAL_VERSION_MAJOR@.@GDAL_VERSION_MINOR@
+ 
++PACKAGE = @PACKAGE@
++
+ prefix		=	@prefix@
+ exec_prefix	=	@exec_prefix@
++datarootdir	=	@datarootdir@
++docdir	=	@docdir@
++htmldir	=	@htmldir@
+ INST_PREFIX	=	@exec_prefix@
+ INST_INCLUDE	=	@includedir@
+-INST_DATA 	=	@datadir@
++INST_DATA 	=	@datadir@/gdal
+ INST_LIB	=	@libdir@
+ INST_BIN	=	@bindir@
+ INST_BASH_COMPLETION	=	@bashcompdir@
+ INST_PYMOD      =       @pymoddir@
+-INST_DOCS	=	@exec_prefix@/doc
++INST_DOCS	=	@htmldir@
+ INST_MAN	=	@mandir@
+-INST_HTML	=	$(HOME)/www/gdal
++INST_WEB	=	$(HOME)/www/gdal
+ 
+ CPPFLAGS	:= @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION
+ CFLAGS		= @CFLAGS@ @C_WFLAGS@ $(USER_DEFS)
+diff --git a/gdal/configure.ac b/gdal/configure.ac
+index 5d0e7ab8be..afef88fdbd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,6 +33,7 @@ define([AC_CACHE_SAVE], )
+ 
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(GDALmake.opt.in)
++AC_SUBST(PACKAGE, gdal)
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([port/cpl_config.h:port/cpl_config.h.in])
+ AH_BOTTOM([#include "cpl_config_extras.h"])
+@@ -5167,25 +5168,6 @@ export BINTRUE
+ 
+ AC_SUBST(BINTRUE,$BINTRUE)
+ 
+-dnl ---------------------------------------------------------------------------
+-dnl If datadir is set to @prefix@/share, the modify it to be
+-dnl @prefix@/share/gdal.  I wish we could default this.
+-dnl ---------------------------------------------------------------------------
+-if test "$datadir" = '${prefix}/share' ; then
+-  datadir='${prefix}/share/gdal'
+-fi
+-
+-if test "$datadir" = '${datarootdir}' \
+-     -a "$datarootdir" = '${prefix}/share' ; then
+-  datarootdir='${prefix}/share/gdal'
+-fi
+-
+-dnl ---------------------------------------------------------------------------
+-dnl By default mandir is $datarootdir/man which would be
+-dnl /usr/local/share/gdal/man but we want man pages in /usr/local/man.
+-dnl ---------------------------------------------------------------------------
+-mandir='${prefix}/man'
+-
+ dnl ---------------------------------------------------------------------------
+ dnl Capture GDAL_PREFIX for the cpl_config.h include file.
+ dnl ---------------------------------------------------------------------------
diff --git a/sci-libs/gdal/gdal-2.4.3.ebuild b/sci-libs/gdal/gdal-2.4.3.ebuild
index 0f880af5e68e..b5307ac8396f 100644
--- a/sci-libs/gdal/gdal-2.4.3.ebuild
+++ b/sci-libs/gdal/gdal-2.4.3.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
@@ -14,7 +14,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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+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="
diff --git a/sci-libs/gdal/gdal-2.4.1-r2.ebuild b/sci-libs/gdal/gdal-3.0.4.ebuild
index ef434fe5b011..eea42e457437 100644
--- a/sci-libs/gdal/gdal-2.4.1-r2.ebuild
+++ b/sci-libs/gdal/gdal-3.0.4.ebuild
@@ -6,7 +6,7 @@ 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
+inherit autotools bash-completion-r1 perl-module distutils-r1 flag-o-matic java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
 HOMEPAGE="https://gdal.org/"
@@ -24,26 +24,32 @@ REQUIRED_USE="
 "
 
 BDEPEND="
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.7:* )
+	java? (
+		dev-java/ant-core
+		dev-lang/swig:0
+		>=virtual/jdk-1.7:*
+	)
 	perl? ( dev-lang/swig:0 )
 	python? (
 		dev-lang/swig:0
 		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
+	)
+"
 DEPEND="
 	dev-libs/expat
 	dev-libs/json-c:=
 	dev-libs/libpcre
-	dev-libs/libxml2:=
-	media-libs/tiff:0=
-	sci-libs/libgeotiff:=
-	sys-libs/zlib:=[minizip(+)]
+	dev-libs/libxml2:2
+	media-libs/tiff
+	>=sci-libs/libgeotiff-1.5.1-r1:=
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib[minizip(+)]
 	armadillo? ( sci-libs/armadillo:=[lapack] )
 	curl? ( net-misc/curl )
 	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-2.2.1 )
+	geos? ( >=sci-libs/geos-3.8.0 )
 	gif? ( media-libs/giflib:= )
 	gml? ( >=dev-libs/xerces-c-3.1 )
 	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
@@ -72,40 +78,21 @@ DEPEND="
 	sqlite? ( dev-db/sqlite:3 )
 	webp? ( media-libs/libwebp:= )
 	xls? ( dev-libs/freexl )
-	zstd? ( app-arch/zstd:= )"
-
+	zstd? ( app-arch/zstd:= )
+"
 RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.7:* )"
+	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.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"
-	"${FILESDIR}"/${P}-poppler-0.83-{1,2}.patch # bug 703790
+	"${FILESDIR}/${PN}-3.0.2-complete.patch"
+	"${FILESDIR}/${PN}-3.0.2-datadir.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
+	default
 
 	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
 		-i configure.ac || die
@@ -113,22 +100,14 @@ src_prepare() {
 	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)
+	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
 	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-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
@@ -138,20 +117,24 @@ src_configure() {
 		# 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-lto
 		--disable-static
+		--disable-driver-bsb
+		--disable-driver-mrf
+		--disable-pdf-plugin
 		--enable-shared
-		--with-expat
+		--enable-driver-grib
+		--with-bash-completion="$(get_bashcompdir)"
+		--with-cpp14
 		--with-cryptopp=no
+		--with-expat
 		--with-geotiff
-		--with-grib
+		--with-gnm
 		--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
@@ -173,18 +156,18 @@ src_configure() {
 		--without-mrsid
 		--without-mrsid_lidar
 		--without-msg
-		--without-mrf
 		--without-rasdaman
 		--without-rasterlite2
 		--without-pcraster
 		--without-pdfium
+		--without-perl
 		--without-podofo
+		--without-python
 		--without-qhull
 		--without-sde
 		--without-sfcgal
 		--without-sosi
 		--without-teigha
-		--disable-lto
 		$(use_enable debug)
 		$(use_with armadillo)
 		$(use_with aux-xml pam)
@@ -194,7 +177,7 @@ src_configure() {
 		$(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 pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
 		$(use_with jpeg)
 		$(use_with jpeg2k openjpeg)
 		$(use_with lzma liblzma)
@@ -205,10 +188,8 @@ src_configure() {
 		$(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)
@@ -258,7 +239,13 @@ src_compile() {
 	# gdal-config needed before generating Python bindings
 	default
 
-	if use perl ; then
+	if use java; then
+		pushd "${S}"/swig/java > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+
+	if use perl; then
 		pushd "${S}"/swig/perl > /dev/null || die
 		perl-module_src_configure
 		perl-module_src_compile
@@ -277,27 +264,21 @@ src_compile() {
 }
 
 src_install() {
-	if use perl ; then
+	local DOCS=( NEWS )
+	use doc && local HTML_DOCS=( html/. )
+
+	default
+
+	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
+
+	if use perl; then
 		pushd "${S}"/swig/perl > /dev/null || die
 		myinst=( DESTDIR="${D}" )
 		perl-module_src_install
 		popd > /dev/null || die
-		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
-			-i GDALmake.opt || die
+		perl_delete_localpod
 	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
@@ -306,10 +287,10 @@ src_install() {
 		distutils-r1_src_install
 		popd > /dev/null || die
 
-		newdoc swig/python/README.txt README-python.txt
+		newdoc swig/python/README.rst README-python.rst
 
 		insinto /usr/share/${PN}/samples
-		doins -r swig/python/samples/
+		doins -r swig/python/samples/.
 	fi
 
 	doman "${S}"/man/man*/*
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 25b8d01d3a51..c420e452802d 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -2,5 +2,5 @@ AUX 3.4.2-solaris-isnan.patch 575 BLAKE2B 34e2fddd46e4e503630d0c44c03ee72ceb8bb1
 DIST geos-3.7.2.tar.bz2 2071465 BLAKE2B ba968488aa5d845e582d3771d8d2b1f67b0f301e73fad5834a0805a912c8f3b1200bba93d8758f43539ce269758de348d999db3db9738e7abf5c1a443f388d8c SHA512 ff0fde2e21ed9d2770c139aa50c6efd22d9cff3c6bfd8f1ef86b064efd1ad318b08dec66e34661bc1c7a341b0837978853494f27d63988be865a8ee4f7611d38
 DIST geos-3.8.0.tar.bz2 2399403 BLAKE2B 0f9b6d7f9a4052b9b84e77d534be6e2909e5dc4995287f34e3b7e7c1537c9a73088d4a49f96f43034723eb37c88674aae469e26d7db3eb40efbcdf5551553a1a SHA512 c89b25b42092152ef261090f25ff64b229f30f67d42fdf44c2871e78b66bb2c42e23b9ae21f9aea0e48823bdb0267d609ab2ee77d310abcb76fa672c6614d8f1
 EBUILD geos-3.7.2.ebuild 1338 BLAKE2B 7ebfca396ca09ebe266c59c901ad7f931076a5bef9b7574167d35b0123297205504cdfe7b11ad3a44729483ab57a14bfce6a17f66c9a4391c06b8fcf4c1071d4 SHA512 fe01f7c023c67401396ba760266b62ebba2388e42a7aae08a188fb7ec4726d9c6390f8768511fbd28ad6374a8f47a5de55a530c025d01e43a43082f7ea3a0021
-EBUILD geos-3.8.0-r1.ebuild 1063 BLAKE2B 19625edaabcff38f910f4dcd8bdb526c1a452d4206d47aff3d822f1c1bfb680aff32ddfb610340ebd5dc8d319ceee7b42121fb2bac661ed07ecdca54549749d3 SHA512 73e3eaf6b0cea2a7977ec37bf4e4b602a31d11fa7a4bf35938e57a606076b1561ad7873a8f16d9d4ed85f0813f1799fbf6cd028240e6c8748b3c9dc7bc5a180f
+EBUILD geos-3.8.0-r1.ebuild 1051 BLAKE2B d3f968edbe2ca5b45d4a7de7dec864c03aef47573b08b271aa1cf4a3e21548bcdb6a50dae532c98a47a40af20a91edde1f18f2f83050cfc786ffefba0dcdd06b SHA512 70cf5c442d28fd8f61d35119c4a6607bdb7d2f646c424ea647841aa215a3c0fe2e19fb8683af8bc4661c92863c2cf8b4ea9063235b810ae2129097c4d1a25931
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.8.0-r1.ebuild b/sci-libs/geos/geos-3.8.0-r1.ebuild
index 9e41eddd122e..3992d7a58cfd 100644
--- a/sci-libs/geos/geos-3.8.0-r1.ebuild
+++ b/sci-libs/geos/geos-3.8.0-r1.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
@@ -11,8 +11,8 @@ SRC_URI="http://download.osgeo.org/geos/${PN}-${MY_PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc python ruby static-libs"
+KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc ruby static-libs"
 
 BDEPEND="
 	doc? ( app-doc/doxygen )
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 2f3124c41e77..695d27040cab 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -5,8 +5,8 @@ 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 3082 BLAKE2B cae441ec3c5a816a2620b0d94ae3529c712862d871008e8d1167c6cb33e1542a854c1874d3508de0c19b29b0aa93d3b4928a55de2a8e1ee31f36d9295a7d967d SHA512 ee7dbb08e1193d748d073196117bc5f864621eceb7729d8a154917fca76695674088431b09fe43db6d8e628d99af114c2aced009c0d1ec39c6c179e9e8f06771
+EBUILD gsl-1.16.ebuild 3083 BLAKE2B 4fce2717abc78876ee02f0eed18d448a21c58e7b293380021c18d5132502b6b3dd0f7bc9d588c7ffe5e46a0cbf285dd7b7a32424116f10bb0b3e4e903c7237a6 SHA512 f7fdd883cb76132a7bf927f42d92006c823079887ae318d6373e53bfbe95155cebefe407fdc649ceec3ee036e91043d854181982ef9fe568ac16721c82fe95f5
 EBUILD gsl-2.4.ebuild 3191 BLAKE2B 230228573c7479f4964da270a8ea2f4fb886a0969e28e914e880cd56dd46ceb6bcc173fa0a0634582bf59eb8007184dd1d91d1c46548ff1eebb2c35aa50ec76b SHA512 91f25c90a99f4a91912e713854cc8f47eecbd64f12534be6609eef156832cec17d4490866b2c1e1aeb6fffd3414e79be538a34f81a463e48c80040ae888e4544
-EBUILD gsl-2.5-r1.ebuild 1415 BLAKE2B 72a8cca1ffc88d7553a48db13b257c95694f9c6c4060a420e81197fba27608ada2f2842e7b59293955f2d23a7195e421ac507baf683b3fc21a8d904534c3471f SHA512 b0ee9ca0d05805b8ffe4ed1ed5c2e856e4d040b282166c6131e70a1f79e9050cdb844ba4f4d5066900a1dd67499650a3b39708014ced2129c7ca62a7ddc29683
+EBUILD gsl-2.5-r1.ebuild 1416 BLAKE2B d5ff7227eb01ad87e48a054efcb76ca31302c80ca0151f689e1ecb31609a9116d13d7e1e2ebe1608389114334ee61211af5c025401c1f005f1f460792be9d7d8 SHA512 33ee9f5ab012a3a5826af2b7e35dfde669cd3be4ffeeaac7c1efb24925202fd945d06b2cca2f18d0d27589562d7c374a54f87dbcf455ad52ad8477974c0ed2a3
 EBUILD gsl-2.5.ebuild 3179 BLAKE2B d6970d769f496680f9238fcb27338722c7e82d5bf8946d4663ce33d1f3373091422480ddd906b074c680824da1fec33023d470b4d3b092b8ad40a84071cbf9e0 SHA512 d71979695720a713553aa52cf53b7d35bf78471479f654b8420f9acb864bb383b0f1e5ce74bd89581ad832d533c612e6dce3af985cf4e5856b46a4c590ecddf0
 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 21492fd2f9bb..990b77902306 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 arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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/gsl/gsl-2.5-r1.ebuild b/sci-libs/gsl/gsl-2.5-r1.ebuild
index 9b2bc0dde891..6cc1113117b7 100644
--- a/sci-libs/gsl/gsl-2.5-r1.ebuild
+++ b/sci-libs/gsl/gsl-2.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/23"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 7b76673d0380..5a06e75b7eab 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -2,5 +2,5 @@ AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8
 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b
 AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
-EBUILD hdf5-1.10.5.ebuild 2708 BLAKE2B aa05e9276c17ad1da567234c534a151b6cb8ecdc22a01e04f21be5301835a6a90e6ff2b805cc51a253291b254b053c63135d9588c1ffb461846c7a638a33dc85 SHA512 d6d14e8aeaa2ec17940ad0fa054afa923a73dba2a295ee5cfd0c0e9656863ad0b07811528cbfb11b86ea495e3dc82a796424e4583ff59ae0baa68db90f3f6b54
+EBUILD hdf5-1.10.5.ebuild 2709 BLAKE2B 73e10b3fe9ef6373a84716a5d49defdbe0d56f112456fb4789ee7918eecffd80ed0a821eb4b07fe2d5071b1844b4ff0284369d886dff5188924a50b082447609 SHA512 71d37f8256c600c3f842813cf5849cb2a8b9f7083238d08162755a85d04fba91011cb9a87247e3d42e60a4676d4b6923e14bc5b76e69ccb129042093dd2414cc
 MISC metadata.xml 670 BLAKE2B 6ec39c2c545ea8130677894921b6914d4503199a40f5498b81f1520312a451585276a2192ecb388323574bf0a17acfe798d090bf499f8ef2b6bb7ff831c662ba SHA512 2cbdee7294537d76bee9c72c77c36d0d2aab176dd4588a7b99d16bc3a421b52770bf6d93943c13fb32674f5deb7bbebb94b9e18875b3e473395a9176277fd56a
diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
index deaec088dd13..daa90a32abd7 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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran +hl mpi szip threads zlib"
 
 REQUIRED_USE="
diff --git a/sci-libs/jmol-acme/Manifest b/sci-libs/jmol-acme/Manifest
deleted file mode 100644
index 50841d8e7cf6..000000000000
--- a/sci-libs/jmol-acme/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX src.list 115 BLAKE2B 13928862099255ad04d567e455b05579c860515cdbd5ee77ccedfc66f27d95720a8cb1225de6046f10392c6376aabb1da210ff6dc2d418a37eae3a38b52e6345 SHA512 3e9a0dc4aa7890554ab66c6e9cbf60287e3c37b45cfc73ccee6f0078cb0f7a267c5eeed07e0bae91fa39759cf15dd794e278058506760ebce4e617963b391f6d
-DIST Acme.tar.gz 478667 BLAKE2B f32212dc0796949416ffd5c2347c66ae9d9f8cacb3974e1f1eb972b2b5b541c685f3f857414d4726db82f49c77cf6f3e8d8e26d27f527224c23f893f5d859b96 SHA512 cf172ce6d341d9a559ef8db837a7c163fb494d5629d2738279b2b0b68bf8874303e37d72c519171a885efca9a1505345f454e434f6f578d370bef961cb7a4d46
-EBUILD jmol-acme-1.0.ebuild 873 BLAKE2B b859781d9107f5526864021c37eb8d60f0b002812e7d9ca826d8e909ca33c4f1777cbc9265151e12d2a10b017e1fa700de8e680ed21601894f3b17bc7bdc35c5 SHA512 a04c66a90033b979d17e427689455247b8700a8d1ffb4f13c3f1720e54c90ca2151d32af278568393fe1ddaa2d5b1e96323973bf246788783c17342a27645ca9
-MISC metadata.xml 253 BLAKE2B e769e1636e1375309c31bf26fcfdcb1ef46b7a69346fd59011620907237204b3b7ced37cb3450c502f5b19aa1adf36f291412ee47e242ecbfc18c26bfa478f42 SHA512 819062e1ccefa39fc7f577279b08e781b9631eb14b7794db691ab92263c013ca432d279ac08671b19c80f7effb8c67528e5221278c573dd29dc0354bbff4a77e
diff --git a/sci-libs/jmol-acme/files/src.list b/sci-libs/jmol-acme/files/src.list
deleted file mode 100644
index 14d1fc028561..000000000000
--- a/sci-libs/jmol-acme/files/src.list
+++ /dev/null
@@ -1,4 +0,0 @@
-./IntHashtable.java
-./JPM/Encoders/GifEncoder.java
-./JPM/Encoders/ImageEncoder.java
-./JPM/Encoders/PpmEncoder.java
diff --git a/sci-libs/jmol-acme/jmol-acme-1.0.ebuild b/sci-libs/jmol-acme/jmol-acme-1.0.ebuild
deleted file mode 100644
index 30ad53ef215f..000000000000
--- a/sci-libs/jmol-acme/jmol-acme-1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="Acme"
-
-# It proved difficult to recompile the whole Acme package, so we'll only take what we need.
-
-DESCRIPTION="Portions of the Acme collection required for jMol"
-HOMEPAGE="http://www.acme.com/"
-SRC_URI="http://www.acme.com/resources/classes/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	mkdir -p classes
-	find . -name \*.class -delete
-	java-pkg_filter-compiler jikes
-}
-
-src_compile() {
-	cp "${FILESDIR}/src.list" "${T}" || die
-	ejavac -sourcepath "" -d "${S}/classes" "@${T}/src.list"
-	jar cf "${PN}.jar" -C classes . || die "failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-}
diff --git a/sci-libs/jmol-acme/metadata.xml b/sci-libs/jmol-acme/metadata.xml
deleted file mode 100644
index ae9640ffb9f1..000000000000
--- a/sci-libs/jmol-acme/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sci-libs/lapack-reference/Manifest b/sci-libs/lapack-reference/Manifest
index 33314a43e130..d988fc119884 100644
--- a/sci-libs/lapack-reference/Manifest
+++ b/sci-libs/lapack-reference/Manifest
@@ -7,7 +7,7 @@ DIST lapack-3.2.1.tgz 4792502 BLAKE2B e9d39c958406db05383ebda7e781ae6c2d0b1f3896
 DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
 DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
 DIST lapack-reference-3.2.1-autotools.patch.bz2 13338 BLAKE2B 1be1d2c273b92a106a9c914f17e0350b44fc42b3837ee48b040d7a61802bf5036c30e8800ec613ccf12a082a7801cad6878b6ddcbd4db32e27a06b7462f8ecd2 SHA512 957e8c7646a0d6ade9c0dfdaf2aa665a01f932dfda376ba1db164106fb174793e6504cdbed7daf158f23bb69502937963cb2e2d45ac720980d3832f6fc0fedbd
-EBUILD lapack-reference-3.2.1-r4.ebuild 2821 BLAKE2B ee447f6e3620f457122ba4ecce84420aaa9f6859a9a9cbf73322328a2be4a0e36113e90f26402b9646b717c66568f31279c132903a26a781e83a95359d86add9 SHA512 15cbac6388b0ff5cee9141eb097416c9764845d9c7bcbb305589ba42d4265ea7241e6c0e56660f823962815d6c843e44cc721c1f38897f47806f943bce0c8c50
+EBUILD lapack-reference-3.2.1-r4.ebuild 2822 BLAKE2B 96bb466a278339c8c2bf825dba6e1e70d9b24233e07f3893799ee42e48b8c44bd4dc8e806c9f0ba9eb5b71b5d1309cc0ca1f8b6f0ef143435a5bdf14a930ceac SHA512 18d6fa439360ec050753ca8fb9f427cd8e7b60fdd4acd38c5dde08c661d1ce3eb6ca766b24616495fdfc6c4a14e96232083aad8c08eba7b4776989ac672af352
 EBUILD lapack-reference-3.6.0.ebuild 2622 BLAKE2B 1059d64fba18d9c91da283fd82b42baeefd6223bf18f04b3e7b38762b709b9335367a2af13ef1a3bd45cc228fc80b7ed2ccf12b67ee0b1513b92f12ebc14b2c1 SHA512 bdc1587e0e3d035bf5959e564ee3247531f286908dde35f8691c58c538d163895fdd40a9bf0a402aad1c370e5859b7c09c8ad44fc0934b5464a5082f463d0c79
 EBUILD lapack-reference-3.7.0.ebuild 2860 BLAKE2B a2c723501a2468be083de147ab99b7aff66ac02f4cdd72129dbf83df2881f64def8ae58cc5946478ddfde0cbb4a89f668d85301bb7c92c3686c08caabe205738 SHA512 c84d6f6650298f1d3b41cfa689c0b41ebdabecf7e9dddaa67b9069280c92fa0f73f1e115829a095e87ee3785f93fae4b5cf1c277c1251a8ca90ebdfc4496ff76
 MISC metadata.xml 779 BLAKE2B 64433bf79744cecd4ce505c3643ff73d3355620749b344ab27324c80ecb7b3ad9dd02a05dbbf1bd3e8174cac947c236d80f51377c259a1ff3aaa17b9908a8a0e SHA512 a72591749a3ea6ac49ce3a20d6934042c54e0b1639d00d585bdcc88cd9425d31135d8acc4ee33856f3933cc2518e5c7354d6debc20bbcc7b701cd6978f474e6f
diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
index 0973af2b1f1c..a607ac654ed1 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index aa3a70523c74..e3b586001aa3 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,3 +1,3 @@
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
-EBUILD lapack-3.8.0.ebuild 3004 BLAKE2B c17e237074dbafe7d677a3ace66f3cec5f9c0f2e1e81dc510f6dcf0fbf9c633f4a2a888c019bb8600dd9e839e158ca3810fea94f92d9bfda054e3224992cc106 SHA512 282e50de6ccd8b0d11d7844b7d55e5924b4c1756737cac1a01211ae98e4a13b0af36716b9325b5bc685006909599e47adc9eff85248b710ff2dcd6027fe63192
+EBUILD lapack-3.8.0.ebuild 3005 BLAKE2B f72bbb2310b5d7397139647952cc082ac330307e8b76b669fc3b1591da7352ca510aa2b3cf142368d4b408537de3845c697c7f4d248fdc1c14dcafb8368d8629 SHA512 b914e3ecbf24f29576b3c0f1bcccfb7028781c7b5718db86454787ff9ab84f65ffedfe3fe632283f2db3a19fc136ffc42db79f4b3a324223c382733416d3b990
 MISC metadata.xml 1423 BLAKE2B 2ec6d7c07c4827cca666cddb7e7b2e47238ff3fd40fd5e15463196812a7a82e0b85e5d36ae2a2c3315c3b4e0b5f3d4a79a953cb1703836b20dc14862956bcf29 SHA512 39a5e8738999caaf00b4f7fcdb3afdd1405a7c817920b9247a76dbc64e06f8c2011763031a058673ac8a411cad2219cbd7c8664d379535e2afea72d2bd578fbe
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index 8a158e8dd50e..8ad78cf13254 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lapacke doc eselect-ldso"
 # TODO: static-libs 64bit-index
 
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index d95496f490a4..247b6d8419be 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -1,3 +1,3 @@
 DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
-EBUILD libcerf-1.5.ebuild 807 BLAKE2B d1a97b4f7df76b5efbb59d5e77d87dcbf28488266cada96065bcbe93edae62260b770fac395d2aa81cf47306aad272b373a6872acd662ea307554fa3b4aa5edb SHA512 2a25d110a9bacb8242097e2a55de791d0ed868935ed599c5177dce5d3d9d55cff4b8e12fee943bf901b29ed95cb60b1390fa6feea8288cec24c04b91ac8bfb29
+EBUILD libcerf-1.5.ebuild 808 BLAKE2B e882a1ea6bfb38640255cf2c858adcaeee9e1b16b370b7215b2f0dcc5dbe755de78253d49a77b4355fcf8348e38a8b0376776240615581748d3cfb5febc2fde9 SHA512 b0656f434debce2d45472ab1e533584a11da47954524e6fa1bdb0860677b4e9ad28c837d27748b15638aac6e370cb7dc51c706715418337296879532d72da4d7
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index 3294d3848a94..f3b3fda424cb 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -9,7 +9,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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libcore/Manifest b/sci-libs/libcore/Manifest
deleted file mode 100644
index fef034a593a3..000000000000
--- a/sci-libs/libcore/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 2.1.1-makefiles.patch 4387 BLAKE2B 84d520eeac3b7de5f1dd7069e5e68b7949afcbbc914982be913f5f3778d16227fcdf07a3249e7e2f630225ede1a81a2bc1af74c29a7bbea96fd11f3560eebded SHA512 586c8b22139f98fd7db1d1cc583eadb7acdc0fada3fbb6df581c71fe8c05c8929438429b6370e67742dfce61efda1b26bd401966388c269b2d4a492636ea6941
-DIST core-2.1.1.tgz 2759163 BLAKE2B e33178bce382aa176896a50ae7ad7821fdeb906bc6dd13805efd8ec5f91b3b659818c570be809c52eb86197d1a1776a51c257a2922e561660f604b70bc831dfa SHA512 e56e184b8efaee82b737e3947f2934b71983cbf905f05005171d3d5670f326597ff7d25767c00ec18a470eb7306f14b813edf9548869d84054830565c044f6fb
-DIST core-2.1.doc.tgz 657871 BLAKE2B bce685204ca0f7c621b833f4a54b092167882d06b83b021cfd86e3b42c6849a429196950ae32293790979c3ed67b2d809982ea3ab3453569bcbefce2723f2f68 SHA512 0988640bbc35de675fc536b852371a8f1233ce0d19818b17e540f1238b0e6d1266657ab815604be3a3379e22e7473eb3fbd71ef94ec099255c456307e69f66c7
-EBUILD libcore-2.1.1-r1.ebuild 1827 BLAKE2B 055604f2c596237c0b363171d57b85d95ff803f6dc51a20d78d6d876da3e38908eef84a8afee67fb251e36cc0a9812663dd43ee885ef0f631810d99b67c9f1a1 SHA512 805a31c9a1876b7867628b05c8dbffe559095c3d841b175d51ee8b04589db2425f1d39828f59ac5705158ec2c151aff71a26613d7c6882710731ece9aa941e57
-MISC metadata.xml 676 BLAKE2B de77ccf6374d16c7a45e452cb537d600f45832f224a6966303d65c8e4cdfe90786d24d6f87d028d40c6f271f244c78a7b2113275a057ee294832c069eda13c9e SHA512 56090f44fae0835fe18df0db30b7eca20874ef9d8ff4a97e3dfc0c58751fb096a63ba3352944214c5e9cc4ee7120ba0f993f02061c66140e0476ea90a6f2b75e
diff --git a/sci-libs/libcore/files/2.1.1-makefiles.patch b/sci-libs/libcore/files/2.1.1-makefiles.patch
deleted file mode 100644
index 09a8f5be2f38..000000000000
--- a/sci-libs/libcore/files/2.1.1-makefiles.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -Nur core-2.1.1.orig/ext/Makefile core-2.1.1/ext/Makefile
---- core-2.1.1.orig/ext/Makefile	2011-08-06 22:53:29.000000000 +0100
-+++ core-2.1.1/ext/Makefile	2011-08-07 00:40:58.000000000 +0100
-@@ -38,16 +38,18 @@
-   endif
- endif
- 
--INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/gmp/include \
--	-I${CORE_PATH}/mpfr/include
-+INCLUDE=-I${CORE_PATH}/inc
- 
- 
- COREX_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.a
- COREX_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.a
- COREX_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.a
--COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.${CORE_DYLIB_EXTENSION}
--COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.${CORE_DYLIB_EXTENSION}
--COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.${CORE_DYLIB_EXTENSION}
-+COREX_SHARED_LIB_LEVEL3_NAME=libcorex++$(VAR)_level3.${CORE_DYLIB_EXTENSION}.2
-+COREX_SHARED_LIB_LEVEL2_NAME=libcorex++$(VAR)_level2.${CORE_DYLIB_EXTENSION}.2
-+COREX_SHARED_LIB_LEVEL1_NAME=libcorex++$(VAR)_level1.${CORE_DYLIB_EXTENSION}.2
-+COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL3_NAME)
-+COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL2_NAME)
-+COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL1_NAME)
- 
- TARGET=${COREX_LIB_LEVEL3} ${COREX_LIB_LEVEL2} ${COREX_LIB_LEVEL1}
- 
-@@ -74,11 +76,11 @@
- 	-@rm -rf $@ 
- 	$(AR) $@ $?
- 
--COREX_SHARED_DEPS=-L${GMP_PREFIX}/lib -lgmp -L${MPFR_PREFIX}/lib -lmpfr -L${CORE_PATH}/lib -lcore++${VAR}
-+COREX_SHARED_DEPS= -lgmp -lmpfr -L${CORE_PATH}/lib -lcore++${VAR}
- 
- ${COREX_SHARED_LIB_LEVEL3}: ${L3_OBJS}
- 	-@rm -rf $@ 
--	$(CXX) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -o $@ $?
-+	$(CXX) $(LDFLAGS) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS)  -Wl,-soname,$(COREX_SHARED_LIB_LEVEL3_NAME) -o $@ $?
- 
- ${COREX_LIB_LEVEL2}: ${L2_OBJS}
- 	-@rm -rf $@ 
-@@ -86,7 +88,7 @@
- 
- ${COREX_SHARED_LIB_LEVEL2}: ${L2_OBJS}
- 	-@rm -rf $@ 
--	$(CXX) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -o $@ $?
-+	$(CXX) $(LDFLAGS) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL2_NAME) -o $@ $?
- 
- ${COREX_LIB_LEVEL1}: ${L1_OBJS}
- 	-@rm -rf $@ 
-@@ -94,7 +96,7 @@
- 
- ${COREX_SHARED_LIB_LEVEL1}: ${L1_OBJS}
- 	-@rm -rf $@ 
--	$(CXX) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -o $@ $?
-+	$(CXX) $(LDFLAGS) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS)  -Wl,-soname,$(COREX_SHARED_LIB_LEVEL1_NAME) -o $@ $?
- 
- %_level3.o:	%.cpp
- 	${CXX} $(CORE_CXXFLAGS) -DCORE_LEVEL=3 $(INCLUDE) -c $< -o $@
-diff -Nur core-2.1.1.orig/progs/Make.options core-2.1.1/progs/Make.options
---- core-2.1.1.orig/progs/Make.options	2011-08-06 22:53:29.000000000 +0100
-+++ core-2.1.1/progs/Make.options	2011-08-06 23:31:01.000000000 +0100
-@@ -11,10 +11,8 @@
- 
- include $(CORE_PATH)/Make.config
- 
--CORE_INC=-I. -I$(CORE_PATH)/inc -I$(CORE_PATH)/mpfr/include \
--	 -I$(CORE_PATH)/gmp/include
--CORE_LIB=-L$(CORE_PATH)/lib -L$(CORE_PATH)/mpfr/lib -L$(CORE_PATH)/gmp/lib \
--	 -lcore++$(VAR) -lmpfr -lgmp
-+CORE_INC=-I. -I$(CORE_PATH)/inc
-+CORE_LIB=-L$(CORE_PATH)/lib -lcore++$(VAR) -lmpfr -lgmp
- 
- COREX_LIB_LEVEL=-lcoreex++$(VAR)_level
- 
-diff -Nur core-2.1.1.orig/src/Makefile core-2.1.1/src/Makefile
---- core-2.1.1.orig/src/Makefile	2011-08-06 22:53:29.000000000 +0100
-+++ core-2.1.1/src/Makefile	2011-08-07 00:24:38.000000000 +0100
-@@ -23,7 +23,7 @@
-   endif
- endif
- 
--INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/mpfr/include -I${CORE_PATH}/gmp/include
-+INCLUDE=-I${CORE_PATH}/inc
- 
- # VAR indicates variants of the Core library
- #	E.g., if VAR=(empty) then we compile the release version.
-@@ -44,7 +44,8 @@
- 
- # The following library will be built:
- CORE_LIB=$(CORE_PATH)/lib/libcore++${VAR}.a
--CORE_SHARED_LIB=$(CORE_PATH)/lib/libcore++${VAR}.${CORE_DYLIB_EXTENSION}
-+CORE_SHARED_LIB_NAME=libcore++${VAR}.${CORE_DYLIB_EXTENSION}.2
-+CORE_SHARED_LIB=$(CORE_PATH)/lib/$(CORE_SHARED_LIB_NAME)
- 
- TARGET=$(CORE_LIB)
- 
-@@ -52,7 +53,7 @@
-   TARGET+=$(CORE_SHARED_LIB)
- endif
- 
--DEPS=-L${GMP_PREFIX}/lib -L${MPFR_PREFIX}/lib -lgmp -lmpfr
-+DEPS=-lgmp -lmpfr
- 
- # =============================================================
- # RULES  ======================================================
-@@ -64,7 +65,7 @@
- 	$(AR) $@ $^
- 
- ${CORE_SHARED_LIB}:	$(EXPROBJS)
--	$(CXX) $(DEPS) $(CORE_LDFLAGS) -o $@ $^
-+	$(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(CORE_SHARED_LIB_NAME) $(DEPS) -o $@ $^ $(LIBS)
- 
- %${VAR}.o:	%.cpp
- 	${CXX} $(CORE_CXXFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/sci-libs/libcore/libcore-2.1.1-r1.ebuild b/sci-libs/libcore/libcore-2.1.1-r1.ebuild
deleted file mode 100644
index 79e8f698f35e..000000000000
--- a/sci-libs/libcore/libcore-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs versionator
-
-MYPN=core
-DOCPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Robust numerical and geometric computation library"
-HOMEPAGE="http://www.cs.nyu.edu/exact/core_pages/"
-SRC_URI="http://cs.nyu.edu/exact/core/download/${MYPN}/${MYPN}-${PV}.tgz
-	doc? ( http://cs.nyu.edu/exact/core/download/${MYPN}/${MYPN}-${DOCPV}.doc.tgz )"
-
-LICENSE="QPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-libs/mpfr
-	dev-libs/gmp
-	doc? ( app-doc/doxygen[latex] )"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-makefiles.patch
-	sed -i \
-		-e "s/-O2/${CXXFLAGS}/g" \
-		-e "s/-shared/-shared ${LDFLAGS}/g" \
-		Make.config || die
-	sed -i -e 's/-lgmp/-lgmp -lgmpxx/g' progs/Make.options || die
-	# missing input file in gaussian test and buggy test in tutorial
-	sed -i -e '/gaussian/d' -e '/tutorial/d' progs/Makefile || die
-}
-
-src_compile(){
-	emake VAR= LINKAGE=shared corelib corex USE_GMPXX=1
-	rm -f src/*.o ext/*.o
-	use static-libs && emake VAR="" corelib corex USE_GMPXX=1
-	if use doc; then
-		cd "${S}/doc"
-		export VARTEXFONTS="${T}/fonts"
-		emake -j1 all
-		emake -j1 -C doxy/latex pdf
-	fi
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/lib" emake \
-		VAR= GMP_PREFIX= MPFR_PREFIX= test
-}
-
-src_install(){
-	dolib.so lib/*.so*
-	for i in $(find "${ED}/usr/$(get_libdir)" -name "*so" | sed "s:${ED}::g"); do
-		dosym $i.2 $i
-	done
-	use static-libs && dolib.a lib/*.a
-
-	insinto /usr/include
-	doins inc/CORE.h
-	insinto /usr/include/CORE
-	doins inc/CORE/*.h
-
-	dodoc FAQs README
-	if use doc; then
-		dodoc doc/*.txt
-		dodoc doc/tutorial/tutorial.pdf doc/doxy/latex/*pdf
-		dohtml -r doc/doxy/html/*
-	fi
-}
diff --git a/sci-libs/libcore/metadata.xml b/sci-libs/libcore/metadata.xml
deleted file mode 100644
index 84bf0d372a6f..000000000000
--- a/sci-libs/libcore/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-geosciences@gentoo.org</email>
-		<name>Gentoo Geosciences Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		The Core Library is a collection of C/C++ classes for exact
-		computation with real algebraic numbers.
-		It embodies our precision-driven approach and is
-		useful for robust numerical (especially geometric) algorithms.
-		The library supports the Exact Geometric Computation (EGC)
-		philosophy through its novel and easy-to-use notion of accuracy
-		levels.
-	</longdescription>
-</pkgmetadata>
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index eb825c9ad5be..34db29c15dc3 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -2,5 +2,5 @@ AUX libgeodecomp-0.4.0-lfa.patch 1548 BLAKE2B f5cce98b02e24bcf34ab803ea323351fe5
 AUX libgeodecomp-0.4.0-libdir.patch 694 BLAKE2B 87b08665e9f1d236183f7bfaaf34ef5a9839e28f7a94a6b870fe99d19603b11f152227137202be5669c9f9cd2ba65b3f559eba9ca2460676f19c22e0911ab36e SHA512 fa8e0e08b45d9250d6f32e1a8ade6ff8bdb8acb7951115916cee7b6df600800f8aa64cfb92e13bb5b108af98e8ac2b1f127f34b415648ebe556a589bb11af68d
 AUX libgeodecomp-0.4.0-scotch.patch 7962 BLAKE2B e47365810132838ba0afc63dead520a17d866c0c6b5c2c2bf8f7299d688bcf10ef34ff19d1b29a29d3388101f082080b5943b037fdc9aedf937b392ffb46a68a SHA512 78d805aedb820b457ae01e5f35c530edf7de014cc60c640314cefb1cdfa88f54a6128fb56a81e974fed9d0620e56c31a8f97922d78e88d729bbf3c29c71f7f5d
 DIST libgeodecomp-0.4.0.tar.bz2 766090 BLAKE2B 2abc5d10371fbad92f957118cabd656f0b4938d5e102da6446851bd979debddaf5eba8a6321dffd32356a40ca12659d9a7a691929e71989e48a71e5177fedc51 SHA512 3ff1a45844e5879662012cb4bae5d577f30ee71094ed4063b535b0ac3da900f34a1bc25be524c006ff91e0edd665e46cbb6cfc0db7966eebfea30f9fee6eeddb
-EBUILD libgeodecomp-0.4.0-r1.ebuild 1441 BLAKE2B be37cd45b97af6f32801838593e660d1208329e6a11de35ac59963698178c5610e226a474e0012830450c6271d938594fe001fdcbdcd2d1b807a0da3906f2f38 SHA512 8963789878d586df0f30d6b3067df70d273618f6db70d63db463dcf78de79bc471ebf5ca0463498602a716271db4670219b7b5922cf88ac3058d97f1ad011bb2
-MISC metadata.xml 1201 BLAKE2B e3338a4d2cc26d55bdc820ffde8280507da7b6808ee2f93fd82197e628b2b69d596c48d6bff3c8c4abedc3509588e55db1b238fcfe0cbf2bc751bfffe1f7b6ac SHA512 ebfd83cbb09b16f24ead5192c9d6bf5754e98448c055b05284ccb8a3bf0d90a77215189d5f310b2a44ac2ccc0db998ace007ab658355545e2974dcfe3c07d548
+EBUILD libgeodecomp-0.4.0-r1.ebuild 1435 BLAKE2B 8ec13f91a6c2338fb995deb5f3140e61a29bc10a10ad73b309a08edd19fa6845c97f050323712701bde799809137778e07b5e938c659f5b98351bcccd684673b SHA512 a34e63e028da1e33258836b0717f7c3b410da5db0c41cbf3febf271423af9115a782fd40a5f0e7cc156a63359f3a6fd4d15d00bc610dc9478acf298321067110
+MISC metadata.xml 1132 BLAKE2B fb4ab3944ada28d683fd6c44b556e4b4cbc9a218527c7d382ae0d5bcd94c485c72e5344477d0d96b13624b124875c2a6f5e1593978c9bd49aec2c8b0f8d09f7d SHA512 298afea3cac7216fd69900c983896a9887c24b3e8704b21be5200d112e11f3c3d80c19d819f58da5f01e66f0a8d0ad555a13f0e609d53159f2e8deaed43973d8
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild
index 5237072823ec..9eb89fce5aaa 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
 SLOT="0"
 LICENSE="Boost-1.0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc mpi cuda opencl opencv silo hpx visit"
+IUSE="cuda doc hpx mpi opencl opencv silo"
 
 BDEPEND="
 	doc? (
diff --git a/sci-libs/libgeodecomp/metadata.xml b/sci-libs/libgeodecomp/metadata.xml
index 119f987c9b7e..ec1181ecc743 100644
--- a/sci-libs/libgeodecomp/metadata.xml
+++ b/sci-libs/libgeodecomp/metadata.xml
@@ -28,8 +28,5 @@
     <flag name="hpx">
       Enables HPX backend
     </flag>
-    <flag name="visit">
-      Enables VisIt related code
-    </flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index b56119d60890..bd415622e98b 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -3,8 +3,8 @@ DIST libqalculate-0.9.9.tar.gz 1509180 BLAKE2B 3f309add80ddb6b21730eab25d37c2d8f
 DIST libqalculate-2.2.0.tar.gz 1717207 BLAKE2B 020ca544683ff140ab5f8256a5a955c895a6ea09a581e9e75ab6c0a0657886c352a1ec2d34400057fe80004481d3198998613113ca40fb4feebfca010445dced SHA512 e6f3693e4dba2beffca300b673657b90037a6b7acc5bbd4e659863f4f5aec148d6d385fc3c666b16b2be713d0a8ad1b4d7fda557cef0e2be340ca2435f62aae7
 DIST libqalculate-2.8.1.tar.gz 1961535 BLAKE2B 074d83a44cbc6cb5d8afe5121e4c34cec46f2f6fecf046f6b4e67c6ebc612030ccbd0f42c303cc675267374502ecb3e831c9bbfca0f13d339e31fb8933a99b7a SHA512 a258bf4f67db70263626ac77822afc75fd7a9e5af2feb1930314daff219865b28c43e82fef6ceae4f3f23957447d6eaebdc709e606d28457bca0f47eefb9274a
 DIST libqalculate-3.2.0.tar.gz 2035352 BLAKE2B 4ad9f1acaaa34693e3167514d16193b06af5a2d441946e636439cd9374c0061e0f20e72126a2cb020fed2e7c82e7144636a7eb545196bd6879af5a09320c3245 SHA512 6d0e1bbc1c9e4436208cd0ea855cc1d90b8a6d0525cd25bc9414db6e610e1e48aa84a9b552248926bd3c6f91db4997afb60658a5579502bac7194178e36fb857
-EBUILD libqalculate-0.9.9.ebuild 1439 BLAKE2B 71859454b82d428a42e263bb949bc37334e1f299bc38b4564e8aca4d04775e2b4decaa588054823e7e593fc3f29a6726a00fe4f002915e9acd9a5da0c5104df7 SHA512 2cd59c02a4a5fd199d62037b204c571c093165dbd5be331bcf9050421fc4ec753994cd98cd724c3993d9de84681505d69618a7e342983a86757be0efd3d5a572
+EBUILD libqalculate-0.9.9.ebuild 1440 BLAKE2B c2f15189c4ad2ecec2264ec2745b6dcc7a163a4eacba6bc760d1b37b0d9c4f45d481aa0508abbbbcab39bef01c5f2d408f865b7cec968e00c9a4cc5f49ec6df6 SHA512 130b4e5a162fa8c1ecc9998ae023e58407c7a7453b5c961fb9e55577f515e1b4142a32e2efd0d3e567995ded2643bcd6a90d05bfc2b41bef80238190f0ec8231
 EBUILD libqalculate-2.2.0.ebuild 1349 BLAKE2B ea1df54be1d8970a19f229dcc268627ec760e586c3c9c5e9526c747d15d95b91cf3bb0fb90e56fda9191191a22ebd23728bb8921a6b608eae8fa5e7b149785ee SHA512 739d3946688533002637177352784a9884a08931ed9d70ec3012e76b3bfdb7d7831d54fc401e3e74ff4f73b1a015fc18c8cbbf8ee27913d5149c44094cdc16f8
-EBUILD libqalculate-2.8.1.ebuild 1437 BLAKE2B 26bfe7e92caec241c025f8d694a92a269cdae6a0bd8af00ec102f82639525c3350c322f898da012ef0cc19559cb7b1a100a1840873542346a2d99a1f33f37a2c SHA512 72fcd890e57366d42bf9ce0fcae362ba534ed2dfea0738092de0373d8daedba7c76a6126d2bc23363fe979b761c86fd71c095a35960c46f5277cb4a83842e6fc
+EBUILD libqalculate-2.8.1.ebuild 1438 BLAKE2B fe96da85dc78b5de908df9703c75fdf292344c88c138c73c2289e385bb5e38fd3b8f103a9ef95ad665cd3579045f99c5e277850d76ab4c76710fc26dc1bd6694 SHA512 a4a8ad9e589216666da5b9664603f602a4fba96385b110c5a9973d4e0e2caeaf2ae9050e879e087a5944307d6ebfa3537fe2de27fd8e78236705864159e5a69e
 EBUILD libqalculate-3.2.0-r1.ebuild 1441 BLAKE2B 2bbeab865e61e3bf0a14e94dbeaff047ff1cd21337e82d0b201fc3a79aae2a98fc6f09ab95596d1058b13739d831da19fa4ca94b8aae9a38cd60f885efdd90b7 SHA512 dfb669c337ecf1c80f831b1fc7c63df442c3a2c3c8fa729967adf921000fbd8f42414bf5a04fb049df87ed3824df23f9c52d15c8ac6d82b7cc4ff33056c725a7
 MISC metadata.xml 412 BLAKE2B 6cb8a434ec8e0eaa50982720079db60a5a2211c9d67852712351e9d6698edb1d70058f8f093ecf7b93fb7f853b1f1c138bc0871a6751975d35c24c622510dde5 SHA512 b6c55b741bda2a497dae278d47c6931611cbda132e08deb16a9c4efef59c7cb18bc464e7d242380b7afde2af4ab6f8e7f72b7db4ed3fd6b8f4cdc9c0359550ce
diff --git a/sci-libs/libqalculate/libqalculate-0.9.9.ebuild b/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
index 8cce0110307a..2a5cbad196ca 100644
--- a/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
+++ b/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gnuplot readline static-libs"
 
 COMMON_DEPEND="
diff --git a/sci-libs/libqalculate/libqalculate-2.8.1.ebuild b/sci-libs/libqalculate/libqalculate-2.8.1.ebuild
index db6083f587df..f48cbe607c5f 100644
--- a/sci-libs/libqalculate/libqalculate-2.8.1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-2.8.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/20"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot readline static-libs"
 
 COMMON_DEPEND="
diff --git a/sci-libs/mpfi/Manifest b/sci-libs/mpfi/Manifest
index d1e59e6337b2..5c87eeddbcb1 100644
--- a/sci-libs/mpfi/Manifest
+++ b/sci-libs/mpfi/Manifest
@@ -1,5 +1,3 @@
-DIST mpfi-1.5.1.tar.bz2 365467 BLAKE2B 9f9a74f44ef9738f875faff7885da6404752d4687a19a85e877195fe2955e27a96192849b6c8ff190c29b7535b72027151cb98f46edf3871c9bb3f4694360fe1 SHA512 498f8b2e114e71c0600f601e4bfef21011e46434d6795e3cd999d38ea9a3d4c66cad2d27e7899629ae422a91b6a776dad2fdbd7c93d51a56f5cfc4ab0e3aeca1
 DIST mpfi-1.5.3.tar.bz2 447256 BLAKE2B 67bb9af362ec96c015571cbdaba09befc2241e0113b6177dd76eec97b619bbf9c924ba4d16583df664cafdb1a78c8700712e30633e91e5ae6f1d5e084c3ede5c SHA512 9c3cdf665fccff8b383c96827f4acb7aa62efdf7854cff271455273f00f8e7ecf84fbe191b02e5f51fe067aaae564fd2a0add062070ff5c1f542d61a021f967d
-EBUILD mpfi-1.5.1.ebuild 527 BLAKE2B e3516564b7dee59722e7c3ea79f28d2172044d0ac67bc0e8eac3be2701cd426e3a1ca914f7f92c56bd4eef3d5c7dc5f7dd54ff52d6efa2b192d6e77eea546ba9 SHA512 64043699a92d35aac4f68111ebace7afea870323728fba414d9eb607cbbcc4cc9c3e8350b496e2e59c88678ec7667ff9e667e99b0ce41ff9c6add0c5afdc7643
 EBUILD mpfi-1.5.3.ebuild 640 BLAKE2B 4e6651f2fd8d8e8890c49424bd447779ed1ec8a5c8ea27ae7b456e1a8d82f10709675b896b8d1909ac3d3a1a3082737d939a679b10ac387e350232032e1c0972 SHA512 d7662f1590b4bc9acec7725b34e0c4306206cb608cf58893a4e55d0e4ddef72cec3ccc5f0c663436f358ba82b31923164c8d6080676adb91df934c227e144e95
 MISC metadata.xml 1029 BLAKE2B 51b40066219be20a21939a82e93c095573e3cadaf288430db3c0a46c83a6045dccb3b940505b6ee189d426a0e1e57b9135df202a6185848546a9f5a1e8316d7b SHA512 870810149f2a547a0db4df6c7997fadfeaee91d0a8a1d456fafba76c7c48e0e59e8a0415a10b46b89bf4930e1880b94d3b6d3f28443dda2bb7ea45a62fa3c8b4
diff --git a/sci-libs/mpfi/mpfi-1.5.1.ebuild b/sci-libs/mpfi/mpfi-1.5.1.ebuild
deleted file mode 100644
index b448cb8cde86..000000000000
--- a/sci-libs/mpfi/mpfi-1.5.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools-utils
-
-PID=30129
-
-DESCRIPTION="Multiple precision interval arithmetic library based on MPFR"
-HOMEPAGE="http://perso.ens-lyon.fr/nathalie.revol/software.html"
-SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=">=dev-libs/gmp-4.1.2
-	>=dev-libs/mpfr-2.4"
-RDEPEND="${DEPEND}"
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index 5d1f262b8a3d..b3ade624e9fc 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -7,7 +7,7 @@ AUX mpir-2.7.2-sed-backport.patch 704 BLAKE2B a4e2083008ddb0acb2cd81886e53fc1e9e
 DIST mpir-2.6.0.tar.lzma 2472231 BLAKE2B ec768fb78317220d677fac24609fdc4db1315e3c5594d7e098a0f502c38eb8dcf69bac5317c3b7afd629c089504856bb686aa4de65ad54b4f728325e100db44f SHA512 e2608beeb72651c9b2e47f8fb2bcf672f8c74e2cd622e17cd19b12100b66e929ee31d102d2901816379b23aee1a3ea3a854e3e10ebffe2a6e4772748858f911d
 DIST mpir-2.7.2.tar.bz2 3771429 BLAKE2B c3431bcb84207fdb1bc0242fe56b7c2d45643e8c21c4b215162f824bed3a395972f734907f966bc14c58a28d30bb35f441b16b2762a9c8ef9c02d164f804bc82 SHA512 8436a0123201f9e30130ea340331c5a6445dddb58ce1f6c6a3a8303c310ac5b3c279c83b5c520a757cba82c2b14e92da44583e0eec287090cf69cbb29d516a9c
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
-EBUILD mpir-2.6.0-r2.ebuild 1720 BLAKE2B 911baede8c9c54591f6f4814adb7babe0c428e38378c519702dc5f4cef65f7feb78bc3c9d1bb22e6673b6cd0ad41821820cc63a5591afb851df43b6353e7d7af SHA512 a733040dd61f37495f3b8a7c9018ecf865b5a48fcb69794c77b6b74164489197ef959b1c8b9b708558fb93782419ca2482ff6dd3ed30313ea67ceb459f6dc193
+EBUILD mpir-2.6.0-r2.ebuild 1721 BLAKE2B 9bd499491217cae88ab3b4e5efc6b1e4a3ce56f10d61c37154e5294aed885c970a89b68b3c68e7708f18b99b734f28c84aeaac80bdd9edfc5338e1a03a7870f9 SHA512 15c31cce89e44948cfdffaab47ed22e51e46c8cc13ac8700c80d18642e0505b8b03d96102dbcc751f7a09c5b1ba87ec19132f3d0375d9e48072353c15af8b797
 EBUILD mpir-2.7.2.ebuild 1719 BLAKE2B e4c9c8a697fb658a76eecdc651c119729a9ec8ecf30d54f054e8f5c61e7a873824e3f566cc5afa2509b96c33eadebbd79bc94aa074e144b562d2fe61c841d6cb SHA512 0cabe5c4e5c1df7b8ecd54b4ba87caff0b934d1805fcbb32b68ba393ba5684fac4314ed277e39286697295f94e79900fc809586b96131d0d03c264873dfd0c07
 EBUILD mpir-3.0.0.ebuild 1844 BLAKE2B ebe1b4565c52d276b5f1ed0a557e47ddcd1b940d1b23cbbacc070959fabad9a234aac37e3d034dbd2220c8113ff3c59a2c92e76c4c89c7eac8f3dcc50066141f SHA512 55220384bcaad613cb99859af8424e7afb150c3b7a7b054e31e0013148c41b3c74b0543f20f5cd1aeeb9a424b1b5f87a2ff0dec95ae52c54d1570318d6093d8c
 MISC metadata.xml 792 BLAKE2B 9c0bea642d53a6afb0abeecefcc940c012b5cecf8c6e98fdf69eb718f63ea8e7c7f913fa1cd8360240b5f355e3742a5ccae00166690cf8a83226ad636342d279 SHA512 811f781a961982955ba036f719ec5cce3def93190fb786ef3c3a60f1b54f9b7638d8083cf0f273174002da7d358d25e8764de591d7b587b41198c48c52908fcc
diff --git a/sci-libs/mpir/mpir-2.6.0-r2.ebuild b/sci-libs/mpir/mpir-2.6.0-r2.ebuild
index ed8549c85602..a69839351337 100644
--- a/sci-libs/mpir/mpir-2.6.0-r2.ebuild
+++ b/sci-libs/mpir/mpir-2.6.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.lzma"
 
 LICENSE="LGPL-3"
 SLOT="0/11"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection static-libs"
 
 DEPEND="x86? ( dev-lang/yasm )
diff --git a/sci-libs/naga/Manifest b/sci-libs/naga/Manifest
deleted file mode 100644
index fc95d26b2115..000000000000
--- a/sci-libs/naga/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST naga-2.1.tar.bz2 22102 BLAKE2B 1c21e5f3fcb6e196d7fbb017ad226808a4a57cc5df81a889850f78b19a73b4e50149acd59f969012f8d644c07bb17d16063315fcaac5ea90b28f8e43d5e35628 SHA512 3f8ca39fa7688f75043989546c9ee17de885e8ba1919e218d6a720f1240155c6eaf4a4d79876c11af2b7d15b510881ba67d33bef4ea30c9c343fc7eeb07478ba
-EBUILD naga-2.1.ebuild 554 BLAKE2B c2720921bf8aa9d57b0b2f6f672f8e4b3d2f337223459e9637aa03f9f3acce8fef05f69e7aa01dfe3f311c6c8ec697d495fc8f97ec91f32ff706446c08c56fd6 SHA512 2397f6848bf22a1b3fdcefa6e5c845b347a8a46fcd0a5c2f33dd90f921bddd16bd62883f1df71a9fb5bbdc84b1f3b92aa9dfe581906e66dc48275e1e5c662a19
-MISC metadata.xml 256 BLAKE2B 9fa12c3aa798dc4119de860be13e2bc2a02caf065b5b3d365ffa39ab9ffc055f777a2cf9b494edc6b2eec46fd0f6e46e16862f762151cbd29ef50dda5ebf4463 SHA512 1a561b9d1b340b4a879f8b8cf1c88f5dde4817a1c87e89f4ddee52baebb337b7e7b136fc14766757b1f2b78cfe109d2824cf9b3554e6a92e89c0856a9cb6a20d
diff --git a/sci-libs/naga/metadata.xml b/sci-libs/naga/metadata.xml
deleted file mode 100644
index 74a29596f7bf..000000000000
--- a/sci-libs/naga/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<longdescription lang="en">
-	Simplified Java NIO asynchronous sockets
-	</longdescription>
-</pkgmetadata>
diff --git a/sci-libs/naga/naga-2.1.ebuild b/sci-libs/naga/naga-2.1.ebuild
deleted file mode 100644
index 00ec41e40a65..000000000000
--- a/sci-libs/naga/naga-2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit java-pkg-2 java-ant-2
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-MY_PV=${PV//./_}
-MY_PVR="${MY_PV}-r43"
-
-DESCRIPTION="Simplified Java NIO asynchronous sockets"
-HOMEPAGE="https://code.google.com/p/naga/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.5"
-
-src_compile() {
-	eant build
-}
-
-src_install() {
-	java-pkg_newjar _DIST/${PN}-${MY_PVR}.jar ${PN}.jar
-}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 5e088f938c9f..7438223c0fe0 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,16 +1,14 @@
 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.0.0.tar.gz 2405217 BLAKE2B 7d0be7753048ffb0b95a7aca8bf73346c4239112527bf0c4a37b22a25c66f97c7692445608cd7aff422edeec18e9eb90839d84cda117dda0bbdefbe274b3e5e3 SHA512 bc4d2f02d697aa01099f5e973a7ca70072f51210754e4d9331ae5bfdef886a41984ce27c1ff926da14fd199005bf9cad7162ab3ea8f3f421ac8b60bc8defd8f7
-DIST proj-6.2.0.tar.gz 2685319 BLAKE2B 8af166a9c98e07cde9e469fc8dbc5033f785181793b989211619fefa443f6449402d66bd42670ca17d81bf3a00d9d7d5c196e16a7975da2a5937ff5a81b771ee SHA512 4c2fd898103c8955a48557353c6866723d6e6b3769580d0b9cb63a685cf4e53ebe63b965498c2ba03eac4827a68fd0036a2234364a7d92dc28e5cdaecf90142d
 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-1.8.zip 6601640 BLAKE2B d439286c27b04767b4085f109a3bbbd555ac9e5acad2f673d5641fee433235b5a5410236ce32e42d3b11ce06d3199dec76c6e41aaa2b5dfd14a09b6b33928164 SHA512 991206f17348b3de484eb5364d773cd06577057228c2d1a0a1c1658308e2596ca13338a666fa71ddd76d538f23dd5bf21e178fd26a785717edd847a17e5c0cd1
 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 1276 BLAKE2B ab895282e8e50e906163c9be2541abf8420826aae4c9a5090224eb6b0edff8c64ae68dba2bfeb7ab58c4b733807f7f0c45b6bfd2bbd844819c66738984f92af8 SHA512 0a5fa49e0307e1ff228c38484d7b83f398c12b61b846585150a1fec5c933f82650b37677ddd6e87fffdc77381bc4d66cbd56a1b97be407301a5838bcfbbfa394
-EBUILD proj-5.2.0.ebuild 916 BLAKE2B c14d391decf32d2888cdcdb300087eac27e78e3d9843ec88d541e633ce91f4f66bdfbf1ac147e10befe11d9750c0aa60a3b0f6ca8c8b7ad58722f59b44e782a7 SHA512 bcacfa39b1b550c05bd5ba9a1da5984a2bcb1826cc82f859f39e1e566aa3747e5742c7f03cad0a2dd0c87e7623102147a3c037ec151dea062f7450d4ced77562
-EBUILD proj-6.0.0.ebuild 943 BLAKE2B ab7c16f6128d96f499063c030f4c938bc2d3aab88b0ef5cd3491b631e485862cb1603c5cd74be13882b498f6a62f4fcc51a85afa4c3d8c4effab6d7d092e8964 SHA512 374ae20f1ce4192d62be5b8519270c57fa172e4c4f30d9dbc0bf0cad02ccffaa2f0a527d33d7e9b197b910ce40457c77d72ab52c77d08bb03935cb1e83a16f16
-EBUILD proj-6.2.0.ebuild 1123 BLAKE2B 9994c8f1d89ab06ae4f68714ebd50fe6689d846b5654b1004c850801bc384d923fba5a4e4cf57f5c3d5160da77a24500438414c93f08729f3c45a51ed3b09643 SHA512 84869c368a4bb63aa43ea765c72bc8ad173a02b86950249bc7c766d5bcd6e2be057d6877d2ddcb89c9d836f1ee75e870a1aa8bd67b2282cfd2f2c4833769fc20
-EBUILD proj-6.2.1.ebuild 1123 BLAKE2B 9994c8f1d89ab06ae4f68714ebd50fe6689d846b5654b1004c850801bc384d923fba5a4e4cf57f5c3d5160da77a24500438414c93f08729f3c45a51ed3b09643 SHA512 84869c368a4bb63aa43ea765c72bc8ad173a02b86950249bc7c766d5bcd6e2be057d6877d2ddcb89c9d836f1ee75e870a1aa8bd67b2282cfd2f2c4833769fc20
+EBUILD proj-5.2.0.ebuild 913 BLAKE2B cbbcf9ef7fa4133e78f8870b17a15ed16a8cd5b9ddcf907e7544c207c57e403d99ab1b13fd21750173b795898ad5a82d5dd7b22afd9a55942af9783f9228c91c SHA512 1c538f9218c6e5436f7c119260f955cbba41a5769b74a1f2044b903ceb98da9f8443d77b119aa4c9339feabbba9ec5d5f9002063a661a2173fc30c77fd00cdc3
+EBUILD proj-6.2.1.ebuild 1122 BLAKE2B 417b73206d2366634b0b770266a3debbb97c3cf1db46c01df774134056bdef47b3877a1f10779b85e37100f96303449614f1b33662c21d4e8dbd8bfde50ab7ff SHA512 8bfa832202057ede229f6c1e48db2acab2c99647ac6b0e48c69fc9d0754c5c94301d4f885f0cb8b0f17b10d2dbb02c6a4392c33aba93a252a29666b2d079c3b9
+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-5.2.0.ebuild b/sci-libs/proj/proj-5.2.0.ebuild
index c8177afc247a..e3978cac85e0 100644
--- a/sci-libs/proj/proj-5.2.0.ebuild
+++ b/sci-libs/proj/proj-5.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=7
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/13"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="static-libs"
 
 src_unpack() {
diff --git a/sci-libs/proj/proj-6.0.0.ebuild b/sci-libs/proj/proj-6.0.0.ebuild
deleted file mode 100644
index 336599353605..000000000000
--- a/sci-libs/proj/proj-6.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils java-pkg-opt-2 flag-o-matic
-
-DESCRIPTION="Proj.4 cartographic projection software"
-HOMEPAGE="http://trac.osgeo.org/proj/"
-DATUMGRID=${PN}-datumgrid-1.8.zip
-SRC_URI="
-	http://download.osgeo.org/proj/${P}.tar.gz
-	http://download.osgeo.org/proj/${DATUMGRID}
-"
-
-LICENSE="MIT"
-SLOT="0/15"
-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
-	dev-db/sqlite:3
-	java? ( >=virtual/jdk-1.5 )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	unpack ${DATUMGRID}
-}
-
-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
-	prune_libtool_files
-}
diff --git a/sci-libs/proj/proj-6.2.1.ebuild b/sci-libs/proj/proj-6.2.1.ebuild
index 70e5a2e53a6b..2cef9831f0a1 100644
--- a/sci-libs/proj/proj-6.2.1.ebuild
+++ b/sci-libs/proj/proj-6.2.1.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
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="europe static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( !europe )"
diff --git a/sci-libs/proj/proj-6.2.0.ebuild b/sci-libs/proj/proj-6.3.0.ebuild
index 70e5a2e53a6b..f8a951b32218 100644
--- a/sci-libs/proj/proj-6.2.0.ebuild
+++ b/sci-libs/proj/proj-6.3.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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"
-EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.4.tar.gz"
+EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.5.tar.gz"
 
 DESCRIPTION="PROJ coordinate transformation software"
 HOMEPAGE="https://proj4.org/"
diff --git a/sci-libs/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index 7df9581968a5..f46cd43ccf9d 100644
--- a/sci-libs/qrupdate/Manifest
+++ b/sci-libs/qrupdate/Manifest
@@ -1,5 +1,5 @@
 AUX qrupdate-1.1.1-Makefiles.patch 2350 BLAKE2B 9d1e21e0118f1fd47699c94e242fb53df5e6fa26b85a56bd13718ce409ade64e618a858fab780a2c927f4ef988273a883872d5ecca57b62b90b16f132dce5bae SHA512 40945650175668ab5155c330a5e6be20059e90d8bb5f47173d14b385710703693b1c5fb77bc01f08328e064301e2fc0c90438a9fac7f6f1222e6b35835137682
 AUX qrupdate-1.1.2-install.patch 1263 BLAKE2B e9d18cda34264374e9456a2c3ed5f849bafe8ef461e1577e1cda4b04695f2c8ef03d0ef47d2d9ba6a56db7251b8a37cafc061a47b751e7947a94f1479df2a2d0 SHA512 3274d57666b2f453f50f0b5244c9f3dd5ea29a2fc05233dedfd43940945744a675d3bbd50e3a1aef7ec8613df16f97c05e0983c711db63364f8b45125e246bb8
 DIST qrupdate-1.1.2.tar.gz 49734 BLAKE2B e5bf9fb39f6c97ee4b4084e664f929d95bee407f9f11ea4dc6da2bdb06d1694eddc1f2f52e5f673f22d097d11addb293b6dc0fd7c30d09acc84dd050fd1d72e9 SHA512 cc4e466ea91958e15c66be82b0c4c8ad813fbe4643f21259a9cb3ca8e0a411dd764bb2397ece848a7045f322d30316801d1540c4ebf7912030bef6995b44917c
-EBUILD qrupdate-1.1.2-r1.ebuild 1273 BLAKE2B 35f00f731d9b62d7bedac14b4b47641113f1624ef0d3d6fbc66ead432bcde1caf4a0795e4efb73683bbdd9dd2e94ed901d3311cf6dff7bac8db01161fcf3950c SHA512 97f49731f882368a770562a45bf327c0462a49136e41bb687c769cc3bc4fe424ebe8021c0267885c3c2d848c6db15c575ac9e96f02e24076cb558f660c49626d
+EBUILD qrupdate-1.1.2-r1.ebuild 1274 BLAKE2B 4d4cfbf65bb65d7bcf70bedcd29bead51ef2d8508e4ed314cfa31b5a543a9bc88acfad30fb4b219a4a03ea645b04afe417a4dedd88b9e4e960daf1f9c1f8c462 SHA512 3324feab7b4b5ab83cba132af95f586be16b9aab825bfbdf95b06d578148d61abfca66e981b2529c70b3d557890ea5256f3b3f555b10e15d09fb619cc2f93831
 MISC metadata.xml 457 BLAKE2B 234b8a14cde520b326328c140261519ec2ad58d8a593453437abe0b3b4424a26870fe212f84bda1b7686ec9113c503897cae1d02c4287ab60092f0b73cd36f05 SHA512 2cea745f8f4abc0e97c88e2d2bbf3da6ec6959d8853450e736f8985e261c77b9d3086e4633855792db2477c0dd655d3a0e939c918cceb875e36fad7187182770
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
index 6d8105729ed2..5aef52df4acc 100644
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos"
 IUSE="static-libs"
 
 RDEPEND="virtual/lapack"
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 56c194666de8..f2d601d48fa2 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -4,6 +4,6 @@ DIST scikit-learn-0.19.0.tar.gz 9341628 BLAKE2B c9e0c12558e81efb6f5cfddead028980
 DIST scikit-learn-0.20.2.tar.gz 10275187 BLAKE2B 6865fd101f99930e014f4a2a89616e1ee917df27a5a1b0a931d47503d7df509fe6490799e876a5d68b1cb76a35c6f85e4acbb31a28adfc528720fe9a69e108a7 SHA512 5e0bdea3c40e38880683c6a49cdf2f4c0d40c1f5436c1d8209d613440d5d9d13b9a608e73943a890ef3effaddd930b5c171c45d29700afb8629285ba4aad414f
 DIST scikit-learn-0.20.4.tar.gz 11684276 BLAKE2B 791fd5c7e3ebfdb9bf01524be46b19341b5750fdc5352de9e50cc395a34cf91551825352f18f235b658b55b38829981884fca9f0535a1c505adeb18ac5d87ceb SHA512 a94c254440641a987df1eaec63302639b8e6f56705ec426c350070658141dd574b502eb1e4b94ae9c766c1becfd911f08bb97d5c87d39b0546d8444ed281b06a
 EBUILD scikits_learn-0.19.0-r1.ebuild 2836 BLAKE2B 06bc03dbe61c8afbf4c83f006d23bd4255979fa7a1091aceb9a78b051dee64f721215122196e66dc93b4a47fdac0337e2a75544693104825ea38879837fbbb30 SHA512 3c87b6a8cc2fd1af8614b809f5ff533d2db2f1d1240162a697aaa392b9143d6ac1e5680d423c104fd71051c70bc3fd4caa874b80a4c866341a6bd70bad575454
-EBUILD scikits_learn-0.20.2.ebuild 2860 BLAKE2B cf81ad4bcb8f98a498a8779cf8584be520a6626350dbee8b240709765611750cecdc8d4fb7801a597723c039a4e72bdecaaab8cab1c1d3aad287e0cfeea0578f SHA512 314c0e025cd30a62f8e47a4608a635c21a3ee0628f4cb288c78520099ce59814663e98aa102aba95ba84d7c27e9d7bf7a9cc00f7a9b780f0209ecce5bae66442
-EBUILD scikits_learn-0.20.4.ebuild 2860 BLAKE2B cf81ad4bcb8f98a498a8779cf8584be520a6626350dbee8b240709765611750cecdc8d4fb7801a597723c039a4e72bdecaaab8cab1c1d3aad287e0cfeea0578f SHA512 314c0e025cd30a62f8e47a4608a635c21a3ee0628f4cb288c78520099ce59814663e98aa102aba95ba84d7c27e9d7bf7a9cc00f7a9b780f0209ecce5bae66442
+EBUILD scikits_learn-0.20.2.ebuild 2888 BLAKE2B 91ecea16f8ca17dcd04519b510c61deb9e78d14362ea3e4f4902bce7a7189577ccb96dc92b530b547389a7c65b957ffa705ca25b680c777453fa1c29c876eefd SHA512 3deb10f3314abb6e82a4e118362724147f09b2104db90cdb7bfe98d804828136a590f0aec53ec873a3c8d718009ff946c660e9efd750d3d550be91c0847e03fc
+EBUILD scikits_learn-0.20.4.ebuild 2888 BLAKE2B 91ecea16f8ca17dcd04519b510c61deb9e78d14362ea3e4f4902bce7a7189577ccb96dc92b530b547389a7c65b957ffa705ca25b680c777453fa1c29c876eefd SHA512 3deb10f3314abb6e82a4e118362724147f09b2104db90cdb7bfe98d804828136a590f0aec53ec873a3c8d718009ff946c660e9efd750d3d550be91c0847e03fc
 MISC metadata.xml 605 BLAKE2B 46a657647a79f0a23cc07b39877b1e57158cdf94d9478c3aa4e7af0dbdbf60acf996d1431076697db764d42bec0d5e0517c1247e91dc36e85823a45784d00e71 SHA512 e14b6835108fa80eca44bab635c9a229da65f048ffcee16cd4ad7736c3a0fb364c94ff0bd9630030653bd3cd78d8dced191c43c7e5aacb3a7f6e61ac45b5bb3d
diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
index 901e9afe5ff3..fc65c21b1d47 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
@@ -19,6 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples test"
 
+RESTRICT="!test? ( test )"
+
 # tried to unbundle virtual/python-funcsigs, funcsigs, odict
 # but it is a large mess to maintain
 
diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
index 901e9afe5ff3..fc65c21b1d47 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
@@ -19,6 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples test"
 
+RESTRICT="!test? ( test )"
+
 # tried to unbundle virtual/python-funcsigs, funcsigs, odict
 # but it is a large mess to maintain
 
diff --git a/sci-libs/scipy-python2/Manifest b/sci-libs/scipy-python2/Manifest
new file mode 100644
index 000000000000..abf28d3aafa4
--- /dev/null
+++ b/sci-libs/scipy-python2/Manifest
@@ -0,0 +1,3 @@
+DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404 SHA512 72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
+EBUILD scipy-python2-1.1.0.ebuild 3628 BLAKE2B c4fc9703dd9ca163fe298bb3d1d37c72ed7a0bd0b559029cbe988b91b2f705df438d5a8f3fc2e7a78975c93d8cdefc35cf05abfead68177a391e8ff2f0e16ea4 SHA512 dcacd321b5828901290078a4e41618d19d21a6253ee0d8db6c73c247477f31343b8a3c86e9f2098f04abc70f2bc27772b2e41d09722d2d5631cc7f9595d40395
+MISC metadata.xml 945 BLAKE2B 52bc24aea94ec233940c12969222f7ad3c8b9760b08a608bf6dc6d320b4a519a27103c2f11d720490c933f90a31fe3fb503694bd067136975617c50efa3c5d47 SHA512 7ab95c274799a7852968c63ca6f05c302d4e478d9e195980859b960ec2f2b1146c1c12674d737f324101383155387429ec1c05f779888819503feebf1e38e6c4
diff --git a/sci-libs/scipy-python2/metadata.xml b/sci-libs/scipy-python2/metadata.xml
new file mode 100644
index 000000000000..2425e896a8a0
--- /dev/null
+++ b/sci-libs/scipy-python2/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    SciPy is an open source library of scientific tools for Python. SciPy
+    supplements the popular numpy module, gathering a variety of high level
+    science and engineering modules together as a single package.
+    SciPy includes modules for graphics and plotting, optimization,
+    integration, special functions, signal and image processing, genetic
+    algorithms, ODE solvers, and others.
+  </longdescription>
+  <use>
+    <flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">scipy</remote-id>
+    <remote-id type="sourceforge">scipy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/scipy-python2/scipy-python2-1.1.0.ebuild b/sci-libs/scipy-python2/scipy-python2-1.1.0.ebuild
new file mode 100644
index 000000000000..23d6871c6c37
--- /dev/null
+++ b/sci-libs/scipy-python2/scipy-python2-1.1.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+MY_PN=${PN/-python2}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Scientific algorithms library for Python (py2 version)"
+HOMEPAGE="https://www.scipy.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="sparse test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+CDEPEND="
+	|| (
+		>=dev-python/numpy-python2-1.10[lapack,${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+	)
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+	dev-lang/swig
+	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${CDEPEND}
+	!<sci-libs/scipy-1.4
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF || die
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile \
+		${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
+	"${PYTHON}" -c \
+		'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \
+		|| die
+	"${EPYTHON}" -c \
+		"import scipy, sys; r = scipy.test('fast', verbose=2); sys.exit(r)" \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 33f5523b505e..0b287d8f6cdf 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -5,6 +5,6 @@ DIST scipy-1.4.1-html.zip 61414053 BLAKE2B e1f0c1a7a8941958512dcc3c0f40ef4a590ba
 DIST scipy-1.4.1-ref.pdf 41100747 BLAKE2B 8e56af69d0bffbe6eff73bfc5bb674aed3b80bdd80d59b58a1835f996c992306a059c2992d74c411e762490c526262753d33273613ed389928845c65eb6546b2 SHA512 76946f3b506fe22a595b70e5a418982257dd59db1a2e9af508cc1cab59d47ba4fc5951388e676f2a513043a6b3391ef853242e78d7feb99a6c21d19f6dca2b58
 DIST scipy-1.4.1.tar.gz 24555206 BLAKE2B e35f6234404839cbd24d463c8cc2f1ea66aed91534e700fd54a623df40d069b14fc220f96af04c78d13b773bfc5461559e59b0bd9b836d7953f9249ccd7cae54 SHA512 79407a2cbb4ba29c0941570181df4d7835e5791e50a3abef9b63c2fc5b15308a2e4964eb71cdebbee8cd2dcb8e497cf92fe50ee21fb12cac3013ea5e0466b25d
 EBUILD scipy-1.1.0.ebuild 3988 BLAKE2B eb0714420ffe87dcd9d8704316be2feb69e24c4f8c76ada3c6d4c87c7d8617d887f18b030e9dd907ce1b5eb4684932f72a987c2449a9dbcc45270e462e1b8b87 SHA512 85823a954133330fc038e7a9b936b1454d3a2e368d709041f0f9195b9bb839a2e3aeef2f0d2a942b09df265d04cc5d4b474377e57ca4281317340272bfffce16
-EBUILD scipy-1.4.1.ebuild 4043 BLAKE2B 6ad63969c2bffb25b3023d4930b9f056e2b8f0a618f6ab9c990ef6ea8dd83db9f9259bea3f7343baf405f6ff7eaa14fd3a281142d9532d7166a0d3713db71fa6 SHA512 77ecc618cee33a99d1ae3cba3b5e854778acb2ea8c7c6545b660b5d141d49bfbee6b7a9324a684b50fad0c3cf239b9a3b70ca243fe06b782b19521dabbb97873
+EBUILD scipy-1.4.1.ebuild 4065 BLAKE2B 094ef61648731f225c5b27695d527ede440ee6d7fa43b939811c27bbae6ea7aabc65e7bcb5c0d0fdcc169b59e131bc83ffa3704d913870048dcb6ba263ba7fe9 SHA512 b6f67054ff0669ac4a7863e00d2a0357e34aae29a0ae9b31c8d5c7502458ba69769cc6a7a3f43a67f743d8e0e891caf4fe453f829f0aabee523432257129f2f7
 EBUILD scipy-9999.ebuild 3601 BLAKE2B 3a86b12c2989b9e64ff97119fbb6cea242179287362010f7d3e82ad0298c207a6318217f81626d18549252383a04cc107861b0283420eae2c1ce990fb7252f18 SHA512 3128f47231149e78818440f2ade24d4ca5c51f8e4a89c93e3e4da2fb2303e60a50f2f65b3c5bc32b42ebd0bd25c77cbb7017f2750367eaf7a21ffd3adcef947a
 MISC metadata.xml 931 BLAKE2B 3e358fcc4354b870a4794f13ed6c840f2c55ffdf4d6306977e6db3606b73e7df9b682a18973f0aa2a1d0d9eabb2d7d40c6aa5c6026813385361700bdc227afd8 SHA512 ae95726c4c661a2e5708a98b347f8ea25708574bbaf8ec86f315069551d6a0d68a43279b214be8b54cd20e5aacea1a9abd40a2de43d51f292a830cab0955d625
diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild b/sci-libs/scipy/scipy-1.4.1.ebuild
index a9e7e584875f..b176683c8870 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -108,6 +108,8 @@ python_prepare_all() {
 
 python_compile() {
 	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
 		${SCIPY_FCONFIG}
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index 2425df06d5cd..6983fc2162c0 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -3,5 +3,5 @@ DIST shapelib-1.4.1.tar.gz 549831 BLAKE2B e579704bd71c2525133f87628261e78f39e806
 DIST shapelib-1.5.0.tar.gz 547686 BLAKE2B 3f962ee701d8cfb86a56aa1c0b2156bc2288a2bc908bb1a8303e491812845241f5281b0b8650befcc53e9dfc408b652a56f5e2fdc5ac7c2ff6eb99170696e437 SHA512 6dbd5fc7929ca403e65017ef58211f351608d9ad08221bf68bde047ceecfd27013ce731f9ae4edcfd040bc3db7fe9054b5d96e46128d2968788bef19532b1721
 EBUILD shapelib-1.4.0-r1.ebuild 734 BLAKE2B 01ef8f8b68ef976f4dc0fe32e948af09cb2c0fe8696566aaf21707d13f2ed1d9a726c67f124b8efb6ead679737c7a5e5d08fa06a1765ab15269bf4e9416cd700 SHA512 9855cd8eae880e70691c10cf7fc253dae7720118930a3ff3a8884e6f89ce55a35ac58b023de0883d321cd130f392d11359e5f82beb680c497e83bc239777d2b3
 EBUILD shapelib-1.4.1.ebuild 739 BLAKE2B 54d057ca4143ffa67a6911a9ff755b9cb716b6e01ad93f34e04500da4f7d314f2c96f2f0a457248d3f38c5bdb668511c0c2511156f4275bde13ca0a3da7a3bf4 SHA512 b7692107c187098ec350e8591aa744681819dd603145f491ce3a11d1060a792d23a72e05f69a4d5b040c06514a8354d158137e18c95bd0e56d7cc89dfc92ef86
-EBUILD shapelib-1.5.0.ebuild 735 BLAKE2B a24b33d02c69daca5d1ce14d42e8bf711b2fe42c87cc0ac7a5d572fdb974734f2bf26e178ee65e3a3f0b941e36f81f2d3ba59b17317169ab4b14338e84e4a641 SHA512 4323da01b30b2d32c6d11d34641414280f952fbb0cb3a5d20a1748856d33e8b70b214d533a81c60110c78024854514b8126c889475a7f16a17b69170234af591
+EBUILD shapelib-1.5.0.ebuild 731 BLAKE2B 11eddcc77943b51e50691d4a11f62131cf6bed0907c83a09ff4268d51b2bba4f0ebbbf481511c24ed32d543370cb516b96b756023aca9500f947514276b23324 SHA512 d44767c4ab7c745d4cce9e4f5a48518d412ed422e57c28d2efe82a4c79131059af5f6c44bb47516c6f6590771b457d0ca92d16527b72a4080f13a5b090640048
 MISC metadata.xml 405 BLAKE2B ed97fadfd57934dab768c271f100531eb2f5c9e98564b54d73c2396d0959c62b39ee7ce5ad96495f1133cf8c3de8ad2ffcb0d13353c1a32c9be92ad81bd80995 SHA512 9581a1f8123cdcc6b68de0fdc03dfa866c64668222f1d90b55160cdaf8d36e1441f0530fced6b149681fef88321bf33879996199685eb6e26cefae975b704adb
diff --git a/sci-libs/shapelib/shapelib-1.5.0.ebuild b/sci-libs/shapelib/shapelib-1.5.0.ebuild
index b99f7abd8cd3..1d5eefa7869f 100644
--- a/sci-libs/shapelib/shapelib-1.5.0.ebuild
+++ b/sci-libs/shapelib/shapelib-1.5.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=7
@@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 src_prepare() {
diff --git a/sci-libs/spooles/Manifest b/sci-libs/spooles/Manifest
deleted file mode 100644
index 7475647eb6a2..000000000000
--- a/sci-libs/spooles/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX Make.inc.in 139 BLAKE2B 960e1107c3903f7b8e929e8057ce6128cc82b3489d9bf09e3eb32f81d4e1b2fa99f03b8b3bc97ce301fba07e663c64471e5ab19fd821d9b45072ea7f542ecfbc SHA512 919c60ca856e4b46b6211f4ace815b5066609e054152b696733d5120d7769a17c6db92c451772b83b0bea5a3e9a14034009755ffbef0889fefd76bca8f466611
-AUX spooles-2.2-I2Ohash-64bit.patch 1035 BLAKE2B 94a1bddf2a86cffdaf3f4f48352232d73077ff303c86de06b029329e10f71cb806e000ead5bf047016aaa676e29ee87f0dbdee5e0a5cecc9e0da616660f42c22 SHA512 825b1a060102799e17ebcfda5025bfbe53555eab3ed32d8c8ba3bfd2f114b9d622763dec78ba311307cab12a93cc6dac363a9237d819830f5ea4c1a6cce7d1f9
-AUX spooles-2.2-formats.patch 654 BLAKE2B 72b3e0ff01f9f11a094dbbd8da11da2158dd6077d430382163265f9fae337d2687fdbc544effdc59003ec97a70cf42b41665048c9c23ccce3cd99a9cca7be13e SHA512 fc4f4dbd4e457f6e162fef5a0d90a153b677205dc9c6c075b47fddc0d8d9c77cda1573d1f9966d5b127084869c797c666fd1e0b579964774020665d988015b86
-AUX spooles-2.2-makefiles.patch 1144 BLAKE2B 180e0e7707fe30cc07939a4fceaf3253d993fe5450b4b11a00092b3c8cc8d1c7b44cb564b72fbd516dbd84474d1684c0b6aae2685422e36bf2f01fe2e4870511 SHA512 29429923b2d5cb5475a2741327a921ff5311f8bc562b357428befa6f7b26660b7ebc2df45bafc2a5f80131a3fe37afba3fe36deb57bdf445a99178bc17faf53a
-DIST spooles.2.2.tgz 4510271 BLAKE2B 86adc0764709f772526909942bcbe034209838c7284e7c1245293e4acb84e9a02511428f0659607de3b39ffecdc02c6b60e4015a8c8905da34b2b15688edab34 SHA512 440146b4abf81d8e66a7c57e839b06b11c7753e16d40ae67f80255d6d5dc9fb43b4fd549326c405a8f3009223fcb0f6997090b3649029c323c732b0759944d19
-EBUILD spooles-2.2.ebuild 1821 BLAKE2B 428c0c25005bbab17db7d619581df8730d04c4c700786d369db820cad150f84fff4da842a488fd0d863ac938b8a94ecf37eef82d61cc42bd1de99a0517da4194 SHA512 ef21fe915946fad6ffd84d048763426b38eb08171184de4f41ff0ed1e6b47bd7536f1cdcd6b64d11dc5bf5e0347e98e9ac1b788768fc6d62dab5d30f8e6631f9
-MISC metadata.xml 1045 BLAKE2B 22258d13dd2f40047b53fdde5301b46fe4e5667cc73a68d105dc7bf5fe5d814a662d594db5c21eb9b91ac688dd1aaa8fc4e89b176c56d735ccbc61c9f60f2801 SHA512 3b514aacc689a00ab5aa10e370d955bcaafa5ba0ee91b3d0c87af8d1e16929bf7d68dfa6fd50a0c35a44355ac6d601bc4b34e84af20313ca65bc13a984ccf08f
diff --git a/sci-libs/spooles/files/Make.inc.in b/sci-libs/spooles/files/Make.inc.in
deleted file mode 100644
index 1557f9fe979e..000000000000
--- a/sci-libs/spooles/files/Make.inc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-.POSIX:
-THREAD_LIBS = -lpthread
-CC = @CC@
-AR = @AR@
-RANLIB = @RANLIB@
-ARFLAGS = rv
-.c.a :
-	$(CC) $(CFLAGS) -c $<
-	$(AR) $(ARFLAGS) $@ $*.o
diff --git a/sci-libs/spooles/files/spooles-2.2-I2Ohash-64bit.patch b/sci-libs/spooles/files/spooles-2.2-I2Ohash-64bit.patch
deleted file mode 100644
index 0f608da2afc8..000000000000
--- a/sci-libs/spooles/files/spooles-2.2-I2Ohash-64bit.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- spooles-2.2/I2Ohash/src/util.c~	1998-05-30 18:45:12.000000000 -0400
-+++ spooles-2.2/I2Ohash/src/util.c	2008-06-28 20:56:49.000000000 -0400
-@@ -39,9 +39,10 @@
- */
- loc1 = (key1 + 1) % hashtable->nlist ;
- loc2 = (key2 + 1) % hashtable->nlist ;
--loc  = (loc1*loc2) % hashtable->nlist ;
-+long int loc3  = (long int)loc1*(long int)loc2 % hashtable->nlist ;
-+loc =(int) loc3;
- #if MYDEBUG > 0
--fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;
-+fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ;
- fflush(stdout) ;
- #endif
- /*
-@@ -158,9 +159,10 @@
- #endif
- loc1 = (key1 + 1) % hashtable->nlist ;
- loc2 = (key2 + 1) % hashtable->nlist ;
--loc  = (loc1*loc2) % hashtable->nlist ;
-+long int loc3  = (long int)loc1*(long int)loc2 % hashtable->nlist ;
-+loc =(int) loc3;
- #if MYDEBUG > 0
--fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;
-+fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ;
- fflush(stdout) ;
- #endif
- /*
diff --git a/sci-libs/spooles/files/spooles-2.2-formats.patch b/sci-libs/spooles/files/spooles-2.2-formats.patch
deleted file mode 100644
index 080574e730d0..000000000000
--- a/sci-libs/spooles/files/spooles-2.2-formats.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- SolveMap/src/setup.c.orig	2011-03-05 18:08:51.000000000 +0000
-+++ SolveMap/src/setup.c	2011-03-05 18:16:50.000000000 +0000
-@@ -28,12 +28,12 @@
-    ---------------
- */
- if ( solvemap == NULL ) {
--   fprintf(stderr, "\n fatal error in SolveMap_forwardSetup(%p,%d)"
-+   fprintf(stderr, "\n fatal error in SolveMap_forwardSetup"
-            "\n solvemap is NULL\n") ;
-    exit(-1) ;
- }
- if ( myid < 0 || myid >= solvemap->nproc ) {
--   fprintf(stderr, "\n fatal error in SolveMap_forwardSetup(%p,%d)"
-+   fprintf(stderr, "\n fatal error in SolveMap_forwardSetup"
-            "\n myid %d, solvemap->nproc %d\n", myid, solvemap->nproc) ;
-    exit(-1) ;
- }
diff --git a/sci-libs/spooles/files/spooles-2.2-makefiles.patch b/sci-libs/spooles/files/spooles-2.2-makefiles.patch
deleted file mode 100644
index 4af8e083736c..000000000000
--- a/sci-libs/spooles/files/spooles-2.2-makefiles.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- MPI/makefile~	1998-12-17 15:47:44.000000000 +0000
-+++ MPI/makefile	2008-02-26 00:10:57.000000000 +0000
-@@ -2,7 +2,7 @@
- 	cd drivers ; make drivers
- 
- lib :
--	cd src ; make spoolesMPI.a
-+	cd src ; make makeLib
- 
- clean :
- 	cd src ; make clean
---- MPI/src/makefile~	1998-12-16 21:54:41.000000000 +0000
-+++ MPI/src/makefile	2008-02-26 00:08:16.000000000 +0000
-@@ -42,3 +42,8 @@
- 
- clean :
- 	- rm -f *.a *.o
-+
-+makeLib :
-+	perl ../../makeLib > makeG
-+	make -f makeG
-+	rm -f makeG
---- MT/makefile~	1998-12-17 15:47:48.000000000 +0000
-+++ MT/makefile	2008-02-26 00:12:43.000000000 +0000
-@@ -2,7 +2,7 @@
- 	cd drivers ; make drivers
- 
- lib :
--	cd src ; make spoolesMT.a
-+	cd src ; make makeLib
- 
- clean :
- 	cd src ; make clean
---- makeLib~	2011-03-05 16:44:12.000000000 +0000
-+++ makeLib	2011-03-05 17:46:58.000000000 +0000
-@@ -70,8 +70,8 @@
- .c.o :
- 	$(PURIFY) $(CC) -c $(CFLAGS) $*.c -o $(OBJ)_$*.o
- 
--../../spooles.a : ${OBJ_FILES}
--	$(AR) $(ARFLAGS) ../../spooles.a $(OBJ)_*.o
-+../../libspooles.a : ${OBJ_FILES}
-+	$(AR) $(ARFLAGS) ../../libspooles.a $(OBJ)_*.o
- 	rm -f $(OBJ)_*.o
--	$(RANLIB) ../../spooles.a
-+	$(RANLIB) ../../libspooles.a
- EOF
diff --git a/sci-libs/spooles/metadata.xml b/sci-libs/spooles/metadata.xml
deleted file mode 100644
index 4f2c1ace32a3..000000000000
--- a/sci-libs/spooles/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		SPOOLES is a library for solving sparse real and complex linear
-		systems of equations, written in the C language using object
-		oriented design. At present, there is the following functionality:
-		1. Compute multiple minimum degree, generalized nested dissection
-		and multisection orderings of matrices with symmetric structure.
-		2. Factor and solve square linear systems of equations with
-		symmetric structure, with or without pivoting for stability.
-		3. Factor and solve overdetermined full rank systems of equations
-		using a multifrontal QR factorization.
-		4. Solve square linear systems using a variety of Krylov iterative
-		methods. The preconditioner is a drop tolerance factorization,
-		with or without pivoting for stability.
-	</longdescription>
-</pkgmetadata>
diff --git a/sci-libs/spooles/spooles-2.2.ebuild b/sci-libs/spooles/spooles-2.2.ebuild
deleted file mode 100644
index cd1a944ec56b..000000000000
--- a/sci-libs/spooles/spooles-2.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs versionator flag-o-matic
-
-MYP=${PN}.${PV}
-
-DESCRIPTION="SParse Object Oriented Linear Equations Solver"
-HOMEPAGE="http://www.netlib.org/linalg/spooles"
-SRC_URI="http://www.netlib.org/linalg/${PN}/${MYP}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="mpi static-libs threads"
-
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-make_shared_lib() {
-	local soname=$(basename "${1%.a}").so.$(get_major_version)
-	einfo "Making ${soname}"
-	${2:-$(tc-getCC)} ${LDFLAGS}  \
-		-shared -Wl,-soname="${soname}" \
-		-Wl,--whole-archive "${1}" -Wl,--no-whole-archive \
-		-o $(dirname "${1}")/"${soname}" || return 1
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-I2Ohash-64bit.patch
-	epatch "${FILESDIR}"/${P}-makefiles.patch
-	epatch "${FILESDIR}"/${P}-formats.patch
-	find . -name makefile -exec \
-		sed -i -e 's:make:$(MAKE):g' '{}' \;
-	sed -e "s/@CC@/$(tc-getCC)/" \
-		-e "s/@AR@/$(tc-getAR)/" \
-		-e "s/@RANLIB@/$(tc-getRANLIB)/" \
-		"${FILESDIR}"/Make.inc.in > Make.inc || die
-}
-
-src_compile () {
-	append-flags -fPIC
-	emake lib
-	use threads && emake -C MT lib
-	use mpi && emake -C MPI CC=mpicc lib
-	make_shared_lib libspooles.a $(use mpi && echo mpicc) || die "shared lib failed"
-	if use static-libs; then
-		filter-flags -fPIC
-		emake clean
-		emake lib
-		use threads && emake -C MT lib
-		use mpi && emake -C MPI CC=mpicc lib
-	fi
-}
-
-src_install () {
-	dolib.so libspooles.so.2
-	dosym libspooles.so.2 /usr/$(get_libdir)/libspooles.so
-	use static-libs && dolib.a libspooles.a
-	find . -name '*.h' -print0 | \
-		xargs -0 -n1 --replace=headerfile install -D headerfile tmp/headerfile
-	insinto /usr/include/${PN}
-	doins -r tmp/*
-}
diff --git a/sci-libs/suitesparseconfig/Manifest b/sci-libs/suitesparseconfig/Manifest
index 062cbf7e937e..184168b0e011 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 701 BLAKE2B 53ab6fd2040c48e77d1f43c3a0e7dbb46d7e406340672fb6297d0a2888360e846c96771f2d1361cb7b3f65be20a19f648952b3acb0d36f3fcfd88b2bcc24a053 SHA512 d2955ab819584851f31687f1fd394753133544ada083e4d0665e1d83253c31f54812b0d6a0fc11c9dcdbfdb412092cdb5f146aed4220b48001474e6386ec4e57
+EBUILD suitesparseconfig-4.2.1-r1.ebuild 702 BLAKE2B 5f79d462654555d35e3abcd01cdc9d17a7961a9460199e77ef2270d911c22dacda93129082a34b72fc0b04278d53d7af7235a77bfc9d3718e95e482124b5ddce SHA512 c0234847c90c68fca8d199033827bc711e133fd308f2bb3f26ffe5e11365f3faac04f408901a29386b212e96646f0d8d893fce3ff4f53f0e4b436ebf8c4121a4
 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 17171f4442b7..289f955ba479 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
@@ -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-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 58e61c170739..0757146497bd 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,3 +1,3 @@
 DIST szip-2.1.tar.gz 383219 BLAKE2B 84e10763bcec885a423d64c2c3cff0632d7a6a39c8cd177cf607f549cb4cd02a4ca03362464c2c4ec4539c80149493329427f529f5d6daea4a35b91af6fa1538 SHA512 bb7e0af6dfaaaaa85013ef52e6901d5b7b6159795338d285c2e843bd2879230a6397fb072662fdfeda5690981db4e9af94782c057bf993f92516d92a8934cb75
-EBUILD szip-2.1-r2.ebuild 714 BLAKE2B ab388d809233c5aa716c0fc4d7d811e82dd302065a3ae10e200e45919cd043ce388006117d52d4ea018756b7cdbeaead5b0a1693ecaad032c0499d2b1bfddbe6 SHA512 f31fdc910988f58fcc9c7dc40b9eed8d8dd84b5ff6a5e2ce72155f60d2de1428a462166bd780da20ce6adb0bcce0d9bf53b3608126ab9a68848c5475c717b332
+EBUILD szip-2.1-r2.ebuild 715 BLAKE2B 9a2ec44031ff6a5263e4d885cff782a9527ee8d6d51748a511a8a055d5c792c9d64e87bbd863a0e574b940ce49dd122cfda083c332037a04ddc3e3d290388f4a SHA512 575e0f75f7e91673177e0800e10de49a5bba5f9139d1e04e2eece1e6a0f069294845c6283105c452e3df0d39fd4dc901811a94e199544af12dec04ce61d5822d
 MISC metadata.xml 765 BLAKE2B a720dfb9f71c9f9adc5e539b2a791b8edcd2fce2b1540b17066c09e1d3895d40e147ddd2ef86499c6a9db3c2c68c3bb9aae3357f13d86370d7fba8069f968368 SHA512 c56edc42adeff2e523e9a312b0393f45647b2a902334221d2b9842afa1ecd885a17f108041cad69a0797bdc1eb58c75672226a0c3a2f4c8f561ab8a70eb28b27
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
index c171043d47ad..42b664d10ac6 100644
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ b/sci-libs/szip/szip-2.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
 
 LICENSE="szip"
 SLOT="0/2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="!sci-libs/libaec[szip]"
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 18144a86e375..1148129c7740 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -1,8 +1,6 @@
 AUX tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch 1188 BLAKE2B dcebed9a89be6ff70f073c432e5e02ab80c0fc9e69cea2b1255a5620d456eec39f717fef3dec062a7dee5d33ce2eb45712d578de9f5ecb00360bb26004cc949c SHA512 d47a98015c424fd61adea6c8f5ed5115ca35c807636530e737963f002f02380d80d30e0f0cf3c6cf3e00914157fce62739da60ae30a4fb533321822a4fa45b2d
 AUX tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch 2370 BLAKE2B 87c60e70e929ade64cae24ae6f6d2d9168b0f5b93093206755fb66033b198e7226b7157a6aa15cb051cd9cd42bec8743ec7b96334ea3b9184445afff5e61c257 SHA512 2469fc0f9c9365c2e1191c68b61ba9ed54f0d240e34bb431ba6efadb9a4a63ae5b579e22b693df41fbbee55e4119bf8dcbdcdec6d7be81e36d1b48da8ff88c7b
 AUX tensorflow-2.1.0-cuda_10.2_support_bin2c.patch 518 BLAKE2B 945a7e2a4b0379c05a274bbc2582fabf37b3447282d14dc28725b8d3b4e8d0a17bada117775e22697f9c2ba5549223a89c4849c49cf007e10ab9da3933255051 SHA512 01f4e5a02b2c68bc39b5be251257a2a484aa66aabaeca33a3e4ab9d434928cb63fb3846fa8870c565a40706acc686d3522e953ae3cc9fbd41d49d27c27838d8d
-AUX tensorflow-2.1.0-external_libs.patch 1024 BLAKE2B ab7bbe1f041f25f3d7cf29140d19e07d3c5af83d556895f01cf022c0191dd4fe7ae0e181f01cb94dbf69bb7e6e4a4dfb3765ce7c62d54746189a5e01b7dba460 SHA512 81118b3478925cb163ed3b1b5395247c0528b349a6f0d78535f09ce693e64bb776ddf94a33b4d959bed9c91a030bcf9084bd5b07d2aa4a72b8d4bacc72d93cfb
-AUX tensorflow-2.1.0-python3.8-pywrap_tensor.patch 666 BLAKE2B 7d261c297e800872030bbaf279b50ba854464c1d90babd10a1baadd2a19a33192bcb77718abe4fdd11829ea657f0e061ca0b2d19ac0bbbb68fe1d7274eb39bff SHA512 4e5ac3b6cb4be5de2a21f5cd1dfb84c04ceb1046b7aefd200a2326469c256abe3f0f3514463658b3be902a146145017874c0ba150df9d6e711e2e9cca21934c2
 DIST ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz 100612 BLAKE2B 84f81072d3298dde613b4c1ebabf852c67e04b5882a4ca0ed6f218b42e8fa3ea9598140b0c0009e8d6b62d08902622a6d57ee005ec3ad8a808c9fb21aa53430c SHA512 03a289d8099a5c4a5298cba8f516d2edb41220935d8db750970113ca7513372c78241c2c948d0ffcd60e84686e50ba1d7fd0b46efea6881dd320435eca92a7b9
 DIST abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz 1281523 BLAKE2B 955802c74ed9baf222dcd824d2940147ae89edbc88f12bb8f54839776fe18bb18c0fde23b0d3142bb3be65a57930c96d03fdd243e8da07435eeb04329c31483d SHA512 c2ae1bd789251ec70cd0baafd92521e48fb1648aee8d9d84a8269436300848b6a9d7aead6bef8a12d3a9040f19535ac725ae961f12566500d309bc13dfee26a4
 DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826
@@ -33,8 +31,9 @@ DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3
 DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
 DIST tensorflow-1.15.0.tar.gz 46183168 BLAKE2B 5ccd87d5b53d6c543728e9c7ef96f12149bd8729620838b07a28f752fd5c57ef88350c2b62e8c44ec3561469eda38d8a64cbfca5e1ac7850674e1dd2c4d605d6 SHA512 f8683a950be6a3fa234d42e0f46bd9e049280e0c1d203c5c00ad44cf4728d894f2c301939d6d71203f815130a1ead53127adcc7565009589ff5aafc878b4dba7
 DIST tensorflow-2.0.0.tar.gz 46176997 BLAKE2B 761e91a774f61b50459240a83fe52f723a76c2cc3eaf7c371684849cb7365b94fb3743ab8de9adffe64bef0f70da2bb0b7e6426a3f402e436eff841d3edefe8d SHA512 c3a2cb9673d2ade8e83961f7d944165123d0e4d94e6ca4d8fdee4f02f536893b879bbbf78d3ad5e557467b58f97f7194f2d9cfc64d7d05540969be732070eecc
-DIST tensorflow-2.1.0_rc2.tar.gz 41641498 BLAKE2B 1ab001f6804cd6b2b3122cd5bf84905d81b1632f363134dc30aee92869077da2420799d0e70ea050004ac854a7e887a44176806b8cdfab5f12b9c8f7440d22be SHA512 7b8c9a83b5c25b36f680cfdaeefdc932cab93ecfc25622cd46ac14b2f5582eea4f04c6bdd5d63058266d5e0bf2cd9e1fb7a0647be62fb4ec4b910b0e7b4214e0
+DIST tensorflow-2.1.0.tar.gz 41637803 BLAKE2B 63aac95cdb71097d2e7a257a691a2b51703fb22d2535395494adebfae0d3f97f8dd9e0deaadf1c2f3d3d26138066a7c6fb9b9728b5b0ac3d54360d7b5e4bebff SHA512 6d09ba3c097e4b3d712e7164d649841572c418d56c207eea6d31e3b1851b84ce57e82801d9887d84cfd8fcf990a3ea4c4b4b05265f8d625509986412c230c3c6
+DIST tensorflow-patches-2.1.0.tar.bz2 5737 BLAKE2B 67f5004312389ed19e810aad9f2d5d4839d806b5a7422963520e0dff06b91346683647db757ac463af13ca70861a7ed9c94be242910abacc6be350e162947225 SHA512 a20bfb619d59e0d2741a27ce36e3d38dbb7a5a706d6bc56f8aa94b5b72288139ad301fc06390b128ef1c3a88b758d09d0224351590dedcda9c5309cc55af6fed
 EBUILD tensorflow-1.15.0.ebuild 11926 BLAKE2B db5054d61568b6b3f1843d553c5957ad8ec30a08aca20b134dd62c8fc9978823eaae41e8ae6118c7899693fb591cdce536d67b6cd197ebb4fe528f5bd407b243 SHA512 b47db814bde146455cbede7516b7aeb972d32e557c62684aa33be1a01f3a5e09f8eee6107ca151aab93f296ad3042778c71e1a1590e697bacdd42f1447890e93
 EBUILD tensorflow-2.0.0.ebuild 11982 BLAKE2B 1cf285381b1c9a90abd4880cb1d2a370fa16ab668597e2cc13bfb97237a8585d61774b2b97e39cab7d0dddb1b02b9b476a9ca6ffaa28557d822758c12f08f2ed SHA512 a02758690fd3aaef021dba985f714d584b16920c6226e8adc504c69ca2d04646495550a00166a8e3b408074baed08959cf4ac5e16a5917c1e09ac99e0805b06e
-EBUILD tensorflow-2.1.0_rc2.ebuild 12622 BLAKE2B 62628804cb269e13b6f45e480fc41a07d2fa5beb40ab389e4f7dce1347d90686a0531c7c674cfd92cefa58950b00d196bdbf52716ce5965adfc3e23f2e031d73 SHA512 2eb32be0f01ca0d623c95f797194f72c20d7b6587fd117eda690c2d84306b54f5c96bafbf24b7fc77598e13b89fec6daec53435cc81c8c3be32eedfcca22b5d8
+EBUILD tensorflow-2.1.0.ebuild 12435 BLAKE2B 12688e6060086531910518a2a13d706181757ac022061b71cde2da690d6e3ba3c6d55d485034db36c627803e292a7343b3ecab8ede704c6525299d16474e5edc SHA512 da9cdb6678f80d918d266610cdf907e45ccc335ab861b9c272b83106f1c56b142a0adf58098810573b639c8602b5c46ef40fa4840a92840d1a11f9afd0e58ffb
 MISC metadata.xml 606 BLAKE2B 910509df7310f05e34bbdd7223a9ad64e4f67c67174d3868629d594022aeab23fb9631fb17782b5787e7880cb2990ffed7d14c030ab86a25c23c8118330bc690 SHA512 ffc3f68be38618f77b7d31406292e3a4ead2819d19aa7c8b1eb779e03027b9220cc248645cad44e31a6f0c113f4aeeed2a45060617b1bb03695bd2c684262b30
diff --git a/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch b/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch
deleted file mode 100644
index 194cdc166510..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/WORKSPACE b/WORKSPACE
-index babb14b509..bcdd4f46e2 100644
---- a/WORKSPACE
-+++ b/WORKSPACE
-@@ -67,7 +67,7 @@ http_archive(
- http_archive(
-     name = "bazel_skylib",
-     sha256 = "1dde365491125a3db70731e25658dfdd3bc5dbdfd11b840b3e987ecf043c7ca0",
--    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel-skylib.0.9.0.tar.gz"],
-+    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz"],
- )  # https://github.com/bazelbuild/bazel-skylib/releases
- http_archive(
-     name = "com_github_apple_swift_swift_protobuf",
-diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl
-index 8619cddfdd..4b57df0cbe 100644
---- a/third_party/systemlibs/syslibs_configure.bzl
-+++ b/third_party/systemlibs/syslibs_configure.bzl
-@@ -27,7 +27,7 @@ VALID_LIBS = [
-     "grpc",
-     "hwloc",
-     "icu",
--    "jpeg",
-+    "libjpeg_turbo",
-     "jsoncpp_git",
-     "keras_applications_archive",
-     "lmdb",
diff --git a/sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch b/sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch
deleted file mode 100644
index bc53750b0701..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tensorflow/python/eager/pywrap_tensor.cc.ORIG	2019-09-27 23:56:33.000000000 +0200
-+++ b/tensorflow/python/eager/pywrap_tensor.cc	2019-11-27 16:39:00.996713385 +0100
-@@ -839,7 +839,7 @@
-     sizeof(EagerTensor),                /* tp_basicsize */
-     0,                                  /* tp_itemsize */
-     (destructor)EagerTensor_dealloc,    /* tp_dealloc */
--    nullptr,                            /* tp_print */
-+    0,                                  /* tp_vectorcall_offset */
-     nullptr,                            /* tp_getattr */
-     nullptr,                            /* tp_setattr */
-     nullptr,                            /* tp_compare */
diff --git a/sci-libs/tensorflow/tensorflow-2.1.0_rc2.ebuild b/sci-libs/tensorflow/tensorflow-2.1.0.ebuild
index 8ae81ea41a8b..5a87c8ff00d5 100644
--- a/sci-libs/tensorflow/tensorflow-2.1.0_rc2.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.1.0.ebuild
@@ -52,6 +52,7 @@ bazel_external_uris="
 	)"
 
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
 		${bazel_external_uris}"
 
 RDEPEND="
@@ -60,7 +61,7 @@ RDEPEND="
 	dev-db/sqlite
 	dev-libs/double-conversion
 	dev-libs/icu
-	~dev-libs/jsoncpp-1.9.1
+	>=dev-libs/jsoncpp-1.9.2
 	dev-libs/libpcre
 	dev-libs/nsync
 	dev-libs/openssl:0=
@@ -127,11 +128,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch"
-	"${FILESDIR}/tensorflow-2.1.0-external_libs.patch"
-	"${FILESDIR}/tensorflow-2.1.0-python3.8-pywrap_tensor.patch"
-)
 DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
 CHECKREQS_MEMORY="5G"
 CHECKREQS_DISK_BUILD="10G"
@@ -166,6 +162,7 @@ pkg_setup() {
 src_unpack() {
 	# Only unpack the main distfile
 	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
 	bazel_load_distfiles "${bazel_external_uris}"
 }
 
@@ -175,9 +172,7 @@ src_prepare() {
 	append-flags $(get-cpu-flags)
 	bazel_setup_bazelrc
 
-	if ver_test "$(cuda_toolkit_version)" -ge "10.2"; then
-		eapply "${FILESDIR}/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch"
-	fi
+	eapply "${WORKDIR}"/patches/*.patch
 
 	default
 	use python && python_copy_sources
@@ -262,6 +257,7 @@ src_configure() {
 			pasta
 			pcre
 			png
+			pybind11
 			six_archive
 			snappy
 			swig
diff --git a/sci-libs/udunits/Manifest b/sci-libs/udunits/Manifest
index 20070fa8f565..370be9f22cc2 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1,6 +1,6 @@
 AUX udunits-2.1.15-autotools.patch 1850 BLAKE2B dc1e48bff93de3764f488bd276b46fe7061399468c621ffb249d50218bceefb52d6e3d59284544173d9b4e340fa2d0d13c2fb04a850ad2bb8faf8f51df622f99 SHA512 bd4371d0ac9c54d2d4e8a3a0e908b38350bcb729c364de6da93da2fa580abd0f7e48cb3b902a67a9ab84fcff043dad554529cbfb5b26f48eb1f8ba87c43236db
 DIST udunits-2.1.24.tar.gz 1059344 BLAKE2B a28f13e886d4db875078ffee7577f4e17712987b0d87df586e037c1f9a0986ad206ea8bf648920269890d458a6b65250c896f4ea9ec2e8e7bfbe6e1692967530 SHA512 71af2aa62300dd6a2c58318d75cb9182433a208e28446725334a3a80195ebdae77aebe66e6c4e12b53b675501cf3295de2960d1e8beb1496a547d4eed0cde98e
 DIST udunits-2.2.20.tar.gz 1002380 BLAKE2B 63bc2756b32aa620f390fa2b033192e8a519b4834d83ca93315ef94ec926814e01906476d7aa1dc8553505ca1a787e71ed358bccefd3c55f6141aa27247682a7 SHA512 5d5803d9c2cbfdba7c760739f522680e3e69921256119af83e139a36fbcb4d7c84e044661f2987e3422f1eea548abaf4f585946643e8db36cd1d7065b86f8737
-EBUILD udunits-2.1.24-r1.ebuild 984 BLAKE2B 85594547d2061aaf8e5fdb7c683ae77fcb9a2f1a95d88ebec72caa91e921268886042c343ba476d38accc69330b8d861a21777a27e528fbdc7b5ce77471e0e20 SHA512 bdcdf11fb725fd896c32347c90d81d17d7ba097f709c13a40308ef6e144f83b12b74b237f122fb7a95330b451fef2e3535afc7c7b4e7f45ad84754fb5cea5fee
+EBUILD udunits-2.1.24-r1.ebuild 985 BLAKE2B 74671d3adf1b1376d1f85b4b57c519af9e30f64ec770d390d48f79d49f9aa9257dc720ea2c442b8c0ee79573c2b4c602080757ceb23c8ca55b1a596c02f2c03f SHA512 a98b56955ca374aaf054e070b10f6dd5199492b0cdb0175af4882a420f257272bb01621c9f10980b19261cd6227c997e006b3525b05ac556dd5ada346cc45621
 EBUILD udunits-2.2.20.ebuild 763 BLAKE2B 9d4e7a2b95eff615a11f95dcf4bf7634a7246b77c6ba210aab444d1ddee3e53369d4cdfb3af30383d2e7369362567aa1fddf6b4bf1502e77ec71290b0334f803 SHA512 0c5936d30b028be8f4f7e19b6c06000447e90df7f0e3e72c48c61e2c80bb5c49b74e2c8e4a85738ed4c6f3798d86a30ffe3aaf4b02fef9b2f0bd271d6eec800d
 MISC metadata.xml 535 BLAKE2B b8b216bb211bfbd90c60f71248d5a390eb6d21bcceb13d077e128a764484b2c30a0aa7378323539acea5ff9b4c756fc51942e5988698d2de095169c7763e4316 SHA512 dcbd5fd4a61a2780193ff4875f973ec1237be15f98bc047c2f1603b1d780183b1869086ed8ab91f5832722c04f0e1d26d17cf3e60883d77e79b65f68dbc47ae9
diff --git a/sci-libs/udunits/udunits-2.1.24-r1.ebuild b/sci-libs/udunits/udunits-2.1.24-r1.ebuild
index 5f2aee130be0..d630d7a932ea 100644
--- a/sci-libs/udunits/udunits-2.1.24-r1.ebuild
+++ b/sci-libs/udunits/udunits-2.1.24-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="UCAR-Unidata"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/expat"
diff --git a/sci-libs/vecmath-objectclub/Manifest b/sci-libs/vecmath-objectclub/Manifest
deleted file mode 100644
index dac44dd54980..000000000000
--- a/sci-libs/vecmath-objectclub/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vecmath1.2-1.14.tar.gz 75291 BLAKE2B 4201dd1f24404e557d79d797e29587fc1351005cfe0da7f396614263d26cc2753385eefdd86437315ca30da2ed4ed34e0aebe700f43d32c3287da8c31173e23d SHA512 b61c60c4c8341327a7494475da380685220a6ecf193f4005bbe9ac2b9c98b5f587607c136ac8ba19425ba57c9d19d2994c1f474ca4cfa3f5a06cebb7d1c5c020
-EBUILD vecmath-objectclub-1.14.ebuild 825 BLAKE2B 1ed12b553da4b2c36ec87a16a728bbbb1db92703a0fca15d899e2b238f12853d91749a5689eac9e7dedf164fbebe73f9d1ee8368dcfd3d1fa5e185ad134ffdff SHA512 b646d86f84f5c893af3a277017b956e0e9fe23c7ff82aa3d790b93beb03e93db017353e852024903215730321fef99c4b3769f3f8743943c7b547eea2b795260
-MISC metadata.xml 743 BLAKE2B 2f80e03c638540f77e30f0b819e4920cfdf0681f016c3821bc4159d08431d896d00c3e195b1b534c07ea3164057c8bfa1e338ecb74d2a296577f2f6f5b803bb3 SHA512 77534c2084b740b4cdbe6ce6cdb9c8f9a57d95324a2a0e2240c5a0b9edf34d7292b047b5c0509135d56a583cf41d0370342c646aaf4275bb66443d6f2a4cf2e2
diff --git a/sci-libs/vecmath-objectclub/metadata.xml b/sci-libs/vecmath-objectclub/metadata.xml
deleted file mode 100644
index 6eb27f16c309..000000000000
--- a/sci-libs/vecmath-objectclub/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
-</maintainer>
-<longdescription lang="en">
-  This is unofficial implementation(java source code) of the
-  javax.vecmath package specified in the Java(TM) 3D API 1.2
-  The package includes classes for 3-space vector/point, 4-space vector,
-  4x4, 3x3 matrix, quaternion, axis-angle combination and etc. which are
-  often utilized for computer graphics mathematics. Most of the classes
-  have single and double precision versions. Generic matrices' LU and SV
-  decomposition are also there.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-libs/vecmath-objectclub/vecmath-objectclub-1.14.ebuild b/sci-libs/vecmath-objectclub/vecmath-objectclub-1.14.ebuild
deleted file mode 100644
index 8d0a0986818f..000000000000
--- a/sci-libs/vecmath-objectclub/vecmath-objectclub-1.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit java-pkg-2
-
-MY_PN="${PN/-objectclub/1.2}"
-
-DESCRIPTION="Unofficial free implementation of Sun javax.vecmath by Kenji Hiranabe"
-HOMEPAGE="http://www.objectclub.jp/download/vecmath_e"
-SRC_URI="http://www.objectclub.jp/download/files/vecmath/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	mkdir classes
-}
-
-src_compile() {
-	find javax/ -name "*.java" > "${T}/src.list"
-	ejavac -d "${S}/classes" "@${T}/src.list"
-
-	cd classes
-	jar -cf "${S}"/${PN}.jar * || die "failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	dodoc README
-}
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 3eabe5ade79e..4f0c85c48bcc 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -2,5 +2,5 @@ DIST VTK-8.1.0.tar.gz 33482506 BLAKE2B 82aecb497847254595f20294120ae793432348fc3
 DIST VTKData-8.1.0.tar.gz 282986441 BLAKE2B 885f35c5386cc5db8db905a868a3ad79c246f1b0e41a3e5b81312b1f3de90483a1e34886d4764c60fe8006acaace2405b25acf047ec0e25a957f7a2d563d3380 SHA512 0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047
 DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c9e611b8655f077bb85e6ab850fb0cfd79f4722a0486f73eafcde2cd77d6be305201857f3e729b1f60f710c45bcf0bb63f SHA512 9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31
 DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c
-EBUILD vtk-8.1.0-r3.ebuild 8937 BLAKE2B 11d0699002026cbb88f35240fca54a03e08da0e4b413baf0290685c1ce7a4c7a57232ebe78da5b0e34a76572e863534579a025d7dcefbcf8e4b4e3fa55094391 SHA512 f3cedd459a2d89d88d5eddbcc07510c55e3b489d62904f192824b91e45f8e54e92b3d691906c9a20fe5c933482732789baece1cdfd9212f6d688f2012a191f6a
+EBUILD vtk-8.1.0-r3.ebuild 8931 BLAKE2B f956f07a1a71b6eed436ad444049f6e08b2adc4cb0d63d56cc08fe652a49c50ad80fefe4adc99fdbcbe116242fba2d081a1328de8b59dddb2d7db9e56215108f SHA512 fd0c6f1d1d647a88023754ba0aadf42db45938bff96d669594335bb7549d367692c11e987a25eff30cddfef49635040c393cc1af94133bba26e9cee18ea3d931
 MISC metadata.xml 988 BLAKE2B 2533eda3936361d835dba2e30f1b1a19484facc289603d82b6c2012ee242e7778b1080d7136584c08113d7a82e0742d7bb2373984667301a4c7d52b4dbd8b087 SHA512 f4e29e15a05cfb49b24f4a8e24a6e43ac72ac0fa21ed640a70e5017263f23e21e514dedc489d963acd803407df8ee2bd2d6006c83eece795f91b4809d2ec2ff4
diff --git a/sci-libs/vtk/vtk-8.1.0-r3.ebuild b/sci-libs/vtk/vtk-8.1.0-r3.ebuild
index c5b14166c04e..c2a250417f9e 100644
--- a/sci-libs/vtk/vtk-8.1.0-r3.ebuild
+++ b/sci-libs/vtk/vtk-8.1.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 WEBAPP_OPTIONAL=yes
 WEBAPP_MANUAL_SLOT=yes
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /sci-libs
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)