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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 611E7158090 for ; Sun, 22 Sep 2024 16:46:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 711CE2BC07E; Sun, 22 Sep 2024 16:46:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 587612BC07E for ; Sun, 22 Sep 2024 16:46:03 +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 95EA1343349 for ; Sun, 22 Sep 2024 16:46:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 795861F45 for ; Sun, 22 Sep 2024 16:46: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: <1727023516.415c3def5b8e48c6f4403b995fdbd15fe0925580.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/cryptsetup/cryptsetup-2.6.1-r1.ebuild sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild sys-fs/cryptsetup/cryptsetup-2.7.2-r1.ebuild sys-fs/cryptsetup/cryptsetup-2.7.2.ebuild sys-fs/cryptsetup/cryptsetup-2.7.3-r1.ebuild sys-fs/cryptsetup/cryptsetup-2.7.3.ebuild sys-fs/cryptsetup/cryptsetup-2.7.4-r1.ebuild sys-fs/cryptsetup/cryptsetup-2.7.4.ebuild sys-fs/cryptsetup/cryptsetup-2.7.5-r1.ebuild sys-fs/cryptsetup/cryptsetup-2.7.5.ebuild X-VCS-Directories: sys-fs/cryptsetup/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 415c3def5b8e48c6f4403b995fdbd15fe0925580 X-VCS-Branch: master Date: Sun, 22 Sep 2024 16:46: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: 2cdcb921-ce21-4de4-a7eb-fdd2bf1c1473 X-Archives-Hash: 1045bf21283bb30e1d2c6f7133d0a25d commit: 415c3def5b8e48c6f4403b995fdbd15fe0925580 Author: Sam James gentoo org> AuthorDate: Sun Sep 22 16:43:40 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 22 16:45:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=415c3def Revert "sys-fs/cryptsetup: fix libssh dep" This reverts commit 8cd13f2192930e245f51d97be1fa5dd9219eb2d3. Mess w/ static replace, too tired to fix it properly now, will later. Signed-off-by: Sam James gentoo.org> .../{cryptsetup-2.6.1-r1.ebuild => cryptsetup-2.6.1.ebuild} | 4 ++-- .../{cryptsetup-2.7.2-r1.ebuild => cryptsetup-2.7.2.ebuild} | 2 +- .../{cryptsetup-2.7.3-r1.ebuild => cryptsetup-2.7.3.ebuild} | 2 +- .../{cryptsetup-2.7.4-r1.ebuild => cryptsetup-2.7.4.ebuild} | 2 +- .../{cryptsetup-2.7.5-r1.ebuild => cryptsetup-2.7.5.ebuild} | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys-fs/cryptsetup/cryptsetup-2.6.1-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild similarity index 97% rename from sys-fs/cryptsetup/cryptsetup-2.6.1-r1.ebuild rename to sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild index 0117f5cf70ab..12b1d328736f 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.6.1-r1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -40,7 +40,7 @@ LIB_DEPEND=" nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) - ssh? ( net-libs/libssh[sftp,static-libs(+)] ) + ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] " # We have to always depend on ${LIB_DEPEND} rather than put behind diff --git a/sys-fs/cryptsetup/cryptsetup-2.7.2-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.2.ebuild similarity index 98% rename from sys-fs/cryptsetup/cryptsetup-2.7.2-r1.ebuild rename to sys-fs/cryptsetup/cryptsetup-2.7.2.ebuild index 80bb32e887e2..10ac2ba5d833 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.7.2-r1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.7.2.ebuild @@ -41,7 +41,7 @@ LIB_DEPEND=" nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) - ssh? ( net-libs/libssh[sftp,static-libs(+)] ) + ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] " # We have to always depend on ${LIB_DEPEND} rather than put behind diff --git a/sys-fs/cryptsetup/cryptsetup-2.7.3-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.3.ebuild similarity index 98% rename from sys-fs/cryptsetup/cryptsetup-2.7.3-r1.ebuild rename to sys-fs/cryptsetup/cryptsetup-2.7.3.ebuild index fe3e57102827..729d59ff8f6d 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.7.3-r1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.7.3.ebuild @@ -41,7 +41,7 @@ LIB_DEPEND=" nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) - ssh? ( net-libs/libssh[sftp,static-libs(+)] ) + ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] " # We have to always depend on ${LIB_DEPEND} rather than put behind diff --git a/sys-fs/cryptsetup/cryptsetup-2.7.4-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.4.ebuild similarity index 98% rename from sys-fs/cryptsetup/cryptsetup-2.7.4-r1.ebuild rename to sys-fs/cryptsetup/cryptsetup-2.7.4.ebuild index fe3e57102827..729d59ff8f6d 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.7.4-r1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.7.4.ebuild @@ -41,7 +41,7 @@ LIB_DEPEND=" nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) - ssh? ( net-libs/libssh[sftp,static-libs(+)] ) + ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] " # We have to always depend on ${LIB_DEPEND} rather than put behind diff --git a/sys-fs/cryptsetup/cryptsetup-2.7.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.7.5.ebuild similarity index 98% rename from sys-fs/cryptsetup/cryptsetup-2.7.5-r1.ebuild rename to sys-fs/cryptsetup/cryptsetup-2.7.5.ebuild index ed9eeb998f61..d09dd78f2b65 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.7.5-r1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.7.5.ebuild @@ -41,7 +41,7 @@ LIB_DEPEND=" nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) - ssh? ( net-libs/libssh[sftp,static-libs(+)] ) + ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] " # We have to always depend on ${LIB_DEPEND} rather than put behind