Fix building against sys-libs/ncurses[tinfo].

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

3 files changed, 63 insertions, 7 deletions

diff --git a/net-ftp/ncftp/ChangeLog b/net-ftp/ncftp/ChangeLog
index 09d5e4476a4c..421934342f0a 100644
--- a/net-ftp/ncftp/ChangeLog
+++ b/net-ftp/ncftp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/ncftp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.141 2013/04/14 14:55:08 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.142 2014/01/02 13:36:35 jer Exp $
+
+*ncftp-3.2.5-r3 (02 Jan 2014)
+
+  02 Jan 2014; Jeroen Roovers <jer@gentoo.org> +ncftp-3.2.5-r3.ebuild:
+  Fix building against sys-libs/ncurses[tinfo].
 
   14 Apr 2013; Jeroen Roovers <jer@gentoo.org> -ncftp-3.2.3.ebuild,
   -ncftp-3.2.4.1.ebuild, -ncftp-3.2.5-r1.ebuild:
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 4c381511e1a2..4e863099b175 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -4,12 +4,13 @@ Hash: SHA256
 DIST ncftp-3.2.5.474.tar.bz2 454682 SHA256 b4ebe2415761a5137cd1d313c8fc1352f26d8963cc9e9e354e29720aa2089d42 SHA512 ebd7f618e5a9ac5e59f3e3dbf9b15765e80404416865212c0b2ee7339aafe2296867faf02fad2084e5a6377796e787d5cfc6599ec3f0e544c6b137734cfdc405 WHIRLPOOL 4b9c0a6bc5b90149d3a1b9ea24dea030faefa4dfe9e361c7694a2e1f133182bf85e46041de209a9a34d7be81b70870298c718a19dd41458dbc9c90283478cfd8
 DIST ncftp-325-v6.diff.gz 23295 SHA256 7fb95240c33aeca67e53be58f6016a7e1dcd753b125940f539dab7595e0d02ba SHA512 6e2e740fba2c2b5268ab5928db979ac813bd29dd76633603d69d747fdf765858e1de893a6067518b0b1f01d0b90d8d6426998f5d9b37bbbebe144951878e2b0a WHIRLPOOL 2f7868bdc0e74707a0b0e2e8a2a1b7d0634fd86ff440e5046a48d5b01c1efb86621a5844d56b0e8793d243fa1a998b6136d147a1a9aeeb95c00e1d312415ebb6
 EBUILD ncftp-3.2.5-r2.ebuild 1224 SHA256 9bfb6b4a2c88aea77cf538710760c20a4428f4ac377d71b3e6b011a5a0a5f8c7 SHA512 dd63f68c64b78bcfd5f2e7bd8e37775014417580e1669886d224bbfde48f4d0abbc157e53e8fd8ca60bb83c40e976947ab70a2660421da84604dcbbd2b06b7f2 WHIRLPOOL ac02a352f791e956a7bfebfac80266af20e4d469bff501ac86bccc91e300087db5cfa9c0e5c27e62e13c6b16e30a25adae30549857b22e0cf6b46af319a57d10
-MISC ChangeLog 16617 SHA256 e1ac1253d24780796eff0da638f87fb3b26bb48a80f251f36d3409f27849ba2f SHA512 5cb2076d8f3e9684788c1ce050e5afa459fc361e22f76318c8a226fd042bfd3ef84e3bfb355b027bcdeb15b3b5de2de1a5529cceec70ac8b0d0254a8a305b9d3 WHIRLPOOL 15b6d88305f514951a0e4639f3338c8060abdffa3ddc7de5bf49a00b3c46a7992655a73dc20272d11e6c72276f6d1cfe0b58868a798713cf9b41f76657ae08e4
+EBUILD ncftp-3.2.5-r3.ebuild 1283 SHA256 c7e5e861adb6754d8b40f612eb6cb1a58bf6a09076b66baf65d160e650a073c9 SHA512 a8d91d69bcc9f3ac398b85a6ad6f88170aefb5fe83b2e7fe59626462dabdf210d680041d8e67a9c63c4dc51d4f741d8a857abaa69b5b3d13383e52216749358c WHIRLPOOL 7d9dcb5fa1f1d9d1b503ea364ba72c31586a229bbf5b328316c0eeceb4a3561518d702198589d52bac5c7449af1f335c3b620f5e83bb67bccaf7019b9788ee43
+MISC ChangeLog 16768 SHA256 a4bc6315d20121f4301197c0a597c83f8beeb610a951012af9ec7db8dcebada9 SHA512 27216eb5c5e3e496c91c56dd4c55f847ac5aed0441c56f1923247b00546aca835db00671c9363d82ddf3de15e9161fb00502dc16cfc2261d075ec5b44ee1bfc1 WHIRLPOOL 2cdb414496a3b973ff83cbdab795576ee1644a0c731058d5bee2bb0f28baede870ff446fb4c139295adf9be5c493ea62b3183747aca2f9bd180e3e9318c9650d
 MISC metadata.xml 724 SHA256 72e694105394441c9e1d4bb2dc19095e905c30f3d1d755583aca84ab19bda11a SHA512 b0f552c9883f33d3108c52cbfea26c2491e01fbe021e5dbb9727a15888eba2cb0b02b4ed963ef147cb5cf88d510f26bd021f105ce6cf7d0d0265207003564754 WHIRLPOOL faa2082024c486a7c94d532364b89179d0f8c84145f4707b2cb5cabf6aee2b7e221c7c27adeed106a0f099fce6dd34e0757b1a1420770698292810259709d901
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlFqw00ACgkQVWmRsqeSphMz2ACeKFxEj2pemHG7RY8ul2NCKAvB
-t9kAnRtX3roXBth+kTz58z/SA6CMuIcf
-=1TdR
+iEYEAREIAAYFAlLFa2QACgkQVWmRsqeSphO3pgCeK6S4dORZMngS9qrBDEmMyCPi
+WoYAn3AMYZ3Yx31JhBRye0iQf7mpiLu8
+=7qgT
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/ncftp/ncftp-3.2.5-r3.ebuild b/net-ftp/ncftp/ncftp-3.2.5-r3.ebuild
new file mode 100644
index 000000000000..1cfc492e5a8f
--- /dev/null
+++ b/net-ftp/ncftp/ncftp-3.2.5-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.2.5-r3.ebuild,v 1.1 2014/01/02 13:36:35 jer Exp $
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="An extremely configurable ftp client"
+HOMEPAGE="http://www.ncftp.com/"
+SRC_URI="
+	ftp://ftp.${PN}.com/${PN}/${P}-src.tar.bz2 -> ${P}.474.tar.bz2
+	mirror://openbsd/distfiles/${P//.}-v6.diff.gz
+"
+
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+IUSE="ipv6 pch"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/.474}
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P//.}-v6.diff
+	tc-export CC
+	sed -i \
+		-e "s:CC=gcc:CC ?= ${CC}:" \
+		-e 's:@SFLAG@::' \
+		-e 's:@STRIP@:true:' \
+		Makefile.in */Makefile.in || die
+	AT_M4DIR=autoconf_local/ eautoreconf
+}
+
+src_configure() {
+	LC_ALL="C" \
+	LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
+		econf \
+		$(use_enable ipv6) \
+		$(use_enable pch precomp) \
+		--disable-ccdv \
+		--disable-universal
+}
+
+src_install() {
+	default
+	dodoc README.txt doc/*.txt
+	dohtml doc/html/*.html
+}