diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2003-08-31 01:55:49 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2003-08-31 01:55:49 +0000 |
| commit | da6646e6dbbf8d7e911949cb5c3cd71613e32acd (patch) | |
| tree | 010135f90d0bb621adcb1ed8a41c98051939c6aa /eclass | |
| parent | added pkgconfig dep (diff) | |
| download | gentoo-2-da6646e6dbbf8d7e911949cb5c3cd71613e32acd.tar.gz gentoo-2-da6646e6dbbf8d7e911949cb5c3cd71613e32acd.tar.bz2 gentoo-2-da6646e6dbbf8d7e911949cb5c3cd71613e32acd.zip | |
slight modifications to all depending on both gtk1 and gtk2 at the same time
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/gtk-engines2.eclass | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/eclass/gtk-engines2.eclass b/eclass/gtk-engines2.eclass index 10a9cbc0bf5c..6522270e6349 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.4 2003/07/18 22:48:15 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-engines2.eclass,v 1.5 2003/08/31 01:55:49 liquidx Exp $ # Author: Alastair Tse <liquidx@gentoo.org> # @@ -62,11 +62,11 @@ if has_version ">=x11-libs/gtk+-2" || use gtk2; then fi # --- define some deps for binary packages -if has_version "=x11-libs/gtk+-1.2*" && ! has_version ">=x11-libs/gtk+-2"; then +if [ -n "${HAS_GTK1}" -a ! -n "${HAS_GTK2}" ]; then newdepend "=x11-libs/gtk+-1.2*" -elif has_version "=x11-libs/gtk+-1.2*" && has_version ">=x11-libs/gtk+-2"; then - newdepend ">=x11-libs/gtk+-1.2" -elif ! has_version "=x11-libs/gtk+-1.2*" && has_version ">=x11-libs/gtk+-2"; then +elif [ -n "${HAS_GTK1}" -a -n "${HAS_GTK2}" ]; then + newdepend "=x11-libs/gtk+-1.2*" "=x11-libs/gtk+-2*" +elif [ ! -n "${HAS_GTK1}" -a -n "${HAS_GTK2}" ]; then newdepend ">=x11-libs/gtk+-2" fi @@ -76,6 +76,9 @@ fi if ! has_version "x11-libs/gtk+"; then newdepend "gtk2? ( >=x11-libs/gtk+-2 ) : ( =x11-libs/gtk+-1.2* )" + use gtk2 \ + && HAS_GTK2=1 \ + || HAS_GTK1=1 fi # --- if GTK1_S and GTK2_S is set, then we do both themes, |