Gentoo Archives: gentoo-commits

From: "Caleb Tennis (caleb)" <caleb@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
Date: Sat, 05 Jan 2008 18:44:46
Message-Id: E1JBE0c-0002BS-TX@stork.gentoo.org
1 caleb 08/01/05 18:44:38
2
3 Modified: qt4.eclass
4 Log:
5 Fixes from bug #203955
6
7 Revision Changes Path
8 1.32 eclass/qt4.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.32&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.32&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.31&r2=1.32
13
14 Index: qt4.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
17 retrieving revision 1.31
18 retrieving revision 1.32
19 diff -u -r1.31 -r1.32
20 --- qt4.eclass 31 Dec 2007 18:55:53 -0000 1.31
21 +++ qt4.eclass 5 Jan 2008 18:44:38 -0000 1.32
22 @@ -1,6 +1,6 @@
23 # Copyright 2005 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.31 2007/12/31 18:55:53 caleb Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.32 2008/01/05 18:44:38 caleb Exp $
27
28 # @ECLASS: qt4.eclass
29 # @MAINTAINER:
30 @@ -99,17 +99,17 @@
31
32 if ! has_version x11-libs/qt-${x}; then
33 eerror "You must first install the x11-libs/qt-${x} package."
34 - die
35 + die "Install x11-libs/qt-${x}"
36 fi
37 - elif [ ${x} == ssl ]; then
38 - if [ ! has_version x11-libs/qt-core || ! built_with_use x11-libs/qt-core ssl ]; then
39 + elif [[ ${x} == ssl ]]; then
40 + if ! has_version x11-libs/qt-core || ! built_with_use x11-libs/qt-core ssl; then
41 eerror "You must first install the x11-libs/qt-core package with the ssl flag enabled."
42 - die
43 + die "Install x1-libs/qt-core with USE=\"ssl\""
44 fi
45 - elif [ ${x} == sqlite3 ]; then
46 - if [ ! has_version x11-libs/qt-sql || ! built_with_use x11-libs/qt-sql sqlite ]; then
47 + elif [[ ${x} == sqlite3 ]]; then
48 + if ! has_version x11-libs/qt-sql || ! built_with_use x11-libs/qt-sql sqlite; then
49 eerror "You must first install the x11-libs/qt-sql package with the sqlite flag enabled."
50 - die
51 + die "Install x11-libs/qt-sql with USE="\sqlite\""
52 fi
53 fi
54 elif ! built_with_use =x11-libs/qt-4* ${x}; then
55
56
57
58 --
59 gentoo-commits@g.o mailing list