From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1A391158042 for ; Fri, 1 Nov 2024 04:12:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A76AE08D6; Fri, 1 Nov 2024 04:12:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC412E08D1 for ; Fri, 1 Nov 2024 04:12:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E24533430B0 for ; Fri, 1 Nov 2024 04:12:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D58B11DF for ; Fri, 1 Nov 2024 04:12:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1730434270.f6208707df3fc27f35365245b6c7c67c2781bec8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libssh/libssh-0.11.1.ebuild net-libs/libssh/libssh-9999.ebuild X-VCS-Directories: net-libs/libssh/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f6208707df3fc27f35365245b6c7c67c2781bec8 X-VCS-Branch: master Date: Fri, 1 Nov 2024 04:12:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4b219610-a95f-481f-81ac-9651219306c7 X-Archives-Hash: dbaaf61d1967435f3865feb7d7b75838 commit: f6208707df3fc27f35365245b6c7c67c2781bec8 Author: Sam James gentoo org> AuthorDate: Fri Nov 1 04:08:12 2024 +0000 Commit: Sam James gentoo 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 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)