commit: 8f6eacff576fbd5fb1e09025dd1a301b221a4c0c Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Dec 22 18:23:57 2019 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Tue May 25 19:56:56 2021 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=8f6eacff
EAPI 8 has selective URI restrictions Bug: https://bugs.gentoo.org/371413 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> [Shortened "selective-uri-restrict" label to make it fit in the margin] Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> eapi-differences.tex | 4 ++++ ebuild-vars.tex | 18 +++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/eapi-differences.tex b/eapi-differences.tex index a334881..22f99e2 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -74,6 +74,9 @@ Bash version & \compactfeatureref{bash-version} & \t{SRC_URI} arrows & \compactfeatureref{src-uri-arrows} & * & Yes & Yes & Yes & Yes \\ +Selective URI restrictions & \compactfeatureref{uri-restrict} & + No & No & No & No & Yes \\ + \t{RDEPEND=DEPEND} & \compactfeatureref{rdepend-depend} & * & No & No & No & No \\ @@ -486,6 +489,7 @@ EAPI 8 is EAPI 7 with the following changes: \begin{compactitem} \item Less strict naming rules for files in \t{updates} directory, \featureref{updates-filenames}. \item Bash version is 5.0, \featureref{bash-version}. +\item Selective fetch/mirror restriction, \featureref{uri-restrict}. \end{compactitem} \ChangeWhenAddingAnEAPI{8} diff --git a/ebuild-vars.tex b/ebuild-vars.tex index 040b02a..f6b1c26 100644 --- a/ebuild-vars.tex +++ b/ebuild-vars.tex @@ -169,16 +169,24 @@ on the right of the arrow. When consulting mirrors (except for those explicitly of the arrow, if \t{mirror://} is used), the filename to the right of the arrow shall be requested instead of the filename in the URI. +\featurelabel{uri-restrict} In EAPIs listed in table~\ref{tab:uri-arrows-table} as supporting +selective URI restrictions, the URI protocol can be prefixed by an additional \t{fetch+} or +\t{mirror+} term. If the ebuild is fetch restricted, the \t{fetch+} prefix undoes the fetch +restriction for the URI (but not the implied mirror restriction). If the ebuild is fetch or mirror +restricted, the \t{mirror+} prefix undoes both fetch and mirror restrictions for the URI. + \ChangeWhenAddingAnEAPI{8} -\begin{centertable}{EAPIs supporting \t{SRC_URI} arrows} +\begin{centertable}{EAPIs supporting \t{SRC_URI} arrows and selective URI restrictions} \label{tab:uri-arrows-table} - \begin{tabular}{ll} + \begin{tabular}{lll} \toprule \multicolumn{1}{c}{\textbf{EAPI}} & - \multicolumn{1}{c}{\textbf{Supports \t{SRC_URI} arrows?}} \\ + \multicolumn{1}{c}{\textbf{Supports \t{SRC_URI} arrows?}} & + \multicolumn{1}{c}{\textbf{Supports selective URI restrictions?}} \\ \midrule - 0, 1 & No \\ - 2, 3, 4, 5, 6, 7, 8 & Yes \\ + 0, 1 & No & No \\ + 2, 3, 4, 5, 6, 7 & Yes & No \\ + 8 & Yes & Yes \\ \bottomrule \end{tabular} \end{centertable}