Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 2/2] git-r3.eclass: Undocument deprecated EGIT_LIVE_* API
Date: Sat, 15 Sep 2018 15:54:47
Message-Id: 20180915155409.10368-2-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/2] git-r3.eclass: Print possible override vars for user convenience by "Michał Górny"
1 ---
2 eclass/git-r3.eclass | 9 +--------
3 1 file changed, 1 insertion(+), 8 deletions(-)
4
5 diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
6 index 3c09b6682ef5..a1ad0d238dc9 100644
7 --- a/eclass/git-r3.eclass
8 +++ b/eclass/git-r3.eclass
9 @@ -122,8 +122,6 @@ fi
10 # URIs are completely unsecured and their use (even if only as
11 # a fallback) renders the ebuild completely vulnerable to MITM attacks.
12 #
13 -# It can be overridden via env using ${PN}_LIVE_REPO variable.
14 -#
15 # Can be a whitespace-separated list or an array.
16 #
17 # Example:
18 @@ -152,8 +150,6 @@ fi
19 # @DESCRIPTION:
20 # The branch name to check out. If unset, the upstream default (HEAD)
21 # will be used.
22 -#
23 -# It can be overridden via env using ${PN}_LIVE_BRANCH variable.
24
25 # @ECLASS-VARIABLE: EGIT_COMMIT
26 # @DEFAULT_UNSET
27 @@ -162,8 +158,6 @@ fi
28 # commit from the branch will be used. Note that if set to a commit
29 # not on HEAD branch, EGIT_BRANCH needs to be set to a branch on which
30 # the commit is available.
31 -#
32 -# It can be overridden via env using ${PN}_LIVE_COMMIT variable.
33
34 # @ECLASS-VARIABLE: EGIT_COMMIT_DATE
35 # @DEFAULT_UNSET
36 @@ -178,8 +172,6 @@ fi
37 # (assuming that merges are done correctly). In other words, each merge
38 # will be considered alike a single commit with date corresponding
39 # to the merge commit date.
40 -#
41 -# It can be overridden via env using ${PN}_LIVE_COMMIT_DATE variable.
42
43 # @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR
44 # @DESCRIPTION:
45 @@ -262,6 +254,7 @@ _git-r3_env_setup() {
46 esc_pn=${PN//[-+]/_}
47 [[ ${esc_pn} == [0-9]* ]] && esc_pn=_${esc_pn}
48
49 + # note: deprecated, use EGIT_OVERRIDE_* instead
50 livevar=${esc_pn}_LIVE_REPO
51 EGIT_REPO_URI=${!livevar-${EGIT_REPO_URI}}
52 [[ ${!livevar} ]] \
53 --
54 2.19.0