[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/

["Sam James" <sam@gentoo.org>]

commit:     44207f33399f9bb406432c3d3689a4362bfb1b23
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  3 03:48:35 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep  3 03:48:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44207f33

net-libs/libssh: add 0.10.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/libssh/Manifest                           |  1 +
 .../{libssh-9999.ebuild => libssh-0.10.2.ebuild}   | 28 ++++++++++++++--------
 net-libs/libssh/libssh-9999.ebuild                 | 28 ++++++++++++++--------
 3 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 4a35ffc7b747..e75dd2adba4e 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,2 +1,3 @@
 DIST libssh-0.10.1.tar.xz 553808 BLAKE2B 1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7 SHA512 d56b2809527d4f3c1d88881b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e
+DIST libssh-0.10.2.tar.xz 554240 BLAKE2B 5732ed9709735ced62c6a1c0fc32f4c35d26bf26fd8a086ce145f7f6c679468c146a1c1a8f85035dc73971f60bd59b0a784e5fe0afc2575de947b386a4cef804 SHA512 8855ebb9ea97e6ad03dec800e0885381c5397a04f5578f0b79b82e49458766f7b6c394713c4fbdc8ff6bb8d3b4c3b8b4f7b797f39ddbc95caf205ee6d89d3278
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1

diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-0.10.2.ebuild
similarity index 84%
copy from net-libs/libssh/libssh-9999.ebuild
copy to net-libs/libssh/libssh-0.10.2.ebuild
index 25b41a81f804..c8592e03bb83 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-0.10.2.ebuild
@@ -45,10 +45,6 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 DOCS=( AUTHORS CHANGELOG README )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch
-)
-
 src_prepare() {
 	cmake_src_prepare
 
@@ -59,14 +55,26 @@ src_prepare() {
 		-i ConfigureChecks.cmake || die
 
 	if use test; then
-		# keyfile torture test is currently broken
-		sed -e "/torture_keyfiles/d" \
-			-i tests/unittests/CMakeLists.txt || die
+		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)
+		# Disable tests that take too long (bug #677006)
 		if use sparc; then
-			sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
-				-i tests/unittests/CMakeLists.txt || die
+			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

diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 25b41a81f804..c8592e03bb83 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -45,10 +45,6 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 DOCS=( AUTHORS CHANGELOG README )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch
-)
-
 src_prepare() {
 	cmake_src_prepare
 
@@ -59,14 +55,26 @@ src_prepare() {
 		-i ConfigureChecks.cmake || die
 
 	if use test; then
-		# keyfile torture test is currently broken
-		sed -e "/torture_keyfiles/d" \
-			-i tests/unittests/CMakeLists.txt || die
+		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)
+		# Disable tests that take too long (bug #677006)
 		if use sparc; then
-			sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
-				-i tests/unittests/CMakeLists.txt || die
+			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