Bump pidgin to 2.7.7

3 files changed, 15 insertions, 237 deletions

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 1701c7b..1ea05b7 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -3,24 +3,22 @@ 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.5.tar.bz2 9811543 RMD160 0e01cfe8e6d2557f0000724d291a66a710d0ea8e SHA1 f8ac5bef7d2bde898d43a5d97c967bc915c22b40 SHA256 f3f5ee7a7f968a590874b4c40019ae1f9f9889b5723b1417ba691e90fafbd878
-DIST pidgin-2.7.6.tar.bz2 9828413 RMD160 9387ff6c3f1024882da189de3df12fffc5ca04b1 SHA1 fe78cbaf06709943ef4968c224c2fb74372c9644 SHA256 f02602c4de78015c542dd873abe61521bafbe074be624ae1d2bab53da9671753
-EBUILD pidgin-2.7.5.ebuild 6585 RMD160 497c03c9f6b19c1403e7dd7ebb7fe57a167f1027 SHA1 e3e22f2ee2fc880092a0c480222e2c8c733d8ce5 SHA256 6d5d16fd3121a9cb9a6a84186f7c4f9ddbf3591db5d505f6f183e3455d4e562e
-EBUILD pidgin-2.7.6.ebuild 6585 RMD160 497c03c9f6b19c1403e7dd7ebb7fe57a167f1027 SHA1 e3e22f2ee2fc880092a0c480222e2c8c733d8ce5 SHA256 6d5d16fd3121a9cb9a6a84186f7c4f9ddbf3591db5d505f6f183e3455d4e562e
+DIST pidgin-2.7.7.tar.bz2 9829698 RMD160 3181f0ef9fd0544a21b486ee4f35aa06cfb4ada9 SHA1 0ac8c134ce11cdb179f5178e324e21a11a3062ac SHA256 6ceedc24510e3577e1f8c57bb01b3abdaa92f6d067e2602125f0d7fc75f72f1d
+EBUILD pidgin-2.7.7.ebuild 6585 RMD160 497c03c9f6b19c1403e7dd7ebb7fe57a167f1027 SHA1 e3e22f2ee2fc880092a0c480222e2c8c733d8ce5 SHA256 6d5d16fd3121a9cb9a6a84186f7c4f9ddbf3591db5d505f6f183e3455d4e562e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJM6oICAAoJEHy/RO9cNQiD+/sQAMjCMnqIDlwv6mpzXzajf6Pq
-2/G3wYDSM0jYlOx5DNCIyJfvCQGq1BxCzTkUKMseG0h2gYug8trzRbw5B0aKW8l3
-HRcW8AKN9PTKqcWfC5tkd+ubnwo80Ui6kDiC1Qt71MU6yRIFSgzWxUf5y8Ouj8M1
-RJi1UqvIfHH0kI6/nET8iNsgwNPwHopS+qn4KNii0KPwdDmlxV34Z1GJimjM8XB5
-zTSJp8toKeNQVPeYPxkq6L0GBbeB2zIlujwoi2a4NR2/cqtTHeTFX4IRjXCBb5tZ
-vkrYMkbFQkWS2rxs6N1mw9bbgurzTTXABpVdT4rAq0Jp3buArFnI+h7ZFfFkRaRk
-3EhUlyhnWRqm6Egr3qyxne6lJii1YrEZJA3rrMETZx5iJs3zHYrsiqghP8VOSXuW
-zD66qE3rCxkL34hwbC6D/94IpiOk3vlDNUThSbUxb+Rcb6dMKcHIobPS5R/aZrjn
-Zs1Swy/J/NrlVNNvtU246NOzgTJpnAuvFCsOMcQsn6N6ytNJsAgL8FoxlKvOrzDn
-Is9ZEmMXEWBxLNSgnovDMoCCYC6s8+jmGzwb9P/fPz9XxJ1F5OAZv/ZuYKcs0h6o
-eXgzYxWGdItM9RKP8drvzqmkX4Ks+EHGoaeb3rKmhTCkkIxaa1H7UmsiRx5Gs/gl
-yS8LuDHKMn7161pcRO4T
-=NZml
+iQIcBAEBAgAGBQJM7ZBzAAoJEHy/RO9cNQiD07gP/1WgdQUjKoJ0O8IaEHmwocln
+Ucx7iI0gLI9TQf7fzefS4P0inUf8bSGlJ7XDgrNg9Nlnglldfi1zXocVaLbaSP/1
+wrx0hlsdsd69R+BTzIaF7WBpXOc4Fo7KdO77lv+ScNAwa7mYEycCkqXYagl0h4ci
+90KLx/BbfXaUB82TCjGW9xnXBir6rW+kiDHz51nPKUUfBemZQTze9pkG8iBKEOJo
+mDunHxFCgUe2jYRVSERyjK59dHm0WRWw/HV/OO0Xh4OCuynwASB0X+LJPpT43k0Z
+ZLTHTEHujn2ijVy5/UGOBjhhGIw4LHiWSxNKJGVFpI8vtb3hfH+MBQWnteh9wF5U
+/rfEtmp5AcklXq/RAnRndj+ivBtIfnArvgCd9STTzwybpgse9WR5ttc6UOJ5S1fD
+GFZLxiAz61SFa0m0RNTcmpEzEjvuX/x5EEixuOsIG7SjjDvdHA7Qmuzsr6I6A6pc
+A+hdcZK578VSkV0ggRECNRwIZzFWenDPQ6+91zKdLe2KnvFT8/ppYR9CKKRelmBq
+F86cYqeDN/u5oV+kjb9K/l6d9Lnt4guBMUGmcPOGBfF6Z6kDy4CvQ3QsUqlfx3ho
+uO7+K1gYNlSgbSXg/eqSlYF26j40T8r+V9BcTs2h/zmkt5BWJt1lt73xvo7kbzR5
+nQPOitfwI+GrdUd/FxRV
+=LIAG
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/pidgin-2.7.6.ebuild b/net-im/pidgin/pidgin-2.7.6.ebuild
deleted file mode 100644
index 8477e34..0000000
--- a/net-im/pidgin/pidgin-2.7.6.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# 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.5.ebuild,v 1.1 2010/11/02 13:02:02 pva 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 ~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 +startup-notification"
-IUSE+=" ncurses 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.
-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 )
-		startup-notification? ( >=x11-libs/startup-notification-0.5 )
-		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 )
-	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 )"
-	# 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-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-botsentry
-#	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 enalbed!"
-	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}-2.7.3-ldflags.patch
-	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 startup-notification) \
-		$(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"
-}
diff --git a/net-im/pidgin/pidgin-2.7.5.ebuild b/net-im/pidgin/pidgin-2.7.7.ebuild
index 8477e34..8477e34 100644
--- a/net-im/pidgin/pidgin-2.7.5.ebuild
+++ b/net-im/pidgin/pidgin-2.7.7.ebuild