gentoo resync : 21.06.2020

2 files changed, 0 insertions, 183 deletions

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 84ea4df2c7ce..1aebe0ec3b27 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,5 +1,4 @@
 AUX mysql-workbench-6.2.5-wbcopytables.patch 496 BLAKE2B 4666f32098ec43ad36f1c726903472e829873002521262d6781a2febfc1394dac6f9708fbb99a3fa52a032a5b8f695c9b98579b28a63e74727eac21a8ef3fbe6 SHA512 c0766315cd345893af57880eccdc2c1dd9ffa456a27d0c736af1382ca24c507de865188588753f212f35d8781305dcbd8d555f128edd6454dc2299bd0357fd5b
-AUX mysql-workbench-6.3.10-i386-json.patch 7167 BLAKE2B 44a6e2446b24cd2f7f096d51b6cfdacfb485634a94733c4ef67a128ec903fec3736cb62ed45d6abbe7c7793b7d3ab668198f663a44b1bcc313f4d02ced4cd578 SHA512 992595df7719c4c958c98b5561f3fea04607213287c72daea6bb331392c417123d6fe5d1126c6dec128a857aa299908221f3a2c0ac08744241bf395e80a9574d
 AUX mysql-workbench-8.0.19-mysql-connector-8.patch 624 BLAKE2B 0cb899a8b0127664471877bb9cdcda946c35ed7a159646b94891a791a618c77201cc7696d6f2893e95fd78dbc13325cef752740f76e69974e10c0f88084594fb SHA512 09c2349cb42393f6d32f24804e2c3438a5d846fc9611e0684ccf2139fd30b0abcb0f2aa7b205c60a081259e073fb345cd72837dab1a216e6a8aaaba5ec3decf7
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-8.0.19-src.tar.gz 19391463 BLAKE2B f9374c234a75851784c940f8288a783ee1c02fe4be2973b174a0d3768a60dd5318ceea7d2dacb083376c83c33bed8fca02768bcf4f3b8ba6284ca78fc7910cfe SHA512 986a34328ec3b9aba1532cfd8792fb970fe3c71eda577988a17a6bca25e783a520878067acd097a74ca3f274f02d271af16d7d6beb6970bca48332721021eebc
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
deleted file mode 100644
index 31e789992d1c..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-Last-Update: 2018-03-05
-Forwarded: not-needed
-Origin: upstream, https://github.com/mysql/mysql-workbench/commit/fff08d9ec68de8215fc8f12fe0ee42e598e1cf75.patch
-Bug-Upstream: https://github.com/mysql/mysql-workbench/pull/14
-Bug-Upstream: https://bugs.mysql.com/bug.php?id=84886
-Bug-Upstream: https://bugs.mysql.com/bug.php?id=84951
-From: Christian Hesse <mail@eworm.de>
-Description: fixes FTBFS on 32bit architectures.
-
-~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:346:79: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'JsonParser::JsonArray::SizeType {aka unsigned int}' [-Werror=format=]
-       throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
-                                                                               ^
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In member function 'const JsonParser::JsonValue& JsonParser::JsonArray::at(JsonParser::JsonArray::SizeType) const':
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:361:79: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'JsonParser::JsonArray::SizeType {aka unsigned int}' [-Werror=format=]
-       throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
-                                                                               ^
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In member function 'void JsonParser::JsonWriter::write(const JsonParser::JsonValue&)':
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1672:44: error: conversion from 'const JsonParser::JsonValue' to 'int64_t {aka long long int}' is ambiguous
-         _output += std::to_string((int64_t)value);
-                                            ^~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1001:3: note: candidate: JsonParser::JsonValue::operator bool() const
-   JsonValue::operator bool() const {
-   ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:981:3: note: candidate: JsonParser::JsonValue::operator double() const
-   JsonValue::operator double() const {
-   ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:950:3: note: candidate: JsonParser::JsonValue::operator size_t() const
-   JsonValue::operator size_t() const {
-   ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:939:3: note: candidate: JsonParser::JsonValue::operator ssize_t() const
-   JsonValue::operator ssize_t() const {
-   ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1675:45: error: conversion from 'const JsonParser::JsonValue' to 'uint64_t {aka long long unsigned int}' is ambiguous
-         _output += std::to_string((uint64_t)value);
-~~~~
-
---- a/library/base/jsonparser.cpp
-+++ b/library/base/jsonparser.cpp
-@@ -342,9 +342,9 @@
-    *         If no such data is present std::out_of_range is thrown.
-    */
-   JsonValue &JsonArray::at(SizeType pos) {
-     if (pos > _data.size())
--      throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
-+      throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", pos));
-     return _data.at(pos);
-   }
- 
-   //--------------------------------------------------------------------------------------------------
-@@ -357,9 +357,9 @@
-    *         If no such data is present std::out_of_range is thrown.
-    */
-   const JsonValue &JsonArray::at(SizeType pos) const {
-     if (pos > _data.size())
--      throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
-+      throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", pos));
-     return _data.at(pos);
-   }
- 
-   //--------------------------------------------------------------------------------------------------
-@@ -1667,14 +1667,16 @@
-         break;
-       case VDouble:
-         _output += std::to_string((double)value);
-         break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-       case VInt64:
-         _output += std::to_string((int64_t)value);
-         break;
-       case VUint64:
-         _output += std::to_string((uint64_t)value);
-         break;
-+#endif
-       case VObject:
-         write((JsonObject)value);
-         break;
-       case VArray:
---- a/library/forms/jsonview.cpp
-+++ b/library/forms/jsonview.cpp
-@@ -650,10 +650,12 @@
-   bool setData = false;
-   if (data != nullptr) {
-     std::stringstream buffer;
-     double number = 0;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-     int64_t number2 = 0;
-     uint64_t number3 = 0;
-+#endif
-     bool retBool = false;
-     auto &storedValue = data->getData();
-     switch (storedValue.getType()) {
-       case VDouble:
-@@ -663,8 +665,9 @@
-         buffer >> number;
-         storedValue = number;
-         setData = true;
-         break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-       case VInt64:
-         if (!base::is_number(value))
-           break;
-         buffer << value;
-@@ -679,8 +682,9 @@
-         buffer >> number3;
-         storedValue = number3;
-         setData = true;
-         break;
-+#endif
-       case VBoolean:
-         if (!base::isBool(value))
-           break;
-         buffer << value;
-@@ -1072,16 +1076,18 @@
-     case VDouble:
-       node->set_string(1, std::to_string((double)value));
-       node->set_string(2, "Double");
-       break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-     case VInt64:
-       node->set_string(1, std::to_string((int64_t)value));
-       node->set_string(2, "Long Integer");
-       break;
-     case VUint64:
-       node->set_string(1, std::to_string((uint64_t)value));
-       node->set_string(2, "Unsigned Long Integer");
-       break;
-+#endif
-     default:
-       break;
-   }
-   node->set_data(new JsonTreeBaseView::JsonValueNodeData(value));
-@@ -1321,10 +1327,12 @@
-   JsonParser::JsonValue &storedValue = (!key.empty() ? ((JsonObject &)data->getData())[key] : data->getData());
-   if (data != NULL) {
-     std::stringstream buffer;
-     double number = 0;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-     int64_t number2 = 0;
-     uint64_t number3 = 0;
-+#endif
-     bool retBool = false;
-     switch (storedValue.getType()) {
-       case VDouble:
-         if (!base::is_number(value))
-@@ -1334,8 +1342,9 @@
-         storedValue = number;
-         node->set_float(column, number);
-         _dataChanged(false);
- 	break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-       case VInt64:
-         if (!base::is_number(value))
-           break;
-         buffer << value;
-@@ -1352,8 +1361,9 @@
-         storedValue = number3;
-         node->set_float(column, (double)number3);
-         _dataChanged(false);
-         break;
-+#endif
-       case VBoolean:
-         if (!base::isBool(value))
-           break;
-         buffer << value;
-@@ -1611,14 +1621,16 @@
-   switch (value.getType()) {
-     case VDouble:
-       node->set_float(columnId, (double)value);
-       break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-     case VInt64:
-       node->set_long(columnId, (int64_t)value);
-       break;
-     case VUint64:
-       node->set_long(columnId, (uint64_t)value);
-       break;
-+#endif
-     default:
-       break;
-   }
- }