From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 673B9138827 for ; Sat, 3 Oct 2015 13:52:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B564121C039; Sat, 3 Oct 2015 13:52:32 +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 4781121C039 for ; Sat, 3 Oct 2015 13:52:32 +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 1908E3408AC for ; Sat, 3 Oct 2015 13:52:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5616C207 for ; Sat, 3 Oct 2015 13:52:28 +0000 (UTC) From: "Julian Ospald" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julian Ospald" Message-ID: <1443880338.8e8cc0754b0d67845c770ebf03a23027850f42d6.hasufell@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.1.5-r1.ebuild dev-libs/libevent/libevent-9999.ebuild X-VCS-Directories: dev-libs/libevent/ X-VCS-Committer: hasufell X-VCS-Committer-Name: Julian Ospald X-VCS-Revision: 8e8cc0754b0d67845c770ebf03a23027850f42d6 X-VCS-Branch: master Date: Sat, 3 Oct 2015 13:52:28 +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: d01db1d3-4183-4207-a857-6c3e3140f360 X-Archives-Hash: c57bd8669528ea67b2c8674bbd4a1e6a commit: 8e8cc0754b0d67845c770ebf03a23027850f42d6 Author: Julian Ospald gentoo org> AuthorDate: Sat Oct 3 13:51:47 2015 +0000 Commit: Julian Ospald gentoo 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