diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2017-08-18 08:31:25 +0200 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2017-08-18 08:31:59 +0200 |
commit | d17d2ce9bbaf465ff91025e809eb34a31833cccb (patch) | |
tree | 54f657313cb7b32e082bf34bc893ba4d80dbc4b5 /gnome-extra/gnome-contacts | |
parent | dev-ruby/coercible: add ruby24 (diff) | |
download | gentoo-d17d2ce9bbaf465ff91025e809eb34a31833cccb.tar.gz gentoo-d17d2ce9bbaf465ff91025e809eb34a31833cccb.tar.bz2 gentoo-d17d2ce9bbaf465ff91025e809eb34a31833cccb.zip |
gnome-extra/gnome-contacts: fix keyword issues after raising folks dependency
Package-Manager: Portage-2.3.7, Repoman-2.3.3
Diffstat (limited to 'gnome-extra/gnome-contacts')
-rw-r--r-- | gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild | 75 | ||||
-rw-r--r-- | gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild | 8 |
2 files changed, 76 insertions, 7 deletions
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild new file mode 100644 index 000000000000..2c52f3abc33a --- /dev/null +++ b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VALA_USE_DEPEND="vapigen" +VALA_MIN_API_VERSION="0.24" + +inherit gnome2 vala + +DESCRIPTION="GNOME contact management application" +HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="v4l" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +VALA_DEPEND=" + $(vala_depend) + >=dev-libs/gobject-introspection-0.9.6:= + dev-libs/folks[vala(+)] + gnome-base/gnome-desktop:3=[introspection] + gnome-extra/evolution-data-server[vala] + 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/glib-2.37.6:2 + >=dev-libs/libgee-0.10:0.8 + >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] + >=gnome-base/gnome-desktop-3.0:3= + media-libs/clutter:1.0 + media-libs/clutter-gtk:1.0 + media-libs/libchamplain:0.12 + net-libs/gnome-online-accounts:= + >=net-libs/telepathy-glib-0.17.5 + >=sci-geosciences/geocode-glib-3.15.3 + x11-libs/cairo:= + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.20.0:3 + x11-libs/pango + v4l? ( >=media-video/cheese-3.5.91:= ) +" +DEPEND="${RDEPEND} + ${VALA_DEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + 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 + touch src/*.vala + fi + + vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --enable-man-pages \ + $(use_with v4l cheese) +} 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 95083e15f4ef..d1c0351111fd 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 |