Add live ebuild now that dev-libs/gnulib is fixed.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 116 insertions, 18 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index fd2d7dca6612..648ad974ae63 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.486 2014/10/10 10:56:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.487 2014/10/10 15:31:40 jer Exp $
+
+*lftp-9999 (10 Oct 2014)
+
+  10 Oct 2014; Jeroen Roovers <jer@gentoo.org> lftp-4.5.5.20141003.ebuild,
+  +lftp-9999.ebuild, +files/lftp-4.5.5-am_config_header.patch:
+  Add live ebuild now that dev-libs/gnulib is fixed.
 
   10 Oct 2014; Agostino Sarubbo <ago@gentoo.org> lftp-4.5.5.ebuild:
   Stable for x86, wrt bug #523654
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 9d352e1cc6dd..150137fdd253 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -5,6 +5,7 @@ AUX lftp-4.0.2.91-lafile.patch 976 SHA256 b54aac35c297657290a2d9571c38bdc4bf5154
 AUX lftp-4.3.5-autopoint.patch 330 SHA256 5aa4d9b739ffcc9a500988a7c80ca6a192d4ef440bea27278d87a27da50bf909 SHA512 7d7f0628bfe817fb9fb10d36f85f729f2e0b8ae3a6b6c9e719469a109b08b65a465c6d313cbe8a8115e9bc036e07347b6f5df0aa3067f905690b221d4bdf3318 WHIRLPOOL 91a8be4feed34ffd3f9d6ea2eb44968420d8cb57c494520b0ce8fb3f40cce85d136e8b2124eac7fcadbb8c9e1187b9fa6c9256f360079ac41eeb693cc5298c3a
 AUX lftp-4.3.8-gets.patch 430 SHA256 20f3f931132aae70c6dc8b03368419951bb4ec9f0d4cfcaf5966db3c6689da35 SHA512 24e61ec6784fdf95b5df75ed29680465e9fac87f9b79eaf4a9156a32c66afd4db5b905c7e29789a8a0e0d7c6b4c782b1f749e52d4c9547c96c1b79834c2a750a WHIRLPOOL 399f1a0714ada86a47a567d49a1d093b4900847fb38994e9adbc95c82d879e061d057945d66a0f26a6015c3737f586e6b83da8d1d5b30f7f103fc4d2e2ee523e
 AUX lftp-4.5.3-autopoint.patch 333 SHA256 36d84c281ecf244cfcd53231ace3085ee1ffccc28083d56c1bf0023d70ce3ac9 SHA512 33ce25fb283dd6d3e760166a718de16ee59a5190202e005f80a970cadc033e90dce5f2d0c848893304a9458c44f8a79bca3084a14db5484e1a739e52dd8aee3f WHIRLPOOL dcfee41610952d394cf8182417ce3abd215368f4f8c58704f381b87c1134e99c4b84279e9e47a47fec4a7550789287deb022ae9e103920d7965d5cf8fc407765
+AUX lftp-4.5.5-am_config_header.patch 306 SHA256 7ab090449f8c26624ebe853a0285954c414e31242fcd3db1026bd88d6ebbd6a0 SHA512 613c0942ec5c4b9de38b6020eddcfcbe91ad6febd176b2953503ee47c82a11a9ed661b442127b25383d1f6593df0ce6837229939ec48da5c36079b145ab488b9 WHIRLPOOL 3d2c0fccdf6f13ed9176bb99c9da13601fd6e8a04c46c6dc62a215334fa7531e684ffcdcbf769a6df7ab14f5e49e3bafecdcab09f990a3202cd1e079917f48ea
 AUX lftp-4.5.5-no_ssl.patch 220 SHA256 cc9c6a7e53a1719e8a901f0d1150c1729ab43d5819f33bef6a5666ec489fa0f8 SHA512 58ded48c131da0464f520b1a9e61ce9477f04f36be6ec19d68ec6b5b382518de081f84b255e17b1121574f7ff2be324930399812cfc98bdaa8f455dd6f79f81b WHIRLPOOL 06ba39bc63b5d458f0cf575dea1384b003759ed7f540b9516acac0178066a48f38db9b33c9435ca8b4bf41eda453670681882fef1adb02951979415ab7f08acb
 DIST lftp-4.4.15.tar.xz 1460568 SHA256 75f40b7ab438a7b295410eb3e1ec8460e36ad2d48785383a6fc9201905db6868 SHA512 1d828a7b2ff808a0ee78f51c265d58df677e67cec9b4744cbd3a34816aba324199202094fa4144665e8d64385df7e76a54c6dc415e9ff33e97adab2eb0edaf4e WHIRLPOOL 3bf4d220b5581d87fb34d72f6129c2d660f80e3142560543c238dfaafd8cde5834f57884247c75e583ab6a9d4c12766b28c90e2b49889e44759d663591bbc7e0
 DIST lftp-4.5.3.tar.xz 1493124 SHA256 62e87621d86b4feb810a1385769f1ae905da545c0939b0a4ba49a70962945d8c SHA512 cff9d5dae7317fa83fc72f7a547ca18c23413912c45d381577c2324a7431fad82f26fbb04f6663c55dd2005a5c9ec1a6abf7c933e3ff003bfa3e73259aaed8e7 WHIRLPOOL 88f5d98e3daebd0ae252b81d17eec4cf37ab4344afa7214ba68ce68b073077d8abee98d1b445473af417aad53ee1b8479b1bed8dc05a632f696f0ccb2450a40e
@@ -14,24 +15,15 @@ DIST lftp-4.5.5.tar.xz 1495660 SHA256 a25d768aa78e0a8d0a2e89eeeae9185793d94ccd9e
 EBUILD lftp-4.4.15.ebuild 2180 SHA256 86fd77a33d87445b33a18ffc617871080a4f40d6d32c39ed156327c26bb533d6 SHA512 716d5474e57dfe426d3afe98f7894ecc2900587ef2545d7fd065831130be13302444e86b42a25e7e160aa738b741ecf1dd4c4a5279138a5a4bc734b659aec059 WHIRLPOOL 6367be65c99a2825c6aa3113ce26d25535eac6ba07d1220c79660d721bc957ff08c6466334e76b5269259f6bc490d8189a014d3d7f4af68852ef0c6539dbb8da
 EBUILD lftp-4.5.3.ebuild 2195 SHA256 8d38ff227c74fa4904b4db91a5ca0ca114497bcca6934efb3dab8cbe3418f720 SHA512 5667a9fd746045c32e49a65058f5b7913afbcb9261b77e5d7f1d9002217f0685dc6a291ffe06ea033f5b6b5a18ae75dc34144f44a84b015960461ec3bab273e8 WHIRLPOOL 0911507170699fa2649a66dcf23a97b85afa7eb28f215ab082e661604e0eb77d4338e32bca7732ea9c9ef5a68857cdc89eb3888628e50a86d33bdb372d21e52f
 EBUILD lftp-4.5.4.ebuild 2191 SHA256 18582df426805c857399c1c78f9cf334370f8cd1f153279c2d74e003ad7b5d51 SHA512 718c6bfed90d7a3b376221f5ade17878d3141b5ff4e3e4ff24539245df5d45a2ebe7bbea6815a36e674943bf0cd3e6a93beffa3f8a2fc816497bd46ac2f57ece WHIRLPOOL df6f8e54f3efc76c065bc8dafefd086fecbcaae7f2fab39dfbcea892785994771eee77aa96661007858400a38e7771268ab2222fa1c2a33c2a3b044dddcdc616
-EBUILD lftp-4.5.5.20141003.ebuild 2025 SHA256 49ac92f1f085510199aabb5a546179bcad97d9fddb23a708178cf506c719744d SHA512 b774b227e7ee0210ff7d6506f1db7e4d8c2a1f1ab262d0a7e7aec3db03fb4b83e556681b89b9c05b934ea90b7ad4a53ff0c9a0afcc387f6a666b44a7d9ae2d2b WHIRLPOOL 1b32efbd69e147bba6124360b26544a59eddb2bcd97f280aba6509f8615c56a3b238829f22bfcd646c4f37871b279e9a61cb593bcd04684736bc6d066df3c3b7
+EBUILD lftp-4.5.5.20141003.ebuild 2071 SHA256 3c287db3ebba56e40272339c74a05f86f6363e103e5b9c8e3ea29a56cbce7743 SHA512 843d2f573e62793b6c8beb1a7ff9bb3195626c843e64403535498be07bf8d092b6c423aa33bed5650768e649cb14989d144419627dc0f581ab84c2f48fd1f4d6 WHIRLPOOL b8ca9dfd7df3c52c655add3695f215e8684e3987391cf8c87abfb87e0653327f02c86f2e3d6721c36fe51158f344a01ccfed92fd54accdc467789036a3ab75cc
 EBUILD lftp-4.5.5.ebuild 2230 SHA256 75e3eaf2a03f90e7ce7874f8b9dacf2866b1e7e9b703899affb213e97dd82648 SHA512 673ba9489f6d66a555b5edfe6a5199c462dbb42a851bddd870ee7c3de7e1365e0c70dfe6c841fa0e49e8e4526307b58698c42c6d745c4b88e87e817877a0cdea WHIRLPOOL 1d650c682d21b68c5b56ffde17d4e2221bc43240ffffff8077295c119d87a17a9aad035eb29e946dae4be87c5bc46c2800b0eb7ebfef6c3fce66d4f4556bdd24
-MISC ChangeLog 60866 SHA256 cc1c36aa1d299e48939bb174fe3ec4907189186dbfb11d561bd526d2453ba920 SHA512 497bd629209e9b14729768d35017aa1d710069671ad6762803759667405b9c0fdd62168503248f8214746883b49d1b48006fe2accd37ac02b13d1daeb32f2b91 WHIRLPOOL feaeed60157b7b4c2f0d0b78b4c0ac8befca99e3c56c28d363ebe237d3766fe88cf5ff1acaa3cdc58b781d9a4ef1892a31c6131cdb1a4918a165f4a301e2b923
+EBUILD lftp-9999.ebuild 2011 SHA256 a26c733f2d38acfcff395450c2482641f3786efdf72ad851161a5012068318d0 SHA512 4c8ba7fe50eda255f0a8c41a08f230802fe8c813201eb2831b574809b1ebdc32f0084ae4eff75bf994725ae95677ac71b6f601f29a9da0d29d11c2d39c806a4c WHIRLPOOL 7aa6fbd216a83a06fab640d1e1179772fe37685ade1e183926e0e576cbb4aa84c1b56aede68ebf35c8544cf58fa1bfe7a1afe8e11bce53650e8ca7981d473b16
+MISC ChangeLog 61084 SHA256 534f67046986551046c505f1c305f8c6fb5a654b786f1112d48402724805cabd SHA512 7181faa563ff10833810c4a683101c879007aa5a8dd449edda8899ca1c566f638fa19030b9fbdf324f0a8599a62881aacd0cba4a5f937498ea8cbc31608e4b61 WHIRLPOOL 7704f4ff62dd96077e9cf4346d889a09319bd59d5ad6fa048b44e624ac8f9171c3d12a156aa24ebc7bc554fa4dc3ddc134e0b959b158311f924a502e541a0baa
 MISC metadata.xml 531 SHA256 ce1a5e5ed227a35582fbc8cae768a0f6b7769ac49194197926882f47600b519f SHA512 6058e3d0fbf8032fc97c48d9742afea487ac89bbe88281e4a4fd392018a42c7ff5bab39b7f01b16c70bd24735cf3b6b9ea613f957f71075f095cf3b109516cd5 WHIRLPOOL cc07076f948d4cbd81a4bd799c8e5f4a06f5665a732034456778d51c7bdd8486c04cd55bfdbdf85f013379f231b535508e46572b191a7bd30d04f6692b0647c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUN7tBAAoJELp701BxlEWfIY4P/iAPO/hzXed/7h8A9JtORXMd
-ZmkRyDMcn6dsvzFWYmEbYDQ4hKR1G9shTG8kSvfp9PCr84Baof9cRSNgBtxVyQE5
-IKKlXPtcbYB6ah10Z0qmFqv0YeqaUJLqSXZjgliMtW81umHhvO2x+Hxn937DzQMk
-hZnLBLPt4rf7BzUTzCoXyIWoYT/RPdlW/HbO9WdC1JeX1v938p3cRHpgUosbeOLX
-SNhJ8IodW/D9DBRdit0Mrh2R2VPbBknxnS5b3nEjvqbhloB/w+5Dtv0rT9nfdmVB
-STkPjhW+rjTcwlBbLMr1fatqxI2Z+qSlLeAaCM3Xj4N16BzXXtMRrkgg5mqRgh5U
-PK7PrmDaGsFZlScMhOfDb4v6yK53D21ptV5EpjkguAzpUesk/r/3tT6iDw5RSgaB
-dp4HlL1kThr2hqT1aOzfCTTRb1LpshZz2s4H0uvTn/SlosVEQMqXoXRGMwoM++qp
-9dJJ/SNJxznjffflxI1RTLjr9PE+hJounff/WV+ueGPS325hlvhWQM7MIGcXfwn5
-s5421t3Hfb12a2XO9EV9bsibQ3R1NCnmJV2MwxMzGN8+5XE55Su8IKISNPEvQKFA
-+nw6SsaiedDue9gevXEvtowxOkmIq5sT89BoyQRMjbNvMovz3eeuNKwIRTKqi5cL
-ba0iGdrLvcDe8QkYGLx1
-=c6GI
+iEYEAREIAAYFAlQ3+94ACgkQVWmRsqeSphP6swCfZXXLEenccGXwWewPommGYJ+Q
+lGkAn06oX5CXpIkCTvLk2Lwq3Mi/vzyq
+=uWqs
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/files/lftp-4.5.5-am_config_header.patch b/net-ftp/lftp/files/lftp-4.5.5-am_config_header.patch
new file mode 100644
index 000000000000..28a9e80504a5
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.5.5-am_config_header.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,7 +5,7 @@
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_LIBOBJ_DIR([lib])
+ AC_CONFIG_SRCDIR([src/ftpclass.cc])
+-AM_CONFIG_HEADER([lib/config.h])
++AC_CONFIG_HEADERS([lib/config.h])
+ AM_INIT_AUTOMAKE
+ 
+ dnl This doesn't *require* GNU extensions; it merely enables them if
diff --git a/net-ftp/lftp/lftp-4.5.5.20141003.ebuild b/net-ftp/lftp/lftp-4.5.5.20141003.ebuild
index 48350bef1ead..15bebe99a848 100644
--- a/net-ftp/lftp/lftp-4.5.5.20141003.ebuild
+++ b/net-ftp/lftp/lftp-4.5.5.20141003.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.5.5.20141003.ebuild,v 1.1 2014/10/07 07:15:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.5.5.20141003.ebuild,v 1.2 2014/10/10 15:31:40 jer Exp $
 
 EAPI=5
 inherit autotools eutils libtool
@@ -58,7 +58,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch \
 		"${FILESDIR}"/${PN}-4.3.8-gets.patch \
-		"${FILESDIR}"/${PN}-4.5.3-autopoint.patch
+		"${FILESDIR}"/${PN}-4.5.3-autopoint.patch \
+		"${FILESDIR}"/${PN}-4.5.5-nls-socks.patch
 
 	sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
 	eautoreconf
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
new file mode 100644
index 000000000000..b1870be31e75
--- /dev/null
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-9999.ebuild,v 1.1 2014/10/10 15:31:40 jer Exp $
+
+EAPI=5
+inherit autotools eutils git-r3 libtool
+
+DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
+HOMEPAGE="http://lftp.yar.ru/"
+EGIT_REPO_URI="https://github.com/lavv17/lftp"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="convert-mozilla-cookies +gnutls nls openssl socks5 +ssl verify-file"
+LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
+IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	ssl? ( ^^ ( openssl gnutls ) )
+"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1
+	>=sys-libs/readline-5.1
+	dev-libs/expat
+	sys-libs/zlib
+	convert-mozilla-cookies? ( dev-perl/DBI )
+	socks5? (
+		>=net-proxy/dante-1.1.12
+		virtual/pam
+	)
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-1.2.3 )
+		openssl? ( >=dev-libs/openssl-0.9.6 )
+	)
+	verify-file? (
+		dev-perl/string-crc32
+		virtual/perl-Digest-MD5
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-libs/gnulib
+	=sys-devel/libtool-2*
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+DOCS=(
+	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
+	README.dnssec README.modules THANKS TODO
+)
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch \
+		"${FILESDIR}"/${PN}-4.5.3-autopoint.patch \
+		"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
+
+	gnulib-tool --update || die
+
+	eautoreconf
+	elibtoolize # for Darwin bundles
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gnutls) \
+		$(use_with openssl openssl "${EPREFIX}"/usr) \
+		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
+		--enable-packager-mode \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--with-modules \
+		--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
+}