Gentoo Archives: gentoo-commits

From: "Göktürk Yüksek" <gokturk@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/devmanual:master commit in: quickstart/
Date: Tue, 26 Nov 2019 03:06:04
Message-Id: 1574737456.427c85aeee6f8766b88e1f94a564032d050dd5a7.gokturk@gentoo
1 commit: 427c85aeee6f8766b88e1f94a564032d050dd5a7
2 Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 26 02:52:25 2019 +0000
4 Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 26 03:04:16 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=427c85ae
7
8 quickstart/text.xml: call default in src_prepare()
9
10 It seems when converting epatch to eapply, the information about a
11 call eapply_user being mandatory was missed.
12
13 Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>
14
15 quickstart/text.xml | 7 +++++++
16 1 file changed, 7 insertions(+)
17
18 diff --git a/quickstart/text.xml b/quickstart/text.xml
19 index 46435fc..24903ec 100644
20 --- a/quickstart/text.xml
21 +++ b/quickstart/text.xml
22 @@ -283,6 +283,7 @@ DEPEND="${RDEPEND}
23 src_prepare() {
24 eapply "${FILESDIR}"/${P}-destdir.patch \
25 "${FILESDIR}"/${P}-parallel_build.patch
26 + eapply_user
27 }
28
29 src_configure() {
30 @@ -299,6 +300,11 @@ mirrors <d/> see <uri link="::general-concepts/mirrors#Gentoo Mirrors"/> and <ur
31 link="::ebuild-writing/functions/src_prepare/epatch/"/>.
32 </p>
33
34 +<p>
35 +When the <c>src_prepare</c> phase is overridden, it must be ensured
36 +that <c>eapply_user</c> is called.
37 +</p>
38 +
39 </body>
40 </section>
41
42 @@ -383,6 +389,7 @@ DEPEND="${RDEPEND}
43 src_prepare() {
44 eapply "${FILESDIR}"/${PN}-namespace.diff \
45 "${FILESDIR}"/${PN}-procmime.diff
46 + eapply_user
47 }
48
49 src_configure() {