| 1 |
commit: cee0bfb56f78270a1a4deaf8de03c8afb428d6a9 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 5 14:59:59 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 5 15:01:19 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee0bfb5 |
| 7 |
|
| 8 |
net-ftp/lftp: Remove all LDFLAGS=.*-L.*\/lib (bug #646284). |
| 9 |
|
| 10 |
.../lftp/files/lftp-4.7.5-libdir-additional.patch | 12 ++++++++++++ |
| 11 |
net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch | 10 ++++++++++ |
| 12 |
net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch | 11 +++++++++++ |
| 13 |
net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch | 10 ++++++++++ |
| 14 |
net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch | 18 ++++++++++++++++++ |
| 15 |
net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch | 11 +++++++++++ |
| 16 |
net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch | 18 ++++++++++++++++++ |
| 17 |
net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch | 18 ++++++++++++++++++ |
| 18 |
net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch | 10 ++++++++++ |
| 19 |
net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch | 18 ++++++++++++++++++ |
| 20 |
net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch | 20 ++++++++++++++++++++ |
| 21 |
net-ftp/lftp/lftp-4.7.5.ebuild | 10 ++++++++-- |
| 22 |
net-ftp/lftp/lftp-4.8.2.ebuild | 10 ++++++++-- |
| 23 |
net-ftp/lftp/lftp-4.8.3.ebuild | 10 ++++++++-- |
| 24 |
net-ftp/lftp/lftp-9999.ebuild | 13 +++++++++---- |
| 25 |
15 files changed, 189 insertions(+), 10 deletions(-) |
| 26 |
|
| 27 |
diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch |
| 28 |
new file mode 100644 |
| 29 |
index 00000000000..bf7f0a96d9f |
| 30 |
--- /dev/null |
| 31 |
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch |
| 32 |
@@ -0,0 +1,12 @@ |
| 33 |
+--- a/m4/lib-prefix.m4 |
| 34 |
++++ b/m4/lib-prefix.m4 |
| 35 |
+@@ -108,7 +108,8 @@ |
| 36 |
+ if test -z "$haveit"; then |
| 37 |
+ if test -d "$additional_libdir"; then |
| 38 |
+ dnl Really add $additional_libdir to $LDFLAGS. |
| 39 |
+- LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" |
| 40 |
++ dnl No, let's not do that. |
| 41 |
++ : |
| 42 |
+ fi |
| 43 |
+ fi |
| 44 |
+ fi |
| 45 |
|
| 46 |
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 |
| 47 |
new file mode 100644 |
| 48 |
index 00000000000..e855ac19432 |
| 49 |
--- /dev/null |
| 50 |
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch |
| 51 |
@@ -0,0 +1,10 @@ |
| 52 |
+--- a/configure.ac |
| 53 |
++++ b/configure.ac |
| 54 |
+@@ -186,7 +186,6 @@ |
| 55 |
+ esac |
| 56 |
+ |
| 57 |
+ if test x$socks_loc != x; then |
| 58 |
+- LDFLAGS="$LDFLAGS -L$socks_loc/lib" |
| 59 |
+ CPPFLAGS="$CPPFLAGS -I$socks_loc/include" |
| 60 |
+ fi |
| 61 |
+ |
| 62 |
|
| 63 |
diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch |
| 64 |
new file mode 100644 |
| 65 |
index 00000000000..f82afc78256 |
| 66 |
--- /dev/null |
| 67 |
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch |
| 68 |
@@ -0,0 +1,11 @@ |
| 69 |
+--- a/m4/ax_lib_expat.m4 |
| 70 |
++++ b/m4/ax_lib_expat.m4 |
| 71 |
+@@ -109,7 +109,7 @@ |
| 72 |
+ |
| 73 |
+ if test -n "$expat_prefix"; then |
| 74 |
+ expat_include_dir="$expat_prefix/include" |
| 75 |
+- expat_ld_flags="-L$expat_prefix/lib" |
| 76 |
++ expat_ld_flags="-L$libdir" |
| 77 |
+ expat_lib_flags="-lexpat" |
| 78 |
+ run_expat_test="yes" |
| 79 |
+ elif test "$expat_requested" = "yes"; then |
| 80 |
|
| 81 |
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 |
| 82 |
new file mode 100644 |
| 83 |
index 00000000000..890138013da |
| 84 |
--- /dev/null |
| 85 |
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch |
| 86 |
@@ -0,0 +1,10 @@ |
| 87 |
+--- a/m4/lftp.m4 |
| 88 |
++++ b/m4/lftp.m4 |
| 89 |
+@@ -319,7 +319,6 @@ |
| 90 |
+ libidn=$withval, libidn=yes) |
| 91 |
+ if test "$libidn" != "no"; then |
| 92 |
+ if test "$libidn" != "yes"; then |
| 93 |
+- LDFLAGS="${LDFLAGS} -L$libidn/lib" |
| 94 |
+ CPPFLAGS="${CPPFLAGS} -I$libidn/include" |
| 95 |
+ fi |
| 96 |
+ AC_CHECK_HEADER(idna.h, |
| 97 |
|
| 98 |
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 |
| 99 |
new file mode 100644 |
| 100 |
index 00000000000..44c5239ae03 |
| 101 |
--- /dev/null |
| 102 |
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch |
| 103 |
@@ -0,0 +1,18 @@ |
| 104 |
+--- a/m4/ssl.m4 |
| 105 |
++++ b/m4/ssl.m4 |
| 106 |
+@@ -10,7 +10,6 @@ |
| 107 |
+ old_CPPFLAGS="$CPPFLAGS" |
| 108 |
+ LIBS="$LIBS -lssl -lcrypto" |
| 109 |
+ if test $loc != default; then |
| 110 |
+- LDFLAGS="$LDFLAGS -L$loc/lib" |
| 111 |
+ CPPFLAGS="$CPPFLAGS -I$loc/include" |
| 112 |
+ fi |
| 113 |
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h> |
| 114 |
+@@ -21,7 +20,6 @@ |
| 115 |
+ if test $found_loc != "none"; then |
| 116 |
+ lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\"" |
| 117 |
+ if test $found_loc != default; then |
| 118 |
+- lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib -R$found_loc/lib\"" |
| 119 |
+ lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include" |
| 120 |
+ fi |
| 121 |
+ break; |
| 122 |
|
| 123 |
diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch |
| 124 |
new file mode 100644 |
| 125 |
index 00000000000..01c9371870c |
| 126 |
--- /dev/null |
| 127 |
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch |
| 128 |
@@ -0,0 +1,11 @@ |
| 129 |
+--- a/m4/lftp_lib_readline.m4 |
| 130 |
++++ b/m4/lftp_lib_readline.m4 |
| 131 |
+@@ -107,7 +107,7 @@ |
| 132 |
+ if test -f "$readline_include_dir/readline/readline.h"; then |
| 133 |
+ readline_include_dir="$readline_include_dir/readline" |
| 134 |
+ fi |
| 135 |
+- readline_ld_flags="-L$readline_prefix/lib" |
| 136 |
++ readline_ld_flags="-L$libdir" |
| 137 |
+ readline_lib_flags="-lreadline" |
| 138 |
+ run_readline_test="yes" |
| 139 |
+ elif test "$readline_requested" = "yes"; then |
| 140 |
|
| 141 |
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 |
| 142 |
new file mode 100644 |
| 143 |
index 00000000000..9ec7c1b0dd1 |
| 144 |
--- /dev/null |
| 145 |
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch |
| 146 |
@@ -0,0 +1,18 @@ |
| 147 |
+--- a/m4/ax_check_zlib.m4 |
| 148 |
++++ b/m4/ax_check_zlib.m4 |
| 149 |
+@@ -105,7 +105,6 @@ |
| 150 |
+ ZLIB_OLD_LDFLAGS=$LDFLAGS |
| 151 |
+ ZLIB_OLD_CPPFLAGS=$CPPFLAGS |
| 152 |
+ if test -n "${ZLIB_HOME}"; then |
| 153 |
+- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" |
| 154 |
+ CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" |
| 155 |
+ fi |
| 156 |
+ AC_LANG_SAVE |
| 157 |
+@@ -120,7 +119,6 @@ |
| 158 |
+ # |
| 159 |
+ m4_ifblank([$1],[ |
| 160 |
+ CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" |
| 161 |
+- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" |
| 162 |
+ LIBS="-lz $LIBS" |
| 163 |
+ AC_DEFINE([HAVE_LIBZ], [1], |
| 164 |
+ [Define to 1 if you have `z' library (-lz)]) |
| 165 |
|
| 166 |
diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch |
| 167 |
new file mode 100644 |
| 168 |
index 00000000000..d8d620b8ee5 |
| 169 |
--- /dev/null |
| 170 |
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch |
| 171 |
@@ -0,0 +1,18 @@ |
| 172 |
+--- a/configure.ac |
| 173 |
++++ b/configure.ac |
| 174 |
+@@ -186,7 +186,6 @@ |
| 175 |
+ esac |
| 176 |
+ |
| 177 |
+ if test x$socks_loc != x; then |
| 178 |
+- LDFLAGS="$LDFLAGS -L$socks_loc/lib" |
| 179 |
+ CPPFLAGS="$CPPFLAGS -I$socks_loc/include" |
| 180 |
+ fi |
| 181 |
+ |
| 182 |
+@@ -307,7 +306,6 @@ |
| 183 |
+ AX_CHECK_ZLIB([ |
| 184 |
+ AC_SUBST([ZLIB],[-lz]) |
| 185 |
+ r=""; test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && r=" -R${ZLIB_HOME}/lib" |
| 186 |
+- AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib$r"]) |
| 187 |
+ AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"]) |
| 188 |
+ ],[ |
| 189 |
+ AC_MSG_ERROR([cannot find -lz library, install zlib-devel package]) |
| 190 |
|
| 191 |
diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch |
| 192 |
new file mode 100644 |
| 193 |
index 00000000000..cae07b9bafe |
| 194 |
--- /dev/null |
| 195 |
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch |
| 196 |
@@ -0,0 +1,10 @@ |
| 197 |
+--- a/m4/lftp.m4 |
| 198 |
++++ b/m4/lftp.m4 |
| 199 |
+@@ -319,7 +319,6 @@ |
| 200 |
+ libidn2=$withval, libidn2=yes) |
| 201 |
+ if test "$libidn2" != "no"; then |
| 202 |
+ if test "$libidn2" != "yes"; then |
| 203 |
+- LDFLAGS="${LDFLAGS} -L$libidn2/lib" |
| 204 |
+ CPPFLAGS="${CPPFLAGS} -I$libidn2/include" |
| 205 |
+ fi |
| 206 |
+ AC_CHECK_HEADER(idn2.h, |
| 207 |
|
| 208 |
diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch |
| 209 |
new file mode 100644 |
| 210 |
index 00000000000..f8bf45b1d59 |
| 211 |
--- /dev/null |
| 212 |
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch |
| 213 |
@@ -0,0 +1,18 @@ |
| 214 |
+--- a/m4/ssl.m4 |
| 215 |
++++ b/m4/ssl.m4 |
| 216 |
+@@ -10,7 +10,6 @@ |
| 217 |
+ old_CPPFLAGS="$CPPFLAGS" |
| 218 |
+ LIBS="$LIBS -lssl -lcrypto" |
| 219 |
+ if test $loc != default; then |
| 220 |
+- LDFLAGS="$LDFLAGS -L$loc/lib" |
| 221 |
+ CPPFLAGS="$CPPFLAGS -I$loc/include" |
| 222 |
+ fi |
| 223 |
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h> |
| 224 |
+@@ -22,7 +21,6 @@ |
| 225 |
+ lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\"" |
| 226 |
+ if test $found_loc != default; then |
| 227 |
+ r=""; test "$enable_rpath" = yes -a "$found_loc" != /usr && r=" -R$found_loc/lib" |
| 228 |
+- lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib$r\"" |
| 229 |
+ lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include" |
| 230 |
+ fi |
| 231 |
+ break; |
| 232 |
|
| 233 |
diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch |
| 234 |
new file mode 100644 |
| 235 |
index 00000000000..7ff003fe6eb |
| 236 |
--- /dev/null |
| 237 |
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch |
| 238 |
@@ -0,0 +1,20 @@ |
| 239 |
+--- a/m4/ax_check_zlib.m4 |
| 240 |
++++ b/m4/ax_check_zlib.m4 |
| 241 |
+@@ -105,7 +105,6 @@ |
| 242 |
+ ZLIB_OLD_LDFLAGS="$LDFLAGS" |
| 243 |
+ ZLIB_OLD_CPPFLAGS="$CPPFLAGS" |
| 244 |
+ if test -n "${ZLIB_HOME}"; then |
| 245 |
+- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" |
| 246 |
+ CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" |
| 247 |
+ fi |
| 248 |
+ AC_LANG_SAVE |
| 249 |
+@@ -118,8 +118,7 @@ |
| 250 |
+ # If both library and header were found, action-if-found |
| 251 |
+ # |
| 252 |
+ m4_ifblank([$1],[ |
| 253 |
+- test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && \ |
| 254 |
+- LDFLAGS="$LDFLAGS -R${ZLIB_HOME}/lib" |
| 255 |
++ test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr |
| 256 |
+ LIBS="-lz $LIBS" |
| 257 |
+ AC_DEFINE([HAVE_LIBZ], [1], |
| 258 |
+ [Define to 1 if you have `z' library (-lz)]) |
| 259 |
|
| 260 |
diff --git a/net-ftp/lftp/lftp-4.7.5.ebuild b/net-ftp/lftp/lftp-4.7.5.ebuild |
| 261 |
index 138bce2efde..ed6f78f723f 100644 |
| 262 |
--- a/net-ftp/lftp/lftp-4.7.5.ebuild |
| 263 |
+++ b/net-ftp/lftp/lftp-4.7.5.ebuild |
| 264 |
@@ -2,7 +2,7 @@ |
| 265 |
# Distributed under the terms of the GNU General Public License v2 |
| 266 |
|
| 267 |
EAPI=6 |
| 268 |
-inherit autotools eutils libtool multilib |
| 269 |
+inherit autotools eutils libtool |
| 270 |
|
| 271 |
DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" |
| 272 |
HOMEPAGE="https://lftp.tech/" |
| 273 |
@@ -55,6 +55,13 @@ PATCHES=( |
| 274 |
"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch |
| 275 |
"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch |
| 276 |
"${FILESDIR}"/${PN}-4.7.0-gettext.patch |
| 277 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch |
| 278 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-configure.patch |
| 279 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch |
| 280 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-libidn.patch |
| 281 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-openssl.patch |
| 282 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch |
| 283 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-zlib.patch |
| 284 |
) |
| 285 |
|
| 286 |
src_prepare() { |
| 287 |
@@ -76,7 +83,6 @@ src_configure() { |
| 288 |
$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \ |
| 289 |
$(usex ssl "$(use_with gnutls)" '--without-gnutls') \ |
| 290 |
--enable-packager-mode \ |
| 291 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 292 |
--sysconfdir="${EPREFIX}"/etc/${PN} \ |
| 293 |
--with-modules \ |
| 294 |
--with-readline="${EPREFIX}"/usr \ |
| 295 |
|
| 296 |
diff --git a/net-ftp/lftp/lftp-4.8.2.ebuild b/net-ftp/lftp/lftp-4.8.2.ebuild |
| 297 |
index a6577ffe126..3ea35f33f1d 100644 |
| 298 |
--- a/net-ftp/lftp/lftp-4.8.2.ebuild |
| 299 |
+++ b/net-ftp/lftp/lftp-4.8.2.ebuild |
| 300 |
@@ -2,7 +2,7 @@ |
| 301 |
# Distributed under the terms of the GNU General Public License v2 |
| 302 |
|
| 303 |
EAPI=6 |
| 304 |
-inherit autotools eutils libtool multilib |
| 305 |
+inherit autotools eutils libtool |
| 306 |
|
| 307 |
DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" |
| 308 |
HOMEPAGE="https://lftp.tech/" |
| 309 |
@@ -57,6 +57,13 @@ PATCHES=( |
| 310 |
"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch |
| 311 |
"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch |
| 312 |
"${FILESDIR}"/${PN}-4.7.0-gettext.patch |
| 313 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch |
| 314 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch |
| 315 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch |
| 316 |
+ "${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch |
| 317 |
+ "${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch |
| 318 |
+ "${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch |
| 319 |
+ "${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch |
| 320 |
) |
| 321 |
|
| 322 |
src_prepare() { |
| 323 |
@@ -79,7 +86,6 @@ src_configure() { |
| 324 |
$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \ |
| 325 |
$(usex ssl "$(use_with gnutls)" '--without-gnutls') \ |
| 326 |
--enable-packager-mode \ |
| 327 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 328 |
--sysconfdir="${EPREFIX}"/etc/${PN} \ |
| 329 |
--with-modules \ |
| 330 |
--with-readline="${EPREFIX}"/usr \ |
| 331 |
|
| 332 |
diff --git a/net-ftp/lftp/lftp-4.8.3.ebuild b/net-ftp/lftp/lftp-4.8.3.ebuild |
| 333 |
index a6577ffe126..3ea35f33f1d 100644 |
| 334 |
--- a/net-ftp/lftp/lftp-4.8.3.ebuild |
| 335 |
+++ b/net-ftp/lftp/lftp-4.8.3.ebuild |
| 336 |
@@ -2,7 +2,7 @@ |
| 337 |
# Distributed under the terms of the GNU General Public License v2 |
| 338 |
|
| 339 |
EAPI=6 |
| 340 |
-inherit autotools eutils libtool multilib |
| 341 |
+inherit autotools eutils libtool |
| 342 |
|
| 343 |
DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" |
| 344 |
HOMEPAGE="https://lftp.tech/" |
| 345 |
@@ -57,6 +57,13 @@ PATCHES=( |
| 346 |
"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch |
| 347 |
"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch |
| 348 |
"${FILESDIR}"/${PN}-4.7.0-gettext.patch |
| 349 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch |
| 350 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch |
| 351 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch |
| 352 |
+ "${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch |
| 353 |
+ "${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch |
| 354 |
+ "${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch |
| 355 |
+ "${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch |
| 356 |
) |
| 357 |
|
| 358 |
src_prepare() { |
| 359 |
@@ -79,7 +86,6 @@ src_configure() { |
| 360 |
$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \ |
| 361 |
$(usex ssl "$(use_with gnutls)" '--without-gnutls') \ |
| 362 |
--enable-packager-mode \ |
| 363 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 364 |
--sysconfdir="${EPREFIX}"/etc/${PN} \ |
| 365 |
--with-modules \ |
| 366 |
--with-readline="${EPREFIX}"/usr \ |
| 367 |
|
| 368 |
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild |
| 369 |
index 75206b99240..d8dca66a3ca 100644 |
| 370 |
--- a/net-ftp/lftp/lftp-9999.ebuild |
| 371 |
+++ b/net-ftp/lftp/lftp-9999.ebuild |
| 372 |
@@ -2,7 +2,7 @@ |
| 373 |
# Distributed under the terms of the GNU General Public License v2 |
| 374 |
|
| 375 |
EAPI=6 |
| 376 |
-inherit autotools eutils git-r3 libtool multilib |
| 377 |
+inherit autotools eutils git-r3 libtool |
| 378 |
|
| 379 |
DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" |
| 380 |
HOMEPAGE="https://lftp.tech/" |
| 381 |
@@ -19,7 +19,7 @@ RDEPEND=" |
| 382 |
dev-libs/expat |
| 383 |
sys-libs/zlib |
| 384 |
convert-mozilla-cookies? ( dev-perl/DBI ) |
| 385 |
- idn? ( net-dns/libidn ) |
| 386 |
+ idn? ( net-dns/libidn2 ) |
| 387 |
socks5? ( |
| 388 |
>=net-proxy/dante-1.1.12 |
| 389 |
virtual/pam |
| 390 |
@@ -52,6 +52,12 @@ DOCS=( |
| 391 |
) |
| 392 |
PATCHES=( |
| 393 |
"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch |
| 394 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch |
| 395 |
+ "${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch |
| 396 |
+ "${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch |
| 397 |
+ "${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch |
| 398 |
+ "${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch |
| 399 |
+ "${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch |
| 400 |
) |
| 401 |
|
| 402 |
src_prepare() { |
| 403 |
@@ -69,12 +75,11 @@ src_configure() { |
| 404 |
econf \ |
| 405 |
$(use_enable ipv6) \ |
| 406 |
$(use_enable nls) \ |
| 407 |
- $(use_with idn libidn) \ |
| 408 |
+ $(use_with idn libidn2) \ |
| 409 |
$(use_with socks5 socksdante "${EPREFIX}"/usr) \ |
| 410 |
$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \ |
| 411 |
$(usex ssl "$(use_with gnutls)" '--without-gnutls') \ |
| 412 |
--enable-packager-mode \ |
| 413 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 414 |
--sysconfdir="${EPREFIX}"/etc/${PN} \ |
| 415 |
--with-modules \ |
| 416 |
--with-readline="${EPREFIX}"/usr \ |
Archives