From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 49AC3139085 for ; Thu, 2 Feb 2017 14:28:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 925E6E0C15; Thu, 2 Feb 2017 14:28:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50F38E0C15 for ; Thu, 2 Feb 2017 14:28:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 40671341229 for ; Thu, 2 Feb 2017 14:28:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9768B3B8E for ; Thu, 2 Feb 2017 14:28:23 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1486045699.cff4c006298f6c732eeb856aac354bd036230414.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libevent/, dev-libs/libevent/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libevent/Manifest dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch dev-libs/libevent/libevent-2.1.5-r4.ebuild X-VCS-Directories: dev-libs/libevent/files/ dev-libs/libevent/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: cff4c006298f6c732eeb856aac354bd036230414 X-VCS-Branch: master Date: Thu, 2 Feb 2017 14:28:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9b529d0c-e54e-4198-b21e-a2efbb976e2e X-Archives-Hash: 9e7d745280bdf928f44cb4a9a094d2cc commit: cff4c006298f6c732eeb856aac354bd036230414 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Feb 2 14:08:57 2017 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu Feb 2 14:28:19 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff4c006 dev-libs/libevent: Old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-libs/libevent/Manifest | 1 - .../libevent-2.1.5-event_signals_ordering.patch | 34 ----------- dev-libs/libevent/libevent-2.1.5-r4.ebuild | 69 ---------------------- 3 files changed, 104 deletions(-) diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest index 6e66ac6..1f0c68a 100644 --- a/dev-libs/libevent/Manifest +++ b/dev-libs/libevent/Manifest @@ -1,3 +1,2 @@ DIST libevent-2.0.22-stable.tar.gz 854987 SHA256 71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3 SHA512 990637f12e890bfa7f86c194c8b112701436e92b60afb829194879efb85d558b986261e6508fe29bde73981feada874438e2d442cec8ea5730c889954f9bc907 WHIRLPOOL fe465e94a35dc489a86fad93fd4a82d5c314e3a66ebf1bcf8ba29014fe9bd2ebce4546b4a6a9fedee40d17010d73eb89b99596cec1dde3b7f9a4240cf6b6760d -DIST libevent-2.1.5-beta.tar.gz 972344 SHA256 79e1b82236a02f1432b6d95ef94186915790eb9910211647f9c01a85149066d8 SHA512 cc38885fc9c7f884085d6adb4bfa51834935475f9c24b76e1fe301b43520dd88935aea588eb4c5795942fa625a790ff575f06b709775e8424691f3307becd216 WHIRLPOOL a040e9b63933d422a7ffa75c4dd0649ae239ebd747fb733420df9f40eb48e9d6ff4d4e6f217b87655a1cbde53cba1ef03beed107d62bf8720391c1f05e010adb DIST libevent-2.1.7_rc.tar.gz 696447 SHA256 548362d202e22fe24d4c3fad38287b4f6d683e6c21503341373b89785fa6f991 SHA512 72187614ddd5ce0ef0560d54e526ca9986dde90d4c1542637217ce62a596d800dedda88e4da383529ebf961c198929da59a2b570b1a19dba9d2506684af8cb3a WHIRLPOOL 5e7e71c22729b068890aacc1e157680489662078c509a1be7689f21707d1b4d40538f97debb6e93df0393fbaa309d3c81f900bebddd2a352782299ff441e2efc 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 deleted file mode 100644 index 27578b1..00000000 --- a/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- 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 deleted file mode 100644 index f3b169a..00000000 --- a/dev-libs/libevent/libevent-2.1.5-r4.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils libtool multilib-minimal - -MY_P="${P}-beta" - -DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor" -HOMEPAGE="http://libevent.org/" -SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz" - -LICENSE="BSD" -# libevent-2.1.so.5 -SLOT="0/2.1-5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug libressl +ssl static-libs test +threads" - -DEPEND=" - ssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) - ) -" -RDEPEND=" - ${DEPEND} - !<=dev-libs/9libs-1.0 -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/event2/event-config.h -) - -S=${WORKDIR}/${MY_P} - -src_prepare() { - elibtoolize - epatch "${FILESDIR}/${PN}-2.1.5-event_signals_ordering.patch" -} - -multilib_src_configure() { - # fix out-of-source builds - mkdir -p test || die - - ECONF_SOURCE="${S}" \ - econf \ - --disable-samples \ - $(use_enable debug debug-mode) \ - $(use_enable debug malloc-replacement) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs static) \ - $(use_enable test libevent-regress) \ - $(use_enable threads thread-support) -} - -src_test() { - # The test suite doesn't quite work (see bug #406801 for the latest - # installment in a riveting series of reports). - : - # emake -C test check | tee "${T}"/tests -} - -DOCS=( ChangeLog{,-1.4,-2.0} ) - -multilib_src_install_all() { - einstalldocs - prune_libtool_files -}