diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2018-03-18 00:21:49 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2018-06-13 10:05:30 +0200 |
| commit | bb7d4c46cc6205e775105d741bfd94809a01757b (patch) | |
| tree | 16c812019b42896ca80236f2b11a80557dfcb41a /eclass | |
| parent | git-r3.eclass: Ban EAPIs 0 through 3 (diff) | |
| download | gentoo-bb7d4c46cc6205e775105d741bfd94809a01757b.tar.gz gentoo-bb7d4c46cc6205e775105d741bfd94809a01757b.tar.bz2 gentoo-bb7d4c46cc6205e775105d741bfd94809a01757b.zip | |
git-r3.eclass: Unconditionally depend on dev-vcs/git[curl] for HTTPS
Since HTTPS is strongly preferred in git-r3 eclass, there is no point
in optimizing it for non-HTTPS use. Therefore, unconditionally depend
on dev-vcs/git[curl] rather than verbosely failing when HTTPS is used
and the dependency is not satisfied.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/git-r3.eclass | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index c5c76232eb41..7fe9bcb40fa4 100644 --- a/eclass/git-r3.eclass +++ b/eclass/git-r3.eclass @@ -26,9 +26,9 @@ if [[ ! ${_GIT_R3} ]]; then if [[ ! ${_INHERITED_BY_GIT_2} ]]; then if [[ ${EAPI:-0} != [0123456] ]]; then - BDEPEND=">=dev-vcs/git-1.8.2.1" + BDEPEND=">=dev-vcs/git-1.8.2.1[curl]" else - DEPEND=">=dev-vcs/git-1.8.2.1" + DEPEND=">=dev-vcs/git-1.8.2.1[curl]" fi fi @@ -654,31 +654,6 @@ git-r3_fetch() { local fetch_command=( git fetch "${r}" ) local clone_type=${EGIT_CLONE_TYPE} - if [[ ${r} == http://* || ${r} == https://* ]] && - [[ ! ${EGIT_CURL_WARNED} ]] - then - case ${EAPI:-0} in - 0|1|2|3|4) - ROOT=/ has_version 'dev-vcs/git[curl]';; - 5|6) - has_version --host-root 'dev-vcs/git[curl]';; - *) - has_version -b 'dev-vcs/git[curl]';; - esac - - if [[ ${?} -ne 0 ]]; then - ewarn "git-r3: fetching from HTTP(S) requested. In order to support HTTP(S)," - ewarn "dev-vcs/git needs to be built with USE=curl. Example solution:" - ewarn - ewarn " echo dev-vcs/git curl >> /etc/portage/package.use" - ewarn " emerge -1v dev-vcs/git" - ewarn - ewarn "HTTP(S) URIs will be skipped." - fi - - EGIT_CURL_WARNED=1 - fi - if [[ ${clone_type} == mirror ]]; then fetch_command+=( --prune |