| 1 |
commit: ffa353428d17602c069d4cd2206a698497cc4c33 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 24 14:46:49 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 24 14:46:49 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=ffa35342 |
| 7 |
|
| 8 |
More XML syntax fixes |
| 9 |
|
| 10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 11 |
|
| 12 |
ebuild-writing/eapi/text.xml | 8 ++++---- |
| 13 |
ebuild-writing/functions/src_prepare/text.xml | 4 ++-- |
| 14 |
function-reference/install-functions/text.xml | 2 +- |
| 15 |
3 files changed, 7 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/ebuild-writing/eapi/text.xml b/ebuild-writing/eapi/text.xml |
| 18 |
index 8653b20..1eb82b9 100644 |
| 19 |
--- a/ebuild-writing/eapi/text.xml |
| 20 |
+++ b/ebuild-writing/eapi/text.xml |
| 21 |
@@ -1054,7 +1054,7 @@ src_install() { |
| 22 |
<p><b>Empty groupings are banned</b></p> |
| 23 |
<p>Groupings which are empty, such as <c>DEPEND="|| ( ${empty_var} )"</c> will now generate an error. |
| 24 |
Furthermore, conditions within groupings are more strictly enforced. |
| 25 |
- Eg. <c>REQUIRED_USE="|| ( foo? ( bar ) baz? ( zoinks )"</c> would previously work with <c>USE="-a -b"<c> now requires |
| 26 |
+ Eg. <c>REQUIRED_USE="|| ( foo? ( bar ) baz? ( zoinks )"</c> would previously work with <c>USE="-a -b"</c> now requires |
| 27 |
either <c>USE="foo bar"</c> or <c>USE="baz zoinks"</c>. |
| 28 |
</p> |
| 29 |
</li> |
| 30 |
@@ -1066,7 +1066,7 @@ src_install() { |
| 31 |
<body> |
| 32 |
<ul> |
| 33 |
<li> |
| 34 |
- <p><b><c>package.provided</c> banned</b><p> |
| 35 |
+ <p><b><c>package.provided</c> banned</b></p> |
| 36 |
<p>Profiles may no longer contain a <c>package.provided</c> file with <c>EAPI=7</c>.</p> |
| 37 |
</li> |
| 38 |
</ul> |
| 39 |
@@ -1127,8 +1127,8 @@ src_install() { |
| 40 |
<p><b>New function <c>dostrip</c></b></p> |
| 41 |
<p> |
| 42 |
The <c>dostrip</c> helper has been added with <c>EAPI=7</c>. |
| 43 |
- This function controls whether or not to strip a binary.<br> |
| 44 |
- <c>dostrip -x [file]</c> will exclude a binary from being stripped.<br> |
| 45 |
+ This function controls whether or not to strip a binary.<br /> |
| 46 |
+ <c>dostrip -x [file]</c> will exclude a binary from being stripped.<br /> |
| 47 |
Conversely, when combined with RESTRICT=strip, <c>dostrip [file]</c> selects a binary |
| 48 |
file to be stripped. |
| 49 |
</p> |
| 50 |
|
| 51 |
diff --git a/ebuild-writing/functions/src_prepare/text.xml b/ebuild-writing/functions/src_prepare/text.xml |
| 52 |
index 214dfbf..0425bb1 100644 |
| 53 |
--- a/ebuild-writing/functions/src_prepare/text.xml |
| 54 |
+++ b/ebuild-writing/functions/src_prepare/text.xml |
| 55 |
@@ -46,9 +46,9 @@ Beginning with EAPI=6, the src_prepare function gained a new default implementat |
| 56 |
<codesample lang="ebuild"> |
| 57 |
src_prepare() { |
| 58 |
if declare -p PATCHES | grep -q "^declare -a "; then |
| 59 |
- [[ -n ${PATCHES[@]} ]] && eapply "${PATCHES[@]}" |
| 60 |
+ [[ -n ${PATCHES[@]} ]] && eapply "${PATCHES[@]}" |
| 61 |
else |
| 62 |
- [[ -n ${PATCHES} ]] && eapply ${PATCHES} |
| 63 |
+ [[ -n ${PATCHES} ]] && eapply ${PATCHES} |
| 64 |
fi |
| 65 |
eapply_user |
| 66 |
} |
| 67 |
|
| 68 |
diff --git a/function-reference/install-functions/text.xml b/function-reference/install-functions/text.xml |
| 69 |
index e42b4f6..d0c8833 100644 |
| 70 |
--- a/function-reference/install-functions/text.xml |
| 71 |
+++ b/function-reference/install-functions/text.xml |
| 72 |
@@ -243,7 +243,7 @@ the first is the source name, the second the name to use when installing. |
| 73 |
<c>domo</c> |
| 74 |
</ti> |
| 75 |
<ti> |
| 76 |
- Install a Gettext <c>.mo</c> file<br> |
| 77 |
+ Install a Gettext <c>.mo</c> file<br /> |
| 78 |
(EAPI=7) No longer looks at the value of <c>into</c> |
| 79 |
</ti> |
| 80 |
</tr> |
Archives