From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-839519-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 2C11413888F
for <garchives@archives.gentoo.org>; Sun, 11 Oct 2015 04:54:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 80245E07E6;
Sun, 11 Oct 2015 04:54:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 16914E07E6
for <gentoo-commits@lists.gentoo.org>; Sun, 11 Oct 2015 04:54:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BFC7A33D3C7
for <gentoo-commits@lists.gentoo.org>; Sun, 11 Oct 2015 04:54:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 36966922
for <gentoo-commits@lists.gentoo.org>; Sun, 11 Oct 2015 04:54:22 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
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" <jer@gentoo.org>
Message-ID: <1444539228.906979de3f0f9d0ecf0c7123d8f34537e58a3ed8.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libevent/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/libevent/libevent-2.0.22-r1.ebuild dev-libs/libevent/libevent-2.1.5-r1.ebuild dev-libs/libevent/libevent-2.1.5-r2.ebuild
X-VCS-Directories: dev-libs/libevent/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 906979de3f0f9d0ecf0c7123d8f34537e58a3ed8
X-VCS-Branch: master
Date: Sun, 11 Oct 2015 04:54:22 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: cbad9cea-7cba-4aff-a5bb-fabb0d4a01e4
X-Archives-Hash: 7c2a3561ee73c3dda6c6f2e55ddf3af2
commit: 906979de3f0f9d0ecf0c7123d8f34537e58a3ed8
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 04:53:48 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 04:53:48 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=906979de
The stable branch deserves USE=libressl too. Add sub-SLOTS (bug #536930).
Package-Manager: portage-2.2.23
...t-2.1.5-r1.ebuild => libevent-2.0.22-r1.ebuild} | 26 ++++++++++++----------
...nt-2.1.5-r1.ebuild => libevent-2.1.5-r2.ebuild} | 5 +++--
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/dev-libs/libevent/libevent-2.1.5-r1.ebuild b/dev-libs/libevent/libevent-2.0.22-r1.ebuild
similarity index 67%
copy from dev-libs/libevent/libevent-2.1.5-r1.ebuild
copy to dev-libs/libevent/libevent-2.0.22-r1.ebuild
index 9602758..de4cc28 100644
--- a/dev-libs/libevent/libevent-2.1.5-r1.ebuild
+++ b/dev-libs/libevent/libevent-2.0.22-r1.ebuild
@@ -5,22 +5,23 @@
EAPI=5
inherit eutils libtool multilib-minimal
-MY_P="${P}-beta"
+MY_P="${P}-stable"
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"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0/5.1.9"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
- )"
+ )
+"
RDEPEND="
${DEPEND}
!<=dev-libs/9libs-1.0
@@ -32,17 +33,20 @@ MULTILIB_WRAPPED_HEADERS=(
S=${WORKDIR}/${MY_P}
+DOCS=( README ChangeLog )
+
src_prepare() {
elibtoolize
- # don't waste time building tests
+
+ # don't waste time building tests/samples
+ # https://github.com/libevent/libevent/pull/143
# https://github.com/libevent/libevent/pull/144
- sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
+ sed -i \
+ -e 's|^\(SUBDIRS =.*\)sample test\(.*\)$|\1\2|' \
+ Makefile.in || die "sed Makefile.in failed"
}
multilib_src_configure() {
- # fix out-of-source builds
- mkdir -p test || die
-
ECONF_SOURCE="${S}" \
econf \
$(use_enable debug debug-mode) \
@@ -59,8 +63,6 @@ src_test() {
# emake -C test check | tee "${T}"/tests
}
-DOCS=( ChangeLog{,-1.4,-2.0} )
-
multilib_src_install_all() {
einstalldocs
prune_libtool_files
diff --git a/dev-libs/libevent/libevent-2.1.5-r1.ebuild b/dev-libs/libevent/libevent-2.1.5-r2.ebuild
similarity index 98%
rename from dev-libs/libevent/libevent-2.1.5-r1.ebuild
rename to dev-libs/libevent/libevent-2.1.5-r2.ebuild
index 9602758..04a8444 100644
--- a/dev-libs/libevent/libevent-2.1.5-r1.ebuild
+++ b/dev-libs/libevent/libevent-2.1.5-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://libevent.org/"
SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/5.0.0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug libressl +ssl static-libs test +threads"
@@ -20,7 +20,8 @@ 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