commit: 7940a47d9339cce138de8e1fce5cb55e48824b86
Author: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
AuthorDate: Sun May 2 23:43:36 2021 +0000
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Sun May 2 23:43:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=7940a47d
net-misc/openssh: remove libressl USE flag
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
net-misc/openssh/openssh-8.2_p1-r7.ebuild | 19 ++++++++-----------
net-misc/openssh/openssh-8.3_p1-r5.ebuild | 19 ++++++++-----------
net-misc/openssh/openssh-8.4_p1-r2.ebuild | 19 ++++++++-----------
3 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/net-misc/openssh/openssh-8.2_p1-r7.ebuild
b/net-misc/openssh/openssh-8.2_p1-r7.ebuild
index b40fb15..8895334 100644
--- a/net-misc/openssh/openssh-8.2_p1-r7.ebuild
+++ b/net-misc/openssh/openssh-8.2_p1-r7.ebuild
@@ -33,7 +33,7 @@ LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit
libressl livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit
livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
RESTRICT="!test? ( test )"
@@ -42,7 +42,7 @@ REQUIRED_USE="
pie? ( !static )
static? ( !kerberos !pam )
X509? ( !sctp !security-key ssl !xmss )
- xmss? ( || ( ssl libressl ) )
+ xmss? ( ssl )
test? ( ssl )
"
@@ -58,17 +58,14 @@ LIB_DEPEND="
security-key? ( dev-libs/libfido2:=[static-libs(+)] )
selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
ssl? (
- !libressl? (
- || (
- (
- >=dev-libs/openssl-1.0.1:0[bindist=]
- <dev-libs/openssl-1.1.0:0[bindist=]
- )
- >=dev-libs/openssl-1.1.0g:0[bindist=]
+ || (
+ (
+ >=dev-libs/openssl-1.0.1:0[bindist=]
+ <dev-libs/openssl-1.1.0:0[bindist=]
)
- dev-libs/openssl:0=[static-libs(+)]
+ >=dev-libs/openssl-1.1.0g:0[bindist=]
)
- libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+ dev-libs/openssl:0=[static-libs(+)]
)
virtual/libcrypt:=[static-libs(+)]
>=sys-libs/zlib-1.2.3:=[static-libs(+)]
diff --git a/net-misc/openssh/openssh-8.3_p1-r5.ebuild
b/net-misc/openssh/openssh-8.3_p1-r5.ebuild
index 2070568..543622f 100644
--- a/net-misc/openssh/openssh-8.3_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-8.3_p1-r5.ebuild
@@ -36,7 +36,7 @@ LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit
libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509
xmss"
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit
livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
RESTRICT="!test? ( test )"
@@ -45,7 +45,7 @@ REQUIRED_USE="
pie? ( !static )
static? ( !kerberos !pam )
X509? ( !sctp !security-key ssl !xmss )
- xmss? ( || ( ssl libressl ) )
+ xmss? ( ssl )
test? ( ssl )
"
@@ -61,17 +61,14 @@ LIB_DEPEND="
security-key? ( >=dev-libs/libfido2-1.4.0:=[static-libs(+)] )
selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
ssl? (
- !libressl? (
- || (
- (
- >=dev-libs/openssl-1.0.1:0[bindist=]
- <dev-libs/openssl-1.1.0:0[bindist=]
- )
- >=dev-libs/openssl-1.1.0g:0[bindist=]
+ || (
+ (
+ >=dev-libs/openssl-1.0.1:0[bindist=]
+ <dev-libs/openssl-1.1.0:0[bindist=]
)
- dev-libs/openssl:0=[static-libs(+)]
+ >=dev-libs/openssl-1.1.0g:0[bindist=]
)
- libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+ dev-libs/openssl:0=[static-libs(+)]
)
virtual/libcrypt:=[static-libs(+)]
>=sys-libs/zlib-1.2.3:=[static-libs(+)]
diff --git a/net-misc/openssh/openssh-8.4_p1-r2.ebuild
b/net-misc/openssh/openssh-8.4_p1-r2.ebuild
index 8941764..67e9aad 100644
--- a/net-misc/openssh/openssh-8.4_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.4_p1-r2.ebuild
@@ -36,7 +36,7 @@ LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit
libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509
xmss"
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit
livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
RESTRICT="!test? ( test )"
@@ -45,7 +45,7 @@ REQUIRED_USE="
pie? ( !static )
static? ( !kerberos !pam )
X509? ( !sctp !security-key ssl !xmss )
- xmss? ( || ( ssl libressl ) )
+ xmss? ( ssl )
test? ( ssl )
"
@@ -61,17 +61,14 @@ LIB_DEPEND="
security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
ssl? (
- !libressl? (
- || (
- (
- >=dev-libs/openssl-1.0.1:0[bindist=]
- <dev-libs/openssl-1.1.0:0[bindist=]
- )
- >=dev-libs/openssl-1.1.0g:0[bindist=]
+ || (
+ (
+ >=dev-libs/openssl-1.0.1:0[bindist=]
+ <dev-libs/openssl-1.1.0:0[bindist=]
)
- dev-libs/openssl:0=[static-libs(+)]
+ >=dev-libs/openssl-1.1.0g:0[bindist=]
)
- libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+ dev-libs/openssl:0=[static-libs(+)]
)
virtual/libcrypt:=[static-libs(+)]
>=sys-libs/zlib-1.2.3:=[static-libs(+)]
