net-im/empathy: moved to gx86; update live ebuild

3 files changed, 23 insertions, 149 deletions

diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 1226cce2..883e94a6 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,3 +1 @@
-DIST empathy-3.4.1.tar.xz 3428932 RMD160 7772d0152736e8a7b967f8b892a7b6ab20088737 SHA1 7a178c287d12e40d201320fe5710fbefc2fc775e SHA256 b12493f47b932dcd3d8b5101d414a00447a6eea60a575db7211ee24cfe8c4565
-EBUILD empathy-3.4.1.ebuild 3605 RMD160 52eed23fcbb053327435cb1ced4b9afffb641fd6 SHA1 1aa563cad6e2d4f7617da7bfcd3edf64c88d8e94 SHA256 8ce358a2bcd5ac2b6e17e7d24098f39431326879a5b39fa755f90bacba4f4064
-EBUILD empathy-9999.ebuild 3605 RMD160 52eed23fcbb053327435cb1ced4b9afffb641fd6 SHA1 1aa563cad6e2d4f7617da7bfcd3edf64c88d8e94 SHA256 8ce358a2bcd5ac2b6e17e7d24098f39431326879a5b39fa755f90bacba4f4064
+EBUILD empathy-9999.ebuild 3680 RMD160 768d47ed59aac5514b7c6a7fa7c5c6b5b30035f2 SHA1 1282badb73edb6e9991cf7f1f9c2fd6c58c0f0c6 SHA256 e87fe9d914a8dcd796e662077ddec0ff732e9a0ca381e0a9a4817c5e91663bf9
diff --git a/net-im/empathy/empathy-3.4.1.ebuild b/net-im/empathy/empathy-3.4.1.ebuild
deleted file mode 100644
index 115b7105..00000000
--- a/net-im/empathy/empathy-3.4.1.ebuild
+++ /dev/null
@@ -1,130 +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.ebuild,v 1.3 2012/02/14 04:57:56 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit gnome2 python
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-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 +map +geoloc gnome-online-accounts legacy-call +networkmanager sendto spell test +v4l"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86 ~x86-linux"
-fi
-
-# 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
-# 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
-RDEPEND=">=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-0.90.3:1.0
-	>=media-libs/clutter-gst-1.5.2:1.0
-
-	>=net-libs/telepathy-glib-0.17.5
-	>=net-im/telepathy-logger-0.2.13
-	>=net-libs/telepathy-farstream-0.2.1
-	net-im/telepathy-connection-managers
-
-	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
-	media-sound/pulseaudio[glib]
-	net-libs/libsoup:2.4
-	x11-libs/libX11
-	x11-themes/gnome-icon-theme-symbolic
-
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	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? (
-		|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
-		media-plugins/gst-plugins-v4l2:0.10
-		>=media-video/cheese-2.91.91.1 )
-"
-DEPEND="${RDEPEND}
-	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.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 legacy-call empathy-av)
-		$(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_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-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 115b7105..d36c4f8c 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.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.ebuild,v 1.3 2012/02/14 04:57:56 tetromino Exp $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -17,20 +17,18 @@ HOMEPAGE="http://live.gnome.org/Empathy"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug eds +map +geoloc gnome-online-accounts legacy-call +networkmanager sendto spell test +v4l"
+IUSE="debug eds +geocode +geoloc gnome gnome-online-accounts legacy-call +map +networkmanager sendto spell test +v4l"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86 ~x86-linux"
 fi
 
-# 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
 # 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
-RDEPEND=">=dev-libs/glib-2.30:2
+COMMON_DEPEND=">=dev-libs/glib-2.30:2
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.3.6:3
 	x11-libs/pango
@@ -44,25 +42,22 @@ RDEPEND=">=dev-libs/glib-2.30:2
 	>=x11-libs/libnotify-0.7
 
 	>=media-libs/clutter-1.10.0:1.0
-	>=media-libs/clutter-gtk-0.90.3: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.17.5
+	>=net-libs/telepathy-glib-0.18
 	>=net-im/telepathy-logger-0.2.13
 	>=net-libs/telepathy-farstream-0.2.1
-	net-im/telepathy-connection-managers
 
 	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
 	media-sound/pulseaudio[glib]
 	net-libs/libsoup:2.4
 	x11-libs/libX11
-	x11-themes/gnome-icon-theme-symbolic
 
 	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? (
@@ -75,11 +70,21 @@ RDEPEND=">=dev-libs/glib-2.30:2
 		>=app-text/enchant-1.2
 		>=app-text/iso-codes-0.35 )
 	v4l? (
-		|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
 		media-plugins/gst-plugins-v4l2:0.10
-		>=media-video/cheese-2.91.91.1 )
+		>=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
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gst-plugins-base:0.10
+	media-libs/gst-plugins-bad
+	net-im/telepathy-connection-managers
+	x11-themes/gnome-icon-theme-symbolic
+	gnome? ( gnome-extra/gnome-contacts )
+	!legacy-call? ( !<net-voip/telepathy-gabble-0.16 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	dev-libs/libxml2:2
 	dev-util/itstool
 
@@ -90,7 +95,7 @@ DEPEND="${RDEPEND}
 		>=dev-libs/check-0.9.4 )
 	dev-libs/libxslt
 "
-PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
+PDEPEND=">=net-im/telepathy-mission-control-5.12"
 
 pkg_setup() {
 	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
@@ -103,6 +108,7 @@ pkg_setup() {
 		$(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)
@@ -127,4 +133,4 @@ 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."
-}
+}
\ No newline at end of file