Version bump for gnome-3.4 with a new call UI. Now uses gnome-contacts to display contacts information. Drop old.

(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)

3 files changed, 55 insertions, 36 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 6e5b57ee33cd..d870f896359c 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,13 @@
 # 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.105 2012/05/04 06:22:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.106 2012/05/15 05:58:13 tetromino Exp $
+
+*empathy-3.4.2 (15 May 2012)
+
+  15 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -empathy-3.2.2.ebuild, +empathy-3.4.2.ebuild, metadata.xml:
+  Version bump for gnome-3.4 with a new call UI. Now uses gnome-contacts to
+  display contacts information. Drop old.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> empathy-2.32.2.ebuild,
   empathy-2.34.0-r2.ebuild, empathy-3.2.2.ebuild, empathy-3.2.2-r1.ebuild:
diff --git a/net-im/empathy/empathy-3.2.2.ebuild b/net-im/empathy/empathy-3.4.2.ebuild
index 5f079cd5703f..d775ec686cbf 100644
--- a/net-im/empathy/empathy-3.2.2.ebuild
+++ b/net-im/empathy/empathy-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.4 2012/05/04 06:22:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.4.2.ebuild,v 1.1 2012/05/15 05:58:13 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -9,79 +9,86 @@ PYTHON_DEPEND="2:2.5"
 
 inherit gnome2 python
 
-DESCRIPTION="Telepathy client and library using GTK+"
+DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
 HOMEPAGE="http://live.gnome.org/Empathy"
 
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="debug eds +geocode +geoloc gnome gnome-online-accounts legacy-call +map +networkmanager sendto spell test +v4l"
 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
-RDEPEND=">=dev-libs/glib-2.28:2
+# clutter-1.10 dep is missing in configure, newer API is used
+# folks-0.6.8 is needed to load the contacts list, configure is wrong again
+COMMON_DEPEND=">=dev-libs/glib-2.30:2
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0.2:3
+	>=x11-libs/gtk+-3.3.6:3
 	x11-libs/pango
 	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/folks-0.6.2
+	>=dev-libs/folks-0.6.8
 	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
 
+	>=media-libs/clutter-1.10.0:1.0
+	>=media-libs/clutter-gtk-0.90.3:1.0
+	>=media-libs/clutter-gst-1.5.2:1.0
+
+	>=net-libs/telepathy-glib-0.18
+	>=net-im/telepathy-logger-0.2.13
+	>=net-libs/telepathy-farstream-0.2.1
+
 	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
-	>=net-im/telepathy-logger-0.2.8
-	net-libs/farsight2
-	>=net-libs/telepathy-farsight-0.0.14
-	net-im/telepathy-connection-managers
-	x11-libs/libX11
-	x11-themes/gnome-icon-theme-symbolic
+	media-sound/pulseaudio[glib]
+	net-libs/libsoup:2.4
+	x11-libs/libX11	
 
-	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 )
+	geocode? ( sci-geosciences/geocode-glib )
+	geoloc? ( >=app-misc/geoclue-0.12 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.3.0 )
 	map? (
 		>=media-libs/clutter-1.7.14:1.0
 		>=media-libs/clutter-gtk-0.90.3:1.0
-		media-libs/libchamplain:0.12[gtk] )
+		>=media-libs/libchamplain-0.12.1: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? (
-		|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
 		media-plugins/gst-plugins-v4l2:0.10
-		>=media-video/cheese-2.91.91.1 )
+		>=media-video/cheese-2.91.91.1
+		sys-fs/udev[gudev] )
+"
+# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
+# eventually at which point the dep can be dropped
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gst-plugins-base:0.10
+	media-libs/gst-plugins-bad
+	net-im/telepathy-connection-managers
+	x11-themes/gnome-icon-theme-symbolic
+	gnome? ( gnome-extra/gnome-contacts )
+	!legacy-call? ( !<net-voip/telepathy-gabble-0.16 )
 "
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.17.3
-	>=dev-util/intltool-0.35.0
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxml2:2
+	dev-util/itstool
+
+	>=dev-util/intltool-0.40.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"
+PDEPEND=">=net-im/telepathy-mission-control-5.12"
 
 pkg_setup() {
 	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
@@ -91,9 +98,10 @@ pkg_setup() {
 		--disable-static
 		--disable-meego
 		--disable-Werror
-		$(use_enable call)
+		$(use_enable legacy-call empathy-av)
 		$(use_enable debug)
 		$(use_with eds)
+		$(use_enable geocode)
 		$(use_enable geoloc location)
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable map)
diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
index 51abc24c4cf2..46f4c30edce3 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/metadata.xml
@@ -6,11 +6,15 @@
 	<use>
 		<flag name="call">Enable Call channel support using
 			<pkg>net-libs/telepathy-farstream</pkg> for audio/video calls</flag>
+		<flag name="geocode">Enable translation between addresses and geographic
+			coordinates using <pkg>sci-geosciences/geocode-glib</pkg> and Yahoo!
+			Place Finder</flag>
 		<flag name="geoloc">Enable geolocation support through
 			<pkg>app-misc/geoclue</pkg></flag>
 		<flag name="gnome-online-accounts">Enable using
 			<pkg>net-libs/gnome-online-accounts</pkg> for authorization (e.g.
 			for Google Talk)</flag>
+		<flag name="legacy-call">Enable the Empathy 3.2-like call UI</flag>
 		<flag name="map">Enable world map support through
 			<pkg>media-libs/libchamplain</pkg></flag>
 		<flag name="nautilus">Enable nautilus-sendto support</flag>