summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2011-12-12 13:50:42 -0800
committerPatrick McLean <chutzpah@gentoo.org>2011-12-12 13:50:42 -0800
commit81bbd6fb46eb538823c1ad0df493d58aea8a7011 (patch)
treed497afc6de281256550ff638671a2a71a876d221 /net-im
parentpidgin version bump (diff)
downloadchutzpah-81bbd6fb46eb538823c1ad0df493d58aea8a7011.tar.gz
chutzpah-81bbd6fb46eb538823c1ad0df493d58aea8a7011.tar.bz2
chutzpah-81bbd6fb46eb538823c1ad0df493d58aea8a7011.zip
pidgin version bump
Diffstat (limited to 'net-im')
-rw-r--r--net-im/pidgin/Manifest29
-rw-r--r--net-im/pidgin/files/pidgin-2.10.0-networkmanager-0.9.patch51
-rw-r--r--net-im/pidgin/pidgin-2.10.1.ebuild235
3 files changed, 302 insertions, 13 deletions
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 0406619..40618e2 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,26 +2,29 @@
Hash: SHA256
AUX pidgin-2.10.0-gold.patch 1003 RMD160 947502ee3c055b80ba35b0fe0d4e5fa26f44b6ae SHA1 2f01a80b9391e15083e009c492ece3771094d46a SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb
+AUX pidgin-2.10.0-networkmanager-0.9.patch 1994 RMD160 76311be8823e809128e5862a2d4019682040b89d SHA1 7582f01f672117a094666c08d03fc114d1184eb6 SHA256 d91ce4a7236ea9b0bc730ec07a994bf5dc2c834e2df04e4615d9ada4a03af7ab
AUX pidgin-2.10.0-utf8-validation.patch 908 RMD160 0f98c6dd6cd9c63b3d61c85a9f18a07a38616115 SHA1 9876a7d8902d85e759c1dff1d8ea55cedaccd293 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4
AUX pidgin-gnome-keyring-2.patch 7680 RMD160 e9f14a4b46aad4e7361113a33fd5e07085bbd978 SHA1 edeca69cb6980f7b5b9ce61a83f7e0ac227c779a SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221
DIST pidgin-2.10.0.tar.bz2 9941288 RMD160 316e948bc4db03b160962b4ee2b1df64d35be335 SHA1 859c6d9c9795c1adcf762b73e072e04a3a85a78d SHA256 f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd
+DIST pidgin-2.10.1.tar.bz2 9961580 RMD160 f73c5540fd01f62ae2a0ae236436f06770a896ef SHA1 045ed0fd7dfedada6e082e7a4564648b55950064 SHA256 2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8
EBUILD pidgin-2.10.0-r1.ebuild 6846 RMD160 3730cf5157689819bb12218b6e4d285f47673c6c SHA1 a9ccf72415e693bfecddf99b513b29972114f78e SHA256 0c961930ae7c7687a2b560439e69592a641d6a6cb9d89dc33d7675490f0491da
EBUILD pidgin-2.10.0-r2.ebuild 7097 RMD160 f1863d895cd6970470c6de2e15c588da28706ff7 SHA1 7c62d84323b093f7cd9b1c4bcda2d439ebcfe411 SHA256 c6d17d2384c89cd7d687a7e1099b665895b5224f8e9701b7d21dd790cf2ee497
EBUILD pidgin-2.10.0.ebuild 6792 RMD160 8b13f7034c9f10d2ac7d609b70eeb7ed68d35346 SHA1 a8155168a17cfc7be2d367a604cffe95f5290689 SHA256 783b63b13dfd0a8465f554900a162552c085575364e99af1402247336e51d46c
+EBUILD pidgin-2.10.1.ebuild 7147 RMD160 7ab996af7067ab7764a9944c2903a98e4d3816c1 SHA1 cfc748af3d532119cdb8dcd6271045a59b7dbbd7 SHA256 814bfb9f568980ebc848ad5fa8b31b24c71b2d2e6e19b5c4b81f22208257781d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCAAGBQJOqgHvAAoJEHy/RO9cNQiD3XMP/jfqFGT3uQvGZxrM5gZeAX21
-JLBOFCN7yShoixZfqbzr6QdpXgHEoSxnNjNRdbK2xTWiHSv0gQIU9Uq6kgm5/Yz/
-PgVHTM8KfVYCf/uCZlTJIFpR/vZmdEyxxQr1Td40CETFX1Dkp3w+axfHyl0qurve
-9fa2+eGENmoARjnIjNvkBoK0mBi+rkG5qVoBUmUksIuFTaghypTpxVdJyQzlXxFb
-gDPoyHYJuLLomjtcbhZ6Pk8zGh2rLnGIQA0yyHKMbIY9fvSPrI1grjnHalguMYh1
-+sB95Vt5xA35JHsGsSku7RN4EvmnqImtKSPLFgB1dlg27/psW/OlMN1L3fj/SmSO
-xU5cE+Ugm3iNzJRGRsIzTURfKa+QHAqk0T/iFDTgIhyAv/SxCiyujegn2U/PjxtD
-xp0NfAMKb1KBpUslyfoSq9WpqwPp11+KMmPh7053U5IXoATKO7o7iH7Y5JTApiD+
-BPb8bSFclO0+B7YVBgOg3K0sF9RHPryD+cBUOh3DxGle7Xe+LF8FvLRtUsLvRqLS
-+JtrQo3GIRGdpSpCuwb/GnIUE2DXz/7bHgCDtlzvps1wTnhOqixgu/Rir+2q41HD
-AMfjmg4Nmh8l0UhFs4qI0L6Z95Rp7uc+wd/gaoaSTnIojrmbbPkYVJ0JEaphds7n
-SVTe5Q5SCDz+wBLLPBuQ
-=WpEK
+iQIcBAEBCAAGBQJO5nbeAAoJEHy/RO9cNQiDkO4P/0pwtBcAwsWtYQfvlp/n4UZ7
+0g7Ri62LfOIHsPzGjUaq3qwed5E61R4bfiEm3F6PQZHnbOcZtjz5bAJmfJo/J07w
+yNJmLG9h920RaVNu4AHcvl5oiHHV97T6vLJhIjJ7Ki6NLQ82Yi/wiv7xZbEA9dGd
+wIISVCxYB2XnijxgKBfXxP3tRGSVu0lm0sldMVssN+zyiZRtv9TyU0FzQuozWYvr
+bAL7w3+BEpceUt7YTqOncy09eAejF0uWx22RvaLPqZAs0cl3fdKOQxJ5Wx0N6V9M
+hZOIqxVjn/PAI7KenAZ8AzgmlO2zbWBx3zOZf5vv4aNG3qehKuNx2S/0rCHMVSct
+aDa+AbKfSDDSx7BDXoJ5elxmOakZoYKSN3X6bh0Aa4FCOKhFZCwdtbhg/NqFeYKM
+7wX6GFkO/TtuS25uY9cynG2LO5Gxd5oErQGx9vRfyRirsISXmQbEXMt9KmUza2xD
+QzszdFJW1mg8sDTq9AooTGQU2pw7wPHV/uqXVHaDGBjYkjLy7x2B+lS+rCF5379c
+FaoU6wbPTvZM/qi6ocVlDLGKjJridvvzt+EottEcDYHimiKJTDExxk15gc8WAeKY
+UDeIljJXDpHfd+CnWtfzG0EkRdyFdOeFIodxkrGolLgpPmpmb39xHGjXXsZoTOEE
+N1eB0dOHf6SioUgF8GwJ
+=IJiD
-----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-2.10.0-networkmanager-0.9.patch b/net-im/pidgin/files/pidgin-2.10.0-networkmanager-0.9.patch
new file mode 100644
index 0000000..8b5c1a7
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.0-networkmanager-0.9.patch
@@ -0,0 +1,51 @@
+http://developer.pidgin.im/ticket/13859
+
+diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c
+--- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 12:01:27.700085246 -0500
++++ pidgin-2.7.11/libpurple/network.c 2011-05-24 13:13:28.185165657 -0500
+@@ -833,8 +833,20 @@ purple_network_is_available(void)
+ purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n");
+ }
+
+- if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED)
+- return TRUE;
++ switch (nm_state)
++ {
++ case NM_STATE_UNKNOWN:
++#if NM_CHECK_VERSION(0,8,992)
++ case NM_STATE_CONNECTED_LOCAL:
++ case NM_STATE_CONNECTED_SITE:
++ case NM_STATE_CONNECTED_GLOBAL:
++#else
++ case NM_STATE_CONNECTED:
++#endif
++ return TRUE;
++ default:
++ break;
++ }
+
+ return FALSE;
+
+@@ -1170,9 +1182,14 @@ purple_network_init(void)
+ NM_DBUS_SERVICE,
+ NM_DBUS_PATH,
+ NM_DBUS_INTERFACE);
++ /* NM 0.6 signal */
+ dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
+ G_CALLBACK(nm_state_change_cb), NULL, NULL);
++ /* NM 0.7 and later signal */
++ dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
++ dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
++ G_CALLBACK(nm_state_change_cb), NULL, NULL);
+
+ dbus_proxy = dbus_g_proxy_new_for_name(nm_conn,
+ DBUS_SERVICE_DBUS,
+@@ -1207,6 +1224,7 @@ purple_network_uninit(void)
+ #ifdef HAVE_NETWORKMANAGER
+ if (nm_proxy) {
+ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL);
++ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL);
+ g_object_unref(G_OBJECT(nm_proxy));
+ }
+ if (dbus_proxy) {
diff --git a/net-im/pidgin/pidgin-2.10.1.ebuild b/net-im/pidgin/pidgin-2.10.1.ebuild
new file mode 100644
index 0000000..ef400d6
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.10.1.ebuild
@@ -0,0 +1,235 @@
+# 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.10.1.ebuild,v 1.1 2011/12/12 18:28:21 pva Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python
+inherit 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 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.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: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-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_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}/${PN}-2.10.0-gold.patch"
+ epatch "${FILESDIR}/${PN}-2.10.0-networkmanager-0.9.patch"
+
+ epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch
+ eautoreconf || die "eautoreconf failed"
+}
+
+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 gnome-keyring) \
+ $(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
+
+ dodoc finch/plugins/pietray.py
+ docompress -x /usr/share/doc/${PF}/pietray.py
+
+ find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}