Add a patch to fix linking failure, bug #198906.

(Portage version: 2.1.3.19)

5 files changed, 77 insertions, 8 deletions

diff --git a/net-ftp/tnftp/ChangeLog b/net-ftp/tnftp/ChangeLog
index 175437894583..45d527309a1f 100644
--- a/net-ftp/tnftp/ChangeLog
+++ b/net-ftp/tnftp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/tnftp
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.24 2007/08/06 17:18:41 swegener Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.25 2008/01/01 19:20:17 swegener Exp $
+
+  01 Jan 2008; Sven Wegener <swegener@gentoo.org>
+  +files/tnftp-20050625-libedit.patch, +files/tnftp-20070806-libedit.patch,
+  tnftp-20050625-r1.ebuild, tnftp-20070806.ebuild:
+  Add a patch to fix linking failure, bug #198906.
 
 *tnftp-20070806 (06 Aug 2007)
 
diff --git a/net-ftp/tnftp/files/tnftp-20050625-libedit.patch b/net-ftp/tnftp/files/tnftp-20050625-libedit.patch
new file mode 100644
index 000000000000..25b05f02107c
--- /dev/null
+++ b/net-ftp/tnftp/files/tnftp-20050625-libedit.patch
@@ -0,0 +1,16 @@
+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/files/tnftp-20070806-libedit.patch b/net-ftp/tnftp/files/tnftp-20070806-libedit.patch
new file mode 100644
index 000000000000..235f4fd4b61e
--- /dev/null
+++ b/net-ftp/tnftp/files/tnftp-20070806-libedit.patch
@@ -0,0 +1,20 @@
+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-20070806/configure.ac
++++ tnftp-20070806/configure.ac
+@@ -84,10 +84,7 @@
+                       [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])])
++                           [no relevant library found containing tgetent])])])
+ 
+ AC_SEARCH_LIBS([gethostbyname], [nsl])
+ AC_SEARCH_LIBS([socket],
diff --git a/net-ftp/tnftp/tnftp-20050625-r1.ebuild b/net-ftp/tnftp/tnftp-20050625-r1.ebuild
index 35a38158ce85..e39cd7e0bf2c 100644
--- a/net-ftp/tnftp/tnftp-20050625-r1.ebuild
+++ b/net-ftp/tnftp/tnftp-20050625-r1.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.5 2007/04/16 22:36:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20050625-r1.ebuild,v 1.6 2008/01/01 19:20:17 swegener 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
@@ -15,6 +20,15 @@ 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 \
@@ -26,5 +40,5 @@ src_compile() {
 src_install() {
 	newbin src/ftp tnftp || die "newbin failed"
 	newman src/ftp.1 tnftp.1 || die "newman failed"
-	dodoc COPYING ChangeLog README THANKS || die "dodoc failed"
+	dodoc ChangeLog README THANKS || die "dodoc failed"
 }
diff --git a/net-ftp/tnftp/tnftp-20070806.ebuild b/net-ftp/tnftp/tnftp-20070806.ebuild
index 3b6388cc0e72..ded05157cb35 100644
--- a/net-ftp/tnftp/tnftp-20070806.ebuild
+++ b/net-ftp/tnftp/tnftp-20070806.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-20070806.ebuild,v 1.1 2007/08/06 17:18:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20070806.ebuild,v 1.2 2008/01/01 19:20:17 swegener Exp $
+
+WANT_AUTOCONF="2.5"
+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
@@ -16,6 +21,15 @@ DEPEND=">=sys-libs/ncurses-5.1
 	socks5? ( net-proxy/dante )"
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-libedit.patch
+
+	eautoconf
+}
+
 src_compile() {
 	econf \
 		--enable-editcomplete \
@@ -28,5 +42,5 @@ src_compile() {
 src_install() {
 	newbin src/ftp tnftp || die "newbin failed"
 	newman src/ftp.1 tnftp.1 || die "newman failed"
-	dodoc COPYING ChangeLog README THANKS || die "dodoc failed"
+	dodoc ChangeLog README THANKS || die "dodoc failed"
 }