Gentoo Archives: gentoo-commits

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