gentoo resync : 28.04.2018

48 files changed, 585 insertions, 335 deletions

diff --git a/sci-libs/Fiona/Fiona-1.5.1.ebuild b/sci-libs/Fiona/Fiona-1.5.1.ebuild
index d4a51401a919..873718cf2d73 100644
--- a/sci-libs/Fiona/Fiona-1.5.1.ebuild
+++ b/sci-libs/Fiona/Fiona-1.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
 inherit distutils-r1
 
 DESCRIPTION="OGR's neat, nimble, no-nonsense API"
-HOMEPAGE="https://pypi.org/project/Fiona"
+HOMEPAGE="https://pypi.org/project/Fiona/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/Fiona/Fiona-1.7.6.ebuild b/sci-libs/Fiona/Fiona-1.7.6.ebuild
index 4154021ff892..12fb7edbfa8f 100644
--- a/sci-libs/Fiona/Fiona-1.7.6.ebuild
+++ b/sci-libs/Fiona/Fiona-1.7.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="OGR's neat, nimble, no-nonsense API"
-HOMEPAGE="https://pypi.org/project/Fiona"
+HOMEPAGE="https://pypi.org/project/Fiona/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/Fiona/Fiona-9999.ebuild b/sci-libs/Fiona/Fiona-9999.ebuild
index c54e9408c48e..73728c1630aa 100644
--- a/sci-libs/Fiona/Fiona-9999.ebuild
+++ b/sci-libs/Fiona/Fiona-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="OGR's neat, nimble, no-nonsense API"
-HOMEPAGE="https://pypi.org/project/Fiona"
+HOMEPAGE="https://pypi.org/project/Fiona/"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
 
diff --git a/sci-libs/Fiona/Manifest b/sci-libs/Fiona/Manifest
index 2609390b1d00..7b96d7fcd8ae 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 711 BLAKE2B c979a73698a9a7e7645ed736a872576f837f013a3e5c0fa3e21be40a43446c9a1b068796cded7a19915ac57d8bf4c5e98aa6da2f0df5f52c91b2d64ebf195ebd SHA512 1bd25744fe8c3c925b4aadd34da7f599cc8f5bfb441ce21af18922961f5ad58e99d845df3818b62a8a82068043e7b6dd20b8f381799a7613d0ca017f8284bc18
-EBUILD Fiona-1.7.6.ebuild 840 BLAKE2B 840e119ee3a1271f2a15f5eb6592568c7cc2494c01490762a19fcc51669051fd2f0b834831df17774961a9ca702afde2d4c0d180ee63f83ba787151321b4935d SHA512 93291c24ed16e07aa91af2f5a569b2457cfaa7e622d0271bd50f169cd59fcffe605fa618cd65ee7f9ee69d7337859756060434df77043d4090aeeb2cfb502ebb
-EBUILD Fiona-9999.ebuild 727 BLAKE2B e9a08d52cd7fef503f2c7386023cbde09b5be4d0aab60abc20689bd7c8f813b2d906bfd3578751adcb145fa38d46c61889b96a7bbd1abc35902a0e1c7155aed6 SHA512 4c771de862ce4f84dacf1982cfce88fbcad39069cf40169e4f6939774446d229dae399f7201f97f5ba313715b2ef365342b5b018205a6a3f35f7f0e047fccd44
+EBUILD Fiona-1.5.1.ebuild 712 BLAKE2B 12f72ed245ecbac19381badc49c72298c70fd36b632380601393fc082b4b0921f63fad576f5b40e9ba165c8220a9788d48b8b9365ed4ed647c5c1a353bb2ab1c SHA512 db36f78c77fa8c38c4fab8b4a19e945b28446e247e429804b20302d2759aa9759f5f640cb5d70e207b318d2c700f546e93fa4bf563e09a842376dc4ebcd1a8e5
+EBUILD Fiona-1.7.6.ebuild 841 BLAKE2B a30cbc19e32aed06cd34a17a261a8a0387e4101b64c224681094b0525a661bc959403de37ea19f2dbb9a897d7beb25b8a45f5f9bc44cb93277bfcf7427bd4d65 SHA512 9aaa0bcfa09c13c91e956ab5e648de22b624c60aa78bd76356820ffcb86b1c67f5b7eed5111e8c3ca78d3444d31ac3de521e171732c633ae18c605e327da3890
+EBUILD Fiona-9999.ebuild 728 BLAKE2B 77343d93f8628e892f9d3db81048d92d64d66ead554d95c9b3ed348755bc8569527c49ce95240541ad6063f3d6ef732d2171065b4e606af1380224c48c75d281 SHA512 f6382d64ea39b07f560d766d0b703894fd3959bf1184bbd0bbc4509fa5f485a65a7045d2316f2e48f81e3088f0331449d596f89913204f1ad425cf7a3adaa651
 MISC metadata.xml 291 BLAKE2B 4ecd07de9c09af8529223d976508c193f0906422ec2eb1de33e81af63e16feeb7ee44822be8bcf2dabda9c5c42fabeeeaafdbf7dc55551148335088eeb47a56e SHA512 de0472e2bb3e03ab9d0c4639274c82fd0019054b5bae99294b82d24f5af057737c61b58065db930088d7021aeaf3e18b520733bb7a2ca5e8eb567d7ee82e5ac1
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 23a4b9de4d5c..eac8ffd703ee 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/Rtree/Manifest b/sci-libs/Rtree/Manifest
index 5e2087250a16..173a38cdcdcf 100644
--- a/sci-libs/Rtree/Manifest
+++ b/sci-libs/Rtree/Manifest
@@ -1,3 +1,3 @@
 DIST Rtree-0.8.2.tar.gz 55813 BLAKE2B fd7391ef92c61a9d502d03376e1eef157dcfec77d3d46642d1b14bbe3a5021880641cbc741dd85e8b3b3d66a019db0a2eb638cfa76d109102459544969877eba SHA512 c0c1091c21e92022540a0aed09c00f3b2b6abb2869757e0cb7a68a120e3a289f275cea824a72172ea5b327696a67024894f5f01354f0cd5ec5b05d9b3ec130e0
-EBUILD Rtree-0.8.2.ebuild 453 BLAKE2B 83742398cf73c51f1c9e862c0c846341091d7a6c25e403efa37d7660338f18d147e50b6f6fa37bbbe7cfef4d96a779a6ade24177c42e6fc7d0a3510bbff1ec1b SHA512 8711c4b18101fed3fe261e251f9331bdfc5cf19f07e3272c5408ef11c8edeae6274700f36e4451eb538523dee0f931af37a745f2974b5ec232ba833c41de97bc
+EBUILD Rtree-0.8.2.ebuild 454 BLAKE2B a50e623faa35666ea8cd369e0efe9bff0468720975003492fe3c9f2ba71c0d0bd64fc483bc65da40e9bf25dde0680d1f36e185406b386324c5e09b6c8b9aad35 SHA512 90f6cda1e3031dc10b87fb35c0857dc4258842f8503bc0303d9be077a1bf9bd69d048d5b6ab07a89ba3cc9786bc56ac494dd1027c08f8086cb72ab90079bc47f
 MISC metadata.xml 291 BLAKE2B 1d7f9362287c7ae3b7adb3658a75b3291c50fc99931fbb5ed1591ff94f863ab28b6c52f45b993260d7dd49f7af792517e0876cbce0fe3eac19f4dc6ba60ed2f4 SHA512 1dc1aaee480103b3d6f3cbdc7612960d422407ceed6e9014a28438bb19d61657291fe7df764928e1cbabb53e7b611afe70ea00c2eb2fb5e5c65a973cadedf367
diff --git a/sci-libs/Rtree/Rtree-0.8.2.ebuild b/sci-libs/Rtree/Rtree-0.8.2.ebuild
index 80e739dbde9f..011ac348bf09 100644
--- a/sci-libs/Rtree/Rtree-0.8.2.ebuild
+++ b/sci-libs/Rtree/Rtree-0.8.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="R-Tree spatial index for Python GIS"
-HOMEPAGE="https://pypi.org/project/Rtree"
+HOMEPAGE="https://pypi.org/project/Rtree/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
index 9d9785549acf..bae179657097 100644
--- a/sci-libs/Shapely/Manifest
+++ b/sci-libs/Shapely/Manifest
@@ -2,9 +2,9 @@ AUX setup_unicode.patch 698 BLAKE2B a4a007ac79df195e261161c59a92bf2fc50beea9d128
 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
-EBUILD Shapely-1.3.0.ebuild 615 BLAKE2B 8f6b77407530df97233a9e09e2321cfbdd8a4653559c1ee13b9fbc8a68466410d3eabd4b76a9ec918cede1a77f94c698d4c30141fe08d76bd0400dbf43c91ddc SHA512 77d1dff22566975a7f6261345a2037f332d75720005af3706bbb1b6f87a56ca9d8a0d63aeb835b63739c95bca9d5dd193626059813d3a4a71a0e80bae04eabd7
-EBUILD Shapely-1.3.2.ebuild 615 BLAKE2B 8f6b77407530df97233a9e09e2321cfbdd8a4653559c1ee13b9fbc8a68466410d3eabd4b76a9ec918cede1a77f94c698d4c30141fe08d76bd0400dbf43c91ddc SHA512 77d1dff22566975a7f6261345a2037f332d75720005af3706bbb1b6f87a56ca9d8a0d63aeb835b63739c95bca9d5dd193626059813d3a4a71a0e80bae04eabd7
-EBUILD Shapely-1.5.17-r1.ebuild 1058 BLAKE2B 78211a63c9ca4d3aec010683e9fd3239357d51febc31ada54cbcdd2dda796f8fc907a34b358062dd585973c7136305514b39f539aeb5c39f54f21ad03384bef5 SHA512 1ffa83a02f7a20540065b7b78001ff3a950cae3e2fe5d25926d48060b0515141b9790c3c2b9c6c142825ccfa91c891ca426bd811a691947032abb269115e2f4d
-EBUILD Shapely-1.5.17.ebuild 694 BLAKE2B d5c5f6f4a8b42d06538f92510ff38d4af4c5c309c2b65d29f3ba551a56626894d2b841735045ccfaffcea3eda6e8b4cc3d72924f29f13e9122f98290f36690ec SHA512 3f16480c4cf761dc1c69939b822a2f2d20eff7e8bd04516441aa79fdedbda973462fc643e8fc5909d341f8e7e7a8afe5954cdddd2cad6aa5df640679127ff7a4
-EBUILD Shapely-9999.ebuild 584 BLAKE2B c7ead69f441b48f86d4132563fe32a3f1aa79d9bc9d78a9e67108909c78aa1468f88653cba239aa38b709a7ddc8b2cd13b410c463d404855144cc34d3ddb869d SHA512 145a528f134cf8effe78f5b4eafdb905d3d97582ef77d06233207cd5d01bb289be6062760cf1009f4a891f64c93858446b5b0ac5f39a869998806d654bfdef34
+EBUILD Shapely-1.3.0.ebuild 616 BLAKE2B 40b5772a42c752cd3a8b1af73c32522d13404d290e55679117f0b66ad8c1b73837ef547f2eccd1f80e92cd6b9340114a7852691641790102dd8fb219d9265bbd SHA512 572a36c51ded12facf3bf61da88b01e84838ed1ae76fd92f1afbbd0ca03d5feddfd9306a7b724e54be961abda8b1a242a5b26a02f018e7ecb4a81497f9faef4b
+EBUILD Shapely-1.3.2.ebuild 616 BLAKE2B 40b5772a42c752cd3a8b1af73c32522d13404d290e55679117f0b66ad8c1b73837ef547f2eccd1f80e92cd6b9340114a7852691641790102dd8fb219d9265bbd SHA512 572a36c51ded12facf3bf61da88b01e84838ed1ae76fd92f1afbbd0ca03d5feddfd9306a7b724e54be961abda8b1a242a5b26a02f018e7ecb4a81497f9faef4b
+EBUILD Shapely-1.5.17-r1.ebuild 1059 BLAKE2B 4f0f4fffff1a90085201b43c56a80c83ee8eaf7bcdc5dd36aa35a722170db915b6d012728d30b8b61bf09de69fee496f73e0f2dbe7f245373872480a8eba8a07 SHA512 37f0822b7f39d8d0701d78a3898b335155b1084671e44711e3bd03c7043af67193cc89d63d4bc8e81b36342efd591edef78d75d3eab98947176cc21dde14477d
+EBUILD Shapely-1.5.17.ebuild 695 BLAKE2B f40613943d6bc8eed954e46d73a893a554b3ef4c2301e0318066c94972988ce8db5f552de0141387ddb3b01bffd66272bfb87dff55f6769cd1347d375976491a SHA512 cdf62837e50eee43531120a193ced8fa1a0df4da5577b01c153b90702caab4edcce35d6698c441e6dbb1e3a5946f57998c074b36375c516d58059c3658676368
+EBUILD Shapely-9999.ebuild 585 BLAKE2B cf9a5b6f9ed91b90573fab2c75ac0a1ba9f4d4521fb0861bb0433469185fb229e78b60a9a8084ffea9e84b069a8fc68bb389d59c4a762f32fa44de14e3ca8926 SHA512 c09c95c79b6e3d927fb0a3c91cdc2a6c2b8c2671c597196f62aa5aaaedfb4eb5820033664292fb10832718a2ca3481830557a05ab3ec0e1e91998067a96cdb43
 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 cf854fc3004c..39a40c586961 100644
--- a/sci-libs/Shapely/Shapely-1.3.0.ebuild
+++ b/sci-libs/Shapely/Shapely-1.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
 inherit distutils-r1
 
 DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely"
+HOMEPAGE="https://pypi.org/project/Shapely/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/Shapely/Shapely-1.3.2.ebuild b/sci-libs/Shapely/Shapely-1.3.2.ebuild
index cf854fc3004c..39a40c586961 100644
--- a/sci-libs/Shapely/Shapely-1.3.2.ebuild
+++ b/sci-libs/Shapely/Shapely-1.3.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
 inherit distutils-r1
 
 DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely"
+HOMEPAGE="https://pypi.org/project/Shapely/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
index 76f1895833ba..ea589527efbe 100644
--- a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
+++ b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely"
+HOMEPAGE="https://pypi.org/project/Shapely/"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
diff --git a/sci-libs/Shapely/Shapely-1.5.17.ebuild b/sci-libs/Shapely/Shapely-1.5.17.ebuild
index c963c87cf754..4dc69f498811 100644
--- a/sci-libs/Shapely/Shapely-1.5.17.ebuild
+++ b/sci-libs/Shapely/Shapely-1.5.17.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely"
+HOMEPAGE="https://pypi.org/project/Shapely/"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
diff --git a/sci-libs/Shapely/Shapely-9999.ebuild b/sci-libs/Shapely/Shapely-9999.ebuild
index 03f7c60c6506..8382fb7186ca 100644
--- a/sci-libs/Shapely/Shapely-9999.ebuild
+++ b/sci-libs/Shapely/Shapely-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely"
+HOMEPAGE="https://pypi.org/project/Shapely/"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
 
diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest
index 7f421d2edbeb..733585e03ec9 100644
--- a/sci-libs/adolc/Manifest
+++ b/sci-libs/adolc/Manifest
@@ -4,14 +4,8 @@ AUX adolc-2.5.0-pkgconfig-no-ldflags.patch 364 BLAKE2B a35ab92ca491110c390a4d0f9
 AUX adolc-2.5.2-dash.patch 5020 BLAKE2B e7ff9c003f2dc9b6804f3e95a54c1ce3e3a5cab786b46fa2a612a2066ba1bf238b951d3b0d589be7885290b92d3177eaab46eb14181d7b18686fea2d7381333b SHA512 3240473df5fc4aa03edb5d0a5c61cf086b76065400bb735cb1b994a2c28cd69e7a4e7be87fe1cb044a329a08c787777bf3c5276acaf4ce2a193f2f44bd05335e
 AUX adolc-2.6.2-dash.patch 4516 BLAKE2B 8db052472bd3051ed0b8b1a180aac4098862695cefeed0f0f94600d447b2ef5b888ba072613ea101ac1435569eb9d5bcba1aa64b23a0bc7cf01a4ef20d3f760b SHA512 9b904d8c0ab3c286af27b293b5ffe516b9c1da53169702f94a9213496b6626e1a587e8ab8d9d25b983872c1a97620a8d5386d9053ba1a4c973ef5e145f655bc5
 DIST ADOL-C-2.4.1.tgz 2210414 BLAKE2B f9b1fd7f0e619d811b29e077e436697dc8b5a388568d73b2db602e57f97cbb690a5b47a55c722ae45cc28698dd19949eddb9d02e11c87383191e217f012519bb SHA512 5e5135ca587d159510bf77338fdff3d324f4d32c4ec6f8cf64ddc92253b427b8ee26a30bc1d83fe18121bbfdc7454c3536f58849c0c335e1b240e39d46acdccc
-DIST ADOL-C-2.5.0.tgz 2313753 BLAKE2B 7c8f59a08c46e6af76e366332c154ddd2a2167910fbe30eccc51b002009f98117b82d5e80bd12baed6cfdf3333f63b0a940128e95f74a2ad92b4d2fbacb21c6f SHA512 e680565ed911bc15165c27281428c1daf35e95292dc3abc64aab6633068ec0d7e7ae626e692e0574b2c696a0c4aec2c79b2b02c3760acd2bd1b579a4c42d9585
-DIST ADOL-C-2.5.2.tgz 2320010 BLAKE2B de2eeb753c54dc3fa288845cb42e1e82e679096e9e22917ccb9b768347aaed57d97aafd0055098914c8308b90fb11777fc6fe15cb140bf482598f3ac78680dd3 SHA512 3d2ef6e42504de9e9c1b5777afda8ece83fa61ab7c22fd471dce6bcb74af0a789d37cd2a6c9c9ead13f6c78e07ba985e7d14e79bcdf35fa56f8e73a2411905b5
-DIST ADOL-C-2.6.2.tgz 2413458 BLAKE2B b448bcc49622c631315eb517442c2f3b9850eca6ab2f2d73fd39fdc71aa8aa02b8490881183fcf0529e2cc6fce3cecebe3a10d0c8b6589c146403a9f93eab820 SHA512 7825b57a06ea146b5095f3345592566887622e4a8b93bf8ef946083486652b5ecd6a44b7b5f1c7a5b5c45cfdb14d78ab2dd5f4d228114226046e99a46257f5be
 DIST ADOL-C-2.6.3.tgz 2416928 BLAKE2B 74e575a1a919bc2787be0c29deaac4b503c077cb06efdba3f2382f21abf1ed53e8cb5f41729dc39f9188e44460fa137a09cffdb296b5f92131153795f36fa83a SHA512 e3c44b1f8ab5211a8a3c3163124e35b6d1e9551672ab4944d983dd3117f609d512c1b08c61e535dc4d50089295ee565bec07aaca67aa88b57b17bc3906573262
 EBUILD adolc-2.4.1.ebuild 863 BLAKE2B e3455061dfd93d3fd14ae07051da5e3a99576d8e20d7ec5f28aad0daae9f0ef37dc0f4ba2565cf4edb96ffb7d07ad6055f06335302a787bd7e88e8c84fdebea1 SHA512 c409dd49db0d5c1043a50aae33d6dfd07e24c1f62f18abd4906ea7468944ec46f89d1e80be97af6c166b0cf1d00a2a38383555e7d1e76e062a136b32ab98006d
-EBUILD adolc-2.5.0.ebuild 990 BLAKE2B 1f743c3658c6a3c684efef162f16be0253306e2fc7bf40b1a25f3027cfc61e594e1cf288351a3582365135da0c42de2adf3e9a8787a236379c1695ee87b42a5f SHA512 7ffd2b636f10003e8adec6c7a935c78f16501db370d42613d69e7984b8e115f9d883417e84d05b572d5d4349c812e4f7ca56643e2d58e0d30949a3811ccf83b7
-EBUILD adolc-2.5.2.ebuild 1053 BLAKE2B 7b922600a38c8a13d4835feffc74367dfcbefe2e49ff6efc7e8b0484ed694af0be2bce1760eae15c23e0e3219f34f4c77ba8a2b703fc21b9e274bd9c62951f00 SHA512 bfdc3010c409ac7365ff8b9dfdb96c4ed2cf78989bdc0f793d496db81860131e88f526485d8613fa72a1936a5d76a3c5a648be855afb15be27d53bcf60ccfb27
-EBUILD adolc-2.6.2.ebuild 1093 BLAKE2B 203e4119a8b6fe8a5a62ab651effe0cf07798095d0fece9ae7ecc0dbd9ed40120efc21c98528f15b5a8052f81a71a6fae1af14241e12e0f4c2c462c4b4f4f2e1 SHA512 e5463934dd35be1828f937f2e36dee69667a8354128ccef478e23c01fd586bc760a047d2f08ec824445f44ada1f440bcf0a0a3377cff4a2c026d869b627dc506
-EBUILD adolc-2.6.3.ebuild 1098 BLAKE2B c3b1adeda30908f41db647b9212468e89ca17b6d58748efe27f1cf9a98f2d03f9c1d95a9a28c49164c3d6e6bd6109c7563be3cfa519a15725dea1e76191e2081 SHA512 115b5b68777e7d84c2e9811387bd1ecf925103214fdf9be6f936cb691eed9c8f827dc4a5a6a9fafebe1bdff8956e2cbb65f19b54b1d1fcd81739ddea7733f457
-EBUILD adolc-9999.ebuild 1236 BLAKE2B 873be76eba16c0ac0336513a609685cf2c02285343637a2e99e8ca790cd63fd536dae4b21b8994d87bb0c47acc9759a640f5224c57c48294e7480ac80d03e552 SHA512 86e6214629709111d6aaf31d4b5e9faeab0ed8ff8f5c42591a636754c18ab459e02efae12281e3a2b0c68777a6baa959d28be8ae77872dbb2f1b922380e12bf8
-MISC metadata.xml 651 BLAKE2B a39ef8fca1cccfc0289138b1904f8cfc993a8403879cc14d52c37eb2267b6376ce28ac04a4994c1aa6a419869172674c1e36bb6102ef1c1b2cda49d5c63acbe8 SHA512 bab109356a0cfc40b0c21518628774bdbb35874247fa71baf12a6755a41fc6d6cd5a8551ae568f3d24e84d7a5ef4026ea2cbda182724ed78d0d962b0c5a80c89
+EBUILD adolc-2.6.3-r1.ebuild 1210 BLAKE2B a2df716245349ff401294a70e78c9c1384cb26e3134b75b08bc16901880a4fcf02a7905d235c20c1d7c0661e44b375faab936b392fe6d99b373fcc214db8f747 SHA512 2e01ec011e1d58501657e4a751f8d86d1babe5f4f6c5d515fc237ce110c640a400e573e449d3a32fdacd73ffa0654f8086236abeb179ccc16d3b3df1ec80cc00
+EBUILD adolc-9999.ebuild 1348 BLAKE2B 58746a5b2cb032019741220c53c6ca87c55abec30e09fe80338462c4b6fde949899e056907fc77896794f906496461609c01647ccbb251020d0e76ace99425f4 SHA512 07c41d419b3b0da7e18af59de07cdef8e1f3d4db6a54e675590176a3202cbdea1f07985a16f9f99b47ac855c89d0aa2a7cbb191c2940cc2c9538f3cc78248355
+MISC metadata.xml 736 BLAKE2B ddc9935966f95c209568fca01f222894812328b0411a75ee3ff369220860c274d52280c39f916dfdf9fd30ee3a67134a1bdab19feba1bf35b0e2695fa4577a97 SHA512 00cb5d1b587dc4220507a52f2e979fbbeed9035e59e1de26781e33b16d6a16474ad4aeae45ea7a1b8de9193fbe0671ffdd19a07431c33e22ff5586c7216b0522
diff --git a/sci-libs/adolc/adolc-2.5.0.ebuild b/sci-libs/adolc/adolc-2.5.0.ebuild
deleted file mode 100644
index 8b54bd951b7b..000000000000
--- a/sci-libs/adolc/adolc-2.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-#AUTOTOOLS_IN_SOURCE_BUILD=yes
-
-inherit autotools-utils toolchain-funcs
-
-MYPN=ADOL-C
-
-DESCRIPTION="Automatic differentiation system for C/C++"
-HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="|| ( EPL-1.0 GPL-2 )"
-SLOT="0/1"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
-IUSE="mpi sparse static-libs"
-
-RDEPEND="mpi? ( sys-cluster/ampi:0= )
-	sparse? ( sci-libs/colpack:0= )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-no-colpack.patch
-	"${FILESDIR}"/${PN}-2.5.0-pkgconfig-no-ldflags.patch
-)
-
-src_configure() {
-	 local myeconfargs=(
-		 $(use_enable mpi ampi)
-		 $(use_enable sparse)
-		 $(use_with sparse colpack "${EPREFIX}"/usr)
-	 )
-	 autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
diff --git a/sci-libs/adolc/adolc-2.5.2.ebuild b/sci-libs/adolc/adolc-2.5.2.ebuild
deleted file mode 100644
index b625ae76398f..000000000000
--- a/sci-libs/adolc/adolc-2.5.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-#AUTOTOOLS_IN_SOURCE_BUILD=yes
-
-inherit autotools-utils toolchain-funcs
-
-MYPN=ADOL-C
-
-DESCRIPTION="Automatic differentiation system for C/C++"
-HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="|| ( EPL-1.0 GPL-2 )"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="mpi sparse static-libs"
-
-RDEPEND="
-	mpi? ( sys-cluster/ampi:0= )
-	sparse? ( sci-libs/colpack:0= )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-no-colpack.patch
-	"${FILESDIR}"/${PN}-2.5.0-pkgconfig-no-ldflags.patch
-	"${FILESDIR}"/${P}-dash.patch
-)
-
-src_configure() {
-	 local myeconfargs=(
-		 $(use_enable mpi ampi)
-		 $(use_enable sparse)
-		 $(use_with sparse colpack "${EPREFIX}"/usr)
-	 )
-	 autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
diff --git a/sci-libs/adolc/adolc-2.6.2.ebuild b/sci-libs/adolc/adolc-2.6.2.ebuild
deleted file mode 100644
index 52b9d2868659..000000000000
--- a/sci-libs/adolc/adolc-2.6.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs eutils
-
-MYPN=ADOL-C
-
-DESCRIPTION="Automatic differentiation system for C/C++"
-HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="|| ( EPL-1.0 GPL-2 )"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="mpi sparse static-libs"
-
-RDEPEND="
-	mpi? ( sys-cluster/ampi:0= )
-		sparse? ( sci-libs/colpack:0= )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-no-colpack.patch
-	"${FILESDIR}"/${PN}-2.5.0-pkgconfig-no-ldflags.patch
-	"${FILESDIR}"/${PN}-2.6.2-dash.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable mpi ampi) \
-		$(use_enable sparse) \
-		$(use_with sparse colpack "${EPREFIX}"/usr)
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files --all
-}
diff --git a/sci-libs/adolc/adolc-2.6.3.ebuild b/sci-libs/adolc/adolc-2.6.3-r1.ebuild
index eb2ddb931e3d..8e711996d79c 100644
--- a/sci-libs/adolc/adolc-2.6.3.ebuild
+++ b/sci-libs/adolc/adolc-2.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,12 +14,12 @@ SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
 LICENSE="|| ( EPL-1.0 GPL-2 )"
 SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="mpi sparse static-libs"
+IUSE="+boost mpi sparse static-libs"
 
 RDEPEND="
+	boost? ( dev-libs/boost:0= )
 	mpi? ( sys-cluster/ampi:0= )
-		sparse? ( sci-libs/colpack:0= )
-"
+	sparse? ( sci-libs/colpack:0= )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYPN}-${PV}"
@@ -37,9 +37,12 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--enable-advanced-branching \
+		--enable-atrig-erf \
 		$(use_enable mpi ampi) \
 		$(use_enable sparse) \
+		$(use_enable static-libs static) \
+		$(use_with boost) \
 		$(use_with sparse colpack "${EPREFIX}"/usr)
 }
 
diff --git a/sci-libs/adolc/adolc-9999.ebuild b/sci-libs/adolc/adolc-9999.ebuild
index c029efc2ea29..a792a5a65c13 100644
--- a/sci-libs/adolc/adolc-9999.ebuild
+++ b/sci-libs/adolc/adolc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,12 +23,12 @@ fi
 
 LICENSE="|| ( EPL-1.0 GPL-2 )"
 SLOT="0/2"
-IUSE="mpi sparse static-libs"
+IUSE="+boost mpi sparse static-libs"
 
 RDEPEND="
+	boost? ( dev-libs/boost:0= )
 	mpi? ( sys-cluster/ampi:0= )
-		sparse? ( sci-libs/colpack:0= )
-"
+	sparse? ( sci-libs/colpack:0= )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -44,9 +44,12 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--enable-advanced-branching \
+		--enable-atrig-erf \
 		$(use_enable mpi ampi) \
 		$(use_enable sparse) \
+		$(use_enable static-libs static) \
+		$(use_with boost) \
 		$(use_with sparse colpack "${EPREFIX}"/usr)
 }
 
diff --git a/sci-libs/adolc/metadata.xml b/sci-libs/adolc/metadata.xml
index 150156feaded..a8f7848ccb65 100644
--- a/sci-libs/adolc/metadata.xml
+++ b/sci-libs/adolc/metadata.xml
@@ -12,6 +12,7 @@
   the requested values.
 </longdescription>
   <use>
+    <flag name="boost">Use the boost allocator from <pkg>dev-libs/boost</pkg></flag>
     <flag name="sparse">Add support for sparse matrix algebra with <pkg>sci-libs/colpack</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index c182acfc6acd..1cd4b1f02045 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -2,6 +2,8 @@ AUX 4.2.7_p1-autotools.patch 3908 BLAKE2B 83041007560940adbce1bc6fc3c0cdb66d9b3e
 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
@@ -9,6 +11,7 @@ DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b42
 DIST hdf-4.2.8.tar.bz2 3027253 BLAKE2B b1291fce4b2f47a4b2f1d725cfc5314c4e451d2dd4ede242ef64a11490884ff991b800b06b7aabf574659117c6abde5cd26236d23d8f38e003c7df9271248d90 SHA512 d033007eff74d957572db8433f66e9df6fec44f67b28ddbad6e9a2d832b5504a29e9ecc5565d861b8308bab8d0dbfce19ae1e2ade0dd758d370a333819364c8e
 DIST hdf-4.2.9.tar.bz2 3126686 BLAKE2B 491fdad375bef944ed9f7040faba0e811b11019e1f51c5c3f874f29be07b945eb68af31cfce56db5e1f03f3bbd9e85320bed6e5f7f2b725676ead50dac022986 SHA512 99630177167f115f4a7f4424cf3fc77962c4eb46698f884d0e89acfe7d585aa659fd7cdf36a29246ae518675b07182223d4337a7d0aac6344ce21ccbed9aa390
 EBUILD hdf-4.2.11.ebuild 1598 BLAKE2B 6cc328bba07d7f5fd96dfc11576d8f89d17b8e4889d74210ef2ed5bfa5faf72f3200d74e8cfd8856c0658f9376139fde9261b03ffbdc51549fcc3d7113e4171d SHA512 e873ec4aec9c1890b1a658aae3e07c6acbd304b6f4e1e90aee2930222518eccc9539dd9a4c0182f4fb352ec5e693cae2f6897a0606c56ab8055f52422e73c488
+EBUILD hdf-4.2.13-r1.ebuild 1787 BLAKE2B 3b7caf81a92ff196bb1cd61295d73a972a22e5e82dc842a39ada96a25fb8ca0c7ba17c0e99138612f406bc86081ee24d5625c9da4f68b9a0a6a38b6df0d3d04f SHA512 71b32ef907661eda8d4279f579cdabe21d7da36ff2820383749c6052537097b9c0ca48ab94f0f03392fa60e8dccc6b32c88ca54d7a9eb6636e34fddbc0485357
 EBUILD hdf-4.2.13.ebuild 1670 BLAKE2B b0af1304dc0a3ea13dbac2094322e96cc0cf87dcaf2ac0e1700fa4dfb514d8e62869fd47b92c323d07736217498fd8ee74604563eef52f975d4f8858365e6d58 SHA512 1d86aa88ac7fd4f9b8037d3dc5a0c0c1f3b07bf85af3508bc6bd0d29608fe0f37a52cc99001c634ac4632f3cfe1750286ac95adfdaa6d827167ed3884d573aa7
 EBUILD hdf-4.2.8.ebuild 1333 BLAKE2B dd4a11a50035b4279c5460f8db46988a9b3786b9bd9bd24ff7aa806dcddf2a9baacc95a37f7a80a02b4e5fd0f84876d166c52aa98f6ecfb739f5a89432910b17 SHA512 87e14301b2f8ffed92013aafc9dce2ebd1ab127c7bbf1bfa2ed73de9e44a57130fe18d3db1dc2b23de03d73029aee114a521278da5d9e07853f6a2375224c74f
 EBUILD hdf-4.2.9.ebuild 1327 BLAKE2B 8d7d692ce5370dc405cbd3a81afa564b5ff59fdcdd21a6d9af44b468c72df2fd4672579ee0fd9e27521db714ecc958b28e47accee3b3c7366c56ce4bfddb12b0 SHA512 17b9ffe9ce05679f64f8bf87ad0ef69d45e6a07fee2745c9378e73d6538e00cd82e08395b272b98cf4933baa6e9ab8bf1d240b052dc991a4f5f8b2d74b3f5462
diff --git a/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch b/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch
new file mode 100644
index 000000000000..a4514ab267ec
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch
@@ -0,0 +1,13 @@
+Index: hdf-4.2.13/configure.ac
+===================================================================
+--- hdf-4.2.13.orig/configure.ac
++++ hdf-4.2.13/configure.ac
+@@ -676,7 +676,7 @@ case "$host" in
+   *) ;;
+ esac
+ 
+-if test "X$BUILD_XDR" != "Xyes"; then
++if test "X$BUILD_XDR" = "Xyes"; then
+     AC_TRY_LINK([
+     #include <rpc/types.h>
+     #include <rpc/xdr.h>], [xdr_int],
diff --git a/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch b/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch
new file mode 100644
index 000000000000..963388f66982
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch
@@ -0,0 +1,29 @@
+Index: hdf-4.2.13/configure.ac
+===================================================================
+--- hdf-4.2.13.orig/configure.ac
++++ hdf-4.2.13/configure.ac
+@@ -673,6 +673,9 @@ case "$host" in
+   *-pc-cygwin*)
+     LIBS="$LIBS -ltirpc"
+     CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc"  ;;
++  *-pc-linux*)
++    LIBS="$LIBS -ltirpc"
++    CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc"  ;;
+   *) ;;
+ esac
+ 
+@@ -703,6 +706,14 @@ if test "X$BUILD_XDR" != "Xyes"; then
+       HAVE_RPC="yes"
+       AC_CHECK_HEADER([rpc.h],[:], [unset HAVE_RPC])
+       AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC])
++      if test -z "$HAVE_RPC"; then
++        AC_MSG_ERROR([couldn't find tirpc library])
++      fi
++      ;;
++     *-pc-linux*)
++      HAVE_RPC="yes"
++      AC_CHECK_HEADER([rpc/rpc.h],[:], [unset HAVE_RPC])
++      AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC])
+       if test -z "$HAVE_RPC"; then
+         AC_MSG_ERROR([couldn't find tirpc library])
+       fi
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
new file mode 100644
index 000000000000..331ad8938e5a
--- /dev/null
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 toolchain-funcs autotools flag-o-matic
+
+MYP=${P/_p/-patch}
+
+DESCRIPTION="General purpose library and format for storing scientific data"
+HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
+SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
+
+SLOT="0"
+LICENSE="NCSA-HDF"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples fortran szip static-libs test"
+REQUIRED_USE="test? ( szip )"
+
+RDEPEND="
+	net-libs/libtirpc
+	sys-libs/zlib
+	virtual/jpeg:0
+	szip? ( virtual/szip )"
+DEPEND="${RDEPEND}
+	test? ( virtual/szip )"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.11-fix-szip-detection.patch
+	"${FILESDIR}"/${PN}-4.2.11-enable-fortran-shared.patch
+	"${FILESDIR}"/${PN}-4.2.13-fix-xdr-configure.patch
+	"${FILESDIR}"/${PN}-4.2.13-linux-tirpc.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
+	eautoreconf
+	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--enable-production=gentoo \
+		--disable-netcdf \
+		$(use_enable fortran) \
+		$(use_enable static-libs static) \
+		$(use_with szip szlib) \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files --all
+	dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
+	cd "${ED}"usr
+	if use examples; then
+		mv  share/hdf4_examples share/doc/${PF}/examples || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -r share/hdf4_examples || die
+	fi
+	mv bin/ncgen{,-hdf} || die
+	mv bin/ncdump{,-hdf} || die
+	mv share/man/man1/ncgen{,-hdf}.1 || die
+	mv share/man/man1/ncdump{,-hdf}.1 || die
+}
diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest
index 18148d018260..176a95d07e6f 100644
--- a/sci-libs/hypre/Manifest
+++ b/sci-libs/hypre/Manifest
@@ -1,5 +1,9 @@
 DIST hypre-2.11.1.tar.gz 8054149 BLAKE2B 207d382b08ac67e09d55e323b86f84a0a7247baf21275c8774bf555c99401aa28f2ae6d4010a63d0c299a702a7b93a85ea98aed51ea5c8c8b31e4587760895d1 SHA512 4266c1b5225bcc97781246475100382f4929d7c918c854570a36b90602e8f111a4893cd1c93b95c68305c851898b970dd92ac173efe9211be5bb914d3c3c5d83
+DIST hypre-2.11.2.tar.gz 8077407 BLAKE2B d51a40d015f03757425da1fbc113a2647c267d1d47bebe343f2cd84983349cdbdb0e5b51a3c253edcab3d54f352158f0e263afcce592157b64202af471d642c6 SHA512 a06321028121e5420fa944ce4fae5f9b96e6021ec2802e68ec3c349f19a20543ed7eff774a4735666c5807ce124eb571b3f86757c67e91faa1c683c3f657469f
+DIST hypre-2.14.0.tar.gz 7312329 BLAKE2B 93de48bdd05c383c74fb1b3b25ddcd5830be099aa7557262547932e17eba524c25ff69ff94d10f29ffdabfef9c05281fd485a7c9b999141f2488ae4fc0238736 SHA512 c7b59fb7ab1cc906e339fcc00603898e44234a65aa74600f740bc825aa94aa66ff0cbd4bd4b7f339c0d28ff5bd9494f15b57f2017a22348fee14b4e8333f1e6c
 DIST hypre-2.9.0b.tar.gz 9053035 BLAKE2B 1bde86f88545d24617673a0c0c8c7458399bd7220a0ffe25ab4c9772e1c802c9b51ceaf716e843e236df1fd673bbd171642726590efdbb100821c3d3e54bacd7 SHA512 6856f2c80eaf669258d73a36a59c0fd0f43e20a5b2e633b6aefbccf41f5217ea821a6201dadc0de2b17a039ba9f53d98031f0b091e3db552cc5251a4f766acb8
 EBUILD hypre-2.11.1.ebuild 2895 BLAKE2B 93d38f17f0536214b2163de4b9cbf31d36bbcf0ecc50eeccd34fb3aa42c07e894bb6777913a33939bc3650da96b9c88d4ee1ee4da8b257eb05948c26de6d6fac SHA512 d72b5f812193840e828766b66305102101a43a289190af7832fe30714353b0c0dcc872905674ac1286f999873869c3b62e388e767f5867ebd0efa16ff0338f2d
+EBUILD hypre-2.11.2.ebuild 2895 BLAKE2B 93d38f17f0536214b2163de4b9cbf31d36bbcf0ecc50eeccd34fb3aa42c07e894bb6777913a33939bc3650da96b9c88d4ee1ee4da8b257eb05948c26de6d6fac SHA512 d72b5f812193840e828766b66305102101a43a289190af7832fe30714353b0c0dcc872905674ac1286f999873869c3b62e388e767f5867ebd0efa16ff0338f2d
+EBUILD hypre-2.14.0.ebuild 2929 BLAKE2B d3e32bd55d00422686ef432e4ec4c63fe133342494f29255c71d86f98ed31a3eee6fdd66b68f32ab194420197994f11d9cc767675afe65367cd85bb7fefbddab SHA512 9024f6db0d7f7cd460a6a639915d3aa7f73d6048a0ecc70fe88b928cf445d6398a206822cade66b237e9fdbee2ad1b6e443c0870ad3fb67532c05409406f98d6
 EBUILD hypre-2.9.0b.ebuild 1883 BLAKE2B 0f7d1d1b5f760ab851369000f6aed343bd20f34e88ebd6de2b3963deabe1acab2d03cd02176f940a1fc11e941bf5e8086562861ac3c06a3dc3c1aebbab065384 SHA512 3dc2f99aeaaf4e0a723d21302e9664eaa2bea69287ee7554ed0e9894d58effb251727cd329e003547525b91cfe48ec6c62fec2dbec64d12de9531defde5f9cb3
 MISC metadata.xml 689 BLAKE2B 81168f6d150dc65e74bbae7b73657d2ef6c5de0cfcb616b9f1dd756e9734e10823c1468cc1725f8681dfb71d529c89c958e751100aa9727dcc28e36c8f27fd2b SHA512 fb10f8f67754f103b109fa7696e66e02f6a66ff74472341f3e2dcb27957646fd4140594c9eee489c3d47f1985bf8a122b48269c6a6168ddbfcdcd0ffe2a415e2
diff --git a/sci-libs/hypre/hypre-2.11.2.ebuild b/sci-libs/hypre/hypre-2.11.2.ebuild
new file mode 100644
index 000000000000..f6aa3e5337be
--- /dev/null
+++ b/sci-libs/hypre/hypre-2.11.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit cmake-utils fortran-2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="Parallel matrix preconditioners library"
+HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods"
+SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples fei fortran int64 openmp mpi"
+
+RDEPEND="
+	sci-libs/superlu:=
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( CHANGELOG COPYRIGHT README )
+
+# 2.11.1: fei and mli wrappers still buggy with big integers
+REQUIRED_USE="int64? ( !fei )"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] &&\
+		use openmp && [[ $(tc-getCC)$ == *gcc* ]] && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && \
+		   use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp ; then
+		ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
+		die "Need an OpenMP capable compiler"
+	fi
+}
+
+src_prepare() {
+	default
+	# link with system superlu and propagate LDFLAGS
+	sed -e "s:@LIBS@:@LIBS@ $($(tc-getPKG_CONFIG) --libs superlu):" \
+		-e 's:_SHARED@:_SHARED@ $(LDFLAGS):g' \
+		-i src/config/Makefile.config.in || die
+	sed -e '/HYPRE_ARCH/s: = :=:g' \
+		-i src/configure || die
+	# link with system blas and lapack
+	sed -e '/^BLASFILES/d' \
+		-e '/^LAPACKFILES/d' \
+		-i src/lib/Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX
+	append-flags -Dhypre_dgesvd=dgesvd_
+	use openmp && [[ $(tc-getCC)$ == *gcc* ]] && \
+		append-flags -fopenmp && append-ldflags -fopenmp
+	use mpi && CC=mpicc FC=mpif77 CXX=mpicxx
+
+	cd src
+
+	# without-superlu: means do not use bundled one
+	econf \
+		--enable-shared \
+		--with-blas-libs="$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's/-l//g')" \
+		--with-blas-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L blas | sed -e 's/-L//g')" \
+		--with-lapack-libs="$($(tc-getPKG_CONFIG) --libs-only-l lapack | sed -e 's/-l//g')" \
+		--with-lapack-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L lapack | sed -e 's/-L//g')" \
+		--with-timing \
+		--without-superlu \
+		$(use_enable debug) \
+		$(use_enable openmp hopscotch) \
+		$(use_enable int64 bigint) \
+		$(use_enable fortran) \
+		$(use_with fei) \
+		$(use_with fei mli) \
+		$(use_with openmp) \
+		$(use_with mpi MPI)
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/src/lib:${LD_LIBRARY_PATH}" \
+				   PATH="${S}/src/test:${PATH}" \
+				   emake -C src check
+}
+
+src_install() {
+	emake -C src install \
+		  HYPRE_INSTALL_DIR="${ED}" \
+		  HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
+		  HYPRE_INC_INSTALL="${ED}$/usr/include/hypre"
+	use doc && dodoc docs/*.pdf
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r src/examples
+	fi
+}
diff --git a/sci-libs/hypre/hypre-2.14.0.ebuild b/sci-libs/hypre/hypre-2.14.0.ebuild
new file mode 100644
index 000000000000..a7d775a6c575
--- /dev/null
+++ b/sci-libs/hypre/hypre-2.14.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit cmake-utils fortran-2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="Parallel matrix preconditioners library"
+HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods"
+SRC_URI="https://github.com/LLNL/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples fei fortran int64 openmp mpi"
+
+RDEPEND="
+	sci-libs/superlu:=
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( CHANGELOG COPYRIGHT README )
+
+# 2.11.1: fei and mli wrappers still buggy with big integers
+REQUIRED_USE="int64? ( !fei )"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] &&\
+		use openmp && [[ $(tc-getCC)$ == *gcc* ]] && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && \
+		   use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp ; then
+		ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
+		die "Need an OpenMP capable compiler"
+	fi
+}
+
+src_prepare() {
+	default
+	# link with system superlu and propagate LDFLAGS
+	sed -e "s:@LIBS@:@LIBS@ $($(tc-getPKG_CONFIG) --libs superlu):" \
+		-e 's:_SHARED@:_SHARED@ $(LDFLAGS):g' \
+		-i src/config/Makefile.config.in || die
+	sed -e '/HYPRE_ARCH/s: = :=:g' \
+		-i src/configure || die
+	# link with system blas and lapack
+	sed -e '/^BLASFILES/d' \
+		-e '/^LAPACKFILES/d' \
+		-i src/lib/Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX
+	append-flags -Dhypre_dgesvd=dgesvd_
+	use openmp && [[ $(tc-getCC)$ == *gcc* ]] && \
+		append-flags -fopenmp && append-ldflags -fopenmp
+	use mpi && CC=mpicc FC=mpif77 CXX=mpicxx
+
+	cd src
+
+	# without-superlu: means do not use bundled one
+	econf \
+		--enable-shared \
+		--with-blas-libs="$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's/-l//g')" \
+		--with-blas-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L blas | sed -e 's/-L//g')" \
+		--with-lapack-libs="$($(tc-getPKG_CONFIG) --libs-only-l lapack | sed -e 's/-l//g')" \
+		--with-lapack-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L lapack | sed -e 's/-L//g')" \
+		--with-timing \
+		--without-superlu \
+		$(use_enable debug) \
+		$(use_enable openmp hopscotch) \
+		$(use_enable int64 bigint) \
+		$(use_enable fortran) \
+		$(use_with fei) \
+		$(use_with fei mli) \
+		$(use_with openmp) \
+		$(use_with mpi MPI)
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/src/lib:${LD_LIBRARY_PATH}" \
+				   PATH="${S}/src/test:${PATH}" \
+				   emake -C src check
+}
+
+src_install() {
+	emake -C src install \
+		  HYPRE_INSTALL_DIR="${ED}" \
+		  HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
+		  HYPRE_INC_INSTALL="${ED}$/usr/include/hypre"
+	use doc && dodoc docs/*.pdf
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r src/examples
+	fi
+}
diff --git a/sci-libs/io_lib/Manifest b/sci-libs/io_lib/Manifest
index 779d276eae23..43ef0a60cda2 100644
--- a/sci-libs/io_lib/Manifest
+++ b/sci-libs/io_lib/Manifest
@@ -1,11 +1,3 @@
-DIST io_lib-1.10.1.tar.gz 254965 BLAKE2B 065c6c3dbb0c6c09c448270e9093372951b008a7eb7812b69fde6433990304b564a87a307166412e67eeb2954e7d3ebda4fc608e23adcfb266e1958da997fd4c SHA512 78cae4cf6836c9ad9e95fe7210e475f1ec61a963065a277236acb815df0c8c08f8afad5f0b984a7f8cd7525aacb6e64119978a32d440b7789235929a5a72f480
-DIST io_lib-1.11.2.1.tar.gz 385229 BLAKE2B 725fa5d9f83d842a6c9f29f2ed7fca842ed912facde4fe34a34e4920b8cc6a7d1b523f3ef0780156c19d5d83054d6c2bd6161a5ac4a7f8a9db733a1ffae6138b SHA512 56c2f76bd8ea1d6a1e03bce005a03df73b8b3397e482e1537620fda9fadd9128bf2fe6789283dc75a77ed5f8424e31a2f81f2a54dbb2b93886b52eb0613843b8
-DIST io_lib-1.12.5.tar.gz 782430 BLAKE2B 5f159deaddadf6eccb34fa3afa4623b1cb5455f10912c81a4a0849df1eaba79323d7bcb6ed8e3eb35f93b4eaecb2c104b0b8641517a0c1341c6cb91354db12bb SHA512 414406fc26e0c991c0390bfa5d28d7682a458efbaa51f58df699665e6ff6f9ac3bda724508bf3b5f5cf666983bc2efec53ff719783fe14f54e79d54ca20158d0
-DIST io_lib-1.13.2.tar.gz 1579795 BLAKE2B 478e9f95b2b9a8734d0b4f08be6bc68a85434a8bf17e68dc3c71dce7e11486a9e87d9ad5c8171e3649f779ffd5e204cf997b103dafee1905b820baeed1570eff SHA512 2192c93a730f5fb6658f75fe6688605c813fcbeef8765d6b372c11a09e746536fdba7fcd20bc95bae3b11dfed0cd1bb52d6dd40cf33747164da91cb94a6ebcf9
 DIST io_lib-1.14.7.tar.gz 2177248 BLAKE2B 6c1a8133a0f0edd253bf0c475cb206294f95659efc82679034f36d8eb963e4020b953f18c0ccfefa6dad61daffbd054513d36a7bdf0e725b8c5a943d98e0d567 SHA512 c1021f0a0dd284e8abbf9cc1dd11995550cf6621455c873effaab56b573fee053ed9e55879003c735c26c403a0aa34d75be87d337cd515cc912706abe7e08665
-EBUILD io_lib-1.10.1.ebuild 693 BLAKE2B 0c9c2694033a67f9f76a981012883a4a267bdfdee2e6c33230df339793ee38a42142638319ada81241b2d2f197e2aa602f9a60b1f130c82310da6091a32efc7f SHA512 a493a5fe3d98b3ddf62469c6b8368b8a6b4a2028e331f23f3a51e0dc59d71b6cb95b81491b95d3dd5a8180c45ea5a2279672c3fc97e094a1cea0ba86b25034de
-EBUILD io_lib-1.11.2.1.ebuild 774 BLAKE2B 551eadde8a9ef991b168b68910b2773029d07cbe0f0ef9fc45af8e73dc750803328ca09a5dbef9609fb31e2f0f1a66a48107f9804c34f0cadaa82d535ba10f1b SHA512 01656bd0f015ce2e32d5f825d40fd138da7a28181fc5e4ae7cbbfd1dd7e8c0d09e7372b260e42bded05ffb91f32d5fa052df45370f49daafcd4e683594207ab3
-EBUILD io_lib-1.12.5.ebuild 809 BLAKE2B ca48be34d8cc419d3f3188b05bde797a5a40d5bcb209e0efe88c63b641a675ab2e3ffd4922a327ba434a09e03ce1dc79985db323e6b04d6b6775d50609e4defa SHA512 de26016687c0aa4c2600fd13a19747101faff8c47be9a8467f02b4e57ac1ecfecbbf3ca8c9f62f899d62946a668acf0fa6c1c4db4059ff003e102cdf22b0dfbc
-EBUILD io_lib-1.13.2.ebuild 795 BLAKE2B 33f38cbd69c5a165bb2faabf089879d230a8f733d3ea45813f37ffdbd37058ef32aff9d8413a5fbfdbdd8b98686ef2fdb9b759aa7e7e63a3a3db0ec3167b83bd SHA512 caf84e31cb8f9e595870b8081cdb26b245c0f3327723412f880b9b8834668660aad93d658d48a8bb6344c8b7290a580b1f5ee6e63003876ec8bbc2585d1d19a9
-EBUILD io_lib-1.14.7.ebuild 719 BLAKE2B d5ece6ae4168887a400af648652c0014abd8680f5a3cc4efdd702db10f746aa24538501a5ee8b958176e9d4deddcd2dfddd63ea5883e03e9bb6353959ef308fd SHA512 86dec29c999c4faca9da70f7dbfbea4c3a079ba04ab57655e1d4a550974696654c39ad42f004fd1b7a470d1a67ca801b72b72b38c7331c477d6e4c86e64e77e0
-MISC metadata.xml 635 BLAKE2B b58e10318bad52920427ecb8cbcaa8d0f9f85fc15e957361710f89514a69190d358a0089fa026f00b3a40dac2ab617cbf31b6c83d3e013395d777f72608784ef SHA512 92cb3d08f968408ec914647d27f84c7e70cfeec650efd645f2631982af86b776cb91fd0963a2e96ccef1eb16e5867ef796fc19aa9f674f547c424803458243a7
+EBUILD io_lib-1.14.7.ebuild 805 BLAKE2B 2c4344fdc6ae895c2e8ade9baa31424bd98487b68a683c8cc7a149aa9924499cfc9e5201888c4eb59f6ff7cb8a3f997261304826ca26b1bca76846c86cb6b011 SHA512 dab3698a96a8cab0bcdf13bc5a907615524051dcf0e312128c82d4cb7c6dbc7fb60b0c127d286604d1eb44fcf48f717ffee2fc23c56e1b2e9f36f3f603d7f8f7
+MISC metadata.xml 625 BLAKE2B d382a7ef928c9164eb879f8b178ee14a44c1caeec61357eb6cfbdd507f9ebc8a68fd34aed0cecbc7923eed432fac190ec4fdb19c0db6e29f660f4aa02699e88b SHA512 925fc23e12ed16087cde34f7ce857e9f513430a3ccf2d992b99583ba08fb3ade154d1a941efe779b821c59c7820836b7aab65a72ed119aac6d9f8ead1a91ddd9
diff --git a/sci-libs/io_lib/io_lib-1.10.1.ebuild b/sci-libs/io_lib/io_lib-1.10.1.ebuild
deleted file mode 100644
index 790405a5fc6e..000000000000
--- a/sci-libs/io_lib/io_lib-1.10.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="A general purpose trace and experiment file reading/writing interface"
-HOMEPAGE="http://staden.sourceforge.net/"
-SRC_URI="mirror://sourceforge/staden/${P}.tar.gz"
-LICENSE="staden"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86"
-IUSE=""
-
-# Prototype changes in io_lib-1.9.0 create incompatibilities with BioPerl. (Only
-# versions 1.8.11 and 1.8.12 will work with the BioPerl Staden extensions.)
-DEPEND="!sci-biology/bioperl"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	dodoc CHANGES README || die "Failed to install documentation."
-}
diff --git a/sci-libs/io_lib/io_lib-1.11.2.1.ebuild b/sci-libs/io_lib/io_lib-1.11.2.1.ebuild
deleted file mode 100644
index b793f7eabbb4..000000000000
--- a/sci-libs/io_lib/io_lib-1.11.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="A general purpose trace and experiment file reading/writing interface"
-HOMEPAGE="http://staden.sourceforge.net/"
-SRC_URI="mirror://sourceforge/staden/${P}.tar.gz"
-LICENSE="staden"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-# Prototype changes in io_lib-1.9.0 create incompatibilities with BioPerl. (Only
-# versions 1.8.11 and 1.8.12 will work with the BioPerl Staden extensions.)
-DEPEND="!sci-biology/bioperl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-1.11.2"
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	dodoc ChangeLog CHANGES README docs/{Hash_File_Format,ZTR_format} || \
-			die "Failed to install documentation."
-}
diff --git a/sci-libs/io_lib/io_lib-1.12.5.ebuild b/sci-libs/io_lib/io_lib-1.12.5.ebuild
deleted file mode 100644
index 00ac1a525aff..000000000000
--- a/sci-libs/io_lib/io_lib-1.12.5.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
-
-DESCRIPTION="General purpose trace and experiment file reading/writing interface"
-HOMEPAGE="http://staden.sourceforge.net/"
-SRC_URI="mirror://sourceforge/staden/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-# needs stadden, not in portage
-RESTRICT=test
-# Prototype changes in io_lib-1.9.0 create incompatibilities with BioPerl. (Only
-# versions 1.8.11 and 1.8.12 will work with the BioPerl Staden extensions.)
-#DEPEND="!sci-biology/bioperl"
-DEPEND="net-misc/curl
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	dodoc docs/{Hash_File_Format,ZTR_format}
-}
diff --git a/sci-libs/io_lib/io_lib-1.13.2.ebuild b/sci-libs/io_lib/io_lib-1.13.2.ebuild
deleted file mode 100644
index cf0f35094a51..000000000000
--- a/sci-libs/io_lib/io_lib-1.13.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="General purpose trace and experiment file reading/writing interface"
-HOMEPAGE="http://staden.sourceforge.net/"
-SRC_URI="mirror://sourceforge/staden/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-# needs stadden, not in portage
-RESTRICT=test
-# Prototype changes in io_lib-1.9.0 create incompatibilities with BioPerl. (Only
-# versions 1.8.11 and 1.8.12 will work with the BioPerl Staden extensions.)
-#DEPEND="!sci-biology/bioperl"
-DEPEND="
-	net-misc/curl
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	autotools-utils_src_install
-	dodoc docs/{Hash_File_Format,ZTR_format}
-}
diff --git a/sci-libs/io_lib/io_lib-1.14.7.ebuild b/sci-libs/io_lib/io_lib-1.14.7.ebuild
index f1475e779918..61c5170f0012 100644
--- a/sci-libs/io_lib/io_lib-1.14.7.ebuild
+++ b/sci-libs/io_lib/io_lib-1.14.7.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="General purpose trace and experiment file reading/writing interface"
 HOMEPAGE="http://staden.sourceforge.net/"
 SRC_URI="mirror://sourceforge/staden/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/11"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
-DEPEND="
-	net-misc/curl
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	net-misc/curl:=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
 
 # tests fails and might need sci-biology/staden from
 # the science overlay
-
 RESTRICT="test"
 
 src_configure() {
@@ -30,6 +29,9 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files
 	dodoc docs/{Hash_File_Format,ZTR_format}
+
+	if ! use static-libs; then
+		find "${D}" \( -name '*.la' -o -name '*.a' \) -delete || die
+	fi
 }
diff --git a/sci-libs/io_lib/metadata.xml b/sci-libs/io_lib/metadata.xml
index a88279ec5d96..e4325132e2d2 100644
--- a/sci-libs/io_lib/metadata.xml
+++ b/sci-libs/io_lib/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription>
-  io_lib is a library of file reading and writing code to provide a
-  general purpose trace file (and Experiment File) reading interface. The
-  programmer simply calls the (eg) read_reading to create a "Read" C structure
-  with the data loaded into memory.
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">staden</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>
+		io_lib is a library of file reading and writing code to provide a
+		general purpose trace file (and Experiment File) reading interface. The
+		programmer simply calls the (eg) read_reading to create a "Read" C structure
+		with the data loaded into memory.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">staden</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/jama/Manifest b/sci-libs/jama/Manifest
index 0efff9cb717f..8250994f2c4e 100644
--- a/sci-libs/jama/Manifest
+++ b/sci-libs/jama/Manifest
@@ -1,4 +1,4 @@
 DIST jama102doc.zip 61085 BLAKE2B a5ce9d2a431d1e9a98e50e974068b7c0846c85cdef719dc37535bdd6731f0f8deb9329ce5ad4d11393b36e1fa900644ba7a48029783692015e045dae5913abf2 SHA512 0082e632ce0a9e06e225013a8079eb77311f62f7e1b1f2a8d05c18f6e1415dfb1db271bef102aed5ea78b841e8b89e191a452014ee0eed17517d7f45e101d74c
 DIST jama125.zip 16277 BLAKE2B aa62cd3983fe32d96cf8db8569e32a08d6c78f90840d206778295d408a66de2055cd4e5dcf8547b79ec8ce92627430f2f3b63745ea318eba4612322183840340 SHA512 773cbf98de2384df5429db3ecc117304934a1de1c24ee1f342ededae8bdc9747e3bb5ec0d3cd7fde62b2ee13ee2e0c6e86f6b30c7082036bd5b224b76592b4f9
-EBUILD jama-1.2.5.ebuild 622 BLAKE2B 6f1cae5e6f13ecb2e76b38f745656596cc43d9f90fef7d1a22e03749de3155798215fc8b81a2aaa127603e84619c301d9492ffa2936c8979034d762720db19ea SHA512 bda3d77977801a312389fae48bff4ce9918cbed51a2c98216bb28947bce32bcd9bec0df5e267847f73259cf2386e41e7f4d3e28f0f61632fc27e1c2d79303dce
+EBUILD jama-1.2.5.ebuild 625 BLAKE2B c66564288aaac47d8f6313b6d516deb40ee1d14cacdc8486ffc7ab3844855cf9a198f2974a982bb0ecc226972524bae00fe9159d0535a06300aa0cbf65682316 SHA512 82ccf43e2b4e684979eb9bf8b0e6b943882b8a5e54d08ffed39d648cc87afc01b82f1b7adad4ab9e2fc3ccda7907f19f6efcea1da682a3c447ac7f65d3295078
 MISC metadata.xml 581 BLAKE2B ed67bb7bb241f00f8c165ad4403a7395d1c8a40dcaabd388613d03d313fb710110ab74a5575b73fdc7486031d2d4d6edcd224361c2cf86b54b54776dbfd20faf SHA512 47ee64f86340ada0aaa3ab76d49d9f648f0f78b5adaad3e7cd35a31e0f13b487f565d4e0289f2093a34dc695c1400c1363818ccdbfe787084c6dfff642969123
diff --git a/sci-libs/jama/jama-1.2.5.ebuild b/sci-libs/jama/jama-1.2.5.ebuild
index 232208b2534d..a9db9225bd5a 100644
--- a/sci-libs/jama/jama-1.2.5.ebuild
+++ b/sci-libs/jama/jama-1.2.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 inherit versionator
 
 MYP="${PN}$(replace_all_version_separators '')"
@@ -14,7 +16,6 @@ SRC_URI="http://math.nist.gov/tnt/${MYP}.zip
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
 IUSE="doc"
 
 DEPEND="app-arch/unzip"
@@ -23,7 +24,8 @@ RDEPEND="sci-libs/tnt"
 S="${WORKDIR}"
 
 src_install() {
-	insinto /usr/include
-	doins *.h || die
-	use doc && dohtml doxygen/html/*
+	doheader *.h
+
+	use doc && HTML_DOCS=( doxygen/html/. )
+	einstalldocs
 }
diff --git a/sci-libs/netcdf-cxx/Manifest b/sci-libs/netcdf-cxx/Manifest
index b8054bf9f402..87dd1a481db5 100644
--- a/sci-libs/netcdf-cxx/Manifest
+++ b/sci-libs/netcdf-cxx/Manifest
@@ -1,7 +1,9 @@
 AUX netcdf-cxx-4.2-config.patch 829 BLAKE2B cd4285ce14647bc1822ac474b3a632fcacfb377d22e34be931741f67b4c071866689311d6d40e9cd86866b5c396605f2ec8e53a2308344ed201fccdf11722789 SHA512 80d0a436103c8408898c065079f3988f706505bace1567a9eff1f5964cac3a09a97f8449b9dcd5bd994d1e3c6e9dfb646d8fcdfb0c5f659cdc64e0800234810f
 DIST netcdf-cxx-4.2.1.tar.gz 456547 BLAKE2B e973f064ad40c0d0cb76766f3b1639d16ed7eaae73d8e55db011645fc0d4e6f8949a60aeb9d47a4f8e88b3c5b2d486d42442e417908a2194b8b9a5e720ba2ff5 SHA512 d51ab1cbda74db5f7b074799d2407d0214d1c920af780ae3bb7a47b3708e45f721be7eec61902e035968a9df5019a7b2b5a10f236f6bab4cb47a26e4e7867adb
 DIST netcdf-cxx-4.2.tar.gz 703482 BLAKE2B a6727b7305204d2b53e6ee951c8165b03cd07f14e5d59a306445481272d0e10eb077e4bc62a2586c57652cb8273b9098ed77836f9023817d8a9e6ef51ac2cfe8 SHA512 347ddbc518ac2186868d69417342e5146e285fc3a88f7c55edc33063f5c9a6647af7e512a03b9b6a8f67a448b85a1edcdde5df707b893f6a1527821cfd78e643
+DIST netcdf-cxx-4.3.0.tar.gz 985897 BLAKE2B 89cfd85764ff8fc730c7cb4187df21a4245cd932bcf86df4edf36eb7ae636906eaafc25cfcbb3dd58bc1d346edacd7f80daa3be9a544d5d777d32ad115cfd00f SHA512 8e77333c979513721209e6b3fde31c298e18a45d7ea08123056e8120469eb8c4024d71289fab2b9182ee19ee7b6ad22bd133525bef048a497ede4aa2e9017465
 EBUILD netcdf-cxx-4.2-r300.ebuild 608 BLAKE2B 53d6866aebf2b8662d09ff60867380354a0042ce38200a15b37fba020542accdd8d724e406be7bd3d3a1f2884bdbf86dc5e54b4da1591e611558a41a0e882ea2 SHA512 a916e243fabe91c34acd9db64e650b4ddc0a29c5130245417ba9891c9a25b9d57a591ea6f4c39e0e3baf24fc468329d4523aba751879967b5b5bc1a1826fb300
 EBUILD netcdf-cxx-4.2.1-r1.ebuild 724 BLAKE2B 027c6fcaa5b8a2e9aa26cd48e0602a4681dc8d18c176c1daed685366fc6dc8a7d620169b9069d27599fafbd18c87a66ec2fa037c7e5529bf3116a67862e5fd88 SHA512 f26e47e42927b90eb36a070fe986c4ac07bf0b548c4213adfbdcf0547c5fef3d31f8632629ffb780bd8709c83f1fe03c043d4d3c441112b1174f8db973a0f89d
 EBUILD netcdf-cxx-4.2.1.ebuild 753 BLAKE2B f0f0c56564da58e2d9f156e1905044744d8bbf021c4ba94303001ec27315aff720f09bcf683426f1e1dfe223d402b55d6017fb46e074417c7c0d71cc90fb8467 SHA512 62499af025029b60dfe6798a37d7a662e48146bc3b1cc999bc49a544f0d8be16b11296c386681486999a961c5a047c59f8f23ac68a102d025afffc07a7746978
+EBUILD netcdf-cxx-4.3.0.ebuild 673 BLAKE2B ecc4673cbe1175058d0b15cdde0abfb1fbbde482c5069954cf81b080e1f3f9d2f76dc414a3e919085524e15f43a2bbf92efdf76aeb9133f3ec4c1feb984fe323 SHA512 a4494434b4c07d8f24e3b0ee188d4550d31c2dd9250a9cd4e6999e6a7a53224ff2da63bee67231a62d34d4dfed7936fc1a9d8fa8428cfe96ec168505ad932f25
 MISC metadata.xml 838 BLAKE2B 7dfb894eff8881120e319f30baf54c41a04a1822f5d7c4db5a90cae56cdd89914ef938c1ad39601d3573d06b419c93d50efe8e563c002473c4a0b3c4f079d426 SHA512 7db14bcbc67509b05f00dcd0e0ee33281ad1d77e566c1de0362058d0fb7c3d2b82430377fb5df4bb09c3e0b9c3fee0d8ddbd9861a24e4b13e70b1151acb26c5b
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild
new file mode 100644
index 000000000000..3b997cf9c659
--- /dev/null
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MYP=${PN}4-${PV}
+
+DESCRIPTION="C++ library for netCDF"
+HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UCAR-Unidata"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples static-libs"
+
+RDEPEND=">=sci-libs/netcdf-4.2:=[hdf5]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MYP}"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use examples && dodoc -r examples
+	prune_libtool_files
+}
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index e5521538f3f1..61daa9c6ee13 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -2,7 +2,9 @@ AUX netcdf-4.3.2-HDF5-1.8.13+-compat.patch 5258 BLAKE2B ef4afcaf5f9139c6db2898e8
 DIST netcdf-4.3.2.tar.gz 5013938 BLAKE2B 7acef16284bf8586750bdeb03da3e2e2a1c543b80423269eb2542d179e1b52dd51e30584a13f604e75c295ae9ff993c814183fbb5a78ad1141c62f8dbdda6525 SHA512 9cb9c761bf1e17a37601c37000fdc0bb654afcf111e5ac2fb7dcf037c6aa827e66beb29d5c661edc50ea3f84849f3dee387aab9e85ef81a9b6ca3f36e45debdd
 DIST netcdf-4.4.0.tar.gz 17487357 BLAKE2B 45c3ea75df4c7fef57cd49d242c349b078a73915f8690bf2508e0f93cb4189246806a3ecead5a0dd050204dbeeeb4eaa0468bcfba4eeee14b9766a3fe0f1ffa6 SHA512 c5cae15e86d11e6434a489bdac39ea498bdca2008ae6732a16603b32d79a9227a168a0fa0174c6d55ced0c92d9b644f60db4d946f695731161572abd6b778fa1
 DIST netcdf-4.4.1.1.tar.gz 17670828 BLAKE2B 9d38b7ce9feaafbe8326b4a055be3aa805dbe0f8efd039c30b2fb9c41ac912a4ae9eb2f95709f0069f8d38c7526491636be4adc65d1d57ee69e0678edccf232b SHA512 ee23f37d7b40e7b9a115d29bc038c7c654d50dedfcad62617b8dee3efa4668305e6a0656ba655770727ff46f4b6d742869c719267eca3392c94e2488eb902da7
+DIST netcdf-4.6.1.tar.gz 18201700 BLAKE2B 2dab9add736d0db3ad91fb1ccda63c200fe5a2c6e56e2dd5b76375f6535807c6f462623d1709235f03e0940b66a8c2d1c3fd896b042b8b0004c87f038852befb SHA512 e290b10e763f9f6ef56b5224f834834853de7c21347ef6a078a2e7d819757fc8069814431784d0a0387ba2ce1f01776556e3051f9465829da0ffd3849571cd61
 EBUILD netcdf-4.3.2-r1.ebuild 1473 BLAKE2B d3ff073e5924fd9d488bb4d190bae636c30972febedaad5e6efd82c6d20c3b9fbfc66301220898ff9e5720fb82c49d64ce7816b828f2c794dc8490732961feab SHA512 4482ff6621ff023a3363e754ce75f3a3fad1f7ef962b809cf0d2bf8e76e6f0d9b54a083a6cf222cefccdb6dc9e75b0d2202959c3be3b15b58945b31ccbee0a91
 EBUILD netcdf-4.4.0-r1.ebuild 1310 BLAKE2B 1b059db62c455618e11d7e1cccddcf8a155f5e3fa5196f9671cb2d4e2e1e9216ee00610ed7c96637ecfbee3aab705bad9ead66a2f9fcff65bf2958492451ca3b SHA512 6aef640d8f2f93d085184901be896acbfc5cc456ad78125e69aee1fe7e1a31ee256c69343ab9a7b1840fb58c5e79040ae45e171c1b005cff33ae5ba8dd4f9bc7
 EBUILD netcdf-4.4.1.1.ebuild 1386 BLAKE2B 2d77e06b62b2bc35342087edb195c8f87a58f6c54a849fb518a9055bb824d31f46cfd613caa04a5a99e0e6b7c8d42b76f4df910d570ce9b94974f1fc1410feac SHA512 7c55b546e818eadff28b6b2a3746b3e0009564ebe040a3c1b5991d75b6582b983e1fcc66fe669417aa878de9bb5090e40a1b7f5e1655a887a22a5a4f573e9d05
+EBUILD netcdf-4.6.1.ebuild 1308 BLAKE2B 057ce823ee47eafefd346e8bb603a1f9bf35fbb8257ed02aaf388966b858c4d39ebc70f12a7c5ce21f194e42d484eafbab1a8bc5401266679be66d3ce24111b7 SHA512 beb05bd3d6ffb0e4ec6151b5c551b2fa3fb39282b23bcf7e0d830967004a7ee2c46575e166e5d2c51da2ce1cffeaf36ada4099a7deb011b757b7558e27d6ca67
 MISC metadata.xml 1064 BLAKE2B 7980e918eb2d2f438aeb5deb4a678c2e324606b40e8d04e592df7d24492bdfbc548082f6fa372c168b09597c3511df15a046cd8f6d746db3d9aeae31cf3604ac SHA512 2aaa7a6c4659ff3daf81bdb63541ce08359f43bb7007f38dea333d0a05fc920e6780b79a9b0f79fec59d4e05a005efd3642acaedcd3223a21d5aa919110545dd
diff --git a/sci-libs/netcdf/netcdf-4.6.1.ebuild b/sci-libs/netcdf/netcdf-4.6.1.ebuild
new file mode 100644
index 000000000000..29e459757a76
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-4.6.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Scientific library and interface for array oriented data access"
+HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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"
+
+RDEPEND="
+	dap? ( net-misc/curl:0= )
+	hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= )
+	hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )"
+DEPEND="${RDEPEND}"
+# doc generation is missing many doxygen files in tar ball
+#	doc? ( app-doc/doxygen[dot] )"
+
+REQUIRED_USE="test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )"
+
+S="${WORKDIR}/${PN}-c-${PV}"
+
+src_configure() {
+	local myconf
+	if use mpi; then
+		export CC=mpicc
+	fi
+	econf "${myconf}" \
+		--disable-examples \
+		--disable-dap-remote-tests \
+		$(use_enable dap) \
+		$(use_enable hdf hdf4) \
+		$(use_enable hdf5 netcdf-4) \
+		$(use_enable static-libs static) \
+		$(use_enable tools utilities)
+}
+
+src_test() {
+	# fails parallel tests: bug #621486
+	emake check -j1
+}
+
+src_install() {
+	default
+	use examples && dodoc -r examples
+	prune_libtool_files
+}
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index b948f1be5ab3..c3e2ea0006b7 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -16,6 +16,6 @@ DIST ogdi-3.1.5.tar.gz 913902 BLAKE2B ec60b620823b0ac77823b4c41f828d7edb8651d4dd
 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.1.5-r1.ebuild 1098 BLAKE2B 4f7480e8dde7baec9438ccff389539888e7647a1be0a8161d10b1f1dbae9d821097f48d13cc7b259f0cdf5f650bf3cbf91b07ef906aca319518a6d997108386b SHA512 7d373f422f366df27e8a4e565852d99f0f5b8dcaa52aadc61053fba77e059ac05836fef81c20d1e32fce8a72e6d600235de4d490665cdb507f1058623d4af6d9
-EBUILD ogdi-3.2.0.ebuild 1720 BLAKE2B 2bc1f44843fefebfdcbd8d325eb2f3db920a9f3231e345804f262b83c9a0f6ac9f495f1c716c8f7f04c9b2869d3ad45de84551bb7c7c10332e938edb89bc3aa3 SHA512 9e6f7a70d6fd7667b77683dc58c9802f5b3f00b9bae17cb31e8238a5ea84ab42484d9138b35d1230ccff9144ff27d7217b8435c57faef780ba63751c3c1cd1ff
-EBUILD ogdi-3.2.0_beta2.ebuild 1555 BLAKE2B 83c43c0d97b0cae8e69e17b91860aaec8c26772f2c8e9703c96d63627dd0930c42bae1846a68e969e931badccd0c4b68784347cc5c8103335ba02b2ae7686b98 SHA512 f73e49a47290430708e4eabfe5aebf83c12d88b71d9f7c542b0f5b5525eb57533479c9ca2c098ec9c3cdb6681a4ae7b36766737bdedd4ce27cbcdfa7fb114372
+EBUILD ogdi-3.2.0.ebuild 1713 BLAKE2B 67711c73536ca49d3c943915e860b9f32fd0c7b1fd3e2dd35b614fc1e3336cbed59d0c1432b9af2b2c94f8230b46834bb766b26b1ddc874f0fd1db5d16899b2b SHA512 36cb92c59b133132a31512cd6a7aab7cdb2b273b2770d1f462aa0308f2e735bf869584766476daacd817aa727f5d8471c6ef45e1b92a76d4b829bcfd525b77ca
+EBUILD ogdi-3.2.0_beta2.ebuild 1549 BLAKE2B ed66593abbf8525dc1b6282e08bc0c73863fda2a9be458f7ea9cb483690dae42ff88fc4ccf014abbd7a95dd0c6a9fdd59953519d668b2ac9ed6c81e15b8b16a2 SHA512 13418dbe5f9bdf62bee8d5a3a8e11562cadb40221fcb47f862c01e0dc52170cfcd6b10901af69c4d94da472f2b1b87f26c78954982d8cb8398453b8ddfda6fdc
 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 f1c34bf77146..bdb3f530f1a1 100644
--- a/sci-libs/ogdi/ogdi-3.2.0.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
index a9a42137ca12..4e7a9c4adf8a 100644
--- a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 0062a9f9c9e9..66d5e7ae7c57 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -3,6 +3,6 @@ DIST proj-4.8.0.tar.gz 785279 BLAKE2B c0b71012128f395347f1233cca55c5d6af258bdc1d
 DIST proj-4.9.2-org_proj4_PJ.h 2960 BLAKE2B f5f367910490fb781a7ddb512e8eaae2d6de4fd1f5b8e9e1dc1b189959a57499174f6b1e90476f10cb4cb8860e069061eb8b507fbbb46b3e1e394df43f67561e SHA512 db2c2b8920ef1c0c56395480dd514e372d5385839ac553a36c92431f5662bb8ec47706489b5c12e0c4308967da58fc94b29a957ede627274ab685ab647151f2c
 DIST proj-4.9.2.tar.gz 874816 BLAKE2B a59a405298a7c8d5bcf3e1a29c5949b466fed5c3745d0f6d631fff3282f6135d6be21cd75c9b377692f4fb98ae6e10e75867fdeab868fdb49c1578073cd7e802 SHA512 34a506742bb27cbc7f5ee91ee7f8c7a27d0f5644a1dcfd11b1e59120040804b1621ddfa4212bff45a1c3fb85511e48ece21612e86033139bafbb50c165e77cda
 DIST proj-datumgrid-1.5.zip 2250131 BLAKE2B c83b5bab72b790c70fbf3b95782ba4e8e93e2accc93a0a8c06667908dc437de44aa3623799f685e020269090be103bac568fe6a9d73ce128b8af024ec1ca8442 SHA512 9d9a935b3e984721a1ceafac49c139d3c5d9923c5bcef5f57fec8028a043c86e7de8bad9c200fa38cd6d1bf27b32dd0126597d42fee793d055e686f090604bf3
-EBUILD proj-4.8.0.ebuild 1305 BLAKE2B cd3d6bfb0240eb35af6941bb0c97b70fb43841c4cec6f76bf56cc99581522a338ee46ad30b598567c9b8e2f9f16e7b132d11cc7014bb778af3f2407e1f883813 SHA512 49cb24ecf32dea486a9f64fc37e57e2e4da2e3222c95be8da97eb3154e830c5986cdfbe95a70eb000f6c42fe1a1b1d617934c734db21b62505471457bc6b606c
-EBUILD proj-4.9.2.ebuild 1286 BLAKE2B 965116d987fb831e14d125b3063bf77c5b0f9b5de711d34df3e6e7b4134ba08b70301ce233a1640626624569757a91abc351e6bb6f87c0c17f3955e1fd59b009 SHA512 3f9d718ca5e6c0f5da2f898dbdc2738be63d57bad94ea369a8a73c8ebccd345e64930f9ff52a3db86ba0b31b1cb79d1691b79470cc38b4cbe37682401d807f37
+EBUILD proj-4.8.0.ebuild 1299 BLAKE2B 0ebc7c73ece64fe41bf071f96becad9f416824e85e031cc1290b16e06d15717e4ef833f207687c7341a9cc09f94508aef508147ca1cd1a084b52bfda6a9e5b36 SHA512 1df5171dfd85e0eee8e49cbd9d603f016978658e73226a1809d5efc6aef96955784b7fc176b06e94e87a2ccdc13d92982d31807f104932a407e16f32f8d50254
+EBUILD proj-4.9.2.ebuild 1279 BLAKE2B 9604909916bbff45a330a4ecc656a053b493976fa1cb2d28ab9373027b58e730132424bf25f8e855b8281eab7aaa21b441703ce7ad671565d76f74da037cf468 SHA512 1f0602c08e5421a9fc9cda24cde3e6957e00daa77bcdf4ce6e987664767686c6b47103b6194e090ac560a79dc45398b04eae982c5a5556992fc65686fdaeaff6
 MISC metadata.xml 415 BLAKE2B 5bbcea99e5589d2c894dc19eaba8b7893d8965d4c8d25024917fa004e3905c0620a76dfaa34de4c2de156544d4ffdc94e3d05e222cb0b2b2b812ac261d0e9bf3 SHA512 8e98b001981de3b4062d8156577061b92918726c7992a3f96fb3d21c2f18d773efe343839255a4cc1ca69f50d05d16a4c48eb4aabc3db9f40a67ac62adc93e5b
diff --git a/sci-libs/proj/proj-4.8.0.ebuild b/sci-libs/proj/proj-4.8.0.ebuild
index b6af547aa289..544b6e767021 100644
--- a/sci-libs/proj/proj-4.8.0.ebuild
+++ b/sci-libs/proj/proj-4.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="java static-libs"
 
 RDEPEND=""
diff --git a/sci-libs/proj/proj-4.9.2.ebuild b/sci-libs/proj/proj-4.9.2.ebuild
index 78c57b4e7c5a..3988e3730f0f 100644
--- a/sci-libs/proj/proj-4.9.2.ebuild
+++ b/sci-libs/proj/proj-4.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="java static-libs"
 
 RDEPEND=""
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index b7366dfa54e2..90b4132cc611 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,6 +1,8 @@
 AUX sundials-2.7.0-underlinking-libdir.patch 19659 BLAKE2B 9dab5796e7f64528df06a435433719bbd34f6f9868ab6d88ec59e32777c4513c995bebe3f4e32b91cfb000328c6ae307a1c29cd34acd21cd9485668c3783b991 SHA512 95bc36d359b672b725391d75540304fac6b2610960f67a636cf5656e30904a2ed309a75175f4d20b9199d70d45fa817e53e86433ff18dfcf28ef76840b9d0dba
 DIST sundials-2.7.0.tar.gz 12258093 BLAKE2B 331fcf255f2bb8bcc798818b05db114feda7aacb6585177a836f17a9b58477f504099b4a33c7d71cab6e70eeb6fe47a76d101c08aa6219ee6fbac630524d5928 SHA512 c86c167538065a4109b36ae7c8f60f3d92184133cfa661b5acfccee052c38f40be865412a1746bb57907b61602c212c0f15e1e30ef29e8a49db6d46a75a28e69
 DIST sundials-3.0.0.tar.gz 12996039 BLAKE2B 0557190f6f7550bd4d7d3df10f727c6f235ff4917f2cfd35ca77785037edc43236a82383664f6fe1579bb5b07a148875b82b22f5a9e4f5f2a0607838e8a3b286 SHA512 3c86c7f27e64c2e6732546b0b1e87ea092502e361cae09b3b7eb29795c978edf494e17be13b78541dc91cc0709d928006bd0fc62ea968f2b621efa51856cdd60
+DIST sundials-3.1.0.tar.gz 13033516 BLAKE2B 41294c1022ab09db6fbfa0d41c169d2ead3483693653a9c0cc26fdffec61918fed5e93241f64f9bfdc6ff22812fb846f3ea8deecd82c28d179dded85ec2c69ba SHA512 288427e00f58c512583cc14d81385e82b0fdeaa4e9adca588a108ad0752341b7be62c9fa2740924ec733e3e0d5794f305dc582fc72e244e675e5ea00ac0d08ca
 EBUILD sundials-2.7.0.ebuild 2063 BLAKE2B 1ca9f283e24c399dadadf6f00835a4e2d25da64b3d660fa2f69daa632b6873bacdd73c329451036379523c3f76a6272c25833db312390e488b5330c862dbd174 SHA512 cd92701c6c400fa5c75610c6d35117b182be293821ce7bd0d15fb8c4807ca5359bd5413e36c2cc12af85321a331a90a2d514b1d31409ed70d9203728b61a995f
 EBUILD sundials-3.0.0.ebuild 2251 BLAKE2B 0550d1728013a3ad574668c1902fe3b416f8ed1842057cf7ea44bafe599e1c056db45dcdde822edb71b6094135d4d7b168ae70f575bf0cb2c41efc09eb449197 SHA512 ad1382f72bd6893788dca8706d1316a23be35f62b33bf0492675d089b506a15191550081999810dfaeff90ecaa84f8d823bae55f2de94d8446a0a1ad1e1a5381
+EBUILD sundials-3.1.0.ebuild 2225 BLAKE2B ab752c33ded747ff5ce3abf961fcdd3ee534ef6eb55b3464d9ad0b08ed231fb6e26885a4ad6859d52e7373982a795dd155a7ec0c55691d7c838dfcaf4c532fb8 SHA512 e6e3fcb7e4c701534c64ea0bab4ff116339cc3c10b221723311362ded3a5cf770220f4aa6b4ce71315ef4b3bdefc13fd6a3977c9c8bd9fcb06f7adc850b477d9
 MISC metadata.xml 1063 BLAKE2B 9fcc89ceb3553bf23a0f1074eaca3a76707ddcd7cdbce253c6710e2db8422fff558a0e761fe93eb00bf385bd6f30fcb53decc5323c425c609f419be92855799a SHA512 d81c64ac7241460ebc7bcd61f1b398ef55a1e9b5a5a9bb0ede400bfe06889d2db781c43853bf33069510f2461140ab8b7a47a4553cdafca64c1ed7bd0f16d742
diff --git a/sci-libs/sundials/sundials-3.1.0.ebuild b/sci-libs/sundials/sundials-3.1.0.ebuild
new file mode 100644
index 000000000000..707322d2accc
--- /dev/null
+++ b/sci-libs/sundials/sundials-3.1.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit cmake-utils toolchain-funcs fortran-2 versionator
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="http://computation.llnl.gov/projects/sundials"
+SRC_URI="http://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(get_major_version)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
+REQUIRED_USE="hypre? ( mpi )"
+
+RDEPEND="
+	lapack? ( virtual/lapack )
+	mpi? ( virtual/mpi sci-libs/hypre:= )
+	sparse? ( sci-libs/klu:= )
+	superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( )
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+		ewarn "OpenMP is not available in your current selected gcc"
+		die "need openmp capable gcc"
+	fi
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS="$(usex static-libs)"
+		-DCXX_ENABLE="$(usex cxx)"
+		-DFCMIX_ENABLE="$(usex fortran)"
+		-DF90_ENABLE="$(usex fortran)"
+		-DHYPRE_ENABLE="$(usex hypre)"
+		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+		-DKLU_ENABLE="$(usex sparse)"
+		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
+		-DLAPACK_ENABLE="$(usex lapack)"
+		-DMPI_ENABLE="$(usex mpi)"
+		-DOPENMP_ENABLE="$(usex openmp)"
+		-DPTHREAD_ENABLE="$(usex threads)"
+		-DSUPERLUMT_ENABLE="$(usex superlumt)"
+		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+		-DSUPERLUMT_LIBRARY="superlu_mt"
+		-DEXAMPLES_ENABLE="$(usex examples)"
+		-DEXAMPLES_INSTALL=ON
+		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+		-DUSE_GENERIC_MATH=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc doc/*/*.pdf
+	cd src
+	for r in */README; do
+		newdoc ${r} README-${r%/*}
+	done
+
+	# Use a sledgehammer, patching the buildsystem is too annoyoing (the
+	# CMake build systems consists of 2000 "lib" DESTINATIONS...)
+	if [[ lib != $(get_libdir) ]]; then
+		mv "${ED%/}"/usr/lib "${ED%/}"/usr/$(get_libdir) || die
+	fi
+}