gentoo auto-resync : 22:11:2023 - 17:18:34

3 files changed, 2 insertions, 68 deletions

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index a2a24080def4..2465db028b4a 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,7 +1,6 @@
 AUX libssh2-1.11.0-mansyntax_sh.patch 304 BLAKE2B 465b6cf0a67fb9d4db83b0ae1556a2cc5d40a2feb981129b8bbe80fcbd75c26fb551a7a33de997ef70101418b094fd18cda55078e2147843c9852b9f7f069451 SHA512 657a6980c505d7359d544d802039325a9e91d2c08f76c499b189c356f47102d793c447aae03d82a22ca25e37c4a02e2c3f7f9cd2cefd37a2c91e0efbf99e86c7
 AUX libssh2-1.11.0-size_t.patch 4251 BLAKE2B e5ef686f8c3d0211d33524b81433f3a8be86b6ce7ac274d788075e827c8b37c6adb6fc790e471d1702118123ae0919f2b2bdd78b3788feffaf94672d1d32b328 SHA512 e52a0f2a531daf8c0e512b3ab802fbe7e7705f793f50455399f1d5e905e1b4d26299ac649b0da7f5856eb451eeaff814124e751d39996927f5cd931c85046981
 DIST libssh2-1.11.0.tar.xz 686796 BLAKE2B 36903798c72f7261d9e997254169c10a4e69166017445276de8b0066fff15cd4dae4119a8d6cbbab8859d765b2d7f34f2911bbaf83c8d6ac5d1feead6b5de64e SHA512 6d50c71b778ca0f769fcc9d2cc257ab669cd0b6c35e8b0e047b6b38aea10638974cc591ba27c25bb7dd523020b4a8a62e2c1ae368287d9dc254d5e24d4a7cee7
-EBUILD libssh2-1.11.0-r1.ebuild 1442 BLAKE2B 290f1b4f0123ba47ae072c279a162105674778e589ff11ed0b017e4a0b0f4f8bd487fbf1414a3f2cbabb95efa25835ea79259d28d523cbfaf7aff5ee700bb7da SHA512 1c4e23333615065cca890270fe3e6e689fb7ce32f9fc37c760355be71c5aa9f662897685af9dbf293743ea4fa0e804fe6fcdb1acda206623187920cf25f0ecef
-EBUILD libssh2-1.11.0-r2.ebuild 1484 BLAKE2B 4b2d2ddead1fabbf0ff3d0725cf0c5d33a0df9bb82cdcfe1d474183d03e012977432c1bbf04cf5c7ceb48fe1af09cc346e67c6f11c35343e32782fec803e379e SHA512 c83ea41a599bef6d1065c864f9b02bc1306aa5fca392783cd3cc913651cdd1dce9aac8e83ae8ff9b3a3e2109759bd93b9a197b46601e25ff059240c4bff0ff28
+EBUILD libssh2-1.11.0-r2.ebuild 1481 BLAKE2B 2df9adf384209518bb8ba9fe02d511aa421a58694ee419518d0199ff3fc519b0fbd926c6080631ed9a45b88197ff3e45925f1fd6fb6fb319d171cd4d7aac8b15 SHA512 3e326a9074eef6530699a7dd133b46b784fa1b751f23e31f0c1225e2eacad63a55bf8401fc9d882a6e289b40cbecc0b2cac9517c98dca9aeb3be7d2f7b2be532
 EBUILD libssh2-9999.ebuild 1363 BLAKE2B 784497be1fffce7873dc5913d4bdf08638c0feff8e0cd6c51141c3a2d8b75d37c7648d4590f73291153f7af1fd47ccebf1f952a2fa27aafee1d55e477948d945 SHA512 cebb0036b408cd3971c6d7307a47a54d617508085cb73f992fa124927d07e41eb136e9f80556bc6529fc8add65ae59200097c66132697e00be83dcdc8c1b35e0
 MISC metadata.xml 625 BLAKE2B 5b2b547a4378190e5fd38b0e4047556da2eb827db4b311aab8fd9456f15a711948bad53951d5b6f1f00620292f938ae097ea43044ab9cc926db941245de22887 SHA512 2ec081036258736ae097981cc5a997c81b09d235ac7f79500128675c0d9df0d8d83d3f570d6dfccac3340d1018f0ad3511f7a8df7e67e8bf9b0a17d4c7332d10
diff --git a/net-libs/libssh2/libssh2-1.11.0-r1.ebuild b/net-libs/libssh2/libssh2-1.11.0-r1.ebuild
deleted file mode 100644
index 11816607f618..000000000000
--- a/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/net-libs/libssh2/libssh2-1.11.0-r2.ebuild b/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
index 2afaa2f4cbe9..eb37955cf515 100644
--- a/net-libs/libssh2/libssh2-1.11.0-r2.ebuild
+++ b/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 )"