[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-contacts/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     d17d2ce9bbaf465ff91025e809eb34a31833cccb
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 18 06:31:25 2017 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 06:31:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d17d2ce9

gnome-extra/gnome-contacts: fix keyword issues after raising folks dependency

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 ...ome-contacts-3.22.1.ebuild => gnome-contacts-3.22.1-r1.ebuild} | 2 +-
 gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild           | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild
similarity index 96%
copy from gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild
copy to gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild
index 95083e15f4e..2c52f3abc33 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="v4l"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 VALA_DEPEND="
 	$(vala_depend)

diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild
index 95083e15f4e..d1c0351111f 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild
@@ -24,9 +24,8 @@ VALA_DEPEND="
 	net-libs/telepathy-glib[vala]
 "
 # Configure is wrong; it needs cheese-3.5.91, not 3.3.91
-# folks-0.11.4 to avoid build issues with vala-0.36, upstream 7a9001b056b4fb1d00375e7b2adeda9b7cf93c90
 RDEPEND="
-	>=dev-libs/folks-0.11.4:=[eds,telepathy]
+	>=dev-libs/folks-0.9.5:=[eds,telepathy]
 	>=dev-libs/glib-2.37.6:2
 	>=dev-libs/libgee-0.10:0.8
 	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
@@ -53,11 +52,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-vala-0.35-part1.patch
-	"${FILESDIR}"/${PV}-fix-vala-0.35-part2.patch
-)
-
 src_prepare() {
 	# Regenerate the pre-generated C sources, bug #471628
 	if ! use v4l; then