gentoo resync : 05.04.2019

3 files changed, 0 insertions, 130 deletions

diff --git a/net-libs/zeromq/files/zeromq-4.2.0-dl-backport.patch b/net-libs/zeromq/files/zeromq-4.2.0-dl-backport.patch
deleted file mode 100644
index c00001d632a5..000000000000
--- a/net-libs/zeromq/files/zeromq-4.2.0-dl-backport.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1b3fcbd3eead8f1f59f3e9472319d58ce6b52bb7 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <luca.boccassi@gmail.com>
-Date: Thu, 10 Nov 2016 22:49:41 +0000
-Subject: [PATCH] Problem: linker fails looking for dladdr
-
-Solution: search and add it via AC_CHECK_LIB when building with
-libunwind, as the backtrace function uses dladdr. This problem
-only appears on some distributions and with some compiler/toolchain
-versions.
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 4fb2757..d548f9f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -650,6 +650,7 @@ PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
-         AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
-         AC_SUBST([LIBUNWIND_CFLAGS])
-         AC_SUBST([LIBUNWIND_LIBS])
-+        AC_CHECK_LIB([dl], [dladdr])
-     ],
-     [
-         AC_MSG_WARN([Cannot find libunwind])
diff --git a/net-libs/zeromq/files/zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch b/net-libs/zeromq/files/zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch
deleted file mode 100644
index 3efe2153bfa9..000000000000
--- a/net-libs/zeromq/files/zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 90c76fbd6069b8e1e98236f31317ed22792ab739 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <luca.boccassi@gmail.com>
-Date: Fri, 28 Apr 2017 16:08:46 +0100
-Subject: [PATCH] Problem: new zmq_poller used by zmq_poll without DRAFTs
-
-Solution: do not define ZMQ_HAVE_POLLER in src/zmq_drafts.h otherwise
-src/zmq.cpp will implement zmq_poll using the new poller classes.
-Same for ZMQ_HAVE_TIMERS, even though it has no internal effect, but
-to be safe against future development.
----
- src/zmq_draft.h | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/zmq_draft.h b/src/zmq_draft.h
-index bfbf9e3..9aed6dd 100644
---- a/src/zmq_draft.h
-+++ b/src/zmq_draft.h
-@@ -67,8 +67,6 @@ const char *zmq_msg_group(zmq_msg_t *msg);
- /*  Poller polling on sockets,fd and thread-safe sockets                      */
- /******************************************************************************/
- 
--#define ZMQ_HAVE_POLLER
--
- typedef struct zmq_poller_event_t
- {
-     void *socket;
-@@ -103,8 +101,6 @@ int zmq_poller_remove_fd (void *poller, int fd);
- /*  Scheduling timers                                                         */
- /******************************************************************************/
- 
--#define ZMQ_HAVE_TIMERS
--
- typedef void (zmq_timer_fn)(int timer_id, void *arg);
- 
- void *zmq_timers_new (void);
diff --git a/net-libs/zeromq/files/zeromq-4.2.2-optional-libunwind.patch b/net-libs/zeromq/files/zeromq-4.2.2-optional-libunwind.patch
deleted file mode 100644
index 36a5f66bbc91..000000000000
--- a/net-libs/zeromq/files/zeromq-4.2.2-optional-libunwind.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Accepted upstream as: https://github.com/zeromq/libzmq/pull/2625
-
-From 88487e7da3e0412abde30af2855a667ab973f9fc Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Fri, 14 Jul 2017 21:44:30 +0100
-Subject: [PATCH] configure.ac: allow user to disable libunwind discovery via
- --disable-libunwind
-
-on ia64 architecture libunwind comes with gcc. Unfortunately
-libunwind is not directly usable as-is and fails at link time:
-
-```
-    ia64-unknown-linux-gnu-g++ -o perf/.libs/local_lat perf/local_lat.o src/.libs/libzmq.so -lsodium -lrt -lpthread -ldl
-    src/.libs/libzmq.so: undefined reference to `_ULia64_step'
-```
-
-The change adds --{enable,disable}-libunwind flag to control
-automatic dependency. The default is unchanged: use if available.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- configure.ac | 32 ++++++++++++++++++++++----------
- 1 file changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c10f8445..ad193871 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -721,16 +721,28 @@ else
-     AC_SUBST(pkg_config_defines, "")
- fi
- 
--PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
--    [
--        AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
--        AC_SUBST([LIBUNWIND_CFLAGS])
--        AC_SUBST([LIBUNWIND_LIBS])
--        AC_CHECK_LIB([dl], [dladdr])
--    ],
--    [
--        AC_MSG_WARN([Cannot find libunwind])
--    ])
-+AC_ARG_ENABLE([libunwind],
-+    [AS_HELP_STRING([--enable-libunwind],
-+        [enable libunwind [default=auto]])],
-+    [enable_libunwind=$enableval],
-+    [enable_libunwind="auto"])
-+
-+if test "x$enable_libunwind" != "xno"; then
-+    PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
-+        [
-+            AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
-+            AC_SUBST([LIBUNWIND_CFLAGS])
-+            AC_SUBST([LIBUNWIND_LIBS])
-+            AC_CHECK_LIB([dl], [dladdr])
-+        ],
-+        [
-+            if test "x$enable_libunwind" = "xyes"; then
-+                AC_MSG_ERROR([Cannot find libunwind])
-+            else
-+                AC_MSG_WARN([Cannot find libunwind])
-+            fi
-+        ])
-+fi
- 
- # Subst LIBZMQ_EXTRA_CFLAGS & CXXFLAGS & LDFLAGS
- AC_SUBST(LIBZMQ_EXTRA_CFLAGS)
--- 
-2.13.3
-