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 B42E21380DC for ; Wed, 5 Feb 2014 14:07:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5331E0BEE; Wed, 5 Feb 2014 14:07:31 +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 2B869E0BEE for ; Wed, 5 Feb 2014 14:07:31 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4808A33F915 for ; Wed, 5 Feb 2014 14:07:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 3CE8B18875 for ; Wed, 5 Feb 2014 14:07:27 +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: <1391609115.284fb39ac904067620114bf267b6816fe6ea18b3.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: 284fb39ac904067620114bf267b6816fe6ea18b3 X-VCS-Branch: master Date: Wed, 5 Feb 2014 14:07:27 +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: 188b2766-af7c-49e6-aa25-e35f25587dbe X-Archives-Hash: 15180d92727541d2e1b6ee62632302e5 commit: 284fb39ac904067620114bf267b6816fe6ea18b3 Author: Michael Palimaka gentoo org> AuthorDate: Wed Feb 5 14:05:15 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Feb 5 14:05:15 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=284fb39a [eclass] Simply supported EAPI logic. --- eclass/cmake-utils.eclass | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index e74ce50..b72454b 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -68,13 +68,12 @@ case ${WANT_CMAKE} in esac inherit toolchain-funcs multilib flag-o-matic eutils -CMAKE_EXPF="src_compile src_test src_install" case ${EAPI:-0} in - 2|3|4|5) CMAKE_EXPF+=" src_prepare src_configure" ;; - 1|0) eerror "cmake-utils no longer supports EAPI 0-1." && die - ;; - *) die "Unknown EAPI, bug eclass maintainers." ;; + 2|3|4|5) : ;; + *) die "EAPI=${EAPI} is not supported" ;; esac + +CMAKE_EXPF="src_prepare src_configure src_compile src_test src_install" EXPORT_FUNCTIONS ${CMAKE_EXPF} case ${CMAKE_MAKEFILE_GENERATOR} in