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

Package-Manager: portage-2.1.1_pre4

6 files changed, 114 insertions, 29 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/Manifest b/net-ftp/lftp/Manifest
index 0b38e29ef8fb..0fdf08764934 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -5,6 +5,18 @@ AUX lftp-3.4.6-nossl.patch 660 RMD160 f4c56f2fe7c491a9344e1b95785231957efb2711 S
 MD5 c0465a6e318d1a1a11c6c322288df990 files/lftp-3.4.6-nossl.patch 660
 RMD160 f4c56f2fe7c491a9344e1b95785231957efb2711 files/lftp-3.4.6-nossl.patch 660
 SHA256 61f79d13b5c2f0cdb7abd300486396a39458192cd71b1a61c799afda1508d1fe files/lftp-3.4.6-nossl.patch 660
+AUX lftp-3.5.2-install_data_hook.patch 1077 RMD160 aba88f76ea129ef5213cce285917a69a6dc3747e SHA1 7c4ad13d621e1e4d48aa4efdff2a81576b298954 SHA256 276310a8bb3fdfc6b4e2db9c59a15324708b974a0f21628b0da839d69cb46ec4
+MD5 72d3bec832f8c950b144cba970004896 files/lftp-3.5.2-install_data_hook.patch 1077
+RMD160 aba88f76ea129ef5213cce285917a69a6dc3747e files/lftp-3.5.2-install_data_hook.patch 1077
+SHA256 276310a8bb3fdfc6b4e2db9c59a15324708b974a0f21628b0da839d69cb46ec4 files/lftp-3.5.2-install_data_hook.patch 1077
+AUX lftp-3.5.2-noautoflags.patch 715 RMD160 ad950f2e738be3d56f65c0cda7e43c5561da2f79 SHA1 3bfe76286d5d2a1b4b9c20d731020f5b73392a1c SHA256 cb0f4228b9ca19eb74c9e558bd07f949ffcc71a7fd26c194b75405090b527ed5
+MD5 71e3a64c34ef66c9123469a5152de1da files/lftp-3.5.2-noautoflags.patch 715
+RMD160 ad950f2e738be3d56f65c0cda7e43c5561da2f79 files/lftp-3.5.2-noautoflags.patch 715
+SHA256 cb0f4228b9ca19eb74c9e558bd07f949ffcc71a7fd26c194b75405090b527ed5 files/lftp-3.5.2-noautoflags.patch 715
+AUX lftp-3.5.2-socklib.patch 674 RMD160 f8682073dc875a31b05ae29dbcd5953fcccb1de8 SHA1 7429994e12dd6339de5bfd7a0d853166d36dc791 SHA256 107ead62b488eb03800aa91fabd80a84b7927305d2b93a63b755cfedabea8bdf
+MD5 77e9ed68ab38084070ff166a31a5102a files/lftp-3.5.2-socklib.patch 674
+RMD160 f8682073dc875a31b05ae29dbcd5953fcccb1de8 files/lftp-3.5.2-socklib.patch 674
+SHA256 107ead62b488eb03800aa91fabd80a84b7927305d2b93a63b755cfedabea8bdf files/lftp-3.5.2-socklib.patch 674
 DIST lftp-3.0.13.tar.bz2 1223604 RMD160 a634945e0f621d4d85d10dab6ff435ee39beeab0 SHA1 d57173bbef188f63b82d33f7e15d4e712357b5b4 SHA256 ec2560dc739f7f202c6c0a4111bbc66cc60c3c550cc931a5c8ddb80b39952e98
 DIST lftp-3.4.4.tar.gz 1733453 RMD160 a8fc4037ab783f3203da2acd1f824d209e60737d SHA1 5ffc87776f946bd99ce755d9793d3372bfffaa07 SHA256 f6a668f1e8814534e8d7949ae75a3cf1c2fed8de112272c97e81c32aa0204ea2
 DIST lftp-3.4.6.tar.gz 1735847 RMD160 801b1c0f8b68e3f5917fd59ba6d80f3f64c38a8f SHA1 f438dfd390c8613776cddb109f4132f81c5c841e SHA256 6731d4b40ca694a8505d16004575ff74205e83d7456c828915cf94e7b73aa8d3
@@ -26,14 +38,14 @@ EBUILD lftp-3.5.1.ebuild 1726 RMD160 1d1ca7f5d03f470b40fe61537d2969f5c49d6fee SH
 MD5 1c1f5569d42f8ee94fb4001c54c662e8 lftp-3.5.1.ebuild 1726
 RMD160 1d1ca7f5d03f470b40fe61537d2969f5c49d6fee lftp-3.5.1.ebuild 1726
 SHA256 b07ad83b67621b70ea5cf1d6679c23cd8bbf847854cb692f71a41ad788a0f1b7 lftp-3.5.1.ebuild 1726
-EBUILD lftp-3.5.2.ebuild 1726 RMD160 d5adaa5e487e3bc04a3b2da1e05bf006289397aa SHA1 66e3d2bb7057955464a8c633a29b7483a2d6fbdf SHA256 f96d9a07b8a8612b23c3ee92abadfcb559c385eddc27fbe17f3b67b01f9a171a
-MD5 396a4d6f9fa3e10eaeb7dd9b474bb345 lftp-3.5.2.ebuild 1726
-RMD160 d5adaa5e487e3bc04a3b2da1e05bf006289397aa lftp-3.5.2.ebuild 1726
-SHA256 f96d9a07b8a8612b23c3ee92abadfcb559c385eddc27fbe17f3b67b01f9a171a lftp-3.5.2.ebuild 1726
-MISC ChangeLog 16776 RMD160 7eb417f7d14f0756d779a8822f555be62f30922f SHA1 98e03d755801494b88c542b330f91590e3eaf3ee SHA256 a604433c4f66486214f3d3c5d013a9e33449bea3fc6de129552f828abd5f970c
-MD5 a3dcbf1dca7340e1395d08f75266b07d ChangeLog 16776
-RMD160 7eb417f7d14f0756d779a8822f555be62f30922f ChangeLog 16776
-SHA256 a604433c4f66486214f3d3c5d013a9e33449bea3fc6de129552f828abd5f970c ChangeLog 16776
+EBUILD lftp-3.5.2.ebuild 1937 RMD160 69ce7766225b9d56b6d2beafbb9347d584bc98f7 SHA1 57d192b07aa77d0d7eaee5072134507e4715200c SHA256 2ba327435c6d4eafaca134c557895fb1200b631fef9f0f52a21faf6d7762cc7d
+MD5 ed636522d233d6c08cb137e21aa04af8 lftp-3.5.2.ebuild 1937
+RMD160 69ce7766225b9d56b6d2beafbb9347d584bc98f7 lftp-3.5.2.ebuild 1937
+SHA256 2ba327435c6d4eafaca134c557895fb1200b631fef9f0f52a21faf6d7762cc7d lftp-3.5.2.ebuild 1937
+MISC ChangeLog 17216 RMD160 3385041d5911033da57c1f193b8723f7ccc9ff20 SHA1 eb5a0e7d86295ff7cb84379ba7c6c7b5605f72ac SHA256 49c31a60c5872ae309c4837ff7cc26febf3d115c38906fab2eb5d32de48c9f05
+MD5 ff702a6653ad1ea2017dacacc4040275 ChangeLog 17216
+RMD160 3385041d5911033da57c1f193b8723f7ccc9ff20 ChangeLog 17216
+SHA256 49c31a60c5872ae309c4837ff7cc26febf3d115c38906fab2eb5d32de48c9f05 ChangeLog 17216
 MISC metadata.xml 430 RMD160 e522bf2928ed5c97a1e41a3443c6c26ba64847cd SHA1 0c992ae070f385380005c35321070c3c5d318eb9 SHA256 bd840a8fc0f6882e2fc2fc80aa4b3ba5a7a1b22a296d998c368ed5628baf3b82
 MD5 bd30469259dd912781df916084edcacd metadata.xml 430
 RMD160 e522bf2928ed5c97a1e41a3443c6c26ba64847cd metadata.xml 430
@@ -54,9 +66,9 @@ MD5 1168538eb2216342a868fa0d3505fee2 files/digest-lftp-3.5.2 235
 RMD160 5de2ff7b40ab24ddcdd95471894b59c78edcf174 files/digest-lftp-3.5.2 235
 SHA256 2351c255384c610ca31f7e30ed6c2c0ab108297a0f79d2b2fd9f7adcf4541f04 files/digest-lftp-3.5.2 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEzgI+mdTrptrqvGERAnYfAJwN4FkCRHc/ej51gJtkYW6+5YcnZQCfdKv0
-DJni/CWyp0zgwDbiPt1LlpE=
-=gg4n
+iD8DBQFE0LdbmdTrptrqvGERAhY/AJ0QdwO7NOC0EqZEFAuvDN3VCX894ACfSNMD
+QAQj6YAA6NoPLMggeY6RMWA=
+=eeYg
 -----END PGP SIGNATURE-----
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
 }