Fixed linking sasl with irc plugin (bug #461530). Comitted revbump straight to stable. Added epatch_user. Added myself as maintainer

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x981CA6FC)

4 files changed, 44 insertions, 6 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 5816f22a1a57..056cb980ee98 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.305 2013/03/14 12:43:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.306 2013/03/18 09:05:20 polynomial-c Exp $
+
+*pidgin-2.10.7-r1 (18 Mar 2013)
+
+  18 Mar 2013; Lars Wendler <polynomial-c@gentoo.org> -pidgin-2.10.7.ebuild,
+  +pidgin-2.10.7-r1.ebuild, +files/pidgin-2.10.7-link_sasl_in_irc_plugin.patch,
+  metadata.xml:
+  Fixed linking sasl with irc plugin (bug #461530). Comitted revbump straight
+  to stable. Added epatch_user. Added myself as maintainer.
 
   14 Mar 2013; Agostino Sarubbo <ago@gentoo.org> pidgin-2.10.7.ebuild:
   Stable for sparc, wrt bug #457580
diff --git a/net-im/pidgin/files/pidgin-2.10.7-link_sasl_in_irc_plugin.patch b/net-im/pidgin/files/pidgin-2.10.7-link_sasl_in_irc_plugin.patch
new file mode 100644
index 000000000000..10cc0a0c7357
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.7-link_sasl_in_irc_plugin.patch
@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Daniel Atallah <datallah@pidgin.im>
+# Date 1362972661 14400
+# Node ID 944ec96bb1037a24435fcdc487f9568197ff5b1d
+# Parent  12fe7c5bfccf80e145470a5a8a4018c53e75b3d8
+Patch from Evangelos Foutras to link to CyrusSASL from the IRC plugin when needed. Fixes #15517
+
+diff --git a/libpurple/protocols/irc/Makefile.am b/libpurple/protocols/irc/Makefile.am
+--- a/libpurple/protocols/irc/Makefile.am
++++ b/libpurple/protocols/irc/Makefile.am
+@@ -27,7 +27,7 @@
+ st =
+ pkg_LTLIBRARIES   = libirc.la
+ libirc_la_SOURCES = $(IRCSOURCES)
+-libirc_la_LIBADD  = $(GLIB_LIBS)
++libirc_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS)
+ 
+ endif
+ 
+
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index 7fdd4641a790..b1ad116dd651 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/metadata.xml
@@ -2,9 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-im</herd>
+	<maintainer>
+	  <email>polynomial-c@gentoo.org</email>
+	  <name>Lars Wendler</name>
+	</maintainer>
 	<longdescription>
-Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes. You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SILC, SIMPLE, and Zephyr.
-</longdescription>
+	Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes. You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SILC, SIMPLE, and Zephyr.
+	</longdescription>
 	<use>
 		<flag name="gadu">Enable Gadu Gadu protocol support</flag>
 		<flag name="groupwise">Enable Novell Groupwise protocol support</flag>
diff --git a/net-im/pidgin/pidgin-2.10.7.ebuild b/net-im/pidgin/pidgin-2.10.7-r1.ebuild
index b8d8ec4f8c16..5b8a145d4c31 100644
--- a/net-im/pidgin/pidgin-2.10.7.ebuild
+++ b/net-im/pidgin/pidgin-2.10.7-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.7.ebuild,v 1.10 2013/03/14 12:43:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.7-r1.ebuild,v 1.1 2013/03/18 09:05:20 polynomial-c Exp $
 
 EAPI=4
 
 GENTOO_DEPEND_ON_PERL=no
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python
+inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python
 
 DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://pidgin.im/"
@@ -134,7 +134,12 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
-		"${FILESDIR}/${P}-fix-cap.patch"
+		"${FILESDIR}/${P}-fix-cap.patch" \
+		"${FILESDIR}/${P}-link_sasl_in_irc_plugin.patch"
+
+	epatch_user
+
+	eautoreconf
 }
 
 src_configure() {