Version bump. Bug fixes and backports from 3.0 branch.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 29 insertions, 13 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/Manifest b/net-im/empathy/Manifest
index 92c35dedb522..827e6139d599 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX empathy-2.32.2-libnotify-0.7.patch 1644 RMD160 87941e9933ec4fb83f45a0e052af77273a6aa250 SHA1 8696716fd49d0a0bce7eeb7044db66b7591e0d82 SHA256 8f7280c95fb67a2f91dc38984523f8ae4be95643e7404ea672d88d6541987ca8
 DIST empathy-2.30.2.tar.bz2 2644286 RMD160 891f1b60b0b5087ef3e6f106676af1728aa4be18 SHA1 de8776cdbceb3895392dee467437e76f893c9194 SHA256 e96846bafcedf39f9869d656031ba1c02c3568038e968db308ff07552e5024d7
 DIST empathy-2.32.2.tar.bz2 2936340 RMD160 36d42e08343e49c1963405caeb35e76400bab209 SHA1 b956af129aaecc54491c7bc01892bb29c33c1d32 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
-DIST empathy-2.33.2.tar.bz2 3337406 RMD160 4f6b18d2999dc94602c1e4d38e2f918d948694ea SHA1 ae9f383c835cbc3995ab0944dddd64b21aaee1cc SHA256 55e359c6494a235079f8d0ecddb1e587c7d87989b8a7c7c4f75f4f38caf8c6d8
+DIST empathy-2.34.0.tar.bz2 3361496 RMD160 a76e9633d88dbd48c5d494d3393566a88a5b35c4 SHA1 cc82c871fb1d3dbc428b851c59ad44184f064d10 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1
 EBUILD empathy-2.30.2.ebuild 2649 RMD160 b0ad8f51259b79ec81f6623db1ed8714a31fff9e SHA1 d6bd8f45c2fdb48de687956933c89e5bb7686d5d SHA256 93e5d38390a0036da100b03c8c1c5bc300f00dbb7eb4e9f77740318401e49fa6
 EBUILD empathy-2.32.2.ebuild 3129 RMD160 432ea4a9ea354ff8c031a6e91b77f460f853f568 SHA1 02c8374d7368e1485f992df349441b316b12fcc9 SHA256 8c784893206ce642837dec44e29cfbbaa7ca6a57b55a65d847d02b5883fdbdad
-EBUILD empathy-2.33.2.ebuild 3072 RMD160 5598ee4d07cce9d27061ec0a0d3e529f256a5c89 SHA1 7a092fa2ad50465a7449391136612819fd990e9b SHA256 1528169d48a26f80f5be6cafacb689a7f4f0f7d0dca9eaa521a28973bf747a77
-MISC ChangeLog 14224 RMD160 b5e807d980cae29dfe11b435f66f7f9273b5ce56 SHA1 eb6dc01622b776aeeb6a92feb8cc6c7d5a67873a SHA256 699aed3241e6f15a3414861531c2689dadf0434be6178370add99eb0f57654b4
+EBUILD empathy-2.34.0.ebuild 3060 RMD160 af070d1ac59b11592f0061a1f0ce4c1614d343fa SHA1 ad7991508bc62cbd4c966208f7fadee9cf496420 SHA256 3d79ed90d18f08afb06f989f3da2b3d9a35b599d8e6c83ce7fa3528c96554167
+MISC ChangeLog 14414 RMD160 e7c00fe2eec5b58c463af43a95a9dbc9858aa80b SHA1 f334c11e3f4677325aeab8ab8966be6e32b20fb6 SHA256 38c64a8cb9c360334ba4389cf4b1e934af6cab212df43a3f7c3ff966a52a2fa3
 MISC metadata.xml 940 RMD160 4e41d99236e8d53fc36a72411432766f084ef526 SHA1 7b36c712b8f94fd2c2cca3133249bdbeea2d35b2 SHA256 88ab29a94d21a18761bba19eb92f07aac4f4577951b0153b71a78ea3db24a23f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2NH0gACgkQ1fmVwcYIWAb1ZACeI5Rv0PRO9aaTnSTLIjqWOrqY
+dMEAn1P+w5aShWF/ZxifOD682jwz0j23
+=JucD
+-----END PGP SIGNATURE-----
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
 }