New version for GNOME 2.26. Add support for file-transfer, use farsight2 for video-chat. Notification & sound support. Clean up old revision.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 276 insertions, 71 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index ed9a7d1b1992..633919cb1766 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.35 2009/01/07 17:17:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.36 2009/05/10 21:10:10 eva Exp $
+
+*empathy-2.26.1 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -empathy-2.24.0-r1.ebuild, +empathy-2.26.1.ebuild,
+  +files/empathy-2.26.1-fix-doc.patch:
+  New version for GNOME 2.26. Add support for file-transfer, use farsight2
+  for video-chat. Notification & sound support. Clean up old revision.
 
   07 Jan 2009; Raúl Porcel <armin76@gentoo.org> empathy-2.24.1.ebuild:
   Add ~alpha/~ia64 wrt #245949
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 536424f812d1..6862172ced33 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,6 +1,17 @@
-DIST empathy-2.24.0.tar.bz2 1776639 RMD160 9e5ee4161bbd80b993f50630750c52d07876a2e0 SHA1 6a293f0dbd9ac12d3cf1e58132ae7641f710cf75 SHA256 5e73cfe9bbe862391386b4d60776a22fc765c48fe9f2bfad17ebd691571da2b9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX empathy-2.26.1-fix-doc.patch 5397 RMD160 02213ee66f32782265e257d0f9db99f50ae87136 SHA1 7a4e54387d4de340bb2ba5a6d4704448288d6047 SHA256 4702a0341183dd66eebbba74b414242b97f64428bade2990d407edf1a92200f3
 DIST empathy-2.24.1.tar.bz2 1761446 RMD160 97e58664c1cf3977806884cc401d679ecca91365 SHA1 7c2b6434d5fd855e887e6ef27300601609706ea5 SHA256 24b675e389fb91898bd2924f8b35db7e7aef4c40bbb69412e445048dd9e18123
-EBUILD empathy-2.24.0-r1.ebuild 1815 RMD160 46ad06c6be0fde1ec6643986421d967337f9c9c6 SHA1 a9f64b2b9654981521911105ba8c33b16c51e628 SHA256 3480a9f85a0633b55d3c2abb82f6896ae9ccee2e9f8298dfea3c24fb598f4591
+DIST empathy-2.26.1.tar.bz2 2006578 RMD160 f30700b375d5ae9f72216403450c119601e40f18 SHA1 8881ba249457f522d20af4a7ea33ccc88e5551cb SHA256 bb3b3663b11e3e573a13dd1b51d8a5b02797a43c53a64efc529f6604f40503c7
 EBUILD empathy-2.24.1.ebuild 1857 RMD160 d0d00b9b518dd500e92cc50b08fd81c00559dbc9 SHA1 a53fafc33193d0fc946d7c3a4e2d2c9480a0ca49 SHA256 40309174f0c2dd7e975b86e0b0cc97b15a34425ad732b5a7c24c3ca527842501
-MISC ChangeLog 7021 RMD160 975fc0a74b9194bf7a9ad10e6942bc061c308738 SHA1 13de1ad824b33d6c2f38b99b8eb037101ff7e9fe SHA256 d7bbeff8f1ef31bff86c3d3bf2987c930fa86d62c5385f4fbb397ac1b1cc677c
+EBUILD empathy-2.26.1.ebuild 2429 RMD160 53a9766e9c6a6f9b5e85a3f3f6d6238506a6473d SHA1 cfd7fd57da487a6a077aac3e10cb814120d2113f SHA256 4ba1c1504537757ea8f54b80dd7ba26e2f000219cfa57ea4ee47d54537a5011e
+MISC ChangeLog 7341 RMD160 5da0efc3730d238f09e2e235669e23462391c719 SHA1 1422e2b84cb9f64538b54c25089d42ede6b94cb7 SHA256 49190c9f5cbe6179749d12ff513982bc0543b3b27bffe22764abf0de25a5d1cf
 MISC metadata.xml 837 RMD160 f89b55575131f76e4c62a41b62f2f881eb5fc231 SHA1 0934f431802b72b4efc3a93ca334dc02696a7816 SHA256 5bc51238a6a5e781c0add5d54d74a7848de0c66ce516a7d8d5a20d8f2c6a751f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoHQrcACgkQ1fmVwcYIWAZiFgCeKEOvHilw7k8uQH1bvEMXtluy
+De0AoLAQ8RQy+vDHQCUQsaPszxef6faE
+=5BKf
+-----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-2.24.0-r1.ebuild b/net-im/empathy/empathy-2.24.0-r1.ebuild
deleted file mode 100644
index 5bf3cd5dfe17..000000000000
--- a/net-im/empathy/empathy-2.24.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.24.0-r1.ebuild,v 1.1 2008/10/03 17:54:39 coldwind Exp $
-
-inherit gnome2
-
-DESCRIPTION="Telepathy client and library using GTK+"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="applet python spell test"
-
-RDEPEND=">=dev-libs/dbus-glib-0.51
-	>=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.12.0
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	applet? ( >=gnome-base/gnome-panel-2.10 )
-	>=net-libs/telepathy-glib-0.7.7
-	>=net-im/telepathy-mission-control-4.61
-	dev-libs/libxml2
-	>=gnome-extra/evolution-data-server-1.2
-	spell? (
-		app-text/enchant
-		app-text/iso-codes )
-	python? (
-		>=dev-lang/python-2.4.4-r5
-		>=dev-python/pygtk-2 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	>=dev-util/pkgconfig-0.16
-	test? ( >=dev-libs/check-0.9.4 )
-	dev-libs/libxslt
-	virtual/python"
-
-DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="$(use_enable debug)
-		$(use_enable spell)
-		$(use_enable python)
-		$(use_enable applet megaphone)
-		$(use_enable applet nothere)
-		--disable-gtk-doc"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Remove hard enabled -Werror (see AM_MAINTAINER_MODE), bug 218687
-	sed -i "s:-Werror::g" configure || die "sed failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	echo
-	elog "Empathy needs telepathy's connection managers to use any IM protocol."
-	elog "You will need to install connection managers yourself."
-	elog "MSN: net-voip/telepathy-butterfly"
-	elog "Jabber and Gtalk: net-voip/telepathy-gabble"
-	elog "IRC: net-irc/telepathy-idle"
-	elog
-	elog "Additionally, you will need >=net-voip/telepathy-stream-engine-0.5.0"
-	elog "if you want any voip functionality."
-}
diff --git a/net-im/empathy/empathy-2.26.1.ebuild b/net-im/empathy/empathy-2.26.1.ebuild
new file mode 100644
index 000000000000..c96c15a55d07
--- /dev/null
+++ b/net-im/empathy/empathy-2.26.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.26.1.ebuild,v 1.1 2009/05/10 21:10:10 eva Exp $
+
+EAPI="2"
+
+inherit gnome2
+
+DESCRIPTION="Telepathy client and library using GTK+"
+HOMEPAGE="http://live.gnome.org/Empathy"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="applet doc python spell test"
+
+# FIXME: libnotify & libcanberra hard deps
+RDEPEND=">=dev-libs/glib-2.16.0
+	>=x11-libs/gtk+-2.14.0
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=dev-libs/dbus-glib-0.51
+	>=gnome-extra/evolution-data-server-1.2
+	>=net-libs/telepathy-glib-0.7.23
+	>=net-im/telepathy-mission-control-4.61
+	>=media-libs/libcanberra-0.4
+	>=x11-libs/libnotify-0.4.4
+
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	net-libs/telepathy-farsight
+	dev-libs/libxml2
+
+	applet? ( >=gnome-base/gnome-panel-2.10 )
+	spell? (
+		app-text/enchant
+		app-text/iso-codes )
+	python? (
+		>=dev-lang/python-2.4.4-r5
+		>=dev-python/pygtk-2 )"
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.35.0
+	>=dev-util/pkgconfig-0.16
+	test? ( >=dev-libs/check-0.9.4 )
+	dev-libs/libxslt
+	virtual/python
+	doc? ( >=dev-util/gtk-doc-1.3 )"
+
+DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
+
+# FIXME: Tests are broken, upstream bug #576785
+RESTRICT="test"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable debug)
+		$(use_enable spell)
+		$(use_enable python)
+		$(use_enable applet megaphone)
+		$(use_enable applet nothere)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Doc is broken
+	epatch "${FILESDIR}/${PN}-2.26.1-fix-doc.patch"
+
+	# Remove hard enabled -Werror (see AM_MAINTAINER_MODE), bug 218687
+	sed -i "s:-Werror::g" configure || die "sed 1 failed"
+
+	# FIXME: report upstream their package is broken
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed 2 failed"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check || die "emake check failed."
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	echo
+	elog "Empathy needs telepathy's connection managers to use any IM protocol."
+	elog "You will need to install connection managers yourself."
+	elog "MSN: net-voip/telepathy-butterfly"
+	elog "Jabber and Gtalk: net-voip/telepathy-gabble"
+	elog "IRC: net-irc/telepathy-idle"
+	elog "Link-local XMPP: net-irc/telepathy-salut"
+	echo
+}
diff --git a/net-im/empathy/files/empathy-2.26.1-fix-doc.patch b/net-im/empathy/files/empathy-2.26.1-fix-doc.patch
new file mode 100644
index 000000000000..7e1b9d5758e2
--- /dev/null
+++ b/net-im/empathy/files/empathy-2.26.1-fix-doc.patch
@@ -0,0 +1,159 @@
+From 75781194946d400128d4c5c7a5be6171bb200294 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 10 May 2009 13:12:54 +0200
+Subject: [PATCH] Fix deprecated references.
+
+---
+ help/ca/ca.po |    6 ------
+ help/cs/cs.po |    7 -------
+ help/de/de.po |    5 -----
+ help/el/el.po |    6 ------
+ help/es/es.po |    7 -------
+ help/it/it.po |    5 -----
+ help/ru/ru.po |   10 ----------
+ help/sv/sv.po |    6 ------
+ 8 files changed, 0 insertions(+), 52 deletions(-)
+
+diff --git a/help/ca/ca.po b/help/ca/ca.po
+index ab63412..df4e49a 100644
+--- a/help/ca/ca.po
++++ b/help/ca/ca.po
+@@ -20,12 +20,6 @@ msgstr ""
+ msgid "@@image: 'figures/empathy-main-window.png'; md5=38259a866f38ff1f754828e46d2b0e5c"
+ msgstr "@@image: 'figures/empathy-main-window.png'; md5=38259a866f38ff1f754828e46d2b0e5c"
+ 
+-#. When image changes, this message will be marked fuzzy or untranslated for you.
+-#. It doesn't matter what you translate it to: it's not used at all.
+-#: C/empathy.xml:306(None) 
+-msgid "@@image: 'figures/empathy-new-account.png'; md5=6c1e0d8c709125d387e975e5738b8c0f"
+-msgstr "@@image: 'figures/empathy-new-account.png'; md5=6c1e0d8c709125d387e975e5738b8c0f"
+-
+ #: C/empathy.xml:25(title) 
+ msgid "<application>Empathy</application> Manual V2.0"
+ msgstr "Manual de l'<application>Empathy</application> v2.0"
+diff --git a/help/cs/cs.po b/help/cs/cs.po
+index 8670270..0d836a5 100644
+--- a/help/cs/cs.po
++++ b/help/cs/cs.po
+@@ -1303,13 +1303,6 @@ msgstr ""
+ #~ msgid "TODO"
+ #~ msgstr "Tato kapitola ještě není hotova."
+ 
+-#~ msgid ""
+-#~ "@@image: 'figures/empathy-new-account.png'; "
+-#~ "md5=6c1e0d8c709125d387e975e5738b8c0f"
+-#~ msgstr ""
+-#~ "@@image: 'figures/empathy-new-account.png'; "
+-#~ "md5=6c1e0d8c709125d387e975e5738b8c0f"
+-
+ #~ msgid "2008"
+ #~ msgstr "2008"
+ 
+diff --git a/help/de/de.po b/help/de/de.po
+index a39cfa5..93601d7 100644
+--- a/help/de/de.po
++++ b/help/de/de.po
+@@ -1427,11 +1427,6 @@ msgstr ""
+ #~ msgid "TODO"
+ #~ msgstr "TODO"
+ 
+-#~ msgid ""
+-#~ "@@image: 'figures/empathy-new-account.png'; "
+-#~ "md5=6c1e0d8c709125d387e975e5738b8c0f"
+-#~ msgstr "translated"
+-
+ #~ msgid "2008"
+ #~ msgstr "2008"
+ 
+diff --git a/help/el/el.po b/help/el/el.po
+index fb433ba..47ad44b 100644
+--- a/help/el/el.po
++++ b/help/el/el.po
+@@ -19,12 +19,6 @@ msgstr ""
+ msgid "@@image: 'figures/empathy-main-window.png'; md5=38259a866f38ff1f754828e46d2b0e5c"
+ msgstr "@@image: 'figures/empathy-main-window.png'; md5=38259a866f38ff1f754828e46d2b0e5c"
+ 
+-#. When image changes, this message will be marked fuzzy or untranslated for you.
+-#. It doesn't matter what you translate it to: it's not used at all.
+-#: C/empathy.xml:306(None)
+-msgid "@@image: 'figures/empathy-new-account.png'; md5=6c1e0d8c709125d387e975e5738b8c0f"
+-msgstr "@@image: 'figures/empathy-new-account.png'; md5=6c1e0d8c709125d387e975e5738b8c0f"
+-
+ #: C/empathy.xml:25(title)
+ msgid "<application>Empathy</application> Manual V2.0"
+ msgstr "Εγχειρίδιο του <application>Empathy</application>, έκδοση 2.0"
+diff --git a/help/es/es.po b/help/es/es.po
+index 3075bac..7ffbafd 100644
+--- a/help/es/es.po
++++ b/help/es/es.po
+@@ -1432,13 +1432,6 @@ msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2008-2009"
+ #~ "Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</"
+ #~ "link>, seleccione un contacto y pulse con el botón derecho sobre él."
+ 
+-#~ msgid ""
+-#~ "@@image: 'figures/empathy-new-account.png'; "
+-#~ "md5=6c1e0d8c709125d387e975e5738b8c0f"
+-#~ msgstr ""
+-#~ "@@image: 'figures/empathy-new-account.png'; "
+-#~ "md5=6c1e0d8c709125d387e975e5738b8c0f"
+-
+ #~ msgid "2008"
+ #~ msgstr "2008"
+ 
+diff --git a/help/it/it.po b/help/it/it.po
+index edf9a40..e7ba48f 100644
+--- a/help/it/it.po
++++ b/help/it/it.po
+@@ -1384,11 +1384,6 @@ msgstr ""
+ msgid "translator-credits"
+ msgstr "Milo Casagrande <milo@ubuntu.com>"
+ 
+-#~ msgid ""
+-#~ "@@image: 'figures/empathy-new-account.png'; "
+-#~ "md5=6c1e0d8c709125d387e975e5738b8c0f"
+-#~ msgstr "fatto"
+-
+ #~ msgid "2008"
+ #~ msgstr "2008"
+ 
+diff --git a/help/ru/ru.po b/help/ru/ru.po
+index ef532e1..5a953d7 100644
+--- a/help/ru/ru.po
++++ b/help/ru/ru.po
+@@ -26,16 +26,6 @@ msgstr ""
+ "@@image: 'figures/empathy-main-window.png'; "
+ "md5=38259a866f38ff1f754828e46d2b0e5c"
+ 
+-#. When image changes, this message will be marked fuzzy or untranslated for you.
+-#. It doesn't matter what you translate it to: it's not used at all.
+-#: C/empathy.xml:307(None)
+-msgid ""
+-"@@image: 'figures/empathy-new-account.png'; "
+-"md5=6c1e0d8c709125d387e975e5738b8c0f"
+-msgstr ""
+-"@@image: 'figures/empathy-new-account.png'; "
+-"md5=6c1e0d8c709125d387e975e5738b8c0f"
+-
+ #: C/empathy.xml:26(title)
+ msgid "<application>Empathy</application> Manual V2.0"
+ msgstr "Руководство по <application>Empathy</application> версии 2.0"
+diff --git a/help/sv/sv.po b/help/sv/sv.po
+index 899b69f..6610d38 100644
+--- a/help/sv/sv.po
++++ b/help/sv/sv.po
+@@ -800,12 +800,6 @@ msgstr "Välj den tjänst som du vill skapa ett konto för från rullgardinslist
+ msgid "translator-credits"
+ msgstr "Daniel Nylander <po@danielnylander.se>, 2008, 2009"
+ 
+-#~ msgid ""
+-#~ "@@image: 'figures/empathy-new-account.png'; "
+-#~ "md5=6c1e0d8c709125d387e975e5738b8c0f"
+-#~ msgstr ""
+-#~ "@@image: 'figures/empathy-new-account.png'; "
+-#~ "md5=6c1e0d8c709125d387e975e5738b8c0f"
+ #~ msgid "2008"
+ #~ msgstr "2008"
+ #~ msgid "milo_casagrande@yahoo.it"
+-- 
+1.6.2.5
+