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: Tue, 16 Oct 2018 15:47:41
Message-Id: 1539704842.f665cadcd6b6650507236e5c58f8dc06abf1d157.asturm@gentoo
1 commit: f665cadcd6b6650507236e5c58f8dc06abf1d157
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 16 15:47:22 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 16 15:47:22 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f665cadc
7
8 net-libs/libssh: Drop old
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 net-libs/libssh/Manifest | 2 -
14 net-libs/libssh/libssh-0.8.2.ebuild | 107 -------------------------------
15 net-libs/libssh/libssh-0.8.3-r1.ebuild | 111 ---------------------------------
16 net-libs/libssh/libssh-0.8.3.ebuild | 108 --------------------------------
17 4 files changed, 328 deletions(-)
18
19 diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
20 index 8d0425735f9..d129d602132 100644
21 --- a/net-libs/libssh/Manifest
22 +++ b/net-libs/libssh/Manifest
23 @@ -1,5 +1,3 @@
24 DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f8311c30364bbf06d4f01121a58f5b560e0a1d9071655ce9b310fa3f3f801e11e880ca3eacde66efa0f49dc51b2b SHA512 94b8183e5c83e339303c1a160c92ccff6159471ac7d189ab66cf6d606d2e803fd616519f079aef1577c947d3a14e315332b05ea08e44d0ab550edbcb768dbea7
25 DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
26 -DIST libssh-0.8.2.tar.xz 408412 BLAKE2B bbd531ed511baa84d40c2e156cc63fca09345196e24e485930d8f42fed451529ea6ec2ce6f50276dfa56d5523062bbc45774891ad47ce7c748e8b95bc28b9f8c SHA512 ef9877d2a35f1871139c12452c917a3888172ea29f71d880e824de182695e5a8786bb39ca2f4874a160e156648d52065a8b2e7c040220badf65eee35dcfddeb9
27 -DIST libssh-0.8.3.tar.xz 422244 BLAKE2B b24e4eed3ad1cd336b1864c68e366788ea62d0df2d527afaabf8d57c2f3e7b490a999bee8e4bfbfac512a77ee2a32cb1a95dbcdbcef2bd8aad5addbed1aeb01f SHA512 09e7ccbb2c584a9e51366a43f08f80cc5775c649886736629ab10f3520432d107c93e94a54c7d7e49a68f8f3b5d268bf1985acbe08d29dbffbfc0c53a4937ea5
28 DIST libssh-0.8.4.tar.xz 425848 BLAKE2B 8ca913e4c9e2ffa231bb437ac6a4de695bbdf8720a7619f3fc310a3d724cb7e85bcf81d31761c3fe4e3c29010b67d3fc81cf391d5c2f7e051cb8cc2400763248 SHA512 73d685bab2e88ff6b03c95cc13f1bd341bce4c527353c7e4870865d236cfbe23dfd2d198a1ec1531aed1afd700ce8e5b738ec68ca9152a4b6ae63dd6cbbf0d51
29
30 diff --git a/net-libs/libssh/libssh-0.8.2.ebuild b/net-libs/libssh/libssh-0.8.2.ebuild
31 deleted file mode 100644
32 index d187c20721b..00000000000
33 --- a/net-libs/libssh/libssh-0.8.2.ebuild
34 +++ /dev/null
35 @@ -1,107 +0,0 @@
36 -# Copyright 1999-2018 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -MY_P="${PN}-${PV/_rc/rc}"
42 -inherit cmake-multilib
43 -
44 -DESCRIPTION="Access a working SSH implementation by means of a library"
45 -HOMEPAGE="https://www.libssh.org/"
46 -
47 -if [[ "${PV}" == *9999 ]] ; then
48 - inherit git-r3
49 - EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
50 -else
51 - inherit eapi7-ver
52 - SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
53 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
54 -fi
55 -
56 -LICENSE="LGPL-2.1"
57 -SLOT="0/4" # subslot = soname major version
58 -IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
59 -# Maintainer: check IUSE-defaults at DefineOptions.cmake
60 -
61 -REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
62 -
63 -RDEPEND="
64 - !gcrypt? (
65 - !mbedtls? (
66 - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
67 - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
68 - )
69 - )
70 - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
71 - gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
72 - mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
73 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
74 -"
75 -DEPEND="${RDEPEND}
76 - doc? ( app-doc/doxygen[dot] )
77 - test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
78 -"
79 -
80 -DOCS=( AUTHORS README ChangeLog )
81 -
82 -S="${WORKDIR}/${MY_P}"
83 -
84 -PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
85 -
86 -src_prepare() {
87 - cmake-utils_src_prepare
88 -
89 - # just install the examples, do not compile them
90 - cmake_comment_add_subdirectory examples
91 -
92 - # keyfile torture test is currently broken
93 - sed -i \
94 - -e '/torture_keyfiles/d' \
95 - tests/unittests/CMakeLists.txt || die
96 -}
97 -
98 -multilib_src_configure() {
99 - local mycmakeargs=(
100 - -DUNIT_TESTING="$(usex test)"
101 - -DWITH_DEBUG_CALLTRACE="$(usex debug)"
102 - -DWITH_DEBUG_CRYPTO="$(usex debug)"
103 - -DWITH_GCRYPT="$(usex gcrypt)"
104 - -DWITH_GSSAPI="$(usex gssapi)"
105 - -DWITH_MBEDTLS="$(usex mbedtls)"
106 - -DWITH_NACL=no
107 - -DWITH_PCAP="$(usex pcap)"
108 - -DWITH_SERVER="$(usex server)"
109 - -DWITH_SFTP="$(usex sftp)"
110 - -DWITH_STACK_PROTECTOR=OFF
111 - -DWITH_STATIC_LIB="$(usex static-libs)"
112 - -DWITH_ZLIB="$(usex zlib)"
113 - )
114 -
115 - multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
116 -
117 - cmake-utils_src_configure
118 -}
119 -
120 -multilib_src_compile() {
121 - cmake-utils_src_compile
122 - multilib_is_native_abi && use doc && cmake-utils_src_compile docs
123 -}
124 -
125 -multilib_src_install() {
126 - cmake-utils_src_install
127 - use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
128 -
129 - # compatibility symlink until all consumers have been updated
130 - # to no longer use libssh_threads.so
131 - dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
132 -}
133 -
134 -multilib_src_install_all() {
135 - use mbedtls && DOCS+=( README.mbedtls )
136 - einstalldocs
137 -
138 - if use examples; then
139 - docinto examples
140 - dodoc examples/*.{c,h,cpp}
141 - fi
142 -}
143
144 diff --git a/net-libs/libssh/libssh-0.8.3-r1.ebuild b/net-libs/libssh/libssh-0.8.3-r1.ebuild
145 deleted file mode 100644
146 index 7b660604f3a..00000000000
147 --- a/net-libs/libssh/libssh-0.8.3-r1.ebuild
148 +++ /dev/null
149 @@ -1,111 +0,0 @@
150 -# Copyright 1999-2018 Gentoo Authors
151 -# Distributed under the terms of the GNU General Public License v2
152 -
153 -EAPI=6
154 -
155 -MY_P="${PN}-${PV/_rc/rc}"
156 -inherit cmake-multilib
157 -
158 -DESCRIPTION="Access a working SSH implementation by means of a library"
159 -HOMEPAGE="https://www.libssh.org/"
160 -
161 -if [[ "${PV}" == *9999 ]] ; then
162 - inherit git-r3
163 - EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
164 -else
165 - inherit eapi7-ver
166 - SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
167 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
168 -fi
169 -
170 -LICENSE="LGPL-2.1"
171 -SLOT="0/4" # subslot = soname major version
172 -IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
173 -# Maintainer: check IUSE-defaults at DefineOptions.cmake
174 -
175 -REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
176 -
177 -RDEPEND="
178 - !gcrypt? (
179 - !mbedtls? (
180 - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
181 - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
182 - )
183 - )
184 - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
185 - gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
186 - mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
187 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
188 -"
189 -DEPEND="${RDEPEND}
190 - doc? ( app-doc/doxygen[dot] )
191 - test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
192 -"
193 -
194 -DOCS=( AUTHORS README ChangeLog )
195 -
196 -S="${WORKDIR}/${MY_P}"
197 -
198 -PATCHES=(
199 - "${FILESDIR}/${PN}-0.8.0-tests.patch"
200 - "${FILESDIR}/${PN}-0.8.3-strict-overflow.patch"
201 -)
202 -
203 -src_prepare() {
204 - cmake-utils_src_prepare
205 -
206 - # just install the examples, do not compile them
207 - cmake_comment_add_subdirectory examples
208 -
209 - # keyfile torture test is currently broken
210 - sed -i \
211 - -e '/torture_keyfiles/d' \
212 - tests/unittests/CMakeLists.txt || die
213 -}
214 -
215 -multilib_src_configure() {
216 - local mycmakeargs=(
217 - -DUNIT_TESTING="$(usex test)"
218 - -DWITH_DEBUG_CALLTRACE="$(usex debug)"
219 - -DWITH_DEBUG_CRYPTO="$(usex debug)"
220 - -DWITH_GCRYPT="$(usex gcrypt)"
221 - -DWITH_GSSAPI="$(usex gssapi)"
222 - -DWITH_MBEDTLS="$(usex mbedtls)"
223 - -DWITH_NACL=no
224 - -DWITH_PCAP="$(usex pcap)"
225 - -DWITH_SERVER="$(usex server)"
226 - -DWITH_SFTP="$(usex sftp)"
227 - -DWITH_STACK_PROTECTOR=OFF
228 - -DWITH_STACK_PROTECTOR_STRONG=OFF
229 - -DWITH_STATIC_LIB="$(usex static-libs)"
230 - -DWITH_ZLIB="$(usex zlib)"
231 - )
232 -
233 - multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
234 -
235 - cmake-utils_src_configure
236 -}
237 -
238 -multilib_src_compile() {
239 - cmake-utils_src_compile
240 - multilib_is_native_abi && use doc && cmake-utils_src_compile docs
241 -}
242 -
243 -multilib_src_install() {
244 - cmake-utils_src_install
245 - use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
246 -
247 - # compatibility symlink until all consumers have been updated
248 - # to no longer use libssh_threads.so
249 - dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
250 -}
251 -
252 -multilib_src_install_all() {
253 - use mbedtls && DOCS+=( README.mbedtls )
254 - einstalldocs
255 -
256 - if use examples; then
257 - docinto examples
258 - dodoc examples/*.{c,h,cpp}
259 - fi
260 -}
261
262 diff --git a/net-libs/libssh/libssh-0.8.3.ebuild b/net-libs/libssh/libssh-0.8.3.ebuild
263 deleted file mode 100644
264 index 0c794b8a473..00000000000
265 --- a/net-libs/libssh/libssh-0.8.3.ebuild
266 +++ /dev/null
267 @@ -1,108 +0,0 @@
268 -# Copyright 1999-2018 Gentoo Authors
269 -# Distributed under the terms of the GNU General Public License v2
270 -
271 -EAPI=6
272 -
273 -MY_P="${PN}-${PV/_rc/rc}"
274 -inherit cmake-multilib
275 -
276 -DESCRIPTION="Access a working SSH implementation by means of a library"
277 -HOMEPAGE="https://www.libssh.org/"
278 -
279 -if [[ "${PV}" == *9999 ]] ; then
280 - inherit git-r3
281 - EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
282 -else
283 - inherit eapi7-ver
284 - SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
285 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
286 -fi
287 -
288 -LICENSE="LGPL-2.1"
289 -SLOT="0/4" # subslot = soname major version
290 -IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
291 -# Maintainer: check IUSE-defaults at DefineOptions.cmake
292 -
293 -REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
294 -
295 -RDEPEND="
296 - !gcrypt? (
297 - !mbedtls? (
298 - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
299 - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
300 - )
301 - )
302 - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
303 - gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
304 - mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
305 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
306 -"
307 -DEPEND="${RDEPEND}
308 - doc? ( app-doc/doxygen[dot] )
309 - test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
310 -"
311 -
312 -DOCS=( AUTHORS README ChangeLog )
313 -
314 -S="${WORKDIR}/${MY_P}"
315 -
316 -PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
317 -
318 -src_prepare() {
319 - cmake-utils_src_prepare
320 -
321 - # just install the examples, do not compile them
322 - cmake_comment_add_subdirectory examples
323 -
324 - # keyfile torture test is currently broken
325 - sed -i \
326 - -e '/torture_keyfiles/d' \
327 - tests/unittests/CMakeLists.txt || die
328 -}
329 -
330 -multilib_src_configure() {
331 - local mycmakeargs=(
332 - -DUNIT_TESTING="$(usex test)"
333 - -DWITH_DEBUG_CALLTRACE="$(usex debug)"
334 - -DWITH_DEBUG_CRYPTO="$(usex debug)"
335 - -DWITH_GCRYPT="$(usex gcrypt)"
336 - -DWITH_GSSAPI="$(usex gssapi)"
337 - -DWITH_MBEDTLS="$(usex mbedtls)"
338 - -DWITH_NACL=no
339 - -DWITH_PCAP="$(usex pcap)"
340 - -DWITH_SERVER="$(usex server)"
341 - -DWITH_SFTP="$(usex sftp)"
342 - -DWITH_STACK_PROTECTOR=OFF
343 - -DWITH_STACK_PROTECTOR_STRONG=OFF
344 - -DWITH_STATIC_LIB="$(usex static-libs)"
345 - -DWITH_ZLIB="$(usex zlib)"
346 - )
347 -
348 - multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
349 -
350 - cmake-utils_src_configure
351 -}
352 -
353 -multilib_src_compile() {
354 - cmake-utils_src_compile
355 - multilib_is_native_abi && use doc && cmake-utils_src_compile docs
356 -}
357 -
358 -multilib_src_install() {
359 - cmake-utils_src_install
360 - use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
361 -
362 - # compatibility symlink until all consumers have been updated
363 - # to no longer use libssh_threads.so
364 - dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
365 -}
366 -
367 -multilib_src_install_all() {
368 - use mbedtls && DOCS+=( README.mbedtls )
369 - einstalldocs
370 -
371 - if use examples; then
372 - docinto examples
373 - dodoc examples/*.{c,h,cpp}
374 - fi
375 -}