gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /sci-libs
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
290 files changed, 1186 insertions, 4457 deletions
diff --git a/sci-libs/Fiona/Fiona-1.5.1.ebuild b/sci-libs/Fiona/Fiona-1.5.1.ebuild
index 9e34142e9a74..c44224221cdd 100644
--- a/sci-libs/Fiona/Fiona-1.5.1.ebuild
+++ b/sci-libs/Fiona/Fiona-1.5.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=sci-libs/gdal-1.8
diff --git a/sci-libs/Fiona/Fiona-1.7.6.ebuild b/sci-libs/Fiona/Fiona-1.7.6.ebuild
index 9ccb3bf929c1..fd6206119270 100644
--- a/sci-libs/Fiona/Fiona-1.7.6.ebuild
+++ b/sci-libs/Fiona/Fiona-1.7.6.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=sci-libs/gdal-1.8
diff --git a/sci-libs/Fiona/Fiona-9999.ebuild b/sci-libs/Fiona/Fiona-9999.ebuild
index f2ba00a0828e..209aabe38660 100644
--- a/sci-libs/Fiona/Fiona-9999.ebuild
+++ b/sci-libs/Fiona/Fiona-9999.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=sci-libs/gdal-1.8
diff --git a/sci-libs/Fiona/Manifest b/sci-libs/Fiona/Manifest
index c25094e62ab0..44ecdbac18ac 100644
--- a/sci-libs/Fiona/Manifest
+++ b/sci-libs/Fiona/Manifest
@@ -2,7 +2,7 @@ AUX scriptname-1.7.6.patch 362 BLAKE2B ad8c36ebdc49654181dd2f70c468deaaf57ec5c9a
 AUX scriptname.patch 353 BLAKE2B 7b135a729d5a15362a9b7ad3b15617f1002da72932627856041c66be8b3556848e978e45d023e40e11a08ec44e267d5f6ababae2823e07b578680443a2ca3710 SHA512 f9a0c51fbdc5bf99eb9a2b94c0f27f7f6fef7ebab94d9e575f34594e31dcb624e4c327e147e5b4955b5434b54cd2179b985bc64a9410bdb792b93f45375838c9
 DIST Fiona-1.5.1.tar.gz 1117361 BLAKE2B 4a2ecd9bcf8152c66a167eef58ecd116452118b888a18b9aadc5fa07ba9fe4cfd4b367c422e5176a3b2e7f9b1e146c6940c332c063d52eabd63b02426864af96 SHA512 06a2f091138b455355aa24bdd3cace48a3ccbbcb8b680f8009862a9ef3bdc217b68ba4596c51caaa9d09d2fad606a581d50f2fc9f2d0636bfec459e2022546a7
 DIST Fiona-1.7.6.tar.gz 641013 BLAKE2B f8cadfaad300306f2d6c5f306d842366807c23db59e96309911f05608a956bb088700da88b9a22e27af0af3decc396b1fe66815007945a39aa193c31c4769155 SHA512 a988772cd8d9cf7ee6862b87c91d18d5caf78f81c35c018e815dfb0000502a0768d9ce6c580a8ef9a9a652c64c4b6027685d597766f851563a70db07db0de4f3
-EBUILD Fiona-1.5.1.ebuild 699 BLAKE2B a20c7f99d2a2f08e506aed460be228816581cc57c3fbfba12c370d6d1011d20f86a56870be0b62b3f118c1858d2402a1b733a39a14584ea0912c5fcd4c18dc1a SHA512 c5bfec49f7fea798810481fedd964441378f25a044afdf9567bfd281459746ad12424f4ee06888d0aa1e6a513dede533e06656a983c6432a65ca31dc8f0879d7
-EBUILD Fiona-1.7.6.ebuild 834 BLAKE2B e9028c02a03a702ba62a961b805c69dff6ed867a0a80482fbea652e4a953617f6c2f6289abecae706574eac29b9a04ea85bad5a8cc7a8575912f33dcc56fa01d SHA512 89b8e3ae93f2877409b6f096aa0c4fcaab7987c0da72e8412d3b340559666625c93bf2933b8e43dde299fce89fcfe5a552805857031416cb26722c9881f02ab2
-EBUILD Fiona-9999.ebuild 723 BLAKE2B 65b96f96dfcf4c981586aed235819d164b56f3262d8a926353352969e295d7fe8d2cf8509795d434fa55e67aeda58fd195f3b01a3279317248f1499446d95509 SHA512 81d9403a518ae5622879d7f726f4e5e8be174f82ae296be997b0d2bbc26508ffbca25ec43f58a083e98de5e9f147d69717964e35373ab6926fdc0962517bc918
+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
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 705f39191b51..1ce81c91e9ca 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/Rtree/Manifest b/sci-libs/Rtree/Manifest
index 1d59f2e7992a..abe877c73ffd 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 662 BLAKE2B e3453195636f60f25c4334be02660f9acf76f15bc07c442de2e983edb8c9c7f85f3c6f1df92df7176fbe72ee7213667befc8ff8f574c332fe8e620a6c7f069d0 SHA512 9371a5ecc63b1687cdcc85c76672d0464cee48699b1649afd0dd61154b9bc1c9a200381f6b580103f8082dcbac8a35b9fdaa9f6df072f6fb418a10b1e4bd969a
+EBUILD Rtree-0.8.3_p20180802.ebuild 689 BLAKE2B 5725e28fdef846acc47bcb5240fe64769b7ece9f7755fa7511471c2551e2a10cd157e7c5b9a0423bd250ae0fcd32f21c0fb4e047a4785c564486388bf0678e67 SHA512 0bd813fc5b8687e1c85c67b3997b1a829fd861f3d28eb170c91a5568b0692e35d10ef6cc778de8df6823de15a24c2b2168e5dfe20f3e3502ffb26933244818ce
 MISC metadata.xml 348 BLAKE2B d075025a84c4e5828a919a6d959e936043b12e1ff30f66e63113c4477879f1ea0bf141271f9fb575d3aaae46de309b261ce9d77319c472e3ededf2100c6b9810 SHA512 8ac80d045fc9ae972bac0b0e6f4618b2eba27225e85710970548e01341f13e32f42839a7baff5de3650059a55c6cad179eccfbda2ec4c8ccdfac94c195277bc3
diff --git a/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild b/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
index 2c31f17d56b2..13fa6bf7226c 100644
--- a/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
+++ b/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,6 +16,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sci-libs/libspatialindex"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
index c2f1f86e036b..627806894a30 100644
--- a/sci-libs/Shapely/Manifest
+++ b/sci-libs/Shapely/Manifest
@@ -1,12 +1,14 @@
+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 603 BLAKE2B 62cf1e6d9fd2910ca19853362f74b6cf887f51680f4ddb4c4815043afc6299145c3238dbf9324d20047a9b7888c0c3ca8f4f97a8e088081943545e064b36b335 SHA512 ad90840393460ff0644e0bdc8be885febbe8c874c47330d200266cb1423335ad8433163762b46fb2bd32275d4d255dde29297ecd44fec689156af7b6f5539905
-EBUILD Shapely-1.3.2.ebuild 603 BLAKE2B 62cf1e6d9fd2910ca19853362f74b6cf887f51680f4ddb4c4815043afc6299145c3238dbf9324d20047a9b7888c0c3ca8f4f97a8e088081943545e064b36b335 SHA512 ad90840393460ff0644e0bdc8be885febbe8c874c47330d200266cb1423335ad8433163762b46fb2bd32275d4d255dde29297ecd44fec689156af7b6f5539905
-EBUILD Shapely-1.5.17-r1.ebuild 1052 BLAKE2B 71a677a56a589598ee692554ecb4e1c07fad83af3f34e521b1f3ba039dc9ca52174431560e9a5624ccb58b51ab5c86c901e773947d08579f1e6d9aef51d767cd SHA512 20ddcc090a596b4fe9da47f5ca361a0710ab8e04e708a021e9d59ff35ded397779931b649937c204332521cf4cf514e7d8d4db196358f91a61d58d225b298c35
-EBUILD Shapely-1.5.17.ebuild 688 BLAKE2B 03b1db2cd2deb926ab58b75228d729ae3315f83533021bb01ca157a3dc210e44d07da0e411f609de99758c655424bca9c158648694851af49bb5b4bc13df7b98 SHA512 11d9431fea44f608a3a50f1bb132c82fe63aaa0ed3591ed36900e3fd1943c55ae9e993ef48edbecf172ef30d7d4008e4bc6cb65bc7e0fd14758fd2ad36fc5d67
-EBUILD Shapely-1.6.4_p2.ebuild 1145 BLAKE2B dac69677d50fc0eb36522f4969f162bea9d2a7501c524731396555d28e4e84f554018d6fe581fed9ec2012457e4fa54c7a0c95503eddf5590c7085d0bc02f18d SHA512 59f6cf247d595d9ee2b597a5dc92b97dbbe2fef1ba94b473968bbb1992de7287ef1a72ee74f90333b050b7bab7672cf637633503d3d0b593ff880f91529da08b
-EBUILD Shapely-9999.ebuild 580 BLAKE2B 1662dcbd1c300b5c039e5d619f7b323d8206967f354f09b3b512cfc91e8f4f4b8d922d1db411f6307c38d33f06f4fd2d0944c7596020c9aa700cf498a38d0f77 SHA512 43dc089ac4901fe171b8bc1df7081d265c01471c6f27981e8c4d99ab13c4ebb7dc807fdb6cf11c2b93f34592307f0fce88dd3350ad2de60a85d6831466b95665
+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
diff --git a/sci-libs/Shapely/Shapely-1.3.0.ebuild b/sci-libs/Shapely/Shapely-1.3.0.ebuild
index 4d072d5665d9..4ea83ff68b95 100644
--- a/sci-libs/Shapely/Shapely-1.3.0.ebuild
+++ b/sci-libs/Shapely/Shapely-1.3.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sci-libs/geos-3.1"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/Shapely/Shapely-1.3.2.ebuild b/sci-libs/Shapely/Shapely-1.3.2.ebuild
index 4d072d5665d9..4ea83ff68b95 100644
--- a/sci-libs/Shapely/Shapely-1.3.2.ebuild
+++ b/sci-libs/Shapely/Shapely-1.3.2.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sci-libs/geos-3.1"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
index be87714e1305..10f755d4cc3a 100644
--- a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
+++ b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
@@ -22,6 +22,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sci-libs/geos-3.3
 	dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/sci-libs/Shapely/Shapely-1.5.17.ebuild b/sci-libs/Shapely/Shapely-1.5.17.ebuild
index 9a95905ea012..a6993a3d6fcd 100644
--- a/sci-libs/Shapely/Shapely-1.5.17.ebuild
+++ b/sci-libs/Shapely/Shapely-1.5.17.ebuild
@@ -21,6 +21,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sci-libs/geos-3.1"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
new file mode 100644
index 000000000000..488e7c29a06e
--- /dev/null
+++ b/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+
+inherit distutils-r1
+
+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"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/geos-3.3"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]"
+
+RESTRICT="!test? ( test )"
+
+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-1.6.4_p2.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
index 50528d9087df..7b76620b7303 100644
--- a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
+++ b/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1 eapi7-ver
 
@@ -24,6 +24,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sci-libs/geos-3.3
 	dev-python/numpy[${PYTHON_USEDEP}]"
@@ -31,6 +32,9 @@ 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() {
diff --git a/sci-libs/Shapely/Shapely-9999.ebuild b/sci-libs/Shapely/Shapely-9999.ebuild
index 9ae0eb5cd352..30efef7c6868 100644
--- a/sci-libs/Shapely/Shapely-9999.ebuild
+++ b/sci-libs/Shapely/Shapely-9999.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sci-libs/geos-3.1"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/Shapely/files/Shapely-1.6.4_p2-test_operations.patch b/sci-libs/Shapely/files/Shapely-1.6.4_p2-test_operations.patch
new file mode 100644
index 000000000000..a9213a333765
--- /dev/null
+++ b/sci-libs/Shapely/files/Shapely-1.6.4_p2-test_operations.patch
@@ -0,0 +1,17 @@
+Description: Mark test_operations as xfail.
+         # Intersection
+ >       self.assertIsInstance(point.intersection(Point(-1, -1)),
+                               GeometryCollection)
+ E       AssertionError: <shapely.geometry.point.Point object at 0xffffb6e2c250> is not an instance of <class 'shapely.geometry.collection.GeometryCollection'>
+Author: Bas Couwenberg <sebastic@debian.org>
+
+--- a/tests/test_operations.py
++++ b/tests/test_operations.py
+@@ -7,6 +7,7 @@ from shapely.geos import TopologicalErro
+ 
+ class OperationsTestCase(unittest.TestCase):
+ 
++    @pytest.mark.xfail(reason="Intersection: Point is not an instance of GeometryCollection")
+     def test_operations(self):
+         point = Point(0.0, 0.0)
+ 
diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
index 4ac836209949..1da545c35903 100644
--- a/sci-libs/ViSP/Manifest
+++ b/sci-libs/ViSP/Manifest
@@ -1,10 +1,5 @@
-AUX ViSP-3.0.0-ffmpeg3.patch 4291 BLAKE2B 2948a7e4cad247da78187a15198fbc5e804caab7ead381219113cd48ccc71c9b59832f315ca784d8bfd3b6d2d2b27ce918341dbbab88c2f66d0749e20cbaa63c SHA512 fed1699ccaba5baa67e0fde19abc5ae828c51c88bf761a9d6784b8ad858230cca7e11bfbc1fb7661bca0a666c49ff9915e0a771909bf42493229165d1131b3a9
 AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4
 AUX ViSP-3.2.0-ocv.patch 1065 BLAKE2B 830cecf11df2d9c5c909ab5e2b5e7430e953355feeea77e40b77d53f24d2f1799a529c8dfda061ca6a276a1e150d10fee475f63e798511ce0296e8fde1fd75a8 SHA512 35fbb672da815fd404bd483800bf3f27b4f62d41b1173b10292a964d23129f4ec8afd530f8de913500214633a425a1a7567341b6da317b9e74720cf9414f3eff
-DIST visp-3.0.1.tar.gz 26029005 BLAKE2B d8881b0dd56b38f5db88e33f13e7dfa29b0a64fa1aebc5160384db2c7124d3a0ab2f0a5b3ba0255cbe209b578a3cdeb4420dc138a063248f945e9a73e041f21d SHA512 558e9acbd7ac5ef2193dca026062b75e0a30a7efbcae7d1e7d392b0855e643ee96ab9f60c19465f6bfa861374e30d9e91faf2f860e0442fa48ea5ea384b4e3fa
-DIST visp-3.1.0.tar.gz 38743434 BLAKE2B 294eaaf95c7ff7a8ade8bdf2146018856b081a9c461aca68eedb6fb096d253e537f41ad9a81687cba7a9e42a34b5a3fe2d1a705917a1c96f47e1e3e708f20cc3 SHA512 b7d56d3286e3610ff0db4f4c3a51f953825578532a9c518f7654142a644f466343660901632487fb513b0f6a6503d3716d56e733830b4d52daf5839bc1cfbdb5
 DIST visp-3.2.0.tar.gz 52737424 BLAKE2B 78b733183a62541f5d5af22a376ac52ba2377753fa53be62858611b27d961fad286923c11f624c4fe0f561d8dbc5367e2ac01e6bc11a2a19068167ef52198307 SHA512 b4ad21e5063327d91d4ebda268cf4a4dc2ceffbe39d6af0dd6bfeb94d1150884d37fc4ea4295f640135fc2ba758afd29b9090755561ef05249fe2cbc5680dcce
-EBUILD ViSP-3.0.1-r1.ebuild 2999 BLAKE2B e5415f5a699aa20037e770f28155be8fef622f30201fa123a6cac27cbd134d1d796e35e971c6c5450ca0154f224dca0f78b78ca7f4f5cecb07c9f3144f8c423b SHA512 ee12ae28a8b83180978bf88b611ad83484ef6061b22252e5d4e0f0109c92b6a8620d3f8e314d41e1aeff700e2d0134c82fbc132db17163f74cc65dd74401a09d
-EBUILD ViSP-3.1.0-r1.ebuild 2864 BLAKE2B 7d9752251c1af6604544b14692352920765653d6022dfebd4eed381243df320d08da3f8539e4cdffdac387e16df4da1e409e5b80f28c086527614810efee3045 SHA512 a1b09523d092e39270210adeb0099b389cc3dc49b2cef86c7a9879bc02315b6c10a7df6d778a6955a3e4bff553ab1cb5751fb4f8b70533d83061bf0677013317
-EBUILD ViSP-3.2.0-r2.ebuild 2897 BLAKE2B e02dae9d88455de806338a8bd70e9e8f75e1405bfcab8b3d74689ed63bb613eca976b9ff074a5f37bb274f2c6bb63e84d6c11e20d494728a2002c0317064fb37 SHA512 52088222b4786e7d6d702abad38d2b1eae569ec8d130cfb02492d1b82eb3c20c52a5106e0b9e5276bc75ef8ec88d6edd8d007c1953ed6c5b6df0ff93b72c5aba
+EBUILD ViSP-3.2.0-r2.ebuild 2881 BLAKE2B 2706c612162b35e58f66c1e00cd343c1fb528be29b196cc9a0477462294a5447bc8ae512f5776bd438b237057beda14bcdc244a2f14fefb54b268dc5724cf04a SHA512 c192fafa044c0910a1f338422acf8fa0cd1c8433c4899085503118621e617a014e206f57f01125e82ade34b95b7133e22c554de76b2cbcc9dfa621d242bacb2d
 MISC metadata.xml 1316 BLAKE2B 0ef658cebd419a44479f24feefd44103fca5a6538cd2f4ba82ac3a12f20fbe4d079551b35587d1616969d7908cb347cf94cc33d27a2a5e327e4b369be30dfaf3 SHA512 738ff67d41b80f336be750cc0e534196bd2055dac9e00a183c097bbe94febb686340db1fd683f3c17cf2dacb68d123e84d6730025d9a46153918aa5b316daf9b
diff --git a/sci-libs/ViSP/ViSP-3.0.1-r1.ebuild b/sci-libs/ViSP/ViSP-3.0.1-r1.ebuild
deleted file mode 100644
index 871d521bc384..000000000000
--- a/sci-libs/ViSP/ViSP-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
-HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html"
-SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm"
-IUSE="
-	+coin demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack motif ogre
-	opencv png test tutorials usb v4l X xml +zbar zlib
-	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
-"
-
-RDEPEND="
-	coin? ( media-libs/coin virtual/opengl )
-	dmtx? ( media-libs/libdmtx )
-	ffmpeg? ( virtual/ffmpeg )
-	gsl? ( sci-libs/gsl )
-	ieee1394? ( media-libs/libdc1394 )
-	jpeg? ( virtual/jpeg:0 )
-	lapack? ( virtual/lapack )
-	motif? ( media-libs/SoXt )
-	ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
-	opencv? ( media-libs/opencv:= )
-	png? ( media-libs/libpng:0= )
-	usb? ( virtual/libusb:1 )
-	v4l? ( media-libs/libv4l )
-	X? ( x11-libs/libX11 )
-	xml? ( dev-libs/libxml2 )
-	zbar? ( media-gfx/zbar )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
-	test? ( sci-misc/ViSP-images )
-	v4l? ( virtual/os-headers )"
-RDEPEND="${RDEPEND}
-	demos? ( sci-misc/ViSP-images )"
-REQUIRED_USE="
-	ffmpeg? ( opencv )
-	motif? ( coin )
-"
-
-S="${WORKDIR}/visp-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-opencv.patch" "${FILESDIR}/${PN}-3.0.0-ffmpeg3.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		"-DBUILD_DEMOS=$(usex demos ON OFF)"
-		"-DBUILD_TUTORIALS=$(usex tutorials ON OFF)"
-		"-DUSE_COIN3D=$(usex coin ON OFF)"
-		"-DUSE_DC1394=$(usex ieee1394 ON OFF)"
-		"-DUSE_DMTX=$(usex dmtx ON OFF)"
-		"-DUSE_FFMPEG=$(usex ffmpeg ON OFF)"
-		"-DUSE_GSL=$(usex gsl ON OFF)"
-		"-DUSE_LAPACK=$(usex lapack ON OFF)"
-		"-DUSE_JPEG=$(usex jpeg ON OFF)"
-		"-DUSE_PNG=$(usex png ON OFF)"
-		"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
-		"-DUSE_OGRE=$(usex ogre ON OFF)"
-		"-DUSE_OIS=$(usex ogre ON OFF)"
-		"-DUSE_OPENCV=$(usex opencv ON OFF)"
-		"-DUSE_SOQT=OFF"
-		"-DUSE_SOXT=$(usex motif ON OFF)"
-		"-DUSE_V4L2=$(usex v4l ON OFF)"
-		"-DUSE_X11=$(usex X ON OFF)"
-		"-DUSE_XML2=$(usex xml ON OFF)"
-		"-DUSE_ZBAR=$(usex zbar ON OFF)"
-		"-DUSE_ZLIB=$(usex zlib ON OFF)"
-		"-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
-		"-DSOQT_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
-		"-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
-		"-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)"
-		"-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	cd "${BUILD_DIR}"
-	use doc && emake visp_doc
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use tutorials ; then
-		dodoc -r tutorial
-		docompress -x /usr/share/doc/${PF}/tutorial
-	fi
-	cd "${BUILD_DIR}"
-	use doc && dohtml -r doc/html/*
-}
diff --git a/sci-libs/ViSP/ViSP-3.1.0-r1.ebuild b/sci-libs/ViSP/ViSP-3.1.0-r1.ebuild
deleted file mode 100644
index 86886b818ec3..000000000000
--- a/sci-libs/ViSP/ViSP-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
-HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html"
-SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/3.1"
-KEYWORDS="~amd64 ~arm"
-IUSE="
-	+coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre
-	opencv png test tutorials usb v4l X xml +zbar zlib
-	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
-"
-
-RDEPEND="
-	coin? ( media-libs/coin virtual/opengl )
-	dmtx? ( media-libs/libdmtx )
-	gsl? ( sci-libs/gsl )
-	ieee1394? ( media-libs/libdc1394 )
-	jpeg? ( virtual/jpeg:0 )
-	lapack? ( virtual/lapack )
-	motif? ( media-libs/SoXt )
-	ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
-	opencv? ( media-libs/opencv:= )
-	png? ( media-libs/libpng:0= )
-	usb? ( virtual/libusb:1 )
-	v4l? ( media-libs/libv4l )
-	X? ( x11-libs/libX11 )
-	xml? ( dev-libs/libxml2 )
-	zbar? ( media-gfx/zbar )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
-	test? ( sci-misc/ViSP-images )
-	v4l? ( virtual/os-headers )"
-RDEPEND="${RDEPEND}
-	demos? ( sci-misc/ViSP-images )"
-REQUIRED_USE="motif? ( coin )"
-
-S="${WORKDIR}/visp-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-opencv.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		"-DBUILD_DEMOS=$(usex demos ON OFF)"
-		"-DBUILD_TUTORIALS=$(usex tutorials ON OFF)"
-		"-DUSE_COIN3D=$(usex coin ON OFF)"
-		"-DUSE_DC1394=$(usex ieee1394 ON OFF)"
-		"-DUSE_DMTX=$(usex dmtx ON OFF)"
-		"-DUSE_GSL=$(usex gsl ON OFF)"
-		"-DUSE_LAPACK=$(usex lapack ON OFF)"
-		"-DUSE_JPEG=$(usex jpeg ON OFF)"
-		"-DUSE_PNG=$(usex png ON OFF)"
-		"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
-		"-DUSE_OGRE=$(usex ogre ON OFF)"
-		"-DUSE_OIS=$(usex ogre ON OFF)"
-		"-DUSE_OPENCV=$(usex opencv ON OFF)"
-		"-DUSE_SOQT=OFF"
-		"-DUSE_SOXT=$(usex motif ON OFF)"
-		"-DUSE_V4L2=$(usex v4l ON OFF)"
-		"-DUSE_X11=$(usex X ON OFF)"
-		"-DUSE_XML2=$(usex xml ON OFF)"
-		"-DUSE_ZBAR=$(usex zbar ON OFF)"
-		"-DUSE_ZLIB=$(usex zlib ON OFF)"
-		"-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
-		"-DSOQT_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
-		"-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
-		"-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)"
-		"-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	cd "${BUILD_DIR}"
-	use doc && emake visp_doc
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use tutorials ; then
-		dodoc -r tutorial
-		docompress -x /usr/share/doc/${PF}/tutorial
-	fi
-	cd "${BUILD_DIR}"
-	use doc && dohtml -r doc/html/*
-}
diff --git a/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild b/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild
index c9cba774d8e7..005b645b21cd 100644
--- a/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild
+++ b/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild
@@ -17,9 +17,10 @@ IUSE="
 	opencv png test tutorials usb v4l X xml +zbar zlib
 	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
 "
+RESTRICT="!test? ( test )"
 
 RDEPEND="
-	coin? ( media-libs/coin virtual/opengl )
+	coin? ( >=media-libs/coin-4 virtual/opengl )
 	dmtx? ( media-libs/libdmtx )
 	gsl? ( sci-libs/gsl )
 	ieee1394? ( media-libs/libdc1394 )
@@ -27,7 +28,7 @@ RDEPEND="
 	lapack? ( virtual/lapack )
 	motif? ( media-libs/SoXt )
 	ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
-	opencv? ( media-libs/opencv:= )
+	opencv? ( media-libs/opencv:=[contribdnn(+)] )
 	png? ( media-libs/libpng:0= )
 	usb? ( virtual/libusb:1 )
 	v4l? ( media-libs/libv4l )
@@ -72,8 +73,7 @@ src_configure() {
 		"-DUSE_XML2=$(usex xml ON OFF)"
 		"-DUSE_ZBAR=$(usex zbar ON OFF)"
 		"-DUSE_ZLIB=$(usex zlib ON OFF)"
-		"-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
-		"-DSOQT_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
+		"-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/Coin4"
 		"-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
 		"-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)"
 		"-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)"
diff --git a/sci-libs/ViSP/files/ViSP-3.0.0-ffmpeg3.patch b/sci-libs/ViSP/files/ViSP-3.0.0-ffmpeg3.patch
deleted file mode 100644
index 8fd3c8b1edb3..000000000000
--- a/sci-libs/ViSP/files/ViSP-3.0.0-ffmpeg3.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Index: visp-3.0.0/modules/io/src/video/vpFFMPEG.cpp
-===================================================================
---- visp-3.0.0.orig/modules/io/src/video/vpFFMPEG.cpp
-+++ visp-3.0.0/modules/io/src/video/vpFFMPEG.cpp
-@@ -180,7 +180,7 @@ bool vpFFMPEG::openStream(const char *fi
-       if (pFrameRGB == NULL)
-         return false;
-       
--      numBytes = avpicture_get_size (PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
-+      numBytes = avpicture_get_size (AV_PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
-     }
-     
-     else if (color_type == vpFFMPEG::GRAY_SCALED)
-@@ -194,7 +194,7 @@ bool vpFFMPEG::openStream(const char *fi
-       if (pFrameGRAY == NULL)
-         return false;
-       
--      numBytes = avpicture_get_size (PIX_FMT_GRAY8,pCodecCtx->width,pCodecCtx->height);
-+      numBytes = avpicture_get_size (AV_PIX_FMT_GRAY8,pCodecCtx->width,pCodecCtx->height);
-     }  
- 
-     /*
-@@ -211,10 +211,10 @@ bool vpFFMPEG::openStream(const char *fi
-   }
-   
-   if (color_type == vpFFMPEG::COLORED)
--    avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
-+    avpicture_fill((AVPicture *)pFrameRGB, buffer, AV_PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
-   
-   else if (color_type == vpFFMPEG::GRAY_SCALED)
--    avpicture_fill((AVPicture *)pFrameGRAY, buffer, PIX_FMT_GRAY8, pCodecCtx->width, pCodecCtx->height);
-+    avpicture_fill((AVPicture *)pFrameGRAY, buffer, AV_PIX_FMT_GRAY8, pCodecCtx->width, pCodecCtx->height);
-   
-   streamWasOpen = true;
- 
-@@ -231,10 +231,10 @@ bool vpFFMPEG::openStream(const char *fi
- bool vpFFMPEG::initStream()
- {
-   if (color_type == vpFFMPEG::COLORED)
--    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
-+    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
-   
-   else if (color_type == vpFFMPEG::GRAY_SCALED)
--    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,PIX_FMT_GRAY8, SWS_BICUBIC, NULL, NULL, NULL);
-+    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,AV_PIX_FMT_GRAY8, SWS_BICUBIC, NULL, NULL, NULL);
- 
-   int ret = av_seek_frame(pFormatCtx, (int)videoStream, 0, AVSEEK_FLAG_ANY) ;
-   if (ret < 0 )
-@@ -703,7 +703,7 @@ bool vpFFMPEG::openEncoder(const char *f
-   pCodecCtx->time_base.den = framerate_encoder;
-   pCodecCtx->gop_size = 10; /* emit one intra frame every ten frames */
-   pCodecCtx->max_b_frames=1;
--  pCodecCtx->pix_fmt = PIX_FMT_YUV420P;
-+  pCodecCtx->pix_fmt = AV_PIX_FMT_YUV420P;
- 
-   /* open it */
- #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53,35,0) // libavcodec 53.35.0
-@@ -726,15 +726,15 @@ bool vpFFMPEG::openEncoder(const char *f
-   outbuf_size = 100000;
-   outbuf = new uint8_t[outbuf_size];
- 
--  numBytes = avpicture_get_size (PIX_FMT_YUV420P,pCodecCtx->width,pCodecCtx->height);
-+  numBytes = avpicture_get_size (AV_PIX_FMT_YUV420P,pCodecCtx->width,pCodecCtx->height);
-   picture_buf = new uint8_t[numBytes];
--  avpicture_fill((AVPicture *)pFrame, picture_buf, PIX_FMT_YUV420P, pCodecCtx->width, pCodecCtx->height);
-+  avpicture_fill((AVPicture *)pFrame, picture_buf, AV_PIX_FMT_YUV420P, pCodecCtx->width, pCodecCtx->height);
- 
--  numBytes = avpicture_get_size (PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
-+  numBytes = avpicture_get_size (AV_PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
-   buffer = new uint8_t[numBytes];
--  avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
-+  avpicture_fill((AVPicture *)pFrameRGB, buffer, AV_PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
- 
--  img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, PIX_FMT_RGB24, pCodecCtx->width,pCodecCtx->height,PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
-+  img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, AV_PIX_FMT_RGB24, pCodecCtx->width,pCodecCtx->height,AV_PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
-   
-   encoderWasOpened = true;
- 
diff --git a/sci-libs/alglib/Manifest b/sci-libs/alglib/Manifest
index 07a491be3667..4b7d41084f0e 100644
--- a/sci-libs/alglib/Manifest
+++ b/sci-libs/alglib/Manifest
@@ -1,5 +1,5 @@
 AUX CMakeLists.txt-3.8.2 1159 BLAKE2B bd12bd65ddc7e60d1e84b04d5c01391420accf099f17801680446856e817bd606315ee54a44b0bd559fe0a9fce35dfab8b9dfa2dd7edc406d57563ea0f77999a SHA512 193661b9f949972048132bc07b4619c2f0d38135d6f0030621cd8aabf87e9e78a6bec18cdb4fb9cb9e547fee9f4387e21ba3a02d45c41033a9c0be9221cf7d3c
 AUX alglib-3.10.0-disable-minlm-test.patch 709 BLAKE2B 160bd6a598eb9c822b16da6455bae980cf6bfd77c9889c0d2385b896ec502030741c1f6a929f48a49c73fe35e696cf83b97d72a007e91899bd61d369b195b9e9 SHA512 00d62278a65f30d97dd7df8ac20d17dbc40117c25e2cef64652f2afd0bda7c277f8600ccfa7036da8a4a4173e0f0f433d898b87c04ab6d2d89e2547f8a305ee9
 DIST alglib-3.10.0.cpp.gpl.tgz 1991101 BLAKE2B 884b80becce676285b7bc1f26ed8917c4c82f53b41c0350dfc8bff6573e2e6f12183e82fc317b54a8021b1f931eb7d5b55944902d0816f7097fdc05632128bdc SHA512 f02b3db5ab8dee841f27186b6693997c4e6876e75310b0a31a04593dbcb41d300920404e32e7aecb39c8dd15e54cfee05b725caa27397a67b453f6e64cd1ef5e
-EBUILD alglib-3.10.0-r1.ebuild 721 BLAKE2B b27ea4c54c620a4eb87ed6098660b7eeefb64073617cceece660593044746631bbfdebc380cc56ca70652b2a39b8e175636a9f7d84bbe3dcd25567ed0b8da2c9 SHA512 e825ad8c516e15c591b222f21669fddf2c71931fe8edeca82b89b3c869ba6cba48d3edffc4fd8c3542be8d076c87bb2ac812703dd2b3b454b24f93420ac393b0
+EBUILD alglib-3.10.0-r1.ebuild 745 BLAKE2B 1d77135cb47c82ee77da0a636c323d5f7089604a6bdbca4342b6c28cf449add451f18445d55b121bf4d9a11a580259907c3115602f8b3ed8bf9049873fae12f1 SHA512 44365e9f263d6159742b154c738343e3be154b0855b8e0398bbab5ec4e7c576a36ac46ecd10fdad9f10baaaade08d8b226f4343746ac6c42b8c4469cec070827
 MISC metadata.xml 1592 BLAKE2B 96df655b24fc1e27a90f6a31388135e9ec14965eef850c14468797dbb19670ef4695219459b2af337613a92cc25a7eb12a1b07f95a3e1e4b058d9f9c38ded770 SHA512 e16165304d85c3201c428b46bb85006281a2faac170f6b7f2966bc683f57387a0d4b68eddd6ad2d4ed9d26af992f4f9b2616c761f0bf1102c6749a8025478844
diff --git a/sci-libs/alglib/alglib-3.10.0-r1.ebuild b/sci-libs/alglib/alglib-3.10.0-r1.ebuild
index 43f3eacc3500..0c87b718bd2d 100644
--- a/sci-libs/alglib/alglib-3.10.0-r1.ebuild
+++ b/sci-libs/alglib/alglib-3.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ SLOT="0/3.8"
 LICENSE="GPL-2+"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}"/cpp/
 
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index b75b3480d5ad..97070b504cbc 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,7 +1,7 @@
 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
-EBUILD armadillo-8.300.2.ebuild 3376 BLAKE2B 3919b3ff29586060911230a35fa61aa590cec61f982c9b817ad468eea146ea142cc6fe021a4240ffc7bc3562e1349e59f76a868a2632f03bc9a626da0811f08e SHA512 4983eb6be844203df5ebb1cc15d2005ec953c05af300ddcba5d656f4cbf03207998a0c198afee9e43d81d7788799b31d4e13a929f74399dc55120ede0538652b
-EBUILD armadillo-9.200.5.ebuild 3375 BLAKE2B bb7354dcba7e6eed511764a0234595a9909289b62912c0f8da36471e82dd785262f9f0aebedcf217e7cd2efb234b9cea7b1e9b71d24e0deb9e53f3d056c9d01f SHA512 645cb2e9f5b282e6fad87c793bbfca12ed3a289bb3ee50632b875dddb12e8c36e15fbac49e4c33b61e3fb32971c2a0f253bd46bdc7dd19cffc3518e88fe8cbfa
-EBUILD armadillo-9.200.6.ebuild 3276 BLAKE2B df197a91daa79362b04b5203ffd209ea40c199e0c0c7d8c515fbea7de8b26e7095b32fec028e6942864839aafc0cf11a139cce3843c590f29a7b48367867de3e SHA512 abcdee4251617e7c20de77660d6b61c84ea2f391db707476cda894de73e354c4d909a6a3e9b1452756c755edfb2e39acbcf0a424fb8eafa3cf67b087c9858ec9
+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
 MISC metadata.xml 1537 BLAKE2B 5116cb259f8e27fb11430cc2b3ab3a351afcefa0734e7997c962596aab226cfdd052ba3186ea068d8d31d501520d063037185909bcf02de72f57b4c8dfd86e31 SHA512 206e3f8912bd753837b0e8301c1db0f94e3480d0f50ba83c1b9a4be44498507ccade8f0b317c3bf2baa8aa782a93c88806ddbe710eed9d8fecb135494c26bc71
diff --git a/sci-libs/armadillo/armadillo-8.300.2.ebuild b/sci-libs/armadillo/armadillo-8.300.2.ebuild
index c903169e984f..1ff6d1fd7a2c 100644
--- a/sci-libs/armadillo/armadillo-8.300.2.ebuild
+++ b/sci-libs/armadillo/armadillo-8.300.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0/8"
 KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( lapack )"
 
 #	atlas? ( sci-libs/atlas[lapack] )
diff --git a/sci-libs/armadillo/armadillo-9.200.5.ebuild b/sci-libs/armadillo/armadillo-9.200.5.ebuild
index 9cd79ff39d6c..06e6051e9208 100644
--- a/sci-libs/armadillo/armadillo-9.200.5.ebuild
+++ b/sci-libs/armadillo/armadillo-9.200.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ 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] )
diff --git a/sci-libs/armadillo/armadillo-9.200.6.ebuild b/sci-libs/armadillo/armadillo-9.200.6.ebuild
index c0be49813cfa..eb5ccd3061d2 100644
--- a/sci-libs/armadillo/armadillo-9.200.6.ebuild
+++ b/sci-libs/armadillo/armadillo-9.200.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0/9"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( lapack )"
 
 #	atlas? ( sci-libs/atlas[lapack] )
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index d84c6884a422..144d25e33004 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -5,5 +5,5 @@ AUX avogadrolibs-1.91.0_pre20180406-underlinking.patch 549 BLAKE2B e773e8994677a
 AUX avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch 3887 BLAKE2B 3803af011ecd8df2cc8cc969623d37237ed398cfd82baaf06d6d59da7dfdda3c8a042ffe2b5e15e9571cb3d74ae0eba4e3d80c9cbd9a6fd53a0035340257a382 SHA512 d49da2a4f215a74f1267de1fe74a19e1f2c4fdd61d583a05c04ca3d8309fd0ed431ac10164a0130fa5a1a2c85f23b5de5445a75dbe0e0e83d7060521454507b1
 DIST avogadrolibs-1.91.0_pre20180415.tar.gz 2541101 BLAKE2B 526d2135af123d31220c8dd87351a35464e3dfd6b8d411d6dc9a6b3e74693090adfa3b61198a6a296eac99e6bbd67623f7aeda6a1752a09e3e3bcaa3df4d5008 SHA512 1cc646368f70523fcf20c6cf598025234162e0c81da64a3b5375c1691a6743f2aceb1f13230937bf9da045e725a23c1c89c8121e07b31ef9e2c7987b1feafccc
 DIST linux64-genXrdPattern 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
-EBUILD avogadrolibs-1.91.0_pre20180415.ebuild 2199 BLAKE2B 429a805feb4f028418bd9d66dc2a27cf1dc4969fc03812f52b1be2bb6996d96d918bf2eaa8658ce3997d8a794683a0a12fcba0d96c2ed693e4f181160abf317c SHA512 3c93329d1873ad9f06dec643681964b280f3718c17319e0fc9eea9003de87b217665e6acfd2c618b27f3e5746b453ea5428d90ba0ec30699f5785645e54d3b63
+EBUILD avogadrolibs-1.91.0_pre20180415.ebuild 2223 BLAKE2B 6a9201d8b944a49fca4a0ef06f227e3d941539666d14a60a12cd72531ff46b1a5845a1543c44a8117b843174a2dacb4b3605e7a5afd4fc893b404bcb9b72304e SHA512 cad3ea94243eccc4f734368a5a8ebdfef1ec7ece172ab6b97e2470b3bc4b5e05c7da2b5ca8c898d4f05ebf5a8531aca6dfbcceea39987dbe5754617bbbe0293e
 MISC metadata.xml 670 BLAKE2B 39737e6ffacaf9284506e41dfa1154f233a6bf37dd514c0eafe6bdf7bd7129a43d81cf4c3e510759b7888277bb403ad933e21abf0ba4dbedd43fda2aa2b55edd SHA512 781b3e67a291253d83d6c2e11124b07dbae652267de2702a1a2b10680f7db19cf35bda8964b320658d849091bd9ead07eeb5fc682a8817101dd1e7a1e9e20757
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
index 0936e94a44ca..f27d9ea8207e 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="BSD GPL-2+"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="archive doc hdf5 qt5 static-plugins test vtk"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="vtk? ( qt5 )"
 
diff --git a/sci-libs/beagle/Manifest b/sci-libs/beagle/Manifest
index cd9533e95d4a..05f9866fe763 100644
--- a/sci-libs/beagle/Manifest
+++ b/sci-libs/beagle/Manifest
@@ -2,5 +2,5 @@ AUX beagle-3.0.3-fix-c++14.patch 1087 BLAKE2B 80c087c98cd5e39331bc078902c3bc1ff4
 AUX beagle-3.0.3-gcc43.patch 3096 BLAKE2B d7c34018389306ce1689f62bbb746def1dca82f39a23398b01ce6c4ed9c33e976b96fe55e33a81850d6032fb09932ba2f9554e06c51ef7ecd64f87aab20eea96 SHA512 3611b41ea82030b192cf36cfa9636a72e874e69b60f69dcbe0745b21c98e8d89e09f52f902b6d4e174a5a64e05b14352227610b4780f917d29122ef03270e702
 AUX beagle-3.0.3-gcc47.patch 447 BLAKE2B 6158075defe88efb7161c6270c66cbc1b2b8576df2b157f2a0a8b9b26cde42d92d596a6ec2bd89a34365112b4571f04efb2e6abc1674b03bb0747c7533768c28 SHA512 693db5621625c8c3323a7f252041f5c2c2eb2609901f326891b782dbcc369f0bf531a2eda40ba08bddb824224e3863ee01917ad56cc99117b2a27aa63599b6d3
 DIST beagle-3.0.3.tar.gz 5002994 BLAKE2B f23c3178a52333aef0d1ba71d3a9ae240a805f016c9f619f59d76f818d9a647505af608aab2e0eb19efba6c6a3ed9d14455e03cfaa38df2b324689ba8139b849 SHA512 2f8f027f3f24d0fd287e27a80fe5b24e18550144add06fb8157dd03f734f5ce212f62889720c81fd33246fa7086e9b913802ec0c5155df5bd801c36888b346cb
-EBUILD beagle-3.0.3-r1.ebuild 1080 BLAKE2B cebefd55ecdcec95010ccc4d2aecbe5c7b42bead859bd33cd747be9296fe8f5ba8d976b6a03a5159fd9c07800770abcfc3ccb2181801b4935ff3c4a41611ec2d SHA512 f95698da02a85c615c966a723dc464cf0b55ebeac3ba5e4ed41be6d9b7bb7db605f2e34dd949089ee6a5bd768eb7114c8d2600be97c61700c102f74f438a11b2
-MISC metadata.xml 621 BLAKE2B 847edac65dbc845d733f06a1a3916cbb1881cf3e7288b098bd66e10fbd4e223986c41ac14fccc6f90edadf7c4ece575d474d7738a1e5ec28cb26c2c64c0629c6 SHA512 69769dfc727998a25726dd144313d37cd7b9539db417f60a2dd93713d8e4490da650cbfe66f2211724ab9f96ee2e87de98854721a6fc591da3b4ed0ffb16e9a2
+EBUILD beagle-3.0.3-r1.ebuild 1082 BLAKE2B 54e4b902a1ef2cba005cbe858493a7db31a11b30d689d209ec8a63ec3c5d50f20263442ede6d9793c4cb916af341cc7e65862c07ba88b9f50893cf9330c3055a SHA512 23b7ee46cc9e0e410fbc8dd6fcc75e1a1a6b59c5f752cdb8eba7a307092da91a803e3cfe24bb0b19a56b2a1edfc831b19597baecb396745dbb31c855405deff2
+MISC metadata.xml 675 BLAKE2B 4fe7528a8c3eb9b20d6bd554cd969d88a2b9484145791de4b82b9ceee30b91c26f6dd63a658716eb7cc04707f375a47655b92737fae606c9854bcf5bd289938d SHA512 3b88a4efef2ba226c2b32bffc25239ad533a9276ce9ee9b69b6bd57c94639153959cb5240dc37e58e3f9551b24c36cae976443380c46afbc5230c4494345f22e
diff --git a/sci-libs/beagle/beagle-3.0.3-r1.ebuild b/sci-libs/beagle/beagle-3.0.3-r1.ebuild
index 65436b9733a4..6cf6a91ecda1 100644
--- a/sci-libs/beagle/beagle-3.0.3-r1.ebuild
+++ b/sci-libs/beagle/beagle-3.0.3-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Open BEAGLE, a versatile EC/GA/GP framework"
 SRC_URI="mirror://sourceforge/beagle/${P}.tar.gz"
-HOMEPAGE="http://beagle.gel.ulaval.ca/"
+HOMEPAGE="https://chgagne.github.io/beagle/"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
diff --git a/sci-libs/beagle/metadata.xml b/sci-libs/beagle/metadata.xml
index 0d243be10737..ee5ba5812c39 100644
--- a/sci-libs/beagle/metadata.xml
+++ b/sci-libs/beagle/metadata.xml
@@ -10,5 +10,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">beagle</remote-id>
+		<remote-id type="github">chgagne/beagle</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
index 2d3c0d14664d..cc57fcb1de30 100644
--- a/sci-libs/btf/Manifest
+++ b/sci-libs/btf/Manifest
@@ -1,6 +1,3 @@
-AUX btf-1.0.1-autotools.patch 1112 BLAKE2B 719b1216d858b2a417ac3738148972974f2c5efc213fe2eecdafafbb8a1577e2f855ef2643d94b5d20e8d07f7e370e991f3cb68bde1eeb4c532ddc002063d268 SHA512 41329d03154fd40cf404deac8a1fdb8a02c7f528d7a810011b933ef440c3389cba7b0182ee7e3b3eb43fbd9e9ff5cdc1da718e6071ed1161c84b1e71913b18cf
-DIST BTF-1.1.3.tar.gz 38276 BLAKE2B f26296ab0d7561cf47f435c4e4bf77758e3333e9a54ad25a909e2788a3407b4b790eb39110ca183df77b07415f755f603e41282c7fb013bada119cd6aaed85f1 SHA512 1e1b3e9bbed22ae417177f1bb960bd8097af05e7fede4b59df270020845e4bc9a77a16733af980d9b309503edc7ab6ffd852d28c6650e4e53b29125c5dc6364c
 DIST btf-1.2.0.tar.bz2 290915 BLAKE2B b9bd3781bfd4fc4924ffb7ee52dc517a6f2ee169daca2a254510d4fddbc9a312fb40de4cadb9ac119c1dee6e3042e9c349ca805f509a958613472f1e423a7bea SHA512 4c2dcd5abf7a72485267a666e679545a5bfa8a20dfbf75a939c92547bdf960d40b6ae93cad23ac44f791e515a13f26c1dae446d3ba6e89b3d1f87d91d4dba50c
-EBUILD btf-1.1.3.ebuild 609 BLAKE2B ce408d4419158d05a635c51d4df536da229d7e6f0d46da945366594ab50a06fb71749168332b878b573d2627a6d8a12b271085c49ceca772686383fac81188d9 SHA512 0bb7d5fd583fbd55cf9f7b92de898078365c1c88b9c4d67bb33b310db4b0ec036af383f6b137e236ba9a72acea18dc61d50650062c4076b9718e7e7cdaadfb4c
 EBUILD btf-1.2.0.ebuild 547 BLAKE2B 837167200c6114d3354235945a0a5eae4e0bfadb9d6bdcd0c11e8e3a1d4817483a04ee9de46712a539ed028364f1a444fbf4fa64b57352faf20d1b1bcb2bb3cf SHA512 ec199159065555fc949db47c06baeee8f30d2b619c4436721f169df082ed41e57e88deac3640893fad570e66f68aa2037b1397b945ae7be36d5c7a25e208ad4b
 MISC metadata.xml 534 BLAKE2B b44c9cb7157ca2496f928f0d4580619991bc3ecc235fef6bca6072e0cd58c2be758f85dd0e4e62552218052db67fe7a24d15c7700a2bcebc88328feb6db93f52 SHA512 90699362212549e8b25ceffbf0df32253d10b5ea2203613d3bbffe5c2e7b228135579be0a63c563083846e8960d9b0594b3e230bd5ecd34100f42b08edd34b50
diff --git a/sci-libs/btf/btf-1.1.3.ebuild b/sci-libs/btf/btf-1.1.3.ebuild
deleted file mode 100644
index 56f4ea71e7ea..000000000000
--- a/sci-libs/btf/btf-1.1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-inherit autotools-utils
-
-MY_PN=BTF
-
-DESCRIPTION="Algorithm for matrix permutation into block triangular form"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/btf/"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="sci-libs/ufconfig"
-RDEPEND=""
-
-DOCS=( README.txt Doc/ChangeLog )
-PATCHES=( "${FILESDIR}"/${PN}-1.0.1-autotools.patch )
-
-S="${WORKDIR}/${MY_PN}"
diff --git a/sci-libs/btf/files/btf-1.0.1-autotools.patch b/sci-libs/btf/files/btf-1.0.1-autotools.patch
deleted file mode 100644
index 4156c2dfeb70..000000000000
--- a/sci-libs/btf/files/btf-1.0.1-autotools.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- configure.ac 	1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac	2008-01-30 12:29:44.232979678 +0000
-@@ -0,0 +1,10 @@
-+# -*- Autoconf -*-
-+AC_PREREQ(2.59)
-+AC_INIT(btf, 1.0.1, davis@cise.ufl.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
-+AC_CHECK_LIB(m, sqrt)
-+AC_CHECK_HEADERS(UFconfig.h)
-+AC_CONFIG_FILES([Makefile Source/Makefile])
-+AC_OUTPUT
---- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am	2008-01-30 12:30:12.862611188 +0000
-@@ -0,0 +1,3 @@
-+SUBDIRS = Source
-+EXTRA_DIST = README.txt
-+include_HEADERS = Include/btf.h Include/btf_internal.h
---- Source/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Source/Makefile.am	2008-01-30 12:37:00.857861512 +0000
-@@ -0,0 +1,12 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
-+
-+BTFSRC = btf_order.c btf_maxtrans.c btf_strongcomp.c
-+
-+lib_LTLIBRARIES = libbtf.la
-+noinst_LTLIBRARIES = libbtfi.la libbtfl.la
-+libbtfi_la_SOURCES = $(BTFSRC)
-+libbtfi_la_CPPFLAGS = $(AM_CPPFLAGS)
-+libbtfl_la_SOURCES = $(BTFSRC)
-+libbtfl_la_CPPFLAGS = $(AM_CPPFLAGS) -DDLONG
-+libbtf_la_SOURCES = 
-+libbtf_la_LIBADD = libbtfl.la libbtfi.la
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index ef2a235b6897..219dac19d9c3 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -2,6 +2,6 @@ AUX cantera_2.4.0_env.patch 3559 BLAKE2B 07af1b751b653b1c92288286b9c82ef230ea0df
 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
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
-EBUILD cantera-2.4.0-r1.ebuild 2828 BLAKE2B 2b41354065b3ce34ddb7c8535fe8e44d14ddb2bc2afb919f72c91ad92f2915895c9a17461d7575e238a719d0043a826eeb5ebd657edc341e289a669f06a5f3cf SHA512 77fdcddcb93927d08976a11828d82f82c4798b2b85795a230a095af4698c4747d4b2241f89d6933d3c5f6b852edc4626557e5ee67eb2243b0bbf40e24c8a8760
-EBUILD cantera-2.4.0-r2.ebuild 2926 BLAKE2B f39d64f5d3177b85ef5d5e2a12397bc62e2095958536bd7b0e9a385ad4c306e2b30085bf61fe9d547533ffa799d5e51fc1963da54041a1493480b5c5ecd213f9 SHA512 a610ce99c7836d58f28c5906ae5a8ce2641acebaeacb7723d149996d736edd16aa2d31c4fac0d33f6143f11097a37f5aeac42f40f875f034159a57cc21a7bea3
+EBUILD cantera-2.4.0-r1.ebuild 2855 BLAKE2B bc6d8688fd01d8baf551a3949c34a6bf511bfde34de650415512cc3ed88e1a869e987bba1031df28967ffa32f9e0e04c5be5620e063bca58b3af8128e6936e0e SHA512 561b7807efe9fa44f34c8e320a7dd2a591c8013081ed7539504aba6be8e0bbacb4fc37c08e38104578341fe3575c0e4afa1f3dc11b29015232689bc1a01a4cfb
+EBUILD cantera-2.4.0-r2.ebuild 2953 BLAKE2B 29f8087e5598c0b55762613c6a8ddb6ba7df1636bd46cb81448ca7cefa0b064e8397fcd71400f7fdc20a296c81b20124bdb1fb8890347881355476551cddb29f SHA512 22272df2ab0c5f349a03fb4f221bc4228ecc160ac17b1040ee0217d3dc4aac4ececd688d10d8bac969d293fc04cc847b28f4325a11bf703d833d81b920b7b264
 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 c277d8d01c6e..2242246e3672 100644
--- a/sci-libs/cantera/cantera-2.4.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+cti fortran pch +python test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	python? ( cti )
diff --git a/sci-libs/cantera/cantera-2.4.0-r2.ebuild b/sci-libs/cantera/cantera-2.4.0-r2.ebuild
index 2d69f8d348c6..2f6a89091503 100644
--- a/sci-libs/cantera/cantera-2.4.0-r2.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r2.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+cti fortran pch +python test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	python? ( cti )
diff --git a/sci-libs/ccpn-data/Manifest b/sci-libs/ccpn-data/Manifest
deleted file mode 100644
index c289a0708a54..000000000000
--- a/sci-libs/ccpn-data/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX 312+ccpn_rhf22_2013-10-02-16-17-30-923_00001.xml 6672 BLAKE2B 390f7a12cd85d674529568e898e6caaecf5727e393201588966bed0388dc14e09b3f4aac4cb52b7b6b9a7b93e6f95d6d5b21c03fa211a7fcd2a1640c401c03f8 SHA512 ce23efeaed52a460979c99b6e60ffaee427a8e5df191132755c7c4bdd36e1246e709cae49643eb5de950668ebc0616e90d872c4092f6a52989d0e0ec224c3845
-DIST analysis2.3.1r2.tar.gz 21683215 BLAKE2B 9eaf77987ff47be3d2ce4f9e9d9a94ce917fd57114181fb2beea56658e5d8e6b6b5b14765b198b29035e6d3b60d3f8fb87b7b21883292a86c3fcf3a36f6f3b50 SHA512 96bf75d1e958340d83836348f5a3045e5b2632913c66d9d74272140085800ea096f1ae53eadfb5bc0eba76804f1864553e82a517d637bdc3bace71b0c1c785ee
-DIST analysis2.4.0.tar.gz 36047222 BLAKE2B 6d38abb06922a4487eed77e19bb920e11f7c6a94e8e62554289310da0ca3555f9ba62e3f9cc52dc9df022ff0d0aebb95d60edd11ce54c645ffaa6efd9cfadab5 SHA512 2f9c5abd401675796d64c620f6142b484084c54af98e0a4800b2bea81de447d711d594ccf773f86ef6631f0482fe0a0ad2881da713d6e022e0704f8dea8d65d9
-DIST analysis2.4.1.tar.gz 36088236 BLAKE2B 8aaf4ffe5a8dc7a6b805a7a66e163cb03b0fc8a45617ebf892268a2f3658e49c48e3c2de4ea654a840eef2c01cf3a3f28f45e053697e68bbc83ce22d19a29cf3 SHA512 db44468c360d51815614fe0055505001c0a7a722f980c2c049c00524672bdfd4a507134ce1d68b29ebf622ffe94e0c9bb9685fea5b3441790b997a64f78c0dc1
-DIST analysis2.4.2.tar.gz 36390919 BLAKE2B 5e7fa44b2029d834ef634b2cd9f2c34d7e6dbfd3e257b9344cff92d13750a21325a2a2f82eb072ae385c528a7406796959c8201edbc1422bc54a17e176d7db33 SHA512 694faefd3c085b559b6bb4729141a9ab885334f578bfbb0ebf260366dbca38c31738d5f5af50b5c7ea16b304b27adf80411082859796a5afeec630c36d56bd8b
-DIST ccpn-update-2.3.1-140425.patch.xz 19020 BLAKE2B 6d86ef7ddeb639b1c7ef50b3b206f4db726369e4c81bb0cd47f1aeec2f1a06d57573e378c1366feca2f35c4db18dc0ae19a9e35de5804595370b8d80f9d41b0c SHA512 071e1a0c4f589a76a6878cb5636516304c3eb9d929924ed1d03c1838cb1d894cc330cc5c6c0b222a71e24513e212f469a69fc3e746ea82e34eb669292d7ce52e
-DIST ccpn-update-2.4.0-140425.patch.xz 1096 BLAKE2B 64aaa083771e84616dd193f3a8ca181386c0784597868d6105744376919e7bab20ec24cdb864e01f6ae5d61b73f304f698824d949a380d7773d03c98f2078816 SHA512 8c1d3df4210f02e8fbb07caabab740c115769457296ae62903f5401ca875b006e355b99dcda32f9606c93c84b0e0cee07acff53fc953bc77918597b58f826e0f
-EBUILD ccpn-data-2.3.1_p140425.ebuild 1909 BLAKE2B 07e6548a301da7cf8c4d9e32a6b750efd109b4e99f0637d9ee49470d1cdc6e4caf9e8f644d8c5a1b432fe6acc00174ed690c96eb9169faa705cac2c74167e1ea SHA512 5c77ff75924d0542c46ec910d7a8e5519f05e0cc16e577872436d2890e0374ad78eadcffff06d2bd0a03c7be0e70dec37220eef9f4a4c6188908545d2089bc8f
-EBUILD ccpn-data-2.4.0_p140425.ebuild 1907 BLAKE2B d70410d14c90c90b4f074739d389ed1727db899f42bc318caf7eba4e951c87b8079be005bb1009b163660c62fd8d7df9c9df704c2e73f067b466b4e0d831e890 SHA512 f14a76197a6ac9a460b5aafa0f83ddfa2938470fe845b089d49086957dd230ed01a48749290d48111b190b431b3cffad2486a1c5a13d1c1986a8717c36fc1fcd
-EBUILD ccpn-data-2.4.1.ebuild 1908 BLAKE2B 7846dfa534ca8f53e1c474794a869b09f956c4d7c410212a5c1347e8d09170e8d80692a0e4fdfb25f1c06df73b2c69dcf2312265889a56b05450a6251895c471 SHA512 ca776c763fa37611b632a6c2bd5660c30529e3591209382886188257f416085a8e8168318f8cf230baa2a2c72c76ac69cd31d35a54f1fc54b7d01b842b1c322b
-EBUILD ccpn-data-2.4.2.ebuild 1908 BLAKE2B c8968b2134718e1ad2b1fb61b6f8899599f38dc489ca0b6b1c05c843947249670e5abfa0504b4fb769fb6b7783bfbfad73b642d05595cebe89262ab7c43ef194 SHA512 9ef6e829de1afd6ab408f96b4f74543061c5291c12a6532933b7dd2170512b93c4bdc7c54aad284db5eeb00304d527126581ff4ac49c5952a55cae8fce0289a1
-MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-libs/ccpn-data/ccpn-data-2.3.1_p140425.ebuild b/sci-libs/ccpn-data/ccpn-data-2.3.1_p140425.ebuild
deleted file mode 100644
index f1212a3d5f05..000000000000
--- a/sci-libs/ccpn-data/ccpn-data-2.3.1_p140425.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils portability python-r1 versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN/-data}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})r2"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR - Data"
-HOMEPAGE="http://www.ccpn.ac.uk/v2-software/software"
-SRC_URI="http://www2.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	!<sci-chemistry/ccpn-${PVR}"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}"/ccpnmr/ccpnmr2.3
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-	cp "${FILESDIR}"/312+ccpn_rhf22_2013-10-02-16-17-30-923_00001.xml data/ccp/nmr/NmrExpPrototype/ || die
-}
-
-src_install() {
-	local i pydocs in_path ein_path
-
-	dodir /usr/share/doc/${PF}/html
-	sed \
-		-e "s:../ccpnmr2.1:${EPREFIX}/usr/share/doc/${PF}/html:g" \
-		../doc/index.html > "${ED}"/usr/share/doc/${PF}/html/index.html || die
-	treecopy $(find python/ -name doc -type d) "${ED}"/usr/share/doc/${PF}/html/
-
-	pydocs="$(find python -name doc -type d)"
-
-	symlinking() {
-		in_path=$(python_get_sitedir)/ccpn
-		ein_path="${in_path#${EPREFIX}}"
-		dosym ../../../../share/doc/${PF}/html ${ein_path}/doc
-		for i in ${pydocs}; do
-			dosym /usr/share/doc/${PF}/html/${i} ${ein_path}/${i}
-		done
-		dosym /usr/share/ccpn/data ${ein_path}/data
-		dosym /usr/share/ccpn/model ${ein_path}/model
-	}
-	python_foreach_impl symlinking
-
-	dohtml -r doc/*
-	insinto /usr/share/ccpn
-	doins -r data model
-}
diff --git a/sci-libs/ccpn-data/ccpn-data-2.4.0_p140425.ebuild b/sci-libs/ccpn-data/ccpn-data-2.4.0_p140425.ebuild
deleted file mode 100644
index 359f1f2acb84..000000000000
--- a/sci-libs/ccpn-data/ccpn-data-2.4.0_p140425.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils portability python-r1 versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN/-data}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR - Data"
-HOMEPAGE="http://www.ccpn.ac.uk/v2-software/software"
-SRC_URI="http://www2.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	!<sci-chemistry/ccpn-${PVR}"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}"/ccpnmr/ccpnmr2.4
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-	cp "${FILESDIR}"/312+ccpn_rhf22_2013-10-02-16-17-30-923_00001.xml data/ccp/nmr/NmrExpPrototype/ || die
-}
-
-src_install() {
-	local i pydocs in_path ein_path
-
-	dodir /usr/share/doc/${PF}/html
-	sed \
-		-e "s:../ccpnmr2.1:${EPREFIX}/usr/share/doc/${PF}/html:g" \
-		../doc/index.html > "${ED}"/usr/share/doc/${PF}/html/index.html || die
-	treecopy $(find python/ -name doc -type d) "${ED}"/usr/share/doc/${PF}/html/
-
-	pydocs="$(find python -name doc -type d)"
-
-	symlinking() {
-		in_path=$(python_get_sitedir)/ccpn
-		ein_path="${in_path#${EPREFIX}}"
-		dosym ../../../../share/doc/${PF}/html ${ein_path}/doc
-		for i in ${pydocs}; do
-			dosym /usr/share/doc/${PF}/html/${i} ${ein_path}/${i}
-		done
-		dosym /usr/share/ccpn/data ${ein_path}/data
-		dosym /usr/share/ccpn/model ${ein_path}/model
-	}
-	python_foreach_impl symlinking
-
-	dohtml -r doc/*
-	insinto /usr/share/ccpn
-	doins -r data model
-}
diff --git a/sci-libs/ccpn-data/ccpn-data-2.4.1.ebuild b/sci-libs/ccpn-data/ccpn-data-2.4.1.ebuild
deleted file mode 100644
index ef092feed4b2..000000000000
--- a/sci-libs/ccpn-data/ccpn-data-2.4.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils portability python-r1 versionator
-
-#PATCHSET="${PV##*_p}"
-MY_PN="${PN/-data}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR - Data"
-HOMEPAGE="http://www.ccpn.ac.uk/v2-software/software"
-SRC_URI="http://www2.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	!<sci-chemistry/ccpn-${PVR}"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}"/ccpnmr/ccpnmr2.4
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-	cp "${FILESDIR}"/312+ccpn_rhf22_2013-10-02-16-17-30-923_00001.xml data/ccp/nmr/NmrExpPrototype/ || die
-}
-
-src_install() {
-	local i pydocs in_path ein_path
-
-	dodir /usr/share/doc/${PF}/html
-	sed \
-		-e "s:../ccpnmr2.1:${EPREFIX}/usr/share/doc/${PF}/html:g" \
-		../doc/index.html > "${ED}"/usr/share/doc/${PF}/html/index.html || die
-	treecopy $(find python/ -name doc -type d) "${ED}"/usr/share/doc/${PF}/html/
-
-	pydocs="$(find python -name doc -type d)"
-
-	symlinking() {
-		in_path=$(python_get_sitedir)/ccpn
-		ein_path="${in_path#${EPREFIX}}"
-		dosym ../../../../share/doc/${PF}/html ${ein_path}/doc
-		for i in ${pydocs}; do
-			dosym /usr/share/doc/${PF}/html/${i} ${ein_path}/${i}
-		done
-		dosym /usr/share/ccpn/data ${ein_path}/data
-		dosym /usr/share/ccpn/model ${ein_path}/model
-	}
-	python_foreach_impl symlinking
-
-	dohtml -r doc/*
-	insinto /usr/share/ccpn
-	doins -r data model
-}
diff --git a/sci-libs/ccpn-data/ccpn-data-2.4.2.ebuild b/sci-libs/ccpn-data/ccpn-data-2.4.2.ebuild
deleted file mode 100644
index 624c6fee4867..000000000000
--- a/sci-libs/ccpn-data/ccpn-data-2.4.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils portability python-r1 versionator
-
-#PATCHSET="${PV##*_p}"
-MY_PN="${PN/-data}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR - Data"
-HOMEPAGE="http://www.ccpn.ac.uk/v2-software/software"
-SRC_URI="http://www2.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	!<sci-chemistry/ccpn-${PVR}"
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}"/ccpnmr/ccpnmr2.4
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-	cp "${FILESDIR}"/312+ccpn_rhf22_2013-10-02-16-17-30-923_00001.xml data/ccp/nmr/NmrExpPrototype/ || die
-}
-
-src_install() {
-	local i pydocs in_path ein_path
-
-	dodir /usr/share/doc/${PF}/html
-	sed \
-		-e "s:../ccpnmr2.1:${EPREFIX}/usr/share/doc/${PF}/html:g" \
-		../doc/index.html > "${ED}"/usr/share/doc/${PF}/html/index.html || die
-	treecopy $(find python/ -name doc -type d) "${ED}"/usr/share/doc/${PF}/html/
-
-	pydocs="$(find python -name doc -type d)"
-
-	symlinking() {
-		in_path=$(python_get_sitedir)/ccpn
-		ein_path="${in_path#${EPREFIX}}"
-		dosym ../../../../share/doc/${PF}/html ${ein_path}/doc
-		for i in ${pydocs}; do
-			dosym /usr/share/doc/${PF}/html/${i} ${ein_path}/${i}
-		done
-		dosym /usr/share/ccpn/data ${ein_path}/data
-		dosym /usr/share/ccpn/model ${ein_path}/model
-	}
-	python_foreach_impl symlinking
-
-	dohtml -r doc/*
-	insinto /usr/share/ccpn
-	doins -r data model
-}
diff --git a/sci-libs/ccpn-data/files/312+ccpn_rhf22_2013-10-02-16-17-30-923_00001.xml b/sci-libs/ccpn-data/files/312+ccpn_rhf22_2013-10-02-16-17-30-923_00001.xml
deleted file mode 100644
index 60e8041c99da..000000000000
--- a/sci-libs/ccpn-data/files/312+ccpn_rhf22_2013-10-02-16-17-30-923_00001.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<_StorageUnit release="2.1.2" originator="CCPN Python XmlIO" packageGuid="www.ccpn.ac.uk_Fogh_2006-08-16-14:22:45_00019" time="Wed Oct  2 16:22:49 2013">
-
-<NMRX.NmrExpPrototype _ID="_1" createdBy="ccpnRef" guid="ccpn_rhf22_2013-10-02-16-17-30-923_00001" lastUnlockedBy="editor" serial="312">
-  <NMRX.NmrExpPrototype.category>
-    <NMRX.ExpCategory>through-bond</NMRX.ExpCategory>
-  </NMRX.NmrExpPrototype.category>
-  <NMRX.NmrExpPrototype.details>
-    <IMPL.Text>e.g. POST-C7, INADEQUATE</IMPL.Text>
-  </NMRX.NmrExpPrototype.details>
-  <NMRX.NmrExpPrototype.name>
-    <IMPL.Line>C[DQ(CC)]_C.through-space</IMPL.Line>
-  </NMRX.NmrExpPrototype.name>
-  <NMRX.NmrExpPrototype.synonym>
-    <IMPL.Line>13C DQ</IMPL.Line>
-  </NMRX.NmrExpPrototype.synonym>
-  <NMRX.NmrExpPrototype.atomSites>
-    <NMRX.AtomSite _ID="_2" isotopeCode="13C" name="C" serial="1">
-      <NMRX.AtomSite.expMeasurements> _3 _4</NMRX.AtomSite.expMeasurements>
-      <NMRX.AtomSite.expTransfers> _5 _6</NMRX.AtomSite.expTransfers>
-    </NMRX.AtomSite>
-    <NMRX.AtomSite _ID="_7" isotopeCode="13C" name="C" serial="2">
-      <NMRX.AtomSite.expMeasurements> _4</NMRX.AtomSite.expMeasurements>
-      <NMRX.AtomSite.expTransfers> _5</NMRX.AtomSite.expTransfers>
-    </NMRX.AtomSite>
-    <NMRX.AtomSite _ID="_8" isotopeCode="13C" name="C" serial="3">
-      <NMRX.AtomSite.expMeasurements> _9</NMRX.AtomSite.expMeasurements>
-      <NMRX.AtomSite.expTransfers> _6</NMRX.AtomSite.expTransfers>
-    </NMRX.AtomSite>
-  </NMRX.NmrExpPrototype.atomSites>
-  <NMRX.NmrExpPrototype.expGraphs>
-    <NMRX.ExpGraph _ID="_10" serial="1">
-      <NMRX.ExpGraph.expSteps>
-        <NMRX.ExpStep _ID="_11" serial="1" stepNumber="1">
-        </NMRX.ExpStep>
-        <NMRX.ExpStep _ID="_12" serial="2" stepNumber="2">
-        </NMRX.ExpStep>
-        <NMRX.ExpStep _ID="_13" serial="3" stepNumber="3">
-        </NMRX.ExpStep>
-        <NMRX.ExpStep _ID="_14" serial="4" stepNumber="4">
-        </NMRX.ExpStep>
-      </NMRX.ExpGraph.expSteps>
-      <NMRX.ExpGraph.expTransfers>
-        <NMRX.ExpTransfer _ID="_5" serial="1" transferType="onebond">
-          <NMRX.ExpTransfer.atomSites> _7 _2</NMRX.ExpTransfer.atomSites>
-        </NMRX.ExpTransfer>
-        <NMRX.ExpTransfer _ID="_6" serial="2" transferToSelf="true" transferType="through-space">
-          <NMRX.ExpTransfer.atomSites> _8 _2</NMRX.ExpTransfer.atomSites>
-        </NMRX.ExpTransfer>
-      </NMRX.ExpGraph.expTransfers>
-    </NMRX.ExpGraph>
-  </NMRX.NmrExpPrototype.expGraphs>
-  <NMRX.NmrExpPrototype.expMeasurements>
-    <NMRX.ExpMeasurement _ID="_3" serial="1">
-      <NMRX.ExpMeasurement.measurementType>
-        <NMRX.ExpMeasurementType>Shift</NMRX.ExpMeasurementType>
-      </NMRX.ExpMeasurement.measurementType>
-      <NMRX.ExpMeasurement.atomSites> _2</NMRX.ExpMeasurement.atomSites>
-      <NMRX.ExpMeasurement.expSteps> _11 _13</NMRX.ExpMeasurement.expSteps>
-      <NMRX.ExpMeasurement.refExpDimRefs> _15</NMRX.ExpMeasurement.refExpDimRefs>
-    </NMRX.ExpMeasurement>
-    <NMRX.ExpMeasurement _ID="_4" serial="2">
-      <NMRX.ExpMeasurement.atomSiteWeights> 1.0 1.0</NMRX.ExpMeasurement.atomSiteWeights>
-      <NMRX.ExpMeasurement.measurementType>
-        <NMRX.ExpMeasurementType>MQShift</NMRX.ExpMeasurementType>
-      </NMRX.ExpMeasurement.measurementType>
-      <NMRX.ExpMeasurement.atomSites> _2 _7</NMRX.ExpMeasurement.atomSites>
-      <NMRX.ExpMeasurement.expSteps> _12</NMRX.ExpMeasurement.expSteps>
-      <NMRX.ExpMeasurement.refExpDimRefs> _16 _17</NMRX.ExpMeasurement.refExpDimRefs>
-    </NMRX.ExpMeasurement>
-    <NMRX.ExpMeasurement _ID="_9" serial="3">
-      <NMRX.ExpMeasurement.measurementType>
-        <NMRX.ExpMeasurementType>Shift</NMRX.ExpMeasurementType>
-      </NMRX.ExpMeasurement.measurementType>
-      <NMRX.ExpMeasurement.atomSites> _8</NMRX.ExpMeasurement.atomSites>
-      <NMRX.ExpMeasurement.expSteps> _14</NMRX.ExpMeasurement.expSteps>
-      <NMRX.ExpMeasurement.refExpDimRefs> _18 _19</NMRX.ExpMeasurement.refExpDimRefs>
-    </NMRX.ExpMeasurement>
-  </NMRX.NmrExpPrototype.expMeasurements>
-  <NMRX.NmrExpPrototype.refExperiments>
-    <NMRX.RefExperiment _ID="_20" serial="3">
-      <NMRX.RefExperiment.name>
-        <IMPL.Line>C[DQ(CC)]_C.through-space</IMPL.Line>
-      </NMRX.RefExperiment.name>
-      <NMRX.RefExperiment.synonym>
-        <IMPL.Line>13C DQ-SQ-SQ</IMPL.Line>
-      </NMRX.RefExperiment.synonym>
-      <NMRX.RefExperiment.refExpDims>
-        <NMRX.RefExpDim _ID="_21" dim="1">
-          <NMRX.RefExpDim.refExpDimRefs>
-            <NMRX.RefExpDimRef _ID="_19" serial="1">
-              <NMRX.RefExpDimRef.validScalingFactors> 1.0</NMRX.RefExpDimRef.validScalingFactors>
-            </NMRX.RefExpDimRef>
-          </NMRX.RefExpDim.refExpDimRefs>
-        </NMRX.RefExpDim>
-        <NMRX.RefExpDim _ID="_22" dim="2">
-          <NMRX.RefExpDim.refExpDimRefs>
-            <NMRX.RefExpDimRef _ID="_15" serial="1">
-              <NMRX.RefExpDimRef.validScalingFactors> 1.0</NMRX.RefExpDimRef.validScalingFactors>
-            </NMRX.RefExpDimRef>
-          </NMRX.RefExpDim.refExpDimRefs>
-        </NMRX.RefExpDim>
-        <NMRX.RefExpDim _ID="_23" dim="3">
-          <NMRX.RefExpDim.refExpDimRefs>
-            <NMRX.RefExpDimRef _ID="_17" serial="1">
-              <NMRX.RefExpDimRef.validScalingFactors> 1.0</NMRX.RefExpDimRef.validScalingFactors>
-            </NMRX.RefExpDimRef>
-          </NMRX.RefExpDim.refExpDimRefs>
-        </NMRX.RefExpDim>
-      </NMRX.RefExperiment.refExpDims>
-    </NMRX.RefExperiment>
-    <NMRX.RefExperiment _ID="_24" serial="4">
-      <NMRX.RefExperiment.name>
-        <IMPL.Line>c[DQ(CC)]_C.through-space</IMPL.Line>
-      </NMRX.RefExperiment.name>
-      <NMRX.RefExperiment.synonym>
-        <IMPL.Line>13C DQ-SQ-SQ</IMPL.Line>
-      </NMRX.RefExperiment.synonym>
-      <NMRX.RefExperiment.refExpDims>
-        <NMRX.RefExpDim _ID="_25" dim="1">
-          <NMRX.RefExpDim.refExpDimRefs>
-            <NMRX.RefExpDimRef _ID="_18" serial="1">
-              <NMRX.RefExpDimRef.validScalingFactors> 1.0</NMRX.RefExpDimRef.validScalingFactors>
-            </NMRX.RefExpDimRef>
-          </NMRX.RefExpDim.refExpDimRefs>
-        </NMRX.RefExpDim>
-        <NMRX.RefExpDim _ID="_26" dim="2">
-          <NMRX.RefExpDim.refExpDimRefs>
-            <NMRX.RefExpDimRef _ID="_16" serial="1">
-              <NMRX.RefExpDimRef.validScalingFactors> 1.0</NMRX.RefExpDimRef.validScalingFactors>
-            </NMRX.RefExpDimRef>
-          </NMRX.RefExpDim.refExpDimRefs>
-        </NMRX.RefExpDim>
-      </NMRX.RefExperiment.refExpDims>
-    </NMRX.RefExperiment>
-  </NMRX.NmrExpPrototype.refExperiments>
-</NMRX.NmrExpPrototype>
-
-</_StorageUnit>
-<!--End of Memops Data-->
diff --git a/sci-libs/ccpn-data/metadata.xml b/sci-libs/ccpn-data/metadata.xml
deleted file mode 100644
index 8937bad0b175..000000000000
--- a/sci-libs/ccpn-data/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-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 697fa311ebd4..1e9c30bbee21 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,5 +1,5 @@
 DIST ceres-solver-1.11.0.tar.gz 3944965 BLAKE2B cafae018abde9b8085f7e8841a6a720ef52cd40178a43c3050b6b20465bc9675cc326a6bc405572a235758c5f2f99e936375f711bf5c4b121acfe0c0641713c6 SHA512 4941538e6ec31e2ee56a24446748dc5d6dd02ba9c151e4320a2db943fd1a377455b0ee23d56780e1f05322b30e25057145c540fde901d7fd2244ec630a73527c
 DIST ceres-solver-1.12.0.tar.gz 5008861 BLAKE2B 52b3954dde96386bd031543ab9d7370368f58f76f1dec9d24ef10803da787cc96f40a1c775626fde832b70ebd94cf4274c70a8fb4bd7e1bcf040e119cbec09f8 SHA512 485eece0471cf05d31b5dd7e133e23115a334a4ed557a3c1bd0b715a063f840738af8f507e935522a0dae90ce6851984c0002a25e9b445b90889792f68a05571
-EBUILD ceres-solver-1.11.0.ebuild 2386 BLAKE2B a10b3bfd896a22a1b9898d1bae44bd6812e599afbc3ef4b5d9824dec772eb1a8363ed021e01e77064fbd4731e2f82ddcb80a2d78ce1ba21290f460790357b068 SHA512 f35ebac140fe5e9be8ed07513bc7b50c97a28730c639448634cc03f49df3845239d368c25f1964e9381bf0fee220cdca0e26c35024d334ca7fece2935038ad8f
-EBUILD ceres-solver-1.12.0.ebuild 2393 BLAKE2B e83b837f75a6a6162f9b3e96d4821c380b787cdb2d84dd657b4a5f91449ae7e561827ff52cb92453ba1b4f5cf66d92d55eba6678c83c976c3b0c3fb1ae5bda3a SHA512 4c4f780482bb31015db872f5a856117778282572ceafe889ebfbb4503cdff07079ce4eed122ee145a665515ffbb7334a854c8c4ca657a58b7219ead76ff7a87d
+EBUILD ceres-solver-1.11.0.ebuild 2410 BLAKE2B f4ef50b480c80873742e73f32289de48e3a9a1ad88504813fa1770e6ba29a5a634d6af4ab477a3754327067b12fa4ad907cc978dd31e8838eb0ea2aa8a204bb3 SHA512 cc1be122eee85fdb08490c4cc98ee9f08cb9996ff216ec8c6c9a6e755c88434a0362d471c41d4802c794dce4a2b7bd61debb251be1f051fcbe6be16ff3ac2c9c
+EBUILD ceres-solver-1.12.0.ebuild 2420 BLAKE2B dfc1af700aa4f052632f4d027197928b6445f881b148fc5a25dd5ca90baa7a62cb4221f75593c6921a70d7d422205ba1d7d5e4478ac1709269e08d7d4ddd8682 SHA512 36c4eb5be0e185fb90ef49adbd83bf486dd1e93e29f474869ef100be4ecda7167ee5e7d951ac256a64d08b409a1aed2915c1268edb88f07e98c8cdfee6c49a37
 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 28e2a35d321f..cfcd2588d25a 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cxsparse c++11 doc examples gflags lapack openmp +schur sparse test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )"
 
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 e2f4c1ef0813..225ebefda327 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
 SLOT="0/1"
 KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cxsparse c++11 doc examples gflags lapack openmp +schur sparse test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )"
 
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 8588f87887c3..32d38ec31bca 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,9 +1,5 @@
 DIST cfitsio-3.360.tar.gz 4104894 BLAKE2B 7a84177c28679db5c27d0586cb6959a0663918a84d46ced9aea6ef7e6bdd32955946807efd4cd852e55128dbc887c4a2135b2eba26847b265011bfd6df049335 SHA512 158819b4a3a29c29a5f017283e2b20067420994e881d202dbf3ba199c9e564dc1e74f8be5ce84f78107126d2a8688cc55cc7ed284540ca647e44cdc3b0b02072
-DIST cfitsio-3.38.tar.gz 4142236 BLAKE2B 05311f9faf4cc7cfbd8c065c075b07941ce4114219f447f9ab85bb51c2e38eee2163b832ce0afe352fa0c3bc82a54d857525b7b9ec1d906fa20be4fb201dee9e SHA512 7428c1c87736ca384153f7f810e0bdbccdcc2f41892b0b9ceda9e5efb20655585c2789b16510a5362f8b67ef53a0ac443094786966e5748cbe7ad828599723fc
-DIST cfitsio-3.39.tar.gz 4177822 BLAKE2B 1cdaa3c930b9e2c254e2fa052e8643311594da1ab25b0739b160b8c131b6e140851fe74f0519c38aee929ca4d8dbac02fdf98310114a66d850b8943eaa2bc621 SHA512 a6cde8353d7beede7e7a53ba7109c3a6b5812355a423ad8e2e459281ac760b392014e3ee2d2f30c639eef38294ebac59950010e3cadfd078692f6d3c6d167e3f
 DIST cfitsio-3.410.tar.gz 4194529 BLAKE2B 31250b9add5b6a85c919c33251d127117ceab81c2243e0b9f8bbe2ef0fd09c85a938b7525338bc718a9b3035efa3660ecffa17ec79e3e278c8014e727f23473b SHA512 cc1de2a4314e7c82bdd6855e11dea4e18dc4e7bcb27b0d15b884cbaeb4acd3b1e12dadd17ab83c7917570934913f89337035470ee4921e7b62409a81052d70cd
 EBUILD cfitsio-3.360.ebuild 1466 BLAKE2B 2fb223fb28e174080819389a09174685a77cb4ac1f96015e15932b16d81e059f908fa4052b7bee6fb1db20497eafa312e6fb92f2499b7cf01eb29af1ce052a02 SHA512 d0b05587db82dae7c49250b9e4a426b7d12c6a1c904210da1b08d0dbb0db44ae01cb53f0c28adba97f5487f74bcdc7c1c19b9c4286dcb3ea232a2e77c64b7068
-EBUILD cfitsio-3.38-r1.ebuild 1591 BLAKE2B 4a4360c3b04dee99f0b62d0a03b60c02798211fccc4d3f64af726ce0775337510125d35a1d51a38ddc78db46a2b9b6deff5ec4224d10e93b687a8ab8e1582c3d SHA512 ee50da814b874ab5f3d3835ab7658694d94940eba4e7d58f9dec53c4b8fe4c1a9c98b8f5b61e3d2a1b195d8839d72b046645f0eceb8354f703c350b0a5d92308
-EBUILD cfitsio-3.39.ebuild 1596 BLAKE2B 7a167a2855fdcb796610ac1b3a17701c003bae05d0b64d1e9272ba8541116e2a5df9ebf2ec1be457d840e753a07a39bcab8b5720667d81e8c8c4a1e445d2b290 SHA512 0e2d890700a61a280fd8330679babc890f046e4a7e3cc85c724e4b7a3bea6e5da7f17ecd88ac7f84286ef174aaedce2b483491a7b66b8c423775c51a68c8d395
 EBUILD cfitsio-3.410.ebuild 1590 BLAKE2B b4bec4603d86823e19d85676bb180611e90f48d798b8888934dd8d2d78c4e6a42cb5af47d2a30a5434f3121e2d57e4199a53ed3b3903dd2f59c6d307138f47c8 SHA512 caa9b4805389dd41b9489389be2eddf82bdc17ac47e73cdb96ec1f1938428a1cf1072eeae664dcdce8f13dc3ac84ad892a38e7c4be6f483f34f736dd352190e1
 MISC metadata.xml 840 BLAKE2B 6f024cc96a9da7bef155b5138d55b518a1ae917af045cd2970227ca1993461659eea8883dc3b6b9e4d3d2aaa5c49b4900e122dbb83a437aa3d94351c333934d7 SHA512 946044116d9a865e3b7e883b41f7d74a3f54c72cd857aed4dcb454cfe559385004b3e55562a306bfa3347cfc035a5af9a5aaa8a4d8dc7fe154b8d0dae7a7390b
diff --git a/sci-libs/cfitsio/cfitsio-3.38-r1.ebuild b/sci-libs/cfitsio/cfitsio-3.38-r1.ebuild
deleted file mode 100644
index 5c7c6535756a..000000000000
--- a/sci-libs/cfitsio/cfitsio-3.38-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools-multilib fortran-2
-
-DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="bzip2 doc examples fortran static-libs +tools threads"
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	fortran? ( dev-lang/cfortran )"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	# avoid internal cfortran
-	if use fortran; then
-		mv cfortran.h cfortran.h.disabled
-		ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
-	fi
-	autotools-multilib_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable fortran)
-		$(use_enable threads)
-		$(use_enable tools)
-		$(use_with bzip2)
-	)
-	autotools-multilib_src_configure
-}
-
-src_install () {
-	autotools-multilib_src_install
-	dodoc README README.md CHANGES.md docs/changes.txt docs/cfitsio.doc
-	use fortran && dodoc docs/fitsio.doc
-	use doc && dodoc docs/{quick,cfitsio,fpackguide}.pdf
-	use doc && use fortran && dodoc docs/fitsio.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins cookbook.c testprog.c speed.c smem.c
-		use fortran && doins cookbook.f testf77.f
-	fi
-}
diff --git a/sci-libs/cfitsio/cfitsio-3.39.ebuild b/sci-libs/cfitsio/cfitsio-3.39.ebuild
deleted file mode 100644
index e38c68f855f4..000000000000
--- a/sci-libs/cfitsio/cfitsio-3.39.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 multilib-minimal
-
-DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="bzip2 doc examples fortran static-libs +tools threads"
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	fortran? ( dev-lang/cfortran )"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	# avoid internal cfortran
-	if use fortran; then
-		mv cfortran.h cfortran.h.disabled
-		ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
-	fi
-	default
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable fortran) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(use_enable tools) \
-		$(use_with bzip2)
-}
-
-multilib_src_install_all() {
-	dodoc README README.md CHANGES.md docs/changes.txt docs/cfitsio.doc
-	use fortran && dodoc docs/fitsio.doc
-	use doc && dodoc docs/{quick,cfitsio,fpackguide}.pdf
-	use doc && use fortran && dodoc docs/fitsio.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins cookbook.c testprog.c speed.c smem.c
-		use fortran && doins cookbook.f testf77.f
-	fi
-	prune_libtool_files --all
-}
diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest
index 51879f036e2c..0115f6725cfa 100644
--- a/sci-libs/cgnslib/Manifest
+++ b/sci-libs/cgnslib/Manifest
@@ -1,5 +1,5 @@
 DIST cgnslib-3.3.0.tar.gz 3314889 BLAKE2B 3b8af11e04c211ca60f512c7995e9b23e0dd79180f3443f238562216073740de6b845c5bb78d6fb017bbf41e5249c1f58c27130047fd50afb4b20bbc778a046b SHA512 eb5c79d3830f8ee1fa30a67fbf32133c13a276c4b18a553826e4670bd4aa7262d7751bccb74c5e208cd47703f9076bde2e2e0db70408c88fde3ac11b638e6ff3
 DIST cgnslib-3.4.0.tar.gz 3393312 BLAKE2B 279d4502ff70701df6a266495ccc7750e9c51ac14bd3d5072ae8e1448b4f1e4afaefaaf254cf0afe1cc984e4d9fc7d5c161f7696f62726aaf567990ded3c9056 SHA512 e26cfb0d9f3061242d327a6c18fe40ed51bf63b61ae0d6b5cce7e6b4aa623b00e1c3fd9fe240d993323c6f4eec043fde5296a82b1f9108027f945300eec541ec
-EBUILD cgnslib-3.3.0.ebuild 1976 BLAKE2B d5bc20620ad851ee7dd2f491f1b17b2970ee7c41d3dcd640cb72704129767d3ee3a68613e0f5e7eb8ab4436ccd40ee8e6e1c9961ffe4188fd8206b20cf393d65 SHA512 6662f4a324febcec8164ac2ee037254c38a1822c2131467bc54c18c0d196194b8e2b08cc9183c4dc783d59a56cd3832b24ab6310c0f72406a0a2edb47c3f6a1d
-EBUILD cgnslib-3.4.0.ebuild 1916 BLAKE2B 71752f19c5ffbb20ee213462ada6007fb15ef8345217f23857ad7a0accd4dc5747f462038fca6152e7015087aa19d9e1b808a73f8f92246bf87d6f517199653c SHA512 e7e8fde0e3ff62fa41ed90410b83d878ebb11ba458c95fe3d18f80c5277d692fa273e203fdb8e6320dfa84193819831adfdd6d2b25e0f2f16c07ccd7a13979f6
+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
diff --git a/sci-libs/cgnslib/cgnslib-3.3.0.ebuild b/sci-libs/cgnslib/cgnslib-3.3.0.ebuild
index e3e6d2d56d92..3d8fd059480e 100644
--- a/sci-libs/cgnslib/cgnslib-3.3.0.ebuild
+++ b/sci-libs/cgnslib/cgnslib-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ LICENSE="ZLIB"
 SLOT="0/3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fortran hdf5 legacy mpi static-libs szip test tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="hdf5? ( sci-libs/hdf5:=[mpi=,szip=] )
 	tools? (
diff --git a/sci-libs/cgnslib/cgnslib-3.4.0.ebuild b/sci-libs/cgnslib/cgnslib-3.4.0.ebuild
index 2358691f512a..e5889cb043ad 100644
--- a/sci-libs/cgnslib/cgnslib-3.4.0.ebuild
+++ b/sci-libs/cgnslib/cgnslib-3.4.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="ZLIB"
 SLOT="0/3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fortran hdf5 legacy mpi static-libs szip test tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="hdf5? ( sci-libs/hdf5:=[mpi=,szip=] )
 	tools? (
diff --git a/sci-libs/clblas/Manifest b/sci-libs/clblas/Manifest
index d31fa95047cf..b008b3dacfd1 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 2357 BLAKE2B 09175185d9956f21c5250cd67c84f09476f6727e96c06bff6036dc8ce2e686f06bf69ac593674c38639392b04889967e6d4fb5cba36c05804f313d60b87bc007 SHA512 9f232367a14cf8200847ace8b84743173cd8a96e332959c22b1be15650651e70667aeb3a14520a63a3b100a4dba2ea28c9102856d797d99f45785f30199eed97
+EBUILD clblas-2.10.ebuild 2384 BLAKE2B a8a68971e820255866a60c112bf0d188cd376dcbdfd609b5369523709dd81151e5b3bc9f611c5e6ae2e8f027e0bda329583d24de23fbfc552ae6244fc309522f SHA512 c434c53534d444e3777a97efcd1551491d6deffc528e472b468ffa5210b9c002c866361103139a2a09e50ea3f81a5d241ecf422147795465c3f09d0f49c35032
 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 c7e12732bda6..c9341e091ed2 100644
--- a/sci-libs/clblas/clblas-2.10.ebuild
+++ b/sci-libs/clblas/clblas-2.10.ebuild
@@ -18,6 +18,7 @@ LICENSE="Apache-2.0"
 SLOT="0/2" # soname version
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+client doc examples ktest performance test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="performance? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/clblast/Manifest b/sci-libs/clblast/Manifest
index d042ed6f64dc..2d53960236e7 100644
--- a/sci-libs/clblast/Manifest
+++ b/sci-libs/clblast/Manifest
@@ -1,3 +1,3 @@
 DIST clblast-0.10.0.tar.gz 508763 BLAKE2B 9b0089963e41b0d0f193ec05d3ba31a2b8b1cb70a38fcbf2fb6240d96cfb81d566068a35a9e35014f84196edd4e622befac76d9ba5d49660eda8992be14d622e SHA512 da1fc659dd470c02c25be0a009b7f5e2333bc590715ac6b90e09e57a25d764479d7e4ecf398f17d0ac0e6bb2eaf24c09082c7f047fb7b3044f4a987e294494ee
-EBUILD clblast-0.10.0.ebuild 1506 BLAKE2B b9de524b6b9248f81270fee200e3d002b47885ed2df3e59c7d03c5fadb4ea5540a5baf518040e1e0401470c5c1e915250af8f9be9ee1121e70445db8abe7e851 SHA512 fc6b562cba51fdc93f80a266857d33d733d4132d4e7c84d1c8ecac5c7daa8881fed4856f498f56f21674b24a7d98bbe295c46038c4c67ff864160168f6562de5
+EBUILD clblast-0.10.0.ebuild 1530 BLAKE2B 269471f1a6f2b6dac3d8038126fe5242d2a6f0edbbbf999741e68c9e12a8d6d8397936bc91c3822c08cbda9e82362e3377f2db014bdf0789bf9e0c584a1c1e50 SHA512 9dc10282f6d861f0fbe15e9e8d8f8fe4bdb99c68a208793211bbf4dc4fc26e66c4509c7ed2d316f7346fa0be51b0a51f97ed8cd9c20bf5f35057183e3d15b86d
 MISC metadata.xml 954 BLAKE2B 3211b3d1da463b4b3df6f5f6b8ca21f02f0155e3e1be3be17c53aad744a644a38c8e042a502694b7632d48114f1dea84b24cb4d8cd892d687ea3b52c0f70e412 SHA512 32637508226381a330fbc29874d5d6a157860f16846b0927f9530cc8f2a36c64f40c483ea89d27671f13f600fd560b1d0314846d55a73cf8a2263c7c5860564c
diff --git a/sci-libs/clblast/clblast-0.10.0.ebuild b/sci-libs/clblast/clblast-0.10.0.ebuild
index 0327840fce5b..6d0652b6e787 100644
--- a/sci-libs/clblast/clblast-0.10.0.ebuild
+++ b/sci-libs/clblast/clblast-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="client doc examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="virtual/opencl"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/cln/Manifest b/sci-libs/cln/Manifest
index c915ba19d196..2134429e76b8 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 1310 BLAKE2B 1cc917a8ea51df291ada350708c37272c6a56326549f2e13718569bf9d485d826e5694c66e98a75424a3c37694fe13dc4e44ddc61528c63af62c4e4b7019ebe2 SHA512 9041c9354830444220312280678ad827bc36b36d529923367e680352a80e04acc47457d974a04548c72abf366d305b6b1adae6c75b4e1d21b4f9df6d57169d2e
+EBUILD cln-1.3.4.ebuild 1301 BLAKE2B 366f4f7bb3eac07571eff80399c100b10181c49cefc8529acd52c8f97b9a8750f222c6312df1d957a291ea49ea7f89c0656f20f03dbcf08fb17c0e84641f48b1 SHA512 2cd9a893ba779bc9b89025af6ea80c00d78fe08465aaca4eaa9c2ed46cab1a0f8dee67a74e69350b6b8ef6bad7ad51144542e34d7149d9602029cd214c8920e3
 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 5677aa74dadd..d49041fadf08 100644
--- a/sci-libs/cln/cln-1.3.4.ebuild
+++ b/sci-libs/cln/cln-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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/cminpack/Manifest b/sci-libs/cminpack/Manifest
index b58485eb32f5..89ee9c6d03af 100644
--- a/sci-libs/cminpack/Manifest
+++ b/sci-libs/cminpack/Manifest
@@ -1,4 +1,4 @@
 AUX cminpack-1.3.5-underlinking.patch 338 BLAKE2B 65f3d7014529ea914067fd8a46bc6812fb688e456f416bab8af2ac145833321c0bbc1cbce1e8901bc1b3c76862f273e69db32a483b50903824baffc065d4115a SHA512 e75edbe045d6936d09a2454504fba6b5b5535424aa1c7603df4b55416e801d27f74f1e2db1038193d36262a12734760138df1c66b6c3d9e6d318f124e7409307
 DIST cminpack-1.3.5.tar.gz 312932 BLAKE2B 52ab91490f7c569e3931346510e08db55166322399736ceb9cc090a3be3624e8db6de12ed33ee8f97f6c5358dc2488f8aa7c7aab81365316f1dbb8948e669a2e SHA512 bb6f1764d90ccc7cbbb114a509f5416567246a730e4329617671e01b535b3a69f6a6df0483810ad1ad28228a1061a3595a15d437647b94a8a2013203905c6fed
-EBUILD cminpack-1.3.5.ebuild 821 BLAKE2B 95effef87137dafa1e3afaa5c60b748a725f0dd164e5338b1690a35e8f897cbdaaf95c6f11ed68eedfd1cd86d024ff025e3ddd4b61145df09f443f6fa9fcdeeb SHA512 211026ea97bf24f287b786f32b27f977be65a6e6d08bfc15b1b16af0e3e25a75a10cdbafe518f62f871d9f2f38e7f10cd528f5fde27bfe74354d96deed2ac68d
+EBUILD cminpack-1.3.5.ebuild 845 BLAKE2B bbbb439f79afb649233d934bb4bd2e3497e61460a71809cbda8c269987436504a80386aebcc1d78ce9c0651309a2feabd46887a0b63582d3bd1283733beb3ebb SHA512 a3b23a4dcf8523675512a3e045d481cf9412316f829cfabcb3c6a7acfcb1457726b5576cd16f10dd2700c09a738dfe04f546f79152347b14f7fd7f21dce1fa1b
 MISC metadata.xml 993 BLAKE2B e037c0d06b1c6192de166d3ced5f6dbc92229fd268ee83e0e6589b05314906c5469d521c61b8d88b6e6c66e877e54e15fd6d7e57b16fa27b62167671d3b0c274 SHA512 d488a3fe1cfc9a04264d7e6078b033b4056236736d7466a609e308988c9e36c25d4fdce24bb3606e8b9878a63ee3ec9a660ab296f081004b601f6317b80bf257
diff --git a/sci-libs/cminpack/cminpack-1.3.5.ebuild b/sci-libs/cminpack/cminpack-1.3.5.ebuild
index 7e59ab588eee..6314fdf3354d 100644
--- a/sci-libs/cminpack/cminpack-1.3.5.ebuild
+++ b/sci-libs/cminpack/cminpack-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="minpack"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
 
diff --git a/sci-libs/coinor-alps/Manifest b/sci-libs/coinor-alps/Manifest
index ce645c459dc4..2423f8574760 100644
--- a/sci-libs/coinor-alps/Manifest
+++ b/sci-libs/coinor-alps/Manifest
@@ -1,5 +1,5 @@
 DIST Alps-1.4.9.tgz 5564207 BLAKE2B a0a38b0b9da0703f2b67d20fe4fe99cfa5a31c288caf30f6581263b421963f7274bdb1251fc78db572381ad091f341c879336c60c08c254895f4f7dabe53ae97 SHA512 b8f557d33f3d02d0bf98541309934eeebebd21829fe1e2a438b07e6e17f0a1de1a970ed97b28cdaddc8b14eb1092a86db4d44838cef70bae3d091cd48fe8e2d8
 DIST Alps-1.5.4.tgz 5691940 BLAKE2B 9a1d78d8957a4fd2156d35ba348f7db442bf6f6128031b9dd0d2b0c1176e5eb408208d3c90fb8563c39efbf0f4aaa9daea705f25ed711a922ab32f1e1d0b8027 SHA512 eace2f0e3dde682ee92b8e185ba6ea226a681dbcecb5fcf5258334e6deed89705b2c61821896b07323459fbd8575a31fa91c3342becbc9f6173efdf094d39555
-EBUILD coinor-alps-1.4.9.ebuild 1562 BLAKE2B 6c314cf6780f6a037fe40d1f7da038c97e0a2358b53cd53227e82a1c66c2a1239c9da9bc1b788fe39bab937c7a6a1de807dbb9729711cbc79ab104baedc5930d SHA512 3c84654faf50e541d57a022d117a1eae87e150949153f800b94e3918074cb388beacc175f637418a109b53d91d5a1aafd89d8f090e2e7b2f478b244fb6fa96dc
-EBUILD coinor-alps-1.5.4.ebuild 1416 BLAKE2B adc222d3aee2beb41e79ad3c02afbca0715978719bfd0a5f691dd79d147cf81d252922e3d448b2ef4d07b4649a28ec5c6c989c8f4b13a4fe51c07ee356162ec6 SHA512 6543c09a8f88037e18b90ea2c0795a50d8bec3202380fc2ed0ff407b7c3d114a9ac692182e92efee8ba94cc5f8b7f2494095afdfe1f7c27424578f90ac3fb48d
+EBUILD coinor-alps-1.4.9.ebuild 1586 BLAKE2B f84ac01e81b081d5ae7a546f0256e227dc66b4ed2d408390dee75aafa9e1986a51d4fdb3b751a1f28deda5e2a38ece4fea07fb72b78c85e46369987a7314d485 SHA512 e10c73a2ad51c6b6afa32c1b3f0c38d915979ffb9fdc6ae8f21aaf8c96925d01318c428e6bd4d5bc5ff6db93352749e21d2027ddacea7d0e15b17f3274b117d6
+EBUILD coinor-alps-1.5.4.ebuild 1440 BLAKE2B 8378ac9554e081dfd59d5090aafcb32b3e2dad4c967ff3ec7e556fa9fa1a2c14c72e3239ea6e3408e6b8b3c5b5541372bb62b0a7c0a244db0d739448eaa1dac4 SHA512 6f02417852f19e6c019449184295f7f0a97292d47242f68f6959fc097dbf01d8ee229522c9e4a82bf16987fb1ecf7b2c80173c9d50f66fd0b9f87ff8198054b4
 MISC metadata.xml 682 BLAKE2B 4333709b145e1a154188403881f2ac6f32562460edd086ad8f5f805a8cc26f4ec4aa3bf996140a2f221ed01cfb27f4545c2de3a2de1180eb8c4b95fbac7035d4 SHA512 c25cfee7ccc30ca49382c3f142cdf7aa26ab0b6bd4e9fae86e618b45ec03c13b81ebd4cb7567fae51ea64113aec47b7d8ba341722c5f41af595437a2193e1fb7
diff --git a/sci-libs/coinor-alps/coinor-alps-1.4.9.ebuild b/sci-libs/coinor-alps/coinor-alps-1.4.9.ebuild
index 0d32e561166a..4376c5b2118d 100644
--- a/sci-libs/coinor-alps/coinor-alps-1.4.9.ebuild
+++ b/sci-libs/coinor-alps/coinor-alps-1.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="CPL-1.0"
 SLOT="0/3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-utils:=
diff --git a/sci-libs/coinor-alps/coinor-alps-1.5.4.ebuild b/sci-libs/coinor-alps/coinor-alps-1.5.4.ebuild
index 3418b1c2bf77..67200c6dd077 100644
--- a/sci-libs/coinor-alps/coinor-alps-1.5.4.ebuild
+++ b/sci-libs/coinor-alps/coinor-alps-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="CPL-1.0"
 SLOT="0/3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-utils:=
diff --git a/sci-libs/coinor-bcp/Manifest b/sci-libs/coinor-bcp/Manifest
index 8db794b40600..6c60d01b189c 100644
--- a/sci-libs/coinor-bcp/Manifest
+++ b/sci-libs/coinor-bcp/Manifest
@@ -1,3 +1,3 @@
 DIST Bcp-1.3.8.tgz 7086225 BLAKE2B 755aeafb9412ed94c7227e6986c2a7e5a26e4bea8084bcd09b517cd9794fe456195cb664f8d341625e8a86552c6ed1ab470c99c8a567d34be9be06ead51cbff4 SHA512 c599cc60df37cab32cfbf24522efaababbdd2de6144c316390f5e0481863ffd6aec016f97188a610ae6aca8d4e5b1b8088a35bc81bd3448fadb1727a9e9663dd
-EBUILD coinor-bcp-1.3.8.ebuild 1190 BLAKE2B 9708e82f25a7a40b0e2dc59c6e14489bcee496421f0077f5b1496d84b765cb7fa71c2366f88ee8909c9f76377e4f608841ca667753335137ac944bb7a0074e0e SHA512 0ca1fdd104182c7854a783670662eca6b1de5a3eeefdbc199c07749ece648c33c8f3e5c171861025d2f28d2f2ac27e0f6572fdc1c7faf8061ad009681baa9b98
+EBUILD coinor-bcp-1.3.8.ebuild 1214 BLAKE2B 4aeff992510b6bf9deed2de04431272801ddb562762ef74fd0f19af520c34edbbdbdb16397cbc494d9c97d9196e488b4c059475c0a41875f769f27bf67efdc8f SHA512 db07289455d303fd2887b0c782a1733c78f9383d4d2f17d4a5ba7e7c5edfc33e7befffe40eb72ad00f06da4ba1909dcc98d41934b77315c60f1f49bd3f79f760
 MISC metadata.xml 678 BLAKE2B 36e740bad7d43c6b0ceee608d4fc36d05ea7d48b17be36cca19ee17650286243c7af2990b71348ac8e3ceeb0b8e023bbbfd993e536da93896718770e20b2c4e0 SHA512 87b752c9aee7c212f00c4af9b4fb8b11ef7135dfada88f190528f339ad0a63570e2d57add7c81fecb8a65833039705fab2ac6bad8433eef66100a4f7f3967c05
diff --git a/sci-libs/coinor-bcp/coinor-bcp-1.3.8.ebuild b/sci-libs/coinor-bcp/coinor-bcp-1.3.8.ebuild
index 69080269d02b..3d6c69d92d7a 100644
--- a/sci-libs/coinor-bcp/coinor-bcp-1.3.8.ebuild
+++ b/sci-libs/coinor-bcp/coinor-bcp-1.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="CPL-1.0"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-cgl:=
diff --git a/sci-libs/coinor-bcps/Manifest b/sci-libs/coinor-bcps/Manifest
index 8ff0fef0d643..e9b6b95e5933 100644
--- a/sci-libs/coinor-bcps/Manifest
+++ b/sci-libs/coinor-bcps/Manifest
@@ -1,3 +1,3 @@
 DIST Bcps-0.93.10.tgz 6270009 BLAKE2B 45372ae18a3f4a7e75d4f71fa6ba411317fc282415390f6e11181543bdac254c5820e8544ffd6c43e8dcb507a8dc5329a42b9cbfc23256a395cc73bc3a8d631b SHA512 4e9348dc1bf75fd9afb74078b55ae0f9a84a99236886552256d7548013c8af4695a4fcc2787ffb0228eba2a870b1cb78c068234048c8650f7d504e1e8d17c549
-EBUILD coinor-bcps-0.93.10.ebuild 1131 BLAKE2B 8b17db3e1162bbc9e733173ad2e845cf32e649eb23d27a099ce76ef3f98bba15f7c5e04c87142c4912b705173036c86d1f944cf0dc35103af4377b4e45b1fa8f SHA512 eeee240cfefd456c18cb8990d2bb381181db256c4dc01c57e619a111c31e545c26e8a199cb97f2a1194bb7a2f7a716548e3b8efd768370de2ffbf3566294d708
+EBUILD coinor-bcps-0.93.10.ebuild 1155 BLAKE2B 57ddeff64a875581b70de517d015751a3a204b41b66c9ef4408c56cd9c760052734865f8bf30d91db2c76c124c68b58aa38c6a0cd0b0306af4597354b2db1b61 SHA512 59506eac73eca4c2cba6e3dde394b29a58d1926ab4ff541bb1346eefd5104f276150c05509967f48c702c219187bd7a10cbd0c9270d2a34bfcbad746f6f7349b
 MISC metadata.xml 671 BLAKE2B 5c13062c4b3e8ac21ee50eb9b1741b1f67f9877a570a85d1567753a8c8fac9c512db08d56be24488b8408d695a167783c9b02d1e74798c925e36bad47fca1e6b SHA512 612c469ad5d853a412574afdbe2ba78d7d4db8bbca7eaf6bbffe1ba558d9ec40d005a94f775f72947742835d1210bdba98de7a6457342e59ae40ebdec9c497d6
diff --git a/sci-libs/coinor-bcps/coinor-bcps-0.93.10.ebuild b/sci-libs/coinor-bcps/coinor-bcps-0.93.10.ebuild
index f9333455ef1b..6e388e55c64b 100644
--- a/sci-libs/coinor-bcps/coinor-bcps-0.93.10.ebuild
+++ b/sci-libs/coinor-bcps/coinor-bcps-0.93.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="CPL-1.0"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-utils:=
diff --git a/sci-libs/coinor-blis/Manifest b/sci-libs/coinor-blis/Manifest
index e9d2722dfe51..88e1185b600b 100644
--- a/sci-libs/coinor-blis/Manifest
+++ b/sci-libs/coinor-blis/Manifest
@@ -1,3 +1,3 @@
 DIST Blis-0.93.10.tgz 10612207 BLAKE2B aaef129ca4de7aba8131c46d7619accd8087abb13e183e9caafdada20636b2d5769b88c0195db0194bbd2d60ada4209609716e8b08436f8c43e62807b325ff68 SHA512 ef4c1b7704353e9d2628401d9a47e72d0b26d485ac3951b03fe84fdc98cfbee8e3b9f3412411eca693c8e00bdf97798e08c4dabcf5b8646bbe3d8481c237820e
-EBUILD coinor-blis-0.93.10.ebuild 1155 BLAKE2B adf260019c66a779d6851128163ed03a8ff8cd91dd2406ad722cc831352a88b4c4b00d7595959b280a5432cdf7768474e411ebb5e007b8d1ab76f83402db1691 SHA512 40d3acd8f470d2476c1804803313d014f60088f523b5a8f569157394dd27845b37f9762b831e8df0d38bb62c33c24a6f1f0ae3ce53e804eb32a6541243d67a49
+EBUILD coinor-blis-0.93.10.ebuild 1179 BLAKE2B fd0bec6dd7b45a6c0417fcbfb39e798addbd01cf9c22c5458e9c0f9422dccec3586481849f2a6b8942f38b4934a092530ecb4f627bd63b5ba9fbdfd538ac7aae SHA512 55ef45de4333bed8cef1dd89cd7ab4ad2b22c889fa2ad8bb56c7ee063c4ba65dd504afc78b28ec7002e3c9cae642e953fe1bddec008bee40f4c86eb7001f0833
 MISC metadata.xml 630 BLAKE2B 2f5b67704950cbc977352b076cf2f558287846bcb67f7994d5bf2ef1e57143e2b4018a5b9de75ef50f40b1d6a2221b4f99a9900e2db31ae37025a77228601017 SHA512 48ea2c95c268345c59ea61a97ccaf0cf93b1ba1e383e64434c5189ae7a81382810df85397e33a2fb3e354c8e44187dca835de82d14e11fcbbc2a74740889e775
diff --git a/sci-libs/coinor-blis/coinor-blis-0.93.10.ebuild b/sci-libs/coinor-blis/coinor-blis-0.93.10.ebuild
index 4456ac2e0b37..3757864db1e7 100644
--- a/sci-libs/coinor-blis/coinor-blis-0.93.10.ebuild
+++ b/sci-libs/coinor-blis/coinor-blis-0.93.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="CPL-1.0"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-utils:=
diff --git a/sci-libs/coinor-bonmin/Manifest b/sci-libs/coinor-bonmin/Manifest
index b44bf874a3bc..8a78418c1ea3 100644
--- a/sci-libs/coinor-bonmin/Manifest
+++ b/sci-libs/coinor-bonmin/Manifest
@@ -1,3 +1,3 @@
 DIST Bonmin-1.7.4.tgz 12320747 BLAKE2B 779881abf98dcf1c0b6a22e2d7fe11c2075ac50a64afcfae735bbb221614ce247c9f918c5cac7d0772784512ff2135fedeb26295c5e5d3979ebb8e435cfdac21 SHA512 290b1b49e467ab8ce7fc6908d8aa76a3b1ba61f63f44427d3bdd8ff2bed4aa6ef28396f0be59e108038173ea670405b50d3c32636aacdee2c5787765bce763a4
-EBUILD coinor-bonmin-1.7.4.ebuild 1433 BLAKE2B 30ed3bd78575596aa7395df8522c5ce555eb1ef3fa5247d3dd87a604a4bd3076a9b7048c6210b1d87a8f4a4c92d27c9c892359854db713a915dca3e488728bc5 SHA512 2846881a3f4f14236f5396fb69cd9353cc9a2e1cd5ef0bf02a8a87c92491492dc0d0c65a4f5b9456836968da2087eccffa15d1ab1707676146021337514ab351
+EBUILD coinor-bonmin-1.7.4.ebuild 1457 BLAKE2B cf9cecfb6cf4b937bc59cf350231df15b5cc8b2883a7b02e34ba243cb24648c63a3811aab22fedafceef6fcd24d24edd18a2b7aba5322f86fa2756140f7771dc SHA512 c1f9c49ed3ed777b7611906dd6acd0becc7fca3118cc8e8275929dfc512fd803f4be1cc662f3f4cde3d58b9595c93949e84e39e095b29d3d176bc10483a10578
 MISC metadata.xml 537 BLAKE2B e099b92290e42b63acc75aab2354cb3295e83f39396f960d338f46e72be7bd0ad3aec8bd6492b595d1b5133d0ea2e7b10aa110553346814e1584eb48153ffa28 SHA512 813db781e346f940d3110f0340208d1400cef20b2dc55b4faafc75c4d71ec0ad3d6cab7638d5afd4e8db7cca1e146bd72f15d45d6e25305961b75e86152377d3
diff --git a/sci-libs/coinor-bonmin/coinor-bonmin-1.7.4.ebuild b/sci-libs/coinor-bonmin/coinor-bonmin-1.7.4.ebuild
index 0523a6cf6082..fb052c19bcd7 100644
--- a/sci-libs/coinor-bonmin/coinor-bonmin-1.7.4.ebuild
+++ b/sci-libs/coinor-bonmin/coinor-bonmin-1.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="CPL-1.0"
 SLOT="0/4"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples glpk static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-cbc:=
diff --git a/sci-libs/coinor-cbc/Manifest b/sci-libs/coinor-cbc/Manifest
index 2460cdc72c41..8599e2ad1d62 100644
--- a/sci-libs/coinor-cbc/Manifest
+++ b/sci-libs/coinor-cbc/Manifest
@@ -1,3 +1,3 @@
 DIST Cbc-2.8.9.tgz 8231882 BLAKE2B 1af837ae04fa129b605b00d91f80019d4d21148660fa64bd9ae8d7e928ba46508072d0f1e4ff70f30a0bb71f68b716b9d0cbc179900a9da3f58d5bf4fca545ba SHA512 ff537a46a8a266767817bc28d61f4541cfda6e8617c857fa0abef4c0b4ef8fbc728dd195645898d94130dfaedb258789bf55e189a0b9665590958355135f020e
-EBUILD coinor-cbc-2.8.9.ebuild 1794 BLAKE2B 9462911c457475c4b9c697d32534d8df271dafde2f1c4d3eccaebf2c6f338177fb0fe0ff935a2ab10e4ae759a7aed132a5331f5df854ee847424dc3631a82140 SHA512 59b82c1d3ac77b01602f49498490ea9ae615dd09343f8649fc01e6924e54bbf4eb2fe8c17abfeb5b3046fd2452cdc3f8a954fa6f4267af0fa94e8022a5dc1175
+EBUILD coinor-cbc-2.8.9.ebuild 1818 BLAKE2B 02c82a02efd05dbf406555e762cdb29f0a1945f2edbdff2a4001a85c9bf68616b03831af0db0d06b135aec987af3634a2bbdc9f4c0d7c51727d0afaf6491cdda SHA512 cb028f3dfc609dd808d83de98063d16183e428a3da266dddec36b9db4e13c5d565f8bc2aa3b11c7c5bd41ea4b2f95528aaca3025c5ece4841ba283acdec31c04
 MISC metadata.xml 542 BLAKE2B 55fb8a6a4dc83e233b8e7cc04db618fd400649c253d08132b3aa6eabdbaa00248545948a0d2a15c33aa1587ede280db0a071e8d9f8a9cb08a8bbfd8f8bb185a7 SHA512 194a75891d6f076bf9771fdb55638db5dc0e94fbed8ea0bfaa8ca7b08634fe406635e58bf8773df9c6a54bbf85c0fe829ef8db675044dd899a1eed8020776bc1
diff --git a/sci-libs/coinor-cbc/coinor-cbc-2.8.9.ebuild b/sci-libs/coinor-cbc/coinor-cbc-2.8.9.ebuild
index c820c9d2def4..14beedc5d08e 100644
--- a/sci-libs/coinor-cbc/coinor-cbc-2.8.9.ebuild
+++ b/sci-libs/coinor-cbc/coinor-cbc-2.8.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="EPL-1.0"
 SLOT="0/3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-clp:=
diff --git a/sci-libs/coinor-cgl/Manifest b/sci-libs/coinor-cgl/Manifest
index f6bc67a9690e..8c6837ecb6a9 100644
--- a/sci-libs/coinor-cgl/Manifest
+++ b/sci-libs/coinor-cgl/Manifest
@@ -1,3 +1,3 @@
 DIST Cgl-0.58.6.tgz 5331274 BLAKE2B 6bd7218b7e87a700b74be322ab0b74dbab81590b0b77361d48247fc1d113db9ab9b878af987e22885ed3c2fde2e7d8641cd4e3977d5c4787fe1dcec3e2e3ef37 SHA512 28fe2e570cb2ebfa3109ca53e5ebb7dd3a38e2ddcfda4d7a9a1d78d4784abe1b6ab79734e6cbcee48e21791fe8353658df47d11253b04366ccb66c3e566db585
-EBUILD coinor-cgl-0.58.6.ebuild 1452 BLAKE2B 35caaa2a9734353567adc15aec0c4a2eec8561dfb65e1fd177ebfbb1d70df819fffdcb1d94698ce2e70252f851169c1c61943ebab46b062a634f1dc63a060a5a SHA512 58b84a1d2b0170a8594f4d7b7da5c9b0673c4664d51c2e75c0b85d48a3e90f9521034203c6afae020dac030913d7d1b2843a24b75fa55afce5d29c677c7cf097
+EBUILD coinor-cgl-0.58.6.ebuild 1476 BLAKE2B 23341562e3ae4b551e4f65d00930b5da8aaa72d9efc1d01d39adac5a7404bb2fa009891c66bdcc2794da74ebcf2fc8a46dd58dfb84f5b930bc4f1f91b24024fe SHA512 65b25f3bc6a14c217f25a4994582ea0e06ae54a6d960f713f81f1c6f976e8a3dc0b2702704660c62964379cab6c2e6e99ee728d914f08bddfa9d3d4e6d704c31
 MISC metadata.xml 589 BLAKE2B 160f0447667b78356ac19e9df3f1909ec2b21abec109d785d62531e37de274e15c028a90338a6484241ae7b473c90cb76243dbc85755d6a3a966ca9203b2ddee SHA512 fa8229d1969d8076bd99381a22d70a73689eef2ac0d56235f0826491a89d5d4b8964339372c11bc586e08f99bab7c8e4e31ba016ec44f6f603b446ed768ca41f
diff --git a/sci-libs/coinor-cgl/coinor-cgl-0.58.6.ebuild b/sci-libs/coinor-cgl/coinor-cgl-0.58.6.ebuild
index d165c14a2d71..8b038be15c73 100644
--- a/sci-libs/coinor-cgl/coinor-cgl-0.58.6.ebuild
+++ b/sci-libs/coinor-cgl/coinor-cgl-0.58.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-clp:=
diff --git a/sci-libs/coinor-clp/Manifest b/sci-libs/coinor-clp/Manifest
index 35374439b4b1..ad86adc04e73 100644
--- a/sci-libs/coinor-clp/Manifest
+++ b/sci-libs/coinor-clp/Manifest
@@ -1,5 +1,5 @@
 AUX coinor-clp-1.15.6-mpi-header.patch 323 BLAKE2B d187af841b0a328de78eac065dcd61f16b3f72534bd7defc55a4552d21b91669a485c3f4a159c0201b9ea6ad54c6a1930fc3b6dcebc1abd336f2d6661d7c5231 SHA512 1f18e00c1a303cffa0ec6244bf1f5dbac83f0a73d1c82f4bf7a4f4df3ce581012a47b044f1d61c140a282e2d262403e76be49892cccec41b191f02edc6fa63a3
 AUX coinor-clp-1.15.6-overflow.patch 349 BLAKE2B 97f501262285a9bcf6165fc13e13722a96c18a7709004b1331ec41397f11744f9ac54182e49cd746700e401de4b2e8e348aad8230e177211ab2413c286142085 SHA512 bc467ff47e0c963aa95c84c3321038327ce4bd99119ea7d66337a60aa329ad7ee8c774aa0405c6e089b081aba0c1e3be577661a7425519e8d56a9e7b05cbb01f
 DIST Clp-1.15.6.tgz 5644504 BLAKE2B 5d11d83f96d77a9a5ec7a65276699527757d7eb77f7e54d5199c26b27007ff49aca6bfc34c777aff62a4a82b876d318d9f49f14d8860fcc784b2733ab74465f9 SHA512 a0da0cc5dcdd409c67cb67dd0f126a3d96bf59851543e7e08adbdbf01012a25905b58ded66aac50b06462ee3a147bed912740c00681417f8c228992a917748db
-EBUILD coinor-clp-1.15.6-r1.ebuild 3005 BLAKE2B a4f621bf77124639e2388fdae442012ed3509af405c70456f74928ea5c10775726e3d7106f9e6d13130fb5b8d8f08659cf95a17595c94c5ad992df0e44ef48dd SHA512 e97784d306e6071e154a2201426e660db12859e86b70c3c0a6d2325734b0a1495cd6742f68c56ed0e8d4aceb9d09da7be03a56350f1ad45fc411cb11cf92db0a
+EBUILD coinor-clp-1.15.6-r1.ebuild 3029 BLAKE2B 4605453742b707a1e8b94ec16cf4eccd21aca0f7fe33c8e27194f075c556bd8da50a19e619cfc9b045c51c331afdd790bb61dd4790062dca98a8f06bf4e255e1 SHA512 580a1c3e60097e764e7b43ab7b247d61745047e23ba10dd8285cad2707642183d673563c990a9ba60e85f66bc5c8c3e763d3dc7f7d39a477cf4ee984cbca7f5c
 MISC metadata.xml 972 BLAKE2B e3116e8ba1a939f7b7b80e278d7e6d9a307b30a7684707a4f1364924e7c612ce87d0655029f0acc38f59ff40286ea48088355d78af3101e8b86ec03827a83d8e SHA512 45e693abd4af3cf838fb519b5fe9be04c1ebeca4b5494ba0f15b93768273b186d759e73670fef9adbeb3febe2773b33260b2d9e78cecd84a81c03ffe6d2028f3
diff --git a/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild b/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild
index 7bcb4e61b3a4..77b81b3997d9 100644
--- a/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild
+++ b/sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="EPL-1.0"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples glpk metis mumps sparse static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-osi:=
diff --git a/sci-libs/coinor-couenne/Manifest b/sci-libs/coinor-couenne/Manifest
index b9fbf5d126f1..0d68efa49715 100644
--- a/sci-libs/coinor-couenne/Manifest
+++ b/sci-libs/coinor-couenne/Manifest
@@ -1,3 +1,3 @@
 DIST Couenne-0.4.7.tgz 12487353 BLAKE2B 795a1d04ee6186e519d57a59ccc7dfa77ec28717b3e3f75d1ed6513438e869d69970c27dc0de758d421e7f5c5f2dfb3308270b185c05b44ef214c760b1f25e39 SHA512 ae87ebee778d6782fffe9e6f6c7c8f604140f6134e29824f89e4f87bb86ac00ac1b2d8de274b23de16078a48a1444fbe7960b15ffefdc1798dca8972a8946deb
-EBUILD coinor-couenne-0.4.7.ebuild 1397 BLAKE2B cbb707f9ce671a94c75481e6951f8c3b542df60ac5f0eb7bf91b10e90eec13c27aa065cc8bcce1a20d3a06b31debdff89207b0190e52d8a80ade5e48d494c8fc SHA512 e3c41e059cd6f55b79623b3beea791374af75f0d84960cfb608f759727edb367fa23e1c20d25b5e4dd74c9778cdb20fef46c6e2d47c858cda41d8c7099b129b1
+EBUILD coinor-couenne-0.4.7.ebuild 1421 BLAKE2B 2a14a91b62dade3a3f07721226c56d25ef77bd69a25440d090575ab7d13b5be99291e31a5da3bc04c134c62eda7014f9ea32286f90f8fed2dc6d7c13eac59bce SHA512 e22e2f68e03dbe3f28a0ee59561c5b7d78431ebcf86bc7d59a97cd39aceeaf216643bf1481f2e06cfd63bc35b84f0e7e5644c55705e25c1b9b2e8a0d4f3d5054
 MISC metadata.xml 620 BLAKE2B 82e4ce9c1f106653d4a3d8a235206950db10283e0c2a02802587a86f0845520b09cbc3731075a90607c51dacec6788bbca8d06ef181e9f4240ef166491c7159e SHA512 6b6a008f16e4bb3e20ae8cdf3c081236c9896346cc8c7dc73acea97fb0b51891764bf9747baac6719229b29e0c7086d9ed9a6c797d6717ef702d7336aee3703c
diff --git a/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild b/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild
index bff100009493..02c94288b5aa 100644
--- a/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild
+++ b/sci-libs/coinor-couenne/coinor-couenne-0.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="EPL-1.0"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sci-libs/coinor-bonmin:="
 DEPEND="${RDEPEND}
diff --git a/sci-libs/coinor-dip/Manifest b/sci-libs/coinor-dip/Manifest
index 0960f883a512..1cb9dce125fa 100644
--- a/sci-libs/coinor-dip/Manifest
+++ b/sci-libs/coinor-dip/Manifest
@@ -1,3 +1,3 @@
 DIST Dip-0.9.8.tgz 10557241 BLAKE2B 1fcddbe4b7e8ae0450fcf97473428c0a36b751bbf5b91ab45c362ca0590d390d8c0b5b4b273ed41f7e9432423c59b9a4f8536ff34b0c9c0f1c11ced779ddb38c SHA512 7dfb51f63aab36fe7e894be5f17f8b614bfdf9be1a14b8f8b2ee555dcb8392f82b13d20481d60423d3d375a2e52eebe0439e696e3b3a7dfdd18223829835d361
-EBUILD coinor-dip-0.9.8.ebuild 1162 BLAKE2B 2525809df1f80d76d005b4faac8d8f9df6e27beb3cee00ba878cbf7c1e8b0472bd085b05256603280c21433b0aecd8b7d9aa2ab1c38d6ba69693f008bd2b30da SHA512 8d23a5f5f95db8463c5a4eb13277b926ea1c65a089bbbaa2c53713feef531bd60c83098ce751904c9e04534163621d889322ee99295f127e04124884bef7718d
+EBUILD coinor-dip-0.9.8.ebuild 1186 BLAKE2B ba0f78baa1c151a10761da40ec82417108960405168aa90587fa1e72542a680bd118bdb647d8b2681e5d6e0987f86d8705f731b4e1318b5cde10af0a6626956a SHA512 3c41767e1472c682dfd3816c3072b3505f36c51d51a53c34ee07188676434259fcdc85a9d8db2d161545e4f9b786bff1f52d1ad3e066b3cac3d3d302af675afe
 MISC metadata.xml 722 BLAKE2B e4d55f25c10c60ad3da175feff1a5d2f9f3307dff701d8f98d83d0be32b21eac18432b7e104ed4570dbae3af4f8da6a10a6bbe4489727c6091ed5c3352d7e496 SHA512 b58f6dc52e8ff8793e843986b8ca71551eb8624e78e4122549306d68b4bb4c41cc6d86c40df697ed5e0bf1f9f829e01ebd57295526e3ef217cd4185cc9d443cb
diff --git a/sci-libs/coinor-dip/coinor-dip-0.9.8.ebuild b/sci-libs/coinor-dip/coinor-dip-0.9.8.ebuild
index 8a74a45423c9..c67282ce4ec6 100644
--- a/sci-libs/coinor-dip/coinor-dip-0.9.8.ebuild
+++ b/sci-libs/coinor-dip/coinor-dip-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-alps:=
diff --git a/sci-libs/coinor-dylp/Manifest b/sci-libs/coinor-dylp/Manifest
index ecf7e0f88696..f9ae9d86017e 100644
--- a/sci-libs/coinor-dylp/Manifest
+++ b/sci-libs/coinor-dylp/Manifest
@@ -1,3 +1,3 @@
 DIST DyLP-1.9.4.tgz 5049865 BLAKE2B 4e7ea46973845959bb4d0b0f24c380b10ec8245bd690a3fadf2fe14d136187a828e898e78afc5625543eec27a7af23d0a3def433259e61fb13d337ac4f4ccd93 SHA512 1dcad555f40b88aafaef0ca712731f3d4787900cefd2125eea9171d5dfdbea1888fd08b6767f50dcb915a0e2ad4e3430ed67d68026015b15af9032ed9231a069
-EBUILD coinor-dylp-1.9.4.ebuild 1378 BLAKE2B b1d0c7de414e864c86bda29ad10283376c3bf7acedc533169acbabac39a2035e5b2d343d4eaf6db90ecf634d1baff8d3a504144ad02e60f50853ce7fc5892532 SHA512 f153e967665f83b2a29b64d06e46fd64388d794542d76ba9c0364662e6de2588f56089efe2c523bf5e5fc2e087804b296e6a4ce99ef1a9123cb28db2dc0621f7
+EBUILD coinor-dylp-1.9.4.ebuild 1402 BLAKE2B 1acdd084eb6c79347db0773ec15cad77e72363cc2ac08278b43a9d97e52cce27aa9a556a6e890d83fd1d10a6d497a05cd16c543971f75f9f75d3fcac428eba63 SHA512 dd9a925846010a5fb58df9497efedde8b6bb383d11783c103c8dcf4348a8a7fa8a2e7d1b17a8730516230a577dc0674f3db300c536fa7fe2d636127f293a1f6b
 MISC metadata.xml 621 BLAKE2B ab7383a1b4706a739b8095227d69c9d29bfadfa1451c5e996e482cb4928119d72b4b94097d918fad28d6a4c41905f7f9e9560110875fc7033a11d37339ce33c5 SHA512 6b577cfbd41c6107609ac4939409f4c0360948b3cd63ea29a87f51706673f2493bfd9e98dd23eebc3d90f314fff666c9ce3359fc43c59bffa82c18b791218e3c
diff --git a/sci-libs/coinor-dylp/coinor-dylp-1.9.4.ebuild b/sci-libs/coinor-dylp/coinor-dylp-1.9.4.ebuild
index af3785fbe343..6432f3ab4b26 100644
--- a/sci-libs/coinor-dylp/coinor-dylp-1.9.4.ebuild
+++ b/sci-libs/coinor-dylp/coinor-dylp-1.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="EPL-1.0"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sci-libs/coinor-osi:="
 DEPEND="${RDEPEND}
diff --git a/sci-libs/coinor-os/Manifest b/sci-libs/coinor-os/Manifest
index a072ba7b6c2b..2eb471b50f91 100644
--- a/sci-libs/coinor-os/Manifest
+++ b/sci-libs/coinor-os/Manifest
@@ -1,4 +1,4 @@
 AUX coinor-os-2.10.1-fix-c++14.patch 4301 BLAKE2B c2bdef9b3bb9e5b8b8d5a9a93abaf71bfe71fd73fe33407f1860e5a350fd51885d35570b1f515826226470f169fa7d5e5976af71226b042841776938d1030983 SHA512 03f53d5a72ad7eef7305fcbd8ee7c07469c418f0e351b7bd84ccba5be0a0395aa5843d84fc7575f5a489a4632dafb651669ef56e760be4c50e69f6c45e24d96e
 DIST OS-2.10.1.tgz 37106742 BLAKE2B 6cf206489e4a63c33a1610ca12d59fcb6607d58a053411d0f9cfa6896e85be82ec18387ffc2e8aae3bbff3326574e0938fdfae1ba96c3862c366d343149f559c SHA512 bfc0af075e0db2160db694ec1e6f69c36cd52b29449fcbd689c809db01a9cf5f6a8a59edb7fb7269db5757faa14da5cd9fef34dffc73de7b2953b35fc2b710f0
-EBUILD coinor-os-2.10.1.ebuild 1245 BLAKE2B 2d8b49ccc1e009ecf1c4db3f9e6f25b1b02623adabfdbaf746824d45c0013ca3ca00d5b36f670e06cf03f8361fe0fd76dc1b51981b2c56acb0b4e8823e1609df SHA512 4acc7c0505fa7b46b3eb4f4977817b21da48f8154267d3283bf89180045e2547d98fbd6f96869dbb21f4eac48f1e4aa9a317363665e23ec35756826df7059f9e
+EBUILD coinor-os-2.10.1.ebuild 1269 BLAKE2B 56d4e129a09cb540720846d15efce23c8ba76298fdf3528220388c1c88d32cdb4dab339af49add373d134349b544c767bff54367442a62e1b1f9fed378a160f9 SHA512 3c77ace5131af057923f4dc4f2bf2eff454807945b7d5f958309ca12e5e6cdeb47234baa65904de0ba427414262c0c88808ce76fa555625752c52018ae144e9a
 MISC metadata.xml 548 BLAKE2B 336c4d19793a8cf4c123c8c143bfdf29e5e64394f0bb5214d579bac933674a99529e0eacdb11ea1663993fef6a26ca4a27d39ce72967c0c211f8719df4aaf1aa SHA512 5ba479c26cd716391de1eca0aa37d87a3ea20f74f036de8d9b6ed5f019fc83f8355cf5db6cf051ee199902b5edf8d333739b6a21547850dbe39a3fc82473a26a
diff --git a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild b/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
index ae0fb46a7469..2093e3961b62 100644
--- a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
+++ b/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="EPL-1.0"
 SLOT="0/6"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-bcp:=
diff --git a/sci-libs/coinor-osi/Manifest b/sci-libs/coinor-osi/Manifest
index bba53cc8afcf..0248e5bbf9d5 100644
--- a/sci-libs/coinor-osi/Manifest
+++ b/sci-libs/coinor-osi/Manifest
@@ -1,3 +1,3 @@
 DIST Osi-0.106.6.tgz 7490371 BLAKE2B 76579c536eb5ffe6b7a79e4e28ee438bf06cdae45f7934435a7174df7bfe4d2a03b2ea79454b4f15df893f968dad34cda6c66503b853842d9c7815702fd9d048 SHA512 25d2dd1791b73329fa9bc32f7b4a4f3d0600ce600868bd14d902dd0ea1c6f5a2eca4bff01ac65ea2843e725fd5c218fca6def9d6974e6af9692c47973b6202ef
-EBUILD coinor-osi-0.106.6.ebuild 1546 BLAKE2B 2b972afaccab6359dde92c88f2de981201179358083b75fdb06377db57b6ebb03567950ede9b99b5a54bb44e31a1e5c9497ce149bfbc8088a2b21a130414f554 SHA512 14710fe45e4344eb41bd198fcd4619a31fa1d1c9a74b5fb4e0ae8d5c59cbf10d1efe39b50d070f8bf3e9e4553619dc880f2a2694116da7611b89830be09a2a3d
+EBUILD coinor-osi-0.106.6.ebuild 1570 BLAKE2B 51b604620d8a55ce82e93fc027351b34e93fc9528baf0841903da4db90f274e8c231d07a1a8b87255e5a74de5eb5db4fba7c53684822eaf55470f08a40d52d5e SHA512 0461c77adaaf42e1241d56264f733f2ae4f7225676d049491189fbe56561eae64345fe666efa1a336689644e632631573250c954829168fbbc29ef62c42a44e5
 MISC metadata.xml 664 BLAKE2B 6c8ca87a619e6c895f1f494ab017645d964f88489f8d0c6e7ff05e547542b7c9bfec7ebacf5a4b1f9ca282fcd2a59aa4e70baf183d38e84cc06258098dc49d23 SHA512 ce3559d0d784f081f901b655c6c9b9005ebc8975838402a2e62c5c3f0874ba5a94b942023fa023850aa41a9c45e82932bd59af74fc6235c4366f16bd9a364626
diff --git a/sci-libs/coinor-osi/coinor-osi-0.106.6.ebuild b/sci-libs/coinor-osi/coinor-osi-0.106.6.ebuild
index 59bd9d74227b..d7d293c7f43f 100644
--- a/sci-libs/coinor-osi/coinor-osi-0.106.6.ebuild
+++ b/sci-libs/coinor-osi/coinor-osi-0.106.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="EPL-1.0"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples glpk static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-utils:=
diff --git a/sci-libs/coinor-smi/Manifest b/sci-libs/coinor-smi/Manifest
index 631f690d5053..f5ad2e6d7ad8 100644
--- a/sci-libs/coinor-smi/Manifest
+++ b/sci-libs/coinor-smi/Manifest
@@ -1,3 +1,3 @@
 DIST Smi-0.93.4.tgz 4907130 BLAKE2B 329cd05ee42cf2fe0928a9fd9049c0a296632bf6c30bc6ca86f62066ee425982a853223581110b4e3e4d7a6a049e06bbb366802b1a18d175e1dc2a1a38772e9b SHA512 9439b7421475cf5d0c85f529305657e04d1ebb3eca28399b0df0352b52df315e9dceb3f1410ada0b7a6f9447b0e383116fb208d6447994ce1611f019fcace007
-EBUILD coinor-smi-0.93.4.ebuild 1494 BLAKE2B f57ce6eb48ef38f09ccd948c67764517a153153967578e7a8618fc40fe8d45e205e41387942dae30d804a14b6d238794c3763a0e4748e4f93fea25c069555604 SHA512 744f28ce09afd81c17629a750369556337196b1581744e2c093c3a0d98f30305fd3c248c549ad075a6d929e8f69b165e996effc0a9ca29642a3c3f80109e4f34
+EBUILD coinor-smi-0.93.4.ebuild 1518 BLAKE2B 68bdc3379e2dca73bc1a47774655084c335b58b9c3cd9b812fb8f4d1ce70cbb38d23d8f1a2227e2260a8ba330caf3a48980bb29faacf972d60167999706d1f62 SHA512 3cdb67da05994f6d03ae0322c7aad18f5af03ebbb24429127abafbcfaba52a525980269db786c11c443195cb1843dc9ed4813f21eed6b7deaa9f20a2f6e84ecf
 MISC metadata.xml 982 BLAKE2B 2f74ba28cece6fa9fe493d79148ce7614e4682c440639e70583f103b606337873fb25a6bc6a685f1e0e1477aff7bc28655ca301a4fca8535c0f7de2e23a8fbf5 SHA512 5d702c7b51072d12118cefb565d266bbe5c7f3c5f3a664a48d1d8a5685d1fa5671b939485cc243bcf4af1e75e306a5797a30a046b6199418b201be474f713db2
diff --git a/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild b/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild
index 1db6ff49b5e2..903528f79728 100644
--- a/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild
+++ b/sci-libs/coinor-smi/coinor-smi-0.93.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,7 @@ LICENSE="CPL-1.0"
 SLOT="0/2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-cbc:=
diff --git a/sci-libs/coinor-symphony/Manifest b/sci-libs/coinor-symphony/Manifest
index 3db11cda2b89..7a49eaae19fe 100644
--- a/sci-libs/coinor-symphony/Manifest
+++ b/sci-libs/coinor-symphony/Manifest
@@ -1,3 +1,3 @@
 DIST SYMPHONY-5.5.7.tgz 7628863 BLAKE2B 8578cc341a2114642911bff68cf260dd6c5974b70ef3deebf9f7ea51f580be809dd1224a18dbd0744e9acf3b1ce9d5bdf90a1e97b53bcd01529978a816e26c6c SHA512 a3ce66b0b1373c58024ce6840277423a1a3684af8e3179a777fbb33a8d266849ae1cde694a527c3776ff67ce0a5ae3c2bfe0dc29f4e0b3ca51ddc2b299eefb24
-EBUILD coinor-symphony-5.5.7.ebuild 2052 BLAKE2B 4ac9c2e258de6a4eeadc9eb59617ddcf729fe1062b69d9d9c184820962b80cf643f5b0c57475084165511d83230ca2f249507ef198968edeaec82c5fa5f2ba66 SHA512 9e738b42c5555a13a0cec371f4487d70494b1197c95362b9955e5f65358396bb2fee76c5135229af62263bfd48c74dc000e60d4e298e4716155072ae4e92d4b4
+EBUILD coinor-symphony-5.5.7.ebuild 2076 BLAKE2B 0b6b9a1188ca24c7e6bfa2a1531a6e5a84b5eacacfb42a382f094681c2232e5a8d38e816b844064f2d7d81936708911a19baba4427959d50ffbfdb4e0f65f9cc SHA512 9f04d98147000697dbcd21cc1bd7a1d95dd0ba36998d4f42f8099788817b86f0ee6df2758b9632c5bd6bd0c047b82f052dfd4f7bed9c39e3e1aa3aecf09d2848
 MISC metadata.xml 830 BLAKE2B ef49e73859bb88cc97b1df0614c299e9596bdab25dfd6b10a64c230dc49d038abdd8d68fb2d9fe9a8d7161722fed4acab654720f8aac3d2c7ed05c9d7f49a9ed SHA512 292f30da8c4b2a847665c848a10b33259c4bb7d89cc9363e75fb167bdbc73e0465697dc9c9979337af438f6f2a9ebba2e51dc32bcd2272ceae741c010e17041d
diff --git a/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild b/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild
index 38e4c4e8d5bd..02a341b4b79d 100644
--- a/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild
+++ b/sci-libs/coinor-symphony/coinor-symphony-5.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="EPL-1.0"
 SLOT="0/3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples glpk static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-cgl:=
diff --git a/sci-libs/coinor-utils/Manifest b/sci-libs/coinor-utils/Manifest
index f5a3d26f3935..717c88951fa4 100644
--- a/sci-libs/coinor-utils/Manifest
+++ b/sci-libs/coinor-utils/Manifest
@@ -1,3 +1,3 @@
 DIST CoinUtils-2.9.11.tgz 1740411 BLAKE2B 7adce4e17d31f8187c7959140f7cb5c537d6454b2e82c9cede7625bcff2b490e50dea190838f598b5fcc55a42ec2beea3982b14dc7bc8432e86ab82475462bc1 SHA512 3cbbce47cda4d5f63338644853601bf0a3dd9b9388e71a7aea7fedd51dfc007134359e5f12f24d8f6135d86b77a88a95bcb88249b1ba880eb3cd9cf41d039424
-EBUILD coinor-utils-2.9.11.ebuild 1916 BLAKE2B 2e2c7c5c52ba6bdb9ba0269a17dff52638bb2bc8747854edeebc46bf9aca2ac2db385246589dff281c3651c7017ff12bc8d1bea44ee4e26ea0d86201a0b6fb10 SHA512 83e8c0509b5c4b26ca9904490d5946a25946413cad38eb5b303e3a07d3b91c8e2c826ee0ccaa25c353aad77c4edf784c38a88354b4a2e04bf455a0e1ac385c98
+EBUILD coinor-utils-2.9.11.ebuild 1940 BLAKE2B 5753a0e83714cbb4aed642f837a5ff00faf21b350efcf241c236157536a60465923695efa88b3868b663edaf3b14449c11ff4ca96e40942c6fe71cd8607c39cf SHA512 3385727a0a1b848f3edbf80f16b7314a5ddbd63a57eecb864636c92ab33f42379e06d595ae87d9e2c4f1fd37bc3f3aaf96fe4db079adb41dcef016252f70a20b
 MISC metadata.xml 653 BLAKE2B 937ed215f67bdd1d369d467af0f15ae05c8eb78726434509fc1fa2c2e777eb269eae21d09dda6ddcde589c3496e5f187a053dba7648a11efea9934940ff99bff SHA512 73fed876146a5d2aea6d7fd5bfb99d938f316cb92022e299c01e04aad218cb75b2745c8e064b9218a96c9b9f9c9e9efb089d38ba930677ce18b71f27667bd0c9
diff --git a/sci-libs/coinor-utils/coinor-utils-2.9.11.ebuild b/sci-libs/coinor-utils/coinor-utils-2.9.11.ebuild
index 393e7c336efe..29e79cb5bf8a 100644
--- a/sci-libs/coinor-utils/coinor-utils-2.9.11.ebuild
+++ b/sci-libs/coinor-utils/coinor-utils-2.9.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="EPL-1.0"
 SLOT="0/3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 doc glpk blas lapack static-libs test zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/readline:0=
diff --git a/sci-libs/coinor-vol/Manifest b/sci-libs/coinor-vol/Manifest
index c18f1a51e823..caacdfa57245 100644
--- a/sci-libs/coinor-vol/Manifest
+++ b/sci-libs/coinor-vol/Manifest
@@ -1,3 +1,3 @@
 DIST Vol-1.4.4.tgz 3205621 BLAKE2B 187b8522d6fbcc287e3eb63e00553d2f90bb7c9add17e2ed604cef3e2ab2ba214a0d6e27ecd28457a983d0d11193ba31914f5defd841848fb9c2486d80ca4935 SHA512 20e04efac09694ddfa035496ec9b2920ef702e5a2ec4515cd88c52129c783efd3c25e044e6c2cec67ad800b297ebd03f3c3c377f58829790109d8d6dcb40cc39
-EBUILD coinor-vol-1.4.4.ebuild 1557 BLAKE2B 01e47aa9a38822db0afe3084bde1c712487253039f45cc1d6d8a9126165fd24b175bf0247f3a3e2f8fa3be1efabf52e742599c1b78bdb439a65f57a546023a42 SHA512 63ccdab1c71c09820ff2e019e9dd671a476bd8acaa51117f02db916050ac63ed474162deae84bae65707fa2afcffb56b8d15077b2ac9047dbd7733e3df9e73a7
+EBUILD coinor-vol-1.4.4.ebuild 1581 BLAKE2B 6a5f73df7a943d92a7722ff5af401fb797d0f53dd6145e2995f1550a38e3c59acd00ddde20d0ef3c2c71b283abe459f81327f82f640e1a45c3a70039468e6dde SHA512 12f74433fb38ed456a75c0466953afcd4fe05916608dfc214108620a354bc8d61eeb6afc62fc4ba9f58a92f6a6d01b4a32738245f25b8fd99761fb0e938dd1d2
 MISC metadata.xml 505 BLAKE2B ed047b858cd4d5ab9edb4706f5de6d7d0d327b81c0fb5a9d51a5b977468b2d2ccbc1f671c9bd5934c7c790f9d87251c52a390d5b473c2f4986edb958c3718110 SHA512 c31de615daba09af37d08828b2e58e2d6fdfeb0e6fb36b10023aa6eb04580c942103ce12b00a1ed40cddab0e2151c091dec1ce7ee65352d29685be2a07e50d0b
diff --git a/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild b/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild
index 58bba00bd35c..ea1df608c973 100644
--- a/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild
+++ b/sci-libs/coinor-vol/coinor-vol-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="EPL-1.0"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-libs/coinor-osi:=
diff --git a/sci-libs/colpack/Manifest b/sci-libs/colpack/Manifest
index a499fc4a3c67..31124917a5ff 100644
--- a/sci-libs/colpack/Manifest
+++ b/sci-libs/colpack/Manifest
@@ -1,11 +1,3 @@
-AUX colpack-1.0.6-flags.patch 408 BLAKE2B aeb8d0376da4b406108a36aab807083fd27d5990f8d0fa3ef90a688c708cc8759e14ae6c8c5fde4b2c409685d3ee247ff862b4e89ad745a4d4ef2ecd2b5a8b06 SHA512 5a614971ea0bb9da829596b352c59455b2a6d892cd96ffd68c5dd6a0f7aea63e35c2fda911a050df55d37109337cb95e52f1bab12174681f964c59c9e0721723
-AUX colpack-1.0.8-no-bin.patch 442 BLAKE2B 0b9e4edfd4113041e90b550e94d2ae8949630c7a957d4d8fb5985e7dff96aad3822135652d2ff7e5b4809e61094a00b84f9cda5852cec9880f5b84b41084a037 SHA512 5424142f844626dca8f71f8deec53c4804c2aba6c618cfab8fb713026a11d6869bab04ed32562f0b77523f27e50db85485ec6346d8ce6f5efb5a1d6aa21b3410
-AUX colpack-1.0.9-fix-c++14.patch 2659 BLAKE2B 8c5d398794a81706b0ee9c97a18ba32e44fcd091e51a82ecfd89611072236e83f65ef7bcbe85f35d3c6aa7477f394cbb3b2749a3dc376f8d6413de1d00d300c8 SHA512 be2bdaf84e9a176bee1e9d2bb772274482fa8d3659f11c09bcc8fa21f7036d08ce49bb77d34370037ceaaf9290abcbd6278b97c68f0cf9916d5fc98459a9fd1a
-AUX colpack-1.0.9-fix_gcc49_omp.patch 1072 BLAKE2B 2e595d4d17ecb00c77414b21933c3f16d68c4a7649352e04ed03fc17e093c9fd9ea2ac8a034b4e3153cdb6a8b051b33146810e4e0460f7c93a4902eedbb45d73 SHA512 702bf542933b59c3fa086595aaf2e680041faae87909b58664a76d60a15e4136cc101a571cc0596277f734be46660a683107a68fbddde4af0c42c39beebe0e77
-DIST ColPack-1.0.6.tar.gz 1027189 BLAKE2B 7a06c7f1c0e86dcb8fc4a7f752562875414ce723a3eb251de55ccae7e95518d5b82de902bd02a403db061e15d2a31f3ecf9f539790b22aee2e05eeabbf505ba5 SHA512 646ffdd459c40906f6c57888c0e38b791f9559a88ce649e9041271655a9d98658db1c6c0f3b09d64b9bd2c7d74c71a6bd8b13972ae7c7bbac42b300b8e3844c9
-DIST ColPack-1.0.9.tar.gz 1185335 BLAKE2B 1f571df50e97e39499f7425ee595f92304fa51ae58fc995afe0f329f6829b3ac18b6417f555520ad8de0c624930f7a184e9f50b66225e1a9e1083fc01268daae SHA512 762ab506f95788f9134033b60bf582472b80ab14766ad6795a7db1b780de0ae49bb30f1c9bd74b4f62cf46cc6029c37ef90a483e41b62bf4067cd4a71eb3db6c
 DIST colpack-1.0.10.tar.gz 658087 BLAKE2B af6409969f0dfee465ad88515d0d4f82525047a8268ac9fd4b0784de1f4fd30ce7ba968502a5d92ad3a86f554fb8f1a786defb09396c8e678f62aeaa3cc25397 SHA512 566b7906c5d0dbcd6dcb9c359510ee8b13bf3249e56d8f88f7806493d1df14f54638a0558d601ab4dbc28f36093795eede57a059a7c4e66438b47bf5a0119808
 EBUILD colpack-1.0.10.ebuild 1083 BLAKE2B baa54509ea9cbd55edd3fe22ac57a13f5e19d73249f871b5ae6e8c11081199cb8252a3ab241d4c375b884643a248f2339f62061169a46f16387be11626dd061f SHA512 59ba4540d5af3529da3c0485a21ea36a4cb622c8e0f6ce4af4c2b7d742c5e2f5ee854b269c14c0c64129d8db44eaca0818e028c81cc6d6dab5a6cae1647a6d0d
-EBUILD colpack-1.0.6.ebuild 876 BLAKE2B a8b31870fad9b2679cc93b54434beb3c3a223a45c9d156f916d6c8b4b03a32a9bd51233b7b7cb0b64ce32b2f1f73f7ea50c5679126d5b9c81c2ccd8d2be83d71 SHA512 2cc5bcdf1c4939b148eaa860aa74257d8c6a85e6d5a456969ab63a929422c4d195c5ed0cd20837b6fc52b46b038ff7d14312785ee49b037e56377fa3d3623505
-EBUILD colpack-1.0.9-r1.ebuild 1200 BLAKE2B 5ca4e556aa8d262b70d8916214db9551836c6d551d4e620251cb080e2fd02c8e9f2c8da4b59898aad4fa2ba3470fdbb0f7309d5538e40957df92e868be53732a SHA512 171db8ec1edf48ed8a0e62ecf31ebd1d753185d4718eb62ad71c3902e10d75887cc93c3c448be4bd9617b526d648ecc939005ef35875a9f716072430b649b62c
 MISC metadata.xml 605 BLAKE2B c7dd1378bd62eeaf69648625deda27806662c0f2fa83112fcc757925412c3d1d2ce218d64be2ad98dc54088618ff874d6a4e7f266e5fc006e98e257d757f4190 SHA512 28e191bbb72a212832b13ad84064538a884835b1f3e4f8e50d4b247b17189a12fa1de32138a675ab1e9fed58b40101c50d2e4472c554cf25f6f919f24059c17b
diff --git a/sci-libs/colpack/colpack-1.0.6.ebuild b/sci-libs/colpack/colpack-1.0.6.ebuild
deleted file mode 100644
index 14cc481ca736..000000000000
--- a/sci-libs/colpack/colpack-1.0.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs autotools
-
-MYPN=ColPack
-
-DESCRIPTION="C++ algorithms for specialized vertex coloring problems"
-LICENSE="GPL-3 LGPL-3"
-HOMEPAGE="http://www.cscapes.org/coloringpage/software.htm"
-SRC_URI="http://www.cscapes.org/download/${MYPN}/${MYPN}-${PV}.tar.gz"
-
-SLOT="0"
-IUSE="openmp static-libs"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-
-pkg_setup() {
-	if use openmp && [[ $(tc-getCC)$ == *gcc* ]] &&	! tc-has-openmp; then
-		ewarn "You are using gcc without OpenMP"
-		die "Need an OpenMP capable compiler"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-flags.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable openmp) \
-		$(use_enable static-libs static)
-}
diff --git a/sci-libs/colpack/colpack-1.0.9-r1.ebuild b/sci-libs/colpack/colpack-1.0.9-r1.ebuild
deleted file mode 100644
index 904d0bdbee6e..000000000000
--- a/sci-libs/colpack/colpack-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-MY_PN="ColPack"
-
-DESCRIPTION="C++ algorithms for specialized vertex coloring problems"
-LICENSE="GPL-3 LGPL-3"
-HOMEPAGE="http://www.cscapes.org/coloringpage/software.htm"
-SRC_URI="http://cscapes.cs.purdue.edu/download/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-SLOT="0"
-IUSE="openmp static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.6-flags.patch"
-	"${FILESDIR}/${PN}-1.0.8-no-bin.patch"
-	"${FILESDIR}/${PN}-1.0.9-fix_gcc49_omp.patch"
-	"${FILESDIR}/${PN}-1.0.9-fix-c++14.patch"
-)
-
-pkg_setup() {
-	if use openmp && [[ $(tc-getCC)$ == *gcc* ]] &&	! tc-has-openmp; then
-		ewarn "You are using gcc without OpenMP"
-		die "Need an OpenMP capable compiler"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable openmp)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/sci-libs/colpack/files/colpack-1.0.6-flags.patch b/sci-libs/colpack/files/colpack-1.0.6-flags.patch
deleted file mode 100644
index 6d4bb6a0d612..000000000000
--- a/sci-libs/colpack/files/colpack-1.0.6-flags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Nur ColPack-1.0.6.orig/Makefile.am ColPack-1.0.6/Makefile.am
---- ColPack-1.0.6.orig/Makefile.am	2012-04-13 03:25:37.000000000 +0100
-+++ ColPack-1.0.6/Makefile.am	2012-04-13 03:30:35.000000000 +0100
-@@ -1,5 +1,5 @@
- ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
--COLPACK_COMMON_FLAGS = $(EXTRA_FLAGS)  -O5  
-+COLPACK_COMMON_FLAGS = $(EXTRA_FLAGS)
- 
- INCLUDES =  $(COLPACK_COMMON_FLAGS) \
- 		-I$(top_srcdir)/Main \
diff --git a/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch b/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch
deleted file mode 100644
index e9230b0ff105..000000000000
--- a/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Sebastien Fabbro <bicatali@gentoo.org>
-Avoid installing the ColPack binary on an absolute path
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -17,8 +17,7 @@
- LDADD = libColPack.la
- AM_DEFAULT_SOURCE_EXT = .cpp
- 
--noinst_bin_PROGRAMS = ColPack
--noinst_bindir = $(abs_top_builddir)/progs
-+noinst_PROGRAMS = ColPack
- lib_LTLIBRARIES = libColPack.la
- pkginclude_HEADERS = \
- 			Utilities/CoutLock.h Utilities/command_line_parameter_processor.h  \
diff --git a/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch b/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch
deleted file mode 100644
index 7076be5426a3..000000000000
--- a/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 44851d9e90d9847fbfeaaea7b0ed1e7c3d093dcb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <me@besser82.io>
-Date: Wed, 24 Feb 2016 23:26:20 +0100
-Subject: [PATCH] fix semantic errors in error-msgs
-
----
- Utilities/extra.cpp | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/Utilities/extra.cpp b/Utilities/extra.cpp
-index 21862e6..9f59263 100644
---- a/Utilities/extra.cpp
-+++ b/Utilities/extra.cpp
-@@ -49,7 +49,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) {
- 
-     ofstream out_Matrix (s_MatrixName.c_str());
-     if(!out_Matrix) {
--	    cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
- 	    exit(1);
-     }
-     
-@@ -84,7 +84,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) {
-     string s_MatrixName = "pattern"+s_postfix+s_BaseName;
-     ofstream out_Matrix (s_MatrixName.c_str());
-     if(!out_Matrix) {
--	    cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
- 	    exit(1);
-     }
- 
-@@ -111,7 +111,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) {
-     string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName;
-     ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str());
-     if(!out_CompressedMatrix) {
--	    cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl;
- 	    exit(1);
-     }
-     
-@@ -140,7 +140,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) {
-     string s_MatrixName = "pattern_value"+s_postfix+s_BaseName;
-     ofstream out_Matrix (s_MatrixName.c_str());
-     if(!out_Matrix) {
--	    cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
- 	    exit(1);
-     }
- 
-@@ -167,7 +167,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) {
-     string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName;
-     ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str());
-     if(!out_CompressedMatrix) {
--	    cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl;
-+	    cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl;
- 	    exit(1);
-     }
-     
-@@ -671,7 +671,6 @@ int buildDotWithColor(ColPack::GraphColoringInterface &g, vector<string> &ListOf
- 	    }
- 	  }
- 	}
--	
-       }
-     }
-   }
-@@ -1483,4 +1482,3 @@ int DisplayADICFormat_Value(std::list<std::vector<double> > &lvd_Value) {
- }
- 
- #endif
--
diff --git a/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch b/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch
deleted file mode 100644
index 0510be9f90ef..000000000000
--- a/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: ColPack-1.0.9/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
-===================================================================
---- ColPack-1.0.9.orig/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
-+++ ColPack-1.0.9/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
-@@ -388,8 +388,9 @@ namespace ColPack
- 					  if ( m_vi_LeftVertexColors [m_vi_Edges [x]] == m_vi_LeftVertexColors[v] && f(v) > f(m_vi_Edges [x]) ) {
- 							//Algo 4 - Line 18: add [v] to R ; cont <- false; break
- #pragma omp critical
-+							{
- 							vi_verticesNeedNewColor.push_back(v);
--#pragma omp end critical
-+							}
- 							cont = false;
- 							break;
- 						}
-@@ -575,8 +576,9 @@ namespace ColPack
- 					  if ( m_vi_RightVertexColors [m_vi_Edges [x]] == m_vi_RightVertexColors[v] && f(v) > f(m_vi_Edges [x]) ) {
- 							//Algo 4 - Line 18: add [v] to R ; cont <- false; break
- #pragma omp critical
-+							{
- 							vi_verticesNeedNewColor.push_back(v);
--#pragma omp end critical
-+							}
- 							cont = false;
- 							break;
- 						}
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index 680cea1e97a4..ca8994c03d27 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -1,8 +1,3 @@
-AUX cxsparse-2.2.2-autotools.patch 5606 BLAKE2B 2736f9aa6033d1c4a81a34462afdd9ff1f3df41c463da865d22bb0ef29c98839c192a62fbbe96932976614c076806ae6984deb1d9eb7475812df27c80b94c226 SHA512 f11831810dca8b870cfe468f14942be84fa7e0b2975c5f7c677dee52b72aebe81d827e3bfa0f48fe005b20894c8bc99ea596849c6e87d01eaa4b29dda372e4fa
-DIST CXSparse-2.2.6.tar.gz 1987681 BLAKE2B a778a2d91a98d3764940155eff1cfd3397333a02becef2f2c3c85dc45a58e83597b2e5680ef7cbac4c8d6b8af0a9966d0402154c6c0bee79c67b7697f1af2c19 SHA512 a049349e1a389f03e918e3d0b7e76f79ee2647229a4935378caa0aa3bf3beb8cff649e5e37263f6f839d90a32e6929fd5a7f9193e787cab02cea7b2eb64dd5ac
-DIST cxsparse-3.1.1.tar.gz 667306 BLAKE2B d8c960b37cacd042286691a4e4d4144f4abc5c8f25345e6d7ceb25785361a36b7b9244cc7c53211a753614cf54d61462895a0a4b8f8bf4af61faf6d0132cc30a SHA512 a36cf3a124baa74fb742c563dc6accfaf320a35f899cd2a684813ef22df4557af2d2b3489272496a370e85cea3a350293043071bb66830305fe3bf925865b424
 DIST cxsparse-3.1.2.tar.bz2 2004570 BLAKE2B 4f1874e83faa1d831fce3847b82aeb67ae96e59b635489eceed3ed08a0fd0aaef7b0c9e40142f96ae5c7820a75bfb58b4d6a741c742b5a85dd6d8e4d78960be9 SHA512 dd3c5e31997564387b6145eaf2069c01e2ae8de384cd775a13ac7ccf03a83b6d0b8bf156a6645547f230dd13fc159d14203a4adcbe65703c154f35ecb161b6e9
-EBUILD cxsparse-2.2.6.ebuild 662 BLAKE2B 32805e1b99ecd7d65e0ff1db3d6c49ba4a6314a4d27412d316d2d42b8416c8df9275489ccd93b62162f0d5f4f90fa903d6bf99a1dc5038d91ba5d074f5cfeab6 SHA512 38544495a5eb2b2fd855fb8f5d0a4f991dbdfe5044a9fd6470783cf84c6036060bc4e8892542577a4637738b960b701a04337fac553a5a0be49d65840001e4ad
-EBUILD cxsparse-3.1.1.ebuild 520 BLAKE2B 0d51f5744021f601e7e198fba049c9f2efaab20d169db257bcfa82e7e93d73041137336a172bb1d7a533c7f2cd708419451f09e1530f087498270ab405f816ed SHA512 26dce123436e35013adb060a88acc4862a25b945135fc26a2d0ca8423bc691c86d35c755616b3c43a2bb82b6edcea5a16f1be3de496fa055c97f2c0c7e978875
 EBUILD cxsparse-3.1.2-r1.ebuild 753 BLAKE2B a3d892c3b4d585445b255ec89283b610964cf7e87bdb65a8920cebcc7c947e206bd374e6a235051c46e01afffe826ec2f4f872531bf2473ecf2fbaf30e4d34d5 SHA512 48404fb91b86177ed8c275ac1936cd03e20217e3927ac06a93c112a683040cddb5fbd5c68f954f65ef6413a5233ee1524df5dd02213d092699ff08cfa535e7e3
 MISC metadata.xml 449 BLAKE2B 18e0d692b302702a20ecfe5ae10b8d48de7582649feeda3fe9c0bbcbbf6e6876f620bd490dabf788276a378d60b3bd0c1ee19a6fa439f37dff9269e8fd74d12d SHA512 908237dbe24a16831fc04faaff76d06bc4f0ae8605a551a98763d72ecbd19dcdbf2c74f320ccaf296c69bcacb3cda51b600ca0a9a8b481858723c2dd34a3754c
diff --git a/sci-libs/cxsparse/cxsparse-2.2.6.ebuild b/sci-libs/cxsparse/cxsparse-2.2.6.ebuild
deleted file mode 100644
index 7879964797a1..000000000000
--- a/sci-libs/cxsparse/cxsparse-2.2.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-inherit autotools-utils
-
-MY_PN=CXSparse
-
-DESCRIPTION="Extended sparse matrix package"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/CXSparse/"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${MY_PN}/versions/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-DEPEND="sci-libs/ufconfig"
-RDEPEND=""
-
-DOCS=( README.txt Doc/ChangeLog )
-PATCHES=( "${FILESDIR}"/${PN}-2.2.2-autotools.patch )
-
-S="${WORKDIR}/${MY_PN}"
diff --git a/sci-libs/cxsparse/cxsparse-3.1.1.ebuild b/sci-libs/cxsparse/cxsparse-3.1.1.ebuild
deleted file mode 100644
index d9e67291e712..000000000000
--- a/sci-libs/cxsparse/cxsparse-3.1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="Extended sparse matrix package"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/CXSparse/"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="sci-libs/suitesparseconfig"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/sci-libs/cxsparse/files/cxsparse-2.2.2-autotools.patch b/sci-libs/cxsparse/files/cxsparse-2.2.2-autotools.patch
deleted file mode 100644
index f8f26f384c86..000000000000
--- a/sci-libs/cxsparse/files/cxsparse-2.2.2-autotools.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am	2008-01-29 19:09:42.000000000 +0000
-@@ -0,0 +1,3 @@
-+SUBDIRS = Demo Source
-+EXTRA_DIST = README.txt
-+include_HEADERS = Include/cs.h
---- configure.ac 	1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac	2008-01-29 19:14:14.000000000 +0000
-@@ -0,0 +1,11 @@
-+#                                               -*- Autoconf -*-
-+AC_PREREQ(2.59)
-+AC_INIT(cxsparse, 2.2.2, davis@cise.ufl.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
-+AC_CHECK_LIB(m, sqrt)
-+AC_CHECK_HEADERS(UFconfig.h)     
-+AC_CONFIG_FILES([Makefile Demo/Makefile Source/Makefile])
-+AC_OUTPUT
-+
---- Source/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Source/Makefile.am	2008-01-29 19:09:42.000000000 +0000
-@@ -0,0 +1,24 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
-+CS_SOURCE = cs_add.c cs_amd.c cs_chol.c cs_cholsol.c cs_counts.c cs_cumsum.c \
-+        cs_droptol.c cs_dropzeros.c cs_dupl.c cs_entry.c \
-+        cs_etree.c cs_fkeep.c cs_gaxpy.c cs_happly.c cs_house.c cs_ipvec.c \
-+        cs_lsolve.c cs_ltsolve.c cs_lu.c cs_lusol.c cs_util.c cs_multiply.c \
-+        cs_permute.c cs_pinv.c cs_post.c cs_pvec.c cs_qr.c cs_qrsol.c \
-+        cs_scatter.c cs_schol.c cs_sqr.c cs_symperm.c cs_tdfs.c cs_malloc.c \
-+        cs_transpose.c cs_compress.c cs_usolve.c cs_utsolve.c cs_scc.c \
-+        cs_maxtrans.c cs_dmperm.c cs_updown.c cs_print.c cs_norm.c cs_load.c \
-+        cs_dfs.c cs_reach.c cs_spsolve.c cs_leaf.c cs_ereach.c cs_randperm.c
-+
-+lib_LTLIBRARIES = libcxsparse.la
-+noinst_LTLIBRARIES = libcxsparse_di.la libcxsparse_dl.la libcxsparse_ci.la libcxsparse_cl.la
-+
-+libcxsparse_di_la_SOURCES = $(CS_SOURCE)
-+libcxsparse_dl_la_SOURCES = $(CS_SOURCE)
-+libcxsparse_dl_la_CPPFLAGS = $(AM_CPPFLAGS) -DCS_LONG
-+libcxsparse_ci_la_SOURCES = $(CS_SOURCE)
-+libcxsparse_ci_la_CPPFLAGS = $(AM_CPPFLAGS) -DCS_COMPLEX
-+libcxsparse_cl_la_SOURCES = $(CS_SOURCE)
-+libcxsparse_cl_la_CPPFLAGS = $(AM_CPPFLAGS) -DCS_LONG -DCS_COMPLEX
-+
-+libcxsparse_la_SOURCES = cs_convert.c
-+libcxsparse_la_LIBADD = libcxsparse_di.la libcxsparse_dl.la libcxsparse_ci.la libcxsparse_cl.la
---- Demo/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Demo/Makefile.am	2008-01-29 19:21:32.000000000 +0000
-@@ -0,0 +1,102 @@
-+check_PROGRAMS = \
-+  cs_ci_demo1 \
-+  cs_ci_demo2 \
-+  cs_ci_demo3 \
-+  cs_cl_demo1 \
-+  cs_cl_demo2 \
-+  cs_cl_demo3 \
-+  cs_demo1 \
-+  cs_demo2 \
-+  cs_demo3 \
-+  cs_di_demo1 \
-+  cs_di_demo2 \
-+  cs_di_demo3 \
-+  cs_dl_demo1 \
-+  cs_dl_demo2 \
-+  cs_dl_demo3 \
-+  cs_idemo \
-+  cs_ldemo
-+
-+LDADD = $(top_builddir)/Source/libcxsparse.la -lm 
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
-+
-+cs_ci_demo1_SOURCES = cs_ci_demo1.c
-+cs_ci_demo2_SOURCES = cs_ci_demo2.c cs_ci_demo.c
-+cs_ci_demo3_SOURCES = cs_ci_demo3.c cs_ci_demo.c
-+cs_cl_demo1_SOURCES = cs_cl_demo1.c
-+cs_cl_demo2_SOURCES = cs_cl_demo2.c cs_cl_demo.c
-+cs_cl_demo3_SOURCES = cs_cl_demo3.c cs_cl_demo.c
-+cs_demo1_SOURCES = cs_demo1.c
-+cs_demo2_SOURCES = cs_demo2.c cs_demo.c
-+cs_demo3_SOURCES = cs_demo3.c cs_demo.c
-+cs_di_demo1_SOURCES = cs_di_demo1.c
-+cs_di_demo2_SOURCES = cs_di_demo2.c cs_di_demo.c
-+cs_di_demo3_SOURCES = cs_di_demo3.c cs_di_demo.c
-+cs_dl_demo1_SOURCES = cs_dl_demo1.c
-+cs_dl_demo2_SOURCES = cs_dl_demo2.c cs_dl_demo.c
-+cs_dl_demo3_SOURCES = cs_dl_demo3.c cs_dl_demo.c
-+cs_idemo_SOURCES = cs_idemo.c
-+cs_ldemo_SOURCES = cs_ldemo.c
-+
-+check-local: $(check_PROGRAMS)
-+	- ./cs_demo1 < ../Matrix/t1
-+	- ./cs_demo2 < ../Matrix/t1
-+	- ./cs_demo2 < ../Matrix/fs_183_1
-+	- ./cs_demo2 < ../Matrix/west0067
-+	- ./cs_demo2 < ../Matrix/lp_afiro
-+	- ./cs_demo2 < ../Matrix/ash219
-+	- ./cs_demo2 < ../Matrix/mbeacxc
-+	- ./cs_demo2 < ../Matrix/bcsstk01
-+	- ./cs_demo3 < ../Matrix/bcsstk01
-+	- ./cs_demo2 < ../Matrix/bcsstk16
-+	- ./cs_demo3 < ../Matrix/bcsstk16
-+	- ./cs_di_demo1 < ../Matrix/t1
-+	- ./cs_di_demo2 < ../Matrix/t1
-+	- ./cs_di_demo2 < ../Matrix/fs_183_1
-+	- ./cs_di_demo2 < ../Matrix/west0067
-+	- ./cs_di_demo2 < ../Matrix/lp_afiro
-+	- ./cs_di_demo2 < ../Matrix/ash219
-+	- ./cs_di_demo2 < ../Matrix/mbeacxc
-+	- ./cs_di_demo2 < ../Matrix/bcsstk01
-+	- ./cs_di_demo3 < ../Matrix/bcsstk01
-+	- ./cs_di_demo2 < ../Matrix/bcsstk16
-+	- ./cs_di_demo3 < ../Matrix/bcsstk16
-+	- ./cs_dl_demo1 < ../Matrix/t1
-+	- ./cs_dl_demo2 < ../Matrix/t1
-+	- ./cs_dl_demo2 < ../Matrix/fs_183_1
-+	- ./cs_dl_demo2 < ../Matrix/west0067
-+	- ./cs_dl_demo2 < ../Matrix/lp_afiro
-+	- ./cs_dl_demo2 < ../Matrix/ash219
-+	- ./cs_dl_demo2 < ../Matrix/mbeacxc
-+	- ./cs_dl_demo2 < ../Matrix/bcsstk01
-+	- ./cs_dl_demo3 < ../Matrix/bcsstk01
-+	- ./cs_dl_demo2 < ../Matrix/bcsstk16
-+	- ./cs_dl_demo3 < ../Matrix/bcsstk16
-+	- ./cs_ci_demo1 < ../Matrix/t2
-+	- ./cs_ci_demo2 < ../Matrix/t2
-+	- ./cs_ci_demo2 < ../Matrix/t3
-+	- ./cs_ci_demo2 < ../Matrix/t4
-+	- ./cs_ci_demo2 < ../Matrix/c_west0067
-+	- ./cs_ci_demo2 < ../Matrix/c_mbeacxc
-+	- ./cs_ci_demo2 < ../Matrix/young1c
-+	- ./cs_ci_demo2 < ../Matrix/qc324
-+	- ./cs_ci_demo2 < ../Matrix/neumann
-+	- ./cs_ci_demo2 < ../Matrix/c4
-+	- ./cs_ci_demo3 < ../Matrix/c4
-+	- ./cs_ci_demo2 < ../Matrix/mhd1280b
-+	- ./cs_ci_demo3 < ../Matrix/mhd1280b
-+	- ./cs_cl_demo1 < ../Matrix/t2
-+	- ./cs_cl_demo2 < ../Matrix/t2
-+	- ./cs_cl_demo2 < ../Matrix/t3
-+	- ./cs_cl_demo2 < ../Matrix/t4
-+	- ./cs_cl_demo2 < ../Matrix/c_west0067
-+	- ./cs_cl_demo2 < ../Matrix/c_mbeacxc
-+	- ./cs_cl_demo2 < ../Matrix/young1c
-+	- ./cs_cl_demo2 < ../Matrix/qc324
-+	- ./cs_cl_demo2 < ../Matrix/neumann
-+	- ./cs_cl_demo2 < ../Matrix/c4
-+	- ./cs_cl_demo3 < ../Matrix/c4
-+	- ./cs_cl_demo2 < ../Matrix/mhd1280b
-+	- ./cs_cl_demo3 < ../Matrix/mhd1280b
-+	- ./cs_idemo < ../Matrix/t2
-+	- ./cs_ldemo < ../Matrix/t2
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index f43a45f87ec0..bd82b4aea87e 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 2950 BLAKE2B 5b5193177d42cbdac7cc02ca06e46b41642175fdec40e4f432b4ace2efab2193ee9e3f92a4524dc304c5cc3f7d59aa6c8b44c932efaaa672812dc0744396de7f SHA512 67b7938ff4e696154021eb4c5a16ca1ceff75082c29e04ee87ad7610bab67ad35e7653609839e0b8b54fae33f49abf510d2cbee0faf2e37f1540695a5fe13394
-EBUILD dlib-19.4.ebuild 1797 BLAKE2B 45fd4d3b434852fa3a8d1571e30fee6ffbdb254ed471433fac534c26854ab69352b981dae4ad45b404cc6ff8525a92bb22915bd058c18e0f00d4c3cce9157164 SHA512 ef2172c18b446cf98c79e9b6a4dcf622ca62d05cc353d82d35385a16a334a94d5689af5117f9fee26e9e32346da57227beb83ca35b4b216135ad15b214042328
-EBUILD dlib-19.7.ebuild 1795 BLAKE2B beb38d516fb6c854f7958c6d63d83d5612acfdd384986df8ef7cfc58bca1a2c323078d96711882f4a2adeef775520fdef9e08caee550667d2493eead4fa7e9c8 SHA512 e3b82055fc6e093d2cbd7850b91354cf3e5b62cbf0d614b1c62316cdcf7aed0082808400161ea072d21a4296f901d5edeebc039ff5db73aaa0a921b6cba106ee
-EBUILD dlib-19.9.ebuild 2041 BLAKE2B 8ee1766f6ed036417412468206428a0712553942da092c7e71b33ac629db0d9ed90ad619d1b11567faf8c15b46ebefb0599ef37d9189f7c734e37ac56aa2df09 SHA512 b668d2317a8e4057b7214791f5f56523a249be48d790e6ef59e5e0b625bdc364d7f442285a5424828c16f98a011230eecae9f4861cb068e78cfc543967539eda
+EBUILD dlib-19.16.ebuild 2977 BLAKE2B af4bc04a8c97296efc96a0d2a57045b0a0d4ec9c024dd9cfa772b24610a6e3d2265a1668f596990060e8df67fb544908d6370f98bf89cb5d440077f4e8bc76fc SHA512 47be42ed7993efb00e23a16ec1b970d83e44018d2f97da23d88505be3581ace7451a66b324f208e0071d0943de6b3b13380861d11bfdac9738f4f3e922a2e3e3
+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
 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 93b39e4eaa05..3eef02e2c0e8 100644
--- a/sci-libs/dlib/dlib-19.16.ebuild
+++ b/sci-libs/dlib/dlib-19.16.ebuild
@@ -15,6 +15,7 @@ LICENSE="Boost-1.0"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cblas cuda debug examples gif jpeg lapack mkl png python sqlite static-libs test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # doc needs a bunch of deps not in portage
diff --git a/sci-libs/dlib/dlib-19.4.ebuild b/sci-libs/dlib/dlib-19.4.ebuild
index c6116343a93b..8e755d5722ee 100644
--- a/sci-libs/dlib/dlib-19.4.ebuild
+++ b/sci-libs/dlib/dlib-19.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cblas debug cuda examples gif jpeg lapack mkl png
 	 sqlite static-libs test X"
+RESTRICT="!test? ( test )"
 
 # doc needs a bunch of deps not in portage
 
diff --git a/sci-libs/dlib/dlib-19.7.ebuild b/sci-libs/dlib/dlib-19.7.ebuild
index 34db96814907..470c52a217e6 100644
--- a/sci-libs/dlib/dlib-19.7.ebuild
+++ b/sci-libs/dlib/dlib-19.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="Boost-1.0"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cblas debug cuda examples gif jpeg lapack mkl png sqlite static-libs test X"
+RESTRICT="!test? ( test )"
 
 # doc needs a bunch of deps not in portage
 
diff --git a/sci-libs/dlib/dlib-19.9.ebuild b/sci-libs/dlib/dlib-19.9.ebuild
index 28049b0cd64a..d0a78e21fc64 100644
--- a/sci-libs/dlib/dlib-19.9.ebuild
+++ b/sci-libs/dlib/dlib-19.9.ebuild
@@ -13,6 +13,7 @@ LICENSE="Boost-1.0"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cblas debug cuda examples gif jpeg lapack mkl png python sqlite static-libs test X"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # doc needs a bunch of deps not in portage
diff --git a/sci-libs/dmlc-core/Manifest b/sci-libs/dmlc-core/Manifest
index 4fb999204d08..82b9a0fa9b02 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 2250 BLAKE2B 01afde6458c15d1f70e0954b34df30e6062994ab5ca8a55cef2a56ce3f15fe129b892cb93b0ceae74a4f83c697d277ad166b2217964d5ce79f9e34a194ed3bf1 SHA512 2e2e067d276fe36d505f89d131ea8b0d935bbb6290c3bb9c93d43d755e985dcc28e8d15a7da6f4e18b8371def749b80d4e06d65a3c1420999d7f7b91e13e79a7
+EBUILD dmlc-core-0_p20170719.ebuild 2274 BLAKE2B 52c76bf3da3b2647e1f22845743a5d51b8a70f42cc0cbb2d385d267497e1789affbf515fb0a4dbec30638988d5820c6e6bb71d01fa7eb05d763bda8a4a19932c SHA512 a8254d898026f942d4daaafa0c64909ca65edada4e32d5142af426d2bca45c7d6a383500c3bf9ec46cbd1a8e690a9727e5bc64375df8bf148581c0f03e4224b3
 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 adf78c827246..7b5c6e91bd63 100644
--- a/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
+++ b/sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ SLOT="0"
 # hdfs needs big java hdfs not yet in portage
 # azure not yet in portage
 IUSE="doc openmp s3 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="net-misc/curl[ssl]"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/exodusii/Manifest b/sci-libs/exodusii/Manifest
index 1ff7d7998db4..08f7e0036d85 100644
--- a/sci-libs/exodusii/Manifest
+++ b/sci-libs/exodusii/Manifest
@@ -1,4 +1,4 @@
 AUX exodusii-6.09-multilib.patch 2891 BLAKE2B 0bca9f2e768b409f1683c3d1925add553f86a9fca393551b98fefac1d4cc9913d50be4660bd4c62474a95f2aae129480533d2a51aaa2083cb5461b91c8655f7f SHA512 189047d12455c539308b8eeb81334d980f847d68b96df7cef442f8d552404e5c70f42a3e3649d62cc7db395ae2ca2f6988ee0638eebf52b3cab9c3bf964d5fc2
 DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516
-EBUILD exodusii-6.09.ebuild 1196 BLAKE2B c2ec5c8ed0c7665420cfa52edfac0e0deb6c504345775e31324d552e2dd103fed776ad31144f360b0b17ffbb33238130e73d1eb92025992368a4bcae7e611a0d SHA512 93d3dec6907f696c84ff8962dd9d942ddbabb0195e220332537500418d6d916c0281de58774eb4311cb78c5d513a63860a1b40af3a153024f5f581da99fa1804
+EBUILD exodusii-6.09.ebuild 1223 BLAKE2B 711f3b8b71c596f20c5358b1e345ee58040609e634f23ee495b254380dae06d871b354610db1de3eaeaad8a59c78edf83f1c6d15807cf94e6cd26e82df9a5218 SHA512 02a036b731650ed9d92a42fd9e8ffbe9d73b52865cedeb7a7d2b10b1765d0c583c83890b2c379da2ce9009116350e2fc188db6866f6200b65ce9e2683f991dc1
 MISC metadata.xml 603 BLAKE2B 99e4fc167e1cf5e96571a2024a8b217083a200fa3850d09c2d520939a87608ecc70708dd302f1c292338aa4c07d0a586c77da80392f85c16e2fb122f98c86cee SHA512 9d703efe9fbf4d49438d83bcdca60db2cd9a40f0b853fcf8cd796d9f96d304c84825c9e2cb26ba98f1893e3e85ddd1af8a5e15c4c4e179d6de25b1df98be3a55
diff --git a/sci-libs/exodusii/exodusii-6.09.ebuild b/sci-libs/exodusii/exodusii-6.09.ebuild
index 1b8221b53486..e866e4c029f8 100644
--- a/sci-libs/exodusii/exodusii-6.09.ebuild
+++ b/sci-libs/exodusii/exodusii-6.09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sci-libs/netcdf[hdf5]"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 5b0a52b1f284..8426ef1ee942 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -8,7 +8,7 @@ DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0
 DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f8216f497694ea1fccc43b6a53fc02d39e17f97c56d15d03410b2005e6c693cb4b639399aac0f6ebdc63fed32d2e SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472
 DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
 EBUILD fftw-2.1.5-r9.ebuild 3148 BLAKE2B c6b8afd87370e5f46aa702cebf74f7daaed6234ec175e013046a9bf13c8168a3a8b223c8bd72cba2aabbee19f9a246bdf1954865945a90a94afdb4de21e09936 SHA512 bced55608e2635cb945ff22ccdcfd1aab37313edbf64728f53fc6653cde54c7863f2dee32f8a198205c46906363a1503ad604f2a3d47f79fdd97634a67caed59
-EBUILD fftw-3.3.6_p2.ebuild 4430 BLAKE2B 1d25af2045be0efb6a810e0803dbdcb9f40743d3a77fc11e67b90e764f3c85a26e8f0a9b118410a2bc7a5ea869aec564a5fa7b97b991df4804b31070609ffcdb SHA512 bf9831541103d91e1319a53c2f2c8061b526bc553c70a0ea3471f8727c830b809438c2c74eef6a5fbebe952c2eb0195011d88288b176469f35ece747ace4ef27
-EBUILD fftw-3.3.8.ebuild 4460 BLAKE2B 10124fe44ad462d5b164dbd7e61c43555925af60028708498e779e045aeb618ad1fee8d2820e68ee012e76a0b247800d8a353723c413e28b12928b0797d858dc SHA512 d375d82c6276bcfd4c3a31262c14f7dc9ade0ea49e01c0803d6748c5df46cbad0b8e0741a2487a8ce93a576cea5a5e85dceb551e826872001cc056fbd3ba8908
-EBUILD fftw-9999.ebuild 4651 BLAKE2B 3d0a496935265e1e56b616577713736d62b30a4227a05d0ca6d1242b973161c13580eb98ee8e5420a7e0e452ddd6adcf860c702f107fdca256d852dd2220c324 SHA512 cbcfe34a1aea2c6a74188b37dd38f4e792474e0f963222f01988bc5e907b28ed5dc9dbd9d1d419ccd9d58132ac7538018bc91a2bc5f41581fd602f61e998442b
+EBUILD fftw-3.3.6_p2.ebuild 4457 BLAKE2B 7557f51209e37ccce47ffe3b22a78d14d88945f68c5bb234d2e6748a6809e63b1a2ad27a2d476ed43ded24d434d43bb8dd0dad54b9904466af3d70031bd01ad1 SHA512 ca833e3e838c18c91f7e708c0ffaad9df11b372d3b1c4d8753ce434bd8c3cae505a02b70dd339755e6d6ef6b35b58f84ce94cc2ac670fd3e8ff8eb62fcde1dd1
+EBUILD fftw-3.3.8.ebuild 4487 BLAKE2B 3f88b09f0973e09ebd253128086307354e03d091cc8095dbcd2672582dec2fdeca3965324a1ce6860aba9500397a2a1ce494547793073557981238b41b7f501a SHA512 4998722cd488e98041d4a8ec4bf3a0888358c5558a44da0e1dbd9be9b1e42d7ce0ebb9c18179d48b324b3ffaaea2473b350b407d5f7af3ad44515176dfd72d30
+EBUILD fftw-9999.ebuild 4678 BLAKE2B 360cf9fa16bcbb3492929e3a6465a3b3898c55c2e20e3b6c26694f8d7e9f9d3254c08c7d9565f9ab41314a7a51328443dec05d61ba0ac86da5e9724feb30b52a SHA512 66d7f5c3f94060b8ec0932eca34c5b858182a658e0a2cc67e003492180ff76a40d417b496ae31d25e47b5f399f7dc2f9efd304270e5bc208763bdad7adfa577f
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index 4535c715b265..69891e2d3d37 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -23,6 +23,7 @@ fi
 LICENSE="GPL-2+"
 SLOT="3.0/3"
 IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
diff --git a/sci-libs/fftw/fftw-3.3.8.ebuild b/sci-libs/fftw/fftw-3.3.8.ebuild
index c89038acc6aa..b0783f5d9cb0 100644
--- a/sci-libs/fftw/fftw-3.3.8.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8.ebuild
@@ -23,6 +23,7 @@ fi
 LICENSE="GPL-2+"
 SLOT="3.0/3"
 IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index a43b48e5809f..3e2234048b53 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -23,6 +23,7 @@ fi
 LICENSE="GPL-2+"
 SLOT="3.0/3"
 IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
diff --git a/sci-libs/gaul-devel/Manifest b/sci-libs/gaul-devel/Manifest
index 317675efac83..f361f972f808 100644
--- a/sci-libs/gaul-devel/Manifest
+++ b/sci-libs/gaul-devel/Manifest
@@ -1,5 +1,5 @@
 AUX gaul-devel-0.1849-as-needed.patch 972 BLAKE2B e03bef77af59333a76a6c91ed6cde6277c5457867cbf78b06f1489fff8e3c0f352485d8a2f7708d39103fc5f4c329373f4f4e54bbcc143de68e145a8befc392c SHA512 2f5b17231b3bc1d932389a3c550ab2756c39ce302bee3c1d9d64932dd080fb828a6035000c2b0b1b45815f2377da5e4665738630ea32cb827d63387c26c1ab6c
 AUX gaul-devel-0.1849-slang2-error.patch 976 BLAKE2B e5f7427d4a566fcec91c37234621beeaabc80aa62a5f0b3ae5b83539ad30d4332447affe9dfb7518d226d871faefee36ecb5c08af84995b26a0865a45263a51c SHA512 7f31cc6d382122e6610230cfc7541517948a35a499b1334573cd023c9af0148a8b1c37ffaaf5b3ca9facbfce5a5ecceeb9a0d9725719979b7e973fc88a478269
 DIST gaul-devel-0.1849-0.tar.bz2 416827 BLAKE2B 7d35ed137731efccd823d580192a3648b075900d469e1506e2689017271e78bb81e7f5cfe256100e3469f92df5c69eceaeadf5b396f58a1a76df614103b00a12 SHA512 c9da2b983073c99b9f785b665b17c7c63b61a5d879c99c167c2014cc1dfd8ad689f89ec788d69a05e0ed391c97dbe1671d039d9122e58a354e8304785082c93d
-EBUILD gaul-devel-0.1849-r2.ebuild 903 BLAKE2B eca8661b4718b7be5e8bedd574280cf139b60a9bfe6ca01ce9cdbd6c7d64ab8fe6142c31d05cca64bbbef277c2424ec564177e6af9fa1952253153d85668d482 SHA512 e30e93e55aa133ea1aac716582b69848e5c7ed99704e90f987fc51bf2022ce6be86da702c7235f9a8608fe549692958a1ee76d3572d46c8850ce48c67725d47c
+EBUILD gaul-devel-0.1849-r2.ebuild 762 BLAKE2B 51ce361774e1533a96b773fac06dcaf0a8479d557cd5d9044ef79c5c7b113f497cdb81004b15d5f724699c15d35476e203008a4738e62e623d02e875bb25b993 SHA512 4c2fd83f73dd0804edb060d04371d36fac235cd72e925ccf491f951b000e9df3c44857683e06eb5f9194e37ab8bc4a2e6e2c35a2a6ffa341db8553931c8937e6
 MISC metadata.xml 881 BLAKE2B 76b563cd127da255b8faa32c39b879632098d8b068c559c7d77b16b542282edf69291bc8f58ef744d1301ea8c5f61da6900567e80899ed5370d2f4a277a7058c SHA512 636f1af4488f9b15cf8df5ba76d9d8eae2da7a879e970fdff6342420ecf869ce76b70bd39b033bc28d90f6b4a8affd5d3f10d2ad1ba7700b59d5f6f009d724cb
diff --git a/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild b/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild
index 56d910c69c5a..883d578b3fea 100644
--- a/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild
+++ b/sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Genetic Algorithm Utility Library"
 HOMEPAGE="http://GAUL.sourceforge.net/"
@@ -12,34 +12,33 @@ SRC_URI="mirror://sourceforge/gaul/${P}-0.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug slang static-libs"
+IUSE="slang"
 
-DEPEND="
-	sys-apps/sed
-	slang? ( sys-libs/slang )"
-RDEPEND="${DEPEND}"
+RDEPEND="slang? ( sys-libs/slang:= )"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${P}-0
+S="${WORKDIR}/${P}-0"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-slang2-error.patch
+	"${FILESDIR}"/${P}-as-needed.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-slang2-error.patch \
-		"${FILESDIR}"/${P}-as-needed.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	local myconf
-	use slang || myconf="--enable-slang=no"
-	if use debug ; then
-		myconf="${myconf} --enable-debug=yes --enable-memory-debug=yes"
-	else
-		myconf="${myconf} --enable-g=no"
-	fi
-	econf $(use_enable static-libs static) ${myconf}
+	econf \
+		--disable-static \
+		$(use_enable slang)
 }
 
 src_install() {
-	MAKEOPTS+=" -j1"
 	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 613e4e04d1d7..602d6efbb088 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -6,6 +6,7 @@ AUX gdal-2.4.1-poppler-0.76.patch 699 BLAKE2B 132ff0a3046734e851d12379d049b2e4fd
 AUX gdal-2.4.1-poppler-0.82.patch 2322 BLAKE2B a07590bdd3d910b6da8e99989f648251d891fe170ec5b6954d34a3986ce949f2c428f184d8ffbe6292cf6fb7915753db7e81b4993c71fe2b1e4016745c8595fd SHA512 9aca4c69c1df413666d58d75e9b235cc7039224e400188e982b5e9de22773b20829c09eb467069c9e56ea79aa4de2f0e1267d2ed4cd8bb1be7e0432f2c7297c2
 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 8193 BLAKE2B a07ad5889a6d80a2fa92aab151cb279769e19bdb7b85293cead93ebecfda9be6689eb762b7e4ad237ad8ab32cd6f3ce9d45e36865116f8b1e1b6e8ed27892ae1 SHA512 b626dc9c2568d76aec6ab7a1e16172d983661289cb3b531e84a3ece9862168c57316c8b1fe9ec177b17a8f811b039bc7e4a6d6eff5d2f1c9ac589b3e0c424365
+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
diff --git a/sci-libs/gdal/gdal-2.4.1-r1.ebuild b/sci-libs/gdal/gdal-2.4.1-r1.ebuild
index db767c561b77..afdbf3e0aa52 100644
--- a/sci-libs/gdal/gdal-2.4.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.4.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.3"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 COMMON_DEPEND="
diff --git a/sci-libs/gdal/gdal-2.4.1-r2.ebuild b/sci-libs/gdal/gdal-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..fa26cc48e938
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.4.1-r2.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2019 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} )
+DISTUTILS_OPTIONAL=1
+inherit autotools perl-module distutils-r1 flag-o-matic java-pkg-opt-2 toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/2.3"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+	mdb? ( java )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )
+"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	java? ( >=virtual/jdk-1.7:* )
+	perl? ( dev-lang/swig:0 )
+	python? (
+		dev-lang/swig:0
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
+
+DEPEND="
+	dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre
+	dev-libs/libxml2:=
+	media-libs/tiff:0=
+	sci-libs/libgeotiff:=
+	sys-libs/zlib:=[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-2.2.1 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+	jpeg? ( virtual/jpeg:0= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	mdb? ( dev-java/jackcess:1 )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( app-text/poppler:= )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )
+	zstd? ( app-arch/zstd:= )"
+
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.7:* )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.3-soname.patch"
+	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
+	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+	"${FILESDIR}/${P}-poppler-0.75.patch"
+	"${FILESDIR}/${P}-poppler-0.76.patch"
+	"${FILESDIR}/${P}-swig-4.patch" # bug 689110
+	"${FILESDIR}/${P}-poppler-0.82.patch"
+)
+
+src_prepare() {
+	# fix datadir and docdir placement
+	sed -e "s:@datadir@:@datadir@/gdal:" \
+		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+		-i "${S}"/GDALmake.opt.in || die
+
+	# the second sed expression should fix bug 371075
+	sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
+		-i "${S}"/swig/python/GNUmakefile || die
+
+	# Fix spatialite/sqlite include issue
+	sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
+		-i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
+
+	# Fix freexl configure check
+	sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
+		-i configure.ac || die
+
+	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+		-i configure.ac || die
+
+	sed -e 's:^ar:$(AR):g' \
+		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+	# updated for newer swig (must specify the path to input files)
+	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
+		-i swig/python/GNUmakefile || die "sed python makefile failed"
+	sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
+		-i swig/python/setup.cfg || die "sed python setup.cfg failed"
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# bug 619148
+	append-cxxflags -std=c++14
+
+	local myconf=(
+		# charls - not packaged in Gentoo ebuild repository
+		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+		# bsb - legal issues
+		# ingres - same story as oracle oci
+		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+		# podofo - we use poppler instead they are exclusive for each other
+		# tiff is a hard dep
+		--includedir="${EPREFIX}"/usr/include/${PN}
+		--disable-pdf-plugin
+		--disable-static
+		--enable-shared
+		--with-expat
+		--with-cryptopp=no
+		--with-geotiff
+		--with-grib
+		--with-hide-internal-symbols
+		--with-libjson-c="${EPREFIX}"/usr/
+		--with-libtiff
+		--with-libtool
+		--with-libz="${EPREFIX}"/usr/
+		--with-gnm
+		--without-bsb
+		--without-charls
+		--without-dods-root
+		--without-ecw
+		--without-epsilon
+		--without-fgdb
+		--without-fme
+		--without-gta
+		--without-grass
+		--without-hdf4
+		--without-idb
+		--without-ingres
+		--without-jasper
+		--without-jp2lura
+		--without-jp2mrsid
+		--without-kakadu
+		--without-kea
+		--without-libkml
+		--without-mongocxx
+		--without-mrsid
+		--without-mrsid_lidar
+		--without-msg
+		--without-mrf
+		--without-rasdaman
+		--without-rasterlite2
+		--without-pcraster
+		--without-pdfium
+		--without-podofo
+		--without-qhull
+		--without-sde
+		--without-sfcgal
+		--without-sosi
+		--without-teigha
+		--disable-lto
+		$(use_enable debug)
+		$(use_with armadillo)
+		$(use_with aux_xml pam)
+		$(use_with curl)
+		$(use_with fits cfitsio)
+		$(use_with geos)
+		$(use_with gif)
+		$(use_with gml xerces)
+		$(use_with hdf5)
+		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library yreleased developer by gdal
+		$(use_with jpeg)
+		$(use_with jpeg2k openjpeg)
+		$(use_with lzma liblzma)
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
+		$(use_with netcdf)
+		$(use_with oracle oci)
+		$(use_with odbc)
+		$(use_with ogdi ogdi "${EPREFIX}"/usr)
+		$(use_with opencl)
+		$(use_with pdf poppler)
+		$(use_with perl)
+		$(use_with png)
+		$(use_with postgres pg)
+		$(use_with python)
+		$(use_with spatialite)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+		$(use_with threads)
+		$(use_with webp)
+		$(use_with xls freexl)
+		$(use_with zstd)
+	)
+
+	tc-export AR RANLIB
+
+	if use java; then
+		myconf+=(
+			--with-java=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-lib=dlopen
+			$(use_with mdb)
+		)
+	else
+		myconf+=( --without-java --without-mdb )
+	fi
+
+	if use sqlite; then
+		append-libs -lsqlite3
+	fi
+
+	# bug #632660
+	if use ogdi; then
+		tc-export PKG_CONFIG
+		append-cflags $(${PKG_CONFIG} --cflags libtirpc)
+		append-cxxflags $(${PKG_CONFIG} --cflags libtirpc)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		sed -e "s: -rdynamic : :" \
+			-i GDALmake.opt || die "sed LIBS failed"
+	fi
+}
+
+src_compile() {
+	if use perl; then
+		rm "${S}"/swig/perl/*_wrap.cpp || die
+		emake -C "${S}"/swig/perl generate
+	fi
+
+	# gdal-config needed before generating Python bindings
+	default
+
+	if use perl ; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null || die
+	fi
+
+	if use python; then
+		rm -f "${S}"/swig/python/*_wrap.cpp || die
+		emake -C "${S}"/swig/python generate
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+
+	use doc && emake docs
+}
+
+src_install() {
+	if use perl ; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		myinst=( DESTDIR="${D}" )
+		perl-module_src_install
+		popd > /dev/null || die
+		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
+			-i GDALmake.opt || die
+	fi
+
+	use perl && perl_delete_localpod
+
+	local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
+	use doc && HTML_DOCS=( html/. )
+
+	default
+
+	python_install() {
+		distutils-r1_python_install
+		python_doscript scripts/*.py
+	}
+
+	if use python; then
+		# Don't clash with gdal's docs
+		unset DOCS HTML_DOCS
+
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		newdoc swig/python/README.txt README-python.txt
+
+		insinto /usr/share/${PN}/samples
+		doins -r swig/python/samples/
+	fi
+
+	doman "${S}"/man/man*/*
+	find "${D}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 256b2440d666..f2dc3012c64e 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 1420 BLAKE2B 27a9f526a4c9e9bdcbe75e725ec4ea13a054e41337df529e8d8e95076f01134102762b45d4ca10b8a3f15db7079e29ac99118f4b1c8d700af69604fe6fe8d89b SHA512 c0e437175912be574a17cb6911655eed1724195d147ce4dad1dc2253f9fc98fb96fbcee39338ce110c6c08ccdd3c2dad602dca06c50e58c481c9c3a9049ca425
+EBUILD gsl-2.5-r1.ebuild 1418 BLAKE2B cd85c83b3db1901848f53c9ef33c10ed9df2ccae4330fae4c80b3d1585e519890f9d61cdcd8f3317c48e5b0bd77ccab2cea69ef8aa12cff18aa199c54defce69 SHA512 55b291aae0ad83d994320445bf2b8430c4c4dfdb674411f1887bd38facf73c37adbdd017b2ff46ffaee8649ccdc9078563eb53199830caf56fa816de325db971
 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 be40aa2ab04e..22e2c8677c62 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/hdf/Manifest b/sci-libs/hdf/Manifest
index 3a2fce57402b..c4724f471bca 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,14 +1,11 @@
-AUX 4.2.7_p1-autotools.patch 3908 BLAKE2B 83041007560940adbce1bc6fc3c0cdb66d9b3e2a4a66f269792896b195f3592601fd03b997b2aea4ffe443226172a0cb379b445e01b9c70377e9c8e51ff508e6 SHA512 ba33a5a2e182feca790069f730dcc2a67d1ac22985a4e4b484e28b8cff7fe55da9675d8c2c60a2a0c733035b76df9325642e7e71a38d2ba7cc4c5378cc9a133c
 AUX hdf-4.2.11-enable-fortran-shared.patch 1287 BLAKE2B 4b1b7aab9a2eb958684418a01067f37b46c38ad1f8c983caace0f01b29a26d1f0c787cfb80045f228a91cb962dd997995e6e5ada1df28e6e1d0bbc70d332265c SHA512 787260127abff6695e5cddbbd75290c2349ae150c01dd1c74e83539e78d503bbcb017ea8aba8f808d846e7e291e4cb13ef69d4186ff1e38780c75e0046ca6734
 AUX hdf-4.2.11-fix-examples-dir.patch 5966 BLAKE2B 8ff35e5db544e73e85629f555d6dd7b22ae902d16c4fa2da5e9c29694196abc9fc65c591fa5898f324ad36a73cc39b2b3785ae1936ae101da3cab4a2eb6d7f5c SHA512 f33b6e2f5de26687accba8b6ff7c1d50b96f9ad40b84771ea8a361692da88d2f376331cb8a80dc662e3213d6ddc7707ca5fcbfcaf7c1ef7224a534c0a969fabb
 AUX hdf-4.2.11-fix-szip-detection.patch 896 BLAKE2B 6e703621ffed66b6757a500cf24cf1f428d5d130f9aebfc261e6108d19cbd7846fc2d90820c993d03fab5c7943b032afb3c8d0b2053ef1665a94f6e38403c60f SHA512 44342b4e7680a002a3dd9ae2a56dcb6689ee57824476436dc5ef5ff1884174e9de6c98972fccc88296f376a354f92e049d64c493df81da2d08ace6271cd2292a
 AUX hdf-4.2.13-fix-xdr-configure.patch 376 BLAKE2B 611e5b37016750ad408a0cf8d73827e4974248747c1a21206149ededbfe8cfd087c862f321e55a23b5d7187b202ac6256edee84c9dee3cad6357081a7ae86d75 SHA512 dd99f0c0a5fe858a717c1373c75c84867383511e91fb5c703353feb22410ea561f84fe03c5c7578d27817a74579516e60331f5d14a1ad3ea38ab1376e396b5c8
 AUX hdf-4.2.13-linux-tirpc.patch 972 BLAKE2B a95350ef2364e3ff08aa79d12e458853bebe610cd8376f6b6a0483f0962fca1a131be1b09cf3cc1447e1fb3b2fded9567a1a3755dbf5f195b0f70ae124bed3c9 SHA512 9901bdacab3e82632637d18fd08714876a990ceb4573261cc0e1e03a5e4e422c50c460a594d46b0434c9c7b96c1bf57de1aa52bbb59e525298eeacf22e8b41b1
-AUX hdf-4.2.9-autotools.patch 3486 BLAKE2B 75786eb25bc11bb53cded2ed6704411eec129dcc2e4fbe43f7b48340a8ff9721d3405e931498085ceeec5eba8fb36c9a7cbf2e1fb05ca89a2d0e5fff67496272 SHA512 c34fafadc39e43169d353bf6d5a01b814ae5d963da2cdf3b140e83dedae84b424dcfcd770aed3512e4ae4f3f358147cf01ec9a72be7e6db5d41c39443d6d44c7
-AUX hdf-ppc.patch 10374 BLAKE2B db28f0a201e4ade1cf126328522443acc99cc1951c9ab538ef137f42a84b6a38e08b9484337fef218a72675fd6ae5b26ddd340540fc3141e89b6be3c4848d41c SHA512 ac88c595e369709dc907b5f009429654c59ae1ac31869aace2656511687d0a7093d41af218768cc825181f623d0018991d1e49e0c48329766c01f608873d2ddb
 DIST hdf-4.2.11.tar.bz2 3173535 BLAKE2B a35a366858cc67d6ef68959cf407c21a929d5dca82834937b648eded506c7c3f75dd67be763f0d1fc24b7be92849b53d688abb25611cbc9b918340dbb23a83e1 SHA512 b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
-EBUILD hdf-4.2.11.ebuild 1605 BLAKE2B 3fbc0b8249a58acd581bd772dbc87c84b18cf523394148dc6492c4fb80a1b7a9667f681650da569afb5db34488361ae27b29db1e3c9fde5570a2a4e08c2b8546 SHA512 45933e613ec198793450fdabcc8c70523eeead4b37e416b607803165c57e8f493d40c863e19e30d754fc765a0a14ccc92b472a4a5606d73912a87309339d5233
-EBUILD hdf-4.2.13-r1.ebuild 1790 BLAKE2B 839f4242d020887d46a486b1f74fb192ec3139f08218b3831d80d2b0ba38ac4dd46297b10df70bf9953a18570f689afb07061cc8c678d026378495b3ee36003e SHA512 218b0e94ec940abcf3603a391de2a694195db122c1331f1ad101262bc968bfb820854e3988fe35b6528d0a6afbfa4f520d4511c0da8159d7fc03e6dd6434bc0f
-EBUILD hdf-4.2.13.ebuild 1677 BLAKE2B 5f82e08c5181de3e8b9bfc50774a7f122a47208b8709e557521cdaefbae51e10fe9c5bcc0ee0a58d3d12b6cae8c6c3f8cd74b3e268b4c5c28e6c8f519a205246 SHA512 17fe44cab142ac357c219c012773d0d411a29292a745c414ff1fd1490c5514a231ccbaae6117eddd8b3e9e2c98a70f0b786c7337841259b07095f83813a92787
+EBUILD hdf-4.2.11.ebuild 1629 BLAKE2B 2e529d551fafd7d3b4f5c2c2053b1c18101f8135ca923940778c35d6e3be116f53d0b6edf6f3f97c2990af3261d4e3f44cfe96eb9455a12c6dcb8808d0536f85 SHA512 b05ebf317ffbb9c94d4002eeba5f612461c86946cd2dcdc12d2a74ba3510745d328b2bfa92705a73589279ff080d3f9fa73304535e35978c6ad2920becd69846
+EBUILD hdf-4.2.13-r1.ebuild 1814 BLAKE2B 6ea22642e1f9ca67825450ceaa979624f95a12a8d22c9ad1914ca3cd0a10b27f742f9c4c694700a16088d80f2c1de887bd408bffac3053ec0699677a4a443c70 SHA512 c204a1ccf112c02540d15c23e13fdec577645314dec4ba20347f12550800cc06ddb378a39db099f91e39fa9da82f36645342c1e3617491ef45c805e9486e9c10
+EBUILD hdf-4.2.13.ebuild 1701 BLAKE2B a9c4e887a0574b7dc305820efb837e81d4a31df1a133a50d9b4996776cdbbc40a77d8905e979bc9731265483a1d822043966ff172c6f83749535357aa41d2781 SHA512 c3793c7f7936d1125c5e59a0258cb8c243dc739075838f24eb10604f2257b65eff7c4ad85b6a5147a21c7e2b93138dedbbeb1493577392204625bbd30371a7d2
 MISC metadata.xml 859 BLAKE2B c5c33f1a444d0af6287dac495443be05de5a2b8d9c55d4bf9aeb80ebc28f1391612510771848277fa1467097ab480b9b1dc306af587d2621e4a1d16c6bdc91a5 SHA512 2a38d2fbd5672f4465cba6da9f74c6ef95068be26514acc3d2949049f8461265e2ce7c6751d1853218ac4a4b62746e355faa9f2e0d7d8d6dc2faf17d8e40fceb
diff --git a/sci-libs/hdf/files/4.2.7_p1-autotools.patch b/sci-libs/hdf/files/4.2.7_p1-autotools.patch
deleted file mode 100644
index 6ae9ccfc64e5..000000000000
--- a/sci-libs/hdf/files/4.2.7_p1-autotools.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -Nur hdf-4.2.7-patch1.orig/configure.ac hdf-4.2.7-patch1/configure.ac
---- hdf-4.2.7-patch1.orig/configure.ac	2012-03-18 03:45:46.000000000 +0000
-+++ hdf-4.2.7-patch1/configure.ac	2012-04-13 03:04:17.000000000 +0100
-@@ -200,20 +200,6 @@
- dnl Build static libraries by default. Furthermore, fortran shared libraries
- dnl are unsupported. Disallow a user from enabling both shared libraries and
- dnl fortran.
--if test "X${enable_shared}" != "Xyes"; then
--    enable_shared="no"
--fi
--
--if test "X${enable_shared}" = "Xyes"; then
--    if test "X${BUILD_FORTRAN}" = "Xyes"; then
--        AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.])
--    fi
--fi
--
--AC_PROG_INSTALL
--AC_PROG_LN_S
--
--AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
- 
- AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], [])
- 
-@@ -404,6 +390,8 @@
- 
-     if test -z "$HAVE_SZIP"; then
-       AC_MSG_ERROR([couldn't find szlib library])
-+    else
-+      USE_COMP_SZIP="yes"
-     fi
-     ;;
-   no)
-@@ -447,7 +435,7 @@
- 
-     AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
- 
--    if test -z "$HAVE_SZIP"; then
-+    if test "X$HAVE_SZIP" != "Xyes"; then
-       AC_MSG_ERROR([couldn't find szlib library])
-     else
-       USE_COMP_SZIP="yes"
-@@ -703,7 +691,7 @@
- dnl ======================================================================
- dnl Libtool initialization
- dnl ======================================================================
--LT_INIT(dlopen disable-shared) 
-+LT_INIT(dlopen) 
- LT_OUTPUT
- 
- dnl ======================================================================
-@@ -781,11 +769,6 @@
- dnl ------------------------------------------------------------------------
- dnl Check to see if libtool has enabled shared libraries. Set a conditional
- dnl as some Makefiles will build based on availability of shared libraries.
--if (./libtool --features | grep '^enable shared libraries' > /dev/null); then
--  enable_shared=yes
--else
--  enable_shared=no
--fi
- 
- dnl ------------------------------------------------------------------------
- dnl Specify shared library extension the host machine should recognize.
-@@ -840,23 +823,8 @@
- dnl name of the compiler and the reported version number.
- AC_SUBST([F77_VERSION])
- dnl Strip anything that looks like a flag off of $F77
--F77_NOFLAGS=`echo $F77 | sed 's/ -.*//'`
--
--if `echo $F77_NOFLAGS | grep ^/ >/dev/null 2>&1`; then
--  F77_VERSION="$F77"
--else
--  F77_VERSION="$F77";
--  for x in `echo $PATH | sed -e 's/:/ /g'`; do
--    if test -x $x/$F77_NOFLAGS; then
--      F77_VERSION="$x/$F77"
--      break
--    fi
--  done
--fi
--if test -n "$fc_version_info"; then
--  F77_VERSION="$F77_VERSION ( $fc_version_info)"
--fi
- 
-+F77_VERSION="$F77";
- 
- dnl This part doesn't work yet since HDF4 config files do not contain
- dnl information for fortran_vendor and fortran_version. 
-diff -Nur hdf-4.2.7-patch1.orig/hdf/test/fortestF.f hdf-4.2.7-patch1/hdf/test/fortestF.f
---- hdf-4.2.7-patch1.orig/hdf/test/fortestF.f	2012-03-18 03:44:01.000000000 +0000
-+++ hdf-4.2.7-patch1/hdf/test/fortestF.f	2012-04-13 02:20:45.000000000 +0100
-@@ -203,7 +203,7 @@
- 
- 	if (cmd .NE. 'Test' .AND. cmd .NE. 'test') then
- 	 print *, 'Unknown Command: ', cmd, param
--	 print *, 'Try one of "Skip", "Test", "Verbosity" or "Cleanup"'
-+	 print *, 'Try one of Skip, Test, Verbosity or Cleanup'
- 	 retcode = -1
- 	 return
- 	endif
-diff -Nur hdf-4.2.7-patch1.orig/mfhdf/libsrc/Makefile.am hdf-4.2.7-patch1/mfhdf/libsrc/Makefile.am
---- hdf-4.2.7-patch1.orig/mfhdf/libsrc/Makefile.am	2012-03-18 03:44:00.000000000 +0000
-+++ hdf-4.2.7-patch1/mfhdf/libsrc/Makefile.am	2012-04-13 02:20:45.000000000 +0100
-@@ -32,10 +32,11 @@
- else
- libmfhdf_la_SOURCES = $(CSOURCES)
- endif
-+libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la
- 
- if HDF_BUILD_XDR
- XDRLIB = ../xdr/libxdr.la
--libmfhdf_la_LIBADD = $(XDRLIB)
-+libmfhdf_la_LIBADD += $(XDRLIB)
- endif
- 
- if HDF_BUILD_NETCDF
diff --git a/sci-libs/hdf/files/hdf-4.2.9-autotools.patch b/sci-libs/hdf/files/hdf-4.2.9-autotools.patch
deleted file mode 100644
index a31946a0dfee..000000000000
--- a/sci-libs/hdf/files/hdf-4.2.9-autotools.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -216,20 +216,6 @@ AC_SUBST([BUILD_FORTRAN])
- ## Build static libraries by default. Furthermore, fortran shared libraries
- ## are unsupported. Disallow a user from enabling both shared libraries and
- ## fortran.
--if test "X${enable_shared}" != "Xyes"; then
--    enable_shared="no"
--fi
--
--if test "X${enable_shared}" = "Xyes"; then
--    if test "X${BUILD_FORTRAN}" = "Xyes"; then
--        AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.])
--    fi
--fi
--
--AC_PROG_INSTALL
--AC_PROG_LN_S
--
--AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
- 
- AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], [])
- 
-@@ -261,7 +247,7 @@ AC_SUBST([LT_STATIC_EXEC])
- ## ======================================================================
- ## Libtool initialization
- ## ======================================================================
--LT_INIT([dlopen disable-shared])
-+LT_INIT([dlopen])
- LT_OUTPUT
- 
- ## ----------------------------------------------------------------------
-@@ -453,6 +439,8 @@ case "$withval" in
- 
-     if test -z "$HAVE_SZIP"; then
-       AC_MSG_ERROR([couldn't find szlib library])
-+    else
-+      USE_COMP_SZIP="yes"
-     fi
-     ;;
-   no)
-@@ -496,7 +484,7 @@ case "$withval" in
- 
-     AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
- 
--    if test -z "$HAVE_SZIP"; then
-+    if test "X$HAVE_SZIP" != "Xyes"; then
-       AC_MSG_ERROR([couldn't find szlib library])
-     else
-       USE_COMP_SZIP="yes"
-@@ -837,11 +825,6 @@ done
- ## ------------------------------------------------------------------------
- ## Check to see if libtool has enabled shared libraries. Set a conditional
- ## as some Makefiles will build based on availability of shared libraries.
--if (./libtool --features | grep '^enable shared libraries' > /dev/null); then
--  enable_shared=yes
--else
--  enable_shared=no
--fi
- 
- ## ------------------------------------------------------------------------
- ## Specify shared library extension the host machine should recognize.
-@@ -911,22 +894,7 @@ fi
- ## name of the compiler and the reported version number.
- AC_SUBST([F77_VERSION])
- ## Strip anything that looks like a flag off of $F77
--F77_NOFLAGS=`echo $F77 | sed 's/ -.*//'`
--
--if `echo $F77_NOFLAGS | grep ^/ >/dev/null 2>&1`; then
--  F77_VERSION="$F77"
--else
--  F77_VERSION="$F77";
--  for x in `echo $PATH | sed -e 's/:/ /g'`; do
--    if test -x $x/$F77_NOFLAGS; then
--      F77_VERSION="$x/$F77"
--      break
--    fi
--  done
--fi
--if test -n "$fc_version_info"; then
--  F77_VERSION="$F77_VERSION ( $fc_version_info)"
--fi
-+F77_VERSION="$F77"
- 
- ## This part doesn't work yet since HDF4 config files do not contain
- ## information for fortran_vendor and fortran_version. 
---- a/hdf/test/fortestF.f
-+++ b/hdf/test/fortestF.f
-@@ -203,7 +203,7 @@ C Skip command
- 
- 	if (cmd .NE. 'Test' .AND. cmd .NE. 'test') then
- 	 print *, 'Unknown Command: ', cmd, param
--	 print *, 'Try one of "Skip", "Test", "Verbosity" or "Cleanup"'
-+	 print *, 'Try one of Skip, Test, Verbosity or Cleanup'
- 	 retcode = -1
- 	 return
- 	endif
---- a/mfhdf/libsrc/Makefile.am
-+++ b/mfhdf/libsrc/Makefile.am
-@@ -32,10 +32,11 @@ libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
- else
- libmfhdf_la_SOURCES = $(CSOURCES)
- endif
-+libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la
- 
- if HDF_BUILD_XDR
- XDRLIB = $(top_builddir)/mfhdf/xdr/libxdr.la
--libmfhdf_la_LIBADD = $(XDRLIB)
-+libmfhdf_la_LIBADD += $(XDRLIB)
- endif
- 
- if HDF_BUILD_NETCDF
diff --git a/sci-libs/hdf/files/hdf-ppc.patch b/sci-libs/hdf/files/hdf-ppc.patch
deleted file mode 100644
index 3cf62d09371d..000000000000
--- a/sci-libs/hdf/files/hdf-ppc.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-Fix FTBS on ppc
-
-https://bugs.gentoo.org/show_bug.cgi?id=450188
-
-Source: http://pkgs.fedoraproject.org/cgit/hdf.git
---- a/hdf/src/hdfi.h
-+++ b/hdf/src/hdfi.h
-@@ -76,6 +76,7 @@
- #define     DFMT_IA64           0x4441
- #define     DFMT_LINUX64        0x4441
- #define     DFMT_POWERPC64      0x1111
-+#define     DFMT_LINUXPPC       0x1111
- 
- /* I/O library constants */
- #define UNIXUNBUFIO 1
-@@ -1289,6 +1290,57 @@ typedef long              hdf_pint_t;
- 
- #endif /*Linux 64 */
- 
-+/* Linux PPC */
-+#if defined __powerpc__ && !defined __powerpc64__
-+
-+#ifdef GOT_MACHINE
-+If you get an error on this line more than one machine type has been defined.
-+Please check your Makefile.
-+#endif
-+#define GOT_MACHINE
-+
-+#include <sys/file.h>               /* for unbuffered i/o stuff */
-+#include <sys/stat.h>
-+#define DF_MT             DFMT_LINUXPPC
-+typedef void              VOID;
-+typedef void              *VOIDP;
-+typedef char              *_fcd;
-+typedef char              char8;
-+typedef unsigned char     uchar8;
-+typedef char              int8;
-+typedef unsigned char     uint8;
-+typedef short int         int16;
-+typedef unsigned short int uint16;
-+typedef int               int32;
-+typedef unsigned int      uint32;
-+typedef int               intn;
-+typedef unsigned int      uintn;
-+typedef int               intf;     /* size of INTEGERs in Fortran compiler */
-+typedef float             float32;
-+typedef double            float64;
-+typedef long              hdf_pint_t;   /* an integer the same size as a pointer */
-+#define FNAME_POST_UNDERSCORE
-+#define _fcdtocp(desc) (desc)
-+#ifdef  HAVE_FMPOOL
-+#define FILELIB PAGEBUFIO  /* enable page buffering */
-+#else
-+#define FILELIB UNIXBUFIO
-+#endif
-+
-+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
-+
-+/* Determine the memory manager we are going to use. Valid values are: */
-+/*  MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS.  See the JPEG docs for details on */
-+/*  what each does */
-+#define JMEMSYS         MEM_ANSI
-+
-+#ifdef __GNUC__
-+#define HAVE_STDC
-+#define INCLUDES_ARE_ANSI
-+#endif
-+
-+#endif /*Linux PPC */
-+
- /*-----------------------------------------------------*/
- /* 64-bit Free BSD */
- 
---- a/mfhdf/fortran/config/jackets-linux.c
-+++ b/mfhdf/fortran/config/jackets-linux.c
-@@ -34,7 +34,7 @@
- 
- struct ncfils {			/* This will be a common block from Fortran */
-     double dd;
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-     int ll;
- #else
-     long ll;
-@@ -65,7 +65,7 @@ struct ncfils {			/* This will be a comm
- 
- struct ncfils {			/* This will be a common block from Fortran */
-     double dd;
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-     int ll;
- #else
-     long ll;
-@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims)
- }
- #endif /* FORTRAN_HAS_NO_SHORT */
- 
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- /*
-  * Convert multi-dimensional array of NCLONGs stored in ints to packed
-  * array of longs, in malloc'ed space.  Returns pointer to longs or NULL
-@@ -916,7 +916,7 @@ nncvpt1(cdfid, varid, indices, value, rc
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long          longs = *(int *)value;
-@@ -1030,7 +1030,7 @@ nncvpt(cdfid, varid, start, count, value
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long *longs = itol (value, ncount, ndims);
-@@ -1141,7 +1141,7 @@ nncvptg(cdfid, varid, start, count, stri
- 	tmpbasis	= nctypelen(NC_LONG);
-     else
- #endif
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-     if (datatype == NC_LONG)
- 	tmpbasis	= sizeof(int);
-     else
-@@ -1198,7 +1198,7 @@ nncvptg(cdfid, varid, start, count, stri
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long *longs = itolg (value, ncount, nbasis, ndims);
-@@ -1334,7 +1334,7 @@ nncvgt1(cdfid, varid, indices, value, rc
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long          longs;
-@@ -1476,7 +1476,7 @@ nncvgt(cdfid, varid, start, count, value
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long iocount = dimprod (ncount, ndims);	/* product of dimensions */
-@@ -1614,7 +1614,7 @@ nncvgtg(cdfid, varid, start, count, stri
- 	tmpbasis	= nctypelen(NC_LONG);
-     else
- #endif
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-     if (datatype == NC_LONG)
- 	tmpbasis	= sizeof(int);
-     else
-@@ -1685,7 +1685,7 @@ nncvgtg(cdfid, varid, start, count, stri
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long iocount = dimprod (ncount, ndims);	/* product of dimensions */
-@@ -1851,7 +1851,7 @@ nncapt(cdfid, varid, attname, datatype,
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long *longs = itol (value, attlen, 1);
-@@ -2016,7 +2016,7 @@ nncagt(cdfid, varid, attname, value, rco
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- /* EIP  We need to use int buffer to read data in on the platforms where long is 8 bytes
---- a/mfhdf/libsrc/netcdf.h.in
-+++ b/mfhdf/libsrc/netcdf.h.in
-@@ -295,7 +295,7 @@ typedef double        ncdouble;
-  */
- #if defined _CRAYMPP
- typedef short	nclong;
--#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64
-+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__
- typedef int     nclong;   
- #else
- typedef long    nclong;         /* default, compatible type */
---- a/mfhdf/ncgen/ncgen.l
-+++ b/mfhdf/ncgen/ncgen.l
-@@ -134,7 +134,7 @@ FloatInf|Infinity|Inf	{    /* float miss
- 		    yyerror(errstr);
- 		}
- 
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- 		if (dd < INT_MIN  ||  dd > INT_MAX) 
- #else
- #if defined (_CRAYMPP)
diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild
index 3582363389a5..c66597afe4de 100644
--- a/sci-libs/hdf/hdf-4.2.11.ebuild
+++ b/sci-libs/hdf/hdf-4.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ SLOT="0"
 LICENSE="NCSA-HDF"
 KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"
 
 RDEPEND="
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index d92320b868a6..170fa0c5f4cf 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ SLOT="0"
 LICENSE="NCSA-HDF"
 KEYWORDS="amd64 ia64 ppc -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"
 
 RDEPEND="
diff --git a/sci-libs/hdf/hdf-4.2.13.ebuild b/sci-libs/hdf/hdf-4.2.13.ebuild
index d7244d6583fa..119a9644d97c 100644
--- a/sci-libs/hdf/hdf-4.2.13.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ SLOT="0"
 LICENSE="NCSA-HDF"
 KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"
 
 RDEPEND="
diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest
index 7f389731e22f..22d7459e0e58 100644
--- a/sci-libs/hypre/Manifest
+++ b/sci-libs/hypre/Manifest
@@ -2,6 +2,6 @@ DIST hypre-2.14.0.tar.gz 7312329 BLAKE2B 93de48bdd05c383c74fb1b3b25ddcd5830be099
 DIST hypre-2.18.0.tar.gz 5698227 BLAKE2B e6562b78dcff6592a7df86d2162e3669c9ea3f71cc8926402038da319cb6c1b801a7ac5e44612ba86762ccdd63ae30cd2976451368309622b46e67a7a7dc1d83 SHA512 41292d590285703b5fb91c767fc9d064e36911f09583a81a3da9f2b5524143b23bb1beba3449d759e3f681760d9ad155072e1762d7d6bbe0e65660d5b16c472a
 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 2759 BLAKE2B 1606c1fc02aadf5be7f5a1f095254182fb28fcba12dfc8d0e5b98961466fbc4a2b24990e5dc9aada96ae2c2bed7743710b878a0621b12979cf43ed0c39f415af SHA512 e9699f6ef44ce63cd05794b083370806115a61d399a4d4765d494590dd823cf831e5d60b5da777524d64db6459349e503203bca739c8cba735d18c31d9b15187
-EBUILD hypre-2.18.2.ebuild 2759 BLAKE2B 1606c1fc02aadf5be7f5a1f095254182fb28fcba12dfc8d0e5b98961466fbc4a2b24990e5dc9aada96ae2c2bed7743710b878a0621b12979cf43ed0c39f415af SHA512 e9699f6ef44ce63cd05794b083370806115a61d399a4d4765d494590dd823cf831e5d60b5da777524d64db6459349e503203bca739c8cba735d18c31d9b15187
+EBUILD hypre-2.18.0.ebuild 2729 BLAKE2B b8d20ca170850be57edd77b9ccb7136bdd5c06979d47fc8b5d5bfd890df99155ac6b2bc4ff74a6536e17811faf7b611dbaf97a54231aa27d91809d9062c08c39 SHA512 c21bb95634bd5a9fb0037d5e10dbfffed32b7e93888677c4df489518be63100360773388b621d97be37a14916e13a40971dc846d10a49d082c774efed0ca3558
+EBUILD hypre-2.18.2.ebuild 2728 BLAKE2B e7ac59dec48ec0943f5cad23ec4cd19eec906639301cdd8b256ad455a8ef77ec290f9a58d0e29e2a3e3d7817ddf9395ddbef022f778a514ff27ea005d6b69299 SHA512 447061a4c24f06c0acf9b0367ce8f0c824fe5745e9fa2ac684bc4e31e47c2fee1ebeed751d09f8d5eca0a6d604bf582cf6068be61136ddfedf6b96635e4f55fa
 MISC metadata.xml 689 BLAKE2B 81168f6d150dc65e74bbae7b73657d2ef6c5de0cfcb616b9f1dd756e9734e10823c1468cc1725f8681dfb71d529c89c958e751100aa9727dcc28e36c8f27fd2b SHA512 fb10f8f67754f103b109fa7696e66e02f6a66ff74472341f3e2dcb27957646fd4140594c9eee489c3d47f1985bf8a122b48269c6a6168ddbfcdcd0ffe2a415e2
diff --git a/sci-libs/hypre/hypre-2.18.0.ebuild b/sci-libs/hypre/hypre-2.18.0.ebuild
index e8e6dd2d154a..7f9dd4cc4b14 100644
--- a/sci-libs/hypre/hypre-2.18.0.ebuild
+++ b/sci-libs/hypre/hypre-2.18.0.ebuild
@@ -94,8 +94,8 @@ src_install() {
 		  HYPRE_INSTALL_DIR="${ED}" \
 		  HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
 		  HYPRE_INC_INSTALL="${ED}$/usr/include/hypre"
+
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r src/examples
+		dodoc -r src/examples
 	fi
 }
diff --git a/sci-libs/hypre/hypre-2.18.2.ebuild b/sci-libs/hypre/hypre-2.18.2.ebuild
index e8e6dd2d154a..6a972afc092d 100644
--- a/sci-libs/hypre/hypre-2.18.2.ebuild
+++ b/sci-libs/hypre/hypre-2.18.2.ebuild
@@ -95,7 +95,6 @@ src_install() {
 		  HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
 		  HYPRE_INC_INSTALL="${ED}$/usr/include/hypre"
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r src/examples
+		dodoc -r src/examples
 	fi
 }
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 045ae6d6f04b..8e0d0d7f7373 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,3 +1,5 @@
 DIST indilib-1.7.5.tar.xz 1380436 BLAKE2B 092f4100894218bf749ee0d7c910c4ee20026cf471f4f65686b67dd37a924b448b6de3733e70d7047dca6a77fd8ae26b9a568f8249336be78d052984838a2ccf SHA512 57205ed9ea9d8e8215886b17d9f0307755bca571d599967dc607320fad5ec62096f31526280f3b184ffeb0434d9adb71e65a7d6f89d29edaa643d729765f47a8
-EBUILD indilib-1.7.5.ebuild 1093 BLAKE2B c74b0e81070522d33288a206e8200276d9953900b0445436db63d55729fd68476247347d083eac12b5c4a82716f4b084f8fa3fc67ef85233ef17e593d716ec48 SHA512 9b1d66d5f521da18f8002ef52b6c0e6017904404e8b123c839669e3f0fa3ab6afe4b824e306a90c0ce69d1e3664146f95456ca0609456accdff8cba9204d1ad3
-MISC metadata.xml 375 BLAKE2B 68a9fc46a21fd5e530412d36468b96bbf409de646206ec8e36bf35fd39ec9193464100f5cc3398c1bfac01a947a70970ecf2d505a1932070ff6ca12dc3a9db1e SHA512 b5dc385e3823484e4fdc5974ace09edb4c19272c159e086cdc6968cafda528b27623c3696dbe42e5a869c3b9b9060dcf99466d5ac9961363de2f05fdcc523448
+DIST indilib-1.8.2.tar.gz 2049051 BLAKE2B 66f85d84bf4e1eae003cb13d8b400055590763d807e880f2375f33064bbeebdd7a47a3c6f1f8dc154e7d82d3424b71883b9ffe2d7853a2feb9b498107387f6ae SHA512 066a7a7b7ffba33fba1435e6a9bd7be5e26f07023438b7c196a6fd865e6d3efe76ec32329962c16fc52e42ecc96dd9e7b9feb77858139faa1d7c32716f4a1a23
+EBUILD indilib-1.7.5.ebuild 1120 BLAKE2B 70e19ee186e7b74d01430d4fafd2fb15d3850666b519051fa2ab97612fd01180b39e5c37d697d8d2508166ad769b41422f9d4e7e7f0789c1059641d5ee77e40d SHA512 f33e4268c4837c2df6b64bb79abd11479001e9fd9abde0c5357751a014522b37d48878a8f72628e56915487c72b7805ab7c5dd01f61a21c47407a4cda8a00a27
+EBUILD indilib-1.8.2-r1.ebuild 1197 BLAKE2B 6a5d767e4cce694bbe0d174ec4c1dca5afc1a64d71f2be4a3a4b145344365762e564d57e1feebaa5a449c96ca3c154c651f4b6ad81941b85fe3bcfa721af5f7e SHA512 6ac6335705b7696115ee84787cd7c0c944ab5a9f2c7ed5dbe9e9b5b58f1a44bddbcb85d006f4231d7b10991a3c65bde328b5c590b649a49a97534669a3f4e0f7
+MISC metadata.xml 460 BLAKE2B b6ebdd49fefcbbb015e5856f0ad42682b5eda153b38b3d64f949d2c41274df269f292f25d5eb3be37a7acb039bab2d3d3b7744cfe7959472fe03425b53bd4282 SHA512 ff04501f56765165645695dda25db6bff677a6f676d3fa1d005ec0bc6fae7413e0fdd87d800b321fdd7a98f1d0cc829daa5a3d4d3bff849b6e164a5768c79c84
diff --git a/sci-libs/indilib/indilib-1.7.5.ebuild b/sci-libs/indilib/indilib-1.7.5.ebuild
index a8179c7fb67a..45012f5a0a87 100644
--- a/sci-libs/indilib/indilib-1.7.5.ebuild
+++ b/sci-libs/indilib/indilib-1.7.5.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="ogg test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	net-misc/curl
diff --git a/sci-libs/indilib/indilib-1.8.2-r1.ebuild b/sci-libs/indilib/indilib-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..d36b86d8d0f5
--- /dev/null
+++ b/sci-libs/indilib/indilib-1.8.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils 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)"
+		$(cmake-utils_use_find_package ogg OggTheora)
+		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}"/test cmake-utils_src_test
+}
diff --git a/sci-libs/indilib/metadata.xml b/sci-libs/indilib/metadata.xml
index f0a7e60d23ed..5d5d0f3c56e4 100644
--- a/sci-libs/indilib/metadata.xml
+++ b/sci-libs/indilib/metadata.xml
@@ -9,4 +9,7 @@
 		<remote-id type="github">indilib/indi</remote-id>
 		<remote-id type="sourceforge">indi</remote-id>
 	</upstream>
+	<use>
+		<flag name="websocket">Enable support for WebSocket protocol</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-libs/ipopt/Manifest b/sci-libs/ipopt/Manifest
index 39a89f5f02c1..2c2af120ce28 100644
--- a/sci-libs/ipopt/Manifest
+++ b/sci-libs/ipopt/Manifest
@@ -1,7 +1,7 @@
 DIST Ipopt-3.11.7.tgz 4749511 BLAKE2B c344634e427a6603544e50d661cafcf6004b4192a3912453dee96cfa143ca5f290f0efc39f46e983dcba6fe5b8a0becb2fa75bd6cc6f27be5c8ea8dc05f1ec4c SHA512 a9edd33b59c9744dc4e09d709519be1fc3d014cc4f50254402784aa8035d21617323f2879c430245886f2a13165cc81d26779331dc1601f0edfc406953dca56f
 DIST Ipopt-3.11.8.tgz 4749758 BLAKE2B c5ee5d3f01f1e8b4b6a1cd7606e2ad1a24c09fb0a8d8ed93fda7af61d543ac4f4579d7bb8817607d916223d9214693e1156f908cef1233a75df8759a1099b5d2 SHA512 1f60ea769dd7305348af3a5d4ed56938f04e59c36fb7a3fa0b808e4788dccee4711f82c3767e2aae87d21618d2a840d0bb22491c21c40bc2f9ebdf4b3a01aeec
 DIST Ipopt-3.12.12.tgz 4530034 BLAKE2B 8a8e24e4e5d8ad5bc1fcfa2de525e1e39c88a4c6dd77b51c0549249f517b3d6a1279e355a7cb606ebd8e606551031b653b78cd4d1cb51dd369e051ffa010011f SHA512 c543695feaa39a69b01e0025ebcd8a8772deb369ea1072f17da4ba34c1b522d322959067f3a6cfc40446e00c2e6dd2d6704a55623aba5d61dff44333727368cb
-EBUILD ipopt-3.11.7.ebuild 2396 BLAKE2B 6ee3cafa3373c403bcd6994bc3c42b35015d4d037db8dc1b68c76af950f319d6c09afb0f15862b0e4bbb8ba8f7193dde4135bd08a633f5d68fd73e51bcaccdea SHA512 6a56ea64340b458b928e6024388b9df26ce8ee881d2dff77e5db4840d16391e1239768b4e18be35bdd911b227615df85b372161a45adc63c14c4ceac8344e593
-EBUILD ipopt-3.11.8.ebuild 2403 BLAKE2B b67624c94f8a07d2b3caf61687aca289036a3a34e84d5d7799d858aea8e71909ab9ad2a4cba129d92f2230ffbb775c7690a4306fd12d3cff3edccb2bbd7dae91 SHA512 19515a32ac7745199237f185a7bb84155e538be4e9effbd6b01a7571e289d09290215c43b56a12fda9cb43ed69d5a67a8c38815ab66b571be9b99392eadaa5e7
+EBUILD ipopt-3.11.7.ebuild 2420 BLAKE2B fd7ff9ff3f9506c1311bdaecde9f7141f07f755b1e04da36cbc66f071ce1eee316c8f94c6fb555c883674d16d424baf34d402c82ca8160f29466a82ae58742e5 SHA512 9ddf2ed876eb388140b1d6922d8cbb929f1d278946e32c12eb10574f39021f95531faa63a93decb97fc1781b8e1b445c65fd316a6f27e7b8f754edffe11f8688
+EBUILD ipopt-3.11.8.ebuild 2427 BLAKE2B cdd028d5b1dddddf398cd7978f894c6441497bf3f2c4a7038379dbb3246c2e938ba15c9e310e49a27b47b3c2716d5c2b2a5f11c01e1a67bcb7b17e714d0055d3 SHA512 3fbda42914236a556272ab83054b01971f76fcfde7d2ec5051d4b3c02d8a2bce5903a7799dde070e550974c5946d1cb2063a935f493c86ed1d30a93719e05bb9
 EBUILD ipopt-3.12.12.ebuild 2080 BLAKE2B 2c3fa37450613d141645906d21c5776064bb6bd6a862014000f99862c7bad432387f43b25dce44667e71ec19fbe0d52a9995ce86c374222510b55bc8c69bbf48 SHA512 52656a3149d8f7582cdd5157faea9c034fc27d436abb5b5de7859361310daebe461c560c9efab87a9cef9abca36247e0db322a828d482c3a63cf822d16f683d3
 MISC metadata.xml 842 BLAKE2B 62d2240cf8ca06d45d88c1563473f40bb3e7a9127c76f0bc8fa40b4e3eeddc92387d4112b4e59e03e06757375e8cee6f209ceb72c85bc9903b239e429ce8717f SHA512 6e18c52fa233ba8c19d3493ceda613b39e310fc32976f289a5f1c9709dac860a0e482390ad601019ea1d9818e5e3499887974466803d8c5800e96e9b0d6c0a72
diff --git a/sci-libs/ipopt/ipopt-3.11.7.ebuild b/sci-libs/ipopt/ipopt-3.11.7.ebuild
index cf3bf34adda8..c0838cc7dedc 100644
--- a/sci-libs/ipopt/ipopt-3.11.7.ebuild
+++ b/sci-libs/ipopt/ipopt-3.11.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,6 +18,7 @@ LICENSE="EPL-1.0 hsl? ( HSL )"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples hsl lapack mpi mumps static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/blas
diff --git a/sci-libs/ipopt/ipopt-3.11.8.ebuild b/sci-libs/ipopt/ipopt-3.11.8.ebuild
index bb3c71daaa61..00636336536d 100644
--- a/sci-libs/ipopt/ipopt-3.11.8.ebuild
+++ b/sci-libs/ipopt/ipopt-3.11.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,6 +19,7 @@ LICENSE="EPL-1.0 hsl? ( HSL )"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples hsl lapack mpi mumps static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/blas
diff --git a/sci-libs/lapack-reference/Manifest b/sci-libs/lapack-reference/Manifest
index 69ad25369907..33314a43e130 100644
--- a/sci-libs/lapack-reference/Manifest
+++ b/sci-libs/lapack-reference/Manifest
@@ -7,7 +7,7 @@ DIST lapack-3.2.1.tgz 4792502 BLAKE2B e9d39c958406db05383ebda7e781ae6c2d0b1f3896
 DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
 DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
 DIST lapack-reference-3.2.1-autotools.patch.bz2 13338 BLAKE2B 1be1d2c273b92a106a9c914f17e0350b44fc42b3837ee48b040d7a61802bf5036c30e8800ec613ccf12a082a7801cad6878b6ddcbd4db32e27a06b7462f8ecd2 SHA512 957e8c7646a0d6ade9c0dfdaf2aa665a01f932dfda376ba1db164106fb174793e6504cdbed7daf158f23bb69502937963cb2e2d45ac720980d3832f6fc0fedbd
-EBUILD lapack-reference-3.2.1-r4.ebuild 2836 BLAKE2B 760608abed92203a817dd14e64044ab889c8e0ca631c0040a04703d7587dcd3ab09eb50108b0f91e8ef25c8e85e1c834dbd765bcde0349546e4905f6100bb0f5 SHA512 a88170263cd60d167296a606061058070d11ee83cdf3dbf9aafb7f1c666d580a251f51e5e33ca0a28bbeaabfbfb11687640a2e42cfb1081002e3674074fee564
+EBUILD lapack-reference-3.2.1-r4.ebuild 2821 BLAKE2B ee447f6e3620f457122ba4ecce84420aaa9f6859a9a9cbf73322328a2be4a0e36113e90f26402b9646b717c66568f31279c132903a26a781e83a95359d86add9 SHA512 15cbac6388b0ff5cee9141eb097416c9764845d9c7bcbb305589ba42d4265ea7241e6c0e56660f823962815d6c843e44cc721c1f38897f47806f943bce0c8c50
 EBUILD lapack-reference-3.6.0.ebuild 2622 BLAKE2B 1059d64fba18d9c91da283fd82b42baeefd6223bf18f04b3e7b38762b709b9335367a2af13ef1a3bd45cc228fc80b7ed2ccf12b67ee0b1513b92f12ebc14b2c1 SHA512 bdc1587e0e3d035bf5959e564ee3247531f286908dde35f8691c58c538d163895fdd40a9bf0a402aad1c370e5859b7c09c8ad44fc0934b5464a5082f463d0c79
 EBUILD lapack-reference-3.7.0.ebuild 2860 BLAKE2B a2c723501a2468be083de147ab99b7aff66ac02f4cdd72129dbf83df2881f64def8ae58cc5946478ddfde0cbb4a89f668d85301bb7c92c3686c08caabe205738 SHA512 c84d6f6650298f1d3b41cfa689c0b41ebdabecf7e9dddaa67b9069280c92fa0f73f1e115829a095e87ee3785f93fae4b5cf1c277c1251a8ca90ebdfc4496ff76
 MISC metadata.xml 779 BLAKE2B 64433bf79744cecd4ce505c3643ff73d3355620749b344ab27324c80ecb7b3ad9dd02a05dbbf1bd3e8174cac947c236d80f51377c259a1ff3aaa17b9908a8a0e SHA512 a72591749a3ea6ac49ce3a20d6934042c54e0b1639d00d585bdcc88cd9425d31135d8acc4ee33856f3933cc2518e5c7354d6debc20bbcc7b701cd6978f474e6f
diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
index 5a099088ec3b..0973af2b1f1c 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
@@ -79,8 +79,8 @@ src_install() {
 
 src_test() {
 	MAKEOPTS+=" -j1"
-	cd "${S}"/TESTING/MATGEN && emake || die
-	cd "${S}"/TESTING && emake || die
+	cd "${S}"/TESTING/MATGEN && emake
+	cd "${S}"/TESTING && emake
 }
 
 pkg_postinst() {
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 351366012cd3..e3b586001aa3 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,3 +1,3 @@
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
-EBUILD lapack-3.8.0.ebuild 3009 BLAKE2B 69da405b4d5ea283e3ff56dbb50022905ae6abb13d396bc88a6d854e5d88f9d868dcc9b4adff6f4ec3709b6c0bee482197f71659f3e0837afcb0c449b6470398 SHA512 124ce172eb0e221b89e183cac530110dfbb2224ff1ea52a66978e4c46b14a8fa84c8361a5685202026ce3a532cec63906b2f5173d6997940da6bff8fa5b1d74c
+EBUILD lapack-3.8.0.ebuild 3005 BLAKE2B f72bbb2310b5d7397139647952cc082ac330307e8b76b669fc3b1591da7352ca510aa2b3cf142368d4b408537de3845c697c7f4d248fdc1c14dcafb8368d8629 SHA512 b914e3ecbf24f29576b3c0f1bcccfb7028781c7b5718db86454787ff9ab84f65ffedfe3fe632283f2db3a19fc136ffc42db79f4b3a324223c382733416d3b990
 MISC metadata.xml 1423 BLAKE2B 2ec6d7c07c4827cca666cddb7e7b2e47238ff3fd40fd5e15463196812a7a82e0b85e5d36ae2a2c3315c3b4e0b5f3d4a79a953cb1703836b20dc14862956bcf29 SHA512 39a5e8738999caaf00b4f7fcdb3afdd1405a7c817920b9247a76dbc64e06f8c2011763031a058673ac8a411cad2219cbd7c8664d379535e2afea72d2bd578fbe
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index 77c82672e9a4..8ad78cf13254 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lapacke doc eselect-ldso"
 # TODO: static-libs 64bit-index
 
diff --git a/sci-libs/ldl/Manifest b/sci-libs/ldl/Manifest
index 6a9b06fe6079..088917075b4e 100644
--- a/sci-libs/ldl/Manifest
+++ b/sci-libs/ldl/Manifest
@@ -1,6 +1,3 @@
-AUX ldl-2.0.3-autotools.patch 2001 BLAKE2B 764594598891783c4fb74d8742bcdab6d13d48d37f6268a63b55cb3b8b5ede25a480434892c0e894cf3241b4620aaab4731c8eda1371250dada1fc6d077e056f SHA512 5c61ad57d39a91b3327803bf7589497679afb78b7754ab5660e855dbc28f47fe288accd62a35fd4aa318dcf25c36e5066818ed88221863830c1962681359493b
-DIST LDL-2.0.4.tar.gz 326840 BLAKE2B 5e509cce3d15a2289b69e02dad1dcbd167a1738cd708f5cfc57b10839bd271ab1d4a465cd6e2aeb43de19ace758d3fd43b54d8202ef173750b0a1995ed2da132 SHA512 5a6011ccf3385c0872662edca0341c29f89f6a231201460337d952460b7b50abc5c257375bd1c2db0d4db80dbfc582e648a70687b671468cae091ee332916268
 DIST ldl-2.1.0.tar.bz2 336442 BLAKE2B 8516e37ac66c329397739fb5d7ee0b3a5cc1a286d780062a749901a13b30dca52e131647e66a721be1f1e2ddd022ecc7c9d6ec5da81acc9c98afa53a06978367 SHA512 ad532e3481e48b9c3587ca0cba3d58a89a2174e3a0d523dcac6d420e04aa5da1cb8517bb14556d0a593110350fdc02aea3677eec41eb74821a3a63552418d0b5
-EBUILD ldl-2.0.4.ebuild 699 BLAKE2B a03830e0c304774dacde6d5f4153254541a72072671fc755d0f24dbdd26ba0670306e52caa807c6c9b9cf005fc7375aa538d37705cd699073e1b7f65dcbbe49a SHA512 69a918aa9b28b640fe229aee1bb3f2f727b4d958f0b8f6e8a7a4339c26fe342ac48f37ea8b76ea0e74d7fbb621cbe86527119ca231373cbe192d6c472f88ca81
 EBUILD ldl-2.1.0.ebuild 676 BLAKE2B 304a185bf67e6d05cb2de2f94fe4c62f773aa4bb9e93e20f20f766afcd49426ce7842f8397654a39e01c1b7741552720c8a8e4a83f29da724cd57db0ceb52d3c SHA512 d11d0a25d7dc3d54045b3dbb0fbb0a489f609d066122261a4b0531dfe33552c129a6ff57afac41c7d0d0a93385886c00d8c8b8004df5ecef19a9d23157b96a07
 MISC metadata.xml 891 BLAKE2B bb9634b4bf10c97b042f24fdd8e6427ae29ebf462d6ab8e2d29e882c683eb88e77ac1960f6cac7b674c85e4934f2f3a3b2e1924bf198f07adf6eb2e7410622b0 SHA512 b03a1a031499fe56e45d73fe5e63585cdddc75ed6a9f3e5ce4327eb02f8bee235366c23648b22959ea43ce79f16811ce28d1abfbc2c8cbb465d2986cde9cdda9
diff --git a/sci-libs/ldl/files/ldl-2.0.3-autotools.patch b/sci-libs/ldl/files/ldl-2.0.3-autotools.patch
deleted file mode 100644
index 5e174999a5f3..000000000000
--- a/sci-libs/ldl/files/ldl-2.0.3-autotools.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- configure.ac 	1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac	2008-01-30 12:45:53.174426797 +0000
-@@ -0,0 +1,10 @@
-+# -*- Autoconf -*-
-+AC_PREREQ(2.59)
-+AC_INIT(ldl, 2.0.3, davis@cise.ufl.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
-+AC_CHECK_LIB(m, sqrt)
-+AC_CHECK_HEADERS(UFconfig.h)
-+AC_CONFIG_FILES([Makefile Source/Makefile Demo/Makefile])
-+AC_OUTPUT
---- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am	2008-01-30 15:49:41.835515468 +0000
-@@ -0,0 +1,4 @@
-+SUBDIRS = Source Demo
-+EXTRA_DIST = README.txt
-+include_HEADERS = Include/ldl.h
-+
---- Source/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Source/Makefile.am	2008-01-30 12:49:25.858546974 +0000
-@@ -0,0 +1,11 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
-+
-+LDLSRC=ldl.c
-+lib_LTLIBRARIES = libldl.la
-+noinst_LTLIBRARIES = libldli.la libldll.la
-+libldli_la_SOURCES = $(LDLSRC)
-+libldli_la_CPPFLAGS = $(AM_CPPFLAGS)
-+libldll_la_SOURCES = $(LDLSRC)
-+libldll_la_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG
-+libldl_la_SOURCES = 
-+libldl_la_LIBADD = libldll.la libldli.la
---- Demo/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Demo/Makefile.am	2008-01-30 15:43:45.603214946 +0000
-@@ -0,0 +1,27 @@
-+LDADD = $(top_builddir)/Source/libldl.la -lm
-+AM_CPPFLAGS =  -I$(top_srcdir)/Include
-+check_PROGRAMS = ldlsimple ldllsimple ldlmain ldllmain ldlamd ldllamd
-+
-+ldlmain_SOURCES = ldlmain.c
-+ldllmain_SOURCES = ldlmain.c
-+ldllmain_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG
-+
-+ldlsimple_SOURCES = ldlsimple.c
-+ldllsimple_SOURCES = ldlsimple.c
-+ldllsimple_CPPFLAGS = $(AM_CPPFLAGS) -DLDL_LONG
-+
-+ldlamd_SOURCES = ldlamd.c
-+ldllamd_CPPFLAGS =  $(AM_CPPFLAGS) -DUSE_AMD
-+ldllamd_SOURCES = ldlamd.c
-+ldllamd_CPPFLAGS =  $(AM_CPPFLAGS) -DUSE_AMD -DLDL_LONG
-+ldllamd_LDADD = $(LDADD) -lamd
-+
-+check-local: $(check_PROGRAMS)
-+	@for i in $(check_PROGRAMS); do \
-+		echo "Testing $$i"; \
-+		./$$i > my_$$i.out; \
-+		if ! diff $$i.out my_$$i.out; then \
-+			echo "Testing $$i failed"; \
-+			exit 1; \
-+		fi \
-+	done;
diff --git a/sci-libs/ldl/ldl-2.0.4.ebuild b/sci-libs/ldl/ldl-2.0.4.ebuild
deleted file mode 100644
index 91e5ecea53e8..000000000000
--- a/sci-libs/ldl/ldl-2.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-inherit autotools-utils
-
-MY_PN=LDL
-
-DESCRIPTION="Simple but educational LDL^T matrix factorization algorithm"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/ldl"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-DEPEND="sci-libs/ufconfig"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.3-autotools.patch )
-DOCS=( README.txt Doc/ChangeLog )
-
-S="${WORKDIR}/${MY_PN}"
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dodoc Doc/ldl_userguide.pdf
-}
diff --git a/sci-libs/lemon/Manifest b/sci-libs/lemon/Manifest
index ba25fca14284..f09954efe160 100644
--- a/sci-libs/lemon/Manifest
+++ b/sci-libs/lemon/Manifest
@@ -1,5 +1,5 @@
 AUX lemon-1.3-as-needed.patch 1346 BLAKE2B 9c198c0062a47f2da724149a147bd2ab1b798df60ec5a8945249b9d8c09ab94094458ba6df7fc9d17b7e51f57f1268432e2ec3086013b3cd0f174af0ffe1c896 SHA512 20aef0cfc1b6884604a3cf1f4a60feb688ab4d1a958314c242e965195d6cc950062f67f7ef273fc096fe5fcd7a7ee9acb76215c1a6a173587da3b5e76b163468
 AUX lemon-1.3.1-multilib.patch 841 BLAKE2B 416a2cff88fd4cb1f07a10a9bfe1ca1861c82c70055a30a900bcd622c307b2bd34f87eb1731b6dbe19e1b6e68148cb9d020082cc13ddd24ae375e0db9d0909f6 SHA512 4e31feda5672bcc02bad95d2b794aa2df9d028c655f157f2f95ba0d75679dce68a2cd54e5aa7c6e61f8eec71b7801e57456ca1def3c50d67c17e16a195b9efed
 DIST lemon-1.3.1.tar.gz 5142826 BLAKE2B 23d3b637b4dd32d73bb053b4f5d032e16be787ba162eed6df793f65b81efef6d7ca66d6e5a483b75ac7b1ddb7c8a2698b3b13eb16fcd44e0b726052290082bee SHA512 715eb45e790c908e41de4c13e68b7880e1d86c54eca53f896c95b6bc411ded504f3f768bed9d63562ed4adad53167fb3a7828c67456fdea645a5d0a94ae2e038
-EBUILD lemon-1.3.1.ebuild 1922 BLAKE2B 1593132815565bc5765507d6834bd6fe233ce6fac41dc01fa77a2e3fa4209c867df336208d8f513670c2b926f2edf6b8e48e7994bdcc013be06d527e2de5537d SHA512 8895c41d7bbed07e57dac8cad33b938c0b859702983a21e92235d768cd27c42fb6a24ce140b4bbed7348def71ded6cfd2a8fa129e9ab5fdbb67031a19a64fefa
+EBUILD lemon-1.3.1.ebuild 1949 BLAKE2B 8dbbcc46af1aa905b8c61de98d5dc3996325060aebaeea964cd323130ef1dfb3534c2779e531d80fad12446696ffab5f55728052a64360690ecd3fe5db5dc996 SHA512 880ee871d596de7e3c54428a50b57612a2eee28106e8f6b640347d4717c2ade244d15c45ba1b06062835fc1fd81bd9c85850ff18f05af89c24a72819ae48ec71
 MISC metadata.xml 813 BLAKE2B 1f398a318d3bdf0b2929a992e80f64df34fa71dbb118de41ae369d46b5c1b763bbedf0b623a056e71ecb98befe5b6dbd6fa29fa71ffe3dd2735f2c5911871580 SHA512 a95dba8ed4531ca6563f4a9582933215f7136d13c3ead6d5a0ff5ff765c66d3f085c31908ed547297e28afd6a5ce7d0368f85b8053f8f9ab95da26db667a2afc
diff --git a/sci-libs/lemon/lemon-1.3.1.ebuild b/sci-libs/lemon/lemon-1.3.1.ebuild
index 3a35fa7919de..cb3bee35083d 100644
--- a/sci-libs/lemon/lemon-1.3.1.ebuild
+++ b/sci-libs/lemon/lemon-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+coin doc glpk static-libs test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="|| ( coin glpk )"
 
diff --git a/sci-libs/levmar/Manifest b/sci-libs/levmar/Manifest
index 1b4538e54e9f..074ed5947cd7 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 939 BLAKE2B ee32694216f707401cb8a8f357bdcafe5b419bf34a1641cc67b901dcd2e11f6ebbf1965e0eb4a01d4fb9ade445c05f51b00bdaa4b341deddb5634d190c577313 SHA512 268aa14f432988a216333cd8694edf843f0a13e20617c9f6b976bdcde8fa84633c5dff69ff2098db6bb92974d1197a60cdb456fe4fd5aab6d27bf1658f4a6122
+EBUILD levmar-2.6.ebuild 963 BLAKE2B 7bbf9d4bce2b9398dadbc43e6490da26ef4f69348f38ee7d8311f46cb5f4298a92802c5e3ad0043d6b9328e0ad57df75bd0a530202fb1574f9947eac8371dbff SHA512 0240afc846c608f67bf0f6ffa7c3ac1b5283cf888700fbaf067531ad5577d9108515acf9f4abab63891c79078c725e9b2c05d7de86fd435406276a111e2e8220
 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 c79aa78b669c..1a31e16ca9e1 100644
--- a/sci-libs/levmar/levmar-2.6.ebuild
+++ b/sci-libs/levmar/levmar-2.6.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
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/blas
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index 7a2d453e7d9c..d95496f490a4 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -1,4 +1,3 @@
-AUX libcerf-1.3-autotools.patch 2758 BLAKE2B 29bb371d1ce1794762df0a18b25110cd8833e96072c65d7660eac53139f6ef2ce8ea726b22faf8d26e97d9790e437acd92e7eb135014c03ee5f85d9f9b9fa4d6 SHA512 f4e99359d9ac5719138108c88f9e1b9f88e986df9e024633ca929a7f09dac826022ac1017f67af55115739d2cf0d4e0de56d751b219c3e4f620948df8cfd74fa
 DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
-EBUILD libcerf-1.5.ebuild 780 BLAKE2B f61c14a08a3995062b2e94608422daf9c21a659faafb72e30ce4928d6481a386b84aad5cc5da53f1142e118a0d41002f1c0c7b9d4e8820a2db8dbf60152b6f05 SHA512 9333bbfef8c6833259e3fce5c06d2058fced746dffa654fc8592a9960cb24c9a77e6ff265039c4f0e2429fef85d5ce0e05532ac8d028b3b0a806310e02fa1494
+EBUILD libcerf-1.5.ebuild 807 BLAKE2B d1a97b4f7df76b5efbb59d5e77d87dcbf28488266cada96065bcbe93edae62260b770fac395d2aa81cf47306aad272b373a6872acd662ea307554fa3b4aa5edb SHA512 2a25d110a9bacb8242097e2a55de791d0ed868935ed599c5177dce5d3d9d55cff4b8e12fee943bf901b29ed95cb60b1390fa6feea8288cec24c04b91ac8bfb29
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcerf/files/libcerf-1.3-autotools.patch b/sci-libs/libcerf/files/libcerf-1.3-autotools.patch
deleted file mode 100644
index caa00dd133ed..000000000000
--- a/sci-libs/libcerf/files/libcerf-1.3-autotools.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Send upstream (j.wuttke@fz-juelich.de) 14.07.14
-diff -Naur libcerf-1.3.orig/configure.ac libcerf-1.3/configure.ac
---- libcerf-1.3.orig/configure.ac	2013-07-17 03:49:33.000000000 -0600
-+++ libcerf-1.3/configure.ac	2014-07-21 17:01:15.399324021 -0600
-@@ -19,7 +19,7 @@
- # Website:
- #   http://apps.jcns.fz-juelich.de/libcerf
- 
--AC_INIT([cerf],[1:3],[http://apps.jcns.fz-juelich.de/libcerf])
-+AC_INIT([libcerf],[1:3],[http://apps.jcns.fz-juelich.de/libcerf])
-   # version is current:revision:age; for simplicity, we always put age=0
-   # <- http://www.sourceware.org/autobook/autobook/autobook_91.html
- 
-@@ -31,7 +31,7 @@
- LT_INIT([disable-static])
- 
- AC_PROG_CC_C99
--AC_SUBST(AM_CFLAGS,"-pedantic -Wall -Werror")
-+AC_SUBST(AM_CFLAGS,"-pedantic -Wall")
- AC_CONFIG_HEADERS([config.h]) # to avoid endless -D options
- AC_HEADER_STDC
- 
-diff -Naur libcerf-1.3.orig/libcerf.pc.in libcerf-1.3/libcerf.pc.in
---- libcerf-1.3.orig/libcerf.pc.in	2013-07-17 03:51:59.000000000 -0600
-+++ libcerf-1.3/libcerf.pc.in	2014-07-14 11:18:01.646512503 -0600
-@@ -7,4 +7,5 @@
- Description: Complex error function library
- Version: @PACKAGE_VERSION@
- Libs: -L${libdir} -lcerf
-+Libs.private: -lm
- Cflags: -I${includedir}
-diff -Naur libcerf-1.3.orig/man/Makefile.am libcerf-1.3/man/Makefile.am
---- libcerf-1.3.orig/man/Makefile.am	2013-02-01 02:00:14.000000000 -0700
-+++ libcerf-1.3/man/Makefile.am	2014-07-14 11:17:36.266182267 -0600
-@@ -19,9 +19,8 @@
- # Website:
- #   http://apps.jcns.fz-juelich.de/libcerf
- 
--man_MANS = w_of_z.3 im_w_of_x.3 dawson.3 cdawson.3 cerf.3 cerfc.3 erfcx.3 cerfcx.3 erfi.3 cerfi.3 voigt.3 
--auxdir = $(datadir)/man/html
--aux_DATA = w_of_z.html voigt.html dawson.html cerf.html erfcx.html erfi.html
-+man_MANS = w_of_z.3 im_w_of_x.3 dawson.3 cdawson.3 libcerf-cerf.3 cerfc.3 erfcx.3 cerfcx.3 erfi.3 cerfi.3 voigt.3 
-+html_DATA = w_of_z.html voigt.html dawson.html cerf.html erfcx.html erfi.html
- 
- w_of_z.3 : w_of_z.pod
- 	pod2man -s 3 -c "libcerf manual" $< > $@
-@@ -35,7 +34,7 @@
- cdawson.3 : dawson.pod
- 	pod2man -s 3 -c "libcerf manual" $< > $@
- 
--cerf.3 : cerf.pod
-+libcerf-cerf.3 : cerf.pod
- 	pod2man -s 3 -c "libcerf manual" $< > $@
- 
- cerfc.3 : cerf.pod
-diff -Naur libcerf-1.3.orig/test/Makefile.am libcerf-1.3/test/Makefile.am
---- libcerf-1.3.orig/test/Makefile.am	2013-07-17 01:45:37.000000000 -0600
-+++ libcerf-1.3/test/Makefile.am	2014-07-14 11:16:00.204932368 -0600
-@@ -20,8 +20,10 @@
- #   http://apps.jcns.fz-juelich.de/libcerf
- 
- AM_CFLAGS += -I$(srcdir)/../lib
--noinst_PROGRAMS = test_libcerf_1 runvoigt run_w_of_z
-+noinst_PROGRAMS = runvoigt run_w_of_z
- test_libcerf_1_SOURCES = test1.c
- runvoigt_SOURCES = runvoigt.c
- run_w_of_z_SOURCES = run_w_of_z.c
- AM_LDFLAGS = -lm -L../lib -lcerf
-+check_PROGRAMS = test_libcerf_1
-+TESTS = test_libcerf_1
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index 5bf866a00bf3..3294d3848a94 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -11,6 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 src_configure() {
 	econf --enable-shared $(use_enable static-libs static)
diff --git a/sci-libs/libdap/Manifest b/sci-libs/libdap/Manifest
index 4112b0533457..178362c85ad4 100644
--- a/sci-libs/libdap/Manifest
+++ b/sci-libs/libdap/Manifest
@@ -5,5 +5,5 @@ AUX libdap-3.18.1-disable-net-tests.patch 1281 BLAKE2B fd00fb1920a8440a633aa9595
 AUX libdap-3.18.1-fix-buildsystem.patch 621 BLAKE2B 09ec113a8860388d9d1150b7111352316b52d8307e29c3db2d6de00d2bc912d46d7c27f2e0f3429382691ff2d3696252c019554c28d8c92ea8f74db9c7877e5b SHA512 4aeb883dd338ed3c27ab2fe217d8419c8e4130485eec11f12b75dad6979034b4cbe251b4f81d21280a05257cd7bd5e56fdbb20b08f48ac0d48822024cf00d9bb
 AUX libdap-3.18.1-fix-c++14.patch 2287 BLAKE2B 2d6c036ab9ad4d611215de48b4288aa93868f3411d5637fcde7757ada661319472827bc4eea7084f925ecd9f9561d2156a4add8f5eb04693b4eb687f02efc398 SHA512 6bd2722f16cd3491922b43040148efb09dcf66f2403bcc8caae028d3497a5c864d6539b980c32cda01f35fffc2c724b68d20042f8d341f0a3a50c8fa78670535
 DIST libdap-3.18.1.tar.gz 2209343 BLAKE2B 0b71f5a557315a1481f45b465a73d62e8bf44c78c7b0d257f56c758a63137eca3777a1e2e9ef1e7dc3e2c434709f238fc7ed40e56f61eb89f8d5b47af7504efa SHA512 a1d06bbbad654718bbf9980dc0943935089c09772678f6457d4de8a9d37f1ce33c0e1cab4c5eefec6f9e159028b194d6e3a6021597276b233eda52603ae8dd38
-EBUILD libdap-3.18.1.ebuild 1156 BLAKE2B 89c6d88a00f0107e560f7883c4bc2ed7c881e74cbec45c8c96b7bc142fb61e1019bbd6f30f3a90cb64ec4b149250c94636f09993cc4175c5d19d1ccecb187c17 SHA512 c3bb006d7b315f7ec237383643def6a7ddba4739237fd7fa8a0c05a7e67446b40f7885b461f6420ce0269fd26179524d313cfb9d7c6e896903099c0a1a0a13a7
+EBUILD libdap-3.18.1.ebuild 1180 BLAKE2B b12babd0caa23d50003305be2afce6a99180787e0d6ef7c50d4b9b6e6aef8a2a4b036c0867c788917a2993f6f5ac03b9a028c8e14787bbef3d5f78e5bd0239bc SHA512 4cd049a6acf16274e56b2f9177dc7dcd39bfe82be1e5cbea71a39a3a6f7b8775ec53c7713a9708e3dab726517d09b6eb57c78246f34825532aa3a1b782eed4c8
 MISC metadata.xml 772 BLAKE2B 93699e5e75c2fffc660963cbc98fd31194553489cd52954c67f79b1b429077e46f66cbf9e6ba170a8e1c9a8213a5e9451350de461d7afe136ba1db88396a9d61 SHA512 277e96ec4eef7a080303e3b3b054d51c017ef2227644ed2d78a35d5c873f085f4524aa14b4f0f523a3d501c96a1f078032941d62005721e8264e2c5d625182eb
diff --git a/sci-libs/libdap/libdap-3.18.1.ebuild b/sci-libs/libdap/libdap-3.18.1.ebuild
index e80817b5255c..07e468687be9 100644
--- a/sci-libs/libdap/libdap-3.18.1.ebuild
+++ b/sci-libs/libdap/libdap-3.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="|| ( LGPL-2.1 URI )"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libxml2:2
diff --git a/sci-libs/libnova/Manifest b/sci-libs/libnova/Manifest
index 0ec75fae22d3..bf2c710ac7e8 100644
--- a/sci-libs/libnova/Manifest
+++ b/sci-libs/libnova/Manifest
@@ -1,3 +1,5 @@
 DIST libnova-0.15.0.tar.gz 1533794 BLAKE2B e87ffd3b8a895ca7ac9913ad3aacff526718442546df5687f2156718f721665ffff27e69af4bcb65bac5df1fda89fc6fc8fe9876a4b74392986771cf157dc48c SHA512 77ab0ccbfe462c03a21e88656cb4d6389994ea1da0ee8da997f19a83d24ad8fd9e505e70e1580b75332e826e5b7859b5f2af4417f65eb811440493ba586f2574
+DIST libnova-0.16.0.tar.xz 909212 BLAKE2B ae7efef8295dafd3715c37506d7403fc38a951c9a7c43e41e3c6ca3c922243a396052bbb71f07901bbd3aae2b2bee183efbd9e3e9c50dce72379f6ced80d5701 SHA512 f1c33421b7f09097223afe1bd5c31fa9a4591e4c965ba8a5ae1f164367717aa03986970ffe9c01e400b27aea43843fbb67cfbfe6ef44ec2c519f524aab9ea86f
 EBUILD libnova-0.15.0.ebuild 979 BLAKE2B e93a6fcd3da8c34a69cea40881ea26340928c5a7c125c46eabcb50634f82aca8bf71fcf46b462ec7d6de3a9ce0baaa3583dc8b5515295c8610ac70ec5df20ed8 SHA512 683649b71c8decd8ed1341fcbda4785bf8285cd54d895703ce9206066c088983e4ee802ec26c545eff14a77ec13b706152c7cda076094bc9fad02dca42d86db3
+EBUILD libnova-0.16.0.ebuild 854 BLAKE2B be30161d3718a50dbd8bc11952d04ceb14eb4f1a305883e16fd86db38e9decbe8dd63b2a1630297e3bf7043cdbc495f38f6c6d2eee0e5262b63b2984f460ab4b SHA512 290d14610f0eb2780e4d13b17d6916a58bce38db4f8a2a4ffd7c9dce703069cdc662aaaaafbca5ea4a455d8ccc176b7e4c0435f52693e83f1afaf04615189511
 MISC metadata.xml 637 BLAKE2B dff43562550feffed3b305c3aa5473a1ea4256c10f1db163b8e7af9f751611525d0720d18eff17a64dd3cd0de1a441a912b79e86e43e307d50b439cb95ccc480 SHA512 f94be1667b076464ade40edbc7fdc3e73ee743c518e862df1277914826e91d9adc075d1a756e6a48a309bc32da384dfc17d5973f1e2b9e116d48cda697c5ece8
diff --git a/sci-libs/libnova/libnova-0.16.0.ebuild b/sci-libs/libnova/libnova-0.16.0.ebuild
new file mode 100644
index 000000000000..185ddf19bb9f
--- /dev/null
+++ b/sci-libs/libnova/libnova-0.16.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Celestial Mechanics and Astronomical Calculation Library"
+HOMEPAGE="http://libnova.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0/0.16"
+KEYWORDS="amd64 hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_compile() {
+	default
+	use doc && emake -C doc doc
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+
+	if use examples; then
+		emake clean
+		rm examples/Makefile* || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index b20b18e2414f..cf2928b36364 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -3,8 +3,8 @@ 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
-EBUILD libsigrok-0.3.0.ebuild 1700 BLAKE2B 33dc1607eb3aaf38b7547fafe90940b3cf3b539fd257d394ee27225d3c40fea9d9d349a1ecaf8b7b4c99b6a57e590aae4c9b5225e6baf514d2bdfe47c4043107 SHA512 73f17a46ea7bfb003dc1ac6be3b32e43bffe2bbe135c6f5c667419ecae5ee0a57f77377d2eb69113e8e50cd25b73f123dffa2711a64837a1035841f3f4d7df43
-EBUILD libsigrok-0.4.0.ebuild 2110 BLAKE2B 2204607de84d0e280debb03089de2d6f2f7065de41190e9ac7ba394359faaa87d23b64c3eb37dba28db1221fc8a2ef82e47e5a37d48951c79e18a7a6b1b6e6b2 SHA512 64745457f78225b04a07e35a074744acc34298de1442ccff93e57b98505c4291baa0154956a6c80d0e948d5fe3c36964fe8a8fadff0458c6e9a6dc4f7cc64e69
-EBUILD libsigrok-0.5.1.ebuild 2338 BLAKE2B 3a0dee99db4df1691b98b8352ca898e0f21f6002184d165fb66f1494c6384ac6d79a47f66ba6aeda47f70f26ae9e407501d2766c1e892cb65d41297ee13ceb81 SHA512 b0b8417940aa670b6f79463728f28562a27c72286a4a75950ec9c9fbd18b571d2ab46dddc6614b8c46f535ee1076bceccb31ac743d02fb8e0e01e61594dd4f37
-EBUILD libsigrok-9999.ebuild 3602 BLAKE2B ee20a39c262db27b4b85174e86fee3868e8e68f8469ae4ec83d033087830e628ad62d09af83264c2961df52c8a21c02b0e6a315028b92b2dbeedf0989ee3122b SHA512 8caf7092a9c451085ae55a1595985d9c307a803605ef6e993d22329616b832b7db7fc6e0b27dc699b81b8026412107810535479caf2579b5262c4fdb6d8db534
+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
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
index dfa540c113fe..68b67e556b26 100644
--- a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,6 +19,7 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
 LICENSE="GPL-3"
 SLOT="0/2"
 IUSE="ftdi serial static-libs test usb"
+RESTRICT="!test? ( test )"
 
 # We also support librevisa, but that isn't in the tree ...
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index 58e0d34119bb..c778d842eb25 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
 LICENSE="GPL-3"
 SLOT="0/3"
 IUSE="cxx ftdi java parport python serial static-libs test usb"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
 
 # We also support librevisa, but that isn't in the tree ...
diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
index 85412408ba65..9be12225b2ba 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
 LICENSE="GPL-3"
 SLOT="0/4"
 IUSE="cxx ftdi java parport python serial static-libs test +udev usb"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
 
 # We also support librevisa, but that isn't in the tree ...
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index b82051f8e0f5..22fa3622f092 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -23,6 +23,7 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
 LICENSE="GPL-3"
 SLOT="0/9999"
 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 ...
diff --git a/sci-libs/magma/Manifest b/sci-libs/magma/Manifest
index c67ccf7a009b..aca2161aee6a 100644
--- a/sci-libs/magma/Manifest
+++ b/sci-libs/magma/Manifest
@@ -1,5 +1,5 @@
 DIST magma-1.4.0.tar.gz 3557459 BLAKE2B 610658835e09772f8a54cd851ca23f0123c45133faf7f7db0a9e62c690a0908f6769b7bf16ba955599503416d7ff1b979c7c9b7fa09b57f693a4da709bb483c6 SHA512 9857ac544cc1657ab7d2f6e8c9700facb7fa38278dbfbfeecc3656434de4bd5b96c268f1a98c9ffa823775aa64c315bd63e577b4d475e104311e09d3e5c3ca15
 DIST magma-1.4.1.tar.gz 3765589 BLAKE2B 9f382942e36492efb7a64d62bd62f704e54589aafcdc6d99d33cac1e49612014a139e01766539948f005d86b611c1bb772421635ccd66dd678549a662a410efa SHA512 d283b59b75ca35c8206c07eff97caf28f07ab598955c84a90d795d46905d879d0f1d7e6a2cb080dad74710255b28999e5ce9708e4f0f53a4adba50724fc5ef71
-EBUILD magma-1.4.0.ebuild 3172 BLAKE2B 5dc53b92ce3e9afea4d0ca712cb0349792b93d0ca418e7a5a0e368b2bb30b60996b927d9268ff4e4537b27df794e6535ca309eb3c3970e9f56f5a47f7619bd99 SHA512 464e3a905cc216908f69384ef4038813bd30be4f06493966bff0cc593d841ca3b3f38e48c51cc03e8efe78e5ccc66a2d04ddefd1a725cabfba48182a8dab161c
-EBUILD magma-1.4.1.ebuild 3172 BLAKE2B 5dc53b92ce3e9afea4d0ca712cb0349792b93d0ca418e7a5a0e368b2bb30b60996b927d9268ff4e4537b27df794e6535ca309eb3c3970e9f56f5a47f7619bd99 SHA512 464e3a905cc216908f69384ef4038813bd30be4f06493966bff0cc593d841ca3b3f38e48c51cc03e8efe78e5ccc66a2d04ddefd1a725cabfba48182a8dab161c
+EBUILD magma-1.4.0.ebuild 3185 BLAKE2B f06d5f99a094a5148d0ded4690b70e94a4970b0e9ba87bbf4c4a9e21ff0b50a8bbc4e49a45c57ec2a793992f0d392aa6146ec3af0b635c2c549312ee9d5a2541 SHA512 4c0124e7e899d3951a0d33cc586830dcd3e5a6a4682e52d5bdaeb096e92c3efc4299e3645b883724e3590f6733861150bfcaa6357651735fa1c725005b71d52f
+EBUILD magma-1.4.1.ebuild 3185 BLAKE2B f06d5f99a094a5148d0ded4690b70e94a4970b0e9ba87bbf4c4a9e21ff0b50a8bbc4e49a45c57ec2a793992f0d392aa6146ec3af0b635c2c549312ee9d5a2541 SHA512 4c0124e7e899d3951a0d33cc586830dcd3e5a6a4682e52d5bdaeb096e92c3efc4299e3645b883724e3590f6733861150bfcaa6357651735fa1c725005b71d52f
 MISC metadata.xml 712 BLAKE2B 0766b74c5103797646ab6b05d13e03e0ed807c110a3cced8ae099d87bb3c58c161db732cd564e83238f20d0302d86c727b4860818a40f578658997d1ad03c258 SHA512 27a54732753e5a772d40323c4571cbe43b3a9aec5243063e2e37fc9939a0fcf4810e8f91364145ab8982a385bbcdebcb468abbab917a074416fd8818943b5ec0
diff --git a/sci-libs/magma/magma-1.4.0.ebuild b/sci-libs/magma/magma-1.4.0.ebuild
index 33d1cd70c243..c50eea5b55ac 100644
--- a/sci-libs/magma/magma-1.4.0.ebuild
+++ b/sci-libs/magma/magma-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 
 # We have to have write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
 # user is (usually) not in the video group
-RESTRICT="userpriv"
+RESTRICT="userpriv !test? ( test )"
 
 pkg_setup() {
 	fortran-2_pkg_setup
diff --git a/sci-libs/magma/magma-1.4.1.ebuild b/sci-libs/magma/magma-1.4.1.ebuild
index 33d1cd70c243..c50eea5b55ac 100644
--- a/sci-libs/magma/magma-1.4.1.ebuild
+++ b/sci-libs/magma/magma-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 
 # We have to have write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
 # user is (usually) not in the video group
-RESTRICT="userpriv"
+RESTRICT="userpriv !test? ( test )"
 
 pkg_setup() {
 	fortran-2_pkg_setup
diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index bf623c874aa0..2ecfbd195eee 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -5,5 +5,5 @@ AUX med-4.0.0-cmakelist.patch 2421 BLAKE2B 38991513aabbb8237a8b0d9456d9bb76f38cf
 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 3509 BLAKE2B 4a73a8220662c5039d2acb54f9b76ca8b0902b8f6c6a837a07bc168998af732f4c9447f87545f649b5d81ae23abf2e1d1d48a44bb22b2415bd512050dd453a4a SHA512 480b25ae9249214602af7129b34d1b64303700a97452440fb4e5703051632ca36fe87ec68ae422c79b046750eed18b21fd9aaa68bbcb596eed9b33ec8b55cb49
+EBUILD med-4.0.0-r2.ebuild 3525 BLAKE2B 9dd6b42c0041428c332969499fd16486d10e422ee5a9365a87227c8dc8a5bd7a300967f007ecafdd9af2f8743296f1dbd04028dfa522788f923f2f85a5b8887d SHA512 6ffb6a7a7e0e80cc4980488e7c6dec0b6ad4ecf17cdf4d1b7eeaa07b5751461fdd0a21b1373c615f2124af3eebdc2041dc1b1e2e3f51077b659cee56b4cab8c8
 MISC metadata.xml 743 BLAKE2B 26b8d89344c704c98c0819d9c10818667619f77ac704086ee645cbae2d15a59c36533edfe13e787da7e20f0611ddedbc2d761e33277d5a0b1f3328f2704971f9 SHA512 65a7ccf699c82ba6830d0172c87e83651f7d02182f3974fbd725e027046e4a2496fbdab9be852d1796f254622a73f697a3677fbb771a30a06a0b8d9c0a54c4bf
diff --git a/sci-libs/med/med-4.0.0-r2.ebuild b/sci-libs/med/med-4.0.0-r2.ebuild
index 837437559bdc..7f05bac5c3a4 100644
--- a/sci-libs/med/med-4.0.0-r2.ebuild
+++ b/sci-libs/med/med-4.0.0-r2.ebuild
@@ -26,7 +26,7 @@ IUSE="doc fortran mpi python test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RESTRICT="python? ( test )"
+RESTRICT="!test? ( test ) python? ( test )"
 
 # dev-lang/tk is needed for wish-based xmdump utility
 RDEPEND="
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 00599d5e53e4..59201e9d5747 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1,6 +1,6 @@
 AUX mkl-10.0.2.018-openmpi.patch 332 BLAKE2B d438bc03fa7f4750ac32423075f960c8bff90230fe303932deecf96a7fe3023fafc59e90cd187711f972d6a3020c87b925fd16868532a0367540ce9a85d2a1f9 SHA512 5efb139622a6f0e8f03c5a76a12298685a9dfe9e816b8eaabd2874fda6c0d468a111a46df8e6885cd62a40ec611c322a99762a805dc74a4c684c85fdf222b530
 AUX mkl-10.0.2.018-tests.patch 528 BLAKE2B 483a6ccc83c04594e265680078e6515f0d3a601dad5c02d8140e800dc79635a8851a42cbad3d972f115e040d02b2a6414c8a4c01bc05490fcaf1f12350144c4f SHA512 6dd716f5d6764cd79c6de22703729d77be71f35e5f600a11f01ccff06c87309471ac5289e68ef40ae830d5917cbd20d4b2b9f1b5554384977f1b83c4b3556382
 DIST l_mkl_p_10.0.5.025.tgz 230389719 BLAKE2B 622dd0076c8e6d747f170685b6a378db95aa2453d15a53c93ef863729bb8dc76409d7bf72f8bab8ef9a07d8efe1e448cb9e7fc8e6f0c0b2cbbf0a0f6944e2a86 SHA512 621c3bfdecb57313e375424e391c0630a29efd70196e3e4bfc5b4ddd03aa45fda4761523652d875f2e60d466a0010c06659306b11f20966fba4943c308fa6f84
-EBUILD mkl-10.0.5.025-r1.ebuild 9897 BLAKE2B f319b9c52bb95c0e38d2e963d2ff9909d893d8861418855e665274783e8472d96bccfdccdec353eb50baabec30f05b5c24caf327c228e11d0973c6e5206dc3be SHA512 04bb9401313ad4dc97d57844897a18905df30b24cd974a29faabc0f69342b86fa8d5965d2cf2e9683ce1f8d0e3f46bc66dec79ef2012ef877b1fd28fa087680e
-EBUILD mkl-10.0.5.025.ebuild 10058 BLAKE2B 20bf78d8d5bdcc44302f147b501f5159ba503f5789024aeb6282ce803bb08ec6f7fe56de19840bae3d67a0179b74d0e82683dffadbe1b3a815414ede35f148a5 SHA512 9f8c2846d4fe4e1b4487e774e391e36f0c1a2647f5a3424cb8e27be9a2b4747697bebaf4b2e4fd4a2a8205c4449a2045a6a09d9c5e0dbef72a3c9d56a780d3da
+EBUILD mkl-10.0.5.025-r1.ebuild 9830 BLAKE2B 17716d8a6413c16381de4a131bf27ea5f8be7d1a1e4a8856e95af7783928b76ee0607aa262a45f7006f308b1e1769278a6c85f35b8101080531311bad965a070 SHA512 6c9734b10be325899f8b8214a9ebfdd75528e6e3d3e7e93b876ff2dfff9cd77174f294f1d373e1fc1b2d571697403fac3916e98ca0b5c3cc7d7b962819c13003
+EBUILD mkl-10.0.5.025.ebuild 9959 BLAKE2B 4ec47ea0618d5eb66ef8094c27d03d7ae926b081ed0e4b593f6adf5d5ade6a24a94e8d9dc196422e47e0a6d88e24053c1ab21d57607735d95a8f14b5744a9810 SHA512 bf07d2f62dfb4a3d41e9b09f97a6b71b4b7aaa4f32ecd9f23fcabada57b1a5fee74e065c82dd6ef75c57a1d751e0bd52f09f47c9b72092b923600c5951622d0d
 MISC metadata.xml 882 BLAKE2B 420f779849ebf2b4191156df6328233e0d474fe7ed1ced6505cfa3136b780a4029eb7f7df52a357287376252704d7215c98f2562689061e4fe5d1b420f2fcb22 SHA512 9909f91bb7389c3bcecc25935f7d7fc03c4b91c26990a188e3597be0818d94aec644f7cc9786cf673321c1136738e4738ae775019ab423019450e49725788be8
diff --git a/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild b/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
index 0a4d33acc080..33fe7c30d1d4 100644
--- a/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
+++ b/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
@@ -307,7 +307,7 @@ src_install() {
 	# install license
 	if  [[ ! -f ${INTEL_LIC_DIR}/${MKL_LIC} ]]; then
 		insinto ${INTEL_LIC_DIR}
-		doins "${WORKDIR}"/${MKL_LIC} || die "install license failed"
+		doins "${WORKDIR}"/${MKL_LIC}
 	fi
 
 	# install main stuff: cp faster than doins
@@ -317,7 +317,7 @@ src_install() {
 	cp -pPR ${cpdirs} "${D}"${MKL_DIR} \
 		|| die "installing mkl failed"
 	insinto ${MKL_DIR}
-	doins -r ${doinsdirs} || die "doins ${doinsdirs} failed"
+	doins -r ${doinsdirs}
 	dosym mkl_cblas.h ${MKL_DIR}/include/cblas.h
 
 	# install blas/lapack profiles
diff --git a/sci-libs/mkl/mkl-10.0.5.025.ebuild b/sci-libs/mkl/mkl-10.0.5.025.ebuild
index 4de67341b9e1..dce78de61457 100644
--- a/sci-libs/mkl/mkl-10.0.5.025.ebuild
+++ b/sci-libs/mkl/mkl-10.0.5.025.ebuild
@@ -215,8 +215,7 @@ src_test() {
 		emake \
 			compiler=${MKL_FC} \
 			${myconf} \
-			so${MKL_ARCH} \
-			|| die "emake ${x} failed"
+			so${MKL_ARCH}
 		popd
 	done
 }
@@ -310,7 +309,7 @@ src_install() {
 	# install license
 	if  [[ ! -f ${INTEL_LIC_DIR}/${MKL_LIC} ]]; then
 		insinto ${INTEL_LIC_DIR}
-		doins "${WORKDIR}"/${MKL_LIC} || die "install license failed"
+		doins "${WORKDIR}"/${MKL_LIC}
 	fi
 
 	# install main stuff: cp faster than doins
@@ -320,7 +319,7 @@ src_install() {
 	cp -pPR ${cpdirs} "${D}"${MKL_DIR} \
 		|| die "installing mkl failed"
 	insinto ${MKL_DIR}
-	doins -r ${doinsdirs} || die "doins ${doinsdirs} failed"
+	doins -r ${doinsdirs}
 	dosym mkl_cblas.h ${MKL_DIR}/include/cblas.h
 
 	# install blas/lapack profiles
diff --git a/sci-libs/mmtk/Manifest b/sci-libs/mmtk/Manifest
deleted file mode 100644
index e32b84c9a047..000000000000
--- a/sci-libs/mmtk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MMTK-2.7.9.tar.gz 1213599 BLAKE2B 66fb7bcb93a100661bc9aaa2b45162b4946fb0aae36f88d328e04e577eb01752e18ade7c2fb6d50db2141279b57069b0e62738d951ba9f363611841c4515fd18 SHA512 66819048aec4d8bdd370bb063f702c828145ecc9b7cb3247fcdd067486c78e00110a4e316f5c76df0b57a7885e05c347fa1616944daabfaa6d8b35933a79a7d8
-EBUILD mmtk-2.7.9.ebuild 1192 BLAKE2B e28bbed7da1b42da37bd774856ef01aa4eea3f25dfb730cdbb11539d65662ffde5d13f226589ef192330e5b8a92fa8b86f5b71bbf6e823bbbf7b17346b1a9695 SHA512 008314d600823fd673642dfd7c8c9486cc756d0ad8965d533920c8e40ac130e848e31b3c09ec16c32b95121fbd1557f3bd7b7a1229208e60908f19f09876645e
-MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-libs/mmtk/metadata.xml b/sci-libs/mmtk/metadata.xml
deleted file mode 100644
index 8937bad0b175..000000000000
--- a/sci-libs/mmtk/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-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-libs/mmtk/mmtk-2.7.9.ebuild b/sci-libs/mmtk/mmtk-2.7.9.ebuild
deleted file mode 100644
index 6b4bc3559c26..000000000000
--- a/sci-libs/mmtk/mmtk-2.7.9.ebuild
+++ /dev/null
@@ -1,54 +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
-
-# This number identifies each release on the CRU website.
-# Can't figure out how to avoid hardcoding it.
-NUMBER="4324"
-
-MY_PN=${PN/mmtk/MMTK}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Molecular Modeling ToolKit for Python"
-HOMEPAGE="http://dirac.cnrs-orleans.fr/MMTK/"
-SRC_URI="http://sourcesup.cru.fr/frs/download.php/${NUMBER}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="CeCILL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	<dev-python/numpy-1.9[${PYTHON_USEDEP}]
-	dev-python/scientificpython[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	export MMTK_USE_CYTHON="1"
-	sed \
-		-e "/ext_package/d" \
-		-e "/^if sphinx/s|:| == 3:|g" \
-		-e "s:import sphinx:sphinx = None:g" \
-		-i "${S}"/setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	DOCS=( README* Doc/CHANGELOG )
-	HTML_DOCS=( Doc/HTML/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/${P}
-		doins -r Examples
-	fi
-}
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index e5c7f320acb8..97c199ca6f9d 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,7 +1,7 @@
 AUX netcdf-4.3.2-HDF5-1.8.13+-compat.patch 5258 BLAKE2B ef4afcaf5f9139c6db2898e8e6339e77de8534218c7e00a6b16ff68bdaeb470a96b06493637a6b7734bc00a4813f21a4fd179bc12d1cf156a04ee651380bfc5e SHA512 aa54ec936aff884b105217a8c87f5d7722b8b76a4bdd8b8804366c6509abba9962fdcdbfda2361662fec3732be1a1c2b7a2ae8abea1862d2ad7fd3b0f3828f59
 DIST netcdf-4.3.2.tar.gz 5013938 BLAKE2B 7acef16284bf8586750bdeb03da3e2e2a1c543b80423269eb2542d179e1b52dd51e30584a13f604e75c295ae9ff993c814183fbb5a78ad1141c62f8dbdda6525 SHA512 9cb9c761bf1e17a37601c37000fdc0bb654afcf111e5ac2fb7dcf037c6aa827e66beb29d5c661edc50ea3f84849f3dee387aab9e85ef81a9b6ca3f36e45debdd
 DIST netcdf-4.6.1.tar.gz 18201700 BLAKE2B 2dab9add736d0db3ad91fb1ccda63c200fe5a2c6e56e2dd5b76375f6535807c6f462623d1709235f03e0940b66a8c2d1c3fd896b042b8b0004c87f038852befb SHA512 e290b10e763f9f6ef56b5224f834834853de7c21347ef6a078a2e7d819757fc8069814431784d0a0387ba2ce1f01776556e3051f9465829da0ffd3849571cd61
-EBUILD netcdf-4.3.2-r1.ebuild 1474 BLAKE2B 4a7ae70e9f5442edd52ebff9263ad517345dd5c930af61668b0a013789052a42aae892ad2816368735ef0963c139ef1446a769366fb67dd842bdfb969045e371 SHA512 b5927be5e0c9d3c2833acc9612e2148b7d9fe92a444f0d662a24ee27956f40e5f1be19341ca7fa4ebabf5c0354d4ea43de20553d3d180a32ecc13454e448336f
-EBUILD netcdf-4.6.1-r1.ebuild 1303 BLAKE2B 1de11a2598f0be06756961a2238afe07b89a7e1f047227fbd9ab41c2791e189d6eaf8e0a14a24f5cac1084da97fab7a2b88849dab01be7b27829fbb42f456f21 SHA512 ed61101c13ec79900be83ee002c03ec9f26e5b95bad64cbf1c941678f037b7ad5dcb48fb3fc6987f765bb70fd976999e78a3e5d58349cfb9dfe32c6ce24195a1
-EBUILD netcdf-4.6.1.ebuild 1309 BLAKE2B 1f3b940aea083c0f02a6266e323edd8693d3eb97a9daaabd142950237c3345ae0154e69e221fa6ce6bba1897b005d55aa74cf567850ae0b45445d86b346c34a0 SHA512 982b9c8923f7223a794b3ac82967fa33fdc646d3e7493a54d02a2182b2e927a78e3672e32045151833b51a949db2ce715211ee4e9e67a42fca9fef88250605ed
+EBUILD netcdf-4.3.2-r1.ebuild 1498 BLAKE2B 7a2dd203d94f38819bea1690c570578da3049eaaa7029ad8efc8ce32569fc06cc37c910888e9fbe7f2340c61c7f860cf4385f4b319e6da3b1a375fc71ed0298e SHA512 1bbf0f408fc29bdcf86447e0d9bba325b1238733bb2770d274587fa1f4907e6d2198e077c4f1cf0067bcd6352d680ff6f6fa752467b6fb9e921c4d903f88b6b6
+EBUILD netcdf-4.6.1-r1.ebuild 1330 BLAKE2B 47d58dd876af112dc1831dad9c8634f3e9129c858815011dca038fe99c3c0bdc7c1b70753f5215ff9c37f4e57020a92de5ba465e4184a7e5f8c5590656549d69 SHA512 7b90db8982bc7113de49e786f892b0330b1ec83ff45a3bac50b1e707774adeb9d5f67ca3a1e4b4aff9869d7e3be95223ac5ec17e72b425a6490e33ae8b8d1ca1
+EBUILD netcdf-4.6.1.ebuild 1333 BLAKE2B c11c53b58e43748b7b31046987255df0c63bb62901b786d4fdf0803ee7e7d79f67a8baaf2aa69da35dd42c6aa985e2b61de27da666bc8976c70d62fea6283232 SHA512 dd9ad3a6e814cf1a8aedda3e2a5c49c965e5f7811936607a93d4c63326a9270aeebad41465958c504230ac13ba847ba8331ee68b0d33c220accc9c1933971eb9
 MISC metadata.xml 1064 BLAKE2B 7980e918eb2d2f438aeb5deb4a678c2e324606b40e8d04e592df7d24492bdfbc548082f6fa372c168b09597c3511df15a046cd8f6d746db3d9aeae31cf3604ac SHA512 2aaa7a6c4659ff3daf81bdb63541ce08359f43bb7007f38dea333d0a05fc920e6780b79a9b0f79fec59d4e05a005efd3642acaedcd3223a21d5aa919110545dd
diff --git a/sci-libs/netcdf/netcdf-4.3.2-r1.ebuild b/sci-libs/netcdf/netcdf-4.3.2-r1.ebuild
index d12cf4ae26a3..4f7a0aedfc29 100644
--- a/sci-libs/netcdf/netcdf-4.3.2-r1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="UCAR-Unidata"
 SLOT="0/7"
 KEYWORDS="amd64 ~arm ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dap? ( net-misc/curl:0= )
diff --git a/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild b/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
index 3ccbe77b51a9..d66d366d233c 100644
--- a/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="UCAR-Unidata"
 SLOT="0/13"
 KEYWORDS="amd64 ~arm ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dap? ( net-misc/curl:0= )
diff --git a/sci-libs/netcdf/netcdf-4.6.1.ebuild b/sci-libs/netcdf/netcdf-4.6.1.ebuild
index 027ac4abf358..6c8e28e72e0e 100644
--- a/sci-libs/netcdf/netcdf-4.6.1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="UCAR-Unidata"
 SLOT="0/11"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dap? ( net-misc/curl:0= )
diff --git a/sci-libs/oc/Manifest b/sci-libs/oc/Manifest
index 84212f68f5ba..61464a41a963 100644
--- a/sci-libs/oc/Manifest
+++ b/sci-libs/oc/Manifest
@@ -1,3 +1,3 @@
 DIST oc-2.0.tar.gz 1104073 BLAKE2B a93fdf15fe085345dc547da51e5f99b4db18baab6126be73aa240e8c5092be0501abc606f556879c09bd41fe1ea4cb78df3c84472e2de3342853d67848b6aeb3 SHA512 e583fbacc8929ef5b2ae0d0f675816b8f46056b11987f8285688a7321d3dfd244a748be00f009f1b2c2b7f95e5a6ecc8eb8e907f81415e849f10a5ff138e82a4
-EBUILD oc-2.0.ebuild 570 BLAKE2B 54d7a3b7787af74942e7b59ccc3241c427f23d31383b41dd2270c24fbae244e21bf12d8f66ece66a63d2d34a9500e24a4c1a9ef22b7c6d2b9a6e4a2a2763e1fc SHA512 5fa7ffd3da5a0a2d92bcf280b2419001f0cd8c4d5f0305ad11ba031703bfeda1d9ebfbf42168001ff33c567e09d1547cb276c9faf87f6eb9c31802de606e48a7
+EBUILD oc-2.0.ebuild 634 BLAKE2B 0c505c9eb442f8f9ba382922fe2101b4f72e7c41fcec1539d3ab9c34567e6684c3156dd4652f98aead84bf568a7108b78b396770400a289acc59c254b09c426c SHA512 e51e7c1df679874dde3bc333de5ffa34adaafee3e023dd72758e6162c958539f78252e3bdd696cba75394e2d076079f5a9395c7bb21323716cfee76b1c9d246d
 MISC metadata.xml 488 BLAKE2B 879f6287b16b3b05952542e86469779f217ae2f2481557aa5047e041773816de985a2bb3eb035a18d29c9de2d11e2c96e60ae39462c8ddbdd6595a928cac9560 SHA512 bce557be392b00cdf54e6448ed69c555497e67484fdd9663e72c041fb6ab2c4f8ba82469a9d950be7393358a07dbeb1d4f5528d221c738ecafac43029cfddc92
diff --git a/sci-libs/oc/oc-2.0.ebuild b/sci-libs/oc/oc-2.0.ebuild
index f44b5451489a..24434e06661f 100644
--- a/sci-libs/oc/oc-2.0.ebuild
+++ b/sci-libs/oc/oc-2.0.ebuild
@@ -1,26 +1,33 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools-utils
+EAPI=7
 
 DESCRIPTION="Network Data Access Protocol client C library"
 HOMEPAGE="http://opendap.org/"
 SRC_URI="http://opendap.org/pub/OC/source/${P}.tar.gz"
 
 LICENSE="LGPL-2"
-
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
+IUSE="doc"
+# tests need network
+RESTRICT="test"
 
 RDEPEND="net-misc/curl"
 DEPEND="${RDEPEND}"
 
-# tests need network
-#PROPERTIES=network
+src_configure() {
+	econf --disable-static
+}
 
 src_install() {
-	autotools-utils_src_install
-	use doc; dodoc docs/oc*html && dohtml docs/html/*
+	if use doc; then
+		dodoc docs/oc*html
+		HTML_DOCS=( docs/html/. )
+	fi
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index 22ba12689288..3b8fcfd80a24 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -13,6 +13,6 @@ AUX ogdi-3.2.0_beta2-proj480.patch 9939 BLAKE2B bcefedd0043c8535adc8d5e3362f3851
 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 1708 BLAKE2B 80bb4525f7cd70096ca701b5444c12ab47e90f80cbb6b6fb81787005e9f7e86804ca295c9dd53ad21629d3206353a1670584f7335f059e810fd446ad1fed3378 SHA512 1efdd96182e467be27894fca7d514c4e73a2bb6287fc064cd7c0c940d0ed2bf65bf6e428f4d561fd409d8ae38af9bd64bd71743f3d86f6b0b0fba115d4e6a774
-EBUILD ogdi-3.2.0_beta2.ebuild 1549 BLAKE2B ed66593abbf8525dc1b6282e08bc0c73863fda2a9be458f7ea9cb483690dae42ff88fc4ccf014abbd7a95dd0c6a9fdd59953519d668b2ac9ed6c81e15b8b16a2 SHA512 13418dbe5f9bdf62bee8d5a3a8e11562cadb40221fcb47f862c01e0dc52170cfcd6b10901af69c4d94da472f2b1b87f26c78954982d8cb8398453b8ddfda6fdc
+EBUILD ogdi-3.2.0.ebuild 1684 BLAKE2B 6a2f19e187d2152b94092746ceb6258edae78837293285f48df6324a38f8a60fea00a32354dcb3de6c04246a39c5b609e7d5d9339826ba13f8d735d252f94b0b SHA512 d20023fdf7b33ade215fbeab8e693deba0f3a233fa6b1b12930639b37f4d45651d8b3e637b174f5ad9a22727fae570b8db8969881f451378bc609cea5828737f
+EBUILD ogdi-3.2.0_beta2.ebuild 1525 BLAKE2B f5d96d0ac178971ecec0f66edef7817dd85220364bc62362c4f2af749749122d93f23851a62aac5f29662e4def9706e951b869b8b2dfb37652e88bb20b06d30d SHA512 2d2a5c8a9959b2fa77fb6395f262f3eae08a713e93700c43b9d746579293b5653f0761f80c23cc32fa3bf823cd31413d48978492e7abc91e5c3a79fc3eb2d318
 MISC metadata.xml 337 BLAKE2B 01ea83d967f6073198b6a96775ed63b603dcd4736a3a3faa8d8e5e891d2b4fb25ef436425fe51be91d4d81702f392c7f28274738b7d672a82d681159e28b87dd SHA512 958474862734f915497c1e574254cd2152009f436b59dd57be9bcd5ad0ae2949dba1f6275ad3a68b3a6d60863093df2bf2bcfffdea51b591e9c1864231899221
diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0.ebuild
index da6e21103bd3..7f42ae15c1e6 100644
--- a/sci-libs/ogdi/ogdi-3.2.0.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0.ebuild
@@ -69,6 +69,6 @@ src_install() {
 	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 || die "symlink failed"
+#	dosym libogdi31.so /usr/$(get_libdir)/libogdi.so
 	dodoc ChangeLog NEWS README
 }
diff --git a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
index 4e7a9c4adf8a..fcd803cbbad7 100644
--- a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
@@ -61,6 +61,6 @@ src_install() {
 	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 || die "symlink failed"
+#	dosym libogdi31.so /usr/$(get_libdir)/libogdi.so
 	dodoc ChangeLog NEWS README
 }
diff --git a/sci-libs/orocos-bfl/Manifest b/sci-libs/orocos-bfl/Manifest
index 439871414b87..41acf77aab0c 100644
--- a/sci-libs/orocos-bfl/Manifest
+++ b/sci-libs/orocos-bfl/Manifest
@@ -1,3 +1,3 @@
 DIST orocos-bfl-0.8.0-src.tar.bz2 212899 BLAKE2B 86e4161ffd627a8546a70ce0a577aa965475e70429861578e46aa4e67ca06c42784790c65c712ad7da80b6e414901731b222f712a7983f112b4026f9c3acdd15 SHA512 045bbc415feec66206774a8bdea3843a7edf233d221bd639b1dcc01906386ff55f114a9685e1008b741ae895e6aef33641a1eab67cb106d23a085d77f1a937d5
-EBUILD orocos-bfl-0.8.0.ebuild 1281 BLAKE2B f435addacb50fbbd1fe8622b573267cbde731e4e33d6c3dec534473854c134a78960846ea2da534d2adab97220c71a30c7f8f04089df4da4c6ccb901d23d25f6 SHA512 1cdb7c169d989f09b7e646700a6fb6d00087445032278508caf8329f6138b08745309caaef61611631ae37e42bab8753ef11bc65ad7eedee71dbc214a1da2d72
+EBUILD orocos-bfl-0.8.0.ebuild 1305 BLAKE2B c2a386d9f649d426cf1c51df88c0ecf8e88d58cb6cc4047740533a8731f0ac29328cab3352d491b28695294dd59ffafc631a78abbc3cbbc3fe26fd99b3c9b359 SHA512 4c81ad611714506c0340f3d6cb493f1d4cd510dccffc774f05864d8fed5c4343280147b87f9d1c1f5657c350953ed8fd6ac6ebd2320ec3a6cf155c6cb7c9a9f1
 MISC metadata.xml 603 BLAKE2B 18aa0b2928931ace7b5af80d4efa46d1f63023e9c30f45499a0cf416cfe74927570292d95641eed606a4d66858460d3a7f6de43ba061a5049e1aee2758e7ee8a SHA512 e4c29ba5a7a3cbe373fcbb4b69ca3ce99e6e092585f3d27af31469949f4ca28a6bf2d4b1850271ddc7c7bc2c70b43bf27411e9fcdef2039c3e0f0949523ded6c
diff --git a/sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild b/sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild
index 082cb9f10997..9b1481d44678 100644
--- a/sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild
+++ b/sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm"
 IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/boost:="
 DEPEND="${RDEPEND}
diff --git a/sci-libs/orocos_kdl/Manifest b/sci-libs/orocos_kdl/Manifest
index a2b0375e922d..29473615bef2 100644
--- a/sci-libs/orocos_kdl/Manifest
+++ b/sci-libs/orocos_kdl/Manifest
@@ -1,6 +1,6 @@
 DIST orocos_kinematics_dynamics-1.3.1.tar.gz 202471 BLAKE2B 46b7bdb62c09e9077b84d914b4d780995f27d486d9c734ef2ee1f8b8c2219265cdba5e63830225e2435b5760b79f00d478670e95b71666959afa773f8bcfe5ce SHA512 93abd9dd5aef3710f784f9db8eea4738458bffa5295923993e2d77656c18f7354559412fb7eb5f1e9da7112de19aa36d3f0f68f149852f955bce960fd3b719e7
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD orocos_kdl-1.3.1-r1.ebuild 1621 BLAKE2B 1bb89339ce08a5b8c90eaeac83daeafc934ec870d231512d28ce092176aa9fab1126bdb7f8ac1c60d1b5755a2819693115e23cbf88a436d1c3dcbee78e46d416 SHA512 10f3ae388edcbbea0495f742c053a2caa6711e6ba6283896cb032a84cf099b4c700484c2237bea3662a187d357acefa9293dfc00f6ad8c32a6c08bea511c9909
-EBUILD orocos_kdl-1.4.0.ebuild 1624 BLAKE2B 9d9f1541bb0c0c96b31320b52d7d76a79d56765fb73879781dac262240a23af4c7345f0e6cbad3e106cf30339d8a7efbcc727c5d52e90d65baaea8af9d3d953b SHA512 a6505a22cd092dfb4eec38a07e047d06d0f15213d8178eed4198f07f8344dd30a32ff78f17ecfef7bd83cb915ffeacb6e008068bb9bb819bba95608710f581bc
-EBUILD orocos_kdl-9999.ebuild 1624 BLAKE2B 9d9f1541bb0c0c96b31320b52d7d76a79d56765fb73879781dac262240a23af4c7345f0e6cbad3e106cf30339d8a7efbcc727c5d52e90d65baaea8af9d3d953b SHA512 a6505a22cd092dfb4eec38a07e047d06d0f15213d8178eed4198f07f8344dd30a32ff78f17ecfef7bd83cb915ffeacb6e008068bb9bb819bba95608710f581bc
+EBUILD orocos_kdl-1.3.1-r1.ebuild 1645 BLAKE2B 3e62191752f89fac3d0834f487152fe96aee63324c3084a7561e0133316c204beccacb70090eb7ffb7cafbdc9a473d4eda7504d6082677c48b96712961ea5951 SHA512 5fae87c172ceee4806ff38fadafab94cfbe5b586109917356a18be4a7cab30e1e9d3726a71ba3865330aecc81b3dfd43c2555b3dc76354bc573c321ff75204fd
+EBUILD orocos_kdl-1.4.0.ebuild 1648 BLAKE2B f5191706dc5cf443c3088dcf96d2ffb705f5934c8fd9258fb009ebc7309f13f0433379cf98ea128cbc23037b0235e79ef9cc650dab271d8584457c1082362d0b SHA512 c68229f5e2687697826d8d89305c78b948398b56041098d3856e53aefdb28a6bf137900a0f6b27e9ff47da03e9e9190c07896ead1323ddc994aea05a10d6917d
+EBUILD orocos_kdl-9999.ebuild 1648 BLAKE2B f5191706dc5cf443c3088dcf96d2ffb705f5934c8fd9258fb009ebc7309f13f0433379cf98ea128cbc23037b0235e79ef9cc650dab271d8584457c1082362d0b SHA512 c68229f5e2687697826d8d89305c78b948398b56041098d3856e53aefdb28a6bf137900a0f6b27e9ff47da03e9e9190c07896ead1323ddc994aea05a10d6917d
 MISC metadata.xml 934 BLAKE2B d82ddb6554a65a4221e67f46cfc6ff218c8caff71662090cd22332bc8f77c88b54c0ed8a7ccde53f00c6ef9c7faa386a82ca4654652ed7876c84105cd4426451 SHA512 09dc8b8c362da950ea685ee6cb2d7eb3ee400f34fca286fa0bf064f3cc4338a5ad2ca8917c951211e9407122a3bd7a1f23e5d394bfed901d6f69e9caefe5eaed
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
index e2fe4f9b4756..a2d743e268b4 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,6 +24,7 @@ HOMEPAGE="http://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="doc test examples models"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-cpp/eigen:3"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
index aa74627a9e43..d3860db1a16d 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,6 +24,7 @@ HOMEPAGE="http://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0/14"
 IUSE="doc test examples models"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-cpp/eigen:3"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
index aa74627a9e43..d3860db1a16d 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,6 +24,7 @@ HOMEPAGE="http://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0/14"
 IUSE="doc test examples models"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-cpp/eigen:3"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 69af6ae72d5c..9f7ad1eeaf20 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,4 +1,4 @@
 DIST pcl-1.9.1.tar.gz 67158067 BLAKE2B 472422930e08feba11f42a2df49d68e0c55484744e0649164b113dc3b654188e598b1c0a55f1b75680150090749b00378ae0f70b35b1695a7914a16be7415bf7 SHA512 ca95028c23861ac2df0fa7e18fdd0202255cb2e49ab714325eb36c35289442c6eedbf489e6f9f232b30fa2a93eff4c9619f8a14d3fdfe58f353a4a6e26206bdf
-EBUILD pcl-1.9.1.ebuild 2225 BLAKE2B 71b098a237d0993d68442220862510f8539cdceedd21dbe86a65724044f64f366fbb861455cceca2467744d951cd4cacc790482012b0ad80ee5a1310a4ae1ea6 SHA512 d7c512ff67957ba32fb241489f14693131c15b57d1c05d5c84b3fe8021101a5a42ab3502686d8a0b0b653198ef4023c63ddfb2bc9626a44c4f1b8c83b27aabcc
-EBUILD pcl-9999.ebuild 2225 BLAKE2B 71b098a237d0993d68442220862510f8539cdceedd21dbe86a65724044f64f366fbb861455cceca2467744d951cd4cacc790482012b0ad80ee5a1310a4ae1ea6 SHA512 d7c512ff67957ba32fb241489f14693131c15b57d1c05d5c84b3fe8021101a5a42ab3502686d8a0b0b653198ef4023c63ddfb2bc9626a44c4f1b8c83b27aabcc
+EBUILD pcl-1.9.1.ebuild 2252 BLAKE2B 3a488488afb1d0d18da684f9fa35c490a8f70ebd3f08d0668cdd265f17384adfa89228ee7034573040e90a9b78301693256fefa6361ff8754fff84517007714c SHA512 b0d94f742f20576b2adc6277c05b53dd78463432b3892f2ebaf58332cb2726cf6d436903f85a8e69c5ac9c350a839d27dc1c521a13ecab05d1e6f6e176225232
+EBUILD pcl-9999.ebuild 2252 BLAKE2B 3a488488afb1d0d18da684f9fa35c490a8f70ebd3f08d0668cdd265f17384adfa89228ee7034573040e90a9b78301693256fefa6361ff8754fff84517007714c SHA512 b0d94f742f20576b2adc6277c05b53dd78463432b3892f2ebaf58332cb2726cf6d436903f85a8e69c5ac9c350a839d27dc1c521a13ecab05d1e6f6e176225232
 MISC metadata.xml 1125 BLAKE2B 27e8b272d41bf690e99b28e7b9af140412e3d5641f56131c1c8ece113262f3222444a487a3e6a050fcf7fb8c8c404f284bc731780fa557d56241e0e0ad18613f SHA512 d5676bf63401993065215538dd0725f13a99251117e7e61cf9614ea765eb0b9388a8866aa74fb6840dba4ead49f763070076cd328c60ab0830ff11bee827e7cf
diff --git a/sci-libs/pcl/pcl-1.9.1.ebuild b/sci-libs/pcl/pcl-1.9.1.ebuild
index 737d110e2cfe..19c912a12d8c 100644
--- a/sci-libs/pcl/pcl-1.9.1.ebuild
+++ b/sci-libs/pcl/pcl-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,6 +25,7 @@ DESCRIPTION="2D/3D image and point cloud processing"
 LICENSE="BSD"
 SLOT="0/1.9"
 IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=sci-libs/flann-1.7.1
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index 737d110e2cfe..19c912a12d8c 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,6 +25,7 @@ DESCRIPTION="2D/3D image and point cloud processing"
 LICENSE="BSD"
 SLOT="0/1.9"
 IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=sci-libs/flann-1.7.1
diff --git a/sci-libs/plotmm/Manifest b/sci-libs/plotmm/Manifest
index 0a6890eee3a1..7072242efc6e 100644
--- a/sci-libs/plotmm/Manifest
+++ b/sci-libs/plotmm/Manifest
@@ -1,4 +1,4 @@
 AUX plotmm-0.1.2-libsigc++-2.2.patch 4037 BLAKE2B 10024df20b90fab7ea8a212789b84a94689169ae3099788f52ba4b087eea9a64783adc81192598b7e79231edfa7744337694cf88cff079e2e4bd715de71ac66d SHA512 3327b7fcd0311976bbf1a6990e9cf14c43c85fb4eea2de21501bc79e90ee7bbec9527b35dab8204534f797e318659f0d67faefa047bb6ef2a8b0962588e2b4b2
 DIST plotmm-0.1.2.tar.gz 473175 BLAKE2B f024abbe77e208443cdf58a7817cdea9d1a93435b55e62d4579c341ca773fc2199def0e93fbba980891dd38c0085515e01833a11fd37f87bdeb0b2737a8ff809 SHA512 68484d7ed3b4d6520782735e05ad3cf9a5749f723285a2a3d0d1fabe3b23df57856d24addb31c23e3f23174655095f55b9b9a8d10316812d7a80fe13e204fab6
-EBUILD plotmm-0.1.2.ebuild 1362 BLAKE2B 9f4b62d78230b26264bcf54b26323faf7174589e60347b14eb058e9a74e504bfee8f1a4809a079cad63780d10686dc6864ac1a9eb36057ff2e1b27ec5f396884 SHA512 ca586b8907e2d35fe8a8bd4bc1272eff861065e3d770840b612f855b6ea206f6aed09d0fce980b55319394fd824ed75739eced17daa77bbb2097b5e941c61f1d
+EBUILD plotmm-0.1.2.ebuild 1317 BLAKE2B 02c078345a1fa555adb19e5902fe1fff81e11e360117ee838d09ce92a9d1ad15c3c34b469ef4ab1e1aa01ead694bf48c34c78cc4a203cf218e86e91ffb474551 SHA512 53193ebe4603964c025be2662673f23c7cc08746a3f6759a101534108ded4bf829ff4e5fc8c8914f6bae6baa4a7c296287c3fa6c86399b3cc78450bf277d71e1
 MISC metadata.xml 243 BLAKE2B 8495df4aecff8a0fba05bc70c2fe798eb257086ad1c16da9f1fa77a6100e7936d455febc72d73609063c034117400a64c19f9bacaaa7e9c41e0937efc041dfb3 SHA512 d9179f9fde1433951047043a7c811ea571511473d16c0c4e2b0655933dd41cc7b0b56edbf3db9ed25037086a676de73ea6886a6935a3c3dff67ad441eaa1304a
diff --git a/sci-libs/plotmm/plotmm-0.1.2.ebuild b/sci-libs/plotmm/plotmm-0.1.2.ebuild
index e6a0447c3f7f..5cf316ca2678 100644
--- a/sci-libs/plotmm/plotmm-0.1.2.ebuild
+++ b/sci-libs/plotmm/plotmm-0.1.2.ebuild
@@ -40,7 +40,7 @@ src_install() {
 	default
 
 	if use doc; then
-		dohtml -r doc/html/* || die "dohtml failed"
+		dohtml -r doc/html/*
 	fi
 
 	if use examples; then
@@ -50,7 +50,7 @@ src_install() {
 
 		# install sources
 		insinto /usr/share/doc/${PF}/examples/
-		doins examples/{curves/curves,simple/simple}.cc || die "doins failed"
+		doins examples/{curves/curves,simple/simple}.cc
 
 		elog "You can use examples by calling ${PN}-curves or ${PN}-simple."
 		elog "Examples source code is in /usr/share/doc/${PF}/examples."
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 834aa9d4ad59..9391b2af4b95 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -4,5 +4,5 @@ AUX plplot-5.12.0-multiarch.patch 1309 BLAKE2B 8bce8e12a82b361989e5b8a7c11c25a64
 AUX plplot-5.12.0-ocaml-remove-rpath.patch 2012 BLAKE2B 47bbcc2c7e49b50f045c786ae3d5a799b45ab734e24e815168d9a6364fe09fc63869b57dd0a12b5c70ef5b69444ad6dba31bcc123faada6df9ac0af8cb0984d5 SHA512 6c40de6ab578ab8c347f12335b8a91976e5e4d8eee039512048039507c5e2b4a75b5bbfdde5ae347d2ccb167679b6574460d3f737ad37ee8902c7bcdc96af05d
 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4
 DIST plplot-5.12.0.tar.gz 16253895 BLAKE2B 5b89c0a6a478c6faf9bff2e2765eb6b13b6b1fc5644dbcdbc6aa88c510ad82a04253a7cb33d16816ff128eb866aad0f5cbccc365687ebb62022926f3c8545a0b SHA512 5566b9db0ddbb5ecaa677168f65f240197b2b8b23a02a812efc7e97fc79686b523591edad9c83de2e72935090d426b4cb9fe82496d9eb5a5a521c42161e9848b
-EBUILD plplot-5.12.0-r1.ebuild 7230 BLAKE2B e2b765ed474958cb34f2f92a26c634ed70a728081a22d0886b89e8aa43aff43499e9c8c1ffc0588fc6c3e388e270715273d7d809a1aca522774b33524b792aaa SHA512 0ac1a50359de3c0c5b6fedcf9ee9ab0393a5e1bf38dac7ae02cf00c8555d3d5d3ee3e546b0ed7d21e079b011629c7af4fed423b62494b2bd6c6aaf26a00a94a7
+EBUILD plplot-5.12.0-r1.ebuild 7243 BLAKE2B 76b1b6838834e291dcebd2ab2e25265bcea2c51b46c9715e19b38586b903513837ba01f643b45f8480d76c206b13b3736c717338458c46f91db99c8785562ae2 SHA512 014b44dbc72abfa66a054059ed8436ee9cbc52152eb6cdfb7e105103513e14ef4d236b0bd6824d24815a7ab7a42e314567572206dfc2f27248fa21b2f53e6450
 MISC metadata.xml 1487 BLAKE2B 33e45227a6094c8b7e8602081e267b5aad51cf90638269b544feb308f95e32757ae5784edc14cda97d8d0e4d5e209e9ba3528f8f763adada95ceb8c61d11fdc8 SHA512 ebace14f95cf9d6e3c71b8a4fa3ed411052183e2fa67197173f99045e22503b0e80dac6762ddb38fa97b7e36b67693b9c7352cba31d399d0b819d8da9cbf27ea
diff --git a/sci-libs/plplot/plplot-5.12.0-r1.ebuild b/sci-libs/plplot/plplot-5.12.0-r1.ebuild
index a8582c6ed658..cf5c4e336744 100644
--- a/sci-libs/plplot/plplot-5.12.0-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf
 	pdl 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="octave? ( test )"
+RESTRICT="!test? ( test ) octave? ( test )"
 
 RDEPEND="
 	cairo? ( x11-libs/cairo:0=[svg?,X] )
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index c947a0d7f041..5a59171c7f41 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -13,5 +13,5 @@ EBUILD proj-4.8.0.ebuild 1299 BLAKE2B 0ebc7c73ece64fe41bf071f96becad9f416824e85e
 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 1096 BLAKE2B 8251133a9e32eb75535d8efc5fbc5fe744b034a1fe05ebc6698805fa45b45e30dc4cdca5641dcb534729b67ca07867747cb85ddee90ded78c792f7ce2be4f243 SHA512 4f1906b875751cb6e2466d5ce15fc25bd275b4e5d2101b2a44d440fedb91563f8f3d7a52133dd647c316d97eb06ce18e025197038edfeab0488e6310107b928c
+EBUILD proj-6.2.0.ebuild 1123 BLAKE2B 9994c8f1d89ab06ae4f68714ebd50fe6689d846b5654b1004c850801bc384d923fba5a4e4cf57f5c3d5160da77a24500438414c93f08729f3c45a51ed3b09643 SHA512 84869c368a4bb63aa43ea765c72bc8ad173a02b86950249bc7c766d5bcd6e2be057d6877d2ddcb89c9d836f1ee75e870a1aa8bd67b2282cfd2f2c4833769fc20
 MISC metadata.xml 513 BLAKE2B 4068b4ddcb4e95578df8da19650ab86b4dbfdba294a3d03f10ada37a578a2113b0d71720545c269b1c097d3a37dbc66ee0cdfe61889466171c109413088707fd SHA512 e841ea4fb30d3632fecca7d584121fce35dff2b23ad8a1feeb98a47f0a3b1d78f57a05b0d303aeff47f981f5b7feb831deb14644ab6615644c0a8593a6e321b3
diff --git a/sci-libs/proj/proj-6.2.0.ebuild b/sci-libs/proj/proj-6.2.0.ebuild
index 2263d70332f5..70e5a2e53a6b 100644
--- a/sci-libs/proj/proj-6.2.0.ebuild
+++ b/sci-libs/proj/proj-6.2.0.ebuild
@@ -18,6 +18,7 @@ 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"
diff --git a/sci-libs/qfits/Manifest b/sci-libs/qfits/Manifest
index 7cc7431680e6..5e966b58301c 100644
--- a/sci-libs/qfits/Manifest
+++ b/sci-libs/qfits/Manifest
@@ -1,5 +1,5 @@
-AUX qfits-6.2.0-open.patch 683 BLAKE2B 5c381b5c2a2367d75e4d158029952377e0fa7d562636f4c24ac68cc3b495c69e5b31bba45fe0d5cbe9bfadb783de21108d269260ee7e3f49b6d03e31d6881806 SHA512 3c1303640f3d30340f11be173ebc2ce87b33064912f4fa071c3381519d19eeda1244955d07e850f0a2e54552f6fc83eb5d1fd297199023f7c6084e374f960cb7
-AUX qfits-6.2.0-ttest.patch 376 BLAKE2B b03ac305275ebb5297c83cd552d375429c19c3795ca2198bf7a4942f9143cb6857c2ba849a55b9049c78085243b1ff94dd34996675dbbea75677256195ec3d5d SHA512 32b822144f7b4a4eaf258078004410c5c7c1cd7117eea678c382b2cd8b08ca855fc3d3f2498383cfafdd57d09dee5b9a2eed2e50b483c28255fab9b8d5b8c243
+AUX qfits-6.2.0-open.patch 512 BLAKE2B a3701d2a9f8d6cbee3d5d9e95b281068b29b2d2f327140086830462a89cb657b00fd1a6e57fd5b593ada0788ba398cfda1fbdd15c9bf302fe84d6b7e09d32e14 SHA512 83bb2d96725e62fd1f593cd38f86d7c4dba2248b34d9eeecb6af11d41b20fde2a5b0bf22e3b64001d9d473b0344120f3df604982ab7d998c37c08771f17309b5
+AUX qfits-6.2.0-ttest.patch 304 BLAKE2B a5cebbd782f1d8fd9090a20f51a52fd756509b479ec199c1efea734e557eae5994515ab003ac920dde1781ee98afff0cb25ed0eb91a92e8821d269e1e9188c8d SHA512 dde0bfbe7aef8ec381ec57b4fdae5419c9ad23ec20d90ee795bf5cc124abf3e6e936f7069d3cc56ff86b766425c2a94304048263310fcf3f7c84415638e073f8
 DIST qfits-6.2.0.tar.gz 475191 BLAKE2B fea94bf77b07e5fbc9493f4bafbf37387b4f9ae83212ffc5a6c0607cad972a592e3937ba042ee94f053f30fd05cbafb8fcbcf2df1c4cd6ee4d2422bf108d9395 SHA512 a0f6863a9e5b26d08de487cfdf468b3d04218a36a01cd9df8b786b1cdf2ffa61acf12b087f4fbd751ba023f02b5a32410949a4ee08432108a7129a283ab3d824
-EBUILD qfits-6.2.0.ebuild 560 BLAKE2B 82d4e1f866055a73a5e15578c2d8a62ae44966d270a72a624b0dfe6150293c902fbc7fac6bfbb0cbf0a0a9bbd3cfb27b13da41c98691ea6b4fb6ff8a0311cf21 SHA512 5c1733cbffe81295cea50f3625150f43d741fd9159280444e4e1df358363baaef0536a9cbe52e641a1fc65d16e927b5a1ebac44e81ea95fcf459415dc8a5ff00
+EBUILD qfits-6.2.0.ebuild 596 BLAKE2B 90ec42dfc65cdc7352b05d357ac0974ebbc0283b35bc07dbd883ffd0f0c92b1bed80a3b017a54341e5d6710a16eee8ac8a25c7a653e9c196a21c820004c8a0ed SHA512 4ca8e8669e922ebf91bd1a4fa1295bf33abec479e050211531af77c969574ec4dacd7f51b0743d5d7e651acbe72c521db6f160168a13956d6a9c5b2f772da41e
 MISC metadata.xml 851 BLAKE2B 2f9e24aaf6d2ca99ed72b95723d2cd05ea2f0b88515366f258f1c6e547174d946d43377396365e0c69ed2fba1450085c5c1187b45efbf240bcabb60c3a08e24a SHA512 97081bccbae198d305fba171d6969993599b8008d82f28acb7489879013564bc95dd42ad9c8d04d883f442cdf70361f080e9ac8bd770752ea2a9ca87e3478434
diff --git a/sci-libs/qfits/files/qfits-6.2.0-open.patch b/sci-libs/qfits/files/qfits-6.2.0-open.patch
index 71d2df1a692a..951970da6dc4 100644
--- a/sci-libs/qfits/files/qfits-6.2.0-open.patch
+++ b/sci-libs/qfits/files/qfits-6.2.0-open.patch
@@ -1,6 +1,5 @@
-diff -ur qfits-6.2.0/src/qfits_memory.c qfits-6.2.0.new/src/qfits_memory.c
---- qfits-6.2.0/src/qfits_memory.c	2006-08-24 17:01:56.000000000 +0200
-+++ qfits-6.2.0.new/src/qfits_memory.c	2007-09-21 13:43:19.000000000 +0200
+--- a/src/qfits_memory.c
++++ b/src/qfits_memory.c
 @@ -308,7 +308,7 @@
          /* Create swap file with rights: rw-rw-rw- */
          swapfileid = ++ qfits_memory_table.file_reg ;
diff --git a/sci-libs/qfits/files/qfits-6.2.0-ttest.patch b/sci-libs/qfits/files/qfits-6.2.0-ttest.patch
index ee87bfc702ca..a333a32e0a68 100644
--- a/sci-libs/qfits/files/qfits-6.2.0-ttest.patch
+++ b/sci-libs/qfits/files/qfits-6.2.0-ttest.patch
@@ -1,5 +1,5 @@
---- test/test_tfits.c	2006-04-27 14:08:43.000000000 +0100
-+++ test/test_tfits.c.new	2007-02-23 00:29:41.000000000 +0000
+--- a/test/test_tfits.c
++++ b/test/test_tfits.c
 @@ -322,7 +322,7 @@
       *    Test on BINARY tables
       */
diff --git a/sci-libs/qfits/qfits-6.2.0.ebuild b/sci-libs/qfits/qfits-6.2.0.ebuild
index e98cd4afcfa2..181c4777ba8a 100644
--- a/sci-libs/qfits/qfits-6.2.0.ebuild
+++ b/sci-libs/qfits/qfits-6.2.0.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit autotools-utils
+EAPI=7
 
 DESCRIPTION="ESO stand-alone C library offering easy access to FITS files"
 HOMEPAGE="http://www.eso.org/projects/aot/qfits/"
 SRC_URI="ftp://ftp.hq.eso.org/pub/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-DEPEND=""
-RDEPEND=""
+IUSE="doc"
 
 PATCHES=( "${FILESDIR}"/${P}-{ttest,open}.patch )
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
-	autotools-utils_src_install
-	use doc && dohtml html/*
+	use doc && HTML_DOCS=( html/. )
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 65ea71b8399a..76eff00071ec 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,6 +1,5 @@
-DIST rtabmap-0.18.1.tar.gz 19725948 BLAKE2B c43cf9c696a151b9f9117d13438122bf47fc66914249377b7c9519a2838c8512147d68f999744c1f1c5a298e1b7adb7b77db8df1c6100d1d9a7a0acbf8b24967 SHA512 37fc2e6445531875cb9b27684cd5ff7a651ca2a8a3c653a52813352579bd2f4a4ee4be7c690cf0b29ae7907d26fd8a1f4e9188071409611b845333e734714aca
+AUX ocv4.patch 698 BLAKE2B 4ec82ff9d08b3051181cd44b157b9097783e4128e5bb09debbd844ec574455c5f9a5e153d643f209f96bf0f2a92474d189d5b8449a17fbe171dc5cee395748b3 SHA512 83814e1fa862c1eb8f23d0865a4f36d2067512af57a12c3569697b12559d27027915b888d9c1cb845d08bd82bdabffd3a06594234b23a68f04a6c723d00265b4
 DIST rtabmap-0.19.3.tar.gz 19818629 BLAKE2B f732a02db6ef8434b1457234211a128e3050236590e0f6a1e08e36bbb5899b9d3de9409d7d7329f346d29874d440bd86835c1501fb638e3802e2663907e7b04d SHA512 bda72596911b1c35d757322c7e5acd7e43ec1f4e984bfb0599cfb39597bee79e470d1bc11b492f244f39c35812ae570d023848cdcbd011eeb78e347727045509
-EBUILD rtabmap-0.18.1.ebuild 1427 BLAKE2B 8cd9e1dcbe91cd609815f9dadd9c252ef9145f2fa2a79e4f0fa627d276310d648cc53d81a4dce4e1b47fab5af19243f50643e2209e50920b2b373c83d1de7d0b SHA512 f380f1de720a19f8bcd5a4aec152b4776771c41794595151890fb47c63ef512a24cc3922d5e7b3ac5eb9671274fb1d26867dcb677eb1e5ee61a4e84461341afb
-EBUILD rtabmap-0.19.3.ebuild 1427 BLAKE2B 8df77b7a3a13eaceb32b14acf719d0ed5310a47861d8ea1fc0b198d52fd8a41d0a898269d8efb03581a8f8c402834a351483928ccb3c215227a3e6cab0863cd2 SHA512 91f0b78b6bfa53210aed90c326ed5151e2712edef451953416e3e81ac5842a8f0e3349ea6ce0eb2b3097012014b908af915525e65e1a074bedd86f3a82594290
-EBUILD rtabmap-9999.ebuild 1427 BLAKE2B 8cd9e1dcbe91cd609815f9dadd9c252ef9145f2fa2a79e4f0fa627d276310d648cc53d81a4dce4e1b47fab5af19243f50643e2209e50920b2b373c83d1de7d0b SHA512 f380f1de720a19f8bcd5a4aec152b4776771c41794595151890fb47c63ef512a24cc3922d5e7b3ac5eb9671274fb1d26867dcb677eb1e5ee61a4e84461341afb
+EBUILD rtabmap-0.19.3-r1.ebuild 1473 BLAKE2B 2a8c64e81f3077cc3440294ccd1fe605a4dd4211b50639414913fb34671486b6cca15ad1483a9b3a63852295c06e108b9fe74358505c5a0e262844df15392fe4 SHA512 1d1c479c484c811b44e8f088add28daa00e7154c2e6db25960e263f2eede05b9e939dc2190d8d9cb337f3fddd82c35a471df17bb0f3a54bd1bebe963aa03b3ac
+EBUILD rtabmap-9999.ebuild 1436 BLAKE2B 058a4f207d6ff2c0f2b05a4126dbf7ebae67de82bdf956b0abdd5ba6f8285b3cd61f60ae086ca2036f9523f62b90ad61c462f98a983e05b7207643ba16f80a1e SHA512 139f504b42598b3c0c9894a87f32f7980873122a2959e3ca1b1764a77e7e0c3bc7c7af360494422b629ee01c0ee711b974312388d412007b47ed545b8e8928ed
 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81
diff --git a/sci-libs/rtabmap/files/ocv4.patch b/sci-libs/rtabmap/files/ocv4.patch
new file mode 100644
index 000000000000..465b364ef013
--- /dev/null
+++ b/sci-libs/rtabmap/files/ocv4.patch
@@ -0,0 +1,23 @@
+From d5b4b252870e4225ed00bd544a102015e5172c85 Mon Sep 17 00:00:00 2001
+From: matlabbe <matlabbe@gmail.com>
+Date: Fri, 9 Aug 2019 15:31:47 -0400
+Subject: [PATCH] updated ORBExtractor opencv include (compatibility issue
+ https://github.com/introlab/rtabmap_ros/issues/333)
+
+---
+ corelib/src/opencv/ORBextractor.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/corelib/src/opencv/ORBextractor.h b/corelib/src/opencv/ORBextractor.h
+index 0f06c395..58619a15 100644
+--- a/corelib/src/opencv/ORBextractor.h
++++ b/corelib/src/opencv/ORBextractor.h
+@@ -31,7 +31,7 @@
+ 
+ #include <vector>
+ #include <list>
+-#include <opencv/cv.h>
++#include <opencv2/core/core_c.h>
+ 
+ 
+ namespace rtabmap
diff --git a/sci-libs/rtabmap/rtabmap-0.18.1.ebuild b/sci-libs/rtabmap/rtabmap-0.18.1.ebuild
deleted file mode 100644
index 0a88ca05e482..000000000000
--- a/sci-libs/rtabmap/rtabmap-0.18.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P}"
-fi
-
-DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
-HOMEPAGE="http://introlab.github.io/rtabmap/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples ieee1394 openni2 qt5"
-
-RDEPEND="
-	media-libs/opencv:=[qt5(-)?]
-	sci-libs/pcl:=[openni,vtk,qt5(-)?]
-	sci-libs/vtk:=[qt5(-)?]
-	sys-libs/zlib
-	sci-libs/octomap:=
-	dev-libs/boost:=
-	ieee1394? ( media-libs/libdc1394 )
-	openni2? ( dev-libs/OpenNI2 )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DWITH_QT=$(usex qt5 ON OFF)"
-		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
-		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	# Needed since we force ros crawling to be done only in
-	# /usr/share/ros_packages/
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-}
diff --git a/sci-libs/rtabmap/rtabmap-0.19.3.ebuild b/sci-libs/rtabmap/rtabmap-0.19.3-r1.ebuild
index da61f393cbde..df3b781baf72 100644
--- a/sci-libs/rtabmap/rtabmap-0.19.3.ebuild
+++ b/sci-libs/rtabmap/rtabmap-0.19.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -42,8 +42,9 @@ RDEPEND="
 		dev-qt/qtsvg:5
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/ocv4.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
index 0a88ca05e482..24cbe5a01b96 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -42,8 +42,8 @@ RDEPEND="
 		dev-qt/qtsvg:5
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest
index d93c4aa9e24a..a26dc2f166e4 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 1586 BLAKE2B 028aef875fb1a867d43a0f07297352786aeca0292765bdf6aa3292022277e470ba5e426dc33c45c100a0fcef339c26835763a00bdfa5f0617505c0b67fd5cc3f SHA512 e39ccd1cd62ad9ff94d1eee1358fb49fe5b2da4fdf0e18e224f5d44344b5b01b31019e53eba1f82a8b728ad059e4f25a1e7d347ceea94d3d8c22068e5cd17491
+EBUILD scalapack-2.0.2-r1.ebuild 1613 BLAKE2B d006b8e6bd4522307c496e600d6499e68a925649b7edd8e17215a756fd42d2b9e34394e9b9b87dd7c2d20cf6c55cb5026c3d6636a478adadccac43e7e16ad8a4 SHA512 86ff70dc140edd393851a67e9897dfead45069a2d665982bdaeac1c86e7108542f2228e12fb7093e9a8b76470bf00dc45c4736618ac1e5bb119ba7b6dd165c0f
 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 3e60e55da8f2..eedda916cce7 100644
--- a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
+++ b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/lapack
diff --git a/sci-libs/scikits_image/Manifest b/sci-libs/scikits_image/Manifest
index 238afc7f698e..e5f1d0ac88f0 100644
--- a/sci-libs/scikits_image/Manifest
+++ b/sci-libs/scikits_image/Manifest
@@ -1,4 +1,4 @@
 DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
-EBUILD scikits_image-0.13.0-r1.ebuild 1802 BLAKE2B 90a39c2e5b940774e7450a8a105a15c91896542613209899717c6a9130f9bef94786a88db67e5abeabe05ed9781c1f71310f0a90338059aa10881aa0c23a7d84 SHA512 9ef9af8cc9d4d6fad1cded893a9b55d85a04ce38232cf79a6f42752789d2f0237a57f7c95ef240d041039a3a81e77d7e4839c600dcb6ad04fc2c48d4d931c6e2
-EBUILD scikits_image-0.13.0.ebuild 1800 BLAKE2B 46b48868ab892309c47488e038feb01be571ad545fbcfe0b7141ab75c409d2b78e50c1abb44683c1e938fe0a5a429e189fc089f882ab9cb44a0a77a829a05230 SHA512 4455e0d670565842ee64dc41ae699729afbb9efa8dbd01c3c8c3b755833d8ec279ff4f08d38a3b864111ecd00ada5993ef66880ad3ef10688e607b08a91b86ea
+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
 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 49f66eaba90b..8c4d5a0fd8e3 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
@@ -18,6 +18,7 @@ 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}]
@@ -44,7 +45,7 @@ python_test() {
 	echo "backend : Agg" > matplotlibrc || die
 	#echo "backend.qt4 : PyQt4" >> matplotlibrc || die
 	#echo "backend.qt4 : PySide" >> matplotlibrc || die
-	MPLCONFIGDIR=. virtx nosetests --exe -v skimage || die
+	MPLCONFIGDIR=. virtx nosetests --exe -v skimage
 }
 
 pkg_postinst() {
diff --git a/sci-libs/scikits_image/scikits_image-0.13.0.ebuild b/sci-libs/scikits_image/scikits_image-0.13.0.ebuild
index ccd8d3938ce4..985fd58974d2 100644
--- a/sci-libs/scikits_image/scikits_image-0.13.0.ebuild
+++ b/sci-libs/scikits_image/scikits_image-0.13.0.ebuild
@@ -18,6 +18,7 @@ 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}]
@@ -44,7 +45,7 @@ python_test() {
 	echo "backend : Agg" > matplotlibrc || die
 	#echo "backend.qt4 : PyQt4" >> matplotlibrc || die
 	#echo "backend.qt4 : PySide" >> matplotlibrc || die
-	MPLCONFIGDIR=. virtx nosetests --exe -v skimage || die
+	MPLCONFIGDIR=. virtx nosetests --exe -v skimage
 }
 
 pkg_postinst() {
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index 1bd2d8aab788..a47e6c7658b0 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -6,11 +6,11 @@ DIST scikit-learn-0.17.tar.gz 7834903 BLAKE2B 9492a0deff723bd1ff3a976f080a5db0d1
 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
 DIST scikit-learn-0.19.0.tar.gz 9341628 BLAKE2B c9e0c12558e81efb6f5cfddead028980b0019d2f6d0fdce5662c9138ec3a5b2a3d30b022a5713578bc7effd09894006e8f7f60a3e038ca66297502d9d4212686 SHA512 1b88bc043b08de9b5bb1f3814b8101c73ced010cf94bd725fb69e1ef95b4a9597a34de4a19f84fbbf63e54d47e95b3ff498d611234fcdfcaa5e4e3cf696289d2
-EBUILD scikits_learn-0.17.1.ebuild 3102 BLAKE2B fcc65ae4ccae1cf51d5d813b1025492639f5b91e3a795471a6de04e1c50c832613464c6ac21cc876b933133a65a903b9794a1afebaa7042286dc2b8ca75cdfc5 SHA512 18e238bfff7395f36726d09e20a8500591e5fbc6b2e673081aebb5c3c3d07a0e0b70e3f3e3e2d8ade023fb102dc8cae9ae1ce0bc3c466a7fd6e87914e1e97c62
-EBUILD scikits_learn-0.17.ebuild 3101 BLAKE2B cb820e2a85478a08baee14de1a8c4f47ec92b90f71729e91daf6e37ed007ae69e0f729750af25716d8b26002fd191af40ccb00ae009819eabdd71456c01ce2c8 SHA512 557c554f055b6b3a2739674479b464ed3fec80ebdca5abe9fd19e7ef331b55dde17a350fd5a647e59dc2a3576c5c9c661b9bdf08e2cc606b0c3650ad8191b375
-EBUILD scikits_learn-0.18.1.ebuild 3129 BLAKE2B d27141520db85f89685949e3d62f1e4512de15f458ed2c77ab7250bec7fe834f9a8d560ea7f7566b7ea2e07a533150d04b40a28edb42fa8def30dcf10c56f9fd SHA512 28976162f6b03af48d4478e05e9d3e3dd56d809865df915abb5c322de078d9eafb8758cce118c295c875b0a67cef65d5c511abede23d64e4add522395d9bf36f
-EBUILD scikits_learn-0.18.2-r1.ebuild 3277 BLAKE2B 30df6d022a1ef0100f34fb6dbcbab2a80b61c083b6e58cb49205e2e7a8125868be52ba12fea55be305f302a012da1a77dc94712ee0def7078ada1018898d5cf7 SHA512 2bd0578062ab1a99862651e80ebf40569898d0159b2d86a4c85a548d4b192a81816b05f152d482c6a3a108bc77d377fea27a484c2f1c54b2024dd3cc6a9b17bc
-EBUILD scikits_learn-0.18.2.ebuild 3141 BLAKE2B 0c9220602cb8f67f4251f4eaf813553d81ef49d24b1c46ba90611a0f33f1e28c40534c0802319ab09c910cc581d7244936a8ede48209308085daf73277a1cfbb SHA512 34d010e3de4c67c940b8218c4d2fbf69968ccc34e7d81e73d93e644fae8641d33fb3d06a23be3adbef8714dff86eb0e12643311c649d353f8da60cff00df6f8f
-EBUILD scikits_learn-0.19.0-r1.ebuild 2821 BLAKE2B a267003f211e4e9a5b16dd50121965cfd1d48f11504e3d6818f4a667b8d5be735e0dd6b526ab0abf4234990258a32b0d810a7db323f22443241838ff8ac62dd2 SHA512 4db55b7807707db298c0a455bf0e18e9a7698d8434ea140416562ae3c061e5ab316e6e5ea80f519fe7e3c9fc9dc9419d3d110f77a9142ea025dc5a8b2fcc18da
-EBUILD scikits_learn-0.19.0.ebuild 2819 BLAKE2B f8e1f95c028c061d7b7f7d652e2a88854c4e5b4d24a5b4f4188de536279080e5515f9f1392d25502ba1fa6fbdf0879be7e07d7bec8e6f9ef2392818de4e0df4e SHA512 220cf1360fbdca2127330fff1beacfdc8103886ae04b8baf94a195638b242ef6dc6241b9814b40adcd90d4f7bf70ae10a14a3df2b638e0104e857ee58116691e
+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
 MISC metadata.xml 605 BLAKE2B 46a657647a79f0a23cc07b39877b1e57158cdf94d9478c3aa4e7af0dbdbf60acf996d1431076697db764d42bec0d5e0517c1247e91dc36e85823a45784d00e71 SHA512 e14b6835108fa80eca44bab635c9a229da65f048ffcee16cd4ad7736c3a0fb364c94ff0bd9630030653bd3cd78d8dced191c43c7e5aacb3a7f6e61ac45b5bb3d
diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
index 0b4c5a6ae9e7..e83910a436ba 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.1.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/joblib[${PYTHON_USEDEP}]
diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
index de24bec47ecf..e8b01caac0bd 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/joblib[${PYTHON_USEDEP}]
diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
index ffbdaba31d23..1a04525ec154 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/joblib[${PYTHON_USEDEP}]
diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild
index 367b03b83e79..854f19af4e33 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.2-r1.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 # tried to unbundle virtual/python-funcsigs, funcsigs, odict
 # but it is a large mess to maintain
diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
index 1a019a21cfb3..191789ac6c0f 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.18.2.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/joblib[${PYTHON_USEDEP}]
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 3184d4e85551..cc0019d518d8 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
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 # tried to unbundle virtual/python-funcsigs, funcsigs, odict
 # but it is a large mess to maintain
diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
index 1a7298c51dec..f6a48d144c7c 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.19.0.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 # tried to unbundle virtual/python-funcsigs, funcsigs, odict
 # but it is a large mess to maintain
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 5d1329f51c57..01e6d4c771e3 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -16,10 +16,10 @@ DIST scipy-1.0.0.tar.gz 15246397 BLAKE2B 37cd50c59830c91f0516c72cf11b367670faf5c
 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 4244 BLAKE2B e2e6491ef2704e1c440b24c0b379d040e7caa224647a1938f6ffce214b50a34e31f83e102213d47ab5aed884736bfe2cd4f8259393aeba92b015d383ccdb2dc9 SHA512 f79c496f02fbf4c1ddef3aa88ed76b6ee99db8d1671e59300f29c94b80cf6a1f352d661d542442b2d68e8666b9333f264bba173716a999c26ad09234146b5ffb
-EBUILD scipy-0.18.1.ebuild 4249 BLAKE2B 633b70b2cfc9e568abbed4a7748771d604f491b48789768ea1ba321152d80a24b34131399399c42cd4513084653855675ce324eb5fac5c0ad5f6265071a7264b SHA512 cc6eac59217a2896f1bdee4142264c94a3ed5ee9bf80957d535cb291249b4761439ab3b30b1851e87bc72581c640069377f77cb5b09ce8ad16345077b8ce553c
-EBUILD scipy-0.19.1.ebuild 4244 BLAKE2B 1fab8f3a9f6191331360b0ce3bf30501abdb16dfd32f349c5d2f90b9e56de3d9365068025e80c37b880062ab13c28a1c8b5867413e8d3be1919dd538597751b1 SHA512 55cb48d0aeb8c200a82657f8648b036c5ecdf2492a43885df699c6ffbc86547fecd5c71bc802f2688cc5b04249132082859cc64198fff1c3fa36b4ad6c618f6f
-EBUILD scipy-1.0.0.ebuild 4028 BLAKE2B 072bf669fa18eb1c00414b9374bc07c3424166c1aada026862a2ca9d8f85f79913528b2f4655302b4174056532f3d1ada8df51a1b32d391cbc6b426ec24cca88 SHA512 c92a1e9641a0297b68f2eff34b8341b9d9adbbc8507a0e8b3a6e576c0792110f6423663b4cbd68a123c62f98d656f8e93abd8ee87d180d9da1adcf5777a9f46c
-EBUILD scipy-1.1.0.ebuild 4026 BLAKE2B 5365a416cf404feecce21c03b1d6d1e13b71e91c8022f281c948358e03d2585a6f2560f9d68533fbf20763074ccf0f27a8e2076bec5fab549ba2df8af82358af SHA512 4d9ffe5cbb62d9bd3956efabbb1f2d977ee545438fca0ae5132d698fca1347e59b8e4c8886516d34419cd2982faa39b417cd4a95ec7efae583a653a39f8c7dd3
-EBUILD scipy-9999.ebuild 3612 BLAKE2B 07b27279a9b3773ad8624b9fbfc2ee83e30ebb42a9bb58fb481b4c24723ca8471eb141093427a1559ea30703dcd04cb656828035b5e59bafa8835ecd35524d40 SHA512 314be69d8523f906e8a27b5f6f32b882cb97ead665f9efd9253806d98acf0779d5248caba6c39e220be453fbe1097c75541d5b363839a2ed45f689e8ffb0d182
+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
 MISC metadata.xml 931 BLAKE2B 3e358fcc4354b870a4794f13ed6c840f2c55ffdf4d6306977e6db3606b73e7df9b682a18973f0aa2a1d0d9eabb2d7d40c6aa5c6026813385361700bdc227afd8 SHA512 ae95726c4c661a2e5708a98b347f8ea25708574bbaf8ec86f315069551d6a0d68a43279b214be8b54cd20e5aacea1a9abd40a2de43d51f292a830cab0955d625
diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild b/sci-libs/scipy/scipy-0.16.1.ebuild
index c698be80f3a9..f105dde30c6c 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -22,6 +22,7 @@ SRC_URI="
 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="
diff --git a/sci-libs/scipy/scipy-0.18.1.ebuild b/sci-libs/scipy/scipy-0.18.1.ebuild
index fb81a2bdbecd..13d5afa657e8 100644
--- a/sci-libs/scipy/scipy-0.18.1.ebuild
+++ b/sci-libs/scipy/scipy-0.18.1.ebuild
@@ -22,6 +22,7 @@ SRC_URI="
 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="
diff --git a/sci-libs/scipy/scipy-0.19.1.ebuild b/sci-libs/scipy/scipy-0.19.1.ebuild
index 2e7f6acd2f82..a17473acc3d5 100644
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ b/sci-libs/scipy/scipy-0.19.1.ebuild
@@ -22,6 +22,7 @@ SRC_URI="
 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="
diff --git a/sci-libs/scipy/scipy-1.0.0.ebuild b/sci-libs/scipy/scipy-1.0.0.ebuild
index b9b79bf1aeff..830587f79c37 100644
--- a/sci-libs/scipy/scipy-1.0.0.ebuild
+++ b/sci-libs/scipy/scipy-1.0.0.ebuild
@@ -22,6 +22,7 @@ SRC_URI="
 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="
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
index adfa2ab45a6b..acbf180275f3 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -22,6 +22,7 @@ SRC_URI="
 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="
diff --git a/sci-libs/scipy/scipy-9999.ebuild b/sci-libs/scipy/scipy-9999.ebuild
index d003a8d19743..0e528a35be0e 100644
--- a/sci-libs/scipy/scipy-9999.ebuild
+++ b/sci-libs/scipy/scipy-9999.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD LGPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="sparse test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
diff --git a/sci-libs/shogun/Manifest b/sci-libs/shogun/Manifest
index 843fa1f8510b..3d30417f69d4 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 3859 BLAKE2B 4272578ea8fdfd20bda50309a73221859f91452946fbb2a76e29ddf00d22d7b60fbde823c1ac88724f8236a405f6b3e49ae3c4cad362c33cb2bae4ab69af1aba SHA512 57f797568583e1b24ebb818b181529406e5cc106fe70e22bd4fff8fce4757aaa239d5524987e461066a22909be87a0bb946abe39aa0056cbe4b699ef2768a58c
+EBUILD shogun-5.0.0.ebuild 3886 BLAKE2B 3bcfcaa44d2f2ddef9f36230fe103cf61f59ebe01797be7681d705c0307839c3f7edcd7369e2f2e5286c335f7824a2865c13594f2443b13c40a87df632953022 SHA512 97ddb219a18dee648569072fc4cfeac7dbfd9027e0bd8890a6d61c6385aff990a55f6015ffdbaea26c03da3420bfb99e149e9fab1058c3ee04c56b49fe6a2e28
 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 4fad7ff5e351..870ef09e18ec 100644
--- a/sci-libs/shogun/shogun-5.0.0.ebuild
+++ b/sci-libs/shogun/shogun-5.0.0.ebuild
@@ -21,6 +21,7 @@ LICENSE="GPL-3 free-noncomm"
 SLOT="0/16"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse doc examples lua octave opencl python R ruby static-libs test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
index ae161b25d14a..da40354cecbc 100644
--- a/sci-libs/silo/Manifest
+++ b/sci-libs/silo/Manifest
@@ -3,5 +3,5 @@ AUX silo-4.10.2-qt5.patch 1414 BLAKE2B 3b33d1228f9b26340d851a97dfcdde38b1ab66632
 AUX silo-4.10.2-qtlibs.patch 4320 BLAKE2B 34fbff942d4caa73bf18302873ba4dc63de063eec84b3e0cd3bf3b24a5aeb44d40b74567f8001c3d14e19dabdb5133ea4ca32af067b16398a6aaaaac664209c5 SHA512 3f2e63ee943463fc23d7ba3542c756bd158c8b8f8280ec87eef53e30add0b335edfd202c592885e2f4002c7f975324ca7e96351c1d9c25ffb1adf2b67cd034d9
 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 1180 BLAKE2B fa564644f76ff5a62aad9d05536f93b7f5862aca3c041a3c422e92e2448bc3ba2b7b3460d981719bde940b4aff4e53dc6a557875fc8c91cd1afa8c11eb24f6ea SHA512 e3b9c393a7aea0f796a4c67989b5cfb8a29bb823e56501c794fdc7b4fd3ecb2ad729b44203d242da19f7c997f07ca5fa0fbbc3e2085990020ccc03e09c79d3b9
+EBUILD silo-4.10.2-r1.ebuild 1204 BLAKE2B 93651449b6d7958d95ea14fcb6e3dc5cb13e9661e667fdf3357fdf011193c7f966645f5088bc0deea7ab20d4412260951a46a95694f45c75aaf79fcf9e05633e SHA512 9b7b838d03ca4e6eebcfa5c26655295e5b30e1aa3b2cc216749c7d5ceab4f7c3632778bb1b0863304b29c51b0dad54715f3195acdf2910964d7b24df8a328d39
 MISC metadata.xml 751 BLAKE2B 15f217d9eeeedb7889e47a18d81715f674156e59aef6901ec3873a731484a645a74c1840d2b41e1ca53d0247b43c5f401353b86e419f74f0aeb965146a53b9c1 SHA512 be9db7766bd0e0ea6c5f7f4505ee48ab6ea8b7da1ccc78ab68868072d15d068dab3f6eeeb53cf5cd348da92d52e32d8ad363798de55cd4a79fb1c19ad8456f5e
diff --git a/sci-libs/silo/silo-4.10.2-r1.ebuild b/sci-libs/silo/silo-4.10.2-r1.ebuild
index 61b8b07e7d19..278b972ca253 100644
--- a/sci-libs/silo/silo-4.10.2-r1.ebuild
+++ b/sci-libs/silo/silo-4.10.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,6 +12,7 @@ SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
 IUSE="hdf5 +silex static-libs +qt5 test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="silex? ( qt5 )"
 
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index 23b08c5e9832..00f97a74d821 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 1623 BLAKE2B 1e0d0ae0f8edac0828f82ee87e62376d96fcfae711dbde19cafb36efa7f5415ac3fd0758e3be36e74ca7720fd4111b47a2780a18158c430028fbefce3ff2ebcd SHA512 b2ae0b96d8570949fdb20fb1f33548ae87d0783ea0c6aa2438e728534388341a1184bbd98c7b3c3f9c838e09c7e8661b01f1c6ef2342dacb7baadf228c8e6c2e
-EBUILD superlu-5.2.1-r1.ebuild 1501 BLAKE2B ff7df8c7b5e64cb2ba51a6445ec0d45981b28acfcd3efcc784eb732ad5d376612bcfd524fbadde7fd0ee2c4ef3ff1ba81d680336cda778ad771c1d40e78a9ff3 SHA512 0fd6ed61165c36aadea94761b507f7ddebc94b6e9db0df5eecf8b77e8b8091c9a7712250f4ab76348aecc6c6bbc9e3e3a3f325c6db0fe9d9ce90516ccc1950e7
+EBUILD superlu-4.3-r1.ebuild 1650 BLAKE2B f154d6d232899f83049a9eebcac275d629954cb649f1999c0fe3802f690b779bde91a308ee07c66a45b2d7190ec9608ac8cd1545b7504aac46249ac6e614046b SHA512 3d4ad886cd5ea2102dfccdd48960a21ae94b877cb185bec6be43a022b084934c58edfe257957dd5306eb5007bf221904a991458c2f9db41ba2aa1b749e564cfc
+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 33e0af340663..a6ce49cd482d 100644
--- a/sci-libs/superlu/superlu-4.3-r1.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r1.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/blas"
diff --git a/sci-libs/superlu/superlu-5.2.1-r1.ebuild b/sci-libs/superlu/superlu-5.2.1-r1.ebuild
index eb6dc71012d0..2f7f382cf88d 100644
--- a/sci-libs/superlu/superlu-5.2.1-r1.ebuild
+++ b/sci-libs/superlu/superlu-5.2.1-r1.ebuild
@@ -28,6 +28,7 @@ HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
 LICENSE="BSD"
 
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="virtual/blas"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/superlu_mt/Manifest b/sci-libs/superlu_mt/Manifest
index a67650b8c2f8..f1259e44d6ae 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 2548 BLAKE2B 899958a5d5365dbf992409e2e13d91322f7388347be93d78f38f3f8f2de29429bafd4d7a17efff1a0a4d61443b63ccdc28136325185d3cd8b1c0554073f4584c SHA512 ebd183c356861a83f06dc487ca404809cc1546a4bd9341fdebcc03d4fd502dea20da72ee1f0c33ea0a407e432e75a733ac68fa4ea38ab9f41c0b49317af87b04
+EBUILD superlu_mt-3.1.ebuild 2572 BLAKE2B f7f400ae68d0c5c2f2b6a5d11b14d3b857534f49af3732b5000519f79154260ca82f0bfdd830675e6ef0c874d9bc94fcae4528a77206f8a7a59010a14c159f40 SHA512 f1dcdb183144c2f16131a5b03e61d11cb35b012562c51c08810590df6b3afbede0384ae538fe6df01a034eda719d903b8a6a37be6237f06e6e18b4316a701a81
 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 2322df8507e6..9cd876c14a25 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-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${SOVERSION}"
 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 )"
 
 RDEPEND="virtual/blas"
diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest
index bb1254933553..e608b37c3c93 100644
--- a/sci-libs/symengine/Manifest
+++ b/sci-libs/symengine/Manifest
@@ -1,5 +1,5 @@
 DIST symengine-0.3.0.tar.gz 629813 BLAKE2B 8d611703604f10d1ed8837708fa2125c0e84d12a8513d34e5d4bd44ae55395bcaa8fda92754b538ba1ecfdcacff83d079094dda9dfca6fdcdc4cccb0702cf484 SHA512 e4a906bb1cc5159003969871711f40b3c6bfb9e38ac25258dc5797933d55374a2f201c8a89e9af48821b24cc54408d4feb70f6de421e0a9fbf766d2b35846b83
 DIST symengine-0.4.0.tar.gz 753664 BLAKE2B c6296ceef20cfbb16803adc3c623429cf417c639d45d8cad742c3f7cf9d8171f22fb72e168cd07a6a705726a09133866fa497e2092ec4885ae4462d55adc416e SHA512 162c4bb4c67e2f21a0a113726d7b0ad00cc3e80db0534e95109a41894dcd05ca03a3be39d1a56a336b4bb7926dadad72fbe6705c71df3448db99fde20139ad11
-EBUILD symengine-0.3.0-r1.ebuild 2074 BLAKE2B 82d76b51ac8baf68d3f31b760760ecc90e4719f9cc8d7d469eef92003e0d72c4c682bf10954c642b9a51e8f5b35ff1a5a33ef66ff5cf48decbfcb3c797eccb5b SHA512 e60602366c3c14046f7aa5131e884663f5fbbdf216b41b8824d0017ef96f7a8c9307bcf6da0eccfec9fcdf06ad3952153142bb5ea10d18bfc1f64230cc27835d
-EBUILD symengine-0.4.0.ebuild 2071 BLAKE2B 7cbb49107a99c4b40c292dd4ede12b9c432f09b691326ba5ce0a4fbbbf62f7fc2ee5f1466cbdf92a43ac3e2b77fd6e6d97d554ab586695b90901840557899652 SHA512 7e3cfef2bfc793fd043e6f3e896dede9cae0c0f672e440a790be8b3f356b07d379da47812d2d789f7a718e73dbbfc70cce833f912901ca4eb552a10df8cb168a
+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
diff --git a/sci-libs/symengine/symengine-0.3.0-r1.ebuild b/sci-libs/symengine/symengine-0.3.0-r1.ebuild
index c493c94e39e8..e3a5ebde2878 100644
--- a/sci-libs/symengine/symengine-0.3.0-r1.ebuild
+++ b/sci-libs/symengine/symengine-0.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/0.3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="arb benchmarks boost debug doc flint llvm mpc mpfr openmp test tcmalloc threads"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/gmp:=
diff --git a/sci-libs/symengine/symengine-0.4.0.ebuild b/sci-libs/symengine/symengine-0.4.0.ebuild
index eac0919d7760..ae20dab9235f 100644
--- a/sci-libs/symengine/symengine-0.4.0.ebuild
+++ b/sci-libs/symengine/symengine-0.4.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/0.4"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="arb benchmarks boost debug doc flint llvm mpc mpfr openmp test tcmalloc threads"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/gmp:=
diff --git a/sci-libs/ta-lib/Manifest b/sci-libs/ta-lib/Manifest
index fd3f7ddadbe0..df3c7661b457 100644
--- a/sci-libs/ta-lib/Manifest
+++ b/sci-libs/ta-lib/Manifest
@@ -1,4 +1,4 @@
 AUX ta-lib-0.4.0-asneeded.patch 3304 BLAKE2B 5350248ae6511136ed09f66faca62021175b4c98030e271f98f08ad948b8b7795eeba84d44b4e808217da76e163a1f1cbcd1dde052de6a8f2351d53947728328 SHA512 aa43a9cd5382eb43cce2dd64325a36fd88bdae7969c3c191ddbbc7ed726145d7cd1cca17196093c7b4af63a95d3a118d6f2e93ff5d021105091056a325042123
 DIST ta-lib-0.4.0-src.tar.gz 1330299 BLAKE2B 2acc09c2a01c02912dd4ea9a72296376dcb4b434723508829d3b97fcb77baaf8d4eaa44a84fbdb094119890fc1949fc52f759345101d8848032c3814576623c7 SHA512 d7ae2acd830cd23b58bded8a90759edfabc73923fbed3cc09501c121cc937caf728c29678f456c2dc7e72fabb52166bccc19ab51ab1131c7d8d35c201c94ed4c
-EBUILD ta-lib-0.4.0.ebuild 661 BLAKE2B 8ea3f75115b2a7d08fde2086da34263c1a25107b2188f3a3a2cad0f8319ac1b89c818110b97af16c14cab1fa670f6e9a48652d428a6f2d32b0eab743e73d2dd5 SHA512 018cc046768f40cdc719c494168abb7379da2d4b7b0f4abc3d14ad0003d4a50358a5bc9baf40497e6a6a3e28031db09f1372deeb4af02cc98777bf0c79852a27
+EBUILD ta-lib-0.4.0.ebuild 679 BLAKE2B e7f8cb0f03219836d0fffaa0d5dc90d3fb2911485ad7b46a75b68fe3a6ef3f5ddb5610275c0449cfb7f92cb17b261cdbe2d525fbfef101b471d8cd8ac070747f SHA512 e178ea0cdab132427d2eb5fbb11e76150c8b8a6382d6ce9d01e5f02f515c8c119989405ea5a7624fa0c3580e70cd7d35976bee5b9d0d23bce5de86490d162457
 MISC metadata.xml 243 BLAKE2B 400c5a1dd01546d5bf24cbf3a8944fa5f83d60ebe181ae799e2d3ce7c862458369524793540d78cd0c8e15b77df23cb90db634b7b7c8ede5373a53a03fe49b33 SHA512 7ce6628e1ef9623673a4981aaaca3a1a3e9f030b6826929de1307bc1ea6d18b31bb5f14e8aefa60a6ecf34c874b4cb18ba8d64e869e151cf750b79e76e394bcf
diff --git a/sci-libs/ta-lib/ta-lib-0.4.0.ebuild b/sci-libs/ta-lib/ta-lib-0.4.0.ebuild
index 99cb7258bb33..7a7a581a503c 100644
--- a/sci-libs/ta-lib/ta-lib-0.4.0.ebuild
+++ b/sci-libs/ta-lib/ta-lib-0.4.0.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="Technical Analysis Library for analyzing financial markets trends"
 HOMEPAGE="http://www.ta-lib.org/"
@@ -14,15 +12,28 @@ SRC_URI="mirror://sourceforge/ta-lib/${P}-src.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
 
-S="${WORKDIR}"/${PN}
+S="${WORKDIR}/${PN}"
 
 PATCHES=( "${FILESDIR}"/${P}-asneeded.patch )
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
 
 src_test() {
-	ewarn "Note: this testsuite will fail without an active internet connection."
-	"${S}"/src/tools/ta_regtest/ta_regtest || die "Failed testsuite."
+	src/tools/ta_regtest/ta_regtest || die
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index 7497cd30fce2..14d3ae11cfff 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -1,10 +1,5 @@
-AUX 0001-pip_package-modularize-build-script-to-allow-distros.patch 4250 BLAKE2B 79702d82e629e2159cbe33efe8dd91536d904536f4bbf3d4ad02186916a09786cde6ce29a63acaafe3169dbd7904448461f2b557f33218651351fd87d42ed613 SHA512 42bb57433f61b3a9b1a93c897202bacdf44a8277ea0e64257ac3b60c9b964a6441345c9b222fb26afb1d66a53323fe38c29811adfd6354032cb5d3f85dde0816
-DIST tensorflow-estimator-1.13.0.tar.gz 530871 BLAKE2B 4f208ed20e10fa68e06d21c9865cd07623e14362bdcff456bc9b412431c8f12f289c8a8f8ad89cb1f0ec98b1432844632d7e1097ea29d40bf6f67b90b4968f93 SHA512 e4be92b805776d2be5f391f737f1043b994f42721173c4d4a7dbf3fac9b00121cb072091a474bf71c7dcd952fc8b330cf9254c7a5ad9d096ba1cdc12ba12078b
-DIST tensorflow-estimator-1.14.0.tar.gz 670750 BLAKE2B d24bba87131605f965be05cd76103e77c45c606af685f08d478cf4acaf2975aba6134bfe9ea51d1837297cf4ce5339bad761af6c00077193ccbae3f1bbcaa667 SHA512 65d21f4d275edc57feb0b36775f275d7b7adc1f5c2958b8269dcf61bed0189570adcb2eaf981e2ae4ba7e6ccec6d4d467384a267a6a29c325dc8126b1bdced5a
-DIST tensorflow-estimator-1.15.0.tar.gz 696331 BLAKE2B 67aac4adb05149de13d68595e3520f4b843dedd48b58b0b0bea920767f04f64291842b9931f2540b6c6e997bbd01f8e23f64da9ea02ee295f57c777186e5ab19 SHA512 ea0f0c9f74db3d7bed5ee2b38a8eafbeae8fddd824c410461a88ecebc3e11ad6f885cc7404b3af8c7751562bbc2b71fb7e0e5627cb5dea05617ec1a383279bee
+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.13.0.ebuild 1336 BLAKE2B 8cb7993e004e31435ee8878335696befd20dc7e90f9156dc2c17a3e3668bdd63c14891b4960ace13d1c2e1da66f3580c4634f75de69ef2095d0f6566bfacc5f5 SHA512 9d7b99123345ae85268b8676d91aa34f62ba4e2fd8131630f26b1dc3bb969cbd40e37c2ac054800f48fd1df02a77cfd724d50bef9e787bbe1316225c9c484cc9
-EBUILD tensorflow-estimator-1.14.0.ebuild 1245 BLAKE2B 4d7a31587186446be9d72524801d95c193db6561558403c0c5b5b8e694b84955792c96e6fc81b2bbba3df2db88f1ffd954d2a028692375549639bb8bfcfd8eb3 SHA512 42259cdced6aabddc930dc07121e9b5f87639e4fb3fb9223c8123dc02f508f5393345873ee11f866b3c859466fdcec2b402d2f303fb8fb4c643edb2c93275e6f
-EBUILD tensorflow-estimator-1.15.0.ebuild 1342 BLAKE2B dc05278c1422a7f7bb51ef7a27e71074593c4e89fd12b0be5ac89b52dfa38ea33c3a109744a398a41c05c27f1112df8dc86be3d5f60e6757298a3e46eec0d205 SHA512 4c3ae397917543760fb2677760c50c556671739717f779340335abc6b3c7f7ce6c37cd7cdb293a0266ee62586b7c594ef8abf6006e69cfd1285a2a0fca5dcd0d
-EBUILD tensorflow-estimator-2.0.0.ebuild 1245 BLAKE2B 4d7a31587186446be9d72524801d95c193db6561558403c0c5b5b8e694b84955792c96e6fc81b2bbba3df2db88f1ffd954d2a028692375549639bb8bfcfd8eb3 SHA512 42259cdced6aabddc930dc07121e9b5f87639e4fb3fb9223c8123dc02f508f5393345873ee11f866b3c859466fdcec2b402d2f303fb8fb4c643edb2c93275e6f
+EBUILD tensorflow-estimator-1.15.1.ebuild 1332 BLAKE2B bf1f8f5d0bbc0dd5f64990d0cd84c02d7c392740dad223d1b67d6f85680ada645bcf32caf15313211f76769126075cda289bf0a99cd951d0af074bf4d694e2e0 SHA512 299e555bbb858dfdf34ae79ab52fe057e448f3e0661c22b7b2a35ce24e4240f675e36eeaf0d53b95ab91d1d535366c5bd26a22333c497b3048bb27a83f7933c3
+EBUILD tensorflow-estimator-2.0.0.ebuild 1235 BLAKE2B a72f3e514a0b095401cc573e70647d5d054493ed7878588822580f52a757e2b05d0aaece5271666d1ded81d81c2befbedaf4743800d041730448861ce020a527 SHA512 4f2434ce286bcfbcc63892542ab73f6313e6e86aa5074f76e8c98add54453a94d79cb23d43237ab97dba824959a44d02360f789b762624493524602bc7ba6736
 MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa
diff --git a/sci-libs/tensorflow-estimator/files/0001-pip_package-modularize-build-script-to-allow-distros.patch b/sci-libs/tensorflow-estimator/files/0001-pip_package-modularize-build-script-to-allow-distros.patch
deleted file mode 100644
index 140e23c84bb5..000000000000
--- a/sci-libs/tensorflow-estimator/files/0001-pip_package-modularize-build-script-to-allow-distros.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 897b25418ae0f77bcee7fdd7070d5c22677dc218 Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Sat, 2 Feb 2019 15:19:44 +0800
-Subject: [PATCH] pip_package: modularize build script to allow distros to
- install more flexibly
-
-Gentoo Linux handles python modules slightly differently and packaging
-wheels is complicated. We prefer to run setup.py directly ourselves
-rather than build a wheel and then install from there.
-
-This modularizes build_pip_package.sh to allow running parts separately.
-using --src srcdir will prepare the package in a known dir so the distro
-package can take it from there. If only dstdir is given (either with
---dst or as the only argument to preserve backwards compat) then
-behaviour is the same as before, the sources are prepared and the wheel
-is built and placed in dstdir.
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- .../tools/pip_package/build_pip_package.sh    | 73 +++++++++++++++++--
- 1 file changed, 66 insertions(+), 7 deletions(-)
-
-diff --git a/tensorflow_estimator/tools/pip_package/build_pip_package.sh b/tensorflow_estimator/tools/pip_package/build_pip_package.sh
-index 5d06dd6..1667169 100755
---- a/tensorflow_estimator/tools/pip_package/build_pip_package.sh
-+++ b/tensorflow_estimator/tools/pip_package/build_pip_package.sh
-@@ -23,10 +23,8 @@ function real_path() {
-   is_absolute "$1" && echo "$1" || echo "$PWD/${1#./}"
- }
- 
--function build_wheel() {
-+function prepare_src() {
-   TMPDIR="$1"
--  DEST="$2"
--  PROJECT_NAME="$3"
- 
-   mkdir -p "$TMPDIR"
-   echo $(date) : "=== Preparing sources in dir: ${TMPDIR}"
-@@ -67,6 +65,17 @@ function build_wheel() {
-     touch "${TMPDIR}/tensorflow_estimator/contrib/estimator/python/__init__.py"
-     touch "${TMPDIR}/tensorflow_estimator/contrib/estimator/python/estimator/__init__.py"
-   fi
-+}
-+
-+function build_wheel() {
-+  if [ $# -lt 2 ] ; then
-+    echo "No src and dest dir provided"
-+    exit 1
-+  fi
-+
-+  TMPDIR="$1"
-+  DEST="$2"
-+  PROJECT_NAME="$3"
- 
-   pushd ${TMPDIR} > /dev/null
-   echo $(date) : "=== Building wheel"
-@@ -75,15 +84,39 @@ function build_wheel() {
-   cp dist/* ${DEST}
-   popd > /dev/null
-   echo $(date) : "=== Output wheel file is in: ${DEST}"
--  rm -rf "${TMPDIR}"
-+}
-+
-+function usage() {
-+  echo "Usage:"
-+  echo "$0 [--src srcdir] [--dst dstdir] [options]"
-+  echo "$0 dstdir [options]"
-+  echo ""
-+  echo "    --src                 prepare sources in srcdir"
-+  echo "                              will use temporary dir if not specified"
-+  echo ""
-+  echo "    --dst                 build wheel in dstdir"
-+  echo "                              if dstdir is not set do not build, only prepare sources"
-+  echo ""
-+  echo "  Options:"
-+  echo "    --project_name <name> set project name to name"
-+  echo "    --nightly             build tensorflow_estimator nightly"
-+  echo ""
-+  exit 1
- }
- 
- function main() {
-   NIGHTLY_BUILD=0
-+  PROJECT_NAME=""
-+  SRCDIR=""
-+  DSTDIR=""
-+  CLEANSRC=1
- 
-   while true; do
-     if [[ -z "$1" ]]; then
-       break
-+    elif [[ "$1" == "--help" ]]; then
-+      usage
-+      exit 1
-     elif [[ "$1" == "--nightly" ]]; then
-       NIGHTLY_BUILD=1
-     elif [[ "$1" == "--project_name" ]]; then
-@@ -92,6 +125,19 @@ function main() {
-         break
-       fi
-       PROJECT_NAME="$1"
-+    elif [[ "$1" == "--src" ]]; then
-+      shift
-+      if [[ -z "$1" ]]; then
-+        break
-+      fi
-+      SRCDIR="$(real_path $1)"
-+      CLEANSRC=0
-+    elif [[ "$1" == "--dst" ]]; then
-+      shift
-+      if [[ -z "$1" ]]; then
-+        break
-+      fi
-+      DSTDIR="$(real_path $1)"
-     else
-       DSTDIR="$(real_path $1)"
-     fi
-@@ -105,16 +151,29 @@ function main() {
-     fi
-   fi
- 
--  SRCDIR="$(mktemp -d -t tmp.XXXXXXXXXX)"
--
--  if [[ -z "$DSTDIR" ]]; then
-+  if [[ -z "$DSTDIR" ]] && [[ -z "$SRCDIR" ]]; then
-     echo "No destination dir provided"
-+    usage
-     exit 1
-   fi
- 
-+  if [[ -z "$SRCDIR" ]]; then
-+    # make temp srcdir if none set
-+    SRCDIR="$(mktemp -d -t tmp.XXXXXXXXXX)"
-+  fi
- 
-+  prepare_src "$SRCDIR"
-+
-+  if [[ -z "$DSTDIR" ]]; then
-+      # only want to prepare sources
-+      exit
-+  fi
- 
-   build_wheel "$SRCDIR" "$DSTDIR" "$PROJECT_NAME"
-+
-+  if [[ $CLEANSRC -ne 0 ]]; then
-+    rm -rf "${TMPDIR}"
-+  fi
- }
- 
- main "$@"
--- 
-2.19.2
-
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.13.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.13.0.ebuild
deleted file mode 100644
index 07240632c5d9..000000000000
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.13.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=7
-
-PYTHON_COMPAT=( python2_7 python{3_5,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=""
-
-SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-java/java-config"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/0001-pip_package-modularize-build-script-to-allow-distros.patch"
-)
-DOCS=( CONTRIBUTING.md README.md )
-
-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-estimator/tensorflow-estimator-1.14.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.14.0.ebuild
deleted file mode 100644
index 4d6fbccd5074..000000000000
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.14.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=7
-
-PYTHON_COMPAT=( python2_7 python{3_5,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=""
-
-SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-java/java-config"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-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-estimator/tensorflow-estimator-1.15.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.1.ebuild
index 736ba39f9e55..7913f44ba2cf 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.0.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,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.0.ebuild
index 4d6fbccd5074..fbd9ccf1cd27 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.0.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 MY_PN="estimator"
 MY_PV=${PV/_rc/-rc}
 MY_P=${MY_PN}-${MY_PV}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index b44f981f74df..9f5284199f3a 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -1,58 +1,39 @@
-AUX tensorflow-1.14.0-0001-systemlibs-unbundle-enum34.patch 1958 BLAKE2B 830ddb5ee1ffe84459879fb5cd9acdbc87d862d780cfa1e6e85f49bf46c2ca705fe25f915d8c8243bb5fae558d05b204268332bad471433b437cf15bb12a173b SHA512 73d6a225f77204daa36696d688721f8f58696dfc7cbb72a79dd2c5dbb938f26e3bd003e22a1755f0d31d2cfc8a532152c6a262cf2f1c7f49706d491021b9066f
-AUX tensorflow-1.14.0-0002-install_headers-fix-paths-of-generated-headers.patch 1059 BLAKE2B ca06d4a07ff5a55399ab84325f7c51fe2abbe969fe2a096bc50b9373b490a52c4a189559d3b92d5f95195c3895ef9bf184b4a876032122781a5edae590806b0d SHA512 c60e16fbcc104d18971cbd097d452ad9e688330a996705532ac2f2c4364bdfbc10641b3fbf42c65079b419bc469610398785f331b4ef1376c3c2f7424c7c51c0
-AUX tensorflow-1.14.0-0003-systemlibs-jsoncpp-update-header-symlinks-for-jsoncp.patch 792 BLAKE2B c51b247be2d9bc2f124c0dd07d48fa7f3685cda148b050328e45521b2eb6da555e59f89ff554057db777ec435daa58ddb786e9ef44779fcaed5cf29f76686031 SHA512 d5266f79efa9402de4cf53803d532711af8db8b40d2964ef1a6b27f6e7ac3ac95e112590c39fbd84873d9459367485e10b351f45e703ab7e095661683e5ba341
-AUX tensorflow-1.14.0-0004-pkgconfig-generate-tensorflow_cc-pkg-config-entry.patch 1420 BLAKE2B 528c26f6be43a3ecec5acbc932916a286086775deca66ccf4e87a46b63d49b0c67b787a0823ee5f5cf222e4c4e06a9b8e6d09048353c6b475efe8af945a0522d SHA512 de764fcacb035c2ffb7b02c583c5cee9297fb53ad3203bbaffbfb3cc63d3d48674c7a99a624cc77e1bf58cd70026fea5de8404a04ba6e7a0c61f2f108ddf639d
-AUX tensorflow-1.14.0-0005-gen_git_source-builtins-does-not-exist-in-python2.patch 865 BLAKE2B 3adb6688478452b6e8e093128a7ed50db5d10efa31192f0fa41d5adca1dc44004ec388171fc09a1a0579e116dd5816eabaec6431961e93719705b0186853b15b SHA512 ada76bfc06c56b19f1f2b7e88979d2dfea3bcac9a91a79e4d0dacaad3bdbf0ff4f450670ff26e49cdd6bf39062c7dfdfb17a61bc92c35a7bc748a42bedec23e0
 AUX tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch 1188 BLAKE2B dcebed9a89be6ff70f073c432e5e02ab80c0fc9e69cea2b1255a5620d456eec39f717fef3dec062a7dee5d33ce2eb45712d578de9f5ecb00360bb26004cc949c SHA512 d47a98015c424fd61adea6c8f5ed5115ca35c807636530e737963f002f02380d80d30e0f0cf3c6cf3e00914157fce62739da60ae30a4fb533321822a4fa45b2d
 AUX tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch 2370 BLAKE2B 87c60e70e929ade64cae24ae6f6d2d9168b0f5b93093206755fb66033b198e7226b7157a6aa15cb051cd9cd42bec8743ec7b96334ea3b9184445afff5e61c257 SHA512 2469fc0f9c9365c2e1191c68b61ba9ed54f0d240e34bb431ba6efadb9a4a63ae5b579e22b693df41fbbee55e4119bf8dcbdcdec6d7be81e36d1b48da8ff88c7b
-AUX tensorflow-1.15.0_rc0-0003-python-deps.patch 588 BLAKE2B edff0b2a3355f812ab7cc42ceecfdcb22a52e6947c75829d001a8db3b1c7de954948f71a9df3c98b69f4988b8bdaf03babaef9f3e38af28d25a26e754713ae9c SHA512 ba813aee0beb164d3b47a2041ff9ff47b195447d00c5cb61189ac2a05189cb85914d08be4ffe2bd1497aca85db18b111c75deec72e44fce01f6189d661adf77e
+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
 DIST ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz 100612 BLAKE2B 84f81072d3298dde613b4c1ebabf852c67e04b5882a4ca0ed6f218b42e8fa3ea9598140b0c0009e8d6b62d08902622a6d57ee005ec3ad8a808c9fb21aa53430c SHA512 03a289d8099a5c4a5298cba8f516d2edb41220935d8db750970113ca7513372c78241c2c948d0ffcd60e84686e50ba1d7fd0b46efea6881dd320435eca92a7b9
-DIST abseil-cpp-389ec3f906f018661a5308458d623d01f96d7b23.tar.gz 1180190 BLAKE2B beec1338bf8cfa99d0de3bdb1631da5385317e68bf87f5da154ceab9455af7221f140838e41f4087d7d0064c22f93dce5860c484a8e4026b46efa103a52db307 SHA512 20d2cc8d23eb729607692d861049dccbd6b4af56fc4ed7733492348e3fe879d7acc6316f0d6e1c683f98188f028d460a40cab35667856cf334aa5f00fc830911
 DIST abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz 1281523 BLAKE2B 955802c74ed9baf222dcd824d2940147ae89edbc88f12bb8f54839776fe18bb18c0fde23b0d3142bb3be65a57930c96d03fdd243e8da07435eeb04329c31483d SHA512 c2ae1bd789251ec70cd0baafd92521e48fb1648aee8d9d84a8269436300848b6a9d7aead6bef8a12d3a9040f19535ac725ae961f12566500d309bc13dfee26a4
-DIST abseil-cpp-daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz 1275955 BLAKE2B eb6e0f9d55458a4ae6e8b86be89add9b0cc44d1ff5a11f6fa1ec93e2f46885c8ff87b8c1e674e1ba5ac13556ed303963864057f0e258fce41fa753d891846996 SHA512 56a827296e2948b90922766369f2040e04abd03320375240ad32fcc2925cdd1ffea312edcef1009a0c8abd79f521a61e433b7651dd4c2721d2b1ad13f48256de
 DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826
-DIST bazel-skylib-0.6.0.tar.gz 29330 BLAKE2B 53d23a81203c08cb5ab4adbd308bb6c9875df0f2d27c6f8832a27397578e9214ebcd95f63bd6c539d534ecb5f2316116063e3e5d1a36986cf94d167d7823234d SHA512 14ce6782509be7d3cb0fe438aaad579ad23bf328d566cab06a2008990041ee098b4602542cb67961d757573a8c272e5dddb143efd756cd6ec40486159329fa91
 DIST bazel-skylib.0.8.0.tar.gz 72941 BLAKE2B 1928989d3e5dc338fee974c5592a524adb492db172b1d2a849ed5f14f91dbb76606335d369e4b15c4eec41adfe3a23cdc5b4f3b2f1351a5e9c25103c002b96a2 SHA512 4729941cedca8ddb876a621b28221d3c17dbb5dd72af27e55f48274208f21db986c5e7cb8adb742c42124bfa8073eb782b49e2557cb3f3f95ca56833fef925c0
-DIST bazel-toolchains-3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz 416360 BLAKE2B 4d7960302cb70247f8166647b991d74aa0514d218c9de4c97fe267ecb789e9966cfd8e546fe11661c92034df7a8de72596c5c5ddea10d145d6783cdc5aba2f9b SHA512 9a810b0a70f81fe3b9a1f23b2d171bbe723f7a33374b2caf7ce398572965f21b9de00791122c32b36e68a572b1b8982be378730f1c9f22bc375ae5f5c1c32873
 DIST bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 660374 BLAKE2B 549292aa3ad8a6e01c29391a123f3cbc84d1f714ff9c68bfc6c8df07fa0ba3b19c22e61627f227a8a484f6d7d6c59935fd7560c447559ff5e774ddf1437eefe1 SHA512 83531a2646a9f63557eff6fefaf551ee7e9f0ccdb31374d7a17c35b9f9d844b9b405597972fcd31b2b68e9da312511bbfd9c8fbb75222f5924e1d2500cd1c2a6
 DIST bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz 505681 BLAKE2B f16225eb11859f487335bddca115c9c2a05731f4bfe4240609a47e17b706d9a25b6b363b61404b4d5df0471e4dd9b4b9befbf78dbcb1c7c11e3f590039ff92b2 SHA512 7723baf2c710adb063375a33fd64e3941fae7e98c824764c266d5554cc0b0cbb1c91a5c2a9058bb4c8766ec404ca556199ce22965a6de4baee09cb740b7671c9
+DIST bazel_skylib-0.9.0.tar.gz 84644 BLAKE2B 40b69a524e632ea00d34b9cf805b882ac4c549dd465ef37f28e54729ff1b614a7610a4895cede4e0c938edba5b19f781f3c0bfdb62bde628ee0af21d6b679546 SHA512 af4bcb641fed05d15f2d0ffe0e3abdfe9c7a5deb9c53064992d6605d224ded1648b1bdfa293e161028913f9f2c178c68cc38bc16028892ca5b0f52b4e645209d
+DIST bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip 72534 BLAKE2B 0bbcc2b3fefb8df84d9f72b13da59c377fcd657ead378f85f80a587f8750302236212ae5c58819933015e62425126bead0733d2924a567fb9c5cb14fb75271a8 SHA512 1818c555504ba89afff88d75fe8b4e1386b3665a3ad477c26b4e9504c8f52f398b6aaedbad41a4ab8b8d9b3f86e0992e7c83a6da70241685d7b79ba177af1035
 DIST bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz 464906 BLAKE2B 033d76b8081f4f987e64875ad5c8e7b8f894ec6be58c52ee02c4d31d4480fee02f3f432ea9c4630ad3f5d1163f820aff37f6493da797ec51b148b361ab3c8b25 SHA512 2cd841f4530503ed31fa6425cb749ef29f8a1071b5d55594644303233e58455783cb02402bc23d7104ef036745733087d43075a1fcdab2ac96cd1a9872a6ea4a
-DIST bazelbuild-rules_closure-cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz 462798 BLAKE2B f461635702cd881828cf401c78fe0e64398c015d7f7824b369b0808d54224c633b6d8b699000e9e481ba094a93e01c33cc4360a541b2d520db10d3e9ef81007e SHA512 e85b13a50cbec60e4e574de9a3d3b646ca4bf045c55afcb41f2fd671202aac9e6d3e91c618f8923986ae142e615624718f3df0d1edb33a90e334f29667888d39
-DIST bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz 435984 BLAKE2B 1ec325861e5e5292b2153119beff3b3be743b4833adf3571eab1a066fef06a61131ef0a761e6f8ba4bf978e7c1c073f197f48a507cd1259ee346d4209129211d SHA512 13991822624e5bdcc2424299acb1b9ce12880f46ebbf2065d7d19a66c77f1a6802862a7ea96334fc91a1c85cff516fd32a493320f0a4d98f19e9d33e5f887986
 DIST bazelbuild-rules_docker-v0.10.0.tar.gz 549649 BLAKE2B e7a537b21138a5c5d9ce360e46238f57c917d2dbf5dd17887607402227cbe7c5d68aead9db0ecdb74c09eed9dac26eb86e004a9020c251152d15beb48be0e0d7 SHA512 7802107f8520c88646728800637cce54dbcefc54aa4361288a5b46e403e41998bc23e16fbe94f23a2ca52e5c33fc255af65846963c2fd0139ca1195435ce1b03
 DIST bazelbuild-rules_swift.0.11.1.tar.gz 107453 BLAKE2B 8cd686b945b5c9de9c8bfcaca38cd7c513bb8b55b4584bc569463997e7c5abcac3be4a5a31ccf95a494d17f3078ec9b1052497dba228fa3159a0c0be2a83eb88 SHA512 3479d6d8ce9111a39b9ef2e014399abc904e432841570dd0380104d80e4d3a74b6ff5cc6d2b250bcd15b152efa29d08f9ed092f70fd8bafa6deaa6f847d7f626
-DIST bazelbuild-rules_swift.0.9.0.tar.gz 105918 BLAKE2B 8f1bd8f5a468e3b37c614cf498a6cd8ceca55b255d6f096ebf88cd77e95148eab3fb5a128ed93b40f6d1ee8988b8dfd300fdf7061fc4ed4f1fb4ab25446ebe58 SHA512 68e985fa30b865317ccf59473cb52873d65159b866a54e35b3fbf83c135f3c750752663e962decbc8ebcd17b5784867d4d4767dd0b706f1182d4715291d8268b
+DIST bazelbuild-rules_swift.0.12.1.tar.gz 111674 BLAKE2B 7c116d6098aa0725034dce4c83628c31c85c36a6331b44636deb2efe0f689a5baee8081b33d65e3727a83bca865bcabedd6f8fa1fdb60e901a9b60840c52c018 SHA512 6136feb3dc0074f82500000cf5335f046f21ea3a1edcb4dcb22228c82b56ed6a334e4b03e4e26a4d25549581abcf7df22b60a2bccf823a51bf270051fe18d489
 DIST cub-1.8.0.zip 602396 BLAKE2B a5e302a52e04f85ae8e1836c59e799532a8b961a8d10c08fe1241c9045f88e31f1ebda6d26124b85c6df40968e1c7b3985a39961bf7614535aafcab2da1a576a SHA512 6167c5be94989f88e05a07508cf69cf2c6b22a5ac733804043daa46bd86a44a15a758b1ffb811bab28b82039d027516ed85b3d9f7677a740a7e00ec9c2f81aed
-DIST double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip 7071029 BLAKE2B 722c190c941b169a3292ce2141c59b8eb1bcc5edd2ed09669592dddb9354e4c6c094dafe02e5a154f215aec776f9f7cebae36b9b0317b10b707282b1ca9449a5 SHA512 1db0d4805c80e9a08d9a581051d8708ddbfe1d74fd820dccde2c2405c45c06a861bd5b535b25d191cd01064e268f3fe71e58bef16fd39471812aea6c2f97da43
 DIST eigen-049af2f56331.tar.gz 2485848 BLAKE2B 9d8a91782c9d40b7a6df101d2f43df25b5a3622bc02a7b9576929afb1f2f3d7c8b80671d24f1e31670883003b60c4cc0f3c9dadff0430d2ee047eb5122805edd SHA512 ab37106e9dfebbb42d7919c16b301887607080345b7ed63c8e3b8568489cfdc2c3ca0117a77905162cb3ba8324753040c841d2c96521fa4b9486f0778f1962df
-DIST eigen-8071cda5714d.tar.gz 2486211 BLAKE2B d5c2bc19d66b4e8508e260ba34a7ebf64c605d0eba3363bf853baaf1329ded80511ee36d54db3e8921eb62a0eab3c3ad2a2d4eac39b5108c2415b20812d998c0 SHA512 364691a5db9d2bd4285e5d5d9b9b2326ffd2138868c33bc2b98975da2aeee03bec7b40654ecc20e0ecc34b2a6d45257c7b9f0055b7310c590cac4c951c2aa635
-DIST eigen-9f48e814419e.tar.gz 2430237 BLAKE2B 2d9df1a23ae049e57366fa6838ee8d4b3cecf2d859ec5ffa07bf18878976a2bd99d7dd94bb08f484a8941b5cf8ac091f837a533f081232c70a45ee0583143ba3 SHA512 ee6d8773d910dbf6798cb849ef7611f0f7aaef9ed68216e91c65bd996b8a92b6c107454f6d8599d83bfa6dede7144c83924de8479a9138c7b456b086cd527ebf
-DIST eigen-a0d250e79c79.tar.gz 2468318 BLAKE2B 8799adc1a13612820251cd22a7ddc347ee4711d583561a5df9735bd22ab727c0d8e7fdc894cd7e83b3b972d5adcb86f033bc089e1a4de5fe4e6257f78df88957 SHA512 864646a0b3fd8287fbf6943f4cc7f692a883e6164add21c97e98372641b32e5ceffadc825178b9d11e9504377b837d0e54a264b7a53b28e4f9fc2a23c616d2b3
+DIST eigen-49177915a14a.tar.gz 2496808 BLAKE2B 4e89b72a2ca121e9d1951a7179434c9eb70104ad45e63ae9811e10e28e32d51386acd2fe6938970404dcada8a377d1b3c07a68a98a68a036a6e85b2cf9ff4b48 SHA512 eb036225b41ffd8cc61ef99d2d22030c0d1e0f87eefcea4dd2b1fdb16a5316e0f4f17527983a00a8a684067654bf1f87c82cfaed5764829778660485ebbfa4b5
+DIST eigen-afc120bc03bd.tar.gz 2546157 BLAKE2B 72e051d77cd22c26a4203cf244e87b1700b4dce664d7ee5f80d0dd86eb5557c93e57c50664f1d79b13796a77c5ccdf72203ec66e9376d383b5a3b056326c7b61 SHA512 61f57a22d2a7947c14cfde87946dc41528df696884502a13000ee5c9b964672a5a8d8c10f505f28ed7a2d39deb820c6818d191dc3ce13215b8b9775b33da2ed8
 DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
 DIST gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip 935628 BLAKE2B 09bd1dd1e367b1e5c4fe9a9525449c09460f19168bc03c57ad563aa27ec74a18f08b620a3dab6da4fa1a1448cdc7ce8bc8a089becc033b53fff4cc07593315ce SHA512 bd42a364f718f3b077cd9c840d626bfc1fd92ace98ce43329d8fa54700c9d28cb47568b6567e9b081b340af7be621c44be1ce06d4b8dccc4fb5d82c35b12f951
-DIST gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip 916632 BLAKE2B 0bde9faf0e185fc69999173eb0b5a2e106d252ee1bc6caf38b1adc27bde96e4e2b52a3d723c8b1af922386c0e933bfcc674be974cee059c1d9b16ff6ac631c3e SHA512 eb141182dff058048c559723e6aa7127244dcc6a5a0bfd1250bbb262f34378dccf15b1b930cf46dcb6ac22ac16e3fa2781cca63cd93865506a36ab7e463aa537
 DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f
 DIST kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz 44744 BLAKE2B aeea5d23c122417ddb70a44354890242c4fb61c456fba9af79054293a1355939af51a681760ac27be55423f888649fd2826e634422c7e9cb3749a9d7f50ef990 SHA512 30f4fcd351bbcb950a27e2a77ca100ccdfd37deb17a05e7e31c3e8f1c56d7c626ab81bbd7497484e6b512e41f7b1bed714722a194b2218c669b297911101df7b
 DIST llvm-7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz 50144723 BLAKE2B b744756c9782e5506fd6628531409e305bd9ce9a79f1776c4fe674cec5b01a86ab1793dc602f704d295587c3d769d622402a4fe07c0d66269c7f610178693bce SHA512 43f185c8dd38ae7cb048bb9c98fb94e1f43ce66764b43a7141a06a1a0b011389fa139f34b7eaee72c39b8f44aeeff3e7a2189c11d10f8f8a93e9792a1acf2b5f
 DIST llvm-b7d166cebcf619a3691eed3f994384aab3d80fa6.tar.gz 49997477 BLAKE2B 66cbd71a4ad65768fb39fd622efd54a7821b83eb105871e82e0b99074960cb4ebd8197ef984b0be29d5178a7ce3c0d4839d2d611c96fe1507227f7f28fd7e156 SHA512 79c6d4986cedfc132f085d2794f295fdbefa772cb53d3870963d4851ea15ce8e2863aa50c903930abaff53d818ad97acfe8acd1c923ccbe26e3a99ac2397ae9f
+DIST llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz 115788302 BLAKE2B ea18d6cb3cc8311a78e543996d88831e1ecf1dec58b7c890a80cd8fce86e1c52244b9cfc0d7ce0867480465c2d914555c16cf003bfdcf90056d63e8f4e0ea0c0 SHA512 5422762ffe1022ad4588bcf2bdce1a041c37b5edffed70fcefdd911b2dbf8b52cba9ec57670d48d7b69be6b71e354d333d6eaa5ac5260df56ed8ab18fd98fe88
 DIST nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz 107044 BLAKE2B fd018b1d40977add357e98382f41e3fa6456bdc9a181e2d6cc7a3bc7fb98d242b3216b5ed0c40323bbcc006ab5221b49819ebc1dccd0c8dd700d9504f085eed1 SHA512 e66f323abb68feeec41927cc23e3a85d82fd1b7105a6232626edba95acb9eb22b3fb8b28d1a7adb536c47c936f68271fe5d8f66d3059e3128608ad826dd7622e
-DIST nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz 95617 BLAKE2B 023788db444b1a50f01ab16f126c920f530a6ff5bf2a9327626db45f985b4093c1024d16d43cdee9f0b3ee5c8b7d104f2a6b1dab0460c6b1998b42a0354f6f27 SHA512 d6b4dd4d6c7c9ca2dcf0699055c9193d4b46c0c5155e0108db38094577c92f954f604b2e83ca320873288e0010eaa3c5812f05f7fafe5112bebbca78e56cb279
-DIST oourafft-20061228.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd0200371c153ddf54ef6c7c4ec523ee6560547e2d5ef9f3200037c0635bf41c18991ac35f271b1e600d0dbd65d1a9a7 SHA512 f1ceac00cb7b9eb8f625eee7f1f5eea8af363343589a344226628d68baf668c176e6c23b7f904c4e682330352eaa0cd5d00731340d208e94c9657b8f85ae2240
 DIST oourafft2d-20061228.tgz 54434 BLAKE2B 382dd5787155b877a2ad1d624596afb5dbbe146a7aedf044d7f016949deedac871a512a030b5e6ac9ea5310e216788ffb99af1dd9d2a0de3f1ad72d9e5e7a3db SHA512 af993f68e8e1eb3cb927a51e86da8f74cfafc912a7cd055515e50fe543dd19ab5a6f7b1c2be4a55d6f4a0e5d766ead34c3be4c5705be6353f78cb2a55bd5cf16
 DIST pybind11-v2.3.0.tar.gz 564520 BLAKE2B a7c1485aa8f63a00eccd3103cf9f531a080b049be02e6182b30503ae6dd6c55fc517684ed9d92aaec244efd5f77336c68d1ea546833f7f0ae2fd7b090c19a02d SHA512 04542fe9dca2ffdb86c15698a4bbc041446a9f11970092e89a482ae0ff64c932f62fff8f437b98bdaa006c1fccabddd79f0c7e376f27daed2150b1d2f988e8aa
-DIST rules_docker-a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz 446437 BLAKE2B 070e1028625c74e6fbd092a3f8c6cf6de3b98d8999fdd69527674cfc55f00bd7638f7cb1eba41d496d1de3307b81b9dfd832d7d4bc65f9d98cd53714cb24bb02 SHA512 e43c013027a7235e85c263d8cfc40f9af77f54d054665116bb8641ed7f60d077b9107aa97da5b7e102077b68be7d2cbe401091016bd46f8828ae159659ce9608
-DIST rules_docker-b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz 460121 BLAKE2B bca31bbdd9069647fa9560002e63a404e2bd4d4ebd19d90e28d08f797f8f63157cc127dab26b996bb976e50f099928a91c1d6343427cb85048c6ca2b47c0c7e2 SHA512 461a663189e5995e31ee8175ee260e1ad06b00ee8a7548b9d3a946a2de693311031ec6eba89e3bad527f5d8f76ed25626ef4ea05a8d6e7579932dc1be3b0a6ba
-DIST tensorflow-1.13.1.tar.gz 31614228 BLAKE2B 3e78309744747afd5a0929eebccb414efe51320f9291424ef6e3cb848f265aaac5ff16a7064c7aac8094f06b1edb61aa9fe22a55c28c23cfc4e2a6f640f4f12d SHA512 1e5c020a82b0b502c9c6fc9439905e19e8f1fb07e32740a5e2c70f4a3565c8c87053ccdcad360e95550dad648154e399ca8e352fb97a1788acfec3b87bf323bb
-DIST tensorflow-1.14.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
-DIST tensorflow-1.14.0.tar.gz 41335204 BLAKE2B d91d84c5d86c838cc659c45e28cf3c8a9ec9a02f5854a1826680806dae41cdd00ea49a6d2c04f2019b3400c6e267c6ca6f3b28e43b244569dca174ff7f2c59d6 SHA512 ac9ea5a2d1c761aaafbdc335259e29c128127b8d069ec5b206067935180490aa95e93c7e13de57f7f54ce4ba4f34a822face22b4a028f60185edb380e5cd4787
+DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3e78b690f70944651c7022c6d946f40b2eb5fe01b2e203141f94b890cf1ad5c72af8e7c6ff3c5242d42af5a8657ed69e3c74d9ac081beb15de6334c0c SHA512 e3e00e92700d08bc55ba0e96148ddf1e00de2d329c1fdac08691ff15976937829f66dbc84af886a4b749ad66ba4ab208d66811e97e33bb9c2d7359735406c450
 DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
-DIST tensorflow-1.15.0_rc0.tar.gz 46177850 BLAKE2B a4cb339018d04da26993400e99bacbe8c88dd68e17158b3effac125ee90b73d441084d530359912c40d1981c7688511ad41117067428233e9310c1fc8617f1d0 SHA512 f9ba5f2c952b7d8be0f3e2b78336513efa07d5323bc28217335391538577ba2b91687cf92f759d4ec03b02dd1c2961de4b54df205e7952c706f5b632029b7c7d
+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-patches-1.14.0-r2.tar.bz2 7213 BLAKE2B 51719fc02049d564b7e5c00a76375af9a7e8dfc73753ba5f0d53163dc1fa00d23bb7ed03553a0bce68b8b90cd5bfe21d29e7a57a827db2c68ceef65f3cb0e925 SHA512 35e1a410060cdde99df148bfd06f042b91e021f7a692ae9c0100c67555de553bc248d73db762ed0239117296fb1147e2b67cdf0dd3dc94dee6fe9804c08a7360
-DIST tensorflow-python-license.rst.txt 45132 BLAKE2B 770ddd87adc745a021daac01a284131825a33f176002a28b20a2251246183bf7ab4686305620678285e4a216a37f01b3ad953fe7864fa79611cccde156d69ab6 SHA512 2d5a3783ec340f24797e89c78007ee95ab753eb5ee8198c739544f9e1159895f7abe816d6b3c66620f8d7b64641d2a7f44ff0a5b4f2f941928f4733157c7995e
-EBUILD tensorflow-1.13.1.ebuild 10011 BLAKE2B 8b151edc20f6b80ccaac0e6c99f2414b484eb23ec2e1706736e90f355c8e5d960d8bb5beb00adf54238243e192832f6765d0edab1a6a14d18b888a34d2be343b SHA512 d3aefaeca59c6ee8ad58c0cf0830dc1334d0c0d12d602bbb6fea3f6030d002e918414fb0a5eb900a0ad199012c454d6dba8bda889b218fe6da4daa1e55a6d95e
-EBUILD tensorflow-1.14.0-r1.ebuild 10688 BLAKE2B 272c017503db3301e972242af8e0b66aaf7e81befe37ece9dc39696dec838b139d873c79e6db4f19fdf91f1af968475848bd4176155fcf5df403b6ebea108b79 SHA512 015fc7b2a664d7b8617da22139e8a87cca5bb6f876ded8fdc441ad68c5456ab9d7c7d5ca624031bec0d38e35e39fee69db8e5a38fdfe9ff23cdb8377fd9df66a
-EBUILD tensorflow-1.14.0-r2.ebuild 10387 BLAKE2B e96b62c51ecddfd883dafe6e43612c490f082cb220eed052239d0bb5743bd899762c7308f9021d7a980a6b080b3930eea7520f257d23a420f53868c7b2606988 SHA512 0805d3024a2cd5fde6bf057bfda691710256639982e9281e4e6e57ab70e13f5069bcdcb232354e87edc8c99e1af9723a63ef2c5f5dee9e83424df5320ba707c4
-EBUILD tensorflow-1.15.0_rc0.ebuild 11300 BLAKE2B 458b1a16c85fe0df4927b526ef2f9f724c0ebb4354b4e68f4b9441ef5c2b861fc8832a9d3487c272f78082c53833113543312874e1a972efbbc302cca74a9960 SHA512 a5c7fc1f5d7ee3ac4541ec68188d542ff4cfe8a54f1736e03d8f658fcbbdf01467d8f8366925cdbc81330e4fc213a54d56a117c78e9116fc97b2226882e6b003
-EBUILD tensorflow-2.0.0.ebuild 11417 BLAKE2B 1906be04e62047351661775d4cd3e5f77e50eccdf9f5564e36d3060c02fdd5492d5380d8868020fe65a58c6020e7c73920c75f308ea9116f8465394e8437f313 SHA512 f5bdcf4073be313d5fbd29ac169ffb8b5360a12869d52a532c6f77afcd8af54396e4997189a1beda0c7b4b79335259843c85e5b2041f5f3129b77f35a837cd86
+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
 MISC metadata.xml 606 BLAKE2B 910509df7310f05e34bbdd7223a9ad64e4f67c67174d3868629d594022aeab23fb9631fb17782b5787e7880cb2990ffed7d14c030ab86a25c23c8118330bc690 SHA512 ffc3f68be38618f77b7d31406292e3a4ead2819d19aa7c8b1eb779e03027b9220cc248645cad44e31a6f0c113f4aeeed2a45060617b1bb03695bd2c684262b30
diff --git a/sci-libs/tensorflow/files/tensorflow-1.14.0-0001-systemlibs-unbundle-enum34.patch b/sci-libs/tensorflow/files/tensorflow-1.14.0-0001-systemlibs-unbundle-enum34.patch
deleted file mode 100644
index a220bca57d69..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-1.14.0-0001-systemlibs-unbundle-enum34.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2956ac52f8495e08d5328f672c1366c52c9f8cfe Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Wed, 29 May 2019 19:27:11 +0800
-Subject: [PATCH] systemlibs: unbundle enum34
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- tensorflow/workspace.bzl                     |  1 +
- third_party/systemlibs/enum34.BUILD          | 14 ++++++++++++++
- third_party/systemlibs/syslibs_configure.bzl |  1 +
- 3 files changed, 16 insertions(+)
- create mode 100644 third_party/systemlibs/enum34.BUILD
-
-diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
-index 55d7eb9371..a53a12e720 100755
---- a/tensorflow/workspace.bzl
-+++ b/tensorflow/workspace.bzl
-@@ -346,6 +346,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
-         ],
-         sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1",
-         build_file = clean_dep("//third_party:enum34.BUILD"),
-+        system_build_file = clean_dep("//third_party/systemlibs:enum34.BUILD"),
-         strip_prefix = "enum34-1.1.6/enum",
-     )
- 
-diff --git a/third_party/systemlibs/enum34.BUILD b/third_party/systemlibs/enum34.BUILD
-new file mode 100644
-index 0000000000..de14bd5641
---- /dev/null
-+++ b/third_party/systemlibs/enum34.BUILD
-@@ -0,0 +1,14 @@
-+# Description:
-+#   enum34 provides a backport of the enum module for Python 2.
-+
-+licenses(["notice"])  # MIT
-+
-+filegroup(
-+    name = "LICENSE",
-+    visibility = ["//visibility:public"],
-+)
-+
-+py_library(
-+    name = "enum",
-+    visibility = ["//visibility:public"],
-+)
-diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl
-index a2d4123fd6..16f3b09697 100644
---- a/third_party/systemlibs/syslibs_configure.bzl
-+++ b/third_party/systemlibs/syslibs_configure.bzl
-@@ -21,6 +21,7 @@ VALID_LIBS = [
-     "curl",
-     "cython",
-     "double_conversion",
-+    "enum34_archive",
-     "flatbuffers",
-     "gast_archive",
-     "gif_archive",
--- 
-2.21.0
-
diff --git a/sci-libs/tensorflow/files/tensorflow-1.14.0-0002-install_headers-fix-paths-of-generated-headers.patch b/sci-libs/tensorflow/files/tensorflow-1.14.0-0002-install_headers-fix-paths-of-generated-headers.patch
deleted file mode 100644
index 566f28743764..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-1.14.0-0002-install_headers-fix-paths-of-generated-headers.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5176e1feb22fac2f9d4ca9d8ad261ef6893d3c76 Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Mon, 29 Jul 2019 01:17:06 +0800
-Subject: [PATCH 2/3] install_headers: fix paths of generated headers
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- tensorflow/BUILD | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/tensorflow/BUILD b/tensorflow/BUILD
-index a04ddf9f8a..1e0cc9207b 100644
---- a/tensorflow/BUILD
-+++ b/tensorflow/BUILD
-@@ -703,8 +703,8 @@ genrule(
-     mkdir $@
-     for f in $(SRCS); do
-       d="$${f%/*}"
--      d="$${d#bazel-out*genfiles/}"
--      d="$${d#*external/eigen_archive/}"
-+      d="$${d#bazel-out/*/genfiles/}"
-+      d="$${d#bazel-out/*/bin/}"
- 
-       if [[ $${d} == *local_config_* ]]; then
-         continue
-@@ -716,6 +716,9 @@ genrule(
-         if [[ $${TF_SYSTEM_LIBS:-} == *$${extname}* ]]; then
-           continue
-         fi
-+
-+        d="$${d#*external/farmhash_archive/src}"
-+        d="$${d#*external/$${extname}/}"
-       fi
- 
-       mkdir -p "$@/$${d}"
--- 
-2.21.0
-
diff --git a/sci-libs/tensorflow/files/tensorflow-1.14.0-0003-systemlibs-jsoncpp-update-header-symlinks-for-jsoncp.patch b/sci-libs/tensorflow/files/tensorflow-1.14.0-0003-systemlibs-jsoncpp-update-header-symlinks-for-jsoncp.patch
deleted file mode 100644
index 3ccdf4933732..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-1.14.0-0003-systemlibs-jsoncpp-update-header-symlinks-for-jsoncp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 22275f7dbfa2d483ed4778427b137e83144bac3d Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Fri, 2 Aug 2019 20:06:33 +0800
-Subject: [PATCH 3/3] systemlibs: jsoncpp: update header symlinks for jsoncpp
- 1.9
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- third_party/systemlibs/jsoncpp.BUILD | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/systemlibs/jsoncpp.BUILD b/third_party/systemlibs/jsoncpp.BUILD
-index 526fd0c418..7d54f9289b 100644
---- a/third_party/systemlibs/jsoncpp.BUILD
-+++ b/third_party/systemlibs/jsoncpp.BUILD
-@@ -6,6 +6,8 @@ filegroup(
- )
- 
- HEADERS = [
-+    "include/json/allocator.h",
-+    "include/json/assertions.h",
-     "include/json/autolink.h",
-     "include/json/config.h",
-     "include/json/features.h",
--- 
-2.21.0
-
diff --git a/sci-libs/tensorflow/files/tensorflow-1.14.0-0004-pkgconfig-generate-tensorflow_cc-pkg-config-entry.patch b/sci-libs/tensorflow/files/tensorflow-1.14.0-0004-pkgconfig-generate-tensorflow_cc-pkg-config-entry.patch
deleted file mode 100644
index 5e65c413e776..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-1.14.0-0004-pkgconfig-generate-tensorflow_cc-pkg-config-entry.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a8144189b257d515f1eb72a4b50098e9f4abd4ea Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Fri, 2 Aug 2019 22:21:25 +0800
-Subject: [PATCH 4/5] pkgconfig: generate tensorflow_cc pkg-config entry
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- tensorflow/c/generate-pc.sh | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/tensorflow/c/generate-pc.sh b/tensorflow/c/generate-pc.sh
-index 7184ad68fb..a4d51a1b3b 100755
---- a/tensorflow/c/generate-pc.sh
-+++ b/tensorflow/c/generate-pc.sh
-@@ -63,12 +63,26 @@ cat << EOF > tensorflow.pc
- prefix=${TF_PREFIX}
- exec_prefix=\${prefix}
- libdir=\${exec_prefix}/${LIBDIR}
--includedir=\${prefix}/include
-+includedir=\${prefix}/include/tensorflow
- 
- Name: TensorFlow
- Version: ${TF_VERSION}
- Description: Library for computation using data flow graphs for scalable machine learning
- Requires:
--Libs: -L\${libdir} -ltensorflow
-+Libs: -L\${libdir} -ltensorflow -ltensorflow_framework
-+Cflags: -I\${includedir}
-+EOF
-+
-+cat << EOF > tensorflow_cc.pc
-+prefix=${TF_PREFIX}
-+exec_prefix=\${prefix}
-+libdir=\${exec_prefix}/${LIBDIR}
-+includedir=\${prefix}/include/tensorflow
-+
-+Name: TensorFlow
-+Version: ${TF_VERSION}
-+Description: Library for computation using data flow graphs for scalable machine learning
-+Requires:
-+Libs: -L\${libdir} -ltensorflow_cc -ltensorflow_framework
- Cflags: -I\${includedir}
- EOF
--- 
-2.21.0
-
diff --git a/sci-libs/tensorflow/files/tensorflow-1.14.0-0005-gen_git_source-builtins-does-not-exist-in-python2.patch b/sci-libs/tensorflow/files/tensorflow-1.14.0-0005-gen_git_source-builtins-does-not-exist-in-python2.patch
deleted file mode 100644
index fc2e1fe92cb4..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-1.14.0-0005-gen_git_source-builtins-does-not-exist-in-python2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bdbe7a572ed248bf8e53df200ffa5e66bf77b16f Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Fri, 2 Aug 2019 22:22:53 +0800
-Subject: [PATCH 5/5] gen_git_source: builtins does not exist in python2
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- tensorflow/tools/git/gen_git_source.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tensorflow/tools/git/gen_git_source.py b/tensorflow/tools/git/gen_git_source.py
-index 6cefd3900b..4d52c1fccf 100755
---- a/tensorflow/tools/git/gen_git_source.py
-+++ b/tensorflow/tools/git/gen_git_source.py
-@@ -26,7 +26,6 @@ NOTE: this script is only used in opensource.
- from __future__ import absolute_import
- from __future__ import division
- from __future__ import print_function
--from builtins import bytes  # pylint: disable=redefined-builtin
- import argparse
- import json
- import os
--- 
-2.21.0
-
diff --git a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0003-python-deps.patch b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0003-python-deps.patch
deleted file mode 100644
index 39fc269b73bc..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0003-python-deps.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
-index fec08f66d7..9d5d1f2a3f 100644
---- a/tensorflow/tools/pip_package/setup.py
-+++ b/tensorflow/tools/pip_package/setup.py
-@@ -62,8 +62,8 @@ REQUIRED_PACKAGES = [
-     'opt_einsum >= 2.3.2',
-     'six >= 1.10.0',
-     'protobuf >= 3.6.1',
--    'tb-nightly >= 1.15.0a20190821, < 1.15.0a20190822',
--    'tf-estimator-nightly >= 1.14.0.dev2019090401, < 1.14.0.dev2019090402',
-+    'tensorboard >= 1.15.0',
-+    'tensorflow_estimator >= 1.15.0',
-     'termcolor >= 1.1.0',
-     'wrapt >= 1.11.1',
- ]
diff --git a/sci-libs/tensorflow/files/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch b/sci-libs/tensorflow/files/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch
new file mode 100644
index 000000000000..4cc2f608d5dc
--- /dev/null
+++ b/sci-libs/tensorflow/files/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch
@@ -0,0 +1,12 @@
+diff --git a/third_party/nccl/build_defs.bzl.tpl b/third_party/nccl/build_defs.bzl.tpl
+index 5719139855..5f5c3a1008 100644
+--- a/third_party/nccl/build_defs.bzl.tpl
++++ b/third_party/nccl/build_defs.bzl.tpl
+@@ -113,7 +113,6 @@ def _device_link_impl(ctx):
+             "--cmdline=--compile-only",
+             "--link",
+             "--compress-all",
+-            "--bin2c-path=%s" % bin2c.dirname,
+             "--create=%s" % tmp_fatbin.path,
+             "--embedded-fatbin=%s" % fatbin_h.path,
+         ] + images,
diff --git a/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch b/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch
new file mode 100644
index 000000000000..194cdc166510
--- /dev/null
+++ b/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch
@@ -0,0 +1,26 @@
+diff --git a/WORKSPACE b/WORKSPACE
+index babb14b509..bcdd4f46e2 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -67,7 +67,7 @@ http_archive(
+ http_archive(
+     name = "bazel_skylib",
+     sha256 = "1dde365491125a3db70731e25658dfdd3bc5dbdfd11b840b3e987ecf043c7ca0",
+-    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel-skylib.0.9.0.tar.gz"],
++    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz"],
+ )  # https://github.com/bazelbuild/bazel-skylib/releases
+ http_archive(
+     name = "com_github_apple_swift_swift_protobuf",
+diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl
+index 8619cddfdd..4b57df0cbe 100644
+--- a/third_party/systemlibs/syslibs_configure.bzl
++++ b/third_party/systemlibs/syslibs_configure.bzl
+@@ -27,7 +27,7 @@ VALID_LIBS = [
+     "grpc",
+     "hwloc",
+     "icu",
+-    "jpeg",
++    "libjpeg_turbo",
+     "jsoncpp_git",
+     "keras_applications_archive",
+     "lmdb",
diff --git a/sci-libs/tensorflow/tensorflow-1.13.1.ebuild b/sci-libs/tensorflow/tensorflow-1.13.1.ebuild
deleted file mode 100644
index a0ff5d05f137..000000000000
--- a/sci-libs/tensorflow/tensorflow-1.13.1.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-inherit bazel check-reqs cuda distutils-r1 flag-o-matic toolchain-funcs
-
-DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
-HOMEPAGE="https://www.tensorflow.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda mpi +python"
-CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
-for i in $CPU_USE_FLAGS_X86; do
-	IUSE+=" cpu_flags_x86_$i"
-done
-
-# distfiles that bazel uses for the workspace, will be copied to basel-distdir
-bazel_external_uris="
-	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
-	https://bitbucket.org/eigen/eigen/get/9f48e814419e.tar.gz -> eigen-9f48e814419e.tar.gz
-	https://github.com/abseil/abseil-cpp/archive/389ec3f906f018661a5308458d623d01f96d7b23.tar.gz -> abseil-cpp-389ec3f906f018661a5308458d623d01f96d7b23.tar.gz
-	https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
-	https://github.com/bazelbuild/rules_docker/archive/a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz -> rules_docker-a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz
-	https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip
-	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
-	https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip
-	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
-	https://github.com/nlopezgi/bazel-toolchains/archive/3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz -> bazel-toolchains-3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz
-	cuda? (
-		https://github.com/nvidia/nccl/archive/f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz -> nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz
-		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
-	)
-	python? (
-		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
-		https://mirror.bazel.build/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-python-license.rst.txt
-		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
-	)"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-		${bazel_external_uris}"
-
-# cuda-10.1 / cudnn 7.5 is not supported yet
-RDEPEND="
-	app-arch/snappy
-	dev-db/lmdb
-	dev-db/sqlite
-	dev-libs/icu
-	>=dev-libs/jsoncpp-1.8.4
-	dev-libs/libpcre
-	dev-libs/nsync
-	dev-libs/openssl:0=
-	>=dev-libs/protobuf-3.6.0:=
-	>=dev-libs/re2-0.2018.04.01
-	media-libs/giflib
-	media-libs/libjpeg-turbo
-	media-libs/libpng:0
-	>=net-libs/grpc-1.16.0
-	net-misc/curl
-	sys-libs/zlib
-	cuda? (
-		|| (
-			( =dev-util/nvidia-cuda-toolkit-10.0*[profiler] =dev-libs/cudnn-7.4* )
-			( =dev-util/nvidia-cuda-toolkit-9.2*[profiler] =dev-libs/cudnn-7.1* )
-			( =dev-util/nvidia-cuda-toolkit-9.1*[profiler] =dev-libs/cudnn-7.0* )
-		)
-	)
-	mpi? ( virtual/mpi )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/flatbuffers-1.8.0
-		dev-python/absl-py[${PYTHON_USEDEP}]
-		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
-		dev-python/gast[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/google-pasta[${PYTHON_USEDEP}]
-		>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/termcolor[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		net-libs/google-cloud-cpp
-		>=sci-libs/keras-applications-1.0.6[${PYTHON_USEDEP}]
-		>=sci-libs/keras-preprocessing-1.0.5[${PYTHON_USEDEP}]
-		>=sci-visualization/tensorboard-1.13.0[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/mock"
-PDEPEND="python? (
-		>=sci-libs/tensorflow-estimator-1.13.0[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	app-arch/unzip
-	>=dev-libs/protobuf-3.6.0
-	dev-java/java-config
-	dev-python/mock
-	dev-lang/swig
-	dev-python/cython
-	<=dev-util/bazel-0.22.0
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
-	)
-	!python? ( dev-lang/python )
-	python? (
-		dev-python/grpcio-tools
-	)"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-CHECKREQS_MEMORY="5G"
-CHECKREQS_DISK_BUILD="5G"
-
-get-cpu-flags() {
-	local i f=()
-	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
-	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
-		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
-	done
-	use cpu_flags_x86_fma3 && f+=( -mfma )
-	echo "${f[*]}"
-}
-
-pkg_setup() {
-	local num_pythons_enabled
-	num_pythons_enabled=0
-	count_impls(){
-		num_pythons_enabled=$((${num_pythons_enabled} + 1))
-	}
-	use python && python_foreach_impl count_impls
-
-	# 5 G to build C/C++ libs, 5G per python impl
-	CHECKREQS_DISK_BUILD="$((5 + 5 * $num_pythons_enabled))G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	# Only unpack the main distfile
-	unpack "${P}.tar.gz"
-	bazel_load_distfiles "${bazel_external_uris}"
-}
-
-src_prepare() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	append-flags $(get-cpu-flags)
-	bazel_setup_bazelrc
-
-	default
-	use python && python_copy_sources
-
-	use cuda && cuda_add_sandbox
-}
-
-src_configure() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	do_configure() {
-		export CC_OPT_FLAGS=" "
-		export TF_ENABLE_XLA=0
-		export TF_NEED_OPENCL_SYCL=0
-		export TF_NEED_OPENCL=0
-		export TF_NEED_COMPUTECPP=0
-		export TF_NEED_ROCM=0
-		export TF_NEED_MPI=$(usex mpi 1 0)
-		export TF_SET_ANDROID_WORKSPACE=0
-
-		if use python; then
-			python_export PYTHON_SITEDIR
-			export PYTHON_BIN_PATH="${PYTHON}"
-			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
-		else
-			export PYTHON_BIN_PATH="$(which python)"
-			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
-		fi
-
-		export TF_NEED_CUDA=$(usex cuda 1 0)
-		export TF_DOWNLOAD_CLANG=0
-		export TF_CUDA_CLANG=0
-		export TF_NEED_TENSORRT=0
-		if use cuda; then
-			export CUDA_TOOLKIT_PATH="${EPREFIX%/}/opt/cuda"
-			export CUDNN_INSTALL_PATH="${EPREFIX%/}/opt/cuda"
-			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
-			export TF_NCCL_VERSION="1"
-			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
-			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
-			einfo "Setting CUDA version: $TF_CUDA_VERSION"
-			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
-		fi
-
-		local SYSLIBS=(
-			absl_py
-			astor_archive
-			boringssl
-			com_github_googleapis_googleapis
-			com_github_googlecloudplatform_google_cloud_cpp
-			com_google_protobuf
-			com_google_protobuf_cc
-			com_googlesource_code_re2
-			curl
-			cython
-			flatbuffers
-			gast_archive
-			gif_archive
-			grpc
-			icu
-			jpeg
-			jsoncpp_git
-			keras_applications_archive
-			lmdb
-			nasm
-			nsync
-			org_sqlite
-			pcre
-			png_archive
-			protobuf_archive
-			six_archive
-			snappy
-			swig
-			termcolor_archive
-			zlib_archive
-		)
-
-		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
-		export TF_IGNORE_MAX_BAZEL_VERSION=1
-
-		# This is not autoconf
-		./configure || die
-
-		echo 'build --config=noaws --config=nohdfs --config=noignite --config=nokafka' >> .bazelrc || die
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir do_configure
-	else
-		do_configure
-	fi
-}
-
-src_compile() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	if use python; then
-		python_setup
-		BUILD_DIR="${S}-${EPYTHON/./_}"
-		cd "${BUILD_DIR}"
-	fi
-
-	# fail early if any deps are missing
-	ebazel build --nobuild \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so \
-		//tensorflow:libtensorflow_cc.so \
-		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
-
-	ebazel build \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so
-	ebazel build //tensorflow:libtensorflow_cc.so
-
-	do_compile() {
-		ebazel build //tensorflow/tools/pip_package:build_pip_package
-	}
-	BUILD_DIR="${S}"
-	cd "${BUILD_DIR}"
-	use python && python_foreach_impl run_in_build_dir do_compile
-	ebazel shutdown
-}
-
-src_install() {
-	local i j
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	do_install() {
-		einfo "Installing ${EPYTHON} files"
-		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
-		cd "${srcdir}" || die
-		esetup.py install
-
-		# libtensorflow_framework.so is in /usr/lib already
-		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
-		rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die
-		python_optimize
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir do_install
-
-		# Symlink to python-exec scripts
-		for i in "${ED}"/usr/lib/python-exec/*/*; do
-			n="${i##*/}"
-			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
-		done
-
-		python_setup
-		local BUILD_DIR="${S}-${EPYTHON/./_}"
-		cd "${BUILD_DIR}" || die
-	fi
-
-	einfo "Installing headers"
-	ebazel build //tensorflow:install_headers
-	ebazel shutdown
-	insinto /usr/include/${PN}/
-	doins -r bazel-genfiles/tensorflow/include/*
-
-	einfo "Installing libs"
-	# Generate pkg-config file
-	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
-	dolib.so bazel-bin/tensorflow/lib${PN}.so
-	dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
-
-	einstalldocs
-}
diff --git a/sci-libs/tensorflow/tensorflow-1.14.0-r2.ebuild b/sci-libs/tensorflow/tensorflow-1.14.0-r2.ebuild
deleted file mode 100644
index b30050d97da7..000000000000
--- a/sci-libs/tensorflow/tensorflow-1.14.0-r2.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-inherit bazel check-reqs cuda distutils-r1 flag-o-matic toolchain-funcs
-
-DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
-HOMEPAGE="https://www.tensorflow.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda mpi +python"
-CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
-for i in $CPU_USE_FLAGS_X86; do
-	IUSE+=" cpu_flags_x86_$i"
-done
-
-# distfiles that bazel uses for the workspace, will be copied to basel-distdir
-bazel_external_uris="
-	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
-	https://bitbucket.org/eigen/eigen/get/a0d250e79c79.tar.gz -> eigen-a0d250e79c79.tar.gz
-	https://github.com/abseil/abseil-cpp/archive/daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz -> abseil-cpp-daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz
-	https://github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz -> bazel-skylib-0.6.0.tar.gz
-	https://github.com/bazelbuild/rules_closure/archive/cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz -> bazelbuild-rules_closure-cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz
-	https://github.com/bazelbuild/rules_swift/releases/download/0.9.0/rules_swift.0.9.0.tar.gz -> bazelbuild-rules_swift.0.9.0.tar.gz
-	https://github.com/bazelbuild/rules_docker/archive/b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz -> rules_docker-b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz
-	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
-	https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip
-	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
-	https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz
-	cuda? (
-		https://github.com/nvidia/nccl/archive/f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz -> nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz
-		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
-	)
-	python? (
-		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
-		http://mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.14.0-python-license.rst.txt
-		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
-	)"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
-		${bazel_external_uris}"
-
-RDEPEND="
-	app-arch/snappy
-	dev-db/lmdb
-	dev-db/sqlite
-	dev-libs/icu
-	>=dev-libs/jsoncpp-1.9
-	dev-libs/libpcre
-	dev-libs/nsync
-	dev-libs/openssl:0=
-	>=dev-libs/protobuf-3.6.0:=
-	>=dev-libs/re2-0.2018.04.01
-	media-libs/giflib
-	media-libs/libjpeg-turbo
-	media-libs/libpng:0
-	>=net-libs/grpc-1.22.0
-	net-misc/curl
-	sys-libs/zlib
-	>=sys-apps/hwloc-2
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
-		dev-libs/cudnn
-	)
-	mpi? ( virtual/mpi )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/flatbuffers-1.8.0
-		dev-python/absl-py[${PYTHON_USEDEP}]
-		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
-		dev-python/gast[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/google-pasta[${PYTHON_USEDEP}]
-		>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/termcolor[${PYTHON_USEDEP}]
-		>=dev-python/grpcio-1.22.0[${PYTHON_USEDEP}]
-		>=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
-		>=net-libs/google-cloud-cpp-0.10.0
-		>=sci-libs/keras-applications-1.0.6[${PYTHON_USEDEP}]
-		>=sci-libs/keras-preprocessing-1.0.5[${PYTHON_USEDEP}]
-		>=sci-visualization/tensorboard-1.13.0[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/mock"
-PDEPEND="python? (
-		>=sci-libs/tensorflow-estimator-1.13.0[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	app-arch/unzip
-	>=dev-libs/protobuf-3.6.0
-	dev-java/java-config
-	dev-python/mock
-	dev-lang/swig
-	dev-python/cython
-	|| (
-		=dev-util/bazel-0.24*
-		=dev-util/bazel-0.26*
-		=dev-util/bazel-0.27*
-	)
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
-	)
-	!python? ( dev-lang/python )
-	python? (
-		>=dev-python/grpcio-tools-1.22.0
-	)"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-CHECKREQS_MEMORY="5G"
-CHECKREQS_DISK_BUILD="5G"
-
-get-cpu-flags() {
-	local i f=()
-	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
-	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
-		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
-	done
-	use cpu_flags_x86_fma3 && f+=( -mfma )
-	echo "${f[*]}"
-}
-
-pkg_setup() {
-	local num_pythons_enabled
-	num_pythons_enabled=0
-	count_impls(){
-		num_pythons_enabled=$((${num_pythons_enabled} + 1))
-	}
-	use python && python_foreach_impl count_impls
-
-	# 5 G to build C/C++ libs, 5G per python impl
-	CHECKREQS_DISK_BUILD="$((5 + 5 * $num_pythons_enabled))G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	# Only unpack the main distfile
-	unpack "${P}.tar.gz"
-	unpack tensorflow-patches-${PVR}.tar.bz2
-	bazel_load_distfiles "${bazel_external_uris}"
-}
-
-src_prepare() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	append-flags $(get-cpu-flags)
-	bazel_setup_bazelrc
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	default
-	use python && python_copy_sources
-
-	use cuda && cuda_add_sandbox
-}
-
-src_configure() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	do_configure() {
-		export CC_OPT_FLAGS=" "
-		export TF_ENABLE_XLA=0
-		export TF_NEED_OPENCL_SYCL=0
-		export TF_NEED_OPENCL=0
-		export TF_NEED_COMPUTECPP=0
-		export TF_NEED_ROCM=0
-		export TF_NEED_MPI=$(usex mpi 1 0)
-		export TF_SET_ANDROID_WORKSPACE=0
-
-		if use python; then
-			python_export PYTHON_SITEDIR
-			export PYTHON_BIN_PATH="${PYTHON}"
-			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
-		else
-			export PYTHON_BIN_PATH="$(which python)"
-			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
-		fi
-
-		export TF_NEED_CUDA=$(usex cuda 1 0)
-		export TF_DOWNLOAD_CLANG=0
-		export TF_CUDA_CLANG=0
-		export TF_NEED_TENSORRT=0
-		if use cuda; then
-			export TF_CUDA_PATHS="${EPREFIX%/}/opt/cuda"
-			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
-			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
-			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
-			einfo "Setting CUDA version: $TF_CUDA_VERSION"
-			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
-		fi
-
-		local SYSLIBS=(
-			absl_py
-			astor_archive
-			boringssl
-			com_github_googleapis_googleapis
-			com_github_googlecloudplatform_google_cloud_cpp
-			com_google_protobuf
-			com_google_protobuf_cc
-			com_googlesource_code_re2
-			curl
-			cython
-			double_conversion
-			enum34_archive
-			flatbuffers
-			gast_archive
-			gif_archive
-			grpc
-			hwloc
-			icu
-			jpeg
-			jsoncpp_git
-			keras_applications_archive
-			lmdb
-			nasm
-			nsync
-			org_sqlite
-			pasta
-			pcre
-			png_archive
-			protobuf_archive
-			six_archive
-			snappy
-			swig
-			termcolor_archive
-			wrapt
-			zlib_archive
-		)
-
-		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
-		export TF_IGNORE_MAX_BAZEL_VERSION=1
-
-		# This is not autoconf
-		./configure || die
-
-		echo 'build --config=noaws --config=nohdfs --config=noignite --config=nokafka' >> .bazelrc || die
-		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
-		echo 'build --incompatible_no_support_tools_in_action_inputs=false' >> .bazelrc || die
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir do_configure
-	else
-		do_configure
-	fi
-}
-
-src_compile() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	if use python; then
-		python_setup
-		BUILD_DIR="${S}-${EPYTHON/./_}"
-		cd "${BUILD_DIR}"
-	fi
-
-	# fail early if any deps are missing
-	ebazel build --nobuild \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so \
-		//tensorflow:libtensorflow_cc.so \
-		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
-
-	ebazel build \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so
-	ebazel build //tensorflow:libtensorflow_cc.so
-
-	do_compile() {
-		ebazel build //tensorflow/tools/pip_package:build_pip_package
-	}
-	BUILD_DIR="${S}"
-	cd "${BUILD_DIR}"
-	use python && python_foreach_impl run_in_build_dir do_compile
-	ebazel shutdown
-}
-
-src_install() {
-	local i j
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	do_install() {
-		einfo "Installing ${EPYTHON} files"
-		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
-		cd "${srcdir}" || die
-		esetup.py install
-
-		# libtensorflow_framework.so is in /usr/lib already
-		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
-		rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die
-		python_optimize
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir do_install
-
-		# Symlink to python-exec scripts
-		for i in "${ED}"/usr/lib/python-exec/*/*; do
-			n="${i##*/}"
-			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
-		done
-
-		python_setup
-		local BUILD_DIR="${S}-${EPYTHON/./_}"
-		cd "${BUILD_DIR}" || die
-	fi
-
-	einfo "Installing headers"
-	ebazel build //tensorflow:install_headers
-	ebazel shutdown
-	insinto /usr/include/${PN}/
-	doins -r bazel-genfiles/tensorflow/include/*
-
-	einfo "Installing libs"
-	# Generate pkg-config file
-	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc ${PN}_cc.pc
-
-	for l in libtensorflow{,_framework,_cc}.so; do
-		dolib.so bazel-bin/tensorflow/${l}
-		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1)
-		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3)
-	done
-
-	einstalldocs
-}
diff --git a/sci-libs/tensorflow/tensorflow-1.15.0_rc0.ebuild b/sci-libs/tensorflow/tensorflow-1.15.0.ebuild
index e9f0fe1e0ab1..5508bef6fa22 100644
--- a/sci-libs/tensorflow/tensorflow-1.15.0_rc0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.15.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,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="
 	http://www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz
-	https://bitbucket.org/eigen/eigen/get/8071cda5714d.tar.gz -> eigen-8071cda5714d.tar.gz
+	https://bitbucket.org/eigen/eigen/get/49177915a14a.tar.gz -> eigen-49177915a14a.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-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz
@@ -56,8 +56,9 @@ RDEPEND="
 	app-arch/snappy
 	dev-db/lmdb
 	dev-db/sqlite
+	dev-libs/double-conversion
 	dev-libs/icu
-	>=dev-libs/jsoncpp-1.9
+	~dev-libs/jsoncpp-1.9.1
 	dev-libs/libpcre
 	dev-libs/nsync
 	dev-libs/openssl:0=
@@ -92,14 +93,12 @@ RDEPEND="
 		>=net-libs/google-cloud-cpp-0.10.0
 		>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
 		>=sci-libs/keras-preprocessing-1.0.5[${PYTHON_USEDEP}]
-		>=sci-visualization/tensorboard-1.15.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*')
-		$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' 'python2*')
+		=sci-visualization/tensorboard-1*[${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
 	dev-python/mock"
 PDEPEND="python? (
-		>=sci-libs/tensorflow-estimator-1.15.0[${PYTHON_USEDEP}]
+		=sci-libs/tensorflow-estimator-1*[${PYTHON_USEDEP}]
 	)"
 BDEPEND="
 	app-arch/unzip
@@ -110,7 +109,6 @@ BDEPEND="
 	dev-python/cython
 	|| (
 		=dev-util/bazel-0.24*
-		=dev-util/bazel-0.26*
 		=dev-util/bazel-0.27*
 	)
 	cuda? (
@@ -127,7 +125,6 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch"
 	"${FILESDIR}/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch"
-	"${FILESDIR}/tensorflow-1.15.0_rc0-0003-python-deps.patch"
 )
 DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
 CHECKREQS_MEMORY="5G"
@@ -168,6 +165,10 @@ src_prepare() {
 	append-flags $(get-cpu-flags)
 	bazel_setup_bazelrc
 
+	if ver_test "$(cuda_toolkit_version)" -ge "10.2"; then
+		eapply "${FILESDIR}/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch"
+	fi
+
 	default
 	use python && python_copy_sources
 
@@ -207,6 +208,18 @@ src_configure() {
 			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
 			einfo "Setting CUDA version: $TF_CUDA_VERSION"
 			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+
+			if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then
+				ewarn "WARNING: Tensorflow is being built with its default CUDA compute capabilities: 3.5 and 7.0."
+				ewarn "These may not be optimal for your GPU."
+				ewarn ""
+				ewarn "To configure Tensorflow with the CUDA compute capability that is optimal for your GPU,"
+				ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow."
+				ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5"
+				ewarn ""
+				ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
+				ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
+			fi
 		fi
 
 		local SYSLIBS=(
diff --git a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild b/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
index e2067d413e56..e70af54032ea 100644
--- a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
 
@@ -56,8 +56,9 @@ RDEPEND="
 	app-arch/snappy
 	dev-db/lmdb
 	dev-db/sqlite
+	dev-libs/double-conversion
 	dev-libs/icu
-	>=dev-libs/jsoncpp-1.9
+	~dev-libs/jsoncpp-1.9.1
 	dev-libs/libpcre
 	dev-libs/nsync
 	dev-libs/openssl:0=
@@ -93,8 +94,6 @@ RDEPEND="
 		>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
 		>=sci-libs/keras-preprocessing-1.0.5[${PYTHON_USEDEP}]
 		>=sci-visualization/tensorboard-2.0.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*')
-		$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' 'python2*')
 	)"
 DEPEND="${RDEPEND}
 	dev-python/mock"
@@ -110,7 +109,6 @@ BDEPEND="
 	dev-python/cython
 	|| (
 		=dev-util/bazel-0.24*
-		=dev-util/bazel-0.26*
 		=dev-util/bazel-0.27*
 	)
 	cuda? (
@@ -209,6 +207,18 @@ src_configure() {
 			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
 			einfo "Setting CUDA version: $TF_CUDA_VERSION"
 			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+
+			if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then
+				ewarn "WARNING: Tensorflow is being built with its default CUDA compute capabilities: 3.5 and 7.0."
+				ewarn "These may not be optimal for your GPU."
+				ewarn ""
+				ewarn "To configure Tensorflow with the CUDA compute capability that is optimal for your GPU,"
+				ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow."
+				ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5"
+				ewarn ""
+				ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
+				ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
+			fi
 		fi
 
 		local SYSLIBS=(
diff --git a/sci-libs/tensorflow/tensorflow-1.14.0-r1.ebuild b/sci-libs/tensorflow/tensorflow-2.1.0_rc0.ebuild
index 8982469fb675..1cd5f24b7610 100644
--- a/sci-libs/tensorflow/tensorflow-1.14.0-r1.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.1.0_rc0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.tensorflow.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cuda mpi +python"
+IUSE="cuda mpi +python xla"
 CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
 for i in $CPU_USE_FLAGS_X86; do
 	IUSE+=" cpu_flags_x86_$i"
@@ -24,24 +24,30 @@ done
 
 # distfiles that bazel uses for the workspace, will be copied to basel-distdir
 bazel_external_uris="
-	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
-	https://bitbucket.org/eigen/eigen/get/a0d250e79c79.tar.gz -> eigen-a0d250e79c79.tar.gz
-	https://github.com/abseil/abseil-cpp/archive/daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz -> abseil-cpp-daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz
-	https://github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz -> bazel-skylib-0.6.0.tar.gz
-	https://github.com/bazelbuild/rules_closure/archive/cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz -> bazelbuild-rules_closure-cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz
-	https://github.com/bazelbuild/rules_swift/releases/download/0.9.0/rules_swift.0.9.0.tar.gz -> bazelbuild-rules_swift.0.9.0.tar.gz
-	https://github.com/bazelbuild/rules_docker/archive/b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz -> rules_docker-b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz
+	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://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
+	https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz
+	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip
+	https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz
+	https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
+	https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz -> bazelbuild-rules_swift.0.12.1.tar.gz
 	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
 	https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip
 	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
-	https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz
+	https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz
+	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
+	https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz
+	https://github.com/llvm/llvm-project/archive/ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz -> llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz
 	cuda? (
-		https://github.com/nvidia/nccl/archive/f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz -> nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz
+		https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz
 		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
 	)
 	python? (
 		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
-		http://mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.14.0-python-license.rst.txt
+		https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt
 		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
 	)"
 
@@ -52,13 +58,14 @@ RDEPEND="
 	app-arch/snappy
 	dev-db/lmdb
 	dev-db/sqlite
+	dev-libs/double-conversion
 	dev-libs/icu
-	>=dev-libs/jsoncpp-1.9
+	~dev-libs/jsoncpp-1.9.1
 	dev-libs/libpcre
 	dev-libs/nsync
 	dev-libs/openssl:0=
-	>=dev-libs/protobuf-3.6.0:=
-	>=dev-libs/re2-0.2018.04.01
+	>=dev-libs/protobuf-3.8.0:=
+	>=dev-libs/re2-0.2019.06.01
 	media-libs/giflib
 	media-libs/libjpeg-turbo
 	media-libs/libpng:0
@@ -77,41 +84,43 @@ RDEPEND="
 		dev-python/absl-py[${PYTHON_USEDEP}]
 		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
 		dev-python/gast[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
 		dev-python/google-pasta[${PYTHON_USEDEP}]
-		>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
+		dev-python/opt-einsum[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.8.0[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/termcolor[${PYTHON_USEDEP}]
 		>=dev-python/grpcio-1.22.0[${PYTHON_USEDEP}]
 		>=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
 		>=net-libs/google-cloud-cpp-0.10.0
-		>=sci-libs/keras-applications-1.0.6[${PYTHON_USEDEP}]
-		>=sci-libs/keras-preprocessing-1.0.5[${PYTHON_USEDEP}]
-		>=sci-visualization/tensorboard-1.13.0[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
+		>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
+		>=sci-libs/keras-preprocessing-1.1.0[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-2.0.0[${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
-	dev-python/mock"
+	python? (
+		dev-python/mock
+		dev-python/setuptools
+	)"
 PDEPEND="python? (
-		>=sci-libs/tensorflow-estimator-1.13.0[${PYTHON_USEDEP}]
+		>=sci-libs/tensorflow-estimator-2.0.0[${PYTHON_USEDEP}]
 	)"
 BDEPEND="
 	app-arch/unzip
-	>=dev-libs/protobuf-3.6.0
+	>=dev-libs/protobuf-3.8.0
 	dev-java/java-config
-	dev-python/mock
 	dev-lang/swig
-	dev-python/cython
 	|| (
-		=dev-util/bazel-0.24*
-		=dev-util/bazel-0.26*
 		=dev-util/bazel-0.27*
+		=dev-util/bazel-0.29*
 	)
 	cuda? (
 		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
 	)
 	!python? ( dev-lang/python )
 	python? (
+		dev-python/cython
+		dev-python/mock
 		>=dev-python/grpcio-tools-1.22.0
 	)"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -119,15 +128,12 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}/tensorflow-1.14.0-0001-systemlibs-unbundle-enum34.patch"
-	"${FILESDIR}/tensorflow-1.14.0-0002-install_headers-fix-paths-of-generated-headers.patch"
-	"${FILESDIR}/tensorflow-1.14.0-0003-systemlibs-jsoncpp-update-header-symlinks-for-jsoncp.patch"
-	"${FILESDIR}/tensorflow-1.14.0-0004-pkgconfig-generate-tensorflow_cc-pkg-config-entry.patch"
-	"${FILESDIR}/tensorflow-1.14.0-0005-gen_git_source-builtins-does-not-exist-in-python2.patch"
+	"${FILESDIR}/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch"
+	"${FILESDIR}/tensorflow-2.1.0-external_libs.patch"
 )
 DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
 CHECKREQS_MEMORY="5G"
-CHECKREQS_DISK_BUILD="5G"
+CHECKREQS_DISK_BUILD="10G"
 
 get-cpu-flags() {
 	local i f=()
@@ -140,6 +146,10 @@ get-cpu-flags() {
 }
 
 pkg_setup() {
+	ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities"
+	ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:"
+	ewarn "https://www.tensorflow.org/guide/migrate"
+
 	local num_pythons_enabled
 	num_pythons_enabled=0
 	count_impls(){
@@ -147,8 +157,8 @@ pkg_setup() {
 	}
 	use python && python_foreach_impl count_impls
 
-	# 5 G to build C/C++ libs, 5G per python impl
-	CHECKREQS_DISK_BUILD="$((5 + 5 * $num_pythons_enabled))G"
+	# 10G to build C/C++ libs, 5G per python impl
+	CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G"
 	check-reqs_pkg_setup
 }
 
@@ -164,6 +174,10 @@ src_prepare() {
 	append-flags $(get-cpu-flags)
 	bazel_setup_bazelrc
 
+	if ver_test "$(cuda_toolkit_version)" -ge "10.2"; then
+		eapply "${FILESDIR}/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch"
+	fi
+
 	default
 	use python && python_copy_sources
 
@@ -175,7 +189,7 @@ src_configure() {
 
 	do_configure() {
 		export CC_OPT_FLAGS=" "
-		export TF_ENABLE_XLA=0
+		export TF_ENABLE_XLA=$(usex xla 1 0)
 		export TF_NEED_OPENCL_SYCL=0
 		export TF_NEED_OPENCL=0
 		export TF_NEED_COMPUTECPP=0
@@ -203,8 +217,21 @@ src_configure() {
 			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
 			einfo "Setting CUDA version: $TF_CUDA_VERSION"
 			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+
+			if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then
+				ewarn "WARNING: Tensorflow is being built with its default CUDA compute capabilities: 3.5 and 7.0."
+				ewarn "These may not be optimal for your GPU."
+				ewarn ""
+				ewarn "To configure Tensorflow with the CUDA compute capability that is optimal for your GPU,"
+				ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow."
+				ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5"
+				ewarn ""
+				ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
+				ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
+			fi
 		fi
 
+		# com_googlesource_code_re2 weird branch using absl, doesnt work with released re2
 		local SYSLIBS=(
 			absl_py
 			astor_archive
@@ -212,29 +239,28 @@ src_configure() {
 			com_github_googleapis_googleapis
 			com_github_googlecloudplatform_google_cloud_cpp
 			com_google_protobuf
-			com_google_protobuf_cc
-			com_googlesource_code_re2
 			curl
 			cython
 			double_conversion
 			enum34_archive
 			flatbuffers
+			functools32_archive
 			gast_archive
-			gif_archive
+			gif
 			grpc
 			hwloc
 			icu
-			jpeg
+			libjpeg_turbo
 			jsoncpp_git
 			keras_applications_archive
 			lmdb
 			nasm
 			nsync
+			opt_einsum_archive
 			org_sqlite
 			pasta
 			pcre
-			png_archive
-			protobuf_archive
+			png
 			six_archive
 			snappy
 			swig
@@ -249,7 +275,7 @@ src_configure() {
 		# This is not autoconf
 		./configure || die
 
-		echo 'build --config=noaws --config=nohdfs --config=noignite --config=nokafka' >> .bazelrc || die
+		echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die
 		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
 		echo 'build --incompatible_no_support_tools_in_action_inputs=false' >> .bazelrc || die
 	}
@@ -305,6 +331,7 @@ src_install() {
 		# libtensorflow_framework.so is in /usr/lib already
 		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
 		rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die
+		rm -f "${D}/${PYTHON_SITEDIR}"/${PN}_core/lib${PN}_framework.so* || die
 		python_optimize
 	}
 
diff --git a/sci-libs/tnt/Manifest b/sci-libs/tnt/Manifest
index 28f6b51ba894..0a8334aff5d9 100644
--- a/sci-libs/tnt/Manifest
+++ b/sci-libs/tnt/Manifest
@@ -1,6 +1,3 @@
-DIST tnt120doc.zip 115063 BLAKE2B b454521b323f4fa7fd689d79ac8fc389cf59b0ee25c1e04f28e7e42a1403e194990b38e5f68837dc0610c68489921810cfcd4e009d87be54d697a5fb9d2ba06a SHA512 c18677ea319bb5485b91c4bcaa09a26bc00a83f0d41b6e1028e57d4924a4524fb7a818169e591c04d71eb03787fc8e4895d76b49721ae8efa4309e3a6be19385
-DIST tnt126.zip 28784 BLAKE2B 46a44797cf03e8a73e719e2dcbb1091dbaec62e88c1b86761e5d9930b8b39ec0cb301f817656bf6bef37874bba89512c516a6977dc03344635a0fe79143c7da7 SHA512 09e4c27cdd0619b25c02dfed6ab8a2f121d002949dee4d1303968df4688196395871ad2ade9e4010cef72f9c6b5c9c02888566d44454949121ad3094e06651f6
 DIST tnt_3_0_12.zip 50166 BLAKE2B 8ecefb46e6ab577cce3881a829d88c8eb61c10ba4a7f33d4408555ac9c76b3b11d2442255920336f2a7fd6eda508d3a4f420e66a0821ae8276fddc78f013e8b4 SHA512 3be00d37880ffc191022db13993c3946e913e92409cef1ff5f53b74cab5ea09782d131056d89bcbd0990939967b5d93ebe93e8a7db956be2fb9e8a7356dafbfd
-EBUILD tnt-1.2.6.ebuild 635 BLAKE2B 722b17878ccf6d375dcbb47b307107747eeb22b37eaaa84e5fb2162ab295054fa525238312cab25f76f0944ab1f49d3ea131e98a7c36d024180da91d915207db SHA512 fd35902adf25e42f09207559fbc1bebf415b609130d63adcc71ef9e2dcc69fb3fe8a034dc3cafcc76dbf07d15125ab0cc79c64785795f7ec4c141dcbff7e5186
-EBUILD tnt-3.0.12.ebuild 548 BLAKE2B 297fdf113f2b56589683972e4af1f449f281bed39223d87cc028e8442b21da689077289c53337b5ab62dffc527f13f13f15b2b6954d85d6de6548683af45c891 SHA512 10300c5eb64ac9603a2aee519d2542f7ad7236b414c4b2377561baf397a1059bd8fcd03d663191fa4def3a962b998da3b9b24ef34eba466a519319eb4e0c699b
+EBUILD tnt-3.0.12.ebuild 468 BLAKE2B 1a9172265bb6dcdafcab7b3bf4062b9daa49a55941d14be1910ab9f69068c55cc7071b971b3ffaf715751b2a72ae628be80429cfcbd76371c5edc441b0370acd SHA512 344d935b84cdb9a8639490d4cb0ace4dba4a8b3f806b0df7b1cf640fc03ab5880210db31d89bb03cd072d3af69661188a1685a2b2eea4dcceb09d2becb1cb14e
 MISC metadata.xml 772 BLAKE2B b9c0850d5a8ed470472cbe42d302d144741d0a9ff97842bb33880cebeb50f85ca6bc48fd7d0f16c891f3e0eaef2bb23b1245cd0e666652d1d27fbdcbd4d4351d SHA512 f6dc74a205271d244c31c2b4533ea35498aaa4489d81990b52e2a1e8be75b8f02eb7e70ccf0d92af3638c2a11a9f8102e6b973aa70ddc87507d9f7a7bf5eb191
diff --git a/sci-libs/tnt/tnt-1.2.6.ebuild b/sci-libs/tnt/tnt-1.2.6.ebuild
deleted file mode 100644
index 344b36833caa..000000000000
--- a/sci-libs/tnt/tnt-1.2.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit versionator
-
-MYP="${PN}$(replace_all_version_separators '')"
-DOCPV=120
-
-DESCRIPTION="Template Numerical Toolkit: C++ headers for array and matrices"
-HOMEPAGE="http://math.nist.gov/tnt/"
-SRC_URI="http://math.nist.gov/tnt/${MYP}.zip
-	doc? ( http://math.nist.gov/tnt/${PN}${DOCPV}doc.zip )"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/include
-	doins *.h
-	use doc && dohtml html/*
-}
diff --git a/sci-libs/tnt/tnt-3.0.12.ebuild b/sci-libs/tnt/tnt-3.0.12.ebuild
index 2a622ddfa0c2..9de7e6dca2ee 100644
--- a/sci-libs/tnt/tnt-3.0.12.ebuild
+++ b/sci-libs/tnt/tnt-3.0.12.ebuild
@@ -1,28 +1,22 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit versionator
-
-MYP="${PN}_$(replace_all_version_separators '_')"
+MY_P="${PN}_$(ver_rs 1-3 '_')"
 
 DESCRIPTION="Template Numerical Toolkit: C++ headers for array and matrices"
 HOMEPAGE="http://math.nist.gov/tnt/"
-SRC_URI="http://math.nist.gov/tnt/${MYP}.zip"
+SRC_URI="http://math.nist.gov/tnt/${MY_P}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${PN}"
 
 src_install() {
-	insinto /usr/include
-	doins *.h
+	doheader *.h
 }
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 79837a526cdc..ccf4f0e32092 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -1,8 +1,10 @@
 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
 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
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-1.5.1.ebuild b/sci-libs/votca-tools/votca-tools-1.5.1.ebuild
new file mode 100644
index 000000000000..62f306992949
--- /dev/null
+++ b/sci-libs/votca-tools/votca-tools-1.5.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils eutils multilib
+
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	S="${WORKDIR}/${P#votca-}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Votca tools library"
+HOMEPAGE="http://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc +fftw sqlite"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-cpp/eigen-3.3
+	fftw? ( sci-libs/fftw:3.0 )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.7.6.1[dot] )
+	>=app-text/txt2tags-2.5
+	virtual/pkgconfig"
+
+DOCS=( NOTICE )
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_FFTW=$(usex fftw)
+		-DWITH_SQLITE3=$(usex sqlite)
+		-DWITH_RC_FILES=OFF
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use doc; then
+		cd "${CMAKE_BUILD_DIR}"
+		cmake-utils_src_make html
+		dodoc -r share/doc/html
+	fi
+}
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 6da8f8e189de..99549764a64c 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,20 +1,6 @@
-AUX vtk-6.1.0-freetype.patch 1159 BLAKE2B 4dca5ddc3a6d7b9cb14a5a2c1d59ce41e8922467ceb07665358aed809481de7d7dd01b1a08b3c302dca53e7fba63ab0b5c10ff4e12420df656ef6c678e386f8f SHA512 c4e0328d1c7c1a1842de0f70ec93fe28e5537d9add29d4e76243f91138b97e993d5ef02a80fece8cc3476086772bb2f3e97ff6c8ce18a4ffedced90ad98199e0
-AUX vtk-6.1.0-gcc67.patch 1166 BLAKE2B 54a83d81ce2683ebce9616c924aa29cdc8e6614b0e654b2b6d95f6dcdb6d03e9c07c7ad6ea902d2c0155bda5b5dde50853a3d46fa6a3a0cd7ca89862c942a618 SHA512 c8190a0d121564b192a6e2075a31ac494ba735d6092827bcc5370319213c9780c3044179b0389d0056b0513c9ec919ba5da76954e7cd0e4d6617335ac8602609
-AUX vtk-6.1.0-gdal2.patch 1132 BLAKE2B 79a3386a0cff34c38a31b0685a0660f44b7d7e91443fa89ab2337dacb3f40893372687cadb312a7189e11e70ac048ecbac1a2144d6324c98a4ed579dd0b3b44e SHA512 5bd4414ca8892f0b290dddce2b7a98d64ab4bc68818ac168d1170ca4ef7212f908ec8b3d1f84ec0aa131e18c20cfd8584f5b44cd5fbb4019b9bb9e0b4a4f2a47
-AUX vtk-6.1.0-glext.patch 609 BLAKE2B 6433fb3d6766a9b4801779d3e435fbd933c8ef8d79bc6db0f0bc735d8c2449b95237e147c0062f832aafafee7194f07b3c18dbde3fbab6dfd7480c7bed447d91 SHA512 a2cfb0801742fded8984dfe849d3c2da9796c6c87a2bbe2eac622f4b91abe1c142fd97d94bbe248ff222fae85a80db8d6ee100de1022049ef6c9a82aaebbb9d5
-AUX vtk-6.1.0-install.patch 968 BLAKE2B e7618cf685f60a2733869549c4aa001044303215bc6a95fa408e6c7e6640377558c166458ff1baf478023209f859f4835a48acde40b21aaece69f66149dbdb64 SHA512 e6f7e5436c6efca920bd7f9b724c219b7a34a357f01fb813bf168aefc1727b9c2d4af6cb380b4b6b70e4b091557f866761499a53e7e1c07a665d06aacd2acdb6
-AUX vtk-6.1.0-memset.patch 5216 BLAKE2B 301ac84c0e439c14228665c8230d3f843c919b0a2cbc0b83007574e8c22bcd986718be81795f114ceca2a6a627570678a21fb057e8bcaf6e5dc2a762486dc534 SHA512 8789198bcb9c23af290c6b2b90d7277e546fe34e8aed03d1644d1edbec1c523801f3cc325dbb3bc8606ed6e3c84ea2a45fe1f05208366a0a3260e9b73cd96691
-AUX vtk-6.1.0-netcdf.patch 994 BLAKE2B 9b24685987b2a76f32cbe7c107f5c5ac580ca7d6616d959caeedc2b3ac0699b9f1b5b79a26fc1cc61818c3712fb40d9246dea2c3bb221e0fbc5db5a61707406d SHA512 0f0b3493270efbf33a13abb7f38637473d48d15efe793f7148c13f5aeb77ac5534340d42f87451cd81ed2d7cce4ca6da9a71e065a7780e84f30a710d7368b488
-AUX vtk-6.1.0-system.patch 1307 BLAKE2B f89f7e4946c94a907ef7b74c1ca1e35106ece486c944f932b6d19febe2ecb08aee6cd11719a121b3a47a978969724aff2d16c2212151bf6fd50cb7c19ab22957 SHA512 1fae8aecaf2344b5517e9b29ea2cb8b834af8a22be88535ec8bf9ec624625ea3f2ca820945a3d3f7c896ca080a7ded59ca7a601c50f970e59c3a8db691f060b3
-AUX vtk-6.1.0-web.patch 776 BLAKE2B e92d3abb96161f0d955c3c653ce67a2427538fcabcb3b492449d086ec35b545c693231fa9bbb02f27ca96395bcd4c73e6741318625ad23c5105fa3fc8cfbf671 SHA512 5489096a0a4e5854cd426a75a0713f53a5c0daab7a9069c249b65d4a34cc8ff18737267f16ee8fbb2a07b7e987525b93e1eec5a23f78ac1b3f893c5847761bc5
-DIST VTK-6.1.0.tar.gz 27608882 BLAKE2B 10cef62e2fc3bf7109f7b3e9858721850243a7798fe885c6a584dba9a6f74c526c58b009f2cba6c56512a6ec159dbf29ac965f9ae6533128f3a20e7224bdddc0 SHA512 3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc
 DIST VTK-8.1.0.tar.gz 33482506 BLAKE2B 82aecb497847254595f20294120ae793432348fc3fd881924b52c004335d9bae3d052f168bbe291b307af67845a80e740d8996d36991c38fbec7213438e2395d SHA512 3d5efd1a18939e21045278a387817421a98919cbaaa6ed65167c16999e1bb882b849b698d201a294da9920dbc96d1fbc987013462b1c7cbb12920bfff9b6f2a3
-DIST VTKData-6.1.0.tar.gz 94452190 BLAKE2B 55e1af454f1c54c0a182552c41e08549781532b510bf29cb28fcd12510c1cef2c4e09274507d658b700f22d0da1961d7b4e6dc289d9ee39c6b1e1fac348ba153 SHA512 4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65
 DIST VTKData-8.1.0.tar.gz 282986441 BLAKE2B 885f35c5386cc5db8db905a868a3ad79c246f1b0e41a3e5b81312b1f3de90483a1e34886d4764c60fe8006acaace2405b25acf047ec0e25a957f7a2d563d3380 SHA512 0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047
-DIST VTKLargeData-6.1.0.tar.gz 166019220 BLAKE2B 94180c9fd73655cbc08914a2309925d40ac2c99ce8652a7db37bb3ddc3b9dd654e8286be97a764c9029a6de21ae847f1f2c46c07ec974e5da802f23a7d277836 SHA512 3663a124c16448882ad3aef0fb15f55f438863ba2176106803ad9c6fb561325accd74f2675d8b6e1de791babfa8b992e516d87640efedda4a6daeb5affc2cf3f
 DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c9e611b8655f077bb85e6ab850fb0cfd79f4722a0486f73eafcde2cd77d6be305201857f3e729b1f60f710c45bcf0bb63f SHA512 9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31
-DIST vtkDocHtml-6.1.0.tar.gz 230827905 BLAKE2B a323728450c5054d715dac137e54ed9b901019af595ea3abca9e7865d0b420d7b5f87789a9489df116f982633984d74721153dc3ab735e97455f64c2ffc4aa95 SHA512 fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60
 DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c
-EBUILD vtk-6.1.0-r4.ebuild 10480 BLAKE2B 72dc967f163fed46bcbe7dc0a2b4de89840c95134a5b89522ed2d8962873a4ee54d7e2a0a9dc9814f003e3aa5d206e39ec77b799690b7ba8af1fec5d874cef48 SHA512 b299bee838d2fac4b44d56039856a326388186bac7d7c154bc4b144db66df1c04b9c74db3039f6e2ff8d3b25714a3e37d097e47a573b4a1851be09acbe161794
 EBUILD vtk-8.1.0-r3.ebuild 8941 BLAKE2B 46621f53b88cd7577f70f8921a583921791b730200e496f2dd846e2b18cf42d19b25826c244141d736e632a0bc7653e7a2e4076faf087276b2cf2e1ae295d766 SHA512 403715ad2de469165775e506968061965216f90bf36ee51e01f7165073882f14e0799324d7d0823f741567f182c78447634bb3a2bb653e341254cb900aa27769
-MISC metadata.xml 1122 BLAKE2B 8dbb591a7a7058bb373268f588fab8e1d4a16840dd92cb2c288222e091a84bbd7c30bac38ed289f7aa4fcd7fb002438f13ce4046e27822271a34d0bb5410fb39 SHA512 1415d25d21fb73f3eebe0401a1a1d022ace5f4a95e1e522209a2010d98b70a721abb6c5214a5bbe8d68df889b439229c618f7d5fa0671fd98eefb572a4b1bae0
+MISC metadata.xml 988 BLAKE2B 2533eda3936361d835dba2e30f1b1a19484facc289603d82b6c2012ee242e7778b1080d7136584c08113d7a82e0742d7bb2373984667301a4c7d52b4dbd8b087 SHA512 f4e29e15a05cfb49b24f4a8e24a6e43ac72ac0fa21ed640a70e5017263f23e21e514dedc489d963acd803407df8ee2bd2d6006c83eece795f91b4809d2ec2ff4
diff --git a/sci-libs/vtk/files/vtk-6.1.0-freetype.patch b/sci-libs/vtk/files/vtk-6.1.0-freetype.patch
deleted file mode 100644
index b7d3e409cde1..000000000000
--- a/sci-libs/vtk/files/vtk-6.1.0-freetype.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig	2014-12-23 09:25:35.000000000 +0100
-+++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx	2014-12-24 09:40:31.886953389 +0100
-@@ -1185,7 +1185,7 @@
-     if (bitmap)
-       {
-       metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
--      metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
-+      metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)),
-                                   metaData.descent);
-       }
-     ++heightString;
-@@ -1952,8 +1952,8 @@
-     if (bitmap)
-       {
-       bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
--      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
--      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
-+      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width));
-+      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
-       bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
-       }
-     else
diff --git a/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch b/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch
deleted file mode 100644
index 83d1ae18f213..000000000000
--- a/sci-libs/vtk/files/vtk-6.1.0-gcc67.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/old/vtkCompilerExtras.cmake b/CMake/vtkCompilerExtras.cmake
-index 05b2db9..92c2c4c 100644
---- a/old/vtkCompilerExtras.cmake
-+++ b/CMake/vtkCompilerExtras.cmake
-@@ -27,7 +27,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-     OUTPUT_VARIABLE _gcc_version_info
-     ERROR_VARIABLE _gcc_version_info)
- 
--  string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]"
-+  string (REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]"
-     _gcc_version "${_gcc_version_info}")
-   if(NOT _gcc_version)
-     string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0"
-diff --git a/old/GenerateExportHeader.cmake b/CMake/GenerateExportHeader.cmake
-index 3cc12dd..b7a47df 100644
---- a/old/GenerateExportHeader.cmake
-+++ b/CMake/GenerateExportHeader.cmake
-@@ -166,7 +166,7 @@ macro(_test_compiler_hidden_visibility)
-     execute_process(COMMAND ${CMAKE_C_COMPILER} --version
-       OUTPUT_VARIABLE _gcc_version_info
-       ERROR_VARIABLE _gcc_version_info)
--    string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]"
-+    string(REGEX MATCH "[0-9]\\.[0-9]\\.[0-9]"
-       _gcc_version "${_gcc_version_info}")
-     # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
-     # patch level, handle this here:
diff --git a/sci-libs/vtk/files/vtk-6.1.0-gdal2.patch b/sci-libs/vtk/files/vtk-6.1.0-gdal2.patch
deleted file mode 100644
index c21864102278..000000000000
--- a/sci-libs/vtk/files/vtk-6.1.0-gdal2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/IO/GDAL/vtkGDALVectorReader.cxx b/IO/GDAL/vtkGDALVectorReader.cxx
-index 86854a0..a0e234a 100644
---- a/IO/GDAL/vtkGDALVectorReader.cxx
-+++ b/IO/GDAL/vtkGDALVectorReader.cxx
-# Patch to build against newer GDAL per upstream commit
-# https://projects.archlinux.org/svntogit/community.git/tree/trunk/gdal2.patch?h=packages/vtk&id=43307598a98872fd4ce7739e47f5bb4cfcb5372d
-@@ -44,7 +44,7 @@ class vtkGDALVectorReader::Internal
- public:
-   Internal( const char* srcName, int srcMode, int appendFeatures, int addFeatIds )
-     {
--    this->Source = OGRSFDriverRegistrar::Open( srcName, srcMode, &this->Driver );
-+    this->Source = (GDALDataset*) OGROpen( srcName, srcMode, NULL );
-     if ( ! this->Source )
-       {
-       this->LastError = CPLGetLastErrorMsg();
-@@ -61,7 +61,7 @@ public:
-     {
-     if ( this->Source )
-       {
--      OGRDataSource::DestroyDataSource( this->Source );
-+      GDALClose( (GDALDatasetH) this->Source );
-       }
-     }
-
-@@ -304,7 +304,7 @@ public:
-     return nCells;
-     }
-
--  OGRDataSource* Source;
-+  GDALDataset* Source;
-   OGRSFDriver* Driver;
-   const char* LastError;
-   int LayerIdx;
diff --git a/sci-libs/vtk/files/vtk-6.1.0-glext.patch b/sci-libs/vtk/files/vtk-6.1.0-glext.patch
deleted file mode 100644
index b5529a5fc3d5..000000000000
--- a/sci-libs/vtk/files/vtk-6.1.0-glext.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h.glext VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h
---- VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h.glext	2014-01-22 08:55:41.000000000 -0700
-+++ VTK-6.1.0/Rendering/OpenGL/vtkOpenGL.h	2014-11-19 10:27:12.349345199 -0700
-@@ -19,7 +19,8 @@
- #include "vtkConfigure.h"
- 
- // To prevent gl.h to include glext.h provided by the system
--#define GL_GLEXT_LEGACY
-+// https://bugzilla.redhat.com/show_bug.cgi?id=1138466
-+// #define GL_GLEXT_LEGACY
- #if defined(__APPLE__) && (defined(VTK_USE_CARBON) || defined(VTK_USE_COCOA))
- # include <OpenGL/gl.h> // Include OpenGL API.
- #else
diff --git a/sci-libs/vtk/files/vtk-6.1.0-install.patch b/sci-libs/vtk/files/vtk-6.1.0-install.patch
deleted file mode 100644
index 27c6c3adfee9..000000000000
--- a/sci-libs/vtk/files/vtk-6.1.0-install.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up VTK-6.1.0/CMake/vtkModuleTop.cmake.install VTK-6.1.0/CMake/vtkModuleTop.cmake
---- VTK-6.1.0/CMake/vtkModuleTop.cmake.install	2014-01-23 19:12:04.922871103 -0700
-+++ VTK-6.1.0/CMake/vtkModuleTop.cmake	2014-01-23 19:14:33.002645155 -0700
-@@ -330,11 +330,15 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT)
-                 CMake/pythonmodules.h.in
-                 CMake/UseVTK.cmake
-                 CMake/FindTCL.cmake
-+                CMake/TopologicalSort.cmake
-                 CMake/vtkTclTkMacros.cmake
-                 CMake/vtk-forward.c.in
-+                CMake/vtkGroups.cmake
-                 CMake/vtkForwardingExecutable.cmake
-                 CMake/vtkJavaWrapping.cmake
-                 CMake/vtkMakeInstantiator.cmake
-+                CMake/vtkMakeInstantiator.cxx.in
-+                CMake/vtkMakeInstantiator.h.in
-                 CMake/vtkModuleAPI.cmake
-                 CMake/vtkModuleHeaders.cmake.in
-                 CMake/vtkModuleInfo.cmake.in
diff --git a/sci-libs/vtk/files/vtk-6.1.0-memset.patch b/sci-libs/vtk/files/vtk-6.1.0-memset.patch
deleted file mode 100644
index 362022edf16d..000000000000
--- a/sci-libs/vtk/files/vtk-6.1.0-memset.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From ef22d3d69421581b33bc0cd94b647da73b61ba96 Mon Sep 17 00:00:00 2001
-From: Anton Gladky <gladk@debian.org>
-Date: Fri, 30 May 2014 23:16:26 +0200
-Subject: [PATCH] Fix compilation by gcc-4.9
-
-VTK fails to build during compilation by gcc-4.9 with the
-following message:
-
-CMakeFiles/vtkFiltersParallelMPI.dir/vtkDistributedDataFilter.cxx.o: In
-function `memset':
-/usr/include/x86_64-linux-gnu/bits/string3.h:81: warning: memset used
-with constant zero length parameter; this could be due to transposed
-parameters
-collect2: error: ld returned 1 exit status
-
-This patch sets if-condition before all "memsets" in
-vtkDistributedDataFilter and checkes, whether the number
-of bytes to be set by memset is more than 0 to escape this
-error.
----
- Filters/ParallelMPI/vtkDistributedDataFilter.cxx | 48 ++++++++++++++++++------
- 1 file changed, 37 insertions(+), 11 deletions(-)
-
-diff --git a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-index 3c1ff30..df4b5d3 100644
---- a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-+++ b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-@@ -1091,7 +1091,10 @@ vtkDataSet *vtkDistributedDataFilter::TestFixTooFewInputFiles(vtkDataSet *input)
-   vtkIdType cellsPerNode = numTotalCells / nprocs;
- 
-   vtkIdList **sendCells = new vtkIdList * [ nprocs ];
--  memset(sendCells, 0, sizeof(vtkIdList *) * nprocs);
-+  
-+  if (sizeof(vtkIdList *) * nprocs > 0) {
-+    memset(sendCells, 0, sizeof(vtkIdList *) * nprocs);
-+  }
- 
-   if (numConsumers == nprocs - 1)
-     {
-@@ -1582,7 +1585,9 @@ vtkFloatArray **
-   // Exchange int arrays
- 
-   float **recvArrays = new float * [nprocs];
--  memset(recvArrays, 0, sizeof(float *) * nprocs);
-+  if (sizeof(float *) * nprocs > 0) {
-+    memset(recvArrays, 0, sizeof(float *) * nprocs);
-+  }
- 
-   if (sendSize[me] > 0)  // sent myself an array
-     {
-@@ -1703,7 +1708,9 @@ vtkIdTypeArray **
-   // Exchange int arrays
- 
-   vtkIdType **recvArrays = new vtkIdType * [nprocs];
--  memset(recvArrays, 0, sizeof(vtkIdType *) * nprocs);
-+  if (sizeof(vtkIdType *) * nprocs > 0) {
-+    memset(recvArrays, 0, sizeof(vtkIdType *) * nprocs);
-+  }
- 
-   if (sendSize[me] > 0)  // sent myself an array
-     {
-@@ -2807,7 +2814,9 @@ void vtkDistributedDataFilter::AddConstantUnsignedCharPointArray(
- 
-   unsigned char *vals = new unsigned char [npoints];
- 
--  memset(vals, val, npoints);
-+  if (npoints > 0) {
-+    memset(vals, val, npoints);
-+  }
- 
-   vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
-   Array->SetName(arrayName);
-@@ -2827,7 +2836,9 @@ void vtkDistributedDataFilter::AddConstantUnsignedCharCellArray(
- 
-   unsigned char *vals = new unsigned char [ncells];
- 
--  memset(vals, val, ncells);
-+  if (ncells > 0) {
-+    memset(vals, val, ncells);
-+  }
- 
-   vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
-   Array->SetName(arrayName);
-@@ -3026,7 +3037,9 @@ int vtkDistributedDataFilter::AssignGlobalNodeIds(vtkUnstructuredGrid *grid)
-   vtkIdType nGridPoints = grid->GetNumberOfPoints();
- 
-   vtkIdType *numPointsOutside = new vtkIdType [nprocs];
--  memset(numPointsOutside, 0, sizeof(vtkIdType) * nprocs);
-+  if (sizeof(vtkIdType) * nprocs > 0) {
-+    memset(numPointsOutside, 0, sizeof(vtkIdType) * nprocs);
-+  }
- 
-   vtkIdTypeArray *globalIds = vtkIdTypeArray::New();
-   globalIds->SetNumberOfValues(nGridPoints);
-@@ -3108,10 +3121,16 @@ int vtkDistributedDataFilter::AssignGlobalNodeIds(vtkUnstructuredGrid *grid)
-   // global ID back?
- 
-   vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs];
--  memset(ptarrayOut, 0, sizeof(vtkFloatArray *) * nprocs);
-+  
-+  if (sizeof(vtkFloatArray *) * nprocs > 0) {
-+    memset(ptarrayOut, 0, sizeof(vtkFloatArray *) * nprocs);
-+  }
- 
-   vtkIdTypeArray **localIds     = new vtkIdTypeArray * [nprocs];
--  memset(localIds, 0, sizeof(vtkIdTypeArray *) * nprocs);
-+  
-+  if (sizeof(vtkIdTypeArray *) * nprocs > 0) {
-+    memset(localIds, 0, sizeof(vtkIdTypeArray *) * nprocs);
-+  }
- 
-   vtkIdType *next = new vtkIdType [nprocs];
-   vtkIdType *next3 = new vtkIdType [nprocs];
-@@ -3286,7 +3305,9 @@ vtkIdTypeArray **vtkDistributedDataFilter::FindGlobalPointIds(
-     {
-     // There are no cells in my assigned region
- 
--    memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs);
-+    if (sizeof(vtkIdTypeArray *) * nprocs > 0) {
-+      memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs);
-+    }
- 
-     return gids;
-     }
-@@ -3491,7 +3512,10 @@ vtkIdTypeArray **vtkDistributedDataFilter::MakeProcessLists(
-   std::multimap<int, int>::iterator mapIt;
- 
-   vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs];
--  memset(processList, 0, sizeof (vtkIdTypeArray *) * nprocs);
-+
-+  if (sizeof (vtkIdTypeArray *) * nprocs > 0) {
-+    memset(processList, 0, sizeof (vtkIdTypeArray *) * nprocs);
-+  }
- 
-   for (int i=0; i<nprocs; i++)
-     {
-@@ -3581,7 +3605,9 @@ vtkIdTypeArray **vtkDistributedDataFilter::GetGhostPointIds(
-   vtkIdType numPoints = grid->GetNumberOfPoints();
- 
-   vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs];
--  memset(ghostPtIds, 0, sizeof(vtkIdTypeArray *) * nprocs);
-+  if (sizeof(vtkIdTypeArray *) * nprocs) {
-+    memset(ghostPtIds, 0, sizeof(vtkIdTypeArray *) * nprocs);
-+  }
- 
-   if (numPoints < 1)
-     {
diff --git a/sci-libs/vtk/files/vtk-6.1.0-netcdf.patch b/sci-libs/vtk/files/vtk-6.1.0-netcdf.patch
deleted file mode 100644
index e6f8b6431720..000000000000
--- a/sci-libs/vtk/files/vtk-6.1.0-netcdf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt
---- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf	2013-12-27 20:29:11.644289659 -0700
-+++ VTK/ThirdParty/netcdf/CMakeLists.txt	2013-12-27 20:33:48.071895769 -0700
-@@ -1,10 +1,18 @@
--vtk_module_third_party(NetCDF
--  LIBRARIES vtkNetCDF vtkNetCDF_cxx
--  INCLUDE_DIRS
--    ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include
--    ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf
--  COMPONENTS C CXX
--  )
-+if(NOT VTK_USE_SYSTEM_NETCDF)
-+  vtk_module_third_party(NetCDF
-+    LIBRARIES vtkNetCDF vtkNetCDF_cxx
-+    INCLUDE_DIRS
-+      ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include
-+      ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf
-+    COMPONENTS C CXX
-+    )
-+else(NOT VTK_USE_SYSTEM_NETCDF)
-+  vtk_module_third_party(NetCDF
-+    LIBRARIES vtkNetCDF netcdf
-+    COMPONENTS C CXX
-+    )
-+endif()
-+
- 
- #Configure the top cpp header to switch between system and internal
- #netcdf just like vtk_module_third_party does for the c header.
diff --git a/sci-libs/vtk/files/vtk-6.1.0-system.patch b/sci-libs/vtk/files/vtk-6.1.0-system.patch
deleted file mode 100644
index c75d544447ea..000000000000
--- a/sci-libs/vtk/files/vtk-6.1.0-system.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -up VTK/CMake/vtkModuleMacros.cmake.system VTK/CMake/vtkModuleMacros.cmake
---- VTK/CMake/vtkModuleMacros.cmake.system	2013-12-24 19:17:43.000000000 -0700
-+++ VTK/CMake/vtkModuleMacros.cmake	2013-12-27 20:28:22.375573277 -0700
-@@ -682,7 +682,7 @@ macro(vtk_module_third_party _pkg)
-     message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES")
-   endif()
- 
--  option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF)
-+  option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES})
-   mark_as_advanced(VTK_USE_SYSTEM_${_upper})
- 
-   if(VTK_USE_SYSTEM_${_upper})
-diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt
---- VTK/CMakeLists.txt.system	2013-12-27 20:28:22.374573241 -0700
-+++ VTK/CMakeLists.txt	2013-12-27 20:28:48.118669708 -0700
-@@ -132,6 +132,11 @@ if (CMAKE_CROSSCOMPILING AND NOT COMPILE
- endif()
- 
- #-----------------------------------------------------------------------------
-+# Do we try to use system libraries by default?
-+OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF)
-+MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES)
-+
-+#-----------------------------------------------------------------------------
- # The third party macros are still used in one or two third party builds.
- include(vtkThirdParty)
- 
diff --git a/sci-libs/vtk/files/vtk-6.1.0-web.patch b/sci-libs/vtk/files/vtk-6.1.0-web.patch
deleted file mode 100644
index a85f2cd99640..000000000000
--- a/sci-libs/vtk/files/vtk-6.1.0-web.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 58373b120db6d51c6d5eace38447cdb45ff858d1 Mon Sep 17 00:00:00 2001
-From: Patric Schmitz <patric.schmitz@rwth-aachen.de>
-Date: Tue, 28 Oct 2014 16:24:22 +0100
-Subject: [PATCH] Include vtkPythonPackages in Web/JavaScript/CMakeLists.txt
-
-Change-Id: Ie7bffa19bdaa78c5b090c886e50c1af76e2aadee
----
- Web/Applications/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Web/Applications/CMakeLists.txt b/Web/Applications/CMakeLists.txt
-index c9e7ad3..b4c9a60 100644
---- a/Web/Applications/CMakeLists.txt
-+++ b/Web/Applications/CMakeLists.txt
-@@ -12,6 +12,7 @@ set(WEB_APPLICATIONS
- 
- set(WEB_APPS_DEPENDS)
- 
-+include(vtkPythonPackages) # for copy_files_recursive
- foreach(_app ${WEB_APPLICATIONS})
-   file(MAKE_DIRECTORY "${VTK_WWW_DIR}/apps/${_app}")
- 
--- 
-2.2.1
-
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
index 9faa532b1c8a..6c1a962488c6 100644
--- a/sci-libs/vtk/metadata.xml
+++ b/sci-libs/vtk/metadata.xml
@@ -8,11 +8,9 @@
   <use>
     <flag name="all-modules">Build all modules</flag>
     <flag name="boost">Add support for boost</flag>
-    <flag name="cg">Use nvidia's cg shaders</flag>
     <flag name="gdal">Support for gdal formated data</flag>
     <flag name="imaging">Building Imaging modules</flag>
     <flag name="json">Support for json formatted data</flag>
-    <flag name="kaapi">Use <pkg>sci-libs/xkaapi</pkg> to handle smp support</flag>
     <flag name="offscreen">Offscreen rendering through OSMesa</flag>
     <flag name="rendering">Building Redering modules</flag>
     <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag>
diff --git a/sci-libs/vtk/vtk-6.1.0-r4.ebuild b/sci-libs/vtk/vtk-6.1.0-r4.ebuild
deleted file mode 100644
index a24386e16e6b..000000000000
--- a/sci-libs/vtk/vtk-6.1.0-r4.ebuild
+++ /dev/null
@@ -1,392 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-CMAKE_MAKEFILE_GENERATOR=ninja
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp
-
-# Short package version
-SPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-	https://www.${PN}.org/files/release/${SPV}/VTK-${PV}.tar.gz
-	doc? ( https://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )
-	test? (
-		https://www.${PN}.org/files/release/${SPV}/VTKData-${PV}.tar.gz
-		https://www.${PN}.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
-		)
-	"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="
-	all-modules aqua boost cg doc examples imaging ffmpeg gdal java json kaapi mpi
-	mysql odbc offscreen postgres python qt5 rendering smp tbb test theora tk tcl
-	video_cards_nvidia views web xdmf2 R +X"
-
-REQUIRED_USE="
-	all-modules? ( python xdmf2 )
-	java? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tcl? ( rendering )
-	smp? ( ^^ ( kaapi tbb ) )
-	test? ( python )
-	tk? ( tcl )
-	web? ( python )
-	^^ ( X aqua offscreen )
-	"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/jsoncpp
-	dev-libs/libxml2:2
-	>=media-libs/freetype-2.5.4
-	media-libs/libpng:0
-	media-libs/mesa
-	media-libs/libtheora
-	media-libs/tiff:0
-	sci-libs/exodusii
-	sci-libs/hdf5:=
-	sci-libs/netcdf-cxx:3
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	>=x11-libs/gl2ps-1.3.8
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	boost? ( >=dev-libs/boost-1.40.0[mpi?] )
-	cg? ( media-gfx/nvidia-cg-toolkit )
-	examples? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		sci-libs/vtkdata
-	)
-	ffmpeg? ( virtual/ffmpeg )
-	gdal? ( sci-libs/gdal )
-	java? ( >=virtual/jre-1.5:* )
-	kaapi? ( <sci-libs/xkaapi-3 )
-	mpi? (
-		virtual/mpi[cxx,romio]
-		python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-	)
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	offscreen? ( media-libs/mesa[osmesa] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/sip[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/designer:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsql:5
-		dev-qt/qtwebkit:5
-		python? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-	)
-	R? ( dev-lang/R )
-	tbb? ( dev-cpp/tbb )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	web? (
-		${WEBAPP_DEPEND}
-		python? (
-			dev-python/autobahn[${PYTHON_USEDEP}]
-			dev-python/twisted-core[${PYTHON_USEDEP}]
-			dev-python/zope-interface[${PYTHON_USEDEP}]
-			)
-		)
-	xdmf2? ( sci-libs/xdmf2 )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.5 )
-"
-
-S="${WORKDIR}"/VTK-${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-freetype.patch
-	"${FILESDIR}"/${P}-install.patch
-	"${FILESDIR}"/${P}-system.patch
-	"${FILESDIR}"/${P}-netcdf.patch
-	"${FILESDIR}"/${P}-web.patch
-	"${FILESDIR}"/${P}-glext.patch
-	"${FILESDIR}"/${P}-memset.patch
-	"${FILESDIR}"/${P}-gdal2.patch
-	"${FILESDIR}"/${P}-gcc67.patch
-)
-
-RESTRICT="test"
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	use web && webapp_pkg_setup
-
-	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
-}
-
-src_prepare() {
-	sed \
-		-e 's:libproj4:libproj:g' \
-		-e 's:lib_proj.h:lib_abi.h:g' \
-		-i CMake/FindLIBPROJ4.cmake || die
-
-	local x
-	# missing: VPIC alglib exodusII freerange ftgl libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
-	for x in expat freetype gl2ps hdf5 jpeg jsoncpp libxml2 netcdf oggtheora png tiff zlib; do
-		ebegin "Dropping bundled ${x}"
-		rm -r ThirdParty/${x}/vtk${x} || die
-		eend $?
-	done
-	rm -r \
-		ThirdParty/AutobahnPython/autobahn \
-		ThirdParty/Twisted/twisted \
-		ThirdParty/ZopeInterface/zope \
-		|| die
-
-	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	if use mpi; then
-		export CC=mpicc
-		export CXX=mpicxx
-		export FC=mpif90
-		export F90=mpif90
-		export F77=mpif77
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# general configuration
-	local mycmakeargs=(
-		-Wno-dev
-#		-DCMAKE_SKIP_RPATH=YES
-		-DVTK_DIR="${S}"
-		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
-		-DVTK_DATA_ROOT:PATH="${EPREFIX}/usr/share/${PN}/data"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
-		-DBUILD_SHARED_LIBS=ON
-		-DVTK_USE_SYSTEM_AUTOBAHN=ON
-		-DVTK_USE_SYSTEM_EXPAT=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_FreeType=ON
-		-DVTK_USE_SYSTEM_GL2PS=ON
-		-DVTK_USE_SYSTEM_HDF5=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_LIBPROJ4=OFF
-#		-DLIBPROJ4_DIR="${EPREFIX}/usr"
-		-DVTK_USE_SYSTEM_LIBXML2=ON
-		-DVTK_USE_SYSTEM_LibXml2=ON
-		-DVTK_USE_SYSTEM_NETCDF=ON
-		-DVTK_USE_SYSTEM_OGGTHEORA=ON
-		-DVTK_USE_SYSTEM_PNG=ON
-		-DVTK_USE_SYSTEM_TIFF=ON
-		-DVTK_USE_SYSTEM_TWISTED=ON
-		-DVTK_USE_SYSTEM_XDMF2=OFF
-		-DVTK_USE_SYSTEM_XDMF3=OFF
-		-DVTK_USE_SYSTEM_ZLIB=ON
-		-DVTK_USE_SYSTEM_ZOPE=ON
-		-DVTK_USE_SYSTEM_LIBRARIES=ON
-		-DVTK_USE_GL2PS=ON
-		-DVTK_USE_LARGE_DATA=ON
-		-DVTK_USE_PARALLEL=ON
-	)
-
-	mycmakeargs+=(
-		-DVTK_EXTRA_COMPILER_WARNINGS=ON
-		-DVTK_Group_StandAlone=ON
-	)
-
-	mycmakeargs+=(
-		$(cmake-utils_use_build doc DOCUMENTATION)
-		$(cmake-utils_use_build examples EXAMPLES)
-		$(cmake-utils_use_build test VTK_BUILD_ALL_MODULES_FOR_TESTS)
-		$(cmake-utils_use all-modules VTK_BUILD_ALL_MODULES)
-		$(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
-		$(cmake-utils_use imaging VTK_Group_Imaging)
-		$(cmake-utils_use mpi VTK_Group_MPI)
-		$(cmake-utils_use rendering VTK_Group_Rendering)
-		$(cmake-utils_use tk VTK_Group_Tk)
-		$(cmake-utils_use views VTK_Group_Views)
-		$(cmake-utils_use web VTK_Group_Web)
-		$(cmake-utils_use web VTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}")
-		$(cmake-utils_use java VTK_WRAP_JAVA)
-		$(cmake-utils_use python VTK_WRAP_PYTHON)
-		$(cmake-utils_use python VTK_WRAP_PYTHON_SIP)
-		$(cmake-utils_use tcl VTK_WRAP_TCL)
-	)
-
-	mycmakeargs+=(
-		$(cmake-utils_use boost VTK_USE_BOOST)
-		$(cmake-utils_use cg VTK_USE_CG_SHADERS)
-		$(cmake-utils_use odbc VTK_USE_ODBC)
-		$(cmake-utils_use offscreen VTK_USE_OFFSCREEN)
-		$(cmake-utils_use offscreen VTK_OPENGL_HAS_OSMESA)
-		$(cmake-utils_use smp vtkFiltersSMP)
-		$(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER)
-		$(cmake-utils_use video_cards_nvidia VTK_USE_NVCONTROL)
-		$(cmake-utils_use R Module_vtkFiltersStatisticsGnuR)
-		$(cmake-utils_use X VTK_USE_X)
-	)
-
-	# IO
-	mycmakeargs+=(
-		$(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
-		$(cmake-utils_use gdal Module_vtkIOGDAL)
-		$(cmake-utils_use json Module_vtkIOGeoJSON)
-		$(cmake-utils_use xdmf2 Module_vtkIOXdmf2)
-	)
-	# Apple stuff, does it really work?
-	mycmakeargs+=( $(cmake-utils_use aqua VTK_USE_COCOA) )
-
-	if use examples || use test; then
-		mycmakeargs+=( -DBUILD_TESTING=ON )
-	fi
-
-	if use kaapi; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Kaapi" )
-	elif use tbb; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
-	else
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
-	fi
-
-	if use java; then
-#		local _ejavahome=${EPREFIX}/etc/java-config-2/current-system-vm
-#
-#	mycmakeargs+=(
-#			-DJAVAC=${EPREFIX}/usr/bin/javac
-#			-DJAVAC=$(java-config -c)
-#			-DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
-#			-DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include
-#			-DJAVA_INCLUDE_PATH2:PATH=${JAVA_HOME}/include/linux
-#		)
-#
-		if [ "${ARCH}" == "amd64" ]; then
-			mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so;${JAVA_HOME}/jre/lib/${ARCH}/xawt/libmawt.so" )
-		else
-			mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/i386/libjawt.so;${JAVA_HOME}/jre/lib/i386/xawt/libmawt.so" )
-		fi
-	fi
-	if use python; then
-		mycmakeargs+=(
-			-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
-			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DPYTHON_LIBRARY="$(python_get_library_path)"
-			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
-			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
-			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX}/usr --root=${D}"
-		)
-	fi
-
-	if use qt5; then
-		mycmakeargs+=(
-			-DVTK_USE_QVTK=ON
-			-DVTK_USE_QVTK_OPENGL=ON
-			-DVTK_USE_QVTK_QTOPENGL=ON
-			-DQT_WRAP_CPP=ON
-			-DQT_WRAP_UI=ON
-			-DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt5/plugins/designer
-			-DDESIRED_QT_VERSION=5
-			-DVTK_QT_VERSION=5
-			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
-			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
-			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
-			-DVTK_Group_Qt:BOOL=ON
-		)
-	fi
-
-	if use R; then
-		mycmakeargs+=(
-#			-DR_LIBRARY_BLAS=$($(tc-getPKG_CONFIG) --libs blas)
-#			-DR_LIBRARY_LAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
-			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
-			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local tcllib
-	ln -sf "${BUILD_DIR}"/lib  "${BUILD_DIR}"/lib/Release || die
-	for tcllib in "${BUILD_DIR}"/lib/lib*TCL*so; do
-		ln -sf $(basename "${tcllib}").1 "${tcllib/.so/-${SPV}.so}" || die
-	done
-	export LD_LIBRARY_PATH="${BUILD_DIR}"/lib:"${JAVA_HOME}"/jre/lib/${ARCH}/:"${JAVA_HOME}"/jre/lib/${ARCH}/xawt/
-	local VIRTUALX_COMMAND="cmake-utils_src_test"
-#	local VIRTUALX_COMMAND="cmake-utils_src_test -R Java"
-#	local VIRTUALX_COMMAND="cmake-utils_src_test -I 364,365"
-	virtualmake
-}
-
-src_install() {
-	use web && webapp_src_preinst
-	# install docs
-	HTML_DOCS=( "${S}"/README.html )
-
-	cmake-utils_src_install
-
-	use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
-
-	if use tcl; then
-		# install Tcl docs
-		docinto vtk_tcl
-		dodoc "${S}"/Wrapping/Tcl/README
-	fi
-
-	# install examples
-	if use examples; then
-		insinto /usr/share/${PN}
-		mv -v Examples examples || die
-		doins -r examples
-	fi
-
-	#install big docs
-	if use doc; then
-		cd "${WORKDIR}"/html || die
-		rm -f *.md5 || die "Failed to remove superfluous hashes"
-		einfo "Installing API docs. This may take some time."
-		docinto html
-		dodoc -r ./*
-	fi
-
-	# environment
-	cat >> "${T}"/40${PN} <<- EOF
-	VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
-	VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
-	VTKHOME=${EPREFIX}/usr
-	EOF
-	doenvd "${T}"/40${PN}
-
-	use web && webapp_src_install
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
-	use web && webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	use web && webapp_pkg_prerm
-}
diff --git a/sci-libs/xdmf2/Manifest b/sci-libs/xdmf2/Manifest
index 2c1ab9175b62..92d4d90814a2 100644
--- a/sci-libs/xdmf2/Manifest
+++ b/sci-libs/xdmf2/Manifest
@@ -2,5 +2,5 @@ AUX xdmf2-1.0_p141226-cannot-find-hdf5-bug-591302.patch 1675 BLAKE2B f1a2674d987
 AUX xdmf2-1.0_p141226-cmake-3.12.patch 422 BLAKE2B 904de870ce6e7cb9aaa4454dbecd47447048eee08e7826869e09e7f294570e0dd235f011ccc775a1c4369bb4e6e890d8279c2102ce1c85f8488815c185be891e SHA512 e9fbf5caeffcccd12d9112cc4afc2485cea89105743d69483c08e931e84cb5d48facf67017b49c20a9c0f3087dbac974fa6eb2b0b76714ad207c1bbb20fd9518
 AUX xdmf2-1.0_p141226-module.patch 452 BLAKE2B 1611edbdf962ba25b72dab702044b7c7299abe5d92757c333827f08eb643fd17661739a4c0f7c0e759c516d9eeba794733145bdb03ef6779d1a9ef6e315fc5db SHA512 9a9e05001f1d8ea8250a7bb9231a43e8cceeface61fb125330b6255a1ba452650a80cb6592a69fdecc04212752c0d1fa195151b13c88262c40a36ca566a33dcd
 DIST xdmf2-1.0_p141226.tar.xz 267096 BLAKE2B 230ed73cc0521f04ff519c0050559ccf3837b915a196336de4b439cf05cae02220270a81290a6aac70e04095695b853e7de35613fba39cef6a90e93e6c99a3f9 SHA512 031b947ccd942c39cb40504e939f03bc9e3190ae1a7baf8325809decf70a040e860b43d5bc9debfcf2f3838f5f0d7a9c77c92561c89fc0d632306e140b136db9
-EBUILD xdmf2-1.0_p141226-r3.ebuild 1799 BLAKE2B 770c26881372a21f0d714e83291f61aa7020ec78e60d732df34b7991faab6c552ca39340862d63c60572e33e51909b8e7bb9835bd78536060afca68900a6c947 SHA512 392b8e52627109788cba56df12a4d08ab94b34c32914bb06a97e83dfe6c60621ef03d66c2395e8afda065c02097f827aa56593d454495328e8ba0e0394914346
+EBUILD xdmf2-1.0_p141226-r3.ebuild 1826 BLAKE2B 163017498172125a0c3705e7c72fe0d711cd5208444e8871623bc0a7ec854ae1cb787def9fedbb18d18bae31b9a0fe7fdafde58176e12f5e9b76aaca35e52c67 SHA512 460bb0336178754a71daaa80df233e4502980af316e6a28440e29cd886d83cc2e2fa0f1f4f6d4f3270b8612b6fdc63cd70e4accc0daecf2097b118e4558637c7
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild
index f8f903a4c1d0..fe0d3fcb2bc5 100644
--- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild
+++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="VTK"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc python test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
diff --git a/sci-libs/xgks-pmel/Manifest b/sci-libs/xgks-pmel/Manifest
index 382d817069ab..bb33fa47529c 100644
--- a/sci-libs/xgks-pmel/Manifest
+++ b/sci-libs/xgks-pmel/Manifest
@@ -1,4 +1,4 @@
-AUX aclocal.patch 3851 BLAKE2B c8ffc8621b9453dfc905909d9e44b24d4a4be5cd92e7cab917199e810cee510719f4c34c0d0e72ab509a4036cf99252c5d5e9118f9226b2a502ed7a612499772 SHA512 f926c8f1b30dc7f960442f53b9f5facf8d9083e378c896e765284565e9b871434967a77b82303e5bbdbb62ca140cccf65f9a8e5e07a2cfc726a7317eb7706b45
+AUX aclocal.patch 3632 BLAKE2B 09c84b06a83821cb8bc8131963e3c9c384883bb0f7c2fd30fb98c4d72f934e118c76b482df52abc72910f2ede5327cfbe5599817c45f3adcec1eeae775db1429 SHA512 ec3d6bf45993cf180b98898cafc3dc72f0ecc5c4868d5e5c478cac1c5748e812609a2ff3f1981a11c0eb1830ef5f1aefad6d88d3db7aaee184d8b95fad7f927e
 DIST xgks-pmel-2.5.5.tar.gz 1006581 BLAKE2B d44a956080382a7cb9758d54bc16528007a1b06abdb591cdff5cbdec4a292122916ff38503baca7ffb5a059eab21f26e5d9d6d71720a484201027032a62bf721 SHA512 001ef5742ebd93534569d650833ef04a82b01de819ceb2c3d3c750df58fd5bf9bbd538a79370b1d553db54477f409f6ab24958d3708260fb9ba7c8894ceb91c8
-EBUILD xgks-pmel-2.5.5.ebuild 1749 BLAKE2B ebf8c3069324080c8c18a1213d8e6370940d89c3538f229a9038d0655a11051227dd98dbf61f35098d1308eca3cdc987395d62f54a606353d1d0ada78f012b37 SHA512 9644d831b3d1ccba28389ded8716580e659008de0306ca4d2e2a70775dfc7219e2b02f33d41fc7112de18b7b872931212b36a86fe80383fb308c7819feddbe00
+EBUILD xgks-pmel-2.5.5.ebuild 1732 BLAKE2B a6590192ebf7ac1893b2c6ddf6527186a5a295faa3db29bffc8da7dd8f91edaa3c19794705bfe2a5493570300c9fa2f33f4e683b94ee89d5c3a4597d4add82da SHA512 099ae50b9dfc64b7ca8da8f74a4ec8279c19a46c2e74958f8e56f87d7dd8d4375b417d9bca6a893099403b6bda4c5386bb26ca7e95c276d27fa90db3356b2840
 MISC metadata.xml 495 BLAKE2B 86505d7994404c5ea76044d131939ea16a845728eda3730e7397d8b79d48312cca1a71a748684b7414ba8e61bb323ad16f639cea1439c5e5cf0c62deed10f337 SHA512 2adc6d6866325d603ad8e0cf2b4f0175f0dbaefbdffd1081b5742f2a5951c342ab5031e01cf29f52e4d090f0bb0d495eb4c289e21116caec377de62878df50dc
diff --git a/sci-libs/xgks-pmel/files/aclocal.patch b/sci-libs/xgks-pmel/files/aclocal.patch
index 48d44d747647..dbedb2e49f29 100644
--- a/sci-libs/xgks-pmel/files/aclocal.patch
+++ b/sci-libs/xgks-pmel/files/aclocal.patch
@@ -1,5 +1,5 @@
---- port/aclocal.m4.orig	2009-04-26 13:33:51.434402251 -0700
-+++ port/aclocal.m4	2009-04-26 13:43:33.466651210 -0700
+--- a/port/aclocal.m4
++++ b/port/aclocal.m4
 @@ -582,26 +582,6 @@
  ])])
  
@@ -122,8 +122,8 @@
  # Check for udres(3) library.
  #
  define([UC_LIB_UDRES], [dnl
---- port/configure.in.orig	2009-04-26 13:34:08.430308009 -0700
-+++ port/configure.in	2009-04-26 13:44:26.218430537 -0700
+--- a/port/configure.in
++++ b/port/configure.in
 @@ -24,8 +24,6 @@
  UC_PROG_FORTC
  UC_PROG_NEQN
@@ -133,8 +133,8 @@
  UC_PROG_INSTALL
  
  UC_UDPOSIX
---- port/master.mk.in.orig	2009-04-26 13:34:18.848400960 -0700
-+++ port/master.mk.in	2009-04-26 13:45:03.187651071 -0700
+--- a/port/master.mk.in
++++ b/port/master.mk.in
 @@ -19,8 +19,6 @@
  INSTALL_DATA	= @INSTALL_DATA@
  INSTALL_PROGRAM	= @INSTALL_PROGRAM@
diff --git a/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild b/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
index a329866fa003..cc8aa0b44b78 100644
--- a/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
+++ b/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils fortran-2 toolchain-funcs multilib
+inherit fortran-2 toolchain-funcs
 
 DESCRIPTION="PMEL fork of XGKS, an X11-based version of the ANSI Graphical Kernel System"
 HOMEPAGE="http://www.gentoogeek.org/viewvc/Linux/xgks-pmel/"
@@ -14,15 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
-RDEPEND="
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
 	sys-apps/groff"
 
-src_prepare() {
-	epatch "${FILESDIR}"/aclocal.patch
-}
+PATCHES=( "${FILESDIR}"/aclocal.patch )
 
 src_configure() {
 	sed -i -e "s:lib64:$(get_libdir):g" port/master.mk.in \
@@ -40,28 +38,27 @@ src_compile() {
 
 	# Fails parallel build, bug #295724
 	emake -j1
-
-	cd src/fortran
-	emake -j1
+	emake -C src/fortran -j1
 }
 
 src_install() {
-	cd "${S}"/progs
-
-	for tool in {defcolors,font,mi,pline,pmark}; do
+	pushd progs >/dev/null || die
+	local tool
+	for tool in defcolors font mi pline pmark; do
 		newbin ${tool} xgks-${tool}
 	done
+	popd >/dev/null || die
 
-	cd "${S}"
 	dolib.a src/lib/libxgks.a
 
-	dodoc COPYRIGHT HISTORY INSTALL README
+	dodoc COPYRIGHT HISTORY README
 	doman doc/{xgks.3,xgks_synop.3}
 	if use doc; then
 		newdoc doc/binding/cbinding.me cbinding
 		newdoc doc/userdoc/userdoc.me userdoc
-		insinto /usr/share/doc/${P}/examples
-		doins progs/{hanoi.c,star.c}
+
+		docinto examples
+		dodoc progs/{hanoi.c,star.f}
 	fi
 
 	insinto /usr/include/xgks
diff --git a/sci-libs/xylib/Manifest b/sci-libs/xylib/Manifest
index 2671662b117e..a97920ba232f 100644
--- a/sci-libs/xylib/Manifest
+++ b/sci-libs/xylib/Manifest
@@ -1,5 +1,3 @@
-DIST xylib-1.1.tar.bz2 288366 BLAKE2B b12093df85b763e658d8552a8850ea85354ea9142705243bb46a9ac464120d547687f2a9a33d9be6b0610f98308a01597f3c4595a41e44c68c69410c6a9187ec SHA512 d9952274fc4adb62aa7dab0d86dbb702d907caa954c68db1924284cc0304066ad8dac94571ecd1b764587655d30ac3fb1cae2307bb9e102ca564594a597a9c3f
 DIST xylib-1.2.tar.bz2 297167 BLAKE2B f30a397aea282626b2e5ea93053571ed6d617b4fdeff468751fed9c9f538595854c948d0f50656ce22dbadfe4ff99a59dc4a5fb70686e78c084bbe1db1c9c11a SHA512 16eaa4b37014914c75ca3d0188aaf236c342887c03e233a9bb770412b3bb16da6779ab82c8acd66677d98ada75537c77d1abad723defd33dbe6eda78c6c88b91
-EBUILD xylib-1.1.ebuild 590 BLAKE2B 8d01dd41a532be40e35736c2e7f6dcd77a00d5ffd0576394da8941c378df5b8d901dd982d85de7c6737baf4cbecab86815aad4aa5a92b94700398502013d1e89 SHA512 565ae367d98065117b83d688f6b8f0cfadab01c43b52bdc103a3e74198c64352c9535c30d9d992725c82f45ec3e21c458dbe04827cc71b3d8d6ae556769f5fb9
 EBUILD xylib-1.2.ebuild 622 BLAKE2B 1e167618f51dda4495240bc40a5ff438d0ac304044f2d4a0a50c933a300c8c8014f101426d9d7a66572f74d6e9aad7a7c352526cea6ad1d509bfdabd5a12a3a2 SHA512 ae4691ce2ece1d209d4769f454b060c1287b47a3510ec9c40b8556786f0fc784b20427d15eac77e69ab58f80193b360f8349c0d31b647d09e6297c99ecd4fc8c
 MISC metadata.xml 560 BLAKE2B 15a5a2f32f2c2285215daa40e7c5cb9cbff5c0f470c52e566812948cecd6cccdfa4a9eaee4a10ccbc46503c1a8ab2df557b88b37912def66bb79fe0cdbe5b8b7 SHA512 5bbf4b430ae8770e8d6ce2e084e093689acbbb36bb9aef5e0a6b21586870ee5fb0c4953588052aa053eb5d3418a84f18d0c6b7940282c9678a803bc1ae9ba8f3
diff --git a/sci-libs/xylib/xylib-1.1.ebuild b/sci-libs/xylib/xylib-1.1.ebuild
deleted file mode 100644
index 6db5c710a483..000000000000
--- a/sci-libs/xylib/xylib-1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Experimental x-y data reading library"
-HOMEPAGE="http://www.unipress.waw.pl/fityk/xylib/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 static-libs zlib"
-
-RDEPEND="
-	dev-libs/boost
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with bzip2 bzlib) \
-		$(use_with zlib)
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /sci-libs
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)