Pidgin version bump.

2 files changed, 236 insertions, 13 deletions

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 0c19a6b..ccded2b 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -4,21 +4,23 @@ Hash: SHA1
 AUX pidgin-2.7.3-ldflags.patch 1332 RMD160 0dd11485e9c990dab1230629faac704835a91ae4 SHA1 7bbb420a206bf6cb366bf501b90c893e896a1f65 SHA256 1f8574a9c2f056ba8c07559623da8c9ce241928f060898752eef5770dd1d081a
 AUX pidgin-gnome-keyring-1.patch 7457 RMD160 0d8345675a073c8585bf0be7678f52d63d14ec95 SHA1 b3dd0d336e4773578cc6e20dc9b317b27f383077 SHA256 f56bc4a1a678ad749848108ecef76f4bb2b16501908197bb645518e1a3027619
 DIST pidgin-2.7.10.tar.bz2 9970363 RMD160 a79e53ba1ecef4c17e2ebf8121a712cf03eac6ca SHA1 ebce0b8c6130849e0df1bdc4557470b1d99da45a SHA256 269708d519537d74ff316ff88f5c39e0c04617073a07dce920fa85321586950e
+DIST pidgin-2.7.11.tar.bz2 9978175 RMD160 2bee3fe39c02948d10e1fdb6fff2840941148786 SHA1 3da07577c15257108d61c7f2d3f63cd422cdb4d7 SHA256 a24e2c3118bd47983955d398c9cf5543c12e95527cdf7de9d273a6e92f9d160b
 EBUILD pidgin-2.7.10.ebuild 6666 RMD160 6cfcd6ba7bb286e84d6be4d9fd28593d8276f84b SHA1 eb517dee2bcf70c6bb5eb737edbb605b481a071f SHA256 37cb2a4787e9ed6ad22bad073f95499795ad998824b88bcf5ad4056345eb680a
+EBUILD pidgin-2.7.11.ebuild 6632 RMD160 36673abb129cf01421e1c20c1aacd91ef62699bc SHA1 ead6dcc42d55a3c80db870922eae30a810537c3c SHA256 20af8703f70721800aa905339e13f47e1b230783dfd1f82ed36a354f97430bce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNXGlsAAoJEHy/RO9cNQiDYAAQAIzHIQ2R8HaPw8eIk3B4ysSf
-4/brF60qrJ45rIoL0kaZ0prhPgR4YDT5h2D8kYCStS1JF+KCYz10TQ1KvCS19mww
-S50wXo6HJT6RBquHOJ7zgms0XCpYTYS84I8XLdF5iXcc0nv4sx2A1D2+25H/DucL
-hiSNLAmEksQVrqwrKoxGK/cyKB6kuYLxs/Li6IhuxpPhr4NLQxlkTJoxpJqFO35j
-PdQ9HxrlbscafZWMhYLTNlw+ZZUskO8loB6AO2q/ZBcxJb+WMO/e7aabny5YSXVW
-p13wcutIucyei/KAyui3NQQ0pKGPU5+EmfLtQFKrnB1nEQrXnAV+H+RIPFgxyer4
-bWsk+gTB4AhZmVvUQhIXfjCE5Tpttg/jD5v3PYMZnTjlx4QHF/5AWghkzhH2t4Mt
-EJ2iE3wTPCmPJsM6rJWc1Ztx++GWBpicwsQe9dh5GUi/VQTC9vTvPeB9CBrH2R6m
-OXG2mQOTPoFAFh6nKCab6/neSUzg965tAicqKCln6cRDPK1SSDT9siF10w4NmIQK
-DfW78zuhxGjvvNzNCN3pSEon034Q7KPWU/+Nak0uAlwYRhKUZy9dZSJa9qwJ+CZj
-9dula4tmvaYC5IlF4iBaIUzfEYO2Q5KGK/PtiKYyE4L/HuE/Op2/DAsn4D0+RvJ+
-f9g9VoQROtX+g7FsElwa
-=9zy0
+iQIcBAEBAgAGBQJNfWb8AAoJEHy/RO9cNQiDx1wQAKrTc27ZBypPukAQZCb5d902
+cvQ4is1uB41YsqrEbWOfeqU48UUCOC6TUENtU4DCKEOlKHkt5EPwZdxSmOcAZz0w
+3edwnh7jdVsDSk1uisDpJje/CF2I/RCPkJ+YYiWAeLkVD4q+4whGx3wZ2T5wpjie
+wzc18b2vzFzKeZRUqZCzg41GS+V2pAgrkYVoEmRy4SxbKMTOk9nheZXA/p+nTu9U
+nvd6ulkLNN0VuIga4F3Arzn4pj54piFxO9jMiuCeHZy+nuJOoYH+og+y0fWGsadG
+XZevkha5Fh/JYgH5qmD6urDY4pmfNbLF7fTchJA0acoqRd3G405Ez/MhcmCr2F4u
+zXs3FLKd4McZ0FbheZz99ePMkEu928KzwcqcviZrIn50nmQGhGM0S0RekE8h5j5M
+mbu2u359I5wH0XHGGaXY2ipEJ7F2GHVb1NHeXjQHyXMypxHyvZWZYLtLTwqLNzzk
+Lu/yDwW59Y/9cmdEwBTCTvmeH4++SwyR71bJebZpX+dO2SQ6UBZQQcmPfBjgEZQd
+4IAaLECuggF2cbZcVTy8W6voSmIWCHS6rYzAeqMva6j8bYIhBgyjF8hvepiFDBXg
+JqPx/XuDALtPU2yHRPBO+PHhBC3yN9R3mvX4SDNk10AGBHl7k4MErdrdrnB++0L/
+s/7SltPjY3H5RVlEFrcW
+=BAFy
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/pidgin-2.7.11.ebuild b/net-im/pidgin/pidgin-2.7.11.ebuild
new file mode 100644
index 0000000..d248b0e
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.7.11.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.11.ebuild,v 1.5 2011/03/13 18:53:26 klausman Exp $
+
+EAPI=2
+
+GENTOO_DEPEND_ON_PERL=no
+inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python autotools
+
+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"
+IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
+IUSE+=" networkmanager nls perl silc tcl tk spell qq sasl ncurses"
+IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+IUSE+=" gnome-keyring"
+
+# 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.12
+	>=dev-libs/libxml2-2.6.18
+	ncurses? ( sys-libs/ncurses[unicode]
+		dbus? ( <dev-lang/python-3 )
+		python? ( <dev-lang/python-3 ) )
+	gtk? (
+		>=x11-libs/gtk+-2.10:2
+		x11-libs/libSM
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		spell? ( >=app-text/gtkspell-2.0.2 )
+		eds? ( gnome-extra/evolution-data-server )
+		prediction? ( >=dev-db/sqlite-3.3:3 ) )
+	gstreamer? ( =media-libs/gstreamer-0.10*
+		=media-libs/gst-plugins-good-0.10*
+		>=net-libs/farsight2-0.0.14
+		media-plugins/gst-plugins-meta
+		media-plugins/gst-plugins-gconf )
+	zeroconf? ( net-dns/avahi )
+	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.9.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 )
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	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
+	dev-util/pkgconfig
+	gtk? ( x11-proto/scrnsaverproto
+		${NLS_DEPEND} )
+	dbus? ( <dev-lang/python-3 )
+	doc? ( app-doc/doxygen )
+	!gtk? ( nls? ( ${NLS_DEPEND} ) )"
+
+DOCS="AUTHORS HACKING NEWS README ChangeLog"
+
+# 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-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/pidgimpd
+#	x11-plugins/pidgin-birthday
+#	x11-plugins/pidgin-convreverse
+#	x11-plugins/pidgin-extended-blist-sort
+#	x11-plugins/pidgin-lastfm
+#	x11-plugins/pidgin-mbpurple
+
+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 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
+	if use dbus || { use ncurses && use python; }; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	epatch "${FILESDIR}"/${PN}-gnome-keyring-1.patch
+	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 silc && DYNAMIC_PRPLS+=",silc"
+	use qq && DYNAMIC_PRPLS+=",qq"
+	use meanwhile && DYNAMIC_PRPLS+=",sametime"
+	use zeroconf && DYNAMIC_PRPLS+=",bonjour"
+	use groupwise && DYNAMIC_PRPLS+=",novell"
+	use zephyr && DYNAMIC_PRPLS+=",zephyr"
+
+	if use gnutls; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf+=" --enable-nss=no --enable-gnutls=yes"
+		myconf+=" --with-gnutls-includes=/usr/include/gnutls"
+		myconf+=" --with-gnutls-libs=/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 \
+		--disable-silent-rules \
+		$(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 farsight) \
+		$(use_enable gstreamer vv) \
+		$(use_enable sasl cyrus-sasl ) \
+		$(use_enable doc doxygen) \
+		$(use_enable networkmanager nm) \
+		$(use_enable zeroconf avahi) \
+		$(use_enable gnome-keyring) \
+		$(use_enable idn) \
+		--with-system-ssl-certs="/etc/ssl/certs/" \
+		--with-dynamic-prpls="${DYNAMIC_PRPLS}" \
+		--disable-mono \
+		--x-includes=/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=${D}/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
+
+	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}