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 0C9C51382C5 for ; Sun, 13 May 2018 22:48:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68D5CE083E; Sun, 13 May 2018 22:48:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 471A9E083E for ; Sun, 13 May 2018 22:48:22 +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 670A8335C2C for ; Sun, 13 May 2018 22:48:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F29E73D for ; Sun, 13 May 2018 22:48:19 +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: <1526251667.1720b64eb22950db744a0bfe2e8726457d7b3819.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: 1720b64eb22950db744a0bfe2e8726457d7b3819 X-VCS-Branch: master Date: Sun, 13 May 2018 22:48:19 +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: a0d0ffc0-af7d-48f7-ac0c-5d0f362174a7 X-Archives-Hash: 218e6405ed0061ea58797c25943b8718 commit: 1720b64eb22950db744a0bfe2e8726457d7b3819 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 10 20:42:15 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 13 22:47:47 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1720b64e cmake-utils.eclass: Switch to eapi7-ver eclass/cmake-utils.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 3302f27608..cbce280625 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -109,11 +109,11 @@ case ${EAPI} in *) die "EAPI=${EAPI:-0} is not supported" ;; esac -inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing versionator xdg-utils +inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils case ${EAPI} in 7) ;; - *) inherit eutils multilib ;; + *) inherit eapi7-ver eutils multilib ;; esac EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install @@ -512,7 +512,7 @@ cmake-utils_src_configure() { # we need to add "" local includes= if [[ ${PN} == cmake ]] ; then - if $(version_is_at_least 3.4.0 $(get_version_component_range 1-3 ${PV})) ; then + if $(version_is_at_least 3.4.0 $(ver_cut 1-3 ${PV})) ; then includes="" fi elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then