1 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
2 |
--- |
3 |
eclass/bzr.eclass | 39 +++++++++++++++------------------------ |
4 |
1 file changed, 15 insertions(+), 24 deletions(-) |
5 |
|
6 |
diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass |
7 |
index fc1de9dc9ccc..e76af5d41d57 100644 |
8 |
--- a/eclass/bzr.eclass |
9 |
+++ b/eclass/bzr.eclass |
10 |
@@ -1,4 +1,4 @@ |
11 |
-# Copyright 1999-2019 Gentoo Authors |
12 |
+# Copyright 1999-2021 Gentoo Authors |
13 |
# Distributed under the terms of the GNU General Public License v2 |
14 |
|
15 |
# @ECLASS: bzr.eclass |
16 |
@@ -9,7 +9,7 @@ |
17 |
# Mark Lee <bzr-gentoo-overlay@×××××××××××××××.com> |
18 |
# Ulrich Müller <ulm@g.o> |
19 |
# Christian Faulhammer <fauli@g.o> |
20 |
-# @SUPPORTED_EAPIS: 2 3 4 5 6 7 |
21 |
+# @SUPPORTED_EAPIS: 7 8 |
22 |
# @BLURB: generic fetching functions for the Bazaar VCS |
23 |
# @DESCRIPTION: |
24 |
# The bzr.eclass provides functions to fetch and unpack sources from |
25 |
@@ -21,20 +21,15 @@ |
26 |
|
27 |
EBZR="bzr.eclass" |
28 |
|
29 |
-PROPERTIES+=" live" |
30 |
- |
31 |
-if [[ ${EBZR_REPO_URI%%:*} = sftp ]]; then |
32 |
- DEPEND=">=dev-vcs/bzr-2.6.0[sftp]" |
33 |
-else |
34 |
- DEPEND=">=dev-vcs/bzr-2.6.0" |
35 |
-fi |
36 |
- |
37 |
-case ${EAPI:-0} in |
38 |
- 2|3|4|5|6) ;; |
39 |
- 7) BDEPEND="${DEPEND}"; DEPEND="" ;; |
40 |
+case ${EAPI} in |
41 |
+ 7|8) ;; |
42 |
*) die "${EBZR}: EAPI ${EAPI:-0} is not supported" ;; |
43 |
esac |
44 |
|
45 |
+PROPERTIES+=" live" |
46 |
+ |
47 |
+BDEPEND="dev-vcs/breezy" |
48 |
+ |
49 |
EXPORT_FUNCTIONS src_unpack |
50 |
|
51 |
# @ECLASS-VARIABLE: EBZR_STORE_DIR |
52 |
@@ -50,32 +45,32 @@ EXPORT_FUNCTIONS src_unpack |
53 |
# @ECLASS-VARIABLE: EBZR_INIT_REPO_CMD |
54 |
# @DESCRIPTION: |
55 |
# The Bazaar command to initialise a shared repository. |
56 |
-: ${EBZR_INIT_REPO_CMD:="bzr init-repository --no-trees"} |
57 |
+: ${EBZR_INIT_REPO_CMD:="brz init-shared-repository --no-trees"} |
58 |
|
59 |
# @ECLASS-VARIABLE: EBZR_FETCH_CMD |
60 |
# @DESCRIPTION: |
61 |
# The Bazaar command to fetch the sources. |
62 |
-: ${EBZR_FETCH_CMD:="bzr branch --no-tree"} |
63 |
+: ${EBZR_FETCH_CMD:="brz branch --no-tree"} |
64 |
|
65 |
# @ECLASS-VARIABLE: EBZR_UPDATE_CMD |
66 |
# @DESCRIPTION: |
67 |
# The Bazaar command to update the sources. |
68 |
-: ${EBZR_UPDATE_CMD:="bzr pull --overwrite-tags"} |
69 |
+: ${EBZR_UPDATE_CMD:="brz pull --overwrite-tags"} |
70 |
|
71 |
# @ECLASS-VARIABLE: EBZR_EXPORT_CMD |
72 |
# @DESCRIPTION: |
73 |
# The Bazaar command to export a branch. |
74 |
-: ${EBZR_EXPORT_CMD:="bzr export"} |
75 |
+: ${EBZR_EXPORT_CMD:="brz export"} |
76 |
|
77 |
# @ECLASS-VARIABLE: EBZR_CHECKOUT_CMD |
78 |
# @DESCRIPTION: |
79 |
# The Bazaar command to checkout a branch. |
80 |
-: ${EBZR_CHECKOUT_CMD:="bzr checkout --lightweight -q"} |
81 |
+: ${EBZR_CHECKOUT_CMD:="brz checkout --lightweight -q"} |
82 |
|
83 |
# @ECLASS-VARIABLE: EBZR_REVNO_CMD |
84 |
# @DESCRIPTION: |
85 |
# The Bazaar command to list a revision number of the branch. |
86 |
-: ${EBZR_REVNO_CMD:="bzr revno"} |
87 |
+: ${EBZR_REVNO_CMD:="brz revno"} |
88 |
|
89 |
# @ECLASS-VARIABLE: EBZR_OPTIONS |
90 |
# @DEFAULT_UNSET |
91 |
@@ -87,9 +82,6 @@ EXPORT_FUNCTIONS src_unpack |
92 |
# @REQUIRED |
93 |
# @DESCRIPTION: |
94 |
# The repository URI for the source package. |
95 |
-# |
96 |
-# Note: If the ebuild uses an sftp:// URI, then the eclass will depend |
97 |
-# on dev-vcs/bzr[sftp]. |
98 |
|
99 |
# @ECLASS-VARIABLE: EBZR_INITIAL_URI |
100 |
# @DEFAULT_UNSET |
101 |
@@ -130,8 +122,7 @@ EXPORT_FUNCTIONS src_unpack |
102 |
# @ECLASS-VARIABLE: EBZR_REVISION |
103 |
# @DEFAULT_UNSET |
104 |
# @DESCRIPTION: |
105 |
-# Revision to fetch, defaults to the latest |
106 |
-# (see http://bazaar-vcs.org/BzrRevisionSpec or bzr help revisionspec). |
107 |
+# Revision to fetch, defaults to the latest (see brz help revisionspec). |
108 |
|
109 |
# @ECLASS-VARIABLE: EBZR_OFFLINE |
110 |
# @DESCRIPTION: |
111 |
-- |
112 |
2.33.0 |