Add net-im/empathy-3.3.92

3 files changed, 159 insertions, 28 deletions

diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 5a21e551..f92bc3ef 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1 +1,3 @@
-EBUILD empathy-9999.ebuild 3451 RMD160 d19603e4c0073c6b6895895357a80b554c601bfa SHA1 c82dda82653c94aa200ef6d6542a0c9b18740d31 SHA256 8c89a64d192ed1c54b6598ed07e344b49926c40171ffe92756581bb2efe94fe1
+DIST empathy-3.3.92.tar.xz 3367780 RMD160 2180fe3f1bf0113e61aeb1147784c4422b3cc91d SHA1 3058f15b9c6c1ae955da415ce6fae62382c8b7ec SHA256 d5880cc7bc092ef8b3d6c9eaa903ebdc501326367aee793aca60a8fccea2ed5f
+EBUILD empathy-3.3.92.ebuild 3473 RMD160 00d93188a168a4a7bdb6ae93dcf62781ce83004d SHA1 d84acf3e86864c36d4957574ad2757b2e8d368fb SHA256 d5e0c1d27ecee94815cbbdd2486ed698f1c43697692dd8d8c4ab292e13c42248
+EBUILD empathy-9999.ebuild 3473 RMD160 00d93188a168a4a7bdb6ae93dcf62781ce83004d SHA1 d84acf3e86864c36d4957574ad2757b2e8d368fb SHA256 d5e0c1d27ecee94815cbbdd2486ed698f1c43697692dd8d8c4ab292e13c42248
diff --git a/net-im/empathy/empathy-3.3.92.ebuild b/net-im/empathy/empathy-3.3.92.ebuild
new file mode 100644
index 00000000..0ce449ef
--- /dev/null
+++ b/net-im/empathy/empathy-3.3.92.ebuild
@@ -0,0 +1,128 @@
+# 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
+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.6
+	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.8.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.8
+	>=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
+	>=dev-util/pkgconfig-0.16
+	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 bc68086e..0ce449ef 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-2.32.2.ebuild,v 1.6 2011/02/05 17:10:33 ssuominen Exp $
+# $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"
@@ -12,60 +12,61 @@ if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
-DESCRIPTION="Telepathy client and library using GTK+"
+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
-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
-RDEPEND=">=dev-libs/glib-2.28:2
+RDEPEND=">=dev-libs/glib-2.30:2
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0.2:3
+	>=x11-libs/gtk+-3.3.6:3
 	x11-libs/pango
 	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/folks-0.6.2
+	>=dev-libs/folks-0.6.6
 	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
 
+	>=media-libs/clutter-1.8.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.8
+	>=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
-	>=net-im/telepathy-logger-0.2.8
-	net-libs/farsight2
-	>=net-libs/telepathy-farsight-0.0.14
-	net-voip/telepathy-connection-managers
+	media-sound/pulseaudio[glib]
+	net-libs/libsoup:2.4
 	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 )
+	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[gtk] )
+		>=media-libs/libchamplain-0.12.1:0.12[gtk] )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
 	spell? (
@@ -77,11 +78,11 @@ RDEPEND=">=dev-libs/glib-2.28:2
 		>=media-video/cheese-2.91.91.1 )
 "
 DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.17.3
-	>=dev-util/intltool-0.35.0
+	dev-libs/libxml2:2
+	dev-util/itstool
+
+	>=dev-util/intltool-0.40.0
 	>=dev-util/pkgconfig-0.16
-	>=sys-devel/gettext-0.17
 	test? (
 		sys-apps/grep
 		>=dev-libs/check-0.9.4 )
@@ -97,7 +98,7 @@ pkg_setup() {
 		--disable-static
 		--disable-meego
 		--disable-Werror
-		$(use_enable call)
+		$(use_enable legacy-call empathy-av)
 		$(use_enable debug)
 		$(use_with eds)
 		$(use_enable geoloc location)
@@ -122,6 +123,6 @@ src_test() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 	elog "Empathy needs telepathy's connection managers to use any IM protocol."
-	elog "See the USE flags on net-voip/telepathy-connection-managers"
+	elog "See the USE flags on net-im/telepathy-connection-managers"
 	elog "to install them."
 }