Version bump. Bug fixes and backports from 3.0 branch.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64, RepoMan options: --force)

2 files changed, 16 insertions, 10 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index c30f68adf89c..757db4a128af 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.81 2011/03/22 19:40:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.82 2011/03/25 23:03:30 eva Exp $
+
+*empathy-2.34.0 (25 Mar 2011)
+
+  25 Mar 2011; Gilles Dartiguelongue <eva@gentoo.org> -empathy-2.33.2.ebuild,
+  +empathy-2.34.0.ebuild:
+  Version bump. Bug fixes and backports from 3.0 branch.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> empathy-2.32.2.ebuild:
   Marking empathy-2.32.2 ppc stable for bug 353436
diff --git a/net-im/empathy/empathy-2.33.2.ebuild b/net-im/empathy/empathy-2.34.0.ebuild
index ef6b4e19c521..f6e8a9484a91 100644
--- a/net-im/empathy/empathy-2.33.2.ebuild
+++ b/net-im/empathy/empathy-2.34.0.ebuild
@@ -1,6 +1,6 @@
 # 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-2.33.2.ebuild,v 1.2 2011/03/21 23:13:18 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.34.0.ebuild,v 1.1 2011/03/25 23:03:30 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Empathy"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 # FIXME: Add location support once geoclue stops being idiotic with automagic deps
 IUSE="eds map nautilus networkmanager spell test webkit"
 
@@ -23,17 +23,17 @@ IUSE="eds map nautilus networkmanager spell test webkit"
 RDEPEND=">=dev-libs/glib-2.27.2:2
 	>=x11-libs/gtk+-2.22:2
 	>=dev-libs/dbus-glib-0.51
-	>=net-libs/telepathy-glib-0.13.12
+	>=net-libs/telepathy-glib-0.14.1
 	>=media-libs/libcanberra-0.4[gtk]
 	>=x11-libs/libnotify-0.7
 	>=gnome-base/gnome-keyring-2.26
 	>=net-libs/gnutls-2.8.5
-	>=dev-libs/folks-0.3.5
+	>=dev-libs/folks-0.4
 
 	>=dev-libs/libunique-1.1.6:1
 	net-libs/farsight2
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
+	>=media-libs/gstreamer-0.10.32:0.10
+	>=media-libs/gst-plugins-base-0.10.32:0.10
 	media-libs/gst-plugins-bad
 	media-plugins/gst-plugins-gconf
 	>=net-libs/telepathy-farsight-0.0.14
@@ -51,7 +51,7 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
 	spell? (
 		>=app-text/enchant-1.2
 		>=app-text/iso-codes-0.35 )
-	webkit? ( >=net-libs/webkit-gtk-1.1.15:2 )
+	webkit? ( >=net-libs/webkit-gtk-1.1.15 )
 "
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
@@ -63,7 +63,7 @@ DEPEND="${RDEPEND}
 		>=dev-libs/check-0.9.4 )
 	dev-libs/libxslt
 "
-PDEPEND=">=net-im/telepathy-mission-control-5"
+PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
 
 pkg_setup() {
 	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
@@ -101,7 +101,7 @@ src_test() {
 }
 
 src_install() {
-	gnome2_pkg_postinst
+	gnome2_src_install
 	# nautilus-sendto plugin doesn't need this
 	find "${ED}" -name "*.la" -delete
 }