[gentoo-dev] [PATCH 2/2] git-r3.eclass: Drop support for *_LIVE_* variables in EAPI 9

[Ulrich Müller]

Acked-by: Michał Górny <mgo...@gentoo.org>
Signed-off-by: Ulrich Müller <u...@gentoo.org>
---
 eclass/git-r3.eclass | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 2a74078634fda..5c6c32bda847d 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -247,8 +247,8 @@ EVCS_STORE_DIRS=()
 # @FUNCTION: _git-r3_env_setup
 # @INTERNAL
 # @DESCRIPTION:
-# Set the eclass variables as necessary for operation. This can involve
-# setting EGIT_* to defaults or ${PN}_LIVE_* variables.
+# Set the eclass variables as necessary for operation.  This can involve
+# setting EGIT_* to defaults.
 _git-r3_env_setup() {
        debug-print-function ${FUNCNAME} "$@"
 
@@ -293,26 +293,30 @@ _git-r3_env_setup() {
        esc_pn=${PN//[-+]/_}
        [[ ${esc_pn} == [0-9]* ]] && esc_pn=_${esc_pn}
 
+       _git-r3_livevar_warn_or_die() {
+               if [[ ${EAPI} == [78] ]]; then
+                       ewarn "Using ${livevar}, no support will be provided"
+               else
+                       die "${livevar} is no longer supported in EAPI ${EAPI}"
+               fi
+       }
+
        # note: deprecated, use EGIT_OVERRIDE_* instead
        livevar=${esc_pn}_LIVE_REPO
        EGIT_REPO_URI=${!livevar-${EGIT_REPO_URI}}
-       [[ ${!livevar} ]] \
-               && ewarn "Using ${livevar}, no support will be provided"
+       [[ ${!livevar} ]] && _git-r3_livevar_warn_or_die
 
        livevar=${esc_pn}_LIVE_BRANCH
        EGIT_BRANCH=${!livevar-${EGIT_BRANCH}}
-       [[ ${!livevar} ]] \
-               && ewarn "Using ${livevar}, no support will be provided"
+       [[ ${!livevar} ]] && _git-r3_livevar_warn_or_die
 
        livevar=${esc_pn}_LIVE_COMMIT
        EGIT_COMMIT=${!livevar-${EGIT_COMMIT}}
-       [[ ${!livevar} ]] \
-               && ewarn "Using ${livevar}, no support will be provided"
+       [[ ${!livevar} ]] && _git-r3_livevar_warn_or_die
 
        livevar=${esc_pn}_LIVE_COMMIT_DATE
        EGIT_COMMIT_DATE=${!livevar-${EGIT_COMMIT_DATE}}
-       [[ ${!livevar} ]] \
-               && ewarn "Using ${livevar}, no support will be provided"
+       [[ ${!livevar} ]] && _git-r3_livevar_warn_or_die
 
        if [[ ${EGIT_COMMIT} && ${EGIT_COMMIT_DATE} ]]; then
                die "EGIT_COMMIT and EGIT_COMMIT_DATE can not be specified 
simultaneously"
-- 
2.53.0