| 1 |
commit: 551b749961d032b04e6b9e50bf297b3b1b3fbbfd |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 2 10:05:56 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 2 10:16:33 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=551b7499 |
| 7 |
|
| 8 |
net-libs/ldns: 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-libs/ldns/ldns-1.7.1-r1.ebuild | 13 ++++++------- |
| 14 |
net-libs/ldns/ldns-1.7.1-r2.ebuild | 15 ++++++--------- |
| 15 |
2 files changed, 12 insertions(+), 16 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild |
| 18 |
index 78a9e8a8dfe..95e2628a1d8 100644 |
| 19 |
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild |
| 20 |
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild |
| 21 |
@@ -12,7 +12,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" |
| 22 |
LICENSE="BSD" |
| 23 |
SLOT="0/3" |
| 24 |
KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" |
| 25 |
-IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax" |
| 26 |
+IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax" |
| 27 |
|
| 28 |
# configure will die if ecdsa is enabled and ssl is not |
| 29 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 30 |
@@ -20,16 +20,15 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 31 |
RDEPEND=" |
| 32 |
python? ( ${PYTHON_DEPS} ) |
| 33 |
ecdsa? ( |
| 34 |
- !libressl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}] ) |
| 35 |
+ >=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}] |
| 36 |
) |
| 37 |
ed25519? ( |
| 38 |
- !libressl? ( >=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}] ) |
| 39 |
+ >=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}] |
| 40 |
) |
| 41 |
ed448? ( |
| 42 |
- !libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}] ) |
| 43 |
+ >=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}] |
| 44 |
) |
| 45 |
- !libressl? ( >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] ) |
| 46 |
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
| 47 |
+ >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] |
| 48 |
" |
| 49 |
DEPEND="${RDEPEND} |
| 50 |
python? ( dev-lang/swig ) |
| 51 |
@@ -48,7 +47,7 @@ pkg_setup() { |
| 52 |
|
| 53 |
multilib_src_configure() { |
| 54 |
# >=openssl-1.1.0 required for dane-ta |
| 55 |
- if has_version "<dev-libs/openssl-1.1.0" || use libressl; then |
| 56 |
+ if has_version "<dev-libs/openssl-1.1.0"; then |
| 57 |
local dane_ta_usage="--disable-dane-ta-usage" |
| 58 |
else |
| 59 |
local dane_ta_usage="" |
| 60 |
|
| 61 |
diff --git a/net-libs/ldns/ldns-1.7.1-r2.ebuild b/net-libs/ldns/ldns-1.7.1-r2.ebuild |
| 62 |
index 9e872b955a9..ee8acea2dae 100644 |
| 63 |
--- a/net-libs/ldns/ldns-1.7.1-r2.ebuild |
| 64 |
+++ b/net-libs/ldns/ldns-1.7.1-r2.ebuild |
| 65 |
@@ -12,28 +12,25 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" |
| 66 |
LICENSE="BSD" |
| 67 |
SLOT="0/3" |
| 68 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris" |
| 69 |
-IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax" |
| 70 |
+IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax" |
| 71 |
|
| 72 |
# configure will die if ecdsa is enabled and ssl is not |
| 73 |
REQUIRED_USE=" |
| 74 |
python? ( ${PYTHON_REQUIRED_USE} ) |
| 75 |
- ed25519? ( !libressl ) |
| 76 |
- ed448? ( !libressl ) |
| 77 |
" |
| 78 |
|
| 79 |
RDEPEND=" |
| 80 |
python? ( ${PYTHON_DEPS} ) |
| 81 |
ecdsa? ( |
| 82 |
- !libressl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}] ) |
| 83 |
+ >=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}] |
| 84 |
) |
| 85 |
ed25519? ( |
| 86 |
- !libressl? ( >=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}] ) |
| 87 |
+ >=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}] |
| 88 |
) |
| 89 |
ed448? ( |
| 90 |
- !libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}] ) |
| 91 |
+ >=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}] |
| 92 |
) |
| 93 |
- !libressl? ( >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] ) |
| 94 |
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
| 95 |
+ >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] |
| 96 |
" |
| 97 |
DEPEND="${RDEPEND} |
| 98 |
python? ( dev-lang/swig ) |
| 99 |
@@ -52,7 +49,7 @@ pkg_setup() { |
| 100 |
|
| 101 |
multilib_src_configure() { |
| 102 |
# >=openssl-1.1.0 required for dane-ta |
| 103 |
- if has_version "<dev-libs/openssl-1.1.0" || use libressl; then |
| 104 |
+ if has_version "<dev-libs/openssl-1.1.0"; then |
| 105 |
local dane_ta_usage="--disable-dane-ta-usage" |
| 106 |
else |
| 107 |
local dane_ta_usage="" |
Archives