commit: 0f1ba103dba4ce5a455f6dd34281c30948917e55 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> AuthorDate: Fri Aug 23 11:34:09 2019 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Fri Aug 23 11:34:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f1ba103
net-dns/bind-tools: make ssl no-op Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> net-dns/bind-tools/bind-tools-9.14.4.ebuild | 9 +++------ net-dns/bind-tools/bind-tools-9.15.2.ebuild | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/net-dns/bind-tools/bind-tools-9.14.4.ebuild b/net-dns/bind-tools/bind-tools-9.14.4.ebuild index f96ea235fc5..fd6ff9184d4 100644 --- a/net-dns/bind-tools/bind-tools-9.14.4.ebuild +++ b/net-dns/bind-tools/bind-tools-9.14.4.ebuild @@ -17,15 +17,13 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"; LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps doc gssapi idn ipv6 libedit libressl readline ssl xml" +IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml" # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 COMMON_DEPEND=" caps? ( sys-libs/libcap ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) @@ -70,7 +68,6 @@ src_configure() { --without-zlib --without-lmdb $(use_with idn libidn2) - $(use_with ssl openssl "${EPREFIX}"/usr) $(use_with xml libxml2) $(use_with gssapi) $(use_with readline) diff --git a/net-dns/bind-tools/bind-tools-9.15.2.ebuild b/net-dns/bind-tools/bind-tools-9.15.2.ebuild index 46ab17b3d09..cb870329d1a 100644 --- a/net-dns/bind-tools/bind-tools-9.15.2.ebuild +++ b/net-dns/bind-tools/bind-tools-9.15.2.ebuild @@ -17,15 +17,13 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"; LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" KEYWORDS="" -IUSE="caps doc gssapi idn ipv6 libedit libressl readline ssl xml" +IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml" # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 COMMON_DEPEND=" caps? ( sys-libs/libcap ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) @@ -69,7 +67,6 @@ src_configure() { --without-zlib --without-lmdb $(use_with idn libidn2) - $(use_with ssl openssl "${EPREFIX}"/usr) $(use_with xml libxml2) $(use_with gssapi) $(use_with readline)
