Bump to 2.26.2. Bug fixes and translation updates.

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

3 files changed, 115 insertions, 2 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index db34d4f600d6..bfc231758fb0 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.38 2009/05/15 20:56:47 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.39 2009/05/18 20:08:09 eva Exp $
+
+*empathy-2.26.2 (18 May 2009)
+
+  18 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +empathy-2.26.2.ebuild:
+  Bump to 2.26.2. Bug fixes and translation updates.
 
   15 May 2009; Tobias Klausmann <klausman@gentoo.org> empathy-2.26.1.ebuild:
   Keyworded on alpha, bug #269314
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 40482a110219..4453307d6197 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,7 +1,19 @@
+-----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
 DIST empathy-2.26.1.tar.bz2 2006578 RMD160 f30700b375d5ae9f72216403450c119601e40f18 SHA1 8881ba249457f522d20af4a7ea33ccc88e5551cb SHA256 bb3b3663b11e3e573a13dd1b51d8a5b02797a43c53a64efc529f6604f40503c7
+DIST empathy-2.26.2.tar.bz2 2021659 RMD160 58d995c9e616aa5d429dde9fad5861d66a33521f SHA1 d2eb4de3d3efd7728dc28eb16dfe60c64141be70 SHA256 2790502f62056926feeab71681033e5787856f7b56ae0beaa49f89b4763f1b9a
 EBUILD empathy-2.24.1.ebuild 1857 RMD160 d0d00b9b518dd500e92cc50b08fd81c00559dbc9 SHA1 a53fafc33193d0fc946d7c3a4e2d2c9480a0ca49 SHA256 40309174f0c2dd7e975b86e0b0cc97b15a34425ad732b5a7c24c3ca527842501
 EBUILD empathy-2.26.1.ebuild 2471 RMD160 f82d887c44b2d9df4a30201e2277625ce006c54a SHA1 5dcbbdbdb1c2b47bc0e88bb877529634432ffcab SHA256 882e8ae71eaa1caca612fb4fbebe232093a435f201e910009d6816093c2bfbf6
-MISC ChangeLog 7596 RMD160 88546b3e49989bff2850b2a41dd7b9f3d9b94981 SHA1 be7e5a99c71cc8f3b502a210323e5e552580586b SHA256 62c166942b3d578daa241c4ee22ba0831040fa84b5577d781b3fe7715302ab84
+EBUILD empathy-2.26.2.ebuild 2466 RMD160 587f548bb126ff23c0a847163900f1a8d1b83ae9 SHA1 2a742a4f622777ae1067ce91150b39eda73f5f62 SHA256 f6c34c9830dbb6b2e149218bc15360db454e063bfa0fb81e17cc3576bae77e98
+MISC ChangeLog 7756 RMD160 c195f95e5dd490fcd4a9e25ee89a9970cce3c8d2 SHA1 ce295f6e472fd6b2cc66393510895cd87f0b4701 SHA256 8fdbd87ea451f211612ece7d8ae26f7c5cc62a130fe0370e937379b341708704
 MISC metadata.xml 837 RMD160 f89b55575131f76e4c62a41b62f2f881eb5fc231 SHA1 0934f431802b72b4efc3a93ca334dc02696a7816 SHA256 5bc51238a6a5e781c0add5d54d74a7848de0c66ce516a7d8d5a20d8f2c6a751f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoRwDMACgkQ1fmVwcYIWAYMnQCcDwcvPKCXCzu21R5KnPulIhr2
+I9oAn08KknCqfme2n7Dcw2EBYvgWQ3bj
+=+Xnk
+-----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-2.26.2.ebuild b/net-im/empathy/empathy-2.26.2.ebuild
new file mode 100644
index 000000000000..f40de6543a6b
--- /dev/null
+++ b/net-im/empathy/empathy-2.26.2.ebuild
@@ -0,0 +1,95 @@
+# 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.2.ebuild,v 1.1 2009/05/18 20:08:09 eva Exp $
+
+EAPI="2"
+
+inherit eutils gnome2
+
+DESCRIPTION="Telepathy client and library using GTK+"
+HOMEPAGE="http://live.gnome.org/Empathy"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~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/scrollkeeper
+	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
+}