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 94B611388C1 for ; Wed, 18 Nov 2015 08:11:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF69A21C032; Wed, 18 Nov 2015 08:11:14 +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 78D6C21C032 for ; Wed, 18 Nov 2015 08:11:14 +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 61D913407D2 for ; Wed, 18 Nov 2015 08:11:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3DA7ABE for ; Wed, 18 Nov 2015 08:11:10 +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: <1447834182.6017849b497d96ff17184ec3c3211665bc7e1a1e.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: 6017849b497d96ff17184ec3c3211665bc7e1a1e X-VCS-Branch: master Date: Wed, 18 Nov 2015 08:11:10 +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: 968bfd49-9041-4976-a329-c9011be6df18 X-Archives-Hash: 1fd84b292ed7d1a492082962ca62a88e commit: 6017849b497d96ff17184ec3c3211665bc7e1a1e Author: Michael Palimaka gentoo org> AuthorDate: Wed Nov 18 08:09:42 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Nov 18 08:09:42 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6017849b Revert "kde5.eclass: call default_src_prepare instead of cmake-utils_src_prepare for EAPI 6 and later" cmake-utils.eclass will move toolchain preparatione etc. into src_prepare from EAPI 6 This reverts commit a7e42401bf8048469326bdb75eaf3195e895d9cd. eclass/kde5.eclass | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 0eb8951..4253da9 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -527,11 +527,7 @@ kde5_src_prepare() { fi fi - if [[ ${EAPI} == 5 ]]; then - cmake-utils_src_prepare - else - default_src_prepare - fi + cmake-utils_src_prepare } # @FUNCTION: kde5_src_configure