1 |
commit: 48b054eb8da9f4689480249e6d65076953dc0ed5 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 24 16:50:22 2018 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 24 16:50:22 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=48b054eb |
7 |
|
8 |
Tidy up formatting, links and typo for BDEPEND |
9 |
|
10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
11 |
|
12 |
ebuild-writing/eapi/text.xml | 4 ++-- |
13 |
ebuild-writing/functions/src_prepare/epatch/text.xml | 6 +++--- |
14 |
ebuild-writing/variables/text.xml | 2 +- |
15 |
function-reference/install-functions/text.xml | 4 ++-- |
16 |
4 files changed, 8 insertions(+), 8 deletions(-) |
17 |
|
18 |
diff --git a/ebuild-writing/eapi/text.xml b/ebuild-writing/eapi/text.xml |
19 |
index 1eb82b9..fabbc93 100644 |
20 |
--- a/ebuild-writing/eapi/text.xml |
21 |
+++ b/ebuild-writing/eapi/text.xml |
22 |
@@ -1054,7 +1054,7 @@ src_install() { |
23 |
<p><b>Empty groupings are banned</b></p> |
24 |
<p>Groupings which are empty, such as <c>DEPEND="|| ( ${empty_var} )"</c> will now generate an error. |
25 |
Furthermore, conditions within groupings are more strictly enforced. |
26 |
- Eg. <c>REQUIRED_USE="|| ( foo? ( bar ) baz? ( zoinks )"</c> would previously work with <c>USE="-a -b"</c> now requires |
27 |
+ Eg. <c>REQUIRED_USE="|| ( foo? ( bar ) baz? ( zoinks )"</c> would previously work with <c>USE="-foo -baz"</c> now requires |
28 |
either <c>USE="foo bar"</c> or <c>USE="baz zoinks"</c>. |
29 |
</p> |
30 |
</li> |
31 |
@@ -1110,7 +1110,7 @@ src_install() { |
32 |
<li><p><c>ver_rs</c> replaces separators in a version string</p></li> |
33 |
<li><p><c>ver_test</c> compares two versions</p></li> |
34 |
</ul> |
35 |
- <p>See <uri link="::ebuild-writing/variables#Version%20and%20Name%20Formatting%20Issues"/> |
36 |
+ <p>See <uri link="::ebuild-writing/variables#version-and-name-formatting-issues">Version and Name Formatting Issues</uri> |
37 |
for examples of common uses or |
38 |
<uri link="https://dev.gentoo.org/~mgorny/articles/the-ultimate-guide-to-eapi-7.html#version-manipulation-and-comparison-commands"> |
39 |
an in-depth look</uri></p> |
40 |
|
41 |
diff --git a/ebuild-writing/functions/src_prepare/epatch/text.xml b/ebuild-writing/functions/src_prepare/epatch/text.xml |
42 |
index 720fd67..5a6939d 100644 |
43 |
--- a/ebuild-writing/functions/src_prepare/epatch/text.xml |
44 |
+++ b/ebuild-writing/functions/src_prepare/epatch/text.xml |
45 |
@@ -14,15 +14,15 @@ Also note that old ebuilds may still use src_unpack to apply patches. |
46 |
This is because those ebuilds are based in EAPI=1. |
47 |
You are advised to use the latest and apply your patches in src_prepare function instead. |
48 |
<br /> |
49 |
-Starting with EAPI=7, this function is banned and eapply must be used. |
50 |
+Starting with EAPI=7, this function is banned and <c>eapply</c> must be used. |
51 |
</p> |
52 |
|
53 |
<p> |
54 |
-Beginning with EAPI=6, a new function eapply was added to apply patches |
55 |
+Beginning with EAPI=6, a new function <c>eapply</c> was added to apply patches |
56 |
without the need for an eclass. |
57 |
This function differs from epatch in several ways: |
58 |
<ul> |
59 |
-<li>eapply will not unpack patches for you.</li> |
60 |
+<li><c>eapply</c> will not unpack patches for you.</li> |
61 |
<li> |
62 |
The default patch level is -p1. |
63 |
Other patch levels must be specified manually or the command will fail. |
64 |
|
65 |
diff --git a/ebuild-writing/variables/text.xml b/ebuild-writing/variables/text.xml |
66 |
index fa960ee..f2575ad 100644 |
67 |
--- a/ebuild-writing/variables/text.xml |
68 |
+++ b/ebuild-writing/variables/text.xml |
69 |
@@ -257,7 +257,7 @@ The following variables may or must be defined by every ebuild. |
70 |
</ti> |
71 |
</tr> |
72 |
<tr> |
73 |
- <ti><c>DEPEND</c></ti> |
74 |
+ <ti><c>BDEPEND</c></ti> |
75 |
<ti> |
76 |
(EAPI=7) A list of the package's CBUILD build dependencies. See |
77 |
<uri link="::general-concepts/dependencies"/>. |
78 |
|
79 |
diff --git a/function-reference/install-functions/text.xml b/function-reference/install-functions/text.xml |
80 |
index d0c8833..2b0cbf2 100644 |
81 |
--- a/function-reference/install-functions/text.xml |
82 |
+++ b/function-reference/install-functions/text.xml |
83 |
@@ -88,10 +88,10 @@ the first is the source name, the second the name to use when installing. |
84 |
<tr> |
85 |
<ti> |
86 |
<c>libopts</c> |
87 |
- <b>Note:</b> Banned in EAPI=7 |
88 |
</ti> |
89 |
<ti> |
90 |
Specify arguments passed to <c>install</c> for libraries |
91 |
+ <b>Note:</b> Banned in EAPI=7 |
92 |
</ti> |
93 |
</tr> |
94 |
<tr> |
95 |
@@ -208,10 +208,10 @@ the first is the source name, the second the name to use when installing. |
96 |
<tr> |
97 |
<ti> |
98 |
<c>dolib</c> |
99 |
- <b>Note:</b> Banned in EAPI=7 |
100 |
</ti> |
101 |
<ti> |
102 |
Install a library file |
103 |
+ <b>Note:</b> Banned in EAPI=7 |
104 |
</ti> |
105 |
</tr> |
106 |
<tr> |