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