Version bump for Gnome 3.6. Switch to EAPI=5 and python-any-r1.eclass. Clean up old revisions.

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

8 files changed, 136 insertions, 281 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 219875be8282..6c763943e2b9 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,16 @@
 # 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.114 2012/12/11 16:55:55 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.115 2012/12/26 23:00:30 eva Exp $
+
+*empathy-3.6.2-r2 (26 Dec 2012)
+
+  26 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> -empathy-3.2.2-r1.ebuild,
+  -files/empathy-3.2.2-cancellable-not-NULL.patch,
+  -files/empathy-3.2.2-delivery-failed.patch,
+  -files/empathy-3.2.2-telepathy-logger-0.4.patch, +empathy-3.6.2-r2.ebuild,
+  metadata.xml:
+  Version bump for Gnome 3.6. Switch to EAPI=5 and python-any-r1.eclass. Clean
+  up old revisions.
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> empathy-3.2.2-r1.ebuild,
   empathy-3.4.2.3.ebuild:
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index c4f281d25054..474139ce5b7a 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -5,21 +5,18 @@ AUX empathy-2.32.2-libnotify-0.7.patch 1644 SHA256 8f7280c95fb67a2f91dc38984523f
 AUX empathy-2.34.0-CVE-2011-3635.patch 2451 SHA256 7b82ba0d9e002ba78975caff45ec08eb7b176feb513ba72c0c312f0a2a8ccd54 SHA512 c15bfa0814e4d588d43b834fc6bf62109d0a121aed8735415f27b743cf8424dec4b27ab118583afc66bb7fe6980209762ebbaf6df11586c40294f936b8178d5a WHIRLPOOL b657bef90495501ab270747a5724dc8be1daa37fbbfc23aaea549e4f57016fb6d6d3d82b92939ebee79f1ed86d0b6dc7a9af0ef9156be0b5dab9b4b7211cb1fc
 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
-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.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.3.tar.xz 3325712 SHA256 ca511c2a6bb2f39fb29127782b4b0ba813839f7ffc06ae8680445ecb5d58c203 SHA512 7850b6d81c6570d5c4279fb121db47b453d4fb5bbde7882f8887cd60d1b5d17317ffb974b0e4703ad105cf0326fc41b34892c9883d6a560cfb03e7f4f68d8ac9 WHIRLPOOL 01125b18c25b89e00aa1084411342a805999efe28ddc7305a1106ad8c703cbcc46188b0e030af9340bc72864cf98051948164fc78426b614b4c38676da42da6d
+DIST empathy-3.6.2.tar.xz 3443720 SHA256 707bf283f37e8b91816c78742d9ebf9e3effc4206a3ecc3e4c0cfbbf8ce0fd26 SHA512 8cd1eaaa9b42f415a175ce2eb57f85f716523e4bcdfe32661af0bc557ed7b7f22ceee884e2474e8b68448b8ae4b3c12225b77501b876cce530d76e14bb7da112 WHIRLPOOL c00e10cbab33a12ddf31b70a654ec53bbb3b50313fd6bbd7503e2e58d82af4ed188bd3763d6dfc3d3e7c10ee7839c2ddd3fe041885ce0d894f9960adf950af26
 EBUILD empathy-2.34.0-r2.ebuild 3263 SHA256 4a37586f24b19bede46e2983de0a0647c9b9fc42da6e52a0c193b1af41448805 SHA512 a90faa742b02b8de4125f7bc0998e76d90394aea73f99b0b61e261a13d19efc18405f2a6518e43e60b29c24cb3c5721fed44db279a53c2007695d7e94a1f82c6 WHIRLPOOL 9d96b2f8e51d4bcd8e27230d038d3ed2849d7bc305e943e22d6582b5b17b24e6026621eba7a69b69ffc4fac85d714898811037b747c9f67cc7574fcfbb3d23ef
-EBUILD empathy-3.2.2-r1.ebuild 3803 SHA256 e4e65c932c613ae4774ff7cc22305e1e8ca9f8401be535fb0f22b725ff0206b9 SHA512 ab8280da4a80bd568b3bb4161d4d79d2008a7374224a84fa73d50a3dbffa3e067afef0cb1669e113413d2c001783f6d04a0ea65c995fcf84d7bb99a7580d10a9 WHIRLPOOL 0e6242527dd71d6dfcc1b606254c05bba59dd9eb6bc5f40bd255a6ba2dd9a1cb89c4b00843917cd65b36e11dae58ed03de614d51d39c8ee0fe4c566aa354f89c
 EBUILD empathy-3.4.2.3.ebuild 3938 SHA256 0d0f80f55270ce46b56a052416a808fa2461705873aef58d0a49ebe006fede96 SHA512 d55a7f682c712f7b2c771e938f1c90510aa173dd0ebc2f64531810fabfc4c50b396317b0c9804d188b4df976ee4c6d14cfae05499afe8f31b1eb320070a5b8ea WHIRLPOOL 41efe165b963fc6f190d530ad424fc4a22e1d73264c6c320f65b39e688a96aea3b64e6aa2b5f715d0bd48bc4d3476a148c94ea3c2c3551fa892c53d82aa7c070
-MISC ChangeLog 20310 SHA256 ffc16cdddfab75927036de69505d2e643459be58e2ba00d1d37d7e7292d49421 SHA512 31269a0b1ae4053cc4dfc2587ac1994e1ffd1221f4632d929bbc31ba297f99857c4114538b5d48b17b21fddf09165c4502b359244b2dd7a834b761d67208af23 WHIRLPOOL 7b68523f6e6c8bc44de78bbd7bb7de63e99935c1770d25719c29918cb73e83ce380c84c8762b5fcc5739ad61b4cbfa8b64f10eb9c3e4d10a26a38f06d267206f
-MISC metadata.xml 1665 SHA256 d004a67be9d82c28f16d52bb1fc2f50ec5c8bbd92b010b89ac0d652723c45140 SHA512 bb52d7245d6111add9c110a8aa3506d5ad8b7bf7d77385cd9d493133941176ed13081e056d65bb212796a9b0e955b7fe83025eaa165d1a0cae59b65fc3c9af6d WHIRLPOOL 800ffadf5d4f5fcd81f799b09ae9cc1299ebeb7f5bc75cddc17496c3c44c18a3c95752963d855653263228a89b3a704dd06635c3cba82efbb8808ceef80beab4
+EBUILD empathy-3.6.2-r2.ebuild 3226 SHA256 b10730f6582930c0f45e6dcc6c290eb8a56e16539701368855ef0bea791c4051 SHA512 eb4d22c921c2ea187f613b50de2c464e32079f76d673f13f8e802ef2cccd97214606aaaa6279779296002ce1a0dcc98c29657acc81ef45d1897814987eded594 WHIRLPOOL 8b3ab79ce54069d8018786867ebcca32c8dfff1c493bc186947d8a9f1b4caea8d34f547c5dfc0bea865e6798562fddea68141aa2ff951e7423a11b6ca087eb8b
+MISC ChangeLog 20713 SHA256 04acec4c0a78e21a317c38ee069056836906b66e5ba8767bde0f954b4f0db629 SHA512 0415a026949a70fb31f6092b59b6a3321c16c9de04d86b8da8cfac418202e6413db59d6c39db1e5042f216ddeab85f4aa304c2e1ed017149b1be21e83e1cb0b2 WHIRLPOOL 5ae408b3f95ed50e9bac78f0a26835add6968fecdceede2f9bee1c4cd0f5b05aea20c26670c3f62203528823e8aa81142aa3623eaaad29d728f6993d9ea58754
+MISC metadata.xml 1663 SHA256 f4e36e62523432d8edfc110d76206eb035493ecd028ec47b5e4e6f85e058fe37 SHA512 8df763bafc4065f897db9509a5244553c6b57eab1d9db3109428070173f27d49db20ae2a10a4ffbe81cad064a5aafa1ca2721e5b55bc9982762f9d89cb140344 WHIRLPOOL bd508e08e39ea482ed299ac2f05deaad0f976710e1b31611cf4bdb234de748e72b3b5b7c205c215f3e9d6006ea1225cccae0f2e14fb2d737a9765abac0485136
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDHZakACgkQ2ugaI38ACPCX/QEAmaiCxaDS5UVMHKXLwJu3Modt
-bMQn1Y1CDgp0COZRiK4A/3yeCxAQgqeg/ELYpY/Z0KQhvrRQTdygozp02k3rpT1E
-=K1CH
+iEYEAREIAAYFAlDbgY8ACgkQ1fmVwcYIWAbWogCghSUjBLpVVU/qrmmkhYpAmBsH
+PVsAn1RHOlfV+k3Y+hMEQJYqw/uQoPkK
+=2UND
 -----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-3.2.2-r1.ebuild b/net-im/empathy/empathy-3.2.2-r1.ebuild
deleted file mode 100644
index ac677e70493e..000000000000
--- a/net-im/empathy/empathy-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,134 +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.2.2-r1.ebuild,v 1.5 2012/12/11 16:55:55 axs Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="Telepathy client and library using GTK+"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +v4l"
-
-# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
-# eventually at which point the dep can be dropped
-# libgee extensively used in libempathy
-# gdk-pixbuf and pango extensively used in libempathy-gtk
-COMMON_DEPEND=">=dev-libs/glib-2.28:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0.2:3
-	x11-libs/pango
-	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/folks-0.6.2
-	dev-libs/libgee:0
-	>=gnome-base/gnome-keyring-2.91.4-r300
-	>=media-libs/libcanberra-0.25[gtk3]
-	media-sound/pulseaudio[glib]
-	>=net-libs/gnutls-2.8.5
-	>=net-libs/telepathy-glib-0.16.0
-	>=net-libs/webkit-gtk-1.3.13:3
-	>=x11-libs/libnotify-0.7
-
-	dev-libs/libxml2:2
-	gnome-base/gsettings-desktop-schemas
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	media-libs/gst-plugins-bad:0.10
-	>=net-im/telepathy-logger-0.2.13
-	net-libs/farsight2
-	>=net-libs/telepathy-farsight-0.0.14
-	net-im/telepathy-connection-managers
-	x11-libs/libX11
-	x11-themes/gnome-icon-theme-symbolic
-
-	call? (
-		>=media-libs/clutter-1.7.14:1.0
-		>=media-libs/clutter-gtk-0.90.3:1.0
-		media-libs/clutter-gst:1.0
-		net-libs/telepathy-farstream )
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	geoloc? ( >=app-misc/geoclue-0.11 )
-	gnome-online-accounts? ( net-libs/gnome-online-accounts )
-	map? (
-		>=media-libs/clutter-1.7.14:1.0
-		>=media-libs/clutter-gtk-0.90.3:1.0
-		media-libs/libchamplain: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? (
-		virtual/udev[gudev]
-		media-plugins/gst-plugins-v4l2:0.10
-		>=media-video/cheese-2.91.91.1 )
-"
-# empathy-3.2 is incompatible with >=telepathy-rakia/sofiasip-0.7, bug #403861
-RDEPEND="${COMMON_DEPEND}
-	!>=net-voip/telepathy-rakia-0.7"
-DEPEND="${COMMON_DEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.17.3
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17
-	test? (
-		sys-apps/grep
-		>=dev-libs/check-0.9.4 )
-	dev-libs/libxslt
-"
-PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
-
-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 call)
-		$(use_enable debug)
-		$(use_with eds)
-		$(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_prepare() {
-	# In next release
-	epatch "${FILESDIR}/${P}-delivery-failed.patch"
-	epatch "${FILESDIR}/${P}-cancellable-not-NULL.patch"
-	# Fix telepathy-logger-0.4 compatibility, bug #413423; patch from 3.4
-	epatch "${FILESDIR}/${PN}-3.2.2-telepathy-logger-0.4.patch"
-
-	gnome2_src_prepare
-}
-
-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.6.2-r2.ebuild b/net-im/empathy/empathy-3.6.2-r2.ebuild
new file mode 100644
index 000000000000..ec0e63ac8969
--- /dev/null
+++ b/net-im/empathy/empathy-3.6.2-r2.ebuild
@@ -0,0 +1,117 @@
+# 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.6.2-r2.ebuild,v 1.1 2012/12/26 23:00:30 eva 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 CCPL-Attribution-ShareAlike-3.0 FDL-1.3 LGPL-2.1"
+SLOT="0"
+IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
+KEYWORDS="~amd64 ~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 )
+	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_DEPENDS}
+	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"
+	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
+}
+
+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/files/empathy-3.2.2-cancellable-not-NULL.patch b/net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch
deleted file mode 100644
index c58e7563a77d..000000000000
--- a/net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 641a6b06225cd00f62001d041316e72535662306 Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
-Date: Wed, 30 Nov 2011 12:55:29 +0100
-Subject: [PATCH] ui-utils: don't expect that cancellable is not NULL
-
-cancellable are always optional so this code should be NULL safe.
----
- libempathy-gtk/empathy-ui-utils.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
-index d5f63c9..2b9f5cf 100644
---- a/libempathy-gtk/empathy-ui-utils.c
-+++ b/libempathy-gtk/empathy-ui-utils.c
-@@ -549,7 +549,8 @@ pixbuf_avatar_from_individual_closure_new (FolksIndividual    *individual,
- 	closure->result = g_object_ref (result);
- 	closure->width = width;
- 	closure->height = height;
--	closure->cancellable = g_object_ref (cancellable);
-+	if (cancellable != NULL)
-+		closure->cancellable = g_object_ref (cancellable);
- 
- 	return closure;
- }
-@@ -558,7 +559,7 @@ static void
- pixbuf_avatar_from_individual_closure_free (
- 		PixbufAvatarFromIndividualClosure *closure)
- {
--	g_object_unref (closure->cancellable);
-+	g_clear_object (&closure->cancellable);
- 	tp_clear_object (&closure->loader);
- 	g_object_unref (closure->individual);
- 	g_object_unref (closure->result);
--- 
-1.7.8.6
-
diff --git a/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch b/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch
deleted file mode 100644
index 84c0dd841150..000000000000
--- a/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 457cdd199d2aa20cbebcc25ea305137ce7b0f440 Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
-Date: Tue, 22 Nov 2011 15:42:11 +0100
-Subject: [PATCH] don't ignore TP_DELIVERY_STATUS_TEMPORARILY_FAILED delivery
- report
-
-We should display an error message as well if not the user will assume the
-message has been sent and the spinner keeps spinning.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=664564
----
- libempathy/empathy-tp-chat.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
-index 2285f3f..f65f25d 100644
---- a/libempathy/empathy-tp-chat.c
-+++ b/libempathy/empathy-tp-chat.c
-@@ -375,7 +375,8 @@ handle_delivery_report (EmpathyTpChat *self,
- 		tp_chat_set_delivery_status (self, delivery_token,
- 			EMPATHY_DELIVERY_STATUS_NONE);
- 		goto out;
--	} else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED) {
-+	} else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED &&
-+		   delivery_status != TP_DELIVERY_STATUS_TEMPORARILY_FAILED) {
- 		goto out;
- 	}
- 
--- 
-1.7.8.6
-
diff --git a/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch b/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch
deleted file mode 100644
index 4ce89197bd49..000000000000
--- a/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 86ba5be5fa9a044fbcce6618ac6cd6dd7bdf3482 Mon Sep 17 00:00:00 2001
-From: Danielle Madeley <danielle.madeley@collabora.co.uk>
-Date: Tue, 3 Apr 2012 10:35:09 +1000
-Subject: [PATCH] TplCallEndReason ceased to exist on March 28
-
----
- libempathy-gtk/empathy-log-window.c |   11 ++++++-----
- libempathy/empathy-message.c        |    2 +-
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
-index 72d4d46..c11bb02 100644
---- a/libempathy-gtk/empathy-log-window.c
-+++ b/libempathy-gtk/empathy-log-window.c
-@@ -1236,11 +1236,11 @@ get_icon_for_event (TplEvent *event)
-   else if (TPL_IS_CALL_EVENT (event))
-     {
-       TplCallEvent *call = TPL_CALL_EVENT (event);
--      TplCallEndReason reason = tpl_call_event_get_end_reason (call);
-+      TpCallStateChangeReason reason = tpl_call_event_get_end_reason (call);
-       TplEntity *sender = tpl_event_get_sender (event);
-       TplEntity *receiver = tpl_event_get_receiver (event);
- 
--      if (reason == TPL_CALL_END_REASON_NO_ANSWER)
-+      if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
-         icon = EMPATHY_IMAGE_CALL_MISSED;
-       else if (tpl_entity_get_entity_type (sender) == TPL_ENTITY_SELF)
-         icon = EMPATHY_IMAGE_CALL_OUTGOING;
-@@ -1357,7 +1357,7 @@ log_window_append_call (TplEvent *event,
-       COL_EVENTS_EVENT, event,
-       -1);
- 
--  if (tpl_call_event_get_end_reason (call) != TPL_CALL_END_REASON_NO_ANSWER)
-+  if (tpl_call_event_get_end_reason (call) != TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
-     {
-       gchar *body;
-       gchar *tmp;
-@@ -3243,11 +3243,12 @@ log_window_got_messages_for_date_cb (GObject *manager,
-             }
-           else
-             {
--              TplCallEndReason reason = tpl_call_event_get_end_reason (call);
-+              TpCallStateChangeReason reason =
-+                tpl_call_event_get_end_reason (call);
-               TplEntity *sender = tpl_event_get_sender (event);
-               TplEntity *receiver = tpl_event_get_receiver (event);
- 
--              if (reason == TPL_CALL_END_REASON_NO_ANSWER)
-+              if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
-                 {
-                   if (ctx->subtype & EVENT_CALL_MISSED)
-                     append = TRUE;
-diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
-index 6111bcd..a4caae1 100644
---- a/libempathy/empathy-message.c
-+++ b/libempathy/empathy-message.c
-@@ -411,7 +411,7 @@ empathy_message_from_tpl_log_event (TplEvent *logevent)
- 
- 		timestamp = tpl_event_get_timestamp (logevent);
- 
--		if (tpl_call_event_get_end_reason (call) == TPL_CALL_END_REASON_NO_ANSWER)
-+		if (tpl_call_event_get_end_reason (call) == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
- 			body = g_strdup_printf (_("Missed call from %s"),
- 				tpl_entity_get_alias (tpl_event_get_sender (logevent)));
- 		else if (tpl_entity_get_entity_type (tpl_event_get_sender (logevent)) == TPL_ENTITY_SELF)
--- 
-1.7.8.6
-
diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
index 46f4c30edce3..1dcbea93f7be 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/metadata.xml
@@ -21,7 +21,7 @@
 		<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>
+			window themes using <pkg>net-libs/webkit-gtk</pkg></flag>
 	</use>
 	<longdescription>
 		Empathy consists of a rich set of reusable instant messaging widgets,