1 |
commit: 21a59db6d2b6d68098c822ac04305b07db980a2e |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 4 05:15:01 2019 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 4 05:23:33 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a59db6 |
7 |
|
8 |
net-libs/libssh2: Fix libdir in Libssh2ConfigVersion.cmake |
9 |
|
10 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
11 |
Bug: https://bugs.gentoo.org/693460 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
net-libs/libssh2/files/libssh2-1.9.0-libdir.patch | 17 +++++++ |
15 |
net-libs/libssh2/libssh2-1.9.0-r1.ebuild | 58 +++++++++++++++++++++++ |
16 |
2 files changed, 75 insertions(+) |
17 |
|
18 |
diff --git a/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch b/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..e04acb0904b |
21 |
--- /dev/null |
22 |
+++ b/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch |
23 |
@@ -0,0 +1,17 @@ |
24 |
+--- a/src/CMakeLists.txt |
25 |
++++ b/src/CMakeLists.txt |
26 |
+@@ -392,7 +392,7 @@ |
27 |
+ ## During package installation, install Libssh2Config.cmake |
28 |
+ install(EXPORT Libssh2Config |
29 |
+ NAMESPACE Libssh2:: |
30 |
+- DESTINATION lib/cmake/libssh2) |
31 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2) |
32 |
+ |
33 |
+ ## During build, register directly from build tree |
34 |
+ # create Libssh2Config.cmake |
35 |
+@@ -424,4 +424,4 @@ |
36 |
+ COMPATIBILITY SameMajorVersion) |
37 |
+ install( |
38 |
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/Libssh2ConfigVersion.cmake |
39 |
+- DESTINATION lib/cmake/libssh2) |
40 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2) |
41 |
|
42 |
diff --git a/net-libs/libssh2/libssh2-1.9.0-r1.ebuild b/net-libs/libssh2/libssh2-1.9.0-r1.ebuild |
43 |
new file mode 100644 |
44 |
index 00000000000..92f1a88bf9c |
45 |
--- /dev/null |
46 |
+++ b/net-libs/libssh2/libssh2-1.9.0-r1.ebuild |
47 |
@@ -0,0 +1,58 @@ |
48 |
+# Copyright 1999-2019 Gentoo Authors |
49 |
+# Distributed under the terms of the GNU General Public License v2 |
50 |
+ |
51 |
+EAPI=7 |
52 |
+inherit cmake-multilib |
53 |
+ |
54 |
+DESCRIPTION="Library implementing the SSH2 protocol" |
55 |
+HOMEPAGE="https://www.libssh2.org" |
56 |
+SRC_URI="https://www.${PN}.org/download/${P}.tar.gz" |
57 |
+ |
58 |
+LICENSE="BSD" |
59 |
+SLOT="0" |
60 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" |
61 |
+IUSE="gcrypt libressl mbedtls zlib" |
62 |
+REQUIRED_USE="?? ( gcrypt mbedtls )" |
63 |
+RESTRICT="test" |
64 |
+ |
65 |
+RDEPEND=" |
66 |
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) |
67 |
+ !gcrypt? ( |
68 |
+ mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) |
69 |
+ !mbedtls? ( |
70 |
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) |
71 |
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
72 |
+ ) |
73 |
+ ) |
74 |
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
75 |
+" |
76 |
+DEPEND=" |
77 |
+ ${RDEPEND} |
78 |
+" |
79 |
+ |
80 |
+PATCHES=( |
81 |
+ "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch |
82 |
+ "${FILESDIR}"/${PN}-1.9.0-libdir.patch |
83 |
+ "${FILESDIR}"/${PN}-1.9.0-missing.patch |
84 |
+) |
85 |
+ |
86 |
+multilib_src_configure() { |
87 |
+ local crypto_backend=OpenSSL |
88 |
+ if use gcrypt; then |
89 |
+ crypto_backend=Libgcrypt |
90 |
+ elif use mbedtls; then |
91 |
+ crypto_backend=mbedTLS |
92 |
+ fi |
93 |
+ |
94 |
+ local mycmakeargs=( |
95 |
+ -DBUILD_SHARED_LIBS=ON |
96 |
+ -DCRYPTO_BACKEND=${crypto_backend} |
97 |
+ -DENABLE_ZLIB_COMPRESSION=$(usex zlib) |
98 |
+ ) |
99 |
+ cmake-utils_src_configure |
100 |
+} |
101 |
+ |
102 |
+multilib_src_install_all() { |
103 |
+ einstalldocs |
104 |
+ find "${ED}" -name '*.la' -delete || die |
105 |
+} |