| 1 |
commit: 306f1d3694c25f6802985e288ef08c3d9fefcab7 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 21 10:27:24 2021 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 23 10:21:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=306f1d36 |
| 7 |
|
| 8 |
git-r3.eclass: Remove git-2 backwards compatibility code |
| 9 |
|
| 10 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/git-r3.eclass | 54 ++++------------------------------------------------ |
| 13 |
1 file changed, 4 insertions(+), 50 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass |
| 16 |
index 365f21a4ed4..39817000049 100644 |
| 17 |
--- a/eclass/git-r3.eclass |
| 18 |
+++ b/eclass/git-r3.eclass |
| 19 |
@@ -21,12 +21,10 @@ if [[ ! ${_GIT_R3} ]]; then |
| 20 |
|
| 21 |
PROPERTIES+=" live" |
| 22 |
|
| 23 |
-if [[ ! ${_INHERITED_BY_GIT_2} ]]; then |
| 24 |
- if [[ ${EAPI} != [56] ]]; then |
| 25 |
- BDEPEND=">=dev-vcs/git-1.8.2.1[curl]" |
| 26 |
- else |
| 27 |
- DEPEND=">=dev-vcs/git-1.8.2.1[curl]" |
| 28 |
- fi |
| 29 |
+if [[ ${EAPI} != [56] ]]; then |
| 30 |
+ BDEPEND=">=dev-vcs/git-1.8.2.1[curl]" |
| 31 |
+else |
| 32 |
+ DEPEND=">=dev-vcs/git-1.8.2.1[curl]" |
| 33 |
fi |
| 34 |
|
| 35 |
# @ECLASS-VARIABLE: EGIT_CLONE_TYPE |
| 36 |
@@ -278,50 +276,6 @@ _git-r3_env_setup() { |
| 37 |
if [[ ${EGIT_COMMIT} && ${EGIT_COMMIT_DATE} ]]; then |
| 38 |
die "EGIT_COMMIT and EGIT_COMMIT_DATE can not be specified simultaneously" |
| 39 |
fi |
| 40 |
- |
| 41 |
- # Migration helpers. Remove them when git-2 is removed. |
| 42 |
- |
| 43 |
- if [[ ${EGIT_SOURCEDIR} ]]; then |
| 44 |
- eerror "EGIT_SOURCEDIR has been replaced by EGIT_CHECKOUT_DIR. While updating" |
| 45 |
- eerror "your ebuild, please check whether the variable is necessary at all" |
| 46 |
- eerror "since the default has been changed from \${S} to \${WORKDIR}/\${P}." |
| 47 |
- eerror "Therefore, proper setting of S may be sufficient." |
| 48 |
- die "EGIT_SOURCEDIR has been replaced by EGIT_CHECKOUT_DIR." |
| 49 |
- fi |
| 50 |
- |
| 51 |
- if [[ ${EGIT_MASTER} ]]; then |
| 52 |
- eerror "EGIT_MASTER has been removed. Instead, the upstream default (HEAD)" |
| 53 |
- eerror "is used by the eclass. Please remove the assignment or use EGIT_BRANCH" |
| 54 |
- eerror "as necessary." |
| 55 |
- die "EGIT_MASTER has been removed." |
| 56 |
- fi |
| 57 |
- |
| 58 |
- if [[ ${EGIT_HAS_SUBMODULES} ]]; then |
| 59 |
- eerror "EGIT_HAS_SUBMODULES has been removed. The eclass no longer needs" |
| 60 |
- eerror "to switch the clone type in order to support submodules and therefore" |
| 61 |
- eerror "submodules are detected and fetched automatically. If you need to" |
| 62 |
- eerror "disable or filter submodules, see EGIT_SUBMODULES." |
| 63 |
- die "EGIT_HAS_SUBMODULES is no longer necessary." |
| 64 |
- fi |
| 65 |
- |
| 66 |
- if [[ ${EGIT_PROJECT} ]]; then |
| 67 |
- eerror "EGIT_PROJECT has been removed. Instead, the eclass determines" |
| 68 |
- eerror "the local clone path using path in canonical EGIT_REPO_URI." |
| 69 |
- eerror "If the current algorithm causes issues for you, please report a bug." |
| 70 |
- die "EGIT_PROJECT is no longer necessary." |
| 71 |
- fi |
| 72 |
- |
| 73 |
- if [[ ${EGIT_BOOTSTRAP} ]]; then |
| 74 |
- eerror "EGIT_BOOTSTRAP has been removed. Please create proper src_prepare()" |
| 75 |
- eerror "instead." |
| 76 |
- die "EGIT_BOOTSTRAP has been removed." |
| 77 |
- fi |
| 78 |
- |
| 79 |
- if [[ ${EGIT_NOUNPACK} ]]; then |
| 80 |
- eerror "EGIT_NOUNPACK has been removed. The eclass no longer calls default" |
| 81 |
- eerror "unpack function. If necessary, please declare proper src_unpack()." |
| 82 |
- die "EGIT_NOUNPACK has been removed." |
| 83 |
- fi |
| 84 |
} |
| 85 |
|
| 86 |
# @FUNCTION: _git-r3_set_gitdir |
Archives