Gentoo Archives: gentoo-dev

From: Raymond Jennings <shentino@×××××.com>
To: gentoo-dev <gentoo-dev@l.g.o>
Subject: Re: [gentoo-dev] [PATCH] subversion.eclass: support for EAPI 6
Date: Sat, 20 Aug 2016 16:43:43
Message-Id: CAGDaZ_pt=ncTuuNrdBxSrJxm0n91SdUGJ7Jj8SGaUsE+QwW-QA@mail.gmail.com
In Reply to: Re: [gentoo-dev] [PATCH] subversion.eclass: support for EAPI 6 by Andrew Savchenko
1 Just an FYI, games-emulation/dosbox tripped over this recently.
2
3 On Sat, Aug 6, 2016 at 7:05 AM, Andrew Savchenko <bircoph@g.o> wrote:
4
5 > Hi,
6 >
7 > On Sat, 30 Jul 2016 12:34:07 +0300 Andrew Savchenko wrote:
8 > > On Sat, 30 Jul 2016 07:37:08 +0200 Michał Górny wrote:
9 > > > > @@ -116,7 +123,8 @@ ESVN_PROJECT="${ESVN_PROJECT:-${PN/-svn}}"
10 > > > >
11 > > > > # @ECLASS-VARIABLE: ESVN_BOOTSTRAP
12 > > > > # @DESCRIPTION:
13 > > > > -# bootstrap script or command like autogen.sh or etc..
14 > > > > +# Bootstrap script or command like autogen.sh or etc..
15 > > > > +# Removed in EAPI 6 and later.
16 > > > > ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}"
17 > > > >
18 > > > > # @ECLASS-VARIABLE: ESVN_PATCHES
19 > > > > @@ -127,6 +135,8 @@ ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}"
20 > > > > #
21 > > > > # Patches are searched both in ${PWD} and ${FILESDIR}, if not found
22 > in either
23 > > > > # location, the installation dies.
24 > > > > +#
25 > > > > +# Removed in EAPI 6 and later, use PATCHES instead.
26 > > > > ESVN_PATCHES="${ESVN_PATCHES:-}"
27 > > >
28 > > > It would be a good idea to check if the variables are set and die if
29 > > > they are, so people don't accidentally use them.
30 > >
31 > > Impossible to implement. These variables (as well as all other
32 > > ESVN_* variables) are usually set after subversion eclass is
33 > > inherited. And even if I'll duplicate this check in all available
34 > > functions (which is ridiculous by itself), it still will not help,
35 > > since several functions are removed from EAPI 6 and people may
36 > > rely on default behaviour of src_prepare() alone.
37 > >
38 > > > > # @ECLASS-VARIABLE: ESVN_RESTRICT
39 > > > > @@ -355,7 +365,10 @@ subversion_fetch() {
40 > > > > # @FUNCTION: subversion_bootstrap
41 > > > > # @DESCRIPTION:
42 > > > > # Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if
43 > specified.
44 > > > > +# Removed in EAPI 6 and later.
45 > > > > subversion_bootstrap() {
46 > > > > + has "${EAPI:-0}" 6 && die "${FUNCNAME[1]} is removed from
47 > subversion.eclass in EAPI 6 and later"
48 > > > > +
49 > > >
50 > > > Reverse the logic. This will require updating in every EAPI while it is
51 > > > rather unlikely the next EAPIs will return to previous behavior.
52 > >
53 > > Done.
54 >
55 > No further comments for a week => in the tree now.
56 > Thank you for review.
57 >
58 > Best regards,
59 > Andrew Savchenko
60 >

Replies

Subject Author
Re: [gentoo-dev] [PATCH] subversion.eclass: support for EAPI 6 Andrew Savchenko <bircoph@g.o>