Gentoo Archives: gentoo-pms

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-pms@l.g.o
Subject: [gentoo-pms] [PATCH] Restore proper scope for PORTDIR and ECLASSDIR.
Date: Sun, 05 Jun 2016 10:26:47
Message-Id: 22355.65120.166959.968433@a1i15.kph.uni-mainz.de
1 Commit fa4ac9474048ec75af138fc61f22485c06aac5b7 had inadvertently
2 changed the scope of the PORTDIR and ECLASSDIR variables which were
3 referring to FILESDIR by a "ditto" in the second column. Restore both
4 variables to src_*. To this end, reorder variables such that DISTDIR
5 follows FILESDIR, and move the remark about accessing the directory
6 into the footnote.
7
8 Note: Similar to FILESDIR, accessing DISTDIR in global scope is needed
9 for assignment of the PATCHES variable in EAPI 6.
10
11 Thanks to mgorny for pointing this out.
12 ---
13 ebuild-env-vars.tex | 21 ++++++++++-----------
14 1 file changed, 10 insertions(+), 11 deletions(-)
15
16 diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex
17 index 7a58f05..469f0cd 100644
18 --- a/ebuild-env-vars.tex
19 +++ b/ebuild-env-vars.tex
20 @@ -84,24 +84,23 @@ variable.
21 of each element of the \t{SRC\_URI} ebuild metadata variable. Only for EAPIs listed in
22 table~\ref{tab:removed-env-vars-table} as supporting \t{AA}. \\
23 \t{FILESDIR} &
24 - \t{src\_*}, global~scope%
25 - \footnote{Not necessarily present when installing from a binary package.} &
26 + \t{src\_*}, global~scope\footnote{Not necessarily present when installing from a binary package.
27 + Ebuilds must not access the directory in global scope.} &
28 No &
29 The full path to the package's files directory, used for small support files or patches.
30 - See section~\ref{sec:package-dirs}. Ebuilds must not access the directory in global scope.
31 - May or may not exist; if a repository provides no support files for the package in question
32 - then an ebuild must be prepared for the situation where \t{FILESDIR} points to a non-existent
33 - directory. \\
34 -\t{PORTDIR} &
35 - Ditto &
36 - No &
37 - The full path to the master repository's base directory. \\
38 + See section~\ref{sec:package-dirs}. May or may not exist; if a repository provides no support
39 + files for the package in question then an ebuild must be prepared for the situation where
40 + \t{FILESDIR} points to a non-existent directory. \\
41 \t{DISTDIR} &
42 Ditto &
43 No &
44 The full path to the directory in which the files in the \t{A} variable are stored. \\
45 +\t{PORTDIR} &
46 + \t{src\_*} &
47 + No &
48 + The full path to the master repository's base directory. \\
49 \t{ECLASSDIR} &
50 - Ditto &
51 + \t{src\_*} &
52 No &
53 The full path to the master repository's eclass directory. \\
54 \t{ROOT} &
55 --
56 2.8.3