Version bump. Switch back to python.eclass since this is a build time only dependency.

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

5 files changed, 143 insertions, 142 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index debc8fcb70b9..e6f66a9dd15b 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,13 @@
 # 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.121 2013/01/06 09:58:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.122 2013/01/25 23:14:04 eva Exp $
+
+*empathy-3.6.3 (25 Jan 2013)
+
+  25 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> -empathy-3.4.2.3.ebuild,
+  +empathy-3.6.3.ebuild, metadata.xml:
+  Version bump. Switch back to python.eclass since this is a build time only
+  dependency.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> empathy-3.6.2-r2.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index c138a132b739..f9e5fbcb5a2e 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,12 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX empathy-2.32.2-libnotify-0.7.patch 1644 SHA256 8f7280c95fb67a2f91dc38984523f8ae4be95643e7404ea672d88d6541987ca8 SHA512 9462bc0584041460f9347eeb3e727296dc5f6ec2ea2f65867860029208096c4d795544c02426587d19a2bd4aef562b0b2bf51c3fefe439e69c65c5c6c79669a9 WHIRLPOOL 31e4192b3212d2a8f7625410df55400c36465d643a24631e486b998b6040542672b4f253189aae6a76aeb97ccc11ab3abf68483c667e08e87806ef97bad943b2
 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
 DIST empathy-2.34.0.tar.bz2 3361496 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1 SHA512 df1f8bac59ceeeff5cef2730df1720084bb4c4d7008c5b36dec122ef83a6a4852dea84d7cf9b83cdc939f56d2b5f49bfe612d00f1f9332c48ee48bc5b17a8565 WHIRLPOOL 60e818e222519bc1f30efdc92aa1eb471869e11c11d364287d0ee65de01ccb8895d1dc7e739194eed681cb4a6eb2966529e31959696220e98f5238ce504cd337
-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
+DIST empathy-3.6.3.tar.xz 3448720 SHA256 eaae20e8e9b8660979ed7a9a65deba61d6d795c6f698e684f21c3821f042704d SHA512 888389b76ac84651ffcc31230a2d77069741acccd231bf1f86bce5c4e9e7be42e4794d65b0bb44e8dff519c52aceaea7e37bc71fa4f4b67b6a2df24818be2e26 WHIRLPOOL 9f71224384d76c9a6684ac44548973cb4ae61053ce1ad53ddb39d493f28a81c29a96c2a4b528d3dd7248972ade08a79dd07886ec2a1f645df5b0f8b6d9a09b4d
 EBUILD empathy-2.34.0-r2.ebuild 3263 SHA256 4a37586f24b19bede46e2983de0a0647c9b9fc42da6e52a0c193b1af41448805 SHA512 a90faa742b02b8de4125f7bc0998e76d90394aea73f99b0b61e261a13d19efc18405f2a6518e43e60b29c24cb3c5721fed44db279a53c2007695d7e94a1f82c6 WHIRLPOOL 9d96b2f8e51d4bcd8e27230d038d3ed2849d7bc305e943e22d6582b5b17b24e6026621eba7a69b69ffc4fac85d714898811037b747c9f67cc7574fcfbb3d23ef
-EBUILD empathy-3.4.2.3.ebuild 3938 SHA256 0d0f80f55270ce46b56a052416a808fa2461705873aef58d0a49ebe006fede96 SHA512 d55a7f682c712f7b2c771e938f1c90510aa173dd0ebc2f64531810fabfc4c50b396317b0c9804d188b4df976ee4c6d14cfae05499afe8f31b1eb320070a5b8ea WHIRLPOOL 41efe165b963fc6f190d530ad424fc4a22e1d73264c6c320f65b39e688a96aea3b64e6aa2b5f715d0bd48bc4d3476a148c94ea3c2c3551fa892c53d82aa7c070
 EBUILD empathy-3.6.2-r2.ebuild 3258 SHA256 44519f24e7d0e8502b87747128aa5e921e9fab6d5bc1b821bf1c3bd77c340b3c SHA512 9717402fec5c103a9ae74d6540929cd9fb690282c5397789755f7368f9b73cc5dac351332b0c90f17d3358c9449eb7586bc7530baf1c37635c2eb2a1649211be WHIRLPOOL c33a165d39943d19fc7eb470f8de2770680860ce743bbf9f8978104089c8f6c6cacb09222511fcb9fbc8e29ff042eca07d19596d26a51e650cfe601fc1f21985
-MISC ChangeLog 21351 SHA256 2b4a2502141c9d4ae8ef4294746ce4d97d48b84e86f748a4bf0465bc5bca8d53 SHA512 6958a9108ec79eb2a7855112038ac6cb6dd00ff4afb6adfd3cb17269d4c00d902cfaf4bc740a64e92343c8778ae51e7e2b55d5699ff90414071aa734a4bcc0dd WHIRLPOOL c4dd21d6590385fe0c591119728090ba407415c5d2dc6d1feb448cc4b0ac7bdd8adfc80857afab917e94e49f5f7da37bda5e70cdc98451de7774700d3de4d686
-MISC metadata.xml 1537 SHA256 20cea6a29f8dd395d168a171aaecc684a74247dcc6f5b8afbe63290a1bcc8cd1 SHA512 0312fcaf388a7c5ec1d89b78a2beb37abdde2e3e4110268a6f152d30340deb052b9ffd7786d96cc7d0f33410a3a0b81750882c7fe49d2ee4bfc19299178d7173 WHIRLPOOL 37dd4aa3feb956b35b0329ad886383417a6abf9e2d99f67f3b592cd071bb157c66920c7279c69a0e9688f9a1c27dd58ef55802d9ca8bc85917773bd0fc770a25
+EBUILD empathy-3.6.3.ebuild 3350 SHA256 73dd0389c3deaaa2421d5634c5b9aaa2efc275a7322f5bc14819e7d4981246cb SHA512 31dda672af938fe963b14e3b61c2b846197669b8769e0e9673a26f63c2d23e9bfa0323bdd93d18e7ac521c23807ddb95152836c65e770adb60d6714512f89d89 WHIRLPOOL 5f6e0517ac0c19b17148a99b4e0968da93906d6a0250a853e753b15a7a7c5899a7906ecdf4f30272eb7b790a268a81a9e8acb74c9d03e3b0de36a91b2db007e5
+MISC ChangeLog 21591 SHA256 0c054a09e052cb2ebcae4530881e2a5acb778c957b33cb64397a9efaf7099d70 SHA512 6a3dbaa4dcf5ae3bc4d9abc109bdc6b7a9c92de9414032d20dc0d602271e63de5a3238cb0afd40b3cb2c37d9ea77819c3f985fd85029ec48719f001d9c9deb2b WHIRLPOOL 07e7cbd7c8f06353726c7688d1575b51b270ff7503e78159dcc2a8b527b3078082907a85b9fe6f00dd438ee500c6afa836e87b2011b342637c7d51145cfc1330
+MISC metadata.xml 1467 SHA256 b1fbccf18385402e0ac0ac63595f9b7b3a27fb61086e5bf503d11a858099c8ae SHA512 2a20c65b50aeee8f660277ffc57f4a223edb9989814c031e8ac7158a5133421ad393d35858e47e639b97a55c2cd6b589e0645d74e791e19967a7cba86a17521e WHIRLPOOL 50c817df40f507c5380bf4d53ef23f494c70a48032d0584210ade162fecae68d178c86e86b12412209443a0dd878c9670c934d3b2267328c9e9a8a9899781d01
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEDEb4ACgkQ1fmVwcYIWAYVSQCg45kcOtsqJMbx8xtM+H+Leb82
+5HIAmgIz6KuFCApoCTza82ywV58otY9d
+=wLVj
+-----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-3.4.2.3.ebuild b/net-im/empathy/empathy-3.4.2.3.ebuild
deleted file mode 100644
index a228adc5cadf..000000000000
--- a/net-im/empathy/empathy-3.4.2.3.ebuild
+++ /dev/null
@@ -1,136 +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.3.ebuild,v 1.6 2012/12/11 16:55:55 axs Exp $
-
-EAPI="5"
-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+ LGPL-2.1+ FDL-1.3+ CCPL-Attribution-ShareAlike-3.0"
-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
-	media-libs/cogl:1.0=
-
-	>=net-libs/telepathy-glib-0.18:=
-	>=net-im/telepathy-logger-0.2.13:=
-	net-libs/farstream:0.1
-	>=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:=
-		virtual/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:0.10
-	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() {
-	# Build time python tools need python2
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	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)"
-	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.3.ebuild b/net-im/empathy/empathy-3.6.3.ebuild
new file mode 100644
index 000000000000..5cfdf9480f1b
--- /dev/null
+++ b/net-im/empathy/empathy-3.6.3.ebuild
@@ -0,0 +1,121 @@
+# 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.3.ebuild,v 1.1 2013/01/25 23:14:04 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.5" # build only
+
+inherit gnome2 python 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="~alpha ~amd64 ~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 )
+	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}
+	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() {
+	# Build time python tools need python2
+	python_set_active_version 2
+	python_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 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/metadata.xml b/net-im/empathy/metadata.xml
index db3fccea87e5..d4a70cfe7e3a 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="gnome-online-accounts">Enable using
 			<pkg>net-libs/gnome-online-accounts</pkg> for authorization (e.g.
 			for Google Talk)</flag>
-		<flag name="legacy-call">Enable the Empathy 3.2-like call UI</flag>
 		<flag name="map">Enable world map support through
 			<pkg>media-libs/libchamplain</pkg></flag>
 		<flag name="nautilus">Enable nautilus-sendto support</flag>