Possibly fix bug #235632. Bump to get the older build fixes in for everyone.

(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7-JeR i686)

3 files changed, 69 insertions, 1 deletions

diff --git a/net-ftp/ncftp/ChangeLog b/net-ftp/ncftp/ChangeLog
index b6780e0abaa0..1010adf2f4b7 100644
--- a/net-ftp/ncftp/ChangeLog
+++ b/net-ftp/ncftp/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-ftp/ncftp
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.73 2008/08/25 06:27:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.74 2008/08/25 17:44:00 jer Exp $
+
+  25 Aug 2008; Jeroen Roovers <jer@gentoo.org>
+  +files/ncftp-3.2.2-no_lfs64_source.patch, +ncftp-3.2.2-r1.ebuild:
+  Possibly fix bug #235632. Bump to get the older build fixes in for
+  everyone.
+
+*ncftp-3.2.2-r1 (25 Aug 2008)
+
+  25 Aug 2008;  <>  ncftp-3.2.2-r1.ebuild
+  # INSERT ENTRY HERE
 
   25 Aug 2008; Jeroen Roovers <jer@gentoo.org>
   files/ncftp-3.2.2-build.patch:
diff --git a/net-ftp/ncftp/files/ncftp-3.2.2-no_lfs64_source.patch b/net-ftp/ncftp/files/ncftp-3.2.2-no_lfs64_source.patch
new file mode 100644
index 000000000000..2c9fc7e5d813
--- /dev/null
+++ b/net-ftp/ncftp/files/ncftp-3.2.2-no_lfs64_source.patch
@@ -0,0 +1,20 @@
+--- libncftp/ncftp.h.orig	2008-08-25 18:55:38.000000000 +0200
++++ libncftp/ncftp.h	2008-08-25 19:09:02.000000000 +0200
+@@ -165,17 +165,6 @@
+ #	endif
+ #else
+ 	/* Includes for UNIX */
+-#	if ((defined(__linux__)) && (! defined(_LARGEFILE64_SOURCE)) && (! defined(NO_LARGEFILE64_SOURCE)) && (! defined(_LARGEFILE_SOURCE)) && (! defined(_FILE_OFFSET_BITS)))
+-		/* Define _LARGEFILE64_SOURCE or NO_LARGEFILE64_SOURCE to
+-		 * quiet this warning.  Be sure to define this for ALL
+-		 * code that uses LibNcFTP.
+-		 */
+-#		warning "<ncftp.h> is #defining _LARGEFILE64_SOURCE for you"
+-#		define _LARGEFILE64_SOURCE 1
+-#		define   Stat    stat64
+-#		define   Lstat   lstat64
+-#		define   Fstat   fstat64
+-#	endif
+ #	include <unistd.h>
+ #	include <sys/types.h>
+ #	include <sys/stat.h>
diff --git a/net-ftp/ncftp/ncftp-3.2.2-r1.ebuild b/net-ftp/ncftp/ncftp-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..be24c1a27547
--- /dev/null
+++ b/net-ftp/ncftp/ncftp-3.2.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.2.2-r1.ebuild,v 1.1 2008/08/25 17:44:00 jer Exp $
+
+inherit eutils toolchain-funcs
+
+IPV6_P="ncftp-322-v6-20080821"
+DESCRIPTION="An extremely configurable ftp client"
+HOMEPAGE="http://www.ncftp.com/"
+SRC_URI="ftp://ftp.ncftp.com/ncftp/${P}-src.tar.bz2
+	ipv6? ( ftp://ftp.kame.net/pub/kame/misc/${IPV6_P}.diff.gz )"
+
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6"
+
+DEPEND=">=sys-libs/ncurses-5.2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	use ipv6 && epatch "${DISTDIR}"/${IPV6_P}.diff.gz
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-no_lfs64_source.patch # bug #235632
+	tc-export CC
+	sed -i \
+		-e s/CC=gcc/"CC ?= ${CC}"/ \
+		-e 's:@SFLAG@::' \
+		-e 's:@STRIP@:true:' \
+		Makefile.in */Makefile.in || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc README.txt doc/*.txt
+	dohtml doc/html/*.html
+}