Version bump for Gnome 3.6. Add ~arm to >=3.6 ebuilds. Clean up old revision.

(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 32 insertions, 27 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 95efec629acc..8a5a202d1033 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.125 2013/03/28 22:36:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.126 2013/03/31 14:57:15 eva Exp $
+
+*empathy-3.6.4 (31 Mar 2013)
+
+  31 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -empathy-3.6.2-r2.ebuild,
+  empathy-3.6.3.ebuild, +empathy-3.6.4.ebuild, empathy-3.8.0.ebuild:
+  Version bump for Gnome 3.6. Add ~arm to >=3.6 ebuilds. Clean up old revision.
 
 *empathy-3.8.0 (28 Mar 2013)
 
diff --git a/net-im/empathy/empathy-3.6.3.ebuild b/net-im/empathy/empathy-3.6.3.ebuild
index b41a0c9d77c4..04e6b82549fc 100644
--- a/net-im/empathy/empathy-3.6.3.ebuild
+++ b/net-im/empathy/empathy-3.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.6.3.ebuild,v 1.2 2013/02/07 22:32:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.6.3.ebuild,v 1.3 2013/03/31 14:57:15 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ HOMEPAGE="http://live.gnome.org/Empathy"
 LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
 SLOT="0"
 IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 
 # gdk-pixbuf and pango extensively used in libempathy-gtk
 COMMON_DEPEND="
diff --git a/net-im/empathy/empathy-3.6.2-r2.ebuild b/net-im/empathy/empathy-3.6.4.ebuild
index bf2c79239e18..46526b8afd9e 100644
--- a/net-im/empathy/empathy-3.6.2-r2.ebuild
+++ b/net-im/empathy/empathy-3.6.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.6.2-r2.ebuild,v 1.8 2013/02/07 22:32:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.6.4.ebuild,v 1.1 2013/03/31 14:57:15 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_COMPAT=( python2_{5,6,7} )
 
 inherit gnome2 python-any-r1 virtualx
 
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=net-libs/gnutls-2.8.5:=
 	>=net-libs/webkit-gtk-1.3.13:3
-	>=x11-libs/libnotify-0.7
+	>=x11-libs/libnotify-0.7:=
 
 	media-libs/gstreamer:1.0
 	>=media-libs/clutter-1.10.0:1.0
@@ -63,7 +63,7 @@ COMMON_DEPEND="
 		>=app-text/iso-codes-0.35 )
 	v4l? (
 		media-plugins/gst-plugins-v4l2:1.0
-		>=media-video/cheese-3.4
+		>=media-video/cheese-3.4:=
 		virtual/udev[gudev] )"
 # >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
 RDEPEND="${COMMON_DEPEND}
@@ -73,7 +73,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic
 	gnome? ( gnome-extra/gnome-contacts )"
 DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPENDS}
+	${PYTHON_DEPS}
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=dev-util/intltool-0.50.0
@@ -86,23 +86,22 @@ PDEPEND=">=net-im/telepathy-mission-control-5.14"
 
 src_configure() {
 	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--disable-ubuntu-online-accounts
-		--disable-coding-style-checks
-		--disable-static
-		--disable-Werror
-		--enable-gst-1.0
-		$(use_enable debug)
-		$(use_enable geocode)
-		$(use_enable geoloc location)
-		$(use_enable gnome-online-accounts goa)
-		$(use_enable map)
-		$(use_enable sendto nautilus-sendto)
-		$(use_enable spell)
-		$(use_with v4l cheese)
-		$(use_enable v4l gudev)
-		ITSTOOL=$(type -P true)"
-	gnome2_src_configure
+	gnome2_src_configure \
+		--disable-Werror \
+		--disable-coding-style-checks \
+		--disable-static \
+		--disable-ubuntu-online-accounts \
+		--enable-gst-1.0 \
+		$(use_enable debug) \
+		$(use_enable geocode) \
+		$(use_enable geoloc location) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable map) \
+		$(use_enable sendto nautilus-sendto) \
+		$(use_enable spell) \
+		$(use_enable v4l gudev) \
+		$(use_with v4l cheese) \
+		ITSTOOL=$(type -P true)
 }
 
 src_test() {
diff --git a/net-im/empathy/empathy-3.8.0.ebuild b/net-im/empathy/empathy-3.8.0.ebuild
index ae341c0df735..81fa61ef34a5 100644
--- a/net-im/empathy/empathy-3.8.0.ebuild
+++ b/net-im/empathy/empathy-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.8.0.ebuild,v 1.1 2013/03/28 22:36:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.8.0.ebuild,v 1.2 2013/03/31 14:57:15 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -18,7 +18,7 @@ SLOT="0"
 #IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
 IUSE="debug +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 
 # gdk-pixbuf and pango extensively used in libempathy-gtk
 COMMON_DEPEND="