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 7E6EF1384B4 for ; Wed, 18 Nov 2015 07:57:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F394021C024; Wed, 18 Nov 2015 07:57:04 +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 95CBA21C024 for ; Wed, 18 Nov 2015 07:57:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31F55340821 for ; Wed, 18 Nov 2015 07:57:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B35FFB6E for ; Wed, 18 Nov 2015 07:56:56 +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: <1447833402.a7e42401bf8048469326bdb75eaf3195e895d9cd.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: a7e42401bf8048469326bdb75eaf3195e895d9cd X-VCS-Branch: master Date: Wed, 18 Nov 2015 07:56:56 +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: 65ef8256-dcc0-4867-a52b-93329ce0a35e X-Archives-Hash: c188edb6db21d971818289efdd8c6e9d commit: a7e42401bf8048469326bdb75eaf3195e895d9cd Author: Michael Palimaka gentoo org> AuthorDate: Wed Nov 18 07:35:13 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Nov 18 07:56:42 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7e42401 kde5.eclass: call default_src_prepare instead of cmake-utils_src_prepare for EAPI 6 and later eclass/kde5.eclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 4253da9..0eb8951 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -527,7 +527,11 @@ kde5_src_prepare() { fi fi - cmake-utils_src_prepare + if [[ ${EAPI} == 5 ]]; then + cmake-utils_src_prepare + else + default_src_prepare + fi } # @FUNCTION: kde5_src_configure