diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-06-05 09:48:46 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-06-05 09:48:46 +0000 |
| commit | 26442c1c78d2cc27c2a05999b891bd9ed1bb4060 (patch) | |
| tree | 7fadd1cf64bd4aa0ff0721cf0ea5964e7d261aad /eclass | |
| parent | usemask pulseaudio on fbsd (diff) | |
| download | historical-26442c1c78d2cc27c2a05999b891bd9ed1bb4060.tar.gz historical-26442c1c78d2cc27c2a05999b891bd9ed1bb4060.tar.bz2 historical-26442c1c78d2cc27c2a05999b891bd9ed1bb4060.zip | |
Adjust the kdedir check for optional/never required kde. Reported by yngwin.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index a054fc8118ab..97dd6a0c0084 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -1,6 +1,6 @@ # Copyright 2007-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.40 2009/06/04 13:50:10 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.41 2009/06/05 09:48:46 scarabeus Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -426,7 +426,14 @@ kde4-base_pkg_setup() { fi done unset slot - [[ -z ${KDEDIR} ]] && die "Failed to determine KDEDIR!" + + # Bail out if kdelibs required but not found + if [[ ${KDE_REQUIRED} = always ]] || { [[ ${KDE_REQUIRED} = optional ]] && use kde; }; then + [[ -z ${KDEDIR} ]] && die "Failed to determine KDEDIR!" + else + [[ -z ${KDEDIR} ]] && KDEDIR="${ROOT}usr" + fi + PREFIX="${PREFIX:-${ROOT}usr}" fi |