diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2012-12-26 23:00:30 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2012-12-26 23:00:30 +0000 |
commit | efb8ed4817342fc07985d301a4a7b0be650d728e (patch) | |
tree | 67ff87274a489d41cbda251e3924b9df049f7df5 /net-im/empathy | |
parent | sync with sci overlay (diff) | |
download | gentoo-2-efb8ed4817342fc07985d301a4a7b0be650d728e.tar.gz gentoo-2-efb8ed4817342fc07985d301a4a7b0be650d728e.tar.bz2 gentoo-2-efb8ed4817342fc07985d301a4a7b0be650d728e.zip |
Version bump for Gnome 3.6. Switch to EAPI=5 and python-any-r1.eclass. Clean up old revisions.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'net-im/empathy')
-rw-r--r-- | net-im/empathy/ChangeLog | 12 | ||||
-rw-r--r-- | net-im/empathy/empathy-3.2.2-r1.ebuild | 134 | ||||
-rw-r--r-- | net-im/empathy/empathy-3.6.2-r2.ebuild | 117 | ||||
-rw-r--r-- | net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch | 36 | ||||
-rw-r--r-- | net-im/empathy/files/empathy-3.2.2-delivery-failed.patch | 31 | ||||
-rw-r--r-- | net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch | 68 | ||||
-rw-r--r-- | net-im/empathy/metadata.xml | 2 |
7 files changed, 129 insertions, 271 deletions
diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog index 219875be8282..6c763943e2b9 100644 --- a/net-im/empathy/ChangeLog +++ b/net-im/empathy/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-im/empathy # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.114 2012/12/11 16:55:55 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.115 2012/12/26 23:00:30 eva Exp $ + +*empathy-3.6.2-r2 (26 Dec 2012) + + 26 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> -empathy-3.2.2-r1.ebuild, + -files/empathy-3.2.2-cancellable-not-NULL.patch, + -files/empathy-3.2.2-delivery-failed.patch, + -files/empathy-3.2.2-telepathy-logger-0.4.patch, +empathy-3.6.2-r2.ebuild, + metadata.xml: + Version bump for Gnome 3.6. Switch to EAPI=5 and python-any-r1.eclass. Clean + up old revisions. 11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> empathy-3.2.2-r1.ebuild, empathy-3.4.2.3.ebuild: diff --git a/net-im/empathy/empathy-3.2.2-r1.ebuild b/net-im/empathy/empathy-3.2.2-r1.ebuild deleted file mode 100644 index ac677e70493e..000000000000 --- a/net-im/empathy/empathy-3.2.2-r1.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.2-r1.ebuild,v 1.5 2012/12/11 16:55:55 axs Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_DEPEND="2:2.5" - -inherit eutils gnome2 python - -DESCRIPTION="Telepathy client and library using GTK+" -HOMEPAGE="http://live.gnome.org/Empathy" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +v4l" - -# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good -# eventually at which point the dep can be dropped -# libgee extensively used in libempathy -# gdk-pixbuf and pango extensively used in libempathy-gtk -COMMON_DEPEND=">=dev-libs/glib-2.28:2 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.0.2:3 - x11-libs/pango - >=dev-libs/dbus-glib-0.51 - >=dev-libs/folks-0.6.2 - dev-libs/libgee:0 - >=gnome-base/gnome-keyring-2.91.4-r300 - >=media-libs/libcanberra-0.25[gtk3] - media-sound/pulseaudio[glib] - >=net-libs/gnutls-2.8.5 - >=net-libs/telepathy-glib-0.16.0 - >=net-libs/webkit-gtk-1.3.13:3 - >=x11-libs/libnotify-0.7 - - dev-libs/libxml2:2 - gnome-base/gsettings-desktop-schemas - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 - media-libs/gst-plugins-bad:0.10 - >=net-im/telepathy-logger-0.2.13 - net-libs/farsight2 - >=net-libs/telepathy-farsight-0.0.14 - net-im/telepathy-connection-managers - x11-libs/libX11 - x11-themes/gnome-icon-theme-symbolic - - call? ( - >=media-libs/clutter-1.7.14:1.0 - >=media-libs/clutter-gtk-0.90.3:1.0 - media-libs/clutter-gst:1.0 - net-libs/telepathy-farstream ) - eds? ( >=gnome-extra/evolution-data-server-1.2 ) - geoloc? ( >=app-misc/geoclue-0.11 ) - gnome-online-accounts? ( net-libs/gnome-online-accounts ) - map? ( - >=media-libs/clutter-1.7.14:1.0 - >=media-libs/clutter-gtk-0.90.3:1.0 - media-libs/libchamplain:0.12[gtk] ) - networkmanager? ( >=net-misc/networkmanager-0.7 ) - sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 ) - spell? ( - >=app-text/enchant-1.2 - >=app-text/iso-codes-0.35 ) - v4l? ( - virtual/udev[gudev] - media-plugins/gst-plugins-v4l2:0.10 - >=media-video/cheese-2.91.91.1 ) -" -# empathy-3.2 is incompatible with >=telepathy-rakia/sofiasip-0.7, bug #403861 -RDEPEND="${COMMON_DEPEND} - !>=net-voip/telepathy-rakia-0.7" -DEPEND="${COMMON_DEPEND} - app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.17.3 - >=dev-util/intltool-0.35.0 - virtual/pkgconfig - >=sys-devel/gettext-0.17 - test? ( - sys-apps/grep - >=dev-libs/check-0.9.4 ) - dev-libs/libxslt -" -PDEPEND=">=net-im/telepathy-mission-control-5.7.6" - -pkg_setup() { - DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README" - G2CONF="${G2CONF} - --disable-coding-style-checks - --disable-schemas-compile - --disable-static - --disable-meego - --disable-Werror - $(use_enable call) - $(use_enable debug) - $(use_with eds) - $(use_enable geoloc location) - $(use_enable gnome-online-accounts goa) - $(use_enable map) - $(use_with networkmanager connectivity nm) - $(use_enable sendto nautilus-sendto) - $(use_enable spell) - $(use_with v4l cheese) - $(use_enable v4l gudev)" - - # Build time python tools need python2 - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # In next release - epatch "${FILESDIR}/${P}-delivery-failed.patch" - epatch "${FILESDIR}/${P}-cancellable-not-NULL.patch" - # Fix telepathy-logger-0.4 compatibility, bug #413423; patch from 3.4 - epatch "${FILESDIR}/${PN}-3.2.2-telepathy-logger-0.4.patch" - - gnome2_src_prepare -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - emake check -} - -pkg_postinst() { - gnome2_pkg_postinst - elog "Empathy needs telepathy's connection managers to use any IM protocol." - elog "See the USE flags on net-im/telepathy-connection-managers" - elog "to install them." -} diff --git a/net-im/empathy/empathy-3.6.2-r2.ebuild b/net-im/empathy/empathy-3.6.2-r2.ebuild new file mode 100644 index 000000000000..ec0e63ac8969 --- /dev/null +++ b/net-im/empathy/empathy-3.6.2-r2.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.6.2-r2.ebuild,v 1.1 2012/12/26 23:00:30 eva Exp $ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python2_{6,7} ) + +inherit gnome2 python-any-r1 virtualx + +DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME" +HOMEPAGE="http://live.gnome.org/Empathy" + +LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 FDL-1.3 LGPL-2.1" +SLOT="0" +IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l" +KEYWORDS="~amd64 ~x86 ~x86-linux" + +# gdk-pixbuf and pango extensively used in libempathy-gtk +COMMON_DEPEND=" + >=dev-libs/glib-2.33.3:2 + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.5.1:3 + x11-libs/pango + >=dev-libs/dbus-glib-0.51 + >=dev-libs/folks-0.7.3:=[telepathy] + dev-libs/libgee:0= + >=app-crypt/libsecret-0.5 + >=media-libs/libcanberra-0.25[gtk3] + >=net-libs/gnutls-2.8.5:= + >=net-libs/webkit-gtk-1.3.13:3 + >=x11-libs/libnotify-0.7 + + media-libs/gstreamer:1.0 + >=media-libs/clutter-1.10.0:1.0 + >=media-libs/clutter-gtk-1.1.2:1.0 + media-libs/clutter-gst:2.0 + media-libs/cogl:1.0= + + net-libs/farstream:0.2 + >=net-libs/telepathy-farstream-0.5:= + >=net-libs/telepathy-glib-0.19.9 + >=net-im/telepathy-logger-0.2.13:= + + app-crypt/gcr + dev-libs/libxml2:2 + gnome-base/gsettings-desktop-schemas + media-sound/pulseaudio[glib] + net-libs/libsoup:2.4 + x11-libs/libX11 + + geocode? ( sci-geosciences/geocode-glib ) + geoloc? ( >=app-misc/geoclue-0.12 ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 ) + map? ( + >=media-libs/clutter-1.7.14:1.0 + >=media-libs/clutter-gtk-0.90.3:1.0 + >=media-libs/libchamplain-0.12.1:0.12[gtk] ) + sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 ) + spell? ( + >=app-text/enchant-1.2 + >=app-text/iso-codes-0.35 ) + v4l? ( + media-plugins/gst-plugins-v4l2:1.0 + >=media-video/cheese-3.4 + virtual/udev[gudev] )" +# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861 +RDEPEND="${COMMON_DEPEND} + media-libs/gst-plugins-base:1.0 + net-im/telepathy-connection-managers + !<net-voip/telepathy-rakia-0.7 + x11-themes/gnome-icon-theme-symbolic + gnome? ( gnome-extra/gnome-contacts )" +DEPEND="${COMMON_DEPEND} + ${PYTHON_DEPENDS} + dev-libs/libxml2:2 + dev-libs/libxslt + >=dev-util/intltool-0.50.0 + virtual/pkgconfig + test? ( + sys-apps/grep + >=dev-libs/check-0.9.4 ) +" +PDEPEND=">=net-im/telepathy-mission-control-5.14" + +src_configure() { + DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README" + G2CONF="${G2CONF} + --disable-ubuntu-online-accounts + --disable-coding-style-checks + --disable-static + --disable-Werror + --enable-gst-1.0 + $(use_enable debug) + $(use_enable geocode) + $(use_enable geoloc location) + $(use_enable gnome-online-accounts goa) + $(use_enable map) + $(use_enable sendto nautilus-sendto) + $(use_enable spell) + $(use_with v4l cheese) + $(use_enable v4l gudev) + ITSTOOL=$(type -P true)" + gnome2_src_configure +} + +src_test() { + Xemake check +} + +pkg_postinst() { + gnome2_pkg_postinst + elog "Empathy needs telepathy's connection managers to use any IM protocol." + elog "See the USE flags on net-im/telepathy-connection-managers" + elog "to install them." +} diff --git a/net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch b/net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch deleted file mode 100644 index c58e7563a77d..000000000000 --- a/net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 641a6b06225cd00f62001d041316e72535662306 Mon Sep 17 00:00:00 2001 -From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> -Date: Wed, 30 Nov 2011 12:55:29 +0100 -Subject: [PATCH] ui-utils: don't expect that cancellable is not NULL - -cancellable are always optional so this code should be NULL safe. ---- - libempathy-gtk/empathy-ui-utils.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c -index d5f63c9..2b9f5cf 100644 ---- a/libempathy-gtk/empathy-ui-utils.c -+++ b/libempathy-gtk/empathy-ui-utils.c -@@ -549,7 +549,8 @@ pixbuf_avatar_from_individual_closure_new (FolksIndividual *individual, - closure->result = g_object_ref (result); - closure->width = width; - closure->height = height; -- closure->cancellable = g_object_ref (cancellable); -+ if (cancellable != NULL) -+ closure->cancellable = g_object_ref (cancellable); - - return closure; - } -@@ -558,7 +559,7 @@ static void - pixbuf_avatar_from_individual_closure_free ( - PixbufAvatarFromIndividualClosure *closure) - { -- g_object_unref (closure->cancellable); -+ g_clear_object (&closure->cancellable); - tp_clear_object (&closure->loader); - g_object_unref (closure->individual); - g_object_unref (closure->result); --- -1.7.8.6 - diff --git a/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch b/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch deleted file mode 100644 index 84c0dd841150..000000000000 --- a/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 457cdd199d2aa20cbebcc25ea305137ce7b0f440 Mon Sep 17 00:00:00 2001 -From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> -Date: Tue, 22 Nov 2011 15:42:11 +0100 -Subject: [PATCH] don't ignore TP_DELIVERY_STATUS_TEMPORARILY_FAILED delivery - report - -We should display an error message as well if not the user will assume the -message has been sent and the spinner keeps spinning. - -https://bugzilla.gnome.org/show_bug.cgi?id=664564 ---- - libempathy/empathy-tp-chat.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c -index 2285f3f..f65f25d 100644 ---- a/libempathy/empathy-tp-chat.c -+++ b/libempathy/empathy-tp-chat.c -@@ -375,7 +375,8 @@ handle_delivery_report (EmpathyTpChat *self, - tp_chat_set_delivery_status (self, delivery_token, - EMPATHY_DELIVERY_STATUS_NONE); - goto out; -- } else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED) { -+ } else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED && -+ delivery_status != TP_DELIVERY_STATUS_TEMPORARILY_FAILED) { - goto out; - } - --- -1.7.8.6 - diff --git a/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch b/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch deleted file mode 100644 index 4ce89197bd49..000000000000 --- a/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 86ba5be5fa9a044fbcce6618ac6cd6dd7bdf3482 Mon Sep 17 00:00:00 2001 -From: Danielle Madeley <danielle.madeley@collabora.co.uk> -Date: Tue, 3 Apr 2012 10:35:09 +1000 -Subject: [PATCH] TplCallEndReason ceased to exist on March 28 - ---- - libempathy-gtk/empathy-log-window.c | 11 ++++++----- - libempathy/empathy-message.c | 2 +- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c -index 72d4d46..c11bb02 100644 ---- a/libempathy-gtk/empathy-log-window.c -+++ b/libempathy-gtk/empathy-log-window.c -@@ -1236,11 +1236,11 @@ get_icon_for_event (TplEvent *event) - else if (TPL_IS_CALL_EVENT (event)) - { - TplCallEvent *call = TPL_CALL_EVENT (event); -- TplCallEndReason reason = tpl_call_event_get_end_reason (call); -+ TpCallStateChangeReason reason = tpl_call_event_get_end_reason (call); - TplEntity *sender = tpl_event_get_sender (event); - TplEntity *receiver = tpl_event_get_receiver (event); - -- if (reason == TPL_CALL_END_REASON_NO_ANSWER) -+ if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER) - icon = EMPATHY_IMAGE_CALL_MISSED; - else if (tpl_entity_get_entity_type (sender) == TPL_ENTITY_SELF) - icon = EMPATHY_IMAGE_CALL_OUTGOING; -@@ -1357,7 +1357,7 @@ log_window_append_call (TplEvent *event, - COL_EVENTS_EVENT, event, - -1); - -- if (tpl_call_event_get_end_reason (call) != TPL_CALL_END_REASON_NO_ANSWER) -+ if (tpl_call_event_get_end_reason (call) != TP_CALL_STATE_CHANGE_REASON_NO_ANSWER) - { - gchar *body; - gchar *tmp; -@@ -3243,11 +3243,12 @@ log_window_got_messages_for_date_cb (GObject *manager, - } - else - { -- TplCallEndReason reason = tpl_call_event_get_end_reason (call); -+ TpCallStateChangeReason reason = -+ tpl_call_event_get_end_reason (call); - TplEntity *sender = tpl_event_get_sender (event); - TplEntity *receiver = tpl_event_get_receiver (event); - -- if (reason == TPL_CALL_END_REASON_NO_ANSWER) -+ if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER) - { - if (ctx->subtype & EVENT_CALL_MISSED) - append = TRUE; -diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c -index 6111bcd..a4caae1 100644 ---- a/libempathy/empathy-message.c -+++ b/libempathy/empathy-message.c -@@ -411,7 +411,7 @@ empathy_message_from_tpl_log_event (TplEvent *logevent) - - timestamp = tpl_event_get_timestamp (logevent); - -- if (tpl_call_event_get_end_reason (call) == TPL_CALL_END_REASON_NO_ANSWER) -+ if (tpl_call_event_get_end_reason (call) == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER) - body = g_strdup_printf (_("Missed call from %s"), - tpl_entity_get_alias (tpl_event_get_sender (logevent))); - else if (tpl_entity_get_entity_type (tpl_event_get_sender (logevent)) == TPL_ENTITY_SELF) --- -1.7.8.6 - diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml index 46f4c30edce3..1dcbea93f7be 100644 --- a/net-im/empathy/metadata.xml +++ b/net-im/empathy/metadata.xml @@ -21,7 +21,7 @@ <flag name="sendto">Enable support for sending files to various devices using <pkg>gnome-extra/nautilus-sendto</pkg></flag> <flag name="webkit">Build support for Adium-style HTML-based conversation - window themes using <pkg>net-libs/webkit-gtk</pkg></flag> + window themes using <pkg>net-libs/webkit-gtk</pkg></flag> </use> <longdescription> Empathy consists of a rich set of reusable instant messaging widgets, |