diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2012-09-08 02:07:53 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2012-09-08 02:07:53 +0000 |
| commit | 6de018cba166d57a5ad253b6e6a44334701532cb (patch) | |
| tree | 119068352273ec9e572a795ebc230adc25695351 /app-misc/tracker | |
| parent | Remove redundant maintainer from metadata. (diff) | |
| download | gentoo-2-6de018cba166d57a5ad253b6e6a44334701532cb.tar.gz gentoo-2-6de018cba166d57a5ad253b6e6a44334701532cb.tar.bz2 gentoo-2-6de018cba166d57a5ad253b6e6a44334701532cb.zip | |
Use either vala-0.14, or vala-0.18
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/tracker')
| -rw-r--r-- | app-misc/tracker/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/tracker/tracker-0.14.2-r1.ebuild | 17 |
2 files changed, 16 insertions, 7 deletions
diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog index 8d38beba9211..4d9667ad3dda 100644 --- a/app-misc/tracker/ChangeLog +++ b/app-misc/tracker/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-misc/tracker # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.130 2012/07/20 15:47:53 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.131 2012/09/08 02:07:53 nirbheek Exp $ + + 08 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> tracker-0.14.2-r1.ebuild: + Use either vala-0.14, or vala-0.18 *tracker-0.14.2-r1 (20 Jul 2012) *tracker-0.12.10-r1 (20 Jul 2012) @@ -674,4 +677,3 @@ 21 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org> +files/tracker-0.5.2-configure.in.patch, +tracker-0.5.2.ebuild: Initial import, patch and ebuild by Saleem Abdulrasool <compnerd@gentoo.org> - diff --git a/app-misc/tracker/tracker-0.14.2-r1.ebuild b/app-misc/tracker/tracker-0.14.2-r1.ebuild index f79a0cd617a4..59b4f08b771e 100644 --- a/app-misc/tracker/tracker-0.14.2-r1.ebuild +++ b/app-misc/tracker/tracker-0.14.2-r1.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/app-misc/tracker/tracker-0.14.2-r1.ebuild,v 1.1 2012/07/20 15:47:53 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild,v 1.2 2012/09/08 02:07:53 nirbheek Exp $ EAPI="4" GCONF_DEBUG="no" @@ -26,6 +26,9 @@ RESTRICT="test" # vala is built with debug by default (see VALAFLAGS) # According to NEWS, introspection is non-optional # glibc-2.12 needed for SCHED_IDLE (see bug #385003) +VALA_DEP="|| ( + dev-lang/vala:0.18 + >=dev-lang/vala-0.13.4:0.14 )" RDEPEND=" >=app-i18n/enca-1.9 >=dev-db/sqlite-3.7[threadsafe] @@ -93,9 +96,9 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig - applet? ( >=dev-lang/vala-0.13.4:0.14 ) + applet? ( ${VALA_DEP} ) gtk? ( - >=dev-lang/vala-0.13.4:0.14 + ${VALA_DEP} >=dev-libs/libgee-0.3 ) doc? ( app-office/dia @@ -105,7 +108,7 @@ DEPEND="${RDEPEND} >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) " -# strigi? ( >=dev-lang/vala-0.13.4:0.14 ) +# strigi? ( ${VALA_DEP} ) PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )" function inotify_enabled() { @@ -141,7 +144,11 @@ pkg_setup() { # if use applet || use gtk || use strigi; then if use applet || use gtk; then - G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)" + if has_version "dev-lang/vala:0.18"; then + G2CONF="${G2CONF} VALAC=$(type -P valac-0.18)" + else + G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)" + fi fi # if use mp3 && (use gtk || use qt4); then |