[gentoo-dev] [PATCH 1/1] Fix eapply_user as per PMS spec and execute in, src_prepare. Support older EAPIs with epatch_user.

[Mike Pagano]

2nd round. As per mgorny's advice, fix eapply_user as per PMS spec and
execute in src_prepare. Support older EAPIs with epatch_user.

---
 eclass/kernel-2.eclass | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 3f5fb3b..e516aff 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -95,7 +95,7 @@ has "${EAPI:-0}" 0 1 2 3 4 5 || die "kernel-2.eclass
is unsupported for EAPI ${E
 PYTHON_COMPAT=( python{2_6,2_7} )

 inherit eutils toolchain-funcs versionator multilib python-any-r1
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install
pkg_preinst pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS pkg_setup src_prepare src_unpack src_compile src_test
src_install pkg_preinst pkg_postinst pkg_postrm

 # Added by Daniel Ostrow <dost...@gentoo.org>
 # This is an ugly hack to get around an issue with a 32-bit userland on
ppc64.
@@ -1260,12 +1260,9 @@ kernel-2_src_unpack() {
        # we run misc `make` functions below
        [[ $(type -t kernel-2_hook_premake) == "function" ]] &&
kernel-2_hook_premake

-       debug-print "Applying any user patches"
-       # apply any user patches
-    case ${EAPI:-0} in
-        0|1|2|3|4|5) epatch_user ;;
-        6) eapply_user ;;
-    esac
+       case ${EAPI:-0} in
+               0|1) kernel-2_src_prepare ;;
+       esac

        debug-print "Doing unpack_set_extraversion"

@@ -1305,6 +1302,20 @@ kernel-2_src_unpack() {
        fi
 }

+# @FUNCTION: kernel-2_src_prepare
+# @DESCRIPTION:
+# Apply any user patches
+kernel-2_src_prepare() {
+
+       debug-print "Applying any user patches"
+
+       # apply any user patches
+       case ${EAPI:-0} in
+               0|1|2|3|4|5) epatch_user ;;
+               6) eapply_user ;;
+       esac
+}
+
 kernel-2_src_compile() {
        cd "${S}"
        [[ ${ETYPE} == headers ]] && compile_headers
-- 
2.7.3

signature.asc
Description: OpenPGP digital signature