@@ -, +, @@ --- .../src_compile/build-environment/text.xml | 2 +- ebuild-writing/functions/src_compile/text.xml | 4 ++-- .../functions/src_configure/configuring/text.xml | 2 +- .../functions/src_prepare/epatch/text.xml | 11 +++++++---- ebuild-writing/functions/src_prepare/text.xml | 4 ++-- .../functions/src_unpack/svn-sources/text.xml | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) --- a/ebuild-writing/functions/src_compile/build-environment/text.xml +++ a/ebuild-writing/functions/src_compile/build-environment/text.xml @@ -141,7 +141,7 @@ functions can be used here.

-See for a full reference. +See the flag-o-matic.eclass for a full reference.

--- a/ebuild-writing/functions/src_compile/text.xml +++ a/ebuild-writing/functions/src_compile/text.xml @@ -11,7 +11,7 @@ Purpose - Configure and build the package.the configure parts of src_compile have been splitted out in EAPI=2 to src_configure. see + Configure and build the package. The configure parts of src_compile have been splitted out in EAPI=2 to src_configure. See . Sandbox @@ -85,7 +85,7 @@ src_compile() { with EAPI=2

-porting the above example to EAPI=2, you won't need to define an extra +Porting the above example to EAPI=2, you don't need to define an extra src_compile, as it only calls emake (which is the default src_compile function).

--- a/ebuild-writing/functions/src_configure/configuring/text.xml +++ a/ebuild-writing/functions/src_configure/configuring/text.xml @@ -63,7 +63,7 @@ src_configure() { # ... } -src_compile() { +src_configure() { econf $(use_with X x11 ) } --- a/ebuild-writing/functions/src_prepare/epatch/text.xml +++ a/ebuild-writing/functions/src_prepare/epatch/text.xml @@ -8,7 +8,10 @@ The canonical way of applying patches in ebuilds is to use epatch (from eutils.eclass, which you must make sure to import!) inside src_prepare. This function automatically -handles -p levels, gunzip 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 -p levels, gunzip and so on as necessary. Also note +that older ebuilds 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.

@@ -87,7 +90,7 @@ manually, or mirror the file.

epatch can also apply multiple patches (which can be selectively based upon arch) from a single directory. This can be useful if upstream -have releases that need more patches. +has releases that need more patches.

@@ -145,8 +148,8 @@ Variables which may be defined include:

Bulk patches should be named in the form ??_${ARCH}_foo.${EPATCH_SUFFIX}. If they are -not, EPATCH_FORCE="yes" must be set. To apply a patch on all -archs, use all for the ${ARCH} part. +not, EPATCH_FORCE="yes" must be set. To apply a patch on all +archs, use all for the ${ARCH} part.

--- a/ebuild-writing/functions/src_prepare/text.xml +++ a/ebuild-writing/functions/src_prepare/text.xml @@ -32,8 +32,8 @@ Default <c>src_prepare</c>

-Starting from EAPI="2", the src_prepare function is the appropriate area to perform -any kind of patching and source code manipulation, instead of src_unpack. +Starting from EAPI="2", the src_prepare function is the appropriate place to +perform any kind of patching and source code manipulation, instead of src_unpack.

src_prepare() { --- a/ebuild-writing/functions/src_unpack/svn-sources/text.xml +++ a/ebuild-writing/functions/src_unpack/svn-sources/text.xml @@ -82,7 +82,7 @@ following variables are also noteworthy:

-See the eclass itself and +See the subversion.eclass itself for the full range of options. To perform the actual checkout, use the subversion_src_unpack function, which calls both subversion_svn_fetch and subversion_bootstrap --