From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QvvSX-0003T1-FE for garchives@archives.gentoo.org; Tue, 23 Aug 2011 18:12:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 184EA21C237; Tue, 23 Aug 2011 18:12:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AC27421C237 for ; Tue, 23 Aug 2011 18:12:12 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A5281B4009 for ; Tue, 23 Aug 2011 18:12:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 72E5D80040 for ; Tue, 23 Aug 2011 18:12:11 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <427a7f84451d7b0a2b58871aa5073d856c567d22.chutzpah@gentoo> Subject: [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/ X-VCS-Repository: dev/chutzpah X-VCS-Files: net-im/pidgin/Manifest net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch net-im/pidgin/pidgin-2.9.0-r1.ebuild X-VCS-Directories: net-im/pidgin/ net-im/pidgin/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 427a7f84451d7b0a2b58871aa5073d856c567d22 Date: Tue, 23 Aug 2011 18:12:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 97257b42bf7bf22c264e140f9dae7731 commit: 427a7f84451d7b0a2b58871aa5073d856c567d22 Author: Patrick McLean cim mcgill ca> AuthorDate: Tue Aug 23 18:12:01 2011 +0000 Commit: Patrick McLean gentoo org> CommitDate: Tue Aug 23 18:12:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/chutzpah.git;a= =3Dcommit;h=3D427a7f84 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(-) 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 61922053efdaf25e9580dc4= 199df75b60c0c976d SHA1 e185accd3dde589b93baf53086790f88b2162f61 SHA256 43= efe68ca8451c993ed46e9523e5eaf419f099d60c3499ab6e451d322c87d63f AUX pidgin-gnome-keyring-2.patch 7680 RMD160 e9f14a4b46aad4e7361113a33fd= 5e07085bbd978 SHA1 edeca69cb6980f7b5b9ce61a83f7e0ac227c779a SHA256 aae63e= 57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221 DIST pidgin-2.9.0.tar.bz2 9925589 RMD160 c093adadd3362ed7d266dfb07df5b75= 974605d5a SHA1 632c681030304443a911c9eeca6d582df0a24fbb SHA256 28ee8ece47= d94ee1b708a78d613832ea88b56d879a93fa934d532d76ae52cfd7 +EBUILD pidgin-2.9.0-r1.ebuild 6816 RMD160 4d7592875919a0aed8b435647e1a1b= fbc2b3a99f SHA1 f1a3319b6c1517799df3e41a95fb03dae01fc6bc SHA256 9c4748d8e= d962ecfe7f4888121cf17c239a2140f817f3b199d739b83806ad7d2 EBUILD pidgin-2.9.0.ebuild 6751 RMD160 0c4701eedbabaeceff636cb79a43c9485= fbb55ca SHA1 f092f1454e4311b14f6576eb0ad6d5cb14ad5d72 SHA256 dcc988da2f20= fe9ab34b829bd53a73c3259db946671ce9de720c8994b76e7aa9 ------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 -=3D29Fs ------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] +# +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- libpurple/conversation.c cd6817f4863abafef969359f65cc025f9483b401 ++++ libpurple/conversation.c 19aac10ceebae1ee28788b6f0c02bcfcff0c8803 +@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC + } +=20 + g_hash_table_remove_all(chat->users); +- chat->users =3D NULL; +=20 + g_list_free(users); + chat->in_room =3D 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=3D3 + +GENTOO_DEPEND_ON_PERL=3Dno +inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 pyt= hon autotools + +DESCRIPTION=3D"GTK Instant Messenger client" +HOMEPAGE=3D"http://pidgin.im/" +SRC_URI=3D"mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE=3D"GPL-2" +SLOT=3D"0" +KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE=3D"dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile" +IUSE+=3D" networkmanager nls perl silc tcl tk spell sasl ncurses" +IUSE+=3D" groupwise prediction python +xscreensaver zephyr zeroconf" # m= ono" +IUSE+=3D" 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 th= ere 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 reali= ty we +# rdepend on python if dbus enabled. But it is possible to separate this= dep. +RDEPEND=3D" + >=3Ddev-libs/glib-2.16 + >=3Ddev-libs/libxml2-2.6.18 + ncurses? ( sys-libs/ncurses[unicode] + dbus? ( =3Dx11-libs/gtk+-2.10:2 + x11-libs/libSM + xscreensaver? ( x11-libs/libXScrnSaver ) + spell? ( >=3Dapp-text/gtkspell-2.0.2 ) + eds? ( gnome-extra/evolution-data-server ) + prediction? ( >=3Ddev-db/sqlite-3.3:3 ) ) + gstreamer? ( =3Dmedia-libs/gstreamer-0.10* + =3Dmedia-libs/gst-plugins-good-0.10* + >=3Dnet-libs/farsight2-0.0.14 + media-plugins/gst-plugins-meta + media-plugins/gst-plugins-gconf ) + zeroconf? ( net-dns/avahi[dbus] ) + dbus? ( >=3Ddev-libs/dbus-glib-0.71 + >=3Dsys-apps/dbus-0.90 + dev-python/dbus-python ) + perl? ( >=3Ddev-lang/perl-5.8.2-r1[-build] ) + gadu? ( || ( >=3Dnet-libs/libgadu-1.11.0[ssl,gnutls] + >=3Dnet-libs/libgadu-1.11.0[-ssl] ) ) + gnutls? ( net-libs/gnutls ) + !gnutls? ( >=3Ddev-libs/nss-3.11 ) + meanwhile? ( net-libs/meanwhile ) + silc? ( >=3Dnet-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 ) + !=3Ddev-util/intltool-0.41.1 sys-devel/gettext" + +DEPEND=3D"$RDEPEND + dev-lang/perl + dev-perl/XML-Parser + dev-util/pkgconfig + gtk? ( x11-proto/scrnsaverproto + ${NLS_DEPEND} ) + dbus? ( python is= enabled + #REQUIRED_USE=3D"gtk? ( nls ) dbus? ( python )" + if use gtk && ! use nls; then + ewarn "gtk build =3D> nls is enabled!" + fi + if use dbus && ! use python; then + elog "dbus is enabled, no way to disable linkage with python =3D> pyth= on 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=3D"${DYNAMIC_PRPLS},gg" + myconf=3D"${myconf} --with-gadu-includes=3D." + myconf=3D"${myconf} --with-gadu-libs=3D." + fi + + use silc && DYNAMIC_PRPLS+=3D",silc" + use meanwhile && DYNAMIC_PRPLS+=3D",sametime" + use zeroconf && DYNAMIC_PRPLS+=3D",bonjour" + use groupwise && DYNAMIC_PRPLS+=3D",novell" + use zephyr && DYNAMIC_PRPLS+=3D",zephyr" + + if use gnutls; then + einfo "Disabling NSS, using GnuTLS" + myconf+=3D" --enable-nss=3Dno --enable-gnutls=3Dyes" + myconf+=3D" --with-gnutls-includes=3D/usr/include/gnutls" + myconf+=3D" --with-gnutls-libs=3D/usr/$(get_libdir)" + else + einfo "Disabling GnuTLS, using NSS" + myconf+=3D" --enable-gnutls=3Dno --enable-nss=3Dyes" + fi + + if use dbus || { use ncurses && use python; }; then + myconf+=3D" --with-python=3D$(PYTHON)" + else + myconf+=3D" --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=3D"/etc/ssl/certs/" \ + --with-dynamic-prpls=3D"${DYNAMIC_PRPLS}" \ + --disable-mono \ + --x-includes=3D/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=3D${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/acti= ons + 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 remo= val failed" +}