gentoo resync : 16.02.1018

5 files changed, 3 insertions, 88 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 1fd576edfbda..6f06109298d1 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index e0eca7254d2d..4ec1bf32c3f8 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,5 @@
 AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b63e1c9b2814acc307e0b5082e7326f495102d10c4b2bdc86b17b7f4ae8ae11231c99215d87fc59217115f0fd92fc96f0 SHA512 16ed7bbd5569166c80cf4d8beba81195a177ee36bcd7e14ca6d00e3add6fe57c7980cbe1853747325443699daa331fc23e53fc86150b6c7cf871ef4812936c39
 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
diff --git a/sci-libs/gdal/files/gdal-2.2.3-json-c-0.13.patch b/sci-libs/gdal/files/gdal-2.2.3-json-c-0.13.patch
deleted file mode 100644
index bbee77b51c78..000000000000
--- a/sci-libs/gdal/files/gdal-2.2.3-json-c-0.13.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Index: gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp
-===================================================================
---- a/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp	(revision 41042)
-+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp	(revision 41043)
-@@ -28,4 +28,6 @@
-  ****************************************************************************/
- 
-+#define JSON_C_VER_013 (13 << 8)
-+
- #include "ogrgeojsonwriter.h"
- #include "ogrgeojsonutils.h"
-@@ -33,5 +35,9 @@
- #include "ogrgeojsonreader.h"
- #include <json.h>  // JSON-C
-+
-+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
- #include <json_object_private.h>
-+#endif
-+
- #include <printbuf.h>
- #include <ogr_api.h>
-@@ -1382,11 +1388,15 @@
-     // TODO(schwehr): Explain this casting.
-     const int nPrecision =
-+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
-         static_cast<int>(reinterpret_cast<GUIntptr_t>(jso->_userdata));
-+#else
-+        static_cast<int>(reinterpret_cast<GUIntptr_t>(json_object_get_userdata(jso)));
-+#endif
-     char szBuffer[75] = {};
--    OGRFormatDouble( szBuffer, sizeof(szBuffer), jso->o.c_double, '.',
-+    OGRFormatDouble( szBuffer, sizeof(szBuffer), json_object_get_double(jso), '.',
-                      (nPrecision < 0) ? 15 : nPrecision );
-     if( szBuffer[0] == 't' /*oobig */ )
-     {
--        CPLsnprintf(szBuffer, sizeof(szBuffer), "%.18g", jso->o.c_double);
-+        CPLsnprintf(szBuffer, sizeof(szBuffer), "%.18g", json_object_get_double(jso));
-     }
-     return printbuf_memappend(pb, szBuffer, static_cast<int>(strlen(szBuffer)));
-@@ -1418,9 +1428,9 @@
-     char szBuffer[75] = {};
-     int nSize = 0;
--    if( CPLIsNan(jso->o.c_double))
-+    if( CPLIsNan(json_object_get_double(jso)))
-         nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "NaN");
--    else if( CPLIsInf(jso->o.c_double) )
--    {
--        if( jso->o.c_double > 0 )
-+    else if( CPLIsInf(json_object_get_double(jso)) )
-+    {
-+        if( json_object_get_double(jso) > 0 )
-             nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "Infinity");
-         else
-@@ -1430,5 +1440,9 @@
-     {
-         char szFormatting[32] = {};
-+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
-         const int nSignificantFigures = (int) (GUIntptr_t) jso->_userdata;
-+#else
-+        const int nSignificantFigures = (int) (GUIntptr_t) json_object_get_userdata(jso);
-+#endif
-         const int nInitialSignificantFigures =
-             nSignificantFigures >= 0 ? nSignificantFigures : 17;
-@@ -1436,5 +1450,5 @@
-                     "%%.%dg", nInitialSignificantFigures);
-         nSize = CPLsnprintf(szBuffer, sizeof(szBuffer),
--                            szFormatting, jso->o.c_double);
-+                            szFormatting, json_object_get_double(jso));
-         const char* pszDot = NULL;
-         if( nSize+2 < static_cast<int>(sizeof(szBuffer)) &&
-@@ -1458,5 +1472,5 @@
-                             "%%.%dg", nInitialSignificantFigures- i);
-                 nSize = CPLsnprintf(szBuffer, sizeof(szBuffer),
--                                    szFormatting, jso->o.c_double);
-+                                    szFormatting, json_object_get_double(jso));
-                 pszDot = strchr(szBuffer, '.');
-                 if( pszDot != NULL &&
-@@ -1473,5 +1487,5 @@
-                             "%%.%dg", nInitialSignificantFigures);
-                 nSize = CPLsnprintf(szBuffer, sizeof(szBuffer),
--                                    szFormatting, jso->o.c_double);
-+                                    szFormatting, json_object_get_double(jso));
-                 if( nSize+2 < static_cast<int>(sizeof(szBuffer)) &&
-                     strchr(szBuffer, '.') == NULL )
diff --git a/sci-libs/libspatialindex/Manifest b/sci-libs/libspatialindex/Manifest
index bb495b488330..d75a3a878cf9 100644
--- a/sci-libs/libspatialindex/Manifest
+++ b/sci-libs/libspatialindex/Manifest
@@ -3,5 +3,5 @@ AUX libspatialindex-1.8.1-pkgconfig.patch 505 BLAKE2B 26f7e55025cf1a847da9f4d534
 DIST spatialindex-src-1.8.1.tar.bz2 368252 BLAKE2B 40365048397255e29f0bd933f201fc0441d8cc8484167a5bd8eec45f22f36c1a7f1d096b510b7c4a52caff82be8130dbaa8c14470bac2f10c144a1ce467cce06 SHA512 34fc743d8fac65a60ae723e3261e8f3717df8bd5997f7338b8d944e9a832d6bad33a4b7cfa4b2f1e5ba0fdbd3ebb4b199e247f0e7b7473953b433e203c21e548
 DIST spatialindex-src-1.8.5.tar.bz2 407871 BLAKE2B 936d0fc4950b4c685088c84019aa22e720371c623bd1883725dc497380e90072333c25f979e13fbc91b7d164b87cb21a285c037bdbe0b8df84eb3876590e8dd1 SHA512 d3e47982cc2809d04490fae27796b31cdb59675790010d8b45e1a98b5a23048a4a44e321a2470dd36c01aba6f6e7620cafc4988a02b55e4f59d1b7fa9b588b06
 EBUILD libspatialindex-1.8.1.ebuild 697 BLAKE2B ae86f40b6676e40efccd2baaf9416b4981003a3f162fe31236efc71c65512b58d141b0c9dbd6ec17e9eb60f7d50999e7aac869cb6f8009f672246d45a03213fb SHA512 72137ebc99c2aaa36acf4c05cf73ad87ca60017edefd5fa664d641a9418509cfd316488b22828d864f5810ee50045988c815e37871e6596e5392bb570d8669d9
-EBUILD libspatialindex-1.8.5-r1.ebuild 711 BLAKE2B c4b5640cd3f6a172570f711b14da0794c6dab64ad6ec431c666ce902a8b45ffc94bf1398d60b9594b66a15113ff5f106c884ab2113b7b6abcc291ddfd6f4525d SHA512 b8809b1592a37d72fa175997620e6d86dbcd90cac6a7b987f0cf5d2371f4e452ea0c0c445dc9a022406847ee85de17e388f32c3e3d3455af2076dd0307547a71
+EBUILD libspatialindex-1.8.5-r1.ebuild 707 BLAKE2B eba450d13981bd2d7ffc4b225c63762b19e3010a2bef3fa8a16a09b631bd8eeecc8733a7c51f76c3d7cfa9cd0041b22a52471c37c6d9052e25793213e61681d8 SHA512 40666f08fc0f68223a030e8a41462d5e9819c29fb065167a63e1eed83292a2c4866e05de856758572ba4d6ec446f4d00f119d3fa13eb7116e02a67f8c445a353
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild b/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
index 0327f5819569..d367e99feea4 100644
--- a/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
+++ b/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://libspatialindex.github.com/"
 SRC_URI="http://download.osgeo.org/libspatialindex/${MY_P}.tar.bz2"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 SLOT="0/4"
 IUSE="debug static-libs"