gentoo auto-resync : 30:05:2023 - 21:21:38

4 files changed, 79 insertions, 4 deletions

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index aff968bb6a1d..fa8d0c952634 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,6 +1,9 @@
 AUX libssh2-1.10.0-libressl.patch 1107 BLAKE2B 5ffb1ffb64da219203e71e335c5808036aaf414ffa1baa72567a33e8c60218a71996544bec3b0c56b448e2884df99c3017f9ac20b9ff6f44e0dc645c2bb1b8c8 SHA512 2e2e8db30b0c7c0d454f11f644630c5cef00ab46ca97104845943d6ab9806d99f952d1c194f9b28d5d0e565c86867d7d59bb9af0cde433017aeb0e8862124318
+AUX libssh2-1.11.0-mansyntax_sh.patch 304 BLAKE2B 465b6cf0a67fb9d4db83b0ae1556a2cc5d40a2feb981129b8bbe80fcbd75c26fb551a7a33de997ef70101418b094fd18cda55078e2147843c9852b9f7f069451 SHA512 657a6980c505d7359d544d802039325a9e91d2c08f76c499b189c356f47102d793c447aae03d82a22ca25e37c4a02e2c3f7f9cd2cefd37a2c91e0efbf99e86c7
 AUX libssh2-1.8.0-mansyntax_sh.patch 367 BLAKE2B 26d83db9af4f1c50cb29a1c560c87685a7d1148a4acb0faec90dd4fd9ae00fa4848eae5eab0d2977393a51c6c26930b8e367cc42e4d383d6c8b4d35f210b4137 SHA512 421ef6945e78004f3818c345cf072a50362a90deafd8aed57cdc21fbfda0848d528dd5233d8e5e844cb361532f6b5e4d2fbaa8b332c951a0cf8402b48ba150f2
 DIST libssh2-1.10.0.tar.gz 965044 BLAKE2B 0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415 SHA512 e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
+DIST libssh2-1.11.0.tar.xz 686796 BLAKE2B 36903798c72f7261d9e997254169c10a4e69166017445276de8b0066fff15cd4dae4119a8d6cbbab8859d765b2d7f34f2911bbaf83c8d6ac5d1feead6b5de64e SHA512 6d50c71b778ca0f769fcc9d2cc257ab669cd0b6c35e8b0e047b6b38aea10638974cc591ba27c25bb7dd523020b4a8a62e2c1ae368287d9dc254d5e24d4a7cee7
 EBUILD libssh2-1.10.0.ebuild 1345 BLAKE2B 4c2fac289235288aaab718a78cf75113e1e7141e5ca58eb98b22a1f67722ad1f2266f31d8040005da35a3dedac68312898e7d466e7ddbc0f3d804893eec66bd2 SHA512 ffdbb9393595a75b2db0f551989fa2713fe19893798c2ad73efc86be17b9de13210a600830ba7e769048b0cb69294881754e9e5118b8570c6f7349b321cca328
-EBUILD libssh2-9999.ebuild 1150 BLAKE2B 598389dc4f42bbd477f9eeddf17ced69ec81602520a313321836937f4ca3e56455867ee7ad860e2f04a3db52e0be19ea39078d4a6de59f6321033cda054de160 SHA512 ecd4f51a283abc70022b174b765975700f6c3233d0ddd606a068917343d9d2c2da45fba74a0809b34b34dea811af50af129e400bc77b646481f3f4f8e51295f8
+EBUILD libssh2-1.11.0.ebuild 1378 BLAKE2B 82c75c5db56d439964dcfd9e3743616ba77ae377f8b7f7a559b6a2fccf850cca89a0d0d1cdc96020f6c0edadc3b727fc5f93dc65c1d7e69096586898de002f4c SHA512 e3e0b314d75b4d66f7048f03c2f51db65efcce4792fd594bcf7911c94c298b1a7ea2de8800a26c5de3cfee8c2a50551442a5d7c8b5c1fcab39b3f4f6336715fa
+EBUILD libssh2-9999.ebuild 1246 BLAKE2B c8ae8a57ffa96d31b035f5637a0f381ad61db03908c47da7b5cea44532b06f1993b8d3fe7722d4b9202895d98980edcad75fe41998c020ae446c1030a3dddfef SHA512 476f7ba945787520358351c2c0ea47022a4cbaae42dabb90432a62e9212c0dfa2bb6da5050bfefc76fbe30b1967d2fedb79da60a91a60a063f9c8f881858502e
 MISC metadata.xml 625 BLAKE2B 5b2b547a4378190e5fd38b0e4047556da2eb827db4b311aab8fd9456f15a711948bad53951d5b6f1f00620292f938ae097ea43044ab9cc926db941245de22887 SHA512 2ec081036258736ae097981cc5a997c81b09d235ac7f79500128675c0d9df0d8d83d3f570d6dfccac3340d1018f0ad3511f7a8df7e67e8bf9b0a17d4c7332d10
diff --git a/net-libs/libssh2/files/libssh2-1.11.0-mansyntax_sh.patch b/net-libs/libssh2/files/libssh2-1.11.0-mansyntax_sh.patch
new file mode 100644
index 000000000000..8d8e93cda47e
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.11.0-mansyntax_sh.patch
@@ -0,0 +1,10 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -63,7 +63,6 @@ if(SH_EXECUTABLE)
+     mark_as_advanced(SSHD_EXECUTABLE)
+   endif()
+ 
+-  add_test(NAME mansyntax COMMAND ${SH_EXECUTABLE} -c "${CMAKE_CURRENT_SOURCE_DIR}/mansyntax.sh")
+ endif()
+ 
+ add_library(runner STATIC ${librunner_la_SOURCES})
diff --git a/net-libs/libssh2/libssh2-1.11.0.ebuild b/net-libs/libssh2/libssh2-1.11.0.ebuild
new file mode 100644
index 000000000000..2f60c46c3928
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.11.0.ebuild
@@ -0,0 +1,59 @@
+# 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)
+		-DRUN_SSHD_TESTS=OFF
+		-DRUN_DOCKER_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
index 7aa0edfae11e..290d28ce2558 100644
--- a/net-libs/libssh2/libssh2-9999.ebuild
+++ b/net-libs/libssh2/libssh2-9999.ebuild
@@ -12,9 +12,9 @@ EGIT_REPO_URI="https://github.com/libssh2/libssh2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="gcrypt mbedtls zlib"
+IUSE="gcrypt mbedtls test zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
@@ -29,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+	"${FILESDIR}"/${PN}-1.11.0-mansyntax_sh.patch
 )
 
 multilib_src_configure() {
@@ -42,8 +42,11 @@ multilib_src_configure() {
 
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING=$(usex test)
 		-DCRYPTO_BACKEND=${crypto_backend}
 		-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+		-DRUN_SSHD_TESTS=OFF
+		-DRUN_DOCKER_TESTS=OFF
 	)
 	cmake_src_configure
 }