[gentoo-commits] proj/gnome:master commit in: net-im/empathy/, dev-libs/folks/

[Nirbheek Chauhan]

commit:     71b60a8b1269cc65e589461dcdfd9dc47ccfb9b9
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 21:45:44 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 22:05:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=71b60a8b

net-im/empathy: 2.91.6.1 -> 2.91.90, fix dev-libs/folks

* folks: re-add keywords, remove old, tests pass, empathy compiles
  - Links against system libfolks?

---
 dev-libs/folks/folks-0.3.4.ebuild                  |   52 --------------------
 dev-libs/folks/folks-0.3.6.ebuild                  |   11 +---
 ...athy-2.91.6.1.ebuild => empathy-2.91.90.ebuild} |   13 ++---
 3 files changed, 8 insertions(+), 68 deletions(-)

diff --git a/dev-libs/folks/folks-0.3.4.ebuild b/dev-libs/folks/folks-0.3.4.ebuild
deleted file mode 100644
index fc4ee1c..0000000
--- a/dev-libs/folks/folks-0.3.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="libfolks is a library that aggregates people from multiple sources"
-HOMEPAGE="http://telepathy.freedesktop.org/wiki/Folks"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=net-libs/telepathy-glib-0.13.1[vala]
-	dev-libs/dbus-glib
-	<dev-libs/libgee-0.7
-	dev-libs/libxml2
-	sys-libs/ncurses
-	sys-libs/readline
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	>=dev-util/pkgconfig-0.21
-	>=dev-lang/vala-0.11.6:0.12[vapigen]
-	>=dev-libs/gobject-introspection-0.9.12
-	sys-devel/gettext
-"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--enable-import-tool
-		--enable-inspect-tool
-		--enable-vala
-		VALAC=$(type -p valac-0.12)
-		VAPIGEN=$(type -p vapigen-0.12)
-		$(use_enable doc docs)
-		--disable-Werror"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Test suite is badly broken, even from git repo
-	sed 's/tests//' -i Makefile.am Makefile.in || die "sed failed"
-}

diff --git a/dev-libs/folks/folks-0.3.6.ebuild b/dev-libs/folks/folks-0.3.6.ebuild
index 580496b..f9fb2eb 100644
--- a/dev-libs/folks/folks-0.3.6.ebuild
+++ b/dev-libs/folks/folks-0.3.6.ebuild
@@ -13,10 +13,10 @@ HOMEPAGE="http://telepathy.freedesktop.org/wiki/Folks"
 
 LICENSE="LGPL-2"
 SLOT="0"
-# Broke API, empathy refuses to compile
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
+# FIXME: links against system libfolks instead of the built one
 RDEPEND=">=dev-libs/glib-2.24:2
 	>=net-libs/telepathy-glib-0.13.1[vala]
 	dev-libs/dbus-glib
@@ -44,10 +44,3 @@ pkg_setup() {
 		$(use_enable doc docs)
 		--disable-Werror"
 }
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Test suite is badly broken, even from git repo
-	sed 's/tests//' -i Makefile.am Makefile.in || die "sed failed"
-}

diff --git a/net-im/empathy/empathy-2.91.6.1.ebuild b/net-im/empathy/empathy-2.91.90.ebuild
similarity index 89%
rename from net-im/empathy/empathy-2.91.6.1.ebuild
rename to net-im/empathy/empathy-2.91.90.ebuild
index fe64830..455079a 100644
--- a/net-im/empathy/empathy-2.91.6.1.ebuild
+++ b/net-im/empathy/empathy-2.91.90.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.4"
 
 inherit eutils gnome2 multilib python
@@ -19,17 +20,15 @@ IUSE="+gnome eds sendto networkmanager spell test webkit" # map
 
 # FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
 # eventually at which point the dep can be dropped
-# XXX: dbus-glib is for dbus-binding-tool, but it's not actually used anywhere?
-# NOTE: ~folks-0.3.4 is required. 0.3.6 broke API.
 RDEPEND=">=dev-libs/glib-2.27.2:2
 	>=x11-libs/gtk+-2.99.0:3
 	>=dev-libs/dbus-glib-0.51
-	>=net-libs/telepathy-glib-0.13.11
+	>=net-libs/telepathy-glib-0.13.12
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7.0
 	>=gnome-base/gnome-keyring-2.91.4-r300
 	>=net-libs/gnutls-2.8.5
-	~dev-libs/folks-0.3.4
+	>=dev-libs/folks-0.3.5
 
 	gnome-base/gsettings-desktop-schemas
 	net-libs/farsight2
@@ -51,8 +50,8 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
 		>=app-text/iso-codes-0.35 )
 	webkit? ( >=net-libs/webkit-gtk-1.3.2:3 )"
 #	map? (
-#		>=media-libs/libchamplain-0.7.1[gtk]
-#		>=media-libs/clutter-gtk-0.90.3:1.0 )
+#		media-libs/libchamplain[gtk]:0.10
+#		media-libs/clutter-gtk:1.0 )
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.17.3
@@ -73,7 +72,7 @@ pkg_setup() {
 src_prepare() {
 	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
 
-	# Hard disable favourite_contacts and tpl, TpLogger is buggy.
+	# TODO: Re-add map/location support
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-location