| 1 |
commit: 6dc73921a467924e32b4c3c65cf2b99c972b0bea |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 26 20:44:55 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 26 20:52:59 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc73921 |
| 7 |
|
| 8 |
net-libs/libssh: update EAPI 7 -> 8, update DOCS |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
net-libs/libssh/libssh-9999.ebuild | 40 ++++++++++++++++++-------------------- |
| 13 |
1 file changed, 19 insertions(+), 21 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild |
| 16 |
index d49e399b64d4..9b897cf8885e 100644 |
| 17 |
--- a/net-libs/libssh/libssh-9999.ebuild |
| 18 |
+++ b/net-libs/libssh/libssh-9999.ebuild |
| 19 |
@@ -1,14 +1,14 @@ |
| 20 |
# Copyright 1999-2022 Gentoo Authors |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
-EAPI=7 |
| 24 |
+EAPI=8 |
| 25 |
|
| 26 |
inherit cmake-multilib |
| 27 |
|
| 28 |
DESCRIPTION="Access a working SSH implementation by means of a library" |
| 29 |
HOMEPAGE="https://www.libssh.org/" |
| 30 |
|
| 31 |
-if [[ "${PV}" == *9999 ]] ; then |
| 32 |
+if [[ ${PV} == *9999* ]] ; then |
| 33 |
inherit git-r3 |
| 34 |
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" |
| 35 |
else |
| 36 |
@@ -22,10 +22,8 @@ IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs tes |
| 37 |
# Maintainer: check IUSE-defaults at DefineOptions.cmake |
| 38 |
|
| 39 |
REQUIRED_USE="?? ( gcrypt mbedtls )" |
| 40 |
+RESTRICT="!test? ( test )" |
| 41 |
|
| 42 |
-BDEPEND=" |
| 43 |
- doc? ( app-doc/doxygen[dot] ) |
| 44 |
-" |
| 45 |
RDEPEND=" |
| 46 |
!gcrypt? ( |
| 47 |
!mbedtls? ( |
| 48 |
@@ -40,15 +38,15 @@ RDEPEND=" |
| 49 |
DEPEND="${RDEPEND} |
| 50 |
test? ( |
| 51 |
>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] |
| 52 |
- elibc_musl? ( sys-libs/argp-standalone ) ) |
| 53 |
+ elibc_musl? ( sys-libs/argp-standalone ) |
| 54 |
+ ) |
| 55 |
" |
| 56 |
+BDEPEND="doc? ( app-doc/doxygen[dot] )" |
| 57 |
|
| 58 |
-DOCS=( AUTHORS README ChangeLog ) |
| 59 |
+DOCS=( AUTHORS CHANGELOG README ) |
| 60 |
|
| 61 |
PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) |
| 62 |
|
| 63 |
-RESTRICT+=" !test? ( test )" |
| 64 |
- |
| 65 |
src_prepare() { |
| 66 |
cmake_src_prepare |
| 67 |
|
| 68 |
@@ -79,17 +77,17 @@ multilib_src_configure() { |
| 69 |
-DWITH_NACL=OFF |
| 70 |
-DWITH_STACK_PROTECTOR=OFF |
| 71 |
-DWITH_STACK_PROTECTOR_STRONG=OFF |
| 72 |
- -DWITH_DEBUG_CALLTRACE="$(usex debug)" |
| 73 |
- -DWITH_DEBUG_CRYPTO="$(usex debug)" |
| 74 |
- -DWITH_GCRYPT="$(usex gcrypt)" |
| 75 |
- -DWITH_GSSAPI="$(usex gssapi)" |
| 76 |
- -DWITH_MBEDTLS="$(usex mbedtls)" |
| 77 |
- -DWITH_PCAP="$(usex pcap)" |
| 78 |
- -DWITH_SERVER="$(usex server)" |
| 79 |
- -DWITH_SFTP="$(usex sftp)" |
| 80 |
- -DBUILD_STATIC_LIB="$(usex static-libs)" |
| 81 |
- -DUNIT_TESTING="$(usex test)" |
| 82 |
- -DWITH_ZLIB="$(usex zlib)" |
| 83 |
+ -DWITH_DEBUG_CALLTRACE=$(usex debug) |
| 84 |
+ -DWITH_DEBUG_CRYPTO=$(usex debug) |
| 85 |
+ -DWITH_GCRYPT=$(usex gcrypt) |
| 86 |
+ -DWITH_GSSAPI=$(usex gssapi) |
| 87 |
+ -DWITH_MBEDTLS=$(usex mbedtls) |
| 88 |
+ -DWITH_PCAP=$(usex pcap) |
| 89 |
+ -DWITH_SERVER=$(usex server) |
| 90 |
+ -DWITH_SFTP=$(usex sftp) |
| 91 |
+ -DBUILD_STATIC_LIB=$(usex static-libs) |
| 92 |
+ -DUNIT_TESTING=$(usex test) |
| 93 |
+ -DWITH_ZLIB=$(usex zlib) |
| 94 |
) |
| 95 |
|
| 96 |
multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) |
| 97 |
@@ -104,7 +102,7 @@ multilib_src_compile() { |
| 98 |
|
| 99 |
multilib_src_install() { |
| 100 |
cmake_src_install |
| 101 |
- multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) |
| 102 |
+ multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) |
| 103 |
|
| 104 |
use static-libs && dolib.a src/libssh.a |
Archives