From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B4BC139696 for ; Sun, 21 May 2017 13:04:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 383FEE0D5E; Sun, 21 May 2017 13:04:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 112DAE0D5E for ; Sun, 21 May 2017 13:04:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1B263416D7 for ; Sun, 21 May 2017 13:04:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 780E77462 for ; Sun, 21 May 2017 13:04:45 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1495371830.7b27f5b52fe1e215e3e203415b3ca833843fe63f.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7b27f5b52fe1e215e3e203415b3ca833843fe63f X-VCS-Branch: master Date: Sun, 21 May 2017 13:04:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2f9788e3-e196-40ad-af04-d1921f6038d9 X-Archives-Hash: 2ba77cba124e3bf1fd350b4b3341c1a3 commit: 7b27f5b52fe1e215e3e203415b3ca833843fe63f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 21 11:53:34 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 21 13:03:50 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7b27f5b5 cmake-utils.eclass: Drop _cmake_execute_optionally after WANT_CMAKE Follow-up to d741b4ef5054c8800b97748ef8caa11ad910d784 eclass/cmake-utils.eclass | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 08057d812d..faf6cdb0b7 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -743,7 +743,7 @@ enable_cmake-utils_src_install() { # @DESCRIPTION: # Apply ebuild and user patches. cmake-utils_src_prepare() { - _cmake_execute_optionally "src_prepare" "$@" + enable_cmake-utils_src_prepare "$@" } # @FUNCTION: cmake-utils_src_configure @@ -751,7 +751,7 @@ cmake-utils_src_prepare() { # General function for configuring with cmake. Default behaviour is to start an # out-of-source build. cmake-utils_src_configure() { - _cmake_execute_optionally "src_configure" "$@" + enable_cmake-utils_src_configure "$@" } # @FUNCTION: cmake-utils_src_compile @@ -759,31 +759,21 @@ cmake-utils_src_configure() { # General function for compiling with cmake. # Automatically detects the build type. All arguments are passed to emake. cmake-utils_src_compile() { - _cmake_execute_optionally "src_compile" "$@" + enable_cmake-utils_src_compile "$@" } # @FUNCTION: cmake-utils_src_test # @DESCRIPTION: # Function for testing the package. Automatically detects the build type. cmake-utils_src_test() { - _cmake_execute_optionally "src_test" "$@" + enable_cmake-utils_src_test "$@" } # @FUNCTION: cmake-utils_src_install # @DESCRIPTION: # Function for installing the package. Automatically detects the build type. cmake-utils_src_install() { - _cmake_execute_optionally "src_install" "$@" -} - -# Optionally executes phases based on WANT_CMAKE variable/USE flag. -_cmake_execute_optionally() { - local phase="$1" ; shift - if [[ ${WANT_CMAKE} = always ]]; then - enable_cmake-utils_${phase} "$@" - else - use ${WANT_CMAKE} && enable_cmake-utils_${phase} "$@" - fi + enable_cmake-utils_src_install "$@" } fi