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 7106C13832E for ; Sat, 30 Jul 2016 05:38:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5E3221C08F; Sat, 30 Jul 2016 05:37:17 +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 02DE821C08A for ; Sat, 30 Jul 2016 05:37:16 +0000 (UTC) Received: from pomiot (d202-252.icpnet.pl [109.173.202.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 548AD340D1B; Sat, 30 Jul 2016 05:37:14 +0000 (UTC) Date: Sat, 30 Jul 2016 07:37:08 +0200 From: =?UTF-8?B?TWljaGHFgiBHw7Nybnk=?= To: Andrew Savchenko Cc: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] [PATCH] subversion.eclass: support for EAPI 6 Message-ID: <20160730073708.7dcfb01a.mgorny@gentoo.org> In-Reply-To: <20160729223601.b66b48bb392db1cb391f5049@gentoo.org> References: <20160729183158.254fcaefbe2485ad8ad5e3d8@gentoo.org> <20160729174241.337d0793.mgorny@gentoo.org> <20160729223601.b66b48bb392db1cb391f5049@gentoo.org> Organization: Gentoo X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; 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_/qFGTRxNoI20BsukMFj.Q9qR"; protocol="application/pgp-signature" X-Archives-Salt: 517c7ee2-2f09-4b0a-a8b3-411d003f375a X-Archives-Hash: aea9e6e73e9b88e1df6052b96c9c64ac --Sig_/qFGTRxNoI20BsukMFj.Q9qR Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Fri, 29 Jul 2016 22:36:01 +0300 Andrew Savchenko wrote: > 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 e= ither > # 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. > =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 specifie= d. > +# Removed in EAPI 6 and later. > subversion_bootstrap() { > + has "${EAPI:-0}" 6 && die "${FUNCNAME[1]} is removed from subversion.ec= lass in EAPI 6 and later" > + Reverse the logic. This will require updating in every EAPI while it is rather unlikely the next EAPIs will return to previous behavior. > 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.ec= lass in EAPI 6 and later" > subversion_bootstrap || die "${ESVN}: unknown problem occurred in subve= rsion_bootstrap." > } > =20 --=20 Best regards, Micha=C5=82 G=C3=B3rny --Sig_/qFGTRxNoI20BsukMFj.Q9qR Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJXnD0EXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO2cUP/R6CUHfi4Btf/3CNPU9nMNRk XzE8Ajfe7Ef7ExOmilNjmiy+7wbyrcT9IlYQKIJHGvO9JfWlJiEwxVBS0tENYiq+ 8Vd90qoR67qobEar5xFb8YsciaBw4ewD4iKWSUhuHpiKjdGkjaFZoggfMNl5qMPE q0d45tqCNY0tsCucYyz4v8gUhXcwoLtgvvQlFcE2PAIh5UXBHH0tlYifaoPd0p1D B9HkUVTOhMlfAUpYkZ7TRbaDzeezkN+QrhwGcyC8dBPITvwVQzVy4GIK9sDMQrE9 cijMzr6/wd69KNTaekQLj7rGrVVanPjQBc1M/q+xStYO2yr9AV/4p4wZ54/EU5V7 X42bHq62yVTjQHQn++71lcyqnp73u84o145Wl+4RG6bmz34/dIoxFdoqChZxKa39 zffLAwHO6RbLa4WUrQ5ZLDf59vIWMwTGv35HR2pBV3z4gVZTZzJEO9GaT2CZn1Nz A2c1hagfB5rPr5QfZnoeEsiUFZfgG6CIzN1QprEUe6MRlnxKUlR/MDJYMRLVHg7t c3OjqJO231S1K5oGD6mpVSwwcSWQWdwCWDvMB+gDbzUUk3rrhTWKOk1UaqyR9XxP 4HwnEQrl/cF7P5fdC+Z8m3bl8BWZy9RlEN0mZPiajgSXyO+wvnG1wHXvHrnbe5DV YOgkCpZoq+4F5rYY5gFF =iISB -----END PGP SIGNATURE----- --Sig_/qFGTRxNoI20BsukMFj.Q9qR--