added patch from upstream. Moved ebuild to use modules mode. Fixed bug #142435 that resulted in automatically stripped executables. Fixed compile problem with USE=socks5

(Portage version: 2.1.1_pre4)

5 files changed, 90 insertions, 17 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 449aba8e9c46..05cf8739e000 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.111 2006/07/31 13:11:52 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.112 2006/08/02 14:17:59 dragonheart Exp $
+
+  02 Aug 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/lftp-3.5.2-install_data_hook.patch,
+  +files/lftp-3.5.2-noautoflags.patch, +files/lftp-3.5.2-socklib.patch,
+  lftp-3.5.2.ebuild:
+  added patch from upstream. Moved ebuild to use modules mode. Fixed bug
+  #142435 that resulted in automatically stripped executables thanks to José
+  Valentín Gutiérrez Boquete. Fixed compile problem with USE=socks5 thanks 
+  to me.
 
 *lftp-3.5.2 (31 Jul 2006)
 
@@ -172,7 +181,7 @@
   version bump to 3.1.0 as per bug #83682. x86 keyword for lftp-3.0.13. Bug
   thanks to Jeffrey Litvin <litvin.j@neu.edu>
 
-  22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.12-r1.ebuild:
+  22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.12-r1.ebuild:
   Stable on alpha, bug 78620.
 
   27 Dec 2004; Guy Martin <gmsoft@gentoo.org> lftp-3.0.12-r1.ebuild:
@@ -194,7 +203,7 @@
   19 Dec 2004; Daniel Black <dragonheart@gentoo.org> +lftp-3.0.12-r1.ebuild,
   +files/lftp-3.0.12.patch, -lftp-3.0.12.ebuild:
   Patch added to prevent segfault. Thanks to Jeffrey Litvin <litvin.j@neu.edu>
-  for the patch reference and Thomas Jäger <tjjr@tj.no> for Bug #74815
+  for the patch reference and Thomas Jäger <tjjr@tj.no> for Bug #74815
 
 *lftp-3.0.12 (07 Dec 2004)
 
@@ -203,7 +212,7 @@
   version bump as per bug #73582 by rockoo. Removed one old version. added ppc
   keyword to 3.0.9
 
-  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.9.ebuild:
+  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.9.ebuild:
   Stable on alpha.
 
   29 Oct 2004; Jason Wever <weeve@gentoo.org> lftp-3.0.9.ebuild:
@@ -259,7 +268,7 @@
   Memory leak fixed - thanks to Luke Macken in bug #61335. OSX fix thanks to
   Miguel Sousa Filipe in bug #61349
 
-  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.6.ebuild:
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.6.ebuild:
   Stable on alpha.
 
   18 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> lftp-3.0.7.ebuild:
@@ -293,7 +302,7 @@
   Version bump thanks to #gentoo.pl Team - sekretarz <sekretarz@dukato.net> in
   bug #53720
 
-  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.3.ebuild:
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> lftp-3.0.3.ebuild:
   Stable on alpha.
 
 *lftp-3.0.5 (04 Jun 2004)
diff --git a/net-ftp/lftp/files/lftp-3.5.2-install_data_hook.patch b/net-ftp/lftp/files/lftp-3.5.2-install_data_hook.patch
new file mode 100644
index 000000000000..102976d965d6
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-3.5.2-install_data_hook.patch
@@ -0,0 +1,23 @@
+--- src/Makefile.am.orig	2006-07-27 08:14:13.000000000 +0200
++++ src/Makefile.am	2006-07-31 23:54:36.000000000 +0200
+@@ -117,5 +117,7 @@
+ 	case " $(LDFLAGS) " in *" -s "*) \
+ 		echo $(STRIP) $(DESTDIR)$(pkgverlibdir)/*.so; \
+ 		$(STRIP) $(DESTDIR)$(pkgverlibdir)/*.so;; \
+-	esac; else rmdir $(DESTDIR)$(pkgverlibdir) 2>/dev/null || true;
++	esac
++else
++	rmdir $(DESTDIR)$(pkgverlibdir) 2>/dev/null || true;
+ endif
+--- src/Makefile.in.orig	2006-07-31 23:54:41.000000000 +0200
++++ src/Makefile.in	2006-07-31 23:55:08.000000000 +0200
+@@ -1027,7 +1027,8 @@
+ @WITH_MODULES_TRUE@	case " $(LDFLAGS) " in *" -s "*) \
+ @WITH_MODULES_TRUE@		echo $(STRIP) $(DESTDIR)$(pkgverlibdir)/*.so; \
+ @WITH_MODULES_TRUE@		$(STRIP) $(DESTDIR)$(pkgverlibdir)/*.so;; \
+-@WITH_MODULES_TRUE@	esac; else rmdir $(DESTDIR)$(pkgverlibdir) 2>/dev/null || true;
++@WITH_MODULES_TRUE@	esac
++@WITH_MODULES_FALSE@	rmdir $(DESTDIR)$(pkgverlibdir) 2>/dev/null || true;
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/net-ftp/lftp/files/lftp-3.5.2-noautoflags.patch b/net-ftp/lftp/files/lftp-3.5.2-noautoflags.patch
new file mode 100644
index 000000000000..3214d4c66e2c
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-3.5.2-noautoflags.patch
@@ -0,0 +1,21 @@
+--- configure.ac.orig	2006-08-02 16:01:52.000000000 +1000
++++ configure.ac	2006-08-02 17:23:10.000000000 +1000
+@@ -31,6 +31,18 @@
+ [   with_profiling=$withval;   ],
+ [   with_profiling=no;	   ])
+ 
++AC_ARG_ENABLE([packager-mode],
++              AS_HELP_STRING([--enable-packager-mode],
++                             [Change configuration behavior
++                              to ease packaging]),
++              [if test x"${enableval}" = xyes
++               then
++				   DEFAULT_CXX=no
++				   DEFAULT_CFLAGS=no
++				   DEFAULT_CXXFLAGS=no
++				   DEFAULT_LDFLAGS=no
++               fi])
++
+ if test x$with_debug = xno; then
+    if test x$DEFAULT_CFLAGS = xyes; then
+       CFLAGS="`echo $CFLAGS | sed 's/-g//'`"
diff --git a/net-ftp/lftp/files/lftp-3.5.2-socklib.patch b/net-ftp/lftp/files/lftp-3.5.2-socklib.patch
new file mode 100644
index 000000000000..1e7aec8e6180
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-3.5.2-socklib.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig	2006-08-02 13:50:55.000000000 +1000
++++ src/Makefile.am	2006-08-02 13:52:33.000000000 +1000
+@@ -77,7 +77,7 @@
+  StringPool.cc StringPool.h DirColors.cc DirColors.h IdNameCache.cc\
+  IdNameCache.h PatternSet.cc PatternSet.h LocalDir.cc LocalDir.h\
+  mbswidth.c mbswidth.h wcwidth.h
+-liblftp_tasks_la_LIBADD = $(TASK_MODULES_STATIC) $(top_builddir)/lib/liblib.la $(LTLIBINTL) $(LTLIBICONV)
++liblftp_tasks_la_LIBADD = $(TASK_MODULES_STATIC) $(top_builddir)/lib/liblib.la $(LTLIBINTL) $(LTLIBICONV) @SOCKSLIBS@
+ 
+ liblftp_jobs_la_SOURCES = Job.cc Job.h CmdExec.cc CmdExec.h\
+  commands.cc mgetJob.h mgetJob.cc SysCmdJob.cc SysCmdJob.h rmJob.cc rmJob.h\
diff --git a/net-ftp/lftp/lftp-3.5.2.ebuild b/net-ftp/lftp/lftp-3.5.2.ebuild
index de520606b143..ad6a62341b7d 100644
--- a/net-ftp/lftp/lftp-3.5.2.ebuild
+++ b/net-ftp/lftp/lftp-3.5.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.5.2.ebuild,v 1.1 2006/07/31 13:11:52 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.5.2.ebuild,v 1.2 2006/08/02 14:17:59 dragonheart Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="A sophisticated ftp/http client, file transfer program"
 HOMEPAGE="http://lftp.yar.ru/"
@@ -17,8 +17,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~spa
 IUSE="ssl gnutls socks5 nls"
 
 RDEPEND=">=sys-libs/ncurses-5.1
-		socks5? ( >=net-proxy/dante-1.1.12 )
-		socks5? ( virtual/pam )
+		socks5? ( 
+			>=net-proxy/dante-1.1.12
+			virtual/pam )
 		ssl? (
 			gnutls? ( >=net-libs/gnutls-1.2.3 )
 			!gnutls? ( >=dev-libs/openssl-0.9.6 )
@@ -30,9 +31,20 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	dev-lang/perl"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-install_data_hook.patch
+	epatch "${FILESDIR}"/${P}-socklib.patch
+	epatch "${FILESDIR}"/${P}-noautoflags.patch
+	AT_M4DIR="m4" eaclocal
+	eautoconf
+	eautomake
+}
+
 
 src_compile() {
-	local myconf="$(use_enable nls)"
+	local myconf="$(use_enable nls) --enable-packager-mode"
 
 	if use ssl && use gnutls ; then
 		myconf="${myconf} --without-openssl"
@@ -48,18 +60,15 @@ src_compile() {
 	use ppc-macos && myconf="${myconf} --with-included-readline"
 	econf \
 		--sysconfdir=/etc/lftp \
-		--without-modules \
+		--with-modules \
 		${myconf} || die "econf failed"
 
 	emake || die "compile problem"
 }
 
 src_install() {
-	emake install DESTDIR=${D} || die
-
-	# hrmph, empty..
-	rm -rf ${D}/usr/lib
+	emake install DESTDIR="${D}" || die
 
 	dodoc BUGS ChangeLog FAQ FEATURES MIRRORS \
-		NEWS README* THANKS TODO
+			NEWS README* THANKS TODO
 }