Block versions of telepathy-rakia that do not work with the corresponding version of empathy (bug #403861, thanks to Olivier Crete).

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

4 files changed, 18 insertions, 6 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 62f837028d00..1302b98b912e 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,11 @@
 # 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.107 2012/05/22 03:31:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.108 2012/07/18 00:58:47 tetromino Exp $
+
+  18 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  empathy-3.2.2-r1.ebuild, empathy-3.4.2.ebuild, empathy-3.4.2.1.ebuild:
+  Block versions of telepathy-rakia that do not work with the corresponding
+  version of empathy (bug #403861, thanks to Olivier Crete).
 
 *empathy-3.4.2.1 (22 May 2012)
 
diff --git a/net-im/empathy/empathy-3.2.2-r1.ebuild b/net-im/empathy/empathy-3.2.2-r1.ebuild
index e24ac216822e..0a60d1f3ea37 100644
--- a/net-im/empathy/empathy-3.2.2-r1.ebuild
+++ b/net-im/empathy/empathy-3.2.2-r1.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-r1.ebuild,v 1.2 2012/05/04 06:22:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.2-r1.ebuild,v 1.3 2012/07/18 00:58:48 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -21,7 +21,7 @@ IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto s
 # 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
+COMMON_DEPEND=">=dev-libs/glib-2.28:2
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.0.2:3
 	x11-libs/pango
@@ -70,7 +70,10 @@ RDEPEND=">=dev-libs/glib-2.28:2
 		media-plugins/gst-plugins-v4l2:0.10
 		>=media-video/cheese-2.91.91.1 )
 "
-DEPEND="${RDEPEND}
+# empathy-3.2 is incompatible with >=telepathy-rakia/sofiasip-0.7, bug #403861
+RDEPEND="${COMMON_DEPEND}
+	!>=net-voip/telepathy-rakia-0.7"
+DEPEND="${COMMON_DEPEND}
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.17.3
 	>=dev-util/intltool-0.35.0
diff --git a/net-im/empathy/empathy-3.4.2.1.ebuild b/net-im/empathy/empathy-3.4.2.1.ebuild
index bf37a06a16b0..f1a0c19e7209 100644
--- a/net-im/empathy/empathy-3.4.2.1.ebuild
+++ b/net-im/empathy/empathy-3.4.2.1.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.4.2.1.ebuild,v 1.1 2012/05/22 03:31:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.4.2.1.ebuild,v 1.2 2012/07/18 00:58:47 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -69,10 +69,12 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 "
 # FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
 # eventually at which point the dep can be dropped
+# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
 RDEPEND="${COMMON_DEPEND}
 	media-libs/gst-plugins-base:0.10
 	media-libs/gst-plugins-bad
 	net-im/telepathy-connection-managers
+	!<net-voip/telepathy-rakia-0.7
 	x11-themes/gnome-icon-theme-symbolic
 	gnome? ( gnome-extra/gnome-contacts )
 	!legacy-call? ( !<net-voip/telepathy-gabble-0.16 )
diff --git a/net-im/empathy/empathy-3.4.2.ebuild b/net-im/empathy/empathy-3.4.2.ebuild
index 755fcca1a133..d4cccfd338c2 100644
--- a/net-im/empathy/empathy-3.4.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.4.2.ebuild,v 1.2 2012/05/15 23:30:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.4.2.ebuild,v 1.3 2012/07/18 00:58:47 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -69,10 +69,12 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 "
 # FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
 # eventually at which point the dep can be dropped
+# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
 RDEPEND="${COMMON_DEPEND}
 	media-libs/gst-plugins-base:0.10
 	media-libs/gst-plugins-bad
 	net-im/telepathy-connection-managers
+	!<net-voip/telepathy-rakia-0.7
 	x11-themes/gnome-icon-theme-symbolic
 	gnome? ( gnome-extra/gnome-contacts )
 	!legacy-call? ( !<net-voip/telepathy-gabble-0.16 )