Fix the silent bugfix release and remove patch obsoleted by that bugfix release (bug #241856).

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

4 files changed, 10 insertions, 31 deletions

diff --git a/net-ftp/ncftp/ChangeLog b/net-ftp/ncftp/ChangeLog
index b503980fea3a..d115d97efaea 100644
--- a/net-ftp/ncftp/ChangeLog
+++ b/net-ftp/ncftp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.84 2008/10/07 11:56:13 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.85 2008/10/14 16:18:04 jer Exp $
+
+  14 Oct 2008; Jeroen Roovers <jer@gentoo.org>
+  -files/ncftp-3.2.2-no_lfs64_source.patch, ncftp-3.2.2-r1.ebuild:
+  Fix the silent bugfix release and remove patch obsoleted by that bugfix
+  release (bug #241856).
 
   07 Oct 2008; nixnut <nixnut@gentoo.org> ncftp-3.2.2-r1.ebuild:
   Stable on ppc wrt bug 239102
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 2c1c5c583972..1f3280b6a77e 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,11 +1,10 @@
 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 982 RMD160 d604a12eefc90a465f0df1894832ec9f7fcad21b SHA1 8d7d2e0e8b795a0d460d7b073dee061155205fcf SHA256 912406470d6b9fa1c59b53b4c7d410b5a8f265709e34aa4890938f702adb3f6f
 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-3.2.2-src.tar.bz2 423140 RMD160 c24473c4534891dfa6365e87cf1e42a356b98ebc SHA1 2127457f1148ca6847daf40397b8c0237af4902d SHA256 b800e3a053856938a5eab349d71674761fb628207e383f81ef762f9fe29ec5a7
 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 1087 RMD160 cd9f8a537fcad7c769bed36c428f5b9776ba6df1 SHA1 4c998f749047e82d87dcef1f0073dc036d766c50 SHA256 28a4f7a35c50aeed3b566b1423b73a9624ea258dc4722fa4ed3711d07dc0a864
-MISC ChangeLog 10178 RMD160 6e8fdb2019ad8bdcdfb4649f1b5c91ddc91fdd09 SHA1 192c337f0677e4a8b64e7617b2eb9ea89293e848 SHA256 4e9f7ba5e10c42e5db4c72f3cde5d4e7da3b660e0c3c3acd4ecd329228794fa0
+EBUILD ncftp-3.2.2-r1.ebuild 1021 RMD160 152ddffdddccefcb640360a9e5871e5374f2ed1c SHA1 8a0f18aef64886546281db8de8a7a194fb823719 SHA256 4d608f1f422d59253dcd803bf71b71d6dd510ad5618bdbae50c4eaaf9ce4af9b
+MISC ChangeLog 10389 RMD160 9496de450156e0efb654acf7dd8d731227aaf783 SHA1 713b3127a221a9891ac44b1e40a3187d123fff0a SHA256 19677ea5ce5a875c3ca656923c3b416aac53694ddc9b76320d0eda5ddeca0a96
 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
deleted file mode 100644
index dcdf18b5787a..000000000000
--- a/net-ftp/ncftp/files/ncftp-3.2.2-no_lfs64_source.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix bug #235632: Apparently this code is still triggered on 64-bit systems
-through configure, when configure is dealing with the proper LFS64 stuff
-already (or should allow the glibc wrapper to do so). -JeR
-
---- 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
index a1dd692cfcc6..6b5f914a7de2 100644
--- a/net-ftp/ncftp/ncftp-3.2.2-r1.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2008/10/07 11:56:13 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.2.2-r1.ebuild,v 1.9 2008/10/14 16:18:04 jer Exp $
 
 inherit eutils toolchain-funcs
 
@@ -22,7 +22,6 @@ src_unpack() {
 	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}"/ \