gentoo resync : 16.02.1018

2 files changed, 0 insertions, 85 deletions

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 )