Gentoo Archives: gentoo-dev

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-dev@l.g.o
Cc: "Ulrich Müller" <ulm@g.o>
Subject: [gentoo-dev] [PATCH 14/14] subversion.eclass: Move EXPORT_FUNCTIONS below inherit
Date: Thu, 02 Sep 2021 10:03:55
Message-Id: 20210902095911.25263-14-ulm@gentoo.org
In Reply to: [gentoo-dev] [PATCH 01/14] apache-module.eclass: Move EXPORT_FUNCTIONS below inherit by "Ulrich Müller"
1 Signed-off-by: Ulrich Müller <ulm@g.o>
2 ---
3 eclass/subversion.eclass | 21 +++++++++------------
4 1 file changed, 9 insertions(+), 12 deletions(-)
5
6 diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
7 index 6ed8a62dbe35..aa1a5c355877 100644
8 --- a/eclass/subversion.eclass
9 +++ b/eclass/subversion.eclass
10 @@ -14,18 +14,10 @@
11
12 ESVN="${ECLASS}"
13
14 -case ${EAPI:-0} in
15 - 4|5)
16 - inherit eutils
17 - EXPORT_FUNCTIONS src_unpack src_prepare pkg_preinst
18 - ;;
19 - 6|7)
20 - inherit estack
21 - EXPORT_FUNCTIONS src_unpack pkg_preinst
22 - ;;
23 - *)
24 - die "${ESVN}: EAPI ${EAPI:-0} is not supported"
25 - ;;
26 +case ${EAPI} in
27 + 4|5) inherit eutils ;;
28 + 6|7) inherit estack ;;
29 + *) die "${ESVN}: EAPI ${EAPI:-0} is not supported" ;;
30 esac
31
32 PROPERTIES+=" live"
33 @@ -543,3 +535,8 @@ subversion__get_peg_revision() {
34
35 echo "${peg_rev}"
36 }
37 +
38 +EXPORT_FUNCTIONS src_unpack pkg_preinst
39 +if [[ ${EAPI} == [45] ]]; then
40 + EXPORT_FUNCTIONS src_prepare
41 +fi
42 --
43 2.33.0