Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/heimdal/
Date: Sun, 22 Oct 2017 16:28:42
Message-Id: 1508689680.f32ac168ac886cde498661a7d39d3c8395808bb7.monsieurp@gentoo
1 commit: f32ac168ac886cde498661a7d39d3c8395808bb7
2 Author: soredake <fdsfgs <AT> krutt <DOT> org>
3 AuthorDate: Sun Apr 9 13:57:10 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 22 16:28:00 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f32ac168
7
8 app-crypt/heimdal: add ibressl support.
9
10 Closes: https://github.com/gentoo/gentoo/pull/4387
11
12 app-crypt/heimdal/heimdal-7.1.0.ebuild | 10 +++++++---
13 app-crypt/heimdal/heimdal-7.3.0.ebuild | 8 ++++++--
14 app-crypt/heimdal/heimdal-7.4.0.ebuild | 8 ++++++--
15 3 files changed, 19 insertions(+), 7 deletions(-)
16
17 diff --git a/app-crypt/heimdal/heimdal-7.1.0.ebuild b/app-crypt/heimdal/heimdal-7.1.0.ebuild
18 index 416e7858a1c..5a5572526bb 100644
19 --- a/app-crypt/heimdal/heimdal-7.1.0.ebuild
20 +++ b/app-crypt/heimdal/heimdal-7.1.0.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2016 Gentoo Foundation
23 +# Copyright 1999-2017 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=6
27 @@ -15,9 +15,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
28 LICENSE="BSD"
29 SLOT="0"
30 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
31 -IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X"
32 +IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
33
34 -CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
35 +CDEPEND="
36 + ssl? (
37 + !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
38 + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
39 + )
40 berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
41 !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
42 caps? ( sys-libs/libcap-ng )
43
44 diff --git a/app-crypt/heimdal/heimdal-7.3.0.ebuild b/app-crypt/heimdal/heimdal-7.3.0.ebuild
45 index 4591ceb4645..5a5572526bb 100644
46 --- a/app-crypt/heimdal/heimdal-7.3.0.ebuild
47 +++ b/app-crypt/heimdal/heimdal-7.3.0.ebuild
48 @@ -15,9 +15,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
49 LICENSE="BSD"
50 SLOT="0"
51 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
52 -IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X"
53 +IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
54
55 -CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
56 +CDEPEND="
57 + ssl? (
58 + !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
59 + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
60 + )
61 berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
62 !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
63 caps? ( sys-libs/libcap-ng )
64
65 diff --git a/app-crypt/heimdal/heimdal-7.4.0.ebuild b/app-crypt/heimdal/heimdal-7.4.0.ebuild
66 index b0582cd4196..fe98d3929c0 100644
67 --- a/app-crypt/heimdal/heimdal-7.4.0.ebuild
68 +++ b/app-crypt/heimdal/heimdal-7.4.0.ebuild
69 @@ -15,9 +15,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
70 LICENSE="BSD"
71 SLOT="0"
72 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
73 -IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X"
74 +IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
75
76 -CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
77 +CDEPEND="
78 + ssl? (
79 + !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
80 + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
81 + )
82 berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
83 !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
84 caps? ( sys-libs/libcap-ng )