commit: f6208707df3fc27f35365245b6c7c67c2781bec8 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Nov 1 04:08:12 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Nov 1 04:11:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6208707
net-libs/libssh: drop libgcrypt support This is deprecated and slated for removal in the next release and apparently doesn't build anymore anyway. Just drop it. Closes: https://bugs.gentoo.org/942634 Signed-off-by: Sam James <sam <AT> gentoo.org> net-libs/libssh/libssh-0.11.1.ebuild | 12 +++--------- net-libs/libssh/libssh-9999.ebuild | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/net-libs/libssh/libssh-0.11.1.ebuild b/net-libs/libssh/libssh-0.11.1.ebuild index efb21e5e77c1..1cab5e95f04b 100644 --- a/net-libs/libssh/libssh-0.11.1.ebuild +++ b/net-libs/libssh/libssh-0.11.1.ebuild @@ -18,19 +18,13 @@ fi LICENSE="LGPL-2.1" SLOT="0/4" # subslot = soname major version -IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib" +IUSE="debug doc examples gssapi mbedtls pcap server +sftp static-libs test zlib" # Maintainer: check IUSE-defaults at DefineOptions.cmake -REQUIRED_USE="?? ( gcrypt mbedtls )" RESTRICT="!test? ( test )" RDEPEND=" - !gcrypt? ( - !mbedtls? ( - >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] - ) - ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) + !mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) @@ -91,7 +85,7 @@ multilib_src_configure() { -DWITH_STACK_PROTECTOR_STRONG=OFF -DWITH_DEBUG_CALLTRACE=$(usex debug) -DWITH_DEBUG_CRYPTO=$(usex debug) - -DWITH_GCRYPT=$(usex gcrypt) + -DWITH_GCRYPT=OFF -DWITH_GSSAPI=$(usex gssapi) -DWITH_MBEDTLS=$(usex mbedtls) -DWITH_PCAP=$(usex pcap) diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index efb21e5e77c1..1cab5e95f04b 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -18,19 +18,13 @@ fi LICENSE="LGPL-2.1" SLOT="0/4" # subslot = soname major version -IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib" +IUSE="debug doc examples gssapi mbedtls pcap server +sftp static-libs test zlib" # Maintainer: check IUSE-defaults at DefineOptions.cmake -REQUIRED_USE="?? ( gcrypt mbedtls )" RESTRICT="!test? ( test )" RDEPEND=" - !gcrypt? ( - !mbedtls? ( - >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] - ) - ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) + !mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) @@ -91,7 +85,7 @@ multilib_src_configure() { -DWITH_STACK_PROTECTOR_STRONG=OFF -DWITH_DEBUG_CALLTRACE=$(usex debug) -DWITH_DEBUG_CRYPTO=$(usex debug) - -DWITH_GCRYPT=$(usex gcrypt) + -DWITH_GCRYPT=OFF -DWITH_GSSAPI=$(usex gssapi) -DWITH_MBEDTLS=$(usex mbedtls) -DWITH_PCAP=$(usex pcap)
