Version bump #187528 by Elias Pipping and Timo Gurr.

(Portage version: 2.1.3.11)

4 files changed, 113 insertions, 1 deletions

diff --git a/net-ftp/ncftp/ChangeLog b/net-ftp/ncftp/ChangeLog
index b69c7c270b48..b048ec5252a5 100644
--- a/net-ftp/ncftp/ChangeLog
+++ b/net-ftp/ncftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/ncftp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.54 2007/07/26 05:49:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.55 2007/10/06 12:37:47 vapier Exp $
+
+*ncftp-3.2.1 (06 Oct 2007)
+
+  06 Oct 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/ncftp-3.2.1-build.patch, +ncftp-3.2.1.ebuild:
+  Version bump #187528 by Elias Pipping and Timo Gurr.
 
   26 Jul 2007; Mike Frysinger <vapier@gentoo.org> ncftp-3.1.9.ebuild,
   ncftp-3.2.0.ebuild:
diff --git a/net-ftp/ncftp/files/digest-ncftp-3.2.1 b/net-ftp/ncftp/files/digest-ncftp-3.2.1
new file mode 100644
index 000000000000..e406e427df7a
--- /dev/null
+++ b/net-ftp/ncftp/files/digest-ncftp-3.2.1
@@ -0,0 +1,6 @@
+MD5 d82cdfe0d5448172c03b434607414fb8 ncftp-3.2.1-src.tar.bz2 419122
+RMD160 b56243d235dca2d49b317016fcdab77855aa5ac9 ncftp-3.2.1-src.tar.bz2 419122
+SHA256 834375c760a826b953c783f56c5d72ef57f9b1450b9bb738fc00b7b1aab7dec7 ncftp-3.2.1-src.tar.bz2 419122
+MD5 e68dc443e5817a62bbae68d647fd9b4e ncftp-321-v6-20070822.diff.gz 37628
+RMD160 7fd73d31ab41c4b45e65d5c8121bff007b3e9394 ncftp-321-v6-20070822.diff.gz 37628
+SHA256 89974a3f5ceede51a0baf60079e4dc011ce65b5529117af439dc6cb46a0ce963 ncftp-321-v6-20070822.diff.gz 37628
diff --git a/net-ftp/ncftp/files/ncftp-3.2.1-build.patch b/net-ftp/ncftp/files/ncftp-3.2.1-build.patch
new file mode 100644
index 000000000000..23fac81a7203
--- /dev/null
+++ b/net-ftp/ncftp/files/ncftp-3.2.1-build.patch
@@ -0,0 +1,65 @@
+Fix DESTDIR and parallel build bugs
+
+http://bugs.gentoo.org/147371
+
+--- ncftp-3.2.1/Makefile.in
++++ ncftp-3.2.1/Makefile.in
+@@ -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)" "$(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.
+ #
+--- ncftp-3.2.1/sio/Makefile.in
++++ ncftp-3.2.1/sio/Makefile.in
+@@ -180,6 +180,7 @@
+ SClose.o: SClose.c $(SYSHDRS_DEP)
+ SConnect.o: SConnect.c $(SYSHDRS_DEP)
+ SConnectByName.o: SConnectByName.c $(SYSHDRS_DEP)
++SError.o: SError.c $(SYSHDRS_DEP)
+ SNew.o: SNew.c $(SYSHDRS_DEP)
+ SRead.o: SRead.c $(SYSHDRS_DEP)
+ SReadline.o: SReadline.c $(SYSHDRS_DEP)
+--- ncftp-3.2.1/libncftp/pch.mk.gcc-gch
++++ ncftp-3.2.1/libncftp/pch.mk.gcc-gch
+@@ -1,5 +1,6 @@
+ syshdrs.h.gch: syshdrs.h ncftp.h ncftp_errno.h util.h ftp.h
+-	$(CCDV) $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) syshdrs.h
++	$(CCDV) $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) syshdrs.h -o .tmp.$@
++	mv -f .tmp.$@ $@
+ 
+ PCH=syshdrs.h.gch
+ SYSHDRS_DEP=syshdrs.h.gch
+--- ncftp-3.2.1/libncftp/Makefile.in
++++ ncftp-3.2.1/libncftp/Makefile.in
+@@ -354,3 +354,6 @@
+ 
+ u_unmdtm.o: u_unmdtm.c $(SYSHDRS_DEP)
+ u_unmdtm.so: u_unmdtm.c $(SYSHDRS_DEP)
++
++u_feat.o: u_feat.c $(SYSHDRS_DEP)
++u_feat.so: u_feat.c $(SYSHDRS_DEP)
+--- ncftp-3.2.1/sio/pch.mk.gcc-gch
++++ ncftp-3.2.1/sio/pch.mk.gcc-gch
+@@ -1,5 +1,6 @@
+ syshdrs.h.gch: syshdrs.h sio.h usio.h
+-	$(CCDV) $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) syshdrs.h
++	$(CCDV) $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) syshdrs.h -o .tmp.$@
++	mv -f .tmp.$@ $@
+ 
+ PCH=syshdrs.h.gch
+ SYSHDRS_DEP=syshdrs.h.gch
diff --git a/net-ftp/ncftp/ncftp-3.2.1.ebuild b/net-ftp/ncftp/ncftp-3.2.1.ebuild
new file mode 100644
index 000000000000..f38504c32330
--- /dev/null
+++ b/net-ftp/ncftp/ncftp-3.2.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.2.1.ebuild,v 1.1 2007/10/06 12:37:47 vapier Exp $
+
+inherit eutils
+
+IPV6_P="ncftp-321-v6-20070822"
+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 #147371
+	sed -i \
+		-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
+}