gentoo resync : 04.05.2019

8 files changed, 2 insertions, 274 deletions

diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index d868d3b4da79..9c8c4ed9558e 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -2,20 +2,13 @@ AUX lftp-4.0.2.91-lafile.patch 976 BLAKE2B 65845bdc84325cd38ec2c40a0ec884510c248
 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 896 BLAKE2B 5015047f3a92098e320d4ca6942426f49a6d220b8e8eacffb54a69cd4df22b2cfc959964d88955e5c1e011c679c4d4213c2e038bb3a774245556c350fc80366d SHA512 ebeabeda18aab710b9988722988d39db5b1c6f01ceb4d1778000be6971420205b8065eefc4bc8a09a9c8e7a9536d58b4341dabe23fde3634d5301c5dfbd90281
 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.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
-EBUILD lftp-4.7.5.ebuild 2551 BLAKE2B 090ebc91da6dbdeae35271ddd823c68a23fe61fb980a3b575454a652c13c5237a742c264e141b0ba07f08dc18f8dbbfea54053df9f21787a1b1bbdd11c05addb SHA512 bacc149a37e2e96c1f65472689ed8454a553ab714ce301934d21451d9b8452106f66dee3d6b1466b3b236df06b1c9800578555960dcd047a31c4c5a83fd2f30f
-EBUILD lftp-4.8.4-r1.ebuild 2646 BLAKE2B b7e25ca7d09fff43f122e2a50d4995ae9f76d31e825d240bd1374cba288156e53976ccb4a441925273dcb125b5ce637186e5d1b1c635fd2010cde51164bd3373 SHA512 da87dcaa6965626bfa88f8ce3500d3c0de31d9c9addae47531b1eedb3653a02de93468cbc68ead3aab4021902b9ac7cc7e055c240a09e2a889a00504cd41bdc5
-EBUILD lftp-4.8.4.ebuild 2564 BLAKE2B c7c7f0082a43d4ae98a41a324b32e1ca283ef5424bd574eb9f29b2f667f1fe1b5ac362879a74ea91cc9e604d9e7d8b261975ad293cdccbed93bc78d0fcffb7a0 SHA512 89141dcecc69fec441b682d0ca980659784a64599a2b0c1338ddb279bb9c84e03042b7b282d474b0bb208b36d8e4618223abc55619d2dd6559b40f81b6a235a0
+EBUILD lftp-4.8.4-r1.ebuild 2643 BLAKE2B 96e8ee692fb8804c5183efa1b8a6458bd3f42972b46f818208ae6e4d206a21773a37cedb28b0cab13b0bc5506658957e5b69292af50ba889723c4ac1017ffcea SHA512 1d38b19021814efccc070d48773168f42bf56894752864a34ab1ae80eff607737f09213861d774663cf40bf46bc1b8b02cb73fc71b8d70d7a26a85e27cbfd99e
 EBUILD lftp-9999.ebuild 2437 BLAKE2B 9acf0cd0125d59d96feeb9268f519e56dd5746704ffb9f10c8c77c1c4ca88db53b1c4c862513d71eb483765e3c724f68d51b25144402bcad721ee8c4886f420d SHA512 05ef650aa2470f8a3b00249d552892415f54b5279016db303226133a7ac03e2aaf269116d7da67bde001590a875e8fe4234f1e101cb29e23e7ed3b437b9d8f25
 MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd
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
deleted file mode 100644
index e855ac194325..000000000000
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-libidn.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch
deleted file mode 100644
index 890138013dad..000000000000
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 44c5239ae03f..000000000000
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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-zlib.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
deleted file mode 100644
index 791bd2c5a3b9..000000000000
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -305,7 +305,6 @@
- 
- AX_CHECK_ZLIB([
-    AC_SUBST([ZLIB],[-lz])
--   AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib"])
-    AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"])
- ],[
-    AC_MSG_ERROR([cannot find -lz library, install zlib-devel package])
---- 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/lftp-4.7.5.ebuild b/net-ftp/lftp/lftp-4.7.5.ebuild
deleted file mode 100644
index 6dac748590dc..000000000000
--- a/net-ftp/lftp/lftp-4.7.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils libtool
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="https://lftp.tech/"
-SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-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"
-IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1:=
-	>=sys-libs/readline-5.1:=
-	dev-libs/expat
-	sys-libs/zlib
-	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn:= )
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		virtual/pam
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	verify-file? (
-		dev-perl/String-CRC32
-		virtual/perl-Digest-MD5
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19 )
-	virtual/pkgconfig
-"
-
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
-	README.dnssec README.modules THANKS TODO
-)
-
-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() {
-	default
-
-	eautoreconf
-	elibtoolize # for Darwin bundles
-
-	# bug #536036
-	printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with idn libidn) \
-		$(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 \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--with-readline="${EPREFIX}"/usr \
-		--without-included-regex
-}
-
-src_install() {
-	default
-	local script
-	for script in {convert-mozilla-cookies,verify-file}; do
-		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
-	done
-}
diff --git a/net-ftp/lftp/lftp-4.8.4-r1.ebuild b/net-ftp/lftp/lftp-4.8.4-r1.ebuild
index ff56e1feb5d7..a814be2121be 100644
--- a/net-ftp/lftp/lftp-4.8.4-r1.ebuild
+++ b/net-ftp/lftp/lftp-4.8.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-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"
+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"
 IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
 RESTRICT="test"
 
diff --git a/net-ftp/lftp/lftp-4.8.4.ebuild b/net-ftp/lftp/lftp-4.8.4.ebuild
deleted file mode 100644
index 2fe153fc40d9..000000000000
--- a/net-ftp/lftp/lftp-4.8.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils libtool
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="https://lftp.tech/"
-SRC_URI="
-	${HOMEPAGE}ftp/${P}.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-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"
-IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1:=
-	>=sys-libs/readline-5.1:=
-	dev-libs/expat
-	sys-libs/zlib
-	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn2:= )
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		virtual/pam
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	verify-file? (
-		dev-perl/String-CRC32
-		virtual/perl-Digest-MD5
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19 )
-	virtual/pkgconfig
-"
-
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
-	README.dnssec README.modules THANKS TODO
-)
-
-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() {
-	default
-
-	eautoreconf
-
-	elibtoolize # for Darwin bundles
-
-	# bug #536036
-	printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(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 \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--with-readline="${EPREFIX}"/usr \
-		--without-included-regex
-}
-
-src_install() {
-	default
-	local script
-	for script in {convert-mozilla-cookies,verify-file}; do
-		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
-	done
-}