1 |
commit: 7e3d69ba24d86abeadd1ecf474577e6977b78934 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 25 12:08:15 2021 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 27 16:54:46 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e3d69ba |
7 |
|
8 |
bzr.eclass: Drop support for EBZR_INITIAL_URI |
9 |
|
10 |
This was historically used only for GNU Emacs, which had a slow |
11 |
original repository and a fast (but possibly out of date) mirror. |
12 |
|
13 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
14 |
|
15 |
eclass/bzr.eclass | 25 +------------------------ |
16 |
1 file changed, 1 insertion(+), 24 deletions(-) |
17 |
|
18 |
diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass |
19 |
index 5dd5d40c13f..b89f4216034 100644 |
20 |
--- a/eclass/bzr.eclass |
21 |
+++ b/eclass/bzr.eclass |
22 |
@@ -82,17 +82,6 @@ EXPORT_FUNCTIONS src_unpack |
23 |
# @DESCRIPTION: |
24 |
# The repository URI for the source package. |
25 |
|
26 |
-# @ECLASS-VARIABLE: EBZR_INITIAL_URI |
27 |
-# @DEFAULT_UNSET |
28 |
-# @DESCRIPTION: |
29 |
-# The URI used for initial branching of the source repository. If this |
30 |
-# variable is set, the initial branch will be cloned from the location |
31 |
-# specified, followed by a pull from ${EBZR_REPO_URI}. This is intended |
32 |
-# for special cases, e.g. when download from the original repository is |
33 |
-# slow, but a fast mirror exists but may be out of date. |
34 |
-# |
35 |
-# Normally, this variable needs not be set. |
36 |
- |
37 |
# @ECLASS-VARIABLE: EBZR_PROJECT |
38 |
# @DESCRIPTION: |
39 |
# The project name of your ebuild. Normally, the branch will be stored |
40 |
@@ -231,19 +220,7 @@ bzr_fetch() { |
41 |
${EBZR_INIT_REPO_CMD} "${repo_dir}" \ |
42 |
|| die "${ECLASS}: can't create shared repository" |
43 |
fi |
44 |
- |
45 |
- if [[ -z ${EBZR_INITIAL_URI} ]]; then |
46 |
- _bzr_initial_fetch "${EBZR_REPO_URI}" "${branch_dir}" |
47 |
- else |
48 |
- # Workaround for faster initial download. This clones the |
49 |
- # branch from a fast server (which may be out of date), and |
50 |
- # subsequently pulls from the slow original repository. |
51 |
- _bzr_initial_fetch "${EBZR_INITIAL_URI}" "${branch_dir}" |
52 |
- if [[ ${EBZR_REPO_URI} != "${EBZR_INITIAL_URI}" ]]; then |
53 |
- EBZR_UPDATE_CMD="${EBZR_UPDATE_CMD} --remember --overwrite" \ |
54 |
- bzr_update "${EBZR_REPO_URI}" "${branch_dir}" |
55 |
- fi |
56 |
- fi |
57 |
+ _bzr_initial_fetch "${EBZR_REPO_URI}" "${branch_dir}" |
58 |
else |
59 |
_bzr_update "${EBZR_REPO_URI}" "${branch_dir}" |
60 |
fi |