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 1QVFJt-0003Yl-HI for garchives@archives.gentoo.org; Sat, 11 Jun 2011 03:57:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0471C1C017; Sat, 11 Jun 2011 03:57:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A5EDE1C017 for ; Sat, 11 Jun 2011 03:57:01 +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 08EAC1B4035 for ; Sat, 11 Jun 2011 03:57:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 38E9E8003C for ; Sat, 11 Jun 2011 03:57:00 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <190d9ff81e534799bfe69ab76b4ad99dbcc7cbcc.nirbheek@gentoo> Subject: [gentoo-commits] dev/nirbheek:master commit in: net-im/pidgin/, net-im/pidgin/files/ X-VCS-Repository: dev/nirbheek X-VCS-Files: net-im/pidgin/Manifest net-im/pidgin/files/pidgin-gnome-keyring.patch net-im/pidgin/pidgin-2.7.10.ebuild X-VCS-Directories: net-im/pidgin/ net-im/pidgin/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 190d9ff81e534799bfe69ab76b4ad99dbcc7cbcc Date: Sat, 11 Jun 2011 03:57:00 +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: 80e95ba7359756580ce410551c8e89bb commit: 190d9ff81e534799bfe69ab76b4ad99dbcc7cbcc Author: Nirbheek Chauhan gentoo org> AuthorDate: Sat Jun 11 03:15:06 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Sat Jun 11 03:15:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/nirbheek.git;a= =3Dcommit;h=3D190d9ff8 net-im/pidgin: remove, I use empathy now --- net-im/pidgin/Manifest | 3 - net-im/pidgin/files/pidgin-gnome-keyring.patch | 175 ------------------= - net-im/pidgin/pidgin-2.7.10.ebuild | 222 ------------------= ------ 3 files changed, 0 insertions(+), 400 deletions(-) diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest deleted file mode 100644 index 05e2f2d..0000000 --- a/net-im/pidgin/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX pidgin-gnome-keyring.patch 6229 RMD160 2574e923fa09dd45996933854a9dd= 5644c8b0db3 SHA1 541e5062f6041d8e772ee02df3da90eb58ba4758 SHA256 d70ce355= 858a72bf35d94e20acc3c67a90a46c7f82eae3a9488ac39d9e9681d8 -DIST pidgin-2.7.10.tar.bz2 9970363 RMD160 a79e53ba1ecef4c17e2ebf8121a712= cf03eac6ca SHA1 ebce0b8c6130849e0df1bdc4557470b1d99da45a SHA256 269708d51= 9537d74ff316ff88f5c39e0c04617073a07dce920fa85321586950e -EBUILD pidgin-2.7.10.ebuild 6748 RMD160 eab3fd4596523348e4b199a54eb8487e= b9e00f36 SHA1 ebc020486df279eae43429370552c8a118c669e2 SHA256 1cd3e3c4d0d= ad9e67627fa44e8a57e8ed1e1854fade483f2fceaf09e9175238f diff --git a/net-im/pidgin/files/pidgin-gnome-keyring.patch b/net-im/pidg= in/files/pidgin-gnome-keyring.patch deleted file mode 100644 index 8fe92ef..0000000 --- a/net-im/pidgin/files/pidgin-gnome-keyring.patch +++ /dev/null @@ -1,175 +0,0 @@ -Index: pidgin-2.6.3/configure.ac -=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=3D=3D=3D=3D=3D=3D=3D ---- pidgin-2.6.3.orig/configure.ac -+++ pidgin-2.6.3/configure.ac -@@ -1799,6 +1799,20 @@ if test "x$enable_nss" !=3D "xno"; then - [AC_HELP_STRING([--with-nss-libs=3DPREFIX], [specify location of Mozi= lla nss3 libs.])], - [with_nss_libs=3D"$withval"]) -=20 -+dnl ###################################################################= #### -+dnl # Check for gnome-keyring -+dnl #--enable-gnome-keyring=3D(yes|no) -+dnl ###################################################################= #### -+AC_ARG_ENABLE(gnome-keyring, -+ AC_HELP_STRING([--enable-gnome-keyring], -+ [use gnome keyring for storing password [d= efault=3Dno]]),, -+ enable_gnome_keyring=3Dno) -+if test "x$enable_gnome_keyring" =3D "xyes"; then -+ PKG_CHECK_MODULES(PURPLE_KEYRING, -+ gnome-keyring-1, -+ AC_DEFINE(PURPLE_ENABLE_KEYRING, [], [Set if we s= hould use gnome-keyring])) -+fi -+ -=20 - if test -n "$with_nspr_includes" || test -n "$with_nspr_libs" || \ - test -n "$with_nss_includes" || test -n "$with_nss_libs" || -Index: pidgin-2.6.3/libpurple/Makefile.am -=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=3D=3D=3D=3D=3D=3D=3D ---- pidgin-2.6.3.orig/libpurple/Makefile.am -+++ pidgin-2.6.3/libpurple/Makefile.am -@@ -291,6 +291,7 @@ libpurple_la_LIBADD =3D \ - $(GLIB_LIBS) \ - $(LIBXML_LIBS) \ - $(NETWORKMANAGER_LIBS) \ -+ $(PURPLE_KEYRING_LIBS) \ - $(INTLLIBS) \ - $(FARSIGHT_LIBS) \ - $(GSTREAMER_LIBS) \ -@@ -306,6 +307,7 @@ AM_CPPFLAGS =3D \ - $(GLIB_CFLAGS) \ - $(DEBUG_CFLAGS) \ - $(DBUS_CFLAGS) \ -+ $(PURPLE_KEYRING_CFLAGS) \ - $(LIBXML_CFLAGS) \ - $(FARSIGHT_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ -Index: pidgin-2.6.3/libpurple/account.c -=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=3D=3D=3D=3D=3D=3D=3D ---- pidgin-2.6.3.orig/libpurple/account.c -+++ pidgin-2.6.3/libpurple/account.c -@@ -49,6 +49,13 @@ typedef struct - #define PURPLE_ACCOUNT_GET_PRIVATE(account) \ - ((PurpleAccountPrivate *) (account->priv)) -=20 -+#ifdef PURPLE_ENABLE_KEYRING -+#include -+ -+static char * purple_account_get_password_from_keyring (const char *_pr= pl, const char *_user); -+static gboolean purple_account_set_password_in_keyring (const char *_pr= pl, const char *_user, const char *password); -+#endif -+ - /* TODO: Should use PurpleValue instead of this? What about "ui"? */ - typedef struct - { -@@ -378,8 +385,13 @@ account_to_xmlnode(PurpleAccount *accoun - if (purple_account_get_remember_password(account) && - ((tmp =3D purple_account_get_password(account)) !=3D NULL)) - { -+#ifdef PURPLE_ENABLE_KEYRING -+ purple_account_set_password_in_keyring( purple_account_= get_protocol_id(account), -+ purple_account_get_username(a= ccount), tmp); -+#else - child =3D xmlnode_new_child(node, "password"); - xmlnode_insert_data(child, tmp, -1); -+#endif - } -=20 - if ((tmp =3D purple_account_get_alias(account)) !=3D NULL) -@@ -828,17 +840,30 @@ parse_account(xmlnode *node) - } -=20 - ret =3D purple_account_new(name, _purple_oscar_convert(name, protocol_= id)); /* XXX: */ -- g_free(name); -- g_free(protocol_id); -- -- /* Read the password */ -- child =3D xmlnode_get_child(node, "password"); -- if ((child !=3D NULL) && ((data =3D xmlnode_get_data(child)) !=3D NULL= )) -+ gboolean got_pwd =3D FALSE; -+#ifdef PURPLE_ENABLE_KEYRING -+ data =3D purple_account_get_password_from_keyring(protocol_id, = name); -+ if (data) - { -+ got_pwd =3D TRUE; - purple_account_set_remember_password(ret, TRUE); - purple_account_set_password(ret, data); - g_free(data); - } -+#endif -+ if (!got_pwd) -+ { -+ /* Read the password */ -+ child =3D xmlnode_get_child(node, "password"); -+ if ((child !=3D NULL) && ((data =3D xmlnode_get_data(ch= ild)) !=3D NULL)) -+ { -+ purple_account_set_remember_password(ret, TRUE)= ; -+ purple_account_set_password(ret, data); -+ g_free(data); -+ } -+ } -+ g_free(name); -+ g_free(protocol_id); -=20 - /* Read the alias */ - child =3D xmlnode_get_child(node, "alias"); -@@ -2873,3 +2898,60 @@ purple_accounts_uninit(void) - purple_signals_disconnect_by_handle(handle); - purple_signals_unregister_by_instance(handle); - } -+ -+#ifdef PURPLE_ENABLE_KEYRING -+static char * -+purple_account_get_password_from_keyring(const char *_prpl, const char = *_user) -+{ -+ GnomeKeyringNetworkPasswordData *found_item; -+ GnomeKeyringResult result; -+ GList *matches; -+ char *password; -+ -+ matches =3D NULL; -+ -+ result =3D gnome_keyring_find_network_password_sync ( -+ _user, /* user */ -+ NULL, /* domain */ -+ "gaim.local", /* server */ -+ NULL, /* object */ -+ _prpl, /* protocol */ -+ NULL, /* authtype */ -+ 1863, /* port */ -+ &matches); -+ -+ if (result !=3D GNOME_KEYRING_RESULT_OK) -+ return NULL; -+ -+ g_assert (matches !=3D NULL && matches->data !=3D NULL); -+ -+ found_item =3D (GnomeKeyringNetworkPasswordData *) matches->data; -+ -+ password =3D g_strdup (found_item->password); -+ -+ gnome_keyring_network_password_list_free (matches); -+ -+ return password; -+} -+ -+static gboolean -+purple_account_set_password_in_keyring (const char *_prpl, const char *= _user, const char *_password) -+{ -+ GnomeKeyringResult result; -+ guint32 item_id; -+ -+ result =3D gnome_keyring_set_network_password_sync ( -+ NULL, /* default keyring */ -+ _user, /* user */ -+ NULL, /* domain */ -+ "gaim.local", /* server */ -+ NULL, /* object */ -+ _prpl, /* protocol */ -+ NULL, /* authtype */ -+ 1863, /* port */ -+ _password, /* password */ -+ &item_id); -+ -+ return result =3D=3D GNOME_KEYRING_RESULT_OK; -+} -+#endif diff --git a/net-im/pidgin/pidgin-2.7.10.ebuild b/net-im/pidgin/pidgin-2.= 7.10.ebuild deleted file mode 100644 index 0151682..0000000 --- a/net-im/pidgin/pidgin-2.7.10.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# 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.9.ebuild,v 1= .4 2010/12/30 15:29:27 jer Exp $ - -EAPI=3D2 - -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 gnome-keyring gnutls +gstreamer +gtk idn= meanwhile" -IUSE+=3D" networkmanager nls perl silc tcl tk spell qq sasl +startup-not= ification" -IUSE+=3D" ncurses groupwise prediction python +xscreensaver zephyr zeroc= onf" # 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 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.12 - >=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 ) - startup-notification? ( >=3Dx11-libs/startup-notification-0.5 ) - spell? ( >=3Dapp-text/gtkspell-2.0.2 ) - eds? ( gnome-extra/evolution-data-server ) - prediction? ( >=3Ddev-db/sqlite-3.3:3 ) ) - gnome-keyring? ( gnome-base/gnome-keyring ) - 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? ( >=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.9.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 ) - 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? ( 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 - if use dbus || { use ncurses && use python; }; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - gnome2_src_prepare - epatch "${FILESDIR}"/${PN}-gnome-keyring.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 qq && DYNAMIC_PRPLS+=3D",qq" - 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 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 gnome-keyring) \ - $(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=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 "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la remov= al failed" -}