gentoo resync : 29.05.2018

19 files changed, 100 insertions, 59 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index dea98786672b..19ec0667b2cb 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/ccfits/Manifest b/sci-libs/ccfits/Manifest
index 21188cdbfa92..a08814befe9f 100644
--- a/sci-libs/ccfits/Manifest
+++ b/sci-libs/ccfits/Manifest
@@ -1,6 +1,6 @@
 AUX ccfits-2.2-makefile.patch 710 BLAKE2B 8368c98ecc0b9c7e2d56ab43473a8b3d83d16e6683e5f58da6e3a25ccaa5353404ae6b8e3c457aee99ca5b6af3ee228973ea2d0aa9d990aa8853032e204ea63c SHA512 ea4553b9a794131fe1b90172d49623bb97c6d78c52a3cdbdd43c8bb3ec23ae535081a981f83c61d425fc9fe1b6258e7ef78cea580f7df302893840ab3a35e7e5
 DIST CCfits-2.4.tar.gz 1792643 BLAKE2B 5304789d01278884faa9765be3f22e03e7a37370f0f3996045a663d5793a1686ce4c2d379227bae57bee5643ac398242223cb0300337f4ad67b662679019e92e SHA512 b12d455bb6dd631056e02a12e996d3bf0b6169f8922011e4b64f979b08d2ab8f405e14947c6f5d26ad18bf2f5764854a84987ae105944515f533fe6b0b4ef7be
 DIST CCfits-2.5.tar.gz 1416358 BLAKE2B 4c525761f98bdb133f8d0c5fd582db5326dda84dc103a7c816cdf8d1a1fa02ac5b8e9c9431629304e3eaf21b4ec9767796c8b2cc8d22dd877a2e043084cae683 SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5
-EBUILD ccfits-2.4-r1.ebuild 889 BLAKE2B ddb55d27616b4255ad54d614fdcec7419ac3e1b30abd518b0cc398444fe69e9941511c783fa965378fd2459ebcd378c408537ebeaeca624f85b5a63828ddcd6f SHA512 da0b9d7138dc9b5438c46cbdba15a8a49bc744e45f4ba872d8597521e272368b1ad2454f027faa937f30ca2f5b1b4b8415ee7923cecb4649d026d18608779113
-EBUILD ccfits-2.5.ebuild 901 BLAKE2B eb454ce56bdd974fee217bd25265e616a87c5380745e57413655f7574978a79a1b394051f0774f4f55e497f5e61355d2b62ac458be73dbe5bb27036b1af5a319 SHA512 382efb11b57f290d250d599f641b7edb37c2f87cf61580a37ef94ecd2ed80eb8b4b4f2938fce9d9aea6b462bd79b534ff67f06a54646c2a43b88989994256128
+EBUILD ccfits-2.4-r1.ebuild 890 BLAKE2B ee8e7b2adca73bec3bf05accba4602395f30331983d6d6b99c3839e19f47a7c6923b1d469e01b9070a9ed4170bdfdc24a97ec02e8211e8f858a782885cfa6d9c SHA512 15ceb8dc21c396b87f1f167184271ac7276f125443fb4406a3ffea95a6582ce86e5f0f0817bb28308427ba82478cca8cf49600cbcffcdc0b990a9f44050ef460
+EBUILD ccfits-2.5.ebuild 902 BLAKE2B 37f9c14a0024e32aaf4d64a27c63ed57e7ca17770df99a4f128e9c4f0bb8b99c88fea0c16ecd197ff653693ed44f2de5b3712d25bdeabf5106cfa67e599e94a1 SHA512 32253e04a205817471c0d4d52e352ca606f67484dd399d169ae978a62dadf97f7d37aa13433dd5622172a52944582e3fc144aa3a83e361eb55780c7f510d3490
 MISC metadata.xml 639 BLAKE2B 6cccb8d66f9dcde2f82383b919dcf67122a8d27f24641b262899831bc60b19b4cf433df5e1d05fcd2a140b20bfbb5a1add4bee162ba7574834a50c455f983a85 SHA512 163801f94ad9076cf5306b4f06682fc7186e724704b4ad1e5dfca871fc770ed0b06827caa2aa83eeebc7bb65b5bbc27f254431d6472735abb30f0872eeccf721
diff --git a/sci-libs/ccfits/ccfits-2.4-r1.ebuild b/sci-libs/ccfits/ccfits-2.4-r1.ebuild
index a053f0dd3a6e..30ea37fa12df 100644
--- a/sci-libs/ccfits/ccfits-2.4-r1.ebuild
+++ b/sci-libs/ccfits/ccfits-2.4-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
@@ -9,7 +9,7 @@ MYPN=CCfits
 MYP=${MYPN}-${PV}
 
 DESCRIPTION="C++ interface for cfitsio"
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/fitsio/CCfits/"
+HOMEPAGE="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/"
 SRC_URI="${HOMEPAGE}/${MYP}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/ccfits/ccfits-2.5.ebuild b/sci-libs/ccfits/ccfits-2.5.ebuild
index 9530618f2c8c..5f2b6eb51712 100644
--- a/sci-libs/ccfits/ccfits-2.5.ebuild
+++ b/sci-libs/ccfits/ccfits-2.5.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
@@ -9,7 +9,7 @@ MYPN=CCfits
 MYP=${MYPN}-${PV}
 
 DESCRIPTION="C++ interface for cfitsio"
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/fitsio/CCfits/"
+HOMEPAGE="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/"
 SRC_URI="${HOMEPAGE}/${MYP}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 4c36e07f8c1f..dfd6eeb81df0 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -2,8 +2,8 @@ DIST cfitsio-3.360.tar.gz 4104894 BLAKE2B 7a84177c28679db5c27d0586cb6959a0663918
 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 1465 BLAKE2B f22482fd2080131603e0a7a2cd66a432cdc20fe9a88791a567581ad0be2c9750102cdfb334fd9825c5260eb05a08bf0277600a8cda3ca39f0cb6c70ce479562d SHA512 060efde974ba25a52aff3cbed2fe808baf643d10d865c9e18485317cd06c50d13939ffb360aa3cd9e9b167290fb5b55f28ca4e31c4500ee79f905a316b6130ba
-EBUILD cfitsio-3.38-r1.ebuild 1590 BLAKE2B 4ef7c2503b97fb8224a4a75b2c592eee4b3419863aae5985b0e195ea1d316b680564f3c9d2f62c1b31dcc2ae154fe797ee633b8f4bf34318c59877a041dbb916 SHA512 20bbace83f6a8dd911620252c5e3fdbc6ed61fe687bc7ac64be84d6ed05f6bb7f472dbfd79f41dd684d59cae2e47ff4f9f631cb28d2cc985af09f1e5f071cd59
-EBUILD cfitsio-3.39.ebuild 1595 BLAKE2B 022c9ee95e93d19695dac56437231d818d48cace2efa49f3c39f70eae804d3df373da6e6d2d2c1ec2faae1852349431fc39b28b4e0843f0890e54962611c6ff0 SHA512 0e164cc9b258431af5aa407f7836a917efc78d5aff310216f368dd8bdc6c2b70e400efd348b408fc912fb68b191262ffc739f4ae7520cbc69770a62e0ab2bd1a
-EBUILD cfitsio-3.410.ebuild 1595 BLAKE2B 022c9ee95e93d19695dac56437231d818d48cace2efa49f3c39f70eae804d3df373da6e6d2d2c1ec2faae1852349431fc39b28b4e0843f0890e54962611c6ff0 SHA512 0e164cc9b258431af5aa407f7836a917efc78d5aff310216f368dd8bdc6c2b70e400efd348b408fc912fb68b191262ffc739f4ae7520cbc69770a62e0ab2bd1a
+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 1596 BLAKE2B 7a167a2855fdcb796610ac1b3a17701c003bae05d0b64d1e9272ba8541116e2a5df9ebf2ec1be457d840e753a07a39bcab8b5720667d81e8c8c4a1e445d2b290 SHA512 0e2d890700a61a280fd8330679babc890f046e4a7e3cc85c724e4b7a3bea6e5da7f17ecd88ac7f84286ef174aaedce2b483491a7b66b8c423775c51a68c8d395
 MISC metadata.xml 840 BLAKE2B 6f024cc96a9da7bef155b5138d55b518a1ae917af045cd2970227ca1993461659eea8883dc3b6b9e4d3d2aaa5c49b4900e122dbb83a437aa3d94351c333934d7 SHA512 946044116d9a865e3b7e883b41f7d74a3f54c72cd857aed4dcb454cfe559385004b3e55562a306bfa3347cfc035a5af9a5aaa8a4d8dc7fe154b8d0dae7a7390b
diff --git a/sci-libs/cfitsio/cfitsio-3.360.ebuild b/sci-libs/cfitsio/cfitsio-3.360.ebuild
index 113be5fdf364..4449edae4bf9 100644
--- a/sci-libs/cfitsio/cfitsio-3.360.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.360.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=5
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
 inherit autotools-utils fortran-2
 
 DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
+HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
 SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/sci-libs/cfitsio/cfitsio-3.38-r1.ebuild b/sci-libs/cfitsio/cfitsio-3.38-r1.ebuild
index 7d3f7ad294b0..5c7c6535756a 100644
--- a/sci-libs/cfitsio/cfitsio-3.38-r1.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.38-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=5
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
 inherit autotools-multilib fortran-2
 
 DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
+HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
 SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/sci-libs/cfitsio/cfitsio-3.39.ebuild b/sci-libs/cfitsio/cfitsio-3.39.ebuild
index 9a75291ffa74..e38c68f855f4 100644
--- a/sci-libs/cfitsio/cfitsio-3.39.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.39.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
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
 inherit fortran-2 multilib-minimal
 
 DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
+HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
 SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/sci-libs/cfitsio/cfitsio-3.410.ebuild b/sci-libs/cfitsio/cfitsio-3.410.ebuild
index 9a75291ffa74..e38c68f855f4 100644
--- a/sci-libs/cfitsio/cfitsio-3.410.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.410.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
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
 inherit fortran-2 multilib-minimal
 
 DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
+HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
 SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 6132a38da80d..376d00f6135b 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -2,5 +2,5 @@ AUX 3.4.2-solaris-isnan.patch 575 BLAKE2B 34e2fddd46e4e503630d0c44c03ee72ceb8bb1
 DIST geos-3.6.1.tar.bz2 1833434 BLAKE2B 7feede989d9aacad8b72e107d988bac7746e74e1674d812a2db738f124d357cf0cb24b4040f36a0e1290086c87585f1155f5cac962bb2c8ad83d7879d7f30af7 SHA512 8b28e7706567375ca02ae5f5dbebf0870e8fed8ea430596a3637e5c975e72bc0f3c16c31b052f154042dd029c54130325a8d44de95c3458f5da024a97d3cfaf9
 DIST geos-3.6.2.tar.bz2 2030705 BLAKE2B f23cf1fc080fb7b353fb6292900d84811ace04a5364200bfea19f79d7b09a795d36e30cd6e4dbb7acd8417245bc2ce644298dc1b4140ef70495e4f7d71fc522b SHA512 515d8700b8a28282678e481faee355e3a43d7b70160472a63335b8d7225d9ba10437be782378f18f31a15288118126d411a2d862f01ce35d27c96f6bc0a73016
 EBUILD geos-3.6.1.ebuild 1326 BLAKE2B 63fec330aa117188041ac2a9653d3a05df850bdedfdc8dc22442c5be81b50d7c6ef73785de7a304d1341ec18911e7ad0a1ea940b8c23b764f49215a1d782dd70 SHA512 98a71dde912af00e31687741a6d327f3a03a69c659a02b9b98ff554dfb8c6765518ff139d40f5c890a033079410072c6a6d4ff09e8825e69f83efad2f89f80a0
-EBUILD geos-3.6.2.ebuild 1327 BLAKE2B 6529e13b2fcf851dd91b5951483ef0bb1e4e5dac6d06f317a9c9a520bcb39812147a76818378094eddec5f0623a36fb4998e34ef86f1ccaec49d1a1a018d1e0a SHA512 f66c802bd3f05284f1bbede45e80889ce9ab2c30c85dbe81acf5e51ebdd88042420a61102d303306d6e48e153ca4361d701bc5d0dda41736a511ce616df1eb8d
+EBUILD geos-3.6.2.ebuild 1325 BLAKE2B 7f89c022ab60568a107c334e1420772ae761d72b0115cf87753f7287b913a15345c576b9724f536068e4e16b9fddbc0a4ffbf5677d76d02f231d2796d3120534 SHA512 e5a27ea6075bde252a7c9f113b77dfa816e09d9c1548d2318ed890e1059b04995b2b9e68e399c91bc01baadc2be3e2a1cbfaf118a153791cdb9385bf72c64feb
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.6.2.ebuild b/sci-libs/geos/geos-3.6.2.ebuild
index b43efaeaccc9..1c746611f0fd 100644
--- a/sci-libs/geos/geos-3.6.2.ebuild
+++ b/sci-libs/geos/geos-3.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc python ruby static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 66283ce68a36..2161c982e065 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -11,7 +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 1784 BLAKE2B 34cc2204c934ef33ef40ce7f38f59b3226214be854f2092ea64466234898bb8d394d350f81e3ed0e18534743201ab9ec565f10eb3f5b86047e7049d8f405068b SHA512 350771ef36ba1ec07b87d834ab36fbb57fdee1a85caab0476d66c6b13b2dff9036a0fc9f543b094213347d4984bb8c5ea26e0ba129230fc00b3823c5c69ffaad
+EBUILD hdf-4.2.13-r1.ebuild 1783 BLAKE2B a21301f8ef349b0b1a77d849151ad04a937f05d8163f7d656a3771afa0bfce9a689aa1b4f6396f4f4bc6a8cc2f2fca0df1fd32f3c0bef04467d0c6441b492d9f SHA512 c799f8c84981158f3934bfa0caa293bbf10dc7d08647068602168def959f3924750e8b1585dca6495d771cbf781b3801d546b11760979dbb33f8eb1e2ddd9c67
 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/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index ed67c5f51be2..63e729e70104 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ia64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 REQUIRED_USE="test? ( szip )"
 
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index c447468e391f..98b4a1887e34 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,4 +1,6 @@
 DIST rtabmap-0.14.0.tar.gz 19515196 BLAKE2B 851017bd3114c4dfaf323ef7ba6c3e970480de4c227b06d625cec0363a144a220be587934b0d457eca587d39c0c0b609acebd71ce7a98f1193ab5723f6a47f9a SHA512 00e2996b11aef8e0f61dc59ac59626b5b695ac3b5281d7776d73b54edbd90473bfffa1daae148e090b601a4d56d7feff2190f362ea188640b93db06e3760042f
+DIST rtabmap-0.17.1.tar.gz 19632117 BLAKE2B 6e2bd929da4148856317f0b03197e541223d59810397fc5d282b04ace5af796028cd8cde850d89fb2f3f289ed11d155a5163132edd7e65e2bc8a1bad1d09c54a SHA512 6714d245b87012cb0432b677c87b17e3bc182df2025203f0bd63b1f4ab06d03d795de4792d3cc4fe6d1ca4db40852c15350fed3c3a6e27176ea5e764a9816cd2
 EBUILD rtabmap-0.14.0.ebuild 1401 BLAKE2B 877164ca7375c4d39f6598b72019b16664c853f3c1ee16753c490df0efbcc600b7a7e0ae57957f11f0469ffc8f09f6c4a50a644191d111b19cd7ecc95bda774c SHA512 b47443ccdf33d69e61c6912951f7c816cfaa13ca8076dc627c1814b7bbffc4a2c547296d2995726a6203b3317e568b6df7933918d660594729bf436ef80382b6
-EBUILD rtabmap-9999.ebuild 1401 BLAKE2B 877164ca7375c4d39f6598b72019b16664c853f3c1ee16753c490df0efbcc600b7a7e0ae57957f11f0469ffc8f09f6c4a50a644191d111b19cd7ecc95bda774c SHA512 b47443ccdf33d69e61c6912951f7c816cfaa13ca8076dc627c1814b7bbffc4a2c547296d2995726a6203b3317e568b6df7933918d660594729bf436ef80382b6
+EBUILD rtabmap-0.17.1.ebuild 1446 BLAKE2B 7f638d8f3b7e756a39122ec993b0471bbf1e72d8fa986679f796c9e5e415fabba12721e7139bc70cb881082f2c2927066f6de814fed35105b85f47f61d196094 SHA512 27178728cadf42f1e8cc9e47e52ef69d3ef9ee6bb1c71223ed80edfa9fe451a6020ddbc08f5f960c2dcb6df77535d0f72458c465213886788048b2b6493fba30
+EBUILD rtabmap-9999.ebuild 1446 BLAKE2B 7f638d8f3b7e756a39122ec993b0471bbf1e72d8fa986679f796c9e5e415fabba12721e7139bc70cb881082f2c2927066f6de814fed35105b85f47f61d196094 SHA512 27178728cadf42f1e8cc9e47e52ef69d3ef9ee6bb1c71223ed80edfa9fe451a6020ddbc08f5f960c2dcb6df77535d0f72458c465213886788048b2b6493fba30
 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81
diff --git a/sci-libs/rtabmap/rtabmap-0.17.1.ebuild b/sci-libs/rtabmap/rtabmap-0.17.1.ebuild
new file mode 100644
index 000000000000..9bbe6d06b163
--- /dev/null
+++ b/sci-libs/rtabmap/rtabmap-0.17.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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}-melodic.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P}-melodic"
+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-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
index ec181ba72d33..9bbe6d06b163 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-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=5
@@ -16,7 +16,8 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-melodic.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P}-melodic"
 fi
 
 DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
@@ -27,7 +28,7 @@ IUSE="examples ieee1394 openni2 qt5"
 
 RDEPEND="
 	media-libs/opencv:=[qt5(-)?]
-	sci-libs/pcl:=[openni,vtk]
+	sci-libs/pcl:=[openni,vtk,qt5(-)?]
 	sci-libs/vtk:=[qt5(-)?]
 	sys-libs/zlib
 	sci-libs/octomap:=
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 7bcf45cd4263..33d3892bc563 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,4 +1,3 @@
 DIST szip-2.1.tar.gz 383219 BLAKE2B 84e10763bcec885a423d64c2c3cff0632d7a6a39c8cd177cf607f549cb4cd02a4ca03362464c2c4ec4539c80149493329427f529f5d6daea4a35b91af6fa1538 SHA512 bb7e0af6dfaaaaa85013ef52e6901d5b7b6159795338d285c2e843bd2879230a6397fb072662fdfeda5690981db4e9af94782c057bf993f92516d92a8934cb75
-EBUILD szip-2.1-r2.ebuild 712 BLAKE2B 4749cb93c7c2b7d47f21a539756e5dec434c28806c1f7bce749f96a22a42da9cd5bcfbcdb03fe65ae1625ed5ab1b1f64a0202e90fa00d08d9c04cebf4c9379b6 SHA512 5a7d895eb62ea16d9484f83fbdc264358ec98c7793ece6eade40dea9f0d2488a058df7c6e129e2d0eeb3a96cee7ae4d7fa52c453b05b775e93c0322911715e9c
-EBUILD szip-2.1.ebuild 657 BLAKE2B ed56e1a2d4a2f35a1562436d33052288139ed67225651fe2e0ff2eaa4b499b50d2ced733b2b2d933f2327f8bed68d10e3d1a98c67335668bb1a44f5753894753 SHA512 8199d391b81ae1622100fa8037e819db89ae1eb001e120807cc523a18b8f63a0534e172bd0bdda0ee2767ab5ec5484b8d1dfdd4022c64418f213778aa0ddb330
+EBUILD szip-2.1-r2.ebuild 725 BLAKE2B c3758ab6b092d8a29745f1bc46bf90129f60900caec4ed94104a21d3e385037cc7dd5c1205064097a7b3d889788c89eecbc32724b090b3619dbf222a57a93be2 SHA512 7a9bdfab3dfbcaba184fb7cb6fbd235005606df093eef6210fab0944b9560134c83c71668e983db536c03d48aae01aada82eb41f0bfda87648a43549060997fa
 MISC metadata.xml 765 BLAKE2B a720dfb9f71c9f9adc5e539b2a791b8edcd2fce2b1540b17066c09e1d3895d40e147ddd2ef86499c6a9db3c2c68c3bb9aae3357f13d86370d7fba8069f968368 SHA512 c56edc42adeff2e523e9a312b0393f45647b2a902334221d2b9842afa1ecd885a17f108041cad69a0797bdc1eb58c75672226a0c3a2f4c8f561ab8a70eb28b27
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
index f21bfef39ae4..603af0c3cff4 100644
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ b/sci-libs/szip/szip-2.1-r2.ebuild
@@ -3,17 +3,15 @@
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="Extended-Rice lossless compression algorithm implementation"
 HOMEPAGE="http://www.hdfgroup.org/doc_resource/SZIP/"
 SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
-LICENSE="szip"
 
+LICENSE="szip"
 SLOT="0/2"
 KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
 IUSE="static-libs"
+
 RDEPEND="!sci-libs/libaec[szip]"
 DEPEND=""
 
@@ -25,5 +23,8 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files --all
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
 }
diff --git a/sci-libs/szip/szip-2.1.ebuild b/sci-libs/szip/szip-2.1.ebuild
deleted file mode 100644
index ef6208b661f1..000000000000
--- a/sci-libs/szip/szip-2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Implementation of the extended-Rice lossless compression algorithm"
-HOMEPAGE="http://www.hdfgroup.org/doc_resource/SZIP/"
-SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
-LICENSE="szip"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-IUSE=""
-DEPEND=""
-RDEPEND="!sci-libs/libaec"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc RELEASE.txt HISTORY.txt
-	insinto /usr/share/doc/${PF}/
-	emake -C examples clean || die
-	doins -r examples
-}