3 files changed, 5 insertions, 71 deletions
diff --git a/net-ftp/ncftp/ChangeLog b/net-ftp/ncftp/ChangeLog
index daefec438fbb..b74ae63a489b 100644
--- a/net-ftp/ncftp/ChangeLog
+++ b/net-ftp/ncftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/ncftp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.95 2009/12/15 19:07:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.96 2009/12/22 22:00:30 jer Exp $
+
+  22 Dec 2009; Jeroen Roovers <jer@gentoo.org> -ncftp-3.2.2-r1.ebuild,
+  -files/ncftp-3.2.2-build.patch:
+  Remove old.
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org> ncftp-3.2.3.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #296364
diff --git a/net-ftp/ncftp/files/ncftp-3.2.2-build.patch b/net-ftp/ncftp/files/ncftp-3.2.2-build.patch
deleted file mode 100644
index a8dcc97b1458..000000000000
--- a/net-ftp/ncftp/files/ncftp-3.2.2-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-The first change makes sure $D/ESTDIR isn't created.
-
-The original build system assumes that in DESTDIR, a mandir (say,
-/usr/share/man) already exists. Using -p may not be compatible, but then again
-this is a Gentoo specific patch. -JeR
-
---- Makefile.in.orig	2008-08-25 05:29:02.000000000 +0200
-+++ Makefile.in	2008-08-25 05:30:41.000000000 +0200
-@@ -43,8 +43,8 @@
- 	@( cd ./ncftp ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" )
- 	@( cd ./sh_util ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" )
- 	@( cd ./vis ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" )
--	-@test -z "$(DESTDIR)" || mkdir -p "$DESTDIR" 2>/dev/null
--	-mkdir "$(DESTDIR)$(prefix)" "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(SYSCONFDIR)" "$(DESTDIR)$(mandir)" "$(DESTDIR)$(mandir)/man1" 2>/dev/null
-+	-@test -z "$(DESTDIR)" || mkdir -p "$(DESTDIR)" 2>/dev/null
-+	-mkdir -p "$(DESTDIR)$(prefix)" "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(SYSCONFDIR)" "$(DESTDIR)$(mandir)/man1" 2>/dev/null
- 	-@echo '..... Installing the programs .....'
- 	$(INSTALL_PROGRAM) bin/ncftp@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftp@EXEEXT@"
- 	$(INSTALL_PROGRAM) bin/ncftpget@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftpget@EXEEXT@"
-@@ -52,7 +52,7 @@
- 	$(INSTALL_PROGRAM) bin/ncftpls@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftpls@EXEEXT@"
- 	$(INSTALL_PROGRAM) bin/ncftpbatch@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftpbatch@EXEEXT@"
- 	-@test -f "$(DESTDIR)$(BINDIR)/ncftpspooler@EXEEXT@" && echo /bin/rm "$(DESTDIR)$(BINDIR)/ncftpspooler@EXEEXT@" && /bin/rm "$(DESTDIR)$(BINDIR)/ncftpspooler@EXEEXT@"
--	ln "$(DESTDIR)$(BINDIR)/ncftpbatch@EXEEXT@" "$(DESTDIR)$(BINDIR)/ncftpspooler@EXEEXT@"
-+	ln -s "ncftpbatch@EXEEXT@" "$(DESTDIR)$(BINDIR)/ncftpspooler@EXEEXT@"
- #
- # The visual programs are only built if a working Curses was found.
- #
diff --git a/net-ftp/ncftp/ncftp-3.2.2-r1.ebuild b/net-ftp/ncftp/ncftp-3.2.2-r1.ebuild
deleted file mode 100644
index 079f3592cbb9..000000000000
--- a/net-ftp/ncftp/ncftp-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 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.11 2009/03/03 18:16:45 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"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use ipv6 && epatch "${DISTDIR}"/${IPV6_P}.diff.gz
-	epatch "${FILESDIR}"/${P}-build.patch
-	tc-export CC
-	sed -i \
-		-e s/CC=gcc/"CC ?= ${CC}"/ \
-		-e 's:@SFLAG@::' \
-		-e 's:@STRIP@:true:' \
-		Makefile.in */Makefile.in || die
-}
-src_compile() {
-	LC_ALL="C" econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc README.txt doc/*.txt
-	dohtml doc/html/*.html
-}