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 CB3D9139694 for ; Tue, 23 May 2017 18:33:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E4A621C038; Tue, 23 May 2017 18:33:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1DE4021C038 for ; Tue, 23 May 2017 18:33:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 F3D11341753 for ; Tue, 23 May 2017 18:32:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95CF97454 for ; Tue, 23 May 2017 18:32:58 +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: <1495564347.848961434ef67e449f44476f69da3caebee9b9b0.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: 848961434ef67e449f44476f69da3caebee9b9b0 X-VCS-Branch: master Date: Tue, 23 May 2017 18:32:58 +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: c9ba4457-69a8-46ed-9485-9011cf9f1b32 X-Archives-Hash: 2ce25e74a793521dc6a46db9403574ee commit: 848961434ef67e449f44476f69da3caebee9b9b0 Author: Michał Górny gentoo org> AuthorDate: Sun May 21 13:45:30 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue May 23 18:32:27 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=84896143 cmake-utils.eclass: Remove redundant enable_cmake-* functions Closes: https://github.com/gentoo/gentoo/pull/4702 eclass/cmake-utils.eclass | 64 ++++++++++++++++------------------------------- 1 file changed, 22 insertions(+), 42 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index faf6cdb0b7..dbb12f25f3 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -421,7 +421,10 @@ _cmake_cleanup_cmake() { _cmake_modify-cmakelists } -enable_cmake-utils_src_prepare() { +# @FUNCTION: cmake-utils_src_prepare +# @DESCRIPTION: +# Apply ebuild and user patches. +cmake-utils_src_prepare() { debug-print-function ${FUNCNAME} "$@" pushd "${S}" > /dev/null || die @@ -455,7 +458,11 @@ enable_cmake-utils_src_prepare() { # } # @CODE -enable_cmake-utils_src_configure() { +# @FUNCTION: cmake-utils_src_configure +# @DESCRIPTION: +# General function for configuring with cmake. Default behaviour is to start an +# out-of-source build. +cmake-utils_src_configure() { debug-print-function ${FUNCNAME} "$@" [[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake @@ -643,7 +650,11 @@ enable_cmake-utils_src_configure() { popd > /dev/null || die } -enable_cmake-utils_src_compile() { +# @FUNCTION: cmake-utils_src_compile +# @DESCRIPTION: +# General function for compiling with cmake. +# Automatically detects the build type. All arguments are passed to emake. +cmake-utils_src_compile() { debug-print-function ${FUNCNAME} "$@" cmake-utils_src_make "$@" @@ -693,7 +704,10 @@ cmake-utils_src_make() { popd > /dev/null || die } -enable_cmake-utils_src_test() { +# @FUNCTION: cmake-utils_src_test +# @DESCRIPTION: +# Function for testing the package. Automatically detects the build type. +cmake-utils_src_test() { debug-print-function ${FUNCNAME} "$@" _cmake_check_build_dir @@ -726,7 +740,10 @@ enable_cmake-utils_src_test() { fi } -enable_cmake-utils_src_install() { +# @FUNCTION: cmake-utils_src_install +# @DESCRIPTION: +# Function for installing the package. Automatically detects the build type. +cmake-utils_src_install() { debug-print-function ${FUNCNAME} "$@" _cmake_check_build_dir @@ -739,41 +756,4 @@ enable_cmake-utils_src_install() { popd > /dev/null || die } -# @FUNCTION: cmake-utils_src_prepare -# @DESCRIPTION: -# Apply ebuild and user patches. -cmake-utils_src_prepare() { - enable_cmake-utils_src_prepare "$@" -} - -# @FUNCTION: cmake-utils_src_configure -# @DESCRIPTION: -# General function for configuring with cmake. Default behaviour is to start an -# out-of-source build. -cmake-utils_src_configure() { - enable_cmake-utils_src_configure "$@" -} - -# @FUNCTION: cmake-utils_src_compile -# @DESCRIPTION: -# General function for compiling with cmake. -# Automatically detects the build type. All arguments are passed to emake. -cmake-utils_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() { - 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() { - enable_cmake-utils_src_install "$@" -} - fi