gentoo auto-resync : 14:10:2024 - 04:04:03

3 files changed, 2 insertions, 138 deletions

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index d2408c3752d5..9bb62729193d 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,7 +1,6 @@
 AUX libssh-0.10.6-ipv6-hostname-parsing.patch 5095 BLAKE2B d231effe7a624f3d42ccae9ae2f8db5d567da3ff4c32f18ad217b11a19f9fa919b6feb42aeb82b8f9b15063ac252db44d79efe27e056f533d1eebdfe9b3d4b8e SHA512 8612f8c9f90e480e8ce4657ba6a150a09ad080c2ed8d4f4a1902fd57b4008d68edaaa31dd3cfb423f2619f580ec0c8b6cd711a91ad6c161f207c8e719200f385
 AUX libssh-0.10.6-libgcrypt-type-mismatches.patch 2544 BLAKE2B 14999447e240fa7a2a5e09d04a09f7a95049482eec3aa9e7094d11ed5a5720a901ac69b663e680e5413dac418792a0701ce3bd294b84e1d2310c8a5ca837de70 SHA512 949789b95347a23eccf9a1d4e4f37a1b410a912895d369aa3c845f44a3dd2213cd507b49ea3ef7f42b83fcb758ddcba7bc443e2f260253eec46e0c2d3adb4222
 DIST libssh-0.10.6.tar.xz 561036 BLAKE2B 6ae1c611b685fa8ec5e5fb159f93493edf4d8ae8536300cd9a357daadc28ca2fbd8a64a22157744bc97e2e672b0b84b58e1167d7369fe88306b3581098af9f57 SHA512 40c62d63c44e882999b71552c237d73fc7364313bd00b15a211a34aeff1b73693da441d2c8d4e40108d00fb7480ec7c5b6d472f9c0784b2359a179632ab0d6c1
-EBUILD libssh-0.10.6-r1.ebuild 3672 BLAKE2B 55b4d958420b81456ee6f80ca282e9fb5b8c3309dbeab6ccd5f632c1f68787b30091c6d85c4f150f1f5df7d90461b0eb57d95e9cc4c88a38bb8d105c7d57951a SHA512 ac246dc34eb03541d82cc1ea0cb538799cd2ca1e54e0b3c589692b117b883093017ace31dba25d133c5f0859aeb0eea6f0364760547d26d40e94ddc81b13d520
-EBUILD libssh-0.10.6.ebuild 3489 BLAKE2B 4e710574815ac6142c6df6634fee2e4453277ba7f1a40065a901af69b626f8bd2f731b199b9abd5512b480ca5bad9dbc44a0b7d3e074955ec6f45d28c3f8fcd2 SHA512 cb49fbd59c2888ff2816b1fa1d234bad5e6aa4ff344d09a1de220e5f2b9d235b5f82d8afc0fb58c26ce1f3c036c973d24e6395ff099efd893663c35de390d247
+EBUILD libssh-0.10.6-r1.ebuild 3671 BLAKE2B 4ec8be5769e8d8fe93490678501ada72b7b5b4078f6bff1bbd31ca5b6aa66e4add5acaf4310a5c224c4041818d8ffd5a70368ef9b9264dfdbf59d217dc9a356a SHA512 53453520a7b1e5b04f21b2b0d5a46757a5024a49874d87b41e3e2af58ddc7150e332cd6b319ce32101ebb9bc06036a16db2c3610dd5556c10be4628848a9f63f
 EBUILD libssh-9999.ebuild 3553 BLAKE2B c0cc63cdf0902f76e466dcaab28fed635718626c98e02839103bf4ca0d54f3528063255621a33fd80beae5f7d3a0380aff57e791bdd852c4552ae1d5e804ab2f SHA512 ce3cb8c1bdc83490dbacec963ba0439c47ce095e6b4371f77a60064f226fc190a6547ab45f787a4d41a5af088359fd7e046928b8b1fd05e2f88e3bfa136cf984
 MISC metadata.xml 783 BLAKE2B 79be0ef9802a5f1d58b866dd2738a721696b0a4a1b6fcf44b024c74593ba9737e4a64ce2cf1cb8ba4a17139da06ccbe2fe3d8365221159ebf797de1c4aa5b490 SHA512 f2204075966244ebc337663f1a9d010320dffeda90954c6bac69c22859fefd2b6ca0ff5809fc2d34743de6400e3d9da234c5b8a9ef211cc634f381ded5d97825
diff --git a/net-libs/libssh/libssh-0.10.6-r1.ebuild b/net-libs/libssh/libssh-0.10.6-r1.ebuild
index 2890c24fa814..96aceba24d24 100644
--- a/net-libs/libssh/libssh-0.10.6-r1.ebuild
+++ b/net-libs/libssh/libssh-0.10.6-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh/libssh-0.10.6.ebuild b/net-libs/libssh/libssh-0.10.6.ebuild
deleted file mode 100644
index 61b5f5d0ad71..000000000000
--- a/net-libs/libssh/libssh-0.10.6.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-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"
-# 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}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
-		elibc_musl? ( sys-libs/argp-standalone )
-	)
-"
-BDEPEND="doc? ( app-text/doxygen[dot] )"
-
-DOCS=( AUTHORS CHANGELOG README )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-		-i ConfigureChecks.cmake || die
-
-	if use test; then
-		local skip_tests=(
-			# keyfile torture test is currently broken
-			-e "/torture_keyfiles/d"
-
-			# Tries to expand ~ which fails w/ portage homedir
-			# (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir)
-			-e "/torture_misc/d"
-			-e "/torture_config/d"
-		)
-
-		# Disable tests that take too long (bug #677006)
-		if use sparc; then
-			skip_tests+=(
-				-e "/torture_threads_pki_rsa/d"
-				-e "/torture_pki_dsa/d"
-			)
-		fi
-
-		if (( ${#skip_tests[@]} )) ; then
-			sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die
-		fi
-
-		if use elibc_musl; then
-			sed -e "/SOLARIS/d" \
-				-i tests/CMakeLists.txt || die
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_NACL=OFF
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_DEBUG_CALLTRACE=$(usex debug)
-		-DWITH_DEBUG_CRYPTO=$(usex debug)
-		-DWITH_GCRYPT=$(usex gcrypt)
-		-DWITH_GSSAPI=$(usex gssapi)
-		-DWITH_MBEDTLS=$(usex mbedtls)
-		-DWITH_PCAP=$(usex pcap)
-		-DWITH_SERVER=$(usex server)
-		-DWITH_SFTP=$(usex sftp)
-		-DBUILD_STATIC_LIB=$(usex static-libs)
-		# TODO: try enabling {CLIENT,SERVER}_TESTING
-		-DUNIT_TESTING=$(usex test)
-		-DWITH_ZLIB=$(usex zlib)
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	multilib_is_native_abi && use doc && cmake_src_compile docs
-}
-
-multilib_src_install() {
-	cmake_src_install
-	multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	use static-libs && dolib.a src/libssh.a
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}