diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2012-09-08 02:23:08 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2012-09-08 02:23:08 +0000 |
| commit | 286e360d0b49653d0826e1694995e14290d90ec4 (patch) | |
| tree | 55600aeae92eafb865d48d7983f68c4a3f8eea41 /x11-misc | |
| parent | Remove redundant maintainer from metadata. (diff) | |
| download | gentoo-2-286e360d0b49653d0826e1694995e14290d90ec4.tar.gz gentoo-2-286e360d0b49653d0826e1694995e14290d90ec4.tar.bz2 gentoo-2-286e360d0b49653d0826e1694995e14290d90ec4.zip | |
Use either vala-0.14, or vala-0.18
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/colord/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/colord/colord-0.1.22.ebuild | 24 |
2 files changed, 20 insertions, 10 deletions
diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog index 23e1dfef3472..3218f212c9e1 100644 --- a/x11-misc/colord/ChangeLog +++ b/x11-misc/colord/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-misc/colord # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.33 2012/08/10 19:01:58 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.34 2012/09/08 02:23:08 nirbheek Exp $ + + 08 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> colord-0.1.22.ebuild: + Use either vala-0.14, or vala-0.18 *colord-0.1.22 (10 Aug 2012) @@ -160,4 +163,3 @@ 14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +colord-0.1.11.ebuild, +files/colord-0.1.11-fix-automagic-vala.patch, +metadata.xml: Add colord from the gnome overlay for GNOME 3 - diff --git a/x11-misc/colord/colord-0.1.22.ebuild b/x11-misc/colord/colord-0.1.22.ebuild index d03064cd92dc..0c32096973ab 100644 --- a/x11-misc/colord/colord-0.1.22.ebuild +++ b/x11-misc/colord/colord-0.1.22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.22.ebuild,v 1.1 2012/08/10 19:01:58 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.22.ebuild,v 1.2 2012/09/08 02:23:08 nirbheek Exp $ EAPI="4" @@ -16,6 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="doc examples +gusb +introspection scanner +udev vala" REQUIRED_USE="vala? ( introspection )" +VALA_DEP="|| ( + dev-lang/vala:0.18[vapigen] + >=dev-lang/vala-0.13.4:0.14[vapigen] )" COMMON_DEPEND=" dev-db/sqlite:3 >=dev-libs/glib-2.28.0:2 @@ -24,8 +27,7 @@ COMMON_DEPEND=" gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) - udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) -" + udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )" RDEPEND="${COMMON_DEPEND} media-gfx/shared-color-profiles" DEPEND="${COMMON_DEPEND} @@ -35,10 +37,8 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 - >=dev-util/gtk-doc-1.9 - ) - vala? ( dev-lang/vala:0.14[vapigen] ) -" + >=dev-util/gtk-doc-1.9 ) + vala? ( ${VALA_DEP} )" # FIXME: needs pre-installed dbus service files RESTRICT="test" @@ -58,6 +58,13 @@ src_prepare() { } src_configure() { + local vapigen + if has_version "dev-lang/vala:0.18"; then + vapigen="VAPIGEN=$(type -P vapigen-0.18)" + else + vapigen="VAPIGEN=$(type -P vapigen-0.14)" + fi + # Reverse tools require gusb econf \ --disable-examples \ @@ -74,7 +81,8 @@ src_configure() { $(use_enable udev gudev) \ $(use_enable vala) \ "$(systemd_with_unitdir)" \ - VAPIGEN=$(type -P vapigen-0.14) + ${vapigen} + # parallel make fails in doc/api use doc && MAKEOPTS="${MAKEOPTS} -j1" } |