summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2004-03-25 01:25:56 +0000
committerAlastair Tse <liquidx@gentoo.org>2004-03-25 01:25:56 +0000
commitb8259694de5553264f94fdecace0758157c7da62 (patch)
treed037d23f45c4beed69ec9053e4ec83392a1131f8 /eclass
parentMarked stable on sparc. (Manifest recommit) (diff)
downloadgentoo-2-b8259694de5553264f94fdecace0758157c7da62.tar.gz
gentoo-2-b8259694de5553264f94fdecace0758157c7da62.tar.bz2
gentoo-2-b8259694de5553264f94fdecace0758157c7da62.zip
fix newdepend and ternary syntax
Diffstat (limited to 'eclass')
-rw-r--r--eclass/gtk-engines2.eclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/gtk-engines2.eclass b/eclass/gtk-engines2.eclass
index c8741fde36ff..31fe3403f574 100644
--- a/eclass/gtk-engines2.eclass
+++ b/eclass/gtk-engines2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-engines2.eclass,v 1.6 2004/02/01 13:11:08 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-engines2.eclass,v 1.7 2004/03/25 01:25:56 liquidx Exp $
# Author: Alastair Tse <liquidx@gentoo.org>
#
@@ -63,11 +63,11 @@ fi
# --- define some deps for binary packages
if [ -n "${HAS_GTK1}" -a ! -n "${HAS_GTK2}" ]; then
- newdepend "=x11-libs/gtk+-1.2*"
+ DEPEND="${DEPEND} =x11-libs/gtk+-1.2*"
elif [ -n "${HAS_GTK1}" -a -n "${HAS_GTK2}" ]; then
- newdepend "=x11-libs/gtk+-1.2*" "=x11-libs/gtk+-2*"
+ DEPEND="${DEPEND} =x11-libs/gtk+-1.2* =x11-libs/gtk+-2*"
elif [ ! -n "${HAS_GTK1}" -a -n "${HAS_GTK2}" ]; then
- newdepend ">=x11-libs/gtk+-2"
+ DEPEND="${DEPEND} >=x11-libs/gtk+-2"
fi
# --- if we don't have any gtk version, we depend on USE flags to tell us
@@ -75,7 +75,7 @@ fi
# --- tell us what DEPEND it wants.
if ! has_version "x11-libs/gtk+"; then
- newdepend "gtk2? ( >=x11-libs/gtk+-2 ) : ( =x11-libs/gtk+-1.2* )"
+ DEPEND="gtk2? ( >=x11-libs/gtk+-2 ) !gtk2? ( =x11-libs/gtk+-1.2* )"
use gtk2 \
&& HAS_GTK2=1 \
|| HAS_GTK1=1