Version bump, drop old, this is being only maintained by gnome team for a long time.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 20 insertions, 262 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index e1fc8fc2325f..e5ee3271177e 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,14 @@
 # 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.134 2013/09/09 21:21:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.135 2013/11/11 21:03:03 pacho Exp $
+
+*empathy-3.8.5 (11 Nov 2013)
+
+  11 Nov 2013; Pacho Ramos <pacho@gentoo.org> +empathy-3.8.5.ebuild,
+  -empathy-3.6.4.ebuild, -empathy-3.8.2.ebuild, -empathy-3.8.3.ebuild,
+  metadata.xml:
+  Version bump, drop old, this is being only maintained by gnome team for a long
+  time.
 
 *empathy-3.8.4 (09 Sep 2013)
 
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index a159388819e1..766f494b0b9a 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -5,21 +5,17 @@ AUX empathy-2.34.0-CVE-2011-3635.patch 2451 SHA256 7b82ba0d9e002ba78975caff45ec0
 AUX empathy-2.34.0-auth-dialog-crash-fix.patch 976 SHA256 cad7bc8885b94cfe777223bd167006f5fd5e57dcff87ba861260d08e961c22f3 SHA512 25b70069d60c6039ef224aeafbdbffa65a32f021231e8e33fe12b9bcaa3865051ead6adaa1f271d4b8121a60842bb51ace87b2c9204d95554e5b9d2529d5a489 WHIRLPOOL 38e879736b54b9455f26f6a7db90f02b6154c3ec483f01788036d63eea8ceb46e6879ed05abafbbebdf72757cebd291745d87756c55d4ce05fb646cd2839f390
 AUX empathy-2.34.0-missing-include.patch 379 SHA256 4e0db8f73a72c5adfd331f53d291f600f83a01832a22121a4b946306f8bc23b6 SHA512 cd1b47accd9535686e5bf0acd8330683efdc8c3acc840d8b9d41cf8d2c1fd81fac42d58168bd0188444d1d0f0be71d52774f66454f707b89d7a9598d9ea289e9 WHIRLPOOL 940a95d4483d69a30bf4824e067bc8715045b8f7b88012513d3813d3ba27777bdce09c0c5cdd741569f16e80fc7aabaffa9c6251fd8b332669ea1114e8386985
 DIST empathy-2.34.0.tar.bz2 3361496 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1 SHA512 df1f8bac59ceeeff5cef2730df1720084bb4c4d7008c5b36dec122ef83a6a4852dea84d7cf9b83cdc939f56d2b5f49bfe612d00f1f9332c48ee48bc5b17a8565 WHIRLPOOL 60e818e222519bc1f30efdc92aa1eb471869e11c11d364287d0ee65de01ccb8895d1dc7e739194eed681cb4a6eb2966529e31959696220e98f5238ce504cd337
-DIST empathy-3.6.4.tar.xz 3447912 SHA256 db3f2529111febc9ec4f0d7a772a19786abf93364b9b0207dc7424767138250c SHA512 2d0b821da9ac172a212657f62ae70702a0a56b8b5acdec13b78cb27ed374b12f6c8f5851fb5b26c6e968b67f65c0d34fcea14dd0d174f90e83f38531fdeb9e8f WHIRLPOOL 69ea4aa7ccc6f83c34d9bbb7e7e3c39c10607eff2d75cc98aea4a273183e9718a97eb23c24bab6e35700f93fac04344951428a07d75b97231ffd8c4fbe8adf8b
-DIST empathy-3.8.2.tar.xz 4715052 SHA256 a3e92d317a1a4e9b49988ea48a144bcd6c0257c6331aae2603a544eedf1dc45c SHA512 d5d5bc4e8e69244a5f758b62d736e6866a28ec2cec486b13f7b8ff6921dd6693987597c4854a3c244c211d2cc9762fef1ca15ad8b14eaa2fb7b4397ee58ac472 WHIRLPOOL 294c54a311ba97dcbb016ee1cbe7dc5fe095e5b82cccbfd6dd6b5471719338ddbffdb5dd510398f2c28f936014c7db3ac2ad8102a27f8b6d663f577165a0aec6
-DIST empathy-3.8.3.tar.xz 4715672 SHA256 61e547c6f0929b3111219349482e2395a32f41bbd0852046405d835acba965c0 SHA512 3084c805b17a881cc8856fc91543e7454480e3a28d6b773e26549d7fbc920ae718939bf3a9d8f48718c779afa913cb7059f37c5175995635affb6183eed6091c WHIRLPOOL adf2f9eba0f14f814d36a9c635b48fc8a8eef3f27eddec23700fceb3ba24979853201d758582480a1f1d9fc56f47a2578a65fa8589b9b7e4aad5a734c1158c2c
 DIST empathy-3.8.4.tar.xz 4900752 SHA256 cbc4934ce838e3d697616b5c36b070d2fc4fc57f84fd654c2f2cb2b8b650f5c9 SHA512 0d9e5a924ed0ddb7529597dc636de817c71cc31b08800ef06b84533ae90f60c0afdef936e783485f65c6585684f5708a8f582299d25f7c4ed516138b268a6efe WHIRLPOOL b56f485d7e0816fd36893aa4777d319fd37486775a190b01b1211b46e6046796da5a204a17b3a59edd55582aa06c2f8dfc4b72183187f0cb2b3c6b3c70c5ca03
+DIST empathy-3.8.5.tar.xz 4902056 SHA256 97c5eba85b5c5689c80e9440840eb03aa4dec78c78e7b3cb0a585bb37be71e41 SHA512 5e3e83abbd9158449eb920a003e638f7eaa84ba10c10226645a758fa4b5a777a40b2424cbb6d7e89b0f7df28ad6b10cc1953fd73e687a87c32b403b0bff5e388 WHIRLPOOL cd05f077014d47261a9edbf92b823d72aa674d19830d92e7d5b5db7391614e5b1c487f4b9d833a04b167a1296ada0b89233f5cdc79eb2b502157804c18c9a401
 EBUILD empathy-2.34.0-r2.ebuild 3292 SHA256 21a47c9d78fe823e2e28719921cf6f25c036ad71d4f9433fb752d147e03bc147 SHA512 7a1d749afea046a1f026f00d01f356f3f5dcf0b297b5793bab9a67cc1c12cb422622dd80f6296fbbfb77743d73f2798e1ccfdec83b8ff65fb57fa09b231af8bc WHIRLPOOL 378e467f28583bb4cdae02b561e113e0b51c0e1701158be973fc8af1eca48e11e8044a54bea61afe2cdb2bd76a2eb4fd4938f4a88aa93ba9f36a7307739586b3
-EBUILD empathy-3.6.4.ebuild 3263 SHA256 5e2f1b13c7002067e9eb4feb9ae3dc4e15082e8e724bac6c026e858706b08990 SHA512 22701e17aafed77b64f2ed35354dfac7090d68d8ab5b40c9fd66b95d54224ad78161cf1aa890db82537b1dffe1c8d31f7c2065670f4ebe2833724bd7c633c32f WHIRLPOOL baee7e19c00a63677ee548ecfbd0c84b04056fc7b9f3574cb14f05da748ab726937eff34633670069e65a23537425dad5386caaff2f43e540b6dd96bd3421d65
-EBUILD empathy-3.8.2.ebuild 3335 SHA256 386b39b56610c4223eb1f36b3a291a484c8da586c506606973b42d5d0b3dd04d SHA512 83fe64864a61589a5fc8f20e432347783d16198f371ac448c454804ced28eec7c4708adfe4ed3f5d50b9b80374a77601ba6fa607fb20f099ad9dd84315aafe67 WHIRLPOOL 6d68d6e07186c8e1308b1033215d87f32151f0cc53d1892dce8858d51c7a3e4eb1d5f5fc42c2d4cf41ce069123885c0420573dd3a8f304aa9459dcb25160ac58
-EBUILD empathy-3.8.3.ebuild 3349 SHA256 eb106c26ce258e00f435543546f4fdc069c4debb560bb51a8de20f6ee05f68ae SHA512 4c2714c2797546f36204b76518e0a35d32eb567d5d435961f00f6329421f53702ffa82c77ec5c48a65bf567dfba7e91e78ea675ac92a703f8f0ce867020fd86d WHIRLPOOL 1a99c30bbf85916990cab1c81811b603d127c5e36ec8571a9c02d0f56d4bcbfb02cfae64e8b4fcc65893b986a6bdb0452987954b70f65768e64c8a3681edf5e5
 EBUILD empathy-3.8.4.ebuild 3346 SHA256 8d8280fe17d0d4a929d600190ada3f7d3aa3287e842723b0a62cf13aea9af8a1 SHA512 02af1a3caafa6759515c8f987adb5d321aa1d6bf754b07de76c2cecf8277cbd8b7f88ec17f700d1dc6ffd92c655e19fcbd6a18474f93fac23b600f1b3ef9c4e6 WHIRLPOOL a14fb30d2b29d45dc5afc07bade24ef2b31f097ecda96ec5e104b3461fec4256aa6ad6787448ed24dd6a5647786b5ec72d0a230b28027e6b18b7523b44573528
-MISC ChangeLog 23472 SHA256 c618a6b82a1ce3d6c4c58e8a744fbbdbe6cc1a708bb1f4ad3971a37a2b2a72cb SHA512 e8477928a92548a79a02ef194807ce1beea56e5db9f472fe480b5d913a04a3c223c8071e66671077041654c582360bf1231644b26c049454107cb184be1f84a7 WHIRLPOOL 31f77f85ee47ba78a9d69f6422db34a8b61e1883731457b10eca5ed8bc4a0b6b21ef2614c0fe84ce26bb167383416790177240e01de3bc05f22b491ec75a091d
-MISC metadata.xml 1467 SHA256 b1fbccf18385402e0ac0ac63595f9b7b3a27fb61086e5bf503d11a858099c8ae SHA512 2a20c65b50aeee8f660277ffc57f4a223edb9989814c031e8ac7158a5133421ad393d35858e47e639b97a55c2cd6b589e0645d74e791e19967a7cba86a17521e WHIRLPOOL 50c817df40f507c5380bf4d53ef23f494c70a48032d0584210ade162fecae68d178c86e86b12412209443a0dd878c9670c934d3b2267328c9e9a8a9899781d01
+EBUILD empathy-3.8.5.ebuild 3349 SHA256 5fbd4ed194c38b37321e6daa6f32871357c9bc2efd46d7ecb25698315f14042b SHA512 a8e9be552829a3f6888ed4c01098e92f3bcc50af79812af1aa886f51cd823323e49110463dcb5fbd0c1a18e9baabddb4980b7a9a827e9e786467810e3cd8d03b WHIRLPOOL 932420ac59a7e3fbdb8a57f18c0b3c18cf0a94e2212a623151a33bfcea8d00a0e8bd2255b0fb316102f04fbab83b9e48031f9638c9f127c731675252aa71f77f
+MISC ChangeLog 23750 SHA256 d327e3b0aefa93ab7db3b66b47812580a6075b5bdb4ce2bf0e6078f2d9c90b93 SHA512 ef4522be7fb456444de0247462cf2d36340c1c8a6a7a939ef4cb0251c27fd268534461689c3cb860eab1d1c8ba54b3062ee4a8e48f0c42080aba0918d0999213 WHIRLPOOL 40bddce9de04f2b232b32c72e42e007150ddb84832eac900f8404ad8e14aa5a5d863e1659baf9eef4a6f00d33525f05f0b7881ec64838d75652c466c9c539848
+MISC metadata.xml 1146 SHA256 32b6d426d2c7531319e725c936ce0729fd024c5a27266eea874f6941bf08a23e SHA512 c8f04dca441ad2235698cc8f90f2a89e26f304ebb0b68fdb53074cf139283e8fd21d47121fabb5ae81714d02ff7fd934df38801195fd064075bfa0b86c02edf1 WHIRLPOOL 35d07ffe68c22d6c869f29c36f0b9e7bf325af5573e854b8cc2e52ed7a0f44de93879a826bc97108a60289a809958cdc58ab0efc2e0a29e43b9991e93afab1c1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIuV94ACgkQ1fmVwcYIWAbm7wCgxW8zitWSJO3j0xYCCEsyJBK9
-QFUAn2J68wKy+At30RavKmGPbmcQKJ5i
-=IEfQ
+iEYEAREIAAYFAlKBRggACgkQCaWpQKGI+9TZdACeJBhrSnl3r8Z/bVvwdatF2qOU
+yNUAmgI+75z+H5GUa9TY+eCxuz0Vu0fN
+=o1DV
 -----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-3.6.4.ebuild b/net-im/empathy/empathy-3.6.4.ebuild
deleted file mode 100644
index dcf7d19b6d14..000000000000
--- a/net-im/empathy/empathy-3.6.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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.4.ebuild,v 1.3 2013/09/05 18:59:51 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
-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 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-
-# gdk-pixbuf and pango extensively used in libempathy-gtk
-COMMON_DEPEND="
-	>=dev-libs/glib-2.33.3:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.5.1:3
-	x11-libs/pango
-	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/folks-0.7.3:=[telepathy]
-	dev-libs/libgee:0=
-	>=app-crypt/libsecret-0.5
-	>=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/gstreamer:1.0
-	>=media-libs/clutter-1.10.0:1.0
-	>=media-libs/clutter-gtk-1.1.2:1.0
-	media-libs/clutter-gst:2.0
-	media-libs/cogl:1.0=
-
-	net-libs/farstream:0.2
-	>=net-libs/telepathy-farstream-0.5:=
-	>=net-libs/telepathy-glib-0.19.9
-	>=net-im/telepathy-logger-0.2.13:=
-
-	app-crypt/gcr
-	dev-libs/libxml2:2
-	gnome-base/gsettings-desktop-schemas
-	media-sound/pulseaudio[glib]
-	net-libs/libsoup:2.4
-	x11-libs/libX11
-
-	geocode? ( ~sci-geosciences/geocode-glib-0.99.0 )
-	geoloc? ( >=app-misc/geoclue-0.12 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
-	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] )
-	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:1.0
-		>=media-video/cheese-3.4:=
-		virtual/udev[gudev] )"
-# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-base:1.0
-	net-im/telepathy-connection-managers
-	!<net-voip/telepathy-rakia-0.7
-	x11-themes/gnome-icon-theme-symbolic
-	gnome? ( gnome-extra/gnome-contacts )"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.0
-	virtual/pkgconfig
-	test? (
-		sys-apps/grep
-		>=dev-libs/check-0.9.4 )
-"
-PDEPEND=">=net-im/telepathy-mission-control-5.14"
-
-src_configure() {
-	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-	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() {
-	Xemake 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.8.2.ebuild b/net-im/empathy/empathy-3.8.2.ebuild
deleted file mode 100644
index 413974f44a71..000000000000
--- a/net-im/empathy/empathy-3.8.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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.2.ebuild,v 1.2 2013/09/05 18:59:51 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
-SLOT="0"
-
-# geocode needs an unreleased version
-# sendto: support from building nautilus sendto plugins from it was dropped in 3.7
-#IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
-IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gdk-pixbuf and pango extensively used in libempathy-gtk
-COMMON_DEPEND="
-	>=dev-libs/glib-2.33.3:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.5.1:3
-	x11-libs/pango
-	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/folks-0.9.0:=[telepathy]
-	dev-libs/libgee:0.8=
-	>=app-crypt/libsecret-0.5
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/gnutls-2.8.5:=
-	>=net-libs/webkit-gtk-1.9.1:3
-	>=x11-libs/libnotify-0.7:=
-
-	media-libs/gstreamer:1.0
-	>=media-libs/clutter-1.10.0:1.0
-	>=media-libs/clutter-gtk-1.1.2:1.0
-	media-libs/clutter-gst:2.0
-	media-libs/cogl:1.0=
-
-	net-libs/farstream:0.2
-	>=net-libs/telepathy-farstream-0.6.0:=
-	>=net-libs/telepathy-glib-0.19.9
-	>=net-im/telepathy-logger-0.8.0:=
-
-	app-crypt/gcr
-	dev-libs/libxml2:2
-	gnome-base/gsettings-desktop-schemas
-	media-sound/pulseaudio[glib]
-	net-libs/libsoup:2.4
-	x11-libs/libX11
-
-	geoloc? ( >=app-misc/geoclue-0.12 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
-	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] )
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35 )
-	v4l? (
-		media-plugins/gst-plugins-v4l2:1.0
-		>=media-video/cheese-3.4:=
-		virtual/udev[gudev] )
-"
-#geocode? ( >=sci-geosciences/geocode-glib-0.99.1 )
-
-# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-base:1.0
-	net-im/telepathy-connection-managers
-	!<net-voip/telepathy-rakia-0.7
-	x11-themes/gnome-icon-theme-symbolic
-	gnome? ( gnome-extra/gnome-contacts )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.0
-	virtual/pkgconfig
-	test? (
-		sys-apps/grep
-		>=dev-libs/check-0.9.4 )
-"
-PDEPEND=">=net-im/telepathy-mission-control-5.14"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-	gnome2_src_configure \
-		--disable-Werror \
-		--disable-coding-style-checks \
-		--disable-static \
-		--disable-ubuntu-online-accounts \
-		--enable-gst-1.0 \
-		$(use_enable debug) \
-		$(use_enable geoloc location) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable map) \
-		$(use_enable spell) \
-		$(use_enable v4l gudev) \
-		$(use_with v4l cheese) \
-		ITSTOOL=$(type -P true) \
-		--disable-geocode \
-		--disable-nautilus-sendto
-		#$(use_enable geocode)
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/net-im/empathy/empathy-3.8.3.ebuild b/net-im/empathy/empathy-3.8.5.ebuild
index 4b866ecfc9c4..158b5cecf40a 100644
--- a/net-im/empathy/empathy-3.8.3.ebuild
+++ b/net-im/empathy/empathy-3.8.5.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.3.ebuild,v 1.3 2013/09/05 18:59:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.8.5.ebuild,v 1.1 2013/11/11 21:03:03 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
 inherit gnome2 python-any-r1 virtualx
 
 DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
-HOMEPAGE="http://live.gnome.org/Empathy"
+HOMEPAGE="https://wiki.gnome.org/Empathy"
 
 LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
 SLOT="0"
diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
index d4a70cfe7e3a..7990e0ee037d 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
-	<herd>gnome</herd>
+<herd>gnome</herd>
 	<use>
-		<flag name="geocode">Enable translation between addresses and geographic
-			coordinates using <pkg>sci-geosciences/geocode-glib</pkg> and Yahoo!
-			Place Finder</flag>
 		<flag name="geoloc">Enable geolocation support through
 			<pkg>app-misc/geoclue</pkg></flag>
 		<flag name="gnome-online-accounts">Enable using
@@ -15,8 +11,6 @@
 		<flag name="map">Enable world map support through
 			<pkg>media-libs/libchamplain</pkg></flag>
 		<flag name="nautilus">Enable nautilus-sendto support</flag>
-		<flag name="sendto">Enable support for sending files to various devices
-			using <pkg>gnome-extra/nautilus-sendto</pkg></flag>
 		<flag name="webkit">Build support for Adium-style HTML-based conversation
 			window themes using <pkg>net-libs/webkit-gtk</pkg></flag>
 	</use>