re-sync with gentoo-x86, fixes bug 256408

(Portage version: 2.2.00.12528-prefix/svn/Linux x86_64)

3 files changed, 1 insertions, 109 deletions

diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 58a2e8e2a7..dd4fcc2642 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,10 +1,6 @@
-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
-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-3.2.2-src.tar.bz2 423140 RMD160 c24473c4534891dfa6365e87cf1e42a356b98ebc SHA1 2127457f1148ca6847daf40397b8c0237af4902d SHA256 b800e3a053856938a5eab349d71674761fb628207e383f81ef762f9fe29ec5a7
 DIST ncftp-322-v6-20080821.diff.gz 39856 RMD160 d82a99c82733f042f78c23ef3d13c67ad74c461d SHA1 002711ef230b7e55bce289a73402870e56d432a7 SHA256 e35028709f62eb4aa2cd7ae827b4134461f7ad995d6d360d5b78e3494df4e194
-EBUILD ncftp-3.2.1.ebuild 1031 RMD160 1c99c6dd497b7b0fc93b9c8dbfd66df4d80a820a SHA1 abe67bdc242994ce5abe96b0af38c9843f912fcb SHA256 fa2419ffc120b12842c4736d688ed61ee932127423df059c33e46b878f358308
 EBUILD ncftp-3.2.2-r1.ebuild 1028 RMD160 767b4f1fc161580bbe732d541a2ab710523fdda6 SHA1 78ca1a3e0bb237a40d7914e3743283c08aadb652 SHA256 19341c99469ebac8b0b54ae3710e594521efe1e48a394d7bd57a48b6a912fea6
 MISC ChangeLog 10630 RMD160 498b10220ef61c0c6d91c19705a928ed0510489e SHA1 a1df20af9c43259a9737ccf79c947fe74b31df35 SHA256 b118e5918bb489aab7cbfb582e4e793c98faf71d6d7e87f5765fb7ade12078dd
 MISC metadata.xml 742 RMD160 4d1ba950bbe861511809939c86eb875c4430c729 SHA1 3e68f2461c3df4d84321fd79e67c5202b2ca544b SHA256 a645f59e27ec2bb27cebf3ceebf567092f1fb2dcfdee5f9d9c46bfdd05907108
diff --git a/net-ftp/ncftp/files/ncftp-3.2.1-build.patch b/net-ftp/ncftp/files/ncftp-3.2.1-build.patch
deleted file mode 100644
index 23fac81a72..0000000000
--- a/net-ftp/ncftp/files/ncftp-3.2.1-build.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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
deleted file mode 100644
index 8c61e9171d..0000000000
--- a/net-ftp/ncftp/ncftp-3.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.1.ebuild,v 1.9 2008/05/11 08:35:57 solar Exp $
-
-EAPI="prefix"
-
-inherit eutils toolchain-funcs
-
-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="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-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
-	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
-}