4 files changed, 9 insertions, 56 deletions
diff --git a/dev-libs/folks/ChangeLog b/dev-libs/folks/ChangeLog
index 4b57825c9af1..10c9b2a367aa 100644
--- a/dev-libs/folks/ChangeLog
+++ b/dev-libs/folks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/folks
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/ChangeLog,v 1.14 2011/08/13 18:18:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/ChangeLog,v 1.15 2011/09/15 21:24:44 eva Exp $
+
+  15 Sep 2011; Gilles Dartiguelongue <eva@gentoo.org> folks-0.2.1.ebuild,
+  -folks-0.4.2.ebuild, folks-0.4.3.ebuild:
+  Pin libgee dependency to slot 0.
 
   13 Aug 2011; Raúl Porcel <armin76@gentoo.org> folks-0.4.3.ebuild:
   alpha/ia64/sparc stable wrt #369909
diff --git a/dev-libs/folks/folks-0.2.1.ebuild b/dev-libs/folks/folks-0.2.1.ebuild
index 3fb3e3796770..72fa7a15d697 100644
--- a/dev-libs/folks/folks-0.2.1.ebuild
+++ b/dev-libs/folks/folks-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.2.1.ebuild,v 1.8 2011/03/22 18:49:57 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.2.1.ebuild,v 1.9 2011/09/15 21:24:44 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -19,7 +19,7 @@ IUSE=""
 RDEPEND=">=dev-libs/glib-2.24:2
 	>=net-libs/telepathy-glib-0.11.16[vala]
 	dev-libs/dbus-glib
-	<dev-libs/libgee-0.7
+	<dev-libs/libgee-0.7:0
 	dev-libs/libxml2
 "
 DEPEND="${RDEPEND}
diff --git a/dev-libs/folks/folks-0.4.2.ebuild b/dev-libs/folks/folks-0.4.2.ebuild
deleted file mode 100644
index d73ed9e60fd3..000000000000
--- a/dev-libs/folks/folks-0.4.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.4.2.ebuild,v 1.1 2011/03/25 22:48:53 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="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="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-# 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
-	<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)
-		--disable-docs
-		--disable-Werror"
-	# Rebuilding docs needs valadoc, which has no release
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
-}
diff --git a/dev-libs/folks/folks-0.4.3.ebuild b/dev-libs/folks/folks-0.4.3.ebuild
index c6958910f799..b62e6ebb576b 100644
--- a/dev-libs/folks/folks-0.4.3.ebuild
+++ b/dev-libs/folks/folks-0.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.4.3.ebuild,v 1.5 2011/08/13 18:18:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.4.3.ebuild,v 1.6 2011/09/15 21:24:44 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -19,7 +19,7 @@ IUSE=""
 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/libgee-0.7:0
 	dev-libs/libxml2
 	sys-libs/ncurses
 	sys-libs/readline