Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog cmake-utils.eclass
Date: Tue, 06 May 2014 15:29:06
Message-Id: 20140506152903.22D982004C@flycatcher.gentoo.org
1 jer 14/05/06 15:29:03
2
3 Modified: ChangeLog cmake-utils.eclass
4 Log:
5 optionaly => optionally
6
7 Revision Changes Path
8 1.1240 eclass/ChangeLog
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1240&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1240&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1239&r2=1.1240
13
14 Index: ChangeLog
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
17 retrieving revision 1.1239
18 retrieving revision 1.1240
19 diff -u -r1.1239 -r1.1240
20 --- ChangeLog 4 May 2014 06:13:55 -0000 1.1239
21 +++ ChangeLog 6 May 2014 15:29:02 -0000 1.1240
22 @@ -1,6 +1,9 @@
23 # ChangeLog for eclass directory
24 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1239 2014/05/04 06:13:55 tetromino Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1240 2014/05/06 15:29:02 jer Exp $
27 +
28 + 06 May 2014; Jeroen Roovers <jer@g.o> cmake-utils.eclass:
29 + optionaly => optionally
30
31 04 May 2014; Alexandre Rostovtsev <tetromino@g.o> vala.eclass:
32 Update VALA_MAX_API_VERSION (bug #509222, thanks to Arfrever) and modernize
33
34
35
36 1.107 eclass/cmake-utils.eclass
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.107&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.107&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?r1=1.106&r2=1.107
41
42 Index: cmake-utils.eclass
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v
45 retrieving revision 1.106
46 retrieving revision 1.107
47 diff -u -r1.106 -r1.107
48 --- cmake-utils.eclass 26 Mar 2014 13:12:39 -0000 1.106
49 +++ cmake-utils.eclass 6 May 2014 15:29:02 -0000 1.107
50 @@ -1,6 +1,6 @@
51 # Copyright 1999-2014 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.106 2014/03/26 13:12:39 kensington Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.107 2014/05/06 15:29:02 jer Exp $
55
56 # @ECLASS: cmake-utils.eclass
57 # @MAINTAINER:
58 @@ -22,7 +22,7 @@
59
60 # @ECLASS-VARIABLE: WANT_CMAKE
61 # @DESCRIPTION:
62 -# Specify if cmake-utils eclass should depend on cmake optionaly or not.
63 +# Specify if cmake-utils eclass should depend on cmake optionally or not.
64 # This is usefull when only part of aplication is using cmake build system.
65 # Valid values are: always [default], optional (where the value is the useflag
66 # used for optionality)
67 @@ -668,7 +668,7 @@
68 # @DESCRIPTION:
69 # Apply ebuild and user patches.
70 cmake-utils_src_prepare() {
71 - _execute_optionaly "src_prepare" "$@"
72 + _execute_optionally "src_prepare" "$@"
73 }
74
75 # @FUNCTION: cmake-utils_src_configure
76 @@ -676,7 +676,7 @@
77 # General function for configuring with cmake. Default behaviour is to start an
78 # out-of-source build.
79 cmake-utils_src_configure() {
80 - _execute_optionaly "src_configure" "$@"
81 + _execute_optionally "src_configure" "$@"
82 }
83
84 # @FUNCTION: cmake-utils_src_compile
85 @@ -685,25 +685,25 @@
86 # EAPI and respectively to configure as well or just compile.
87 # Automatically detects the build type. All arguments are passed to emake.
88 cmake-utils_src_compile() {
89 - _execute_optionaly "src_compile" "$@"
90 + _execute_optionally "src_compile" "$@"
91 }
92
93 # @FUNCTION: cmake-utils_src_install
94 # @DESCRIPTION:
95 # Function for installing the package. Automatically detects the build type.
96 cmake-utils_src_install() {
97 - _execute_optionaly "src_install" "$@"
98 + _execute_optionally "src_install" "$@"
99 }
100
101 # @FUNCTION: cmake-utils_src_test
102 # @DESCRIPTION:
103 # Function for testing the package. Automatically detects the build type.
104 cmake-utils_src_test() {
105 - _execute_optionaly "src_test" "$@"
106 + _execute_optionally "src_test" "$@"
107 }
108
109 # Optionally executes phases based on WANT_CMAKE variable/USE flag.
110 -_execute_optionaly() {
111 +_execute_optionally() {
112 local phase="$1" ; shift
113 if [[ ${WANT_CMAKE} = always ]]; then
114 enable_cmake-utils_${phase} "$@"