| 1 |
commit: 34357105fe3e6f9d42aeb21e863983c420af337f |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 16 15:55:51 2020 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 18 16:04:51 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=34357105 |
| 7 |
|
| 8 |
general-concepts/slotting: Clarify that SLOT must not be empty. |
| 9 |
|
| 10 |
Not sure from where the concept "an empty slot means disable slotting" |
| 11 |
originated. In any case, it is wrong, and it was not legal in any EAPI. |
| 12 |
|
| 13 |
Update the SLOT section in ebuild-writing/variables, too. |
| 14 |
|
| 15 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 16 |
|
| 17 |
ebuild-writing/variables/text.xml | 4 ++-- |
| 18 |
general-concepts/slotting/text.xml | 10 ++++++---- |
| 19 |
2 files changed, 8 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/ebuild-writing/variables/text.xml b/ebuild-writing/variables/text.xml |
| 22 |
index 6266a68..863330b 100644 |
| 23 |
--- a/ebuild-writing/variables/text.xml |
| 24 |
+++ b/ebuild-writing/variables/text.xml |
| 25 |
@@ -355,8 +355,8 @@ The following variables may or must be defined by every ebuild. |
| 26 |
<body> |
| 27 |
|
| 28 |
<p> |
| 29 |
-When slots are not needed, use <c>SLOT="0"</c>. Do <b>not</b> use <c>SLOT=""</c>, as |
| 30 |
-this will disable slotting for this package. |
| 31 |
+When slots are not needed, use <c>SLOT="0"</c>. Do <b>not</b> use |
| 32 |
+<c>SLOT=""</c>, because the variable must not be empty. |
| 33 |
</p> |
| 34 |
|
| 35 |
<p> |
| 36 |
|
| 37 |
diff --git a/general-concepts/slotting/text.xml b/general-concepts/slotting/text.xml |
| 38 |
index d1ba524..5bd33b0 100644 |
| 39 |
--- a/general-concepts/slotting/text.xml |
| 40 |
+++ b/general-concepts/slotting/text.xml |
| 41 |
@@ -12,12 +12,14 @@ parallel. This feature is called slotting. |
| 42 |
</p> |
| 43 |
|
| 44 |
<p> |
| 45 |
-Most packages have no need for slotting. These packages specify <c>SLOT="0"</c> in |
| 46 |
-the ebuilds. This is <b>not</b> the same as specifying an empty slot |
| 47 |
-(<c>SLOT=""</c>) <d/> an empty |
| 48 |
-slot means "disable slotting entirely", and should not be used. |
| 49 |
+Most packages have no need for slotting. These packages specify <c>SLOT="0"</c> |
| 50 |
+in the ebuilds. |
| 51 |
</p> |
| 52 |
|
| 53 |
+<note> |
| 54 |
+<c>SLOT</c> is a mandatory variable and must not be empty. |
| 55 |
+</note> |
| 56 |
+ |
| 57 |
<p> |
| 58 |
Portage permits at most one instance of a package installation <e>per <c>SLOT</c> |
| 59 |
value</e>. For example, say we have the following: |
Archives