Remove nls use flag ag (bug #319557) and added upstream patch for ICQ regression (bug #320061)

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 69 insertions, 11 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 62fea52d8b07..601dd68a5eee 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.162 2010/05/13 16:03:48 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.163 2010/05/17 00:59:23 tester Exp $
+
+  17 May 2010; Olivier Crête <tester@gentoo.org> pidgin-2.7.0.ebuild,
+  +files/pidgin-2.7.0-icq-fix.patch:
+  Remove nls use flag ag (bug #319557) and added upstream patch for ICQ
+  regression (bug #320061)
 
 *pidgin-2.7.0 (13 May 2010)
 
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index f5d2ef77a69a..c2e5712a9dfa 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pidgin-2.7.0-icq-fix.patch 1991 RMD160 7158710b27950bec2d8dec47e02a4494f8dfaac9 SHA1 8589601e86bd8077f8dd50afac49ee38b71cfba1 SHA256 c2e9e1bf1921e2e2e9f1594a348be5103298f28bc4ab5fcbd6c3cb6543fea24e
 DIST pidgin-2.6.3.tar.bz2 9093452 RMD160 3768e30abb54aca6c80343d4fc0f11da0d54d8fe SHA1 552f3cbfb2cb2026342777efc9102e3511b0b29f SHA256 0515a0add6b0b541160a5d13484f665964072ed331c3e59c65fb6086a070d2a1
 DIST pidgin-2.6.5.tar.bz2 9383600 RMD160 ca1867476c3cae0be5f4d56cbb58391758da00a9 SHA1 e50edbe0fe588d7222d54154942550ef1788b89d SHA256 3c459e4093fca679591e35ea34da4a0e45b15f2bb7ca00314a1486dc022f3d0e
 DIST pidgin-2.6.6.tar.bz2 9479337 RMD160 6e2ca8fb05b2575c758537d9adc154678b36cd55 SHA1 d74459152f9598139a3fd8aee385e3366722155c SHA256 6ebbe9d339246dfebb244e4c855c4feb678f120d1024ef2ee269e2fde77b2ad9
@@ -8,13 +9,13 @@ DIST pidgin-2.7.0.tar.bz2 9795914 RMD160 45e4b5a9acb9c4080ce6b33cedbf9b962883ca2
 EBUILD pidgin-2.6.3.ebuild 4669 RMD160 6605b8fdde7aa0784d22c7c5c8215e67d0f2c217 SHA1 e3a640f73205de6ff917db232c496d058764d7a9 SHA256 8d2d4cce7699a94daead3684aaec5c06d7e67636fffda22407d1ff720b6f53a8
 EBUILD pidgin-2.6.5.ebuild 5159 RMD160 5932845048c48cffb9568cfe793fa5b7f4050ce5 SHA1 63aa4d99313f96541bc65a801905bd4239ce7b61 SHA256 9c56cdc4699d7fbffcb805ded51cae1656d3d2e1504a93a34d905e4eeb3a5f7c
 EBUILD pidgin-2.6.6.ebuild 5214 RMD160 7b8ba0f30aecf8cf62036bfc164ed9632f1d30a3 SHA1 0d3175fa2a0964c86cbacb106cbe3045c8028fc6 SHA256 4bcb6e451bec0f2f19d1d8215adf4943c3ea5d072da66104c88f2955b225a4bb
-EBUILD pidgin-2.7.0.ebuild 5161 RMD160 69e021d2652ecbe62a22f722c81cf3d71bbb6398 SHA1 3cae820f3a3e093ce0e88d9b07da64634a3d7182 SHA256 5419d03ff6635a4cc00550ad31ac249b6231b131105e2d33c41a5a35bf17d05b
-MISC ChangeLog 21940 RMD160 253d8ca41164987173c43d6d54d41853f3fd5eb9 SHA1 53e6d278b43a71e15bf2685d1ea9d6d8e84cb9ef SHA256 e4744b688b0ac53ae7fc0beefcc44beff5256bd41be7aafd7e7c9a44c43f1906
+EBUILD pidgin-2.7.0.ebuild 5167 RMD160 40e3e27b7479740016931379f9331a575f6b5e4f SHA1 ddb9920a588cc16243622d17dcc277e7359645e0 SHA256 03da54e3635d08dcbda03379f095ece2aa613aae70697b95ddbd44f80c8d62e6
+MISC ChangeLog 22148 RMD160 84f4791b2f92c981ccec0f58a4b1bb50907b352b SHA1 f2a57667ad79a0c321a7915f03cd3b71c7b2b2bc SHA256 6e9d6437bf77d6e9cd3d7c4ae44a457f800245758587237de5a10520dac7bf31
 MISC metadata.xml 987 RMD160 a83ec75f557b2b49e5916dcb1f7a555aaf4643e5 SHA1 1885706fc2f6c48d7bdfb77eedf8805ef9d26842 SHA256 62409a470ac0f5f12e37edaaead6b7d184878d20cf317320fa629b2fbf6dfd31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvsIuoACgkQmOfEJZHYOKejUQCfeUrrhLXITq+6yRr4l/hRKzuE
-K28AnR2SDyraPUOrbKQZMBQyNdAWiawC
-=KbxC
+iEYEARECAAYFAkvwlPAACgkQmOfEJZHYOKc4FgCeLCC9L4yOl3evEr4fikIRetsF
+UNYAn2GthvyPM0cNLeJmlYq16KptG3+t
+=Q4rN
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-2.7.0-icq-fix.patch b/net-im/pidgin/files/pidgin-2.7.0-icq-fix.patch
new file mode 100644
index 000000000000..b6cdc6f1dc3a
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.7.0-icq-fix.patch
@@ -0,0 +1,52 @@
+#
+#
+# patch "libpurple/protocols/oscar/oscar.c"
+#  from [ec79d8d9fcba376be091b363977e8f23c748eff2]
+#    to [c8cc188e64cc6b466711a5b56454ce70615b0eea]
+#
+============================================================
+--- libpurple/protocols/oscar/oscar.c	ec79d8d9fcba376be091b363977e8f23c748eff2
++++ libpurple/protocols/oscar/oscar.c	c8cc188e64cc6b466711a5b56454ce70615b0eea
+@@ -2486,32 +2486,6 @@ static int incomingim_chan1(OscarData *o
+ 	tmp = g_string_free(message, FALSE);
+ 
+ 	/*
+-	 * If the message is from an ICQ user and to an ICQ user then escape any HTML,
+-	 * because HTML is not sent over ICQ as a means to format a message.
+-	 * So any HTML we receive is intended to be displayed.  Also, \r\n must be
+-	 * replaced with <br>
+-	 *
+-	 * Note: There *may* be some clients which send messages as HTML formatted -
+-	 *       they need to be special-cased somehow.
+-	 *
+-	 * Update: Newer ICQ clients have started sending IMs as HTML.  We can
+-	 * distinguish HTML IMs from non-HTML IMs by looking at the features.  If
+-	 * the features are "0x 01 06" then the message is plain text.  If the
+-	 * features are "0x 01" then the message is HTML.
+-	 */
+-	if (od->icq && oscar_util_valid_name_icq(userinfo->bn)
+-			&& (args->featureslen != 1 || args->features[0] != 0x01))
+-	{
+-		/* being recevied by ICQ from ICQ - escape HTML so it is displayed as sent */
+-		gchar *tmp2 = g_markup_escape_text(tmp, -1);
+-		g_free(tmp);
+-		tmp = tmp2;
+-		tmp2 = purple_strreplace(tmp, "\r\n", "<br>");
+-		g_free(tmp);
+-		tmp = tmp2;
+-	}
+-
+-	/*
+ 	 * Convert iChat color tags to normal font tags.
+ 	 */
+ 	if (purple_markup_find_tag("body", tmp, &start, &end, &attribs))
+@@ -4787,7 +4761,8 @@ oscar_send_im(PurpleConnection *gc, cons
+ 			tmp2 = purple_markup_strip_html(tmp1);
+ 			is_html = FALSE;
+ 		} else {
+-			tmp2 = g_strdup(tmp1);
++			/* ICQ 6 wants its HTML wrapped in these tags. Oblige it. */
++			tmp2 = g_strdup_printf("<HTML><BODY>%s</BODY></HTML>", tmp1);
+ 			is_html = TRUE;
+ 		}
+ 		g_free(tmp1);
diff --git a/net-im/pidgin/pidgin-2.7.0.ebuild b/net-im/pidgin/pidgin-2.7.0.ebuild
index 093ac92f4d95..251b84c83183 100644
--- a/net-im/pidgin/pidgin-2.7.0.ebuild
+++ b/net-im/pidgin/pidgin-2.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.0.ebuild,v 1.1 2010/05/13 16:03:48 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.0.ebuild,v 1.2 2010/05/17 00:59:23 tester Exp $
 
 EAPI=2
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="dbus debug doc eds gadu gnutls idn meanwhile networkmanager"
-IUSE+=" nls perl silc tcl tk spell qq gadu +gtk sasl +startup-notification"
+IUSE+=" perl silc tcl tk spell qq gadu +gtk sasl +startup-notification"
 IUSE+=" ncurses groupwise prediction +xscreensaver zephyr zeroconf" # mono"
 
 RDEPEND="
@@ -60,9 +60,9 @@ DEPEND="$RDEPEND
 	dev-perl/XML-Parser
 	dev-util/pkgconfig
 	dev-util/intltool
+	sys-devel/gettext
 	gtk? ( x11-proto/scrnsaverproto )
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
+	doc? ( app-doc/doxygen )"
 
 # Enable Default protocols
 DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
@@ -106,6 +106,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-icq-fix.patch"
 	intltoolize --automake --copy --force || die
 	eautoreconf
 }
@@ -142,7 +143,6 @@ src_configure() {
 
 	econf \
 		$(use_enable ncurses consoleui) \
-		$(use_enable nls) \
 		$(use_enable gtk gtkui) \
 		$(use_enable gtk sm) \
 		$(use gtk && use_enable startup-notification) \