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

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7-JeR i686

4 files changed, 72 insertions, 2 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/Manifest b/net-ftp/ncftp/Manifest
index f81c0384de8f..db487430a7fa 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,10 +1,12 @@
 AUX ncftp-3.2.1-build.patch 2769 RMD160 1767f7d934b485d3184493e37fdba4368e33befa SHA1 29361ad9d5e35ddb1f165bc01060bf6819622cfa SHA256 4fcb8d303dc7db269ce700cffcaa76943afbbd72361ac28029113a485887dfde
 AUX ncftp-3.2.2-build.patch 1711 RMD160 d99cdc320b8bbb50d213fa3f11e9b59b34d44c14 SHA1 24e489eb28034b3f6a30d470796388381bc07672 SHA256 93228d593d60e5597e646f2177c1dff4180b76f09d4440bf8f2312d092291a78
+AUX ncftp-3.2.2-no_lfs64_source.patch 774 RMD160 2bd9e5e07eb1c4870f3a24da81a9e183c74fc85a SHA1 4e26896870dd9c7bd740d63e413d920e708828e5 SHA256 46c261e5b7e9cc8049329a74d0a286def3b6e5764c2a38b74c0e0a70f7661e48
 DIST ncftp-3.2.1-src.tar.bz2 419122 RMD160 b56243d235dca2d49b317016fcdab77855aa5ac9 SHA1 6c1f19531ade7fbe19174aa48cf5940830ced7f7 SHA256 834375c760a826b953c783f56c5d72ef57f9b1450b9bb738fc00b7b1aab7dec7
 DIST ncftp-3.2.2-src.tar.bz2 422824 RMD160 36e01e369abebe55836be504b3eb43ef3c12f42b SHA1 913df52ee99fee3e28728177ec8496325e82118f SHA256 c369e913bc7e9f0b0794e12ace714d211d00f80a7011d4ec1b4f90a6195df260
 DIST ncftp-321-v6-20070822.diff.gz 37628 RMD160 7fd73d31ab41c4b45e65d5c8121bff007b3e9394 SHA1 044e41bfc4fa0acac9e59a69c26ccda1834acaf7 SHA256 89974a3f5ceede51a0baf60079e4dc011ce65b5529117af439dc6cb46a0ce963
 DIST ncftp-322-v6-20080821.diff.gz 39856 RMD160 d82a99c82733f042f78c23ef3d13c67ad74c461d SHA1 002711ef230b7e55bce289a73402870e56d432a7 SHA256 e35028709f62eb4aa2cd7ae827b4134461f7ad995d6d360d5b78e3494df4e194
 EBUILD ncftp-3.2.1.ebuild 1024 RMD160 ce4e3ecb1ff793cf6b2408ec1e73b1e0ea095622 SHA1 4f6318fe2459f7a3baec45c1dc9815e5a6c25349 SHA256 399c2bc90f687c1c5b1565134b96f6fa173df53aaf4159bbae7007347ec04fdb
+EBUILD ncftp-3.2.2-r1.ebuild 1092 RMD160 05632346f34eba4c7c2cde5f9f2b5bbb930f6412 SHA1 23f9a448a5e0ce0ab01e9b9882ab18244c88d217 SHA256 13969f096d1a2edfb47c2142e55cd8572727ee98681ec6cf001dcfe8bccf7080
 EBUILD ncftp-3.2.2.ebuild 1026 RMD160 453f088d3ab683141ba6b443634687964b12e83c SHA1 ac464ce0da126e9bef5b2ce656c90199455db267 SHA256 96b42a709baef3fb5259d8395f8a5d85956bd92aa9191d5f29feeed05fbf4203
-MISC ChangeLog 9034 RMD160 f39bd556f88a79b0fb93718d56d5f845f0938232 SHA1 ecf5bd344fea29b3c5b5f7447bc102c85012ba8e SHA256 1fcec577b0b090a62aedc9f4171b4ee46457d4f63392a942b3dcaa4587afdc63
+MISC ChangeLog 9327 RMD160 d999f7fe24f84ed29c6f07d2fab3665374db4624 SHA1 39c5f3d45b7295aafece7941bb2a63e316e88f76 SHA256 d142346e7e5ab3d74e5fc0ad4acd32ab078f50f82acc610b8b74affa95725d30
 MISC metadata.xml 712 RMD160 52a767f758cb937ccb366f47ae5907d6bcdb3ad3 SHA1 dfbfd7ea89cd094f84ec7e6d52752740aba52fa2 SHA256 1572d420deed521bf43bcda24c87973cf68f43566100ea8a9c4d3eb134e033ac
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
+}