Added patch for silc building

Package-Manager: portage-2.0.51.21-r1

4 files changed, 38 insertions, 17 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index c90c25799fee..fa5904ac86e0 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.335 2005/05/11 23:17:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.336 2005/05/13 21:16:30 rizzo Exp $
+
+  13 May 2005; Don Seiler <rizzo@gentoo.org>
+  +files/gaim-1.3.0-silc-ft.patch, gaim-1.3.0.ebuild:
+  Added patch for silc building
 
   11 May 2005; Bryan Østergaard <kloeri@gentoo.org> gaim-1.3.0.ebuild:
   Stable on alpha + ia64, bug 91862.
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index fbb079a08b4f..b43f5d4a169c 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5e3ae91afdfdfca07459a8582ce58f11 gaim-1.2.1.ebuild 4125
-MD5 bcb05bf3039df119d6399bfcb7c20d60 ChangeLog 49487
-MD5 c68402df57b7df210f8f1805c61b0916 gaim-1.3.0.ebuild 4153
+MD5 aa7e342621ce35e0a99274e78d2726b6 ChangeLog 49618
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
-MD5 ccd9c297b39c84ce83df7011a542900b files/digest-gaim-1.2.1 64
-MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
+MD5 191614742541c2999500d894d4bd7382 gaim-1.3.0.ebuild 4283
+MD5 5e3ae91afdfdfca07459a8582ce58f11 gaim-1.2.1.ebuild 4125
 MD5 cbf619d060172da33caaee6ece99ceac files/digest-gaim-1.3.0 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCgpKjKf2g/qXtneoRAuC9AJ9owvHmjx/YVId6DTno4+8va6LDTQCeNKRz
-d2FXGY0tC+lbGqW5whzsFpc=
-=xt/q
------END PGP SIGNATURE-----
+MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
+MD5 7eeaeb97528ef69941cf3fa3d04dea3e files/gaim-1.3.0-silc-ft.patch 567
+MD5 ccd9c297b39c84ce83df7011a542900b files/digest-gaim-1.2.1 64
diff --git a/net-im/gaim/files/gaim-1.3.0-silc-ft.patch b/net-im/gaim/files/gaim-1.3.0-silc-ft.patch
new file mode 100644
index 000000000000..00bc3bb86817
--- /dev/null
+++ b/net-im/gaim/files/gaim-1.3.0-silc-ft.patch
@@ -0,0 +1,19 @@
+Index: ft.c
+===================================================================
+RCS file: /cvsroot/gaim/gaim/src/protocols/silc/ft.c,v
+retrieving revision 1.5.2.1
+diff -u -r1.5.2.1 ft.c
+--- ft.c	10 Feb 2005 00:07:35 -0000	1.5.2.1
++++ ft.c	13 May 2005 15:11:38 -0000
+@@ -363,11 +363,6 @@
+ 	if (!silc_parse_userfqdn(name, &nickname, NULL))
+ 		return;
+ 
+-#ifndef _WIN32
+-	silc_debug = TRUE;
+-	silc_log_set_debug_string("*client*,*ftp*");
+-#endif
+-
+ 	/* Find client entry */
+ 	clients = silc_client_get_clients_local(client, conn, nickname, name,
+ 						&clients_count);
diff --git a/net-im/gaim/gaim-1.3.0.ebuild b/net-im/gaim/gaim-1.3.0.ebuild
index 097842373793..5867a3f1e7f3 100644
--- a/net-im/gaim/gaim-1.3.0.ebuild
+++ b/net-im/gaim/gaim-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.3.0.ebuild,v 1.6 2005/05/11 23:17:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.3.0.ebuild,v 1.7 2005/05/13 21:16:30 rizzo Exp $
 
 inherit flag-o-matic eutils gcc debug
 
@@ -90,6 +90,13 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
+
+	# Fix silc building
+	if use silc ; then
+		cd ${S}/src/protocols/silc
+		epatch ${FILESDIR}/gaim-1.3.0-silc-ft.patch
+		cd ${S}
+	fi
 }
 
 src_compile() {