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 9CD26138331 for ; Tue, 6 Mar 2018 22:46:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8FB3E09E8; Tue, 6 Mar 2018 22:46:40 +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 88A06E09E8 for ; Tue, 6 Mar 2018 22:46:40 +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 575A7335C31 for ; Tue, 6 Mar 2018 22:46:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A7CCD243 for ; Tue, 6 Mar 2018 22:46:37 +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: <1520375240.f3fbceca1d7c6958364606a545b81c4fbeb194ce.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: f3fbceca1d7c6958364606a545b81c4fbeb194ce X-VCS-Branch: master Date: Tue, 6 Mar 2018 22:46:37 +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: d6729297-8450-4e1b-8c5d-5c6b13bbcbb4 X-Archives-Hash: 5a343628ad42282496c8679d1447939d commit: f3fbceca1d7c6958364606a545b81c4fbeb194ce Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 6 22:27:20 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 6 22:27:20 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f3fbceca cmake-utils.eclass: inherit eutils,multilib only pre-EAPI-7 eclass/cmake-utils.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index de58d37add..814cc78f8d 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -109,8 +109,12 @@ case ${EAPI} in *) die "EAPI=${EAPI:-0} is not supported" ;; esac -inherit toolchain-funcs multilib ninja-utils flag-o-matic eutils \ - multiprocessing versionator xdg-utils +inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing versionator xdg-utils + +case ${EAPI} in + 7) ;; + *) inherit eutils multilib ;; +esac EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install