Bump to 3.2.1.1 from the gnome overlay. Remove old (and vulnerable) 3.0.2. Notable changes: optional farstream call support, better theming, new log viewer, google talk support via gnome-online-accounts.

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

3 files changed, 55 insertions, 34 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 2dbc9f8a3275..769788f29f1e 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.93 2011/10/30 12:37:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.94 2011/11/04 05:12:33 tetromino Exp $
+
+*empathy-3.2.1.1 (04 Nov 2011)
+
+  04 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -empathy-3.0.2.ebuild, +empathy-3.2.1.1.ebuild, metadata.xml:
+  Bump to 3.2.1.1 from the gnome overlay. Remove old (and vulnerable) 3.0.2.
+  Notable changes: optional farstream call support, better theming, new log
+  viewer, google talk support via gnome-online-accounts.
 
   30 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   empathy-2.34.0-r2.ebuild:
diff --git a/net-im/empathy/empathy-3.0.2.ebuild b/net-im/empathy/empathy-3.2.1.1.ebuild
index b6b9f86f100f..267a143049d5 100644
--- a/net-im/empathy/empathy-3.0.2.ebuild
+++ b/net-im/empathy/empathy-3.2.1.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.0.2.ebuild,v 1.1 2011/08/18 06:22:13 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.1.1.ebuild,v 1.1 2011/11/04 05:12:33 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.4"
 
-inherit eutils gnome2 multilib python
+inherit gnome2 python
 
 DESCRIPTION="Telepathy client and library using GTK+"
 HOMEPAGE="http://live.gnome.org/Empathy"
@@ -15,53 +15,66 @@ HOMEPAGE="http://live.gnome.org/Empathy"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux"
-# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="debug eds +gnome +map +geoloc +networkmanager sendto spell test webkit"
+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
-RDEPEND=">=dev-libs/glib-2.27.2:2
+# libgee extensively used in libempathy
+# gdk-pixbuf and pango extensively used in libempathy-gtk
+RDEPEND=">=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
-	>=net-libs/telepathy-glib-0.14.1
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7
+	>=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
-	>=dev-libs/folks-0.4
+	>=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
-	net-libs/farsight2
 	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
-	dev-libs/libxml2:2
-	x11-libs/libX11
 	net-voip/telepathy-connection-managers
-	>=net-im/telepathy-logger-0.2.8
+	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? ( >=gnome-base/gnome-control-center-3.0.0 )
+	gnome-online-accounts? ( net-libs/gnome-online-accounts )
 	map? (
-		media-libs/libchamplain:0.10[gtk]
-		media-libs/clutter-gtk:1.0 )
+		>=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 )
-	webkit? ( >=net-libs/webkit-gtk-1.3.2:3 )
+	v4l? (
+		|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
+		media-plugins/gst-plugins-v4l2:0.10
+		>=media-video/cheese-2.91.91.1 )
 "
-# Will not build with gnome-control-center-3.1.4 due to removed headers,
-# but should (probably) continue to run
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.17.3
 	>=dev-util/intltool-0.35.0
 	>=dev-util/pkgconfig-0.16
-	gnome? ( <gnome-base/gnome-control-center-3.1.4 )
+	>=sys-devel/gettext-0.17
 	test? (
 		sys-apps/grep
 		>=dev-libs/check-0.9.4 )
@@ -71,37 +84,32 @@ PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
 
 pkg_setup() {
 	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-
-	# TODO: Re-add location support
 	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 control-center-embedding)
+		$(use_enable gnome-online-accounts goa)
 		$(use_enable map)
 		$(use_with networkmanager connectivity nm)
 		$(use_enable sendto nautilus-sendto)
 		$(use_enable spell)
-		$(use_enable webkit)"
+		$(use_with v4l cheese)
+		$(use_enable v4l gudev)"
 
-	# Build time python tools needs python2
+	# Build time python tools need python2
 	python_set_active_version 2
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	python_convert_shebangs -r 2 tools
+	python_pkg_setup
 }
 
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "emake check failed."
+	emake check
 }
 
 pkg_postinst() {
diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
index 8ea9ff10b13d..51abc24c4cf2 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/metadata.xml
@@ -4,8 +4,13 @@
 	<herd>net-im</herd>
 	<herd>gnome</herd>
 	<use>
+		<flag name="call">Enable Call channel support using
+			<pkg>net-libs/telepathy-farstream</pkg> for audio/video calls</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="map">Enable world map support through
 			<pkg>media-libs/libchamplain</pkg></flag>
 		<flag name="nautilus">Enable nautilus-sendto support</flag>