gentoo resync : 25.08.2018

25 files changed, 209 insertions, 602 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 5f8e3de50845..771c7c31466d 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 7909ae08559b..791516c37f58 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -5,5 +5,5 @@ DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8
 EBUILD armadillo-6.200.3.ebuild 2992 BLAKE2B 29a1dd94fee4f8e82447a65921cfa8ad3d3c632fa86adfb6c29b98ece345f60042768e793d0df5ba3af4f0d24ddc1f7b19f0eae7b3b957acc304174cb9300b59 SHA512 39ac3f773cee2493e4511f51fa9a37bad89b2507aad03298bccacec1d4f76992dc3805b3a79fe81d0bd7fcc02db2c879e9237cb88c8925f6562712ce895da918
 EBUILD armadillo-7.950.1.ebuild 3377 BLAKE2B 7cb31f807a6e4c9114eda569b74795bf94f806b2640485be49069793f4b100b611166724d1ef6d8f78aa1afacbed73834f6d2e82e8ed268123d9222e7b52773d SHA512 e585c4981c3c8338594f6cbb3feffdd869afd4c9bd41446f2c33f22443fca24ea747514e27c5e5e4fb9b02f3cacf3ccc0cfeffd89843a8dceabc6a837715fdc6
 EBUILD armadillo-8.200.0.ebuild 3379 BLAKE2B 5975e874dc9569ff03f71601c9af9d14cc0ac6407bccebc6e3379ca5e152735fdfd18947756e1898cb72e29b76b9b91be692f82d6942377d5492805555685002 SHA512 74d5355a77a1edf9ad891fcc978e043b12415490822fc2e3914f87196ac42773e82f6e10687134be5995a394c7c521fcce603b3de17465b8a6a5ee493df57738
-EBUILD armadillo-8.300.2.ebuild 3379 BLAKE2B 5975e874dc9569ff03f71601c9af9d14cc0ac6407bccebc6e3379ca5e152735fdfd18947756e1898cb72e29b76b9b91be692f82d6942377d5492805555685002 SHA512 74d5355a77a1edf9ad891fcc978e043b12415490822fc2e3914f87196ac42773e82f6e10687134be5995a394c7c521fcce603b3de17465b8a6a5ee493df57738
+EBUILD armadillo-8.300.2.ebuild 3376 BLAKE2B 3919b3ff29586060911230a35fa61aa590cec61f982c9b817ad468eea146ea142cc6fe021a4240ffc7bc3562e1349e59f76a868a2632f03bc9a626da0811f08e SHA512 4983eb6be844203df5ebb1cc15d2005ec953c05af300ddcba5d656f4cbf03207998a0c198afee9e43d81d7788799b31d4e13a929f74399dc55120ede0538652b
 MISC metadata.xml 1537 BLAKE2B 5116cb259f8e27fb11430cc2b3ab3a351afcefa0734e7997c962596aab226cfdd052ba3186ea068d8d31d501520d063037185909bcf02de72f57b4c8dfd86e31 SHA512 206e3f8912bd753837b0e8301c1db0f94e3480d0f50ba83c1b9a4be44498507ccade8f0b317c3bf2baa8aa782a93c88806ddbe710eed9d8fecb135494c26bc71
diff --git a/sci-libs/armadillo/armadillo-8.300.2.ebuild b/sci-libs/armadillo/armadillo-8.300.2.ebuild
index dccb43520ea1..c903169e984f 100644
--- a/sci-libs/armadillo/armadillo-8.300.2.ebuild
+++ b/sci-libs/armadillo/armadillo-8.300.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0/8"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
 REQUIRED_USE="test? ( lapack )"
 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 8c5930d89a11..3e155f1cba33 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,12 +2,12 @@ AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b6
 AUX gdal-2.2.3-goocast.patch 540 BLAKE2B 3e80e54dc29d90529a6c705e434b6bd0f99bcc326c9e0e7967bd81ab8b80f3a09657c16f4a95250e6753a3dd463acc0a45301a157279a6408b697c15868f86aa SHA512 2dce2e5f391645c4470d7b08a906a942b1821a0086a4042853ba6a38df96b710b29bb7c32f6a2ac9732d281f3afe9e42aeb6f51fdc2734f896402680aed95d27
 AUX gdal-2.2.3-json-c-0.13.patch 3733 BLAKE2B 34921f8e2717a446bead6d8b07c6a8e2455752bd4534d066c4bb6150f1cd03856269a8510535517cbf60e609053e470107e9ce62d58358afcb48aa819a546563 SHA512 f4beaa11431b1eb2c6986c3da24a696cdade04f025a9bdeb9726c392aecdf597126c7735b1b2c1175bd0de71a2441b2c1e5d01e597acd7869e9c75644660994d
 AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d
+AUX gdal-2.3.0-changeset_38658.patch 3281 BLAKE2B 3939df03e8ceba4c3615a70003bfa6a599676cd29ba6f3b61d753d7eefe6f7de1082bb3bf7fd41a45bd40674f62b390c18fd7ccc4ade10fc72b4c91b0b9ce5e2 SHA512 9e176b5335bd035e38440317b1b4aced7e252d84f48c6e3b5a42f6041a4ab810da5ef45421326a071ebe7c7cdecf133df9ca0335557e8fbc2da48b3274f46dc8
 AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6
-DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046
+AUX gdal-2.3.0-frmts-nitf38234.patch 421 BLAKE2B d32592e440b459a57a25de39658224db5a871a82955620140a209bab0f84872dd5c67414df16d64cf24d7ad7a180eeaff7eed7e4aef8e6a70f550575538d93ec SHA512 ffcd68e4fc277f37540a81cf200a597da0f3ee42284107724a3b6bdb44ca54459dceefd52e9d946c8b3d8fd9c5153bcdcc30dacf3ebef46180a9d22280e62c2d
+AUX gdal-2.3.0-libtiff.patch 306 BLAKE2B 8f2b39c812ceeee94b95102638885d0ff25086dec8196eaf9ae50378abe88809414da370d9b626b05d2daecfd762bf56938e35fd566952fddc18f1c614dfb4c4 SHA512 b793b1f2631a5944a79be58eab530f3cd248b25858f810515875adc71abb8e4abb1c9f9cf87ec45282bf9eca2e3932706110099a330664aadba3724954ca7297
 DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
 DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
-EBUILD gdal-2.2.3-r1.ebuild 7528 BLAKE2B db6fd16c9fa5679cfde4ef85b5ec6ecc161052dbd990da6e6eeae9934f300172bccd020e114067e90ad4ba25714741f24923379246ae29cc1ebdffe69bee0cdc SHA512 444f2a99ca963a4e1359fd888053a7cd8754534c12e4cd28bb4441aeeecc4fe869442eefbc7bcaa23347ee12cff568859f497a6411d0b0de86e3dbc2dd38f9d7
-EBUILD gdal-2.2.3-r2.ebuild 7579 BLAKE2B 3b6d969b924315db0563ba43b1f5b6370f5682c019095b8febdadf8c78807a85a81dd548fafb1826d91b6eddcf694f72f1f873fbfb42ba23a4a0da084e7ad047 SHA512 11f91a0186a6a35d16725894c9f330027eae6124e3903295183f673068c75cfcf08e5c578873bff22017a14a77f67e390c08a7ab75cccc2f154883a624afca12
-EBUILD gdal-2.3.0-r1.ebuild 7926 BLAKE2B 6781fc33a7d287814d267d95c7b9fa5ff6eab0ad970072f79f55476481560753155121add92bbd4d8d18d7b3f8fe22ccc1fab1aa3c69907eb8993ac50970e421 SHA512 0da72b67c0ee5acb3ef0a4306877e942574873672156a61ceffeea4043170e88df46b4b675f85f0b42326b088b7a8f76dedd70699b8282a4857ff5133d9e103a
-EBUILD gdal-2.3.1.ebuild 7987 BLAKE2B d550f6c8a05cefef45f62de1a11845d80ee14f257cbedb373ac317632e0abe814098c455253912f1cc111ea5eadeb50c8d83987566338941edf127c17b1e2922 SHA512 fc7344da710ca0464229ea8ef2f5192ad6bd13b7e9ca533d8369d8bd18c79241e9d40019a0b27d110e4b50189702e548423914f6390cfbe78b8ae2d39e81ae31
+EBUILD gdal-2.3.0-r2.ebuild 8138 BLAKE2B f11f4a5110a63b6eacac015ce16d05c235776a365d8328ce2046494ec560f6653f9dee26b8c99b536c6452d25e0fb600bfaed4b849b5dea87dea2bf5c0d5752b SHA512 a2cbe076456ad3b151c554b7f72da5fdf52637278b2e06816aede1e5150ee6c8aaf6441fd1be10a90b3bba380d99262c33430df10dfc7a524ea6001feca7bcab
+EBUILD gdal-2.3.1.ebuild 7988 BLAKE2B 62f4a17522a39a3fb054be6e4d516d3795a3f63481f13bb4a43dbf2fb1c7e62de4f5e9297ffa5bd37eec977acf01c4794c298c342f7544f3fb589c76eee9d0f7 SHA512 674bee0f3e1b2094186ec76255dd252c045642ad9a30619a346dc4fc4f2d65ba9586a02d806a39537dfabff6eb8a96f1ea01139f716b333682e161bd807c52cb
 MISC metadata.xml 1616 BLAKE2B 7167165623c93e069ce77ef80e68e6339fc38354c0db343564ce8ecf3566e0d61b8b5aeb4e6b69e66bf1e8932d18de54b528bf1a2148767efe3b5cf985a31748 SHA512 dca0cb7a8c94a5313aed09f8c28ae35a55de4b0ff8198469b7f9adc8220b29cbd8c3f92db121b944b03c169b302ac8aa95f4342b76510590aff63a5f122c74c1
diff --git a/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch b/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
new file mode 100644
index 000000000000..3f681836989f
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
@@ -0,0 +1,80 @@
+Index: /trunk/gdal/frmts/nitf/nitfrasterband.cpp

+===================================================================

+--- a/frmts/nitf/nitfrasterband.cpp	(revision 38657)

++++ b/frmts/nitf/nitfrasterband.cpp	(revision 38658)

+@@ -824,4 +826,20 @@

+         pUnpackData[i+7] = ((pDataSrc[k+2]) & 0x7);

+       }

++      if( i < n )

++      {

++        pUnpackData[i+0] = ((pDataSrc[k+0] >> 5));

++        if( i + 1 < n )

++            pUnpackData[i+1] = ((pDataSrc[k+0] >> 2) & 0x07);

++        if( i + 2 < n )

++            pUnpackData[i+2] = ((pDataSrc[k+0] << 1) & 0x07) | (pDataSrc[k+1] >> 7);

++        if( i + 3 < n )

++            pUnpackData[i+3] = ((pDataSrc[k+1] >> 4) & 0x07);

++        if( i + 4 < n )

++            pUnpackData[i+4] = ((pDataSrc[k+1] >> 1) & 0x07);

++        if( i + 5 < n )

++            pUnpackData[i+5] = ((pDataSrc[k+1] << 2) & 0x07) | (pDataSrc[k+2] >> 6);

++        if( i + 6 < n )

++            pUnpackData[i+6] = ((pDataSrc[k+2] >> 3) & 0x07);

++      }

+ 

+       memcpy(pData, pUnpackData, n);

+@@ -842,4 +862,20 @@

+         pUnpackData[i+7] = ((pDataSrc[k+4]) & 0x1f);

+       }

++      if( i < n )

++      {

++        pUnpackData[i+0] = ((pDataSrc[k+0] >> 3));

++        if( i + 1 < n )

++            pUnpackData[i+1] = ((pDataSrc[k+0] << 2) & 0x1f) | (pDataSrc[k+1] >> 6);

++        if( i + 2 < n )

++            pUnpackData[i+2] = ((pDataSrc[k+1] >> 1) & 0x1f);

++        if( i + 3 < n )

++            pUnpackData[i+3] = ((pDataSrc[k+1] << 4) & 0x1f) | (pDataSrc[k+2] >> 4);

++        if( i + 4 < n )

++            pUnpackData[i+4] = ((pDataSrc[k+2] << 1) & 0x1f) | (pDataSrc[k+3] >> 7);

++        if( i + 5 < n )

++            pUnpackData[i+5] = ((pDataSrc[k+3] >> 2) & 0x1f);

++        if( i + 6 < n )

++            pUnpackData[i+6] = ((pDataSrc[k+3] << 3) & 0x1f) | (pDataSrc[k+4] >> 5);

++      }

+ 

+       memcpy(pData, pUnpackData, n);

+@@ -856,4 +894,12 @@

+         pUnpackData[i+3] = ((pDataSrc[k+2]) & 0x3f);

+       }

++      if( i < n )

++      {

++        pUnpackData[i+0] = ((pDataSrc[k+0] >> 2));

++        if( i + 1 < n )

++            pUnpackData[i+1] = ((pDataSrc[k+0] << 4) & 0x3f) | (pDataSrc[k+1] >> 4);

++        if( i + 2 < n )

++            pUnpackData[i+2] = ((pDataSrc[k+1] << 2) & 0x3f) | (pDataSrc[k+2] >> 6);

++      }

+ 

+       memcpy(pData, pUnpackData, n);

+@@ -873,4 +921,20 @@

+         pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] >> 7);

+         pUnpackData[i+7] = ((pDataSrc[k+6]) & 0x7f);

++      }

++      if( i < n )

++      {

++        pUnpackData[i+0] = ((pDataSrc[k+0] >> 1));

++        if( i + 1 < n )

++            pUnpackData[i+1] = ((pDataSrc[k+0] << 6) & 0x7f) | (pDataSrc[k+1] >> 2);

++        if( i + 2 < n )

++            pUnpackData[i+2] = ((pDataSrc[k+1] << 5) & 0x7f) | (pDataSrc[k+2] >> 3) ;

++        if( i + 3 < n )

++            pUnpackData[i+3] = ((pDataSrc[k+2] << 4) & 0x7f) | (pDataSrc[k+3] >> 4);

++        if( i + 4 < n )

++            pUnpackData[i+4] = ((pDataSrc[k+3] << 3) & 0x7f) | (pDataSrc[k+4] >> 5);

++        if( i + 5 < n )

++            pUnpackData[i+5] = ((pDataSrc[k+4] << 2) & 0x7f) | (pDataSrc[k+5] >> 6);

++        if( i + 6 < n )

++            pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] >> 7);

+       }

+ 

diff --git a/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch b/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch
new file mode 100644
index 000000000000..783752e0efa6
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch
@@ -0,0 +1,12 @@
+Index: trunk/gdal/frmts/nitf/nitffile.c

+===================================================================

+--- a/frmts/nitf/nitffile.c	(revision 38085)

++++ b/frmts/nitf/nitffile.c	(revision 38234)

+@@ -350,5 +350,6 @@

+     if (nOffset != -1)

+         nOffset = NITFCollectSegmentInfo( psFile, nHeaderLen, nOffset, "RE", 4, 7, &nNextData);

+-    else

++

++    if( nOffset < 0 )

+     {

+         NITFClose(psFile);

diff --git a/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch b/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch
new file mode 100644
index 000000000000..5964165e3e6f
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch
@@ -0,0 +1,12 @@
+--- ./frmts/gtiff/libtiff/tif_read.c.old	2018-08-11 09:12:42.378891934 +0100
++++ ./frmts/gtiff/libtiff/tif_read.c	2018-08-11 09:15:37.330882891 +0100
+@@ -296,7 +296,8 @@
+         }
+         else
+         {
+-                return 1;
++		tif->tif_rawcc = tif->tif_rawdataloaded;
++		return 1;
+         }
+ }
+ 
diff --git a/sci-libs/gdal/gdal-2.2.3-r1.ebuild b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
deleted file mode 100644
index b4bd9eb1ac6b..000000000000
--- a/sci-libs/gdal/gdal-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/2.2"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libxml2:=
-	media-libs/tiff:0=
-	sci-libs/libgeotiff
-	sys-libs/zlib:=[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-2.2.1 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	mdb? ( dev-java/jackcess:1 )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( >=app-text/poppler-0.24.3:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	spatialite? ( dev-db/spatialite )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-	xls? ( dev-libs/freexl )"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.7:* )"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.7:* )
-	perl? ( dev-lang/swig:0 )
-	python? (
-		dev-lang/swig:0
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="
-	mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-soname.patch"
-	"${FILESDIR}/${P}-json-c-0.13.patch" # bug 641658
-	"${FILESDIR}/${P}-bashcomp-path.patch" # bug 641866
-)
-
-src_prepare() {
-	# fix datadir and docdir placement
-	sed -e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		-i "${S}"/GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		-i "${S}"/swig/python/GNUmakefile || die
-
-	# Fix spatialite/sqlite include issue
-	sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		-i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# updated for newer swig (must specify the path to input files)
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-	sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-		-i swig/python/setup.cfg || die "sed python setup.cfg failed"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug 619148
-	append-cxxflags -std=c++14
-
-	tc-export AR RANLIB
-	local myopts=()
-
-	if use java; then
-		myopts+=(
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-lib=dlopen
-			$(use_with mdb)
-		)
-	else
-		myopts+=( --without-java --without-mdb )
-	fi
-
-	if use sqlite; then
-		append-libs -lsqlite3
-	fi
-
-	# pcidsk is internal, because there is no such library yet released
-	#     also that thing is developed by the gdal people
-	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-	# bsb - legal issues
-	# ingres - same story as oracle oci
-	# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
-	# podofo - we use poppler instead they are exclusive for each other
-	# tiff is a hard dep
-	ECONF_SOURCE="${S}" econf \
-		--includedir="${EPREFIX}/usr/include/${PN}" \
-		--disable-pdf-plugin \
-		--disable-static \
-		--enable-shared \
-		--with-expat \
-		--with-geotiff \
-		--with-grib \
-		--with-hide-internal-symbols \
-		--with-libjson-c="${EPREFIX}/usr/" \
-		--with-libtiff \
-		--with-libtool \
-		--with-libz="${EPREFIX}/usr/" \
-		--with-gnm \
-		--with-cryptopp=no \
-		--without-bsb \
-		--without-dods-root \
-		--without-ecw \
-		--without-epsilon \
-		--without-fme \
-		--without-grass \
-		--without-hdf4 \
-		--without-idb \
-		--without-ingres \
-		--without-jasper \
-		--without-jp2mrsid \
-		--without-kakadu \
-		--without-mrsid \
-		--without-msg \
-		--without-mrf \
-		--without-pcraster \
-		--without-pdfium \
-		--without-sde \
-		--without-sosi \
-		--without-mongocxx \
-		--without-podofo \
-		--disable-lto \
-		$(use_enable debug) \
-		$(use_with armadillo) \
-		$(use_with aux_xml pam) \
-		$(use_with curl) \
-		$(use_with fits cfitsio) \
-		$(use_with geos) \
-		$(use_with gif) \
-		$(use_with gml xerces) \
-		$(use_with hdf5) \
-		$(use_with jpeg pcidsk) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k openjpeg) \
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
-		$(use_with netcdf) \
-		$(use_with oracle oci) \
-		$(use_with odbc) \
-		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
-		$(use_with opencl) \
-		$(use_with perl) \
-		$(use_with png) \
-		$(use_with pdf poppler) \
-		$(use_with postgres pg) \
-		$(use_with python) \
-		$(use_with spatialite) \
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
-		$(use_with threads) \
-		$(use_with webp) \
-		$(use_with xls freexl) \
-		${myopts}
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -e "s: -rdynamic : :" \
-			-i GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"/swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_install
-		popd > /dev/null || die
-		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
-			-i GDALmake.opt || die
-	fi
-
-	use perl && perl_delete_localpod
-
-	local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
-	use doc && HTML_DOCS=( html/. )
-
-	default
-
-	python_install() {
-		distutils-r1_python_install
-		python_doscript scripts/*.py
-	}
-
-	if use python; then
-		# Don't clash with gdal's docs
-		unset DOCS HTML_DOCS
-
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		newdoc swig/python/README.txt README-python.txt
-
-		insinto /usr/share/${PN}/samples
-		doins -r swig/python/samples/
-	fi
-
-	doman "${S}"/man/man*/*
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-2.2.3-r2.ebuild b/sci-libs/gdal/gdal-2.2.3-r2.ebuild
deleted file mode 100644
index 723e7ffd8c56..000000000000
--- a/sci-libs/gdal/gdal-2.2.3-r2.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/2.2"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libxml2:=
-	media-libs/tiff:0=
-	sci-libs/libgeotiff
-	sys-libs/zlib:=[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-2.2.1 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	mdb? ( dev-java/jackcess:1 )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( >=app-text/poppler-0.24.3:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	spatialite? ( dev-db/spatialite )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-	xls? ( dev-libs/freexl )"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.7:* )"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.7:* )
-	perl? ( dev-lang/swig:0 )
-	python? (
-		dev-lang/swig:0
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="
-	mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-soname.patch"
-	"${FILESDIR}/${P}-json-c-0.13.patch" # bug 641658
-	"${FILESDIR}/${P}-bashcomp-path.patch" # bug 641866
-	"${FILESDIR}/${P}-goocast.patch" # bug 656252
-)
-
-src_prepare() {
-	# fix datadir and docdir placement
-	sed -e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		-i "${S}"/GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		-i "${S}"/swig/python/GNUmakefile || die
-
-	# Fix spatialite/sqlite include issue
-	sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		-i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# updated for newer swig (must specify the path to input files)
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-	sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-		-i swig/python/setup.cfg || die "sed python setup.cfg failed"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug 619148
-	append-cxxflags -std=c++14
-
-	tc-export AR RANLIB
-	local myopts=()
-
-	if use java; then
-		myopts+=(
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-lib=dlopen
-			$(use_with mdb)
-		)
-	else
-		myopts+=( --without-java --without-mdb )
-	fi
-
-	if use sqlite; then
-		append-libs -lsqlite3
-	fi
-
-	# pcidsk is internal, because there is no such library yet released
-	#     also that thing is developed by the gdal people
-	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-	# bsb - legal issues
-	# ingres - same story as oracle oci
-	# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
-	# podofo - we use poppler instead they are exclusive for each other
-	# tiff is a hard dep
-	ECONF_SOURCE="${S}" econf \
-		--includedir="${EPREFIX}/usr/include/${PN}" \
-		--disable-pdf-plugin \
-		--disable-static \
-		--enable-shared \
-		--with-expat \
-		--with-geotiff \
-		--with-grib \
-		--with-hide-internal-symbols \
-		--with-libjson-c="${EPREFIX}/usr/" \
-		--with-libtiff \
-		--with-libtool \
-		--with-libz="${EPREFIX}/usr/" \
-		--with-gnm \
-		--with-cryptopp=no \
-		--without-bsb \
-		--without-dods-root \
-		--without-ecw \
-		--without-epsilon \
-		--without-fme \
-		--without-grass \
-		--without-hdf4 \
-		--without-idb \
-		--without-ingres \
-		--without-jasper \
-		--without-jp2mrsid \
-		--without-kakadu \
-		--without-mrsid \
-		--without-msg \
-		--without-mrf \
-		--without-pcraster \
-		--without-pdfium \
-		--without-sde \
-		--without-sosi \
-		--without-mongocxx \
-		--without-podofo \
-		--disable-lto \
-		$(use_enable debug) \
-		$(use_with armadillo) \
-		$(use_with aux_xml pam) \
-		$(use_with curl) \
-		$(use_with fits cfitsio) \
-		$(use_with geos) \
-		$(use_with gif) \
-		$(use_with gml xerces) \
-		$(use_with hdf5) \
-		$(use_with jpeg pcidsk) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k openjpeg) \
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
-		$(use_with netcdf) \
-		$(use_with oracle oci) \
-		$(use_with odbc) \
-		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
-		$(use_with opencl) \
-		$(use_with perl) \
-		$(use_with png) \
-		$(use_with pdf poppler) \
-		$(use_with postgres pg) \
-		$(use_with python) \
-		$(use_with spatialite) \
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
-		$(use_with threads) \
-		$(use_with webp) \
-		$(use_with xls freexl) \
-		${myopts}
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -e "s: -rdynamic : :" \
-			-i GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"/swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_install
-		popd > /dev/null || die
-		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
-			-i GDALmake.opt || die
-	fi
-
-	use perl && perl_delete_localpod
-
-	local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
-	use doc && HTML_DOCS=( html/. )
-
-	default
-
-	python_install() {
-		distutils-r1_python_install
-		python_doscript scripts/*.py
-	}
-
-	if use python; then
-		# Don't clash with gdal's docs
-		unset DOCS HTML_DOCS
-
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		newdoc swig/python/README.txt README-python.txt
-
-		insinto /usr/share/${PN}/samples
-		doins -r swig/python/samples/
-	fi
-
-	doman "${S}"/man/man*/*
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-2.3.0-r1.ebuild b/sci-libs/gdal/gdal-2.3.0-r2.ebuild
index 436c68a468d8..fe8e746f8d17 100644
--- a/sci-libs/gdal/gdal-2.3.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.3"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
 
 COMMON_DEPEND="
@@ -82,6 +82,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
 	"${FILESDIR}/${PN}-2.2.3-goocast.patch" # bug 656252
 	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+	# Security bugs
+	"${FILESDIR}/${P}-libtiff.patch" # bug 621712
+	"${FILESDIR}/${P}-frmts-nitf38234.patch" # bug 621720
+	"${FILESDIR}/${P}-changeset_38658.patch" # bug 623028
 )
 
 src_prepare() {
@@ -305,6 +309,7 @@ src_install() {
 	fi
 
 	doman "${S}"/man/man*/*
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
index 38736368a997..e1f97f524f2e 100644
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.1.ebuild
@@ -210,8 +210,9 @@ src_configure() {
 		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
 		$(use_with threads)
 		$(use_with webp)
-		$(use_with xls freexl) )
+		$(use_with xls freexl)
 		$(use_with zstd)
+	)
 
 	tc-export AR RANLIB
 
diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest
new file mode 100644
index 000000000000..b730166b4af8
--- /dev/null
+++ b/sci-libs/keras-applications/Manifest
@@ -0,0 +1,3 @@
+DIST keras-applications-1.0.4.tar.gz 285031 BLAKE2B 7208752b45f825949eb2718e4e276f7c3e4a523b2668975d6834084c42cdc2dc3efb57fd0ef24401bc0dd35453f4798422f6afd9583249237cd35941939c25f4 SHA512 10a793a60b7084ea641035618e178d5b1261da5826292db25134f9886b191bd152dfa8fa686a6270fa56a7fc1831bda07e77d12597972b186a9354f857feb1d0
+EBUILD keras-applications-1.0.4.ebuild 554 BLAKE2B 8492cef67af05dc39a0ed36f0afdedb568983de1c6225417ee143ed73017cc76e38307ac7e95aaeebed6494d1a8b2ccbbfe9eb1b5a86d66cb5597d9650debd43 SHA512 b0ab5268039f213cf46c88198f2153acdacf672e42e6d51bb85c6115d7ceca39fe78472a71af2a2e93b6ef176a44b0d9000fd8ef693fa967158432a98d5151a9
+MISC metadata.xml 621 BLAKE2B 4f375ddfcfed6172df186350f7bd3dbfbcacea34f555b14719af43f58b140d73e378cd0a5efd8438ed2a0006f3552febc684b4fce85aeb88fb2c9bf819c06c4b SHA512 9dbb366d483843279cc7532b56a877313a7c39de25c93c313a2957092f9766ce5715a83dd87ef116d1733a7cc399319025ce1eb0e7ad174e2b7441360a9f5560
diff --git a/sci-libs/keras-applications/keras-applications-1.0.4.ebuild b/sci-libs/keras-applications/keras-applications-1.0.4.ebuild
new file mode 100644
index 000000000000..ce11be0de2ee
--- /dev/null
+++ b/sci-libs/keras-applications/keras-applications-1.0.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Keras deep learning library reference implementations of deep learning models"
+HOMEPAGE="https://keras.io/applications/"
+SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/keras-applications/metadata.xml b/sci-libs/keras-applications/metadata.xml
new file mode 100644
index 000000000000..f195797ab3a0
--- /dev/null
+++ b/sci-libs/keras-applications/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+	<longdescription lang="en">
+		Keras Applications is the applications module of the Keras deep learning library. It provides model definitions and pre-trained weights for a number of popular archictures, such as VGG16, ResNet50, Xception, MobileNet, and more.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">keras-team/keras-applications</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest
new file mode 100644
index 000000000000..2aede3829617
--- /dev/null
+++ b/sci-libs/keras-preprocessing/Manifest
@@ -0,0 +1,3 @@
+DIST keras-preprocessing-1.0.2.tar.gz 34762 BLAKE2B 3b4766aa48d6e6cfd50817af97c8f2faf9ae7e78007f7dddcbf1f4ded072657a5b94ac4b563d090dd8a8437a249b64fea61a1cd5f680767f14611fa6fe92dd3a SHA512 d5a558c3d9741c298ea3737bfb04788bd2cbecefe14aa53e0f6ccde891ad9304ec673a888dc53a2f954c0b718ce31d9d35095d3f21e15d73248acfc8105457d9
+EBUILD keras-preprocessing-1.0.2.ebuild 602 BLAKE2B 2e9a1d1fe5af86239dd6c28ad262506b1e6d52ca853daa89130ac536ae37de0b83954cbf3cfddf4a1e25e20c945aee9d3a28f1d5ea192eead788960294cd6410 SHA512 eab972f49c8c94d4c2a14b2f643e9ebc164657fc637605ee683eabb7eefa414245b65859dd01b60387c9b1b638bc4038bbafeb1bf2cdf643b88695bdf7f7cce1
+MISC metadata.xml 585 BLAKE2B a2f92ac4e2b9af055313a13de9bcbaee7ab7ca2efa4790c82027aece4b629bfa7a73c5ed0286b0f24f1853330057527009afe6ab1722f19d9c504a9d0737e827 SHA512 371cc3f5897bd28c62642a8857a22e775e24aa917bc0e58bb4de4e0a2a6580174ba35cfda2e8dd83599e2180fdfb3f11a953e7076c6d87073e1465b145b115e9
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.2.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.2.ebuild
new file mode 100644
index 000000000000..930bd5dcf266
--- /dev/null
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models"
+HOMEPAGE="https://keras.io/"
+SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/keras-preprocessing/metadata.xml b/sci-libs/keras-preprocessing/metadata.xml
new file mode 100644
index 000000000000..833dd3977c1a
--- /dev/null
+++ b/sci-libs/keras-preprocessing/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+	<longdescription lang="en">
+		Keras Preprocessing is the data preprocessing and data augmentation module of the Keras deep learning library. It provides utilities for working with image data, text data, and sequence data.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">keras-team/keras-preprocessing</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/lapack-reference/Manifest b/sci-libs/lapack-reference/Manifest
index 3065291e0ec4..9269e6ef36d0 100644
--- a/sci-libs/lapack-reference/Manifest
+++ b/sci-libs/lapack-reference/Manifest
@@ -7,7 +7,7 @@ DIST lapack-3.2.1.tgz 4792502 BLAKE2B e9d39c958406db05383ebda7e781ae6c2d0b1f3896
 DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
 DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
 DIST lapack-reference-3.2.1-autotools.patch.bz2 13338 BLAKE2B 1be1d2c273b92a106a9c914f17e0350b44fc42b3837ee48b040d7a61802bf5036c30e8800ec613ccf12a082a7801cad6878b6ddcbd4db32e27a06b7462f8ecd2 SHA512 957e8c7646a0d6ade9c0dfdaf2aa665a01f932dfda376ba1db164106fb174793e6504cdbed7daf158f23bb69502937963cb2e2d45ac720980d3832f6fc0fedbd
-EBUILD lapack-reference-3.2.1-r4.ebuild 2856 BLAKE2B af3edf3c9bdc96f349b997d45b3784a13849375b3724e1f20c7d8a41d61f1ccd4b9db0fcc55baf854d46f1a3773bef3b84ca871fcc91915ce4a5f5ad0bdd76e0 SHA512 3ef5329596912cc97135ddfe6f086159ac92466970ea2a8d76bed523af6a608db506b02b92743dd728e01e9e1c1e266c8d623cf5177ae2738df7ad2ecf81f72d
+EBUILD lapack-reference-3.2.1-r4.ebuild 2855 BLAKE2B 4aeca07854fc0183018fdeca31a88a5f738cc43b065c4af940c927f26393d0a8d91102af30bcd83b385bd022774a5305ff51d5201a3e8673e1019d341f50ad92 SHA512 8a511761406608264d1c9c7fbbe802901a90943dbae891f1bbcd2e5d293c9a225595798179058566d8d783b18ce076d19f9ee2ec06cc173206238fcadb74fb43
 EBUILD lapack-reference-3.6.0.ebuild 2644 BLAKE2B cd1c5867264c0541f0d58a1049e812365bf15884ad5dd8f31460194daf4ee2acca92d752b5d9e51c642cd38ec1afb8fdb2034f0567bd53602fa0de36eec2bb86 SHA512 b4df9f1a368314b55ea5bdb44324089729262e7a47dd6105d93ef58acfb60fc369252c20bdf9a5436d4f08be2fd5af6929259b9f7b03bcffbaa2ff5a461f7bfd
 EBUILD lapack-reference-3.7.0.ebuild 2882 BLAKE2B 7700edf55666373a03e808743d8ea050fb9eb52fe14b76b9022974b85c265495c937aacc6b023310f6ef45549b9a2281ce1e6ca02a83cc6a9bcf0a9b532352ac SHA512 b69c879e1fb12c2c9e90f97cea99b7a0711e95ad08b7ab139be5357396179f3942f5dd796ba10fc34bd44ca8015b2f98db8ec59d9d3ee730a3ca750a230b1336
 MISC metadata.xml 779 BLAKE2B 64433bf79744cecd4ce505c3643ff73d3355620749b344ab27324c80ecb7b3ad9dd02a05dbbf1bd3e8174cac947c236d80f51377c259a1ff3aaa17b9908a8a0e SHA512 a72591749a3ea6ac49ce3a20d6934042c54e0b1639d00d585bdcc88cd9425d31135d8acc4ee33856f3933cc2518e5c7354d6debc20bbcc7b701cd6978f474e6f
diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
index 26258bbf0c57..e8d5f5d55d16 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
@@ -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,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index d6c58d1eff4c..13eb931d9d04 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -4,5 +4,5 @@ AUX linux-gpib-4.0.3-reallydie.patch 621 BLAKE2B 367ea6a50513b86591e5dfe60df11a4
 AUX linux-gpib-4.0.4_rc2-kernel-4.11.0.patch 387 BLAKE2B 38516ea8a9ca5dd3dc32cfd605bd68100726bbcc8d96fa457caabfb91cbc17ce37e61194ac32e573acc797d71c448454d03e6202ec331cb25c056f8ee7b78829 SHA512 6f6b25695ae81671a93e8b86978ea1ef9e71ba5a38d14ad95b9a6aa59704bb2d6a8064c1ac006b1e7c4740d059184d4d4cefef88a2fd0c2a09406f64f6597187
 DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af
 DIST linux-gpib-4.1.0.tar.gz 1529480 BLAKE2B b49df07f15d0f91b9d475052993421979d6776ef15aaa9b7e49632db9018f0cbd9ff38d12e2afa9e8027202e450dfc487ac9e2e6ab719086646d983cc41b3482 SHA512 037ed9e484a83caccb15d2d142eef6f1eec356ae972480ca7a676a318d3e9f844fc1911c1b30869b4bb14ef0b4cd10587a803426df9145966bafe22ca7316bd8
-EBUILD linux-gpib-4.1.0.ebuild 6148 BLAKE2B eba62ead0f6400de24715a07347737f4ba03e465d6a0eb16dbec5e2c5ca0301ba3c258a9e9c4268fc3a267433cb60f7ca726da61b51e563a516d60a90d92d9fc SHA512 63029b5e608e9834545850403d1aceaedd3c247d5c26fa5ff5ac33714dc6511a297dd2d4a068df6e9fae735566f6dad56574e9c737b672251a7f114566b9999e
+EBUILD linux-gpib-4.1.0.ebuild 6110 BLAKE2B 354731c55d29f49b1aaca808c45128f7826b322555d5340fa9fd11481a9ec171bfa8cd365c5329f033e46f49d677c1a2a9f56cb8bc02e911224025de51505563 SHA512 29592c5c05b72e8a4263781636aa9a68b3d4e38743f5c7228a9ed449ab1e877141c5f238789e2942dbaa8c883439086c87321e55a7f8be653b91056b9f677656
 MISC metadata.xml 688 BLAKE2B 405c816eb10feec819da0e5994c2ebe1e73ae4882cecf9f619bf30674b9ff499ae044cca42bad687d97cf3aef2a70eb826d5b07695cbde0c164a00cbac576e0a SHA512 d5af868c802d6c01b8267038cc5bdffc61677403ecb88cdfaf97f31d6b80d1e9318bcd507199d6a850df221cda2baf2869a1de4d732cde75a4aea2ec54f944b8
diff --git a/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild b/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild
index b4f528a35e76..d9dbcd6880cc 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild
@@ -10,9 +10,9 @@ inherit linux-info readme.gentoo-r1 versionator eutils linux-mod autotools perl-
 MY_PV=${PV/_/}
 
 DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="http://linux-gpib.sourceforge.net/"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
 SRC_URI="mirror://sourceforge/linux-gpib/${PN}-${MY_PV}.tar.gz
-	firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
+	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
 "
 
 LICENSE="GPL-2"
@@ -54,7 +54,7 @@ pkg_setup () {
 		die "Kernel versions older than 2.6.8 are not supported."
 	fi
 
-	# https://sourceforge.net/tracker/?func=detail&aid=3285657&group_id=42378&atid=432940
+	# https://sourceforge.net/p/linux-gpib/bugs/43/
 	if use pcmcia && kernel_is -ge 2 6 38; then
 		die "pcmcia support is broken on kernels newer 2.6.38"
 	fi
diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
index 3020ba5eea81..ae161b25d14a 100644
--- a/sci-libs/silo/Manifest
+++ b/sci-libs/silo/Manifest
@@ -3,5 +3,5 @@ AUX silo-4.10.2-qt5.patch 1414 BLAKE2B 3b33d1228f9b26340d851a97dfcdde38b1ab66632
 AUX silo-4.10.2-qtlibs.patch 4320 BLAKE2B 34fbff942d4caa73bf18302873ba4dc63de063eec84b3e0cd3bf3b24a5aeb44d40b74567f8001c3d14e19dabdb5133ea4ca32af067b16398a6aaaaac664209c5 SHA512 3f2e63ee943463fc23d7ba3542c756bd158c8b8f8280ec87eef53e30add0b335edfd202c592885e2f4002c7f975324ca7e96351c1d9c25ffb1adf2b67cd034d9
 AUX silo-4.10.2-tests.patch 562 BLAKE2B 27a15c9b6561101610774fd5f69b3bde7c0bca13943f37792562a0af66924566852ff67d5eee208bfcf1dd7790be602809c552a3f5a3b98cfc971aa1e90fd560 SHA512 c54c9cd7934f94e572302c8afabf20b4bfe84c34e602afe37fde2c0953598c5c91cb5a9351669da2dd44226cf269a4d762a38af5a23896677d8260cfcff032f3
 DIST silo-4.10.2.tar.gz 13135900 BLAKE2B 6326a42df43c4bb6936522d1730db8ce45c6b74779cf37b7a5a0b7a72def9e9a4f174b68392adbda59936113ccac4ae5e7bf7266effb364eac7e5d0cff8bb37c SHA512 8cd1340ed641c8be77f310b286da344e2fed7ae469ed7bebf5deebaa1a369ca91c283b38eae2c57b7ad046f65343cfaa56a1c07b6c8b07b79aad69c4e5617f6e
-EBUILD silo-4.10.2-r1.ebuild 1179 BLAKE2B e785939ebf112b33777b56f99abfddfe68d042dd5e149dffc198e91378a8af86e3c647d3f0e5de707b0ff90ef4e425cbe4aed2b56ab4575d245f8f149280c056 SHA512 641e8e2f98ce7d916b565014760ca21dd43447080b8c47e186575414820868d7bba91ef7c951f57af35a7cee4e5ea6ea7f5d4f4db60e1dab6bd63a8ffb7bafb8
+EBUILD silo-4.10.2-r1.ebuild 1180 BLAKE2B fa564644f76ff5a62aad9d05536f93b7f5862aca3c041a3c422e92e2448bc3ba2b7b3460d981719bde940b4aff4e53dc6a557875fc8c91cd1afa8c11eb24f6ea SHA512 e3b9c393a7aea0f796a4c67989b5cfb8a29bb823e56501c794fdc7b4fd3ecb2ad729b44203d242da19f7c997f07ca5fa0fbbc3e2085990020ccc03e09c79d3b9
 MISC metadata.xml 751 BLAKE2B 15f217d9eeeedb7889e47a18d81715f674156e59aef6901ec3873a731484a645a74c1840d2b41e1ca53d0247b43c5f401353b86e419f74f0aeb965146a53b9c1 SHA512 be9db7766bd0e0ea6c5f7f4505ee48ab6ea8b7da1ccc78ab68868072d15d068dab3f6eeeb53cf5cd348da92d52e32d8ad363798de55cd4a79fb1c19ad8456f5e
diff --git a/sci-libs/silo/silo-4.10.2-r1.ebuild b/sci-libs/silo/silo-4.10.2-r1.ebuild
index b8c03cde0cde..61b8b07e7d19 100644
--- a/sci-libs/silo/silo-4.10.2-r1.ebuild
+++ b/sci-libs/silo/silo-4.10.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${PN
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
-IUSE="hdf5 +silex static-libs qt5 test"
+IUSE="hdf5 +silex static-libs +qt5 test"
 
 REQUIRED_USE="silex? ( qt5 )"
 
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index e7ea1a4f6dc0..a9096abcab35 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -5,5 +5,5 @@ AUX superlu-5.2.1-pkgconfig.patch 1013 BLAKE2B a36aac6c06fa8cb4bd3d19fcc74b27c09
 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c
 DIST superlu_5.2.1.tar.gz 2560875 BLAKE2B b1dd51bddb55061f5756f3cf766f80e506f7cc12b272c2ceebbae71cab9314000308b72cf265d5948ed69c68d0ad0adeb938a4471250147b0fcfdc2b80298db7 SHA512 30538b4c2809294b8f34646bce6445944f21a1dffaf3ec0a0f29a55d5261caa56e4279d7722bb95cc9d89450d36ded969617edc82ecce7d0f1dfb24040d80d07
 EBUILD superlu-4.3-r1.ebuild 1625 BLAKE2B c37f8db95d689f21930dbaebd82e854490ee08cc97a5a78e2acdd38d4f24dbdb31c7c32d68a921f73948fcd05a6a6d8e73e7657b601a192fd4a05003ad0ac205 SHA512 1f43902eb51afc5b238cda59885b85ad33cd310c7dd70fbc33b67222b39357d277b8f54b46c636101f232cc51b6ed2fb6456445cee35714e41882e0a9ee48909
-EBUILD superlu-5.2.1-r1.ebuild 1489 BLAKE2B 366b91ea11b50bbbf33ed28f32bf8513dd5be1bc5a982ee73675eb9c1fede1da551f09098fc2073092366d8d4a89e35ce2e8b471f20d8a296399a518511b6a90 SHA512 e58177e1d053be0327135b4bdb4494b263123e541bc2ab825659cf9cebab65625bf2b50c5f756992293c00a51a72bcacfc6397328bf6568d45c115ae0a4f5cc0
+EBUILD superlu-5.2.1-r1.ebuild 1502 BLAKE2B bcb99daedf81fcdabecfb8382954c6c61ab1a6f059d01a558b0ae469dbc69e8dc74dedbfbbe57eeb649f3cb8be2990f4a077dd926f36f777c2a33bbb78be294e SHA512 64f1567449a0f6ede3513e0f3cc6efcc7610976f3c3771a97db5a9132888492e3fb79dd3b4ac0d3716bb3070b62ce898390dedfb043af1dacd36e408e088e951
 MISC metadata.xml 1404 BLAKE2B 3ab566d18d18307d9fc7dea889e492e19b76aa9fdebe0dce86b46b1cf7a2d53f65404f56da04cc8420e6a7c21867b948e537833693cb60521746c5a48f16bc6b SHA512 8b758572ed599bdf43898050e265ce8ea82c4952af97471c09ee0013e56cf6928df3f3a436516c4fae7a38a13bba4a3437e130f294f942eaaae05125fa5fbdea
diff --git a/sci-libs/superlu/superlu-5.2.1-r1.ebuild b/sci-libs/superlu/superlu-5.2.1-r1.ebuild
index a0f4af495788..ad93fe85e938 100644
--- a/sci-libs/superlu/superlu-5.2.1-r1.ebuild
+++ b/sci-libs/superlu/superlu-5.2.1-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
@@ -12,7 +12,7 @@ MY_PN=SuperLU
 if [[ ${PV} != *9999* ]]; then
 	inherit versionator
 	SRC_URI="http://crd-legacy.lbl.gov/~xiaoye/SuperLU//${PN}_${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 	SLOT="0/$(get_major_version)"
 	S="${WORKDIR}/SuperLU_${PV}"
 else
@@ -20,7 +20,7 @@ else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/xiaoyeli/${PN}"
 	SLOT="0/9999"
-	KEYWORDS="~arm64 ~hppa ~ia64 ~sparc"
+	KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Sparse LU factorization library"