Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/, net-ftp/lftp/files/
Date: Fri, 03 May 2019 08:27:01
Message-Id: 1556872010.93ce6a29b012ae8e10039e4f9a02c71bc8745e39.jer@gentoo
1 commit: 93ce6a29b012ae8e10039e4f9a02c71bc8745e39
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 3 08:26:24 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Fri May 3 08:26:50 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ce6a29
7
8 net-ftp/lftp: Old
9
10 Package-Manager: Portage-2.3.66, Repoman-2.3.12
11 Bug: https://bugs.gentoo.org/show_bug.cgi?id=662882
12 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
13
14 net-ftp/lftp/Manifest | 1 -
15 .../lftp/files/lftp-4.7.5-libdir-configure.patch | 10 --
16 net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch | 10 --
17 net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch | 18 ----
18 net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch | 28 ------
19 net-ftp/lftp/lftp-4.7.5.ebuild | 98 --------------------
20 net-ftp/lftp/lftp-4.8.4.ebuild | 101 ---------------------
21 7 files changed, 266 deletions(-)
22
23 diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
24 index eeccc3697da..7fc73c4df9c 100644
25 --- a/net-ftp/lftp/Manifest
26 +++ b/net-ftp/lftp/Manifest
27 @@ -1,2 +1 @@
28 -DIST lftp-4.7.5.tar.xz 1567232 BLAKE2B 6ff7d264102ee25e989136b67b0587c025fd29a2573b25e4b9baac63c0ff0e9e40a4444b61ad50f8b892eb2f16dd31266056840aec0fb260686eb3b1714e4326 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960
29 DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
30
31 diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch
32 deleted file mode 100644
33 index e855ac19432..00000000000
34 --- a/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch
35 +++ /dev/null
36 @@ -1,10 +0,0 @@
37 ---- a/configure.ac
38 -+++ b/configure.ac
39 -@@ -186,7 +186,6 @@
40 - esac
41 -
42 - if test x$socks_loc != x; then
43 -- LDFLAGS="$LDFLAGS -L$socks_loc/lib"
44 - CPPFLAGS="$CPPFLAGS -I$socks_loc/include"
45 - fi
46 -
47
48 diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch
49 deleted file mode 100644
50 index 890138013da..00000000000
51 --- a/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch
52 +++ /dev/null
53 @@ -1,10 +0,0 @@
54 ---- a/m4/lftp.m4
55 -+++ b/m4/lftp.m4
56 -@@ -319,7 +319,6 @@
57 - libidn=$withval, libidn=yes)
58 - if test "$libidn" != "no"; then
59 - if test "$libidn" != "yes"; then
60 -- LDFLAGS="${LDFLAGS} -L$libidn/lib"
61 - CPPFLAGS="${CPPFLAGS} -I$libidn/include"
62 - fi
63 - AC_CHECK_HEADER(idna.h,
64
65 diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch
66 deleted file mode 100644
67 index 44c5239ae03..00000000000
68 --- a/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch
69 +++ /dev/null
70 @@ -1,18 +0,0 @@
71 ---- a/m4/ssl.m4
72 -+++ b/m4/ssl.m4
73 -@@ -10,7 +10,6 @@
74 - old_CPPFLAGS="$CPPFLAGS"
75 - LIBS="$LIBS -lssl -lcrypto"
76 - if test $loc != default; then
77 -- LDFLAGS="$LDFLAGS -L$loc/lib"
78 - CPPFLAGS="$CPPFLAGS -I$loc/include"
79 - fi
80 - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>
81 -@@ -21,7 +20,6 @@
82 - if test $found_loc != "none"; then
83 - lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\""
84 - if test $found_loc != default; then
85 -- lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib -R$found_loc/lib\""
86 - lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include"
87 - fi
88 - break;
89
90 diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
91 deleted file mode 100644
92 index 791bd2c5a3b..00000000000
93 --- a/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
94 +++ /dev/null
95 @@ -1,28 +0,0 @@
96 ---- a/configure.ac
97 -+++ b/configure.ac
98 -@@ -305,7 +305,6 @@
99 -
100 - AX_CHECK_ZLIB([
101 - AC_SUBST([ZLIB],[-lz])
102 -- AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib"])
103 - AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"])
104 - ],[
105 - AC_MSG_ERROR([cannot find -lz library, install zlib-devel package])
106 ---- a/m4/ax_check_zlib.m4
107 -+++ b/m4/ax_check_zlib.m4
108 -@@ -105,7 +105,6 @@
109 - ZLIB_OLD_LDFLAGS=$LDFLAGS
110 - ZLIB_OLD_CPPFLAGS=$CPPFLAGS
111 - if test -n "${ZLIB_HOME}"; then
112 -- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
113 - CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
114 - fi
115 - AC_LANG_SAVE
116 -@@ -120,7 +119,6 @@
117 - #
118 - m4_ifblank([$1],[
119 - CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
120 -- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
121 - LIBS="-lz $LIBS"
122 - AC_DEFINE([HAVE_LIBZ], [1],
123 - [Define to 1 if you have `z' library (-lz)])
124
125 diff --git a/net-ftp/lftp/lftp-4.7.5.ebuild b/net-ftp/lftp/lftp-4.7.5.ebuild
126 deleted file mode 100644
127 index 6dac748590d..00000000000
128 --- a/net-ftp/lftp/lftp-4.7.5.ebuild
129 +++ /dev/null
130 @@ -1,98 +0,0 @@
131 -# Copyright 1999-2019 Gentoo Authors
132 -# Distributed under the terms of the GNU General Public License v2
133 -
134 -EAPI=6
135 -inherit autotools eutils libtool
136 -
137 -DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
138 -HOMEPAGE="https://lftp.tech/"
139 -SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz"
140 -
141 -LICENSE="GPL-3"
142 -SLOT="0"
143 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
144 -IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
145 -RESTRICT="test"
146 -
147 -RDEPEND="
148 - >=sys-libs/ncurses-5.1:=
149 - >=sys-libs/readline-5.1:=
150 - dev-libs/expat
151 - sys-libs/zlib
152 - convert-mozilla-cookies? ( dev-perl/DBI )
153 - idn? ( net-dns/libidn:= )
154 - socks5? (
155 - >=net-proxy/dante-1.1.12
156 - virtual/pam
157 - )
158 - ssl? (
159 - gnutls? ( >=net-libs/gnutls-1.2.3:0= )
160 - !gnutls? (
161 - !libressl? ( dev-libs/openssl:0= )
162 - libressl? ( dev-libs/libressl:0= )
163 - )
164 - )
165 - verify-file? (
166 - dev-perl/String-CRC32
167 - virtual/perl-Digest-MD5
168 - )
169 -"
170 -
171 -DEPEND="
172 - ${RDEPEND}
173 - =sys-devel/libtool-2*
174 - app-arch/xz-utils
175 - nls? ( >=sys-devel/gettext-0.19 )
176 - virtual/pkgconfig
177 -"
178 -
179 -DOCS=(
180 - BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
181 - README.dnssec README.modules THANKS TODO
182 -)
183 -
184 -PATCHES=(
185 - "${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
186 - "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
187 - "${FILESDIR}"/${PN}-4.7.0-gettext.patch
188 - "${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
189 - "${FILESDIR}"/${PN}-4.7.5-libdir-configure.patch
190 - "${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
191 - "${FILESDIR}"/${PN}-4.7.5-libdir-libidn.patch
192 - "${FILESDIR}"/${PN}-4.7.5-libdir-openssl.patch
193 - "${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch
194 - "${FILESDIR}"/${PN}-4.7.5-libdir-zlib.patch
195 -)
196 -
197 -src_prepare() {
198 - default
199 -
200 - eautoreconf
201 - elibtoolize # for Darwin bundles
202 -
203 - # bug #536036
204 - printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
205 -}
206 -
207 -src_configure() {
208 - econf \
209 - $(use_enable ipv6) \
210 - $(use_enable nls) \
211 - $(use_with idn libidn) \
212 - $(use_with socks5 socksdante "${EPREFIX}"/usr) \
213 - $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
214 - $(usex ssl "$(use_with gnutls)" '--without-gnutls') \
215 - --enable-packager-mode \
216 - --sysconfdir="${EPREFIX}"/etc/${PN} \
217 - --with-modules \
218 - --with-readline="${EPREFIX}"/usr \
219 - --without-included-regex
220 -}
221 -
222 -src_install() {
223 - default
224 - local script
225 - for script in {convert-mozilla-cookies,verify-file}; do
226 - use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
227 - done
228 -}
229
230 diff --git a/net-ftp/lftp/lftp-4.8.4.ebuild b/net-ftp/lftp/lftp-4.8.4.ebuild
231 deleted file mode 100644
232 index 2fe153fc40d..00000000000
233 --- a/net-ftp/lftp/lftp-4.8.4.ebuild
234 +++ /dev/null
235 @@ -1,101 +0,0 @@
236 -# Copyright 1999-2019 Gentoo Authors
237 -# Distributed under the terms of the GNU General Public License v2
238 -
239 -EAPI=6
240 -inherit autotools eutils libtool
241 -
242 -DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
243 -HOMEPAGE="https://lftp.tech/"
244 -SRC_URI="
245 - ${HOMEPAGE}ftp/${P}.tar.xz
246 -"
247 -
248 -LICENSE="GPL-3"
249 -SLOT="0"
250 -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
251 -IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
252 -RESTRICT="test"
253 -
254 -RDEPEND="
255 - >=sys-libs/ncurses-5.1:=
256 - >=sys-libs/readline-5.1:=
257 - dev-libs/expat
258 - sys-libs/zlib
259 - convert-mozilla-cookies? ( dev-perl/DBI )
260 - idn? ( net-dns/libidn2:= )
261 - socks5? (
262 - >=net-proxy/dante-1.1.12
263 - virtual/pam
264 - )
265 - ssl? (
266 - gnutls? ( >=net-libs/gnutls-1.2.3:0= )
267 - !gnutls? (
268 - !libressl? ( dev-libs/openssl:0= )
269 - libressl? ( dev-libs/libressl:0= )
270 - )
271 - )
272 - verify-file? (
273 - dev-perl/String-CRC32
274 - virtual/perl-Digest-MD5
275 - )
276 -"
277 -
278 -DEPEND="
279 - ${RDEPEND}
280 - =sys-devel/libtool-2*
281 - app-arch/xz-utils
282 - nls? ( >=sys-devel/gettext-0.19 )
283 - virtual/pkgconfig
284 -"
285 -
286 -DOCS=(
287 - BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
288 - README.dnssec README.modules THANKS TODO
289 -)
290 -
291 -PATCHES=(
292 - "${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
293 - "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
294 - "${FILESDIR}"/${PN}-4.7.0-gettext.patch
295 - "${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
296 - "${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
297 - "${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch
298 - "${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch
299 - "${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
300 - "${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
301 - "${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
302 -)
303 -
304 -src_prepare() {
305 - default
306 -
307 - eautoreconf
308 -
309 - elibtoolize # for Darwin bundles
310 -
311 - # bug #536036
312 - printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
313 -}
314 -
315 -src_configure() {
316 - econf \
317 - $(use_enable ipv6) \
318 - $(use_enable nls) \
319 - $(use_with idn libidn2) \
320 - $(use_with socks5 socksdante "${EPREFIX}"/usr) \
321 - $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
322 - $(usex ssl "$(use_with gnutls)" '--without-gnutls') \
323 - --enable-packager-mode \
324 - --sysconfdir="${EPREFIX}"/etc/${PN} \
325 - --with-modules \
326 - --with-readline="${EPREFIX}"/usr \
327 - --without-included-regex
328 -}
329 -
330 -src_install() {
331 - default
332 - local script
333 - for script in {convert-mozilla-cookies,verify-file}; do
334 - use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
335 - done
336 -}