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 E6A811384B4 for ; Sun, 22 Nov 2015 08:38:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37D3021C040; Sun, 22 Nov 2015 08:38:50 +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 0F02921C03C for ; Sun, 22 Nov 2015 08:38:49 +0000 (UTC) Received: from pomiot (d202-251.icpnet.pl [109.173.202.251]) (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 C7096340755; Sun, 22 Nov 2015 08:38:46 +0000 (UTC) Date: Sun, 22 Nov 2015 09:38:38 +0100 From: =?UTF-8?B?TWljaGHFgiBHw7Nybnk=?= To: "Michael Sterrett" Cc: gentoo-dev@lists.gentoo.org, qa@gentoo.org Subject: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: eclass/ Message-ID: <20151122093838.0b548d61.mgorny@gentoo.org> In-Reply-To: <1448180855.a144d7480f781f21323943d87e6a56136add3830.mr_bones_@gentoo> References: <1448180855.a144d7480f781f21323943d87e6a56136add3830.mr_bones_@gentoo> Organization: Gentoo X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) 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-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/GKxAHsmuO+zp6C+lzRtWhJt"; protocol="application/pgp-signature" X-Archives-Salt: f63c914a-700b-421a-9bc5-2a5d904f49c3 X-Archives-Hash: 37094a3177e6a938254173595775521a --Sig_/GKxAHsmuO+zp6C+lzRtWhJt Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Sun, 22 Nov 2015 08:27:47 +0000 (UTC) "Michael Sterrett" wrote: > commit: a144d7480f781f21323943d87e6a56136add3830 > Author: Michael Sterrett gentoo org> > AuthorDate: Sun Nov 22 08:26:57 2015 +0000 > Commit: Michael Sterrett gentoo org> > CommitDate: Sun Nov 22 08:27:35 2015 +0000 > URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3Da144d7= 48 >=20 > Stop inheriting base.eclass (bug #494208) >=20 > eclass/games.eclass | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) >=20 > diff --git a/eclass/games.eclass b/eclass/games.eclass > index 7d231e1..aebf679 100644 > --- a/eclass/games.eclass > +++ b/eclass/games.eclass > @@ -24,11 +24,11 @@ > if [[ -z ${_GAMES_ECLASS} ]]; then > _GAMES_ECLASS=3D1 > =20 > -inherit base multilib toolchain-funcs eutils user > +inherit multilib toolchain-funcs eutils user This changes API in all existing eclasses. In paricular, src_unpack() and src_prepare() stop being implicitly exported which can cause them to being implicitly replaced by another eclass. Which is especially relevant since you specifically required people to inherit games.eclass last and force its overrides. > case ${EAPI:-0} in > 0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst pkg_postinst ;; > - 2|3|4|5) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_prein= st pkg_postinst ;; > + 2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_pre= inst pkg_postinst ;; This is irrelevant change and belongs in a separate commit. Furthermore, I don't think it is appropriate to enable new EAPI support until you perform the eclass changes requested by the Council. > *) die "no support for EAPI=3D${EAPI} yet" ;; > esac > =20 > @@ -302,12 +302,14 @@ games_src_configure() { > =20 > # @FUNCTION: games_src_compile > # @DESCRIPTION: > -# Runs base_src_make(). This function is exported as src_compile(). > +# This function is exported as src_compile(). > games_src_compile() { > case ${EAPI:-0} in > 0|1) games_src_configure ;; > esac > - base_src_make > + if [[ -f Makefile || -f GNUmakefile || -f makefile ]]; then > + emake "$@" || die > + fi > } > =20 > # @FUNCTION: games_pkg_preinst >=20 I'm going to revert this commit on behalf of QA to avoid breakage. The relevant bug specifically mentioned making the change conditional to EAPI 6. Please either do that (and don't enable EAPI 6 until you have performed all requested changes), or confirm that none of the packages will be broken by removing it retroactively. --=20 Best regards, Micha=C5=82 G=C3=B3rny --Sig_/GKxAHsmuO+zp6C+lzRtWhJt Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJWUX8OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOP9wQAMMw+s59LPwjfK8cxUhk2rHj HIl/BYU/CTelVF7Bokc5xIXYEuOKBx6USoJzBNPmSaydPFsHGUMgdGQ6qMUULvLP Sx8kkedrOm6QEkQpY7p8cz3jcWPGkyTdN1yR7yxEer7bsLNaMq+y4Tl+75tFK6n6 4gJmfOEVTWC5xLn5/UoJqV0gd1ZnjFVKu09XrBySyF2Os9Bi8RIik2iz7bucxsCu T142va2HrTZNEIVkhqG7xu4EzOh1Z025aJbWOLi7Vyplv9AkAUFWEFl5jhRPVmUd d7GrhPrMmz0TbQx2Y5w8K+gGqCFLwqsQI+JR7WYbpW42eMKC92/TloMMuGxwL9JJ BM70pxQja9OJV3ygZz1ojoTfOSeEQdyg6UI+SuLGzV2LMvmEroN9wI44VEfDeNAg eBxZ7JQGSF9LsyK8gaFa6KbaLU+rftLjKW9ktqi3jfQFAIu1AYF/cYFl7mlEC5lC q5A/pr4Dt6RwQmT1Vc2HTBLxaI/FumMKu1WB1A9ALqkcGr+lVeKJuo2A4rfsSG6Z vkFxszIgEuHy46HBI2uo/nC5Mh09mwIXLXJzwgIDN6kVUOoPfLRuxhow3tGYyxzd eShdW/1TT5VNDS+x3FoENqLoGCy8MNwCfKZ6NGVCCAt3AwajlNHsXGa4gA8mTbIM 7S00A5jUqaOsREaTj4CX =Jlpe -----END PGP SIGNATURE----- --Sig_/GKxAHsmuO+zp6C+lzRtWhJt--