[gentoo-commits] repo/gentoo:master commit in: eclass/

[Ulrich Müller]

commit:     c7f5b41f33965df5efb3f3723bf797c69c9da955
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  2 08:55:03 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Sep  3 15:19:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f5b41f

subversion.eclass: Move EXPORT_FUNCTIONS below inherit

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

 eclass/subversion.eclass | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
index 6ed8a62dbe3..aa1a5c35587 100644
--- a/eclass/subversion.eclass
+++ b/eclass/subversion.eclass
@@ -14,18 +14,10 @@
 
 ESVN="${ECLASS}"
 
-case ${EAPI:-0} in
-       4|5)
-               inherit eutils
-               EXPORT_FUNCTIONS src_unpack src_prepare pkg_preinst
-               ;;
-       6|7)
-               inherit estack
-               EXPORT_FUNCTIONS src_unpack pkg_preinst
-               ;;
-       *)
-               die "${ESVN}: EAPI ${EAPI:-0} is not supported"
-               ;;
+case ${EAPI} in
+       4|5) inherit eutils ;;
+       6|7) inherit estack ;;
+       *) die "${ESVN}: EAPI ${EAPI:-0} is not supported" ;;
 esac
 
 PROPERTIES+=" live"
@@ -543,3 +535,8 @@ subversion__get_peg_revision() {
 
        echo "${peg_rev}"
 }
+
+EXPORT_FUNCTIONS src_unpack pkg_preinst
+if [[ ${EAPI} == [45] ]]; then
+       EXPORT_FUNCTIONS src_prepare
+fi