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 582D513832E for ; Mon, 22 Aug 2016 13:27:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1242D21C14F; Mon, 22 Aug 2016 13:27:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF37921C0AB for ; Mon, 22 Aug 2016 13:26:58 +0000 (UTC) Received: from localhost (unknown [85.143.114.129]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bircoph) by smtp.gentoo.org (Postfix) with ESMTPSA id 06682340751 for ; Mon, 22 Aug 2016 13:26:56 +0000 (UTC) Date: Mon, 22 Aug 2016 16:26:35 +0300 From: Andrew Savchenko To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] [PATCH] subversion.eclass: support for EAPI 6 Message-Id: <20160822162635.a5f536e3e82c0629a9dfa5cf@gentoo.org> In-Reply-To: References: <20160729183158.254fcaefbe2485ad8ad5e3d8@gentoo.org> <20160729174241.337d0793.mgorny@gentoo.org> <20160729223601.b66b48bb392db1cb391f5049@gentoo.org> <20160730073708.7dcfb01a.mgorny@gentoo.org> <20160730123407.1d5ac5b737bc74d7c1684a92@gentoo.org> <20160806170539.82e500a7965303b5526c7689@gentoo.org> X-Mailer: Sylpheed 3.5.0 (GTK+ 2.24.25; 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; protocol="application/pgp-signature"; micalg="PGP-SHA512"; boundary="Signature=_Mon__22_Aug_2016_16_26_35_+0300_OWPJf/6wN/JVWc.t" X-Archives-Salt: 1410b9fa-f0d4-415b-ab7a-002b3f6d1ec2 X-Archives-Hash: 949a0d0f2909c47c518a40df041ac4d2 --Signature=_Mon__22_Aug_2016_16_26_35_+0300_OWPJf/6wN/JVWc.t Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, 20 Aug 2016 09:42:51 -0700 Raymond Jennings wrote: > Just an FYI, games-emulation/dosbox tripped over this recently. It should not call subversion_src_prepare() in EAPI 6 ebuild. Please file a bug for this issue for dosbox maintainers. I can't help you here. > On Sat, Aug 6, 2016 at 7:05 AM, Andrew Savchenko wro= te: >=20 > > Hi, > > > > On Sat, 30 Jul 2016 12:34:07 +0300 Andrew Savchenko wrote: > > > On Sat, 30 Jul 2016 07:37:08 +0200 Micha=C5=82 G=C3=B3rny wrote: > > > > > @@ -116,7 +123,8 @@ ESVN_PROJECT=3D"${ESVN_PROJECT:-${PN/-svn}}" > > > > > > > > > > # @ECLASS-VARIABLE: ESVN_BOOTSTRAP > > > > > # @DESCRIPTION: > > > > > -# bootstrap script or command like autogen.sh or etc.. > > > > > +# Bootstrap script or command like autogen.sh or etc.. > > > > > +# Removed in EAPI 6 and later. > > > > > ESVN_BOOTSTRAP=3D"${ESVN_BOOTSTRAP:-}" > > > > > > > > > > # @ECLASS-VARIABLE: ESVN_PATCHES > > > > > @@ -127,6 +135,8 @@ ESVN_BOOTSTRAP=3D"${ESVN_BOOTSTRAP:-}" > > > > > # > > > > > # Patches are searched both in ${PWD} and ${FILESDIR}, if not fo= und > > in either > > > > > # location, the installation dies. > > > > > +# > > > > > +# Removed in EAPI 6 and later, use PATCHES instead. > > > > > ESVN_PATCHES=3D"${ESVN_PATCHES:-}" > > > > > > > > It would be a good idea to check if the variables are set and die if > > > > they are, so people don't accidentally use them. > > > > > > Impossible to implement. These variables (as well as all other > > > ESVN_* variables) are usually set after subversion eclass is > > > inherited. And even if I'll duplicate this check in all available > > > functions (which is ridiculous by itself), it still will not help, > > > since several functions are removed from EAPI 6 and people may > > > rely on default behaviour of src_prepare() alone. > > > > > > > > # @ECLASS-VARIABLE: ESVN_RESTRICT > > > > > @@ -355,7 +365,10 @@ subversion_fetch() { > > > > > # @FUNCTION: subversion_bootstrap > > > > > # @DESCRIPTION: > > > > > # Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if > > specified. > > > > > +# Removed in EAPI 6 and later. > > > > > subversion_bootstrap() { > > > > > + has "${EAPI:-0}" 6 && die "${FUNCNAME[1]} is removed from > > subversion.eclass in EAPI 6 and later" > > > > > + > > > > > > > > Reverse the logic. This will require updating in every EAPI while i= t is > > > > rather unlikely the next EAPIs will return to previous behavior. > > > > > > Done. > > > > No further comments for a week =3D> in the tree now. > > Thank you for review. > > > > Best regards, > > Andrew Savchenko > > Best regards, Andrew Savchenko --Signature=_Mon__22_Aug_2016_16_26_35_+0300_OWPJf/6wN/JVWc.t Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJXuv2LAAoJEPZTWjO6HuSN6lcP/Rk9RwuWKALOEh4fh1G3PoNJ 3f+y/UcU6SQqvgUUyFM9813QmR5WVdIsvJ42g9DVK2xgqxbXHU8qUvYrW7eLXME1 YTvIpDbKSwdTq9k7usa4uMuV+DOENUEaqlkNy/hAPGIFPzuC8eUIzJ2IM6vW6Xe/ xPGZec3AO4AYCPWNqRFDHxTisqAhPabHs8Rb1CVyFiIMQUdDg6Y3mThJ7Q6POzV/ 7x+MqBYh7PNWpbZr79EWtjSxIMHQ/899pqkqOag1m0+Blt91x10v4BpxMOH2AKfO kOIxjFQ79X2XTqOuI/FCO9SdZ6498NJSDT9+56fNMUYC5cVcsQsDVNNs7tlpUQDQ Y2R/wf2KGIXzTIztvQlNdkFkHOQ9WwML6u5P0j1amnkKO8mLmubRCJ24uqOxbjQe URIta61EzPucYV2l6T6iyhwSFBZDH2FeUww/JbPQNkV61oFnB9lgb94FhwCzeQj2 FR8Up4seE89mw6P80BX+hM5WcJJEYil3EBLDzmkI5dKrUhMupcQ7grP3qGQZuI/D 1VG9vA6zylS6v7wlWpYeU0X+fvkQvhwsX+ee2vol8fDlqGbsP7QSe2uqe0N91mAi ZUvVGGJOLguCC//KIHNsfmThDPu63PY4mHJHZKCIXejreaAf4uTWMDOsA5Y48jkx 1S6C1CkWk5Q//sBtbJLN =Tqvb -----END PGP SIGNATURE----- --Signature=_Mon__22_Aug_2016_16_26_35_+0300_OWPJf/6wN/JVWc.t--