summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2012-09-08 02:36:40 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2012-09-08 02:36:40 +0000
commit9fb6fb286f18adbf2c53dd32d6c8ff1ee332514a (patch)
treeb1ba9daab962544ab66a08c40bb739ce99a6bd0e /x11-misc/alltray
parentStable arm, bug #434210 (diff)
downloadgentoo-2-9fb6fb286f18adbf2c53dd32d6c8ff1ee332514a.tar.gz
gentoo-2-9fb6fb286f18adbf2c53dd32d6c8ff1ee332514a.tar.bz2
gentoo-2-9fb6fb286f18adbf2c53dd32d6c8ff1ee332514a.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/alltray')
-rw-r--r--x11-misc/alltray/ChangeLog6
-rw-r--r--x11-misc/alltray/alltray-0.7.5.1.ebuild11
2 files changed, 12 insertions, 5 deletions
diff --git a/x11-misc/alltray/ChangeLog b/x11-misc/alltray/ChangeLog
index 6309dd823762..05d2ac37a387 100644
--- a/x11-misc/alltray/ChangeLog
+++ b/x11-misc/alltray/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/alltray
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alltray/ChangeLog,v 1.45 2012/05/05 04:53:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alltray/ChangeLog,v 1.46 2012/09/08 02:36:40 nirbheek Exp $
+
+ 08 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> alltray-0.7.5.1.ebuild:
+ Use either vala-0.14, or vala-0.18
05 May 2012; Jeff Horelick <jdhore@gentoo.org> alltray-0.7.4.ebuild,
alltray-0.7.5.1.ebuild:
@@ -189,4 +192,3 @@
+alltray-0.3.ebuild:
Initial commit, ebuild written by me. Requested by Christian Lemke
<christian.lemke@stud.tu-ilmenau.de> in bug #77483.
-
diff --git a/x11-misc/alltray/alltray-0.7.5.1.ebuild b/x11-misc/alltray/alltray-0.7.5.1.ebuild
index 31d6308ee604..e7f97cee04e7 100644
--- a/x11-misc/alltray/alltray-0.7.5.1.ebuild
+++ b/x11-misc/alltray/alltray-0.7.5.1.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/alltray/alltray-0.7.5.1.ebuild,v 1.6 2012/05/05 04:53:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alltray/alltray-0.7.5.1.ebuild,v 1.7 2012/09/08 02:36:40 nirbheek Exp $
EAPI=4
inherit autotools
@@ -24,7 +24,8 @@ RDEPEND="dev-libs/glib:2
x11-libs/libXpm
x11-libs/libwnck:1"
DEPEND="${RDEPEND}
- dev-lang/vala:0.14
+ || ( dev-lang/vala:0.18
+ dev-lang/vala:0.14 )
virtual/pkgconfig"
S=${WORKDIR}/${MY_P}
@@ -40,7 +41,11 @@ src_prepare() {
-e '/Icon/s:.png::' \
data/alltray.desktop{,.in} || die
- sed -i -e '/AC_PATH_PROG/s:valac:valac-0.14:g' configure.ac || die
+ if has_version "dev-lang/vala:0.18"; then
+ sed -i -e '/AC_PATH_PROG/s:valac:valac-0.18:g' configure.ac || die
+ else
+ sed -i -e '/AC_PATH_PROG/s:valac:valac-0.14:g' configure.ac || die
+ fi
eautoreconf
}