Fixed bug #420819 and #434212

Package-Manager: portage-2.2.0_alpha182/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 267 insertions, 18 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index c355e5f7ff84..b6ca265b64ec 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.307 2013/03/27 20:17:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.308 2013/06/20 13:58:10 polynomial-c Exp $
+
+*pidgin-2.10.7-r2 (20 Jun 2013)
+
+  20 Jun 2013; Lars Wendler <polynomial-c@gentoo.org> +pidgin-2.10.7-r2.ebuild,
+  +files/pidgin-eds-3.6.patch.bz2, metadata.xml:
+  Added mxit protocol as per bug #420819 and added the patch from bug #434212
+  to make pidgin compile against >=evolution-data-server-3.6. Converted the
+  package to use new python eclass.
 
   27 Mar 2013; Agostino Sarubbo <ago@gentoo.org> -pidgin-2.10.4.ebuild,
   -pidgin-2.10.6.ebuild:
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 94002a84623f..a942ff66999b 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,27 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX pidgin-2.10.0-gold.patch 1003 SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb SHA512 9c54d1da082362325aa5ec0f25356e629adb7f639a0ea98a8aff726e4769cb21bf3350772aa219b7ad021630d13113de02c42317551edfe5f044ae40ac0df984 WHIRLPOOL 77fdb2855ac8fe3dc163a42d18df1847f849d9fc42cb09565746e70e72f9e2f74f3d33f44c6bc6f8277047d6d05bb9f12507a8f8c16e1c672c201a75c8fa7c8b
 AUX pidgin-2.10.7-fix-cap.patch 692 SHA256 4dbf4e8123d7b7550f99fb5b8fb97e98b44551750436ca5327f8257438400dcd SHA512 0a1dc0ceaf78416ecd409a4bdcecef83a48cbdea50314d55a6cb1e1cad06775e1e8ac23f069ef4ed8ca8b4f3bb99f184804fddf7812adfcba8c8920a9c6efdbc WHIRLPOOL 8beca2bcb10380034ccd461559e7504922613de19649ca045e88c19de452bc4beb4b47c4b9976cf24854edf502ce11e74de00f5add86025c4bd066e17e85a962
 AUX pidgin-2.10.7-link_sasl_in_irc_plugin.patch 642 SHA256 8f91df48549004c80d5989bfdcc11f7a7805f3770b6aa2a5676d86eb334cf5b8 SHA512 3bc39f994473e01ab532e804481a858b0e1ddc3252a27fc29cb32c550e207699ee39da0057b6e86f4a33870b29f44b701a1614e93ff223930208ef0e8061fed1 WHIRLPOOL 5d0ce684e06fbe8c507310947696fed1910f631f93b0e71fc44610e06c6b1d93b966af89d4def15d8fcaa1b11001ab7066e94c732f58423046bc9e645816a91e
+AUX pidgin-eds-3.6.patch.bz2 2352 SHA256 321185dd5f44e502f671b17e84fa1ca2e08a3f7c79ed211c0bb92710700bcc41 SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 WHIRLPOOL 5c1d3e933bdfa4b1f20f98dbf8b5c1669eb857b9db60dacae488fa04331300618df2f1265e4fb2e58ed31b24229df0edb8c30970d8172fd65ca7fa03bc0e3805
 DIST pidgin-2.10.7.tar.bz2 10069279 SHA256 eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192 SHA512 0f0d421f91be3b1577527f3609bff164d7c57a94338e18dca5d8b7d911634a98b9c0e8860f3e62026eba09a6afb3112a8cd6770a90c89afdb9fb40f83dd6f3e4 WHIRLPOOL 025a392ab069817e2fea07d0e9e7efeee006eaf4ce2e6571c49b851735309f3346bfdbf34c874f55b440b71fbbba0ac55029da727b1f731175d72efb2e74f3b4
 EBUILD pidgin-2.10.7-r1.ebuild 7196 SHA256 503c720666eace61455aa57b854f9fde0d5320906d50f4cfedf650e698dcc94c SHA512 f75243e7071b3381af567bd621f626aab99f741b588a3b637b7c7e93730b3b555d845f8d4ede95a947d1159cab905879ba362a36658e9749d12df60833f45af1 WHIRLPOOL d8780190a547b32b266ce475ffbc63eedcf740e18adf9c5d78ab02a5967bf04be7cc8377ebc8e5b9bb91634844522349ca1d20def2bbc3bb1c631035ae2ff49a
-MISC ChangeLog 43283 SHA256 d85f9b783d41ba317895b7b69657edf0d62f8434c89c1894343bce0e875dbbbb SHA512 88ae9acb9a2a3cf551381796257fd4d7d6fa99d280bcd78cf871dab5fd8caeb44e3fdcf405513dfe45cef2a5f108ae9734cbf1fa66d63b6461a1b46b960cc0a9 WHIRLPOOL 921b82a8a4e8f67a55f5428615dbd7b3a8001552223fcafeae8edb10759547fab4b5f16664fe9ebc6cd09bbf1c8c14491de61c1e3270984276d268154bfce85c
-MISC metadata.xml 1413 SHA256 bc70dbf6ae07f27a8267ef736bf78ea553779947a5b55fc239afeb8bb9f40d54 SHA512 596f8fb6a456b1be9b3403d7b7df32b224c539b711c7f9ce7d95b36c28d4485c2e268387c553fb8ce9eb9b312f2b91fec8ce9d3f88b5f50446d4755bb6101b20 WHIRLPOOL 3a29fc9c15e2c796adc9f298aed736f7fb4aba1e5318cfb02f83b8f193374867670819f14e8a15d894ed9880d4a011e1d5f27a7e1742d56b943c4e102e507fd6
+EBUILD pidgin-2.10.7-r2.ebuild 7267 SHA256 8f9ae4c73b3aa20d7e9f7574b77b1e1c9bc10c71e27399cdd560f667e01da663 SHA512 f377c50787bcfec2e34e4e5d3c6c5aada89c1af5721db9961a575137be67d64551e100d6739d4523b59529a1d37fbb46c94e36ba10ab4b8716274ece409de3f3 WHIRLPOOL f81a4c33e8eec6e2f8c60216ae4038b7857d007fa3660b02cd3d2eeeeae1162ceaaf796c2912582cda1a41feb76fbe24c2cb68237851c83da66580fb08f648eb
+MISC ChangeLog 43645 SHA256 d019fd33b5a9740e68b627109f338de97aca92b0a8eb8706036a31bb7dfa40f0 SHA512 4a4b3b427464abca34ca2d05af0778ecbec2eb723d057ddbe495e721dba4025bdf345d3a3c1261837c45aeba56e9be0863e4ca093c3574830f3b39b352e01ddf WHIRLPOOL 6a446d0f5a33a37eab80e377f19fdc104478ec91bc5132134db5b2fc970bda860d6abf738318ecd9b8a797c2a99fc83b71f3391475f676e631bb4f2e9c462c47
+MISC metadata.xml 1469 SHA256 5ca9b28465b16f382131076f07b9da546c34979bd8b681e980684ba8df7aabb9 SHA512 30cbf602434bd058632099ed6545a62a9ed476b1cc98f46a5500c61a0c8deb2a2325f74c08cfb7ac486128c5979646308e3c9a1c292e2f0bc9832a413079ccce WHIRLPOOL 745038f3b97b3d3e5adbf7d98292f0effe00553ce5c53f888dde4d02cf73b80fd62901b19acad2d0988902dcbc9813f5953c6d13348f2bb7409bfeeda05ab6af
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRU1P4AAoJELp701BxlEWf/MAQAMDPTFvpssXLkxwUVhG9PDNv
-Kj8Z+ZpL0YuaA4I5NNLsEGAze4IhFVJJ29m8XYoZmG0s2C9WyFt1smC3ccSx4ufo
-xIrAVdaWXGWck3C/+bnESapq1YWFletla78UWXj7iLhqHgG5fCbsHbsB+RjdvXWF
-TwaAxmmy99GTMP7lfLBZIzsNDQp6Z+MQHh2eC1l+gH9wF7yAKERasBBSvzyMgfxt
-6Lgft92Rp0yP8Wi9iqgFhR8Z7J2oQlBSlqGAdKnRwkzbuCF73FHAGKdQSxx1oWy2
-DtqBVJIcRWcsMDPRrbF6M3QV7levSeF4rjtF5Kxu9V9krzjO2OT24H2+IPeZfYMR
-KFU0OqSQQGi3ubG6TMlivNbLvTiXIBjntBsu3GHr0pwXGR4VhkEHtnhZp3CAJqfL
-GlF/zpjrnhXwAvJqI3aeNbFDtth6/YvdlFASYzlQcTz2mZhjRUAZIV5WBvHTMquw
-8nlWfe/UeKKDH2KiCRNko+nsCAIGAqS/iepEIJWaDaBsrA1ieaw1gzKgVwr6HrWR
-0K2FgMmKmNJJbpFB2KciKjVtcmna8DOwsdDMMIeb5C6NyVKHimT4G0lXkv0iAWbS
-1nt2+7GVjTjR8vBu2PtLRdsdYYfwD3U+TJaExWv7MO1aIxHbM0YDUEeB0bZXc/GC
-NVWvlvtB5Nw8ZexIGs4Z
-=H6b+
+iQIcBAEBCAAGBQJRwwpzAAoJEPiazRVxLXTFzE4QALvAbNPD9YGe5J2ki7SH622M
+CnoLn6jlifpCktp2g3BMY3XJMZMGe3ETrbN4mrm2Zy3oIuJsx+19qPpqq1jlxm8F
+9UuByST5eXFtEK5fy+DvgxT5PG/OFJEM8YCWlXT9i2meRh4fXMTzvuJ17uULvgh2
+6zwm2RLq2Xd1viF/eeEdfZN+t/Vh/P2N1CIBtscTfrDnKqJJ1mK6L6v8s/WO08nx
+m558qlPQClbYMhpLknCCZKlXKnGVeiXNr12hqSlg/SCq0LsB4eMrC0lOzj8nJ/a2
+TOQl0pLJAO+utBFpj2K4plX0xuqGubde8krB01z66St7bj8m50Z9TzD1G9Aff1RX
++Jc6iqeMHvvC3VLDGmDAYrJwUGB2Qf+u7JcNabX88P2yJVNJYIJEZrW23av7t2L2
+ijwJLsfrWKgR4sgPBsuMl/wlcPmC/9QL3chPL+yA0ztoOw7uXJ1PA3nR59xBkEw/
+3cSpb5IdNgzJp4ABJdrE6kdkihK0kGiWFO1m7MyAPqfAiOZWqk2GpmF5c5sZ/Tof
+SnILtA7RkDR+cxhvsv9tQYvFLenl8EPQoAB2C/OqLKha9HJnbHT0jgNdvUb4yI5p
+/LZHhsjAaL3frHPBthSih67e/SlWVh0u0sHEmM3cH5fXoAz2hapM6p8/KPnjWDZc
+v/eIDXyjacs5ZWoVsbUP
+=hOJN
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-eds-3.6.patch.bz2 b/net-im/pidgin/files/pidgin-eds-3.6.patch.bz2
new file mode 100644
index 000000000000..7a9747213392
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-eds-3.6.patch.bz2
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index b1ad116dd651..616232190385 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name="gstreamer">Enables voice and video sessions</flag>
 		<flag name="gtk">Builds Pidgin, the GTK+ interface</flag>
 		<flag name="meanwhile">Enable meanwhile support for Sametime protocol</flag>
+		<flag name="mxit">Enable mxit protocol support</flag>
 		<flag name="ncurses">Build finch, console interface</flag>
 		<flag name="prediction">Enable Contact Availability Prediction plugin</flag>
 		<flag name="python">Build libgnt (GLib Ncurses Toolkit used by finch) with python scripting support</flag>
diff --git a/net-im/pidgin/pidgin-2.10.7-r2.ebuild b/net-im/pidgin/pidgin-2.10.7-r2.ebuild
new file mode 100644
index 000000000000..5bdc3bacd85b
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.10.7-r2.ebuild
@@ -0,0 +1,238 @@
+# 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-r2.ebuild,v 1.1 2013/06/20 13:58:10 polynomial-c Exp $
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 )
+inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://pidgin.im/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
+IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
+IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+IUSE+=" aqua"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+	>=dev-libs/glib-2.16
+	>=dev-libs/libxml2-2.6.18
+	ncurses? ( sys-libs/ncurses[unicode]
+		dbus? ( ${PYTHON_DEPS} )
+		python? ( ${PYTHON_DEPS} ) )
+	gtk? (
+		>=x11-libs/gtk+-2.10:2[aqua=]
+		x11-libs/libSM
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		spell? ( >=app-text/gtkspell-2.0.2:2 )
+		eds? ( >=gnome-extra/evolution-data-server-3.6 )
+		prediction? ( >=dev-db/sqlite-3.3:3 ) )
+	gstreamer? ( =media-libs/gstreamer-0.10*
+		=media-libs/gst-plugins-good-0.10*
+		|| ( net-libs/farstream:0.1 net-libs/farsight2 )
+		media-plugins/gst-plugins-meta:0.10
+		media-plugins/gst-plugins-gconf:0.10 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	dbus? ( >=dev-libs/dbus-glib-0.71
+		>=sys-apps/dbus-0.90
+		dev-python/dbus-python )
+	perl? ( >=dev-lang/perl-5.8.2-r1[-build] )
+	gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls]
+		>=net-libs/libgadu-1.11.0[-ssl] ) )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( >=dev-libs/nss-3.11 )
+	meanwhile? ( net-libs/meanwhile )
+	silc? ( >=net-im/silc-toolkit-1.0.1 )
+	tcl? ( dev-lang/tcl )
+	tk? ( dev-lang/tk )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	networkmanager? ( net-misc/networkmanager )
+	idn? ( net-dns/libidn )
+	!<x11-plugins/pidgin-facebookchat-1.69-r1"
+	# Mono support crashes pidgin
+	#mono? ( dev-lang/mono )"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="$RDEPEND
+	dev-lang/perl
+	dev-perl/XML-Parser
+	virtual/pkgconfig
+	gtk? ( x11-proto/scrnsaverproto
+		${NLS_DEPEND} )
+	dbus? ( ${PYTHON_DEPS} )
+	doc? ( app-doc/doxygen )
+	!gtk? ( nls? ( ${NLS_DEPEND} ) )"
+
+DOCS="AUTHORS HACKING NEWS README ChangeLog"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
+
+# List of plugins
+#   app-accessibility/pidgin-festival
+#   net-im/librvp
+#   x11-plugins/guifications
+#	x11-plugins/msn-pecan
+#   x11-plugins/pidgin-encryption
+#   x11-plugins/pidgin-extprefs
+#   x11-plugins/pidgin-hotkeys
+#   x11-plugins/pidgin-latex
+#   x11-plugins/pidgintex
+#   x11-plugins/pidgin-libnotify
+#	x11-plugins/pidgin-mbpurple
+#	x11-plugins/pidgin-bot-sentry
+#   x11-plugins/pidgin-otr
+#   x11-plugins/pidgin-rhythmbox
+#   x11-plugins/purple-plugin_pack
+#   x11-themes/pidgin-smileys
+#	x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+#	x11-plugins/pidgin-audacious-remote
+#	x11-plugins/pidgin-autoanswer
+#	x11-plugins/pidgin-birthday-reminder
+#	x11-plugins/pidgin-blinklight
+#	x11-plugins/pidgin-convreverse
+#	x11-plugins/pidgin-embeddedvideo
+#	x11-plugins/pidgin-extended-blist-sort
+#	x11-plugins/pidgin-gfire
+#	x11-plugins/pidgin-lastfm
+#	x11-plugins/pidgin-sendscreenshot
+#	x11-plugins/pidgimpd
+
+pkg_setup() {
+	if ! use gtk && ! use ncurses ; then
+		elog "You did not pick the ncurses or gtk use flags, only libpurple"
+		elog "will be built."
+	fi
+	if use dbus || { use ncurses && use python; }; then
+		python-single-r1_pkg_setup
+	fi
+
+	# dbus is enabled, no way to disable linkage with python => python is enabled
+	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+	if use gtk && ! use nls; then
+		ewarn "gtk build => nls is enabled!"
+	fi
+	if use dbus && ! use python; then
+		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
+		"${FILESDIR}/${P}-fix-cap.patch" \
+		"${FILESDIR}/${P}-link_sasl_in_irc_plugin.patch" \
+		"${FILESDIR}/${PN}-eds-3.6.patch.bz2"
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+
+	local myconf
+
+	if use gadu; then
+		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
+			myconf="${myconf} --with-gadu-includes=."
+			myconf="${myconf} --with-gadu-libs=."
+	fi
+
+	use groupwise && DYNAMIC_PRPLS+=",novell"
+	use silc && DYNAMIC_PRPLS+=",silc"
+	use meanwhile && DYNAMIC_PRPLS+=",sametime"
+	use mxit && DYNAMIC_PRPLS+=",mxit"
+	use zephyr && DYNAMIC_PRPLS+=",zephyr"
+	use zeroconf && DYNAMIC_PRPLS+=",bonjour"
+
+	if use gnutls; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf+=" --enable-nss=no --enable-gnutls=yes"
+		myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
+		myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
+	else
+		einfo "Disabling GnuTLS, using NSS"
+		myconf+=" --enable-gnutls=no --enable-nss=yes"
+	fi
+
+	if use dbus || { use ncurses && use python; }; then
+		myconf+=" --with-python=${PYTHON}"
+	else
+		myconf+=" --without-python"
+	fi
+
+	econf \
+		$(use_enable ncurses consoleui) \
+		$(use_enable gtk gtkui) \
+		$(use_enable gtk sm) \
+		$(use gtk || use_enable nls) \
+		$(use gtk && echo "--enable-nls") \
+		$(use gtk && use_enable xscreensaver screensaver) \
+		$(use gtk && use_enable prediction cap) \
+		$(use gtk && use_enable eds gevolution) \
+		$(use gtk && use_enable spell gtkspell) \
+		$(use_enable perl) \
+		$(use_enable tk) \
+		$(use_enable tcl) \
+		$(use_enable debug) \
+		$(use_enable dbus) \
+		$(use_enable meanwhile) \
+		$(use_enable gstreamer) \
+		$(use_enable gstreamer farstream) \
+		$(use_enable gstreamer vv) \
+		$(use_enable sasl cyrus-sasl ) \
+		$(use_enable doc doxygen) \
+		$(use_enable networkmanager nm) \
+		$(use_enable zeroconf avahi) \
+		$(use_enable idn) \
+		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
+		--with-dynamic-prpls="${DYNAMIC_PRPLS}" \
+		--disable-mono \
+		--x-includes="${EPREFIX}"/usr/include/X11 \
+		${myconf}
+		#$(use_enable mono) \
+}
+
+src_install() {
+	gnome2_src_install
+	if use gtk; then
+		# Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
+		# implementations that are not complient with new hicolor theme yet, #323355
+		local pixmapdir
+		for d in 16 22 32 48; do
+			pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+			mkdir "${pixmapdir}" || die
+			pushd "${pixmapdir}" >/dev/null || die
+			for f in ../status/*; do
+				ln -s ${f} || die
+			done
+			popd >/dev/null
+		done
+	fi
+	use perl && fixlocalpod
+
+	dodoc finch/plugins/pietray.py
+	docompress -x /usr/share/doc/${PF}/pietray.py
+
+	prune_libtool_files --all
+}