Fix missed icons in tray that is not compatible with new hicolor theme, bug #323355, thank P Purkayastha for report and test.

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

3 files changed, 214 insertions, 2 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 56d397b0f369..30182d13dd33 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.168 2010/06/09 17:06:34 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.169 2010/06/11 19:48:04 pva Exp $
+
+*pidgin-2.7.1-r1 (11 Jun 2010)
+
+  11 Jun 2010; Peter Volkov <pva@gentoo.org> +pidgin-2.7.1-r1.ebuild:
+  Fix missed icons in tray that is not compatible with new hicolor theme,
+  bug #323355, thank P Purkayastha for report and test.
 
   09 Jun 2010; Peter Volkov <pva@gentoo.org> pidgin-2.7.1.ebuild:
   Set active python version, bug #315109, thank Arfrever Frehtes Taifersar
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 0383408f6639..f05b69703229 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,6 +2,7 @@ AUX pidgin-2.7.0-icq-fix.patch 1991 RMD160 7158710b27950bec2d8dec47e02a4494f8dfa
 DIST pidgin-2.6.6.tar.bz2 9479337 RMD160 6e2ca8fb05b2575c758537d9adc154678b36cd55 SHA1 d74459152f9598139a3fd8aee385e3366722155c SHA256 6ebbe9d339246dfebb244e4c855c4feb678f120d1024ef2ee269e2fde77b2ad9
 DIST pidgin-2.7.1.tar.bz2 9647234 RMD160 5e5deec529b1c8d75cd3f925b3f5e4f5310e42e5 SHA1 b746720cc3e65b3d6da6eab0729f26673f997849 SHA256 f412a5a7389ad553229743b49399f968278095c8258dc0f89f766a6cd0ba95d1
 EBUILD pidgin-2.6.6.ebuild 5214 RMD160 7b8ba0f30aecf8cf62036bfc164ed9632f1d30a3 SHA1 0d3175fa2a0964c86cbacb106cbe3045c8028fc6 SHA256 4bcb6e451bec0f2f19d1d8215adf4943c3ea5d072da66104c88f2955b225a4bb
+EBUILD pidgin-2.7.1-r1.ebuild 6200 RMD160 ae9ad9539204c5d0c6836843c5d4e4d6ad363db6 SHA1 140d7958c70704a3e6524318e1ed804a19af89c9 SHA256 145f005430ac8ed2da1a7605f89b2298368fbd04843e798d987d292e80b1bda2
 EBUILD pidgin-2.7.1.ebuild 5790 RMD160 99ae69219b883d6c2801bfabc56846215a2fe622 SHA1 467e3656ae2a2c75f6470918c9e0df3e384f21d5 SHA256 341d3edf186e7e3615aca9b5d945a1da6d75443cc971175886a54d539dcb1555
-MISC ChangeLog 23476 RMD160 e71038f422b7460986ed557a3b3a4352aa2c578b SHA1 c25734185ed2e110320e9ae7794d48826316202a SHA256 278c0e2fad97dcfdc81367793e93698e3b2c4e78ee64b30a791b6e3565556438
+MISC ChangeLog 23709 RMD160 c76118ee673736895c0e08f4291aa4bfbc05c4b5 SHA1 bd0c3cb535a225bf1732bc7585f8e5311036b8c6 SHA256 9cefb27d5f6b8347362578c783263326f648c63442ba7504ff46106965d94ec0
 MISC metadata.xml 1287 RMD160 a4dbdb57292b295718c8925752fd0850056a0393 SHA1 f7ef2c046ed3bfd53a1c3b84e2724e53d3fa823b SHA256 7abefacd8163d7a36506085a0c00f14fcd56eb269e77fda65c81dd5c08fb87e1
diff --git a/net-im/pidgin/pidgin-2.7.1-r1.ebuild b/net-im/pidgin/pidgin-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..7af74bf6ec54
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.7.1-r1.ebuild
@@ -0,0 +1,205 @@
+# 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.1-r1.ebuild,v 1.1 2010/06/11 19:48:04 pva Exp $
+
+EAPI=2
+
+GENTOO_DEPEND_ON_PERL=no
+inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python
+
+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 krb4 meanwhile"
+IUSE+=" networkmanager nls perl silc tcl tk spell qq sasl +startup-notification"
+IUSE+=" ncurses groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+
+# 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 )
+	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1[krb4?] )
+	tcl? ( dev-lang/tcl )
+	tk? ( dev-lang/tk )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	networkmanager? ( net-misc/networkmanager )
+	idn? ( net-dns/libidn )"
+	# Mono support crashes pidgin
+	#mono? ( dev-lang/mono )"
+
+DEPEND="$RDEPEND
+	dev-lang/perl
+	dev-perl/XML-Parser
+	dev-util/pkgconfig
+	gtk? ( x11-proto/scrnsaverproto )
+	dbus? ( <dev-lang/python-3 )
+	doc? ( app-doc/doxygen )
+	nls? ( >=dev-util/intltool-0.41.1
+		sys-devel/gettext )"
+
+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
+		einfo
+		elog "You did not pick the ncurses or gtk use flags, only libpurple"
+		elog "will be built."
+		einfo
+	fi
+	if ! use xscreensaver; then
+		elog "Note: xscreensaver USE flag is disabled. Thus pidgin will be unable"
+		elog "to monitor idle/active status based on mouse/keyboard events"
+	fi
+	if use dbus && ! use python; then
+		elog "It's impossible to disable linkage with python in case dbus is enabled."
+	fi
+	if use dbus || { use ncurses && use python; }; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+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 \
+		$(use_enable ncurses consoleui) \
+		$(use_enable nls) \
+		$(use_enable gtk gtkui) \
+		$(use_enable gtk sm) \
+		$(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 zephyr && use_with krb4) \
+		$(use_enable zeroconf avahi) \
+		$(use_enable idn) \
+		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
+		--disable-mono \
+		--x-includes=/usr/include/X11 \
+		${myconf}
+		#$(use_enable mono) \
+}
+
+src_install() {
+	gnome2_src_install
+	# 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
+	use perl && fixlocalpod
+}