Cleanup.

(Portage version: 2.1.5_rc2)

3 files changed, 5 insertions, 61 deletions

diff --git a/net-ftp/tnftp/ChangeLog b/net-ftp/tnftp/ChangeLog
index 1772c40eecbe..a237daf28645 100644
--- a/net-ftp/tnftp/ChangeLog
+++ b/net-ftp/tnftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/tnftp
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.28 2008/04/03 01:35:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.29 2008/04/11 18:50:03 swegener Exp $
+
+  11 Apr 2008; Sven Wegener <swegener@gentoo.org>
+  -files/tnftp-20050625-libedit.patch, -tnftp-20050625-r1.ebuild:
+  Cleanup.
 
   03 Apr 2008; Brent Baude <ranger@gentoo.org> tnftp-20070806.ebuild:
   stable ppc, bug 215491
diff --git a/net-ftp/tnftp/files/tnftp-20050625-libedit.patch b/net-ftp/tnftp/files/tnftp-20050625-libedit.patch
deleted file mode 100644
index 25b05f02107c..000000000000
--- a/net-ftp/tnftp/files/tnftp-20050625-libedit.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Completely disable external libedit support. When libedit is installed, the
-check will automatically add -ledit to LIBS and the result will be wrong
-strlcpy check results and linking failures.
-
-https://bugs.gentoo.org/198906
-
---- tnftp-20050625/configure.in
-+++ tnftp-20050625/configure.in
-@@ -40,7 +40,6 @@
- if test $opt_editcomplete = yes; then
- 	AC_SEARCH_LIBS(tgetent, [termcap termlib curses ncurses tinfo], ,
- 	    AC_MSG_ERROR([no relevant library found containing tgetent]))
--	AC_SEARCH_LIBS(el_init, [edit], [have_libedit=yes], [have_libedit=no])
- fi
- AC_LIBRARY_NET
- AC_LIBRARY_SOCKS
diff --git a/net-ftp/tnftp/tnftp-20050625-r1.ebuild b/net-ftp/tnftp/tnftp-20050625-r1.ebuild
deleted file mode 100644
index 14e1a2edabca..000000000000
--- a/net-ftp/tnftp/tnftp-20050625-r1.ebuild
+++ /dev/null
@@ -1,44 +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/tnftp/tnftp-20050625-r1.ebuild,v 1.7 2008/02/03 14:20:41 grobian Exp $
-
-WANT_AUTOCONF="2.1"
-WANT_AUTOMAKE="none"
-
-inherit eutils autotools
-
-DESCRIPTION="NetBSD FTP client with several advanced features"
-SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
-	ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/old/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="alpha ~amd64 ppc sparc x86 ~x86-fbsd"
-IUSE="ipv6"
-
-DEPEND=">=sys-libs/ncurses-5.1"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-libedit.patch
-
-	eautoconf
-}
-
-src_compile() {
-	econf \
-		--enable-editcomplete \
-		$(use_enable ipv6) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	newbin src/ftp tnftp || die "newbin failed"
-	newman src/ftp.1 tnftp.1 || die "newman failed"
-	dodoc ChangeLog README THANKS || die "dodoc failed"
-}