[gentoo-commits] repo/gentoo:master commit in: dev-libs/libevent/

["Julian Ospald" <hasufell@gentoo.org>]

commit:     8e8cc0754b0d67845c770ebf03a23027850f42d6
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 13:51:47 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 13:52:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e8cc075

dev-libs/libevent: add libressl support

 ...bevent-9999.ebuild => libevent-2.1.5-r1.ebuild} | 22 +++++++++++++++-------
 dev-libs/libevent/libevent-9999.ebuild             | 10 +++++++---
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-2.1.5-r1.ebuild
similarity index 62%
copy from dev-libs/libevent/libevent-9999.ebuild
copy to dev-libs/libevent/libevent-2.1.5-r1.ebuild
index fc1817a..9602758 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-2.1.5-r1.ebuild
@@ -1,20 +1,26 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-inherit autotools eutils git-r3 libtool multilib-minimal
+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/"
-EGIT_REPO_URI="https://github.com/libevent/libevent"
+SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE="debug +ssl static-libs test +threads"
+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"
 
-DEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )"
+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
@@ -24,8 +30,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/event2/event-config.h
 )
 
+S=${WORKDIR}/${MY_P}
+
 src_prepare() {
-	eautoreconf
+	elibtoolize
 	# don't waste time building tests
 	# https://github.com/libevent/libevent/pull/144
 	sed -i -e '/^all:/s|tests||g' Makefile.nmake || die

diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index fc1817a..179af26 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,9 +12,13 @@ EGIT_REPO_URI="https://github.com/libevent/libevent"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug +ssl static-libs test +threads"
+IUSE="debug libressl +ssl static-libs test +threads"
 
-DEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )"
+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