| 1 |
commit: 0f1ba103dba4ce5a455f6dd34281c30948917e55 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 23 11:34:09 2019 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 23 11:34:09 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f1ba103 |
| 7 |
|
| 8 |
net-dns/bind-tools: make ssl no-op |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
net-dns/bind-tools/bind-tools-9.14.4.ebuild | 9 +++------ |
| 14 |
net-dns/bind-tools/bind-tools-9.15.2.ebuild | 9 +++------ |
| 15 |
2 files changed, 6 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-dns/bind-tools/bind-tools-9.14.4.ebuild b/net-dns/bind-tools/bind-tools-9.14.4.ebuild |
| 18 |
index f96ea235fc5..fd6ff9184d4 100644 |
| 19 |
--- a/net-dns/bind-tools/bind-tools-9.14.4.ebuild |
| 20 |
+++ b/net-dns/bind-tools/bind-tools-9.14.4.ebuild |
| 21 |
@@ -17,15 +17,13 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz" |
| 22 |
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" |
| 23 |
SLOT="0" |
| 24 |
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" |
| 25 |
-IUSE="caps doc gssapi idn ipv6 libedit libressl readline ssl xml" |
| 26 |
+IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml" |
| 27 |
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 |
| 28 |
|
| 29 |
COMMON_DEPEND=" |
| 30 |
caps? ( sys-libs/libcap ) |
| 31 |
- ssl? ( |
| 32 |
- !libressl? ( dev-libs/openssl:0= ) |
| 33 |
- libressl? ( dev-libs/libressl:0= ) |
| 34 |
- ) |
| 35 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 36 |
+ libressl? ( dev-libs/libressl:0= ) |
| 37 |
xml? ( dev-libs/libxml2 ) |
| 38 |
idn? ( net-dns/libidn2:= ) |
| 39 |
gssapi? ( virtual/krb5 ) |
| 40 |
@@ -70,7 +68,6 @@ src_configure() { |
| 41 |
--without-zlib |
| 42 |
--without-lmdb |
| 43 |
$(use_with idn libidn2) |
| 44 |
- $(use_with ssl openssl "${EPREFIX}"/usr) |
| 45 |
$(use_with xml libxml2) |
| 46 |
$(use_with gssapi) |
| 47 |
$(use_with readline) |
| 48 |
|
| 49 |
diff --git a/net-dns/bind-tools/bind-tools-9.15.2.ebuild b/net-dns/bind-tools/bind-tools-9.15.2.ebuild |
| 50 |
index 46ab17b3d09..cb870329d1a 100644 |
| 51 |
--- a/net-dns/bind-tools/bind-tools-9.15.2.ebuild |
| 52 |
+++ b/net-dns/bind-tools/bind-tools-9.15.2.ebuild |
| 53 |
@@ -17,15 +17,13 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz" |
| 54 |
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" |
| 55 |
SLOT="0" |
| 56 |
KEYWORDS="" |
| 57 |
-IUSE="caps doc gssapi idn ipv6 libedit libressl readline ssl xml" |
| 58 |
+IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml" |
| 59 |
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 |
| 60 |
|
| 61 |
COMMON_DEPEND=" |
| 62 |
caps? ( sys-libs/libcap ) |
| 63 |
- ssl? ( |
| 64 |
- !libressl? ( dev-libs/openssl:0= ) |
| 65 |
- libressl? ( dev-libs/libressl:0= ) |
| 66 |
- ) |
| 67 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 68 |
+ libressl? ( dev-libs/libressl:0= ) |
| 69 |
xml? ( dev-libs/libxml2 ) |
| 70 |
idn? ( net-dns/libidn2:= ) |
| 71 |
gssapi? ( virtual/krb5 ) |
| 72 |
@@ -69,7 +67,6 @@ src_configure() { |
| 73 |
--without-zlib |
| 74 |
--without-lmdb |
| 75 |
$(use_with idn libidn2) |
| 76 |
- $(use_with ssl openssl "${EPREFIX}"/usr) |
| 77 |
$(use_with xml libxml2) |
| 78 |
$(use_with gssapi) |
| 79 |
$(use_with readline) |
Archives