Make sure cmd-torrent.so gets linked properly (patch sent upstream).

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 20 insertions, 4 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 232b27050248..af9cb0004a28 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.209 2009/07/27 17:44:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.210 2009/07/29 05:05:15 jer Exp $
+
+  29 Jul 2009; Jeroen Roovers <jer@gentoo.org> lftp-3.99.5.ebuild,
+  +files/lftp-3.99.5-torrent_la.patch:
+  Make sure cmd-torrent.so gets linked properly (patch sent upstream).
 
 *lftp-3.99.5 (27 Jul 2009)
 
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index df9c4fb575fa..3db117d89d75 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,3 +1,4 @@
+AUX lftp-3.99.5-torrent_la.patch 618 RMD160 0b106a31458a8f025763284d901da4d2f6b38912 SHA1 86531dc2ae48302f4d8ecc87373011ea099bd57a SHA256 8b02d4a4c96667d48669c6a1b750c615fd83090e64c29aa22dc01c3f7050c477
 AUX lftp-gnutls.patch 881 RMD160 5d2f22c93072607200282f2c992498b3015ff236 SHA1 03af36916b237facf90aae77d07c30b064c985fe SHA256 ef044e65f912f0fcb545f9af5dcf44ad3c3c4d072d330a0aa6b7fc1d28c6d76d
 DIST lftp-3.7.14.tar.bz2 1490470 RMD160 b6c7bfc5d33b607203afa6784c2db5ece6d2716b SHA1 b36819aa9624057f1c9067867579c2ac509c72e7 SHA256 f1b9d56b85842c4924b73b91877bc4360f33963c584449285f281f57b31004c6
 DIST lftp-3.7.15.tar.bz2 1499838 RMD160 1e4b34cffea2b81243223e27f7e8351dc785e9f0 SHA1 dbf7c1a9171501c181eef807b36001466b70322d SHA256 c4cd5ee5fb17b1cceb7b2cf655b1cfc8f6aead69e2623d5d7ee6f3975d0e8769
@@ -5,6 +6,6 @@ DIST lftp-3.99.5.tar.gz 2085098 RMD160 911409a943d20ee3a564864df031aeb718387c5e
 EBUILD lftp-3.7.14.ebuild 1494 RMD160 9416d73cbf6085b267ddb70cda0eebb67fa16dee SHA1 901e9a24797dc7e42774b1205c376e94604610f4 SHA256 86cb44bedd1f9a261964ea7382066dbfdc08db0b243691433adbbd7d30999ffe
 EBUILD lftp-3.7.15-r1.ebuild 1608 RMD160 b192333ff9f3b86830f2b1d16a99292dee381750 SHA1 abd3444853349168e0d9597f845cdf5052c17893 SHA256 bfe52b853b06caf27a553ca760945d4af281067b01c90e9c7eb20700919bdf35
 EBUILD lftp-3.7.15.ebuild 1501 RMD160 2c1a4e3408da194f9745da1112751afac6330043 SHA1 0ebe80ff50c372bf82bd02542ded783749c5dab2 SHA256 ff7dd4affd800bda9443d20eeaabf0589ec3051d290176ddfc1422a23e20d587
-EBUILD lftp-3.99.5.ebuild 1591 RMD160 e1d00d57091a8895d87addc2f0df34d74e4a9629 SHA1 ff668c256d48fed030f80c86bf74d09c773d10f9 SHA256 87621ab75bb011020068562e8fbfa0e6a4a9f1a711b764e5415587deab9746f5
-MISC ChangeLog 29530 RMD160 cb634c6a26d86369a51ad00b41e8a18f4f9e33af SHA1 76df3551539287c7d856041716c073cc335dc3a5 SHA256 ef4347444e6643b0f4de1afd8276da7a1b2161c207f3d062e76443fd90d85381
+EBUILD lftp-3.99.5.ebuild 1635 RMD160 8cd0aacdba682a41dc29b2653a23d121988fc817 SHA1 980f5bbfcd6b1a50274e2d113cee81df811d239b SHA256 c59e7b93fc234932d256892089551bbd49bf6fad57f804e948698542670ea54f
+MISC ChangeLog 29708 RMD160 a68d745c40ecd661b553f4475d67749c26b84c6b SHA1 4fa7ada180f14432b50afbc1a78d0f0eb9cffcda SHA256 5f5a5eaa2f429b84f6ac71cae1033bfe97fa2b59fc4463f4cf950dc0d8321392
 MISC metadata.xml 519 RMD160 6424fa2d245737f03d7c220ea73bc5896a404eac SHA1 c2aa31fe9bd860cae68e64a3df10082c23689fbe SHA256 439cf5422ec9039c0521f8d2b8e3baa229f14294ebbbfc9981354cd9c80496aa
diff --git a/net-ftp/lftp/files/lftp-3.99.5-torrent_la.patch b/net-ftp/lftp/files/lftp-3.99.5-torrent_la.patch
new file mode 100644
index 000000000000..259546fa1998
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-3.99.5-torrent_la.patch
@@ -0,0 +1,10 @@
+--- src/Makefile.am.orig	2009-06-26 17:14:39.000000000 +0200
++++ src/Makefile.am	2009-07-29 06:35:41.000000000 +0200
+@@ -63,6 +63,7 @@
+ proto_http_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la $(EXPAT_LIBS)
+ proto_fish_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la liblftp-pty.la
+ proto_sftp_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la liblftp-pty.la
++cmd_torrent_la_LIBADD  = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la
+ 
+ liblftp_tasks_la_SOURCES = PollVec.cc PollVec.h SMTask.cc SMTask.h ProcWait.cc\
+  ProcWait.h GetPass.cc GetPass.h ConnectionSlot.cc ConnectionSlot.h\
diff --git a/net-ftp/lftp/lftp-3.99.5.ebuild b/net-ftp/lftp/lftp-3.99.5.ebuild
index 1d17255b6868..340d59105cd3 100644
--- a/net-ftp/lftp/lftp-3.99.5.ebuild
+++ b/net-ftp/lftp/lftp-3.99.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.99.5.ebuild,v 1.1 2009/07/27 17:44:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.99.5.ebuild,v 1.2 2009/07/29 05:05:15 jer Exp $
 
 EAPI="2"
 
@@ -35,6 +35,7 @@ DEPEND="
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-gnutls.patch"
+	epatch "${FILESDIR}/${P}-torrent_la.patch"
 	eautoreconf
 }