From 4419e7068665df8b3c80542a6344debfd3717762 Mon Sep 17 00:00:00 2001
From: Bo Ørsted Andresen <zlin@gentoo.org>
Date: Wed, 26 Mar 2008 20:39:05 +0000
Subject: Don't run `use opengl` when OPENGL_REQUIRED is set to always (bug
 #214960).

---
 eclass/kde4-base.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'eclass/kde4-base.eclass')

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 65338c44326a..7956be9c51ca 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.5 2008/03/14 15:51:50 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.6 2008/03/26 20:39:05 zlin Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -271,14 +271,14 @@ kde4-base_pkg_setup() {
 				x11-libs/qt-qt3support:4 debug
 				x11-libs/qt-svg:4 debug
 				x11-libs/qt-test:4 debug"
-			if [[ ${OPENGL_REQUIRED} == always ]] || has opengl ${IUSE//+} && use opengl; then
+			if has opengl ${IUSE//+} && use opengl || [[ ${OPENGL_REQUIRED} == always ]]; then
 				KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
 					x11-libs/qt-opengl:4 debug"
 			fi
 		fi
 	fi
 
-	if [[ ${OPENGL_REQUIRED} == always ]] || has opengl ${IUSE//+} && use opengl; then
+	if has opengl ${IUSE//+} && use opengl || [[ ${OPENGL_REQUIRED} == always ]]; then
 		if has_version '<x11-libs/qt-4.4.0_alpha:4'; then
 			QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
 		fi
-- 
cgit v1.2.3-65-gdbad