| 1 |
commit: 9f4411cbbd77fa4f4b6b3165fe51568e8a1d8df2 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 21 16:13:19 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 21 16:13:19 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4411cb |
| 7 |
|
| 8 |
net-libs/libssh: Synced live ebuild. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 11 |
|
| 12 |
net-libs/libssh/libssh-9999.ebuild | 30 +++++++++++------------------- |
| 13 |
1 file changed, 11 insertions(+), 19 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild |
| 16 |
index 641c1853e98..d187c20721b 100644 |
| 17 |
--- a/net-libs/libssh/libssh-9999.ebuild |
| 18 |
+++ b/net-libs/libssh/libssh-9999.ebuild |
| 19 |
@@ -23,6 +23,8 @@ SLOT="0/4" # subslot = soname major version |
| 20 |
IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib" |
| 21 |
# Maintainer: check IUSE-defaults at DefineOptions.cmake |
| 22 |
|
| 23 |
+REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )" |
| 24 |
+ |
| 25 |
RDEPEND=" |
| 26 |
!gcrypt? ( |
| 27 |
!mbedtls? ( |
| 28 |
@@ -36,27 +38,21 @@ RDEPEND=" |
| 29 |
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
| 30 |
" |
| 31 |
DEPEND="${RDEPEND} |
| 32 |
- doc? ( app-doc/doxygen ) |
| 33 |
+ doc? ( app-doc/doxygen[dot] ) |
| 34 |
test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] ) |
| 35 |
" |
| 36 |
|
| 37 |
-REQUIRED_USE="?? ( gcrypt mbedtls )" |
| 38 |
- |
| 39 |
DOCS=( AUTHORS README ChangeLog ) |
| 40 |
|
| 41 |
S="${WORKDIR}/${MY_P}" |
| 42 |
|
| 43 |
-PATCHES=( |
| 44 |
- "${FILESDIR}/${PN}-0.8.0-tests.patch" |
| 45 |
-) |
| 46 |
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) |
| 47 |
|
| 48 |
src_prepare() { |
| 49 |
cmake-utils_src_prepare |
| 50 |
|
| 51 |
- # just install the examples do not compile them |
| 52 |
- sed -i \ |
| 53 |
- -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \ |
| 54 |
- CMakeLists.txt || die |
| 55 |
+ # just install the examples, do not compile them |
| 56 |
+ cmake_comment_add_subdirectory examples |
| 57 |
|
| 58 |
# keyfile torture test is currently broken |
| 59 |
sed -i \ |
| 60 |
@@ -78,27 +74,22 @@ multilib_src_configure() { |
| 61 |
-DWITH_SFTP="$(usex sftp)" |
| 62 |
-DWITH_STACK_PROTECTOR=OFF |
| 63 |
-DWITH_STATIC_LIB="$(usex static-libs)" |
| 64 |
- -DWITH_STATIC_LIB="$(usex test)" |
| 65 |
-DWITH_ZLIB="$(usex zlib)" |
| 66 |
) |
| 67 |
|
| 68 |
+ multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) |
| 69 |
+ |
| 70 |
cmake-utils_src_configure |
| 71 |
} |
| 72 |
|
| 73 |
multilib_src_compile() { |
| 74 |
cmake-utils_src_compile |
| 75 |
- multilib_is_native_abi && use doc && cmake-utils_src_compile doc |
| 76 |
+ multilib_is_native_abi && use doc && cmake-utils_src_compile docs |
| 77 |
} |
| 78 |
|
| 79 |
multilib_src_install() { |
| 80 |
cmake-utils_src_install |
| 81 |
- |
| 82 |
- if multilib_is_native_abi && use doc ; then |
| 83 |
- docinto html |
| 84 |
- dodoc -r doc/html/. |
| 85 |
- fi |
| 86 |
- |
| 87 |
- use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh.a |
| 88 |
+ use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) |
| 89 |
|
| 90 |
# compatibility symlink until all consumers have been updated |
| 91 |
# to no longer use libssh_threads.so |
| 92 |
@@ -106,6 +97,7 @@ multilib_src_install() { |
| 93 |
} |
| 94 |
|
| 95 |
multilib_src_install_all() { |
| 96 |
+ use mbedtls && DOCS+=( README.mbedtls ) |
| 97 |
einstalldocs |
| 98 |
|
| 99 |
if use examples; then |
Archives