1 |
From: Michał Górny <mgorny@g.o> |
2 |
|
3 |
Bug: https://bugs.gentoo.org/371413 |
4 |
Signed-off-by: Michał Górny <mgorny@g.o> |
5 |
[Shortened "selective-uri-restrict" label to make it fit in the margin] |
6 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
7 |
--- |
8 |
eapi-differences.tex | 4 ++++ |
9 |
ebuild-vars.tex | 18 +++++++++++++----- |
10 |
2 files changed, 17 insertions(+), 5 deletions(-) |
11 |
|
12 |
diff --git a/eapi-differences.tex b/eapi-differences.tex |
13 |
index a334881..22f99e2 100644 |
14 |
--- a/eapi-differences.tex |
15 |
+++ b/eapi-differences.tex |
16 |
@@ -74,6 +74,9 @@ Bash version & \compactfeatureref{bash-version} & |
17 |
\t{SRC_URI} arrows & \compactfeatureref{src-uri-arrows} & |
18 |
* & Yes & Yes & Yes & Yes \\ |
19 |
|
20 |
+Selective URI restrictions & \compactfeatureref{uri-restrict} & |
21 |
+ No & No & No & No & Yes \\ |
22 |
+ |
23 |
\t{RDEPEND=DEPEND} & \compactfeatureref{rdepend-depend} & |
24 |
* & No & No & No & No \\ |
25 |
|
26 |
@@ -486,6 +489,7 @@ EAPI 8 is EAPI 7 with the following changes: |
27 |
\begin{compactitem} |
28 |
\item Less strict naming rules for files in \t{updates} directory, \featureref{updates-filenames}. |
29 |
\item Bash version is 5.0, \featureref{bash-version}. |
30 |
+\item Selective fetch/mirror restriction, \featureref{uri-restrict}. |
31 |
\end{compactitem} |
32 |
|
33 |
\ChangeWhenAddingAnEAPI{8} |
34 |
diff --git a/ebuild-vars.tex b/ebuild-vars.tex |
35 |
index 040b02a..f6b1c26 100644 |
36 |
--- a/ebuild-vars.tex |
37 |
+++ b/ebuild-vars.tex |
38 |
@@ -169,16 +169,24 @@ on the right of the arrow. When consulting mirrors (except for those explicitly |
39 |
of the arrow, if \t{mirror://} is used), the filename to the right of the arrow shall be requested |
40 |
instead of the filename in the URI. |
41 |
|
42 |
+\featurelabel{uri-restrict} In EAPIs listed in table~\ref{tab:uri-arrows-table} as supporting |
43 |
+selective URI restrictions, the URI protocol can be prefixed by an additional \t{fetch+} or |
44 |
+\t{mirror+} term. If the ebuild is fetch restricted, the \t{fetch+} prefix undoes the fetch |
45 |
+restriction for the URI (but not the implied mirror restriction). If the ebuild is fetch or mirror |
46 |
+restricted, the \t{mirror+} prefix undoes both fetch and mirror restrictions for the URI. |
47 |
+ |
48 |
\ChangeWhenAddingAnEAPI{8} |
49 |
-\begin{centertable}{EAPIs supporting \t{SRC_URI} arrows} |
50 |
+\begin{centertable}{EAPIs supporting \t{SRC_URI} arrows and selective URI restrictions} |
51 |
\label{tab:uri-arrows-table} |
52 |
- \begin{tabular}{ll} |
53 |
+ \begin{tabular}{lll} |
54 |
\toprule |
55 |
\multicolumn{1}{c}{\textbf{EAPI}} & |
56 |
- \multicolumn{1}{c}{\textbf{Supports \t{SRC_URI} arrows?}} \\ |
57 |
+ \multicolumn{1}{c}{\textbf{Supports \t{SRC_URI} arrows?}} & |
58 |
+ \multicolumn{1}{c}{\textbf{Supports selective URI restrictions?}} \\ |
59 |
\midrule |
60 |
- 0, 1 & No \\ |
61 |
- 2, 3, 4, 5, 6, 7, 8 & Yes \\ |
62 |
+ 0, 1 & No & No \\ |
63 |
+ 2, 3, 4, 5, 6, 7 & Yes & No \\ |
64 |
+ 8 & Yes & Yes \\ |
65 |
\bottomrule |
66 |
\end{tabular} |
67 |
\end{centertable} |
68 |
-- |
69 |
2.31.1 |