[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_prepare/epatch/

[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_prepare/epatch/

[Markos Chandras]

commit:     7fae06684e630b635562d10f603cb46d28902bc0
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 09:30:21 2013 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 09:30:21 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=7fae0668

epatch: Reword "larger patches"

Make it mention the devspace instead of mirrors

Bug 483292

---
 ebuild-writing/functions/src_prepare/epatch/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebuild-writing/functions/src_prepare/epatch/text.xml b/ebuild-writing/functions/src_prepare/epatch/text.xml
index a88ecaf..1322a5e 100644
--- a/ebuild-writing/functions/src_prepare/epatch/text.xml
+++ b/ebuild-writing/functions/src_prepare/epatch/text.xml
@@ -37,7 +37,7 @@ src_unpack() {
 </codesample>
 
 <p>
-For larger patches, using <c>mirror://gentoo/</c> rather
+For larger patches, using  <uri link="::general-concepts/mirrors/#suitable-download-hosts">your devspace</uri> rather
 than <c>files/</c> is more appropriate. In these situations, it is
 usually best to <c>bzip2</c> the patch in question (as opposed to
 <c>files/</c> patches, which must not be compressed). For example,

[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_prepare/epatch/

[Göktürk Yüksek]

commit:     c6e5ee2b40f491089980056f4c4d737469282887
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 15:50:21 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 01:15:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=c6e5ee2b

ebuild-writing/.../epatch: suggest compressing patches with xz

With app-arch/xz-utils being in @system, suggest patches to be
compressed with xz as it achieves higher compression rates than bzip2.

Also replace 'files/' with '${FILESDIR}' and add a link to the
variables page.

Reported-by: dracwyrm <j.scruggs <AT> gmail.com>

 ebuild-writing/functions/src_prepare/epatch/text.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ebuild-writing/functions/src_prepare/epatch/text.xml b/ebuild-writing/functions/src_prepare/epatch/text.xml
index a8d5f04..a3adfb5 100644
--- a/ebuild-writing/functions/src_prepare/epatch/text.xml
+++ b/ebuild-writing/functions/src_prepare/epatch/text.xml
@@ -37,11 +37,14 @@ src_unpack() {
 </codesample>
 
 <p>
-For larger patches, using  <uri link="::general-concepts/mirrors/#suitable-download-hosts">your devspace</uri> rather
-than <c>files/</c> is more appropriate. In these situations, it is
-usually best to <c>bzip2</c> the patch in question (as opposed to
-<c>files/</c> patches, which must not be compressed). For example,
-from <c>app-admin/showconsole</c>:
+For larger patches, using
+<uri link="::general-concepts/mirrors/#suitable-download-hosts">
+your devspace</uri> rather than
+<uri link="::ebuild-writing/variables#Predefined Read-Only Variables">
+${FILESDIR}</uri> is more appropriate. In these situations, it is
+usually best to compress the patch in question with <c>xz</c> or
+<c>bzip2</c>(as opposed to <c>${FILESDIR}</c> patches, which must not
+be compressed). For example, from <c>app-admin/showconsole</c>:
 </p>
 
 <codesample lang="ebuild">

[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_prepare/epatch/

[Göktürk Yüksek]

commit:     90fa2a619b36681a02458fb07ba9670a87a6b91e
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 22:14:43 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 22:14:43 2016 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=90fa2a61

ebuild-writing/.../epatch: use the term 'inherit' as opposed to import

Reported-by: Amy Winston <amynka <AT> gentoo.org>

 ebuild-writing/functions/src_prepare/epatch/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebuild-writing/functions/src_prepare/epatch/text.xml b/ebuild-writing/functions/src_prepare/epatch/text.xml
index a3adfb5..6cdff0d 100644
--- a/ebuild-writing/functions/src_prepare/epatch/text.xml
+++ b/ebuild-writing/functions/src_prepare/epatch/text.xml
@@ -7,7 +7,7 @@
 <p>
 The canonical way of applying patches in ebuilds is to
 use <c>epatch</c> (from <c>eutils.eclass</c>, which you must make sure
-to import!) inside <c>src_prepare</c>. This function automatically
+to inherit!) inside <c>src_prepare</c>. This function automatically
 handles <c>-p</c> levels, <c>gunzip</c> and so on as necessary. Also note that olds ebuild may still use src_unpack to apply patches. This is because those ebuilds are based in EAPI=1. You are advised to use EAPI=2 and apply your patches in src_prepare function instead.
 </p>
 

[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_prepare/epatch/

[Brian Evans]

commit:     459be03a011a231ef4c995a234251a3071ceb95f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 17:43:06 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 12:59:24 2018 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=459be03a

Change src_prepare/epatch document to include eapply as well

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 .../functions/src_prepare/epatch/text.xml          | 63 ++++++++++++++++++++--
 1 file changed, 60 insertions(+), 3 deletions(-)

diff --git a/ebuild-writing/functions/src_prepare/epatch/text.xml b/ebuild-writing/functions/src_prepare/epatch/text.xml
index 65386dd..eba335b 100644
--- a/ebuild-writing/functions/src_prepare/epatch/text.xml
+++ b/ebuild-writing/functions/src_prepare/epatch/text.xml
@@ -1,14 +1,37 @@
 <?xml version="1.0"?>
 <guide self="ebuild-writing/functions/src_prepare/epatch/">
 <chapter>
-<title>Patching with epatch</title>
+<title>Patching with epatch and eapply</title>
 
 <body>
 <p>
 The canonical way of applying patches in ebuilds is to
-use <c>epatch</c> (from <c>eutils.eclass</c>, which you must make sure
+use <c>epatch</c> (from <c>epatch.eclass</c>, which you must make sure
 to inherit!) inside <c>src_prepare</c>. This function automatically
-handles <c>-p</c> levels, <c>gunzip</c> and so on as necessary. Also note that olds ebuild may still use src_unpack to apply patches. This is because those ebuilds are based in EAPI=1. You are advised to use EAPI=2 and apply your patches in src_prepare function instead.
+handles <c>-p</c> levels, <c>gunzip</c> and so on as necessary.
+<br>
+Also note that olds ebuild may still use src_unpack to apply patches.
+This is because those ebuilds are based in EAPI=1.
+You are advised to use the latest and apply your patches in src_prepare function instead.
+<br>
+Starting with EAPI=7, this function is banned and eapply must be used.
+</p>
+
+<p>
+Beginning with EAPI=6, a new function eapply was added to apply patches
+without the need for an eclass.
+This function differs from epatch in several ways:
+<ul>
+<li>eapply will not unpack patches for you.</li>
+<li>
+The default patch level is -p1.
+Other patch levels must be specified manually or the command will fail.
+</li>
+<li>
+When specifying a directory, at least file name ending in .patch or .diff
+must exist or the command fails.  Other files are ignored.
+</li>
+</ul>
 </p>
 
 <p>
@@ -17,6 +40,40 @@ and patches is <e>highly</e> discouraged.
 </p>
 </body>
 
+<section>
+<title>Basic <c>eapply</c></title>
+<body>
+<p>
+The default src_prepare function will look for a global PATCHES array to apply
+a list of patches for you.
+</p>
+<codesample lang="ebuild">
+PATCHES=(
+	"${FILESDIR}/${P}-destdir.patch"
+	"${FILESDIR}/${P}-parallel_build.patch"
+)
+</codesample>
+</body>
+</section>
+
+<section>
+<title>Advanced <c>eapply</c></title>
+<body>
+<p>
+This example shows how different patch levels can be applied:
+</p>
+
+<codesample lang="ebuild">
+src_prepare() {
+	eapply -p2 "${WORKDIR}/${P}-suse-update.patch.bz2"
+	eapply -p0 "${FILESDIR}/${PV}-no-TIOCGDEV.patch"
+	eapply "${FILESDIR}/${PV}-gcc-6.patch"
+	eapply_user
+}
+</codesample>
+</body>
+</section>
+
 <section>
 <title>Basic <c>epatch</c></title>
 <body>

[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_prepare/epatch/

[Brian Evans]

commit:     9598695d8c75f47e8f11adb8c468e48a57af4c10
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 24 14:14:06 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 14:14:06 2018 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=9598695d

Fix XML syntax in epatch document

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 ebuild-writing/functions/src_prepare/epatch/text.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebuild-writing/functions/src_prepare/epatch/text.xml b/ebuild-writing/functions/src_prepare/epatch/text.xml
index 7f80b93..a1a2baf 100644
--- a/ebuild-writing/functions/src_prepare/epatch/text.xml
+++ b/ebuild-writing/functions/src_prepare/epatch/text.xml
@@ -9,11 +9,11 @@ The canonical way of applying patches in ebuilds is to
 use <c>epatch</c> (from <c>epatch.eclass</c>, which you must make sure
 to inherit!) inside <c>src_prepare</c>. This function automatically
 handles <c>-p</c> levels, <c>gunzip</c> and so on as necessary.
-<br>
+<br />
 Also note that olds ebuild may still use src_unpack to apply patches.
 This is because those ebuilds are based in EAPI=1.
 You are advised to use the latest and apply your patches in src_prepare function instead.
-<br>
+<br />
 Starting with EAPI=7, this function is banned and eapply must be used.
 </p>
 

[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_prepare/epatch/

[Brian Evans]

commit:     4684bc6ef8285f33d1c31e7b631f4fc85519f42c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 24 14:16:12 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 14:16:12 2018 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=4684bc6e

ebuild-writing/epatch: Fix typo

"olds ebuild" -> "old ebuilds"

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 ebuild-writing/functions/src_prepare/epatch/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebuild-writing/functions/src_prepare/epatch/text.xml b/ebuild-writing/functions/src_prepare/epatch/text.xml
index a1a2baf..720fd67 100644
--- a/ebuild-writing/functions/src_prepare/epatch/text.xml
+++ b/ebuild-writing/functions/src_prepare/epatch/text.xml
@@ -10,7 +10,7 @@ use <c>epatch</c> (from <c>epatch.eclass</c>, which you must make sure
 to inherit!) inside <c>src_prepare</c>. This function automatically
 handles <c>-p</c> levels, <c>gunzip</c> and so on as necessary.
 <br />
-Also note that olds ebuild may still use src_unpack to apply patches.
+Also note that old ebuilds may still use src_unpack to apply patches.
 This is because those ebuilds are based in EAPI=1.
 You are advised to use the latest and apply your patches in src_prepare function instead.
 <br />

[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_prepare/epatch/

[Ulrich Müller]

commit:     d9396de5ed663961944d27c0c100875b3480a4f0
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 08:40:18 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 08:40:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d9396de5

ebuild-writing/.../epatch: eapply does't support compressed files.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ebuild-writing/functions/src_prepare/epatch/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebuild-writing/functions/src_prepare/epatch/text.xml b/ebuild-writing/functions/src_prepare/epatch/text.xml
index 5a6939d..b0a257d 100644
--- a/ebuild-writing/functions/src_prepare/epatch/text.xml
+++ b/ebuild-writing/functions/src_prepare/epatch/text.xml
@@ -65,7 +65,7 @@ This example shows how different patch levels can be applied:
 
 <codesample lang="ebuild">
 src_prepare() {
-	eapply -p2 "${WORKDIR}/${P}-suse-update.patch.bz2"
+	eapply -p2 "${WORKDIR}/${P}-suse-update.patch"
 	eapply -p0 "${FILESDIR}/${PV}-no-TIOCGDEV.patch"
 	eapply "${FILESDIR}/${PV}-gcc-6.patch"
 	eapply_user

[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_prepare/epatch/

[Ulrich Müller]

commit:     30ea65fbd411deeb9ad8b784cb9cb6425bfe4739
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 18:07:44 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 22:14:02 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=30ea65fb

ebuild-writing/functions/src_prepare/epatch: fix whitespace

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ebuild-writing/functions/src_prepare/epatch/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebuild-writing/functions/src_prepare/epatch/text.xml b/ebuild-writing/functions/src_prepare/epatch/text.xml
index d1def03..4b0c427 100644
--- a/ebuild-writing/functions/src_prepare/epatch/text.xml
+++ b/ebuild-writing/functions/src_prepare/epatch/text.xml
@@ -97,7 +97,7 @@ your devspace</uri> rather than
 <uri link="::ebuild-writing/variables#Predefined Read-Only Variables">
 ${FILESDIR}</uri> is more appropriate. In these situations, it is
 usually best to compress the patch in question with <c>xz</c> or
-<c>bzip2</c>(as opposed to <c>${FILESDIR}</c> patches, which must not
+<c>bzip2</c> (as opposed to <c>${FILESDIR}</c> patches, which must not
 be compressed). For example, from <c>app-admin/showconsole</c>:
 </p>