New version for GNOME 2.28. Clean up old revision.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

4 files changed, 67 insertions, 194 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 47e50d524ec0..8b416aba62e1 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,13 @@
 # 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.43 2009/10/25 17:13:32 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.44 2009/10/30 16:43:43 eva Exp $
+
+*empathy-2.28.1.1 (30 Oct 2009)
+
+  30 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -empathy-2.26.1.ebuild, -files/empathy-2.26.1-fix-doc.patch,
+  +empathy-2.28.1.1.ebuild, metadata.xml:
+  New version for GNOME 2.28. Clean up old revision.
 
   25 Oct 2009; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove coldwind from metadata.xml (#181764)
diff --git a/net-im/empathy/empathy-2.26.1.ebuild b/net-im/empathy/empathy-2.28.1.1.ebuild
index f6a61cae05f7..3f7223e32a69 100644
--- a/net-im/empathy/empathy-2.26.1.ebuild
+++ b/net-im/empathy/empathy-2.28.1.1.ebuild
@@ -1,81 +1,93 @@
 # 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.4 2009/09/14 21:26:40 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.1.1.ebuild,v 1.1 2009/10/30 16:43:43 eva Exp $
 
 EAPI="2"
 
-inherit eutils gnome2
+inherit eutils gnome2 multilib
 
 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"
+KEYWORDS="~amd64 ~x86"
+# FIXME: Add location support once geoclue stops being idiotic with automagic deps
+IUSE="applet doc networkmanager python spell test webkit" # map
 
 # FIXME: libnotify & libcanberra hard deps
 RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.14.0
+	>=x11-libs/gtk+-2.16.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
-	=net-im/telepathy-mission-control-4*
-	>=media-libs/libcanberra-0.4
+	>=net-libs/telepathy-glib-0.7.35
+	>=media-libs/libcanberra-0.4[gtk]
 	>=x11-libs/libnotify-0.4.4
+	>=gnome-base/gnome-keyring-2.22
 
+	dev-libs/libunique
+	net-libs/farsight2
 	media-libs/gstreamer:0.10
 	media-libs/gst-plugins-base:0.10
 	net-libs/telepathy-farsight
 	dev-libs/libxml2
+	x11-libs/libX11
 
 	applet? ( >=gnome-base/gnome-panel-2.10 )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	python? (
+		>=dev-lang/python-2.4.4-r5
+		>=dev-python/pygtk-2 )
 	spell? (
 		app-text/enchant
 		app-text/iso-codes )
-	python? (
-		>=dev-lang/python-2.4.4-r5
-		>=dev-python/pygtk-2 )"
+	webkit? ( >=net-libs/webkit-gtk-1.1.7 )
+"
+#	map? (
+#		>=media-libs/libchamplain-0.4[gtk]
+#		>=media-libs/clutter-gtk-0.10:1.0 )
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
-	app-text/gnome-doc-utils
+	>=app-text/gnome-doc-utils-0.17.3
 	>=dev-util/intltool-0.35.0
 	>=dev-util/pkgconfig-0.16
-	test? ( >=dev-libs/check-0.9.4 )
+	test? (
+		sys-apps/grep
+		>=dev-libs/check-0.9.4 )
 	dev-libs/libxslt
 	virtual/python
-	doc? ( >=dev-util/gtk-doc-1.3 )"
+	doc? ( >=dev-util/gtk-doc-1.3 )
+"
+PDEPEND=">=net-im/telepathy-mission-control-5"
 
 DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
 
-# FIXME: Tests are broken, upstream bug #576785
-RESTRICT="test"
+# FIXME: Highly broken with parallel make, mallard strike 2, see bug #286889
+MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		--disable-maintainer-mode
 		--disable-static
+		--disable-location
+		$(use_enable applet megaphone)
+		$(use_enable applet nothere)
 		$(use_enable debug)
-		$(use_enable spell)
+		$(use_with networkmanager connectivity nm)
+		$(use_enable map)
 		$(use_enable python)
-		$(use_enable applet megaphone)
-		$(use_enable applet nothere)"
+		$(use_enable spell)
+		$(use_enable test coding-style-checks)
+		$(use_enable webkit)
+	"
 }
 
 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() {
@@ -83,6 +95,12 @@ src_test() {
 	emake check || die "emake check failed."
 }
 
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libempathy.so.23
+	preserve_old_lib /usr/$(get_libdir)/libempathy-gtk.so.19
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 	echo
@@ -93,4 +111,6 @@ pkg_postinst() {
 	elog "IRC: net-irc/telepathy-idle"
 	elog "Link-local XMPP: net-irc/telepathy-salut"
 	echo
+	preserve_old_lib_notify /usr/$(get_libdir)/libempathy.so.23
+	preserve_old_lib_notify /usr/$(get_libdir)/libempathy-gtk.so.19
 }
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
deleted file mode 100644
index 7e1b9d5758e2..000000000000
--- a/net-im/empathy/files/empathy-2.26.1-fix-doc.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-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
-
diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
index 1aa7020bdff9..e989a89f470e 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/metadata.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-im</herd>
-  <herd>gnome</herd>
-  <use>
-    <flag name="applet">Enable Empathy's applets for
-  <pkg>gnome-base/gnome-panel</pkg>.</flag>
-  </use>
+<herd>net-im</herd>
+<maintainer>
+  <email>coldwind@gentoo.org</email>
+  <name>Santiago M. Mola</name>
+</maintainer>
+<herd>gnome</herd>
+<use>
+  <flag name="applet">Enable Empathy's applets for <pkg>gnome-base/gnome-panel</pkg></flag>
+  <flag name="webkit">Build support for Adium-style HTML-based conversation
+	  window themes using <pkg>net-libs/webkit-gtk</pkg></flag>
+</use>
   <longdescription>Empathy consists of a rich set of reusable instant messaging
   widgets, and a GNOME client using those widgets. It uses Telepathy and Nokia's
   Mission Control, and reuses Gossip's UI. The main goal is to permit desktop