From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5F44A58973 for ; Sun, 17 Jan 2016 11:48:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4C0321C01C; Sun, 17 Jan 2016 11:48:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60E3C21C01C for ; Sun, 17 Jan 2016 11:48:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50635340862 for ; Sun, 17 Jan 2016 11:48:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 090D6CFB for ; Sun, 17 Jan 2016 11:48:44 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1453031306.27d9b2c35be819c77cc42edea9f894a4ef04782b.kensington@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: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 27d9b2c35be819c77cc42edea9f894a4ef04782b X-VCS-Branch: master Date: Sun, 17 Jan 2016 11:48:44 +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: ac862718-9152-453f-9fc6-ed3b9ba0810f X-Archives-Hash: fe387cfedd910b990262f3c97a24ee0b commit: 27d9b2c35be819c77cc42edea9f894a4ef04782b Author: Michael Palimaka gentoo org> AuthorDate: Sun Jan 17 11:48:26 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Jan 17 11:48:26 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=27d9b2c3 cmake-utils.eclass: ban helper functions in EAPI 6 and later eclass/cmake-utils.eclass | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index ee6098e..0190ae4 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -161,6 +161,11 @@ unset CMAKEDEPEND _use_me_now() { debug-print-function ${FUNCNAME} "$@" + local arg=$2 + [[ ! -z $3 ]] && arg=$3 + + has "${EAPI:-0}" 2 3 4 5 || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" instead" + local uper capitalised x [[ -z $2 ]] && die "cmake-utils_use-$1 []" if [[ ! -z $3 ]]; then @@ -178,6 +183,13 @@ _use_me_now() { _use_me_now_inverted() { debug-print-function ${FUNCNAME} "$@" + local arg=$2 + [[ ! -z $3 ]] && arg=$3 + + if ! has "${EAPI:-0}" 2 3 4 5 && [[ "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then + die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" insteadss" + fi + local uper capitalised x [[ -z $2 ]] && die "cmake-utils_use-$1 []" if [[ ! -z $3 ]]; then