jer 14/05/06 15:29:03 Modified: ChangeLog cmake-utils.eclass Log: optionaly => optionally
Revision Changes Path 1.1240 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1240&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1240&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1239&r2=1.1240 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1239 retrieving revision 1.1240 diff -u -r1.1239 -r1.1240 --- ChangeLog 4 May 2014 06:13:55 -0000 1.1239 +++ ChangeLog 6 May 2014 15:29:02 -0000 1.1240 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1239 2014/05/04 06:13:55 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1240 2014/05/06 15:29:02 jer Exp $ + + 06 May 2014; Jeroen Roovers <j...@gentoo.org> cmake-utils.eclass: + optionaly => optionally 04 May 2014; Alexandre Rostovtsev <tetrom...@gentoo.org> vala.eclass: Update VALA_MAX_API_VERSION (bug #509222, thanks to Arfrever) and modernize 1.107 eclass/cmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.107&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.107&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?r1=1.106&r2=1.107 Index: cmake-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- cmake-utils.eclass 26 Mar 2014 13:12:39 -0000 1.106 +++ cmake-utils.eclass 6 May 2014 15:29:02 -0000 1.107 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.106 2014/03/26 13:12:39 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.107 2014/05/06 15:29:02 jer Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -22,7 +22,7 @@ # @ECLASS-VARIABLE: WANT_CMAKE # @DESCRIPTION: -# Specify if cmake-utils eclass should depend on cmake optionaly or not. +# Specify if cmake-utils eclass should depend on cmake optionally or not. # This is usefull when only part of aplication is using cmake build system. # Valid values are: always [default], optional (where the value is the useflag # used for optionality) @@ -668,7 +668,7 @@ # @DESCRIPTION: # Apply ebuild and user patches. cmake-utils_src_prepare() { - _execute_optionaly "src_prepare" "$@" + _execute_optionally "src_prepare" "$@" } # @FUNCTION: cmake-utils_src_configure @@ -676,7 +676,7 @@ # General function for configuring with cmake. Default behaviour is to start an # out-of-source build. cmake-utils_src_configure() { - _execute_optionaly "src_configure" "$@" + _execute_optionally "src_configure" "$@" } # @FUNCTION: cmake-utils_src_compile @@ -685,25 +685,25 @@ # EAPI and respectively to configure as well or just compile. # Automatically detects the build type. All arguments are passed to emake. cmake-utils_src_compile() { - _execute_optionaly "src_compile" "$@" + _execute_optionally "src_compile" "$@" } # @FUNCTION: cmake-utils_src_install # @DESCRIPTION: # Function for installing the package. Automatically detects the build type. cmake-utils_src_install() { - _execute_optionaly "src_install" "$@" + _execute_optionally "src_install" "$@" } # @FUNCTION: cmake-utils_src_test # @DESCRIPTION: # Function for testing the package. Automatically detects the build type. cmake-utils_src_test() { - _execute_optionaly "src_test" "$@" + _execute_optionally "src_test" "$@" } # Optionally executes phases based on WANT_CMAKE variable/USE flag. -_execute_optionaly() { +_execute_optionally() { local phase="$1" ; shift if [[ ${WANT_CMAKE} = always ]]; then enable_cmake-utils_${phase} "$@"