From f32ac168ac886cde498661a7d39d3c8395808bb7 Mon Sep 17 00:00:00 2001 From: soredake Date: Sun, 9 Apr 2017 16:57:10 +0300 Subject: app-crypt/heimdal: add ibressl support. Closes: https://github.com/gentoo/gentoo/pull/4387 --- app-crypt/heimdal/heimdal-7.1.0.ebuild | 10 +++++++--- app-crypt/heimdal/heimdal-7.3.0.ebuild | 8 ++++++-- app-crypt/heimdal/heimdal-7.4.0.ebuild | 8 ++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app-crypt/heimdal/heimdal-7.1.0.ebuild b/app-crypt/heimdal/heimdal-7.1.0.ebuild index 416e7858a1c7..5a5572526bbe 100644 --- a/app-crypt/heimdal/heimdal-7.1.0.ebuild +++ b/app-crypt/heimdal/heimdal-7.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,9 +15,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" -IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X" +IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X" -CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) +CDEPEND=" + ssl? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) + ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] ) caps? ( sys-libs/libcap-ng ) diff --git a/app-crypt/heimdal/heimdal-7.3.0.ebuild b/app-crypt/heimdal/heimdal-7.3.0.ebuild index 4591ceb4645b..5a5572526bbe 100644 --- a/app-crypt/heimdal/heimdal-7.3.0.ebuild +++ b/app-crypt/heimdal/heimdal-7.3.0.ebuild @@ -15,9 +15,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" -IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X" +IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X" -CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) +CDEPEND=" + ssl? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) + ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] ) caps? ( sys-libs/libcap-ng ) diff --git a/app-crypt/heimdal/heimdal-7.4.0.ebuild b/app-crypt/heimdal/heimdal-7.4.0.ebuild index b0582cd41968..fe98d3929c08 100644 --- a/app-crypt/heimdal/heimdal-7.4.0.ebuild +++ b/app-crypt/heimdal/heimdal-7.4.0.ebuild @@ -15,9 +15,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd" -IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X" +IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X" -CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) +CDEPEND=" + ssl? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) + ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] ) caps? ( sys-libs/libcap-ng ) -- cgit v1.2.3-65-gdbad