diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2004-03-25 01:25:56 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2004-03-25 01:25:56 +0000 |
| commit | b2d1358f7f48b466c6a1235fd50dbd962cbef284 (patch) | |
| tree | 34600379644eb6ce2603a6d77cdae09e7df64f09 /eclass/gtk-engines2.eclass | |
| parent | Marked stable on sparc. (diff) | |
| download | historical-b2d1358f7f48b466c6a1235fd50dbd962cbef284.tar.gz historical-b2d1358f7f48b466c6a1235fd50dbd962cbef284.tar.bz2 historical-b2d1358f7f48b466c6a1235fd50dbd962cbef284.zip | |
fix newdepend and ternary syntax
Diffstat (limited to 'eclass/gtk-engines2.eclass')
| -rw-r--r-- | eclass/gtk-engines2.eclass | 10 |
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 |