[gentoo-portage-dev] [PATCH 1/2] portage.5: Describe userpatch applying rules in more clean wording

[gentoo-portage-dev] [PATCH 1/2] portage.5: Describe userpatch applying rules in more clean wording

[Nekun]

Bug: https://bugs.gentoo.org/698244
Signed-off-by: Nekun <nekokun@firemail.cc>
---
Tried to be more compact and precise, as suggested in the Bugzilla discussion

 man/portage.5 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 50f20454c..4e7d8c802 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1392,12 +1392,12 @@ following order:
 /etc/portage/patches/${CATEGORY}/${PN}[:${SLOT}]
 .RE 2
 
-Patches from more-specific directories overrides patches from less-specific,
-i.e. if patches with the same name coexist in different directories matches
-same package, only patch from directory matches the first matching pattern
-will be applied. Patches for each package are applied in the POSIX
-lexicographic order. Patch file name must end in ".patch" or, for
-\fBEAPI\fR >= \fB6\fR, in ".diff".
+If patches with the same filename exist in multiple directories
+matching the same package, only the patch from the most specific
+directory is applied. An empty patch from more-specific directory
+discards patches with the same filename from less-specific. Patches
+for each package are applied in the POSIX lexicographic order. Patch
+filename must end in ".patch" or, for \fBEAPI\fR >= \fB6\fR, in ".diff".
 
 If package ebuild uses \fBEAPI\fR <= \fB5\fR, it must explicitly invoke
 \fBepatch_user\fR or inherit \fBepatch.eclass\fR(5) and rely on default
-- 
2.26.3

[gentoo-portage-dev] [PATCH 2/2] ebuild.5: Fix eapply target

[Nekun]

More generally, it's a current shell directory (which can be changed in
a ebuild) and it can be overrided with -d, maybe we need more
clarification here. However, in the default src_prepare it's ${S}.

Bug: https://bugs.gentoo.org/698244
Signed-off-by: Nekun <nekokun@firemail.cc>
---
 man/ebuild.5 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index a113c1502..2afea05bb 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1218,13 +1218,14 @@ directory. The function will append \fIsource\fR to the \fBDISTDIR\fR variable.
 .SS "Prepare:"
 .TP
 .B eapply\fR \fI[patch options]\fR \fI<files|directories>
-Applies patches to the \fB${WORKDIR}\fR with specified options. Default patch level is \fI\-p1\fR. If a directory specified, all patches from it with
-\fI.patch\fR or \fI.diff\fR suffix are applied.
+Applies patches to the build directory with specified options.
+Default patch level is \fI\-p1\fR. If a directory specified, all
+patches from it with \fI.patch\fR or \fI.diff\fR suffix are applied.
 This function is available beginning with \fBEAPI 6\fR, replacing old
 \fBepatch.eclass\fR(5) functions.
 .TP
 .B eapply_user
-Applies user\-provided patches to the \fB${WORKDIR}\fR from Portage config
+Applies user\-provided patches to the build directory from Portage config
 directory tree. For directory syntax and applying rules, see
 \fI/etc/portage/patches/\fR section in \fBportage\fR(5). This function is
 available beginning with \fBEAPI 6\fR, replacing old \fBepatch.eclass\fR(5)
-- 
2.26.3

[gentoo-portage-dev] [PATCH v2 1/2] portage.5: Describe userpatch applying rules in more clean wording

[Nekun]

Bug: https://bugs.gentoo.org/698244
Signed-off-by: Nekun <nekokun@firemail.cc>
---
Tried to be more compact and precise, as suggested in the Bugzilla discussion
// v2: fix some minor grammar issues

 man/portage.5 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 50f20454c..4e7d8c802 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1392,12 +1392,12 @@ following order:
 /etc/portage/patches/${CATEGORY}/${PN}[:${SLOT}]
 .RE 2
 
-Patches from more-specific directories overrides patches from less-specific,
-i.e. if patches with the same name coexist in different directories matches
-same package, only patch from directory matches the first matching pattern
-will be applied. Patches for each package are applied in the POSIX
-lexicographic order. Patch file name must end in ".patch" or, for
-\fBEAPI\fR >= \fB6\fR, in ".diff".
+If patches with the same filename exist in multiple directories
+matching the same package, only the patch from the most specific
+directory is applied. An empty patch from a more-specific directory
+discards patches with the same filename from less-specific directories.
+Patches for each package are applied in POSIX lexicographic order. Patch
+filenames must end in ".patch" or, for \fBEAPI\fR >= \fB6\fR, in ".diff".
 
 If package ebuild uses \fBEAPI\fR <= \fB5\fR, it must explicitly invoke
 \fBepatch_user\fR or inherit \fBepatch.eclass\fR(5) and rely on default
-- 
2.26.3

[gentoo-portage-dev] [PATCH v2 2/2] ebuild.5: Fix eapply target

[Nekun]

More generally, it's a current shell directory (which can be changed in
a ebuild) and it can be overrided with -d, maybe we need more
clarification here. However, in the default src_prepare it's ${S}.

Bug: https://bugs.gentoo.org/698244
Signed-off-by: Nekun <nekokun@firemail.cc>
---
 man/ebuild.5 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index a113c1502..2afea05bb 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1218,13 +1218,14 @@ directory. The function will append \fIsource\fR to the \fBDISTDIR\fR variable.
 .SS "Prepare:"
 .TP
 .B eapply\fR \fI[patch options]\fR \fI<files|directories>
-Applies patches to the \fB${WORKDIR}\fR with specified options. Default patch level is \fI\-p1\fR. If a directory specified, all patches from it with
-\fI.patch\fR or \fI.diff\fR suffix are applied.
+Applies patches to the build directory with specified options.
+Default patch level is \fI\-p1\fR. If a directory specified, all
+patches from it with \fI.patch\fR or \fI.diff\fR suffix are applied.
 This function is available beginning with \fBEAPI 6\fR, replacing old
 \fBepatch.eclass\fR(5) functions.
 .TP
 .B eapply_user
-Applies user\-provided patches to the \fB${WORKDIR}\fR from Portage config
+Applies user\-provided patches to the build directory from Portage config
 directory tree. For directory syntax and applying rules, see
 \fI/etc/portage/patches/\fR section in \fBportage\fR(5). This function is
 available beginning with \fBEAPI 6\fR, replacing old \fBepatch.eclass\fR(5)
-- 
2.26.3