From fcacf90a82c20d160d9589b0df45f1e266d804e5 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 1 Jan 2024 07:14:25 +0000
Subject: [PATCH] net-libs/libssh2: Sync with Gentoo

It's from Gentoo commit 23d377b24fb52e31275b9af7304eebdbc6f11939.
---
 .../net-libs/libssh2/libssh2-1.11.0-r1.ebuild | 65 -------------------
 .../net-libs/libssh2/libssh2-1.11.0-r2.ebuild |  2 +-
 .../net-libs/libssh2/metadata.xml             |  1 +
 3 files changed, 2 insertions(+), 66 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.11.0-r1.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.11.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.11.0-r1.ebuild
deleted file mode 100644
index 11816607f6..0000000000
--- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.11.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="https://www.libssh2.org"
-SRC_URI="https://www.libssh2.org/download/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="gcrypt mbedtls test zlib"
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	!gcrypt? (
-		mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
-		!mbedtls? (
-			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11.0-mansyntax_sh.patch
-)
-
-multilib_src_configure() {
-	local crypto_backend=OpenSSL
-	if use gcrypt; then
-		crypto_backend=Libgcrypt
-	elif use mbedtls; then
-		crypto_backend=mbedTLS
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTING=$(usex test)
-		-DCRYPTO_BACKEND=${crypto_backend}
-		-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
-	)
-
-	if use test ; then
-		# Pass separately to avoid unused var warnings w/ USE=-test
-		mycmakeargs+=(
-			-DRUN_SSHD_TESTS=OFF
-			-DRUN_DOCKER_TESTS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.11.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
index 2afaa2f4cb..eb37955cf5 100644
--- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="!test? ( test )"
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/metadata.xml b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/metadata.xml
index 1f00f91c1c..72168fb364 100644
--- a/sdk_container/src/third_party/portage-stable/net-libs/libssh2/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/net-libs/libssh2/metadata.xml
@@ -14,5 +14,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">libssh2/libssh2</remote-id>
+		<remote-id type="cpe">cpe:/a:libssh2:libssh2</remote-id>
 	</upstream>
 </pkgmetadata>