eclass/git-r3: Sync with gentoo

It's from gentoo commit 306f1d3694c25f6802985e288ef08c3d9fefcab7.
This commit is contained in:
Krzesimir Nowak 2021-12-21 09:23:15 +01:00
parent 8ea3271af0
commit 6493b12aee

View File

@ -1,24 +1,18 @@
# Copyright 1999-2020 Gentoo Authors # Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# @ECLASS: git-r3.eclass # @ECLASS: git-r3.eclass
# @MAINTAINER: # @MAINTAINER:
# Michał Górny <mgorny@gentoo.org> # Michał Górny <mgorny@gentoo.org>
# @SUPPORTED_EAPIS: 4 5 6 7 # @SUPPORTED_EAPIS: 5 6 7 8
# @BLURB: Eclass for fetching and unpacking git repositories. # @BLURB: Eclass for fetching and unpacking git repositories.
# @DESCRIPTION: # @DESCRIPTION:
# Third generation eclass for easing maintenance of live ebuilds using # Third generation eclass for easing maintenance of live ebuilds using
# git as remote repository. # git as remote repository.
case "${EAPI:-0}" in case ${EAPI:-0} in
0|1|2|3) 5|6|7|8) ;;
die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}" *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
;;
4|5|6|7)
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
;;
esac esac
EXPORT_FUNCTIONS src_unpack EXPORT_FUNCTIONS src_unpack
@ -27,15 +21,14 @@ if [[ ! ${_GIT_R3} ]]; then
PROPERTIES+=" live" PROPERTIES+=" live"
if [[ ! ${_INHERITED_BY_GIT_2} ]]; then if [[ ${EAPI} != [56] ]]; then
if [[ ${EAPI:-0} != [0123456] ]]; then BDEPEND=">=dev-vcs/git-1.8.2.1[curl]"
BDEPEND=">=dev-vcs/git-1.8.2.1[curl]" else
else DEPEND=">=dev-vcs/git-1.8.2.1[curl]"
DEPEND=">=dev-vcs/git-1.8.2.1[curl]"
fi
fi fi
# @ECLASS-VARIABLE: EGIT_CLONE_TYPE # @ECLASS-VARIABLE: EGIT_CLONE_TYPE
# @USER_VARIABLE
# @DESCRIPTION: # @DESCRIPTION:
# Type of clone that should be used against the remote repository. # Type of clone that should be used against the remote repository.
# This can be either of: 'mirror', 'single', 'shallow'. # This can be either of: 'mirror', 'single', 'shallow'.
@ -283,50 +276,6 @@ _git-r3_env_setup() {
if [[ ${EGIT_COMMIT} && ${EGIT_COMMIT_DATE} ]]; then if [[ ${EGIT_COMMIT} && ${EGIT_COMMIT_DATE} ]]; then
die "EGIT_COMMIT and EGIT_COMMIT_DATE can not be specified simultaneously" die "EGIT_COMMIT and EGIT_COMMIT_DATE can not be specified simultaneously"
fi fi
# Migration helpers. Remove them when git-2 is removed.
if [[ ${EGIT_SOURCEDIR} ]]; then
eerror "EGIT_SOURCEDIR has been replaced by EGIT_CHECKOUT_DIR. While updating"
eerror "your ebuild, please check whether the variable is necessary at all"
eerror "since the default has been changed from \${S} to \${WORKDIR}/\${P}."
eerror "Therefore, proper setting of S may be sufficient."
die "EGIT_SOURCEDIR has been replaced by EGIT_CHECKOUT_DIR."
fi
if [[ ${EGIT_MASTER} ]]; then
eerror "EGIT_MASTER has been removed. Instead, the upstream default (HEAD)"
eerror "is used by the eclass. Please remove the assignment or use EGIT_BRANCH"
eerror "as necessary."
die "EGIT_MASTER has been removed."
fi
if [[ ${EGIT_HAS_SUBMODULES} ]]; then
eerror "EGIT_HAS_SUBMODULES has been removed. The eclass no longer needs"
eerror "to switch the clone type in order to support submodules and therefore"
eerror "submodules are detected and fetched automatically. If you need to"
eerror "disable or filter submodules, see EGIT_SUBMODULES."
die "EGIT_HAS_SUBMODULES is no longer necessary."
fi
if [[ ${EGIT_PROJECT} ]]; then
eerror "EGIT_PROJECT has been removed. Instead, the eclass determines"
eerror "the local clone path using path in canonical EGIT_REPO_URI."
eerror "If the current algorithm causes issues for you, please report a bug."
die "EGIT_PROJECT is no longer necessary."
fi
if [[ ${EGIT_BOOTSTRAP} ]]; then
eerror "EGIT_BOOTSTRAP has been removed. Please create proper src_prepare()"
eerror "instead."
die "EGIT_BOOTSTRAP has been removed."
fi
if [[ ${EGIT_NOUNPACK} ]]; then
eerror "EGIT_NOUNPACK has been removed. The eclass no longer calls default"
eerror "unpack function. If necessary, please declare proper src_unpack()."
die "EGIT_NOUNPACK has been removed."
fi
} }
# @FUNCTION: _git-r3_set_gitdir # @FUNCTION: _git-r3_set_gitdir
@ -611,7 +560,7 @@ git-r3_fetch() {
local commit_date=${4:-${EGIT_COMMIT_DATE}} local commit_date=${4:-${EGIT_COMMIT_DATE}}
# support new override API for EAPI 6+ # support new override API for EAPI 6+
if ! has "${EAPI:-0}" 0 1 2 3 4 5; then if [[ ${EAPI} != 5 ]]; then
# get the name and do some more processing: # get the name and do some more processing:
# 1) kill .git suffix, # 1) kill .git suffix,
# 2) underscore (remaining) non-variable characters, # 2) underscore (remaining) non-variable characters,