net-im/empathy: 3.1.4 → 3.1.5

Version bump with numerous changes. Now requires pulseaudio and
telepathy-farstream. The live version now has an obligatory dependency
on webkit.

3 files changed, 18 insertions, 15 deletions

diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index bb39ecbb..992d08a2 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,3 +1,3 @@
-DIST empathy-3.1.4.tar.xz 3178856 RMD160 18aef4de192db78a28a7f073d6b7779cfe12c060 SHA1 60705946297c2704eb485cb882d04bd317b49fdb SHA256 23a230432985715ca6df151b6855419c1957130c0ae83e958739a57d5a5cc9d4
-EBUILD empathy-3.1.4.ebuild 3466 RMD160 4b1488d0357dad7246978da441d6250f0d8d3fca SHA1 beea934bce2aafb6f206256cc6e0443ace9d011f SHA256 c17e13abcac6620c2db6bce4f1297660cd161157e692b3dd958537e969cf7fe4
-EBUILD empathy-9999.ebuild 3466 RMD160 4b1488d0357dad7246978da441d6250f0d8d3fca SHA1 beea934bce2aafb6f206256cc6e0443ace9d011f SHA256 c17e13abcac6620c2db6bce4f1297660cd161157e692b3dd958537e969cf7fe4
+DIST empathy-3.1.5.tar.xz 3033480 RMD160 475d125a1b4b7641d54268c349e0343091fd3541 SHA1 5be064653834e3923b06d5679958a72381c8bfe9 SHA256 4de231ca9c8528599d8c9974603a0e04a9f759d0f1c940c3b55cd44253f93132
+EBUILD empathy-3.1.5.ebuild 3527 RMD160 e1469704ee518ce6b454509a6fd505d0d7a0a582 SHA1 88244b7e26a7a1fdf98b76787469bfb545fddb63 SHA256 e838f9d02c2b8eced1f25e0b8fbedaf8353aac4d4228824406a2bd1cf77e0cd6
+EBUILD empathy-9999.ebuild 3485 RMD160 50417bb4c66324b97a15900664612b827c415338 SHA1 cbd8e97d845b931911797bda64ea6856c0786024 SHA256 cafda1ae77874daec97efad6da3a690e84ab91f01a6a45281466d19f1cb3e04e
diff --git a/net-im/empathy/empathy-3.1.4.ebuild b/net-im/empathy/empathy-3.1.5.ebuild
index 9d31916c..3a9c7aa1 100644
--- a/net-im/empathy/empathy-3.1.4.ebuild
+++ b/net-im/empathy/empathy-3.1.5.ebuild
@@ -31,12 +31,13 @@ IUSE="debug eds +map +geoloc +networkmanager sendto spell test +video webkit" #
 RDEPEND=">=dev-libs/glib-2.28:2
 	>=x11-libs/gtk+-3.0.2:3
 	>=dev-libs/dbus-glib-0.51
-	>=net-libs/telepathy-glib-0.15.3
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7
+	>=dev-libs/folks-0.6.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.5.1
+	>=net-libs/telepathy-glib-0.15.3
+	>=x11-libs/libnotify-0.7
 
 	dev-libs/libxml2:2
 	gnome-base/gsettings-desktop-schemas
@@ -49,6 +50,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	>=net-im/telepathy-logger-0.2.8
 	net-libs/farsight2
 	>=net-libs/telepathy-farsight-0.0.14
+	net-libs/telepathy-farstream
 	net-voip/telepathy-connection-managers
 	x11-libs/libX11
 
@@ -63,7 +65,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	video? (
 		|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
 		>=media-video/cheese-2.91.91.1 )
-	webkit? ( >=net-libs/webkit-gtk-1.3.2:3 )
+	webkit? ( >=net-libs/webkit-gtk-1.3.13:3 )
 "
 	# gnome? ( >=gnome-base/gnome-control-center-2.31.4 )
 DEPEND="${RDEPEND}
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 9d31916c..2d506649 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -24,19 +24,21 @@ else
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 fi
 # FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="debug eds +map +geoloc +networkmanager sendto spell test +video webkit" # gnome
+IUSE="debug eds +map +geoloc +networkmanager sendto spell test +video" # gnome
 
 # 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.28:2
 	>=x11-libs/gtk+-3.0.2:3
 	>=dev-libs/dbus-glib-0.51
-	>=net-libs/telepathy-glib-0.15.3
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7
+	>=dev-libs/folks-0.6.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.5.1
+	>=net-libs/telepathy-glib-0.15.3
+	>=net-libs/webkit-gtk-1.3.13:3
+	>=x11-libs/libnotify-0.7
 
 	dev-libs/libxml2:2
 	gnome-base/gsettings-desktop-schemas
@@ -49,6 +51,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	>=net-im/telepathy-logger-0.2.8
 	net-libs/farsight2
 	>=net-libs/telepathy-farsight-0.0.14
+	net-libs/telepathy-farstream
 	net-voip/telepathy-connection-managers
 	x11-libs/libX11
 
@@ -63,7 +66,6 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	video? (
 		|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
 		>=media-video/cheese-2.91.91.1 )
-	webkit? ( >=net-libs/webkit-gtk-1.3.2:3 )
 "
 	# gnome? ( >=gnome-base/gnome-control-center-2.31.4 )
 DEPEND="${RDEPEND}
@@ -97,7 +99,6 @@ pkg_setup() {
 		$(use_enable spell)
 		$(use_with video cheese)
 		$(use_enable video gudev)
-		$(use_enable webkit)
 		--disable-control-center-embedding"
 	#	$(use_enable gnome control-center-embedding)
 	# gnome-control-center-3.1.4 dropped support for third-party panels