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

(Portage version: 2.2.0_alpha160/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 129 insertions, 138 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/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>