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 04AA813832E for ; Fri, 29 Jul 2016 19:36:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C930421C038; Fri, 29 Jul 2016 19:36:08 +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 C0119E0941 for ; Fri, 29 Jul 2016 19:36:07 +0000 (UTC) Received: from localhost (unknown [185.31.165.234]) (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 5D2AB3408D4 for ; Fri, 29 Jul 2016 19:36:05 +0000 (UTC) Date: Fri, 29 Jul 2016 22:36:01 +0300 From: Andrew Savchenko To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] [PATCH] subversion.eclass: support for EAPI 6 Message-Id: <20160729223601.b66b48bb392db1cb391f5049@gentoo.org> In-Reply-To: <20160729174241.337d0793.mgorny@gentoo.org> References: <20160729183158.254fcaefbe2485ad8ad5e3d8@gentoo.org> <20160729174241.337d0793.mgorny@gentoo.org> X-Mailer: Sylpheed 3.5.0 (GTK+ 2.24.30; i686-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=_Fri__29_Jul_2016_22_36_01_+0300_P_qUVxsvq5qbNcJK" X-Archives-Salt: 5ccf6fac-2922-41dd-a57e-588e8b570d81 X-Archives-Hash: 65adb3e071b76f18c79f88a203ec64d0 --Signature=_Fri__29_Jul_2016_22_36_01_+0300_P_qUVxsvq5qbNcJK Content-Type: multipart/mixed; boundary="Multipart=_Fri__29_Jul_2016_22_36_01_+0300_9B8Nt7=DC2X4Rjp6" --Multipart=_Fri__29_Jul_2016_22_36_01_+0300_9B8Nt7=DC2X4Rjp6 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, 29 Jul 2016 17:42:40 +0200 Micha=C5=82 G=C3=B3rny wrote: > On Fri, 29 Jul 2016 18:31:58 +0300 > Andrew Savchenko wrote: >=20 > > diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass > > index c45c725..49040a4 100644 > > --- a/eclass/subversion.eclass > > +++ b/eclass/subversion.eclass > > @@ -434,6 +434,7 @@ subversion_src_unpack() { > > # Default src_prepare. Bootstrap. > > subversion_src_prepare() { > > subversion_bootstrap || die "${ESVN}: unknown problem occurred in sub= version_bootstrap." > > + [[ ${EAPI:-0} -ge 6 ]] && eapply_user >=20 > EAPI is not always a number, so this is wrong. Then as QA you should go and fix xorg-2.eclass :) Due to changes below this code is not needed in the subversion.eclass. > Furthermore, since it didn't work in EAPI 6 anyway, please take a look > into improving this eclass for EAPI 6. In particular: >=20 > - add a proper EAPI check preventing it from implicitly being enabled > in new EAPIs, Done. =20 > - disable subversion_bootstrap() along with all the relevant facilities > in EAPI 6 and later, therefore also stopping exporting src_prepare(). Done, no need for eappy_user in this case. Please in future explain such requirements to save fellow developer's time, since subversion_bootstrap doesn't contradict directly with EAPI 6 (ESVN_PATCHES is not needed with PATCHES available in EAPI 6, but this is another matter). The real reason for removal is that nobody uses it in the main tree anymore. Best regards, Andrew Savchenko --Multipart=_Fri__29_Jul_2016_22_36_01_+0300_9B8Nt7=DC2X4Rjp6 Content-Type: text/x-diff; name="subversion.eclass.patch" Content-Disposition: attachment; filename="subversion.eclass.patch" Content-Transfer-Encoding: quoted-printable diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index c45c725..489e448 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -21,10 +21,17 @@ case "${EAPI:-0}" in EXPORT_FUNCTIONS src_unpack pkg_preinst DEPEND=3D"dev-vcs/subversion" ;; - *) + 2|3|4|5) EXPORT_FUNCTIONS src_unpack src_prepare pkg_preinst DEPEND=3D"|| ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] = dev-vcs/subversion[webdav-serf] )" ;; + 6) + EXPORT_FUNCTIONS src_unpack pkg_preinst + DEPEND=3D"|| ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] = dev-vcs/subversion[webdav-serf] )" + ;; + *) + die "EAPI ${EAPI} is not supported in subversion.eclass" + ;; esac =20 DEPEND+=3D" net-misc/rsync" @@ -116,7 +123,8 @@ ESVN_PROJECT=3D"${ESVN_PROJECT:-${PN/-svn}}" =20 # @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:-}" =20 # @ECLASS-VARIABLE: ESVN_PATCHES @@ -127,6 +135,8 @@ ESVN_BOOTSTRAP=3D"${ESVN_BOOTSTRAP:-}" # # Patches are searched both in ${PWD} and ${FILESDIR}, if not found in eit= her # location, the installation dies. +# +# Removed in EAPI 6 and later, use PATCHES instead. ESVN_PATCHES=3D"${ESVN_PATCHES:-}" =20 # @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.ecla= ss in EAPI 6 and later" + if has "export" ${ESVN_RESTRICT}; then return fi @@ -432,7 +445,9 @@ subversion_src_unpack() { # @FUNCTION: subversion_src_prepare # @DESCRIPTION: # Default src_prepare. Bootstrap. +# Removed in EAPI 6 and later. subversion_src_prepare() { + has "${EAPI:-0}" 6 && die "${FUNCNAME[1]} is removed from subversion.ecla= ss in EAPI 6 and later" subversion_bootstrap || die "${ESVN}: unknown problem occurred in subvers= ion_bootstrap." } =20 --Multipart=_Fri__29_Jul_2016_22_36_01_+0300_9B8Nt7=DC2X4Rjp6-- --Signature=_Fri__29_Jul_2016_22_36_01_+0300_P_qUVxsvq5qbNcJK Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJXm7AhAAoJEPZTWjO6HuSNj1IP/1OhtyRGldfEI0AB4vxs39M8 90L3DAbxJv+AqlcoOwyNQdLjtmOItwgVOUPZQeb+yQxJdY89Nfi4vqsHmeybLl5p Z5zMAzyADLXr9uPV+NfwYQC5kFLG8264iWeD5sUJ0IjVgaEFus72ZNz0HcrakMku 1LmBAdIqTeyG+jbtrmFgXavBdrTX6V08h1hKs/mKUWknaU2Tu/ecQ7SHSO+llP0D 7LWIYy/dGiRXn9Kb62qeoeBqnPRbmnGZh/UyguO6YCSG3TCbKHaBppXrMsl06aDt qBaNIvbOO98HM1kjic7LBiTh/y3KNW80ZNBWOTwQVoB3TZwfpryQvRH9s2kLkn5V DB31byg/NqSNAqLWnR1jyPeZt+A0DSEqzuIf6UBZeOM7ZxAhATBpAPpVDMNEaa2Y toShSSEm2dGpOLvSYltfiPZ37bIgm6A/NT7FfVAb3X8BfvYKUst7BlOCUZM0lXRA POAYztTcRYrsDlUoJwX1/NM4hy9pSROaZxnaS32ibz6cvMyoilh3KfWM0Iwapa74 6+oKwD7vj3GpSQDuBLEXNK5n+fiOe83SdJdAJlPhr7xMGroGjNay3lWB9+2eDQrl GBGOTZMx/Wi7PKi0yjlX4W9bFTb2kegf866We5QrSYWdr+1ahjiZGf8tHzZEil01 1+szhRlIHitkar8vInBH =XqfI -----END PGP SIGNATURE----- --Signature=_Fri__29_Jul_2016_22_36_01_+0300_P_qUVxsvq5qbNcJK--