gentoo resync : 18.05.2019

30 files changed, 244 insertions, 93 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index aaa5c0b05407..6157e704dae1 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/blas-reference/Manifest b/sci-libs/blas-reference/Manifest
index 9736a0e8b48c..801c5054b86e 100644
--- a/sci-libs/blas-reference/Manifest
+++ b/sci-libs/blas-reference/Manifest
@@ -7,7 +7,7 @@ AUX lapack-reference-3.7.0-fix-build-system.patch 1598 BLAKE2B 9128036fc47dae239
 DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
 DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
 DIST lapack-lite-3.1.1.tgz 5332509 BLAKE2B 5a8ea98e9956f2bc1fc8dbb1ede18178d43d1f418e324f2798daf2197a2f7f7a1841ea0a0d68f1affa3c9c0a37b024f82222bd2fd6072ca827c70c9c441191c7 SHA512 492b932ef313339ce6b4e63ac8f778489e6870b0eb85f7b086f3c844e75f98e7f85382c7556dfa368ab8320b6f02d1df8ccfcb40b5c0b7c2d74518b7c309e75c
-EBUILD blas-reference-20070226-r4.ebuild 1956 BLAKE2B d979907812d17f61d0401f1c50ea4c758873f642e0cca1c22eee0a61002c95792e8972296576a858274fe42f9ed78aacf146bbbc666b65a600eac077e56cefdb SHA512 929dff29757fd2c5ed991e592725ad62bbd51a365d419c1c4a52a0bf9da0003f686494e5cfd807452cfbd462cd1622934a08f8792c55b1ab574cca9cec83ce03
+EBUILD blas-reference-20070226-r4.ebuild 1962 BLAKE2B f5b110c852b5399e04803bd02b9afc9e1b6b1925b29426fa06c37b4bd18548b139495856a6e4e384b28ba023ae5d594dbe8af6e0a4eb73c3c628f19bc7d75a1a SHA512 c216991bc62f5333652f1c142820fead433ea00e42f4e59bc9bd2431716c0316964e924d6cb984b898014b30d40fb5d258838b177bbf3809eedb048c9f122367
 EBUILD blas-reference-20151113-r1.ebuild 2465 BLAKE2B 814bb3dd1750a8b24d89be02a6cc503064760b6d6b2b51c6a0781c3f74951aa3284caab9ed6c00f9a1959624c43d2dcd26625952208176be08fe98f75c514c95 SHA512 3ba5dc44282a82e42a5d337fa9cbde9f5a1c098ba2ec4179748f55dce9c0ad152f45bf20617af975e7bea0cd5c5d6a47f25b0a50fe239f2aa4642eb514b06821
 EBUILD blas-reference-20161223.ebuild 2701 BLAKE2B 0cf4f7b7a45f2ba3090f507091df05f0617370961e95bdd6e6d8c0957aa7a2d2f682631b147774e1d69f6e1587e417f387a171c7faf6608106f27356f2dfa7f8 SHA512 4bb9b8ec30db542d6fed0389de07fb4cdf3c0b79bfc79331fff501fa4d340d23ce1889b472c60b73743918c0da2e3c28f1aa23b879b6eb6fb5b37eba15ff01c9
 MISC metadata.xml 801 BLAKE2B 68ea5978073c01c861253ffd064179a25dc63771c9cabc0b3de200e5333c93a5d55caf8cde1234b643007b690b2a96fa207314117f790b367bd089c997722676 SHA512 78ca8d7459ba5bc81f5f821d9020023d01610d1fd55157bf566890a5c80ff8f83ca1139304319ee41b04f04b559c9e377037c04a1fbdd8dfde3e62f7ca6ff9fe
diff --git a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
index ee6ad0323510..8c70f4051e9a 100644
--- a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 DEPEND="app-eselect/eselect-blas"
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index 663fad96d6a5..b866551b3423 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -2,7 +2,7 @@ AUX flann-1.9.1-cmake-3.11.patch 2998 BLAKE2B 85c6b6feb800ab1a21af86a4001b0056fd
 AUX flann-1.9.1-cuda-9.patch 850 BLAKE2B f193a6fd25a1d2cd45201d547fb444393cb82f344da6f5d1e2a012599170a412b261f6cf35d8943da7e96fd9f204991580d5ea045b43e2aa33ea5ad9fa9307d4 SHA512 0b5cad7b928319b922bdaa27d07fd38f1c359799ef9c217b6c1979f8ac9a86706e7ad1547f484aeb1db449a37693d18b2710b877483266915a869372c29ee1e4
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
 EBUILD flann-1.9.1-r1.ebuild 2242 BLAKE2B c36832b645ca46e3aa622882cca34b644d8b667def8b900f1e5eea83fa0d55677f65c14c4a17134f080b4b7fe863023a71a7aeac72385bc25a9c2a4048fb33bb SHA512 08de8ba5d423999f8403104be8efbd678e6c4981790a314e717944d6f5ca714cf97219efa445894145acc47d896ce11a49867e19c654b6c403db3b55700b5ab0
-EBUILD flann-1.9.1-r2.ebuild 2306 BLAKE2B 2913821eb87a06cd7dd14bfe8562ab72496043977fd6a7a909f9c3899a65532539bce43a1298547cbefc766b4f27f00d4c27ade5dbfd1467928765ca2cc96d54 SHA512 9a94f340a95e5a2c68adba8a278211b7a655c0753cc52edc9b92ffd65629a4ac8cdb8197ddde31ec88ed6908abcb9019b77447a1e12983c0b63f1c6a47313315
+EBUILD flann-1.9.1-r2.ebuild 2305 BLAKE2B 2a84c0364635d870ffb9b1c1dbc0f266f98323c265e8e7a7a1b833724f9a3df5eddf9a46237f6aebef4b8f186bc94b90d2ca36247fded5401d94e0692400060b SHA512 832a5bf708f07390653e0a8ff336a244861c99b8bb138d2f61f7a8cedcf5093d82a23c7684b927ff04e176c2737a2da6a22b545fec6df9904f349bc40d4cbf1b
 EBUILD flann-1.9.1.ebuild 2183 BLAKE2B 8de25772b012bbbe70e13db8876688ee283d1dada1978bb9c982d1f1bc26f3daea9adaf7f12663d1a0590c03730e6da604f10bfa356a8728262681c7173af13a SHA512 7f5ff08c1fe83379577043d01b2c7cda91b4a44237cd65aa1e2cb36e10331238efdc40a9d1698b41d3ff493ac50cfa61cfc5ccae33d5cb9a03e47a94458dd05c
 EBUILD flann-9999.ebuild 2215 BLAKE2B bb8f804a838a8c6b1702666a92cca7ce919523b7c8590a6f816ae3ec2d8b85c44ecc237f55bd498c8e6e296388c7b1cfcb6338b7a2361a5eaef869f2987b85f4 SHA512 9d2c22c2e45bc73cd982a7d75f77ec05b0533a60dc1125cd5127aec43d74f990b81690a1e47fd67cabc2ed5da500dded79c4dd8c79dc138db6c2a36d10bac0a0
 MISC metadata.xml 971 BLAKE2B 5cffd393d18c3719d8b61069dbc84f4ce4e16e6746637b1203dcba3719fb672d8db082afa93add6be9ebc4203df85391d20eb824a7a9ea3550b37295186538ff SHA512 b8416b149e26ede6d3f207d7e48316a8b880436c40c4ed5610953ceda0fee4e5b97f1b99f778678514dd115c257fb419b365ed46fdd90a19d444bca8e3e0fe03
diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild
index c240ca1dcf11..b628b93c4ced 100644
--- a/sci-libs/flann/flann-1.9.1-r2.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc examples mpi openmp octave static-libs"
 
 BDEPEND="
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index d568a4c6b770..cf98462cae1b 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -5,10 +5,12 @@ AUX gdal-2.3.1-poppler-0.69.0.patch 12775 BLAKE2B 27fe38cb5db58961e1f9f4aef9eddb
 AUX gdal-2.3.1-poppler-0.71.0.patch 2770 BLAKE2B d856ebd2cc1077b39303ca0300ff5a27d1d9981c4f557bb935a0a2ddf7372ef3ae25b59c8f87a103eaf8be0eb467741b1191032889efb5f98a8bb09be1254ab5 SHA512 9c8fc013b191fc579517389928c2d0c4c2f769f188b26fa86b192dc6e7223c799f579095d0765ffe2c6f7158a661b384cb36e92e7bc8c1d5af236d24fe41281d
 AUX gdal-2.3.1-poppler-0.72.0.patch 2377 BLAKE2B c70dbfba879ecba9956b27e56ffe6fcbb076b9f6ed127eedc201c8d47cf527109374e98e2c31107f9ff14dace67556bffeff8651ae01161f2cb9e78732585846 SHA512 985a44492c585c1c8066feb7810b135535ccc87abf86996f64806e53952e7dd96c02649e072a1329aefab80c03d2d6069c829d36c4ea1471493cfb3af26eb69e
 AUX gdal-2.3.1-poppler-0.73.0.patch 906 BLAKE2B c71bf66068f19e80f38907d3f5ffd24e73ae4be99f720cc852ba8aad2f6999a020d59e068ed8a173c6f84e97471c1f6937f82d2519a166282216995cb8db69bb SHA512 0e846ec7c5ddf44144949018ae70063df1043f9dc2730bb189e794ffb40bd91869bd6f5939bd40fc88b18fb53f20151e286610a8db6e9292ba1c5ccc4065148f
+AUX gdal-2.4.1-poppler-0.75.patch 5452 BLAKE2B 7cb3b1e84f2f1ff91af49cb4292047f055aeff5a45c8f0d4c440c99d2ab746d32500f11c040f0eaba72b8da9122ab5fc3b5d50dc082c60281354652ab65fff9f SHA512 7482a8a160f514c31c11d101e1f8a2c32dcc862b3c7bc76ac11712bca7c3088975b4fefae33a6d68a847a5e54982b8d02d6bdc8dee27dd0d5efea0f6d28590ed
+AUX gdal-2.4.1-poppler-0.76.patch 699 BLAKE2B 132ff0a3046734e851d12379d049b2e4fdbefcd4bb6949ddf9fa18b856b1ae20d2a2ec9dbcc0d973097cd2ba5f6e72e852b26a93997ffe4b428fe79d44b5c1cf SHA512 09cdd963dbc5e09d211663f54b1cef72eeeda7484ad10b08862907df60aefc068d840e80d4fd0aa0776a03edca89e8affb8b614c4db02085e854bb4a14342d4f
 DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
 DIST gdal-2.4.0.tar.gz 14533664 BLAKE2B ec10a4a9ba438a758131c1b80286b27ee17f1f270e77af61d70ed4149d63b9224c98db9c55156075ebd86b5f0875c626d87df3779f0b981895ff1c00786f908e SHA512 9517b23009621ed2622a460dc813b30de726d293531c6f107fb308a31e45a143e67e71aa3af3d1faed554ad516a35924973d714c63ee41445ac8d3b2da61dd10
 DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61 SHA512 b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
 EBUILD gdal-2.3.1.ebuild 8396 BLAKE2B 9f1237ca5566fcbf9cd96d8625fab6378e177659a5df2016c8b3a6f91ef6294a9ae1fcf1e9daa37f464ba77376a183a1be551831b1e3b07f4462a582999d381b SHA512 5c90139465932d1b503e26a401afaecd4388e3e34b8db86505931cd4aac1702457a91fedc5557ab5bc5d31c46a86d03a9cf8046d315800dc4529e1fbd7ec4bf6
-EBUILD gdal-2.4.0.ebuild 8302 BLAKE2B 31e64b20c812786e4cc27a103e85838a38d6082bdf517f16cf8363b35cf18eb40a19853efcb2d37e739d137daa3d01bcb5c9769b314f26a0e9ed75250358692c SHA512 fcca09c9aee575decbf9a59695a4865f0c488242415812554868a85bbfa5aea7306306f756154ddd32daeb8e95c16e086d11b4b23cc54f9341c9a1c9df95d2c5
-EBUILD gdal-2.4.1.ebuild 8055 BLAKE2B b2bb41dfd1a38c6465c2b917dea123bfbca350edf7f6dbf0a3f47db4f202f04f30135228593f6ccec1c2c4296084de3876fca21170e9dde90e9171b5f8222fe1 SHA512 3dbb42c30039f5466472fac3e8b994ee0df823ba8cc74fa2318b3f4a71f0f343107201f7ce9b3cf77f3afae05480f571a032168b86ffd89b9d31ef26a47c418c
+EBUILD gdal-2.4.0.ebuild 8297 BLAKE2B b04defd05cdadb3d7ebc78b5b5389e8cdbbd66287d6e0388476b87d749920152862b65d4ce6cc8f4af2c2711a4e35c68e9a52e3e8791ec081600e540788ea3a3 SHA512 e1832e54c9582bcba56db4f5a95dd400787b9cb7ccb0e607662fda1a3ee73cb9d0d99e6a42e9406f6b52a27d6ba8a472b0a602fbe87009ec85ee250a170a9f56
+EBUILD gdal-2.4.1.ebuild 8117 BLAKE2B 2d056d0c11b0c3ccf54800dbd2764641bb80c910679357e36eff8e9d7a0da527ea839f37df0ea01a26d4ec27b84140a69dd2963aed3104853009a9b4b23b8046 SHA512 82eb5e04061c799ae95781d4c9b2515bacc5d09b00e95c9f4038d150fed74df704b2197775051e484a88d6178a6f94b0bfe2c6ad3141b3177744223a7394b657
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch
new file mode 100644
index 000000000000..49824022b3be
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch
@@ -0,0 +1,148 @@
+From 5c12d11614a325317ceaa7c0567070b3e4188275 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Tue, 26 Mar 2019 12:43:59 +0100
+Subject: [PATCH] Add support for Poppler 0.75.0 (fixes #1388)
+
+---
+ gdal/frmts/pdf/pdfio.h       |  5 ---
+ gdal/frmts/pdf/pdfobject.cpp | 59 ++++++++----------------------------
+ 2 files changed, 12 insertions(+), 52 deletions(-)
+
+diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
+index 7ae15c88aa3..ec13b8fe94c 100644
+--- a/frmts/pdf/pdfio.h
++++ b/frmts/pdf/pdfio.h
+@@ -93,11 +93,6 @@ class VSIPDFFileStream final: public BaseStream
+         virtual void       close() override;
+ 
+     private:
+-        /* getChars/hasGetChars added in poppler 0.15.0
+-         * POPPLER_BASE_STREAM_HAS_TWO_ARGS true from poppler 0.16,
+-         * This test will be wrong for poppler 0.15 or 0.16,
+-         * but will still compile correctly.
+-         */
+         virtual GBool hasGetChars() override;
+         virtual int getChars(int nChars, Guchar *buffer) override;
+ 
+diff --git a/frmts/pdf/pdfobject.cpp b/frmts/pdf/pdfobject.cpp
+--- a/frmts/pdf/pdfobject.cpp
++++ b/frmts/pdf/pdfobject.cpp
+@@ -1195,7 +1195,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
+         return oIter->second;
+ 
+ #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
+-    Object o = m_poDict->lookupNF(((char*)pszKey));
++    auto&& o(m_poDict->lookupNF(((char*)pszKey)));
+     if (!o.isNull())
+     {
+         int nRefNum = 0;
+@@ -1204,7 +1204,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
+         {
+             nRefNum = o.getRefNum();
+             nRefGen = o.getRefGen();
+-            Object o2 = m_poDict->lookup((char*)pszKey);
++            Object o2(m_poDict->lookup((char*)pszKey));
+             if( !o2.isNull() )
+             {
+                 GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE);
+@@ -1215,7 +1215,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
+         }
+         else
+         {
+-            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE);
++            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o.copy())), TRUE);
+             poObj->SetRefNumAndGen(nRefNum, nRefGen);
+             m_map[pszKey] = poObj;
+             return poObj;
+@@ -1329,7 +1329,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
+         return m_v[nIndex];
+ 
+ #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
+-    Object o = m_poArray->getNF(nIndex);
++    auto&& o(m_poArray->getNF(nIndex));
+     if( !o.isNull() )
+     {
+         int nRefNum = 0;
+@@ -1338,7 +1338,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
+         {
+             nRefNum = o.getRefNum();
+             nRefGen = o.getRefGen();
+-            Object o2 = m_poArray->get(nIndex);
++            Object o2(m_poArray->get(nIndex));
+             if( !o2.isNull() )
+             {
+                 GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE);
+@@ -1349,7 +1349,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
+         }
+         else
+         {
+-            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE);
++            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o.copy())), TRUE);
+             poObj->SetRefNumAndGen(nRefNum, nRefGen);
+             m_v[nIndex] = poObj;
+             return poObj;
+@@ -1416,8 +1416,6 @@ int GDALPDFStreamPoppler::GetLength()
+ 
+ char* GDALPDFStreamPoppler::GetBytes()
+ {
+-    /* fillGooString() available in poppler >= 0.16.0 */
+-#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
+     GooString* gstr = new GooString();
+     m_poStream->fillGooString(gstr);
+ 
+@@ -1427,7 +1425,12 @@ char* GDALPDFStreamPoppler::GetBytes()
+         char* pszContent = (char*) VSIMalloc(m_nLength + 1);
+         if (pszContent)
+         {
+-            memcpy(pszContent, gstr->getCString(), m_nLength);
++#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
++            const char* srcStr = gstr->c_str();
++#else
++            const char* srcStr = gstr->getCString();
++#endif
++            memcpy(pszContent, srcStr, m_nLength);
+             pszContent[m_nLength] = '\0';
+         }
+         delete gstr;
+@@ -1438,41 +1441,6 @@ char* GDALPDFStreamPoppler::GetBytes()
+         delete gstr;
+         return nullptr;
+     }
+-#else
+-    int i;
+-    int nLengthAlloc = 0;
+-    char* pszContent = nullptr;
+-    if( m_nLength >= 0 )
+-    {
+-        pszContent = (char*) VSIMalloc(m_nLength + 1);
+-        if (!pszContent)
+-            return nullptr;
+-        nLengthAlloc = m_nLength;
+-    }
+-    m_poStream->reset();
+-    for(i = 0; ; ++i )
+-    {
+-        int nVal = m_poStream->getChar();
+-        if (nVal == EOF)
+-            break;
+-        if( i >= nLengthAlloc )
+-        {
+-            nLengthAlloc = 32 + nLengthAlloc + nLengthAlloc / 3;
+-            char* pszContentNew = (char*) VSIRealloc(pszContent, nLengthAlloc + 1);
+-            if( pszContentNew == nullptr )
+-            {
+-                CPLFree(pszContent);
+-                m_nLength = 0;
+-                return nullptr;
+-            }
+-            pszContent = pszContentNew;
+-        }
+-        pszContent[i] = (GByte)nVal;
+-    }
+-    m_nLength = i;
+-    pszContent[i] = '\0';
+-    return pszContent;
+-#endif
+ }
+ 
+ #endif // HAVE_POPPLER
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch
new file mode 100644
index 000000000000..f15e540932d1
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch
@@ -0,0 +1,24 @@
+From 8958528f9b5737581afa7249b0e16f2ff89d727e Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sun, 21 Apr 2019 12:19:56 +0200
+Subject: [PATCH] PDF: add support for Poppler 0.76.0
+
+---
+ gdal/frmts/pdf/pdfsdk_headers.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h
+index 41e48ae91d6..1f77429bf9b 100644
+--- a/frmts/pdf/pdfsdk_headers.h
++++ b/frmts/pdf/pdfsdk_headers.h
+@@ -55,7 +55,10 @@
+ #else
+ typedef unsigned char Guchar;
+ #endif
++
++#if !(POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 76)
+ #include <goo/GooList.h>
++#endif
+ 
+ /* begin of poppler xpdf includes */
+ #include <poppler/Object.h>
diff --git a/sci-libs/gdal/gdal-2.4.0.ebuild b/sci-libs/gdal/gdal-2.4.0.ebuild
index 67fd2d0fa327..32a0cbe2453b 100644
--- a/sci-libs/gdal/gdal-2.4.0.ebuild
+++ b/sci-libs/gdal/gdal-2.4.0.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 zstd"
 
 COMMON_DEPEND="
diff --git a/sci-libs/gdal/gdal-2.4.1.ebuild b/sci-libs/gdal/gdal-2.4.1.ebuild
index 303bd716b48f..ac9b89603d03 100644
--- a/sci-libs/gdal/gdal-2.4.1.ebuild
+++ b/sci-libs/gdal/gdal-2.4.1.ebuild
@@ -82,6 +82,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-soname.patch"
 	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
 	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+	"${FILESDIR}/${P}-poppler-0.75.patch"
+	"${FILESDIR}/${P}-poppler-0.76.patch"
 )
 
 src_prepare() {
@@ -174,7 +176,6 @@ src_configure() {
 		--without-rasterlite2
 		--without-pcraster
 		--without-pdfium
-		--without-php
 		--without-podofo
 		--without-qhull
 		--without-sde
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 247289a3efb7..fb8ce89a873b 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,4 +1,4 @@
 AUX 3.4.2-solaris-isnan.patch 575 BLAKE2B 34e2fddd46e4e503630d0c44c03ee72ceb8bb19af31075ae209d0198b5db0839a633cbb7c855035bf8964d860174c56288579a4bd50e322d728ea4704d312108 SHA512 efa2730f178814e8d98318347e7a8313327679a5c861ef2a844ce821c5854f4dd56e0cc2c52fa5866fb4214b0d9aa8614b1f1ebaa62f0427e69221a93106aa45
 DIST geos-3.7.0.tar.bz2 2028814 BLAKE2B 17385d9be831d4812391a30627e13989d3ca099ca9b0a719a92cdb2503dadff3693d4b3d320652764185db05782b33760ca14d155365d87167bb4ef6d6c2463c SHA512 fcca5e503efa32bb388376b2a06b9ca5c74fbcddba750cce6b3b4109eb2eb122058aead12b9462cdd881f425cd75d7241645ab344f25ce022bc0659954560742
-EBUILD geos-3.7.0.ebuild 1339 BLAKE2B 34db98d731c945204bc323681df3929c430e62f257edeaf99dd30ece466d50ab0b688efd9f852fe87cf105dcef916beafc0422af34a8993443284da2a8497e40 SHA512 907a02c6d3884f8fbf3e49a04eca0c98b4a1c719d6088cd86e3b6ea7b9fb3fc5d0962f459f545fbce81db5a6a45048480aafa7871df6fc8600ecdf9b7dff0d67
+EBUILD geos-3.7.0.ebuild 1338 BLAKE2B 7ebfca396ca09ebe266c59c901ad7f931076a5bef9b7574167d35b0123297205504cdfe7b11ad3a44729483ab57a14bfce6a17f66c9a4391c06b8fcf4c1071d4 SHA512 fe01f7c023c67401396ba760266b62ebba2388e42a7aae08a188fb7ec4726d9c6390f8768511fbd28ad6374a8f47a5de55a530c025d01e43a43082f7ea3a0021
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.7.0.ebuild b/sci-libs/geos/geos-3.7.0.ebuild
index f0f47c27e064..4c8405e7855f 100644
--- a/sci-libs/geos/geos-3.7.0.ebuild
+++ b/sci-libs/geos/geos-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,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/lapack-reference/Manifest b/sci-libs/lapack-reference/Manifest
index 9269e6ef36d0..fd8c9dae43df 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 2855 BLAKE2B 4aeca07854fc0183018fdeca31a88a5f738cc43b065c4af940c927f26393d0a8d91102af30bcd83b385bd022774a5305ff51d5201a3e8673e1019d341f50ad92 SHA512 8a511761406608264d1c9c7fbbe802901a90943dbae891f1bbcd2e5d293c9a225595798179058566d8d783b18ce076d19f9ee2ec06cc173206238fcadb74fb43
+EBUILD lapack-reference-3.2.1-r4.ebuild 2858 BLAKE2B fd0747aacf3170272eaaa5938eda60bec8ef83ea2b1dea2319b003132a92d156f959336d42f03cba0f220df8daee7082c20e8615b7ab808b7e72ddf3f003cebd SHA512 515dd0646bbf6b0c713a31b71480c9c669c200c2d0657f9fb44338ba9bcc09876d77d1b626409d68f896c89b1de9a3beab1321d72fc1ef03a333fe3a43fa0b60
 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 e8d5f5d55d16..b58d917776d4 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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 arm64 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/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index ae44d6154309..940ac3410369 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,8 +1,5 @@
-AUX libflatarray.patch 528 BLAKE2B 474cde0e9871454c042587c282d9439cace5ffacc91f171dd4c77ea4c6298c9e863fb3a6267d2a97222255f396f7689a98e28e57ea47f063e2e01159d77dd8c7 SHA512 e3b195723999285fa14702e01497485f55e8523883951db16eb883220cb636d3f20f3df776b1a0dff70da221dfd7483a032e08b2996e94fd642fa175f69cc627
 AUX libgeodecomp-0.4.0-libdir.patch 694 BLAKE2B 87b08665e9f1d236183f7bfaaf34ef5a9839e28f7a94a6b870fe99d19603b11f152227137202be5669c9f9cd2ba65b3f559eba9ca2460676f19c22e0911ab36e SHA512 fa8e0e08b45d9250d6f32e1a8ade6ff8bdb8acb7951115916cee7b6df600800f8aa64cfb92e13bb5b108af98e8ac2b1f127f34b415648ebe556a589bb11af68d
 AUX libgeodecomp-0.4.0-scotch.patch 7962 BLAKE2B e47365810132838ba0afc63dead520a17d866c0c6b5c2c2bf8f7299d688bcf10ef34ff19d1b29a29d3388101f082080b5943b037fdc9aedf937b392ffb46a68a SHA512 78d805aedb820b457ae01e5f35c530edf7de014cc60c640314cefb1cdfa88f54a6128fb56a81e974fed9d0620e56c31a8f97922d78e88d729bbf3c29c71f7f5d
-DIST libgeodecomp-0.3.1.tar.bz2 740341 BLAKE2B f08f4a7e1b8666d20e40a21d494dbd1cf54b38bae90f451a1b239038e313ae692d39e81d2182cd018d85a4dfc298394c74da2d36218d379e226807feb9ff2cc3 SHA512 28f0ea04e45cb0a5b81b18efd3e3a011d58c077562f8039ff42e701cc362f86dff90bd505690ec22c8a42e9de1236d5b6c61d288ad4c154289e92700a2a7fcc0
 DIST libgeodecomp-0.4.0.tar.bz2 766090 BLAKE2B 2abc5d10371fbad92f957118cabd656f0b4938d5e102da6446851bd979debddaf5eba8a6321dffd32356a40ca12659d9a7a691929e71989e48a71e5177fedc51 SHA512 3ff1a45844e5879662012cb4bae5d577f30ee71094ed4063b535b0ac3da900f34a1bc25be524c006ff91e0edd665e46cbb6cfc0db7966eebfea30f9fee6eeddb
-EBUILD libgeodecomp-0.3.1.ebuild 1149 BLAKE2B a4f53fc01e70fc062f33b3e5977d002a24976c03501bde84cf7d18392cbdfe1c834c32f1f250fae70e3c37983bcdf3335133831e48cb3f36fdce27a9968e4c7d SHA512 25bc38e283677b494026427ef3aacf8b30b0092294fbab5536d5fae383398f2287d7fcd22b580af09f8c696ba5f90472d50bf29e7098ba19e27a1437361a82ae
-EBUILD libgeodecomp-0.4.0.ebuild 1433 BLAKE2B b01b43bb080a42db99cb4f9a7d5b40cd7c398cded3f70c042c56893ff004ee5cec9e21e3247ca663a2a2e103c5a0850349c5ec6ea501d43da0c70ae136f3910b SHA512 26eebc9213e4b09c5b8708fbf2965a6e7215b65a455f54f07e97f1a088374082c14d7dcb09456821236b03bb1307185f2ac3502771aae5458944c51b10a4c407
+EBUILD libgeodecomp-0.4.0.ebuild 1435 BLAKE2B b259a896d174988bec38e7e1be7493648ca5ed862eb04eecd1fc3b182b5b7bca159fa57075334368fbc3e667f4168db43134199e426ff890c1a17afdd61b8adc SHA512 f3a91db74a114d40bbecce9a3c997bdfa85c14c650fa14d35507b536ab34eff91fe11314d81c63c9f720bdcf43f29d67879b33fb1929f6d60840b14a000d459a
 MISC metadata.xml 1252 BLAKE2B 1c35e4efb788c48e23b62025853472afeedfe1f860797cf22e79877e8bab3170998bb1e064ff05a36bf8ddbb6e70b40da329cf9be7ab929a7cb6a9aca2b51c04 SHA512 e8c259afc51b594f4d167128555c7c0ef6935eab46e43ee92407ed32183815cd5e3588a3b0cb0230d757dfa9ca0ddb1f36ef4887b9c31f27ee57e668413f1026
diff --git a/sci-libs/libgeodecomp/files/libflatarray.patch b/sci-libs/libgeodecomp/files/libflatarray.patch
deleted file mode 100644
index 8a109d986577..000000000000
--- a/sci-libs/libgeodecomp/files/libflatarray.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/CMakeLists.txt.orig	2015-05-06 07:03:21.508147301 +0200
-+++ src/CMakeLists.txt	2015-05-06 07:03:27.038147363 +0200
-@@ -439,7 +439,7 @@
-   install(FILES ${HEADERS} DESTINATION include/${PACKAGE_NAME}/${dir})
- endforeach(dir)
- # install libflatarray, too
--install(FILES ../lib/libflatarray/src/flat_array.hpp DESTINATION include/libflatarray)
-+#install(FILES ../lib/libflatarray/src/flat_array.hpp DESTINATION include/libflatarray)
- 
- # link against the libs we need
- set(INSTALLER_LINK_FLAGS "-L\${libdir} -lgeodecomp ")
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild
deleted file mode 100644
index 739df1ee915c..000000000000
--- a/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="An auto-parallelizing library to speed up computer simulations"
-HOMEPAGE="http://www.libgeodecomp.org"
-SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/boost-1.48"
-DEPEND="${RDEPEND}
-	dev-libs/libflatarray
-	examples? ( !sys-cluster/mpich2 )"
-
-S="${WORKDIR}/${P}/src"
-PATCHES=( "${FILESDIR}/libflatarray.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i 's/libdir=${CMAKE_INSTALL_PREFIX}\/lib/libdir=\/usr\/'$(get_libdir)'/' "${S}/CMakeLists.txt"
-	sed -i 's/install(TARGETS geodecomp DESTINATION lib)/install(TARGETS geodecomp DESTINATION '$(get_libdir)')/' "${S}/CMakeLists.txt"
-
-	if ! use examples ; then
-		sed -i 's/examples//g' CMakeLists.txt
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doc
-}
-
-src_install() {
-	DOCS=( ../README )
-	use doc && HTML_DOCS=( ../doc/html/* )
-	cmake-utils_src_install
-}
-
-src_test() {
-	cmake-utils_src_make test
-}
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
index 98fd350e079c..d3a1b4df976b 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="Boost-1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc mpi cuda opencl opencv silo hpx visit"
 
 RDEPEND=">=dev-libs/boost-1.48"
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 984cf106c40c..fe793e440174 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -2,7 +2,7 @@ AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a
 DIST libgeotiff-1.4.0.tar.gz 1517881 BLAKE2B 5340029481b1d529626170e61b73948a620cf24e86297178eb84a76e4988dd5bde2c278f995d39fa598a84eaaac69e93a62e7d091a77830c5fd16a43cb20a750 SHA512 1336e9b5345d69c47807f350d2f757c753543fecc477a6fc036743e78fbfca7b7f99db1b0fdf03e80418fbd4c66db100d04ac7c3338913f9a2b922b9c9f91f1b
 DIST libgeotiff-1.4.1.tar.gz 1674928 BLAKE2B 6c83ca77728c40995bf262d165c8566573c995f0d0116a3756f688b5686ff6529295d3340afdd771268c80050fb81b10953f7ae7339c46ed23d44dbd73cf302d SHA512 4a68bd7b9adf7453fdcb8f98cdeb79289b5f21315d1ef91d54fcc01724c8d687d243826c05a5523bb08c930296335959d2290916d46b6d802e63ac9be727c628
 DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893 SHA512 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
-EBUILD libgeotiff-1.4.0.ebuild 1504 BLAKE2B 1fe286a7dd5709b2ba11c68161e2e6eed9ef36e2388c2e43fddb2f394e9af5e02e6f8b273649fd54e90c4215474a8d3fda1226bf99832a505a3a53e964a35a1b SHA512 7ead72d31550a10908d9a5e54ef6954bd4ba5ed9987f5fb5ce40e74abecf22c237a29e2591664eb9b0871a83c451408202732fad2308b3601f0b748c981b824d
+EBUILD libgeotiff-1.4.0.ebuild 1507 BLAKE2B af67acd8b1095a41d858b412cb9b8056e364056c9a646f160e6b3e2f8eca16b94b3ccbba05cf67ed190d5200683d82635b593bd822c7e07ff91ede7f15fa362b SHA512 1f07cae9b9c412e3efa268f3517ccd6c744551496d2c4bd4235ec03c126515b2b173b767bd12533a4958abf11ab2b9c0e0be2c7b2a6ad345aaa52a109aa88bc0
 EBUILD libgeotiff-1.4.1-r1.ebuild 1288 BLAKE2B 29d7fc36597ec31717fdcfdda203123b972069af3364f3d27f8782563ceb11b76d0a9f29bc0579314077f58397ca4489320736e306ecab64f66462d89fbbeb70 SHA512 e5fc2a4623d9a5f94dda82b0fd4d00e10b86c9f3e27fbebc05b84fb11e4b506b07209de809b1310b3b4e36d80951f47b9a61dc1bbcc6d4a4b1a2bf3605e2fd52
 EBUILD libgeotiff-1.5.1.ebuild 1285 BLAKE2B b252f6e4c70bea3c1e7f6c714acc6bb726990c292713178e896faef9f4741bfe019aa2b4e3b41ba983932e5a9ac11975a5432a0122b54e7d2a3a0a98e2cb7c14 SHA512 8641501ae7be2dc6a1343869fafd7ef6635a90e16502afac311c6b37aeebcc6c9cd4b842d18dfcfa9f79a493c6faaee93aa7d444b89361ce5d61ac6b7441016c
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild
index 9b1f08a486bf..c7aebcf4ce30 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs"
 
 RDEPEND="
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index 6b6bed5bbe16..22ba12689288 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -13,6 +13,6 @@ AUX ogdi-3.2.0_beta2-proj480.patch 9939 BLAKE2B bcefedd0043c8535adc8d5e3362f3851
 AUX ogdi-3.2.0_beta2-subdirs.patch 905 BLAKE2B 69db0794449ca68b61ba8723585a2d055836f2bfd031023073b515a326ca04215833c9ab1ef1d73f1bd5392a56d2479ba71d9a24fea42f5a41f239a3ec6c55db SHA512 b6e6f50dafdb6aea991b8ece37953a9910b3fa790dcb68108ba7316c81de3cffae1413afb9d9126457550fa46bded8a7613c8be27fcd9956c8c17b5b64065732
 DIST ogdi-3.2.0.beta2.tar.gz 956839 BLAKE2B d0729d42f3224d9911bb09f8cf2f150204950739547bf8ed5349c8ed63e7ab7a4e17298fe8bbf45fc17f5781e86925ab35d8356d396ffe7f35a4cf20803fce04 SHA512 2159dfd010be9da63cf009beee7f6571cd13c4f08d1a69a5d945dd64878347b28455eb5376f184e2d91fa4a3bd409446ccbd706aa9000d3d7d2ac4b6e30ced93
 DIST ogdi-3.2.0.tar.gz 976004 BLAKE2B 535f05b3145c49ce72adcd86cd9ded1c8d8d12e051feb4e1898d8ddabbff1cf27f609326ccdb3a1cbff523b277f99e9d8c3678d2ed565dd81e6c5d956ed2dcca SHA512 b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0
-EBUILD ogdi-3.2.0.ebuild 1712 BLAKE2B 1b8e346639cbc60551e82eeaa3ad4b7958939e2aefbed3d5554179c517955dc84f08e19b8238e65b27d4b254b42c781766f42e32d933a38e23578c03715d2e5d SHA512 91903156b5c98782bcb5377d9a7820e16087c4360d18365e5f65a3cc8dea46cdcb638a3e44ded81321e5f98c9024e832ed9f4cb1fbdf825942d4fbfb28d2cd06
+EBUILD ogdi-3.2.0.ebuild 1708 BLAKE2B 80bb4525f7cd70096ca701b5444c12ab47e90f80cbb6b6fb81787005e9f7e86804ca295c9dd53ad21629d3206353a1670584f7335f059e810fd446ad1fed3378 SHA512 1efdd96182e467be27894fca7d514c4e73a2bb6287fc064cd7c0c940d0ed2bf65bf6e428f4d561fd409d8ae38af9bd64bd71743f3d86f6b0b0fba115d4e6a774
 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 1473c674acc2..da6e21103bd3 100644
--- a/sci-libs/ogdi/ogdi-3.2.0.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+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 cc2fb554d894..9907e7fa5607 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -6,6 +6,6 @@ DIST proj-6.0.0.tar.gz 2405217 BLAKE2B 7d0be7753048ffb0b95a7aca8bf73346c42391125
 DIST proj-datumgrid-1.5.zip 2250131 BLAKE2B c83b5bab72b790c70fbf3b95782ba4e8e93e2accc93a0a8c06667908dc437de44aa3623799f685e020269090be103bac568fe6a9d73ce128b8af024ec1ca8442 SHA512 9d9a935b3e984721a1ceafac49c139d3c5d9923c5bcef5f57fec8028a043c86e7de8bad9c200fa38cd6d1bf27b32dd0126597d42fee793d055e686f090604bf3
 DIST proj-datumgrid-1.8.zip 6601640 BLAKE2B d439286c27b04767b4085f109a3bbbd555ac9e5acad2f673d5641fee433235b5a5410236ce32e42d3b11ce06d3199dec76c6e41aaa2b5dfd14a09b6b33928164 SHA512 991206f17348b3de484eb5364d773cd06577057228c2d1a0a1c1658308e2596ca13338a666fa71ddd76d538f23dd5bf21e178fd26a785717edd847a17e5c0cd1
 EBUILD proj-4.8.0.ebuild 1299 BLAKE2B 0ebc7c73ece64fe41bf071f96becad9f416824e85e031cc1290b16e06d15717e4ef833f207687c7341a9cc09f94508aef508147ca1cd1a084b52bfda6a9e5b36 SHA512 1df5171dfd85e0eee8e49cbd9d603f016978658e73226a1809d5efc6aef96955784b7fc176b06e94e87a2ccdc13d92982d31807f104932a407e16f32f8d50254
-EBUILD proj-4.9.2.ebuild 1278 BLAKE2B 832adc77c20d87ea805ac255bd4cf56256ce14d11a982e58cd3243e1944b41cce895645308b2e6a5f6ac8a927126d808ec63e88ec47fc8dff23f5c2dc6d32b7a SHA512 b473463745084c60b535d6d6f91095a9a13ab6f0c7d72b010710d7112b16ee7991378e9bdb227657aaaed90292960160d147f4c988f674612158e6efe2a95a22
+EBUILD proj-4.9.2.ebuild 1274 BLAKE2B 25461d51e835da57b62a0f5ca7aa1c3bf6f8d05b6b20c9dec23706b4febf396b825c2af20a574c26019adc2bdfb0d2cedfb837d172d34897d39b9b9a0ea9241b SHA512 659eeabad7d2afde8c4fdf7e14aa161494488d840cde5c932f71e77b67c8cf9074c4e4b8706e00de2431aec2e3716fff52f937259ddcdd7992d540d825d18359
 EBUILD proj-6.0.0.ebuild 940 BLAKE2B f9dc8b36da183f28a697f21562ebe79ca5452e4b90af037646a62ee7e48484535682491d71a8ada25282d5426f777caa96c873eb0eeb1c553fa331243f67210e SHA512 948dfd6357fe0d8bad1b0fcc09f9a3191ce023e25a2601a0ca5ad50513b77338183f8648331c91035266f9d753857a8a1805e00785974b2c2b05c7c02477c10c
 MISC metadata.xml 415 BLAKE2B 5bbcea99e5589d2c894dc19eaba8b7893d8965d4c8d25024917fa004e3905c0620a76dfaa34de4c2de156544d4ffdc94e3d05e222cb0b2b2b812ac261d0e9bf3 SHA512 8e98b001981de3b4062d8156577061b92918726c7992a3f96fb3d21c2f18d773efe343839255a4cc1ca69f50d05d16a4c48eb4aabc3db9f40a67ac62adc93e5b
diff --git a/sci-libs/proj/proj-4.9.2.ebuild b/sci-libs/proj/proj-4.9.2.ebuild
index 6595cb0eed7d..7fac923f670c 100644
--- a/sci-libs/proj/proj-4.9.2.ebuild
+++ b/sci-libs/proj/proj-4.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="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/scipy/Manifest b/sci-libs/scipy/Manifest
index e6a880dd6ee8..5d1329f51c57 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -20,6 +20,6 @@ EBUILD scipy-0.16.1.ebuild 4244 BLAKE2B e2e6491ef2704e1c440b24c0b379d040e7caa224
 EBUILD scipy-0.18.1.ebuild 4249 BLAKE2B 633b70b2cfc9e568abbed4a7748771d604f491b48789768ea1ba321152d80a24b34131399399c42cd4513084653855675ce324eb5fac5c0ad5f6265071a7264b SHA512 cc6eac59217a2896f1bdee4142264c94a3ed5ee9bf80957d535cb291249b4761439ab3b30b1851e87bc72581c640069377f77cb5b09ce8ad16345077b8ce553c
 EBUILD scipy-0.19.1.ebuild 4244 BLAKE2B 1fab8f3a9f6191331360b0ce3bf30501abdb16dfd32f349c5d2f90b9e56de3d9365068025e80c37b880062ab13c28a1c8b5867413e8d3be1919dd538597751b1 SHA512 55cb48d0aeb8c200a82657f8648b036c5ecdf2492a43885df699c6ffbc86547fecd5c71bc802f2688cc5b04249132082859cc64198fff1c3fa36b4ad6c618f6f
 EBUILD scipy-1.0.0.ebuild 4028 BLAKE2B 072bf669fa18eb1c00414b9374bc07c3424166c1aada026862a2ca9d8f85f79913528b2f4655302b4174056532f3d1ada8df51a1b32d391cbc6b426ec24cca88 SHA512 c92a1e9641a0297b68f2eff34b8341b9d9adbbc8507a0e8b3a6e576c0792110f6423663b4cbd68a123c62f98d656f8e93abd8ee87d180d9da1adcf5777a9f46c
-EBUILD scipy-1.1.0.ebuild 4030 BLAKE2B 56eee67e1786637765174d204a60d85cc27fbe6bd517f3ff3bf76f6b21a1b155adea08a836c874feb7a886bf56105384a30aa88dd96e844d59c29997b41eb848 SHA512 1788f4f745acf52e80591eb7ac77f9d3d54c2a813aa02a2e223c7d43001324aa9bcc34ce400fe38f431dc60a7e9fa4c77e9afce3f709c6e2cb2ad39d60951ac5
+EBUILD scipy-1.1.0.ebuild 4026 BLAKE2B 5365a416cf404feecce21c03b1d6d1e13b71e91c8022f281c948358e03d2585a6f2560f9d68533fbf20763074ccf0f27a8e2076bec5fab549ba2df8af82358af SHA512 4d9ffe5cbb62d9bd3956efabbb1f2d977ee545438fca0ae5132d698fca1347e59b8e4c8886516d34419cd2982faa39b417cd4a95ec7efae583a653a39f8c7dd3
 EBUILD scipy-9999.ebuild 3612 BLAKE2B 07b27279a9b3773ad8624b9fbfc2ee83e30ebb42a9bb58fb481b4c24723ca8471eb141093427a1559ea30703dcd04cb656828035b5e59bafa8835ecd35524d40 SHA512 314be69d8523f906e8a27b5f6f32b882cb97ead665f9efd9253806d98acf0779d5248caba6c39e220be453fbe1097c75541d5b363839a2ed45f689e8ffb0d182
 MISC metadata.xml 931 BLAKE2B 3e358fcc4354b870a4794f13ed6c840f2c55ffdf4d6306977e6db3606b73e7df9b682a18973f0aa2a1d0d9eabb2d7d40c6aa5c6026813385361700bdc227afd8 SHA512 ae95726c4c661a2e5708a98b347f8ea25708574bbaf8ec86f315069551d6a0d68a43279b214be8b54cd20e5aacea1a9abd40a2de43d51f292a830cab0955d625
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
index 9c92f8606e00..adfa2ab45a6b 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="
 	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index 0151f2ff53a8..81b73d67093e 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -1,5 +1,7 @@
 DIST shapelib-1.4.0.tar.gz 548990 BLAKE2B 0e75481d35f8dc5687eee23696d46a780d4b185a81ca1246e5c19f01e58f4a55dc7b69347c9effa01ac1786c5271dfe3907798cc81fe9314979c502bcb9d982d SHA512 206b81fe859a837e821e449ab1b2dbd5a3aa7abd1871da4aec69e130b6fad6300697429884ce359c90e4b76bca90e2108f32b9fdbd3b92013fa5a39f3bedeeb1
 DIST shapelib-1.4.1.tar.gz 549831 BLAKE2B e579704bd71c2525133f87628261e78f39e8063cd7e8a57997e90a8ca4a6ebb5de3a4d1ab8da5d00afe1363d9eb22e8c7a9a66ac109c300b72b6d26bd87b61fd SHA512 791c1a0d6c5ff09341176f68349ebd760ae91e8749a9f844299d7ac38a42c4f1131e63479c384a8a8b05a89e90d02e9fd92c526cab417eb80b171d639b4a4422
+DIST shapelib-1.5.0.tar.gz 547686 BLAKE2B 3f962ee701d8cfb86a56aa1c0b2156bc2288a2bc908bb1a8303e491812845241f5281b0b8650befcc53e9dfc408b652a56f5e2fdc5ac7c2ff6eb99170696e437 SHA512 6dbd5fc7929ca403e65017ef58211f351608d9ad08221bf68bde047ceecfd27013ce731f9ae4edcfd040bc3db7fe9054b5d96e46128d2968788bef19532b1721
 EBUILD shapelib-1.4.0-r1.ebuild 739 BLAKE2B f3149e901a0d974e94d00ff64dea46355070ff537abe36b03b4ae9ededadf4a679633eebb6d9696de00e932e153d8f8bf9905cd8c2e790b36a0dc9e0a9396324 SHA512 587239c58c93654f82a4ec81015e92eabcfdb47f82c5b4c4ca32b9e2e91d67de4cc170d2609531cf4e0dc5ca564f40158c3b549de292362234fc8ca1fe64a8ff
 EBUILD shapelib-1.4.1.ebuild 747 BLAKE2B d7c24d2a6d9d1e6a2782932c808551875335c95f83c71265b410e167273b058e80099fabbfe03ca5613bce18e3bf6a09ad5a9ff95a834ba3b5f3c48182a7808f SHA512 0faec499f5ab12ecdd2e9909723734552c9b22e6d36597869051862629a07dbe178d415b372cdcb84b2099092889485360fa693e8ccbb3a8a28edcf07b919339
+EBUILD shapelib-1.5.0.ebuild 745 BLAKE2B 9e9fce7b2dda007154d3536a4546034a13683ea6b4afc025e31e4d9fb05978eda85b86b5d4fcc1774948023d685ea1a1089da752f8518fd31d164510d180abcc SHA512 562faebaf4811461449fcde8269c102c078d8efacd96ea852e140b9e66626e13713a38a678771524b7089e65ba70d7765afdc2407c998597d8d0dcf557897c6a
 MISC metadata.xml 405 BLAKE2B ed97fadfd57934dab768c271f100531eb2f5c9e98564b54d73c2396d0959c62b39ee7ce5ad96495f1133cf8c3de8ad2ffcb0d13353c1a32c9be92ad81bd80995 SHA512 9581a1f8123cdcc6b68de0fdc03dfa866c64668222f1d90b55160cdaf8d36e1441f0530fced6b149681fef88321bf33879996199685eb6e26cefae975b704adb
diff --git a/sci-libs/shapelib/shapelib-1.5.0.ebuild b/sci-libs/shapelib/shapelib-1.5.0.ebuild
new file mode 100644
index 000000000000..91abc76af145
--- /dev/null
+++ b/sci-libs/shapelib/shapelib-1.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library for manipulating ESRI Shapefiles"
+HOMEPAGE="http://shapelib.maptools.org/"
+SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+src_prepare() {
+	default
+	rm -f m4/* || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--includedir="${EPREFIX}"/usr/include/libshp \
+		--prefix="${EPREFIX}"/usr
+}
+
+src_install() {
+	use doc && HTML_DOCS=( web/. )
+	default
+
+	if ! use static-libs; then
+		find "${ED}" \( -name '*.la' -o -name '*.a' \) -delete || die
+	fi
+}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index bee79345f95d..1c7f74c0c4be 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -14,5 +14,5 @@ DIST oourafft-20061228.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd02003
 DIST rules_docker-a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz 446437 BLAKE2B 070e1028625c74e6fbd092a3f8c6cf6de3b98d8999fdd69527674cfc55f00bd7638f7cb1eba41d496d1de3307b81b9dfd832d7d4bc65f9d98cd53714cb24bb02 SHA512 e43c013027a7235e85c263d8cfc40f9af77f54d054665116bb8641ed7f60d077b9107aa97da5b7e102077b68be7d2cbe401091016bd46f8828ae159659ce9608
 DIST tensorflow-1.13.1.tar.gz 31614228 BLAKE2B 3e78309744747afd5a0929eebccb414efe51320f9291424ef6e3cb848f265aaac5ff16a7064c7aac8094f06b1edb61aa9fe22a55c28c23cfc4e2a6f640f4f12d SHA512 1e5c020a82b0b502c9c6fc9439905e19e8f1fb07e32740a5e2c70f4a3565c8c87053ccdcad360e95550dad648154e399ca8e352fb97a1788acfec3b87bf323bb
 DIST tensorflow-python-license.rst.txt 45132 BLAKE2B 770ddd87adc745a021daac01a284131825a33f176002a28b20a2251246183bf7ab4686305620678285e4a216a37f01b3ad953fe7864fa79611cccde156d69ab6 SHA512 2d5a3783ec340f24797e89c78007ee95ab753eb5ee8198c739544f9e1159895f7abe816d6b3c66620f8d7b64641d2a7f44ff0a5b4f2f941928f4733157c7995e
-EBUILD tensorflow-1.13.1.ebuild 9982 BLAKE2B 5c2eafc13c64b2215fa262a596f38b9d013488ca23dbea50f4dfd96a58c20352a6afd40304014b443e30c1becf41c0cfcadbe5858e85617ad5d08ff5bdee841c SHA512 92eeb030be1fe9330254805fffc74e582dfd09b216928038155738ca776ab06d0641728257248b9fdaff40c905ab759a7be6de536abcf04f25969de25da8fd28
+EBUILD tensorflow-1.13.1.ebuild 10007 BLAKE2B 0f14d3aaa1d8a571e7c7bc5263cfa247b7c0e579068e9afebc9392249c2c94a0be27e67fa7be8b2113163bc5f227cabdd99fc2278c302bf00850f64715396d3c SHA512 c081762335a0e1c7096f92715a2b8bcc5b662fa4419e46e6beb845259e889694f0e90b044960d1fdbb21645b5a24eb0d5f500c082a3106acd2f49e47b133e24d
 MISC metadata.xml 512 BLAKE2B 39a7fc6dc76945448a9f0e8e9d79866f364d0df5036500a2ab981b6ab6f1170ef8a15e29e3a5a3d39edc0dc441985feaa45ce8069fdfb815ca1419721ba9d870 SHA512 a6dc893a523fa7dab319173914e8602434b8247aee2af6a4adbde29be440097901b0e40193e5592f3849340414a4debce1218ae3895c2c6e7d5af171c463c82b
diff --git a/sci-libs/tensorflow/tensorflow-1.13.1.ebuild b/sci-libs/tensorflow/tensorflow-1.13.1.ebuild
index d8f8b29bb7e6..b0bb0fafaa3e 100644
--- a/sci-libs/tensorflow/tensorflow-1.13.1.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.13.1.ebuild
@@ -103,6 +103,7 @@ BDEPEND="
 	dev-python/mock
 	dev-lang/swig
 	dev-python/cython
+	<=dev-util/bazel-0.22.0
 	cuda? (
 		>=dev-util/nvidia-cuda-toolkit-8.0[profiler]
 	)