[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

[Mikle Kolyada]

commit:     73de8fdef3d85f1db4f751a95b2b033a022f821a
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 18:21:26 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 18:28:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73de8fde

sys-fs/cryptsetup: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild | 8 ++------
 sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
index 506cc07dfd9..641a9c76c68 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
@@ -16,9 +16,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 
~riscv ~s390 sparc x
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality reencrypt static 
static-libs +udev urandom"
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-       libressl? ( openssl )
        static? ( !gcrypt )" #496612
 
 LIB_DEPEND="
@@ -29,10 +28,7 @@ LIB_DEPEND="
        argon2? ( app-crypt/argon2:=[static-libs(+)] )
        gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
        nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-       openssl? (
-               !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-               libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-       )
+       openssl? ( dev-libs/openssl:0=[static-libs(+)] )
        pwquality? ( dev-libs/libpwquality[static-libs(+)] )
        sys-fs/lvm2[static-libs(+)]
        udev? ( virtual/libudev[static-libs(-)] )"

diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
index c752e6c2722..30f4962b68e 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
@@ -16,9 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc 
~ppc64 ~riscv ~s390 ~
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward 
compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality reencrypt static 
static-libs +udev urandom"
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs 
+udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-       libressl? ( openssl )
        static? ( !gcrypt )" #496612
 
 LIB_DEPEND="
@@ -29,10 +28,7 @@ LIB_DEPEND="
        argon2? ( app-crypt/argon2:=[static-libs(+)] )
        gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
        nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-       openssl? (
-               !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-               libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-       )
+       openssl? ( dev-libs/openssl:0=[static-libs(+)] )
        pwquality? ( dev-libs/libpwquality[static-libs(+)] )
        sys-fs/lvm2[static-libs(+)]
        udev? ( virtual/libudev[static-libs(-)] )"