gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sci-libs
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
247 files changed, 2616 insertions, 3006 deletions
diff --git a/sci-libs/Fiona/Fiona-1.7.6.ebuild b/sci-libs/Fiona/Fiona-1.7.6.ebuild
index fd6206119270..f31861694fc7 100644
--- a/sci-libs/Fiona/Fiona-1.7.6.ebuild
+++ b/sci-libs/Fiona/Fiona-1.7.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/sci-libs/Fiona/Fiona-9999.ebuild b/sci-libs/Fiona/Fiona-9999.ebuild
index 209aabe38660..9874a5fd2758 100644
--- a/sci-libs/Fiona/Fiona-9999.ebuild
+++ b/sci-libs/Fiona/Fiona-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 git-r3
 
diff --git a/sci-libs/Fiona/Manifest b/sci-libs/Fiona/Manifest
index 44ecdbac18ac..98479f4ea1b9 100644
--- a/sci-libs/Fiona/Manifest
+++ b/sci-libs/Fiona/Manifest
@@ -3,6 +3,6 @@ AUX scriptname.patch 353 BLAKE2B 7b135a729d5a15362a9b7ad3b15617f1002da7293262785
 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 861 BLAKE2B 2f1ccc478254303432eed3ea9088298c4f0a7b4e3ea1a8bd46b5c971a6130d1551650539b168d242f107145be1f17fc5138b3ed2f142e8b280925b4d5b3882cf SHA512 80e045d045c5dacad92ed51e8dbc7ddc114b03a0c6cb5d2456f243ddd231d602496be72efc2498d1c83fcbcb006dc86b07580f327c45d417ce5e278615cd7a8d
-EBUILD Fiona-9999.ebuild 750 BLAKE2B ded8324150f2ad343bab489801c9abe61ab531bbf213abe818659865b3911fac2dbb49be94df7a2b69dcbd9deff6fc34310fe6cc8fca7534ee0eeeaf1f361fe1 SHA512 c8a637ca1354c18646e422a23a699359a2f4a59b2da3fa76579479708fd8159a7b35380535102e6419665960b2f64f03444ee06ad6e446fbd772c607f18d6e54
-MISC metadata.xml 291 BLAKE2B 4ecd07de9c09af8529223d976508c193f0906422ec2eb1de33e81af63e16feeb7ee44822be8bcf2dabda9c5c42fabeeeaafdbf7dc55551148335088eeb47a56e SHA512 de0472e2bb3e03ab9d0c4639274c82fd0019054b5bae99294b82d24f5af057737c61b58065db930088d7021aeaf3e18b520733bb7a2ca5e8eb567d7ee82e5ac1
+EBUILD Fiona-1.7.6.ebuild 857 BLAKE2B c03aac23e53f4d0cbb1404a8408df19fad552752b6da1f2cbac9c0850fee92e49cb19a68f1f63ac43a29b54d5c165ed2d0318fa9f7eb9d1efdaa04b5ef208b26 SHA512 4d7378045bb67c8fbb226ff8a4b65cd58c58079afdec07c8bd9c00b585f6e6305f0b6680c811f3958d8aa9cdcf819d76dd62a1f09df4b3b91af2ed216f9f3929
+EBUILD Fiona-9999.ebuild 746 BLAKE2B f772fee9bbafd9aacf15264457f18c7237316f770d9a7a0c9edac9e1dba5be48f28fcd3bc932d156eab401eab765482a3364662afc3309eee60cde9a875e2df6 SHA512 7ada2f06a6140ed9241a38988a494d8a84f4601a6845836d476ab34ddcad209d8ac510a651dac3329b88bd4525f24d5f7027319461b0668f03734a9999bfa0f5
+MISC metadata.xml 240 BLAKE2B 010e6f1f4b61059c3ae02f9b2a777d806a527c907b6f50f2143f7e9468c8083e60e0b0c01b1008eace030563421825e894f8f479cb27bed072f8f6f3295bbe66 SHA512 a4cc37701e25a2f50b06a3609f98173bf00df77bbabcfe38c8c60c4a488c5971b34f26cdcbf03c34eca4aa3a567b6242f597742a6f5575b1e74978a6fc249a91
diff --git a/sci-libs/Fiona/metadata.xml b/sci-libs/Fiona/metadata.xml
index 8260bf3a55b3..51838a08fe1f 100644
--- a/sci-libs/Fiona/metadata.xml
+++ b/sci-libs/Fiona/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">Fiona</remote-id>
   </upstream>
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 1ce81c91e9ca..110bb3a5bd8d 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/Rtree/Manifest b/sci-libs/Rtree/Manifest
index abe877c73ffd..d22f9c888506 100644
--- a/sci-libs/Rtree/Manifest
+++ b/sci-libs/Rtree/Manifest
@@ -1,5 +1,5 @@
 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 689 BLAKE2B 5725e28fdef846acc47bcb5240fe64769b7ece9f7755fa7511471c2551e2a10cd157e7c5b9a0423bd250ae0fcd32f21c0fb4e047a4785c564486388bf0678e67 SHA512 0bd813fc5b8687e1c85c67b3997b1a829fd861f3d28eb170c91a5568b0692e35d10ef6cc778de8df6823de15a24c2b2168e5dfe20f3e3502ffb26933244818ce
-MISC metadata.xml 348 BLAKE2B d075025a84c4e5828a919a6d959e936043b12e1ff30f66e63113c4477879f1ea0bf141271f9fb575d3aaae46de309b261ce9d77319c472e3ededf2100c6b9810 SHA512 8ac80d045fc9ae972bac0b0e6f4618b2eba27225e85710970548e01341f13e32f42839a7baff5de3650059a55c6cad179eccfbda2ec4c8ccdfac94c195277bc3
+EBUILD Rtree-0.8.3_p20180802.ebuild 687 BLAKE2B 5f931cc3d08d1057f0a0379cbe7aafe03dfdbee432257644b923b0a8e3c28df9544595ddc41fd0c4bf3e4bb05212baff59ea12ad8b7d6f5f31b098643c1bb4db SHA512 4ac8b7590938f3569290a94f13ec7c86f6b2bc58aaa6231b5954d49839ea67d3501d3fdd8da9f18e18d0085922b1189a4d2d90cd8e3cf58f260fca5bc68009df
+MISC metadata.xml 297 BLAKE2B dc79464a861da2bba0e4d63ef427f0a6d1300ba196b4739ccc8c1827cda2714fe4222c5cac032f6fb80ed0e557ee851bb763c83bb107283b7840dbb8651779d7 SHA512 37da09df732badd85eea558b74949850f08be3039d813e94e33240a68a58fbd13fb9a469382cc234fa399f32a0aa796c0ed11fae44cb00c77735bc1f3df7223f
diff --git a/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild b/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
index 13fa6bf7226c..fbba424b40b0 100644
--- a/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
+++ b/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/sci-libs/Rtree/metadata.xml b/sci-libs/Rtree/metadata.xml
index 0a6a504a6658..f78d3bff8f54 100644
--- a/sci-libs/Rtree/metadata.xml
+++ b/sci-libs/Rtree/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">Toblerity/rtree</remote-id>
     <remote-id type="pypi">Rtree</remote-id>
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
index 627806894a30..cc73ed6c90c6 100644
--- a/sci-libs/Shapely/Manifest
+++ b/sci-libs/Shapely/Manifest
@@ -1,14 +1,6 @@
 AUX Shapely-1.6.4_p2-test_operations.patch 722 BLAKE2B 661659bc1d2f8c8a5d6b77f0ca746024aa9724f2c25047d8203d591a4f793982d4cf9bebaa6abcaf48c0cf1b266ef941b986897d26bece39519f8fcaf5dcaf96 SHA512 c1e9eda0cf8dbfbcee2d6994f470559507c754fa2bf03973ac692ca6bd2fcf62ce05e15116515877e8900a89c55c6b2bf6e70b74e2cfced8d3852608901b34db
-AUX setup_unicode.patch 698 BLAKE2B a4a007ac79df195e261161c59a92bf2fc50beea9d12818e0059e64527c7485a10ea8ea51ff9dbd2705a23ecacb957288da16f4c38ee740d989987b1fdccc3909 SHA512 f3e2766a1da5586a5c534d4e2eae1a00545d5af90e0f7ce92d2a1e38644f07b6db90c7ab20742d390e79198b6d5957900a7cd6777515a773fab2f1f98e09c8dd
-DIST Shapely-1.3.0.tar.gz 118863 BLAKE2B 6a35060b6593519b62b479fdb21047e0a44976109e27a55dbdf7583952666c8cfecf775975be54701696d57d3c5b1082110dd474df265ccf5b467acddcd2a629 SHA512 106f9773a5b00e7269a84c760f3a2b867c48139c48eebeecd524c8216d75c28daaf46eff45c118c1809999e33a317e9aca278a8d83605dc7273877a7ed3edd82
-DIST Shapely-1.3.2.tar.gz 120179 BLAKE2B bc10e017a546e715c05c4edb1aab4f86cb0fd6f1f35ab23f1d8dcdf402c96bbbbaca92668cf9bc788387dac8cabd958cfa3ffff5a90045f2f2a7a6798383cb2d SHA512 23d65c5a7137726e05e0399dc49f05e5ad9b582d4adcdf30215f72ae75989e85daf30ea2a5010d6a5a086cb6bbb5b4599b5065080b845c833776812f6e46566d
 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.3.0.ebuild 630 BLAKE2B e1a1dd2631504d2bff39be9810dfb5bc582c172d6bf07cb7c8e66c2fb209882856cb9b076a27a6d02b91539cce943368c5877404f94a39f152823a3634f835a5 SHA512 2189a3826dde73a4860a8a0baecb8c3438d7a286cc8b7ad0e6dc3f34ee61db4f0d4a1b379b211d3ccb90a189a580025f90b5c9a07698ed409fa9c7ed836189bc
-EBUILD Shapely-1.3.2.ebuild 630 BLAKE2B e1a1dd2631504d2bff39be9810dfb5bc582c172d6bf07cb7c8e66c2fb209882856cb9b076a27a6d02b91539cce943368c5877404f94a39f152823a3634f835a5 SHA512 2189a3826dde73a4860a8a0baecb8c3438d7a286cc8b7ad0e6dc3f34ee61db4f0d4a1b379b211d3ccb90a189a580025f90b5c9a07698ed409fa9c7ed836189bc
-EBUILD Shapely-1.5.17-r1.ebuild 1079 BLAKE2B 82941c1ec13100c47128bbe373d6580bdd6da42783df7d991c5488e26155b3313c55bf02a55f5cfa8985aafa2b9cf6d4a4f908ba2986218888da37a6fafd4b9c SHA512 a7ff580487dd3099bf4e7cee423bd15cc08c8694d60489d961dd9e04f73738c8d3b0aa0e2c4ab3372758d1eb4a3628467953d6ddabd4db3970bbff0338e9f43c
-EBUILD Shapely-1.5.17.ebuild 715 BLAKE2B 24fa2f05db4df4199f52bcfeafd1895158545137a62c71fc443d62e8ee010190cb39b7489ab3d6df778f79c343ea07badcf60410d8922c625b757852cdec9e98 SHA512 3cc5342029d4a49aaad3c8c15a8ef1508af884f056179045ec6e43187807b1d4826921d041813b295af9d4da3bcf390bbfac76c09c2028ec2ba396fdc0a13932
-EBUILD Shapely-1.6.4_p2-r1.ebuild 1234 BLAKE2B 0c98aebdfb0f4e67a444bf1cacd35ecb038f96611d2499a019448ff7c1ad7066bf12650d1c8219bf3fc9ca1ee464cc98ac40b57cf509338d9fb334606088d6b1 SHA512 1f606a5fe9bf25bfc52175b39322599380733db52400d1af74e1205e977ccf34615ac9e0b6b86a6c837ed42b29c9b1819582be1fd87bbeb39d0fa84f4795eb02
-EBUILD Shapely-1.6.4_p2.ebuild 1242 BLAKE2B 84a91a4a627e519b199538e6047629276cee36119b0414eaa9d8f1c2066de81dbfb14ae621c5cad7db5e7c3f588a797e9ba6ac91e03802431c3ef3450dd58ea1 SHA512 daa23676af10b2e8f91028e6f70156f123ec3fe8efc6724e030a3bbed2bba41841ab2bf2fd76a72edbb0282854a59936e6358e351d96b6a669282f9b0faabc8b
-EBUILD Shapely-9999.ebuild 607 BLAKE2B 5483a76c62d0b98d78a53bff1c97965660eecdd3af808e70e36e1d0786da5f7045523c9a8147c0d5a76b27df629305c5cae3511ae6c7537e9344811c15238c38 SHA512 b227dd717bf6f9744305b0e957ad557267bcb0468fbe010b2eac9ff420d47e0c00d2d6fa27098ac69e5bca22e1ddd0044b40a34d8ded426a4ceb8746f3dcefc3
-MISC metadata.xml 293 BLAKE2B 556bed997454d3e7c0a32291cae2326e9fcdd3cd91d5a3f43fd5934bb093daf397c3f3628b0f921460f7cb846b1c961a02de772437275193883d59c90f018e78 SHA512 850b4e0ef0b365030c29a55c20eba931ea283a3f1603d0c0f887e80fad352ffcee0c546cd68ada65d4ba9f33fc0bfb2a817b11e630e704a22928380c7180deb4
+EBUILD Shapely-1.5.17-r1.ebuild 1075 BLAKE2B d27f0eda9125b453c17f411e18e4961f10e7507e56f10561c4ffd963a3fda58befb1dc2bc5f8fdbc1d702446dfae48e3d056bd47d642ba4493f796988a1ed648 SHA512 90cc083f8102273faa78aff7b0ad4027fdb8368dd8c3a2b7be4d4c9532ef47dd13c7c2842f2e24434ca15248faf2a940f8760baf6ad715b57ac8e043b34c799d
+EBUILD Shapely-1.6.4_p2-r1.ebuild 1231 BLAKE2B bcaa4b3dee9e05d924cd7f6f9fdfb17f410d16e7e7210e446e7a126da16a1e91f3998da71305cf5fe0888071fcd05cc9b131c3a8ee5acfb847017df76bb7a8bc SHA512 57cfa44501741647624ad7e0f3b97c327058a40d1dd351454105644559232835ede3ea855c544158fb8998c5a58b7a36218abb09f45f1154cf724ba8c89c1d31
+MISC metadata.xml 242 BLAKE2B 5314a9f3c3a7dd475d215dc1be8c4fba1947504699ae6658044a1f8d05fa860798ebb24aed8b881a16a89f8eb84d554e2f9a738a2193668807173888bc187f56 SHA512 0d12ba53a623b64840750891b600f6fc2b4f857f8766557c54cf7a0ef473320b0bc09bab1d50d6ce2c8284fcf7a10b3aa1df8d43d9b10274101e82e1a7b1db94
diff --git a/sci-libs/Shapely/Shapely-1.3.0.ebuild b/sci-libs/Shapely/Shapely-1.3.0.ebuild
deleted file mode 100644
index 4ea83ff68b95..000000000000
--- a/sci-libs/Shapely/Shapely-1.3.0.ebuild
+++ /dev/null
@@ -1,29 +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="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/"
-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/geos-3.1"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/setup_unicode.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/sci-libs/Shapely/Shapely-1.3.2.ebuild b/sci-libs/Shapely/Shapely-1.3.2.ebuild
deleted file mode 100644
index 4ea83ff68b95..000000000000
--- a/sci-libs/Shapely/Shapely-1.3.2.ebuild
+++ /dev/null
@@ -1,29 +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="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/"
-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/geos-3.1"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/setup_unicode.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
index 10f755d4cc3a..9c0df2cbe226 100644
--- a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
+++ b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/Shapely/Shapely-1.5.17.ebuild b/sci-libs/Shapely/Shapely-1.5.17.ebuild
deleted file mode 100644
index a6993a3d6fcd..000000000000
--- a/sci-libs/Shapely/Shapely-1.5.17.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-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.1"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
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 488e7c29a06e..036aee50103f 100644
--- a/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
+++ b/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -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/Shapely/Shapely-1.6.4_p2.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
deleted file mode 100644
index 7b76620b7303..000000000000
--- a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/"
-
-MY_PV="$(ver_cut 1-3).post$(ver_cut 5)"
-
-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}/${PN}-${MY_PV}.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}] )"
-
-PATCHES=( "${FILESDIR}/${P}-test_operations.patch" ) # bug 701624
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-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-9999.ebuild b/sci-libs/Shapely/Shapely-9999.ebuild
deleted file mode 100644
index 30efef7c6868..000000000000
--- a/sci-libs/Shapely/Shapely-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sci-libs/geos-3.1"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/sci-libs/Shapely/files/setup_unicode.patch b/sci-libs/Shapely/files/setup_unicode.patch
deleted file mode 100644
index 89e1b058f0f8..000000000000
--- a/sci-libs/Shapely/files/setup_unicode.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- setup.py.orig	2014-06-20 10:27:26.638779565 +0200
-+++ setup.py	2014-06-20 10:27:29.885446151 +0200
-@@ -1,4 +1,5 @@
- #!/usr/bin/env python
-+# -*- coding: utf-8 -*-
- 
- from __future__ import print_function
- 
-@@ -74,8 +75,12 @@
-     readme_text = fp.read()
- readme_text = readme_text.replace(".. include:: CREDITS.txt", "")
- 
--with open('CREDITS.txt', 'r') as fp:
--    credits = fp.read()
-+if sys.version_info[0] == 3:
-+    with open('CREDITS.txt', 'r', encoding='utf-8') as fp:
-+        credits = fp.read()
-+elif sys.version_info[0] == 2:
-+    with open('CREDITS.txt', 'r') as fp:
-+        credits = fp.read().decode('utf-8')
- 
- with open('CHANGES.txt', 'r') as fp:
-     changes_text = fp.read()
diff --git a/sci-libs/Shapely/metadata.xml b/sci-libs/Shapely/metadata.xml
index a97d495a34c5..8c6ed6fdd97a 100644
--- a/sci-libs/Shapely/metadata.xml
+++ b/sci-libs/Shapely/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">Shapely</remote-id>
   </upstream>
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 97070b504cbc..07eb8959fc85 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,7 +1,5 @@
 DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c
-DIST armadillo-9.200.5.tar.xz 4786264 BLAKE2B 3ac5e7e50c82927ba311860915d65426e5b71e6235a041b949166e02aa50dd50a6c32d34d44761052829471ce66df9a4a9a495e1da18deff2abfbd8d67b72d0f SHA512 31110ac0d9ef9e6cf6fcf97a846ad4bb7545aa2d16fc847d85d481d605942af62994562ba8b083d76b051002d6693c966ee4b4ad398711fe1d68d31bf12daea2
-DIST armadillo-9.200.6.tar.xz 4786904 BLAKE2B 4cd6245476b674ea325037fed4b9d613be399036328b72616631b26fec7b0d3d30a788689312d0c8f4bc8ce2041454ce5ff129523f1e3ef25de16c0668d7c958 SHA512 9375a5d8414ec6d34dfa07faa472ca8c56a0ed62761d6bdcb2c584f255fc212fadf00e5380e7b10e67836b93d17e609fe6714a7b233b6f0e5d9355ff504a15fd
+DIST armadillo-9.800.3.tar.xz 4716468 BLAKE2B 4909cbcf1f8d6aedb366bb9b21784e865d9e68a3c833263d1c1df942e96ef679e31191ea9dbd8bcddab6086bd26c80915546c29dfdd16188f0d9e865e7b3c03f SHA512 6088f7254c54067421fcc0b69751c6d37ffe484474ab5955755fa5b3dd38ed4246e353701fb614c820d192675ec75f134e3bbb511a70612e4fbf133a89cacc21
 EBUILD armadillo-8.300.2.ebuild 3400 BLAKE2B 477f6db643c60d915b556574868181bf6b5613c0c6f99ac42f31440aa6ade6447e82f7e241103cfdc6a848223d6dd5dcd170dabecd429535ab7724fec68d6eaf SHA512 096f51d270472bbed4ebcce4bf899644966d31154ce18eacc8c77d70afd6e9ad31d8e02435a0e7413005dfb1a2a844f402169c1cf4457b98ba0d760daa763d37
-EBUILD armadillo-9.200.5.ebuild 3402 BLAKE2B affbe6320c75eb7886cddccee2d3bf83e0ccd2b02c62b8b87c946a51dc7f52aad1056be37b887e0d2a7990058a721f7fa0e3f68cb06c2d3991e84b021f39d7f5 SHA512 4b6d259019bb1206662ccf9923096b5d5706201a96ad81a083255ae0e3eea5c7640f85b00545caa33f216d7e40f56888c909808ea698a18d4d1ec6684475051c
-EBUILD armadillo-9.200.6.ebuild 3303 BLAKE2B 251b23369d0fe2fbec7fb5cc19edfb23e0a943e112e1515cb96b40383ac3a9df0498cef070881f64781ecc7c8d91edfb2cb5b1408036ee61ec32db6987b6fce0 SHA512 cda23095ffa2067fafd082d22083db52766ba1b1caf03ab7d927b0dc525e07332efa2a6d5383c280f6bdd695273bf31af505ddd4e4e2820acc5f2eb1d387bbd1
+EBUILD armadillo-9.800.3.ebuild 3499 BLAKE2B 5cb98f75d176cfaa1ab2a84271730f710867a96df908de0235ec0422426a881d57880b0679e724c84741f6ce172b392c6ec993e1685a0b5279c835b7ea3996e2 SHA512 d4d0659690847d5287697b1514b4839cec662ed9d8f185f4e6e9dd529a1b26e4c9417203d62ddafcbe885ea5b6b38e9a8f8160e9904bffe3832f556a4ed39b6f
 MISC metadata.xml 1537 BLAKE2B 5116cb259f8e27fb11430cc2b3ab3a351afcefa0734e7997c962596aab226cfdd052ba3186ea068d8d31d501520d063037185909bcf02de72f57b4c8dfd86e31 SHA512 206e3f8912bd753837b0e8301c1db0f94e3480d0f50ba83c1b9a4be44498507ccade8f0b317c3bf2baa8aa782a93c88806ddbe710eed9d8fecb135494c26bc71
diff --git a/sci-libs/armadillo/armadillo-9.200.5.ebuild b/sci-libs/armadillo/armadillo-9.200.5.ebuild
deleted file mode 100644
index 06e6051e9208..000000000000
--- a/sci-libs/armadillo/armadillo-9.200.5.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( lapack )"
-
-#	atlas? ( sci-libs/atlas[lapack] )
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	superlu? ( >=sci-libs/superlu-5.2 )
-"
-
-DEPEND="${RDEPEND}
-	arpack? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	hdf5? ( sci-libs/hdf5 )
-	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DARMA_EXTRA_DEBUG="$(usex debug)"
-		-DARMA_USE_MKL_ALLOC="$(usex mkl)"
-		-DARMA_USE_TBB_ALLOC="$(usex tbb)"
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	else
-		mycmakeargs+=(
-			-DARPACK_FOUND=OFF
-		)
-	fi
-#	if use atlas; then
-#		local c=atlas-cblas l=atlas-clapack
-#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-#		mycmakeargs+=(
-#			-DCBLAS_FOUND=ON
-#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-#			-DCLAPACK_FOUND=ON
-#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-#		)
-#	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	else
-		mycmakeargs+=(
-			-DBLAS_FOUND=OFF
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DHDF5_FOUND=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-		)
-	else
-		mycmakeargs+=(
-			-DHDF5_FOUND=OFF
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	else
-		mycmakeargs+=(
-			-DLAPACK_FOUND=OFF
-		)
-	fi
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
-			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
-		)
-	else
-		mycmakeargs+=(
-			-DSuperLU_FOUND=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md
-	use doc && dodoc *pdf *html
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/armadillo/armadillo-9.200.6.ebuild b/sci-libs/armadillo/armadillo-9.800.3.ebuild
index eb5ccd3061d2..ac58225faa5a 100644
--- a/sci-libs/armadillo/armadillo-9.200.6.ebuild
+++ b/sci-libs/armadillo/armadillo-9.800.3.ebuild
@@ -41,8 +41,14 @@ PDEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	# avoid the automagic cmake macros...
+	sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die
+
+	# ... except for mkl, since without a license it's hard to figure out what to do there
+	if use mkl; then
+		sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die
+	fi
+
 	cmake-utils_src_prepare
 }
 
@@ -50,11 +56,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
-	if ! use mkl; then
-		mycmakeargs+=(
-			-DMKL_FOUND=OFF
-		)
-	fi
 	if use arpack; then
 		mycmakeargs+=(
 			-DARPACK_FOUND=ON
@@ -139,8 +140,8 @@ src_install() {
 	dodoc README.md
 	use doc && dodoc *pdf *html
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
+		docinto /usr/share/doc/${PF}/examples
+		dodoc -r examples/*
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/sci-libs/blis/Manifest b/sci-libs/blis/Manifest
index 9009236830a5..89a2de2a38f2 100644
--- a/sci-libs/blis/Manifest
+++ b/sci-libs/blis/Manifest
@@ -7,6 +7,6 @@ AUX blis-0.6.0-rpath.patch 384 BLAKE2B f5a0390384d30d2929fcb5ff22424770dc3b6a4b9
 AUX cblas.lds 205 BLAKE2B ab2c41b571dbb9b55e36fa5afe4344ed9ef33454f6b7a5cda0726aa7f98a61dcef3065976cc02ab593aad94c5d6c0a23efce726da30673bd06cf57b64e826b93 SHA512 23008248e2b2c221a9ce36c2aca3e2acf58a6d434ffde498a058689af5d16d6e87ab56900508bb0403c5f5a1fc9366b202a7fc44a42d04c409197ec1ec164408
 DIST blis-0.5.2.tar.gz 3502383 BLAKE2B b09fda20711086c8bde0d4efc3f3c9b0f6072e1ddb8bd2846465877f0353cced27548abe1239b6a042fe655e85e4b7b3c960322e39b2c733866b8e17777718bd SHA512 4f91a7834ef0ed39544dd21856814467416a222240050cca323917b0fc61b9201ae4dbd109aa687cdecb27ddee5d6bf4510ef023e1c1dc73599faef0482d3d04
 DIST blis-0.6.0.tar.gz 5107257 BLAKE2B cd589ad1216486e8bb0cf574cc096c1e1f2bb9587b182c2bcff44db322468d9f027323c0bf2d22ea0fabb1902dc047d2bf62253ef1c2797fc3de9ba53d7fc34a SHA512 74e9da5146f7986cbd11651d7cd0837562a1603c667b9e6d3f79b5057443de657b60d7463cb2d64daf3eff7d33fc05a64e6d8eb807f4cabe0c3121517924a206
-EBUILD blis-0.5.2.ebuild 2731 BLAKE2B 918e61749a6e8b338805d4255f82205dd8834f16e8fedc80264b30ed6a799a14201573bc5c0c4d99e9fef0566507447165959b05e2315b1a123767921f636860 SHA512 6d4959da4440a037cf8c133b383e4aefded0cd7285da6b50aebb76da503dc9998a09635efc8532ee59d2696e9dbdc3b6fd1e54cecb23777d35a3e0bd0cbd460f
-EBUILD blis-0.6.0.ebuild 2689 BLAKE2B c0b684e0aebfa5b607e2afb703b89d9fbba44069db963b6c023252fb677c932c9fee9956500ee408c67d3a6a12adaae6746066486e4bb655880ba98bf4d3a146 SHA512 b355863ef2f14516912cfb4e966489fa95fb832947317b2729768f21755678ee988dbc7768f93eb18b94e7819a35f4c38063204cd5b55524ec7e346d912ea3e8
+EBUILD blis-0.5.2.ebuild 2732 BLAKE2B d02c1b1706301ea0de2d58bb9b8e485d432ad8f413fd1aaf1400f3bacaad0491c56a91e7c618e07ebb10d4a5bdb7449ab91248a314cba43a62ff705ad40cc960 SHA512 d0d1138f84124f44235520a38d6f9783a3aa53cfe696f82e534ede6068d8d4cc462efce7cbab5ce7fea6deaeba4127bbfe4959567b2bbcc433557c31324e97a9
+EBUILD blis-0.6.0.ebuild 2690 BLAKE2B 571b826c4beabb96fcea6ece9613c32c5863019d8e514b57f1eeab96b26cee284cbc4fb40fc824dbe801a66106068c7a89e82f723a00eb37fcd14d0eb9f23c30 SHA512 6bad168fc042c7be83e5760044557273f82251e5b1dc52b02260c535354817492e800deb69ad23a3cde7f2204c902d7c98a79f2ecc92a3c7d498d7646c9a22bf
 MISC metadata.xml 1608 BLAKE2B c8026b4a933bd7f14e7c446ea5d4bda580532252e52194b058d97daaa38969c661d5dbd86d230f44d2c77d52798962ca2953b1d88490fe284629777e763a5ee7 SHA512 b7ce333449f22acb746fed9913850e226e2e6bd6573537996f43f402b055f20b5ca5fe511eda8aa220939dd8194937eb65e8bec34bf61280ddf90722563ab037
diff --git a/sci-libs/blis/blis-0.5.2.ebuild b/sci-libs/blis/blis-0.5.2.ebuild
index 2c8bf1dbc422..2ac88177874b 100644
--- a/sci-libs/blis/blis-0.5.2.ebuild
+++ b/sci-libs/blis/blis-0.5.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit python-any-r1
 
 DESCRIPTION="BLAS-like Library Instantiation Software Framework"
diff --git a/sci-libs/blis/blis-0.6.0.ebuild b/sci-libs/blis/blis-0.6.0.ebuild
index 4d56f5622120..7c50cdadba05 100644
--- a/sci-libs/blis/blis-0.6.0.ebuild
+++ b/sci-libs/blis/blis-0.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit python-any-r1
 
 DESCRIPTION="BLAS-like Library Instantiation Software Framework"
diff --git a/sci-libs/bmrblib/Manifest b/sci-libs/bmrblib/Manifest
index 36cd05ec018e..f89f228c9765 100644
--- a/sci-libs/bmrblib/Manifest
+++ b/sci-libs/bmrblib/Manifest
@@ -1,3 +1,3 @@
 DIST bmrblib-1.0.3.tar.bz2 51246 BLAKE2B e2adc970523b33c88b73451b1c3d50c218e4600e0e1019bb6fa4dbae1c6a6737bcd1661bf68b6863a1199c46f3df1b0ba36c155efe1010152e120ccc23b034ab SHA512 b03ad9e4ca035439165ebd1b7ba93ede427b2a233a4179be4e8089db988f1dcdce68b1e97348fe22fe7f2c3827ed003b654e0674a4d16a9e32a8a7c255c4b248
-EBUILD bmrblib-1.0.3.ebuild 432 BLAKE2B 2a6277ac5a885da14b5765b8ff131fc2697ce49dde4fe2c588a8c81792fcf3c09be6770acb2e806248982904dc249a90351a24f1e0c4667ca1ab467ed2a002ea SHA512 0ac5e1b863afee773e62a30c4075ee2ba5cac7c0f8bbfde3f82ac1da79258750fb0a35e8f5c652807d6077d39135772c981137dc8acf0074fcf4646c57946997
+EBUILD bmrblib-1.0.3.ebuild 423 BLAKE2B 2641bd9dfbc31b3f8ba1fc79b207126772067ba042597a906021f11db824e89642b8118e2f9ab414fd017288413e2603e5fcfba420a13732bda7d7eda45ea474 SHA512 81ce3293ee290b4c0aebbba08d3f203d5501129a13fe6b4c3733c08ba45f595ab9b8e571bcbd880599783a9e46f1170a236a23082f3cb0e07d0b8f3d5c80b74d
 MISC metadata.xml 697 BLAKE2B 6448efc90859f836649dc91366bc8662fbccac80ee2079880078238b2c9bd7897cb3337aecc727f2dc2da2f8916e766c25bcd5703d1b0eb4b263c3e3481fffb7 SHA512 c09f4efba0b36032d60b363ff7f18a6b477f6a321c7d8069ebcc4bcd0deee1448c1230e5651371a5748cdd66c9032e8ff7c480dfa3af7a712503f3589d282f28
diff --git a/sci-libs/bmrblib/bmrblib-1.0.3.ebuild b/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
index feda6a9d2969..3211e7e10710 100644
--- a/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
+++ b/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
index cc57fcb1de30..a48f96475c5e 100644
--- a/sci-libs/btf/Manifest
+++ b/sci-libs/btf/Manifest
@@ -1,3 +1,3 @@
 DIST btf-1.2.0.tar.bz2 290915 BLAKE2B b9bd3781bfd4fc4924ffb7ee52dc517a6f2ee169daca2a254510d4fddbc9a312fb40de4cadb9ac119c1dee6e3042e9c349ca805f509a958613472f1e423a7bea SHA512 4c2dcd5abf7a72485267a666e679545a5bfa8a20dfbf75a939c92547bdf960d40b6ae93cad23ac44f791e515a13f26c1dae446d3ba6e89b3d1f87d91d4dba50c
-EBUILD btf-1.2.0.ebuild 547 BLAKE2B 837167200c6114d3354235945a0a5eae4e0bfadb9d6bdcd0c11e8e3a1d4817483a04ee9de46712a539ed028364f1a444fbf4fa64b57352faf20d1b1bcb2bb3cf SHA512 ec199159065555fc949db47c06baeee8f30d2b619c4436721f169df082ed41e57e88deac3640893fad570e66f68aa2037b1397b945ae7be36d5c7a25e208ad4b
+EBUILD btf-1.2.0.ebuild 542 BLAKE2B 0c68190981b2db131e18e5c1084e0d5e6fa1db4aaa33ce417078f88b028452ca9bbc4f50b68c14879cc12e0255a1c79178621c5c025251b6f1acba71cf014a4c SHA512 740f280706e53eb3f3803dd1c6c8a9cfbc8044c4125191a68d5134c851946852553bdd0011ad38b45e2725d33b57c5a705c35f769dd61a2f990c532e0daa0b5c
 MISC metadata.xml 534 BLAKE2B b44c9cb7157ca2496f928f0d4580619991bc3ecc235fef6bca6072e0cd58c2be758f85dd0e4e62552218052db67fe7a24d15c7700a2bcebc88328feb6db93f52 SHA512 90699362212549e8b25ceffbf0df32253d10b5ea2203613d3bbffe5c2e7b228135579be0a63c563083846e8960d9b0594b3e230bd5ecd34100f42b08edd34b50
diff --git a/sci-libs/btf/btf-1.2.0.ebuild b/sci-libs/btf/btf-1.2.0.ebuild
index bb12a9bd3e57..3144388ab48f 100644
--- a/sci-libs/btf/btf-1.2.0.ebuild
+++ b/sci-libs/btf/btf-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS=" ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 219dac19d9c3..55f1808c5249 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,7 +1,7 @@
 AUX cantera_2.4.0_env.patch 3559 BLAKE2B 07af1b751b653b1c92288286b9c82ef230ea0df7d9ea4036d23ac24338a221cc45c8e74f137fcf741bb9bb7148e7f3339f54234e9a92ac939956ba7c0ca8e157 SHA512 f2574c3de42d1666a2b64914c66d97045a2a3598f63678b3b60a701d111d7bfc9bd71031dd665a64e6791c9f311fb9514b1a0462a5713763a1b5f87fcd72e528
 AUX cantera_2.4.0_env_python_install.patch 1001 BLAKE2B bfe6e69332117526d8a7c330ae9610e26e72a9e250ce04beda564149fbd21f3262f36982971e5ec0c552e09f12804172b7f978ab03bfb98c0dbe92cd8c7d9401 SHA512 410a81b4ec69eb6eb2a60d55d142b266b836da5a7d4e4ae2fd8844fb87eff0f3544f6e370fc354d334c6cd5a61f8364842c8a9b3bd0dc2290f58ee7392a170f4
-AUX cantera_2.4.0_sundials4.patch 7492 BLAKE2B 995142708ffd02bb3bfdf94b7cad545f269b4c20ffd4c325109637d61e3544d343d0135119388a4b88dc3b037f054854064df83aff381bac6769ec62b12ebf2e SHA512 24afc5d5944966140d191b2250768e2e1331b4db5d53b2dc204b0c1888ff2a328e1dd467b69616d3aced51e6108e38bc1fd2c3a102bf3a02b4c975b677ea73c5
+AUX cantera_2.4.0_sundials4.patch 7498 BLAKE2B 8a3fa5ff6a07987bf4d35f0c6362e91414be513a79150526773f8a141271ffe772efbbb7765fc888043ccc2326e89f51a14f2eaf40765c1d05d5987abf5942fe SHA512 0ec9d7f0a0818262ebf2d694800fd6f5a438ef9a501c122ffebe703271cbfd50cc8db20fa28f9674e5740f768df9f3e5fec010c46703c01e4bfff7aea0a4c948
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
-EBUILD cantera-2.4.0-r1.ebuild 2855 BLAKE2B bc6d8688fd01d8baf551a3949c34a6bf511bfde34de650415512cc3ed88e1a869e987bba1031df28967ffa32f9e0e04c5be5620e063bca58b3af8128e6936e0e SHA512 561b7807efe9fa44f34c8e320a7dd2a591c8013081ed7539504aba6be8e0bbacb4fc37c08e38104578341fe3575c0e4afa1f3dc11b29015232689bc1a01a4cfb
-EBUILD cantera-2.4.0-r2.ebuild 2953 BLAKE2B 29f8087e5598c0b55762613c6a8ddb6ba7df1636bd46cb81448ca7cefa0b064e8397fcd71400f7fdc20a296c81b20124bdb1fb8890347881355476551cddb29f SHA512 22272df2ab0c5f349a03fb4f221bc4228ecc160ac17b1040ee0217d3dc4aac4ececd688d10d8bac969d293fc04cc847b28f4325a11bf703d833d81b920b7b264
+EBUILD cantera-2.4.0-r1.ebuild 2853 BLAKE2B e3d82310324f9d2fceef870afd681a6f5a9da6c2b56519e6cd5178955601c8b0d135e9f7c9ca3d446cd47a60f30c47e72cae689e0ff9d500081e26722a700796 SHA512 06682c35592aa9f89c9fe26dcb3a1730a2e18a2ecca32acb9138198b9b7eb9a76e9dbd24c1dfb6e2723eefe17872a6c9fc1b7d07cedbbcb9b57e7fc43b58c7f6
+EBUILD cantera-2.4.0-r2.ebuild 2952 BLAKE2B 1fda0f1671adf6ee5122d3f38e7d89136ab05a052a95c57f0288266e1d8e08ba499465f27c032295476e89d0dbe6fe5d131024da1703ddcea0d2b44c7593c639 SHA512 545d7c5509d29bfcaec47be5e48c6f1189fff02da79f1c580907f9d6bb8f86b8b20fb1b0af1129b113d9b030eae4f22f85bd0d8343a7856f0e82a6f6c36499f6
 MISC metadata.xml 794 BLAKE2B 4a92fb553aad7d87d4b7a8d77974dbd67d593b4010783f96324979d9c01067bccc60d2faedf604bd8d44a8ac4316356879301899af8bc08d0fcd548df6d3762d SHA512 a9e6f4e161519d0b3618fe8da7065195bc760ba889fa4356358d4047ea1970eb5fd78bdc5fbeb7c660f1bee48a68ab20ced636514e6f12848e88f6f4dabc9705
diff --git a/sci-libs/cantera/cantera-2.4.0-r1.ebuild b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
index 2242246e3672..edaded328a20 100644
--- a/sci-libs/cantera/cantera-2.4.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD=90
diff --git a/sci-libs/cantera/cantera-2.4.0-r2.ebuild b/sci-libs/cantera/cantera-2.4.0-r2.ebuild
index 2f6a89091503..f82bfa086396 100644
--- a/sci-libs/cantera/cantera-2.4.0-r2.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD=90
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+cti fortran pch +python test"
 RESTRICT="!test? ( test )"
 
@@ -30,7 +30,7 @@ RDEPEND="
 	python? (
 		dev-python/numpy[${PYTHON_USEDEP}]
 	)
-	<sci-libs/sundials-5.0.0:0=
+	<sci-libs/sundials-5.1.0:0=
 "
 
 DEPEND="
diff --git a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
index c745f6b6f7ff..0345a98e2527 100644
--- a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
+++ b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
@@ -47,7 +47,7 @@ diff -Nur old/SConstruct new/SConstruct
      # Ignore the minor version, e.g. 2.4.x -> 2.4
      env['sundials_version'] = '.'.join(sundials_version.split('.')[:2])
 -    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2'):
-+    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2','4.0','4.1'):
++    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2','4.0','4.1','5.0'):
          print("""ERROR: Sundials version %r is not supported.""" % env['sundials_version'])
          sys.exit(1)
      print("""INFO: Using system installation of Sundials version %s.""" % sundials_version)
diff --git a/sci-libs/ccfits/Manifest b/sci-libs/ccfits/Manifest
index a08814befe9f..38f5e1e31d16 100644
--- a/sci-libs/ccfits/Manifest
+++ b/sci-libs/ccfits/Manifest
@@ -1,6 +1,6 @@
 AUX ccfits-2.2-makefile.patch 710 BLAKE2B 8368c98ecc0b9c7e2d56ab43473a8b3d83d16e6683e5f58da6e3a25ccaa5353404ae6b8e3c457aee99ca5b6af3ee228973ea2d0aa9d990aa8853032e204ea63c SHA512 ea4553b9a794131fe1b90172d49623bb97c6d78c52a3cdbdd43c8bb3ec23ae535081a981f83c61d425fc9fe1b6258e7ef78cea580f7df302893840ab3a35e7e5
 DIST CCfits-2.4.tar.gz 1792643 BLAKE2B 5304789d01278884faa9765be3f22e03e7a37370f0f3996045a663d5793a1686ce4c2d379227bae57bee5643ac398242223cb0300337f4ad67b662679019e92e SHA512 b12d455bb6dd631056e02a12e996d3bf0b6169f8922011e4b64f979b08d2ab8f405e14947c6f5d26ad18bf2f5764854a84987ae105944515f533fe6b0b4ef7be
 DIST CCfits-2.5.tar.gz 1416358 BLAKE2B 4c525761f98bdb133f8d0c5fd582db5326dda84dc103a7c816cdf8d1a1fa02ac5b8e9c9431629304e3eaf21b4ec9767796c8b2cc8d22dd877a2e043084cae683 SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5
-EBUILD ccfits-2.4-r1.ebuild 890 BLAKE2B ee8e7b2adca73bec3bf05accba4602395f30331983d6d6b99c3839e19f47a7c6923b1d469e01b9070a9ed4170bdfdc24a97ec02e8211e8f858a782885cfa6d9c SHA512 15ceb8dc21c396b87f1f167184271ac7276f125443fb4406a3ffea95a6582ce86e5f0f0817bb28308427ba82478cca8cf49600cbcffcdc0b990a9f44050ef460
-EBUILD ccfits-2.5.ebuild 902 BLAKE2B 37f9c14a0024e32aaf4d64a27c63ed57e7ca17770df99a4f128e9c4f0bb8b99c88fea0c16ecd197ff653693ed44f2de5b3712d25bdeabf5106cfa67e599e94a1 SHA512 32253e04a205817471c0d4d52e352ca606f67484dd399d169ae978a62dadf97f7d37aa13433dd5622172a52944582e3fc144aa3a83e361eb55780c7f510d3490
+EBUILD ccfits-2.4-r1.ebuild 922 BLAKE2B 1e60367bb9934e3f03ff3133da8a0089fd7555f4ba4f1fcfff5c77c4b40035d1a244f377b17a2b0f86783c7de28f81985263703c6d52c31bda345ca9cb2009e1 SHA512 7eb3e8b31567666cf401c202959c27baca7a1eed5ee4061e259b8092835087dbad6a5f16d4c1d53b6aad7cf34cb724bd012aef160497c00215ac066b359ec2a5
+EBUILD ccfits-2.5.ebuild 934 BLAKE2B 310ae44fa50cfbef569218ac32531ce4be18f8f3d0e54df29a5dc94286be305faa79d141f7e73a69909a1fef5bc29b48052575e7bc67a3217b7ccdefc7b65c05 SHA512 adef3bcdf14ac8aeebd1720aa132e839b9d2a6c153f8fd933b56f7b466949981be82710f2da8ce70fd3d6acce7641bb5c4a0571b3bcd92d208fafe952631988e
 MISC metadata.xml 639 BLAKE2B 6cccb8d66f9dcde2f82383b919dcf67122a8d27f24641b262899831bc60b19b4cf433df5e1d05fcd2a140b20bfbb5a1add4bee162ba7574834a50c455f983a85 SHA512 163801f94ad9076cf5306b4f06682fc7186e724704b4ad1e5dfca871fc770ed0b06827caa2aa83eeebc7bb65b5bbc27f254431d6472735abb30f0872eeccf721
diff --git a/sci-libs/ccfits/ccfits-2.4-r1.ebuild b/sci-libs/ccfits/ccfits-2.4-r1.ebuild
index 30ea37fa12df..6707c94a1e98 100644
--- a/sci-libs/ccfits/ccfits-2.4-r1.ebuild
+++ b/sci-libs/ccfits/ccfits-2.4-r1.ebuild
@@ -10,7 +10,7 @@ MYP=${MYPN}-${PV}
 
 DESCRIPTION="C++ interface for cfitsio"
 HOMEPAGE="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/"
-SRC_URI="${HOMEPAGE}/${MYP}.tar.gz"
+SRC_URI="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/${MYP}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-libs/ccfits/ccfits-2.5.ebuild b/sci-libs/ccfits/ccfits-2.5.ebuild
index 5f2b6eb51712..c34cb59ced16 100644
--- a/sci-libs/ccfits/ccfits-2.5.ebuild
+++ b/sci-libs/ccfits/ccfits-2.5.ebuild
@@ -10,7 +10,7 @@ MYP=${MYPN}-${PV}
 
 DESCRIPTION="C++ interface for cfitsio"
 HOMEPAGE="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/"
-SRC_URI="${HOMEPAGE}/${MYP}.tar.gz"
+SRC_URI="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/${MYP}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-libs/cddlib/Manifest b/sci-libs/cddlib/Manifest
index e188ea0885cd..c99a16d6f548 100644
--- a/sci-libs/cddlib/Manifest
+++ b/sci-libs/cddlib/Manifest
@@ -2,8 +2,10 @@ AUX cdd_both_reps.c 6439 BLAKE2B bc370bafb19869bd72c2926dda0c9216a4fc768f60fd1ca
 AUX cddlib-094g-add-cdd_both_reps-binary.patch 1210 BLAKE2B f0e8c1cae6cb108b3a77a5ab629550115acf21320fc0b288ff86f1ccb9df617ee4caaf20349270d27f66d965b94fad8b0a2f18ba344bb5b6e384554c3aa0060f SHA512 c69c6d2ebbfbf132a287032ac1470fcce0c0d1e000dd96501f271ff200034567056d3948626023722c83082289f40122b0eacf35d10d2497f36ab226a9316348
 AUX cddlib-094h-add-cdd_both_reps-binary.patch 1601 BLAKE2B 9d4d3784a758bb9b6d156550cd56b6e1b39fb3b82e5002344c3c3d8025ca6f3b57201a414cf98f3fec9a88b8268ff4427a6bc2ba96e91df06f6618faaf4573d7 SHA512 ccd75d42aa3bb1f753197fd3be7a6561f0bf419396cfbd42a6072b9d27955c5d80eff71622c6b54b26ed6cbe03544ae3bf61e0773c5630f1ce964845e71f7015
 AUX cddlib-094h-enforce-no-gmp.patch 1155 BLAKE2B e2111bd137f5f85c964023f63fe3b9da8bf0c5b5915051422faed4246d240006c87dd05de214a6f13f2ce4a7d1f804168d90020d32080ad121386d7207d37d4c SHA512 113f4d9cf812c46663a87e1c22c56e41717ac93b1e022f99ad011917cf96cd25ada7670e3270a40f3b9dbdf8e88e6cefe9fcc03971f0cf17488c9a59a1612de6
+DIST cddlib-0.94j.tar.gz 1364746 BLAKE2B 60e81fccf8abd8d60fb7261d1d2d61b7ad2b60285e7dfa760905e2cb5b01f1570c27920728c12fc6994135e4b29ba8e1709066ddf2e2eff00f8f48b093ebd43e SHA512 b82d5e06538a29143a79f7ba7287a1784292e28f086071041e500fd81387a30c3fca6fae9049752f57b62d50b385d73681276d42d24941e3a43893da00452ea6
 DIST cddlib-094g.tar.gz 1383388 BLAKE2B c26f201f0369a931d672b192d6fab775210d2758e980cf867cf64f34d2ff3b23d862942507ae497c37723cdfe0c7beb55fe5d6cbe02349f576349579adbd4166 SHA512 e1053c6e34f79add53b2880c7664f9c20c0a6de636aa5de4c6a9dfc4d1d241221601c37d15e1833bcd5b1162512c3fbaed4046f771bc0a1e5753b713d6840b77
 DIST cddlib-094h.tar.gz 1678116 BLAKE2B 619e26745c04338d97fb4ce2997c23a16017ed19e14dda24c9ef90b84253d5540361b4ccd68eafb65b6380cff95b58e9ec2bf587643e71084cd47ed87bdffbc9 SHA512 22160c88832b78dd568b58c1e097e4c6006f82580f1114a3ef03fc10bde98132337d5b555306b58b65aac6fea1534d9e09725907808c969de16c2dfc75f80204
 EBUILD cddlib-094g.ebuild 1014 BLAKE2B e53740d143751c2a96efa2613e5d1df912805b44cb690f576c5bf036fcece1f708a92fbbc9cf5f20c05e66dce158b2e2a88fd65e4f33534fe25c15d156727c8f SHA512 f59749d1d10d844dfd97eafbbb1a752424f26af88652ff52d6f8a1fac2f1849051184a68c03f6bc82f548d0b550f12623c9ecce6c1e0aea2b1a9683779e57ef9
 EBUILD cddlib-094h.ebuild 1133 BLAKE2B 691775959804f7daad4349aea12a1b6977f82439d4e1d2a791fdf2b74a5f7e27ca0f7c927c758b3e11783a26aa2c8bdc4ec18985ebd0f2fe8de5dcc0f5cf6a15 SHA512 82955079415a3be974df9393350cf0e58dbf3c5c84dee1460e4db0c6f96049b71798b21e9b4d6f986a3f6e65cbb652da2fccc569a3e34309fd0d1316ff8acc94
-MISC metadata.xml 1238 BLAKE2B 9ba70dc687c1759fca96fabab7455f0156c23913059f3953fe1f12c2f2cf5e69327c65d1525cac918aad06aa152efe7c078d6acb244e6918bd647e70dec7fe92 SHA512 f9422c30988d6e2ef87f650906dc500fd3dc8203745c5a8e261dbce3dd2daa307c9e8245deb64dad70a594a92f78ec2add3d77aacc94d2490ac2e9c1bfe1e4b1
+EBUILD cddlib-094j.ebuild 1399 BLAKE2B a226e70edb7db2206c6f81dc56da1ba066300167f5d08f75c99907a1930b13c2eba9bfe0d56d97bcf8a5113a9b342f64a5bf798908ccc3787eb60b727d2edd37 SHA512 1a976453e9e94dbfe84860b39c242e3e5c09b343a1cd6d0db2f91be1e1bed7fb07e12eb86e5fd690eb588462d96003a45c2ae5b14a31ef951930689530207189
+MISC metadata.xml 1817 BLAKE2B 3a75a0a27708d31cf58ec067ad25ffce663b3d52f90dd2437ce529bb4babf49a6e0461eee6841ef836f37caa2f7e4f62a762ea61094213fe10f9cd1e16951d99 SHA512 a50ed995ba248cf59ae3b2c2d5a8f91df9b08bd03cb48a14de0eabc79b44091d425b41d980952ac3eea6182e12ca235985f347bb67ac109993a47a545d1c4289
diff --git a/sci-libs/cddlib/cddlib-094j.ebuild b/sci-libs/cddlib/cddlib-094j.ebuild
new file mode 100644
index 000000000000..73468ab72e6d
--- /dev/null
+++ b/sci-libs/cddlib/cddlib-094j.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This should have been dealt with versionator in the direction
+# 0.94x -> 094x - now we are screwed.
+MY_PV="0.94j"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="C library implementing the Double Description Method"
+HOMEPAGE="https://www.inf.ethz.ch/personal/fukudak/cdd_home/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs tools"
+
+DEPEND="dev-libs/gmp:0"
+RDEPEND="dev-libs/gmp:0="
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if ! use tools; then
+		rm "${ED}"/usr/bin/* || die
+	fi
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	# Nobody wants the dvi/ps manual...
+	rm "${ED}/usr/share/doc/${PF}"/cddlibman.{dvi,ps} || die
+
+	# since the PDF manual is installed by default.
+	if ! use doc; then
+		rm "${ED}/usr/share/doc/${PF}"/cddlibman.pdf || die
+	fi
+
+	# The docs and examples are *both* installed by default, so we
+	# have to remove the examples if the user doesn't want them.
+	docompress -x "/usr/share/doc/${PF}"/examples{,-ext,-ine,-ine3d}
+	if ! use examples; then
+		rm -r "${ED}/usr/share/doc/${PF}"/examples{,-ext,-ine,-ine3d} || die
+	fi
+}
diff --git a/sci-libs/cddlib/metadata.xml b/sci-libs/cddlib/metadata.xml
index a93a12f9174f..eebce0ab1969 100644
--- a/sci-libs/cddlib/metadata.xml
+++ b/sci-libs/cddlib/metadata.xml
@@ -1,29 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <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>
   <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
   <longdescription lang="en">
-    The C-library  cddlib is a C implementation of the Double Description 
+    The C-library  cddlib is a C implementation of the Double Description
     Method of Motzkin et al. for generating all vertices (i.e. extreme points)
-    and extreme rays of a general convex polyhedron in R^d given by a system 
+    and extreme rays of a general convex polyhedron in R^d given by a system
     of linear inequalities:
-    
+
     P = { x=(x1, ..., xd)^T :  b - A  x  &gt;= 0 }
 
-    where  A  is a given m x d real matrix, b is a given m-vector 
+    where  A  is a given m x d real matrix, b is a given m-vector
     and 0 is the m-vector of all zeros.
-    
+
     The program can be used for the reverse operation (i.e. convex hull
-    computation).  This means that  one can move back and forth between 
-    an inequality representation  and a generator (i.e. vertex and ray) 
+    computation).  This means that  one can move back and forth between
+    an inequality representation  and a generator (i.e. vertex and ray)
     representation of a polyhedron with cdd.  Also, cdd can solve a linear
-    programming problem, i.e. a problem of maximizing and minimizing 
+    programming problem, i.e. a problem of maximizing and minimizing
     a linear function over P.
   </longdescription>
   <use>
     <flag name="tools">Add a few executables and tests for cddlib</flag>
   </use>
+  <upstream>
+    <remote-id type="github">cddlib/cddlib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 1e9c30bbee21..61b7ad2ca3a7 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,5 +1,5 @@
 DIST ceres-solver-1.11.0.tar.gz 3944965 BLAKE2B cafae018abde9b8085f7e8841a6a720ef52cd40178a43c3050b6b20465bc9675cc326a6bc405572a235758c5f2f99e936375f711bf5c4b121acfe0c0641713c6 SHA512 4941538e6ec31e2ee56a24446748dc5d6dd02ba9c151e4320a2db943fd1a377455b0ee23d56780e1f05322b30e25057145c540fde901d7fd2244ec630a73527c
 DIST ceres-solver-1.12.0.tar.gz 5008861 BLAKE2B 52b3954dde96386bd031543ab9d7370368f58f76f1dec9d24ef10803da787cc96f40a1c775626fde832b70ebd94cf4274c70a8fb4bd7e1bcf040e119cbec09f8 SHA512 485eece0471cf05d31b5dd7e133e23115a334a4ed557a3c1bd0b715a063f840738af8f507e935522a0dae90ce6851984c0002a25e9b445b90889792f68a05571
-EBUILD ceres-solver-1.11.0.ebuild 2410 BLAKE2B f4ef50b480c80873742e73f32289de48e3a9a1ad88504813fa1770e6ba29a5a634d6af4ab477a3754327067b12fa4ad907cc978dd31e8838eb0ea2aa8a204bb3 SHA512 cc1be122eee85fdb08490c4cc98ee9f08cb9996ff216ec8c6c9a6e755c88434a0362d471c41d4802c794dce4a2b7bd61debb251be1f051fcbe6be16ff3ac2c9c
-EBUILD ceres-solver-1.12.0.ebuild 2420 BLAKE2B dfc1af700aa4f052632f4d027197928b6445f881b148fc5a25dd5ca90baa7a62cb4221f75593c6921a70d7d422205ba1d7d5e4478ac1709269e08d7d4ddd8682 SHA512 36c4eb5be0e185fb90ef49adbd83bf486dd1e93e29f474869ef100be4ecda7167ee5e7d951ac256a64d08b409a1aed2915c1268edb88f07e98c8cdfee6c49a37
+EBUILD ceres-solver-1.11.0.ebuild 2412 BLAKE2B f4aec1265ab4534a65b768e4b4da9546e8ef4fb68b918488e57ab494c3f0b30d179dba1dc68d9c45630396a66ef535f8936b31c68962530360337f2c1c48b469 SHA512 a15c6ef0f7d97ef7515180b085979efb7c55327038cf380101bc7e856cf660c2f60d3d869470bd63f38fe82b6a719857828da60ddacf06b18b6eedb9482cb1ec
+EBUILD ceres-solver-1.12.0.ebuild 2428 BLAKE2B d84c0f0b172a4e3311c806bccc4874a34f05231f61f5948bef766fb26d84b0428c609d807ff6417334fd21db74ba2e971b355891f496676575cd15cde94fbb05 SHA512 29259316f073da03ec859783dde0d3d20346a931f5dc1493b68d2073cc8b1c552f8a6e7e36b86d05963069208e043e63643dff120ee36401ea036a10650197c6
 MISC metadata.xml 1525 BLAKE2B 46de33a7fa6513877e2427442e918d8e39871a6b6b8a15a18d14dcedd55c42bfb1bdeab7e1cc57c0ac03ba06d5c3628dd666b6f0787eac5c9dc75785e2a9e471 SHA512 4c95aef23ce327f9cd11b53638e1b6485eb789cd296ad8a571278b65c9001465f56c97b97db6e2c4a4ed76336f0e33684958adef593d74193cb73930e7ea5ad2
diff --git a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
index cfcd2588d25a..d8f758d4dd37 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-multilib eutils python-any-r1 toolchain-funcs
 
 DESCRIPTION="Nonlinear least-squares minimizer"
 HOMEPAGE="http://ceres-solver.org/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+SRC_URI="http://ceres-solver.org/${P}.tar.gz"
 
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
 SLOT="0/1"
diff --git a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
index 225ebefda327..175e6a1cec4b 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit cmake-multilib eutils python-any-r1 toolchain-funcs
 
 DESCRIPTION="Nonlinear least-squares minimizer"
 HOMEPAGE="http://ceres-solver.org/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+SRC_URI="http://ceres-solver.org/${P}.tar.gz"
 
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
 SLOT="0/1"
diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest
index 0115f6725cfa..f40a3a8e33d4 100644
--- a/sci-libs/cgnslib/Manifest
+++ b/sci-libs/cgnslib/Manifest
@@ -2,4 +2,4 @@ DIST cgnslib-3.3.0.tar.gz 3314889 BLAKE2B 3b8af11e04c211ca60f512c7995e9b23e0dd79
 DIST cgnslib-3.4.0.tar.gz 3393312 BLAKE2B 279d4502ff70701df6a266495ccc7750e9c51ac14bd3d5072ae8e1448b4f1e4afaefaaf254cf0afe1cc984e4d9fc7d5c161f7696f62726aaf567990ded3c9056 SHA512 e26cfb0d9f3061242d327a6c18fe40ed51bf63b61ae0d6b5cce7e6b4aa623b00e1c3fd9fe240d993323c6f4eec043fde5296a82b1f9108027f945300eec541ec
 EBUILD cgnslib-3.3.0.ebuild 2000 BLAKE2B 46ef19a44d29f372e00dea7eefd869e6eb7a19368b9660fe98f905954478b1b2b64235bbc0b385cf8a4b2a98f3f6460d8eb090ea9824fcbe0dd469a210a92223 SHA512 b0267e8f0f1e69cd6008a650c9c9baccb7efbc360d6a81c5a8fb29c5d06b829c834066d335c05e4162d486c34a02ec0dd25059991653182779097d8f368c22f9
 EBUILD cgnslib-3.4.0.ebuild 1943 BLAKE2B 37b583d0eab7c94aacb3cc9b4aa435c7ce21954a98a66f157881e71ea7a063cbad4b32a244b12be831a641e68042f86dbfc88a617714ba113e63d4f3ae94bbe8 SHA512 3eb50cc045678bd10c93fe269b8b046d1a924e954e39f16cf2f0011ba2c8297cb187d368b69784a8b60a765edf79352817abef2c50e4ab56febb9bbe92437895
-MISC metadata.xml 1202 BLAKE2B 812a82c8a2d93299ddd4c3e93913055971a18db1e3cdf581b9f34f6ba04dda4eda647b5762ee4509e1e48c6f3e823921ad3d08503a879feb26890c8eff3b1589 SHA512 320b2e7940f9c3ef6a47cbca31cdee70d97b38291da3f4552fd159d83594b88ab347cc71e22d50d7bf08e44a63d6b4b90bbf5e96c5a0d9780d2407d1ecf02a05
+MISC metadata.xml 1126 BLAKE2B 9ee9f1c8457293509d5b8cb4c0b64b4f1dcc7b4858d0f7ba99e79388118be318b8567719ca7deffa8b161e5d0acbba125c63b07baf61864e77f0ae6502f74a34 SHA512 969a67120b9dd3878f479e9ae2e2274c31c477660f1ffec8f67bd033ccd5d35588bd454b8e82efcede970c1393336c3c36f66aedba07b4d8c1b93c053a78efad
diff --git a/sci-libs/cgnslib/metadata.xml b/sci-libs/cgnslib/metadata.xml
index fa09f9d33bba..855392f824c3 100644
--- a/sci-libs/cgnslib/metadata.xml
+++ b/sci-libs/cgnslib/metadata.xml
@@ -16,9 +16,6 @@
 			cgnscheck, cgnscompress, cgnsdiff, cgnslist, cgnsnames, cgnsupdate, cgnsconvert, adf2hdf, hdf2adf.
 		</flag>
 	</use>
-	<maintainer type="person">
-		<email>slis@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/sci-libs/clblas/Manifest b/sci-libs/clblas/Manifest
index b008b3dacfd1..643f9a67796a 100644
--- a/sci-libs/clblas/Manifest
+++ b/sci-libs/clblas/Manifest
@@ -5,5 +5,5 @@ AUX clblas-2.10-fix-pthread-linkage.patch 684 BLAKE2B 6f50b130f57a3a36a202c516bd
 AUX clblas-2.10-use-boost-dynamic-libs.patch 579 BLAKE2B bd7d7913b72baf15dd733a75050a5981c369fd42ea9c4ad2e6edcc084d52476b65a0b7269ce6c6083fc8fd86c2e2df0716cf0db9a645918c55b52e23165aebd1 SHA512 a07163684bcf69dba8c2df69d120a25ca7186104d40c27bf4d0267a21320460f3585d3fb1fb132df5cc5a1bca2905623c0285bffceb125c1f7d89129a3cc4f65
 AUX clblas-2.10-use-system-mathjax.patch 765 BLAKE2B ced4d5efddcaae15a5844bb2b2cdf32f03f117d394ee9daeffa5c4f0bc10310e7898a2c305774970263cc9e1d3d7e247d23cf477dea906d64af45395d6770807 SHA512 156a0a664bbab80a17f3032c759656769eee36db0a93e4fd4a983eb584ef56d2023aef37b565c8cf81adb507f00f6b83ca9d31ace66c620f2279ca82aa512744
 DIST clblas-2.10.tar.gz 1154117 BLAKE2B 67035b03ab3a8fa07f32cb8d1d40af39fd885ceb21d9754f8a49a62adcfacbeeec703dfdae922ec0fc915a2dcadff2fc2f07a6c5ced74db3da6cd85c6c63f4d5 SHA512 5ed43104aae565292e0df4cc9e014cf483ccc0ff89257ebb5817f6508bfc9593585ed658da639f2167fbfb5d92ef116be4d5de3694f56e1a1e228bd42b1c05c6
-EBUILD clblas-2.10.ebuild 2384 BLAKE2B a8a68971e820255866a60c112bf0d188cd376dcbdfd609b5369523709dd81151e5b3bc9f611c5e6ae2e8f027e0bda329583d24de23fbfc552ae6244fc309522f SHA512 c434c53534d444e3777a97efcd1551491d6deffc528e472b468ffa5210b9c002c866361103139a2a09e50ea3f81a5d241ecf422147795465c3f09d0f49c35032
+EBUILD clblas-2.10.ebuild 2380 BLAKE2B 066cfe1abfcaeb46614a681af8fb5ce2773e983a930ebb60deb003cc556e2bd80e0c8146bdbc3cb5b14fc58cd2ab04caff4c801926e4f21be2d5b9a8e4e301f0 SHA512 feeacce5e8c8eb9b254ba850a524fbe66bf947b6db4d22a6bf82adeab33fad86e1c37b9bebd9e0387ba74f68c176eede25444d1ffab8a7cb6944831d2be75534
 MISC metadata.xml 1029 BLAKE2B 9f21ddf2d9d08fccdf4f40c7324feaa5dc003a8ee0abe35f6158e3d9f507edb593f89216802ea04192486615ef5effb9ce5d70d42d4da5000c246be4db5c4e48 SHA512 62e2f6461060977e68d8f175f40d8de1801f5c4f635e33817ffb04dba9b8a19747bcd99206972e21b8780f5f0499290ff8b0d46bf5bdc1463659a8dd5cebb483
diff --git a/sci-libs/clblas/clblas-2.10.ebuild b/sci-libs/clblas/clblas-2.10.ebuild
index c9341e091ed2..3211a5ab13e0 100644
--- a/sci-libs/clblas/clblas-2.10.ebuild
+++ b/sci-libs/clblas/clblas-2.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 FORTRAN_NEEDED=test
 
 inherit cmake-utils python-single-r1 toolchain-funcs fortran-2
diff --git a/sci-libs/cln/Manifest b/sci-libs/cln/Manifest
index 2134429e76b8..943304a6380a 100644
--- a/sci-libs/cln/Manifest
+++ b/sci-libs/cln/Manifest
@@ -2,5 +2,5 @@ AUX cln-1.3.2-arm.patch 340 BLAKE2B e66f245944e4a21f87c64d6c79f8b11fd55d8733fbc3
 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 1301 BLAKE2B 366f4f7bb3eac07571eff80399c100b10181c49cefc8529acd52c8f97b9a8750f222c6312df1d957a291ea49ea7f89c0656f20f03dbcf08fb17c0e84641f48b1 SHA512 2cd9a893ba779bc9b89025af6ea80c00d78fe08465aaca4eaa9c2ed46cab1a0f8dee67a74e69350b6b8ef6bad7ad51144542e34d7149d9602029cd214c8920e3
+EBUILD cln-1.3.4.ebuild 1297 BLAKE2B 01921ae544e01c406ad4d008de4df2a78234e9e14dbf4596f41139cd431de26d28c5d189843bcc9d272e617eada8cfea8a847132680b7d6c3e92fa77ae19bbe1 SHA512 6db83ec560633c56939582f1198b07e7dc517f959246f6b813160ffd05b2a7b24aff1cb8ba2852082f6cf6919a1db0c53dc2dd54ffb36918fd0710c3d3025ee5
 MISC metadata.xml 702 BLAKE2B 597b40fd2f7f11ef4e6ec7d0c523d2eeedb9a2cf6d2a663616dc45e891368136b38cb7760c588a7fee0880d6bcab6acace1771ad4d108ea6d52eff0abbb7e08f SHA512 4b6ddc8f558bc777963dcf271584ba59ba3d8cc3c2c95260a5680eab2a436dca894a2318f5bacdd9c9da68e6c22323d4ef2829b9bb1de0db2467f20ac204d95b
diff --git a/sci-libs/cln/cln-1.3.4.ebuild b/sci-libs/cln/cln-1.3.4.ebuild
index d49041fadf08..8a92dc7cd71a 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/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index ec8c397ecb60..814bbcc267b7 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -3,6 +3,8 @@ AUX dcmtk-3.6.3-fix-gcc9.patch 2620 BLAKE2B 101faae609065ab9e37a4b9edd1363562a4b
 AUX dcmtk-3.6.3-nostrip.patch 7049 BLAKE2B 57d7b4d2cc3bdd683cb6c51c6d9c7e37023ddaf255655cf3f6c1473484d4e41d4a75b3bcb452a3caa06b8c751cfca47a14b0cd10372c1ebde936f7dec3046ed0 SHA512 00f28de0995c2d38b32b59298ac1c97878248647d403df86244d16a16cfd4c7ba47e7fe400592e5ac0f935a3704733a768fa3b94c9625903e86ab5f714d093bd
 DIST dcmtk-3.6.3.tar.gz 6269785 BLAKE2B 8f0797840fa5ab4ffb60e46f65b16739d3ed0cb7591b20cbfba81a59de97344a663f73bed8fc7f349a99accc46fd2fde3cff021861bde6f07957a433a4db67a3 SHA512 5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8
 DIST dcmtk-3.6.4.tar.gz 6402734 BLAKE2B 2d362789e7819089b7da46a9601fa5d53b8e8aab1ac7d30bf1180b3da0645d015a177c97188dc9255c6962a9d7246cf287b20824a78fbe9612b9bc277e68d294 SHA512 735f85d04410437a5163b154f43c8a299aff7a8f810605ce6c5027ae4569ff1323a69f70a2603805cec9d826a31166fd904bb53c3edc1137bfc41ba2902c2261
+DIST dcmtk-3.6.5.tar.gz 6483626 BLAKE2B 6182ef207b42b16ee91e94397cc8a5b2d108435a30d4c86f0b7e39af91186604f16be07a75e176bf50575446abcab21b2f63158dc4e5f2cb6de3996a0881b295 SHA512 c0cf61b0095c5708709406bfef5e8bb82dd01dbf77df7f2af2118004920bda68218eb1e4174bf92941cdae0acdb275c886570dafd29476eee2eb815e9a82830a
 EBUILD dcmtk-3.6.3.ebuild 2039 BLAKE2B 655b3b3d424ebdba0d96f629b2308d1bd5650c03ebf48e575f05a8a9c3295928aff91cf34086b1a2f19a41907ff4811394f6c4622f3fd0ba3b2501dbe5a44d2c SHA512 7b92fda743f4ad39112f440b63db6549547a0e12510b9feb2c2a04cbea1a96db49d3c4ee04a8bf4e61bf500c0a94325332a997cc1f5f2434040b1b6a59b24211
 EBUILD dcmtk-3.6.4-r1.ebuild 1931 BLAKE2B 03b414dc9a763d562598760d9adae6f0ddea24431e13dbc517197ce84e4cf4261edd702b68398040674a7e11bc48b3b21b2564993d579902e40e914c75da1149 SHA512 6cb6d226886c6b7d29366986f6ce319d45f4f96d61b8c794cddcc1867bc8aa3518474c23b8c56e51e6d81bad03fbe309fa06364213a1327063aca852e76897c4
+EBUILD dcmtk-3.6.5.ebuild 1898 BLAKE2B 5f818d6d211393229a6bae8baec6cf79c7df232d01b020b00d7effc7988c4cfb77a4f9ebd79a4bd7523722f5929c6a7d759b6d535fdbbc3b5aed56c54c12e267 SHA512 52adf936393945f3e57cda5ada6386025d25e2167bfdd258d9411ee2b14200007bdcbd1d813d7ddd65484bfa758c92413dd0c594eba1ea25698d9663048cae62
 MISC metadata.xml 317 BLAKE2B cad6b71cf9d8e4f626ee594c2eaad2e75f8ae288ea53206ae8ba37f0be04168f2ce7adeef7e45876d1358250e7ec6f2d9a07cc1c0ea4cf929323f1292ae4853a SHA512 0c6bb7cc6f8d56a7809354d0630ee49f33b63f7b60ad0a0ccbbfd7f28391a4c6b0c9f56caeb7cefcc74bf169ed6d46adda4fd204ef633311376b3cc3f7193d68
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
new file mode 100644
index 000000000000..240ca02f96fb
--- /dev/null
+++ b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="The DICOM Toolkit"
+HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
+SRC_URI="https://dicom.offis.de/download/dcmtk/release/${P}.tar.gz"
+
+LICENSE="OFFIS"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="doc png ssl tcpd tiff +threads xml zlib"
+
+RDEPEND="
+	dev-libs/icu:=
+	virtual/jpeg:0
+	png? ( media-libs/libpng:* )
+	ssl? ( dev-libs/openssl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	media-gfx/graphviz
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s:share/doc/dcmtk:&-${PV}:" \
+		-e "s:DIR \"/:DIR \"/usr/:" \
+		-e "s:usr/etc:etc:" \
+		-e "s:/lib\":/$(get_libdir)\":" \
+		-e "s:COPYRIGHT::" \
+		-i CMakeLists.txt || die
+	sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \
+		-i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt || die
+	# Temporary workaround: docs are not built with CMake
+	sed -i -e '/include/d' doxygen/Makefile.in || die
+
+	# fix -D deprecation warnings
+	sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
+		"${S}"/config/configure.in \
+		"${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EROOT}/etc"
+		-DDCMTK_WITH_ICU=ON
+		-DDCMTK_WITH_TIFF=$(usex tiff)
+		-DDCMTK_WITH_PNG=$(usex png)
+		-DDCMTK_WITH_XML=$(usex xml)
+		-DDCMTK_WITH_ZLIB=$(usex zlib)
+		-DDCMTK_WITH_OPENSSL=$(usex ssl)
+		-DDCMTK_WITH_DOXYGEN=$(usex doc)
+		-DDCMTK_WITH_THREADS=$(usex threads)
+	)
+
+	cmake_src_configure
+
+	if use doc; then
+		cd "${S}"/doxygen || die
+		econf
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		emake -C "${S}"/doxygen
+	fi
+}
+
+src_install() {
+	doman doxygen/manpages/man1/*
+
+	if use doc; then
+		local HTML_DOCS=( "${S}"/doxygen/htmldocs/. )
+	fi
+	cmake_src_install
+}
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 64faa4294ea6..725dff9b618b 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,6 +1,6 @@
 AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09
 DIST dealii-9.1.1-offline_documentation.tar.gz 211103151 BLAKE2B ef7cf48aa8019a2d42a38804744ff72cc7f744255fa27df852f8f93c86a02f2125458e0e525e57510bb98adc27aed933fefa27d556d8203c991dae9866c7d57a SHA512 5e2b71e9bdeb80875772356e2c873bc1f065f2a8c5c47923b74b471d464e4867c257e3a47b32341aa60af98e74e3ed2eceba8dedb4b157ab872681576ecbd5db
 DIST dealii-9.1.1.tar.gz 19911088 BLAKE2B e8488833f11339ccffd4791b9b46ab77f1982cbbdeb11fab7f6b74ca2e17c3d648a2940f4462d0ac9c68bd619b3c4f43b4d8052d2903cbb9cae2fece93d81987 SHA512 02dd91e2b0f395960f900f4cbe00bd307a4762ffbc5f3838dcc34828937e96727efbbcc66fc3d357d6b00b0dddcbc6cd7709c4c03f067d92a8f72d4631b88bf1
-EBUILD dealii-9.1.1.ebuild 5262 BLAKE2B f7518d6570851c50513608bd6e8d4a84bdbe29579d86db3d2d30f4cd5739714199611245f74a393a34473a510d0b5419b2cde670eebaa5b2ef64dd3e3037ae3c SHA512 ad603ec9c6265054571006b8d244674e11abccc817af640f7851380105ba77d6feb24c6e5986389b1e7a3eb0c0004ed0090e12f9136fa34c3b4207eb0c9132a5
-EBUILD dealii-9999.ebuild 5295 BLAKE2B 4d3c6a8bf1e481e06426cad5dc37cd4fac7ae9190da3ca5a51a5f2a7e35b6fc3c77891198ce9feae6687a58bf6b99cfdebc39dbc1a9ec36e7514c19808f5db14 SHA512 36e338671b9cf44f18f57289797aa0fd8e0209da756320ea254efeb989bdc620851c97d157d45ed8cb9d45e1c4533430220232b0c30588706664348198352375
+EBUILD dealii-9.1.1.ebuild 5267 BLAKE2B b95577f351d9c090bb807ff36aeb72375f650bfc65b4fccb466e6973d102ac6f43ec397478f222b34832d0efb975789a7302aba4c2f0e892a3b36007a9910b9d SHA512 99bf9eac19dcbdbd03b5f3b9b56156e78f17f022c151404f7e215b1ae48bb09c6bc4ad931c50b5825e23222c80a9cb210958999df69a757b9ae0188cd4b9cb69
+EBUILD dealii-9999.ebuild 5300 BLAKE2B 55788567c9bb5496535d693fff48a6e8d9e246da4f43ecaf147b4d722d9a8eb863f1442a59e0092c71844ff1391d89bc81c5550a2d61194e7488052660755aef SHA512 dd500dff91b28285e5e1ad2cd8850a0243978adeccae260eda4d4da64b9c17be625afe1e16bc703ca1fcaf12ffdeb48e688ec92a911741b143ac2f1aa8de2009
 MISC metadata.xml 2569 BLAKE2B 55b26d8d83d1203492fd10737e5845259a4eb7db5aed5f5e310616c812bd56b2d03fe389541ad28a7547be9331a6a587b09b3847172d1a70a98ca7c006168bab SHA512 738e28a559017ac76fbf595eb134f91932ed94fb56831ee125dca7aa31eb46db2439f3594b5b104f6a417d0715db149d94cb263d30ba2d32f76fc8deb5195526
diff --git a/sci-libs/dealii/dealii-9.1.1.ebuild b/sci-libs/dealii/dealii-9.1.1.ebuild
index f4aeb21e9f00..94009ead1838 100644
--- a/sci-libs/dealii/dealii-9.1.1.ebuild
+++ b/sci-libs/dealii/dealii-9.1.1.ebuild
@@ -67,7 +67,7 @@ RDEPEND="dev-libs/boost
 	scalapack? ( sci-libs/scalapack )
 	slepc? ( sci-mathematics/slepc[mpi=] )
 	sparse? ( sci-libs/umfpack )
-	sundials? ( sci-libs/sundials )
+	sundials? ( <sci-libs/sundials-4:= )
 	symengine? ( >=sci-libs/symengine-0.4:= )
 	tbb? ( dev-cpp/tbb )
 	trilinos? ( sci-libs/trilinos )"
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index dbaa10c592be..35dcbc94b523 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -67,7 +67,7 @@ RDEPEND="dev-libs/boost
 	scalapack? ( sci-libs/scalapack )
 	slepc? ( sci-mathematics/slepc[mpi=] )
 	sparse? ( sci-libs/umfpack )
-	sundials? ( sci-libs/sundials )
+	sundials? ( <sci-libs/sundials-4:= )
 	symengine? ( >=sci-libs/symengine-0.4:= )
 	tbb? ( dev-cpp/tbb )
 	trilinos? ( sci-libs/trilinos )"
diff --git a/sci-libs/deap/Manifest b/sci-libs/deap/Manifest
index fb46784c5c4e..0581d4b96f03 100644
--- a/sci-libs/deap/Manifest
+++ b/sci-libs/deap/Manifest
@@ -4,4 +4,4 @@ DIST deap-1.0.1.tar.gz 861409 BLAKE2B f0b37e4fc054b86a4bf08bd010d02281317bacdaf6
 EBUILD deap-0.9.1.ebuild 423 BLAKE2B 7c716bc401d0aa7c78a2c830962f009270506862d6bdf7a961b9a73b346c675956d581eee12c26d0d577ff2286639a8d9edf74cb29a0ca11cd302e977731cb74 SHA512 b0134b6c4a1a8aeae92598860b95be4b232c75b5617b2081f54780c14e28734e628586e79d5b6c01ea3bec6bf60a8c0d0e02f3c3e3e0185b6fc67f8c669569f3
 EBUILD deap-1.0.0.ebuild 452 BLAKE2B 373cfe053f95d3528b254a756082df6a3b6ba8fa98ec67ed767f7c12cd91604ef63bf501cf946a97e63890565ae2d27f2c1262f45be8646b9643fe948b925edd SHA512 3f86601c83201641f102338eae2cb6e07937f8df604fff0c516965a419cb1214cdfe04eb84d9e66c1fbd7a01a8c9269924faae6814008e9189e83c31b662b6db
 EBUILD deap-1.0.1.ebuild 437 BLAKE2B 8bcbe6f25ea826bdae8716f742e4a1d170641e1a2d500ceb061c2bca29453a12718e1ceb0426cd85f7afbba56e5003ad5ecfcf9f32db6040a4dd298f1d400415 SHA512 c3f4b72fd66c84a5a3e81609dd2141c7194bf187ad51d661d6ee7fe98a10a441e4d15e2a3c5c175aec9300739485b9fd893c4b378cd140ed7d324e9899c8a165
-MISC metadata.xml 681 BLAKE2B 245001477de80f344ce15aa29f2ba79e62f51a9d8a7ae86b19ce631ed691408271737ad18871f93900e13af34fddc777b2ef9ed544be6befe26e8aeb7d89355e SHA512 a123b25b398dd6cb165faa331a0bb39154ea1d5d2f128f55330cd84bc042584f13a55700fd1f3edb7def994a6a6150fa3db4247091b8234d39456dedea7db58c
+MISC metadata.xml 633 BLAKE2B 59d9b2e51488273f55ab6662aa5d86833aa1419bd5e678dbf92271ad3d193ee15b974d1bb27f9f9f4eb44bed515aabefed84fc763af8076fcd0c363172b13cdd SHA512 7d1fe41bdf5c095cb8e2e330238c1bdb1ea3c1e48198d9c93786659fb9535df84db8af151aa850d2934b18bdee20354126bca28fa047e0c383d984851d43fd63
diff --git a/sci-libs/deap/metadata.xml b/sci-libs/deap/metadata.xml
index a5ab9a524dcd..62d9ca88584a 100644
--- a/sci-libs/deap/metadata.xml
+++ b/sci-libs/deap/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slis@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		DEAP stands for Distributed Evolutionary Algorithm in Python, it is dedicated to people who
 		wish to learn how to use evolutionary algorithms and to those who wish to
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index bd82b4aea87e..469912daa2f4 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -2,8 +2,8 @@ DIST dlib-19.16.tar.gz 10411975 BLAKE2B 93047590a4d8f4685970d3db6841cbf9cc90ca8a
 DIST dlib-19.4.tar.gz 7226923 BLAKE2B 2d72936fc46d559a80288e7f88a64c372fb5f8dcfc69b57abee8a27519f3084fa0cf4193261dd9758f9eb718e755d46a17655e38cb74aaa0046855f11676e157 SHA512 23bf80353f9b6ce07b6a3a7df05016705645c18bcf2b3ead567935008ea12c9f6dc0722d9bbacc009bd26f78eb43c1cbecf776bfed5a3445c1f2e8e208f201e2
 DIST dlib-19.7.tar.gz 7670615 BLAKE2B 13343f3b99bf5dd7a9c032de09eff47f1675bbc978a93edfbd952196b2347e4a887a8eed805f22985477b10ecfa1df85fc568e32f1a00b17b0292a0a51db9764 SHA512 a3877066e04a411d96e910f4229c60a86971a9290e840aa4a5b2f0b102e9b8c37bfede259b80b71ba066d21eb0aa2565808e51d0eab6397ff5fd2bac60dcedd5
 DIST dlib-19.9.tar.gz 8892457 BLAKE2B d18548e09f8169bbc9d7f339599bd58b940410839b259a8d7be9cb999f82e634ad5cd0539adb45239dab821ea1029493d24ae9990ca32c75c744e2c5d9e218f6 SHA512 1e2123c22e1b13cc84108fa627bfa92eadc9dee63f93a9f45676bbf2b752c8728117d915ac327f5223b0cdbce87dd3bef2f4d8d5ed3f8f5a314ffa9e8962a246
-EBUILD dlib-19.16.ebuild 2977 BLAKE2B af4bc04a8c97296efc96a0d2a57045b0a0d4ec9c024dd9cfa772b24610a6e3d2265a1668f596990060e8df67fb544908d6370f98bf89cb5d440077f4e8bc76fc SHA512 47be42ed7993efb00e23a16ec1b970d83e44018d2f97da23d88505be3581ace7451a66b324f208e0071d0943de6b3b13380861d11bfdac9738f4f3e922a2e3e3
+EBUILD dlib-19.16.ebuild 2975 BLAKE2B 4ded3ab6329c15b3ab34765bb69c4cd7f48bd2e24315b6eea7136a0685309ece5eae7541ff1d8d0b6dde110a9c98675ef7a8a3ddac4b9bb0427c1cdcc7cee866 SHA512 359ef635af4ca95b541e4205092afbe00e5d753f45f7e9d3103ea7bd5012d931bfa97a8d2b3cf98545f966644cfef325d9fe23e2e3bfa3f7cb2fc494a4d3f602
 EBUILD dlib-19.4.ebuild 1821 BLAKE2B 22b259faf3b3eb0ae4ce4fbd0930f81f2ef0ac79a249c8af45a23476e290ab08ce6b27c9bf918890bf7e994994eb6371f5a16fb2dc4cbbe698ae2b16a739d83e SHA512 a56e6c3b13248450dfbe243b561873d1147e2d3a94832c5d092934868c3e0233b4b90b95ba2b1c57d8362605b065c208c860024e4026ba71670038b7b2eb2dc9
 EBUILD dlib-19.7.ebuild 1819 BLAKE2B 3e259e1dfb027149dcff41ffe2dc861e3072991755d3d7a545fffc6a61f844566e02a9482305472cc62cf7623c8eec6c7794afe26cef9b2983cd6a0327760ba4 SHA512 993f94efc9712bac9bcd584bf6e8d918d7638fd6d2a13d127c8f41c484d9fe4c10c40063c2516925a543f4e6894c639c858cc8416162d9f8aee4b27c71011e43
-EBUILD dlib-19.9.ebuild 2068 BLAKE2B 7996a305ba822449d2e6b414a4ddac1b2da89df1cefb8dfe75b6d5c28b54ee855e1982eabb8e85c119d8cb427140088dacac373dd69b701433383d5f48aa6d95 SHA512 fd54359f14840d3d445d7f4689493d943fd9aee555c48321aa1bc8162fd8a582ed9b1d4da326d9e201e5d2ea51f58b154dcfa8982b7c44b7957a5441a27369b7
+EBUILD dlib-19.9.ebuild 2062 BLAKE2B 8d693459b90472916c37d9d20febf48c7120116d368346277926e7ad9ec5b0aa3c5ccdf9f1d7e1cb62ff22b7cb8fcf269ab43087b51a3d149be79f002db54db0 SHA512 370d72e972404a9a709dd499203abb7652f85126cda4b400dc59d1396badbeb331a117120889eae0835eb7fe311cae4bb11f6c0f590dd2fa3fe05d7383822a6d
 MISC metadata.xml 1002 BLAKE2B 899d622186d6ed4ab0c8c448bdbe312be12f0eeeec5e4d4ae031de4dcb26d73f0489b697375893d4c4bd16651c6b2d40ac156b67be0b376ec270d7d99a6f465a SHA512 1977d192107b78b97d5336d3e5b2e43a7ea12ede631a864ce14aeab2f9d328526f815fab0d62ae1417842cdfe9e1e7c0494fcf79be535dbfc4e3ca9342447b5c
diff --git a/sci-libs/dlib/dlib-19.16.ebuild b/sci-libs/dlib/dlib-19.16.ebuild
index 3eef02e2c0e8..cb682127de97 100644
--- a/sci-libs/dlib/dlib-19.16.ebuild
+++ b/sci-libs/dlib/dlib-19.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_OPTIONAL=1
 inherit cmake-utils cuda distutils-r1
 
diff --git a/sci-libs/dlib/dlib-19.9.ebuild b/sci-libs/dlib/dlib-19.9.ebuild
index d0a78e21fc64..fcc55d70b0e1 100644
--- a/sci-libs/dlib/dlib-19.9.ebuild
+++ b/sci-libs/dlib/dlib-19.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit python-r1 cmake-utils cuda
 
 DESCRIPTION="Numerical and networking C++ library"
diff --git a/sci-libs/dmlc-core/Manifest b/sci-libs/dmlc-core/Manifest
index 82b9a0fa9b02..e07b0d821d14 100644
--- a/sci-libs/dmlc-core/Manifest
+++ b/sci-libs/dmlc-core/Manifest
@@ -1,4 +1,4 @@
 AUX dmlc-core-install-dirs.patch 1206 BLAKE2B df1f1520f3e6b21ef7dc30d6f2d73f888c639bdbbfe824ed89a5a7a9fa7b9dabb94704d6ba1ee9a95274b66b5160c560538cdb252804cfdeb304f7b8727cddb5 SHA512 ceee3e6f6f02e4a96167f12ffb50cbbc3bfbf07d025acb002139072ac73cf02adcd9c8f7a7b371055a68a61a104bf16ad95d7a3769edc3ad2dc63be36ff45ff5
 DIST dmlc-core-0_p20170719.tar.gz 160242 BLAKE2B 2752968c831b5468cb926fbd2783098d1d66f5dd7f06b1abf138e165c637a3c16d477b04b709a05826528ee8e35ed61b563bdaae958fb91c78591dd57761a5f4 SHA512 2e2d79800839652772f07deb5ea3aa470cc5a18d2d0e480b8f4a1598aca72443546a438f3309708268cc49cf2d65684c3366cfc6c33c085baf1b804b4c04f02e
-EBUILD dmlc-core-0_p20170719.ebuild 2274 BLAKE2B 52c76bf3da3b2647e1f22845743a5d51b8a70f42cc0cbb2d385d267497e1789affbf515fb0a4dbec30638988d5820c6e6bb71d01fa7eb05d763bda8a4a19932c SHA512 a8254d898026f942d4daaafa0c64909ca65edada4e32d5142af426d2bca45c7d6a383500c3bf9ec46cbd1a8e690a9727e5bc64375df8bf148581c0f03e4224b3
+EBUILD dmlc-core-0_p20170719.ebuild 2296 BLAKE2B 769e8645eb0b6ca836d6a06e34156da58f5f2ee9e3031da91ffb6be490658a67aa6f215091a1703fc5f16f205b49768ad9f3a72953e099739cd40c35804f6e42 SHA512 c83bf5976e9e3f85c8bf5e6cb0679db0568e9c97a7a3da42606f6785c936e73dd16a41dd4a8fc2f97213302f0cf8bd45600b4d944229a49040eed19b548d4e8d
 MISC metadata.xml 702 BLAKE2B 085ca9f33a3772884d2b401b8339c2f0862a834ccfbe28ecd141c97b26b50f00f499ff7ea917db0eb0fd0b5c3618efadc82300f3bb6c4475c7cf10dc58657bf8 SHA512 ab1359ef913665692ab9fd32c0a18ad6ac9315cb3dbb6299cc4ea642ec7d649f31a79814017e8ad29062fc0c10c8ca27201dbad157a662432bc2b04f4105fe83
diff --git a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild b/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
index 7b5c6e91bd63..182aed5e7046 100644
--- a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
+++ b/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
@@ -16,7 +16,7 @@ else
 	EGIT_COMMIT="54db57d5d1b2a7b93319053011802888b827a539"
 	inherit vcs-snapshot
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/dmlc/dmlc-core/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 602d6efbb088..bae5a41ea627 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,12 +1,15 @@
 AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b63e1c9b2814acc307e0b5082e7326f495102d10c4b2bdc86b17b7f4ae8ae11231c99215d87fc59217115f0fd92fc96f0 SHA512 16ed7bbd5569166c80cf4d8beba81195a177ee36bcd7e14ca6d00e3add6fe57c7980cbe1853747325443699daa331fc23e53fc86150b6c7cf871ef4812936c39
-AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d
+AUX gdal-2.2.3-soname.patch 2031 BLAKE2B adc05d4e426083af16c153011d1bccb2a6d7334eac2911faffdc373765cd21a69505928b14cf9896b7f7b23acefc574abd5c85d20b6376aee6a7bb87d775d30b SHA512 8d4cf1f7a69002c7d2789a5abb3c4d10a0d687566e8acd2ea208e994870eff2cb03975812c435eaa0dc13e1e2f42e2151dcb23ea0470242b1e79aa6892a13cdd
 AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6
 AUX gdal-2.4.1-poppler-0.75.patch 5452 BLAKE2B 7cb3b1e84f2f1ff91af49cb4292047f055aeff5a45c8f0d4c440c99d2ab746d32500f11c040f0eaba72b8da9122ab5fc3b5d50dc082c60281354652ab65fff9f SHA512 7482a8a160f514c31c11d101e1f8a2c32dcc862b3c7bc76ac11712bca7c3088975b4fefae33a6d68a847a5e54982b8d02d6bdc8dee27dd0d5efea0f6d28590ed
 AUX gdal-2.4.1-poppler-0.76.patch 699 BLAKE2B 132ff0a3046734e851d12379d049b2e4fdbefcd4bb6949ddf9fa18b856b1ae20d2a2ec9dbcc0d973097cd2ba5f6e72e852b26a93997ffe4b428fe79d44b5c1cf SHA512 09cdd963dbc5e09d211663f54b1cef72eeeda7484ad10b08862907df60aefc068d840e80d4fd0aa0776a03edca89e8affb8b614c4db02085e854bb4a14342d4f
 AUX gdal-2.4.1-poppler-0.82.patch 2322 BLAKE2B a07590bdd3d910b6da8e99989f648251d891fe170ec5b6954d34a3986ce949f2c428f184d8ffbe6292cf6fb7915753db7e81b4993c71fe2b1e4016745c8595fd SHA512 9aca4c69c1df413666d58d75e9b235cc7039224e400188e982b5e9de22773b20829c09eb467069c9e56ea79aa4de2f0e1267d2ed4cd8bb1be7e0432f2c7297c2
+AUX gdal-2.4.1-poppler-0.83-1.patch 993 BLAKE2B 8ecf716c8f64c6ee51be6cc8e1ebfe242d5fc2d4b8f5ec2b116c52137bc3bfbec24b7260533f610777f106e8fc5d302828ba615435568342025ba365f68f52e6 SHA512 3ff3f08c18cd9980e947948b19ea229608bbc2e59dba39c40d374d417104155b956e4077c0ef4f0dfd0625c1af54f9cdc19d812345495716c82690f3e2beff2b
+AUX gdal-2.4.1-poppler-0.83-2.patch 1501 BLAKE2B 3b85001fe0e9c01bf97cd94da3ce063c5b43aa5c6e258dbe3f81d6d179fb668597945ac2c5c66a8f84c2235f40a66bd12ebb811d9b5f0d56dcd5d3aa5beeea59 SHA512 953b8f819275f882820e0346617b522d35da4a756ecdb889e3862a7526addcf1794f9d1f9c4fcf70b4876fe20e0b3127827df48fe50d841c07f89a8f6bf9356c
 AUX gdal-2.4.1-swig-4.patch 4239 BLAKE2B d3bfc88aa79fa94015816cd6e620b7520c765379668542dc1fa5c20192898e9e25fcd1a4cc7aed98fca8d07dc1e0a06b6bcd60fa19049af738f061f7537a7129 SHA512 7db4206ce24a35b4b71859310cc4218fd02c3c2900892fc51950d7ddb90b5e743dc42fe4fe545404063ffeb2f0eaa4319f616a200ed3e92723ed04db4300f7c0
 DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61 SHA512 b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
-EBUILD gdal-2.4.1-r1.ebuild 8189 BLAKE2B 59c1dbf53b587eac521f11a24a79a08d13c0b421578ad216591620b962b34bc23398c5b3b98394b26912d8363d28bb346f35a02d553befe98e3995b4002cef07 SHA512 5b4e122ad6171abf17079455a4a23f64f0f124839a7ad5e7d597a01432f43573739261e6135dd664905b79212cda2a74f96260c338b69ab0c26902370cb58631
-EBUILD gdal-2.4.1-r2.ebuild 8162 BLAKE2B 31ca4811a298d47055acefcf80f4de8440cb8ffe1100972174128800e5518072423745da30b279eef705defd9a49014dee346c640b2958a8a529d3848a4fb8f0 SHA512 a37e8f09e3a40f563e59e309cd41ffad28f3d2e3fadf2c8a03d65685ebb65990442deefd0358ddf163f983b7737bd4344cbefd752c1afceaa56c51cb6bafb096
-EBUILD gdal-2.4.1.ebuild 8103 BLAKE2B 64c0da0778d1d685931f26d5503ea2842094b9d2575d11d81f4bfc494087917079bc458c2cef6237fa666f7290912b2990311bffca1d4a4170891c3d9fcc50c0 SHA512 41fb4a70b214b754b47168b0518b7f2265c1d879d3b99229ff658586c25edd4c1bed086dacb1cd644595cd996ec9e4bff52b04b7bd65a4d6f4924cbec905e09a
-MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
+DIST gdal-2.4.3.tar.gz 14726748 BLAKE2B 104c29912a96b03d0913be40f91a844b2f04f1e972b1ae8764bd277e7d51960b45d4a67a8f9240130de7ce8752f69f4172ca9a54bb11e70635aa55b6c6924cb5 SHA512 e532ce86c92724300ab443c42dd8cec0e74e41411a54d30222f98faa10623b31e616eda44da8f406ed01f3fc3c72c76e8ceb80c1dff733f8efcaa2e2e18132f6
+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
+MISC metadata.xml 1420 BLAKE2B 1887e48a94b0d8596913fda0e102c0e23768e1fe9df32f8f0387c5966d9e9b1e0bdd6d06f6d281660494c871d887ed20d4254f1aaa9b23cda9830f7a4810ef00 SHA512 be3a0fdc46e1b022fce052908ce7f43399f1be9d4f4b1cf23e3cca8e43d6280d1f8f820fe1d0ac1d65d2dacde1ddc859c1ce3b8d067e0f6114ab3900abc419eb
diff --git a/sci-libs/gdal/files/gdal-2.2.3-soname.patch b/sci-libs/gdal/files/gdal-2.2.3-soname.patch
index f2746bdf5e30..4cceee5ec928 100644
--- a/sci-libs/gdal/files/gdal-2.2.3-soname.patch
+++ b/sci-libs/gdal/files/gdal-2.2.3-soname.patch
@@ -3,8 +3,8 @@ Set SONAME and unbreak compilation on Darwin
 Author: Fabian Groffen <grobian@gentoo.org>
 Author: Dennis Schridde <devurandom@gmx.net>
 
---- old/GDALmake.opt.in.orig	2008-02-02 18:25:48.000000000 -0800
-+++ new/GDALmake.opt.in	2008-02-02 18:54:53.000000000 -0800
+--- a/GDALmake.opt.in	2008-02-02 18:25:48.000000000 -0800
++++ b/GDALmake.opt.in	2008-02-02 18:54:53.000000000 -0800
 @@ -97,6 +97,14 @@
  GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT)
  GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
@@ -20,8 +20,8 @@ Author: Dennis Schridde <devurandom@gmx.net>
  # Mac OS X Framework definition
  MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
  
---- gdal-2.0.3.old/GNUmakefile
-+++ gdal-2.0.3/GNUmakefile
+--- a/GNUmakefile
++++ b/GNUmakefile
 @@ -208,7 +208,7 @@ else
  
  ifeq ($(HAVE_LD_SHARED),yes)
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch
new file mode 100644
index 000000000000..f077f4632386
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch
@@ -0,0 +1,27 @@
+From 1f8fa16f58cfe0364099ddad0e1d86522d8de41a Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Wed, 13 Nov 2019 14:07:22 +0100
+Subject: [PATCH] PDF: fix build against Poppler 0.83.0dev
+
+---
+ gdal/frmts/pdf/pdfdataset.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 8f944c40d30..88017953de5 100644
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -4267,7 +4267,13 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+         CPLMutexHolderD(&hGlobalParamsMutex);
+         /* poppler global variable */
+         if (globalParams == nullptr)
++        {
++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
++            globalParams.reset(new GlobalParams());
++#else
+             globalParams = new GlobalParams();
++#endif
++        }
+ 
+         globalParams->setPrintCommands(CPLTestBool(
+             CPLGetConfigOption("GDAL_PDF_PRINT_COMMANDS", "FALSE")));
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch
new file mode 100644
index 000000000000..74614e925f6d
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch
@@ -0,0 +1,42 @@
+From 7318576fc7037412b755f038f8148f2d299587aa Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Tue, 26 Nov 2019 14:33:32 +0100
+Subject: [PATCH] PDF: fix to build against latest Poppler master (0.83dev)
+
+---
+ gdal/frmts/pdf/pdfio.cpp | 3 +++
+ gdal/frmts/pdf/pdfio.h   | 7 ++++++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/frmts/pdf/pdfio.cpp b/frmts/pdf/pdfio.cpp
+index 917e92330ae..c0b9dad93cb 100644
+--- a/frmts/pdf/pdfio.cpp
++++ b/frmts/pdf/pdfio.cpp
+@@ -170,6 +170,9 @@ getStart_ret_type VSIPDFFileStream::getStart()
+ /************************************************************************/
+ 
+ StreamKind VSIPDFFileStream::getKind()
++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
++                                        const
++#endif
+ {
+     return strFile;
+ }
+diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
+index aa34ab7210d..23344d33f77 100644
+--- a/frmts/pdf/pdfio.h
++++ b/frmts/pdf/pdfio.h
+@@ -81,7 +81,12 @@ class VSIPDFFileStream final: public BaseStream
+         virtual void       setPos(setPos_offset_type pos, int dir = 0) override;
+         virtual void       moveStart(moveStart_delta_type delta) override;
+ 
+-        virtual StreamKind getKind() override;
++        virtual StreamKind getKind()
++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
++            const
++#endif
++            override;
++
+         virtual GooString *getFileName() override;
+ 
+         virtual int        getChar() override;
diff --git a/sci-libs/gdal/gdal-2.4.1-r1.ebuild b/sci-libs/gdal/gdal-2.4.1-r1.ebuild
index afdbf3e0aa52..ee52cca2e4d8 100644
--- a/sci-libs/gdal/gdal-2.4.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.4.1-r1.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=6
 
 GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_OPTIONAL=1
 
 inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
@@ -15,8 +15,8 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.3"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 COMMON_DEPEND="
 	dev-libs/expat
@@ -187,7 +187,7 @@ src_configure() {
 		--disable-lto
 		$(use_enable debug)
 		$(use_with armadillo)
-		$(use_with aux_xml pam)
+		$(use_with aux-xml pam)
 		$(use_with curl)
 		$(use_with fits cfitsio)
 		$(use_with geos)
diff --git a/sci-libs/gdal/gdal-2.4.1-r2.ebuild b/sci-libs/gdal/gdal-2.4.1-r2.ebuild
index fa26cc48e938..ef434fe5b011 100644
--- a/sci-libs/gdal/gdal-2.4.1-r2.ebuild
+++ b/sci-libs/gdal/gdal-2.4.1-r2.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
 
 GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
 inherit autotools perl-module distutils-r1 flag-o-matic java-pkg-opt-2 toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 SLOT="0/2.3"
 LICENSE="BSD Info-ZIP MIT"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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"
+IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
 	mdb? ( java )
@@ -85,6 +85,7 @@ PATCHES=(
 	"${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
 )
 
 src_prepare() {
@@ -186,7 +187,7 @@ src_configure() {
 		--disable-lto
 		$(use_enable debug)
 		$(use_with armadillo)
-		$(use_with aux_xml pam)
+		$(use_with aux-xml pam)
 		$(use_with curl)
 		$(use_with fits cfitsio)
 		$(use_with geos)
diff --git a/sci-libs/gdal/gdal-2.4.1.ebuild b/sci-libs/gdal/gdal-2.4.3.ebuild
index 7d215149c2c3..0f880af5e68e 100644
--- a/sci-libs/gdal/gdal-2.4.1.ebuild
+++ b/sci-libs/gdal/gdal-2.4.3.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
-
-inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
+inherit autotools perl-module distutils-r1 flag-o-matic java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
 HOMEPAGE="https://gdal.org/"
@@ -15,17 +14,32 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.3"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+	mdb? ( java )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )
+"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	java? ( >=virtual/jdk-1.7:* )
+	perl? ( dev-lang/swig:0 )
+	python? (
+		dev-lang/swig:0
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
 
-COMMON_DEPEND="
+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(+)]
+	sys-libs/zlib[minizip(+)]
 	armadillo? ( sci-libs/armadillo:=[lapack] )
 	curl? ( net-misc/curl )
 	fits? ( sci-libs/cfitsio:= )
@@ -60,42 +74,27 @@ COMMON_DEPEND="
 	xls? ( dev-libs/freexl )
 	zstd? ( app-arch/zstd:= )"
 
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	java? ( >=virtual/jre-1.7:* )"
 
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.7:* )
-	perl? ( dev-lang/swig:0 )
-	python? (
-		dev-lang/swig:0
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="
-	mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
 PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${P}-poppler-0.75.patch"
-	"${FILESDIR}/${P}-poppler-0.76.patch"
+	"${FILESDIR}"/${PN}-2.2.3-soname.patch
+	"${FILESDIR}"/${PN}-2.2.3-bashcomp-path.patch # bug 641866
+	"${FILESDIR}"/${PN}-2.4.1-swig-4.patch # bug 689110
+	"${FILESDIR}"/${PN}-2.4.1-poppler-0.82.patch
+	"${FILESDIR}"/${PN}-2.4.1-poppler-0.83-{1,2}.patch # bug 703790
 )
 
 src_prepare() {
 	# fix datadir and docdir placement
 	sed -e "s:@datadir@:@datadir@/gdal:" \
 		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		-i "${S}"/GDALmake.opt.in || die
+		-i GDALmake.opt.in || die
 
 	# the second sed expression should fix bug 371075
 	sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
 		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		-i "${S}"/swig/python/GNUmakefile || die
+		-i swig/python/GNUmakefile || die
 
 	# Fix spatialite/sqlite include issue
 	sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
@@ -135,7 +134,7 @@ src_configure() {
 		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
 		# podofo - we use poppler instead they are exclusive for each other
 		# tiff is a hard dep
-		--includedir="${EPREFIX}/usr/include/${PN}"
+		--includedir="${EPREFIX}"/usr/include/${PN}
 		--disable-pdf-plugin
 		--disable-static
 		--enable-shared
@@ -144,10 +143,10 @@ src_configure() {
 		--with-geotiff
 		--with-grib
 		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}/usr/"
+		--with-libjson-c="${EPREFIX}"/usr/
 		--with-libtiff
 		--with-libtool
-		--with-libz="${EPREFIX}/usr/"
+		--with-libz="${EPREFIX}"/usr/
 		--with-gnm
 		--without-bsb
 		--without-charls
@@ -185,7 +184,7 @@ src_configure() {
 		--disable-lto
 		$(use_enable debug)
 		$(use_with armadillo)
-		$(use_with aux_xml pam)
+		$(use_with aux-xml pam)
 		$(use_with curl)
 		$(use_with fits cfitsio)
 		$(use_with geos)
@@ -304,14 +303,14 @@ 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/
 	fi
 
 	doman "${S}"/man/man*/*
-	find "${ED}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
 
 pkg_postinst() {
diff --git a/sci-libs/gdal/metadata.xml b/sci-libs/gdal/metadata.xml
index 7088f71ba0f1..44e078ca7dfa 100644
--- a/sci-libs/gdal/metadata.xml
+++ b/sci-libs/gdal/metadata.xml
@@ -15,11 +15,10 @@
 	</slots>
 	<use>
 		<flag name="armadillo">Use <pkg>sci-libs/armadillo</pkg> for faster TPS transform computation</flag>
-		<flag name="aux_xml">Enable Portable Auxilliary Metadata generation</flag>
+		<flag name="aux-xml">Enable Portable Auxilliary Metadata generation</flag>
 		<flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
 		<flag name="geos">Add support for geometry engine (<pkg>sci-libs/geos</pkg>)</flag>
 		<flag name="gml">Enable support for <pkg>dev-libs/xerces-c</pkg> C++ API</flag>
-		<flag name="hdf5">Add support for the Hierarchical Data Format v5 (<pkg>sci-libs/hdf5</pkg>)</flag>
 		<flag name="mdb">Enable support for Microsoft Access database</flag>
 		<flag name="ogdi">Enable support for the open geographic datastore interface (<pkg>sci-libs/ogdi</pkg>)</flag>
 		<flag name="opencl">Enable OpenCL support</flag>
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 94eea2bdc417..25b8d01d3a51 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,8 +1,6 @@
 AUX 3.4.2-solaris-isnan.patch 575 BLAKE2B 34e2fddd46e4e503630d0c44c03ee72ceb8bb19af31075ae209d0198b5db0839a633cbb7c855035bf8964d860174c56288579a4bd50e322d728ea4704d312108 SHA512 efa2730f178814e8d98318347e7a8313327679a5c861ef2a844ce821c5854f4dd56e0cc2c52fa5866fb4214b0d9aa8614b1f1ebaa62f0427e69221a93106aa45
-DIST geos-3.7.0.tar.bz2 2028814 BLAKE2B 17385d9be831d4812391a30627e13989d3ca099ca9b0a719a92cdb2503dadff3693d4b3d320652764185db05782b33760ca14d155365d87167bb4ef6d6c2463c SHA512 fcca5e503efa32bb388376b2a06b9ca5c74fbcddba750cce6b3b4109eb2eb122058aead12b9462cdd881f425cd75d7241645ab344f25ce022bc0659954560742
 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.0.ebuild 1338 BLAKE2B 7ebfca396ca09ebe266c59c901ad7f931076a5bef9b7574167d35b0123297205504cdfe7b11ad3a44729483ab57a14bfce6a17f66c9a4391c06b8fcf4c1071d4 SHA512 fe01f7c023c67401396ba760266b62ebba2388e42a7aae08a188fb7ec4726d9c6390f8768511fbd28ad6374a8f47a5de55a530c025d01e43a43082f7ea3a0021
 EBUILD geos-3.7.2.ebuild 1338 BLAKE2B 7ebfca396ca09ebe266c59c901ad7f931076a5bef9b7574167d35b0123297205504cdfe7b11ad3a44729483ab57a14bfce6a17f66c9a4391c06b8fcf4c1071d4 SHA512 fe01f7c023c67401396ba760266b62ebba2388e42a7aae08a188fb7ec4726d9c6390f8768511fbd28ad6374a8f47a5de55a530c025d01e43a43082f7ea3a0021
-EBUILD geos-3.8.0.ebuild 1346 BLAKE2B e68219f57a210aa0f2ae633740360a75b88e302715deaec1af24446c540e9e3fb24812985118f73e2fb34e404c1bea7f7f91203df6c87d62b7e9165bcc85da06 SHA512 173bf18fd49919a49a9459a43ab598a68ca84cf3db8d0b299d72bd9e1e3de3ce6e9d3adb15fab5ab5b63d58bc29920b20a8dafb23b22a26d011d1c96fb62f240
+EBUILD geos-3.8.0-r1.ebuild 1063 BLAKE2B 19625edaabcff38f910f4dcd8bdb526c1a452d4206d47aff3d822f1c1bfb680aff32ddfb610340ebd5dc8d319ceee7b42121fb2bac661ed07ecdca54549749d3 SHA512 73e3eaf6b0cea2a7977ec37bf4e4b602a31d11fa7a4bf35938e57a606076b1561ad7873a8f16d9d4ed85f0813f1799fbf6cd028240e6c8748b3c9dc7bc5a180f
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.7.0.ebuild b/sci-libs/geos/geos-3.7.0.ebuild
deleted file mode 100644
index 4c8405e7855f..000000000000
--- a/sci-libs/geos/geos-3.7.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${P}.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"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig:0 )
-	ruby? ( dev-lang/swig:0 )
-"
-
-PATCHES=( "${FILESDIR}"/3.4.2-solaris-isnan.patch )
-
-RESTRICT="test"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ruby) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	use doc && emake -C "${S}/doc" doxygen-html
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/doxygen_docs/html/. )
-	default
-	use python && python_optimize "${D}$(python_get_sitedir)"/geos/
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/geos/geos-3.8.0.ebuild b/sci-libs/geos/geos-3.8.0-r1.ebuild
index 3ad295e1f4be..9e41eddd122e 100644
--- a/sci-libs/geos/geos-3.8.0.ebuild
+++ b/sci-libs/geos/geos-3.8.0-r1.ebuild
@@ -1,14 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
+EAPI=7
 
 MY_PV=${PV/_/}
-S=${WORKDIR}/${PN}-${MY_PV}
 
 DESCRIPTION="Geometry engine library for Geographic Information Systems"
 HOMEPAGE="http://trac.osgeo.org/geos/"
@@ -18,23 +13,19 @@ 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"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}
+BDEPEND="
 	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig:0 )
 	ruby? ( dev-lang/swig:0 )
 "
+RDEPEND="
+	ruby? ( dev-lang/ruby:* )
+"
+DEPEND="${RDEPEND}"
 
 RESTRICT="test"
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
+S="${WORKDIR}"/${PN}-${MY_PV}
 
 src_prepare() {
 	default
@@ -43,20 +34,19 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable python) \
+		--disable-python \
 		$(use_enable ruby) \
 		$(use_enable static-libs static)
 }
 
 src_compile() {
 	default
-	use doc && emake -C "${S}/doc" doxygen-html
+	use doc && emake -C doc doxygen-html
 }
 
 src_install() {
 	use doc && HTML_DOCS=( doc/doxygen_docs/html/. )
 	default
-	use python && python_optimize "${D}$(python_get_sitedir)"/geos/
 
 	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/givaro/Manifest b/sci-libs/givaro/Manifest
new file mode 100644
index 000000000000..1f8e873e0c6e
--- /dev/null
+++ b/sci-libs/givaro/Manifest
@@ -0,0 +1,3 @@
+DIST givaro-4.1.1.tar.gz 1008358 BLAKE2B 246fd1a263174f58d96dd66fa79e6113368b6c318c33d68858a339bd9cb778dfda84636c683ee9d02f2ac72ccff8ac22d395b92741448a8ed2ce08c041ac8ba9 SHA512 7ad15ac24f55ad65c9c5d0d48ff4388d0494e75dc7b66d1e139195cd086ff2371259bdb5df940fead1db2fd378bb76289f2327a8d6f41575d99d424a74cf644c
+EBUILD givaro-4.1.1.ebuild 1645 BLAKE2B 671186b7b4e55c72c3bd2a76803bbabd193942c97488be4ad7d89abf3497ff7fd4e9d07d847f40daeb0cc616d62a6153beca530dc1d13cfe74495298920bc8f2 SHA512 47b584f55c716720df959527c1f644922d097f82f5d913772399490e859443c407f3ad6e55e5d24e4ded60541c433fe1fa7424f011acb2bd4028f2aa8088a49f
+MISC metadata.xml 738 BLAKE2B 89916089365fd82a21b273b91b832888d542ec4c0d7533d725f2be0bf9c9310758f3d4ccd5e8c1d6abf8cb63f92e62c048be22f99a88f05eb6db5cd6bc5a8c17 SHA512 768957687398de4ece1f9d04f6f4c7836b0230d166553b5b2998d61875d78810c1470061eeaac5d39b4ee81f839cb4eddc4ba2316a7024374f8a8864a275af4f
diff --git a/sci-libs/givaro/givaro-4.1.1.ebuild b/sci-libs/givaro/givaro-4.1.1.ebuild
new file mode 100644
index 000000000000..68976e9c1941
--- /dev/null
+++ b/sci-libs/givaro/givaro-4.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ library for arithmetic and algebraic computations"
+HOMEPAGE="https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/"
+SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="CeCILL-B"
+SLOT="0/9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen[dot,latex] )"
+DEPEND="dev-libs/gmp:0[cxx]"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_configure(){
+	# Passing "--disable-doc" also accidentally enables building
+	# the documentation, so we can't just $(use_enable doc) here.
+	# https://github.com/linbox-team/givaro/issues/148
+	econf \
+		$(usex doc --enable-doc "" "" "") \
+		--with-docdir="/usr/share/doc/${PF}/html" \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_fma3 fma) \
+		$(use_enable cpu_flags_x86_fma4 fma4) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_ssse3 ssse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse41) \
+		$(use_enable cpu_flags_x86_sse4_2 sse42) \
+		$(use_enable cpu_flags_x86_avx avx) \
+		$(use_enable cpu_flags_x86_avx2 avx2)
+}
+
+src_install(){
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/givaro/metadata.xml b/sci-libs/givaro/metadata.xml
new file mode 100644
index 000000000000..e1c0c3cbd9cd
--- /dev/null
+++ b/sci-libs/givaro/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <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">linbox-team/givaro</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index f2dc3012c64e..2f3124c41e77 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -7,6 +7,6 @@ DIST gsl-2.4.tar.gz 5916715 BLAKE2B f22c07b2d5759a383e05b8bfdba70071672cc27f12ff
 DIST gsl-2.5.tar.gz 7303881 BLAKE2B 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997c1111f980a5e4cb50d110ca626fe810c44be70180 SHA512 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a
 EBUILD gsl-1.16.ebuild 3082 BLAKE2B cae441ec3c5a816a2620b0d94ae3529c712862d871008e8d1167c6cb33e1542a854c1874d3508de0c19b29b0aa93d3b4928a55de2a8e1ee31f36d9295a7d967d SHA512 ee7dbb08e1193d748d073196117bc5f864621eceb7729d8a154917fca76695674088431b09fe43db6d8e628d99af114c2aced009c0d1ec39c6c179e9e8f06771
 EBUILD gsl-2.4.ebuild 3191 BLAKE2B 230228573c7479f4964da270a8ea2f4fb886a0969e28e914e880cd56dd46ceb6bcc173fa0a0634582bf59eb8007184dd1d91d1c46548ff1eebb2c35aa50ec76b SHA512 91f25c90a99f4a91912e713854cc8f47eecbd64f12534be6609eef156832cec17d4490866b2c1e1aeb6fffd3414e79be538a34f81a463e48c80040ae888e4544
-EBUILD gsl-2.5-r1.ebuild 1418 BLAKE2B cd85c83b3db1901848f53c9ef33c10ed9df2ccae4330fae4c80b3d1585e519890f9d61cdcd8f3317c48e5b0bd77ccab2cea69ef8aa12cff18aa199c54defce69 SHA512 55b291aae0ad83d994320445bf2b8430c4c4dfdb674411f1887bd38facf73c37adbdd017b2ff46ffaee8649ccdc9078563eb53199830caf56fa816de325db971
+EBUILD gsl-2.5-r1.ebuild 1415 BLAKE2B 72a8cca1ffc88d7553a48db13b257c95694f9c6c4060a420e81197fba27608ada2f2842e7b59293955f2d23a7195e421ac507baf683b3fc21a8d904534c3471f SHA512 b0ee9ca0d05805b8ffe4ed1ed5c2e856e4d040b282166c6131e70a1f79e9050cdb844ba4f4d5066900a1dd67499650a3b39708014ced2129c7ca62a7ddc29683
 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-2.5-r1.ebuild b/sci-libs/gsl/gsl-2.5-r1.ebuild
index 22e2c8677c62..9b2bc0dde891 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/hypre/Manifest b/sci-libs/hypre/Manifest
index 22d7459e0e58..7fe0fe062292 100644
--- a/sci-libs/hypre/Manifest
+++ b/sci-libs/hypre/Manifest
@@ -3,5 +3,5 @@ DIST hypre-2.18.0.tar.gz 5698227 BLAKE2B e6562b78dcff6592a7df86d2162e3669c9ea3f7
 DIST hypre-2.18.2.tar.gz 5699792 BLAKE2B 6adb343d23594adea60a4009f589285236365a5769b1d5cb66908ce83984dd48b3be929e6c7298c7b9cb1e2d67b1fe7ea641c8a160562d223edb9809977fb684 SHA512 7b343a5c8530d7f5e31cad6c940c2f154b2b954566d4fe8525d690fec41db23936a46fb642a994791de32984e696c624804fb1fde1f0c9ce026f1a6e46b9c0f4
 EBUILD hypre-2.14.0.ebuild 2929 BLAKE2B d3e32bd55d00422686ef432e4ec4c63fe133342494f29255c71d86f98ed31a3eee6fdd66b68f32ab194420197994f11d9cc767675afe65367cd85bb7fefbddab SHA512 9024f6db0d7f7cd460a6a639915d3aa7f73d6048a0ecc70fe88b928cf445d6398a206822cade66b237e9fdbee2ad1b6e443c0870ad3fb67532c05409406f98d6
 EBUILD hypre-2.18.0.ebuild 2729 BLAKE2B b8d20ca170850be57edd77b9ccb7136bdd5c06979d47fc8b5d5bfd890df99155ac6b2bc4ff74a6536e17811faf7b611dbaf97a54231aa27d91809d9062c08c39 SHA512 c21bb95634bd5a9fb0037d5e10dbfffed32b7e93888677c4df489518be63100360773388b621d97be37a14916e13a40971dc846d10a49d082c774efed0ca3558
-EBUILD hypre-2.18.2.ebuild 2728 BLAKE2B e7ac59dec48ec0943f5cad23ec4cd19eec906639301cdd8b256ad455a8ef77ec290f9a58d0e29e2a3e3d7817ddf9395ddbef022f778a514ff27ea005d6b69299 SHA512 447061a4c24f06c0acf9b0367ce8f0c824fe5745e9fa2ac684bc4e31e47c2fee1ebeed751d09f8d5eca0a6d604bf582cf6068be61136ddfedf6b96635e4f55fa
+EBUILD hypre-2.18.2.ebuild 2727 BLAKE2B a85616ed37b83dcf3e391e100d5e2f6170c800e7e598cf707712ec9f124eb77209a21b285e5aa117c297bbc3eb3a99254d5324a18687dea9b8ccf5a8e9909d20 SHA512 0943f1fc06ba648388dae2efa0bcf41868244afcd4ab5ff8595d16478b9a326061359cb263ba6d45ede67c2d8ee1fbefb6efe8135c1a4c4783ced1c64a76ac4a
 MISC metadata.xml 689 BLAKE2B 81168f6d150dc65e74bbae7b73657d2ef6c5de0cfcb616b9f1dd756e9734e10823c1468cc1725f8681dfb71d529c89c958e751100aa9727dcc28e36c8f27fd2b SHA512 fb10f8f67754f103b109fa7696e66e02f6a66ff74472341f3e2dcb27957646fd4140594c9eee489c3d47f1985bf8a122b48269c6a6168ddbfcdcd0ffe2a415e2
diff --git a/sci-libs/hypre/hypre-2.18.2.ebuild b/sci-libs/hypre/hypre-2.18.2.ebuild
index 6a972afc092d..71a4fd5fdacd 100644
--- a/sci-libs/hypre/hypre-2.18.2.ebuild
+++ b/sci-libs/hypre/hypre-2.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}-space/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples fortran int64 openmp mpi"
 
 RDEPEND="
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 8e0d0d7f7373..3e87a83e791b 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,7 @@
 DIST indilib-1.7.5.tar.xz 1380436 BLAKE2B 092f4100894218bf749ee0d7c910c4ee20026cf471f4f65686b67dd37a924b448b6de3733e70d7047dca6a77fd8ae26b9a568f8249336be78d052984838a2ccf SHA512 57205ed9ea9d8e8215886b17d9f0307755bca571d599967dc607320fad5ec62096f31526280f3b184ffeb0434d9adb71e65a7d6f89d29edaa643d729765f47a8
 DIST indilib-1.8.2.tar.gz 2049051 BLAKE2B 66f85d84bf4e1eae003cb13d8b400055590763d807e880f2375f33064bbeebdd7a47a3c6f1f8dc154e7d82d3424b71883b9ffe2d7853a2feb9b498107387f6ae SHA512 066a7a7b7ffba33fba1435e6a9bd7be5e26f07023438b7c196a6fd865e6d3efe76ec32329962c16fc52e42ecc96dd9e7b9feb77858139faa1d7c32716f4a1a23
+DIST indilib-1.8.3.tar.gz 2062250 BLAKE2B f46b557dfbbe16070605ad638111505577b801ac6abc2cf42df3a322eaec35a25e6f8efe3ea740b5758b3aeadd656efb4b98e284d531621ab34ca00f28e39a2e SHA512 09c23299659efea795ec430566a5b51181878c382c72f1e530ef3abe3b996b670506f6f5f1bca4eb88fbdc756854c3a36d8bd646a2cf13e397e09ace1f1af044
 EBUILD indilib-1.7.5.ebuild 1120 BLAKE2B 70e19ee186e7b74d01430d4fafd2fb15d3850666b519051fa2ab97612fd01180b39e5c37d697d8d2508166ad769b41422f9d4e7e7f0789c1059641d5ee77e40d SHA512 f33e4268c4837c2df6b64bb79abd11479001e9fd9abde0c5357751a014522b37d48878a8f72628e56915487c72b7805ab7c5dd01f61a21c47407a4cda8a00a27
-EBUILD indilib-1.8.2-r1.ebuild 1197 BLAKE2B 6a5d767e4cce694bbe0d174ec4c1dca5afc1a64d71f2be4a3a4b145344365762e564d57e1feebaa5a449c96ca3c154c651f4b6ad81941b85fe3bcfa721af5f7e SHA512 6ac6335705b7696115ee84787cd7c0c944ab5a9f2c7ed5dbe9e9b5b58f1a44bddbcb85d006f4231d7b10991a3c65bde328b5c590b649a49a97534669a3f4e0f7
+EBUILD indilib-1.8.2-r2.ebuild 1181 BLAKE2B 22ec0b8f27a1a69809e0a18c81b8905c0085ddd86cce2302c3c39e49da82da0ab5dec0c02ad9ccc1bbb5cedbcb0c3022f17fe1f04587cae66e16d95ccb5f89fe SHA512 11c5cfe17a1897a43b716825137e41f79f794d3aad866676dde9ee40e0ace9ef13c428fa1a5bfda14eaff0a841bd3020c194555018569a51c606f9aa653e0c71
+EBUILD indilib-1.8.3.ebuild 1182 BLAKE2B 72992e4b51b92d044bb0d95ee05d5e9ee23c8cd5bc375df999b5166e5a6241150545cd6ed1de5281833a6218ed3ece509d9e907b1d439016d4d15f4d68578643 SHA512 a5a3f070a4cb27c38108b7adb2a58652d470e0d1880fd4a4381eca74ea0e4d08f8917604748cc5c7de37fd551a18f7bfec2904b58c6132c90b883678b6090a8d
 MISC metadata.xml 460 BLAKE2B b6ebdd49fefcbbb015e5856f0ad42682b5eda153b38b3d64f949d2c41274df269f292f25d5eb3be37a7acb039bab2d3d3b7744cfe7959472fe03425b53bd4282 SHA512 ff04501f56765165645695dda25db6bff677a6f676d3fa1d005ec0bc6fae7413e0fdd87d800b321fdd7a98f1d0cc829daa5a3d4d3bff849b6e164a5768c79c84
diff --git a/sci-libs/indilib/indilib-1.8.2-r1.ebuild b/sci-libs/indilib/indilib-1.8.2-r2.ebuild
index d36b86d8d0f5..f8b0dd3086fa 100644
--- a/sci-libs/indilib/indilib-1.8.2-r1.ebuild
+++ b/sci-libs/indilib/indilib-1.8.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils udev
+inherit cmake udev
 
 DESCRIPTION="INDI Astronomical Control Protocol library"
 HOMEPAGE="https://www.indilib.org/"
@@ -43,14 +43,14 @@ src_configure() {
 	local mycmakeargs=(
 		-DINDI_BUILD_QT5_CLIENT=OFF
 		-DINDI_BUILD_UNITTESTS=$(usex test)
-		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
-		$(cmake-utils_use_find_package ogg OggTheora)
+		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"/rules.d
+		$(cmake_use_find_package ogg OggTheora)
 		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	BUILD_DIR="${BUILD_DIR}"/test cmake-utils_src_test
+	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
 }
diff --git a/sci-libs/indilib/indilib-1.8.3.ebuild b/sci-libs/indilib/indilib-1.8.3.ebuild
new file mode 100644
index 000000000000..c0ffca05006a
--- /dev/null
+++ b/sci-libs/indilib/indilib-1.8.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev
+
+DESCRIPTION="INDI Astronomical Control Protocol library"
+HOMEPAGE="https://www.indilib.org/"
+SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ogg test websocket"
+
+RDEPEND="
+	net-misc/curl
+	sci-libs/cfitsio:=
+	sci-libs/fftw:3.0=
+	sci-libs/gsl:=
+	sci-libs/libnova:=
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libusb:0
+	ogg? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+	websocket? ( dev-libs/boost:= )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-kernel/linux-headers )
+	test? ( >=dev-cpp/gtest-1.8.0 )
+	websocket? ( dev-cpp/websocketpp )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${P/lib/}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DINDI_BUILD_QT5_CLIENT=OFF
+		-DINDI_BUILD_UNITTESTS=$(usex test)
+		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"/rules.d
+		$(cmake_use_find_package ogg OggTheora)
+		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
+}
diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest
index 3583c2bc3fc8..60bc616e5406 100644
--- a/sci-libs/keras-applications/Manifest
+++ b/sci-libs/keras-applications/Manifest
@@ -1,5 +1,5 @@
 DIST keras-applications-1.0.7.tar.gz 289570 BLAKE2B 5f6fe2419b2de41f718e6beae56c8c4910efe0e6c282ad32b792f50a8b9ebc88c866eed84fb8c7dcbbd1680de605036a0012458af6d14250b1f8624ead5013b7 SHA512 5f2c5fb7b7f644a881f8cc9040633a69d3a72562206dd0601c8b31bf4fd3bb2aeee07a0d7040311f0fd42f16330bc249d306cdfa01c7b60717b05726040a0b78
 DIST keras-applications-1.0.8.tar.gz 288909 BLAKE2B 41d70552f5dfdd0c1385a7ca0b527ce0e0c3441c1ee3f72c90569f3e43e6a82485d0d4affee83afc645f3b99a519facb41d11a3fc1384c98f44182dddbea02bb SHA512 58af0d8e0289d97b416559bf235deeb9a5405d50f2a2c93612cdbde36e4d6d006db5c570acb814c209414a4b61c2310a99257aa0e2feaf24e5260d549b8b94f6
-EBUILD keras-applications-1.0.7.ebuild 559 BLAKE2B 02d3a8c28c3a4d732ab235befe91277af16b355041d90044b1da26ec3a084fa8283904e398bf484938562293acd9d2a61af8ab7bb5c8d308008e73f363cfbb83 SHA512 b7587035aab92fadf125e29c78158b8fd16838588fcb06828798809ed1699286aae1655c509bf6df8b1e234f087e1e15c8c32bae642fc3078d4d3d7faac76e81
-EBUILD keras-applications-1.0.8.ebuild 561 BLAKE2B 428e826b883af98b9e27abb6d26afffd0f6dc0c8777f0d2e4bdd70917c1448f890e81ec1281ba9c683cea8024d880ea8e21aedde5dd457b204a7ca05d1ffb1b2 SHA512 a3a2ebf399cdfaad7a8e51992171f66570f7f42025c6f60f1d101611582396e9685570d4b1cedbbec2ce5c10d8e79fd16062f6e01b4d437e2043e009759d0cd3
+EBUILD keras-applications-1.0.7.ebuild 555 BLAKE2B 4122997649b17c067326b78d4a177e76864ca19166f1f1660c6d3b84cb0f028d31d5f33ca89251a33e59cb81a008da8d6f5db3865a73aa58dde612fdd883f20d SHA512 7b15f028ad57cdf50e4ca6b23099ef01b945ae011619ed7bf4e82d7e7d31f081b33b73981119d03a773ba9cd74b3e906d4d4056947bbf012a39fa5eef46ef9f1
+EBUILD keras-applications-1.0.8.ebuild 557 BLAKE2B 9c3421de5e73b9fb604a0baff979d129e694ec6824d190b8fd1a67d4face6542918c26106ffef28c7c0dad8336537f012f28dd6859173ac4bf94ce76428b1db6 SHA512 d188868b3da62f5d24999c8d77dce51508639acf50854590d7aaec2a6101dfec065d5a6045e4a1b3e7f5a4300deeb3c754a45f79ddfb4a097420e3a6cb1efbaf
 MISC metadata.xml 621 BLAKE2B 4f375ddfcfed6172df186350f7bd3dbfbcacea34f555b14719af43f58b140d73e378cd0a5efd8438ed2a0006f3552febc684b4fce85aeb88fb2c9bf819c06c4b SHA512 9dbb366d483843279cc7532b56a877313a7c39de25c93c313a2957092f9766ce5715a83dd87ef116d1733a7cc399319025ce1eb0e7ad174e2b7441360a9f5560
diff --git a/sci-libs/keras-applications/keras-applications-1.0.7.ebuild b/sci-libs/keras-applications/keras-applications-1.0.7.ebuild
index 7881ca725229..d83037357a94 100644
--- a/sci-libs/keras-applications/keras-applications-1.0.7.ebuild
+++ b/sci-libs/keras-applications/keras-applications-1.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Keras deep learning library reference implementations of deep learning models"
diff --git a/sci-libs/keras-applications/keras-applications-1.0.8.ebuild b/sci-libs/keras-applications/keras-applications-1.0.8.ebuild
index dcf6a0b2bd09..8468b5755fad 100644
--- a/sci-libs/keras-applications/keras-applications-1.0.8.ebuild
+++ b/sci-libs/keras-applications/keras-applications-1.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Keras deep learning library reference implementations of deep learning models"
diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest
index eb3a53da0dfd..2f7bba86e497 100644
--- a/sci-libs/keras-preprocessing/Manifest
+++ b/sci-libs/keras-preprocessing/Manifest
@@ -1,5 +1,5 @@
 DIST keras-preprocessing-1.0.9.tar.gz 46476 BLAKE2B af80a6647bb56f8c4dba93120bc2b70db36d2c6a0e36c3be9a4843e5c36c9ffe50db1cd9396eecd47f6c0595c110825d70d2e6b28a29a0a199b5cfcc499e4440 SHA512 93ef9b294638bfeaea82170b323f08b261a2519f5ee8b9aac7d88e5b32c6486646d91075cea71bfbc27780c8af55125319873361f0431d48b451e574d1e7a400
 DIST keras-preprocessing-1.1.0.tar.gz 50631 BLAKE2B 235a1a7d296684e5405c6472026a53b1930923e74065529ba6921e91bf8849d35c02378f8eeabc4f532a4e25937e8fd8f712a59067c5b358afe10b88e1531fcb SHA512 68c71e82ea2139d3db4142c86a2c404e4d65a9a881f72b07b4ccf28733b93a9e4837f91534a20c3ca5128600d8b885cc8723181d96c9045d5280ad7f84091cbb
-EBUILD keras-preprocessing-1.0.9.ebuild 607 BLAKE2B 114021d956911f44d328bb0404ea39aedd2adc8026a385562752811a3dc8949db3f0d746eb83f0befe71ab0c6b3f1d38eb164ecd9ac664e69455a7c4f3d79541 SHA512 fe830bc4dac0cf7730914de5cb2080f5e2ad4b8d375d051e9a8d34fd491df0f948ac5a93e7e103337ba4b8042d72b3a77f531f4424b5dc064a7d050e9a21e398
-EBUILD keras-preprocessing-1.1.0.ebuild 609 BLAKE2B 6eb32367a3e9cbfecd7c211b2378d48d68afcb8801314dacd2d168fddf285cfa5aa3d10b66f15f670947efa0f0a13c89290cb0e65c649bec257ef274ddaf5f6a SHA512 198cf1d5796e5d727abd898e8f96a8ecca2cecfd8e26cd88e22f8e04c02800601cf7ccfa7076b84e8c8dd88dacef6173a52791ae66b19efd513162ffbd76e3bc
+EBUILD keras-preprocessing-1.0.9.ebuild 603 BLAKE2B 480ec1be11e9553483e39e9c35fceeaf619f837f6dc65235b2a55522deffc4a005722b4ca66417a6e7ee7c586a5742c1a152e663c33c192fcc21ae961ff5313e SHA512 b861496c45a5819ec9042ee6b909e0a6d56901f501ff90375b83116aef32c356f35fc76a571c9f289a38a97e822c859d2825cc4845d38b025b2308417478d315
+EBUILD keras-preprocessing-1.1.0.ebuild 605 BLAKE2B ff9c2a5cec242aba2b99569d4d73e76617b65f3cd32aa87f4ca381c706b3ee49ed9207f9e767c2bb774cfb4ce467e9f0412cdf029b183fc1e0ee28f413ec1f21 SHA512 17495366f3eb556e4f94aa8eac92c2d7b62ac2edf0db0b3e3ed7a40afcf052db7893656db8c854b820e954dc9370f957f714c85aeb55991309a3cf90f1b220b1
 MISC metadata.xml 585 BLAKE2B a2f92ac4e2b9af055313a13de9bcbaee7ab7ca2efa4790c82027aece4b629bfa7a73c5ed0286b0f24f1853330057527009afe6ab1722f19d9c504a9d0737e827 SHA512 371cc3f5897bd28c62642a8857a22e775e24aa917bc0e58bb4de4e0a2a6580174ba35cfda2e8dd83599e2180fdfb3f11a953e7076c6d87073e1465b145b115e9
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
index b4b6f40dea1a..f75f64631d3f 100644
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models"
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
index 51974c566595..90f33c01b7db 100644
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models"
diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
index 55317813ee3e..94744add955f 100644
--- a/sci-libs/klu/Manifest
+++ b/sci-libs/klu/Manifest
@@ -1,3 +1,3 @@
 DIST klu-1.2.1.tar.bz2 612428 BLAKE2B 807bfc56deb5c4cbefd2f6c118cd8e929ba9b02d9b88e8eee8b9443991f16a2a3e9b4e1fa888b2b6e450aeda9fc4d12d6a5480f9f25bf366312f57cd8f380af0 SHA512 2837ade61596b5e738d0dd16a5486fd2b0089ec9ddeae4fa3b2c3671de6637c7cf2d55e44c0103c9393caa3f046039a76d9abc5b8094d236523db0c58cc58b70
-EBUILD klu-1.2.1.ebuild 660 BLAKE2B 14733c3d057115325b8a17de91c46d936d2ce431b27677861750171c5fc018732050c59cdb0e1bad688feae0b0ebf7a2fd9a083b560d1eae6fe59a29764fd2e8 SHA512 60e6e6a38dcd6c39167b8c965bca5b86235c2caefbd5a7e2abefa544dbcdcafd1c80811df55249bc896b9f59107e1cb93af7ed1bfc056fb889beb689ad2162f3
+EBUILD klu-1.2.1.ebuild 656 BLAKE2B 53d38f9b4a6b80b98c50a0eecf85ce3e0eb6ffa65134ef68d7c7b67c1ea1f402f11f8870f1a1720b9583c79c952c7820eae652ecd3ebf9bb399fa7f2d20c27fa SHA512 2e0dbdfb47e311c4f537aa9e064e2a383b5aa783b67c3ece14023b88512167bc9f897f707129d6a57de207152804d80e181398b7ca17ebd7a7e20985672fd717
 MISC metadata.xml 460 BLAKE2B f4d619f68a16bcbaaf2b44a9fd1156cc88dd02d38609da2e56f8b242df9744fbbe4b7befff2ae34f084b5895ab9a537e62182015008e596fddda33ea891698b5 SHA512 1e01a7e6576552beac665a8a0affe21809785f33316767ef6e0bcc59dd019e5100f1ed16ca1bd91ee1daf102de2122ed57ff0980dd6b4f21270f8c4c5f832db7
diff --git a/sci-libs/klu/klu-1.2.1.ebuild b/sci-libs/klu/klu-1.2.1.ebuild
index 45aca3dabe4e..ee3f2f53374a 100644
--- a/sci-libs/klu/klu-1.2.1.ebuild
+++ b/sci-libs/klu/klu-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index e3b586001aa3..aa3a70523c74 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 3005 BLAKE2B f72bbb2310b5d7397139647952cc082ac330307e8b76b669fc3b1591da7352ca510aa2b3cf142368d4b408537de3845c697c7f4d248fdc1c14dcafb8368d8629 SHA512 b914e3ecbf24f29576b3c0f1bcccfb7028781c7b5718db86454787ff9ab84f65ffedfe3fe632283f2db3a19fc136ffc42db79f4b3a324223c382733416d3b990
+EBUILD lapack-3.8.0.ebuild 3004 BLAKE2B c17e237074dbafe7d677a3ace66f3cec5f9c0f2e1e81dc510f6dcf0fbf9c633f4a2a888c019bb8600dd9e839e158ca3810fea94f92d9bfda054e3224992cc106 SHA512 282e50de6ccd8b0d11d7844b7d55e5924b4c1756737cac1a01211ae98e4a13b0af36716b9325b5bc685006909599e47adc9eff85248b710ff2dcd6027fe63192
 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 8ad78cf13254..8a158e8dd50e 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/levmar/Manifest b/sci-libs/levmar/Manifest
index 074ed5947cd7..7d576a01f9e7 100644
--- a/sci-libs/levmar/Manifest
+++ b/sci-libs/levmar/Manifest
@@ -1,5 +1,5 @@
 AUX levmar-2.6-demo-underlinking.patch 419 BLAKE2B f9b5f6761a1c29568a86e92793024c3eab4988c9cb4fde157fcc94d59dc0675d4eb3cfaad50528838e3800df543280813a3f8339d2586bf4b6199a82f18e558b SHA512 bed5504603e17dcde3c6fc91031f0d221eec3e8da3a75c930e7a113b04162340d5e83593e7ef3d60e17d2df07caff24356a64b95e8842fcbe5b79c26c1ae2c61
 AUX levmar-2.6-shared.patch 425 BLAKE2B f66eb4f1f50a93b201f3c315b30dfd956f546159a7a6de1d8e97ed70fec70526b48c3b6065b3010c199e4fdccf72fde74f7096a8388b04f6973f251d0412c672 SHA512 1544ba8d450f383f556f6f140b7b0c15d128bc0e12071f4cd47ae00068d3c67e82c49c4b7525ef3d9af2e3df805f3c749e460c91de652065e2954d6c1ee76109
 DIST levmar-2.6.tgz 81143 BLAKE2B 569bba64797e3cf20a0248167b48dfac4b87b3f238637ae5a970616786faedddc63e35b89c5623ee46239442b50e5f7129958ea0715a7ecb965363c0e2efc216 SHA512 5b4c64b63be9b29d6ad2df435af86cd2c2e3216313378561a670ac6a392a51bbf1951e96c6b1afb77c570f23dd8e194017808e46929fec2d8d9a7fe6cf37022b
-EBUILD levmar-2.6.ebuild 963 BLAKE2B 7bbf9d4bce2b9398dadbc43e6490da26ef4f69348f38ee7d8311f46cb5f4298a92802c5e3ad0043d6b9328e0ad57df75bd0a530202fb1574f9947eac8371dbff SHA512 0240afc846c608f67bf0f6ffa7c3ac1b5283cf888700fbaf067531ad5577d9108515acf9f4abab63891c79078c725e9b2c05d7de86fd435406276a111e2e8220
+EBUILD levmar-2.6.ebuild 993 BLAKE2B 7773af50e2b685800d5346bb31c3a932fd2767c89e5dcd398b340a67c8c959473e6ad433321e62f394771ce9022f2f51fee2ec6e158c8e0acdc65e1e55b0f8af SHA512 84c61297700dfa82c25f387890fc541ec4a9608b95ca1e1a6632fc0f665d95d02565b15fd77fc89c23924080a462b44833993c3104e166e0e6a3be202ec700a5
 MISC metadata.xml 765 BLAKE2B c99d768ce005a5feb04a006d677d619ef4bbdfc68f6efaefb9b2ace3be6d3f0499c4c50f7a4380f34ec88e7f2f5aba551f92eb57987fb8e62c878ecb17bb246a SHA512 5aa2314b9c7fd03543d1a4e069bb7f3812237784473b4529d902873131b25338962090ecdb8cd2e9c9d9893486a88acf2febbabd4bc802f7f761ea9b73c9c1c8
diff --git a/sci-libs/levmar/levmar-2.6.ebuild b/sci-libs/levmar/levmar-2.6.ebuild
index 1a31e16ca9e1..8a9aeb3b8ff3 100644
--- a/sci-libs/levmar/levmar-2.6.ebuild
+++ b/sci-libs/levmar/levmar-2.6.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils eutils toolchain-funcs
 
 DESCRIPTION="Levenberg-Marquardt nonlinear least squares C library"
 HOMEPAGE="https://www.ics.forth.gr/~lourakis/levmar/"
-SRC_URI="${HOMEPAGE}/${P}.tgz"
+SRC_URI="https://www.ics.forth.gr/~lourakis/levmar/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sci-libs/libaec/Manifest b/sci-libs/libaec/Manifest
index 0fe7b8b3df0b..75cc4f3fc4c9 100644
--- a/sci-libs/libaec/Manifest
+++ b/sci-libs/libaec/Manifest
@@ -3,7 +3,7 @@ DIST libaec-1.0.0.tar.gz 3118578 BLAKE2B f3b8ef52e636cd3a04710f75de6fac6d4ab97bb
 DIST libaec-1.0.1.tar.gz 769507 BLAKE2B 7a5f0e3c016f6562a94013a072e33638ba6e4b4af1a607befd508e442dae750d59435b96628bc59e4b86694d5745c302a615fa00603221d642700b86519c4428 SHA512 e3e38298d8d1fdf86332612c4dd62cafb8fa59ec8de00ed96aabee5bfbb46fd2396fcc0ad7fa2e4f89f9a22de538e58be5017d214b42176c0450dcc7c35bfedb
 DIST libaec-1.0.2.tar.gz 767910 BLAKE2B 4d843839b21d93a7ae0f90627217978d1d7262dff35962bb7fe7a9f62f57b5042c36278ff61ad7d7aa3ad1a7cdd1ceb75a59dcc1ab9b3d1c899c506ffe5819d3 SHA512 28a8839089e4b643b259cb8679b96e602a35098d1129baae6b3923767060e5deabfa33256d628a8bcbf205368cda5f2e6701078de0caccf44e0597d932a67ba2
 EBUILD libaec-0.3.2.ebuild 861 BLAKE2B 02da5f244313ee6e63b45786c993bafac01aa4e25599a9c6669fb00cef636cd36cb1210cf4e138ec7554812ae4e8cf325bb7d324155754c391403bf7ae6016ac SHA512 98665305d25602202a33013af317ce7c12e65a5c37520db0e7f62b57bed70df064356d4a79cdedc7d8c119fec6bad06f327cc9f4ce95b46bf069f15d14dc63f6
-EBUILD libaec-1.0.0.ebuild 867 BLAKE2B 41f44e86d7298b6d2693e95f99bd5a7562bd070b76118baeddb226c30b8ff6fdf67d437cc1fc40d93adc61529b34a9e919724b99542ee397cc0617a0171cd73c SHA512 14b5bd5e53710b28b53110cf3720754425220d1a58635da560945a3c2c6aec609adcad5bc5992aec1366e14a6ac3a3d1f200e4a7ee3543b1153835dc21ec1c02
-EBUILD libaec-1.0.1.ebuild 727 BLAKE2B e798ca2aa12bb996cfdcbb1a4d6f93be758e0fd6656ec5b69f5aabad5fe99171bfeace01fb20da536f57691375192d16177c9869c87fb5b2aec2629fbb48cc67 SHA512 c265ab4b16211ff6af0b166b070642f6f3c37ef06b48da3d9dc4d1ba16c955909be9c94a1428d9cace53cac3df099bc5a86091ec110b1c1fa9e382d6919095bb
-EBUILD libaec-1.0.2.ebuild 713 BLAKE2B 371bb02593580c81beeec9f1f0adac65274e79da6625294438c983c881a93dd35e8980de44947b43421b122aeacabd4ca9ff8726c1a4142a50f8d77885ff8692 SHA512 101f39b27c011559c63d7072a47b6546ca4edaeae0aa2fd5024384c7cd5cfd8ad8fa645f07b2baef22f1ea2678ba0670154d2636f34329d6c757c19d77912487
+EBUILD libaec-1.0.0.ebuild 893 BLAKE2B cc4e36b482059925a93d3f19cb4b048b9df2efb70ee204e9acbb4cd2d2e3ed41b4c8c5ddfb15b04b9d0a6e6fcdcc8648b34aebc0e58b21672f58208b23ae5d73 SHA512 862d6d929b89f39d2863fd03afd5d814f804ba9240b9d706fd950600edc954777b3994f399cfe3119c508f6e49f4ea0144b0f629cdb0f6e69adae3ff58ddad54
+EBUILD libaec-1.0.1.ebuild 753 BLAKE2B 4d5e17cc1a58e9efa5cec4eb102bf9db346126cbc4e9cff25847c23b72dca201f2421dbbf4b20d92f2c65d7cbffbde80e84910e00e8b61fd3b03b8a28021b375 SHA512 678624efae4ad07f98521faf9e3d9bff4b974ee8a25d1ab5381cbb34953199dd8a4cade0556c366a9dee29ca1afd0033fa95eeaad479af91bda9037ab06f23a4
+EBUILD libaec-1.0.2.ebuild 739 BLAKE2B 329845c663bcfd2823a5760695478e4010e16fba0f18e07b0217f563a97bf783b186b6e84c93283e590f8ecf82b1095beb610a47172aaea8e27dd0705b4130da SHA512 2272eddee96a22d5292a3e7069424b0b7ac86764c7406e55bb6857edf336819b81d692363a4282b536560f6ccea97d318ff327ce149aa8c76670f1d0f56d4493
 MISC metadata.xml 719 BLAKE2B d8294233ada6c2318c05d70c6062e7b7db0b0bab38410e9bd0c7d6f9834d1515cb138095d555f27f36c829fbbf7c83c141c1ce74213fba849da8704adf63889d SHA512 f0197c0cf374cb0771e4b2e3bfcc80f639d3e660943df1cab79eec68b515a605855f792b0b1627d24409cfb6cc2890ca7e96f4aace01639106ee50e14574ccf6
diff --git a/sci-libs/libaec/libaec-1.0.0.ebuild b/sci-libs/libaec/libaec-1.0.0.ebuild
index f1d47bb32d3f..c7dcca775d17 100644
--- a/sci-libs/libaec/libaec-1.0.0.ebuild
+++ b/sci-libs/libaec/libaec-1.0.0.ebuild
@@ -9,7 +9,7 @@ PID="631e85bcf877c2dcaca9b2e6d6526339"
 
 DESCRIPTION="Adaptive Entropy Coding library"
 HOMEPAGE="https://gitlab.dkrz.de/k202009/libaec"
-SRC_URI="${HOMEPAGE}/uploads/${PID}/${P}.tar.gz"
+SRC_URI="https://gitlab.dkrz.de/k202009/libaec/uploads/${PID}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/2"
diff --git a/sci-libs/libaec/libaec-1.0.1.ebuild b/sci-libs/libaec/libaec-1.0.1.ebuild
index e6a8588c3d0d..ff096dc7334b 100644
--- a/sci-libs/libaec/libaec-1.0.1.ebuild
+++ b/sci-libs/libaec/libaec-1.0.1.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils vcs-snapshot
 
 DESCRIPTION="Adaptive Entropy Coding library"
 HOMEPAGE="https://gitlab.dkrz.de/k202009/libaec"
-SRC_URI="${HOMEPAGE}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+SRC_URI="https://gitlab.dkrz.de/k202009/libaec/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/2"
diff --git a/sci-libs/libaec/libaec-1.0.2.ebuild b/sci-libs/libaec/libaec-1.0.2.ebuild
index 410594b49bbf..ee564a7b48de 100644
--- a/sci-libs/libaec/libaec-1.0.2.ebuild
+++ b/sci-libs/libaec/libaec-1.0.2.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils vcs-snapshot
 
 DESCRIPTION="Adaptive Entropy Coding library"
 HOMEPAGE="https://gitlab.dkrz.de/k202009/libaec"
-SRC_URI="${HOMEPAGE}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+SRC_URI="https://gitlab.dkrz.de/k202009/libaec/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/2"
diff --git a/sci-libs/libbraiding/Manifest b/sci-libs/libbraiding/Manifest
new file mode 100644
index 000000000000..0a5f665ef3fd
--- /dev/null
+++ b/sci-libs/libbraiding/Manifest
@@ -0,0 +1,3 @@
+DIST libbraiding-1.0.tar.gz 377140 BLAKE2B 93520ca1af05dfe77028d3a8d94e94fb4b387662c0f71048db5aa8b1dcc4115996be2ac95108c01a574095cdaba97db1997a65e98a64f87230dda4ae1b6bd8cb SHA512 0fb389d4483b665165bf9ef8dc770b51884eb4ab576c4ca06944080d87ddae806bcf4ebee1fd586f97de171d2ec79c89aeef86ffdeac10eed49ffd0541989ee6
+EBUILD libbraiding-1.0.ebuild 786 BLAKE2B 0ac6f17376a3d5114b1e7788c207a7bcc668d4c54426d353ae5fff7fddff2078f9c626bfa47aaaa720333fdda6840e7fedb53a0be49cb7076f7eecb1b5d435a2 SHA512 bbeefa44f865c94a7118830219e6ce776073b9b196aac0ca5fc82a989e1877907cd45865279aa4716cc48cfb666709c714831ec4c806f9c6306a3b54aa90e4c1
+MISC metadata.xml 1009 BLAKE2B 8dff16992db4a93811825eba4e52e60025c0981e8f1faf2077ae78800d730777e73239146e3356ab4cbc39c94c117715a2ebaccdf1e1a23e3a864bcc06b50a8b SHA512 f6fd4fbe425042627258bf02be878c40834858521daa8feba891ce04990910ba256dec5e550c69cf0791564c8eeef1219f6d0ffabc2dbcc879ee8a44c25a324d
diff --git a/sci-libs/libbraiding/libbraiding-1.0.ebuild b/sci-libs/libbraiding/libbraiding-1.0.ebuild
new file mode 100644
index 000000000000..591115bbc221
--- /dev/null
+++ b/sci-libs/libbraiding/libbraiding-1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Expose the functionality of cbraid as a shared library"
+HOMEPAGE="https://github.com/miguelmarco/libbraiding"
+
+# The github release is missing the generated autotools files, like the
+# ./configure script. Rather than involve autotools.eclass, let's just
+# get it from sage.
+SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.gz"
+
+# A few source headers still say GPLv2, but I believe that to be an
+# oversight: https://github.com/jeanluct/cbraid/issues/4
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs"
+
+src_configure(){
+	econf $(use_enable static-libs static)
+}
+
+src_install(){
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/libbraiding/metadata.xml b/sci-libs/libbraiding/metadata.xml
new file mode 100644
index 000000000000..1b46fd9baaa6
--- /dev/null
+++ b/sci-libs/libbraiding/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <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>
+
+  <longdescription lang="en">
+    This is a project to expose the functionality of the cbraid
+    program as a shared library. The original goal was to include it
+    as a component of SageMath, but it can be used in any other C++
+    program.
+  </longdescription>
+
+  <upstream>
+    <remote-id type="github">miguelmarco/libbraiding</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index d16b6ba6c4ed..1995a99aaec5 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -2,4 +2,4 @@ AUX libgeodecomp-0.4.0-libdir.patch 694 BLAKE2B 87b08665e9f1d236183f7bfaaf34ef5a
 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.ebuild 1466 BLAKE2B 5d6b2314208bee5bc15bc69fcc564ffa425d82421c1d54df69f8db187adab43889cee89f9d9affcf87ed139d283602c6514491240393bb44444d66f6a273f9b2 SHA512 1fc4b3515cb3d219108da35349292a4bceb1bc282949c2a16127d99a2b75787aa2edc2ac80b712c3b9579686a26e4ffe7a85020345030153c5b67c0420c09a29
-MISC metadata.xml 1252 BLAKE2B 1c35e4efb788c48e23b62025853472afeedfe1f860797cf22e79877e8bab3170998bb1e064ff05a36bf8ddbb6e70b40da329cf9be7ab929a7cb6a9aca2b51c04 SHA512 e8c259afc51b594f4d167128555c7c0ef6935eab46e43ee92407ed32183815cd5e3588a3b0cb0230d757dfa9ca0ddb1f36ef4887b9c31f27ee57e668413f1026
+MISC metadata.xml 1201 BLAKE2B e3338a4d2cc26d55bdc820ffde8280507da7b6808ee2f93fd82197e628b2b69d596c48d6bff3c8c4abedc3509588e55db1b238fcfe0cbf2bc751bfffe1f7b6ac SHA512 ebfd83cbb09b16f24ead5192c9d6bf5754e98448c055b05284ccb8a3bf0d90a77215189d5f310b2a44ac2ccc0db998ace007ab658355545e2974dcfe3c07d548
diff --git a/sci-libs/libgeodecomp/metadata.xml b/sci-libs/libgeodecomp/metadata.xml
index a3c9cd3cd67d..119f987c9b7e 100644
--- a/sci-libs/libgeodecomp/metadata.xml
+++ b/sci-libs/libgeodecomp/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
     LibGeoDecomp (Library for Geometric Decomposition codes) is an
     auto-parallelizing library for computer simulations. It is specifically
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 82ddbb2226bd..e45505cb8f3a 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,6 +1,6 @@
 AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a52151b59e82704545d55521f1983ca2b77a93c20dc0e9ddcc6b446a6485e942f301e19e165 SHA512 cc0324c682d5f45f516f0a71311a9b6527c5c4cd6c1a4113503ad9023b72c64ef9c257008cda95d565723183f932f61f79aab73e123e7b7ecf8b7fdb30457fee
 DIST libgeotiff-1.4.1.tar.gz 1674928 BLAKE2B 6c83ca77728c40995bf262d165c8566573c995f0d0116a3756f688b5686ff6529295d3340afdd771268c80050fb81b10953f7ae7339c46ed23d44dbd73cf302d SHA512 4a68bd7b9adf7453fdcb8f98cdeb79289b5f21315d1ef91d54fcc01724c8d687d243826c05a5523bb08c930296335959d2290916d46b6d802e63ac9be727c628
 DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893 SHA512 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
-EBUILD libgeotiff-1.4.1-r1.ebuild 1280 BLAKE2B 4a9b5b8eddf22a9c0e1d3578029036146c00bec8883a1a59d09a274f28ef573dde917e2cc0daddf771d2ac94fc0de6fd9612cb3c1ce6130d6e4a958d3afb7df4 SHA512 ef13ec278afe453581231b4eab2d0e5d69eafc539025e902db6ca411842e105e20f5fd3f9fc085b50ddaf2d220435eb740f16779091428351ff1a5e37d828580
-EBUILD libgeotiff-1.5.1-r1.ebuild 1287 BLAKE2B f25dc592b8ea6f624a35a0a4e269d4b44705aa441d9844ee412c3891784d2f75b714fbb6cfba2235ca2ad7be89e45bcea1173a0ddc9e59750e86f8457b09eb9f SHA512 e0ffc07f1150e0b91443921674ef85533139184f43baa0736b03351acfc20b1b7d66dfc123b4aa3bd788e5f4cae1b142d46d7ac7164d855f1d97d07dfee2ba7b
+EBUILD libgeotiff-1.4.1-r1.ebuild 1282 BLAKE2B 878dfb3f73781cd4d799900bcb556bd0c3080e1b7c57854a09f058614162bd0fcf84070ff277b9184e7d670b272190199a6f7a8597e369c819ab24fb64a6d051 SHA512 f1faee1223815f7ade357a1f2d3d32a8da3b7b491da69548dc2183948fdf334234b0542cced920bc5a8cc231a790881ae22a3e078bf31be06d0981b2badcb30a
+EBUILD libgeotiff-1.5.1-r1.ebuild 1289 BLAKE2B 395f4496e5ac04e22aee1036ed6bb0b7cbaf277ab273119f5714afd04055406a35e7e4a810b0d0c77ebccd988e2677e57c3b5e2a3fc50bb881dbdf953b327f60 SHA512 c020f9dacec0c9c7e85d7b2372927b725ed0f49ba3c1031b1ce329b51a2878499c165c4a71122954f17301ee525d6b1e26393a82f319a881b1bd7004715af086
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
index aaa7845a9a1d..fe26ae0b2647 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="debug doc static-libs"
 RDEPEND="
 	virtual/jpeg:=
 	>=media-libs/tiff-3.9.1:0
-	sci-libs/proj
+	sci-libs/proj:=
 	sys-libs/zlib"
 
 DEPEND="${RDEPEND}
diff --git a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
index 7696605edc46..1e85578587ad 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
@@ -19,7 +19,7 @@ BDEPEND="
 "
 DEPEND="
 	>=media-libs/tiff-3.9.1:0
-	>=sci-libs/proj-6.0.0
+	>=sci-libs/proj-6.0.0:=
 	sys-libs/zlib
 	virtual/jpeg:=
 "
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index cf2928b36364..517a3570f4ae 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -3,8 +3,10 @@ AUX libsigrok-0.3.0-no-check-linkage.patch 980 BLAKE2B 44f84888190f6a683da93d8f9
 DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df SHA512 b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550
 DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 8d1578c1f84c84af54f0e6c97bcdcec6d183a80170d0b19aa44c4015dac3c418e1a1e304b42b12be3f905a3887f95d2ecc9644aeb2a81a961e09438e380ec70b SHA512 5963c1a44cf351a38d9434f89a15b20d36c7196a78464c302c65ab262bcdb2f26274c7fabf01174757e1f9a367497b9721578ebf802f75ef97ee71ff3dade1e0
 DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B b5765e1057ee4411ef2f83fa73473429bc8f84653f1c7761af3c1280decc2fcb1d3c68d8f92f7e77b85f1fcda74cf6066e5bf56c0da2de4b28148b920b94e0da SHA512 48337fc4625dc0abc162ae54e04ce091047835aa1e49ba1ab84542805008d1ff5646b143fde57e317f3b34514c0e6d4dcb7b1c5944f3f16bdef1a7169edc3517
+DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
 EBUILD libsigrok-0.3.0.ebuild 1724 BLAKE2B 1c426bf94a8f83078ea74d094c8c43ce044ac6fe6c94548f47a15c203cc06295de43b6e72d97cffcb4a7a0ec11fecda611217e5d04541ec108f0a4d647773838 SHA512 e6ff926a3e3b0b4e753969c734603d934844c3099a3ba6eb6b81b5e938fa3e113014d46b1ce2cff977940a2099920d30e41f9a3bad5eea4ba41454196f801829
-EBUILD libsigrok-0.4.0.ebuild 2137 BLAKE2B 124389b23f9cd4723145af3b08e171bf002ef3eea9b8f5d5cd3465b8f53f393624d35d2e2e23674fc08411bc53f59f93a6e5421b9ea3833977d87e6683334c02 SHA512 8ff6e5b057ad29fcca715d9545d431c3e9f254be2006dbf442e1f9f814f63e27cf611abdd6d88e758c7e17ef8ab9cddd26a0b5e5bf5e426a915e2737e1fac629
-EBUILD libsigrok-0.5.1.ebuild 2365 BLAKE2B 9d927e3dfed88bb3f366e990d662bf37ec574c30c992c3ea62b8fac39ce8ae38a08c332460ef80a9b5e2d424db46fb46e48921dd4cbc40ada16bfe456bf33801 SHA512 d086054cb05b5380dc7479157dcd3505eab22130d88fce116843cb77f10bf795f1dbb8cb85d068ff43d337bcd8cff930eb785d67ce343c9d88ac30c6d8d24f64
-EBUILD libsigrok-9999.ebuild 3629 BLAKE2B 4abc8dc5330c1cfa5a4bb5432a84b0bbbb2d605e93da69178e254e22ec21703d5a893705fe009ebff195a154bd221fcd990036b7e54f222920ddd8334af18b82 SHA512 903e174fb8a339ad7e3e471a2415b4e3bc4a5c0395078b0df95d8ade75e2a8d720e2aefb8d1ada3039bcc866bc0eac6583c4ed7f55b064ec70271d55c7e70027
+EBUILD libsigrok-0.4.0.ebuild 2133 BLAKE2B 5385b1cf0a9accbb5172b95cb0e91efe6439d204c0cb734f4d9e01fae933e3a2c647e3fc2011e25955a92ab05714ad7de796e58023cee7afac9a8749b8089c4d SHA512 e299140f57d33d72c5f1cbf0723704f56b837106d71f91ca3c62dd691e982ffac0c9fcc561673821f00bbe0e3f265c148853e444bb2298ebcd8b0fb444fba194
+EBUILD libsigrok-0.5.1.ebuild 2363 BLAKE2B f4ead74620b10b97b32a94400f56e56bd54f8c4a80cddbbf837ac5edb185d65eb110ae83621f86412e1335a2a05ba480482fab1faeac332d091f1d5675b0181d SHA512 114eeb66a774f8a3739215a3029a7e65e94204497eadcd097f3a6e3f56ffa1a79d754ccfb22910520fd1c69389fef7286c40061ce42a285959cef5c7c5910c0c
+EBUILD libsigrok-0.5.2.ebuild 3641 BLAKE2B 3c7b23e7e1fca072d969bac0adb61c44344c30f856f2b54b87fbf2a43b25a1d4edb0a7726256f30f4c741c8c446b93e0c73b1b3a4bb5d8772eeb94d0ed6b236b SHA512 3a821aa28e6349b69312e863051a52a2f3030b412ce608ffb936f811640a9d54e07718af2766be5923921318c999f703e3faadea4bd2be0c8ad7fd443c560767
+EBUILD libsigrok-9999.ebuild 3644 BLAKE2B cc90f93d924687e2e213a24d844276ab2424fd55505743ca93777c616cb4d1a442e40fa9f0edc93d3b99296d35836fa730c79e21db12805deca5ea31ec712c91 SHA512 88a23335faf959585fe92d4dd94c49c1d9634b747884e8c9bfa9ef16b822f145444f3866abc681c534b3b12097e76172ff4471d1e3d2ffdd3c5e186ec63c19c8
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index c778d842eb25..a360d4392473 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit eutils python-single-r1 java-pkg-opt-2
 
diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
index 9be12225b2ba..a55893a01993 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 udev xdg-utils
 
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
new file mode 100644
index 000000000000..b34f77155e08
--- /dev/null
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+USE_RUBY="ruby26 ruby25 ruby24"
+RUBY_OPTIONAL="yes"
+
+inherit eutils gnome2-utils python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="basic hardware drivers for logic analyzers and input/output file format support"
+HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
+
+LICENSE="GPL-3"
+SLOT="0/4"
+IUSE="cxx ftdi java parport python ruby serial static-libs +udev test usb"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} ) ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
+
+# We also support librevisa, but that isn't in the tree ...
+LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
+	>=dev-libs/libzip-0.8:=[static-libs(+)]
+	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
+	python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] )
+	ruby? ( $(ruby_implementations_depend) )
+	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
+	parport? ( sys-libs/libieee1284[static-libs(+)] )
+	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
+	usb? ( virtual/libusb:1[static-libs(+)] )"
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	static-libs? ( ${LIB_DEPEND} )
+	java? ( >=virtual/jre-1.4 )"
+DEPEND="${LIB_DEPEND//\[static-libs(+)]}
+	test? ( >=dev-libs/check-0.9.4 )
+	cxx? ( app-doc/doxygen )
+	java? (
+		>=dev-lang/swig-3.0.6
+		>=virtual/jdk-1.4
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-lang/swig-3.0.6
+	)
+	ruby? ( >=dev-lang/swig-3.0.8 )
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P}
+
+pkg_setup() {
+	use ruby && ruby-ng_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
+}
+
+sigrok_src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+each_ruby_prepare() {
+	sigrok_src_prepare
+}
+
+src_prepare() {
+	use ruby && cp -rl "${S}" "${WORKDIR}"/all && ruby-ng_src_prepare
+	sigrok_src_prepare
+	eapply_user
+	use python && python_copy_sources
+}
+
+sigrok_src_configure() {
+	econf \
+		$(use_with ftdi libftdi) \
+		$(use_with parport libieee1284) \
+		$(use_with serial libserialport) \
+		$(use_with usb libusb) \
+		$(use_enable cxx) \
+		$(use_enable java) \
+		$(use_enable static-libs static) \
+		"${@}"
+}
+
+each_ruby_configure() {
+	RUBY="${RUBY}" sigrok_src_configure --enable-ruby --disable-python
+}
+
+each_python_configure() {
+	cd "${BUILD_DIR}"
+	sigrok_src_configure --disable-ruby --enable-python
+}
+
+src_configure() {
+	python_setup
+	sigrok_src_configure --disable-ruby --disable-python
+	use ruby && ruby-ng_src_configure
+	use python && python_foreach_impl each_python_configure
+}
+
+each_ruby_compile() {
+	emake ruby-build
+}
+
+each_python_compile() {
+	cd "${BUILD_DIR}"
+	emake python-build
+}
+
+src_compile() {
+	default
+	use ruby && ruby-ng_src_compile
+	use python && python_foreach_impl each_python_compile
+}
+
+src_test() {
+	emake check
+}
+
+each_ruby_install() {
+	emake ruby-install DESTDIR="${D}"
+}
+
+each_python_install() {
+	cd "${BUILD_DIR}"
+	emake python-install DESTDIR="${D}"
+	python_optimize
+}
+
+src_install() {
+	default
+	use python && python_foreach_impl each_python_install
+	use ruby && ruby-ng_src_install
+	use udev && udev_dorules contrib/*.rules
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index 22fa3622f092..5c3c959d1d21 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 USE_RUBY="ruby26 ruby25 ruby24"
 RUBY_OPTIONAL="yes"
 
@@ -134,6 +134,7 @@ each_ruby_install() {
 each_python_install() {
 	cd "${BUILD_DIR}"
 	emake python-install DESTDIR="${D}"
+	python_optimize
 }
 
 src_install() {
diff --git a/sci-libs/libsigrokdecode/Manifest b/sci-libs/libsigrokdecode/Manifest
index a7300743ef94..d0b2a8cfe74e 100644
--- a/sci-libs/libsigrokdecode/Manifest
+++ b/sci-libs/libsigrokdecode/Manifest
@@ -1,6 +1,8 @@
 DIST libsigrokdecode-0.4.1.tar.gz 751546 BLAKE2B b1625714a75e481d94956bd64af264c87b440c0a236f19ff02d18cc16964b701de8799a81943f4e9ec1181b1906c5e62deca98fbbbc30dfbdf8bff2208f86bc6 SHA512 b072001190e80a194986524fd4de4d32f4559d618b151a3dbfa2c63b292c8a490535cb7479cfa665c4e8d3798251a5d6f5ecfa456ca669237237ffced3e88272
 DIST libsigrokdecode-0.5.2.tar.gz 852133 BLAKE2B 7a73c3766582d6fd33e597ca286b0125ece3e5e9f5f3b70dcd79dd42693b9688df674dd5d1876ddef798a5b3aee97f47df4d40b52c5a24b9b8c09a347cda96ad SHA512 49d0cba3a5fe17593165c3669dc8530e4e68497369b461f39b63c903f41a3060766c23d44c4112c9b9a5e740ae1e2c03a735494ac798dc631f3913079be04e22
-EBUILD libsigrokdecode-0.4.1.ebuild 1065 BLAKE2B aacdbba26a7cd826b231b2bedd102e13ef992f232452e9618a8d156f1a579c43823dd8e10c4c11ff3c3419bc894e5d78bf7f4c2a2148940fd7dbc2255a995cd5 SHA512 790aef8a5ce7afadb0601832f96fed1fc714fe604a62bd558d4acbea010ae793591add7970aa7622cb1f4de701aacab5df55c1d0c169c003c80de694d206c667
-EBUILD libsigrokdecode-0.5.2.ebuild 1067 BLAKE2B 5db722c1223f36dbf37d38099841f18ebd820dd50e1ccecb5080737909a047d079269b0cbecb26d45b08534ba27845c4e5dff0e27ae14c479e389e2c99cecba5 SHA512 757a700ecbfbd04a6a3e073796fd106ae9922ba92904e0d8c4e5a9932a0c228569207757e47a3c3af02c20cc8a4708c2c70f775c69b486a775725d927497f73a
-EBUILD libsigrokdecode-9999.ebuild 1070 BLAKE2B 557831ff6b0e60a0a9729b6edc4f733b8fc457143a187392bfe90ad0c3d0f68cdd4ef9fd6e5f81961e3edc8b97167fa4ee295f9165d242aa90837d58c57107a6 SHA512 bd699e5f2b67881b5df7066cbc3eab38f5d28a6530407abca702daa4f5a7d1009ce09a8f86e846d64ca41ef9779924460710cc8b80d9cfbdafc502a896c71735
+DIST libsigrokdecode-0.5.3.tar.gz 892783 BLAKE2B 45bae2488e4872be3bb891813083ed540617ac88558bb6c2d971fbb0c05585d3fcb74192fc83ce7d67ee466bc04c61fbccf6f475e549b80c86fe5f0cc191c7c1 SHA512 23393504b68135ed4ae8e8a654df024620af02e84fa3955956c61899388812229108155b4ae8d946e61f33dc8a8807db090d608350548a7a717d966442b07b9e
+EBUILD libsigrokdecode-0.4.1.ebuild 1061 BLAKE2B a2a36dc28724859a4c70248540e536d093b74ec7c104f18e63673e4d1be72365f95c68bcac7c0f1e1fb977b49db7c8aa0dca34ee3acb122c5944d0c14e5a81c7 SHA512 513fa83e6d71482c4a0b590cd1c236a719e206a82b0d140a6ba72bf99107119171c60d75e5e4fd03085a44c4029842b3dfc8910b753399c40759d59ac9f0d6ae
+EBUILD libsigrokdecode-0.5.2.ebuild 1065 BLAKE2B eb359b67f680fe06f4cf800c514d29de1cc4b0d76756465f824a701c556dc5db2120650a3d9aefe7de8ad5435d626dae25a338a54ec382f92a43f48e704fdd55 SHA512 33c3f179b422476b729f3c7eabda82a76f1cd2c47c49fec28a45d3bdcf23018c14ee7db9d4606da543f0aa35f5b146e37819c31361d7aa169ffaef55c942957e
+EBUILD libsigrokdecode-0.5.3.ebuild 1065 BLAKE2B eb359b67f680fe06f4cf800c514d29de1cc4b0d76756465f824a701c556dc5db2120650a3d9aefe7de8ad5435d626dae25a338a54ec382f92a43f48e704fdd55 SHA512 33c3f179b422476b729f3c7eabda82a76f1cd2c47c49fec28a45d3bdcf23018c14ee7db9d4606da543f0aa35f5b146e37819c31361d7aa169ffaef55c942957e
+EBUILD libsigrokdecode-9999.ebuild 1068 BLAKE2B 146515208863e47e506b1a46758a1921dfd65eb01640a0d46d3b00281cbd1ee007573783b731a71c88e69b342a864c37ba0527d6f3e6de4ea0655e2a42c78cbf SHA512 0c0cda967aa688673ba00057a6cd135dc62b9a0dc1c122f4f4b372cea751066fa5dc9d8d229637eeeb4694da36a888fb0b63d60baf1dca1ae1cc437c164e9e77
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.4.1.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.4.1.ebuild
index 4797964f3237..567a214f5fba 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.4.1.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils python-single-r1
 
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild
index 60b532dd084b..1dd2104c01a3 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils python-single-r1
 
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild
new file mode 100644
index 000000000000..1dd2104c01a3
--- /dev/null
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit eutils python-single-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="provide (streaming) protocol decoding functionality"
+HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
+
+LICENSE="GPL-3"
+SLOT="0/4"
+IUSE="static-libs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=dev-libs/glib-2.34.0
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+
+	# Only a test program (not installed, and not used by src_test)
+	# is used by libsigrok, so disable it to avoid the compile.
+	sed -i \
+		-e '/build_runtc=/s:yes:no:' \
+		configure || die
+
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
index c88e62e00b80..61816553315d 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils python-single-r1
 
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index a601be340408..4e0cbb59096e 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,7 +1,5 @@
 AUX 3.11-openmp.patch 943 BLAKE2B 39f092a108f808711dd928595cd82d507f6154efd549c319047c7a94edb772887338209549dba99cca4ed0a8106dc40ef4afd3a42dfe41d7d884f7f630391bfe SHA512 17bcea4da6a6aa32192ce7fb66e7eefef5e037ca2afd968e67de385938555975abe2103ee2cc50d02cd21d9783e9334eac93de694d6e685f13af80c49e42af38
 AUX 3.14-makefile.patch 1634 BLAKE2B f25e5225e07040e43cc6057558914f177de4e3d40254df9668de8719fbacd6cbadd685d38e2935c13e1778d8a260ef0733672bfc5c719a9e5d9a8832cbbe8ca8 SHA512 f4c2e2f6556604bf3572e341176c855e87caf4c3db8c2b347ce4e7a7948d21b708a7df29d5bf9b741dd3f34e08a0750572b94bd5e94bb4052f1ba4b9ae50e918
-DIST libsvm-3.21.tar.gz 847291 BLAKE2B 49790de8efd1f30b5009ba1d1a03c85e99b3ae78cfff83362146a19fbb93c8fe018e453478ca13ede8ae54836b422c5cab176ac8c53f7a63afc97fecbdfbcaf6 SHA512 697a7505100e48746a87e3e4ab025524fa581856320da3a187ac501138ce0a5bc7885ff37454ae5e75d6b0eab94e368b6bcd36601ad18db3b2fb35d2f360520a
 DIST libsvm-3.22.tar.gz 850563 BLAKE2B 824451dd2cafb7f2546d510d2c516dee67c27e586d5b16557a3c23e0c372cd577af5a322e24f70df6cda66e0a58f2e4d70017e6155a1d211ad3c728f840bfa2b SHA512 80a22fd2c2a82f70b8279fa5d8c5a2838b10ee439cf6d725816d608f8e45990ba1780ae6750cad78b25c1c18daf2c2315b342b9e329affbd5729d6fd7da87f7a
-EBUILD libsvm-3.21.ebuild 2672 BLAKE2B 11d3c7bcdaa5adc38d9b0edfbc920ded50231e411c456b252cd8e818ba4d019e37990a6b99fc64388f5e278ba72659fc99b2a7c5626e4cc90357febde5de70a0 SHA512 84207f32784635db5fa694a753fbd2b8d9b360772a28169890b69b68fb5bce8af60c78ad077281c89eb576de65522ee34fc46f8994b41a1d3cf52ad8ac0a83dd
-EBUILD libsvm-3.22.ebuild 2678 BLAKE2B 579c937da41d6746d48128d956669278c4197d9bc8a83aa464e701c3814484e9f600d7c3d33dacb1a72f1c1faa0c9bf6d9a83b670bceb6110fab32094a184801 SHA512 257d770c51373e67a5600e25533a0f9a70e6192510ef60c53ea073f4be5936febb767674873b4d60e366f33eb65c930c751829eecfb70e86447be89bf67a889c
+EBUILD libsvm-3.22.ebuild 2674 BLAKE2B f50e5e3f652c0936a70107c0c19560114c6c9aacd1ae7fb755cfbb993b66be4edbe2d30923690e1f4e1c04c3ebc42e071838f04274615c05dd52c9254d208a13 SHA512 a9060ba923d0a018c1667f623ed76193f142780f8add18b780858806ef6d2718d9b93765e516558def4d52785fe3ce9bdda87c40a9d3d3c8534d550052bb6940
 MISC metadata.xml 815 BLAKE2B b73e733b7881fd6c9b45f7605259a7d99e9bef6729936b7502df8c857e40e8552ebc0be25065a7d1391dd9b98cb4dd81b5dfd12722e5852f18c85ee693b2d20f SHA512 0e26fd0b3ddb08f769e92249819e93483cbca426465b8cd623703be2c242b5c8dd9731c978f6965e2c39d680229d5b15587ec0a16aea0b6fcf8172cf70e7f7ec
diff --git a/sci-libs/libsvm/libsvm-3.21.ebuild b/sci-libs/libsvm/libsvm-3.21.ebuild
deleted file mode 100644
index 60900fafeb26..000000000000
--- a/sci-libs/libsvm/libsvm-3.21.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit flag-o-matic java-pkg-opt-2 python-r1 toolchain-funcs
-
-DESCRIPTION="Library for Support Vector Machines"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/libsvm/"
-SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="java openmp python tools"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	java? ( >=virtual/jdk-1.4 )
-	python? ( ${PYTHON_DEPS} )"
-RDEPEND="
-	java? ( >=virtual/jre-1.4 )
-	python? ( ${PYTHON_DEPS} )
-	tools? ( sci-visualization/gnuplot )"
-
-PATCHES=(
-	"${FILESDIR}/3.11-openmp.patch"
-	"${FILESDIR}/3.14-makefile.patch"
-)
-
-pkg_setup() {
-	if use openmp; then
-		if ! tc-has-openmp; then
-			ewarn "OpenMP is not supported by your currently selected compiler"
-
-			if tc-is-clang; then
-				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
-				ewarn "which you will need to build ${CATEGORY}/${PN} for USE=\"openmp\""
-			fi
-
-			die "need openmp capable compiler"
-		fi
-
-		append-cflags -fopenmp
-		append-cxxflags -fopenmp
-		append-cppflags -DOPENMP
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
-		|| die "Failed to fix paths in python files"
-	sed -i -e "s|./grid.py|${EPREFIX}/usr/bin/svm-grid|g" tools/*.py \
-		|| die "Failed to fix paths for svm-grid"
-	sed -i -e 's/grid.py/svm-grid/g' tools/grid.py \
-		|| die "Failed to rename grid.py to svm-grid"
-
-	if use java; then
-		local JAVAC_FLAGS="$(java-pkg_javac-args)"
-		sed -i \
-			-e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
-			java/Makefile || die "Failed to fix java makefile"
-	fi
-	tc-export CXX CC
-}
-
-src_compile() {
-	default
-	use java && emake -C java
-}
-
-src_install() {
-	dobin svm-train svm-predict svm-scale
-	dolib.so *.so*
-	doheader svm.h
-
-	DOCS=( README )
-
-	if use tools; then
-		local t
-		for t in tools/*.py; do
-			python_foreach_impl python_newscript ${t} svm-$(basename ${t} .py)
-		done
-
-		mv tools/README{,.tools} || die
-		DOCS+=( tools/README.tools )
-
-		insinto /usr/share/doc/${PF}/examples
-		docompress -x /usr/share/doc/${PF}/examples
-		doins heart_scale
-		doins -r svm-toy
-	fi
-
-	if use python ; then
-		installation() {
-			touch python/__init__.py || die
-			python_moduleinto libsvm
-			python_domodule python/*.py
-		}
-		python_foreach_impl installation
-
-		mv python/README{,.python} || die
-		DOCS+=( python/README.python )
-	fi
-
-	HTML_DOCS=( FAQ.html )
-	if use java; then
-		java-pkg_dojar java/libsvm.jar
-		HTML_DOCS+=( java/test_applet.html )
-	fi
-
-	einstalldocs
-}
diff --git a/sci-libs/libsvm/libsvm-3.22.ebuild b/sci-libs/libsvm/libsvm-3.22.ebuild
index 5f08e5e62179..ffb32ee33897 100644
--- a/sci-libs/libsvm/libsvm-3.22.ebuild
+++ b/sci-libs/libsvm/libsvm-3.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit flag-o-matic java-pkg-opt-2 python-r1 toolchain-funcs
 
diff --git a/sci-libs/lrslib/Manifest b/sci-libs/lrslib/Manifest
index c772578f6353..a7f24520b6ed 100644
--- a/sci-libs/lrslib/Manifest
+++ b/sci-libs/lrslib/Manifest
@@ -1,7 +1,3 @@
-DIST lrslib-042c.tar.gz 168765 BLAKE2B d9ac0d59e4ca356f4cf76fa4f3756b6badd79a8c8546b7bd3a2dc65d211af30d354b9829395e68d79bb5acf24ba2087ca4d8a390a7c7d98e6cad86d0f9a27eac SHA512 a5fdd65b2c4e4cadd5fb9679e0e94ddc6b3564cdb9bdfcb7304351fec943527d2dccf117148d8d418ad8bd4577c9f69dabd6ca07107c1c1555c8c6d17f38fa60
-DIST lrslib-051.tar.gz 179396 BLAKE2B 22697dc4e99bf9ae528328c1a03e87f5101b1e0c74cbee9c7dafb5e1c897ad07587e9664abd9710094a6fe78cba0cff48c0489f687bedb616886101286153cc6 SHA512 65e4752ae75f06bccb74b0e12e0b03943654cba048d54dbcf93a36bea7f73b32826babe066d5fe20d3c6609548dc957063558633affe64d795c240c1fe748927
 DIST lrslib-062.tar.gz 292745 BLAKE2B 1a2c0e264d590c38d83ee35616b1ec36d8a093b5c7f08179019261d8b321d5b95d8889ca6555ae69853f919d6d66358a865a8a2002516dfd560bec6658f3913d SHA512 1d644a7798580457ff266730f42f6fac317ec8cdf2509ad6028e7a838e5c4c948bd0f9499b840c227bad4269f7144ff72b87fe3a19bdb9ad0925ebe4a7bc4f9f
-EBUILD lrslib-042c-r2.ebuild 1312 BLAKE2B 67ab2c35e3be56629e05fc62d3602058bc799a94c8741fe47c3f0346a93282cb7bf155f67e819b0992db9030950e06d344b054cc9e24fba3e4c1121a7ee656d2 SHA512 3d9dc22227f77784303922d1fb693ddd7ccd8b588743b2270243c584f1dbac97b633cab7bc4fcd5c2176fd4c6d29841f6a6eec589e8fbdf6f4420fb284bc9b79
-EBUILD lrslib-051.ebuild 915 BLAKE2B c67319e8aec861ca0a0ab3220390025164625c4f4d10bf876edd4bcf49cb3469dbf534d5c2659975f4c299f7bb4215fb82a62d3463fbc9c78b52b23e0bb3b5b0 SHA512 f557d6681656fa4bc6243a88575f3ae14eb5b6264e8c409b898cc23423eb80107cc311a5ad01cb4338f87dc059a96536b23bf0b0e6cb4981014383310aea00e2
-EBUILD lrslib-062.ebuild 1114 BLAKE2B 455c4e6e732fdfaa491da292db2d8bdf55c6b692da6bd738d617d8bb51e225dfa3b88263894482f4b5b38a0bb0daf3bc726fd5ec5e88ca269e210dd198a5eee9 SHA512 6e29d90108ae11e1cc5143406ecb7636277395fa3ebfbaa02eb8cd11e5f2f5a0f43877a75e52bbfddc5ea6104f4524b87daa8f092bfa02a20f13733d38d2492e
+EBUILD lrslib-062.ebuild 1109 BLAKE2B 8ea9aab321b54be31d5366f9e2b0e2a4c1b10c38b25e0fec72426f31251cf23512adf4f27364382aeb2c1a50d4923f311e5d0c883cdd1060fdcd49a75487a055 SHA512 a948ff0ccc8732045861cfb1a70ee378143e0bcd448d397adb6f24a3826c1e351a618d977f52d4a870f0bf3bce1a13422648b33d185eb3b78e81cc00e5b98999
 MISC metadata.xml 769 BLAKE2B 5660de1ef577fce0595a5d28eac737e1454bb97ec47a1993cfc9047a505ebef1d1c3984a129e4367ba5dfb2f8bc5975bcb7b7332e268528d820f1ea3231dabbc SHA512 f604771858909c1fb3f4f4c47094e9d6b16c1294575026246008c927a4d99aae6a2bdad45d66fe87c8be68b5a5a23f6fdfa72ec26a00a2a48a2ae7fe64cfb57d
diff --git a/sci-libs/lrslib/lrslib-042c-r2.ebuild b/sci-libs/lrslib/lrslib-042c-r2.ebuild
deleted file mode 100644
index 8fafdff0cba2..000000000000
--- a/sci-libs/lrslib/lrslib-042c-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="self-contained ANSI C implementation of the reverse search algorithm"
-HOMEPAGE="http://cgm.cs.mcgill.ca/~avis/C/lrs.html"
-SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gmp"
-
-DEPEND="gmp? ( dev-libs/gmp )"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
-	sed -i "s/gcc/$(tc-getCC)/g" makefile || die
-	sed -i "s/-O3/${CFLAGS} ${LDFLAGS}/g" makefile || die
-	# We don't like static linking to gmp or anywhere.
-	if use amd64 ; then
-		# This macro may only change messages that the
-		# binary outputs, but just in case... (Bug 384195)
-		sed -i "s/-static/-DB64/g" makefile || die
-	else
-		sed -i "s/-static//g" makefile || die
-	fi
-}
-
-src_compile () {
-	if use amd64 ; then
-		emake all64
-	else
-		emake
-	fi
-	if use gmp ; then
-		emake gmp
-	fi
-}
-
-src_install() {
-	dobin lrs redund redund1
-	# Collides with sys-block/buffer
-	newbin buffer lrsbuffer
-	if use x86; then
-		dobin nash setupnash setupnash2 2nash
-		# Prevent clash with cddlib:
-		newbin fourier lrsfourier
-	fi
-	if use gmp; then
-		dobin glrs gredund gfourier
-		# Clash with www-plugins/gnash
-		newbin gnash lrsgnash
-	fi
-	dodoc readme
-	dohtml lrslib.html
-}
diff --git a/sci-libs/lrslib/lrslib-051.ebuild b/sci-libs/lrslib/lrslib-051.ebuild
deleted file mode 100644
index 8c8e791b7941..000000000000
--- a/sci-libs/lrslib/lrslib-051.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="self-contained ANSI C implementation of the reverse search algorithm"
-HOMEPAGE="http://cgm.cs.mcgill.ca/~avis/C/lrs.html"
-SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gmp"
-
-DEPEND="gmp? ( dev-libs/gmp:0= )"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
-	sed -i "s/gcc/$(tc-getCC)/g" makefile || die
-	sed -i "s/-O3/${CFLAGS} ${LDFLAGS}/g" makefile || die
-	# Prefix for install
-	sed -i "s,/usr/local,/usr,g" makefile || die
-}
-
-src_compile () {
-	if use gmp ; then
-		emake all
-		emake all-shared
-	else
-		emake allmp
-	fi
-}
-
-src_install() {
-	dodoc readme
-	# Library
-	if use gmp ; then
-		emake DESTDIR="${D}" install-shared
-	fi
-	# Install default set of binaries
-	emake DESTDIR="${D}" install-common
-}
diff --git a/sci-libs/lrslib/lrslib-062.ebuild b/sci-libs/lrslib/lrslib-062.ebuild
index 1df9b43c7019..3cade66effaa 100644
--- a/sci-libs/lrslib/lrslib-062.ebuild
+++ b/sci-libs/lrslib/lrslib-062.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="gmp mpi"
 
 RDEPEND="gmp? ( dev-libs/gmp:0=
diff --git a/sci-libs/m4ri/Manifest b/sci-libs/m4ri/Manifest
new file mode 100644
index 000000000000..78ff938b663b
--- /dev/null
+++ b/sci-libs/m4ri/Manifest
@@ -0,0 +1,3 @@
+DIST m4ri-20140914.tar.gz 457978 BLAKE2B eadba6d1a751cb49cef25cc7726d87aa5746b23ad0a3b9bd274735a71da43ec4751fb655f91f3748f082369875508db365595f8443d77ae9645b3e4199d4f204 SHA512 efdd4ffa194d2d2b64a23a833420926613e74072ce62b2b06d768d157e134a615d88b93ed08d9f51f0fd14d686fd068523d1dc2c7cd9fb87108c96a4a11f4643
+EBUILD m4ri-20140914.ebuild 1479 BLAKE2B cec3f194a66b82b09fd29aba43573028bfdbc0341f8e594544570a7a7c7945e7db069427823460421e7b3650bbaf9cf21d3b0ccf2a555f8f19ee42c93e92cf68 SHA512 d74486068c8987d0fca7db524c311b53a87d8c05826cb322fb009f01b0c8f1a4901ef85a4d07887546e43680e81d70fb9f587ac78f7527072fc57c5eb5424a02
+MISC metadata.xml 1159 BLAKE2B 4a51b94a6a8d48e39412d90a249ef2038bcaac90653cbc187226842f33f5a8c75704b2671dc5fc63650cf4a57f77d7724409eca8d5822c7689eda3e5386902da SHA512 40d6e3dce814e11ced9da6874af71022dad66ff1b0511024a9033706f1b43ce741f418086d9beb276e09578db2acc1708758f71cdb168384d59f85627505e643
diff --git a/sci-libs/m4ri/m4ri-20140914.ebuild b/sci-libs/m4ri/m4ri-20140914.ebuild
new file mode 100644
index 000000000000..2e7cb8b7207e
--- /dev/null
+++ b/sci-libs/m4ri/m4ri-20140914.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Method of four russian for inversion (M4RI)"
+HOMEPAGE="https://bitbucket.org/malb/m4ri"
+
+# We use the SageMath tarball instead of the one from bitbucket because
+# the bitbucket releases don't contain the "make dist" stuff and we
+# would need autotools.eclass to generate it.
+SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug openmp cpu_flags_x86_sse2 png static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="png? ( media-libs/libpng:= )"
+RDEPEND="${DEPEND}"
+
+# NEWS and ChangeLog are empty as of 2020-01-01, and README.md
+# didn't make it into the release tarball.
+DOCS=( AUTHORS )
+
+pkg_pretend() {
+	use openmp && tc-check-openmp
+}
+
+src_configure() {
+	# when using openmp and -O0 the testsuite fails
+	# https://github.com/cschwan/sage-on-gentoo/issues/475
+	use openmp && replace-flags -O0 -O1
+
+	# kiwifb: cachetune option is not available, because it kills (at
+	# least my) X when I switch from yakuake to desktop
+	econf \
+		$(use_enable debug) \
+		$(use_enable openmp) \
+		$(use_enable png) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable static-libs static)
+}
+
+src_install(){
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/m4ri/metadata.xml b/sci-libs/m4ri/metadata.xml
new file mode 100644
index 000000000000..9807bfb0055f
--- /dev/null
+++ b/sci-libs/m4ri/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <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>
+
+  <longdescription>
+    M4RI is a library for fast arithmetic with dense matrices over
+    F2. The name M4RI comes from the first implemented algorithm: The
+    "Method of the Four Russians" inversion algorithm published by
+    Gregory Bard. This algorithm in turn is named after the 'Method of
+    the Four Russians' multiplication algorithm which is probably
+    better referred to as Kronrod's method.
+  </longdescription>
+
+  <upstream>
+    <remote-id type="bitbucket">malb/m4ri</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index 2ecfbd195eee..5d7fe4774423 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -4,6 +4,6 @@ AUX med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch 1683 BLAK
 AUX med-4.0.0-cmakelist.patch 2421 BLAKE2B 38991513aabbb8237a8b0d9456d9bb76f38cffecff9b1b4c906c0f9d17abd6c02ec150420403d8c1b36310b871f5354e100d1038d5620f6ba8719074e0ccd665 SHA512 405669dedc95b3776a2f4f6d64f8a608c914adb7d0666690f1f8b4a0598d6d85c7398622f50c50ead0295ee965fa993c36eb9e4217985079b528714682ea8b5d
 AUX med-4.0.0-installdoc.patch 1045 BLAKE2B ddc44d986743a4bf1fa59ab20d34835117f2213283ad13ce1e8e16358b87fe64888facb2f32da76a025cc283a5d942554700cc8816c25cb6f0eeaa54970f1f9a SHA512 486eb41af086d2dc92463aa8f64f074f70a39920b4954e4c272bc6b92c960efe198255975b7c594ff801be43e9eb6a31d007f55451901107db90ed6b3389eee6
 DIST med-4.0.0.tar.gz 47849098 BLAKE2B 0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63 SHA512 2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7
-EBUILD med-4.0.0-r1.ebuild 2955 BLAKE2B 0ec34136f384fd172b7cf07fb8d0ed896f363f4a05b2a784bce784fb7747258aef27894c3850988536b1eb9d27c02729aa14609b4a76988eb7b4a4beafe6801b SHA512 b07717aa5cebf4421b9caa11a48adfd303ef661cc75d656f60ee0315134387028067e2d420556277248bbe408f8a97b6b0bd31f3c2726ca4a27dc0fca381e3ec
-EBUILD med-4.0.0-r2.ebuild 3525 BLAKE2B 9dd6b42c0041428c332969499fd16486d10e422ee5a9365a87227c8dc8a5bd7a300967f007ecafdd9af2f8743296f1dbd04028dfa522788f923f2f85a5b8887d SHA512 6ffb6a7a7e0e80cc4980488e7c6dec0b6ad4ecf17cdf4d1b7eeaa07b5751461fdd0a21b1373c615f2124af3eebdc2041dc1b1e2e3f51077b659cee56b4cab8c8
+EBUILD med-4.0.0-r1.ebuild 2953 BLAKE2B 68c033c2c9663183fee08eeb04dbd523370c52fc57d53f85d68492a7b00e18e2f0ab773d321490c2f998aa7da753575fe695a1adb4b3330edbb0568dfae9ba6d SHA512 796abff2f8ad4430d908823429de27924c92a248d499280125f7e22ed66ef72d9223750b05ea69c968bb07e0d5737d2825893d7ac240adf3597d03c83a448e51
+EBUILD med-4.0.0-r2.ebuild 3493 BLAKE2B 119f7121365e2467dd99d77aa39eefe69356b78a09a4d7926d5386520d0150612ad0cdc1c6e462f41bd3b4eb8367169262c4d5d15e901f1b6c041b8b435a0fc5 SHA512 b613150305bd7b95312b05addfbb140d61f5d19a860798379f26e5690fa624fcdc5186f6f9493835dd8b32a694712a3d6a12c55e2fb8816ada8850078408a706
 MISC metadata.xml 743 BLAKE2B 26b8d89344c704c98c0819d9c10818667619f77ac704086ee645cbae2d15a59c36533edfe13e787da7e20f0611ddedbc2d761e33277d5a0b1f3328f2704971f9 SHA512 65a7ccf699c82ba6830d0172c87e83651f7d02182f3974fbd725e027046e4a2496fbdab9be852d1796f254622a73f697a3677fbb771a30a06a0b8d9c0a54c4bf
diff --git a/sci-libs/med/med-4.0.0-r1.ebuild b/sci-libs/med/med-4.0.0-r1.ebuild
index 3eaa9806e84f..d7a73bc88129 100644
--- a/sci-libs/med/med-4.0.0-r1.ebuild
+++ b/sci-libs/med/med-4.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools flag-o-matic fortran-2 python-single-r1
 
diff --git a/sci-libs/med/med-4.0.0-r2.ebuild b/sci-libs/med/med-4.0.0-r2.ebuild
index 7f05bac5c3a4..5ab14261fa8a 100644
--- a/sci-libs/med/med-4.0.0-r2.ebuild
+++ b/sci-libs/med/med-4.0.0-r2.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,9 +11,9 @@ FORTRAN_NEEDED=fortran
 
 # NOTE:The build for multiple python versions should be possible but
 # complicated for the build system
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
-inherit cmake-utils fortran-2 python-single-r1
+inherit cmake fortran-2 python-single-r1
 
 DESCRIPTION="A library to store and exchange meshed data or computation results"
 HOMEPAGE="https://www.salome-platform.org/user-section/about/med"
@@ -68,7 +68,7 @@ src_prepare() {
 			"${cm}" || die "sed on ${cm} failed"
 	done
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -85,11 +85,11 @@ src_configure() {
 		-DMEDFILE_INSTALL_DOC=$(usex doc)
 		-DMEDFILE_USE_MPI=$(usex mpi)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# we don't need old 2.3.6 include files
 	rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir"
@@ -113,5 +113,5 @@ src_install() {
 src_test() {
 	# override parallel mode only for tests
 	local myctestargs=( "-j 1" )
-	cmake-utils_src_test
+	cmake_src_test
 }
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index 159fca1ef782..1e3a9b92604b 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -4,7 +4,7 @@ AUX metis-5.1.0-multilib.patch 579 BLAKE2B 3e9edf7809a43026bfc7a320b1ff37f2e00a0
 AUX metis-5.1.0-shared-GKlib.patch 590 BLAKE2B 63a10fd00f21cff949660c598fa4519432559965c72f31c35d2a726dbbdfb9d2591c99e92c9520c2021e8ce0c485aa9834445e9f5dfe388f93106e49eee562af SHA512 3157e364f56661c7bc896016b2cda83658f2b00fe7c936e732e80e366ccf6421a1ab6f95d5a74fdb790f4ec8789d048aab9d68b0ccf1eb03f94621f78adb1a3a
 DIST metis-4.0.3.tar.gz 522624 BLAKE2B a09d15de35deb0a41bc7f54254effc68d977349e015b77c5523ed60343f5b7cc737c79b2f9420c42d7a60819c23322ad34770d1dcb93f0f1dea461bca3e7c831 SHA512 3d1388120c9c94bac6a20e2d38d6022c241bb6094cf71e31decf019d5500d2037716c6d615c5db69b536348a54e43f321c33ecfa25335fa6c84e412be227e332
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
-EBUILD metis-4.0.3.ebuild 809 BLAKE2B d1a6bb19bee499e0f909e27f3d4253021f120e58a339797272b2cc8862bb0462b628eab0120698d197e3fcd25fa754f2e0f3ede81c6a9dfea2ae5f19c28c43b1 SHA512 edfc634406d5c677174662debf1de98012148a9ed5b8f7345b44cfab4a73b75acf2ff3f08bde335e338de08b2f540d3bb1d3a5412ec5a26c7da098db2c470584
+EBUILD metis-4.0.3-r1.ebuild 842 BLAKE2B 436b4eef63e9e4b8c48c7ce2c989c6614354acfc5f5a6dfa920b78915aea3e808ad3a99b39c16748011f100e4165f05ff7ff95e438261930786c3e4f35991c2d SHA512 8518a8b773bafaaa98c4f238c183ccaf88be585b88e6dec1efaa2eb609832e633097943560438b080934668eb968e3b669c14aa20017512faa91f2a92e7f122a
 EBUILD metis-5.1.0-r2.ebuild 1905 BLAKE2B 4bffcbb4a902c84b843a7398491242ec6a6c37a3c9a9353e28b4debad79edf95332db9578cd098b5469c8a9d144a05d4864333a29f888f46c061dd125bf59579 SHA512 7c2b0b9cece1f4842babea6cf02492584b79eb965acffe9135f43372ceabb3a87fa3514e29fb1edf061b579196a0664ee8ae5e133375e7793d06fb529b9bae5d
 EBUILD metis-5.1.0-r3.ebuild 1936 BLAKE2B ef3740f53f426b5ab9e241963a5a1401e776008a311b999297b2ec267bf59902efaff5d21a0ded45084de967de9b7ee14fd6a9ecdcf12d9601fac9b59f26747f SHA512 c42713219592ce941c56230c7b7181053c41d80ad476671115909e09ea02d7d631b485874ab348712f9867c2c0a2b4c11e13b71db4667f0591b09e694248167d
 MISC metadata.xml 618 BLAKE2B 862f647c5562ab3d781bd3cb6a4ec1470cd45941043bbf1b9d09d41c5ad528546e338663400d322d8b1cb6b57e33910a9520b818a81c376451af0da6c037aa34 SHA512 7f46d28a97805eddd9d547ba66263cd395be46b495f4a9651312cfb421714b614d2c7415142c929c99386d32799fe78ea10110471b702487be4072b981ca17ee
diff --git a/sci-libs/metis/metis-4.0.3.ebuild b/sci-libs/metis/metis-4.0.3-r1.ebuild
index d572fdb47ee5..2f0d76f02d59 100644
--- a/sci-libs/metis/metis-4.0.3.ebuild
+++ b/sci-libs/metis/metis-4.0.3-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=5
@@ -9,10 +9,11 @@ DESCRIPTION="A package for unstructured serial graph partitioning"
 HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/metis/"
 SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/OLD/${P}.tar.gz"
 
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-LICENSE="free-noncomm"
 IUSE="doc static-libs"
+RESTRICT="mirror bindist"
 
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/sci-libs/minfx/Manifest b/sci-libs/minfx/Manifest
index 3f264a9722d7..6b7e392877e6 100644
--- a/sci-libs/minfx/Manifest
+++ b/sci-libs/minfx/Manifest
@@ -5,11 +5,11 @@ DIST minfx-1.0.4.tar.gz 59363 BLAKE2B e69e43e6bf59d413ec7c4f64c53646ba24f7efcdd6
 DIST minfx-1.0.4_pre98.tar.xz 51072 BLAKE2B 08d42fd22640670e60155d1985a05db11de3e8bc929ebb638c8b17439969a24990c1785fbf19911dfd9aad553955b24a84cac82d5e1f5a9c29ba799c74eea35e SHA512 734ce5d6596cf4ef91ad5ccbee3bffc1bb121a448cb78eac373b412fc1aa7ba2227ee0bce108ade45d037558a7692f67c504bf5aa1d6462dfcee05cee0cb9b9f
 DIST minfx-1.0.5.tar.gz 60700 BLAKE2B 33b77c6620fb3fa2abc0390bb80c0c67ba132868ea3da5550d868d28ea56650ada6efcffb1d5e200a3b821dc7e34e0ab48c67325621f59fadf7a3705f7154404 SHA512 86b48f3cde26d141e3b9e43decd1c01a7cc78a51165e964090e0db7ea73a31fa34ca383a4f2b6df9394c1f00cc4fe4eb52b32b721d2bad7cad622e74b8aa3742
 DIST minfx-1.0.6.tar.gz 60776 BLAKE2B b9cfde680d9e3734b5dd068092d3ed2e6652bceca27c6cc7b92e22e16234211151ce1cf7f8b935fb51c05aac4302f3e86a619a945c0a093da69490f74dbacbfd SHA512 f98a64d2a34db1d7d1df5c93f89fad13ddd3f4d2d27a170c76236284276de573b543b365af45030076f4c49e9d26cc67375dfe351c830f98c1580fb0dbaabee9
-EBUILD minfx-1.0.10.ebuild 388 BLAKE2B f04d6b4a4c50a7950bbf0edd8a09d06515359c30d0f89beaa3c910dbcfbaf026cdfce4e358a4c7a7c0bba2d1097bb51d9c07b7dc1916a99d71a57b2410190472 SHA512 feff59ef991d1d9072b62f574e81d08f707f2568154177f7a0bd0a540508e1db8c787ec027076bf30dc743c70a5716d80ca7eeaaf75bbef9762e44efa509f3ff
-EBUILD minfx-1.0.11.ebuild 398 BLAKE2B 6010607d6d9499d9a5e369a6dd912ffdd5af614096c7ee31b1ddaf1485743230478ce36704c5e29d3b1e754df7449348fde18bafb6afb2f623c7f4d24739b473 SHA512 e563dd4642153b5ab5182c39115d4466a370f5bb4892ce806f4508d264172637da62bbd16077c8796c3d5b995d55af29bde570f155cf795a6619646f04e9f7e2
-EBUILD minfx-1.0.3-r1.ebuild 391 BLAKE2B 337570aa5caaf792589183e119d364a62b52070ebfd9aa88d8abb838e3f11de1df77cb5e0d3d1ba274970ad05eed915a4ac16e689e4919cbde27bdc128d417c4 SHA512 6567c245c20f2ec3ed83f976e4cf011fbff7e7f18c5bdd952d106b75dda5c48599681ffc78c7b61b7c88d5543b62f3aa489ea02e51e5f789ccc7c0fef2bb523d
-EBUILD minfx-1.0.4.ebuild 391 BLAKE2B 337570aa5caaf792589183e119d364a62b52070ebfd9aa88d8abb838e3f11de1df77cb5e0d3d1ba274970ad05eed915a4ac16e689e4919cbde27bdc128d417c4 SHA512 6567c245c20f2ec3ed83f976e4cf011fbff7e7f18c5bdd952d106b75dda5c48599681ffc78c7b61b7c88d5543b62f3aa489ea02e51e5f789ccc7c0fef2bb523d
-EBUILD minfx-1.0.4_pre98.ebuild 453 BLAKE2B 69aae171b9895d281aeb1bd7807f95ecde49d49f2a280c3789aaa433fbd723cfde9dbf0a75f8355df3dfabe36e27620ba184b1b340ab988aac01afec12f7711c SHA512 01a7c87f6e4798a4ec3e6d1ab342a6350a957ae03fc0b1f5ff17418dabf2f86a99cc6baf313d65a00ab8d93303268d1ab3b74e6648227226475d765717fc720a
-EBUILD minfx-1.0.5.ebuild 391 BLAKE2B 337570aa5caaf792589183e119d364a62b52070ebfd9aa88d8abb838e3f11de1df77cb5e0d3d1ba274970ad05eed915a4ac16e689e4919cbde27bdc128d417c4 SHA512 6567c245c20f2ec3ed83f976e4cf011fbff7e7f18c5bdd952d106b75dda5c48599681ffc78c7b61b7c88d5543b62f3aa489ea02e51e5f789ccc7c0fef2bb523d
-EBUILD minfx-1.0.6.ebuild 388 BLAKE2B f04d6b4a4c50a7950bbf0edd8a09d06515359c30d0f89beaa3c910dbcfbaf026cdfce4e358a4c7a7c0bba2d1097bb51d9c07b7dc1916a99d71a57b2410190472 SHA512 feff59ef991d1d9072b62f574e81d08f707f2568154177f7a0bd0a540508e1db8c787ec027076bf30dc743c70a5716d80ca7eeaaf75bbef9762e44efa509f3ff
+EBUILD minfx-1.0.10.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
+EBUILD minfx-1.0.11.ebuild 389 BLAKE2B 812a0bfe91c50d6aafc11e9091cbce103d21ff435e500805bd1fc365a439895d15d5079b48f63ba38c3f0cad269d9a62691cc59f96e759bb5d0ee41b1ef3c395 SHA512 00c4b517631feea7a1fb4317f5d0abcaf08d2422d9fde05eb84199b06730a8575d57b26d86ed614d5ceeadc1cd0f0024537ce785d85ac90a1ebf5c03d82f6821
+EBUILD minfx-1.0.3-r1.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
+EBUILD minfx-1.0.4.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
+EBUILD minfx-1.0.4_pre98.ebuild 445 BLAKE2B f8b795a653fad4a45b50346df5a824d88f422378bdf401cc451bf4ade7a728f99249b1c454822c377b519207d8f4aa77baf45f36db8a65754b8d02e32c6282f0 SHA512 1cf8d6a683d95ade1e65904015d3a426b01b7c6d87af112e8f5a73fea7ae3f07c9de20c9bc74f369f8c84183236b618e92cb96499d0f867831ddecbd61e4c69b
+EBUILD minfx-1.0.5.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
+EBUILD minfx-1.0.6.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
 MISC metadata.xml 517 BLAKE2B 0716933a4c886a8245b8a93d2d2e8a7378124f420a6e068b57472de3dc977aab93848b16635f162ffea8a8770e3bf9cba5b0a7a803ef1e01de03c40961f62667 SHA512 656aaca8e83634c0dd4669bc62c9ada5db7a5882eafc33cec13f20dd5429bc7a24c34641f65ecb68bf39d9152fee381747ad1f15234a9e6a16e82d1cd0b160b1
diff --git a/sci-libs/minfx/minfx-1.0.10.ebuild b/sci-libs/minfx/minfx-1.0.10.ebuild
index 9db474e407a4..ae45355724fc 100644
--- a/sci-libs/minfx/minfx-1.0.10.ebuild
+++ b/sci-libs/minfx/minfx-1.0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/minfx/minfx-1.0.11.ebuild b/sci-libs/minfx/minfx-1.0.11.ebuild
index ab6c7de3ec25..00c79c67cadb 100644
--- a/sci-libs/minfx/minfx-1.0.11.ebuild
+++ b/sci-libs/minfx/minfx-1.0.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/sci-libs/minfx/minfx-1.0.3-r1.ebuild b/sci-libs/minfx/minfx-1.0.3-r1.ebuild
index 608d4a2ef76d..ae45355724fc 100644
--- a/sci-libs/minfx/minfx-1.0.3-r1.ebuild
+++ b/sci-libs/minfx/minfx-1.0.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/minfx/minfx-1.0.4.ebuild b/sci-libs/minfx/minfx-1.0.4.ebuild
index 608d4a2ef76d..ae45355724fc 100644
--- a/sci-libs/minfx/minfx-1.0.4.ebuild
+++ b/sci-libs/minfx/minfx-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/minfx/minfx-1.0.4_pre98.ebuild b/sci-libs/minfx/minfx-1.0.4_pre98.ebuild
index 9e9d8b9b6cef..fbf89ca2eb46 100644
--- a/sci-libs/minfx/minfx-1.0.4_pre98.ebuild
+++ b/sci-libs/minfx/minfx-1.0.4_pre98.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/minfx/minfx-1.0.5.ebuild b/sci-libs/minfx/minfx-1.0.5.ebuild
index 608d4a2ef76d..ae45355724fc 100644
--- a/sci-libs/minfx/minfx-1.0.5.ebuild
+++ b/sci-libs/minfx/minfx-1.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/minfx/minfx-1.0.6.ebuild b/sci-libs/minfx/minfx-1.0.6.ebuild
index 9db474e407a4..ae45355724fc 100644
--- a/sci-libs/minfx/minfx-1.0.6.ebuild
+++ b/sci-libs/minfx/minfx-1.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/mpfi/Manifest b/sci-libs/mpfi/Manifest
index 5f93588039b0..d1e59e6337b2 100644
--- a/sci-libs/mpfi/Manifest
+++ b/sci-libs/mpfi/Manifest
@@ -1,5 +1,5 @@
 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 712 BLAKE2B 666158d47dbf219856d861c48eae01155467701325e1bfcbe7bf6c004845a97f60b870ee9442a60bd44a02a8e3569e162d60573471d61f5777d8a0fc32fb9528 SHA512 fca866fac5894fda9a2b7370c722e857fe87fc3a47298841ad77a59186d76dc05a4d5f655ff54c54e6fec6b86205e969b95c0aa877be2553f8d3d15514a4cdba
+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.3.ebuild b/sci-libs/mpfi/mpfi-1.5.3.ebuild
index f3981fb6316b..d84acb228b35 100644
--- a/sci-libs/mpfi/mpfi-1.5.3.ebuild
+++ b/sci-libs/mpfi/mpfi-1.5.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
@@ -11,8 +11,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/37331/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/gmp-4.1.2:0=
@@ -20,14 +19,12 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 my_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static)
+	econf --disable-static
 }
 
 my_src_install() {
 	default
 
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/mumps/Manifest b/sci-libs/mumps/Manifest
index e575f525b7ba..925e5f99ca24 100644
--- a/sci-libs/mumps/Manifest
+++ b/sci-libs/mumps/Manifest
@@ -1,3 +1,3 @@
 DIST MUMPS_5.1.2.tar.gz 3351215 BLAKE2B 1c77c2a217c101245a9a96a59be6b9bfd67ceffa603d807b5a7173026c5c33e2c4de78c14833d7b7f0a90130b9ebc0ac9c7d4ebfbf881d0bd2210a542887c239 SHA512 38a63b14a8df835be68b5fa310b39aa1815799220d56c176e4005797800959e9e08c9a6bf11d308ab82ea40b6f34d36072cebe7c1de39e0c314eb138b93f1b74
-EBUILD mumps-5.1.2.ebuild 5598 BLAKE2B b4e54e0a12c408aae80ae39ee0a3f05a2f438737a226820d4b05b99eb81b79ac17a424c8e125b67757968680071aa824d8dcb83093fbe79acce85d6abf354990 SHA512 c52956c06bd991e709edd121c689d2601f6702ea8ebeb6b67d2d889d7e0a4b9746cc851c80ab369f37c2bd0acd94894953ecb1c01f035ab4c5f92da70f7fa5c0
+EBUILD mumps-5.1.2.ebuild 5612 BLAKE2B b39dcd469604f9f9b4315afe11e1feeed5023ac5b09bfe608d15a9b48a946950e91dc47e815cd2137dd4079047dd920ef98df560ee98b08772a6a78df06e1ed7 SHA512 e32040032f43537b6648230b8342950865abdbce6e90688a8bd079d353d87a72c33a639b54937aa85ac4cab841c09e60e3ffac890e151b93e324c8a59b2cec6b
 MISC metadata.xml 864 BLAKE2B 78db103b861071cbad317a65db2bb1c7eafc6c3936728cf3854ea05e92210abbf552e01dcbc974dc5238fc1a432ad7ff48fab3d662ea6081ff70fd86263ac11b SHA512 c285d7ed4bd26bb603f40f9d5e4e7262aea8a2679d14f65a4f8959a9bf2c622310422790e6221708fa227cd2c3bb2f4ba140eb5f23acc71b3f1ca20c04c4711a
diff --git a/sci-libs/mumps/mumps-5.1.2.ebuild b/sci-libs/mumps/mumps-5.1.2.ebuild
index e5251550f248..60baa087c35c 100644
--- a/sci-libs/mumps/mumps-5.1.2.ebuild
+++ b/sci-libs/mumps/mumps-5.1.2.ebuild
@@ -9,7 +9,7 @@ MYP=MUMPS_${PV}
 
 DESCRIPTION="MUltifrontal Massively Parallel sparse direct matrix Solver"
 HOMEPAGE="http://mumps.enseeiht.fr/"
-SRC_URI="${HOMEPAGE}${MYP}.tar.gz"
+SRC_URI="http://mumps.enseeiht.fr/${MYP}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 6988c2b5d87d..acad693add5e 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -3,5 +3,5 @@ AUX nlopt-2.3-pkgconfig.patch 318 BLAKE2B 3569931fb9e2fceebf46c542e10fcd2562c8ac
 AUX nlopt-2.4.2-fix-dynamic-underlinking.patch 2522 BLAKE2B 5cdb8ea93cb44c25b1814431962259727c5c4dc97b4cf78d239189187f953a4b9458849a9afe77979841768b78226c6218ecc531328cb5752d26b9df63468ee5 SHA512 bdb07b216ffb68b68cb3f03076336234c558db3953c48b02511883bf9fb12f5915c04950a2e3222577c7af4fb1e288a165af2e8adf211fc853e747c98a65cd19
 AUX nlopt-2.4.2-octave-4-map.patch 1858 BLAKE2B 34b1696762a9690a5ef5f3abc265b37d5de2f92b29e514952aa062faf1553a77ed3dba6f2abf7c8f1f7cbcc1cc63c9546967f3a317a773aa5e7c5c1e9c13f7e3 SHA512 00c45fe04fdc1acf4ccbb77aaf39feab0cb2b811b45edf791db7e87aa9e965c23b6131400eebd68335be8dcb86f346c01892e718f739f07dc0853b3dd9ea5ad4
 DIST nlopt-2.4.2.tar.gz 2361992 BLAKE2B c1c9f533c7e7b3bb61e81343ebd26b87e05434fdbea1f347fc5f6a6c10160289ce105a51c6540296f3f1d122d31b415452da49b84516cd13fabc73372e4cfd0e SHA512 136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703
-EBUILD nlopt-2.4.2-r1.ebuild 2640 BLAKE2B 5518a5d65625d1f001955469a72195ce07dbf2348b1c0901abe77d707c96a6a590fac697b849801b33665b795fc22518698d767c3e582314be69e02382dea6f0 SHA512 c8255cebd138aa4a3236f09b6d27f97781353dccb065652d64130973643dd97866d61cdc8f12c7465f5df0b63fc579864afb71ecff06ebdd31aa991de4ee1745
+EBUILD nlopt-2.4.2-r1.ebuild 2659 BLAKE2B 9008205cbefc5440e649fb24fa87f21184a74d639272d128ecbd14f2db5035a056b2b70ca1f107012552befd1fe37d84ee88eafa5603a7afb42994de9813306e SHA512 d5b8c7ee8061376f84577416d725a6bd4b6fdf26e7de6f1066740fae79d3e858c5818e0d4928080e6eb022bfc03dad0e49839284fe7bb2cdabdb0f98a918b1dc
 MISC metadata.xml 1095 BLAKE2B e5032d65fbb49b125b6cb5abe332c52a1e058271c71aec2d2522cc78874a079f8987e2e8356290295bcb886c32e1cf794df9b157ebc712a862605105b80abe31 SHA512 74a37bc3e6fa74d0f96c3390fadf16e76caf904f43cf9ac0496f70e3e3bc458727e58d9fc65c39a81302b081575e530c27be3812488df20fab42aff5494437f7
diff --git a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
index 8562dd322d07..ff0499805459 100644
--- a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
@@ -10,7 +10,7 @@ inherit python-r1 autotools-utils
 
 DESCRIPTION="Non-linear optimization library"
 HOMEPAGE="http://ab-initio.mit.edu/nlopt/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+SRC_URI="http://ab-initio.mit.edu/nlopt/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
diff --git a/sci-libs/numkit/Manifest b/sci-libs/numkit/Manifest
index 86f34ac46a2e..510a7e6a6e3c 100644
--- a/sci-libs/numkit/Manifest
+++ b/sci-libs/numkit/Manifest
@@ -1,3 +1,3 @@
 DIST numkit-1.1.2.tar.gz 243442 BLAKE2B e5d1e4d85b7646acf47a1e332cbb08f849272ada30bcd65fc5995cd000683f802eb882603e4e7043b159d30ca73395988b83c1fc16d6303ea32731bfdea12db5 SHA512 694a56f64282bbbffed975eabeb2716ac924fbf47f5fb62934ba3b57e6415e5f4b079345fd4eee670990fbf7abe1f945b98472aba034d8c7ff259676da58c034
-EBUILD numkit-1.1.2.ebuild 784 BLAKE2B 62ed2a3f85f7f566c5ab29ea86aff15b1f1a8faf1d754d999d0a8c805633e007f0f6253bf450bd54826ccca6bb4e5786edaa5a498ded72ac3f6eb22fc2ee2d41 SHA512 b9dce213f6cffd1585df04eaf7a49aac6926d46cae23789a4ba61880faf09f5c06fc66e249ecbb5913001bb7802edd2a8bf8fc2e2cc4b67633f5dfeac4150292
+EBUILD numkit-1.1.2.ebuild 782 BLAKE2B de1e5858a48ee6cdc48a83b3a949252ae8d7dfb10a9bb577bd7d028efb6bde70ef0af693bef5b6a32d87471b83ca970b1d2f06172cb2ef39afa3eb1612db968a SHA512 d26481c4d89b931c0adbf1423da3bded2ad5a4d09d3f8c985af556dcc6a9278651b16b9dacfd96bc1f99c53290e18f03bfc28ab34c2300b3c6b023cfb71ae90d
 MISC metadata.xml 474 BLAKE2B 7467f534225c3c84437c0306f716e64c9740607a9c18afae941af472c867fb29e3bf8e7371caaabd200a0a583c6502f5c6dc2dc6efa8508b91e15a372c90048f SHA512 7df51b689b986305f1a266361661871f2f0da60e1bda3c77d98f1f45d9ba4e2614930f283e2ef73fe861e519931fbc8b1724f2692c4759ddfa78e9cc89b1efeb
diff --git a/sci-libs/numkit/numkit-1.1.2.ebuild b/sci-libs/numkit/numkit-1.1.2.ebuild
index 51a550050540..19fc0f3c8168 100644
--- a/sci-libs/numkit/numkit-1.1.2.ebuild
+++ b/sci-libs/numkit/numkit-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 if [[ $PV = *9999* ]]; then
 	scm_eclass=git-r3
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index 3b8fcfd80a24..a0edb68e45bc 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,4 +1,3 @@
-AUX ogdi-3.1.6-fpic.patch 961 BLAKE2B 6339c06958876010249514fb633186ba08eb749cc16c36ca2279f0685641b0b7a0cc2f4aa70994cfc20cba4107d05e969cb3bc2ae9627a1920557af3d292ce84 SHA512 9d5d89d907043b14f5a18b6e036a1784b657ae6dd824d03067ab3e1e4e777ad55286e9addf15c9499523d7b2fdb743d329660f64a54e5140961c567135b40579
 AUX ogdi-3.2.0-acinclude.patch 508 BLAKE2B 97ab24d0f836b3da111f88455734e681f203932c98ec85319e49843575e4ed224d04f319a7fd6069c9ea6b08ece00838c82236a9425e90e9262fbe144c1d5765 SHA512 6782744a2d7ae0e2a11d6b600777e10891c4ff68f2e32d205b8e96b79dcbdde4d863a25ed263705df54e48ed1fedeffcee085ec12fc769fe53a22f7cb863441c
 AUX ogdi-3.2.0-aclocal.patch 2048 BLAKE2B 91fe93c2ab1adb8d9561411a3668f093ba6922586f9401d7abbc449fea057ba6315595604eba123fa8149d608358f15d6ff1c4c2b4765c41377c2c91ddb77a57 SHA512 a63e00f5e1706169311d43e00c2baa78d017eee728dd1bafad10aa3d9f7332ecdb5bfea1b24df888dd06d9de1f09339da68ea8ed663e9f1fa97665459b2099f1
 AUX ogdi-3.2.0-endianess.patch 1028 BLAKE2B 25ea3bb0991b201bbfae2597ae622e2cd0a18749d274e6553e7dcd31cd2befb15f2bea1dd073f8d6d3bac568aeafbdaac6b04b7fcb0597733a97ea926bbd9a49 SHA512 3a4ee5ee69f27fbad6170f1e3142a70ba529bd81a9b3209d1cb005a2ebf1c04f782194f20e8a046a19ec817c81ee04a9f7ab192321f8dc9590f4f8823c71d38e
@@ -7,12 +6,7 @@ AUX ogdi-3.2.0-ldflags.patch 700 BLAKE2B 6a2b494e35644dfa544ed000c4b3139b03a495e
 AUX ogdi-3.2.0-optimisation.patch 247 BLAKE2B 097d0e9615352512f5322b7e11826fe4352728f020b76c4c7dcbb58c6cc9903165ac49ec442c773a97bb575271f37e88a5f22951aae507afa0483c6b512d5488 SHA512 894dd439f0599e68117a82e461e75e5e48efde1bcd165fde727339b3d5855a17fab1f721663154a8d8626e38607237d8136e41a57b6b390f061762dd317b2e3c
 AUX ogdi-3.2.0-rpc.patch 11640 BLAKE2B 86809477603e9842e9c80e59b83769ef7a67e05aa5fd8db5795639aa0387a3f7324405bf4ea532a522154f88a4fd29469b7bdbef3285771b4c54c625c33f32a0 SHA512 b16647603aec1a2bc5fdcdf17234d78c62d882777187ba4896d7ea7ef96025c663f585866fa70e432700faa1963c2d2643f6b83791a90f4c38fc1e426b84889a
 AUX ogdi-3.2.0-tcl.patch 320 BLAKE2B 4cf742b86210f4b78f9cfd304e6ed928fdeb26aebc541d3de3017939b75f08ec47676e5c91466a9ec667830b7cebacd334878cb30ba4d0937ab9f5408bb1333f SHA512 19f08d16caab2cc456b608f89f100830de6c2b7d13336240a9738c5435fe6065a946c4929dab386889363d392dd701dc5be5c1a1d6b589c31721caa5fddf97b8
-AUX ogdi-3.2.0_beta2-64b.patch 289 BLAKE2B 7b35827d1d06037d25a17a8d9dc4bb288e653847b763a0ea21823fa7e0ead371c8f7fd3431cd840ac8027efb16d736ee562c72fbd45b22b0d4b3a383329501e7 SHA512 fa79643dda054c1dad1e398d429c638eba31e572e265b3eec10408116d68eeafb65b0fedb0c0710beed58c506c810e2ef432b1f998a73cb70421fb8c796e2e91
-AUX ogdi-3.2.0_beta2-endianess.patch 590 BLAKE2B 4af94feb2e6b3345d9e440f48f1ac98f71792a832010f5666c38335b55b0215248ec568a52d61dfbae3e5804122a8fa4d95751108de85125182dcb440417e337 SHA512 7d4508610cc34d2552c4135226e2418d6e634ff6f85a9423534a3f2275392e5097399decc4bb9b8f4f02e7a23b7f7a4507182541c814e73efd5544292469e50e
-AUX ogdi-3.2.0_beta2-proj480.patch 9939 BLAKE2B bcefedd0043c8535adc8d5e3362f38514ec91a220444145b1c27b1a41b45191364f52130a46e91e371571bf4a5f7a4df64f798c7d526fa29a250b67690044989 SHA512 3ac6c554c8f89252b8ff6f8f9ff3824ec1c453b1ac395d41e395ccd1c15c659dfbb77d0a6110edf2cd20a1c738f70e444a566cd6bee7ead2bc563d773c77c737
 AUX ogdi-3.2.0_beta2-subdirs.patch 905 BLAKE2B 69db0794449ca68b61ba8723585a2d055836f2bfd031023073b515a326ca04215833c9ab1ef1d73f1bd5392a56d2479ba71d9a24fea42f5a41f239a3ec6c55db SHA512 b6e6f50dafdb6aea991b8ece37953a9910b3fa790dcb68108ba7316c81de3cffae1413afb9d9126457550fa46bded8a7613c8be27fcd9956c8c17b5b64065732
-DIST ogdi-3.2.0.beta2.tar.gz 956839 BLAKE2B d0729d42f3224d9911bb09f8cf2f150204950739547bf8ed5349c8ed63e7ab7a4e17298fe8bbf45fc17f5781e86925ab35d8356d396ffe7f35a4cf20803fce04 SHA512 2159dfd010be9da63cf009beee7f6571cd13c4f08d1a69a5d945dd64878347b28455eb5376f184e2d91fa4a3bd409446ccbd706aa9000d3d7d2ac4b6e30ced93
 DIST ogdi-3.2.0.tar.gz 976004 BLAKE2B 535f05b3145c49ce72adcd86cd9ded1c8d8d12e051feb4e1898d8ddabbff1cf27f609326ccdb3a1cbff523b277f99e9d8c3678d2ed565dd81e6c5d956ed2dcca SHA512 b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0
-EBUILD ogdi-3.2.0.ebuild 1684 BLAKE2B 6a2f19e187d2152b94092746ceb6258edae78837293285f48df6324a38f8a60fea00a32354dcb3de6c04246a39c5b609e7d5d9339826ba13f8d735d252f94b0b SHA512 d20023fdf7b33ade215fbeab8e693deba0f3a233fa6b1b12930639b37f4d45651d8b3e637b174f5ad9a22727fae570b8db8969881f451378bc609cea5828737f
-EBUILD ogdi-3.2.0_beta2.ebuild 1525 BLAKE2B f5d96d0ac178971ecec0f66edef7817dd85220364bc62362c4f2af749749122d93f23851a62aac5f29662e4def9706e951b869b8b2dfb37652e88bb20b06d30d SHA512 2d2a5c8a9959b2fa77fb6395f262f3eae08a713e93700c43b9d746579293b5653f0761f80c23cc32fa3bf823cd31413d48978492e7abc91e5c3a79fc3eb2d318
+EBUILD ogdi-3.2.0-r1.ebuild 1730 BLAKE2B 0414eebbe445021de0a41e17ae77f5b954d025c90c3f4e74708e941793d3bd5cb171a329897b06b0652fa01dc4e036cadb4199ee56a7b6503a8ca38cd74d1b74 SHA512 8602a2c3ed67233f23006739206a471e72fed4a8d370150bbaa7d3f7e9f3a0567eca246d7ec47db96767237538a42962cfc3dbee12ba9cd317d4479590931a93
 MISC metadata.xml 337 BLAKE2B 01ea83d967f6073198b6a96775ed63b603dcd4736a3a3faa8d8e5e891d2b4fb25ef436425fe51be91d4d81702f392c7f28274738b7d672a82d681159e28b87dd SHA512 958474862734f915497c1e574254cd2152009f436b59dd57be9bcd5ad0ae2949dba1f6275ad3a68b3a6d60863093df2bf2bcfffdea51b591e9c1864231899221
diff --git a/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch b/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch
deleted file mode 100644
index f6fbc85e5ae9..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/config/generic.mak.in b/config/generic.mak.in
-index 1cb74f5..2e9cabe 100644
---- a/config/generic.mak.in
-+++ b/config/generic.mak.in
-@@ -35,16 +35,16 @@ AR		= ar cr
- # Compilation and linking flags
- #
- SHLIB_CFLAGS	= @C_PIC@
--COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1
-+COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@
- 
--SHLIB_LDFLAGS	= -shared 
--COMMON_LDFLAGS  = $(OPTIMIZATION) 
-+SHLIB_LDFLAGS	= -shared -Wl,-soname,$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR)
-+COMMON_LDFLAGS  = $(OPTIMIZATION) $(LDFLAGS)
- 
- RPC_INCLUDES = @RPC_INCLUDES@
- 
- UCB_STATICLIB = 
- 
--TCL_INCLUDE = -I/usr/include/tcl8.3
-+TCL_INCLUDE = -I${prefix}/include
- TCL_LINKLIB =
- 
- #
-diff --git a/config/unix.mak b/config/unix.mak
-index e3af578..927b0fc 100644
---- a/config/unix.mak
-+++ b/config/unix.mak
-@@ -55,7 +55,7 @@ LINK_SW		= -L
- ifeq ($(CFG),debug)
- OPTIMIZATION	= -g
- else
--OPTIMIZATION	= -O
-+OPTIMIZATION	= 
- endif
- 
- #
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch
deleted file mode 100644
index 16c40b2ff435..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ogdi.old/ogdi/driver/vrf/feature.c	2007/05/09 20:46:28	1.16
-+++ ogdi/ogdi/driver/vrf/feature.c	2009/05/08 04:15:50	1.17
-@@ -1347,7 +1350,7 @@
-   short int temp4;
-   int temp5;
-   date_type temp6;
--  long count;
-+  int32 count;
- 
-   if (returnString != NULL) {
-     free(returnString);
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-endianess.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-endianess.patch
deleted file mode 100644
index 75c85fbb29b5..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-endianess.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urNad ogdi-dfsg~/vpflib/include/machine.h ogdi-dfsg/vpflib/include/machine.h
---- ogdi-dfsg~/vpflib/include/machine.h	2007-03-27 17:35:24.000000000 +0200
-+++ ogdi-dfsg/vpflib/include/machine.h	2007-03-27 17:41:16.000000000 +0200
-@@ -15,10 +15,11 @@
-     long            output;
- } xBYTE_ORDER;
- 
--#if SYS_BIG_ENDIAN == 1
--#define MACHINE_BYTE_ORDER MOST_SIGNIFICANT
--#else
-+#include <endian.h>
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
- #define MACHINE_BYTE_ORDER LEAST_SIGNIFICANT
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+#define MACHINE_BYTE_ORDER MOST_SIGNIFICANT
- #endif
- 
- #ifdef _WINDOWS
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-proj480.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-proj480.patch
deleted file mode 100644
index 9380f91ffd3d..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-proj480.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-Index: ogdi-dfsg/configure
-===================================================================
---- ogdi-dfsg.orig/configure
-+++ ogdi-dfsg/configure
-@@ -3939,7 +3939,7 @@
- fi
- 
- 
--for ac_header in projects.h
-+for ac_header in proj_api.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-@@ -4085,8 +4085,8 @@
-    { (exit 1); exit 1; }; }
-   fi
-   if test "$ac_cv_header_projects_h" = no ; then
--    { { echo "$as_me:$LINENO: error: Unable to find external PROJ.4 projects.h file, give path or use default internal library." >&5
--echo "$as_me: error: Unable to find external PROJ.4 projects.h file, give path or use default internal library." >&2;}
-+    { { echo "$as_me:$LINENO: error: Unable to find external PROJ.4 proj_api.h file, give path or use default internal library." >&5
-+echo "$as_me: error: Unable to find external PROJ.4 proj_api.h file, give path or use default internal library." >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- 
-@@ -4095,12 +4095,12 @@
- 
- elif test "$with_proj" != "no" -a "$with_proj" != "" ; then
- 
--  if test -r $with_proj/include/projects.h ; then
--    echo "checking for $with_proj/include/projects.h ... found"
-+  if test -r $with_proj/include/proj_api.h ; then
-+    echo "checking for $with_proj/include/proj_api.h ... found"
-     PROJ_INCLUDE=-I$with_proj/include
-   else
--    { { echo "$as_me:$LINENO: error: Unable to find $with_proj/include/projects.h" >&5
--echo "$as_me: error: Unable to find $with_proj/include/projects.h" >&2;}
-+    { { echo "$as_me:$LINENO: error: Unable to find $with_proj/include/proj_api.h" >&5
-+echo "$as_me: error: Unable to find $with_proj/include/proj_api.h" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- 
-Index: ogdi-dfsg/configure.in
-===================================================================
---- ogdi-dfsg.orig/configure.in
-+++ ogdi-dfsg/configure.in
-@@ -81,13 +81,13 @@
- if test "$with_proj" = "yes" ; then
- 
-   AC_CHECK_LIB(proj,pj_init,PROJ_SETTING=external,PROJ_SETTING=missing,)
--  AC_CHECK_HEADERS(projects.h)
-+  AC_CHECK_HEADERS(proj_api.h)
- 
-   if test $PROJ_SETTING = missing ; then
-     AC_MSG_ERROR([Unable to find external PROJ.4 library, give path or use default internal library.])
-   fi
-   if test "$ac_cv_header_projects_h" = no ; then
--    AC_MSG_ERROR([Unable to find external PROJ.4 projects.h file, give path or use default internal library.])
-+    AC_MSG_ERROR([Unable to find external PROJ.4 proj_api.h file, give path or use default internal library.])
-   fi
- 
-   PROJ_SETTING=external
-@@ -95,11 +95,11 @@
- 
- elif test "$with_proj" != "no" -a "$with_proj" != "" ; then
-   
--  if test -r $with_proj/include/projects.h ; then
--    echo "checking for $with_proj/include/projects.h ... found"
-+  if test -r $with_proj/include/projapi.h ; then
-+    echo "checking for $with_proj/include/proj_api.h ... found"
-     PROJ_INCLUDE=-I$with_proj/include
-   else
--    AC_MSG_ERROR([Unable to find $with_proj/include/projects.h])
-+    AC_MSG_ERROR([Unable to find $with_proj/include/proj_api.h])
-   fi
- 
-   if test -r $with_proj/lib/libproj.so ; then
-Index: ogdi-dfsg/ogdi/c-api/client.c
-===================================================================
---- ogdi-dfsg.orig/ogdi/c-api/client.c
-+++ ogdi-dfsg/ogdi/c-api/client.c
-@@ -1576,7 +1576,7 @@
-   char *error_message;
-   ecs_CtlPoints *cpts;
-   ecs_Result *res;
--  PJ *tempproj;
-+  projPJ tempproj;
- 
-   if (multiblock != 0) {
-     res = &cln_dummy_result;
-@@ -1598,7 +1598,7 @@
-   /* Check if the projection is valid */
- 
-   if (strncmp(projection,PROJ_LONGLAT,13) != 0) {
--    tempproj = (PJ *) cln_ProjInit(projection);
-+    tempproj = (projPJ) cln_ProjInit(projection);
-     if(tempproj == NULL) {
-       res = &cln_dummy_result;
-       ecs_SetError(res,1,"This projection string is invalid");
-@@ -1775,7 +1775,7 @@
-   ecs_Result *res;
-   register ecs_Client *cln;
-   char *server_proj;
--  PJ *oldtarget,*oldsource;
-+  projPJ oldtarget,oldsource;
-   ecs_Region oldreg;
-   int oldisprojequal;
-   int oldisTargetLL;
-@@ -1874,7 +1874,7 @@
- 
-   if (strncmp(projection,PROJ_LONGLAT,13) != 0) {
-     cln->isTargetLL = FALSE;
--    cln->target = (PJ *) cln_ProjInit(projection);
-+    cln->target = (projPJ) cln_ProjInit(projection);
-     if(cln->target == NULL) {
-       goto setprojerror;
-     }
-@@ -1920,7 +1920,7 @@
- 
-   if (strncmp(server_proj,PROJ_LONGLAT,13) != 0) {
-     cln->isSourceLL = FALSE;
--    cln->source = (PJ *) cln_ProjInit(server_proj);
-+    cln->source = (projPJ) cln_ProjInit(server_proj);
-     if(cln->source == NULL) {
-       goto setprojerror;
-     }
-@@ -2328,13 +2328,13 @@
-  *	char *d: Projection name
-  *
-  *  OUT
-- *	return PJ *: New projection structure. If NULL, the operation
-+ *	return projPJ: New projection structure. If NULL, the operation
-  *	is a failure.
-  *
-  *----------------------------------------------------------------------
-  */
- 
--PJ *cln_ProjInit(d)
-+projPJ cln_ProjInit(d)
-      char *d;
- {
-   int i,n;
-@@ -2343,7 +2343,7 @@
-   char *l;
-   int longueur;
-   char *c;
--  PJ *retour;
-+  projPJ retour;
-   
-   if ((c = (char *) malloc(strlen(d)+3)) == NULL) {
-     return NULL;
-@@ -2378,7 +2378,7 @@
-     n++;
-   }
- 
--  retour = (PJ *) pj_init(n, (char **) tableau);
-+  retour = (projPJ) pj_init(n, (char **) tableau);
-   free(c);
-   free(tableau);
- 
-Index: ogdi-dfsg/ogdi/c-api/ecsgeo.c
-===================================================================
---- ogdi-dfsg.orig/ogdi/c-api/ecsgeo.c
-+++ ogdi-dfsg/ogdi/c-api/ecsgeo.c
-@@ -310,7 +310,7 @@
-      char *projection;
-      double X1,Y1,X2,Y2;
- {
--  PJ *proj;
-+  projPJ proj;
-   char **argv;
-   int argc;
-   double lon1,lat1,lon2,lat2;
-Index: ogdi-dfsg/ogdi/datum_driver/usa/dtusa.c
-===================================================================
---- ogdi-dfsg.orig/ogdi/datum_driver/usa/dtusa.c
-+++ ogdi-dfsg/ogdi/datum_driver/usa/dtusa.c
-@@ -26,7 +26,12 @@
-   ********************************************************************/
- 
- #include "ecs.h"
--#include "projects.h"
-+#include "proj_api.h"
-+
-+/* Definition from Proj.4 */
-+projUV nad_cvt(projUV, int, struct CTABLE *);
-+struct CTABLE *nad_init(projCtx ctx, char *);
-+void nad_free(struct CTABLE *);
- 
- typedef struct {
-   struct CTABLE *dtptr;
-@@ -124,7 +129,7 @@
-     strcat(pathfile,"/");  
-     strcat(pathfile,table);  
- 
--    ptr->dtptr = nad_init(pathfile);
-+    ptr->dtptr = nad_init(pj_get_default_ctx(), pathfile);
-     if (ptr->dtptr == NULL) {
-       ptr->count--;
-       return FALSE;
-Index: ogdi-dfsg/ogdi/include/ecs_util.h
-===================================================================
---- ogdi-dfsg.orig/ogdi/include/ecs_util.h
-+++ ogdi-dfsg/ogdi/include/ecs_util.h
-@@ -105,12 +105,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
--#include "projects.h"
--
--/* Ensure we are compatible with PROJ.4.4.x and PROJ.4.3.x */
--#ifndef USE_PROJUV
--#  define projUV UV
--#endif
-+#include "proj_api.h"
- 
- #include "ecs.h"
- 
-@@ -1054,8 +1049,8 @@
-      ecs_Family currentSelectionFamily: Current layer selection type
-      char *tclprocname: attribute callback procedure for tcl
-      char *target_proj: Projection descriptor
--     PJ *target: target (c interface) projection descriptors
--     PJ *source: source (driver) projection descriptors
-+     projPJ target: target (c interface) projection descriptors
-+     projPJ source: source (driver) projection descriptors
-      ecs_Datum targetdatum: target datum information
-      ecs_Datum sourcedatum: source datum information
-      void *dthandle: Handle to the datum driver
-@@ -1092,8 +1088,8 @@
-   ecs_Family currentSelectionFamily; /* Current layer selection type */
-   char *tclprocname;      /* attribute callback procedure for tcl */
-   char *target_proj;
--  PJ *target;             /* source and target projection descriptors */
--  PJ *source;
-+  projPJ target;             /* source and target projection descriptors */
-+  projPJ source;
-   int isSourceLL;         /* flags to avoid unnecessary computation */
-   int isTargetLL;
-   int isProjEqual;
-@@ -1165,7 +1161,7 @@
- 
- /* Projection conversion functions */
- 
--PJ *cln_ProjInit                     _ANSI_ARGS_((char *d));
-+projPJ cln_ProjInit                     _ANSI_ARGS_((char *d));
- int cln_CompareProjections           _ANSI_ARGS_((int ClientID));
- int cln_UpdateMaxRegion              _ANSI_ARGS_((int ClientID, double x, double y, ecs_Region *gr, int sens, int first));
- int cln_ConvRegion                   _ANSI_ARGS_((int ClientID, ecs_Region *gr, int sens));
-Index: ogdi-dfsg/contrib/ogdi_import/ogdi_import.c
-===================================================================
---- ogdi-dfsg.orig/contrib/ogdi_import/ogdi_import.c
-+++ ogdi-dfsg/contrib/ogdi_import/ogdi_import.c
-@@ -63,12 +63,7 @@
- #include "ecs.h"
- #include "shapefil.h"
- #include <assert.h>
--#include "projects.h"
--
--#ifndef PJ_VERSION
--#define projPJ PJ*
--#define projUV UV
--#endif
-+#include "proj_api.h"
- 
- static int	ClientID = -1;
- static int      bNoDict = FALSE;
-Index: ogdi-dfsg/contrib/ogdi_info/ogdi_info.c
-===================================================================
---- ogdi-dfsg.orig/contrib/ogdi_info/ogdi_info.c
-+++ ogdi-dfsg/contrib/ogdi_info/ogdi_info.c
-@@ -63,7 +63,7 @@
-  */
- 
- #include "ecs.h"
--#include "projects.h"
-+#include "proj_api.h"
- 
- static int	ClientID = -1;
- static int      bNoDict = FALSE;
-@@ -214,7 +214,7 @@
- /*                          DumpGlobalRegion()                          */
- /************************************************************************/
- 
--static int DumpGlobalRegion( ecs_Region * region, PJ * proj_defn )
-+static int DumpGlobalRegion( ecs_Region * region, projPJ proj_defn )
- 
- {
-     ecs_Result	*result;
-@@ -398,7 +398,7 @@
- 
- {
-     ecs_Result *result;
--    PJ	       *proj_defn = NULL;
-+    projPJ     proj_defn = NULL;
- 
- /* -------------------------------------------------------------------- */
- /*      Close old client if there is one active.                        */
diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0-r1.ebuild
index 7f42ae15c1e6..7de1803045b3 100644
--- a/sci-libs/ogdi/ogdi-3.2.0.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_P=${P/_/.}
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
 HOMEPAGE="http://ogdi.sourceforge.net/"
@@ -18,13 +18,16 @@ IUSE="static-libs"
 DEPEND="
 	net-libs/libtirpc
 	dev-libs/expat
-	>=sci-libs/proj-4.9.0
+	>=sci-libs/proj-4.9.0:=
+	<sci-libs/proj-6.0.0:=
 	sys-libs/zlib
 "
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+DOCS=( ChangeLog NEWS README )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.0_beta2-subdirs.patch
 	"${FILESDIR}"/${P}-acinclude.patch
@@ -39,7 +42,7 @@ PATCHES=(
 
 src_prepare() {
 	default
-	rm -rf external
+	rm -r external || die
 	sed 's:O2:O9:g' -i configure || die
 }
 
@@ -51,7 +54,8 @@ src_configure() {
 
 	econf \
 		--with-projlib="-L${EPREFIX}/usr/$(get_libdir) -lproj" \
-		--with-zlib --with-expat
+		--with-expat \
+		--with-zlib
 }
 
 src_compile() {
@@ -70,5 +74,5 @@ src_install() {
 	dolib.so lib/${TARGET}/lib*
 	use static-libs && dolib.a lib/${TARGET}/static/*.a
 #	dosym libogdi31.so /usr/$(get_libdir)/libogdi.so
-	dodoc ChangeLog NEWS README
+	einstalldocs
 }
diff --git a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
deleted file mode 100644
index fcd803cbbad7..000000000000
--- a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${P/_/.}
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
-HOMEPAGE="http://ogdi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="
-	dev-libs/expat
-	>=sci-libs/proj-4.8.0
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rm -rf external
-	epatch \
-		"${FILESDIR}"/${P}-subdirs.patch \
-		"${FILESDIR}"/${P}-endianess.patch \
-		"${FILESDIR}"/${P}-64b.patch \
-		"${FILESDIR}"/${P}-proj480.patch \
-		"${FILESDIR}"/${PN}-3.1.6-fpic.patch
-	sed 's:O2:O9:g' -i configure || die
-}
-
-src_configure() {
-	export TOPDIR="${S}"
-	export TARGET=$(uname)
-	export CFG="release"
-	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
-
-	econf \
-		--with-projlib="-L${EPREFIX}/usr/$(get_libdir) -lproj" \
-		--with-zlib --with-expat
-}
-
-src_compile() {
-	# bug #299239
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		SHLIB_LD="$(tc-getCC)"
-}
-
-src_install() {
-	mv "${S}"/bin/${TARGET}/*.so* "${S}"/lib/Linux/. || die "lib move failed"
-	dobin "${S}"/bin/${TARGET}/*
-	insinto /usr/include
-	doins ogdi/include/ecs.h ogdi/include/ecs_util.h
-	dolib.so lib/${TARGET}/lib*
-	use static-libs && dolib.a lib/${TARGET}/static/*.a
-#	dosym libogdi31.so /usr/$(get_libdir)/libogdi.so
-	dodoc ChangeLog NEWS README
-}
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 25663fc37b49..cfeb4e1b3238 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -7,5 +7,5 @@ AUX opencascade-7.4.0.env.in 4611 BLAKE2B 3593cd4e05d33e466a975cf4641c56cd8e6863
 DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6 SHA512 17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
 EBUILD opencascade-7.3.0.ebuild 4410 BLAKE2B ccb199b9cde98a579d3be135c657755506f2f4950317521bc70260666f191e9176124fb98b7ae232121222da4db93db2a300eaf88e42b14bfd330d0d8ac4f3c2 SHA512 0ca80511c240296b5f5d93c1e0132eb369778205f192f8f322cacfdede1808c5700ee96ebc10afad01b2786e18f5ae64e179fd54ddb632e1cede07a20aa2da91
-EBUILD opencascade-7.4.0.ebuild 3766 BLAKE2B 2f997bf0370d954515dcebcada59b5df5414356539e68a0f73beb84a7923896961f63be913cb29bc5a403727b8d3a7543f6633e015a378c098d9be5db8b5a13f SHA512 b63050e4dc4d616651c10fda42af95cfd2b426fcb21ed0a674f75b630531f6dc52b3d759b634b13debaaf26d9ee64d68d2637ff8aa65e7c151a213fe2a6f116c
+EBUILD opencascade-7.4.0.ebuild 3733 BLAKE2B 9bfa3ca240c9c1eb3e047c4603f86d5228b81e3d15171f5cc7b36c1a0b392435205b14d6f4bd53f600c79e296961fe77c0b61000338210b2b0da4fd431bfb8a6 SHA512 9f224495b6583cb22f16e81aeebc7b492867be72308d65beab1f02cc1c562010e04b1550a7661ea3fbf3027d6137b835d05813fffea0e755ef3d2d53701e86dc
 MISC metadata.xml 957 BLAKE2B 609b823e60c216481f0628bf396a81b827dea3d3d7a8e96203d9243e46c110784e4dc55032773ccd808cfa10f18342b30852ad982983e86ab41a399cfc99692d SHA512 80246f152111d9bb48df691198b478f5181c51a94286e28dc0f3a037e025b403559ad2c1aebf7660693d6a6a333e058de4bc711317c45ba9491e98529bd2d5ba
diff --git a/sci-libs/opencascade/opencascade-7.4.0.ebuild b/sci-libs/opencascade/opencascade-7.4.0.ebuild
index 5c0a6496857e..372cacad7c81 100644
--- a/sci-libs/opencascade/opencascade-7.4.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.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
 
 # TODO:
@@ -7,7 +7,7 @@
 
 EAPI=7
 
-inherit check-reqs cmake-utils flag-o-matic java-pkg-opt-2 multilib
+inherit check-reqs cmake flag-o-matic java-pkg-opt-2
 
 DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
 HOMEPAGE="https://www.opencascade.com"
@@ -77,7 +77,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	use java && java-pkg-opt-2_src_prepare
 }
 
@@ -104,7 +104,7 @@ src_configure() {
 
 	use examples && mycmakeargs+=( -DBUILD_SAMPLES_QT=$(usex qt5) )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	# prepare /etc/env.d file
 	sed -e 's|VAR_CASROOT|'${EROOT%}'/usr/'$(get_libdir)'/'${P}'/ros|g' < "${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die
@@ -122,7 +122,7 @@ src_configure() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# respect slotting
 	insinto "/etc/env.d/${PN}"
diff --git a/sci-libs/parmetis/Manifest b/sci-libs/parmetis/Manifest
index c1fd4b39faf4..75931431889e 100644
--- a/sci-libs/parmetis/Manifest
+++ b/sci-libs/parmetis/Manifest
@@ -1,4 +1,4 @@
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
 DIST parmetis-4.0.3.tar.gz 5567670 BLAKE2B 69a44ea8e50d8fd78046a342807b994220d03da3ab1695533d92772b1840302917a7d5d6f9eb020d9ff8ab7e5372bff0386d6354b662f58495b74f8f596c45f9 SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132
-EBUILD parmetis-4.0.3.ebuild 4087 BLAKE2B 57e125520954c312e093056d7aaeb1950af75df76203ca6eee29d0daf4dadabb9c9ffa2780a06547d2145c8db49af1a82b76209b25c2c3f99073d6ce9b60d474 SHA512 2e6a24226ba8e4b6c5b8839175eeb7e18e738497d53c6ad2d8bac9653dae774f2750f4a81e0858cc9fffab6fe6bcd533c83c3233a4e2609ac174a521eb5ddd27
+EBUILD parmetis-4.0.3-r1.ebuild 4120 BLAKE2B f3c5293939e260fbdec5268c854bee3831e5581aa746d70c12794ec3138d969dfeea7ac2fc3c9b651454b615c86ca4cf28a2a60238f0f8925a0e8a903e26b76d SHA512 5ab948e1c62267f7512e12eeb0f21348a78950b8fdd4fd917804cb7042b9e5457e88d8499d0e66a8d2832d36eba63b311c3d51a25fff4ee5f46e79db8ad2a864
 MISC metadata.xml 851 BLAKE2B 8c8fc30f50378b05ae59ca1f829da71f2a5cf66dfab03f645ceed4379bc8edc176fb9e5d1f1f83bbb695519a9e14bfd7855e040f56070a344791eb70eed12721 SHA512 6309c02babe871cd0bdaf509caab79dd8b81face5f6f5a39a1473284dbae6859223ae4f65d61fcf08370bac29dfd0e174cb722fbeeaeb5c80d53b749c265c73a
diff --git a/sci-libs/parmetis/parmetis-4.0.3.ebuild b/sci-libs/parmetis/parmetis-4.0.3-r1.ebuild
index 0351c921efe4..4bcc0ab1385f 100644
--- a/sci-libs/parmetis/parmetis-4.0.3.ebuild
+++ b/sci-libs/parmetis/parmetis-4.0.3-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=6
@@ -16,10 +16,11 @@ SRC_URI="
 	doc? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/${METISP}.tar.gz )
 	examples? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/${METISP}.tar.gz )"
 
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
-LICENSE="free-noncomm"
 IUSE="doc double-precision examples int64 mpi openmp pcre static-libs"
+RESTRICT="mirror bindist"
 
 DEPEND="mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}
diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index a41a85d213e0..117fd10baae6 100644
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -5,6 +5,5 @@ AUX pgplot-libpng15.patch 374 BLAKE2B 975eed22e5f2c4ff7bd169224eee766b5438ad25dd
 AUX pgplot-makemake.patch 7901 BLAKE2B 65b6d9fa41667d95376530315269872a25fc9445753e0f7b57ebe02feb3bfbf8deb75e977c771a09c4bf7851e5a9d392c145916c054ebd5624309487a4756fad SHA512 a29bc78eb17397c8fc3a0ec0f8dcec28d5d3f1345b16b90c05aad6459c9b312b63d04e55882b99c47ab22e7b3e16ee3e437c684fb5f50a43aaecd5fc6915689a
 AUX pgplot-tk86.patch 1863 BLAKE2B 23abf5177049d19ce782ff68987689fe9e6cac0267bd664c681bb1bd94a11da1898ed6c639d0a3773d64f43502c588352304e593672940fdf83e42ac00219ab2 SHA512 32abe4409cc1b63bf807a3544c36c163c6278dbe3dfd50ce24c6c65da6e22c8d8c0992217bab44c3e3105a11a6cad9b721c1ed8efe6835b46686072f40b83468
 DIST pgplot522.tar.gz 1197397 BLAKE2B 9eafde628373abdbda7adeb365b107618197aa5884d16b27f42b20c7957efa9b09d64adbcbc311ec92b974427355f8410a35c3f12969d240e8e25f3a72cae82b SHA512 03a075c84506ead1d665a7105cd41c7cfbe19d12094cb36fb7459a0f6ee0df0638543b7eca92aaf80677984cc47a07b968f854db8eaa90ec605f78d89c615d1f
-EBUILD pgplot-5.2.2-r6.ebuild 4414 BLAKE2B 5a8aa877ca1889859adc09b178f1be5808e6851b37843d8aab6b3a0b66087da1ee1fff0edeccd3f82e53ec9f4ac2a968a0fdaa640ad2e47f9789854448fd55ae SHA512 21e0ef68fdb94a9b37b5423b3d8b32f6e052ba931248a463f9abd5067aeb193f874c6449458a80eb8ff0c484ca1b225ea5c00782a96e950533d7c8ae5970c181
-EBUILD pgplot-5.2.2-r7.ebuild 4352 BLAKE2B 8051778edb0a2bad2835f1fc9bde8ec22492d350cee66dc67fe0ed103c4f9b03d70baa1b5a825b38be4f240c5b0b5bda031c81b85f5f51eee267bc8df0eb6437 SHA512 f82c4c994761b1bf9004218db54b6364cc8da6222fb1cb2bb9449b7f1761b55af03e43091b61d2c3310203f6454c039012a4c15c18a0de085ef9439fca28d7cb
+EBUILD pgplot-5.2.2-r7.ebuild 4347 BLAKE2B 91131d11c0689666762aae5582d1d0eff52cccbae3c70cf446e19b42331e184003b0fa97df0edac35571704dbb5e4ad3a4d172636afef97eb702a6b30dbd9583 SHA512 493d3acaf32d115bcb94e636cdf1eb9d0de75da1861adae9ce0f3baefaf39db7c6310aa0fda2aac8bfd29093c062c8115882430c62cb20f3c00b36483100f5fd
 MISC metadata.xml 622 BLAKE2B 666fe62f8627ba218e6b54badfc8fd497c4a166a9fbe6a5252461ef226beed6cb6bdf38f070563e86468e2fd617e30d9643646a918881912f555680ef1b2edc3 SHA512 09372d4c73ac5f4222ac4c47df1ff138bc1266740552b4592fc3765b5a6391f1dbadf58a5cfc0985eb6000709ab57a5bb3ecaf24cfe59213caaaaf70536227f7
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r6.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r6.ebuild
deleted file mode 100644
index 87dd80c669a9..000000000000
--- a/sci-libs/pgplot/pgplot-5.2.2-r6.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils fortran-2 toolchain-funcs multilib
-
-MY_P="${PN}${PV//.}"
-
-DESCRIPTION="FORTRAN/C device-independent scientific graphic library"
-HOMEPAGE="http://www.astro.caltech.edu/~tjp/pgplot/"
-SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="free-noncomm"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc motif static-libs tk"
-
-RDEPEND="
-	media-libs/libpng
-	x11-libs/libX11
-	x11-libs/libXt
-	motif? ( >=x11-libs/motif-2.3:0 )
-	tk? ( dev-lang/tk )"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-drivers.patch \
-		"${FILESDIR}"/${PN}-makemake.patch \
-		"${FILESDIR}"/${PN}-compile-setup.patch \
-		"${FILESDIR}"/${PN}-headers.patch \
-		"${FILESDIR}"/${PN}-libpng15.patch \
-		"${FILESDIR}"/${PN}-tk86.patch
-
-	# gfortran < 4.3 does not compile gif, pp and wd drivers
-	if [[ $(tc-getFC) == *gfortran* ]] &&
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] ; then
-		echo
-		ewarn "Warning!"
-		ewarn "gfortran < 4.3 selected: does not compile all drivers"
-		ewarn "disabling gif, wd, and ppd drivers"
-		ewarn "if you want more drivers, use gfortran >= 4.3"
-		echo
-		sed -i \
-			-e 's/GIDRIV/! GIDRIV/g' \
-			-e 's/PPDRIV/! GIDRIV/g' \
-			-e 's/WDDRIV/! GIDRIV/g' \
-			drivers.list || die "sed drivers failed"
-	fi
-
-	# fix pointers for 64 bits
-	if use amd64 || use ia64; then
-		sed -i \
-			-e 's/INTEGER PIXMAP/INTEGER*8 PIXMAP/g' \
-			drivers/{gi,pp,wd}driv.f || die "sed 64bits failed"
-	fi
-
-	cp sys_linux/g77_gcc.conf local.conf
-
-	sed -i \
-		-e "s:FCOMPL=.*:FCOMPL=\"$(tc-getFC)\":g" \
-		-e "s:CCOMPL=.*:CCOMPL=\"$(tc-getCC)\":g" \
-		local.conf || die "sed flags failed"
-
-	if [[ "$(tc-getFC)" = if* ]]; then
-		sed -i \
-			-e 's/-Wall//g' \
-			-e 's/TK_LIBS="/TK_LIBS="-nofor-main /' \
-			local.conf || die "sed drivers failed"
-	fi
-
-	sed -i \
-		-e "s:/usr/local/pgplot:/usr/$(get_libdir)/pgplot:g" \
-		-e "s:/usr/local/bin:/usr/bin:g" \
-		src/grgfil.f makehtml maketex || die "sed path failed"
-
-	use motif && sed -i -e '/XMDRIV/s/!//' drivers.list
-	use tk && sed -i -e '/TKDRIV/s/!//' drivers.list
-}
-
-src_configure() {
-	./makemake . linux
-	# post makefile creation prefix hack
-	sed -i -e "s|/usr|${EROOT}/usr|g" makefile || die
-}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS} -fPIC" \
-		FFLAGS="${FFLAGS} -fPIC" \
-		shared cpg-shared pgxwin_server pgdisp pgplot.doc
-
-	use tk && emake CFLAGS="${CFLAGS} -fPIC" libtkpgplot.so
-	use motif && emake CFLAGS="${CFLAGS} -fPIC" libXmPgplot.so
-
-	emake -j1 clean
-	use static-libs && emake all cpg
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts"
-		emake pgplot.html pgplot-routines.tex
-		pdflatex pgplot-routines.tex
-		pdflatex pgplot-routines.tex
-	fi
-
-	# this just cleans out not needed files
-	emake -j1 clean
-}
-
-src_test() {
-	# i can go to 16
-	local i j
-	for i in 1 2 3; do
-		emake pgdemo${i}
-		# j can also be LATEX CPS...
-		for j in NULL PNG PS CPS LATEX; do
-			local testexe=./test_${j}_${i}
-			echo "LD_LIBRARY_PATH=. ./pgdemo${i} <<EOF" > ${testexe}
-			echo "/${j}" >> ${testexe}
-			echo "EOF" >> ${testexe}
-			sh ${testexe} || die "test ${i} failed"
-		done
-	done
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/pgplot
-	doins grfont.dat grexec.f *.inc rgb.txt
-	echo "PGPLOT_FONT=${EROOT%/}/usr/$(get_libdir)/pgplot/grfont.dat" >> 99pgplot
-	doenvd 99pgplot
-
-	dolib.so libpgplot.so*
-	dobin pgxwin_server pgdisp
-
-	# C binding
-	insinto /usr/include
-	doins cpgplot.h
-	dolib.so libcpgplot.so*
-
-	if use motif; then
-		insinto /usr/include
-		doins XmPgplot.h
-		dolib.so libXmPgplot.so*
-	fi
-
-	if use tk; then
-		insinto /usr/include
-		doins tkpgplot.h
-		dolib.so libtkpgplot.so*
-	fi
-
-	use static-libs && dolib.a lib*pgplot.a
-
-	# minimal doc
-	dodoc aaaread.me pgplot.doc
-	newdoc pgdispd/aaaread.me pgdispd.txt
-
-	if use doc; then
-		dodoc cpg/cpgplot.doc applications/curvefit/curvefit.doc
-		dohtml pgplot.html
-		insinto /usr/share/doc/${PF}
-		doins pgplot-routines.pdf pgplot-routines.tex
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/* cpg/cpgdemo.c
-		insinto /usr/share/doc/${PF}/applications
-		doins -r applications/*
-		if use motif; then
-			insinto /usr/share/doc/${PF}/pgm
-			doins pgmf/* drivers/xmotif/pgmdemo.c
-		fi
-		if use tk; then
-			insinto /usr/share/doc/${PF}/pgtk
-			doins drivers/xtk/pgtkdemo.*
-		fi
-	fi
-}
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
index 793ce9da5939..f38f5b98ec9d 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc motif static-libs tk"
 
 RDEPEND="
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 9391b2af4b95..6a789d0ffade 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -2,7 +2,15 @@ AUX plplot-5.11.0-octave.patch 669 BLAKE2B 43361aa8c31f6b743b1a6d20b27701655ab4d
 AUX plplot-5.12.0-java-install-path.patch 393 BLAKE2B bd6860e694b5132a349699e25b79951308001b04b49d4ac1f070cd2ce51dc1e6ea76a7721e925c123669beb981ba756c3ae4e29bc0dee6f85f4e44fb61ac5f91 SHA512 0e87a67fd6821be07a56b68d8f9c23e4c25efea4fc9b56a2cec06d804202946917abd58271c71674d6b3b3ecda688be44920649095da3b125fe3a119fd22f1dd
 AUX plplot-5.12.0-multiarch.patch 1309 BLAKE2B 8bce8e12a82b361989e5b8a7c11c25a642fc2d62af37b74764db675ed6d91bc4b011318633b42a942abd0b59db70658f1cb28bf4873722095a998d5e63a00d51 SHA512 4fe0992ccc8f7f9dcab956c1ec06a647e4a7bab67c0f2a78c4e004491a5d8685240dadfd2c248e4fd6a58747a5da67ab8c8dc35c1a0de5a85431da431a00607f
 AUX plplot-5.12.0-ocaml-remove-rpath.patch 2012 BLAKE2B 47bbcc2c7e49b50f045c786ae3d5a799b45ab734e24e815168d9a6364fe09fc63869b57dd0a12b5c70ef5b69444ad6dba31bcc123faada6df9ac0af8cb0984d5 SHA512 6c40de6ab578ab8c347f12335b8a91976e5e4d8eee039512048039507c5e2b4a75b5bbfdde5ae347d2ccb167679b6574460d3f737ad37ee8902c7bcdc96af05d
+AUX plplot-5.12.0-safe-string.patch 791 BLAKE2B 8a3b37dd236d3086fe0780dd0e10d670884f706b4e6164980d8197de1a3f49fc0ef2ee15cd9f499c50b14a454bf62a6d6aee1512522ab5a3fe16c8fb93fc042f SHA512 c531a57ef2203c01f5d44f0bd1edc5101c740986987e454019fe42f4905dbd9b5f13ad93e91e3c73c95c320e9128ac4696021e258dc523fc9f5559348eda9129
+AUX plplot-5.15.0-ieee.patch 1243 BLAKE2B 291274ae674f3471fdf081619c2b8e14caec490b391413e52bc8b424f596757297b48b9af09647196adc3069f81750652d05d8da5582092ad13e92d56af05c01 SHA512 e242ff53ac490f17b898cf8184446a342bd9ca36f6245f4142cefe275aa2f5865e13428cdbc8663e80a56d7f0c438492b3529dd7c3dd0400d380d99928c58318
+AUX plplot-5.15.0-multiarch.patch 2544 BLAKE2B 288fc0f26f1f30cdbb786642ca5a59d8ba29958ffa690f87622748d4fa47ba098bce6671988e55f59526113dba08370ef15b0bc516552a9dee6918f430444dd5 SHA512 f98ea4f09cfaff7b1b2ad78940a10c5368ad29f402daca34a9a1ee2eeb3b275137576db884f1304ddc4c48ca83c032b9b2b10132a850839fba9c176bb27255a7
+AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbfbd277787a12421cf24c31453952257111c06e790a7f728f9b97ef16a8c4ea5a5e856e852f54cd81445a1f5b2aadb9df9d SHA512 5262e9922829ee3ec223b60b794de728e15104ba176f1a1e2fe4ba14929b08943cc5f00d166441c0e8ed5dfb09902044e3c62d944efdcf4bc3be604a56cb424a
+AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3
 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4
+AUX replace-gdc-extensions.patch 15746 BLAKE2B 76d778d095c3c18ad990610b436ad9fad778187c572df260b9cc8278b3d17ef313c6462d07c2f23e1c7c7497e9028610a6bd2823a789df2c1dbb83dee723d8dc SHA512 9d4733bb79f654fdb0b6344be8dc366fc43251dc17dd5ce7dad4fe7883499dcfc58e53d278272c9263753ea45d5c1e9c406e906694366aeef2821bc8f0b2b3e2
 DIST plplot-5.12.0.tar.gz 16253895 BLAKE2B 5b89c0a6a478c6faf9bff2e2765eb6b13b6b1fc5644dbcdbc6aa88c510ad82a04253a7cb33d16816ff128eb866aad0f5cbccc365687ebb62022926f3c8545a0b SHA512 5566b9db0ddbb5ecaa677168f65f240197b2b8b23a02a812efc7e97fc79686b523591edad9c83de2e72935090d426b4cb9fe82496d9eb5a5a521c42161e9848b
+DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
 EBUILD plplot-5.12.0-r1.ebuild 7243 BLAKE2B 76b1b6838834e291dcebd2ab2e25265bcea2c51b46c9715e19b38586b903513837ba01f643b45f8480d76c206b13b3736c717338458c46f91db99c8785562ae2 SHA512 014b44dbc72abfa66a054059ed8436ee9cbc52152eb6cdfb7e105103513e14ef4d236b0bd6824d24815a7ab7a42e314567572206dfc2f27248fa21b2f53e6450
+EBUILD plplot-5.15.0.ebuild 7153 BLAKE2B 74fc0873428d0022eafb6c591439773c904c98423112593fd093d076b0dc9ad10599b6abad8e6f275a7549776fdd617b02aab22f1009aaee515b564ef9ac768e SHA512 7f689d63e44cbe0cb88ba24bea9e5f9fb0c86908d43680a653ee48125605d6556392472d133941edbbc490c7a8e150a1da14af210ab7f059238006b4eecbfaf3
 MISC metadata.xml 1487 BLAKE2B 33e45227a6094c8b7e8602081e267b5aad51cf90638269b544feb308f95e32757ae5784edc14cda97d8d0e4d5e209e9ba3528f8f763adada95ceb8c61d11fdc8 SHA512 ebace14f95cf9d6e3c71b8a4fa3ed411052183e2fa67197173f99045e22503b0e80dac6762ddb38fa97b7e36b67693b9c7352cba31d399d0b819d8da9cbf27ea
diff --git a/sci-libs/plplot/files/plplot-5.12.0-safe-string.patch b/sci-libs/plplot/files/plplot-5.12.0-safe-string.patch
new file mode 100644
index 000000000000..5a3605168e61
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.12.0-safe-string.patch
@@ -0,0 +1,20 @@
+--- plplot-5.12.0.old/examples/ocaml/x20.ml	2017-01-29 01:50:35.000000000 +0000
++++ plplot-5.12.0/examples/ocaml/x20.ml	2017-11-18 12:10:33.476409441 +0000
+@@ -59,7 +59,7 @@
+   let w, h = Scanf.sscanf w_h_line "%d %d" (fun w h -> w, h) in
+   let num_col = Scanf.sscanf num_col_line "%d" (fun n -> n) in
+ 
+-  let img = String.make (w * h) ' ' in
++  let img = Bytes.make (w * h) ' ' in
+   let imf = Array.make_matrix w h 0.0 in
+ 
+   (* Note that under 32bit OCaml, this will only work when reading strings up
+@@ -72,7 +72,7 @@
+     for j = 0 to h - 1 do
+       imf.(i).(j) <-
+         (* flip image up-down *)
+-        float_of_int (int_of_char (img.[(h - 1 - j ) * w + i]));
++        float_of_int (int_of_char (Bytes.get img ((h - 1 - j ) * w + i)));
+     done
+   done;
+   imf, w, h, num_col
diff --git a/sci-libs/plplot/files/plplot-5.15.0-ieee.patch b/sci-libs/plplot/files/plplot-5.15.0-ieee.patch
new file mode 100644
index 000000000000..065f59a52dfd
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.15.0-ieee.patch
@@ -0,0 +1,19 @@
+diff -up plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake.ieee plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake
+--- plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake.ieee	2018-09-19 20:31:11.333168883 -0600
++++ plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/cmake/modules/csiro.cmake	2018-09-19 20:31:56.323728783 -0600
+@@ -27,15 +27,6 @@ option(WITH_CSA "Enable use of the csa l
+ # expanded to a lot more cases as we gain platform experience.
+ set(NAN_CFLAGS ${CMAKE_C_FLAGS})
+ if(PL_HAVE_QHULL OR WITH_CSA)
+-  if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86" AND NOT CMAKE_C_COMPILER MATCHES "gcc")
+-    set(NAN_CFLAGS "${NAN_CFLAGS} -mieee-fp")
+-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*")
+-    if(CMAKE_C_COMPILER MATCHES "gcc")
+-      set(NAN_CFLAGS "${NAN_CFLAGS} -mieee")
+-    else(CMAKE_C_COMPILER MATCHES "gcc")
+-      set(NAN_CFLAGS "${NAN_CFLAGS} -ieee")
+-    endif(CMAKE_C_COMPILER MATCHES "gcc")
+-  endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86" AND NOT CMAKE_C_COMPILER MATCHES "gcc")
+   if(NOT DEFINED NaNAwareCCompiler)
+     message(STATUS "Check for NaN awareness in C compiler")
+     try_run(RUN_RESULT COMPILE_RESULT
diff --git a/sci-libs/plplot/files/plplot-5.15.0-multiarch.patch b/sci-libs/plplot/files/plplot-5.15.0-multiarch.patch
new file mode 100644
index 000000000000..4fc5b0b43d9e
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.15.0-multiarch.patch
@@ -0,0 +1,56 @@
+diff -up plplot-5.15.0/examples/c/Makefile.examples.in.multiarch plplot-5.15.0/examples/c/Makefile.examples.in
+--- plplot-5.15.0/examples/c/Makefile.examples.in.multiarch	2019-09-17 21:47:24.535984257 -0600
++++ plplot-5.15.0/examples/c/Makefile.examples.in	2019-09-17 21:50:37.029009186 -0600
+@@ -23,9 +23,6 @@ SHELL = @SH_EXECUTABLE@
+ CC = @CC@
+ EXEEXT = @EXEEXT@
+ 
+-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+-install_tree_c_RPATHCMD = @install_tree_c_RPATHCMD@
+-
+ @extXdrawable_true@extXdrawable_EXECUTABLES_list = \
+ @extXdrawable_true@	extXdrawable_demo$(EXEEXT)
+ 
+diff -up plplot-5.15.0/examples/c++/Makefile.examples.in.multiarch plplot-5.15.0/examples/c++/Makefile.examples.in
+--- plplot-5.15.0/examples/c++/Makefile.examples.in.multiarch	2019-09-17 21:47:24.536984262 -0600
++++ plplot-5.15.0/examples/c++/Makefile.examples.in	2019-09-17 21:50:18.672911449 -0600
+@@ -23,15 +23,10 @@ SHELL = @SH_EXECUTABLE@
+ CXX = @CXX@
+ EXEEXT = @EXEEXT@
+ 
+-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+-install_tree_cxx_RPATHCMD = @install_tree_cxx_RPATHCMD@
+-
+-@wxwidgets_true@install_tree_wxwidgets_RPATHCMD = @install_tree_wxwidgets_RPATHCMD@
+ @wxwidgets_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \
+ @wxwidgets_true@	@wxdemo_name@$(EXEEXT)
+ 
+ @qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@
+-@qt_gui_true@install_tree_qt_RPATHCMD = @install_tree_qt_RPATHCMD@
+ @qt_gui_true@qt_gui_EXECUTABLES_list = \
+ @qt_gui_true@	qt_example$(EXEEXT)
+ 
+diff -up plplot-5.15.0/examples/fortran/Makefile.examples.in.multiarch plplot-5.15.0/examples/fortran/Makefile.examples.in
+--- plplot-5.15.0/examples/fortran/Makefile.examples.in.multiarch	2019-09-17 21:47:24.537984268 -0600
++++ plplot-5.15.0/examples/fortran/Makefile.examples.in	2019-09-17 21:48:01.062178741 -0600
+@@ -24,7 +24,6 @@ SHELL = @SH_EXECUTABLE@
+ Fortran = @FC@
+ EXEEXT = @EXEEXT@
+ 
+-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+ install_tree_fortran_RPATHCMD = @install_tree_fortran_RPATHCMD@
+ 
+ EXECUTABLES_list = \
+diff -up plplot-5.15.0/examples/tk/Makefile.examples.in.multiarch plplot-5.15.0/examples/tk/Makefile.examples.in
+--- plplot-5.15.0/examples/tk/Makefile.examples.in.multiarch	2019-09-17 21:47:24.538984273 -0600
++++ plplot-5.15.0/examples/tk/Makefile.examples.in	2019-09-17 21:50:00.816816375 -0600
+@@ -24,9 +24,6 @@ SHELL = @SH_EXECUTABLE@
+ CC = @CC@
+ EXEEXT = @EXEEXT@
+ 
+-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
+-install_tree_tk_RPATHCMD = @install_tree_tk_RPATHCMD@
+-
+ EXECUTABLES_list = xtk01$(EXEEXT)
+ # Second and fourth examples depend on itk.
+ @itk_true@itk_EXECUTABLES_list = xtk02$(EXEEXT) xtk04$(EXEEXT)
diff --git a/sci-libs/plplot/files/plplot-5.15.0-ocaml-rpath.patch b/sci-libs/plplot/files/plplot-5.15.0-ocaml-rpath.patch
new file mode 100644
index 000000000000..f3fe04d84a7c
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.15.0-ocaml-rpath.patch
@@ -0,0 +1,166 @@
+commit 6b215267e7baeae83906bec8dab72a549aeda6c8
+Author: Alan W. Irwin <airwin@users.sourceforge.net>
+Date:   Mon Sep 23 17:39:31 2019 -0700
+
+    Build system: Fix ocaml examples core build for -DUSE_RPATH=OFF case
+    
+    Thanks to Orion Poplawski for reporting this issue which is that the
+    *core build_tree* rpath manipulations for the ocaml examples were
+    being (incorrectly) skipped for the -DUSE_RPATH=OFF case.  The fix for
+    this issue required non-trivial CMake logic changes so was extensively
+    tested (see below).
+    
+    Tested by: Alan W. Irwin <airwin@users.sourceforge.net> on Linux
+    (Debian Buster = Stable) with the following steps:
+    
+    # Choose these prefixes to assure that the source, build, and install
+    # trees have blanks in their pathnames (to test those cases during
+    # this comprehensive test)
+    COMPREHENSIVE_TEST_PREFIX="/home/software/plplot/HEAD/comprehensive_test_disposeable blank"
+    SOURCE_PREFIX="/home/software/plplot/HEAD/plplot blank .git"
+    
+    # Set CMAKE_PREFIX_PATH to access local versions of lua and libLASi to
+    # avoid important bugs in the Debian Testing versions of those
+    # packages.  Also access a local version of libqhull to test that
+    # additional rpath possibility.
+    
+    # Put a local build of CMake-3.15.20190829-g3ec986c first on the PATH to thoroughly
+    # test our build system for a locally built CMake version that includes an
+    # essential fix so that D language support works properly for the ldc2 and dmd compilers.
+    
+    # For this particular test use the gdc D compiler if D enabled (which it was not, see below).
+    
+    # Use the -DUSE_INCRTCL_VERSION_4=ON option to help CMake find Tcl/Tk
+    # components. (This step will not be necessary as soon as the PLplot
+    # build system is modified to make Tcl/Tk/Itcl/Itk/Iwidgets finding
+    # more robust.)
+    
+    # Use -DSWIG_EXECUTABLE=/home/software/swig/install/bin/swig to test
+    # swig-4.0.0 that I built for myself.
+    
+    # To save time, constrain the test to just the ocaml binding and svg device.
+    
+    # To save a lot of babysitting of this test, constrain the test by dropping
+    # the interactive component.
+    
+    time (nice -19 env CMAKE_PREFIX_PATH=/home/software/lua/install-5.3.5:/home/software/lasi_svn/install:/home/software/qhull/install PATH=/home/software/cmake/install-3ec986ce8e/bin:"$PATH" DC=gdc "$SOURCE_PREFIX"/scripts/comprehensive_test.sh --prefix "$COMPREHENSIVE_TEST_PREFIX" --cmake_added_options "-DUSE_INCRTCL_VERSION_4=ON -DSWIG_EXECUTABLE=/home/software/swig/install/bin/swig -DDEFAULT_NO_BINDINGS=ON -DENABLE_ocaml=ON -DDEFAULT_NO_DEVICES=ON -DPLD_svg=ON " --build_command "make -j18" --ctest_command "ctest -j18" --do_test_interactive no)
+    
+    The time result on my Ryzen 7 1700 system with 16 hardware threads was
+    
+    real    4m12.625s
+    user    4m22.128s
+    sys     0m58.076s
+    
+    The above test was repeated with the following changes:
+    
+    # Specify LD_LIBRARY_PATH to workaround the lack of special rpath
+    # support for external local versions of software
+    
+    # Use the -DUSE_RPATH=OFF cmake option to drop all install-tree
+    # rpath support (and to ignore any special rpath support for
+    # external local versions of software).
+    
+    # Further constrain the test to be performed just for the core build tree
+    # since -DUSE_RPATH=OFF will obviously give bad results for the install
+    # tree for this non-standard installation location.
+    
+    time (nice -19 env CMAKE_PREFIX_PATH=/home/software/lua/install-5.3.5:/home/software/lasi_svn/install:/home/software/qhull/install PATH=/home/software/cmake/install-3ec986ce8e/bin:"$PATH" DC=gdc LD_LIBRARY_PATH=/home/software/lasi_svn/install/lib:/home/software/qhull/install/lib "$SOURCE_PREFIX"/scripts/comprehensive_test.sh --prefix "$COMPREHENSIVE_TEST_PREFIX" --cmake_added_options "-DUSE_INCRTCL_VERSION_4=ON -DSWIG_EXECUTABLE=/home/software/swig/install/bin/swig -DDEFAULT_NO_BINDINGS=ON -DENABLE_ocaml=ON -DDEFAULT_NO_DEVICES=ON -DPLD_svg=ON -DUSE_RPATH=OFF" --build_command "make -j18" --ctest_command "ctest -j18" --do_test_interactive no --do_test_install_tree no --do_test_traditional_install_tree no)
+    
+    The time result on my Ryzen 7 1700 system with 16 hardware threads was
+    
+    real    1m57.888s
+    user    1m42.156s
+    sys     0m26.478s
+    
+    Both these comprehensive tests (one which tests that the default
+    -DUSE_RPATH=ON still works for the ocaml case and one similar to
+    Orion's test case which tests that -DUSER_RPATH=OFF works for the
+    ocaml case in the core build tree) ran without issues (e.g., there
+    were no hangs or other obvious errors) and was followed up by the
+    evaluation procedure documented in doc/wiki_source/Testing_PLplot.
+    Those evaluations showed no configure, build, or obvious run-time
+    errors (i.e., no non-zero return codes for any of the steps in these
+    comprehensive tests), and the difference test results (done with the
+    default svg device) were perfect as well.
+
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index 93cb01b..5bcbceb 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -343,27 +343,24 @@ if(CORE_BUILD)
+       # Extra layer of -Wl indirection required for the nagfor compiler
+       string(REPLACE "-Wl," "-Wl,-Wl,," install_tree_fortran_RPATHCMD ${install_tree_fortran_RPATHCMD})
+     endif(install_tree_fortran_RPATHCMD AND CMAKE_Fortran_COMPILER MATCHES "nagfor")
++  endif(USE_RPATH AND NOT WIN32_OR_CYGWIN)
++
++  # ocaml is a special case not handled by the above logic for other languages
++  # because the (unofficial) CMake language support is
++  # implemented with low-level add_custom commands/targets so that rpath
++  # must be specified for 3 cases (the traditional build of the installed
++  # examples, and the CMake-based build of the build-tree and install-tree examples).
++  # Furthermore, the rpath syntax is different for ocaml.
++  if(ENABLE_ocaml)
++    set(language ocaml)
+ 
+-    # ocaml is a special case because the (unofficial) CMake language support is
+-    # implemented with low-level add_custom commands/targets so that rpath
+-    # must be specified for 3 cases (the traditional build of the installed
+-    # examples, and the CMake-based build of the build-tree and install-tree examples).
+-    # Furthermore, the rpath syntax is different for ocaml.
+-    if(ENABLE_ocaml)
+-      set(language ocaml)
++    if(USE_RPATH AND NOT WIN32_OR_CYGWIN)
+       # Each of the installed examples that are built depend on a library installed in ${LIB_DIR}.
+       set(install_tree_${language}_RPATH ${LIB_DIR})
+-      # The ocaml examples depend on the plplot library
++      # The ocaml examples depend on the plplot library so use INSTALL_RPATH
++      # property of that library target.
+       set(tll_arguments PLPLOT::plplot)
+       process_rpath(install_tree_${language}_RPATH "${tll_arguments}")
+-
+-      # Special case of the ocaml build-tree examples.
+-      # Must be done before ${install_tree_${language}_RPATH gets transformed
+-      # from official CMake list to colon-separated form.
+-      set(build_tree_${language}_RPATH ${install_tree_${language}_RPATH})
+-      list(REMOVE_ITEM build_tree_${language}_RPATH ${LIB_DIR})
+-      list(APPEND build_tree_${language}_RPATH ${CMAKE_BINARY_DIR}/src)
+-
+       # Transform from semicolon- to colon-separated list.  (Quotes
+       # for last argument required to process whole argument as string
+       # containing semicolons rather than as the concatanated elements
+@@ -372,19 +369,30 @@ if(CORE_BUILD)
+       # install- and build-tree versions of CMake-based build of ocaml
+       # examples
+       string(REGEX REPLACE ";" ":"  install_tree_${language}_RPATH "${install_tree_${language}_RPATH}")
+-      string(REGEX REPLACE ";" ":"  build_tree_${language}_RPATH "${build_tree_${language}_RPATH}")
+       string(REPLACE " " "\\ " install_tree_${language}_RPATH_ESCAPED "${install_tree_${language}_RPATH}")
+-      string(REPLACE " " "\\ " build_tree_${language}_RPATH_ESCAPED "${build_tree_${language}_RPATH}")
+-
+       # install_tree_ocaml_RPATHCMD needed in configured traditional
+       # Makefile for the ocaml subdirectory.
+       # Ocaml compiler requires -ccopt in front of every -Wl option:
+       set(install_tree_${language}_RPATHCMD "-ccopt -Wl,-rpath -ccopt -Wl,\"${install_tree_${language}_RPATH_ESCAPED}\"")
++    endif(USE_RPATH AND NOT WIN32_OR_CYGWIN)
+ 
+-    endif(ENABLE_ocaml)
++    # Special case of the ocaml build-tree examples.
++    # Follow above process_rpath logic but with some changes
++    # appropriate for the core build of the ocaml examples.
++    set(build_tree_${language}_RPATH ${CMAKE_BINARY_DIR}/src)
++    set(tll_arguments PLPLOT::plplot)
++    process_rpath(build_tree_${language}_RPATH "${tll_arguments}")
+ 
++    # Get rid of any mention of ${LIB_DIR} for the core build version
++    # of the examples.
++    # Must be done before ${build_tree_${language}_RPATH gets transformed
++    # from official CMake list to colon-separated form.
++    list(REMOVE_ITEM build_tree_${language}_RPATH ${LIB_DIR})
+ 
+-  endif(USE_RPATH AND NOT WIN32_OR_CYGWIN)
++    string(REGEX REPLACE ";" ":"  build_tree_${language}_RPATH "${build_tree_${language}_RPATH}")
++    string(REPLACE " " "\\ " build_tree_${language}_RPATH_ESCAPED "${build_tree_${language}_RPATH}")
++
++  endif(ENABLE_ocaml)
+ 
+   # Install Chloe.pgm in installed examples directory so that all implementations
+   # of example 20 in the various examples subdirectories can conveniently
diff --git a/sci-libs/plplot/files/plplot-5.15.0-ocaml.patch b/sci-libs/plplot/files/plplot-5.15.0-ocaml.patch
new file mode 100644
index 000000000000..6f0827f334e5
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.15.0-ocaml.patch
@@ -0,0 +1,43 @@
+diff -up plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/CMakeLists.txt.ocaml plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/CMakeLists.txt
+--- plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/CMakeLists.txt.ocaml	2018-09-19 17:38:53.000000000 -0600
++++ plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/CMakeLists.txt	2018-09-19 20:32:29.884146436 -0600
+@@ -326,11 +326,11 @@ if(ENABLE_ocaml)
+     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
+     )
+ 
+-  # ocamlc -a -custom builds a *.cma library from *.cmo
++  # ocamlc -a builds a *.cma library from *.cmo
+   add_custom_command(
+     OUTPUT
+     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma
+-    COMMAND ${OCAMLC} -a -custom -o plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${ocaml_LIBRARIES_FLAGS}
++    COMMAND ${OCAMLC} -a -o plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${ocaml_LIBRARIES_FLAGS}
+     DEPENDS
+     ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo
+     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
+@@ -341,7 +341,7 @@ if(ENABLE_ocaml)
+   add_custom_command(
+     OUTPUT
+     ${CMAKE_CURRENT_BINARY_DIR}/installed_plplot.cma
+-    COMMAND ${OCAMLC} -a -custom -o installed_plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS}
++    COMMAND ${OCAMLC} -a -o installed_plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS}
+     DEPENDS
+     ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo
+     ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
+diff -up plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/plcairo/CMakeLists.txt.ocaml plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/plcairo/CMakeLists.txt
+--- plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/plcairo/CMakeLists.txt.ocaml	2018-09-19 20:32:29.884146436 -0600
++++ plplot-plplot-a9d9500c732d4eae47ed7fca687e02ec8a48d02c/bindings/ocaml/plcairo/CMakeLists.txt	2018-09-19 20:33:18.389750080 -0600
+@@ -91,11 +91,11 @@ if(ENABLE_ocaml AND OCAML_HAS_CAIRO)
+     ${CMAKE_CURRENT_BINARY_DIR}/plcairo.ml
+     )
+ 
+-  # ocamlc -a -custom builds a *.cma library from *.cmo
++  # ocamlc -a builds a *.cma library from *.cmo
+   add_custom_command(
+     OUTPUT
+     ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma
+-    COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -l${WRITEABLE_TARGET}plplot -dllpath ${CMAKE_BINARY_DIR}/src
++    COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -l${WRITEABLE_TARGET}plplot -dllpath ${CMAKE_BINARY_DIR}/src
+     DEPENDS
+     ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo
+     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/sci-libs/plplot/files/replace-gdc-extensions.patch b/sci-libs/plplot/files/replace-gdc-extensions.patch
new file mode 100644
index 000000000000..551926dc1540
--- /dev/null
+++ b/sci-libs/plplot/files/replace-gdc-extensions.patch
@@ -0,0 +1,434 @@
+Description: Replace gdc extensions in D binding and examples source code with equivalent standard D source code
+ This patch is needed to avoid FTBFS with recent gdc versions.
+Origin: upstream, https://sourceforge.net/p/plplot/plplot/ci/74799e02c5435e491b46dfc1fd053753105c3441/
+Reviewed-by: Sébastien Villemot <sebastien@debian.org>
+Last-Update: 2019-10-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/bindings/d/plplot.d
++++ b/bindings/d/plplot.d
+@@ -298,7 +298,7 @@ void plfill3( PLFLT[] x, PLFLT[] y, PLFL
+ // Get the current device (keyword) name
+ void plgdev( out string p_dev )
+ {
+-    char cdev[1024];
++    char[1024] cdev;
+     c_plgdev( cdev.ptr );
+     p_dev = to!string( cdev.ptr );
+ }
+@@ -306,7 +306,7 @@ void plgdev( out string p_dev )
+ // Get the (current) output file name.  Must be preallocated to >80 bytes
+ void plgfnam( out string fnam )
+ {
+-    char cfnam[1024];
++    char[1024] cfnam;
+     c_plgfnam( cfnam.ptr );
+     fnam = to!string( cfnam.ptr );
+ }
+@@ -337,7 +337,7 @@ void  plgriddata( PLFLT[] x, PLFLT[] y,
+ // Get the current library version number
+ void plgver( out string p_ver )
+ {
+-    char cver[1024];
++    char[1024] cver;
+     c_plgver( cver.ptr );
+     p_ver = to!string( cver.ptr );
+ }
+--- a/examples/d/x01d.d
++++ b/examples/d/x01d.d
+@@ -224,7 +224,7 @@ class plot {
+ 
+         if ( do_test && test_xor )
+         {
+-            writefln( "The -xor command line option can only be exercised if your "
++            writefln( "The -xor command line option can only be exercised if your " ~
+                 "system\nhas usleep(), which does not seem to happen." );
+         }
+     }
+@@ -294,4 +294,4 @@ class plot {
+         plcol0( 4 );
+         plline( x, y );
+     }
+-}
+\ No newline at end of file
++}
+--- a/examples/d/x08d.d
++++ b/examples/d/x08d.d
+@@ -24,7 +24,7 @@
+ import plplot;
+ import std.string;
+ import std.math;
+-import std.c.stdlib;
++import core.stdc.stdlib;
+ 
+ //--------------------------------------------------------------------------
+ // cmap1_init1
+@@ -92,8 +92,8 @@ int main( char[][] args )
+     PLFLT[]     alt = [ 60.0, 40.0 ];
+     PLFLT[]     az  = [ 30.0, -30.0 ];
+ 
+-    string title[] = [ "#frPLplot Example 8 - Alt=60, Az=30",
+-                       "#frPLplot Example 8 - Alt=40, Az=-30" ];
++    string[]    title = [ "#frPLplot Example 8 - Alt=60, Az=30",
++                          "#frPLplot Example 8 - Alt=40, Az=-30" ];
+ 
+     // Parse and process command line arguments
+     plparseopts( args, PL_PARSE_FULL );
+--- a/examples/d/x11d.d
++++ b/examples/d/x11d.d
+@@ -48,16 +48,16 @@ void cmap1_init()
+ //--------------------------------------------------------------------------
+ int main( char[][] args )
+ {
+-    const   nlevel = 10;
+-    const   XPTS   = 35;        // Data points in x
+-    const   YPTS   = 46;        // Data points in y
++    const    nlevel = 10;
++    const    XPTS   = 35;       // Data points in x
++    const    YPTS   = 46;       // Data points in y
+ 
+-    int[]   opt = [ DRAW_LINEXY, DRAW_LINEXY ];
++    int[]    opt = [ DRAW_LINEXY, DRAW_LINEXY ];
+ 
+-    PLFLT[] alt = [ 33.0, 17.0 ];
+-    PLFLT[] az  = [ 24.0, 115.0 ];
++    PLFLT[]  alt = [ 33.0, 17.0 ];
++    PLFLT[]  az  = [ 24.0, 115.0 ];
+ 
+-    string title[] = [ "#frPLplot Example 11 - Alt=33, Az=24, Opt=3",
++    string[] title = [ "#frPLplot Example 11 - Alt=33, Az=24, Opt=3",
+                        "#frPLplot Example 11 - Alt=17, Az=115, Opt=3" ];
+ 
+     PLFLT xx, yy;
+--- a/examples/d/x15d.d
++++ b/examples/d/x15d.d
+@@ -145,10 +145,10 @@ class plot {
+ //--------------------------------------------------------------------------
+     public void plot2( PLFLT[][] z )
+     {
+-        static PLINT nlin[10]   = [ 1, 1, 1, 1, 1, 2, 2, 2, 2, 2 ];
+-        static PLINT inc[10][2] = [ [450, 0], [-450, 0], [0, 0], [900, 0], [300, 0],
++        static PLINT[10] nlin   = [ 1, 1, 1, 1, 1, 2, 2, 2, 2, 2 ];
++        static PLINT[2][10] inc = [ [450, 0], [-450, 0], [0, 0], [900, 0], [300, 0],
+                                     [450, -450], [0, 900], [0, 450], [450, -450], [0, 900] ];
+-        static PLINT del[10][2] = [ [2000, 2000], [2000, 2000], [2000, 2000],
++        static PLINT[2][10] del = [ [2000, 2000], [2000, 2000], [2000, 2000],
+                                     [2000, 2000], [2000, 2000], [2000, 2000],
+                                     [2000, 2000], [2000, 2000], [4000, 4000],
+                                     [4000, 2000] ];
+@@ -191,11 +191,11 @@ class plot {
+ //--------------------------------------------------------------------------
+     public void plot3()
+     {
+-        static PLFLT xx[2][5] = [ [-1.0, 1.0, 1.0, -1.0, -1.0],
++        static PLFLT[5][2] xx = [ [-1.0, 1.0, 1.0, -1.0, -1.0],
+                                   [-1.0, 1.0, 1.0, -1.0, -1.0] ];
+-        static PLFLT yy[2][5] = [ [1.0, 1.0, 0.0, 0.0, 1.0],
++        static PLFLT[5][2] yy = [ [1.0, 1.0, 0.0, 0.0, 1.0],
+                                   [-1.0, -1.0, 0.0, 0.0, -1.0] ];
+-        static PLFLT zz[2][5] = [ [0.0, 0.0, 1.0, 1.0, 0.0],
++        static PLFLT[5][2] zz = [ [0.0, 0.0, 1.0, 1.0, 0.0],
+                                   [0.0, 0.0, 1.0, 1.0, 0.0] ];
+ 
+         pladv( 0 );
+--- a/examples/d/x16d.d
++++ b/examples/d/x16d.d
+@@ -195,7 +195,7 @@ int main( char[][] args )
+     string[]  axis_opts = [
+         "bcvtm",
+     ];
+-    PLFLT[] values[NUM_AXES];
++    PLFLT[][NUM_AXES] values;
+     for ( size_t i = 0; i < NUM_AXES; i++ )
+     {
+         values[i] = new PLFLT[ns];
+@@ -207,7 +207,7 @@ int main( char[][] args )
+         0,
+     ];
+     const int NUM_LABELS = 1;
+-    PLINT label_opts[] = [
++    PLINT[]   label_opts = [
+         PL_COLORBAR_LABEL_BOTTOM,
+     ];
+     string[] labels = [
+--- a/examples/d/x17d.d
++++ b/examples/d/x17d.d
+@@ -4,7 +4,7 @@
+ import std.string;
+ import std.math;
+ import std.stdio;
+-import std.c.stdlib;
++import core.stdc.stdlib;
+ import plplot;
+ 
+ 
+--- a/examples/d/x18d.d
++++ b/examples/d/x18d.d
+@@ -6,9 +6,9 @@ import std.string;
+ 
+ import plplot;
+ 
+-int opt[]   = [ 1, 0, 1, 0 ];
+-PLFLT alt[] = [ 20.0, 35.0, 50.0, 65.0 ];
+-PLFLT az[]  = [ 30.0, 40.0, 50.0, 60.0 ];
++int[]   opt = [ 1, 0, 1, 0 ];
++PLFLT[] alt = [ 20.0, 35.0, 50.0, 65.0 ];
++PLFLT[] az  = [ 30.0, 40.0, 50.0, 60.0 ];
+ 
+ //--------------------------------------------------------------------------
+ // main
+@@ -81,7 +81,7 @@ int main( char[][] args )
+ 
+ void test_poly( int k )
+ {
+-    PLINT draw[][] = [ [ 1, 1, 1, 1 ],
++    PLINT[][] draw = [ [ 1, 1, 1, 1 ],
+                        [ 1, 0, 1, 0 ],
+                        [ 0, 1, 0, 1 ],
+                        [ 1, 1, 0, 0 ] ];
+--- a/examples/d/x19d.d
++++ b/examples/d/x19d.d
+@@ -4,7 +4,7 @@
+ 
+ import std.math;
+ import std.string;
+-import std.c.string;
++import core.stdc.string;
+ 
+ import plplot;
+ 
+@@ -109,15 +109,15 @@ int main( char[][] args )
+     PLFLT maxy = 80;
+ 
+     //variables for the shapelib example
+-    const PLINT nbeachareas = 2;
+-    const PLINT beachareas[] = [ 23, 24 ];
+-    const       nwoodlandareas = 94;
+-    PLINT       woodlandareas[94];
+-    const PLINT nshingleareas = 22;
+-    const PLINT shingleareas[] = [ 0, 1, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 217, 2424, 2425, 2426, 2427, 2428, 2491, 2577 ];
+-    const PLINT ncragareas = 2024;
+-    PLINT       cragareas[2024];
+-    const PLINT majorroads[] = [ 33, 48, 71, 83, 89, 90, 101, 102, 111 ];
++    const PLINT   nbeachareas    = 2;
++    const PLINT[] beachareas     = [ 23, 24 ];
++    const         nwoodlandareas = 94;
++    PLINT[94] woodlandareas;
++    const PLINT   nshingleareas = 22;
++    const PLINT[] shingleareas  = [ 0, 1, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 217, 2424, 2425, 2426, 2427, 2428, 2491, 2577 ];
++    const PLINT   ncragareas    = 2024;
++    PLINT[2024]       cragareas;
++    const PLINT[] majorroads = [ 33, 48, 71, 83, 89, 90, 101, 102, 111 ];
+ 
+     plinit();
+ 
+@@ -173,8 +173,8 @@ int main( char[][] args )
+     // Show Baltimore, MD on the map
+     plcol0( 2 );
+     plssym( 0.0, 2.0 );
+-    PLFLT x[1] = -76.6125;
+-    PLFLT y[1] = 39.2902778;
++    PLFLT[1] x = -76.6125;
++    PLFLT[1] y = 39.2902778;
+     plpoin( x, y, 18 );
+     plssym( 0.0, 1.0 );
+     plptex( -76.6125, 43.0, 0.0, 0.0, 0.0, "Baltimore, MD" );
+--- a/examples/d/x23d.d
++++ b/examples/d/x23d.d
+@@ -336,14 +336,14 @@ int main( char[][] args )
+             }
+             else if ( page == 14 )
+             {
+-                text = format( "Page 15, %s, %s, %s:  #<0x%1x0>#<0x%1x1>#<0x%1x2>"
++                text = format( "Page 15, %s, %s, %s:  #<0x%1x0>#<0x%1x1>#<0x%1x2>" ~
+                     "The quick brown fox jumps over the lazy dog",
+                     family[family_index], style[style_index], weight[weight_index],
+                     family_index, style_index, weight_index );
+             }
+             else if ( page == 15 )
+             {
+-                text = format( "Page 16, %s, %s, %s:  #<%s/>#<%s/>#<%s/>"
++                text = format( "Page 16, %s, %s, %s:  #<%s/>#<%s/>#<%s/>" ~
+                     "The quick brown fox jumps over the lazy dog",
+                     family[family_index], style[style_index], weight[weight_index],
+                     family[family_index], style[style_index], weight[weight_index] );
+--- a/examples/d/x33d.d
++++ b/examples/d/x33d.d
+@@ -30,7 +30,7 @@ import plplot;
+ import std.math;
+ import std.string;
+ 
+-static PLINT position_options[16] = [
++static PLINT[16] position_options = [
+     PL_POSITION_LEFT | PL_POSITION_TOP | PL_POSITION_OUTSIDE,
+     PL_POSITION_TOP | PL_POSITION_OUTSIDE,
+     PL_POSITION_RIGHT | PL_POSITION_TOP | PL_POSITION_OUTSIDE,
+@@ -50,7 +50,7 @@ static PLINT position_options[16] = [
+ ];
+ 
+ // Pick 5 arbitrary UTF-8 symbols useful for plotting points (✠✚✱✪✽✺✰✴✦).
+-static string special_symbols[5] = [
++static string[5] special_symbols = [
+     "✰",
+     "✴",
+     "✱",
+@@ -61,14 +61,14 @@ static string special_symbols[5] = [
+ // plcolorbar options
+ 
+ // Colorbar type options
+-const int    COLORBAR_KINDS = 4;
+-static PLINT colorbar_option_kinds[COLORBAR_KINDS] = [
++const int COLORBAR_KINDS = 4;
++static    PLINT[COLORBAR_KINDS] colorbar_option_kinds = [
+     PL_COLORBAR_SHADE,
+     PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL,
+     PL_COLORBAR_IMAGE,
+     PL_COLORBAR_GRADIENT
+ ];
+-static string colorbar_option_kind_labels[COLORBAR_KINDS] = [
++static string[COLORBAR_KINDS] colorbar_option_kind_labels = [
+     "Shade colorbars",
+     "Shade colorbars with custom labels",
+     "Image colorbars",
+@@ -76,14 +76,14 @@ static string colorbar_option_kind_label
+ ];
+ 
+ // Which side of the page are we positioned relative to?
+-const int    COLORBAR_POSITIONS = 4;
+-static PLINT colorbar_position_options[COLORBAR_POSITIONS] = [
++const int COLORBAR_POSITIONS = 4;
++static    PLINT[COLORBAR_POSITIONS] colorbar_position_options = [
+     PL_POSITION_LEFT,
+     PL_POSITION_RIGHT,
+     PL_POSITION_TOP,
+     PL_POSITION_BOTTOM
+ ];
+-static string colorbar_position_option_labels[COLORBAR_POSITIONS] = [
++static string[COLORBAR_POSITIONS] colorbar_position_option_labels = [
+     "Left",
+     "Right",
+     "Top",
+@@ -91,14 +91,14 @@ static string colorbar_position_option_l
+ ];
+ 
+ // Colorbar label positioning options
+-const int    COLORBAR_LABELS = 4;
+-static PLINT colorbar_label_options[COLORBAR_LABELS] = [
++const int COLORBAR_LABELS = 4;
++static    PLINT[COLORBAR_LABELS] colorbar_label_options = [
+     PL_COLORBAR_LABEL_LEFT,
+     PL_COLORBAR_LABEL_RIGHT,
+     PL_COLORBAR_LABEL_TOP,
+     PL_COLORBAR_LABEL_BOTTOM
+ ];
+-static string colorbar_label_option_labels[COLORBAR_LABELS] = [
++static string[COLORBAR_LABELS] colorbar_label_option_labels = [
+     "Label left",
+     "Label right",
+     "Label top",
+@@ -106,14 +106,14 @@ static string colorbar_label_option_labe
+ ];
+ 
+ // Colorbar cap options
+-const int    COLORBAR_CAPS = 4;
+-static PLINT colorbar_cap_options[COLORBAR_CAPS] = [
++const int COLORBAR_CAPS = 4;
++static    PLINT[COLORBAR_CAPS] colorbar_cap_options = [
+     PL_COLORBAR_CAP_NONE,
+     PL_COLORBAR_CAP_LOW,
+     PL_COLORBAR_CAP_HIGH,
+     PL_COLORBAR_CAP_LOW | PL_COLORBAR_CAP_HIGH
+ ];
+-static string colorbar_cap_option_labels[COLORBAR_CAPS] = [
++static string[COLORBAR_CAPS] colorbar_cap_option_labels = [
+     "No caps",
+     "Low cap",
+     "High cap",
+@@ -126,20 +126,20 @@ void
+ plcolorbar_example_page( int kind_i, int label_i, int cap_i, PLINT cont_color, PLFLT cont_width, PLINT n_values, PLFLT [] values )
+ {
+     // Parameters for the colorbars on this page
+-    PLINT     position_i, position, opt;
+-    PLFLT     x, y, x_length, y_length;
+-    PLFLT     ticks[1]     = [ 0.0 ];
+-    PLINT     sub_ticks[1] = [ 0 ];
++    PLINT position_i, position, opt;
++    PLFLT x, y, x_length, y_length;
++    PLFLT[1]     ticks     = [ 0.0 ];
++    PLINT[1]     sub_ticks = [ 0 ];
+     PLFLT     low_cap_color, high_cap_color;
+     PLINT     vertical, ifn;
+     PLINT     n_axes = 1;
+     string[]  axis_opts;
+-    PLINT     n_labels      = 1;
+-    PLINT     label_opts[1] = [ 0 ];
++    PLINT     n_labels = 1;
++    PLINT[1]     label_opts = [ 0 ];
+     string[]  label;
+     string    title;
+     PLFLT     colorbar_width, colorbar_height;
+-    PLINT     n_values_array[1];
++    PLINT[1]     n_values_array;
+     PLFLT[][] values_array;
+ 
+     axis_opts.length  = 1;
+@@ -279,26 +279,26 @@ const int MAX_NLEGEND = 7;
+ 
+ int main( char[][] args )
+ {
+-    int    i, k;
+-    PLINT  opt;
+-    PLINT  nlegend, nturn;
+-    PLINT  opt_array[MAX_NLEGEND];
+-    PLINT  text_colors[MAX_NLEGEND];
+-    PLINT  box_colors[MAX_NLEGEND];
+-    PLINT  box_patterns[MAX_NLEGEND];
+-    PLFLT  box_scales[MAX_NLEGEND];
+-    PLFLT  box_line_widths[MAX_NLEGEND];
+-    PLINT  line_colors[MAX_NLEGEND];
+-    PLINT  line_styles[MAX_NLEGEND];
+-    PLFLT  line_widths[MAX_NLEGEND];
+-    PLINT  symbol_numbers[MAX_NLEGEND];
+-    PLINT  symbol_colors[MAX_NLEGEND];
+-    PLFLT  symbol_scales[MAX_NLEGEND];
+-    string text[MAX_NLEGEND];
+-    string symbols[MAX_NLEGEND];
+-    PLFLT  legend_width, legend_height, x, y, xstart, ystart;
+-    PLFLT  max_height, text_scale;
+-    PLINT  position, opt_base, nrow, ncolumn;
++    int   i, k;
++    PLINT opt;
++    PLINT nlegend, nturn;
++    PLINT[MAX_NLEGEND]  opt_array;
++    PLINT[MAX_NLEGEND]  text_colors;
++    PLINT[MAX_NLEGEND]  box_colors;
++    PLINT[MAX_NLEGEND]  box_patterns;
++    PLFLT[MAX_NLEGEND]  box_scales;
++    PLFLT[MAX_NLEGEND]  box_line_widths;
++    PLINT[MAX_NLEGEND]  line_colors;
++    PLINT[MAX_NLEGEND]  line_styles;
++    PLFLT[MAX_NLEGEND]  line_widths;
++    PLINT[MAX_NLEGEND]  symbol_numbers;
++    PLINT[MAX_NLEGEND]  symbol_colors;
++    PLFLT[MAX_NLEGEND]  symbol_scales;
++    string[MAX_NLEGEND] text;
++    string[MAX_NLEGEND] symbols;
++    PLFLT legend_width, legend_height, x, y, xstart, ystart;
++    PLFLT max_height, text_scale;
++    PLINT position, opt_base, nrow, ncolumn;
+ 
+     // Parse and process command line arguments
+     plparseopts( args, PL_PARSE_FULL );
+@@ -822,9 +822,9 @@ int main( char[][] args )
+     if ( colorbar )
+     {
+         // Color bar examples
+-        PLFLT values_small[2]  = [ -1.0e-20, 1.0e-20 ];
+-        PLFLT values_uneven[9] = [ -1.0e-20, 2.0e-20, 2.6e-20, 3.4e-20, 6.0e-20, 7.0e-20, 8.0e-20, 9.0e-20, 10.0e-20 ];
+-        PLFLT values_even[9]   = [ -2.0e-20, -1.0e-20, 0.0e-20, 1.0e-20, 2.0e-20, 3.0e-20, 4.0e-20, 5.0e-20, 6.0e-20 ];
++        PLFLT[2] values_small  = [ -1.0e-20, 1.0e-20 ];
++        PLFLT[9] values_uneven = [ -1.0e-20, 2.0e-20, 2.6e-20, 3.4e-20, 6.0e-20, 7.0e-20, 8.0e-20, 9.0e-20, 10.0e-20 ];
++        PLFLT[9] values_even   = [ -2.0e-20, -1.0e-20, 0.0e-20, 1.0e-20, 2.0e-20, 3.0e-20, 4.0e-20, 5.0e-20, 6.0e-20 ];
+ 
+         // Use unsaturated green background colour to contrast with black caps.
+         plscolbg( 70, 185, 70 );
diff --git a/sci-libs/plplot/plplot-5.15.0.ebuild b/sci-libs/plplot/plplot-5.15.0.ebuild
new file mode 100644
index 000000000000..bafe731a8d46
--- /dev/null
+++ b/sci-libs/plplot/plplot-5.15.0.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER=3.0-gtk3
+FORTRAN_NEEDED=fortran
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake-utils flag-o-matic fortran-2 java-pkg-opt-2 python-single-r1 toolchain-funcs virtualx wxwidgets
+
+DESCRIPTION="Multi-language scientific plotting library"
+HOMEPAGE="http://plplot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0/14" # SONAME of libplplot.so
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf
+	png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( dynamic )
+	test? ( latex )
+	tk? ( tcl )
+"
+
+RESTRICT="
+	!test? ( test )
+	octave? ( test )
+"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:0=[svg?,X] )
+	gd? ( media-libs/gd:2=[jpeg?,png?] )
+	java? ( >=virtual/jre-1.5:* )
+	latex? (
+		app-text/ghostscript-gpl
+		virtual/latex-base
+	)
+	lua? ( dev-lang/lua:0= )
+	ocaml? (
+		dev-lang/ocaml
+		dev-ml/camlidl
+		cairo? ( dev-ml/cairo-ocaml[gtk] )
+	)
+	octave? ( sci-mathematics/octave:0= )
+	pdf? ( media-libs/libharu:0= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+		qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
+	)
+	qhull? ( media-libs/qhull:0= )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtprintsupport:5
+	)
+	shapefile? ( sci-libs/shapelib:0= )
+	tcl? (
+		dev-lang/tcl:0=
+		dev-tcltk/itcl:0=
+		tk? (
+			dev-lang/tk:0=
+			dev-tcltk/itk
+		)
+	)
+	truetype? (
+		media-fonts/freefont
+		media-libs/lasi:0=
+		gd? ( media-libs/gd:2=[truetype] )
+	)
+	wxwidgets? (
+		x11-libs/wxGTK:${WX_GTK_VER}=[X]
+		x11-libs/agg:0=[truetype?]
+	)
+	X? (
+		x11-libs/libX11:0=
+		x11-libs/libXau:0=
+		x11-libs/libXdmcp:0=
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	java? (
+		>=virtual/jdk-1.5
+		dev-lang/swig
+	)
+	ocaml? ( dev-ml/findlib )
+	octave? ( >=dev-lang/swig-3.0.12 )
+	python? ( dev-lang/swig )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.6-python.patch
+
+	# Fedora patches
+	"${FILESDIR}"/${PN}-5.15.0-ocaml-rpath.patch
+	"${FILESDIR}"/${PN}-5.15.0-ieee.patch
+	"${FILESDIR}"/${PN}-5.15.0-multiarch.patch
+	"${FILESDIR}"/${PN}-5.15.0-ocaml.patch
+	"${FILESDIR}"/${PN}-5.12.0-safe-string.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	use wxwidgets && need-wxwidgets unicode
+	cmake-utils_src_prepare
+
+	# avoid installing license
+	sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
+
+	# prexify hard-coded /usr/include in cmake modules
+	sed -i \
+		-e "s:/usr/include:${EPREFIX}/usr/include:g" \
+		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
+		-e "s:/usr/share:${EPREFIX}/usr/share:g" \
+		cmake/modules/*.cmake || die
+
+	# change default install directories for doc and examples
+	local f
+	while IFS="" read -d $'\0' -r f; do
+		sed -i -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' "${f}" || die
+	done < <(find "${S}" -name CMakeLists.txt -print0)
+
+	sed -i \
+		-e 's:${VERSION}::g' \
+		-e "s:doc/\${PACKAGE}:doc/${PF}:" \
+		cmake/modules/instdirs.cmake || die
+
+	java-utils-2_src_prepare
+}
+
+src_configure() {
+	# - don't build doc, it pulls in a whole stack of horrible dependencies
+	# - Bindings:
+	#   * Ada is a mess in Gentoo, don't use
+	#   * D has been removed from Gentoo, don't use
+	#   * Qt4 has been disabled, as it is deprecated and unsupported upstream
+	# - DPLD_* drivers need to use ON/OFF instead of the usex defaults yes/no, as
+	#   the testsuite performs a string comparison to determine which tests to run
+
+	# Octave bindings now require C++11 support, #609980
+	append-cxxflags -std=c++11
+
+	local mycmakeargs=(
+		# The build system does not honour CMAKE_INSTALL_LIBDIR as a
+		# relative dir, which is against the spirit of GNUInstallDirs, #610066
+		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+
+		## Features
+		-DBUILD_DOC=OFF
+		-DBUILD_DOX_DOC=OFF
+		-DUSE_RPATH=OFF
+		-DPREBUILT_DOC=$(usex doc)
+		-DHAVE_SHAPELIB=$(usex shapefile)
+		-DWITH_FREETYPE=$(usex truetype)
+		-DPL_HAVE_PTHREAD=$(usex threads)
+		-DPL_HAVE_QHULL=$(usex qhull)
+		-DPLPLOT_USE_QT5=$(usex qt5)
+
+		## Tests
+		-DBUILD_TEST=$(usex test)
+
+		## Bindings
+		-DENABLE_ada=OFF
+		-DENABLE_d=OFF
+		-DENABLE_ocaml=$(usex ocaml)
+		-DENABLE_pyqt4=OFF
+		-DENABLE_cxx=$(usex cxx)
+		-DENABLE_DYNDRIVERS=$(usex dynamic)
+		-DENABLE_fortran=$(usex fortran)
+		-DENABLE_java=$(usex java)
+		-DENABLE_lua=$(usex lua)
+		-DENABLE_octave=$(usex octave)
+		-DENABLE_python=$(usex python)
+		-DENABLE_qt=$(usex qt5)
+		-DENABLE_tcl=$(usex tcl)
+		-DENABLE_itcl=$(usex tcl)
+		-DENABLE_tk=$(usex tk)
+		-DENABLE_itk=$(usex tk)
+		-DENABLE_wxwidgets=$(usex wxwidgets)
+
+		## Drivers
+		-DPLD_cgm=OFF
+		-DPLD_gif=OFF
+		-DPLD_jpeg=OFF
+		-DPLD_plmeta=OFF
+		-DPLD_png=OFF
+		-DPLD_pstex=OFF
+		-DPLD_wxpng=OFF
+		-DPLD_mem=ON
+		-DPLD_null=ON
+		-DPLD_wingcc=ON
+		# Cairo
+		$(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON")
+		-DPLD_epscairo=$(usex cairo ON OFF)
+		-DPLD_extcairo=$(usex cairo ON OFF)
+		-DPLD_memcairo=$(usex cairo ON OFF)
+		-DPLD_pdfcairo=$(usex cairo ON OFF)
+		-DPLD_pngcairo=$(usex cairo ON OFF)
+		-DPLD_pscairo=$(usex cairo ON OFF)
+		-DPLD_svgcairo=$(usex cairo ON OFF)
+		-DPLD_xcairo=$(usex cairo ON OFF)
+		# LaTeX
+		-DPLD_ps=$(usex latex ON OFF)
+		# PDF
+		-DPLD_pdf=$(usex pdf ON OFF)
+		# Qt
+		-DPLD_aqt=$(usex qt5 ON OFF)
+		-DPLD_bmpqt=$(usex qt5 ON OFF)
+		-DPLD_epsqt=$(usex qt5 ON OFF)
+		-DPLD_extqt=$(usex qt5 ON OFF)
+		-DPLD_jpgqt=$(usex qt5 ON OFF)
+		-DPLD_memqt=$(usex qt5 ON OFF)
+		-DPLD_pdfqt=$(usex qt5 ON OFF)
+		-DPLD_pngqt=$(usex qt5 ON OFF)
+		-DPLD_ppmqt=$(usex qt5 ON OFF)
+		-DPLD_qtwidget=$(usex qt5 ON OFF)
+		-DPLD_svgqt=$(usex qt5 ON OFF)
+		-DPLD_tiffqt=$(usex qt5 ON OFF)
+		# SVG
+		-DPLD_svg=$(usex svg ON OFF)
+		# Tk
+		-DPLD_ntk=$(usex tk ON OFF)
+		-DPLD_tk=$(usex tk ON OFF)
+		-DPLD_tkwin=$(usex tk ON OFF)
+		# Truetype
+		-DPLD_psttf=$(usex truetype ON OFF)
+		# Wx
+		-DPLD_wxwidgets=$(usex wxwidgets ON OFF)
+		# X
+		-DPLD_xfig=$(usex X ON OFF)
+		-DPLD_xwin=$(usex X ON OFF)
+	)
+
+	use truetype && mycmakeargs+=(
+		-DPL_FREETYPE_FONT_PATH="${EPREFIX}"/usr/share/fonts/freefont
+	)
+	use shapefile && mycmakeargs+=(
+		-DSHAPELIB_INCLUDE_DIR="${EPREFIX}"/usr/include/libshp
+	)
+	use ocaml && mycmakeargs+=(
+		-DOCAML_INSTALL_DIR="$(ocamlc -where)"
+	)
+	use python && mycmakeargs+=(
+		-DENABLE_pyqt5=$(usex qt5)
+	)
+
+	cmake-utils_src_configure
+
+	# clean up bloated pkg-config files (help linking properly on prefix)
+	sed -i \
+		-e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \
+		-e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \
+		-e "s:${LDFLAGS}::g" \
+		"${BUILD_DIR}"/pkgcfg/*pc || die
+}
+
+src_test() {
+	virtx cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -r "${ED%/}"/usr/share/doc/${PF}/examples || die
+	fi
+
+	if use java; then
+		java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
+		java-pkg_regso "${EPREFIX}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so
+	fi
+}
diff --git a/sci-libs/primegen/Manifest b/sci-libs/primegen/Manifest
index fa999ad4cc48..26996834ac26 100644
--- a/sci-libs/primegen/Manifest
+++ b/sci-libs/primegen/Manifest
@@ -1,6 +1,5 @@
 AUX primegen-0.97-man.patch 738 BLAKE2B cd89d5156fca4a060cb59a6d9878998ac3c2f52d52891db56daf5f30986f12d20cd6d58f3cd62687f74dc44616b21c12f943c79717c72bd07d41fb925441979e SHA512 42b3748fe77eea9af4ffd531c9dabe28a6be49e05afbf705a47f7111c936fb7cb31517df475c04dc4a3157be9b7890bff64e5ae73a49d8c3517ab756d954f0e8
 AUX primegen-0.97-missing-headers.patch 1282 BLAKE2B 2863d18462642f91c8e7e29a6dfef1b570793ca468eb1bef714f311d0115c1e9019439b913f30d0a0c350dc31b19b1a623a871a74e54bce7aa28c2f110215034 SHA512 4933f7fd107f8272ae863f4b5ccf976ea29a0f1a7eab7f93160ed8dc188fef3520e2cea62513eb802e51db46190d0199c4e440b770abfed4d39b0dc6cef582c1
 DIST primegen-0.97.tar.gz 31491 BLAKE2B d9e48075a38456da30a23aa95dcf98143f5ad59e8ec56469ea06b6f33b8b2376261fd254fdb9c40ca55f76fae58b89c82329194dd99be3a6bbb356416f294337 SHA512 d6d8de4d9866dbbec20afd4d4b563e3383528138cd3ec849f706211045d735c28bbf7aa6931b8aa54163664e87c2e7ad028c68f407040ac88efce7856bc8b6f4
-EBUILD primegen-0.97-r1.ebuild 1315 BLAKE2B 14dd60c4b67ec81527719bee5069e2ef22ba2700f25737593409e140734565a3b70c27ae18080d108589b15da1ce2f00b14bd2fb09ade985d29760ef3183bd98 SHA512 d0f4237601b08f9431af575143b8ff5a7ac471b9f4d40be3f90a32c860c8047f972a47a0f32548c69a252df76ca5f2ac8452bfd506ac9e83391e7d83fe34c4f7
-EBUILD primegen-0.97-r2.ebuild 1385 BLAKE2B 2531c1772d8abfb4ff3acdaf63b948e23b5b71a01e2736f2613315b982b8237b356b7dbc7affa0d5e2eb8082036903f382bf2fa9434c1cd63939bb6ba46475f5 SHA512 99222f8bdc801d758c6d98cd3eff24c2bf37dc6bb843b1a63fdf220d949b7c15a6401b3b0ecc85c56a7a69c2115323f676ff00c6304d4b9dcc4bbcd02bc2d3ea
+EBUILD primegen-0.97-r2.ebuild 1380 BLAKE2B 717488da736d893dfdc889250fa45183cf90102d4e8cf85be70b84bb83581504a24e2508a5c000026136af4a33a3e54d676009b0eec6eb7a23f2b55f880c110d SHA512 471d3008fcaef1d65ba91cc75395a8f2ebeff1538cc3bc148c2ed73d9995e09f78bc2e94c6e70fd070b2106ef4002c9610603f273554b3e5b3981be4f3ee704d
 MISC metadata.xml 722 BLAKE2B 2200f436b6abff92d1ea37cc45bd5485b2ad2e8c3d8ab0745a98ed5099a7ed136bc898be524d1469e6c5412665776f20bc230ae0a063fd1cee29e5b704428e71 SHA512 343b3b0a267710506ae692987fa40a0197f1d50140bb14c5bb276ea44efb36691182bf52f2f71a8ad50072eee6258180d3215741ce2ff37b206d4ff2cbaac3c3
diff --git a/sci-libs/primegen/primegen-0.97-r1.ebuild b/sci-libs/primegen/primegen-0.97-r1.ebuild
deleted file mode 100644
index 4dc121e56cd5..000000000000
--- a/sci-libs/primegen/primegen-0.97-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Small, fast library to generate primes in order"
-HOMEPAGE="http://cr.yp.to/primegen.html"
-SRC_URI="http://cr.yp.to/primegen/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-man.patch"
-	epatch "${FILESDIR}/${P}-missing-headers.patch"
-	find . -type f -exec \
-		sed -i -e 's:\(primegen.a\):lib\1:' {} \;
-	mkdir usr
-}
-
-src_configure() {
-	# Fixes bug #161015
-	append-flags -fsigned-char
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "${S}/usr" > conf-home
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-}
-
-src_test() {
-	[[ $(./primes 1 100000000 | md5sum ) == "4e2b0027288a27e9c99699364877c9db "* ]] || die "test failed"
-}
-
-src_install() {
-	dobin primegaps primes primespeed
-	doman primegaps.1 primes.1 primespeed.1 primegen.3
-	dolib.a libprimegen.a
-	# include the 2 typedefs to avoid collision (bug #248327)
-	sed -i \
-		-e "s/#include \"uint32.h\"/$(grep typedef uint32.h)/" \
-		-e "s/#include \"uint64.h\"/$(grep typedef uint64.h)/" \
-		primegen.h || die
-	insinto /usr/include
-	doins primegen.h
-	dodoc BLURB CHANGES README TODO
-}
diff --git a/sci-libs/primegen/primegen-0.97-r2.ebuild b/sci-libs/primegen/primegen-0.97-r2.ebuild
index a71a29ef2560..72285f5925f0 100644
--- a/sci-libs/primegen/primegen-0.97-r2.ebuild
+++ b/sci-libs/primegen/primegen-0.97-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://cr.yp.to/primegen/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 PATCHES=(
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 5a59171c7f41..5e088f938c9f 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,17 +1,16 @@
-DIST proj-4.8.0-org_proj4_PJ.h 2960 BLAKE2B f5f367910490fb781a7ddb512e8eaae2d6de4fd1f5b8e9e1dc1b189959a57499174f6b1e90476f10cb4cb8860e069061eb8b507fbbb46b3e1e394df43f67561e SHA512 db2c2b8920ef1c0c56395480dd514e372d5385839ac553a36c92431f5662bb8ec47706489b5c12e0c4308967da58fc94b29a957ede627274ab685ab647151f2c
-DIST proj-4.8.0.tar.gz 785279 BLAKE2B c0b71012128f395347f1233cca55c5d6af258bdc1d0c67ca8b847e8b69c2f6fead7176f69ae1546f45dddcd96e05c6409167b0c078029de0be1d7bc4e550edec SHA512 6076289f8bdf1ca3b76ea879d8c221a668fcb4a6deec7cf6a293c489dfe0b21c36da0c6ed2c7a0b8042436106e851018aa429b4731f4ff018fea2fdb8887ec76
 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-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
-EBUILD proj-4.8.0.ebuild 1299 BLAKE2B 0ebc7c73ece64fe41bf071f96becad9f416824e85e031cc1290b16e06d15717e4ef833f207687c7341a9cc09f94508aef508147ca1cd1a084b52bfda6a9e5b36 SHA512 1df5171dfd85e0eee8e49cbd9d603f016978658e73226a1809d5efc6aef96955784b7fc176b06e94e87a2ccdc13d92982d31807f104932a407e16f32f8d50254
 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
 MISC metadata.xml 513 BLAKE2B 4068b4ddcb4e95578df8da19650ab86b4dbfdba294a3d03f10ada37a578a2113b0d71720545c269b1c097d3a37dbc66ee0cdfe61889466171c109413088707fd SHA512 e841ea4fb30d3632fecca7d584121fce35dff2b23ad8a1feeb98a47f0a3b1d78f57a05b0d303aeff47f981f5b7feb831deb14644ab6615644c0a8593a6e321b3
diff --git a/sci-libs/proj/proj-4.8.0.ebuild b/sci-libs/proj/proj-4.8.0.ebuild
deleted file mode 100644
index 544b6e767021..000000000000
--- a/sci-libs/proj/proj-4.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils java-pkg-opt-2 flag-o-matic
-
-DESCRIPTION="Proj.4 cartographic projection software with updated NAD27 grids"
-HOMEPAGE="http://trac.osgeo.org/proj/"
-SRC_URI="
-	ftp://ftp.remotesensing.org/pub/proj/${P}.tar.gz
-	http://download.osgeo.org/proj/${PN}-datumgrid-1.5.zip
-	http://trac.osgeo.org/proj/export/2190/tags/${PV}/proj/src/org_proj4_PJ.h -> ${P}-org_proj4_PJ.h
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="java static-libs"
-
-RDEPEND=""
-DEPEND="
-	app-arch/unzip
-	java? ( >=virtual/jdk-1.5 )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"/nad || die
-	mv README README.NAD || die
-	cp "${DISTDIR}/${P}-org_proj4_PJ.h" "${S}/src/org_proj4_PJ.h" || die
-	unpack ${PN}-datumgrid-1.5.zip
-}
-
-src_configure() {
-	if use java; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		append-cflags "$(java-pkg_get-jni-cflags)"
-	fi
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with java jni)
-}
-
-src_install() {
-	default
-	cd nad || die
-	dodoc README.{NAD,NADUS}
-	insinto /usr/share/proj
-	insopts -m 755
-	doins test27 test83
-	insopts -m 644
-	doins pj_out27.dist pj_out83.dist
-	prune_libtool_files
-}
diff --git a/sci-libs/proj/proj-6.2.1.ebuild b/sci-libs/proj/proj-6.2.1.ebuild
new file mode 100644
index 000000000000..70e5a2e53a6b
--- /dev/null
+++ b/sci-libs/proj/proj-6.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 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"
+
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj4.org/"
+SRC_URI="
+	https://download.osgeo.org/proj/${P}.tar.gz
+	https://download.osgeo.org/proj/${DATUMGRID}
+	europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
+"
+
+LICENSE="MIT"
+SLOT="0/15"
+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 )"
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"/data || die
+	mv README README.DATA || die
+	unpack ${DATUMGRID}
+	use europe && unpack ${EUROPE_DATUMGRID}
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--without-jni
+}
+
+src_install() {
+	default
+	cd data || die
+	dodoc README.{DATA,DATUMGRID}
+	use europe && dodoc README.EUROPE
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/pyshp/Manifest b/sci-libs/pyshp/Manifest
index cf4d2f7579d3..47d76b1f4449 100644
--- a/sci-libs/pyshp/Manifest
+++ b/sci-libs/pyshp/Manifest
@@ -1,4 +1,4 @@
 DIST pyshp-1.2.0.tar.gz 58993 BLAKE2B f7cb69976b6dd089be45d7984765f803ce94300dc19df1b99a11ba876365f49659fb37a5ebfa36ebe3ce6de4df9f0b80f628160ace9b11a66a247f9a57ac0a80 SHA512 c77e19f258ba9d2e2c480b82c342d2bbeae4b5855627aa98777fbf590e904d50045edecaa0e5ec2e03ddaaf49bf7261944fb77bcd26bf6d21e50c90c30cd0b43
-EBUILD pyshp-1.2.0.ebuild 600 BLAKE2B a10a5f015e7b4c80300b73c7f678810be7b144a49f4f665c088b3bbd7b6555506b4527411fb0fdd4e734becfb4192ef4e88f5ee1e4d01d558491d92485003803 SHA512 735cd978907cc5551532fe4cfd60034d9172923b1c8395d234bedba3bad1fc946d968050689e031a9c8565fc0f886f3417b512b6bbfb8e8372ec47ebefcb8078
-EBUILD pyshp-9999.ebuild 600 BLAKE2B a10a5f015e7b4c80300b73c7f678810be7b144a49f4f665c088b3bbd7b6555506b4527411fb0fdd4e734becfb4192ef4e88f5ee1e4d01d558491d92485003803 SHA512 735cd978907cc5551532fe4cfd60034d9172923b1c8395d234bedba3bad1fc946d968050689e031a9c8565fc0f886f3417b512b6bbfb8e8372ec47ebefcb8078
-MISC metadata.xml 291 BLAKE2B fb64de66751a7868d76faae6047152688b31bb70f0d59b6078bea7ce778bedf669c8434c04146daf012e690037b4592e61d25b751014086a9bb670818a4786b5 SHA512 5f734d7badf75d687d67ecfb97c8a826ab4d57240ca8153e7950c758ec1d77c46ad4910f952155f8c601bb64e6f46e0643b2dd53576cbed5e9dd81e890cd807f
+EBUILD pyshp-1.2.0.ebuild 596 BLAKE2B 3712d774739c205d58e59d2d3b9896503829ff283425fa1167c08d5483f583ebceec41246aa2131f055329d83fa2e8e8205d3b7ca89ebe978c62e77d216b39f6 SHA512 bc2c8931b6f663d1e2f6d01749f928f42583b48a057429a334ef5593e1a42f36fd2dce76521b99000dbbd90191d460059b76c345e0a47498dee3b1d77d7bd5c2
+EBUILD pyshp-9999.ebuild 596 BLAKE2B 3712d774739c205d58e59d2d3b9896503829ff283425fa1167c08d5483f583ebceec41246aa2131f055329d83fa2e8e8205d3b7ca89ebe978c62e77d216b39f6 SHA512 bc2c8931b6f663d1e2f6d01749f928f42583b48a057429a334ef5593e1a42f36fd2dce76521b99000dbbd90191d460059b76c345e0a47498dee3b1d77d7bd5c2
+MISC metadata.xml 240 BLAKE2B 3e95a8539eb32738e34078f4ed5c3820536fd4fc86c9e3d4d0116cd543b0c874774124b8154b6da763417e05d373b41ace9dafb190190089b42c290453cf0727 SHA512 7f9d2935d53cdaf4f9daed93507c2f0ec213c0b3db5ae35d6612885913dbcfb4f62f78a057c0b894d1adb7360735e76e2cbfccd64f358a392df5b78fcc156101
diff --git a/sci-libs/pyshp/metadata.xml b/sci-libs/pyshp/metadata.xml
index 97d8d84efce1..512ca5c34a9e 100644
--- a/sci-libs/pyshp/metadata.xml
+++ b/sci-libs/pyshp/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">pyshp</remote-id>
   </upstream>
diff --git a/sci-libs/pyshp/pyshp-1.2.0.ebuild b/sci-libs/pyshp/pyshp-1.2.0.ebuild
index f29bee6d27b4..71fb122d6eab 100644
--- a/sci-libs/pyshp/pyshp-1.2.0.ebuild
+++ b/sci-libs/pyshp/pyshp-1.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/sci-libs/pyshp/pyshp-9999.ebuild b/sci-libs/pyshp/pyshp-9999.ebuild
index f29bee6d27b4..71fb122d6eab 100644
--- a/sci-libs/pyshp/pyshp-9999.ebuild
+++ b/sci-libs/pyshp/pyshp-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest
index a26dc2f166e4..aecbedb47815 100644
--- a/sci-libs/scalapack/Manifest
+++ b/sci-libs/scalapack/Manifest
@@ -1,4 +1,4 @@
 AUX scalapack-2.0.2-libdir.patch 2159 BLAKE2B e96c845a6e841b8a432268b76755d92158ef880cff11b8925c82651cb2fda736e60da94ea075b44eff9f7a0e00854ac81308d762523351b68b66a782e131aa3a SHA512 40fa841fe31c6665eab09065eed8f5aed8ed48a8e2211ee5fd9365c5c101a2d7167c9d084628ee5f5a26475599a210c4011ce4a207c8df677cf72a67b6a26cac
 DIST scalapack-2.0.2.tgz 4779534 BLAKE2B c2aabd87bc8f7c0d9af31bd8ad8c933703dcbba399658d15c1e5256da2350c1a0feac2ca4a205f697b1c48083df89cbcd64ba432da036081c0f33d5d2acddc9b SHA512 92c71d3de0900955511c527ab3ca57ff69d6d9edc390e69f93ac3769d32ce83a714326bcb6218c8c74b8874be2fdc8aad5e42c912a12581e8d4ce8829ea39248
-EBUILD scalapack-2.0.2-r1.ebuild 1613 BLAKE2B d006b8e6bd4522307c496e600d6499e68a925649b7edd8e17215a756fd42d2b9e34394e9b9b87dd7c2d20cf6c55cb5026c3d6636a478adadccac43e7e16ad8a4 SHA512 86ff70dc140edd393851a67e9897dfead45069a2d665982bdaeac1c86e7108542f2228e12fb7093e9a8b76470bf00dc45c4736618ac1e5bb119ba7b6dd165c0f
+EBUILD scalapack-2.0.2-r1.ebuild 1634 BLAKE2B 59aef45013c7b37393566b9516a10d19bdd8035e9adda829e2d703adf98c8db80fd37c8ed5197fddedfb9d8291cb648a1e4a9aa940003917c018d36d9b390dd8 SHA512 577e5ac7708e9e0cae11d65bff29213bac0c874b62cf75be5127926c630b147a5257ad97f86054f31e3b0376ab3270a9739cf0fff66a210fe76f1a5c28222d13
 MISC metadata.xml 662 BLAKE2B aacea4e0ad09d68f6d953ba2eeac01ffe9660d389271be5335686b2f2d1000ddc79e0a7f24e506749d57f5e6adc3c7f1f82f3d758fe1d62145dea29d5dcc05f4 SHA512 90820c7f860bfabd8b057277a967bffac6af9d12c334a5813ea4fc75cbdf90d63e5e8d8ec04d5c28e819785dafbbe698ca8e5933f97102c1369727a8a9eaa5b0
diff --git a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
index eedda916cce7..8f0f1295c1bc 100644
--- a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
+++ b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils fortran-2
 
 DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) computing"
 HOMEPAGE="https://www.netlib.org/scalapack/"
-SRC_URI="${HOMEPAGE}/${P}.tgz"
+SRC_URI="https://www.netlib.org/scalapack/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-libs/scikits/Manifest b/sci-libs/scikits/Manifest
index 6ab8091f613c..dfe9f81be26a 100644
--- a/sci-libs/scikits/Manifest
+++ b/sci-libs/scikits/Manifest
@@ -1,4 +1,4 @@
 DIST scikits.example-0.1.tar.gz 2401 BLAKE2B 4c67adb2e74be9c94d68e99bf44017eb75c054608b69045523c5cfeee18edb01384640e8ed3cba4765bc181e7dfb9a2e70d1a97ad2b6176d2df7112172adce55 SHA512 9e5534a9f12f5a11e7f9d7c3d4f16cdbfa34293b29882e6bc9ec597b6e7ac306cc65e2b197da8c0bfc8e319b01db31f34b06018b5420c3ad68e8cc3f490259e1
-EBUILD scikits-0.1-r1.ebuild 753 BLAKE2B f930539931f3399fdd4c82b9148e5996b43b2051d8c52429795a90b63db54bb6f91c77bcbd5aa8e77fb84fc2a9f2efa218e7bc06efbb6c23e18f447d2aab9d77 SHA512 4959c848f06b45d553e75c2429133e5e814d7307be1d3d2c78b1335a1a91225a2d6b4df14e0b10cea3692ac9653414cc803ce6a06c830b739c0a55e7a23df05d
-EBUILD scikits-0.1-r2.ebuild 759 BLAKE2B 72d5ebeddf875a66f48606aea0d127098ab7d4c05ef10e156b0b3cd4c22550b4d5af95213a682411fdb8fac153481be555be926f99bc2390971073cc13a90ab8 SHA512 42d353358dc15c3061b7a300a8caa6a50a2071bd44a30b8beb9b5929faeed8f469de3a82770b90a3aa607bf7908d70fcc468ef2bfcf86dfef9d5ee7c4edc035b
+EBUILD scikits-0.1-r1.ebuild 744 BLAKE2B d604848d273e80062dccc17d527649761766fbe388c7376791c5b3382b08110723acdcb549fff8ac62857d78234ea5a5e7bef0b58ff2197af45b606b1b99314e SHA512 35fc9810a66a0fb94a6d28f46c56e1a8d2ba20f7896444d16d694c9312c9cf42f46db1356166363e1ae76ed9d3def3e8c79c23968b378ca5290b5d867dc82719
+EBUILD scikits-0.1-r2.ebuild 752 BLAKE2B f8540044ed82e5ca4cb8e0fafceceba5759cd7a1644a40caa441ed123c3d09238a15b6a7f85b945942dc44e0be7b6a0be68098a2ddc54edbaf001bdbd08b10ee SHA512 0761da7e625d7efcef310e7ec9b8ebaf0418f1a99efb053ae3bb0d5b46e57b406be8a021bb3332ea7750b0316a63b0ab7b4fe9dc4b943793920a88c71c047b71
 MISC metadata.xml 454 BLAKE2B 65b13370ebd7fdc79632a088b403f493076c87a0ccc49b64946c7ed0050fcfd85f7ac0fce2fa853e1be0944d0ee1628470dadb4124448e7a746bdb864ffe9977 SHA512 b33fed7d1199471c4a86dadf1aa90951035fe49c76df9310de4ed13c391b92782230308a55a33c7fa88f5bd42b8718fe5f6ac88c0a8c1818848a447c4c1d0eb8
diff --git a/sci-libs/scikits/scikits-0.1-r1.ebuild b/sci-libs/scikits/scikits-0.1-r1.ebuild
index 0c7caeb5c2f9..43c2ebdff8ee 100644
--- a/sci-libs/scikits/scikits-0.1-r1.ebuild
+++ b/sci-libs/scikits/scikits-0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-r1
 
diff --git a/sci-libs/scikits/scikits-0.1-r2.ebuild b/sci-libs/scikits/scikits-0.1-r2.ebuild
index 0febd354ddb8..21c6d190c228 100644
--- a/sci-libs/scikits/scikits-0.1-r2.ebuild
+++ b/sci-libs/scikits/scikits-0.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit python-r1
 
diff --git a/sci-libs/scikits_image/Manifest b/sci-libs/scikits_image/Manifest
index e5f1d0ac88f0..4fd4d37f834f 100644
--- a/sci-libs/scikits_image/Manifest
+++ b/sci-libs/scikits_image/Manifest
@@ -1,4 +1,3 @@
 DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
-EBUILD scikits_image-0.13.0-r1.ebuild 1822 BLAKE2B e595df705bd5aed423277c56cb9c0b9ce41e2a8ee492d521ecea117b5043290f8350fa2d8ca233eb9e00d1781dec3f693b14b5a7860d994301072fada5739234 SHA512 52c1b774f54ef368076f2b3286b9b024a0de92740a0527ac5b8a05ca55a4a5040e24ffd68a3c64ed4da2f01a329ba65d0372c0e9d7575aaf6a4bdc8086859d37
-EBUILD scikits_image-0.13.0.ebuild 1820 BLAKE2B e0acc39756bc717c5f0e35edc92606cfb38f2a24ca5297d72c63dc306a316b3172841aace9c0210b8eb3a80ea259a61fd1ccc92b165a46eb1bbd6138d638638a SHA512 e61b38dc34f10d5a08b04071fbe341daaefed3110372f740237a79fd3433b8ab2460ba416e7faf55c9410d53d1d7d028f2832cba56565f16b4066bb224cebd23
+EBUILD scikits_image-0.13.0-r1.ebuild 1810 BLAKE2B 8e90aecad0cd74e15dc7e817253d492bacaa9b846b8dcfea6b244bba0de386ffa2db2f54701e2b06aa4adb085df8fc044a6d5cae7f90ad4d84669d75ad1db51d SHA512 9359682962f99c304eb4ef52138ccb0d87477c5dca7239af2dc8c154a6ba1553cf8f06232f9c768fd8888853282e4a893b68a304713dd5f68910b0185af00fdb
 MISC metadata.xml 834 BLAKE2B d6ed9731e0bfffb39fb127b1ccaa9d449e7cedc4038a5a4a915624fadad131d39df0d1d7123951539074758095d35c1b9730bb4a3da2278b02630903645eb769 SHA512 1c615479bc22c8c66b4f7a2189e38c69f9b8722f051c68473439069ef89598f0505dbd94fe06cbe56a07e41a1a6552f4d8d666703676ef9a165dbcf462e09e40
diff --git a/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild b/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
index 8c4d5a0fd8e3..99a0588f9ff9 100644
--- a/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
+++ b/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 eutils virtualx
 
diff --git a/sci-libs/scikits_image/scikits_image-0.13.0.ebuild b/sci-libs/scikits_image/scikits_image-0.13.0.ebuild
deleted file mode 100644
index 985fd58974d2..000000000000
--- a/sci-libs/scikits_image/scikits_image-0.13.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eutils virtualx
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="https://scikit-image.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc freeimage pyamg test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pywavelets[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[sparse,${PYTHON_USEDEP}]
-	freeimage? ( media-libs/freeimage )
-	pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYP}"
-
-DOCS=( CONTRIBUTORS.txt DEPENDS.txt RELEASE.txt TASKS.txt TODO.txt )
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	echo "backend : Agg" > matplotlibrc || die
-	#echo "backend.qt4 : PyQt4" >> matplotlibrc || die
-	#echo "backend.qt4 : PySide" >> matplotlibrc || die
-	MPLCONFIGDIR=. virtx nosetests --exe -v skimage
-}
-
-pkg_postinst() {
-	optfeature "FITS io capability" dev-python/astropy
-	optfeature "GTK" dev-python/pygtk
-	optfeature "Parallel computation" dev-python/dask
-	# not in portage yet
-	#optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk
-	#optfeature "io plugin providing most standard formats" dev-python/imread
-}
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index a47e6c7658b0..306a618ba3b4 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -1,16 +1,9 @@
-AUX scikits_learn-0.14.1-system-cblas.patch 1072 BLAKE2B ef9b50a89065bd546ee7d5277df4b9b071cb1e30d18a6517738536eac0964ea9c28ba3d1e333522a2a919316427c688cf4cbbe342460f7f4542c152180ad9998 SHA512 bb9d7265c81fe11d5a4467716e982eafb046cd24fe317a01e02d20ff43df39e9557a4325f26cf131b87a26e9fe86342abf3166be058aeeca41fb675f9ead17d3
-AUX scikits_learn-0.17.1-system-cblas.patch 1344 BLAKE2B b7629bc48cdbd628d764de6aa22bcc2a6e4836f859a3eb76e6447a898ee52598c6810e33fa13d86edd03715ac19fcd3e80009583709ee9b4017caef252110956 SHA512 8f4c83771a8b196ce3daff3d0a57f8d9a5d53d49528ac206aee767867d273056f50105371d6aa2e46e47fdd2c29ab56c3c1a41aef747c36af95c9968ccb8d755
 AUX scikits_learn-0.18.1-system-cblas.patch 1366 BLAKE2B 8678695de19e8c56b1a0f98193da79c69d32a81f1c419d0c594afe7865d5469312d7f9799ae0ccca307d2acbdc9f1a8641b446a7cb6b263a81c4b50ff260c1d4 SHA512 be8527fa924502453a9f43af5b3553db50f97b4b1f1ee14fcb2699319e77e3d0d3c19bf82bd66357c6464011dcb819e3625a83360923d322f5d340568a72cbf6
-DIST scikit-learn-0.17.1.tar.gz 7898571 BLAKE2B 4125864e8701e072e45f83be504a0eba8480f2c08584a6e98f2ae09dd4d64487931eca2ae116230b0d8945822d6e07cc2102129f48e789825c2b70102121fa06 SHA512 5786e04a13225d2433103f1873f2753e332704b98c4c32b840970f763ec1abf0248007089e5ae47e11c66535f05a0d0402715622e6d6f0955ec7961b92e1b2e5
-DIST scikit-learn-0.17.tar.gz 7834903 BLAKE2B 9492a0deff723bd1ff3a976f080a5db0d1bf590521a324d627b09bbb755dbdccc6e41fe71519e10bbad8d425b6b12ff6f44b0518d501d9d075dfa5d021be64dd SHA512 53a76e2f90e27967bf216cd9d7e8051ed847a3381e3b7b7b8236511b4105eef41bd4d3c9f7f71a51db4b0bf99cbd571d7c1b26803757cff04424b70cb834b555
-DIST scikit-learn-0.18.1.tar.gz 8933930 BLAKE2B 48cfc73769531242d1228f41115a78e4649c52e7d8796e54286f996ddab72353e3f73bf22302535b7d24f55194e893ed681c74dd60beab5f8ba09aa3af8e161a SHA512 7149e683424351a28c19501302ece147cb03d4d12b08822eb2b1898a4978b96803323778fbba628008dd7a7c85daea4e9b550a71ee76851f9a09b2baac18a799
-DIST scikit-learn-0.18.2.tar.gz 9224516 BLAKE2B fe4b402e3ac561f9272a0a51ddc17092f2a9fada3e2dc081be3fe66bb7932e0ca0c14d9be21272c364d13c4d9669e9ff399e16b53b5cbaa3f5b20e43d2bb448d SHA512 7c5c7bdd577ad215790654ce1eff6e802aebe53283ab6c5f12684cf99aeecc8976f9a9803f619f549d4d03be0d7634f249046e4b4f15afa12aecb2697e2e0b05
+AUX scikits_learn-0.20.2-fix-cdfast.patch 3401 BLAKE2B cb75c941c2d7a81cde7fe07dc46107730bed0323ce07030f3401138234816c9edc53aff18973545f66a5ed6c54ab11b7dd2a04faf7d106dd046d54c84533c697 SHA512 56ef8a8e66138df5b2899e38d04c9d1303882103fa3c16c31c592a42a22c2111ab490caa0cd6d83332b21184f9c88b13e735cf5317f4f58d7e1c0356a74e0114
 DIST scikit-learn-0.19.0.tar.gz 9341628 BLAKE2B c9e0c12558e81efb6f5cfddead028980b0019d2f6d0fdce5662c9138ec3a5b2a3d30b022a5713578bc7effd09894006e8f7f60a3e038ca66297502d9d4212686 SHA512 1b88bc043b08de9b5bb1f3814b8101c73ced010cf94bd725fb69e1ef95b4a9597a34de4a19f84fbbf63e54d47e95b3ff498d611234fcdfcaa5e4e3cf696289d2
-EBUILD scikits_learn-0.17.1.ebuild 3129 BLAKE2B 3ed1bbf4d4a71659f0b8e7bf2366e6a8b8995def99821d2e58d2af68558183e944fee67b9c194e963b6a7fcb2011b2983e2b5223082cc7a2182e3ea9d6d19df0 SHA512 f078a56afcfc2e163628b9bf8101909b770955f0344cd0bc8cc1db19bcddde785fd3fab99b7504e8f4a3b11db42393430f24c94efe352b2be737cc6ec5d11697
-EBUILD scikits_learn-0.17.ebuild 3128 BLAKE2B 213d49e59a2dc8b846bb91849f7508008ca238ebd614bfeb37851137802650ee577636c1599b572d89b263ef90b645eb7090cf75e84ecb1423a56122cb438f5c SHA512 e9711822a4c74ee1ec13aa1c8a9a884208962a31f6ea20d2688d1cab62effa5373bd29d3aba5827658e8437415f7e5d412c14549d9c4a033ce1826c23a9a2468
-EBUILD scikits_learn-0.18.1.ebuild 3156 BLAKE2B cf12d6cb19ea6ed324b2f2c3f0898f49a2d3eec9171f0e55ea31c7b03b5f53dd2872688b265e83ec366aba0964448400cd45368df8aa146c808a1eac02f75511 SHA512 563bbcad4b743551457c2b4f90237d112f9dc82e9d6397b833475f60d770920cfa3f80c95f9df03a3c1baaf3bf04d05a13678c89f118a4f5b6c17155918b790e
-EBUILD scikits_learn-0.18.2-r1.ebuild 3304 BLAKE2B 86c64b0f6aa28e5077c77c22fabe6ec92d53b14080686a3b99bafaa12ec5bf3be766ddd9c19879ca6e5bdd3a494c3f42d557e23b1e848136d955c7cd97f7b134 SHA512 a0e14cddbbbdc7897b26fa7a4fdadef83418d261f442b1b03f2d2189532e8896758a1285c69393ec037124b7930fe077bb63bda7777625fb0d0a4aae2c014e72
-EBUILD scikits_learn-0.18.2.ebuild 3168 BLAKE2B 29adca7487cc6bee87bbd388e72883515fbbf1d65785dd1a04f83a83773f014fb57bad33222c59ca4fac1183342da351ed53ccab22f73c092f8c4e48efc9062c SHA512 0ec847d8e4aef38582d5dbcfd2fddaa28aaa36f5007638cac079dae097ead3a1175d5d558b83dc6e7dec51ec128fb1160c13a720baa518c48b134eb8a14bff91
-EBUILD scikits_learn-0.19.0-r1.ebuild 2848 BLAKE2B d20e0645dbe75479b3e923c7fdd7b8e04fe645846af0a3008b053c43dea31c9508fd54f2db2ce9be8d4a59cf0bdc4bf49d9c1c9abaeefb13aedd5121f668aea2 SHA512 3d57c32ad9bfdc4686b406ba2ecb7d5703408a9f3404e44fc49ff6569c01182b2bd60da6b30434ea68ac9bc7602e198e9c154ccf41d469b862e37fbe01898b2a
-EBUILD scikits_learn-0.19.0.ebuild 2846 BLAKE2B 8dc3531bf0800bad86044893ce63261f693380dd9cac6d8dff40bf4d7364f23ceacb77fdc4655bebe6989e2f20f3c23429241629ad0fc9b1a95381001639cfa1 SHA512 ecab717df4619958ff84d36f9cee11969b0e5b7fb54b1ff79bf6794313c966c0dab09f086c0feae6949aa4d1ba8a1cd4fc478bb451d94a64cb60d52ea515a977
+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 2846 BLAKE2B f5ec4d43a2af7fc0c76acec86edb717c7de4a424dc351482e2a579ae29eaca3291a4c302f9c31e87a67acf9a173d180163ef0375419c65a872de2463aaf6b6e4 SHA512 ff0bb216170b8ea1472e68ca8f8451039e7cc8d8589c6c9f88e9c480303c7b11226ca6a5027413f3495572d8146150b1354da196857a040fae5164a207253a91
+EBUILD scikits_learn-0.20.2.ebuild 2869 BLAKE2B 5d31c30890c02139b25724ba6d7ba61ebb331ef91f49536566ed13305901479afcf20d3f513a180c9ad35e9175727c15069305d0defd507ea5c3cba9c5076139 SHA512 afea761a062d61b3ecbef3a7f7c5b51c0faffe49f6157e5a42c3e45b1f83dd45d3ca612229cfde88baf8759004b0b8070358644790773d6aae3a01e1f429c210
+EBUILD scikits_learn-0.20.4.ebuild 2869 BLAKE2B 5d31c30890c02139b25724ba6d7ba61ebb331ef91f49536566ed13305901479afcf20d3f513a180c9ad35e9175727c15069305d0defd507ea5c3cba9c5076139 SHA512 afea761a062d61b3ecbef3a7f7c5b51c0faffe49f6157e5a42c3e45b1f83dd45d3ca612229cfde88baf8759004b0b8070358644790773d6aae3a01e1f429c210
 MISC metadata.xml 605 BLAKE2B 46a657647a79f0a23cc07b39877b1e57158cdf94d9478c3aa4e7af0dbdbf60acf996d1431076697db764d42bec0d5e0517c1247e91dc36e85823a45784d00e71 SHA512 e14b6835108fa80eca44bab635c9a229da65f048ffcee16cd4ad7736c3a0fb364c94ff0bd9630030653bd3cd78d8dced191c43c7e5aacb3a7f6e61ac45b5bb3d
diff --git a/sci-libs/scikits_learn/files/scikits_learn-0.14.1-system-cblas.patch b/sci-libs/scikits_learn/files/scikits_learn-0.14.1-system-cblas.patch
deleted file mode 100644
index 96c6cc2dbde5..000000000000
--- a/sci-libs/scikits_learn/files/scikits_learn-0.14.1-system-cblas.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- sklearn/setup.py.orig	2013-08-08 13:54:08.310879167 -0700
-+++ sklearn/setup.py	2013-08-08 13:52:59.808456423 -0700
-@@ -68,14 +68,6 @@
-         libraries=libraries,
-     )
- 
--    # some libs needs cblas, fortran-compiled BLAS will not be sufficient
--    blas_info = get_info('blas_opt', 0)
--    if (not blas_info) or (
--            ('NO_ATLAS_INFO', 1) in blas_info.get('define_macros', [])):
--        config.add_library('cblas',
--                           sources=[join('src', 'cblas', '*.c')])
--        warnings.warn(BlasNotFoundError.__doc__)
--
-     # the following packages depend on cblas, so they have to be build
-     # after the above.
-     config.add_subpackage('linear_model')
---- sklearn/_build_utils.py.orig	2013-08-08 14:01:35.994589269 -0700
-+++ sklearn/_build_utils.py	2013-08-08 12:19:41.875967870 -0700
-@@ -23,7 +23,7 @@
-         return False
- 
-     blas_info = get_info('blas_opt', 0)
--    if (not blas_info) or atlas_not_found(blas_info):
-+    if (not blas_info):
-         cblas_libs = ['cblas']
-         blas_info.pop('libraries', None)
-     else:
diff --git a/sci-libs/scikits_learn/files/scikits_learn-0.17.1-system-cblas.patch b/sci-libs/scikits_learn/files/scikits_learn-0.17.1-system-cblas.patch
deleted file mode 100644
index 42657a7adacc..000000000000
--- a/sci-libs/scikits_learn/files/scikits_learn-0.17.1-system-cblas.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur scikit-learn-0.17.1.orig/sklearn/_build_utils.py scikit-learn-0.17.1/sklearn/_build_utils.py
---- scikit-learn-0.17.1.orig/sklearn/_build_utils.py	2016-03-09 00:27:54.756813784 +0000
-+++ scikit-learn-0.17.1/sklearn/_build_utils.py	2016-03-09 00:30:09.605118512 +0000
-@@ -23,7 +23,7 @@
-         return False
- 
-     blas_info = get_info('blas_opt', 0)
--    if (not blas_info) or atlas_not_found(blas_info):
-+    if (not blas_info):
-         cblas_libs = ['cblas']
-         blas_info.pop('libraries', None)
-     else:
-diff -Nur scikit-learn-0.17.1.orig/sklearn/setup.py scikit-learn-0.17.1/sklearn/setup.py
---- scikit-learn-0.17.1.orig/sklearn/setup.py	2016-03-09 00:27:54.806813156 +0000
-+++ scikit-learn-0.17.1/sklearn/setup.py	2016-03-09 00:29:28.215638848 +0000
-@@ -58,14 +58,6 @@
-         libraries=libraries,
-     )
- 
--    # some libs needs cblas, fortran-compiled BLAS will not be sufficient
--    blas_info = get_info('blas_opt', 0)
--    if (not blas_info) or (
--            ('NO_ATLAS_INFO', 1) in blas_info.get('define_macros', [])):
--        config.add_library('cblas',
--                           sources=[join('src', 'cblas', '*.c')])
--        warnings.warn(BlasNotFoundError.__doc__)
--
-     # the following packages depend on cblas, so they have to be build
-     # after the above.
-     config.add_subpackage('linear_model')
diff --git a/sci-libs/scikits_learn/files/scikits_learn-0.20.2-fix-cdfast.patch b/sci-libs/scikits_learn/files/scikits_learn-0.20.2-fix-cdfast.patch
new file mode 100644
index 000000000000..1d1de4a3e0e5
--- /dev/null
+++ b/sci-libs/scikits_learn/files/scikits_learn-0.20.2-fix-cdfast.patch
@@ -0,0 +1,42 @@
+--- scikit-learn-0.20.3.orig/sklearn/linear_model/cd_fast.c	2019-08-09 03:05:05.351926119 +0500
++++ scikit-learn-0.20.3/sklearn/linear_model/cd_fast.c	2019-08-09 03:05:35.022926006 +0500
+@@ -4889,7 +4889,7 @@
+ 
+ static PyObject *__pyx_pf_7sklearn_12linear_model_7cd_fast_8enet_coordinate_descent(CYTHON_UNUSED PyObject *__pyx_self, __Pyx_memviewslice __pyx_v_w, float __pyx_v_alpha, float __pyx_v_beta, __Pyx_memviewslice __pyx_v_X, __Pyx_memviewslice __pyx_v_y, int __pyx_v_max_iter, float __pyx_v_tol, PyObject *__pyx_v_rng, int __pyx_v_random, int __pyx_v_positive) {
+   PyObject *__pyx_v_dtype = NULL;
+-  void (*__pyx_v_gemv)(enum CBLAS_ORDER, enum CBLAS_TRANSPOSE, int, int, float, float *, int, float *, int, float, float *, int);
++  void (*__pyx_v_gemv)(CBLAS_ORDER, CBLAS_TRANSPOSE, int, int, float, float *, int, float *, int, float, float *, int);
+   float (*__pyx_v_dot)(int, float *, int, float *, int);
+   void (*__pyx_v_axpy)(int, float, float *, int, float *, int);
+   float (*__pyx_v_asum)(int, float *, int);
+@@ -6279,7 +6279,7 @@
+ 
+ static PyObject *__pyx_pf_7sklearn_12linear_model_7cd_fast_10enet_coordinate_descent(CYTHON_UNUSED PyObject *__pyx_self, __Pyx_memviewslice __pyx_v_w, double __pyx_v_alpha, double __pyx_v_beta, __Pyx_memviewslice __pyx_v_X, __Pyx_memviewslice __pyx_v_y, int __pyx_v_max_iter, double __pyx_v_tol, PyObject *__pyx_v_rng, int __pyx_v_random, int __pyx_v_positive) {
+   PyObject *__pyx_v_dtype = NULL;
+-  void (*__pyx_v_gemv)(enum CBLAS_ORDER, enum CBLAS_TRANSPOSE, int, int, double, double *, int, double *, int, double, double *, int);
++  void (*__pyx_v_gemv)(CBLAS_ORDER, CBLAS_TRANSPOSE, int, int, double, double *, int, double *, int, double, double *, int);
+   double (*__pyx_v_dot)(int, double *, int, double *, int);
+   void (*__pyx_v_axpy)(int, double, double *, int, double *, int);
+   double (*__pyx_v_asum)(int, double *, int);
+@@ -16246,8 +16246,8 @@
+   CYTHON_UNUSED float (*__pyx_v_asum)(int, float *, int);
+   void (*__pyx_v_copy)(int, float *, int, float *, int);
+   void (*__pyx_v_scal)(int, float, float *, int);
+-  void (*__pyx_v_ger)(enum CBLAS_ORDER, int, int, float, float *, int, float *, int, float *, int);
+-  void (*__pyx_v_gemv)(enum CBLAS_ORDER, enum CBLAS_TRANSPOSE, int, int, float, float *, int, float *, int, float, float *, int);
++  void (*__pyx_v_ger)(CBLAS_ORDER, int, int, float, float *, int, float *, int, float *, int);
++  void (*__pyx_v_gemv)(CBLAS_ORDER, CBLAS_TRANSPOSE, int, int, float, float *, int, float *, int, float, float *, int);
+   unsigned int __pyx_v_n_samples;
+   unsigned int __pyx_v_n_features;
+   unsigned int __pyx_v_n_tasks;
+@@ -17965,8 +17965,8 @@
+   CYTHON_UNUSED double (*__pyx_v_asum)(int, double *, int);
+   void (*__pyx_v_copy)(int, double *, int, double *, int);
+   void (*__pyx_v_scal)(int, double, double *, int);
+-  void (*__pyx_v_ger)(enum CBLAS_ORDER, int, int, double, double *, int, double *, int, double *, int);
+-  void (*__pyx_v_gemv)(enum CBLAS_ORDER, enum CBLAS_TRANSPOSE, int, int, double, double *, int, double *, int, double, double *, int);
++  void (*__pyx_v_ger)(CBLAS_ORDER, int, int, double, double *, int, double *, int, double *, int);
++  void (*__pyx_v_gemv)(CBLAS_ORDER, CBLAS_TRANSPOSE, int, int, double, double *, int, double *, int, double, double *, int);
+   unsigned int __pyx_v_n_samples;
+   unsigned int __pyx_v_n_features;
+   unsigned int __pyx_v_n_tasks;
diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
deleted file mode 100644
index e83910a436ba..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas
-	doc? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}/${P}-system-cblas.patch" )
-
-python_prepare_all() {
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
-	# use system joblib
-	rm -r sklearn/externals/joblib/* || die
-	echo "from joblib import *" > sklearn/externals/joblib/__init__.py
-	sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
-	sed -i -e 's/..externals.joblib/ joblib/g' \
-		sklearn/cross_validation.py \
-		sklearn/decomposition/tests/test_sparse_pca.py \
-		sklearn/metrics/pairwise.py || die
-
-	rm sklearn/externals/funcsigs.py || die
-	rm sklearn/externals/odict.py || die
-	sed -e 's:from ..externals.funcsigs import signature:from funcsigs import signature:g' \
-		-i sklearn/utils/fixes.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}/doc" || die
-		local d="${BUILD_DIR}"/lib
-		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets || die
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${d}" \
-			emake html
-		rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
-	fi
-}
-
-python_test() {
-	# doc builds and runs tests
-	use doc && return
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	esetup.py \
-		install --root="${T}/test-${EPYTHON}" \
-		--no-compile ${SCIPY_FCONFIG}
-	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
-	nosetests -v sklearn --exe || die
-	popd > /dev/null
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	insinto /usr/share/doc/${PF}
-	use doc && doins -r doc/_build/html
-	use examples && doins -r examples
-	distutils-r1_python_install_all
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
deleted file mode 100644
index e8b01caac0bd..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
+++ /dev/null
@@ -1,117 +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 eutils multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas
-	doc? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
-	# use system joblib
-	rm -r sklearn/externals/joblib/* || die
-	echo "from joblib import *" > sklearn/externals/joblib/__init__.py
-	sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
-	sed -i -e 's/..externals.joblib/joblib/g' \
-		sklearn/decomposition/tests/test_sparse_pca.py \
-		sklearn/metrics/pairwise.py || die
-
-	rm sklearn/externals/funcsigs.py || die
-	rm sklearn/externals/odict.py || die
-	sed \
-		-e 's:from ..externals.funcsigs import signature:from funcsigs import signature:g' \
-		-i sklearn/utils/fixes.py || die
-
-	# use gentoo cblas infrastructure
-	epatch "${FILESDIR}"/${PN}-0.14.1-system-cblas.patch
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}/doc" || die
-		local d="${BUILD_DIR}"/lib
-		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets || die
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${d}" \
-			emake html
-		rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
-	fi
-}
-
-python_test() {
-	# doc builds and runs tests
-	use doc && return
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	esetup.py \
-		install --root="${T}/test-${EPYTHON}" \
-		--no-compile ${SCIPY_FCONFIG}
-	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
-	nosetests -v sklearn --exe || die
-	popd > /dev/null
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	use examples && EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
deleted file mode 100644
index 1a04525ec154..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas
-	doc? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}/${P}-system-cblas.patch" )
-
-python_prepare_all() {
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
-	# remove bundled cblas
-	rm -r sklearn/src || die
-
-	# use system joblib
-	rm -r sklearn/externals/joblib || die
-	sed -i -e '/joblib/d' sklearn/externals/setup.py || die
-	for f in sklearn/{*/,}*.py; do
-		sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
-			-e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
-	done
-
-	rm sklearn/externals/funcsigs.py || die
-	rm sklearn/externals/odict.py || die
-	for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
-		sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
-	done
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}/doc" || die
-		local d="${BUILD_DIR}"/lib
-		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets || die
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${d}" \
-			emake html
-		rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
-	fi
-}
-
-python_test() {
-	# doc builds and runs tests
-	use doc && return
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	esetup.py \
-		install --root="${T}/test-${EPYTHON}" \
-		--no-compile ${SCIPY_FCONFIG}
-	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
-	nosetests -v sklearn --exe || die
-	popd > /dev/null
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	insinto /usr/share/doc/${PF}
-	use doc && doins -r doc/_build/html
-	use examples && doins -r examples
-	distutils-r1_python_install_all
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
deleted file mode 100644
index 191789ac6c0f..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/blas
-	virtual/cblas
-	doc? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.18.1-system-cblas.patch" )
-
-python_prepare_all() {
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
-	# remove bundled cblas
-	rm -r sklearn/src || die
-
-	# use system joblib
-	rm -r sklearn/externals/joblib || die
-	sed -i -e '/joblib/d' sklearn/externals/setup.py || die
-	for f in sklearn/{*/,}*.py; do
-		sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
-			-e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
-	done
-
-	rm sklearn/externals/funcsigs.py || die
-	rm sklearn/externals/odict.py || die
-	for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
-		sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
-	done
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}/doc" || die
-		local d="${BUILD_DIR}"/lib
-		ln -s "${S}"/sklearn/datasets/{data,descr,images} \
-			"${d}"/sklearn/datasets || die
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${d}" \
-			emake html
-		rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
-	fi
-}
-
-python_test() {
-	# doc builds and runs tests
-	use doc && return
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	esetup.py \
-		install --root="${T}/test-${EPYTHON}" \
-		--no-compile ${SCIPY_FCONFIG}
-	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
-	nosetests -v sklearn --exe || die
-	popd > /dev/null
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	insinto /usr/share/doc/${PF}
-	use doc && doins -r doc/_build/html
-	use examples && doins -r examples
-	distutils-r1_python_install_all
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
index cc0019d518d8..991b1ca7d29e 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
index f6a48d144c7c..a7cda1c289c1 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
@@ -11,14 +11,13 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
+HOMEPAGE="http://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+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
@@ -44,7 +43,8 @@ DEPEND="
 
 S="${WORKDIR}/${MYP}"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch
+	"${FILESDIR}"/${PN}-0.20.2-fix-cdfast.patch )
 
 python_prepare_all() {
 	# bug #397605
@@ -56,7 +56,7 @@ python_prepare_all() {
 	export SCIPY_FCONFIG="config_fc --noopt --noarch"
 
 	# remove bundled cblas
-	rm -r sklearn/src || die
+	rm -rf sklearn/src || die "failed to remove bundled cblas"
 
 	# commented out, since it is a mess to maintain
 	# use system joblib
diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
index 854f19af4e33..a7cda1c289c1 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
@@ -11,14 +11,13 @@ MYPN="${PN/scikits_/scikit-}"
 MYP="${MYPN}-${PV}"
 
 DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
+HOMEPAGE="http://scikit-learn.org"
 SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
 
 # tried to unbundle virtual/python-funcsigs, funcsigs, odict
 # but it is a large mess to maintain
@@ -40,15 +39,12 @@ DEPEND="
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	virtual/blas:=
 	virtual/cblas:=
-	doc? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
 "
 
 S="${WORKDIR}/${MYP}"
 
-PATCHES=( "${FILESDIR}/${PN}-0.18.1-system-cblas.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch
+	"${FILESDIR}"/${PN}-0.20.2-fix-cdfast.patch )
 
 python_prepare_all() {
 	# bug #397605
@@ -60,7 +56,7 @@ python_prepare_all() {
 	export SCIPY_FCONFIG="config_fc --noopt --noarch"
 
 	# remove bundled cblas
-	rm -r sklearn/src || die
+	rm -rf sklearn/src || die "failed to remove bundled cblas"
 
 	# commented out, since it is a mess to maintain
 	# use system joblib
@@ -84,21 +80,6 @@ python_compile() {
 	distutils-r1_python_compile ${SCIPY_FCONFIG}
 }
 
-python_compile_all() {
-	if use doc; then
-		cd "${S}/doc" || die
-		local d="${BUILD_DIR}/lib"
-		ln -s \
-		   "${S}"/sklearn/datasets/{data,descr,images} \
-		   "${d}"/sklearn/datasets || die
-		VARTEXFONTS="${T}"/fonts \
-			MPLCONFIGDIR="${BUILD_DIR}" \
-			PYTHONPATH="${d}" \
-			emake html
-		rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
-	fi
-}
-
 python_test() {
 	# doc builds and runs tests
 	use doc && return
@@ -117,8 +98,10 @@ python_install() {
 
 python_install_all() {
 	find "${S}" -name \*LICENSE.txt -delete
-	insinto /usr/share/doc/${PF}
-	use doc && doins -r doc/_build/html
-	use examples && doins -r examples
 	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 }
diff --git a/sci-libs/scikits_optimization/Manifest b/sci-libs/scikits_optimization/Manifest
index c395d713a828..acbecf9e3a12 100644
--- a/sci-libs/scikits_optimization/Manifest
+++ b/sci-libs/scikits_optimization/Manifest
@@ -1,4 +1,4 @@
 DIST scikits.optimization-0.3.tar.gz 25297 BLAKE2B 1001ee772fb115e620f98547332f26f3876b38c9718e9f3c9a47e17863f2efbd6d9f6551da2340fda1ce612b385f757123bd32786764dcd3e287689313cac4ec SHA512 e8f33f4770d9b0514854e36127c53554823a159363c69d1ca0445a05ca9ebc55bc7105b35b2c615bfbef0c63a2b658d628befccb0ab09bcf98d91f8cb4d8be72
-EBUILD scikits_optimization-0.3-r1.ebuild 670 BLAKE2B f23b992a06db15ef1c2f3727197f153ce8a2f4a3eb3212aff542e25c385cbaaa91b175d5a60b4157f2b01da3a732dd35bfb2987e72243f6fd2e1e01cb483d142 SHA512 35902192f7f6437e3ee1d4c3cdc0bfeaaec6585002dff8a8d56b143cc8c23eb29b519b9a6aa54f3fdb95dda58d31670ef653bb2ab7a45b3d4cc7952d294375c6
+EBUILD scikits_optimization-0.3-r1.ebuild 668 BLAKE2B f62a9f76c1ce2daf74c1bbb9f680d1e5b2b67b0390e2a01d2d5f774a9d264df5572a11ae9ffae2ea831c8ab59247b636f84568286fc55bae9181b89a3bc437f2 SHA512 a9235a1f85a571fb35ed0146d77e8c8f1ee999aee80edd0552118c04a277ef16a318b8573bcf96975999a7e469c7c400221845d08c461fb46e082e09bf49adb8
 EBUILD scikits_optimization-0.3.ebuild 657 BLAKE2B 9fbf57298b6b2c4ada5656cdfb83af65df910b2222f31635d1bd208ff18e7993704cbb03ebd5c66379da43b6c35a59c61e55012fe7fdcfb1d965db16a3682cdf SHA512 cee7de81a15ecb2b9c6b08787ca5f8c04fe3732a6730263508c6af31d062c8fd7cd47745ed2b601254ee7a45e70de0c54f6f2e3834a9e8e3c6fac8107fc405e3
 MISC metadata.xml 441 BLAKE2B 503d22424542fd6a0f363f1a53c9f7fbd3945105ce8139e197266226b38464ce6b22b778d605ac502f9a990eb6e427a3333015c1c0e50b130e3299c17d867d9c SHA512 820c83082ab922e90874e753fee91b8d76d7bad211928dffc011d7ed44e11ca187d2d5fa75933defe673b7293770e6167148779fdfb28986c5784891d6843157
diff --git a/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild b/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild
index 119808a32f92..3dfd78dd6384 100644
--- a/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild
+++ b/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/sci-libs/scikits_timeseries/Manifest b/sci-libs/scikits_timeseries/Manifest
index 0ea447334704..43446f0e7e20 100644
--- a/sci-libs/scikits_timeseries/Manifest
+++ b/sci-libs/scikits_timeseries/Manifest
@@ -1,5 +1,5 @@
 DIST scikits.timeseries-0.91.3-html_docs.zip 907495 BLAKE2B e06c295bb4b093c2d7d5e767a8c03cb71e84ef3207790203c920ad9a9d57488f926c7a761ffb41fbc6829a9847327d40fa202776fa36fe473663066e41ecdee4 SHA512 9fb474e2a13dee865801fa5aa5f05bb74ea2387b7e14d716210898d9b338b63b7f1935f7a5514d72ffcd6f4a8552054094244fab199e18c819815d4b19cd3f23
 DIST scikits.timeseries-0.91.3.tar.gz 323771 BLAKE2B 74c14a1ec903dd02f8b3134867d4e371bac00d1a7b22de38962c3ca27afb603296b415e3ab2f21114b9c34890c24ea10379e5465d557778c6c794470235a311e SHA512 ea7292bf4d9bcce416b6f0e2c99fc40afe97a3a0210c535bd68f43a4a553d8a30cb77ce00f96ffc26340d5ff837faf5d480ea775385769495eccb5a196a88617
 EBUILD scikits_timeseries-0.91.3-r1.ebuild 1120 BLAKE2B 786204c02e544a40181b379465a04e77e81d661d26f21920e8d13923051a7c1958bd17a1930982ebe24054928c23bbb6ab4e58208dbad18c99da15308ddee7e6 SHA512 cb788db3f4233d299b101038f56f92c636a475532e6a343dc0dce8125bffc23dbbb0b8427ee43a78f457756efc47cdd4886100c5b7de4762a4e23cefc08246c7
-EBUILD scikits_timeseries-0.91.3-r2.ebuild 1133 BLAKE2B c4fc6118073aebf51e699d565c3235a2f33b5d4b10cbb60170056ede233a02b229a50cb16f1b1cda5cde50d06f1941c2966596b309060ff49d71fde40db91df0 SHA512 5487485fcee9b8220360359ffe2df21367d3169ec40b9e8efc0c8824373999ed4dbfb2d5f81401a13fa13530feb6b89fe6ae1ed3fb664c5a5127ac54372c7e81
+EBUILD scikits_timeseries-0.91.3-r2.ebuild 1131 BLAKE2B 5347a14ac976d2bdaf904f5c620be3f39d3464032e932eb7759b5dd83244a5ec8723b45e831a089431c7cedc5cc9e5322387757dda2b46c8d7eee8205209f8cb SHA512 0c45cbe34c455479a5ad61f8320218a88244bb4dcc5f26423de40291e4dfa633a117c21b5be7cf4c1498c326119c270d925f283491c00a513b1544dbb8f3290c
 MISC metadata.xml 673 BLAKE2B 432205d6049ba9bcc3355436a0017b30b66c0865afed8900e5f62846885050958ff193d2524fb9818141dca6cce2a912cf11cea4075a10abce4ed6bff3964f28 SHA512 1bd1de5dfc98873bf2df5d6fa42a02b5d4c0736d965b712909ccb991d8caff4fc71827bc292643a659566c64578e2a52a780ddec2eead4339d3481683b778d43
diff --git a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
index 7cbafda1d0b2..f67ebf2a2efc 100644
--- a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
+++ b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 01e6d4c771e3..33f5523b505e 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,25 +1,10 @@
-AUX scipy-0.12.0-blitz.patch 731 BLAKE2B 40c16b6db584f178b37a9b8ff6e15142d76f2c74b4e60543d1a8b2300ca10f4e0a9a7d27605c0bb58cecfa8bf6a1d6960956d906a04fc91ee6c3eb1d7d1147c9 SHA512 a788d08d34e13b02a0ec8127fd7918786cd26376ef5160f4acde585c6c1ac018a39652d9174b5e31173aa5c4e0c2f63101549de70806ea7ac56731abe3cb929c
-AUX scipy-0.12.0-restore-sys-argv.patch 483 BLAKE2B 14282423bcbe7838bcc5623b7e731048245207128109fad1f65ab1f3c750b324c0416149bbfe5f16935f6b5627ee82919167897def466e957092cb8e8cbf101b SHA512 7c439aa7e1e0ccc7444c2c091ef03d3d39f2999a33ef487224c78e74cd3a1b84bd18a9e92d84ab2cd3fc7578644beb3b667fdaacb20a239600cb9b1765eeb7fc
-AUX scipy-0.16.1-glibc-2.22-backport.patch 1125 BLAKE2B 912731b28945971c37b8708dbcbb9329d0a0ed310c005677f6c43ce3e64b0340bb0dd0b36e2ecd1895d385b658973caf4917d08d6590197c9316c73256337bff SHA512 50340cbea8ee6a41a1ed60650b56a3d11f450cf182ce86f3d007a4b08069b4b9a4dab7a45cd44a530b0475e6a1fadaad001c9ea32224c16540970a51ac62046a
-DIST scipy-0.16.1-html.zip 33158474 BLAKE2B dfeac8456ea328f293a28c379e3723f8a2fa2e5c47fc2771902083fb89764df9041f71c2ee656fc4c9a00017367f5e4726c798d309f8c2c50dd020c0fd93d168 SHA512 47b1ebd43b58ada7f4fd772e2a94c25d8ee2b03d808743ac386c7fbcc8a1daa3082906156ba421b1dd91ce2fb4f0114639ea124caac7522d919507029fee6c1a
-DIST scipy-0.16.1-ref.pdf 33916573 BLAKE2B 8bb2fbb592168c1233fa0e464cd8ded7ab05f4ab9b27ed54e45a71f1902ea4378ad6099cdbce633364372dfa6c0525f906cff7fab3d38d62f9d8c8b698d96fd9 SHA512 eaf7221c2dcb2cf0bcddcaf6064e52f3d1542edaf0238fa96ae62e27911b275a3bc7ee624fe655b0abd00055312f18582d49cafdccf339f7c38aa93ca5badea9
-DIST scipy-0.16.1.tar.gz 12221561 BLAKE2B 8181330d7e83c75ee3e3b88cdc7736fdedbf0eb410fc237a3aa0d45bc5919d79d2bec8876351dee9c331016371becf6a6a1a0b419e50739e717125334d5512bd SHA512 1761a943a0629179fd546fe3754b16101ca86b98eb0539b73614ea65bce24055ca898f295683eb3f3f63402ebbbb9248aa2a9f6a1d7d6cdf5e1e7486b15c1a8b
-DIST scipy-0.18.1-html.zip 32907714 BLAKE2B e1e32d4472f8bb3064e732689cdbe7055a441e7dea38a0fff37458e4530b841db969fdcad92967d9ee2bc37120ed7dae238365d566363ec6b86a188b6cb2a746 SHA512 fc61ce9a9dcc7091da29d35a42cc38074b0c4f5ff81d5ca5dea9c2d32e5e3ee1e8463fcb4e18c931c0c0e4f00410f8cd16d0f81c219fb326edc20d2286866e03
-DIST scipy-0.18.1-ref.pdf 14824115 BLAKE2B 94ecf2332925adba1f40fbf303a5ec6ecddfb5ab30d25f038945e6c2328cee2e5182f4a8214bd49e7f4cc5af2fa5d6e70b7f6248cbc7964ed38c5479914ce17f SHA512 e668420ae3668f459d15cb88765045c89df02f9c73854c8ddce8fe1611973e8c9d40ac49a1db0342282074b1d46b8156bb75430b7df079efd1c3a6ccb4bf2c37
-DIST scipy-0.18.1.tar.gz 13141689 BLAKE2B b761c2543e962eb04cc9c9651e6c95612e421393a2b3d519a52fbb3dd0f7583972004632429ddbe9ea007248908c937b26050a0579f45472978b2f3629a27c67 SHA512 f2ee21c808141d8002f69e48e7cf006e36982b1a7041323a8f4d803a1de3d191ffcc40227aac351dd876c28843de366ef89e9cf84dc106fadac86a3f40491659
-DIST scipy-0.19.1-html.zip 38201310 BLAKE2B 28ba5538ecfb1a8a6b7676a2b427a320d3fd6e76f591203d25451e4de8e2534ef3bfaee960322d427774459319da3098c70bf69b176641a75eb64e17a53d5690 SHA512 7eecef83a92aa99a726a8839e2cdac1171129ba0efcaf8e36b07d6714fde20cce9ce9f676be6b4835845930c49f740cb11ce0d93012d0b8c990e7061bb3afbcc
-DIST scipy-0.19.1-ref.pdf 17530855 BLAKE2B a0b0011ded7ee1f6bf9944b0c6d474581b64debb192277ebf142ebcc297f8e2f52412a4a8bfb7e618984c0c32233e2a6346d9795565276e08f00be5e782da04f SHA512 79718fde0aedb4c9906b37f2d75878719b614268160e645ad69ea797d6baeecaff9153884171906e6b7673b65da997ff4fd245e0f42ab766497ee9c96f4f9fd2
-DIST scipy-0.19.1.tar.gz 14083805 BLAKE2B 65369ffec2726a8e16da2d6852a71965277b8d4637316a375122e5b6cbf0e05cdcbd3304bcd14ca0b9b6677620a27c0fed6d4924eb8b1726c22ec0ec663feeac SHA512 5c124c44c672dcb53c31f8592fd9f74189f04cb0bade99476a2a6eb4844338e3e9842f27a148b007b7eed25cbfde090a697575a381ebe4ca066abdf54c214203
-DIST scipy-1.0.0-html.zip 47873725 BLAKE2B 0c6c1070e46e644c9e5700a116e700a0ce8d69c1cfaa0ae63ae34af8844db83a7b61c5d072c54bdc23ef7016440ec6d378a45965778c0e8078113bf1a54bade3 SHA512 15d5726ad527bbe3e3e1579d5d2f6031393a2eca8e27adc6f78b16697e9dd67633407a160f461d7a18a8b8bde83201ccf363cdda8f9ca3531b6d6ec1491e0f14
-DIST scipy-1.0.0-ref.pdf 31394378 BLAKE2B bc8e590509cfb4bfda9deab40bbc6ebc919e39cb03a5817040ad2e9bbdfd0acc1a1dc194a88ac890a9052b6ddb3bb7b39292d08d925e3d1eb310605ca0589450 SHA512 657ef3c643ab61a8452dd85982018eb2210cd1531edd152c9b1c3d8c722f8a45ab1efd03f5bbb3c763a75e70e6d39036a845869ec5135f2aa0445480a074f3e0
-DIST scipy-1.0.0.tar.gz 15246397 BLAKE2B 37cd50c59830c91f0516c72cf11b367670faf5c1fe3fd3cf37bc6f30a4b1f44f7b1d124ff7097c3dcb8c32c3876e166ab1caaa3991a637df5f61bb26b0f52c3f SHA512 7d55c5660ac606933d517171a229b288fd0ea8d9fdd8e30fac3d294545a26b2700c7b100b014a93231c4122dee0f1ddd741c00f5902643a6ccc287cdf581da7a
 DIST scipy-1.1.0-html.zip 49851258 BLAKE2B 528df7ed8aa8e56662f436f31ee9e1d6d72d6fe962f9f0f6f84b7a2704b53009ce333b2102ec73bb7795110f8a61b18246aab95b1e21055f2b68c0ff2225b7bb SHA512 a03894a22a67c1359ee6206e9e1c9de1f926a7f829f5039f161e78df735708da09b0e51cdad3bf36bfede701d0bc5dc44f8cc0f249b6bfb80c9d8c9fe23aed46
 DIST scipy-1.1.0-ref.pdf 34360806 BLAKE2B f82807879d5d36d91d74e8983a0f4104bcb4b69cb7787fe5190f73fbbfcb8635a9399686b3c75736d3b0b5dd877b5280ff6fba728520e3b47c13ffc7835f8cd6 SHA512 c792064c986dffafa3c5d0741f30715028e655761d099f0fdd472270cf34642b367dfa2178ddceba13043a471e3aeb1db20d65308dbb40c704dab576aaadeb3e
 DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404 SHA512 72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
-EBUILD scipy-0.16.1.ebuild 4271 BLAKE2B ef5b79005a1b1f5e113b5a17e022365106fec169406443065a415ec11ed5d9ce3acb3a18dd1c8c2a2459bbfd446dbfd1025b4e95efb6bd267ad2cff88f47689e SHA512 918c101d0cf1e48026877a2e2801650f6bf9c49e4a1a9f8fd80dde16ac2e2b19fb4fa3d2bd02146abf12d80a8f016e63cf61f8c87359af6cda5262d070fc5b4a
-EBUILD scipy-0.18.1.ebuild 4276 BLAKE2B 8e29bb1a2303220a6741c6d9b77092a367db93585e779f5148b99f3ed9f49f593beda75a4d34f0c4e39749b8be3af199c699c7b28e8e41972974f4f86a9be9db SHA512 65dff5ace5a22c49a214c2cf03971d7882eab86ccac6a3dd4431a6c54acb60d7336004f37897fa2afcc2b47d21791f883f718cef1ba25ae1d2bbc3056554ea30
-EBUILD scipy-0.19.1.ebuild 4271 BLAKE2B 32051e4653b12a7ca2080d4e9eb4c9f8a4f7d59c7f7d315ff439961387723408f8040b684e629b85cc8677000bb1a5b785ca3e2a1e0d0d7fe85a988aafb09d8c SHA512 c73bb1fc086d22b3140d6dfca7a87741fe64f7980ee22688dbe17591fb9e750ddbb5d379941736e4b34e2955b17c8f2876f759c88cb8e2878e1424242548fa2c
-EBUILD scipy-1.0.0.ebuild 4055 BLAKE2B c123e4283168cfd418a72e1e522c600f74b3edc4ae4fdbb225658e5954289e41dd81fde958350184cdeeda75885bead1ea2db43551a42f0a8a077b0bc5ed3650 SHA512 5f9fcb9617369438dc24f5f1420cf26ad22e8a6d6c726de48d19e74da7b3f25c5ecafed8ecc7737b43293ad1c8bdfbbed488ab8459c26787debcc15495a54726
-EBUILD scipy-1.1.0.ebuild 4053 BLAKE2B 26969658226408225eaccc15beb8e72d4add4843345de771f99b7bd5833f467829e84f941848c0ccc5263cc12b234b4fdd02189964e9f006fddc5a14f3737121 SHA512 bbd1cfea32986d6a82a19d936c059d6eb2fe8c36929c60eb5a1298528c12d19171b0c0539cf1ab19d58eaee40a01a2ab0108cd1639ce4dedce7de3782f0f6f8d
-EBUILD scipy-9999.ebuild 3639 BLAKE2B 2afb487266a2d0908da8e9d5e35b2dd4d1923a23eadb478ffaaa3dd29074ade54321ef08bb64c618c8e03f66f46de1be170de03a524b00b7493a20804b45154d SHA512 dfffe88f6670fde4a2a14e3002c146c07ec1fdb84a4cc5bb3317c4c221d4441281ba361b59d9888424b6980180958053796aa1ae5368864f9d45b97adea0a8d0
+DIST scipy-1.4.1-html.zip 61414053 BLAKE2B e1f0c1a7a8941958512dcc3c0f40ef4a590bab0b44b33f842bc6e1c5d103c17f223d8b0a2f4e564f57645d601d4d74005c1ec605be2dd3bf4db19d2ac1f614d1 SHA512 9eeae83cd723d63aa1dc7a610ce3118cb68a2336be24cbfeaa8e57b34de413b2efa2fdad0978eb5bdac0ebca6b15f564b9509637efbd87d1007c969ae954e3ae
+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-9999.ebuild 3601 BLAKE2B 3a86b12c2989b9e64ff97119fbb6cea242179287362010f7d3e82ad0298c207a6318217f81626d18549252383a04cc107861b0283420eae2c1ce990fb7252f18 SHA512 3128f47231149e78818440f2ade24d4ca5c51f8e4a89c93e3e4da2fb2303e60a50f2f65b3c5bc32b42ebd0bd25c77cbb7017f2750367eaf7a21ffd3adcef947a
 MISC metadata.xml 931 BLAKE2B 3e358fcc4354b870a4794f13ed6c840f2c55ffdf4d6306977e6db3606b73e7df9b682a18973f0aa2a1d0d9eabb2d7d40c6aa5c6026813385361700bdc227afd8 SHA512 ae95726c4c661a2e5708a98b347f8ea25708574bbaf8ec86f315069551d6a0d68a43279b214be8b54cd20e5aacea1a9abd40a2de43d51f292a830cab0955d625
diff --git a/sci-libs/scipy/files/scipy-0.12.0-blitz.patch b/sci-libs/scipy/files/scipy-0.12.0-blitz.patch
deleted file mode 100644
index 2817aa39b871..000000000000
--- a/sci-libs/scipy/files/scipy-0.12.0-blitz.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fixes scipy.weave.inline compalition with g++ 4.3 and upwards
-Author: Sameer Morar <smorar@gmail.com>
-Forwarded: http://projects.scipy.org/scipy/scipy/ticket/739
-Bug-Debian: http://bugs.debian.org/598520
-Bug-Ubuntu: https://launchpad.net/bugs/302649
-
---- a/scipy/weave/blitz/blitz/blitz.h
-+++ b/scipy/weave/blitz/blitz/blitz.h
-@@ -65,6 +65,8 @@
- 
- #define BZ_THROW                     // Needed in <blitz/numinquire.h>
- 
-+#include <cstdlib>
-+
- BZ_NAMESPACE(blitz)
- 
- #ifdef BZ_HAVE_STD
---- a/scipy/weave/blitz/blitz/prettyprint.h
-+++ b/scipy/weave/blitz/blitz/prettyprint.h
-@@ -22,6 +22,8 @@
- #ifndef BZ_PRETTYPRINT_H
- #define BZ_PRETTYPRINT_H
- 
-+#include <cstdlib>
-+
- BZ_NAMESPACE(blitz)
- 
- class prettyPrintFormat {
diff --git a/sci-libs/scipy/files/scipy-0.12.0-restore-sys-argv.patch b/sci-libs/scipy/files/scipy-0.12.0-restore-sys-argv.patch
deleted file mode 100644
index 3eef739f93a8..000000000000
--- a/sci-libs/scipy/files/scipy-0.12.0-restore-sys-argv.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: restore sys.argv in case of exception
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=500814
-
---- a/scipy/weave/build_tools.py
-+++ b/scipy/weave/build_tools.py
-@@ -283,6 +283,9 @@ def build_extension(module_path,compiler
-         configure_python_path(build_dir)
-     except SyntaxError: #TypeError:
-         success = 0
-+    except Exception, e:
-+        restore_sys_argv()
-+        raise e
- 
-     # restore argv after our trick...
-     restore_sys_argv()
diff --git a/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch b/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch
deleted file mode 100644
index 791d67f32531..000000000000
--- a/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1f5ccd5447ed2796bb8e9506cfbfdb4a82cccfc0 Mon Sep 17 00:00:00 2001
-From: Ralf Gommers <ralf.gommers@gmail.com>
-Date: Sat, 24 Oct 2015 18:17:04 +0200
-Subject: [PATCH] TST: fix issue with a ctypes test for integrate on Fedora. 
- Closes gh-5370
-
----
- scipy/integrate/tests/test_quadpack.py | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/scipy/integrate/tests/test_quadpack.py b/scipy/integrate/tests/test_quadpack.py
-index c3a417c..f384c77 100644
---- a/scipy/integrate/tests/test_quadpack.py
-+++ b/scipy/integrate/tests/test_quadpack.py
-@@ -42,7 +42,14 @@ def setUp(self):
-             file = 'libm.dylib'
-         else:
-             file = 'libm.so'
--        self.lib = ctypes.CDLL(file)
-+
-+        try:
-+            self.lib = ctypes.CDLL(file)
-+        except OSError:
-+            # This test doesn't work on some Linux platforms (Fedora for
-+            # example) that put an ld script in libm.so - see gh-5370
-+            self.skipTest("Ctypes can't import libm.so")
-+
-         restype = ctypes.c_double
-         argtypes = (ctypes.c_double,)
-         for name in ['sin', 'cos', 'tan']:
diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild b/sci-libs/scipy/scipy-0.16.1.ebuild
deleted file mode 100644
index f105dde30c6c..000000000000
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-DOC_PV=${PV}
-
-inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc sparse test"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	>=dev-python/numpy-1.6.2[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}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )
-	"
-
-RDEPEND="${CDEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
-	fi
-}
-
-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
-		[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
-
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-0.12.0-blitz.patch
-		"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-		"${FILESDIR}"/${P}-glibc-2.22-backport.patch
-	)
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	${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
-	# https://github.com/scipy/scipy/issues/5426
-	"${EPYTHON}" -c \
-		"import scipy, sys; r = scipy.test('fast', verbose=2, raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \
-		|| die "Tests fail with ${EPYTHON}"
-#	"${EPYTHON}" -c \
-#		"import scipy, sys; r = scipy.test('fast',verbose=2); sys.exit(0 if r.wasSuccessful() else 1)" \
-#		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf
-		docinto html
-		dodoc -r "${WORKDIR}"/html/.
-	fi
-	distutils-r1_python_install_all
-}
-
-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/scipy-0.18.1.ebuild b/sci-libs/scipy/scipy-0.18.1.ebuild
deleted file mode 100644
index 13d5afa657e8..000000000000
--- a/sci-libs/scipy/scipy-0.18.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-DOC_PV=${PV}
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc sparse test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	>=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}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND="${CDEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.0-blitz.patch
-	"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
-	fi
-}
-
-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() {
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
-		${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
-	# https://github.com/scipy/scipy/issues/5426
-	"${EPYTHON}" -c \
-		"import scipy, sys; r = scipy.test('fast', verbose=2, raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \
-		|| die "Tests fail with ${EPYTHON}"
-#	"${EPYTHON}" -c \
-#		"import scipy, sys; r = scipy.test('fast',verbose=2); sys.exit(0 if r.wasSuccessful() else 1)" \
-#		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	distutils-r1_python_install_all
-}
-
-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/scipy-0.19.1.ebuild b/sci-libs/scipy/scipy-0.19.1.ebuild
deleted file mode 100644
index a17473acc3d5..000000000000
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-DOC_PV=${PV}
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc sparse test"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	>=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
-	doc? ( app-arch/unzip )
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND="${CDEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
-	fi
-}
-
-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
-	# $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
-	${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
-	# https://github.com/scipy/scipy/issues/5426
-	"${EPYTHON}" -c \
-		"import scipy, sys; r = scipy.test('fast', verbose=2, raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \
-		|| die "Tests fail with ${EPYTHON}"
-#	"${EPYTHON}" -c \
-#		"import scipy, sys; r = scipy.test('fast',verbose=2); sys.exit(0 if r.wasSuccessful() else 1)" \
-#		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	distutils-r1_python_install_all
-}
-
-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/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
index acbf180275f3..a676281fbac9 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
@@ -107,7 +107,6 @@ python_prepare_all() {
 
 python_compile() {
 	# FIXME: parallel python building fails, bug #614464
-	# $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
 		${SCIPY_FCONFIG}
diff --git a/sci-libs/scipy/scipy-1.0.0.ebuild b/sci-libs/scipy/scipy-1.4.1.ebuild
index 830587f79c37..a9e7e584875f 100644
--- a/sci-libs/scipy/scipy-1.0.0.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
@@ -33,8 +33,9 @@ CDEPEND="
 	sparse? ( sci-libs/umfpack:0= )"
 DEPEND="${CDEPEND}
 	dev-lang/swig
-	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? ( app-arch/unzip )
 	test? (
@@ -107,7 +108,6 @@ python_prepare_all() {
 
 python_compile() {
 	# FIXME: parallel python building fails, bug #614464
-	# $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
 		${SCIPY_FCONFIG}
@@ -134,6 +134,7 @@ python_install_all() {
 
 python_install() {
 	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
 }
 
 pkg_postinst() {
diff --git a/sci-libs/scipy/scipy-9999.ebuild b/sci-libs/scipy/scipy-9999.ebuild
index 0e528a35be0e..574e02209628 100644
--- a/sci-libs/scipy/scipy-9999.ebuild
+++ b/sci-libs/scipy/scipy-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
@@ -93,7 +93,7 @@ python_prepare_all() {
 python_compile() {
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
-		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+		"-j $(makeopts_jobs)" \
 		${SCIPY_FCONFIG}
 }
 
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 67e95197b10f..d2e40b447170 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -8,6 +8,6 @@ DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5c
 EBUILD scotch-5.1.12b.ebuild 4446 BLAKE2B 6c02eb7b272e22e2c62e95daf9a99745420a69233d0b95bc9479556ba08b6cdc36339272a0cd16eec51934125c3f50afa9873a5a03b21fbd63a87592889726bd SHA512 8020ca4ed7709607e1bc9f4cf21b96efd03ad413912304d70bde02606b1c2cba6abcb6e3a14ae0ff59c19ab82a40efb02567bafe1bce53d0e39d192f3aff1dbb
 EBUILD scotch-6.0.0.ebuild 4628 BLAKE2B ebc43748190e1da73de26e45ef1d43c314eb6e267c36dc5eb803dd3d3654b568c3136fa557c4ec5c370b849e2d89983c09b55c9921550fc5e71016ad9076c818 SHA512 f7f348526f0ae65c3154e432cef738131b9b6d1cb8cba66bc3dfc25cbfe5138c0cd05b0f0a20fa2f572c7d92532ad3d5e90db574ff13b28c1980eb6b041ae1f3
 EBUILD scotch-6.0.4-r1.ebuild 4824 BLAKE2B c49f659384cfece6fe15ea4476cc5e5c1194f3bbc3ac205eab9eddb54a9480e972868c602b5a74d9c0e921910b4442e9055744760f4d0f6520dbd4703aa175b7 SHA512 71110eb916825346450636f7f78a84032dd1a51405654ad50c77e4b717f9bc71c55f6a3f3a7d874ae23fadddbd2c8e3e3a2b8706c895da7eacbac00da9e068ab
-EBUILD scotch-6.0.4-r2.ebuild 4915 BLAKE2B 5afba7f9cec8b50004a7b699790e53c946e97f2e36f014ac3ea10b0dfd4c9bd42243a49a2f81a0fcda470546f99ff29ba5a6bf815ecec76952cf37ce43aed1f9 SHA512 e92fb4b3f6634e582754b4b393fb31090358d4775281f3e414918ba6d3b121c42050285710fa0bd994362cbf35786f2a37c0a61b5e632d4ab5187d65e970724b
+EBUILD scotch-6.0.4-r2.ebuild 4910 BLAKE2B b71de7fd6f6471efe2dbd3037d78aaeb5e6dcda6b1e529014335eebf5714775a79dc4a342e1793042f5e82c2ad181546a2a8a74c067ecec86d1f65e0ea7126e3 SHA512 9909700133b6c8a5ef4094066b19c69fe85a07f413dd0e970f9016567aa161a1963f453cd11aa0e96c1f569b2681aa498cac6b5469a05cff3f614d8b4123412d
 EBUILD scotch-6.0.4.ebuild 4628 BLAKE2B ea17389d6ee48c40ebb66064ed478886cc94b237e806d458f323f2d2a9c8333552256ae4bc25b492ef9b828c5f8c3cceba67fb4ef48b2a1d02497b51864869ef SHA512 0dd2f53982da1fc085f4cca6be9c0ca2c7b0c98548171ed3ad1bb2159389ebd55c6654d95372f47709c108aa7258c291f5f3e23e9e5054a5ebe0b16316fbe14e
 MISC metadata.xml 1199 BLAKE2B c5d721a43a47c20cf10d18bf0f9e1a2db04a2473bf772d6b64a8360a897ddfea8904b0bb65443fbf0738a4580d867477d9b58f8e720c8bd39933d461bd744b85 SHA512 78345510290afd5d47a88595c3d2b07cbdb6f99d1341c6433095750bd27bb0f81fbe5e98cb6ffd23b5c8c2e0a346d1a2f25b5bf2f83093dff471906fdadc4eee
diff --git a/sci-libs/scotch/scotch-6.0.4-r2.ebuild b/sci-libs/scotch/scotch-6.0.4-r2.ebuild
index 73a32f6d207d..9f16ee0554d2 100644
--- a/sci-libs/scotch/scotch-6.0.4-r2.ebuild
+++ b/sci-libs/scotch/scotch-6.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-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 int64 mpi static-libs tools threads"
 
 DEPEND="
diff --git a/sci-libs/shogun/Manifest b/sci-libs/shogun/Manifest
index 3d30417f69d4..7cee43439a10 100644
--- a/sci-libs/shogun/Manifest
+++ b/sci-libs/shogun/Manifest
@@ -2,5 +2,5 @@ AUX shogun-4.1.0-remove-C-linkage.patch 825 BLAKE2B c95a7a322b669aa51a9a33470088
 AUX shogun-5.0.0-fix-buildsystem.patch 2889 BLAKE2B 63593dcf5f077310c31983446d5060c15c23d45d3eb5e3780c0d7a53074ccef57da79fb115ce67b109ed94f2e58aa1e5804bdbd1d0d0a13c05de716de7ed1058 SHA512 3119a95e8fe76804eb113361e09260bbb951679faeb3360d378c0a9afcdbf322ac75f02da6e4c799102949abbd97006f2bbb7550b5f5b01fa8b4335ac530f377
 DIST shogun-5.0.0.tar.bz2 2448509 BLAKE2B 85352d782740b4c671bb6081e0445bb7e801e27e36fdc0f82658b937fd6658c41016e4a91841ddb09ae9062b77d32f290f56b191318c1c34bf0812d1b9a8b364 SHA512 fa8d9dee4596acce12022540a6927cbdb62e08f8468c8be3790de07ebf3a53055032bcc532b28334ca83284c38f2b0153602634f12bafe4019acb9121b9ff236
 DIST shogun-data-0.9.tar.bz2 287533841 BLAKE2B 796830262205961b88715f4eb60a47ff2ad108426b7af8e4e1a0733920962ad8154a1ab9892356e9793be24d415fcbc358960210f089a0173f55a0091ea3c0d1 SHA512 ab501640e2db650603899c857866b451fac5c7bbbc7b4ef98559581928869cea49aa326dfca1bb398eee7ebc8843dcc8ee3105c9f462718f1af672aac6b9340a
-EBUILD shogun-5.0.0.ebuild 3886 BLAKE2B 3bcfcaa44d2f2ddef9f36230fe103cf61f59ebe01797be7681d705c0307839c3f7edcd7369e2f2e5286c335f7824a2865c13594f2443b13c40a87df632953022 SHA512 97ddb219a18dee648569072fc4cfeac7dbfd9027e0bd8890a6d61c6385aff990a55f6015ffdbaea26c03da3420bfb99e149e9fab1058c3ee04c56b49fe6a2e28
+EBUILD shogun-5.0.0.ebuild 3882 BLAKE2B ebf718e3ef0dd9faedd09f38e2974cb163c6f772b9676362b35e9aed4af4301b10aaf63fafcab12732d30659aadb41944d0fb5ebca307935ec51701c57930e90 SHA512 c60bfb0cea35340e05c210b905cc5bb16ce887ac9b932fd0b8d5a8fc93456886ebbeafb4540110d1f53a849b40ad204ff79e40123f2b94c343b51e4f65be4524
 MISC metadata.xml 1627 BLAKE2B 871fc71cd8ae67ef94fa060b50f249b233333ec934db4d8ad238f24408e491f071d1271903f57ad2548923b2091c0f2738a7ce3f269d5c24fd10300aaf179047 SHA512 babaf4f8a5d4a7d83e678d2ba1cb4f29a15a928740e7c2b312fe03ffd2c909f1f867a071573954269a03bd8f915f38f82c4c11782573ae08be6ec053cf3b54c6
diff --git a/sci-libs/shogun/shogun-5.0.0.ebuild b/sci-libs/shogun/shogun-5.0.0.ebuild
index 870ef09e18ec..82a612f37075 100644
--- a/sci-libs/shogun/shogun-5.0.0.ebuild
+++ b/sci-libs/shogun/shogun-5.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit cmake-utils flag-o-matic python-single-r1 toolchain-funcs versionator
 
diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
index da40354cecbc..9ce8f95dfc26 100644
--- a/sci-libs/silo/Manifest
+++ b/sci-libs/silo/Manifest
@@ -4,4 +4,4 @@ AUX silo-4.10.2-qtlibs.patch 4320 BLAKE2B 34fbff942d4caa73bf18302873ba4dc63de063
 AUX silo-4.10.2-tests.patch 562 BLAKE2B 27a15c9b6561101610774fd5f69b3bde7c0bca13943f37792562a0af66924566852ff67d5eee208bfcf1dd7790be602809c552a3f5a3b98cfc971aa1e90fd560 SHA512 c54c9cd7934f94e572302c8afabf20b4bfe84c34e602afe37fde2c0953598c5c91cb5a9351669da2dd44226cf269a4d762a38af5a23896677d8260cfcff032f3
 DIST silo-4.10.2.tar.gz 13135900 BLAKE2B 6326a42df43c4bb6936522d1730db8ce45c6b74779cf37b7a5a0b7a72def9e9a4f174b68392adbda59936113ccac4ae5e7bf7266effb364eac7e5d0cff8bb37c SHA512 8cd1340ed641c8be77f310b286da344e2fed7ae469ed7bebf5deebaa1a369ca91c283b38eae2c57b7ad046f65343cfaa56a1c07b6c8b07b79aad69c4e5617f6e
 EBUILD silo-4.10.2-r1.ebuild 1204 BLAKE2B 93651449b6d7958d95ea14fcb6e3dc5cb13e9661e667fdf3357fdf011193c7f966645f5088bc0deea7ab20d4412260951a46a95694f45c75aaf79fcf9e05633e SHA512 9b7b838d03ca4e6eebcfa5c26655295e5b30e1aa3b2cc216749c7d5ceab4f7c3632778bb1b0863304b29c51b0dad54715f3195acdf2910964d7b24df8a328d39
-MISC metadata.xml 751 BLAKE2B 15f217d9eeeedb7889e47a18d81715f674156e59aef6901ec3873a731484a645a74c1840d2b41e1ca53d0247b43c5f401353b86e419f74f0aeb965146a53b9c1 SHA512 be9db7766bd0e0ea6c5f7f4505ee48ab6ea8b7da1ccc78ab68868072d15d068dab3f6eeeb53cf5cd348da92d52e32d8ad363798de55cd4a79fb1c19ad8456f5e
+MISC metadata.xml 673 BLAKE2B 639f90056f17af577124146182274dd3ca2b5daa1bccb323f24f299d7a2ab1960507d38d11b9f46f4af3031910d3760580cc529abd55f329ef1b8510d1f7ae69 SHA512 ff637cc90c5e7704f5290ad89909c65a9c6c2c1d8e21dae3e8118ea0e226f31df1d925d006ef751599aaca346c3f9841c7db23f00ea6cc14aefe3915d5bfd4cb
diff --git a/sci-libs/silo/metadata.xml b/sci-libs/silo/metadata.xml
index 6c626818da20..0e901aa81b1a 100644
--- a/sci-libs/silo/metadata.xml
+++ b/sci-libs/silo/metadata.xml
@@ -11,10 +11,7 @@
   <use>
     <flag name="silex">Build silex data browser</flag>
   </use>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index e1de506801e1..d200297435bf 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,10 +1,13 @@
 AUX sundials-3.2.1-fix-license-install-path.patch 335 BLAKE2B ac9a2c33fabf13cb55876f39836006b1b145395311800bd052f5e0784b7926fab4ffd4abf2bb0047d69fbd5feccdec026bf7f7c115fb4f130c8419c6e8986dcb SHA512 7ac45a8932a273330fcf6fecb355cbbcf83038240fd06db6e20eb54a51a137266d033c7fe513f73b72e252509b0105d4de48fffedb4adff2ce8e5187e26b7ac3
 AUX sundials-4.0.2-fix-license-install-path.patch 479 BLAKE2B d77b43b2d30978dce198f51917286b208cc1baccb4230a2eaf9f1e656a23e1b1980bf7c86a4a4bd16a5210b16083aec4e05b316af5a42f6a64631a843d79f7f9 SHA512 99baa802dd367159a82c57997421aad938b52babf3c2444957f46fe9affcd57e9524a6ef0fecdf3ef973e95a032f3dec37487794e397e45db515db01af2893dd
 AUX sundials-4.1.0-fix-license-install-path.patch 479 BLAKE2B c87cf483663f970aba2352e6831fcce7ead9ec7ce3c9a8e451e47481b0c663d698df98ffc62bbc9b6e6117188fcf1272a491b9df1a77d4acadf0625dbcdf2d26 SHA512 a8fa64f8d16e09b86b08910b395f17f2bfdcd82667b789a85bef87591ecdb9b0f01630f9dd65e7892f36261d3ef42ce12c95e980be29669dd74cc6469bd4ea87
+AUX sundials-5.0.0-fix-license-install-path.patch 434 BLAKE2B 29fbdab95a77d983eb95753202ef39f1bbeb0ff25fe6c7ddfef8fae340e8ea958bdc45ee4230f0e42218884bb8f04f9167d94d04ba8e14c77824242a4026332d SHA512 dba0893329c769eb90e03e9c6c2aa84ecd8554640979b0145cc75ba8facea1bba1d645a7876ff1975170df507653d501099a831688f0c8b7422ab69fd29eafc2
 DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
 DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794bf99d6c6a108bfa2bd5615f27f32f7ab6ca4989802fa052d3132b53dca3069b7e4ec9941f95efb92de7bf0792dd88 SHA512 6d0a6fc49c695e70593da71892f0906585dee9c94899bb6b8c9a56c85f345809565166a62544647fdac411d22e37276b9b1bb78ba9be46eaeb28dcd3f6162ef5
 DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad907d053cb67ee0d3b076076621958374eb847e48318ddf7ced85a7601c5330ac640c7abe8723aaee7d650e3298b8d SHA512 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
-EBUILD sundials-3.2.1.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
+DIST sundials-5.0.0.tar.gz 18820465 BLAKE2B 77bc7bd489b52ff316f3e889aad4ec27830c42650591270443d45a0aa958d06663e93931a8933ca2d228619263219be4d7441cb473eaaedeab958ae47418a44e SHA512 4962adabcde19207b5044d1e63758d58b5d3cfeefcd0eae65ddfe5499931bf19fa98bafbd4742045cc255f6b4a45653f41df7a7739f86d6eb47c79c9312b4471
+EBUILD sundials-3.2.1.ebuild 2053 BLAKE2B 5bb930c92705f0b30ef23379da27379c16e19d6ff58239d6da988cdd1463b64757313c6bb2f569229ffd98d979a863c8257e71dcd3696c108bb4e3dd992a4c12 SHA512 fd8f7a523d855d38d132b054d4b6fb6addb7e5f8266bf0eaf932a91cff1200ff4c665a3dafb5ea73d05989eef376b29f145c385cef426ac8e4c847231ce3e668
 EBUILD sundials-4.0.2.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
 EBUILD sundials-4.1.0.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
+EBUILD sundials-5.0.0.ebuild 1990 BLAKE2B 52ab23123248a3bc590ce5dea0bc0583bf3cd0b5587e8cbcda392a5f5b14b6229f88a247d3e2889cf8351e7f41290a09be1186857ebffaa31a3a513534d6994d SHA512 f1788b29f519eb1af18c2e2409e14bbce54e96b69144d9267840b9a9678c4fb6039dd44f03af987fb207498e23d631b4f689de0427bb77e8ef0eae6fdc360bdd
 MISC metadata.xml 1059 BLAKE2B 48ccadfac9b7ea4203334ffdadaa76ab3164273835c727e76085db3a5afc179404eb21c74aad77ceb368397377afb0efa27d798c849eab2ffc35153cd4fe7588 SHA512 47da8b9edc993c480a045642ad2746ff6180e54e1ad368823fd81b0d217e72c31394d7575cb4c2d5e5cfea065dffb01751bc8b1088f0f1a6feaaea15c2c7fb8f
diff --git a/sci-libs/sundials/files/sundials-5.0.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.0.0-fix-license-install-path.patch
new file mode 100644
index 000000000000..5de76573630a
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-5.0.0-fix-license-install-path.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d5436bf..76b27c5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1122,9 +1122,9 @@ endif()
+ # install license and notice files
+ install(
+   FILES ${PROJECT_SOURCE_DIR}/LICENSE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-5.0.0
+   )
+ install(
+   FILES ${PROJECT_SOURCE_DIR}/NOTICE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-5.0.0
+   )
diff --git a/sci-libs/sundials/sundials-3.2.1.ebuild b/sci-libs/sundials/sundials-3.2.1.ebuild
index 54f396b21f78..18dd6bbaa8d4 100644
--- a/sci-libs/sundials/sundials-3.2.1.ebuild
+++ b/sci-libs/sundials/sundials-3.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
@@ -15,7 +15,7 @@ SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
 REQUIRED_USE="hypre? ( mpi )"
 
diff --git a/sci-libs/sundials/sundials-5.0.0.ebuild b/sci-libs/sundials/sundials-5.0.0.ebuild
new file mode 100644
index 000000000000..9505cbb40bfd
--- /dev/null
+++ b/sci-libs/sundials/sundials-5.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit cmake-utils toolchain-funcs fortran-2
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
+REQUIRED_USE="hypre? ( mpi )"
+
+RDEPEND="
+	lapack? ( virtual/lapack )
+	mpi? ( virtual/mpi sci-libs/hypre:= )
+	sparse? ( sci-libs/klu:= )
+	superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+		ewarn "OpenMP is not available in your current selected gcc"
+		die "need openmp capable gcc"
+	fi
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS="$(usex static-libs)"
+		-DCXX_ENABLE="$(usex cxx)"
+		-DFCMIX_ENABLE="$(usex fortran)"
+		-DF90_ENABLE="$(usex fortran)"
+		-DHYPRE_ENABLE="$(usex hypre)"
+		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+		-DKLU_ENABLE="$(usex sparse)"
+		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
+		-DLAPACK_ENABLE="$(usex lapack)"
+		-DMPI_ENABLE="$(usex mpi)"
+		-DOPENMP_ENABLE="$(usex openmp)"
+		-DPTHREAD_ENABLE="$(usex threads)"
+		-DSUPERLUMT_ENABLE="$(usex superlumt)"
+		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
+		-DEXAMPLES_ENABLE="$(usex examples)"
+		-DEXAMPLES_INSTALL=ON
+		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+		-DUSE_GENERIC_MATH=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc doc/*/*.pdf
+}
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index 00f97a74d821..0effcb6ed9c6 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -4,6 +4,6 @@ AUX superlu-5.2.1-no-implicits.patch 4950 BLAKE2B 32a01cb343e21ee870fdfec54f3e52
 AUX superlu-5.2.1-pkgconfig.patch 1013 BLAKE2B a36aac6c06fa8cb4bd3d19fcc74b27c092283b209665cb4dc5d3336f4b025f5145a190e76105b5e96f846e02fd4fe43a71b9542937beefe5e8b375b54ad87e05 SHA512 f22dcbaaa6857008b75b8c6481b219b11c09ebcfe2dffe0a4d4f0cba6392f18fc9a5a870b2a8efa7c31df321b78186cbde7cf8739da59dc089fa3b6ae836bf36
 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c
 DIST superlu_5.2.1.tar.gz 2560875 BLAKE2B b1dd51bddb55061f5756f3cf766f80e506f7cc12b272c2ceebbae71cab9314000308b72cf265d5948ed69c68d0ad0adeb938a4471250147b0fcfdc2b80298db7 SHA512 30538b4c2809294b8f34646bce6445944f21a1dffaf3ec0a0f29a55d5261caa56e4279d7722bb95cc9d89450d36ded969617edc82ecce7d0f1dfb24040d80d07
-EBUILD superlu-4.3-r1.ebuild 1650 BLAKE2B f154d6d232899f83049a9eebcac275d629954cb649f1999c0fe3802f690b779bde91a308ee07c66a45b2d7190ec9608ac8cd1545b7504aac46249ac6e614046b SHA512 3d4ad886cd5ea2102dfccdd48960a21ae94b877cb185bec6be43a022b084934c58edfe257957dd5306eb5007bf221904a991458c2f9db41ba2aa1b749e564cfc
+EBUILD superlu-4.3-r1.ebuild 1681 BLAKE2B 40e40634bfa2568bde5414cf45a14eab8855a56daf67edff1805b6d0a45f469f7f638bf74c4989f74130ca289c8f15ecf57f3b84bd67c8033b348666f547434f SHA512 5a0dbf2084165f19cb2e7c133715b236b6f5655870f5aad0dd39af771e96a9c68ae178c8eb56ffeb19aa70104ed37ba61fb84e3cd08dc9a9d10fbf9823a03313
 EBUILD superlu-5.2.1-r1.ebuild 1528 BLAKE2B f5da9af1ae76566415e0df6d5ec814bacd79639f073f6c6fa881957033affb589360bf26e035e07073dca4eaedb76b60368961308c0a97018a0be98e330477e0 SHA512 3b0a798b47be26a58e4a296895206623389c9ed5f4fca43b0582b75e5dfa0707734403d7a6b96ca448b13dbf793259f3015920c431e923dab59bce442e3db769
 MISC metadata.xml 1404 BLAKE2B 3ab566d18d18307d9fc7dea889e492e19b76aa9fdebe0dce86b46b1cf7a2d53f65404f56da04cc8420e6a7c21867b948e537833693cb60521746c5a48f16bc6b SHA512 8b758572ed599bdf43898050e265ce8ea82c4952af97471c09ee0013e56cf6928df3f3a436516c4fae7a38a13bba4a3437e130f294f942eaaae05125fa5fbdea
diff --git a/sci-libs/superlu/superlu-4.3-r1.ebuild b/sci-libs/superlu/superlu-4.3-r1.ebuild
index a6ce49cd482d..2dbb631e4cfc 100644
--- a/sci-libs/superlu/superlu-4.3-r1.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r1.ebuild
@@ -12,7 +12,7 @@ MY_PN=SuperLU
 
 DESCRIPTION="Sparse LU factorization library"
 HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
-SRC_URI="${HOMEPAGE}/${PN}_${PV}.tar.gz"
+SRC_URI="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-libs/superlu_mt/Manifest b/sci-libs/superlu_mt/Manifest
index f1259e44d6ae..a2195146496d 100644
--- a/sci-libs/superlu_mt/Manifest
+++ b/sci-libs/superlu_mt/Manifest
@@ -1,4 +1,4 @@
 AUX superlu_mt-3.1-duplicate-symbols.patch 7284 BLAKE2B 6402f745b280c02dfb4b0fadee120c9def38819d01c5e00406f68a812a06f3d86d4ac0ee799e3abe7b081737d2566bfb6ad981f7768ac29b3a2ad0b0bc147ee1 SHA512 b233677071ce175116454614b6289faa80f60ef0dfeee728bc4a1a7603ce8490c93e63ba635d1db231c92a055dee5cdbeff2793a2e138fa688efc18bd72b693f
 DIST superlu_mt_3.1.tar.gz 1824440 BLAKE2B 6355c624eca13a6ad7fa0e6100b3a548215d93aafc5958b9a0e693b3333006e4b1e98facddf352f62ef1632c8528cb39a85ca15509abf046d32f8d97335749c5 SHA512 41b8d9808f6a9c3f8d9e983ab253b0c5aec486df1cc419d043a201bd950034fa4bdd5465410e1198a2314d072b92cb388fc117165a06f820922f04060c755971
-EBUILD superlu_mt-3.1.ebuild 2572 BLAKE2B f7f400ae68d0c5c2f2b6a5d11b14d3b857534f49af3732b5000519f79154260ca82f0bfdd830675e6ef0c874d9bc94fcae4528a77206f8a7a59010a14c159f40 SHA512 f1dcdb183144c2f16131a5b03e61d11cb35b012562c51c08810590df6b3afbede0384ae538fe6df01a034eda719d903b8a6a37be6237f06e6e18b4316a701a81
+EBUILD superlu_mt-3.1.ebuild 2594 BLAKE2B 31956846fd85ffc4d1175b648c0a9f4a4f3f9aa95f22f753e576c03152e695aecc084c96dd82e4f374a20d2daaf9540c0011d5bbadcd7b3ab28e797a69f52e13 SHA512 1cca2b8451c1b92ef50253a441a6dd7c714d60d5391e8493bb8a49c72361c8075b6c1b92cf861fdcb6767d6b1a6520b0f4ff430590869607318c7a547e40002f
 MISC metadata.xml 1471 BLAKE2B a51fd3dd9c2e49e44b3178e6ff5a268ea5be4786aad0f78a6e44156aa2df30adf265ed64d80904350c7f57bcdd7c15f7b563d35d06a51a34974437c09cb482b2 SHA512 1f4ab676f807e3211c894cd5ae692987c419937a0f0aa2bae46b72d029ad843f3d4415ee9ce3876b6d19e8446e3d6c5085b1671f0b7b73329696d9c231540e76
diff --git a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
index 9cd876c14a25..bd98796402d4 100644
--- a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
+++ b/sci-libs/superlu_mt/superlu_mt-3.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=6
@@ -10,11 +10,11 @@ SOVERSION=$(get_major_version)
 
 DESCRIPTION="Multithreaded sparse LU factorization library"
 HOMEPAGE="http://crd.lbl.gov/~xiaoye/SuperLU/"
-SRC_URI="${HOMEPAGE}/${PN}_${PV}.tar.gz"
+SRC_URI="http://crd.lbl.gov/~xiaoye/SuperLU/${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${SOVERSION}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples int64 openmp static-libs test threads"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( openmp threads )"
diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest
index e608b37c3c93..ed731b950a33 100644
--- a/sci-libs/symengine/Manifest
+++ b/sci-libs/symengine/Manifest
@@ -1,5 +1,7 @@
 DIST symengine-0.3.0.tar.gz 629813 BLAKE2B 8d611703604f10d1ed8837708fa2125c0e84d12a8513d34e5d4bd44ae55395bcaa8fda92754b538ba1ecfdcacff83d079094dda9dfca6fdcdc4cccb0702cf484 SHA512 e4a906bb1cc5159003969871711f40b3c6bfb9e38ac25258dc5797933d55374a2f201c8a89e9af48821b24cc54408d4feb70f6de421e0a9fbf766d2b35846b83
 DIST symengine-0.4.0.tar.gz 753664 BLAKE2B c6296ceef20cfbb16803adc3c623429cf417c639d45d8cad742c3f7cf9d8171f22fb72e168cd07a6a705726a09133866fa497e2092ec4885ae4462d55adc416e SHA512 162c4bb4c67e2f21a0a113726d7b0ad00cc3e80db0534e95109a41894dcd05ca03a3be39d1a56a336b4bb7926dadad72fbe6705c71df3448db99fde20139ad11
+DIST symengine-0.5.0.tar.gz 761321 BLAKE2B ddff0e756188f375e966b92e6e7796936b8b6fe1a884c036066dc09d46183f157761c9813fe27366e625b7cc070381332964a12f14617be66b0f38f536c0518d SHA512 0b94b531f71adf9129440e0664a5b5ce23453de6c8d22ed385958b38cda9bc2b356a0182a80076f47b217e9f6b5a57f059b040fddf7d69694d5bd5857b0a046b
 EBUILD symengine-0.3.0-r1.ebuild 2098 BLAKE2B 4faf5dc46cb1736f3e76fadbc11397b093827e81534216f2bb3c58b59bc9f17c5d0d29100065e6add3ab3a3c8f9d774d22df70336f9d6353fffdd3411697f335 SHA512 f9f5f7202f118e362468cc7899409c826a2590525643c05f0c5e3db773b46f761e09daf5fe692722bf07184bc72961f69725ccb7294811992ddf20a683476231
 EBUILD symengine-0.4.0.ebuild 2098 BLAKE2B 072f1e55eb91c66cc0056b4de3314029c049f2caa8e8dc20b3ae30fd11b851d56df85196a8418c4ae6a5782647e25b80e2eb704c8cd95106ad4cc2f38a0d2ff9 SHA512 5d8c7336ebde34694a4acf39b37dfb9288b14b5eed41ffd54919ec8f7ec956ff47e08791e2ca6566bc6c9c0833abe07cb3ed647018d0d9a27fc3842acac365fa
-MISC metadata.xml 1150 BLAKE2B b71aad51273ac2e9cd7907b72b71ab3fca4baf67ffcba3fdb3f3560ae6a75f5aef6077f4dc9e4ef26c62d75c6b66438f2dd0489c094dec37a94e733905732726 SHA512 33f04c5f8b7eaeb25dfe712582fec5cbc6a17a4d2f90c96eea84c43025af0be6eb8f3d6ce4a9904a46e4d36374d651a15e539ebf09f16ba9bfd2c4a61cd7e911
+EBUILD symengine-0.5.0.ebuild 2115 BLAKE2B 8cb38f033fb9bec53a490f657ceaa38aefd75ca701424bf3d86ed6cfb555045623a4a784d071af613eb6b175aa62044855396278915e83581eb48aadd464003b SHA512 5335024931f58917e8730a5ff5c7bb76cd9ae5f800e09c3bbe4640409b0896c39c931b5769c1b68ee17412be8f26b863b171479c126628781297a8982d04a10f
+MISC metadata.xml 1265 BLAKE2B f91a4783ae464dee61dbca5f532bb73a217600b49633f0c80ee46f7650f27f2e37e32cd4f5e14e171e6a47eb4c612d686f883034378afb73520ed0c22862d564 SHA512 f2a634346a9f703565959b48d7648df6abb088a479819aa3f9818ae941df168dbfa3cb1867f48673fce9f24dc890d05134689d93edb0d6761f2a54f4c802037e
diff --git a/sci-libs/symengine/metadata.xml b/sci-libs/symengine/metadata.xml
index 63672cfa6a09..759e5c9c0a48 100644
--- a/sci-libs/symengine/metadata.xml
+++ b/sci-libs/symengine/metadata.xml
@@ -17,6 +17,7 @@
     <flag name="arb">Add support for arb (<pkg>sci-mathematics/arb</pkg>)</flag>
     <flag name="benchmarks">Build benchmarks</flag>    
     <flag name="boost">Add support for boost integers(<pkg>dev-libs/boost</pkg>)</flag>
+    <flag name="ecm">Add support for ECM integer factorization library (<pkg>sci-mathematics/gmp-ecm</pkg>)</flag>
     <flag name="flint">Add support for (<pkg>sci-mathematics/flint</pkg>)</flag>
     <flag name="llvm">Build with LLVM</flag>
     <flag name="mpc">Add support for multiprecision complex arithmetic(<pkg>dev-libs/mpc</pkg>)</flag>    
diff --git a/sci-libs/symengine/symengine-0.5.0.ebuild b/sci-libs/symengine/symengine-0.5.0.ebuild
new file mode 100644
index 000000000000..6b84f4677d6c
--- /dev/null
+++ b/sci-libs/symengine/symengine-0.5.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake flag-o-matic
+
+DESCRIPTION="Fast symbolic manipulation library, written in C++"
+HOMEPAGE="https://github.com/sympy/symengine"
+SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/0.4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/gmp:=
+	sys-libs/binutils-libs:=
+	arb? ( sci-mathematics/arb:= )
+	boost? ( dev-libs/boost:= )
+	ecm? ( sci-mathematics/gmp-ecm )
+	mpc? ( dev-libs/mpc:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )
+"
+
+pkg_pretend() {
+	use openmp && [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \
+		-e "s|/lib|/$(get_libdir)|g" \
+		-e "s|lib/|$(get_libdir)/|g" \
+		-e "/DESTINATION/s|lib|$(get_libdir)|g" \
+		-i CMakeLists.txt symengine/CMakeLists.txt \
+		symengine/utilities/teuchos/CMakeLists.txt || die
+}
+
+src_configure() {
+	# not in portage yet: piranha
+	local int_class
+	if use arb || use flint; then
+		int_class=flint
+	elif use mpfr; then
+		int_class=gmpxx
+	elif use boost; then
+		int_class=boostmp
+	else
+		int_class=gmp
+	fi
+	local mycmakeargs=(
+		-DARB_INCLUDE_DIR="${EPREFIX}/usr/include"
+		-DINTEGER_CLASS="${int_class}"
+		-DBUILD_BENCHMARKS="$(usex benchmarks)"
+		-DBUILD_DOXYGEN="$(usex doc)"
+		-DBUILD_TESTS="$(usex test)"
+		-DWITH_ARB="$(usex arb)"
+		-DWITH_BFD="$(usex debug)"
+		-DWITH_SYMENGINE_ASSERT="$(usex debug)"
+		-DWITH_SYMENGINE_THREAD_SAFE="$(usex threads)"
+		-DWITH_FLINT="$(usex flint)"
+		-DWITH_OPENMP="$(usex openmp)"
+		-DWITH_MPFR="$(usex mpfr)"
+		-DWITH_MPC="$(usex mpc)"
+		-DWITH_LLVM="$(usex llvm)"
+		-DWITH_PTHREAD="$(usex threads)"
+		-DWITH_TCMALLOC="$(usex tcmalloc)"
+		-DWITH_ECM="$(usex ecm)"
+	)
+	test-flag-CXX -std=c++11 && append-cxxflags -std=c++11
+	cmake_src_configure
+}
diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index 14d3ae11cfff..d0ce74e5b07e 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -1,5 +1,8 @@
+DIST bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip 72534 BLAKE2B 0bbcc2b3fefb8df84d9f72b13da59c377fcd657ead378f85f80a587f8750302236212ae5c58819933015e62425126bead0733d2924a567fb9c5cb14fb75271a8 SHA512 1818c555504ba89afff88d75fe8b4e1386b3665a3ad477c26b4e9504c8f52f398b6aaedbad41a4ab8b8d9b3f86e0992e7c83a6da70241685d7b79ba177af1035
 DIST tensorflow-estimator-1.15.1.tar.gz 696316 BLAKE2B 7797ae13fa5f56920df912f7d0eaef214a381acb25632dc2d21c6bbf5744bcc36b32f21e30b18be16d37f7a1deb30b2139d58c2c0f97a1de7a5f767a8a5462d8 SHA512 ae42057870cfb0e19d45ee59bd99c110ecfb3ae43cd5a5536711c7d2528b429c433b0f594e462eae9c40b34dd7813f3b14b1282cbf2edc725e13c45e93da818d
-DIST tensorflow-estimator-2.0.0.tar.gz 618578 BLAKE2B e7e13b6a38f9d23350510aaef689761bc8459556db487572da0ee07d5ae0f1b0ec62517037ecd2f6b109f9657d42127a149405b7780dba4c1086f87319d77ad6 SHA512 99bbdb4be9cd9f46128657b262fc6daa61a1dbfad6c430c43bb62ef99cefec10b10bf03090adcb21bdac0404e00084b4e5c4961761a52462afdeb105ef1e0c73
-EBUILD tensorflow-estimator-1.15.1.ebuild 1332 BLAKE2B bf1f8f5d0bbc0dd5f64990d0cd84c02d7c392740dad223d1b67d6f85680ada645bcf32caf15313211f76769126075cda289bf0a99cd951d0af074bf4d694e2e0 SHA512 299e555bbb858dfdf34ae79ab52fe057e448f3e0661c22b7b2a35ce24e4240f675e36eeaf0d53b95ab91d1d535366c5bd26a22333c497b3048bb27a83f7933c3
-EBUILD tensorflow-estimator-2.0.0.ebuild 1235 BLAKE2B a72f3e514a0b095401cc573e70647d5d054493ed7878588822580f52a757e2b05d0aaece5271666d1ded81d81c2befbedaf4743800d041730448861ce020a527 SHA512 4f2434ce286bcfbcc63892542ab73f6313e6e86aa5074f76e8c98add54453a94d79cb23d43237ab97dba824959a44d02360f789b762624493524602bc7ba6736
+DIST tensorflow-estimator-2.0.1.tar.gz 618583 BLAKE2B d4ae6225cb8a56febc9ffa64d5f811fc41db462534361a183095f724ce6deb17fa22edbd13bacd2d556adcc023dff1daeb7bf7338360b3cb49b19dc3bc3e97d0 SHA512 d7aa35784aa2726c49039be50b73cc957e7f883414bb43101527918bacfa55632df89e6f54cfc58a096512fc49a6ea7524aea87af0579c2a52db2ca7f5ee4bc2
+DIST tensorflow-estimator-2.1.tar.gz 622792 BLAKE2B d1c8abb22d90c789ebfadaf78ca932f87428274afe6e1ac20670bf6d2b4c1c6ea8f367b1eb7ee64ff9f6e9b8ecdc2f64113924e7e2286e3f4e3d2c36cb101794 SHA512 4aaa21969299b02443e9396c238ef4c03af3bde1d0142a81c04d9706f18b02bfd125f3aaf8ffb47e0a3ffad949c3d3bca3909375f12a1c1e4c55ca1cc7930d51
+EBUILD tensorflow-estimator-1.15.1.ebuild 1328 BLAKE2B b629259c42c606f8620f3efb2b56c253dca488c59c5c4df52a241c1e279856484e8fc289cc011044fff2ad4d80138234a20782d9a396ce84716f453530cacdbe SHA512 722e5579e71df900c0702980197e1eb532ace50817769363b42d9ba413037c339eeae61e625b6fdf53efbd95d821fc83ea7ed12a62e77a1bcc945abcc8916148
+EBUILD tensorflow-estimator-2.0.1.ebuild 1527 BLAKE2B 846fb24d0b0cc085c02a43254b5f8bb2c2c160198315f3188d8c57689b1a378361be3f7f93036a78a17ed34d9552613d09e8d2cff81fbb834b3160f40ed66554 SHA512 eceb919ccd58559c84a301409b82bbad4eda4ed92a6adf6f20f2e4507e6e97c530393a6179efb12a869d5e7ae4c92ffbc0ce63f943359fd5e1546d8a02a78e98
+EBUILD tensorflow-estimator-2.1.ebuild 1527 BLAKE2B 846fb24d0b0cc085c02a43254b5f8bb2c2c160198315f3188d8c57689b1a378361be3f7f93036a78a17ed34d9552613d09e8d2cff81fbb834b3160f40ed66554 SHA512 eceb919ccd58559c84a301409b82bbad4eda4ed92a6adf6f20f2e4507e6e97c530393a6179efb12a869d5e7ae4c92ffbc0ce63f943359fd5e1546d8a02a78e98
 MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.1.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.1.ebuild
index 7913f44ba2cf..37a74e0d4193 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.1.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 MY_PN="estimator"
 MY_PV=${PV/_rc/-rc}
 MY_P=${MY_PN}-${MY_PV}
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.1.ebuild
index fbd9ccf1cd27..937c3b58dbb4 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.0.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 MY_PN="estimator"
 MY_PV=${PV/_rc/-rc}
 MY_P=${MY_PN}-${MY_PV}
@@ -18,7 +18,11 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+bazel_external_uris="
+	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip"
+
+SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${bazel_external_uris}"
 
 RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
@@ -29,6 +33,11 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS=( CONTRIBUTING.md README.md )
 
+src_unpack() {
+	unpack "${P}.tar.gz"
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
 src_prepare() {
 	bazel_setup_bazelrc
 	default
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.1.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.1.ebuild
new file mode 100644
index 000000000000..937c3b58dbb4
--- /dev/null
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+MY_PN="estimator"
+MY_PV=${PV/_rc/-rc}
+MY_P=${MY_PN}-${MY_PV}
+
+inherit bazel distutils-r1 flag-o-matic toolchain-funcs
+
+DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+bazel_external_uris="
+	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip"
+
+SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${bazel_external_uris}"
+
+RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-java/java-config"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	bazel_setup_bazelrc
+	default
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home)
+
+	ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
+	ebazel shutdown
+
+	local srcdir="${T}/src"
+	mkdir -p "${srcdir}" || die
+	bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
+}
+
+src_install() {
+	do_install() {
+		cd "${T}/src" || die
+		esetup.py install
+		python_optimize
+	}
+	python_foreach_impl do_install
+
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 9f5284199f3a..18144a86e375 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -2,6 +2,7 @@ AUX tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-too
 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
@@ -17,7 +18,7 @@ DIST bazelbuild-rules_swift.0.12.1.tar.gz 111674 BLAKE2B 7c116d6098aa0725034dce4
 DIST cub-1.8.0.zip 602396 BLAKE2B a5e302a52e04f85ae8e1836c59e799532a8b961a8d10c08fe1241c9045f88e31f1ebda6d26124b85c6df40968e1c7b3985a39961bf7614535aafcab2da1a576a SHA512 6167c5be94989f88e05a07508cf69cf2c6b22a5ac733804043daa46bd86a44a15a758b1ffb811bab28b82039d027516ed85b3d9f7677a740a7e00ec9c2f81aed
 DIST eigen-049af2f56331.tar.gz 2485848 BLAKE2B 9d8a91782c9d40b7a6df101d2f43df25b5a3622bc02a7b9576929afb1f2f3d7c8b80671d24f1e31670883003b60c4cc0f3c9dadff0430d2ee047eb5122805edd SHA512 ab37106e9dfebbb42d7919c16b301887607080345b7ed63c8e3b8568489cfdc2c3ca0117a77905162cb3ba8324753040c841d2c96521fa4b9486f0778f1962df
 DIST eigen-49177915a14a.tar.gz 2496808 BLAKE2B 4e89b72a2ca121e9d1951a7179434c9eb70104ad45e63ae9811e10e28e32d51386acd2fe6938970404dcada8a377d1b3c07a68a98a68a036a6e85b2cf9ff4b48 SHA512 eb036225b41ffd8cc61ef99d2d22030c0d1e0f87eefcea4dd2b1fdb16a5316e0f4f17527983a00a8a684067654bf1f87c82cfaed5764829778660485ebbfa4b5
-DIST eigen-afc120bc03bd.tar.gz 2546157 BLAKE2B 72e051d77cd22c26a4203cf244e87b1700b4dce664d7ee5f80d0dd86eb5557c93e57c50664f1d79b13796a77c5ccdf72203ec66e9376d383b5a3b056326c7b61 SHA512 61f57a22d2a7947c14cfde87946dc41528df696884502a13000ee5c9b964672a5a8d8c10f505f28ed7a2d39deb820c6818d191dc3ce13215b8b9775b33da2ed8
+DIST eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz 2580537 BLAKE2B 927897c80f3529da40a76ddde26113403926d730fa4539aa9e4121406e8d3852abcfdbc55d178723300e9daa26176f6170db06bb49a59cb190e8c7e6dfdea4dd SHA512 d5461e615044aa94b6ac9ab2815536f4bdf2b9ccfeb578cc7bc62554ba928b4192450f72f1350f3231ed44d2bb90e95218de9a5d0bcee9ec02867499a6dc5db0
 DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
 DIST gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip 935628 BLAKE2B 09bd1dd1e367b1e5c4fe9a9525449c09460f19168bc03c57ad563aa27ec74a18f08b620a3dab6da4fa1a1448cdc7ce8bc8a089becc033b53fff4cc07593315ce SHA512 bd42a364f718f3b077cd9c840d626bfc1fd92ace98ce43329d8fa54700c9d28cb47568b6567e9b081b340af7be621c44be1ce06d4b8dccc4fb5d82c35b12f951
 DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f
@@ -32,8 +33,8 @@ 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_rc0.tar.gz 41625131 BLAKE2B bc286f2f8d76a38973706acf3d839a4f54843b2f37ba5485eb149beacd55c7ac13660592acbc2413f8e60242c4a34b90cea8f1d9708d3f086e7cae73cc338832 SHA512 1481af1ed43ff03f6a0eeaad9896e2ec021d763bc69bf03e33353d6188074fdfaa1b6c3bba1d4e2496207f468e6a555fe2c962ae15eddd30ef872a3d76e19911
-EBUILD tensorflow-1.15.0.ebuild 11930 BLAKE2B 6f663b343e1566b69ac9f340f2bdd1b47d6e78ac2d90628ef324c2c898b734727b7b2022db48253f2f9466afc3bde1651cc96247ce3d337a9e37f5665c96315e SHA512 740b2bf5e7577eb2229c13a29f8644720b424c7663ce8b15a38362e8a2f2b9c6c905dcacd72e2d1b9331ddfa8d38c5d03a6628b6670c1f60aa4ca28e7111fe7c
-EBUILD tensorflow-2.0.0.ebuild 11986 BLAKE2B 4fcf72a11e010cc1f5c6f5acf20d90a292bb2e0e415e1d4674854c5895599c74e96de4991880178bf0eb808ff9a129b69ff9cbd32781e2802d440e2e806d0e38 SHA512 c0de6c32525b74e25f1fa8311c15da206f8f195d69901772d5d6c1d9abb81e18131b35e60c5bcdad3b202787755a7d0931095aee55e81a9d40b90983588ce08f
-EBUILD tensorflow-2.1.0_rc0.ebuild 12455 BLAKE2B 6c15da235a7f2dc79d25cc19c596d888f638426fb3accf6ce5585a45d59a4b427322b894e364229d9c98b9e5cd673950ddc83582045203d92b9bf7560c378554 SHA512 ac3cdede1d13242f1c72715abf6bd0f584856a8ebcc201aff74db92721d37f696aebc6df533b0782b1c638ab4fd709ca0aa44a62b805247c7bda674981972b33
+DIST tensorflow-2.1.0_rc2.tar.gz 41641498 BLAKE2B 1ab001f6804cd6b2b3122cd5bf84905d81b1632f363134dc30aee92869077da2420799d0e70ea050004ac854a7e887a44176806b8cdfab5f12b9c8f7440d22be SHA512 7b8c9a83b5c25b36f680cfdaeefdc932cab93ecfc25622cd46ac14b2f5582eea4f04c6bdd5d63058266d5e0bf2cd9e1fb7a0647be62fb4ec4b910b0e7b4214e0
+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
 MISC metadata.xml 606 BLAKE2B 910509df7310f05e34bbdd7223a9ad64e4f67c67174d3868629d594022aeab23fb9631fb17782b5787e7880cb2990ffed7d14c030ab86a25c23c8118330bc690 SHA512 ffc3f68be38618f77b7d31406292e3a4ead2819d19aa7c8b1eb779e03027b9220cc248645cad44e31a6f0c113f4aeeed2a45060617b1bb03695bd2c684262b30
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
new file mode 100644
index 000000000000..bc53750b0701
--- /dev/null
+++ b/sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch
@@ -0,0 +1,11 @@
+--- 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-1.15.0.ebuild b/sci-libs/tensorflow/tensorflow-1.15.0.ebuild
index 5508bef6fa22..346da2aec9d2 100644
--- a/sci-libs/tensorflow/tensorflow-1.15.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.15.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
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
 
diff --git a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild b/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
index e70af54032ea..c72dd4ffc983 100644
--- a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.0.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
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
 
diff --git a/sci-libs/tensorflow/tensorflow-2.1.0_rc0.ebuild b/sci-libs/tensorflow/tensorflow-2.1.0_rc2.ebuild
index 1cd5f24b7610..8ae81ea41a8b 100644
--- a/sci-libs/tensorflow/tensorflow-2.1.0_rc0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.1.0_rc2.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
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
 
@@ -25,7 +25,7 @@ done
 # distfiles that bazel uses for the workspace, will be copied to basel-distdir
 bazel_external_uris="
 	https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz
-	https://bitbucket.org/eigen/eigen/get/afc120bc03bd.tar.gz -> eigen-afc120bc03bd.tar.gz
+	https://gitlab.com/libeigen/eigen/-/archive/4e696901f873a2347f76d931cf2f701e31e15d05/eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz -> eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz
 	https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz
 	https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz
 	https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz
@@ -130,6 +130,7 @@ 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"
diff --git a/sci-libs/voro++/Manifest b/sci-libs/voro++/Manifest
index 5f5d2b8d5500..d8b161f44aaf 100644
--- a/sci-libs/voro++/Manifest
+++ b/sci-libs/voro++/Manifest
@@ -1,4 +1,4 @@
 AUX voro++-0.4.6-cmake.patch 5811 BLAKE2B 2d0e54fdbc4b3603624365a08c2b9cf76271a403308ade16c36b74c01b3cb7273d47fd25ff9d6eccb3ed292ac87d9256e827276dd4034064167b335856eb48e1 SHA512 6c8d8168432a5cad2713e8fea7e990004f9ff99a5114b0687e7e277cc09009d2545e47ab3389332f3ae342ae71ecae2b71e1cbe85dc5ed20fff29200b95912c1
 DIST voro++-0.4.6.tar.gz 809124 BLAKE2B 0b12f68fe2400d850353171a79aa41dd0a7780dd38d8b7d5fcda6621ba43e5bad60d72a1dd24c3ef9e30d4b63c0be9467062ef33f27138a838f7a984dd3321a2 SHA512 aa8c73d7634bb4ec4c0a7d4d18c0df07511ef975338f2517e6f0ec65de56bac10397adccf1c0e13439d29d096b7cb9b4540d7cfc191a1662f15dc0c3c1ff77c1
-EBUILD voro++-0.4.6-r1.ebuild 460 BLAKE2B 84a9160c6aa57179c2090107c2ded1b9131ee4e9448dcdb259d1ca93c3f742c7ec4d810551bdee65148df850fff773039a69a4be4681844f759cd6ac402908de SHA512 b4613a7ebc2b430803c6549ca5a5f57c0eb033486ad3beba2c22b4e116ee5dd215e061833e4e6c2561523ae6ed0630ec1e9a258363b94045e582a18656dbcf50
+EBUILD voro++-0.4.6-r1.ebuild 475 BLAKE2B d1a0262539241f16d0b496ddbf8b9fc781f96945e18d70d5fa145b0b8d0add207d1442156d3da3112994bee434ab47df18ca1480d3e08441fdf15b651794ad68 SHA512 965dc4251d30b441b79261a2d2e4b6b7bb90116c8f06d06bcab0627335a693e18a1f138dd071b18e8df6370af0c5e2ccc487df68673c8240ffdc4469316a15fa
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/voro++/voro++-0.4.6-r1.ebuild b/sci-libs/voro++/voro++-0.4.6-r1.ebuild
index 203bee51e027..286073dabf62 100644
--- a/sci-libs/voro++/voro++-0.4.6-r1.ebuild
+++ b/sci-libs/voro++/voro++-0.4.6-r1.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils
 
 DESCRIPTION="A 3D Voronoi cell software library"
 HOMEPAGE="http://math.lbl.gov/voro++/"
-SRC_URI="${HOMEPAGE}/download/dir/${P}.tar.gz"
+SRC_URI="http://math.lbl.gov/voro++/download/dir/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index ccf4f0e32092..3a031cb310f9 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -1,10 +1,13 @@
+AUX 197.patch 1238 BLAKE2B c268890151942f8f5a285897d37626431b79963f7e0271d220be3de6903fd6557aebb706ad58f7e340acd0e331d49a957743f23a3b201f3d3c53a8e7a52da969 SHA512 6a65808d3b7e0e9ac928249949d2f807e420e871d35da58344baf822eab74395a91fa8d90efe5d4b649b1851c7eb0281e89037cb869e0bc6bc2ab6a2164bb604
 DIST votca-tools-1.4.1.tar.gz 103152 BLAKE2B 73dc726ea899ceb65d0406f3795f1df79a6184d65e50e95be3768678a2d006b75e487dbe3df5d44be4b5ba3899aeeb01ed63b51755bd46b546b017ccc0406d38 SHA512 19165be7c9903cb664051a6556f9fd689b02af71156f040960008e8d74e4a32adfe283c67eb7b53c8bdc6ae6f72516ad0b674d9f2b3354ca50f082b1651dafef
 DIST votca-tools-1.4.tar.gz 103102 BLAKE2B a398d20b628148ec753ee1e59353e272dbda93848be11ecccaf2153385ebcac62c7b819c4ef0b9b1a7cfc7dfd85136d042726cc996af79a4dad64375f5aa9f6c SHA512 7c4bf2e2ba8cf795f03879138787db3875f48db56b88394c98b18cef0ae90e636d8aafff42eb62a408df06a91583e37e59b33440e83de9f4338295e9ccfc9be5
 DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B ab68b38241d2c065939cf0b2e08603eaaccf613454bb64056c3d3d03472501e2079408ce856fbcc7243d51d035acec0b52c9767e2d687234296c7858f1a46fa4 SHA512 c8fe4baee0f4586dbe1a9f5b7c33b7d6b16ef0ebc35b50febfdcb049b09cd150dec3a5e9b98b43430db66f866dd01c1776f6777f01d227246c9d7b7ca879ea72
 DIST votca-tools-1.5.tar.gz 129464 BLAKE2B 2ab72758cc7c9bed5a49c924f7f0a93dc562a43cefbcc84f393656fd6c6b165152114eab48131db4d42008472d01103b5abba6ae0cf12779fe1ffacbcd65dc11 SHA512 fdee932c861742961937bdb88a1ace8caa4041c38ce80ece3b27e8a4b624248c21bf9be63b157565d1114047d3895c8b959f95b4fa49225c0cd1b2e708ef54f0
+DIST votca-tools-1.6_rc1.tar.gz 128577 BLAKE2B d9270739c00f945ff4af24e45a529e73ff0da596956791991f03b5586134d16b5fec077b3859dcd685de96a334f419f5f82ede7df60614482c9fddc61a01ca8d SHA512 42b0eae148bb93293ac16e193d2595aaa850dcee0dcaab1f6cf0ca8e36a95a1719a03243d421fbfb1034c81baf2ef294768a86530f0d69b59862df95846241ed
 EBUILD votca-tools-1.4.1.ebuild 1211 BLAKE2B d49fc0a98bfaf61cee9b1c38f058687591b81319788b578e91db513f76d452fec9e2116e503b22539f84bc0e567434d144b6ad22d3c62bd819b0fa817a7ccdea SHA512 920a37e44b7ad3d1e655843b22646d87f376bb93cbb99f7241ff538183b1d4df7aeb6ede66f04fee423bd112c651185d837423024fd1cdfde7350018b83ebde7
 EBUILD votca-tools-1.4.ebuild 1182 BLAKE2B 2077617efbf04198cf2a0f53bbf07f87897a8420ec6ad9e1774c821e7e3789421a253b79e9f09e85abfdf1523ebba02400233199cee5d7966a03b97db4477155 SHA512 48eb152df0bc0ad1481179977c0a8b6947180d9978961024a57674414326eb370182c02f5fda3a902a03a14fe3f0e60f666787eb16729412426ee83f1a074613
 EBUILD votca-tools-1.5.1.ebuild 1124 BLAKE2B d8bbb47af7f2b160f83719246b8c1c1e435970790aa1ec3922085959354347c61a845013a32da9edcbcad19c66e7dd25fd0fa8c2b908f795827c324452413183 SHA512 9219e23530a0f55cc4159f250e251c49ce61a8514b05d0d4eca7f224b340e0bcc313e82b57fb647141f683607be545044495da2eea956ea197cae029f52a5662
 EBUILD votca-tools-1.5.ebuild 1122 BLAKE2B e6ca1c6354b17eae1f1574de117b2fe421965e05376ac2d13cff50814e5b2987fbac645be133037cf31b08513e09f96fba94cb02a82bab06c60a667b9147d75c SHA512 2482328a8306a0126c7ab17250be2ab91e823a1ae248e3d4bf15b27bf1f313b3277a132ba4e52362c92f1d4096a00f7b5e657afaa6de464866b551c5976c4be5
-EBUILD votca-tools-9999.ebuild 1118 BLAKE2B d0a35124322cd249fb57a49151889005a9e3da80d6a0c9196bedccbb34228857865820613aa5a706fed9a5a1657e08efceaa61022703836f97b5ca957675093b SHA512 95780c5025941d1c124fd8ae277360d3654217b7135993669fc50d7873a6b72d7d3f4d9518a99e96688be1efdfdf9b736a820f68120ff8b113d018185866b157
+EBUILD votca-tools-1.6_rc1.ebuild 854 BLAKE2B ee6c6234021d9a903a611fe75c64c612ea8c3c35c048c0663dfbff91d289410966d9aef8ca2533895b33d734d7333e7bb3dba9ae88db3b387dbee199bef2c2e5 SHA512 137867d077e0c84d49a76553f00e2182350643822c6961103aba45810b236e2333f3a9092b5572cb1588d658e0c1111aa2ffdc83e6b679d84af2d7c885fbb0da
+EBUILD votca-tools-9999.ebuild 817 BLAKE2B 07c6d4667bf74c45a962fea7ad7af4d3e40910d7fb4c38713e30193c9d58d2553c693b28db361f7c0b7d16df2d05636fedc648a18934b77bd6f7faeefebb6b5c SHA512 4be6e932cb3a573465c907956d79f6f85c3f2d38bd867ce8488afdafdc4e005c3d953f5e8cfdc4a422ff16e39a8d844ed5e84e53e1155a800ab3844ffbd8a32c
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/files/197.patch b/sci-libs/votca-tools/files/197.patch
new file mode 100644
index 000000000000..a0e4245c7635
--- /dev/null
+++ b/sci-libs/votca-tools/files/197.patch
@@ -0,0 +1,27 @@
+From 32c497808d3ff52a25cd0367c602f57577d56352 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@votca.org>
+Date: Thu, 5 Dec 2019 07:16:02 -0700
+Subject: [PATCH] VOTCA_TOOLSConfig.cmake.in: only add VOTCA::votca_compare
+ once
+
+---
+ src/libtools/VOTCA_TOOLSConfig.cmake.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/libtools/VOTCA_TOOLSConfig.cmake.in b/src/libtools/VOTCA_TOOLSConfig.cmake.in
+index c69c0426..b129913f 100644
+--- a/src/libtools/VOTCA_TOOLSConfig.cmake.in
++++ b/src/libtools/VOTCA_TOOLSConfig.cmake.in
+@@ -2,8 +2,10 @@ include(CMakeFindDependencyMacro)
+ find_dependency(Eigen3 NO_MODULE)
+ find_dependency(Boost 1.53.0 REQUIRED COMPONENTS program_options)
+ include("${CMAKE_CURRENT_LIST_DIR}/VOTCA_TOOLS_Targets.cmake")
+-add_executable(VOTCA::votca_compare IMPORTED)
+-set_property(TARGET VOTCA::votca_compare PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_BINDIR@/votca_compare")
++if(NOT TARGET VOTCA::votca_compare)
++  add_executable(VOTCA::votca_compare IMPORTED)
++  set_property(TARGET VOTCA::votca_compare PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_BINDIR@/votca_compare")
++endif()
+ if(@MKL_FOUND@)
+   if(NOT TARGET MKL::MKL)
+     add_library(MKL::MKL UNKNOWN IMPORTED)
diff --git a/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild b/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
new file mode 100644
index 000000000000..888d78eb3405
--- /dev/null
+++ b/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils eutils multilib
+
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	S="${WORKDIR}/${P#votca-}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Votca tools library"
+HOMEPAGE="http://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-cpp/eigen-3.3
+	sci-libs/fftw:3.0"
+
+DEPEND="${RDEPEND}
+	>=app-text/txt2tags-2.5
+	virtual/pkgconfig"
+
+DOCS=( NOTICE )
+
+PATCHES=( "${FILESDIR}/197.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_RC_FILES=OFF
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index a0839fa8779c..6088d1e095d9 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
@@ -22,17 +22,15 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc +fftw sqlite"
+IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/expat
 	>=dev-cpp/eigen-3.3
-	fftw? ( sci-libs/fftw:3.0 )
-	sqlite? ( dev-db/sqlite:3 )"
+	sci-libs/fftw:3.0"
 
 DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.7.6.1[dot] )
 	>=app-text/txt2tags-2.5
 	virtual/pkgconfig"
 
@@ -40,18 +38,7 @@ DOCS=( NOTICE )
 
 src_configure() {
 	mycmakeargs=(
-		-DWITH_FFTW=$(usex fftw)
-		-DWITH_SQLITE3=$(usex sqlite)
 		-DWITH_RC_FILES=OFF
 	)
 	cmake-utils_src_configure
 }
-
-src_install() {
-	cmake-utils_src_install
-	if use doc; then
-		cd "${CMAKE_BUILD_DIR}"
-		cmake-utils_src_make html
-		dodoc -r share/doc/html
-	fi
-}
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 99549764a64c..3eabe5ade79e 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 8941 BLAKE2B 46621f53b88cd7577f70f8921a583921791b730200e496f2dd846e2b18cf42d19b25826c244141d736e632a0bc7653e7a2e4076faf087276b2cf2e1ae295d766 SHA512 403715ad2de469165775e506968061965216f90bf36ee51e01f7165073882f14e0799324d7d0823f741567f182c78447634bb3a2bb653e341254cb900aa27769
+EBUILD vtk-8.1.0-r3.ebuild 8937 BLAKE2B 11d0699002026cbb88f35240fca54a03e08da0e4b413baf0290685c1ce7a4c7a57232ebe78da5b0e34a76572e863534579a025d7dcefbcf8e4b4e3fa55094391 SHA512 f3cedd459a2d89d88d5eddbcc07510c55e3b489d62904f192824b91e45f8e54e92b3d691906c9a20fe5c933482732789baece1cdfd9212f6d688f2012a191f6a
 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 cf30b696b29f..c5b14166c04e 100644
--- a/sci-libs/vtk/vtk-8.1.0-r3.ebuild
+++ b/sci-libs/vtk/vtk-8.1.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 WEBAPP_OPTIONAL=yes
 WEBAPP_MANUAL_SLOT=yes
 
diff --git a/sci-libs/vtkdata/Manifest b/sci-libs/vtkdata/Manifest
deleted file mode 100644
index d416f78c1d79..000000000000
--- a/sci-libs/vtkdata/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST VTKData-6.1.0.tar.gz 94452190 BLAKE2B 55e1af454f1c54c0a182552c41e08549781532b510bf29cb28fcd12510c1cef2c4e09274507d658b700f22d0da1961d7b4e6dc289d9ee39c6b1e1fac348ba153 SHA512 4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65
-EBUILD vtkdata-6.1.0.ebuild 542 BLAKE2B cd9321447c214da62fa6a81a98e8a55d1eee94a88336d88abfa0a0f66565df3de3abdea11dbee8118d273d985098e7bcffc1b704d0c377a7a20060df7a4c269e SHA512 8ea22e90926556f19c95aa684c2aebc053dc155f4c81d813341f11bc0fac2317138de84ee01788f4f151a1cf04cba58eb1fdd682f2dbb6d23e69c49f1aa8bca0
-MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/vtkdata/metadata.xml b/sci-libs/vtkdata/metadata.xml
deleted file mode 100644
index 8425c0d53cb0..000000000000
--- a/sci-libs/vtkdata/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/vtkdata/vtkdata-6.1.0.ebuild b/sci-libs/vtkdata/vtkdata-6.1.0.ebuild
deleted file mode 100644
index 551014f6949d..000000000000
--- a/sci-libs/vtkdata/vtkdata-6.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="Example data file for VTK"
-HOMEPAGE="http://www.vtk.org"
-SRC_URI="http://www.vtk.org/files/release/$(get_version_component_range 1-2)/VTKData-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT="binchecks strip"
-
-RDEPEND="!<sci-libs/vtk-6"
-
-S="${WORKDIR}"/VTK-${PV}
-
-src_install() {
-	insinto /usr/share/vtk/data
-	doins -r .ExternalData
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sci-libs
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)