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 0161D139694 for ; Sun, 21 May 2017 13:04:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2ACB4E0D49; Sun, 21 May 2017 13:04:48 +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 F398AE0D4E for ; Sun, 21 May 2017 13:04:47 +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 99E393416A9 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 353AE745F 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: <1495371395.9b345bc630718eb959890dd7c511210114ba043d.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: 9b345bc630718eb959890dd7c511210114ba043d 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: e0e8642e-5e01-42c8-ace0-d4660ea6c5a6 X-Archives-Hash: 7cb8797f0bfd8070451583873a61007e commit: 9b345bc630718eb959890dd7c511210114ba043d Author: David Seifert gentoo org> AuthorDate: Sun May 21 08:09:50 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 21 12:56:35 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b345bc6 cmake-utils.eclass: Remove WANT_CMAKE and warn users Closes: https://github.com/gentoo/gentoo/pull/4528 eclass/cmake-utils.eclass | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 2b3c8d933d..6ae324093b 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -94,16 +94,6 @@ _CMAKE_UTILS_ECLASS=1 # Use -DCMAKE_INSTALL_PREFIX=... CMake variable instead. : ${PREFIX:=/usr} -# @ECLASS-VARIABLE: WANT_CMAKE -# @DESCRIPTION: -# Specify if cmake-utils eclass should depend on cmake optionally or not. -# This is useful when only part of application is using cmake build system. -# Valid values are: always [default], optional (where the value is the useflag -# used for optionality) -# -# This is banned in EAPI 6 and later. -: ${WANT_CMAKE:=always} - # @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE # @DESCRIPTION: # Specifies an extra cache file to pass to cmake. This is the analog of EXTRA_ECONF @@ -121,23 +111,14 @@ inherit toolchain-funcs multilib ninja-utils flag-o-matic eutils \ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install -CMAKEDEPEND="" -case ${WANT_CMAKE} in - always) - ;; - *) - [[ ${EAPI} == [2345] ]] || die "WANT_CMAKE is banned in EAPI 6 and later" - IUSE+=" ${WANT_CMAKE}" - CMAKEDEPEND+="${WANT_CMAKE}? ( " - ;; -esac +[[ ${WANT_CMAKE} ]] && eqawarn "\${WANT_CMAKE} has been removed and is a no-op now" case ${CMAKE_MAKEFILE_GENERATOR} in emake) - CMAKEDEPEND+=" sys-devel/make" + DEPEND="sys-devel/make" ;; ninja) - CMAKEDEPEND+=" dev-util/ninja" + DEPEND="dev-util/ninja" ;; *) eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}" @@ -146,14 +127,9 @@ case ${CMAKE_MAKEFILE_GENERATOR} in esac if [[ ${PN} != cmake ]]; then - CMAKEDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}" + DEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}" fi -[[ ${WANT_CMAKE} = always ]] || CMAKEDEPEND+=" )" - -DEPEND="${CMAKEDEPEND}" -unset CMAKEDEPEND - # Internal functions used by cmake-utils_use_* _cmake_use_me_now() { debug-print-function ${FUNCNAME} "$@"