[gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass

[Tomas Chvatal (scarabeus)]

scarabeus    09/06/05 09:48:46

  Modified:             kde4-base.eclass
  Log:
  Adjust the kdedir check for optional/never required kde. Reported by yngwin.

Revision  Changes    Path
1.41                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.40&r2=1.41

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kde4-base.eclass	4 Jun 2009 13:50:10 -0000	1.40
+++ kde4-base.eclass	5 Jun 2009 09:48:46 -0000	1.41
@@ -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 @@
 			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