Gentoo Archives: gentoo-portage-dev

From: Nekun <nekokun@××××××××.cc>
To: gentoo-portage-dev@l.g.o
Cc: Nekun <nekokun@××××××××.cc>
Subject: [gentoo-portage-dev] [PATCH 1/2] portage.5: Describe userpatch applying rules in more clean wording
Date: Sun, 25 Apr 2021 16:56:58
Message-Id: 20210425165628.2790-1-nekokun@firemail.cc
1 Bug: https://bugs.gentoo.org/698244
2 Signed-off-by: Nekun <nekokun@××××××××.cc>
3 ---
4 Tried to be more compact and precise, as suggested in the Bugzilla discussion
5
6 man/portage.5 | 12 ++++++------
7 1 file changed, 6 insertions(+), 6 deletions(-)
8
9 diff --git a/man/portage.5 b/man/portage.5
10 index 50f20454c..4e7d8c802 100644
11 --- a/man/portage.5
12 +++ b/man/portage.5
13 @@ -1392,12 +1392,12 @@ following order:
14 /etc/portage/patches/${CATEGORY}/${PN}[:${SLOT}]
15 .RE 2
16
17 -Patches from more-specific directories overrides patches from less-specific,
18 -i.e. if patches with the same name coexist in different directories matches
19 -same package, only patch from directory matches the first matching pattern
20 -will be applied. Patches for each package are applied in the POSIX
21 -lexicographic order. Patch file name must end in ".patch" or, for
22 -\fBEAPI\fR >= \fB6\fR, in ".diff".
23 +If patches with the same filename exist in multiple directories
24 +matching the same package, only the patch from the most specific
25 +directory is applied. An empty patch from more-specific directory
26 +discards patches with the same filename from less-specific. Patches
27 +for each package are applied in the POSIX lexicographic order. Patch
28 +filename must end in ".patch" or, for \fBEAPI\fR >= \fB6\fR, in ".diff".
29
30 If package ebuild uses \fBEAPI\fR <= \fB5\fR, it must explicitly invoke
31 \fBepatch_user\fR or inherit \fBepatch.eclass\fR(5) and rely on default
32 --
33 2.26.3

Replies