diff options
| author |   Dan Armak <danarmak@gentoo.org> | 2002-11-23 16:53:03 +0000 |
|---|---|---|
| committer | Dan Armak <danarmak@gentoo.org> | 2002-11-23 16:53:03 +0000 |
| commit | 10c688a05c6d2c3ef84e9b4c88a1bb2cd5798e23 (patch) | |
| tree | c07e0f44b1a972db291579bbb89acccc66b1d940 /eclass | |
| parent | Unmasked zope. (diff) | |
| download | gentoo-2-10c688a05c6d2c3ef84e9b4c88a1bb2cd5798e23.tar.gz gentoo-2-10c688a05c6d2c3ef84e9b4c88a1bb2cd5798e23.tar.bz2 gentoo-2-10c688a05c6d2c3ef84e9b4c88a1bb2cd5798e23.zip | |
add dep on >=automake-1.6.3 on ppc or kde 3.1, as reported by doctomoe. also stop using newdepend /autotools.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde-functions.eclass | 4 | ||||
| -rw-r--r-- | eclass/kde.eclass | 24 |
2 files changed, 18 insertions, 10 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index aafaf0488dd4..573c6193f36d 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.eclass @@ -1,7 +1,7 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 # Author Dan Armak <danarmak@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.43 2002/11/19 12:16:46 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.44 2002/11/23 16:53:03 danarmak Exp $ # This contains everything except things that modify ebuild variables and functions (e.g. $P, src_compile() etc.) ECLASS=kde-functions @@ -146,8 +146,6 @@ set-kdedir() { IFS="$IFSBACKUP" debug-print "$FUNCNAME: version breakup: KDEMAJORVER=$KDEMAJORVER KDEMINORVER=$KDEMINORVER KDEREVISION=$KDEREVISION" - - # install prefix if [ -n "$KDEPREFIX" ]; then export PREFIX="$KDEPREFIX" diff --git a/eclass/kde.eclass b/eclass/kde.eclass index ea8a0e3e2967..fd02fdec8a8d 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.eclass @@ -1,12 +1,15 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 # Author Dan Armak <danarmak@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.64 2002/11/01 11:16:45 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.65 2002/11/23 16:53:03 danarmak Exp $ # The kde eclass is inherited by all kde-* eclasses. Few ebuilds inherit straight from here. - inherit base kde-functions ECLASS=kde INHERITED="$INHERITED $ECLASS" +IUSE="$IUSE ppc" + +DESCRIPTION="Based on the $ECLASS eclass" +HOMEPAGE="http://www.kde.org/" # is this a kde-base ebuid? case $PN in @@ -26,13 +29,20 @@ case $PN in ;; esac -newdepend /autotools +# deps on the build tools +if [ -n "$KDEBASE" -a -n "`use x86`" -a "${PV//3.1}" != "$PV" ]; then + DEPEND="$DEPEND >=sys-devel/automake-1.6.3" + einfo "foobar" +else + DEPEND="$DEPEND sys-devel/automake" + einfo "not foobar" +fi +DEPEND="$DEPEND sys-devel/autoconf sys-devel/make" + +# all kde apps need this one newdepend "~kde-base/kde-env-3" -DESCRIPTION="Based on the $ECLASS eclass" -HOMEPAGE="http://www.kde.org/" - -# overridden in other places like kde-dist, kde-source and individual ebuilds +# overridden in other places like kde-dist, kde-source and some individual ebuilds SLOT="0" kde_src_compile() { |