gentoo resync : 15.01.2020

4 files changed, 0 insertions, 86 deletions

diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-2048-bytes-should-be-enough-right-question-mark.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-2048-bytes-should-be-enough-right-question-mark.patch
deleted file mode 100644
index 15fb13ca633c..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-2048-bytes-should-be-enough-right-question-mark.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/utils/wvtask.cc
-+++ b/utils/wvtask.cc
-@@ -429,7 +429,7 @@
- 	    total = (val+1) * (size_t)1024;
- 	    
-             if (!use_shared_stack())
--                total = 1024; // enough to save the do_task stack frame
-+                total = 2048; // enough to save the do_task stack frame
- 
- 	    // set up a stack frame for the new task.  This runs once
- 	    // per get_stack.
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch
deleted file mode 100644
index b2c2efd56248..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix building with C++14, which errors out due to explicit operator bool() conversion
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594058
-
---- a/streams/wvstream.cc
-+++ b/streams/wvstream.cc
-@@ -907,9 +907,9 @@
-     
-     if (forceable)
-     {
--	si.wants.readable = readcb;
--	si.wants.writable = writecb;
--	si.wants.isexception = exceptcb;
-+	si.wants.readable = static_cast<bool>(readcb);
-+	si.wants.writable = static_cast<bool>(writecb);
-+	si.wants.isexception = static_cast<bool>(exceptcb);
-     }
-     else
-     {
-@@ -1019,7 +1019,7 @@
- 
- IWvStream::SelectRequest WvStream::get_select_request()
- {
--    return IWvStream::SelectRequest(readcb, writecb, exceptcb);
-+    return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb), static_cast<bool>(exceptcb));
- }
- 
- 
-@@ -1107,7 +1107,7 @@
-     // inefficient, because if the alarm was expired then pre_select()
-     // returned true anyway and short-circuited the previous select().
-     TRACE("hello-%p\n", this);
--    return !alarm_was_ticking || select(0, readcb, writecb, exceptcb);
-+    return !alarm_was_ticking || select(0, static_cast<bool>(readcb), static_cast<bool>(writecb), static_cast<bool>(exceptcb));
- }
- 
- 
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
deleted file mode 100644
index 38218d7213a9..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/333301
-
---- a/ipstreams/wvunixdgsocket.cc
-+++ b/ipstreams/wvunixdgsocket.cc
-@@ -1,5 +1,5 @@
- #include "wvunixdgsocket.h"
--#ifdef MACOS
-+#if defined(MACOS) || defined(__GNUC__)
- #include <sys/types.h>
- #include <sys/stat.h>
- #endif
---- a/streams/wvatomicfile.cc
-+++ b/streams/wvatomicfile.cc
-@@ -11,7 +11,8 @@
- #include "wvfileutils.h"
- #include "wvstrutils.h"
- 
--#ifdef MACOS
-+#if defined(MACOS) || defined(__GNUC__)
-+#include <sys/types.h>
- #include <sys/stat.h>
- #endif
- 
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch
deleted file mode 100644
index 327e19a0c11b..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/304283
-
---- a/crypto/wvx509.cc
-+++ b/crypto/wvx509.cc
-@@ -1157,7 +1157,11 @@
-         
-         if (ext)
-         {
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+            const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
-+#else
-             X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
-+#endif
-             if (!method)
-             {
-                 WvDynBuf buf;