1 |
commit: 1aefaeb489d312c3b2da84569200846ba80f0657 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 2 19:19:04 2021 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 2 19:19:04 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aefaeb4 |
7 |
|
8 |
net-dns/unbound: remove libressl support |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
12 |
|
13 |
net-dns/unbound/unbound-1.13.0-r1.ebuild | 9 ++++----- |
14 |
net-dns/unbound/unbound-1.13.0.ebuild | 9 ++++----- |
15 |
net-dns/unbound/unbound-1.13.1.ebuild | 7 +++---- |
16 |
3 files changed, 11 insertions(+), 14 deletions(-) |
17 |
|
18 |
diff --git a/net-dns/unbound/unbound-1.13.0-r1.ebuild b/net-dns/unbound/unbound-1.13.0-r1.ebuild |
19 |
index 30b267d4439..473024caee7 100644 |
20 |
--- a/net-dns/unbound/unbound-1.13.0-r1.ebuild |
21 |
+++ b/net-dns/unbound/unbound-1.13.0-r1.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2020 Gentoo Authors |
24 |
+# Copyright 1999-2021 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI="7" |
28 |
@@ -14,7 +14,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz" |
29 |
LICENSE="BSD GPL-2" |
30 |
SLOT="0/8" # ABI version of libunbound.so |
31 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86" |
32 |
-IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads" |
33 |
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test threads" |
34 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
35 |
RESTRICT="!test? ( test )" |
36 |
|
37 |
@@ -27,15 +27,14 @@ CDEPEND="acct-group/unbound |
38 |
acct-user/unbound |
39 |
>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] |
40 |
>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}] |
41 |
- libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] ) |
42 |
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) |
43 |
+ >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] |
44 |
dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] ) |
45 |
dnstap? ( |
46 |
dev-libs/fstrm[${MULTILIB_USEDEP}] |
47 |
>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}] |
48 |
) |
49 |
ecdsa? ( |
50 |
- !libressl? ( dev-libs/openssl:0[-bindist] ) |
51 |
+ dev-libs/openssl:0[-bindist] |
52 |
) |
53 |
http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) |
54 |
python? ( ${PYTHON_DEPS} ) |
55 |
|
56 |
diff --git a/net-dns/unbound/unbound-1.13.0.ebuild b/net-dns/unbound/unbound-1.13.0.ebuild |
57 |
index a8e0c81179f..7719cd597bc 100644 |
58 |
--- a/net-dns/unbound/unbound-1.13.0.ebuild |
59 |
+++ b/net-dns/unbound/unbound-1.13.0.ebuild |
60 |
@@ -1,4 +1,4 @@ |
61 |
-# Copyright 1999-2020 Gentoo Authors |
62 |
+# Copyright 1999-2021 Gentoo Authors |
63 |
# Distributed under the terms of the GNU General Public License v2 |
64 |
|
65 |
EAPI="7" |
66 |
@@ -14,7 +14,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz" |
67 |
LICENSE="BSD GPL-2" |
68 |
SLOT="0/8" # ABI version of libunbound.so |
69 |
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86" |
70 |
-IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads" |
71 |
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test threads" |
72 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
73 |
RESTRICT="!test? ( test )" |
74 |
|
75 |
@@ -27,15 +27,14 @@ CDEPEND="acct-group/unbound |
76 |
acct-user/unbound |
77 |
>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] |
78 |
>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}] |
79 |
- libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] ) |
80 |
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) |
81 |
+ >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] |
82 |
dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] ) |
83 |
dnstap? ( |
84 |
dev-libs/fstrm[${MULTILIB_USEDEP}] |
85 |
>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}] |
86 |
) |
87 |
ecdsa? ( |
88 |
- !libressl? ( dev-libs/openssl:0[-bindist] ) |
89 |
+ dev-libs/openssl:0[-bindist] |
90 |
) |
91 |
http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) |
92 |
python? ( ${PYTHON_DEPS} ) |
93 |
|
94 |
diff --git a/net-dns/unbound/unbound-1.13.1.ebuild b/net-dns/unbound/unbound-1.13.1.ebuild |
95 |
index 094e9854429..473024caee7 100644 |
96 |
--- a/net-dns/unbound/unbound-1.13.1.ebuild |
97 |
+++ b/net-dns/unbound/unbound-1.13.1.ebuild |
98 |
@@ -14,7 +14,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz" |
99 |
LICENSE="BSD GPL-2" |
100 |
SLOT="0/8" # ABI version of libunbound.so |
101 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86" |
102 |
-IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads" |
103 |
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test threads" |
104 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
105 |
RESTRICT="!test? ( test )" |
106 |
|
107 |
@@ -27,15 +27,14 @@ CDEPEND="acct-group/unbound |
108 |
acct-user/unbound |
109 |
>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] |
110 |
>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}] |
111 |
- libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] ) |
112 |
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) |
113 |
+ >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] |
114 |
dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] ) |
115 |
dnstap? ( |
116 |
dev-libs/fstrm[${MULTILIB_USEDEP}] |
117 |
>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}] |
118 |
) |
119 |
ecdsa? ( |
120 |
- !libressl? ( dev-libs/openssl:0[-bindist] ) |
121 |
+ dev-libs/openssl:0[-bindist] |
122 |
) |
123 |
http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) |
124 |
python? ( ${PYTHON_DEPS} ) |