From 5bba0a896a1a1a66684a6c7bf072ee297df24e96 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Fri, 16 Oct 2015 06:48:19 +0200
Subject: dev-libs/libevent: Clean up/properly name patch.

Package-Manager: portage-2.2.23
---
 .../libevent/files/event_signals_ordering.patch    | 36 ----------------------
 .../libevent-2.1.5-event_signals_ordering.patch    | 34 ++++++++++++++++++++
 dev-libs/libevent/libevent-2.1.5-r4.ebuild         |  2 +-
 3 files changed, 35 insertions(+), 37 deletions(-)
 delete mode 100644 dev-libs/libevent/files/event_signals_ordering.patch
 create mode 100644 dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch

(limited to 'dev-libs')

diff --git a/dev-libs/libevent/files/event_signals_ordering.patch b/dev-libs/libevent/files/event_signals_ordering.patch
deleted file mode 100644
index d0cb2b3b4bcf..000000000000
--- a/dev-libs/libevent/files/event_signals_ordering.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/event.c b/event.c
-index acef2b2..ad4c7f0 100644
---- a/event.c
-+++ b/event.c
-@@ -926,13 +926,13 @@ event_reinit(struct event_base *base)
- 		event_del_nolock_(&base->sig.ev_signal, EVENT_DEL_AUTOBLOCK);
- 		event_debug_unassign(&base->sig.ev_signal);
- 		memset(&base->sig.ev_signal, 0, sizeof(base->sig.ev_signal));
--		if (base->sig.ev_signal_pair[0] != -1)
--			EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
--		if (base->sig.ev_signal_pair[1] != -1)
--			EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
- 		had_signal_added = 1;
- 		base->sig.ev_signal_added = 0;
- 	}
-+    if (base->sig.ev_signal_pair[0] != -1)
-+        EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
-+    if (base->sig.ev_signal_pair[1] != -1)
-+        EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
- 	if (base->th_notify_fn != NULL) {
- 		was_notifiable = 1;
- 		base->th_notify_fn = NULL;
-@@ -981,8 +981,12 @@ event_reinit(struct event_base *base)
- 		if (evmap_reinit_(base) < 0)
- 			res = -1;
- 	} else {
--		if (had_signal_added)
- 			res = evsig_init_(base);
-+			if (res == 0 && had_signal_added) {
-+				res = event_add_nolock_(&base->sig.ev_signal, NULL, 0);
-+				if (res == 0)
-+					base->sig.ev_signal_added = 1;
-+			}
- 	}
- 
- 	/* If we were notifiable before, and nothing just exploded, become
diff --git a/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch b/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch
new file mode 100644
index 000000000000..27578b15248c
--- /dev/null
+++ b/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch
@@ -0,0 +1,34 @@
+--- a/event.c
++++ b/event.c
+@@ -926,13 +926,13 @@ event_reinit(struct event_base *base)
+ 		event_del_nolock_(&base->sig.ev_signal, EVENT_DEL_AUTOBLOCK);
+ 		event_debug_unassign(&base->sig.ev_signal);
+ 		memset(&base->sig.ev_signal, 0, sizeof(base->sig.ev_signal));
+-		if (base->sig.ev_signal_pair[0] != -1)
+-			EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
+-		if (base->sig.ev_signal_pair[1] != -1)
+-			EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
+ 		had_signal_added = 1;
+ 		base->sig.ev_signal_added = 0;
+ 	}
++    if (base->sig.ev_signal_pair[0] != -1)
++        EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
++    if (base->sig.ev_signal_pair[1] != -1)
++        EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
+ 	if (base->th_notify_fn != NULL) {
+ 		was_notifiable = 1;
+ 		base->th_notify_fn = NULL;
+@@ -981,8 +981,12 @@ event_reinit(struct event_base *base)
+ 		if (evmap_reinit_(base) < 0)
+ 			res = -1;
+ 	} else {
+-		if (had_signal_added)
+ 			res = evsig_init_(base);
++			if (res == 0 && had_signal_added) {
++				res = event_add_nolock_(&base->sig.ev_signal, NULL, 0);
++				if (res == 0)
++					base->sig.ev_signal_added = 1;
++			}
+ 	}
+ 
+ 	/* If we were notifiable before, and nothing just exploded, become
diff --git a/dev-libs/libevent/libevent-2.1.5-r4.ebuild b/dev-libs/libevent/libevent-2.1.5-r4.ebuild
index e55213f0d758..16300fc49e95 100644
--- a/dev-libs/libevent/libevent-2.1.5-r4.ebuild
+++ b/dev-libs/libevent/libevent-2.1.5-r4.ebuild
@@ -36,7 +36,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	elibtoolize
-	epatch "${FILESDIR}/event_signals_ordering.patch"
+	epatch "${FILESDIR}/${PN}-2.1.5-event_signals_ordering.patch"
 	# don't waste time building tests
 	# https://github.com/libevent/libevent/pull/144
 	sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
-- 
cgit v1.2.3-65-gdbad