Pin gstreamer dependencies to slot 0.10. Drop old revisions.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

7 files changed, 20 insertions, 264 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index d4a84054ffc9..972a7686cfca 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.110 2012/09/10 16:31:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.111 2012/10/25 20:56:29 eva Exp $
+
+  25 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org> -empathy-2.32.2.ebuild,
+  empathy-2.34.0-r2.ebuild, empathy-3.2.2-r1.ebuild, -empathy-3.4.2.1.ebuild,
+  empathy-3.4.2.3.ebuild:
+  Pin gstreamer dependencies to slot 0.10. Drop old revisions.
 
   10 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   empathy-3.4.2.1.ebuild, empathy-3.4.2.3.ebuild:
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index bac9e4f7468e..f8b5ab70388c 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -8,26 +8,18 @@ AUX empathy-2.34.0-missing-include.patch 379 SHA256 4e0db8f73a72c5adfd331f53d291
 AUX empathy-3.2.2-cancellable-not-NULL.patch 1292 SHA256 b25914257a9403b24b5219e73882dd6b865c0a6f1e4300d9b27962ce0109aa63 SHA512 686c27a35203c82bd1325e168d8c098f01cb611997cd664a7346dc705791445a5c0e9cf0fb6a24808f0e1ca18b3ba9b971496439f955f0a2b4054340c1f257cf WHIRLPOOL 573b448d1d9073f6c6c62a4c3f351023c1265d238898beea0403e340c2235ab9988c0952367816d1bf15697e27d71041deb3a6517525d9d1049ecc64aa4e69a7
 AUX empathy-3.2.2-delivery-failed.patch 1119 SHA256 25a155d821f6264b76c43ed2e0597b9149520de4d2a4a0a1da38fb1edb1a9571 SHA512 0c56cb4429b6e5f6e0158e3a2932379528c612e89565d524e518e66a555e32399c68a65098ad1c562753e4e341c06ee0278a5e6e8db2e74fa8a2dc49062c0b22 WHIRLPOOL fad48aa6bc7d53b33141f8cb51d692ff9011efde9dc4b28b415638260e7969fd1609fb8c8c8cf8200fb303985f67f5b6aca032192a69eb4934d095900e32e6f8
 AUX empathy-3.2.2-telepathy-logger-0.4.patch 2980 SHA256 5b55c7c4b7c8bea11a0e842a44d52836f6b7d1dbfb2d0a567109ff0662c95448 SHA512 4713f31003d99360144b44068e6b059b1c19ae5f887da2e13cf2e8354d046a80a2fd97163ae89c3069264f39cbec6ab683b611d80d7382e387fd9ef9223fe8b8 WHIRLPOOL 366ab44903aa45204e3e449e2b6fc0e1feed299b5b2e0c4d361598d1fcb7cb870699839170a17aba7c13922e43d5f27fa4b922ba850851f1f6a3704c0085e7ec
-DIST empathy-2.32.2.tar.bz2 2936340 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861 SHA512 38c0c4c0236967356f9b732bd5ca7e3d911866a31c486c17d3b0307feecd13e795a72536c78ebb3ad5e906287d970399cc9edd915f2d9b6f49ce9556ffede1ac WHIRLPOOL 8c26ed2992ebae65ddc20309d8bf74b529ae91e4866a600c2fd3566be9ab4edcf5612e16a287b016fdff2a6c8077e460bdfc0d24c720ef8c21666d94f1dcad52
 DIST empathy-2.34.0.tar.bz2 3361496 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1 SHA512 df1f8bac59ceeeff5cef2730df1720084bb4c4d7008c5b36dec122ef83a6a4852dea84d7cf9b83cdc939f56d2b5f49bfe612d00f1f9332c48ee48bc5b17a8565 WHIRLPOOL 60e818e222519bc1f30efdc92aa1eb471869e11c11d364287d0ee65de01ccb8895d1dc7e739194eed681cb4a6eb2966529e31959696220e98f5238ce504cd337
 DIST empathy-3.2.2.tar.xz 3184408 SHA256 d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1 SHA512 40df2b5ad6d20fcc9a3fba5e0ed543e29e28af37f4574c5d0c5229914fee581281efda696461c517d90dd6bbdff7158e9c25a5fa251308b62042884708dac400 WHIRLPOOL 8b1b42a0189231d797d0171d9a4316976f17c59911f92e0fceca3cfd0bae2e63596485a6b59516d3c57a8c9fad041a4203bd116233fca6504e1e58972edd8b04
-DIST empathy-3.4.2.1.tar.xz 3433484 SHA256 e73a30259492860d5c93213b33f8850b8a45053222062fd6e2784ba447d9cce0 SHA512 052120940f0d548c53c8f0b92899e817861c093078fddf5edccd481991faac8bc51c17ec30321bd8036add32bf37160135e8cb30217a614e96f8c8c5278340b9 WHIRLPOOL 36e47bd073d002f3ed457d6c5e9d558afb3faa8e08213563a923851effe4a80d1cdec55c27d36751e9e50ae191fe97b423b4ccb29b495dce0f8303b5be4a569b
 DIST empathy-3.4.2.3.tar.xz 3325712 SHA256 ca511c2a6bb2f39fb29127782b4b0ba813839f7ffc06ae8680445ecb5d58c203 SHA512 7850b6d81c6570d5c4279fb121db47b453d4fb5bbde7882f8887cd60d1b5d17317ffb974b0e4703ad105cf0326fc41b34892c9883d6a560cfb03e7f4f68d8ac9 WHIRLPOOL 01125b18c25b89e00aa1084411342a805999efe28ddc7305a1106ad8c703cbcc46188b0e030af9340bc72864cf98051948164fc78426b614b4c38676da42da6d
-EBUILD empathy-2.32.2.ebuild 3085 SHA256 7bb228fb0baa3c124e9ea04939533f8f7c9efb3e17e3ca33bc93410a5875a3a5 SHA512 53c6049c863e08b450e839ad6766f3191fbd8205ab19f1876f41e5568677b2a4078d17edc11a6ab6a3df21e680f07f609ac7bc2a69b9cc825f2d8932d01c9fa5 WHIRLPOOL f317e6751d052e76403b293440039b5bde0fb409090d98ba9310bdf302035d5d3454eaa860d89f1f4cac932b465ed5691cca85c092c4ecd17dce414f7552b045
-EBUILD empathy-2.34.0-r2.ebuild 3286 SHA256 03b88ab0bebb3fe5ea20e177b1a682d458d8dea6ceaddc3abaeae8265c297ba9 SHA512 4e36450dfaf266a3d435e32b4ce6c9a14faccb63cab16d8adf6b26080150da507cbcf72935ecea76ad4c398ff97d0937df3ae7178099a738821fcb98c274fe52 WHIRLPOOL 5a7e966336b0f5d909f907c263b3fa58c507232678f872e84707c1abee9019d2c687c2422abcbf0c64a5e22394be28d6d74a7b475a883687eac7368d7e353129
-EBUILD empathy-3.2.2-r1.ebuild 3830 SHA256 879b872f73a7824f3f963e78e6218ffdadbfeaccbc5ae6bf24e3f4a6848d9657 SHA512 ea801cc042d88f8f34bcdc0d321329de8ab2015baecd8e1fcafa013fde6d5335ecafab963fb510631e0a0d21a3d92a289bec120f92eb9a25e116596803d044d3 WHIRLPOOL bd091fe63e59a7a5d225a9288617d1f901f51e664c27975156117de5a7aca3196a749655edaebd2f5911a3d028ea7b8c8ee9d2a5abe871ff97735ce91f11d2cf
-EBUILD empathy-3.4.2.1.ebuild 3801 SHA256 c03f716c0ef9c7063a23a6377b9cb7cf5971acdfe1fedbfd81dbde8a4b0f1c8e SHA512 0da709d1b1b7dbd0c99dcddff45afd9db0d7e33fb1c4f034260e63079dc85440e486182e4659e79f43328309376c4ea545ffe6e0b6add6e46afd068811ea4f4b WHIRLPOOL 9818fe4e88e21cd87d5348868fba895c2d75da913eed0b17aad8a0e4c18731643752a55c59028d52b94647ebcaf8e57fded13b724ef06f3998e23431e0e4bfaf
-EBUILD empathy-3.4.2.3.ebuild 3801 SHA256 95a4ad22666637e561024d9641d9ab94fda6d7b045b4a9081cf9b288d458e51a SHA512 1c40f6d64573c50a57482378a012cef04d0fd3612c7bc19aaeabc46a825c612f4bc5ffac61d7b5dac850cf6943317f0a54a9d3af585533e690f2da4dd99cb070 WHIRLPOOL a8ba941180d4f14685a5a7a9f9e21d1b205d786476a471e0495ec15f98fc8e593677cb277e7fb2607b96c1cb55a28f95f0c9f18b439c8aca6ac5e3d518bc64ce
-MISC ChangeLog 19592 SHA256 604df99ea90c764aae23b602447c4963ae5d079a6a8a57d1a5d2445b1cf67189 SHA512 85db239f6d8e2e1abfa3e7b7339f9ac82615f2d19aee49d11f60c470a9ce2e7f072b87b6eb66fcfbfac3690719042eaf4fc54f857e7be79154db479bdf2be438 WHIRLPOOL e70a012df195f8f95ede28c21f9423723bd39b752d3241a3b2159a99ca96465135a04ab2f064f122e47238224b11b065f48b9922241b792b86c20ead53cd4bf8
+EBUILD empathy-2.34.0-r2.ebuild 3293 SHA256 48587fd4838156a25c76f52e2755204e2a4f9230be0dda4e7ccc0a88234ecf50 SHA512 9a3595820e25a1ddfcddebe75af69c4abb1b15dca0f1fc7f6d5158a2bc0563f802d3af28131dd92386e4473146a2976f895b1ce86346c792983506514b351e09 WHIRLPOOL 5ee1c1e78984fe5417ebb8a40b18dd561e3da0b9f493e4335ae3a0dce11314fc05101289a79715eb5149870495a41b6501c830c9a479223299f0e980f23ed92c
+EBUILD empathy-3.2.2-r1.ebuild 3829 SHA256 d72aaaaccdef12bc0a47d342c85b24a7f110cb330c07f4fed1b8359d4500def0 SHA512 38936d03d98694b8f0b011ab90bdf0c42ca7f9f8ab2a138a055bbc75b8bda3de0c6b05f385b258c6c19b2082d4617096541b15b28117a7cd090268fa36365e80 WHIRLPOOL 54e8fcf88f98c9aa180bfcc2477ed2e555d06bf4b94561fc5a164ec21fb46a1b91d02ac1572343e73c5549b712c0609107beeae0faa4bf1ee456942a40e8c046
+EBUILD empathy-3.4.2.3.ebuild 3800 SHA256 17dc1e213841bc5e7ccae28cdc15c2de45c73c74cf0eb650b5c746f8719d843c SHA512 fa36e5cd05ba04a6804f7cb510c6b5b6e4ed24a35364cdaae9efa2b74f38ece8f60d10ef0ae651749b5c53b5947cbc6417577d708da66133ba02200a22e1b2c2 WHIRLPOOL 7e66bb5a47896dfd4dd6474630297068845d95540b746dda51fa3c5cb61cd042681eec9a3a11cd97b4fc507ac8dc3456642b7f31326b8995131ffed1ac6753d1
+MISC ChangeLog 19832 SHA256 976168b80c7d4f7e96840690085ee39e419a95203c6910cc432530db7eb0c74f SHA512 ccbbe3957bb4ac4dacc5ae36a0047b428e232deac545d38a333bef74c25f1f0405bb6f0fd0a31191a66ce53c031da9fff9f47e7f78d0af3808b7fecd009b28f1 WHIRLPOOL f05d3086cf715ed5ef8fedde1d34b87c7ef134f242f0ad8d59107e041097c4eaa46a7a08ef5d7258a32d61872342b5ae442b977906807359830062ae440ccb4e
 MISC metadata.xml 1665 SHA256 d004a67be9d82c28f16d52bb1fc2f50ec5c8bbd92b010b89ac0d652723c45140 SHA512 bb52d7245d6111add9c110a8aa3506d5ad8b7bf7d77385cd9d493133941176ed13081e056d65bb212796a9b0e955b7fe83025eaa165d1a0cae59b65fc3c9af6d WHIRLPOOL 800ffadf5d4f5fcd81f799b09ae9cc1299ebeb7f5bc75cddc17496c3c44c18a3c95752963d855653263228a89b3a704dd06635c3cba82efbb8808ceef80beab4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEbBAEBCAAGBQJQThX8AAoJEJ0WA1zPCt1hVsgH9RL0BIN6Kwz9SKL6re6l/VtL
-lR6yVuIcCmCysRKYofvy1LLA+EV/8aboWPRUZwawzj5zl1l46UvJd/R0eY0JH+r+
-qqxTRozhTeZNrGD9B6pNyh7SdpPltKO35ZBtsViK944zj+k4Oq5Crx4Sf1cRYxEB
-dzwqUmj8WxxyPxK1ggkvL/95H9cv38z1wSDz0RnfQKSPxHY0iwSz4G4li/HnKRjn
-IR23T+QG09/C7TKBM1IZbuUewvz/0MBN1kb+RuQJgboZ75cUdGBOUPTW6NKy6Uz+
-YiZT43Sm6V3z5vzKvtUUXqn10zTNQq0nijFrVS+COxCnXEA38E6OCOXbQtnA2g==
-=A02T
+iEYEAREIAAYFAlCJp38ACgkQ1fmVwcYIWAaUCgCg3TzWDndbzXzpXWTCbGlJItg9
+8W8AniDis107liIaGUf5Q3r+0U7Ub1R7
+=3QS3
 -----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-2.32.2.ebuild b/net-im/empathy/empathy-2.32.2.ebuild
deleted file mode 100644
index ef090038a976..000000000000
--- a/net-im/empathy/empathy-2.32.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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-2.32.2.ebuild,v 1.18 2012/05/04 06:22:12 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils gnome2 multilib python
-
-DESCRIPTION="Telepathy client and library using GTK+"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="eds nautilus networkmanager spell test webkit" # map
-
-# FIXME: libnotify & libcanberra hard deps
-# 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.25.9:2
-	>=x11-libs/gtk+-2.22:2
-	>=dev-libs/dbus-glib-0.51
-	>=net-libs/telepathy-glib-0.11.15
-	>=media-libs/libcanberra-0.4[gtk]
-	>=x11-libs/libnotify-0.4.4
-	>=gnome-base/gnome-keyring-2.26
-	>=net-libs/gnutls-2.8.5
-	>=dev-libs/folks-0.1.15
-	<dev-libs/folks-0.3
-
-	>=dev-libs/libunique-1.1.6:1
-	net-libs/farsight2
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	media-libs/gst-plugins-bad
-	media-plugins/gst-plugins-gconf:0.10
-	>=net-libs/telepathy-farsight-0.0.14
-	dev-libs/libxml2:2
-	x11-libs/libX11
-	net-im/telepathy-connection-managers
-	>=net-im/telepathy-logger-0.1.5
-	<net-im/telepathy-logger-0.2.0
-
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35 )
-	webkit? ( >=net-libs/webkit-gtk-1.1.15:2 )"
-#	map? (
-#		>=media-libs/libchamplain-0.7.1[gtk]
-#		>=media-libs/clutter-gtk-0.10:0.10 )
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.17.3
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	test? (
-		sys-apps/grep
-		>=dev-libs/check-0.9.4 )
-	dev-libs/libxslt
-"
-PDEPEND=">=net-im/telepathy-mission-control-5"
-
-pkg_setup() {
-	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-
-	# Hard disable favourite_contacts and tpl, TpLogger is buggy.
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-location
-		--disable-map
-		--disable-control-center-embedding
-		--disable-Werror
-		$(use_enable debug)
-		$(use_with eds)
-		$(use_enable nautilus nautilus-sendto)
-		$(use_with networkmanager connectivity nm)
-		$(use_enable spell)
-		$(use_enable test coding-style-checks)
-		$(use_enable webkit)"
-
-	# Build time python tools needs python2
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-	# Remove unnecessary restriction. Should get punted from configure.ac.
-	sed -i -e '/libnotify/s:0.7:9999:' configure || die
-	gnome2_src_prepare
-	python_convert_shebangs -r 2 .
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "emake check failed."
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "Empathy needs telepathy's connection managers to use any IM protocol."
-	elog "See the USE flags on net-im/telepathy-connection-managers"
-	elog "to install them."
-}
diff --git a/net-im/empathy/empathy-2.34.0-r2.ebuild b/net-im/empathy/empathy-2.34.0-r2.ebuild
index 8b9b372ee477..ac05f57bffc6 100644
--- a/net-im/empathy/empathy-2.34.0-r2.ebuild
+++ b/net-im/empathy/empathy-2.34.0-r2.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-2.34.0-r2.ebuild,v 1.8 2012/05/04 06:22:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.34.0-r2.ebuild,v 1.9 2012/10/25 20:56:29 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -36,8 +36,8 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
 	net-libs/farsight2
 	>=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
+	media-libs/gst-plugins-bad:0.10
+	media-plugins/gst-plugins-gconf:0.10
 	>=net-libs/telepathy-farsight-0.0.14
 	dev-libs/libxml2
 	x11-libs/libX11
diff --git a/net-im/empathy/empathy-3.2.2-r1.ebuild b/net-im/empathy/empathy-3.2.2-r1.ebuild
index 0a60d1f3ea37..7fbf34d8b4dc 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.3 2012/07/18 00:58:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.2-r1.ebuild,v 1.4 2012/10/25 20:56:29 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -40,7 +40,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
 	gnome-base/gsettings-desktop-schemas
 	media-libs/gstreamer:0.10
 	media-libs/gst-plugins-base:0.10
-	media-libs/gst-plugins-bad
+	media-libs/gst-plugins-bad:0.10
 	>=net-im/telepathy-logger-0.2.13
 	net-libs/farsight2
 	>=net-libs/telepathy-farsight-0.0.14
diff --git a/net-im/empathy/empathy-3.4.2.1.ebuild b/net-im/empathy/empathy-3.4.2.1.ebuild
deleted file mode 100644
index 2505b1161c6f..000000000000
--- a/net-im/empathy/empathy-3.4.2.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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.3 2012/09/10 16:31:50 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit gnome2 python
-
-DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug eds +geocode +geoloc gnome gnome-online-accounts legacy-call +map +networkmanager sendto spell test +v4l"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-
-# libgee extensively used in libempathy
-# gdk-pixbuf and pango extensively used in libempathy-gtk
-# clutter-1.10 dep is missing in configure, newer API is used
-# folks-0.6.8 is needed to load the contacts list, configure is wrong again
-COMMON_DEPEND=">=dev-libs/glib-2.30:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.3.6:3
-	x11-libs/pango
-	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/folks-0.6.8
-	dev-libs/libgee:0
-	>=gnome-base/gnome-keyring-2.91.4-r300
-	>=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
-
-	>=media-libs/clutter-1.10.0:1.0
-	>=media-libs/clutter-gtk-1.1.2:1.0
-	>=media-libs/clutter-gst-1.5.2:1.0
-
-	>=net-libs/telepathy-glib-0.18
-	>=net-im/telepathy-logger-0.2.13
-	net-libs/farstream
-	>=net-libs/telepathy-farstream-0.2.1
-
-	dev-libs/libxml2:2
-	gnome-base/gsettings-desktop-schemas
-	media-libs/gstreamer:0.10
-	media-sound/pulseaudio[glib]
-	net-libs/libsoup:2.4
-	x11-libs/libX11
-
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	geocode? ( sci-geosciences/geocode-glib )
-	geoloc? ( >=app-misc/geoclue-0.12 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.3.0 )
-	map? (
-		>=media-libs/clutter-1.7.14:1.0
-		>=media-libs/clutter-gtk-0.90.3:1.0
-		>=media-libs/libchamplain-0.12.1:0.12[gtk] )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35 )
-	v4l? (
-		media-plugins/gst-plugins-v4l2:0.10
-		>=media-video/cheese-3.4
-		sys-fs/udev[gudev] )
-"
-# 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 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxml2:2
-	dev-util/itstool
-
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	test? (
-		sys-apps/grep
-		>=dev-libs/check-0.9.4 )
-	dev-libs/libxslt
-"
-PDEPEND=">=net-im/telepathy-mission-control-5.12"
-
-pkg_setup() {
-	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--disable-coding-style-checks
-		--disable-schemas-compile
-		--disable-static
-		--disable-meego
-		--disable-Werror
-		$(use_enable legacy-call empathy-av)
-		$(use_enable debug)
-		$(use_with eds)
-		$(use_enable geocode)
-		$(use_enable geoloc location)
-		$(use_enable gnome-online-accounts goa)
-		$(use_enable map)
-		$(use_with networkmanager connectivity nm)
-		$(use_enable sendto nautilus-sendto)
-		$(use_enable spell)
-		$(use_with v4l cheese)
-		$(use_enable v4l gudev)"
-
-	# Build time python tools need python2
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "Empathy needs telepathy's connection managers to use any IM protocol."
-	elog "See the USE flags on net-im/telepathy-connection-managers"
-	elog "to install them."
-}
diff --git a/net-im/empathy/empathy-3.4.2.3.ebuild b/net-im/empathy/empathy-3.4.2.3.ebuild
index 01c7db4ae4eb..f17a572b9101 100644
--- a/net-im/empathy/empathy-3.4.2.3.ebuild
+++ b/net-im/empathy/empathy-3.4.2.3.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.3.ebuild,v 1.2 2012/09/10 16:31:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.4.2.3.ebuild,v 1.3 2012/10/25 20:56:29 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -73,7 +73,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 # 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
+	media-libs/gst-plugins-bad:0.10
 	net-im/telepathy-connection-managers
 	!<net-voip/telepathy-rakia-0.7
 	x11-themes/gnome-icon-theme-symbolic