gentoo resync : 11.02.2018

16 files changed, 204 insertions, 14 deletions

diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 34ba8e893c18..116669c55e63 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,11 +1,22 @@
 AUX lftp-4.0.2.91-lafile.patch 976 BLAKE2B 65845bdc84325cd38ec2c40a0ec884510c24800928195e9a8091a1363366197e6ebc0e2b619c0129a20ae6de86a4354dad01f5af776da24d3cb2b55f02819482 SHA512 5da906b19e2f2eeb46292e4b406656e851072fcba431c3fc771baf3825f09e577550cab079991625cb96b1547a6ba15938b6c67c4e89ee9e11fb9ccd21509bf2
 AUX lftp-4.5.5-am_config_header.patch 306 BLAKE2B 6e4fc3b3940dbfa6745dae2e6abf8206494de82046205fea02a866dbeb7536926cc83996b818250b5f0f70c0c6f02af95b5a0ffea9c5e83237dab8819b62ca74 SHA512 613c0942ec5c4b9de38b6020eddcfcbe91ad6febd176b2953503ee47c82a11a9ed661b442127b25383d1f6593df0ce6837229939ec48da5c36079b145ab488b9
 AUX lftp-4.7.0-gettext.patch 421 BLAKE2B 3d1583173e610983d93e44c8411729a0ed90f64c943e7005840308730325f05129001dac521c5149ace051035ea66cf70e526a5aab951f7c5343d30140baf20d SHA512 5b90dc5ae24c2b5e7ef630ecfb709c139ff176644c5a351d97ae78b4adc28266ed09ea17e1cfd875ec52eb15e719eb12d796eb02859875a5c099d99b04035a69
+AUX lftp-4.7.5-libdir-additional.patch 369 BLAKE2B 8a9c2bca001d4975ed8d08a2bae2bbcd1219345e307b953e635bd9833bab81b4b7c94d96955c4df84e20ea08b3c41f49914ae6e74b466018e60bcdb7da1db6e9 SHA512 97e81ecc2db5a71ae36393e2f3f7ba60466d5dc7e7979ebab3be3f36fef220ce927c9d6716dc380028b8e6436c490fb3c8771b0beb3a6e9c7ff8b6bf2e608ca1
+AUX lftp-4.7.5-libdir-configure.patch 190 BLAKE2B 7346d963c1355c1ca2dcf403ba879aa92a3896ef923e10f2355353ebde138b8f97c4bca34d41a99c7134f99ed1c5be731f9b3cf861ab54438022d6c5bd7db317 SHA512 b5000b2fe2a0f330c855540b6967ccdb07e3621dcae0ad0945a1c39c2637f137913818687dafa35e98985ec4edc115499d0ed636ca2baa9a293b613b4c8933d1
+AUX lftp-4.7.5-libdir-expat.patch 356 BLAKE2B 62a89c02aa89ed746e28b13f08fb649804cdb81a31e4d20d12d049b16cf53f0bed3b36a8b2f85a8ff271d354498c0dc1ff778793d0dbafcf5aec220629508354 SHA512 ef748260275dacee08baff3b922e9e1e559fe2fedcc64e7c3125e57e16e04330b80bd1bca16d53ba7970ae5b20a396cd2de0ef1ba2c14320bf56111d4db6a8a9
+AUX lftp-4.7.5-libdir-libidn.patch 309 BLAKE2B 588964ff572985759925d2a3355dd3606e2a3cf36de5843f716438398833ddeb1dbc37c208d02d656705d0278d09506d58f148e8e1c633fbc32f3796d280f99b SHA512 282dfd90b6edbff1af1c74b4a8fdcd63c8082529583e942d677a20ee58e53b535012614820a12e3ae272b7a5dbdc193da4c1b1b1cbc8c72819505fb13621d337
+AUX lftp-4.7.5-libdir-openssl.patch 624 BLAKE2B 78f024327f635daf9f5f0cba3f4d88b42ee787470dc27acbd3a753b8dd2974e8c32862018a86983700f206f4d16b372d4f830d88b2bbc22f88804b4c0ef8d391 SHA512 fb1314e41800d53d637fc3431190608b9f5be140835c6828b2cce30575b16b49539dd8e732e67df72d634a2b9a5c07f734be0ec3ddbd82ffb51db3d746728654
+AUX lftp-4.7.5-libdir-readline.patch 424 BLAKE2B 323da25222e0dfc47ebcc123a243006927514ce77fbae1656e831d2c1e96c0d7bb1c55c92570d0d60f6bd004843b5ec89a6311b5c453f9d5e5f97da1c58cce8f SHA512 6b926598702d222dcb8cb0ed348f1c1f62ddbafd8b6b227dce8acca7ac5d6b1c1f5743d3c43e721a5ac36fe9bfd5725fdb7d0d2d16bde685e75ad9c9c760a86c
+AUX lftp-4.7.5-libdir-zlib.patch 606 BLAKE2B f3356f3abcc0cdda356dde48f17fb9d15f835eca87fd99e6aaece7c03f437c65def0268841695e11058de001bfc6b497b44090d4bc0a853338ea5e6daa65eb75 SHA512 efbfd9a8bdeb14be2a417c441a9bf7c2bdcb5c9bd704cf818bebddb0bb44d710eb492af15f98ad4eec4ed71a1feea8996a7d234b59f8a263356aaf26448ce3ed
+AUX lftp-4.8.2-libdir-configure.patch 530 BLAKE2B b376a53130563d37329e701d77b5a9c0a98d37deba6cae4d1446d8cc38deec45e80e49407507b7556aaf165c6d8c74f9f4fb31d1c1057f3156b261bb3292f37a SHA512 dc97d62360079b525b1735faf1c5238e5f03661fca81445a3e3ad21826d6559cefa3cefa987eeb01bc76df65ff92243b9cecbf4585820fd51fddc55fbc3b322d
+AUX lftp-4.8.2-libdir-libidn2.patch 315 BLAKE2B 0ebb68e3d4175b2c4900cb540049dabd08dd5acc3b36bb487433612bc391527091e10ef22f522980f7b5fdb8966918aee49713848eb2af7e349834a398854340 SHA512 5476169b31d9704db9ae00834a8e8cdcbbaea13a88b2288ed8ea69300d8734af1bf80d994e42a9a47bf179c14fe9471d931cd9ca231fff0974ee206163801cd2
+AUX lftp-4.8.2-libdir-openssl.patch 658 BLAKE2B 430dab0713f82c3c10ac7395b8ca9ca1fc12afedf9eae52e5aaa34aad518cbee5ab225fca3a524e21efc583ab9e103bb8dafa6c9154da18962d4b03400a939d0 SHA512 a48e46873d9134693452cc55c2562d1a7d7b6bb7124dba061db029e6e1c611ed9787518c86043213629683727cf0fff07afc8ce7298a30fd237941300a1aeae0
+AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8370cdf511303df4b17346275d936ebfcb658262102c01e61e11861d69e4c54f45baeddb246c062f3c66eadf8b0bcd SHA512 4a47a2e63bfe80faa640edc92c645e89d5c0063c0adc992f0b0613e01cfa0599f61f9bd07568432673addb1a981f101c474b1a0d99fd50fced455c9700b886e6
 DIST lftp-4.7.5.tar.xz 1567232 BLAKE2B 6ff7d264102ee25e989136b67b0587c025fd29a2573b25e4b9baac63c0ff0e9e40a4444b61ad50f8b892eb2f16dd31266056840aec0fb260686eb3b1714e4326 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960
 DIST lftp-4.8.2.tar.xz 1598920 BLAKE2B 2946a0ac3e915983e85f08f4c8a293cfd76b837dff007c60230522f4633dac9f9f198ee1d0e9e0d13217b83a55e46bd024d18d863e44bc17071561da6ec917a6 SHA512 582775c27f020a6864b960a06681698522842e147deee6dba18115738af56fc0094c2b21ed1eb4984626276472f707be795fcf4b23f451ba17a60e4bf8facd5e
 DIST lftp-4.8.3.tar.xz 1602324 BLAKE2B 196a9a08f97512952ea8c9e95b85c7222765a9df05d300d6c2cc3bd934b746d0c62a3d4c93a5c6eb3f1eca138495ae1c09edc31ad4f5516128c44fd3b8bbf2de SHA512 16d0ddc36ac00db009fd4e634a2eaa575bd1c690ea7e1af396317ccc677704d2a4dfa19ea0c46dab83450072714086ed2b15ac00ffe51ec5c9bb900e5e744583
-EBUILD lftp-4.7.5.ebuild 2269 BLAKE2B 8f348d351cae5412394c1777e36063d3685943e0c3cb44b09120c56bd0e2b5e1ba4fda03e772aeeeba9dcd4152e2ad401646530397f3fe8a5bb935b9e82c6ec8 SHA512 27d83d091cd46c48137de0583057f0d445a45eddf17fb9ff360480201dd1f78c7ad5b0d960b122040fa1b001f69861a4d214bbdf52a6500a5c45564b965134e0
-EBUILD lftp-4.8.2.ebuild 2284 BLAKE2B 3713451e8236956ad11f510b78e31148123a4b4defd85125750642eb242bcb5777e37644541da17539976579509a69e1a1464488df65805b295ef71c786e7479 SHA512 7a941a664539a477beead174842d370bed190419eae9a161555aeb7e89ccd849527dd528f34cb729c3e593f6fe2020581188f413a53a4089e61eda8e7d67909d
-EBUILD lftp-4.8.3.ebuild 2284 BLAKE2B 3713451e8236956ad11f510b78e31148123a4b4defd85125750642eb242bcb5777e37644541da17539976579509a69e1a1464488df65805b295ef71c786e7479 SHA512 7a941a664539a477beead174842d370bed190419eae9a161555aeb7e89ccd849527dd528f34cb729c3e593f6fe2020581188f413a53a4089e61eda8e7d67909d
-EBUILD lftp-9999.ebuild 2116 BLAKE2B 55eb53dee393078094cdd2a00bf9c0c29025429e5f8581b624a9a24e0b1c909f0b6cc7c2181ff005eef0fc962591e2e67177250e04053e06b3dfa89c188270f2 SHA512 515aab6d64d4b74753b942b2b5bee0eff09d8efa4bed27c2473e075dc70180a6c4c8c6cdbefc68de52b2dc893217181cc5f3bd1bd00f9dbf76cedb6f7d45bda6
+EBUILD lftp-4.7.5.ebuild 2552 BLAKE2B 3d99cfd051ade3491264a80c2640685720425faa4d783293b23ed6baa8699e82cc12e6a8259ddcacde5d8308efecfe1bc37f267b42735589b04f8b6614fcf98d SHA512 cfcb38856ceb7c195c64467fba134b8b744c3b35a4f411e3928e99df72bec286e70e0f877948bd10075e379b9efd3dce93cd3a3f21d8e6e316d7ef75b49a11c7
+EBUILD lftp-4.8.2.ebuild 2568 BLAKE2B 9a55eaa9b585296345e3a03556add0d4fb196e76eb07e42540c9dbb3c3ec83a5595802b91f90c46f851f8e0fe01bba9eb628a5a803844a6f91aad741669fd4af SHA512 73fb5dff8969bc4059270094430f36046269082f2986ff1bd467112f6cc2c69ab6a491fd476cfe18692c9e262fabf943dd463d7ec44ce20c9e94a728c533b16f
+EBUILD lftp-4.8.3.ebuild 2568 BLAKE2B 9a55eaa9b585296345e3a03556add0d4fb196e76eb07e42540c9dbb3c3ec83a5595802b91f90c46f851f8e0fe01bba9eb628a5a803844a6f91aad741669fd4af SHA512 73fb5dff8969bc4059270094430f36046269082f2986ff1bd467112f6cc2c69ab6a491fd476cfe18692c9e262fabf943dd463d7ec44ce20c9e94a728c533b16f
+EBUILD lftp-9999.ebuild 2351 BLAKE2B 252c1c026a5bad4adc8b37fb16819c53090be97e18a8df4befcde504ddfc56bf7f62ca32800250729499248319799c43dc4616aa93ca7c48137a670fae9bb0b2 SHA512 714b570e69f9978fce0fb3726187110e4c1f9733a3cf6b4ed7a06d1b536a248c5c7300ad43c45558a458350bff1695ba365c6e7d7c31d6accdc7796c40a47030
 MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd
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
new file mode 100644
index 000000000000..bf7f0a96d9f5
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch
@@ -0,0 +1,12 @@
+--- a/m4/lib-prefix.m4
++++ b/m4/lib-prefix.m4
+@@ -108,7 +108,8 @@
+         if test -z "$haveit"; then
+           if test -d "$additional_libdir"; then
+             dnl Really add $additional_libdir to $LDFLAGS.
+-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
++            dnl No, let's not do that.
++            :
+           fi
+         fi
+       fi
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
new file mode 100644
index 000000000000..e855ac194325
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -186,7 +186,6 @@
+ esac
+ 
+ if test x$socks_loc != x; then
+-   LDFLAGS="$LDFLAGS -L$socks_loc/lib"
+    CPPFLAGS="$CPPFLAGS -I$socks_loc/include"
+ fi
+ 
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
new file mode 100644
index 000000000000..f82afc782565
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch
@@ -0,0 +1,11 @@
+--- a/m4/ax_lib_expat.m4
++++ b/m4/ax_lib_expat.m4
+@@ -109,7 +109,7 @@
+ 
+     if test -n "$expat_prefix"; then
+         expat_include_dir="$expat_prefix/include"
+-        expat_ld_flags="-L$expat_prefix/lib"
++        expat_ld_flags="-L$libdir"
+         expat_lib_flags="-lexpat"
+         run_expat_test="yes"
+     elif test "$expat_requested" = "yes"; then
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
new file mode 100644
index 000000000000..890138013dad
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch
@@ -0,0 +1,10 @@
+--- a/m4/lftp.m4
++++ b/m4/lftp.m4
+@@ -319,7 +319,6 @@
+        libidn=$withval, libidn=yes)
+      if test "$libidn" != "no"; then
+        if test "$libidn" != "yes"; then
+-         LDFLAGS="${LDFLAGS} -L$libidn/lib"
+          CPPFLAGS="${CPPFLAGS} -I$libidn/include"
+        fi
+        AC_CHECK_HEADER(idna.h,
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
new file mode 100644
index 000000000000..44c5239ae03f
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch
@@ -0,0 +1,18 @@
+--- a/m4/ssl.m4
++++ b/m4/ssl.m4
+@@ -10,7 +10,6 @@
+ 		old_CPPFLAGS="$CPPFLAGS"
+ 		LIBS="$LIBS -lssl -lcrypto"
+ 		if test $loc != default; then
+-			LDFLAGS="$LDFLAGS -L$loc/lib"
+ 			CPPFLAGS="$CPPFLAGS -I$loc/include"
+ 		fi
+ 		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>
+@@ -21,7 +20,6 @@
+ 		if test $found_loc != "none"; then
+ 			lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\""
+ 			if test $found_loc != default; then
+-				lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib -R$found_loc/lib\""
+ 				lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include"
+ 			fi
+ 			break;
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
new file mode 100644
index 000000000000..01c9371870c0
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch
@@ -0,0 +1,11 @@
+--- a/m4/lftp_lib_readline.m4
++++ b/m4/lftp_lib_readline.m4
+@@ -107,7 +107,7 @@
+ 	if test -f "$readline_include_dir/readline/readline.h"; then
+ 	    readline_include_dir="$readline_include_dir/readline"
+ 	fi
+-        readline_ld_flags="-L$readline_prefix/lib"
++        readline_ld_flags="-L$libdir"
+         readline_lib_flags="-lreadline"
+         run_readline_test="yes"
+     elif test "$readline_requested" = "yes"; then
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
new file mode 100644
index 000000000000..9ec7c1b0dd17
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
@@ -0,0 +1,18 @@
+--- a/m4/ax_check_zlib.m4
++++ b/m4/ax_check_zlib.m4
+@@ -105,7 +105,6 @@
+   ZLIB_OLD_LDFLAGS=$LDFLAGS
+   ZLIB_OLD_CPPFLAGS=$CPPFLAGS
+   if test -n "${ZLIB_HOME}"; then
+-        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+         CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+   fi
+   AC_LANG_SAVE
+@@ -120,7 +119,6 @@
+     #
+     m4_ifblank([$1],[
+                 CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+-                LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+                 LIBS="-lz $LIBS"
+                 AC_DEFINE([HAVE_LIBZ], [1],
+                           [Define to 1 if you have `z' library (-lz)])
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
new file mode 100644
index 000000000000..d8d620b8ee5f
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch
@@ -0,0 +1,18 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -186,7 +186,6 @@
+ esac
+ 
+ if test x$socks_loc != x; then
+-   LDFLAGS="$LDFLAGS -L$socks_loc/lib"
+    CPPFLAGS="$CPPFLAGS -I$socks_loc/include"
+ fi
+ 
+@@ -307,7 +306,6 @@
+ AX_CHECK_ZLIB([
+    AC_SUBST([ZLIB],[-lz])
+    r=""; test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && r=" -R${ZLIB_HOME}/lib"
+-   AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib$r"])
+    AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"])
+ ],[
+    AC_MSG_ERROR([cannot find -lz library, install zlib-devel package])
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
new file mode 100644
index 000000000000..cae07b9bafed
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch
@@ -0,0 +1,10 @@
+--- a/m4/lftp.m4
++++ b/m4/lftp.m4
+@@ -319,7 +319,6 @@
+        libidn2=$withval, libidn2=yes)
+      if test "$libidn2" != "no"; then
+        if test "$libidn2" != "yes"; then
+-         LDFLAGS="${LDFLAGS} -L$libidn2/lib"
+          CPPFLAGS="${CPPFLAGS} -I$libidn2/include"
+        fi
+        AC_CHECK_HEADER(idn2.h,
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
new file mode 100644
index 000000000000..f8bf45b1d590
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch
@@ -0,0 +1,18 @@
+--- a/m4/ssl.m4
++++ b/m4/ssl.m4
+@@ -10,7 +10,6 @@
+ 		old_CPPFLAGS="$CPPFLAGS"
+ 		LIBS="$LIBS -lssl -lcrypto"
+ 		if test $loc != default; then
+-			LDFLAGS="$LDFLAGS -L$loc/lib"
+ 			CPPFLAGS="$CPPFLAGS -I$loc/include"
+ 		fi
+ 		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>
+@@ -22,7 +21,6 @@
+ 			lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\""
+ 			if test $found_loc != default; then
+ 				r=""; test "$enable_rpath" = yes -a "$found_loc" != /usr && r=" -R$found_loc/lib"
+-				lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib$r\""
+ 				lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include"
+ 			fi
+ 			break;
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
new file mode 100644
index 000000000000..7ff003fe6eb3
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch
@@ -0,0 +1,20 @@
+--- a/m4/ax_check_zlib.m4
++++ b/m4/ax_check_zlib.m4
+@@ -105,7 +105,6 @@
+   ZLIB_OLD_LDFLAGS="$LDFLAGS"
+   ZLIB_OLD_CPPFLAGS="$CPPFLAGS"
+   if test -n "${ZLIB_HOME}"; then
+-        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+         CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+   fi
+   AC_LANG_SAVE
+@@ -118,8 +118,7 @@
+     # If both library and header were found, action-if-found
+     #
+     m4_ifblank([$1],[
+-		test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && \
+-		    LDFLAGS="$LDFLAGS -R${ZLIB_HOME}/lib"
++		test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr
+                 LIBS="-lz $LIBS"
+                 AC_DEFINE([HAVE_LIBZ], [1],
+                           [Define to 1 if you have `z' library (-lz)])
diff --git a/net-ftp/lftp/lftp-4.7.5.ebuild b/net-ftp/lftp/lftp-4.7.5.ebuild
index 138bce2efdea..ed6f78f723f9 100644
--- a/net-ftp/lftp/lftp-4.7.5.ebuild
+++ b/net-ftp/lftp/lftp-4.7.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils libtool multilib
+inherit autotools eutils libtool
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="https://lftp.tech/"
@@ -55,6 +55,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
 	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
 	"${FILESDIR}"/${PN}-4.7.0-gettext.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-configure.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-libidn.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-openssl.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-zlib.patch
 )
 
 src_prepare() {
@@ -76,7 +83,6 @@ src_configure() {
 		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
 		--enable-packager-mode \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--with-modules \
 		--with-readline="${EPREFIX}"/usr \
diff --git a/net-ftp/lftp/lftp-4.8.2.ebuild b/net-ftp/lftp/lftp-4.8.2.ebuild
index a6577ffe126d..3ea35f33f1da 100644
--- a/net-ftp/lftp/lftp-4.8.2.ebuild
+++ b/net-ftp/lftp/lftp-4.8.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils libtool multilib
+inherit autotools eutils libtool
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="https://lftp.tech/"
@@ -57,6 +57,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
 	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
 	"${FILESDIR}"/${PN}-4.7.0-gettext.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
 )
 
 src_prepare() {
@@ -79,7 +86,6 @@ src_configure() {
 		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
 		--enable-packager-mode \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--with-modules \
 		--with-readline="${EPREFIX}"/usr \
diff --git a/net-ftp/lftp/lftp-4.8.3.ebuild b/net-ftp/lftp/lftp-4.8.3.ebuild
index a6577ffe126d..3ea35f33f1da 100644
--- a/net-ftp/lftp/lftp-4.8.3.ebuild
+++ b/net-ftp/lftp/lftp-4.8.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils libtool multilib
+inherit autotools eutils libtool
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="https://lftp.tech/"
@@ -57,6 +57,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch
 	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
 	"${FILESDIR}"/${PN}-4.7.0-gettext.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
 )
 
 src_prepare() {
@@ -79,7 +86,6 @@ src_configure() {
 		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
 		--enable-packager-mode \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--with-modules \
 		--with-readline="${EPREFIX}"/usr \
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index 75206b992406..d8dca66a3ca7 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils git-r3 libtool multilib
+inherit autotools eutils git-r3 libtool
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
 HOMEPAGE="https://lftp.tech/"
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-libs/expat
 	sys-libs/zlib
 	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn )
+	idn? ( net-dns/libidn2 )
 	socks5? (
 		>=net-proxy/dante-1.1.12
 		virtual/pam
@@ -52,6 +52,12 @@ DOCS=(
 )
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch
+	"${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-libidn2.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
+	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
 )
 
 src_prepare() {
@@ -69,12 +75,11 @@ src_configure() {
 	econf \
 		$(use_enable ipv6) \
 		$(use_enable nls) \
-		$(use_with idn libidn) \
+		$(use_with idn libidn2) \
 		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
 		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
 		--enable-packager-mode \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
 		--with-modules \
 		--with-readline="${EPREFIX}"/usr \