commit: 22a0ce7c0fe649572956f60d13e1003ced401689
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 5 10:11:02 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 10:11:02 2016 +0000
URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=22a0ce7c
Restore proper scope for PORTDIR and ECLASSDIR.
Commit fa4ac9474048ec75af138fc61f22485c06aac5b7 had inadvertently
changed the scope of the PORTDIR and ECLASSDIR variables which were
referring to FILESDIR by a "ditto" in the second column. Restore both
variables to src_*. To this end, reorder variables such that DISTDIR
follows FILESDIR, and move the remark about accessing the directory
into the footnote.
Note: Similar to FILESDIR, accessing DISTDIR in global scope is needed
for assignment of the PATCHES variable in EAPI 6.
Thanks to mgorny for pointing this out.
ebuild-env-vars.tex | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex
index 7a58f05..469f0cd 100644
--- a/ebuild-env-vars.tex
+++ b/ebuild-env-vars.tex
@@ -84,24 +84,23 @@ variable.
of each element of the \t{SRC\_URI} ebuild metadata variable. Only for
EAPIs listed in
table~\ref{tab:removed-env-vars-table} as supporting \t{AA}. \\
\t{FILESDIR} &
- \t{src\_*}, global~scope%
- \footnote{Not necessarily present when installing from a binary package.} &
+ \t{src\_*}, global~scope\footnote{Not necessarily present when installing
from a binary package.
+ Ebuilds must not access the directory in global scope.} &
No &
The full path to the package's files directory, used for small support
files or patches.
- See section~\ref{sec:package-dirs}. Ebuilds must not access the directory
in global scope.
- May or may not exist; if a repository provides no support files for the
package in question
- then an ebuild must be prepared for the situation where \t{FILESDIR}
points to a non-existent
- directory. \\
-\t{PORTDIR} &
- Ditto &
- No &
- The full path to the master repository's base directory. \\
+ See section~\ref{sec:package-dirs}. May or may not exist; if a repository
provides no support
+ files for the package in question then an ebuild must be prepared for the
situation where
+ \t{FILESDIR} points to a non-existent directory. \\
\t{DISTDIR} &
Ditto &
No &
The full path to the directory in which the files in the \t{A} variable
are stored. \\
+\t{PORTDIR} &
+ \t{src\_*} &
+ No &
+ The full path to the master repository's base directory. \\
\t{ECLASSDIR} &
- Ditto &
+ \t{src\_*} &
No &
The full path to the master repository's eclass directory. \\
\t{ROOT} &
