Add back in USE=ipv6 #173836 by ProTech.

(Portage version: 2.1.3_rc9)

5 files changed, 26 insertions, 13 deletions

diff --git a/net-ftp/ncftp/ChangeLog b/net-ftp/ncftp/ChangeLog
index 163c21be209e..b69c7c270b48 100644
--- a/net-ftp/ncftp/ChangeLog
+++ b/net-ftp/ncftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/ncftp
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.53 2006/12/01 21:16:52 grobian Exp $
+# 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 $
+
+  26 Jul 2007; Mike Frysinger <vapier@gentoo.org> ncftp-3.1.9.ebuild,
+  ncftp-3.2.0.ebuild:
+  Add back in USE=ipv6 #173836 by ProTech.
 
   01 Dec 2006; Fabian Groffen <grobian@gentoo.org> ncftp-3.1.9.ebuild,
   ncftp-3.2.0.ebuild:
diff --git a/net-ftp/ncftp/files/digest-ncftp-3.1.9 b/net-ftp/ncftp/files/digest-ncftp-3.1.9
index f7dfc0cf6695..655445439fe1 100644
--- a/net-ftp/ncftp/files/digest-ncftp-3.1.9
+++ b/net-ftp/ncftp/files/digest-ncftp-3.1.9
@@ -4,3 +4,6 @@ SHA256 b7ae2363f6b7cfb69e64a21c2edf3f9cf6fadc52606510bcc925668f6045c469 ncftp-3.
 MD5 4aa685aa30528a100aa1e38d497ce0de ncftp-3.1.9_editcmd.patch 9594
 RMD160 d87f0c76e08ffe3452926c2d6db69490fd1c853a ncftp-3.1.9_editcmd.patch 9594
 SHA256 99f1213edf9eeb8c53f0560069b3dfcfc3c69123d78ab6f9326be028f7d8a68d ncftp-3.1.9_editcmd.patch 9594
+MD5 8a696bf0e2dcd4e04309da630e993dfd ncftp-319-v6-20050419.diff.gz 37427
+RMD160 ce4284afbeaba10f46c730ae9c7eff14251abbec ncftp-319-v6-20050419.diff.gz 37427
+SHA256 23a8f9ab422e2bd0bd4bba942b5430ba8b83702b375fbdd58420e57be11cfd5a ncftp-319-v6-20050419.diff.gz 37427
diff --git a/net-ftp/ncftp/files/digest-ncftp-3.2.0 b/net-ftp/ncftp/files/digest-ncftp-3.2.0
index 1556379806a7..7668195607bd 100644
--- a/net-ftp/ncftp/files/digest-ncftp-3.2.0
+++ b/net-ftp/ncftp/files/digest-ncftp-3.2.0
@@ -1,3 +1,6 @@
 MD5 384b7f01d725c89ccd30692628b3ac1b ncftp-3.2.0-src.tar.bz2 427962
 RMD160 391dc307112f018647d3e2b9a8099a236972733c ncftp-3.2.0-src.tar.bz2 427962
 SHA256 2ebc7b51af96cb0fa8b703c7cb995bfb46ccf5312e335270d0420e260544c376 ncftp-3.2.0-src.tar.bz2 427962
+MD5 54c136bbda91390db22aecb1dc78aeba ncftp-320-v6-20061109b.diff.gz 37019
+RMD160 37802886a931db73e4ad95bf538515de5affe4f7 ncftp-320-v6-20061109b.diff.gz 37019
+SHA256 c30acc3c5ecb73c01f50d2dc59e896f27362e57e2e8c746ce5c57664cfb6f33d ncftp-320-v6-20061109b.diff.gz 37019
diff --git a/net-ftp/ncftp/ncftp-3.1.9.ebuild b/net-ftp/ncftp/ncftp-3.1.9.ebuild
index eb3f7ae3bc37..e4cb42a825db 100644
--- a/net-ftp/ncftp/ncftp-3.1.9.ebuild
+++ b/net-ftp/ncftp/ncftp-3.1.9.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.1.9.ebuild,v 1.13 2006/12/01 21:16:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.9.ebuild,v 1.14 2007/07/26 05:49:02 vapier Exp $
 
 inherit eutils
 
-#IPV6_P="ncftp-3181-v6-20040826"
+IPV6_P="ncftp-319-v6-20050419"
 DESCRIPTION="An extremely configurable ftp client"
 HOMEPAGE="http://www.ncftp.com/"
 SRC_URI="ftp://ftp.ncftp.com/ncftp/${P}-src.tar.bz2
-	http://www.thrysoee.dk/ncftp/ncftp-${PV}_editcmd.patch"
-#	ipv6? ( ftp://ftp.cc.chuo-u.ac.jp/pub/IPv6/kame/misc/${IPV6_P}.diff.gz )"
+	http://www.thrysoee.dk/ncftp/ncftp-${PV}_editcmd.patch
+	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"
+IUSE="ipv6"
 
 DEPEND=">=sys-libs/ncurses-5.2"
 
 src_unpack() {
 	unpack ${P}-src.tar.bz2
 	cd "${S}"
-#	use ipv6 && epatch ${DISTDIR}/${IPV6_P}.diff.gz
+	use ipv6 && epatch "${DISTDIR}"/${IPV6_P}.diff.gz
 	epatch "${DISTDIR}"/ncftp-${PV}_editcmd.patch
 	epatch "${FILESDIR}"/ncftp-${PV}-build.patch
 }
diff --git a/net-ftp/ncftp/ncftp-3.2.0.ebuild b/net-ftp/ncftp/ncftp-3.2.0.ebuild
index 98661b20df17..a1c21952e23d 100644
--- a/net-ftp/ncftp/ncftp-3.2.0.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.0.ebuild
@@ -1,23 +1,26 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.0.ebuild,v 1.2 2006/12/01 21:16:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.2.0.ebuild,v 1.3 2007/07/26 05:49:02 vapier Exp $
 
 inherit eutils
 
+IPV6_P="ncftp-320-v6-20061109b"
 DESCRIPTION="An extremely configurable ftp client"
 HOMEPAGE="http://www.ncftp.com/"
-SRC_URI="ftp://ftp.ncftp.com/ncftp/${P}-src.tar.bz2"
+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=""
+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
 	sed -i \
 		-e 's:@SFLAG@::' \