Pin libgee dependency to slot 0.

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

diff --git a/dev-libs/folks/ChangeLog b/dev-libs/folks/ChangeLog
index 4b57825c9af1bdb998a3f2654e17667ee0d34c7d..10c9b2a367aa3f09ae35d0755dd4bf9dc8c9ba4a 100644 (file)
--- 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/Manifest b/dev-libs/folks/Manifest
index b1f0e7a4283d9507277794b86d24577f3ac723d2..48957545b3bee0d70be98ca4450d5d3ac5c1d10d 100644 (file)
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA1
 
 DIST folks-0.2.1.tar.bz2 465522 RMD160 bdc195494d88b80d825702aaff4366caa4bfec9e SHA1 b3bef99026d549e74b1462ba3b87b2a4cd92dc00 SHA256 f8eeeb6a6974416d4db1ab6b18187173fb6ff4ec7830bece379dfba9b25f2a29
-DIST folks-0.4.2.tar.bz2 610469 RMD160 8807ec65c809ca84e0f42902ed65ad8bf84b0772 SHA1 8c08c13880be3c73ebaebfbd786e6ca28c6d3fe1 SHA256 269426df3896c07581067d3ead6aa2669c5895cfd3568e9e83abda5016b08e54
 DIST folks-0.4.3.tar.bz2 635168 RMD160 8afa36c6969393ec11fb6436d463576fac3ab195 SHA1 f3c08a828bc06282745d57d7d007b9b281a04c76 SHA256 e5a5bbe1524130ff5b6400726db3e12299b12ffefa108bc89169509f343d925e
-EBUILD folks-0.2.1.ebuild 1209 RMD160 66a2f6d60a92c899d9ddc9e3d4253e9bd8ef44c1 SHA1 47066058529c8910f3e017f711d44244b6113958 SHA256 9553f88c9ed4471670b53755d6dea4bc6c304cc353f0e0bc3bb8179404f7533f
-EBUILD folks-0.4.2.ebuild 1286 RMD160 fc66ac51f3503324c53c75ccda1922fc8158ef1c SHA1 9e6edf4c3363c67835aff4a66465328d8d2736c8 SHA256 5bd5bcb979dff0d9e45c59ef32c4ef422885c5822ce04c776a197dfc6666768e
-EBUILD folks-0.4.3.ebuild 1296 RMD160 03057d1bb7105959169796536a93e64bf37b2b13 SHA1 a19416f1bc4d3b788b4778ec77d8aa13e1459f06 SHA256 e8d3f1e807d4e86051d1899971d58be527c0eb069278dad6a234b9e6542565a8
-MISC ChangeLog 1793 RMD160 f4fc566d08b71b66a06f5f13418feef2441f419e SHA1 6cbf23d3aac220f364d4cf6cce7a7b2ce17c8f27 SHA256 08dd143248414aa8bd0a8500704fb34ed40a8e26fdeacbd0256b5b6b26824e68
+EBUILD folks-0.2.1.ebuild 1208 RMD160 0061c81ad2c2a9c8c0b24b33ecf93c9665ffa16c SHA1 4d6d5f7d56a2eb240889b6fa9331db9483702b7a SHA256 bbdfc4217032d567b94a1265761d8ae2ed761d806980de7c379439d588c402e7
+EBUILD folks-0.4.3.ebuild 1294 RMD160 42b8179ba913b94bbecf3d21730eae1af393a461 SHA1 efaa82c604529c1ef2e4c5211f1d8e40ba2956cf SHA256 369be19f39faef9124255e72155df7198205a74c90100717ac6dd7d9e9ac4eb1
+MISC ChangeLog 1942 RMD160 f6969cb3679a685e09f3d1b86caf4ef54574236e SHA1 f7e61cb84cb389ee8de23036ae5ad5754a09d88d SHA256 d4021a2f52a04e9cda4f81117ac7b349ec8940932250f02b9e87aead4bdf3e5c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5Gv+cACgkQuQc30/atMkDMmACgg9fQo/IuAS2z/zNS0wozdVrM
-ZJIAnRCqXJCXi+BrC8FOkJINYYVTpPwW
-=IC35
+iEYEARECAAYFAk5ybSEACgkQ1fmVwcYIWAa4OACg6GWT8Jl/cRJCFWHmDGifI57+
+EKwAoOa3x6Atth2ycfxJpNyhn5Ty6Ksh
+=26aM
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/folks/folks-0.2.1.ebuild b/dev-libs/folks/folks-0.2.1.ebuild
index 3fb3e37967704b9e20837f1477e131f68ea94abe..72fa7a15d697d98d1e27fcd3867e09dd336771f4 100644 (file)
--- 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 (file)
index d73ed9e..0000000
--- 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 c6958910f799241dd19a45e31ef8a0ca2ef0da32..b62e6ebb576b8cf382f953f6f9cf41dc0b41c17d 100644 (file)
--- 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