Fix multiple display of room members, bug 375627 thank Antonov Nikolay for digging...

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

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index c2891f8bb3f1a522cb7560d01f4e2da81364886b..32b679b743421ee566b046bc6c9c603f65c30b27 100644 (file)
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.245 2011/07/09 16:49:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.246 2011/07/27 07:01:12 pva Exp $
+
+*pidgin-2.9.0-r1 (27 Jul 2011)
+
+  27 Jul 2011; Peter Volkov <pva@gentoo.org> +pidgin-2.9.0-r1.ebuild,
+  +files/pidgin-2.9.0-conversation.c.patch:
+  Fix multiple display of room members, bug 375627 thank Antonov Nikolay for
+  digging patch.
 
   09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> pidgin-2.9.0.ebuild:
   ppc stable wrt #372785

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 9ebe17433468f802b82ca07158e36bb888444bfd..39682a4e53d02b5c756343decd9d898f41bd437c 100644 (file)
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pidgin-2.7.2-ldflags.patch 1593 RMD160 ade438f25d0af927485523e561ce728762645948 SHA1 6ac16bd019ad048109643af5e3525987c994dbb0 SHA256 64d78b48111345b49216e9678c114f321963393b4fd0aa6046de8aec6f03cb44
 AUX pidgin-2.7.3-ldflags.patch 1332 RMD160 0dd11485e9c990dab1230629faac704835a91ae4 SHA1 7bbb420a206bf6cb366bf501b90c893e896a1f65 SHA256 1f8574a9c2f056ba8c07559623da8c9ce241928f060898752eef5770dd1d081a
 AUX pidgin-2.8.0-finch-icq.patch 602 RMD160 7aa3168c557985ef2f6f4381ff0b60d3bd9c4fd1 SHA1 1d1aaf53ef0a46d486c9746cff22cc0bfa855158 SHA256 15caf0a737fb9d1e6f02dbf567107abe7121bc79f18568c2216539b80dbc7d04
+AUX pidgin-2.9.0-conversation.c.patch 523 RMD160 61922053efdaf25e9580dc4199df75b60c0c976d SHA1 e185accd3dde589b93baf53086790f88b2162f61 SHA256 43efe68ca8451c993ed46e9523e5eaf419f099d60c3499ab6e451d322c87d63f
 DIST pidgin-2.7.11.tar.bz2 9978175 RMD160 2bee3fe39c02948d10e1fdb6fff2840941148786 SHA1 3da07577c15257108d61c7f2d3f63cd422cdb4d7 SHA256 a24e2c3118bd47983955d398c9cf5543c12e95527cdf7de9d273a6e92f9d160b
 DIST pidgin-2.8.0.tar.bz2 9921362 RMD160 92bed10284e2d88e18dbabaa2eac214c938c9adb SHA1 c5b4f06fc88d57054953044c75563a473bb352fd SHA256 71ced93efecd48a1114eaf6370adebf591ace31158457baf023d15892d663c78
 DIST pidgin-2.9.0.tar.bz2 9925589 RMD160 c093adadd3362ed7d266dfb07df5b75974605d5a SHA1 632c681030304443a911c9eeca6d582df0a24fbb SHA256 28ee8ece47d94ee1b708a78d613832ea88b56d879a93fa934d532d76ae52cfd7
 EBUILD pidgin-2.7.11.ebuild 6450 RMD160 15df33bfd9e0a4875a1206fe43cd54843104df69 SHA1 936ed58367c33e4df403d7764ecb7d51d2d6b9b6 SHA256 804438aedd0fd8b309c7291b60978b5cbad4acdc8c65e9fcf23722b978a4fa08
 EBUILD pidgin-2.8.0-r1.ebuild 6922 RMD160 d8ef43aa08c040fef51a39ec480a686a11c73f1b SHA1 590acac68022bf4f7a9617b03a1eb658414f8f78 SHA256 4e794fe3fdb55ecb1236a9c64acd592f313cb2bb6af34605ff1b4c74580d09e9
 EBUILD pidgin-2.8.0.ebuild 6835 RMD160 10c655434d6590a442b4cabfa9e0847c76fedfac SHA1 85783e1161b006f05d5bcf18a01053c5259e109f SHA256 6db41d97437a296141ae1234bd50d73e9808d28984f11d49d812eecbae5c38b9
+EBUILD pidgin-2.9.0-r1.ebuild 6643 RMD160 e92eaa5eb4adee2407fd95be576460b717d0eea5 SHA1 24ed54beb85844f03842d0b862e627b93e0c7e3b SHA256 849083f40ff6feb0f52e2e4066b576e13a5d2bf0a8381138dc2b9ac387a081c6
 EBUILD pidgin-2.9.0.ebuild 6564 RMD160 6ad35cd8e0e57fc926f717b9acdc0e204b1fec75 SHA1 74e25e6ed11be085dbdcd5712166d9bd4dfbc51f SHA256 07136384254a9cec2a3f98813265f4c85bbd4a05eabde343e6ffa31978f4de13
-MISC ChangeLog 34452 RMD160 bb345eef19e0b92cf8c083bb7438c9f51cf50c53 SHA1 6d7fa80b72cdb2cd4401f6f360acf1491ad89750 SHA256 0543b6683748de5635dbce28149e83872f7cb6ac9bac3dbed142d5e105a1c198
+MISC ChangeLog 34686 RMD160 bd7d9740f6a7ccb28de7d72e4f0f0be73f86d285 SHA1 0d69df9378e580114f93748a2923db4955447fcf SHA256 f8945f7b1ed2fb080a25f44933d6f9b292281024a61a66388141d890fe2b8bd9
 MISC metadata.xml 1347 RMD160 ab118b33da598ea43ea4adb8cd07d269faf19528 SHA1 d68aea7e02d1fa45f1a71eb34c98259d61c935ca SHA256 b1b9067810378483188a403fb85f8ff76bc5260cb4bb811179eed1088dd6f5ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk4YhrgACgkQIiMqcbOVdxQeMgP+ME+cqbaOZCD4Rla4w7GEMHmP
-Srz/5PL3Zh4fc/PQbp+1E/rA5wXXzYHkxnUnc9h1tkkL03qvyDn55qHgTWVfRYhk
-hJtImrpuh/NRn7jfRWpGMuSA/d5l6g1jPq0c23n0W4UAjHee3mk48YQXWGIBmISb
-lYUDLtyKHLJD3obcBeU=
-=Ddm6
------END PGP SIGNATURE-----

diff --git a/net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch b/net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch
new file mode 100644 (file)
index 0000000..bf09668
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch
@@ -0,0 +1,17 @@
+#
+#
+# patch "libpurple/conversation.c"
+#  from [cd6817f4863abafef969359f65cc025f9483b401]
+#    to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803]
+#
+============================================================
+--- libpurple/conversation.c   cd6817f4863abafef969359f65cc025f9483b401
++++ libpurple/conversation.c   19aac10ceebae1ee28788b6f0c02bcfcff0c8803
+@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC
+       }
+ 
+       g_hash_table_remove_all(chat->users);
+-      chat->users = NULL;
+ 
+       g_list_free(users);
+       chat->in_room = NULL;

diff --git a/net-im/pidgin/pidgin-2.9.0-r1.ebuild b/net-im/pidgin/pidgin-2.9.0-r1.ebuild
new file mode 100644 (file)
index 0000000..54bb709
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.9.0-r1.ebuild
@@ -0,0 +1,219 @@
+# 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.9.0-r1.ebuild,v 1.1 2011/07/27 07:01:12 pva Exp $
+
+EAPI=3
+
+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 ~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 sasl ncurses"
+IUSE+=" 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.
+# 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? ( <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] )
+       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
+       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 dbus || { use ncurses && use python; }; then
+               python_set_active_version 2
+               python_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}/pidgin-2.9.0-conversation.c.patch"
+}
+
+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 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 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 "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}