| 1 |
commit: bb7d4c46cc6205e775105d741bfd94809a01757b |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 17 23:21:49 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 13 08:05:30 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7d4c46 |
| 7 |
|
| 8 |
git-r3.eclass: Unconditionally depend on dev-vcs/git[curl] for HTTPS |
| 9 |
|
| 10 |
Since HTTPS is strongly preferred in git-r3 eclass, there is no point |
| 11 |
in optimizing it for non-HTTPS use. Therefore, unconditionally depend |
| 12 |
on dev-vcs/git[curl] rather than verbosely failing when HTTPS is used |
| 13 |
and the dependency is not satisfied. |
| 14 |
|
| 15 |
eclass/git-r3.eclass | 29 ++--------------------------- |
| 16 |
1 file changed, 2 insertions(+), 27 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass |
| 19 |
index c5c76232eb4..7fe9bcb40fa 100644 |
| 20 |
--- a/eclass/git-r3.eclass |
| 21 |
+++ b/eclass/git-r3.eclass |
| 22 |
@@ -26,9 +26,9 @@ if [[ ! ${_GIT_R3} ]]; then |
| 23 |
|
| 24 |
if [[ ! ${_INHERITED_BY_GIT_2} ]]; then |
| 25 |
if [[ ${EAPI:-0} != [0123456] ]]; then |
| 26 |
- BDEPEND=">=dev-vcs/git-1.8.2.1" |
| 27 |
+ BDEPEND=">=dev-vcs/git-1.8.2.1[curl]" |
| 28 |
else |
| 29 |
- DEPEND=">=dev-vcs/git-1.8.2.1" |
| 30 |
+ DEPEND=">=dev-vcs/git-1.8.2.1[curl]" |
| 31 |
fi |
| 32 |
fi |
| 33 |
|
| 34 |
@@ -654,31 +654,6 @@ git-r3_fetch() { |
| 35 |
local fetch_command=( git fetch "${r}" ) |
| 36 |
local clone_type=${EGIT_CLONE_TYPE} |
| 37 |
|
| 38 |
- if [[ ${r} == http://* || ${r} == https://* ]] && |
| 39 |
- [[ ! ${EGIT_CURL_WARNED} ]] |
| 40 |
- then |
| 41 |
- case ${EAPI:-0} in |
| 42 |
- 0|1|2|3|4) |
| 43 |
- ROOT=/ has_version 'dev-vcs/git[curl]';; |
| 44 |
- 5|6) |
| 45 |
- has_version --host-root 'dev-vcs/git[curl]';; |
| 46 |
- *) |
| 47 |
- has_version -b 'dev-vcs/git[curl]';; |
| 48 |
- esac |
| 49 |
- |
| 50 |
- if [[ ${?} -ne 0 ]]; then |
| 51 |
- ewarn "git-r3: fetching from HTTP(S) requested. In order to support HTTP(S)," |
| 52 |
- ewarn "dev-vcs/git needs to be built with USE=curl. Example solution:" |
| 53 |
- ewarn |
| 54 |
- ewarn " echo dev-vcs/git curl >> /etc/portage/package.use" |
| 55 |
- ewarn " emerge -1v dev-vcs/git" |
| 56 |
- ewarn |
| 57 |
- ewarn "HTTP(S) URIs will be skipped." |
| 58 |
- fi |
| 59 |
- |
| 60 |
- EGIT_CURL_WARNED=1 |
| 61 |
- fi |
| 62 |
- |
| 63 |
if [[ ${clone_type} == mirror ]]; then |
| 64 |
fetch_command+=( |
| 65 |
--prune |
Archives