commit: 06f2d87af6e41e33a345f1bf494444173f682ff8 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Sep 30 11:51:03 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Sep 30 13:33:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f2d87a
net-libs/libssh: drop 0.9.6 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-libs/libssh/Manifest | 1 - net-libs/libssh/files/libssh-0.8.0-tests.patch | 11 --- net-libs/libssh/libssh-0.9.6.ebuild | 124 ------------------------- 3 files changed, 136 deletions(-) diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index 5ba4cc28088f..a4166a8ad16b 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,2 +1 @@ DIST libssh-0.10.4.tar.xz 554920 BLAKE2B 9349a688bdbd7c0d3bc93d6d0d6d55122ae9f918b922baeae8a7c6d4ae3ec340e6607afdd8a47055176f31531aefa94b6cc2bda25d59625fe1a7f83823dd75f9 SHA512 01ee52d480201d9886c15e81137c185334b404d1c8e8b743ddf58e95fe8619c8c013616a49807bd1111fde72fa177cd35f3c22b66cbf5d720b5abfacdf7601ed -DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1 diff --git a/net-libs/libssh/files/libssh-0.8.0-tests.patch b/net-libs/libssh/files/libssh-0.8.0-tests.patch deleted file mode 100644 index 7ce84f89983b..000000000000 --- a/net-libs/libssh/files/libssh-0.8.0-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libssh-0.8.0/tests/unittests/torture_misc.c -+++ libssh-0.8.0/tests/unittests/torture_misc.c -@@ -361,7 +361,7 @@ - #ifdef _WIN32 - cmocka_unit_test(torture_path_expand_tilde_win), - #else -- cmocka_unit_test(torture_path_expand_tilde_unix), -+ //cmocka_unit_test(torture_path_expand_tilde_unix), - #endif - cmocka_unit_test_setup_teardown(torture_path_expand_escape, setup, teardown), - cmocka_unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown), diff --git a/net-libs/libssh/libssh-0.9.6.ebuild b/net-libs/libssh/libssh-0.9.6.ebuild deleted file mode 100644 index e90e4d2cfed3..000000000000 --- a/net-libs/libssh/libssh-0.9.6.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~ia64 ~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 )" - -BDEPEND=" - doc? ( app-doc/doxygen[dot] ) -" -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 ) ) -" - -DOCS=( AUTHORS README ChangeLog ) - -PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) - -RESTRICT+=" !test? ( test )" - -src_prepare() { - cmake_src_prepare - - # just install the examples, do not compile them - cmake_comment_add_subdirectory examples - - # keyfile torture test is currently broken - sed -e "/torture_keyfiles/d" \ - -i tests/unittests/CMakeLists.txt || die - - # 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 - fi - - sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ - -i ConfigureChecks.cmake || die - - if use test && use elibc_musl; then - sed -e "/SOLARIS/d" \ - -i tests/CMakeLists.txt || die - 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)" - -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 && 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 -}
