Cleanup.

Package-Manager: portage-2.1.5_rc2

4 files changed, 16 insertions, 65 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/Manifest b/net-ftp/tnftp/Manifest
index 440bdf4b7f15..a59f896e2694 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,8 +1,15 @@
-AUX tnftp-20050625-libedit.patch 594 RMD160 c1305f1ad910f06cf85b54f4c3d2157c7a894922 SHA1 41aba49506a073d0e4d5cc16603ebd6002714a7e SHA256 d33a9a3e39726f697041ebc6331731eab53d0f3995d47eeba1ee161d4086c512
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tnftp-20070806-libedit.patch 792 RMD160 70f2d65251b2d92a5dfc3f99bd612bb44c2aa5a9 SHA1 a008b2604288c4a00c2e7c39e41777fe1820116f SHA256 c323bf381e5bd9f128114bc9bd7722bc950f5e42e59030162d03cb2da62430ab
-DIST tnftp-20050625.tar.gz 313915 RMD160 74a310cf0e28cbc183141aff277458e35df1295a SHA1 1dd0996775755000686b59f5c2fbdb0ecaadfff7 SHA256 6194383702bfef8d7731660f9359c5946e2ba8176df9382ae39584942a28d6b3
 DIST tnftp-20070806.tar.gz 371223 RMD160 f70a9de5c87736aa98693a1808be5db76cdc97b0 SHA1 b6dad820e71412bd52f2c4a4ccaa7a2b62c3a22f SHA256 ee0d6c77a74bcb5edf904a7ea97bb9c023007c76bc741f22dc197b9938372a87
-EBUILD tnftp-20050625-r1.ebuild 1064 RMD160 ecc42e70d4ebdffa591cb0ac688d0dd41d6893b8 SHA1 523741c1a2e1107b2614e4a9d5f5c6814ccca9d8 SHA256 3b5440b9a5df7ff92e8fdc14d75cfc43b633379f675adc5a29a700bc3db4f80a
 EBUILD tnftp-20070806.ebuild 1125 RMD160 8335e6d9332b7d2d20691c07ce6571e32ac16cf2 SHA1 e8a46d4c9ee1cbd79076f6e8807f93e502e9a059 SHA256 a23917618dbc79985002fa418d24e6d560fbf629abf4f3407b3aa993bbc1d207
-MISC ChangeLog 3819 RMD160 8608351fd96af9724bb1f8355c232cde045dcb1f SHA1 0fa1dcac7794d09cb90ef9b370bd3b17ae5b8bb6 SHA256 d26d2cf9c27459780ca22ce6dc50260190b4787b72019a07ec1dd07eae8d13da
+MISC ChangeLog 3949 RMD160 7a7c00cd039328e519387e654c1e8ba52f420059 SHA1 b50b8686d50ceae9ea67b46ba52789918cb1d414 SHA256 4c2fc71313fa5ce0f9aabc72097a0d27dd628004389b0b8cbca9e68e1cc73263
 MISC metadata.xml 298 RMD160 60625e202ed0ef00f82e7d7e5bf05b4412526f36 SHA1 a51489bc5de3f67a0183720f9425adb2cba0e3ef SHA256 fa6086e7352367eeb9b96d059ab58bca3bd6fde533180cd5551280c808535fc9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH/7LgI1lqEGTUzyQRAqJjAJ4ljHK6C/KGez/IsdLVRIQbNnL/hACgpNVU
+l1iSQi2VxF+nCa9ZMC9uuO0=
+=Y/5t
+-----END PGP SIGNATURE-----
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"
-}