Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/conserver/
Date: Sat, 26 Dec 2015 01:00:17
Message-Id: 1451092028.36489dd5e040ef943793f26576a9432d869d63ee.blueness@gentoo
1 commit: 36489dd5e040ef943793f26576a9432d869d63ee
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 26 01:07:08 2015 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 26 01:07:08 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36489dd5
7
8 app-admin/conserver: add libressl support
9
10 Package-Manager: portage-2.2.24
11
12 app-admin/conserver/conserver-8.1.18-r1.ebuild | 11 +++++++----
13 1 file changed, 7 insertions(+), 4 deletions(-)
14
15 diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild
16 index 5c91885..7e60c04 100644
17 --- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
18 +++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
19 @@ -1,8 +1,8 @@
20 -# Copyright 1999-2014 Gentoo Foundation
21 +# Copyright 1999-2015 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23 # $Id$
24
25 -EAPI="4"
26 +EAPI="5"
27
28 inherit ssl-cert eutils pam autotools
29
30 @@ -13,9 +13,12 @@ SRC_URI="http://www.conserver.com/${P}.tar.gz"
31 LICENSE="BSD GPL-2"
32 SLOT="0"
33 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
34 -IUSE="kerberos pam ssl tcpd debug"
35 +IUSE="kerberos libressl pam ssl tcpd debug"
36
37 -DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
38 +DEPEND="ssl? (
39 + !libressl? ( dev-libs/openssl:0 )
40 + libressl? ( dev-libs/libressl )
41 + )
42 pam? ( virtual/pam )
43 tcpd? ( sys-apps/tcp-wrappers )
44 debug? ( dev-libs/dmalloc )