Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh/
Date: Wed, 14 Sep 2022 07:35:56
Message-Id: 1663140943.1e81a73223484601852a1a10d34033172a61ee68.asturm@gentoo
1 commit: 1e81a73223484601852a1a10d34033172a61ee68
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 14 07:35:00 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 14 07:35:43 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e81a732
7
8 net-libs/libssh: drop 0.10.2, 0.10.3
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 net-libs/libssh/Manifest | 2 -
13 net-libs/libssh/libssh-0.10.2.ebuild | 135 -----------------------------------
14 net-libs/libssh/libssh-0.10.3.ebuild | 135 -----------------------------------
15 3 files changed, 272 deletions(-)
16
17 diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
18 index cdfc84157310..5ba4cc28088f 100644
19 --- a/net-libs/libssh/Manifest
20 +++ b/net-libs/libssh/Manifest
21 @@ -1,4 +1,2 @@
22 -DIST libssh-0.10.2.tar.xz 554240 BLAKE2B 5732ed9709735ced62c6a1c0fc32f4c35d26bf26fd8a086ce145f7f6c679468c146a1c1a8f85035dc73971f60bd59b0a784e5fe0afc2575de947b386a4cef804 SHA512 8855ebb9ea97e6ad03dec800e0885381c5397a04f5578f0b79b82e49458766f7b6c394713c4fbdc8ff6bb8d3b4c3b8b4f7b797f39ddbc95caf205ee6d89d3278
23 -DIST libssh-0.10.3.tar.xz 554928 BLAKE2B 5bb1feecf77ec038b89cec1058d0c401d2f3ecca6975ee098dc9eb4d3b981b807d54291f915f8f7e236dc06ac864289f99d92ea1d6983afda1044a690c8207e6 SHA512 dfc992a4d16bf3de6ed01b1d0d73e061f61acf6785b2c81a722154219a286fc2b8952dec0e842bcbc14ce2734078161a820d44091f01851c8538f8f381655253
24 DIST libssh-0.10.4.tar.xz 554920 BLAKE2B 9349a688bdbd7c0d3bc93d6d0d6d55122ae9f918b922baeae8a7c6d4ae3ec340e6607afdd8a47055176f31531aefa94b6cc2bda25d59625fe1a7f83823dd75f9 SHA512 01ee52d480201d9886c15e81137c185334b404d1c8e8b743ddf58e95fe8619c8c013616a49807bd1111fde72fa177cd35f3c22b66cbf5d720b5abfacdf7601ed
25 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1
26
27 diff --git a/net-libs/libssh/libssh-0.10.2.ebuild b/net-libs/libssh/libssh-0.10.2.ebuild
28 deleted file mode 100644
29 index c8592e03bb83..000000000000
30 --- a/net-libs/libssh/libssh-0.10.2.ebuild
31 +++ /dev/null
32 @@ -1,135 +0,0 @@
33 -# Copyright 1999-2022 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=8
37 -
38 -inherit cmake-multilib
39 -
40 -DESCRIPTION="Access a working SSH implementation by means of a library"
41 -HOMEPAGE="https://www.libssh.org/"
42 -
43 -if [[ ${PV} == *9999* ]] ; then
44 - inherit git-r3
45 - EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
46 -else
47 - SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
48 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
49 -fi
50 -
51 -LICENSE="LGPL-2.1"
52 -SLOT="0/4" # subslot = soname major version
53 -IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib"
54 -# Maintainer: check IUSE-defaults at DefineOptions.cmake
55 -
56 -REQUIRED_USE="?? ( gcrypt mbedtls )"
57 -RESTRICT="!test? ( test )"
58 -
59 -RDEPEND="
60 - !gcrypt? (
61 - !mbedtls? (
62 - >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
63 - )
64 - )
65 - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
66 - gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
67 - mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
68 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
69 -"
70 -DEPEND="${RDEPEND}
71 - test? (
72 - >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
73 - elibc_musl? ( sys-libs/argp-standalone )
74 - )
75 -"
76 -BDEPEND="doc? ( app-doc/doxygen[dot] )"
77 -
78 -DOCS=( AUTHORS CHANGELOG README )
79 -
80 -src_prepare() {
81 - cmake_src_prepare
82 -
83 - # just install the examples, do not compile them
84 - cmake_comment_add_subdirectory examples
85 -
86 - sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
87 - -i ConfigureChecks.cmake || die
88 -
89 - if use test; then
90 - local skip_tests=(
91 - # keyfile torture test is currently broken
92 - -e "/torture_keyfiles/d"
93 -
94 - # Tries to expand ~ which fails w/ portage homedir
95 - # (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir)
96 - -e "/torture_misc/d"
97 - -e "/torture_config/d"
98 - )
99 -
100 - # Disable tests that take too long (bug #677006)
101 - if use sparc; then
102 - skip_tests+=(
103 - -e "/torture_threads_pki_rsa/d"
104 - -e "/torture_pki_dsa/d"
105 - )
106 - fi
107 -
108 - if (( ${#skip_tests[@]} )) ; then
109 - sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die
110 - fi
111 -
112 - if use elibc_musl; then
113 - sed -e "/SOLARIS/d" \
114 - -i tests/CMakeLists.txt || die
115 - fi
116 - fi
117 -}
118 -
119 -multilib_src_configure() {
120 - local mycmakeargs=(
121 - -DWITH_NACL=OFF
122 - -DWITH_STACK_PROTECTOR=OFF
123 - -DWITH_STACK_PROTECTOR_STRONG=OFF
124 - -DWITH_DEBUG_CALLTRACE=$(usex debug)
125 - -DWITH_DEBUG_CRYPTO=$(usex debug)
126 - -DWITH_GCRYPT=$(usex gcrypt)
127 - -DWITH_GSSAPI=$(usex gssapi)
128 - -DWITH_MBEDTLS=$(usex mbedtls)
129 - -DWITH_PCAP=$(usex pcap)
130 - -DWITH_SERVER=$(usex server)
131 - -DWITH_SFTP=$(usex sftp)
132 - -DBUILD_STATIC_LIB=$(usex static-libs)
133 - # TODO: try enabling {CLIENT,SERVER}_TESTING
134 - -DUNIT_TESTING=$(usex test)
135 - -DWITH_ZLIB=$(usex zlib)
136 - )
137 -
138 - multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
139 -
140 - cmake_src_configure
141 -}
142 -
143 -multilib_src_compile() {
144 - cmake_src_compile
145 - multilib_is_native_abi && use doc && cmake_src_compile docs
146 -}
147 -
148 -multilib_src_install() {
149 - cmake_src_install
150 - multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
151 -
152 - use static-libs && dolib.a src/libssh.a
153 -
154 - # compatibility symlink until all consumers have been updated
155 - # to no longer use libssh_threads.so
156 - dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
157 -}
158 -
159 -multilib_src_install_all() {
160 - use mbedtls && DOCS+=( README.mbedtls )
161 - einstalldocs
162 -
163 - if use examples; then
164 - docinto examples
165 - dodoc examples/*.{c,h,cpp}
166 - fi
167 -}
168
169 diff --git a/net-libs/libssh/libssh-0.10.3.ebuild b/net-libs/libssh/libssh-0.10.3.ebuild
170 deleted file mode 100644
171 index c8592e03bb83..000000000000
172 --- a/net-libs/libssh/libssh-0.10.3.ebuild
173 +++ /dev/null
174 @@ -1,135 +0,0 @@
175 -# Copyright 1999-2022 Gentoo Authors
176 -# Distributed under the terms of the GNU General Public License v2
177 -
178 -EAPI=8
179 -
180 -inherit cmake-multilib
181 -
182 -DESCRIPTION="Access a working SSH implementation by means of a library"
183 -HOMEPAGE="https://www.libssh.org/"
184 -
185 -if [[ ${PV} == *9999* ]] ; then
186 - inherit git-r3
187 - EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
188 -else
189 - SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
190 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
191 -fi
192 -
193 -LICENSE="LGPL-2.1"
194 -SLOT="0/4" # subslot = soname major version
195 -IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib"
196 -# Maintainer: check IUSE-defaults at DefineOptions.cmake
197 -
198 -REQUIRED_USE="?? ( gcrypt mbedtls )"
199 -RESTRICT="!test? ( test )"
200 -
201 -RDEPEND="
202 - !gcrypt? (
203 - !mbedtls? (
204 - >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
205 - )
206 - )
207 - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
208 - gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
209 - mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
210 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
211 -"
212 -DEPEND="${RDEPEND}
213 - test? (
214 - >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
215 - elibc_musl? ( sys-libs/argp-standalone )
216 - )
217 -"
218 -BDEPEND="doc? ( app-doc/doxygen[dot] )"
219 -
220 -DOCS=( AUTHORS CHANGELOG README )
221 -
222 -src_prepare() {
223 - cmake_src_prepare
224 -
225 - # just install the examples, do not compile them
226 - cmake_comment_add_subdirectory examples
227 -
228 - sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
229 - -i ConfigureChecks.cmake || die
230 -
231 - if use test; then
232 - local skip_tests=(
233 - # keyfile torture test is currently broken
234 - -e "/torture_keyfiles/d"
235 -
236 - # Tries to expand ~ which fails w/ portage homedir
237 - # (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir)
238 - -e "/torture_misc/d"
239 - -e "/torture_config/d"
240 - )
241 -
242 - # Disable tests that take too long (bug #677006)
243 - if use sparc; then
244 - skip_tests+=(
245 - -e "/torture_threads_pki_rsa/d"
246 - -e "/torture_pki_dsa/d"
247 - )
248 - fi
249 -
250 - if (( ${#skip_tests[@]} )) ; then
251 - sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die
252 - fi
253 -
254 - if use elibc_musl; then
255 - sed -e "/SOLARIS/d" \
256 - -i tests/CMakeLists.txt || die
257 - fi
258 - fi
259 -}
260 -
261 -multilib_src_configure() {
262 - local mycmakeargs=(
263 - -DWITH_NACL=OFF
264 - -DWITH_STACK_PROTECTOR=OFF
265 - -DWITH_STACK_PROTECTOR_STRONG=OFF
266 - -DWITH_DEBUG_CALLTRACE=$(usex debug)
267 - -DWITH_DEBUG_CRYPTO=$(usex debug)
268 - -DWITH_GCRYPT=$(usex gcrypt)
269 - -DWITH_GSSAPI=$(usex gssapi)
270 - -DWITH_MBEDTLS=$(usex mbedtls)
271 - -DWITH_PCAP=$(usex pcap)
272 - -DWITH_SERVER=$(usex server)
273 - -DWITH_SFTP=$(usex sftp)
274 - -DBUILD_STATIC_LIB=$(usex static-libs)
275 - # TODO: try enabling {CLIENT,SERVER}_TESTING
276 - -DUNIT_TESTING=$(usex test)
277 - -DWITH_ZLIB=$(usex zlib)
278 - )
279 -
280 - multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
281 -
282 - cmake_src_configure
283 -}
284 -
285 -multilib_src_compile() {
286 - cmake_src_compile
287 - multilib_is_native_abi && use doc && cmake_src_compile docs
288 -}
289 -
290 -multilib_src_install() {
291 - cmake_src_install
292 - multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
293 -
294 - use static-libs && dolib.a src/libssh.a
295 -
296 - # compatibility symlink until all consumers have been updated
297 - # to no longer use libssh_threads.so
298 - dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
299 -}
300 -
301 -multilib_src_install_all() {
302 - use mbedtls && DOCS+=( README.mbedtls )
303 - einstalldocs
304 -
305 - if use examples; then
306 - docinto examples
307 - dodoc examples/*.{c,h,cpp}
308 - fi
309 -}