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

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

4 files changed, 73 insertions, 39 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/Manifest b/net-im/empathy/Manifest
index caed5e31273d..aa2f313d678b 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX empathy-2.32.2-libnotify-0.7.patch 1644 RMD160 87941e9933ec4fb83f45a0e052af77273a6aa250 SHA1 8696716fd49d0a0bce7eeb7044db66b7591e0d82 SHA256 8f7280c95fb67a2f91dc38984523f8ae4be95643e7404ea672d88d6541987ca8
 AUX empathy-2.34.0-CVE-2011-3635.patch 2451 RMD160 74947ef5803899f2882fd80186329673303c84d2 SHA1 36b1e435df44238ad8ec457148198c6f33e402c8 SHA256 7b82ba0d9e002ba78975caff45ec08eb7b176feb513ba72c0c312f0a2a8ccd54
 AUX empathy-2.34.0-auth-dialog-crash-fix.patch 976 RMD160 97ea8bb28e5673baaca8d437158202d9b40019d1 SHA1 ab18d8759a46da7e34b0f2261c7c3b802688663a SHA256 cad7bc8885b94cfe777223bd167006f5fd5e57dcff87ba861260d08e961c22f3
@@ -8,9 +11,21 @@ AUX empathy-3.2.2-telepathy-logger-0.4.patch 2980 RMD160 c665a2ab69ef82beca02e78
 DIST empathy-2.32.2.tar.bz2 2936340 RMD160 36d42e08343e49c1963405caeb35e76400bab209 SHA1 b956af129aaecc54491c7bc01892bb29c33c1d32 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
 DIST empathy-2.34.0.tar.bz2 3361496 RMD160 a76e9633d88dbd48c5d494d3393566a88a5b35c4 SHA1 cc82c871fb1d3dbc428b851c59ad44184f064d10 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1
 DIST empathy-3.2.2.tar.xz 3184408 RMD160 f323ef6c46f074c32947e64bad3d9c94194f3aa3 SHA1 fbf0e43c75c49caca4e4a25d1790afcbae7942f2 SHA256 d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1
+DIST empathy-3.4.2.tar.xz 3432860 RMD160 8b65ea4ae9c236c1abeaa52346b97146a5f61279 SHA1 d66ec3cfa029e19de2a942cab1e31b846b69935f SHA256 e68936811d52c0b5419c93a87a81429b09f944d3f6cd65eb1554e6c7d489de32
 EBUILD empathy-2.32.2.ebuild 3085 RMD160 70ebde8e2c24b38db3809d0487739351e0f78243 SHA1 2c1c85c3b75e076a283b027ec5f497890fd2ad84 SHA256 7bb228fb0baa3c124e9ea04939533f8f7c9efb3e17e3ca33bc93410a5875a3a5
 EBUILD empathy-2.34.0-r2.ebuild 3286 RMD160 c6db9d2197b2ea456d6c8c184dde0a56d97c180a SHA1 d08630040bc1a1764712037b5999696c08d5bc31 SHA256 03b88ab0bebb3fe5ea20e177b1a682d458d8dea6ceaddc3abaeae8265c297ba9
 EBUILD empathy-3.2.2-r1.ebuild 3676 RMD160 5bcb06de7cfd67664d38db3935de80d654888fbf SHA1 7de71c93fe78b76e9ae9fb9c99fb52f1f2e4ee18 SHA256 9f07a6932c7dc0ccdead2e7e0c78d2aa0441d161de004818008e44f365db03fc
-EBUILD empathy-3.2.2.ebuild 3371 RMD160 3d522ddcf0c30f5069739bceeb9c8cc838c331e7 SHA1 c6e703a5f1b9e2391f5455345b0c528e6b596669 SHA256 28b32695bf24cca6a4440f5cc0592f801155f8eefafdcb80a917bf918d040480
-MISC ChangeLog 18521 RMD160 4735ab9d86abd1f2d901abe91833b23dc61a6935 SHA1 1c0594b06a0aeaf54d10df970d8e93a522d7b4a2 SHA256 2aac6846d4ae204153d3642cc3ae5dcbb65fa7d53345827bf754ef5c4fdb6003
-MISC metadata.xml 1425 RMD160 38d0a65bd440db5fe8deb90bd79f079b12a5502d SHA1 d1743cb72216d94a45eae200cd40d310a121cb5b SHA256 0a68cd5576cafddcf96b2046679bcd0511adc7f3205fefb8f8cc1cb4de87d7c0
+EBUILD empathy-3.4.2.ebuild 3687 RMD160 ea781fd7a87985060014e764f95947d3b4552a8b SHA1 6317dbca3f0c7462b9c88279aa0f23bd6e446639 SHA256 a0f6578b9a5d4f59343fe232701ac717e8f28c19443090d7859665aa33c2a88b
+MISC ChangeLog 18794 RMD160 d0d81f75728976b37cf3cce386f8245504b55ab7 SHA1 5c61a7fa2301adbd8f146ac4f85e031c2f3df7b5 SHA256 5e98d88bf66c3ae8d1443a8c328e31c07af8d71ffdfcd258a0b0990b3915c2f0
+MISC metadata.xml 1665 RMD160 349a6c344bf5ed5abbaa87f0649466bba3a06f7a SHA1 06669dd9c38118e51bf77c533041dac0182ee285 SHA256 d004a67be9d82c28f16d52bb1fc2f50ec5c8bbd92b010b89ac0d652723c45140
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPsfB6AAoJEJ0WA1zPCt1hgt4H/06MZpRVwL9l4UXXYVxa3Wtu
+VzjnRtK5IT4ayVqeao54RI3Kvqt5W/yvdDWCDL22ViO1hvQAAWd9Book3Dv3ZIZy
+68u8OMH2u7HXIChgRPSshce+ZIM+u1qW0ujpZoje+X0+kXWdUOYmNLPUlt1AhFfM
+AoAevfl3dxFH3joiCpOeMgUKc4YzqAXLgMYvZiWGjJNfXZAxRNUsXhZNVoe05Vwb
+2SGvQSDcpx2eeXQI+m1txcl49oBeALOsS2Nop/nMtD1R6+sYskiXZ+n6+QzfSscT
+k//Exsk0ugdR3U1zKsnVqObrcfXbXw11rkbwrbPb0ILz0Oqc3aaRGl09djZ0ZEg=
+=4MCc
+-----END PGP SIGNATURE-----
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>