Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass
Date: Wed, 28 Oct 2009 15:51:02
Message-Id: E1N3AnZ-00022M-7j@stork.gentoo.org
1 scarabeus 09/10/28 15:50:57
2
3 Modified: kde4-base.eclass
4 Log:
5 Use correct variable name. Effectively reverts abcd's change.
6
7 Revision Changes Path
8 1.52 eclass/kde4-base.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.52&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.52&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.51&r2=1.52
13
14 Index: kde4-base.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
17 retrieving revision 1.51
18 retrieving revision 1.52
19 diff -u -r1.51 -r1.52
20 --- kde4-base.eclass 28 Oct 2009 14:27:17 -0000 1.51
21 +++ kde4-base.eclass 28 Oct 2009 15:50:56 -0000 1.52
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2009 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.51 2009/10/28 14:27:17 abcd Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.52 2009/10/28 15:50:56 scarabeus Exp $
27
28 # @ECLASS: kde4-base.eclass
29 # @MAINTAINER:
30 @@ -13,14 +13,14 @@
31 # NOTE: KDE 4 ebuilds by default define EAPI="2", this can be redefined but
32 # eclass will fail with version older than 2.
33
34 -# @ECLASS-VARIABLE: WANT_CMAKE
35 +# @ECLASS-VARIABLE: CMAKE_REQUIRED
36 # @DESCRIPTION:
37 # Specify if cmake buildsystem is being used. Possible values are 'always' and 'never'.
38 # Please note that if it's set to 'never' you need to explicitly override following phases:
39 # src_configure, src_compile, src_test and src_install.
40 # Defaults to 'always'.
41 -WANT_CMAKE="${WANT_CMAKE:-${CMAKE_REQUIRED:-always}}"
42 -if [[ ${WANT_CMAKE} = false || ${WANT_CMAKE} = never ]]; then
43 +CMAKE_REQUIRED="${CMAKE_REQUIRED:-${CMAKE_REQUIRED:-always}}"
44 +if [[ ${CMAKE_REQUIRED} = false || ${CMAKE_REQUIRED} = never ]]; then
45 buildsystem_eclass=""
46 export_fns=""
47 else