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 230D3139070 for ; Fri, 18 May 2018 21:53:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BA65E0A5E; Fri, 18 May 2018 21:53:12 +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 42F43E095C for ; Fri, 18 May 2018 21:53:12 +0000 (UTC) Received: from pomiot (d202-252.icpnet.pl [109.173.202.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id DE5A3335C51; Fri, 18 May 2018 21:53:09 +0000 (UTC) Message-ID: <1526680386.12336.0.camel@gentoo.org> Subject: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: eclass/ From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org, Andreas Sturmlechner Date: Fri, 18 May 2018 23:53:06 +0200 In-Reply-To: <1526675772.d780c05e4459175eb314c82de9f3b998e2b4fc6e.asturm@gentoo> References: <1526675772.d780c05e4459175eb314c82de9f3b998e2b4fc6e.asturm@gentoo> Organization: Gentoo Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.24.6 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: fea08224-7c66-499c-adba-6bf1d016a95a X-Archives-Hash: 3e665c12fabb6b39251866535c1ffaa4 W dniu pią, 18.05.2018 o godzinie 20∶36 +0000, użytkownik Andreas Sturmlechner napisał: > commit: d780c05e4459175eb314c82de9f3b998e2b4fc6e > Author: Andreas Sturmlechner gentoo org> > AuthorDate: Thu May 10 20:42:15 2018 +0000 > Commit: Andreas Sturmlechner gentoo org> > CommitDate: Fri May 18 20:36:12 2018 +0000 > URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d780c05e > > 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 3302f27608b..cbce280625e 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 One of the reasons we do mailing list reviews of widely used eclasses is to let people tell you that you've left 'version_is_at_least' here. > includes="" > fi > elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then > -- Best regards, Michał Górny