Gentoo Archives: gentoo-commits

From: Julian Ospald <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libevent/
Date: Sat, 03 Oct 2015 13:52:35
Message-Id: 1443880338.8e8cc0754b0d67845c770ebf03a23027850f42d6.hasufell@gentoo
1 commit: 8e8cc0754b0d67845c770ebf03a23027850f42d6
2 Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 3 13:51:47 2015 +0000
4 Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 3 13:52:18 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e8cc075
7
8 dev-libs/libevent: add libressl support
9
10 ...bevent-9999.ebuild => libevent-2.1.5-r1.ebuild} | 22 +++++++++++++++-------
11 dev-libs/libevent/libevent-9999.ebuild | 10 +++++++---
12 2 files changed, 22 insertions(+), 10 deletions(-)
13
14 diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-2.1.5-r1.ebuild
15 similarity index 62%
16 copy from dev-libs/libevent/libevent-9999.ebuild
17 copy to dev-libs/libevent/libevent-2.1.5-r1.ebuild
18 index fc1817a..9602758 100644
19 --- a/dev-libs/libevent/libevent-9999.ebuild
20 +++ b/dev-libs/libevent/libevent-2.1.5-r1.ebuild
21 @@ -1,20 +1,26 @@
22 -# Copyright 1999-2014 Gentoo Foundation
23 +# Copyright 1999-2015 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 # $Id$
26
27 EAPI=5
28 -inherit autotools eutils git-r3 libtool multilib-minimal
29 +inherit eutils libtool multilib-minimal
30 +
31 +MY_P="${P}-beta"
32
33 DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor"
34 HOMEPAGE="http://libevent.org/"
35 -EGIT_REPO_URI="https://github.com/libevent/libevent"
36 +SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
37
38 LICENSE="BSD"
39 SLOT="0"
40 -KEYWORDS=""
41 -IUSE="debug +ssl static-libs test +threads"
42 +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"
43 +IUSE="debug libressl +ssl static-libs test +threads"
44
45 -DEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )"
46 +DEPEND="
47 + ssl? (
48 + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
49 + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
50 + )"
51 RDEPEND="
52 ${DEPEND}
53 !<=dev-libs/9libs-1.0
54 @@ -24,8 +30,10 @@ MULTILIB_WRAPPED_HEADERS=(
55 /usr/include/event2/event-config.h
56 )
57
58 +S=${WORKDIR}/${MY_P}
59 +
60 src_prepare() {
61 - eautoreconf
62 + elibtoolize
63 # don't waste time building tests
64 # https://github.com/libevent/libevent/pull/144
65 sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
66
67 diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
68 index fc1817a..179af26 100644
69 --- a/dev-libs/libevent/libevent-9999.ebuild
70 +++ b/dev-libs/libevent/libevent-9999.ebuild
71 @@ -1,4 +1,4 @@
72 -# Copyright 1999-2014 Gentoo Foundation
73 +# Copyright 1999-2015 Gentoo Foundation
74 # Distributed under the terms of the GNU General Public License v2
75 # $Id$
76
77 @@ -12,9 +12,13 @@ EGIT_REPO_URI="https://github.com/libevent/libevent"
78 LICENSE="BSD"
79 SLOT="0"
80 KEYWORDS=""
81 -IUSE="debug +ssl static-libs test +threads"
82 +IUSE="debug libressl +ssl static-libs test +threads"
83
84 -DEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )"
85 +DEPEND="
86 + ssl? (
87 + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
88 + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
89 + )"
90 RDEPEND="
91 ${DEPEND}
92 !<=dev-libs/9libs-1.0