From 427a7f84451d7b0a2b58871aa5073d856c567d22 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Tue, 23 Aug 2011 11:12:01 -0700 Subject: version bump --- net-im/pidgin/Manifest | 22 +- .../pidgin/files/pidgin-2.9.0-conversation.c.patch | 17 ++ net-im/pidgin/pidgin-2.9.0-r1.ebuild | 224 +++++++++++++++++++++ 3 files changed, 243 insertions(+), 20 deletions(-) create mode 100644 net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch create mode 100644 net-im/pidgin/pidgin-2.9.0-r1.ebuild diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index 564a59b..4a66b99 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -1,23 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - +AUX pidgin-2.9.0-conversation.c.patch 523 RMD160 61922053efdaf25e9580dc4199df75b60c0c976d SHA1 e185accd3dde589b93baf53086790f88b2162f61 SHA256 43efe68ca8451c993ed46e9523e5eaf419f099d60c3499ab6e451d322c87d63f AUX pidgin-gnome-keyring-2.patch 7680 RMD160 e9f14a4b46aad4e7361113a33fd5e07085bbd978 SHA1 edeca69cb6980f7b5b9ce61a83f7e0ac227c779a SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221 DIST pidgin-2.9.0.tar.bz2 9925589 RMD160 c093adadd3362ed7d266dfb07df5b75974605d5a SHA1 632c681030304443a911c9eeca6d582df0a24fbb SHA256 28ee8ece47d94ee1b708a78d613832ea88b56d879a93fa934d532d76ae52cfd7 +EBUILD pidgin-2.9.0-r1.ebuild 6816 RMD160 4d7592875919a0aed8b435647e1a1bfbc2b3a99f SHA1 f1a3319b6c1517799df3e41a95fb03dae01fc6bc SHA256 9c4748d8ed962ecfe7f4888121cf17c239a2140f817f3b199d739b83806ad7d2 EBUILD pidgin-2.9.0.ebuild 6751 RMD160 0c4701eedbabaeceff636cb79a43c9485fbb55ca SHA1 f092f1454e4311b14f6576eb0ad6d5cb14ad5d72 SHA256 dcc988da2f20fe9ab34b829bd53a73c3259db946671ce9de720c8994b76e7aa9 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBCAAGBQJOCK96AAoJEHy/RO9cNQiDFKwP/3jO8LlDDZOSkhRsuCyq6stE -PSf9XsclI8T4EwPuliBe6As5X2RkO3taxUUq0RgLzGI0p4yS/jyeoiuj9JG1PE07 -DurVZaAr69PmFhmYwaaEXV83OSJo1lBhh3H0kZEUforJDISjWF5DqrOw1/k3GmJj -3LIIcJ9SPf6HJnuOWWMFmR6FM5f6xqAsfKplgtGk0CClUGRVwpd2H/w3Wfc4jlGc -9LrdX4w8OftEQqefEBHg93wOdLk969js7jdZeQp+FmDNaHjLpqgH3VD7uR5D+8D0 -jRdvJiSM6G7/Hix346EOnLRblNGaJLGDQiN7cAfXEBrB0zobpUgWIFYZ00tj5ngJ -bpQb1I+lRRQuNH33d1j25XALDaWhyTNyufuSuh5R/mj5R5C/RSyoi+KvqEhoifTZ -POnncrdpUYf7OM6p81g/Ubpv+b9KL+57AToidcFvj0bXATk5iKt5unAEJUELIZkR -UanvSiiYm++uJW2DAVG3AVnQeapK92aTiqRD7OLvMwwNeAjluf0gaGWTwBNZQmOj -fA6WQgZyd1eO2A7zpd5caacXjd/DbrRVGcCgFxVrl5xZreJZyKMc56eL0ui3XMDx -RAbVkBGLux2DXGZvvtFpsw4Vc54uOsyJdZ1BQfAm86bPYax8dpEOCxvqOWVH/Qmc -Pp5iH/HjyAWBC0JlOJho -=29Fs ------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 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 index 0000000..5ac3889 --- /dev/null +++ b/net-im/pidgin/pidgin-2.9.0-r1.ebuild @@ -0,0 +1,224 @@ +# 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 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? ( =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 ) + gnome-keyring? ( gnome-base/gnome-keyring ) + idn? ( net-dns/libidn ) + ! 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" + epatch "${FILESDIR}"/${PN}-gnome-keyring-2.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 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 + + find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" +} -- cgit v1.2.3-65-gdbad