/[gentoo-x86]/eclass/bzr.eclass
Gentoo

Diff of /eclass/bzr.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.8 Revision 1.17
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2011 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.8 2010/03/05 09:35:23 fauli Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.17 2011/09/22 08:13:09 ulm Exp $
4# 4#
5# @ECLASS: bzr.eclass 5# @ECLASS: bzr.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Emacs team <emacs@gentoo.org>
8# Bazaar team <bazaar@gentoo.org>
9# @AUTHOR:
7# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>, 10# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
8# Ulrich Mueller <ulm@gentoo.org>,
9# Christian Faulhammer <fauli@gentoo.org>,
10# Mark Lee <bzr-gentoo-overlay@lazymalevolence.com>, 11# Mark Lee <bzr-gentoo-overlay@lazymalevolence.com>
11# and anyone who wants to help 12# Ulrich Müller <ulm@gentoo.org>
12# @BLURB: This eclass provides support to use the Bazaar VCS 13# Christian Faulhammer <fauli@gentoo.org>
14# @BLURB: generic fetching functions for the Bazaar VCS
13# @DESCRIPTION: 15# @DESCRIPTION:
14# The bzr.eclass provides support for apps using the Bazaar VCS 16# The bzr.eclass provides functions to fetch, unpack, patch, and
15# (distributed version control system). 17# bootstrap sources from repositories of the Bazaar distributed version
16# The eclass was originally derived from the git eclass. 18# control system. The eclass was originally derived from git.eclass.
17# 19#
18# Note: Just set EBZR_REPO_URI to the URI of the branch and the src_unpack() 20# Note: Just set EBZR_REPO_URI to the URI of the branch and src_unpack()
19# of this eclass will put an export of the branch in ${WORKDIR}/${PN}. 21# of this eclass will export the branch to ${WORKDIR}/${P}.
20 22
21inherit eutils 23inherit eutils
22 24
23EBZR="bzr.eclass" 25EBZR="bzr.eclass"
24 26
28esac 30esac
29 31
30HOMEPAGE="http://bazaar-vcs.org/" 32HOMEPAGE="http://bazaar-vcs.org/"
31DESCRIPTION="Based on the ${EBZR} eclass" 33DESCRIPTION="Based on the ${EBZR} eclass"
32 34
33DEPEND=">=dev-vcs/bzr-1.5" 35DEPEND=">=dev-vcs/bzr-2.0.1"
36case "${EAPI:-0}" in
37 0|1) ;;
38 *) [[ ${EBZR_REPO_URI%%:*} = sftp ]] \
39 && DEPEND=">=dev-vcs/bzr-2.0.1[sftp]" ;;
40esac
34 41
35# @ECLASS-VARIABLE: EBZR_STORE_DIR 42# @ECLASS-VARIABLE: EBZR_STORE_DIR
36# @DESCRIPTION: 43# @DESCRIPTION:
37# The directory to store all fetched Bazaar live sources. 44# The directory to store all fetched Bazaar live sources.
38: ${EBZR_STORE_DIR:=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bzr-src} 45: ${EBZR_STORE_DIR:=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/bzr-src}
46
47# @ECLASS-VARIABLE: EBZR_INIT_REPO_CMD
48# @DESCRIPTION:
49# The Bazaar command to initialise a shared repository.
50: ${EBZR_INIT_REPO_CMD:="bzr init-repository --no-trees"}
39 51
40# @ECLASS-VARIABLE: EBZR_FETCH_CMD 52# @ECLASS-VARIABLE: EBZR_FETCH_CMD
41# @DESCRIPTION: 53# @DESCRIPTION:
42# The Bazaar command to fetch the sources. 54# The Bazaar command to fetch the sources.
43EBZR_FETCH_CMD="bzr checkout --lightweight" 55: ${EBZR_FETCH_CMD:="bzr branch --no-tree"}
44 56
45# @ECLASS-VARIABLE: EBZR_UPDATE_CMD 57# @ECLASS-VARIABLE: EBZR_UPDATE_CMD
46# @DESCRIPTION: 58# @DESCRIPTION:
47# The Bazaar command to update the sources. 59# The Bazaar command to update the sources.
48EBZR_UPDATE_CMD="bzr update" 60: ${EBZR_UPDATE_CMD:="bzr pull"}
49
50# @ECLASS-VARIABLE: EBZR_DIFF_CMD
51# @DESCRIPTION:
52# The Bazaar command to get the diff output.
53EBZR_DIFF_CMD="bzr diff"
54 61
55# @ECLASS-VARIABLE: EBZR_EXPORT_CMD 62# @ECLASS-VARIABLE: EBZR_EXPORT_CMD
56# @DESCRIPTION: 63# @DESCRIPTION:
57# The Bazaar command to export a branch. 64# The Bazaar command to export a branch.
58EBZR_EXPORT_CMD="bzr export" 65: ${EBZR_EXPORT_CMD:="bzr export"}
59 66
60# @ECLASS-VARIABLE: EBZR_REVNO_CMD 67# @ECLASS-VARIABLE: EBZR_REVNO_CMD
61# @DESCRIPTION: 68# @DESCRIPTION:
62# The Bazaar command to list a revision number of the branch. 69# The Bazaar command to list a revision number of the branch.
63EBZR_REVNO_CMD="bzr revno" 70: ${EBZR_REVNO_CMD:="bzr revno"}
64 71
65# @ECLASS-VARIABLE: EBZR_OPTIONS 72# @ECLASS-VARIABLE: EBZR_OPTIONS
73# @DEFAULT_UNSET
66# @DESCRIPTION: 74# @DESCRIPTION:
67# The options passed to the fetch and update commands. 75# The options passed to the fetch and update commands.
68EBZR_OPTIONS="${EBZR_OPTIONS:-}"
69 76
70# @ECLASS-VARIABLE: EBZR_REPO_URI 77# @ECLASS-VARIABLE: EBZR_REPO_URI
78# @DEFAULT_UNSET
79# @REQUIRED
71# @DESCRIPTION: 80# @DESCRIPTION:
72# The repository URI for the source package. 81# The repository URI for the source package.
73# 82#
74# @CODE 83# Note: If the ebuild uses an sftp:// URI, then in EAPI 0 or 1 it must
75# Supported protocols: 84# make sure that dev-vcs/bzr was built with USE="sftp". In EAPI 2 or
76# - http:// 85# later, the eclass will depend on dev-vcs/bzr[sftp].
77# - https:// 86
78# - sftp:// 87# @ECLASS-VARIABLE: EBZR_INITIAL_URI
79# - rsync:// 88# @DEFAULT_UNSET
80# - lp: 89# @DESCRIPTION:
81# @CODE 90# The URI used for initial branching of the source repository. If this
91# variable is set, the initial branch will be cloned from the location
92# specified, followed by a pull from ${EBZR_REPO_URI}. This is intended
93# for special cases, e.g. when download from the original repository is
94# slow, but a fast mirror exists but may be out of date.
82# 95#
83# Note: lp: seems to be an alias for https://launchpad.net 96# Normally, this variable needs not be set.
84EBZR_REPO_URI="${EBZR_REPO_URI:-}"
85 97
86# @ECLASS-VARIABLE: EBZR_BOOTSTRAP 98# @ECLASS-VARIABLE: EBZR_BOOTSTRAP
99# @DEFAULT_UNSET
87# @DESCRIPTION: 100# @DESCRIPTION:
88# Bootstrap script or command like autogen.sh or etc. 101# Bootstrap script or command like autogen.sh or etc.
89EBZR_BOOTSTRAP="${EBZR_BOOTSTRAP:-}"
90 102
91# @ECLASS-VARIABLE: EBZR_PATCHES 103# @ECLASS-VARIABLE: EBZR_PATCHES
104# @DEFAULT_UNSET
92# @DESCRIPTION: 105# @DESCRIPTION:
93# bzr eclass can apply patches in bzr_bootstrap(). 106# bzr.eclass can apply patches in bzr_bootstrap(). You can use regular
94# You can use regular expressions in this variable like *.diff or 107# expressions in this variable like *.diff or *.patch and the like.
95# *.patch and the like.
96# NOTE: These patches will bei applied before EBZR_BOOTSTRAP is processed. 108# Note: These patches will be applied before EBZR_BOOTSTRAP is processed.
97# 109#
98# Patches are searched both in ${PWD} and ${FILESDIR}, if not found in either 110# Patches are searched both in ${PWD} and ${FILESDIR}. If not found in
99# location, the installation dies. 111# either location, the installation dies.
100EBZR_PATCHES="${EBZR_PATCHES:-}" 112
113# @ECLASS-VARIABLE: EBZR_PROJECT
114# @DESCRIPTION:
115# The project name of your ebuild. Normally, the branch will be stored
116# in the ${EBZR_STORE_DIR}/${EBZR_PROJECT} directory.
117#
118# If EBZR_BRANCH is set (see below), then a shared repository will be
119# created in that directory, and the branch will be located in
120# ${EBZR_STORE_DIR}/${EBZR_PROJECT}/${EBZR_BRANCH}.
121: ${EBZR_PROJECT:=${PN}}
122
123# @ECLASS-VARIABLE: EBZR_BRANCH
124# @DEFAULT_UNSET
125# @DESCRIPTION:
126# The directory where to store the branch within a shared repository,
127# relative to ${EBZR_STORE_DIR}/${EBZR_PROJECT}.
128#
129# This variable should be set if there are several live ebuilds for
130# different branches of the same upstream project. The branches can
131# then share the same repository in EBZR_PROJECT, which will save both
132# data traffic volume and disk space.
133#
134# If there is only a live ebuild for one single branch, EBZR_BRANCH
135# needs not be set. In this case, the branch will be stored in a
136# stand-alone repository directly in EBZR_PROJECT.
101 137
102# @ECLASS-VARIABLE: EBZR_REVISION 138# @ECLASS-VARIABLE: EBZR_REVISION
139# @DEFAULT_UNSET
103# @DESCRIPTION: 140# @DESCRIPTION:
104# Revision to fetch, defaults to the latest 141# Revision to fetch, defaults to the latest
105# (see http://bazaar-vcs.org/BzrRevisionSpec or bzr help revisionspec). 142# (see http://bazaar-vcs.org/BzrRevisionSpec or bzr help revisionspec).
106# If you set this to a non-empty value, then it is recommended not to
107# use a lightweight checkout (see also EBZR_FETCH_CMD).
108EBZR_REVISION="${EBZR_REVISION:-}"
109
110# @ECLASS-VARIABLE: EBZR_CACHE_DIR
111# @DESCRIPTION:
112# The directory to store the source for the package, relative to
113# EBZR_STORE_DIR.
114#
115# default: ${PN}
116EBZR_CACHE_DIR="${EBZR_CACHE_DIR:-${PN}}"
117 143
118# @ECLASS-VARIABLE: EBZR_OFFLINE 144# @ECLASS-VARIABLE: EBZR_OFFLINE
119# @DESCRIPTION: 145# @DESCRIPTION:
120# Set this variable to a non-empty value to disable the automatic updating of 146# Set this variable to a non-empty value to disable automatic updating
121# a bzr source tree. This is intended to be set outside the ebuild by users. 147# of a bzr source tree. This is intended to be set outside the ebuild
122EBZR_OFFLINE="${EBZR_OFFLINE:-${ESCM_OFFLINE}}" 148# by users.
149: ${EBZR_OFFLINE=${EVCS_OFFLINE}}
123 150
124# @FUNCTION: bzr_initial_fetch 151# @FUNCTION: bzr_initial_fetch
152# @USAGE: <repository URI> <branch directory>
125# @DESCRIPTION: 153# @DESCRIPTION:
126# Retrieves the source code from a repository for the first time, via 154# Internal function, retrieves the source code from a repository for the
127# ${EBZR_FETCH_CMD}. 155# first time, using ${EBZR_FETCH_CMD}.
128bzr_initial_fetch() { 156bzr_initial_fetch() {
129 local repository="${1}"; 157 local repo_uri=$1 branch_dir=$2
130 local branch_dir="${2}"; 158
159 if [[ -n "${EBZR_OFFLINE}" ]]; then
160 ewarn "EBZR_OFFLINE cannot be used when there is no local branch yet."
161 fi
131 162
132 # fetch branch 163 # fetch branch
133 einfo "bzr fetch start -->" 164 einfo "bzr branch start -->"
134 einfo " repository: ${repository} => ${branch_dir}" 165 einfo " repository: ${repo_uri} => ${branch_dir}"
135 166
136 ${EBZR_FETCH_CMD} ${EBZR_OPTIONS} "${repository}" "${branch_dir}" \ 167 ${EBZR_FETCH_CMD} ${EBZR_OPTIONS} "${repo_uri}" "${branch_dir}" \
137 || die "${EBZR}: can't branch from ${repository}." 168 || die "${EBZR}: can't branch from ${repo_uri}"
138} 169}
139 170
140# @FUNCTION: bzr_update 171# @FUNCTION: bzr_update
172# @USAGE: <repository URI> <branch directory>
141# @DESCRIPTION: 173# @DESCRIPTION:
142# Updates the source code from a repository, via ${EBZR_UPDATE_CMD}. 174# Internal function, updates the source code from a repository, using
175# ${EBZR_UPDATE_CMD}.
143bzr_update() { 176bzr_update() {
144 local repository="${1}"; 177 local repo_uri=$1 branch_dir=$2
145 178
146 if [[ -n "${EBZR_OFFLINE}" ]]; then 179 if [[ -n "${EBZR_OFFLINE}" ]]; then
147 einfo "skipping bzr update -->" 180 einfo "skipping bzr pull -->"
148 einfo " repository: ${repository}" 181 einfo " repository: ${repo_uri}"
149 else 182 else
150 # update branch 183 # update branch
151 einfo "bzr update start -->" 184 einfo "bzr pull start -->"
152 einfo " repository: ${repository}" 185 einfo " repository: ${repo_uri}"
153 186
154 pushd "${EBZR_BRANCH_DIR}" > /dev/null 187 pushd "${branch_dir}" > /dev/null \
188 || die "${EBZR}: can't chdir to ${branch_dir}"
155 ${EBZR_UPDATE_CMD} ${EBZR_OPTIONS} \ 189 ${EBZR_UPDATE_CMD} ${EBZR_OPTIONS} "${repo_uri}" \
156 || die "${EBZR}: can't update from ${repository}." 190 || die "${EBZR}: can't pull from ${repo_uri}"
157 popd > /dev/null 191 popd > /dev/null
158 fi 192 fi
159} 193}
160 194
161# @FUNCTION: bzr_fetch 195# @FUNCTION: bzr_fetch
162# @DESCRIPTION: 196# @DESCRIPTION:
163# Wrapper function to fetch sources from a Bazaar repository via bzr 197# Wrapper function to fetch sources from a Bazaar repository with
164# fetch or bzr update, depending on whether there is an existing 198# bzr branch or bzr pull, depending on whether there is an existing
165# working copy in ${EBZR_BRANCH_DIR}. 199# working copy.
166bzr_fetch() { 200bzr_fetch() {
167 local EBZR_BRANCH_DIR 201 local repo_dir branch_dir
168 202
169 # EBZR_REPO_URI is empty.
170 [[ ${EBZR_REPO_URI} ]] || die "${EBZR}: EBZR_REPO_URI is empty." 203 [[ -n ${EBZR_REPO_URI} ]] || die "${EBZR}: EBZR_REPO_URI is empty"
171
172 # check for the protocol or pull from a local repo.
173 if [[ -z ${EBZR_REPO_URI%%:*} ]] ; then
174 case ${EBZR_REPO_URI%%:*} in
175 # lp: seems to be an alias to https://launchpad.net
176 http|https|rsync|lp)
177 ;;
178 sftp)
179 if ! built_with_use --missing true dev-vcs/bzr sftp; then
180 eerror "To fetch sources from ${EBZR_REPO_URI} you need SFTP"
181 eerror "support in dev-vcs/bzr."
182 die "Please, rebuild dev-vcs/bzr with the sftp USE flag enabled."
183 fi
184 ;;
185 *)
186 die "${EBZR}: fetch from ${EBZR_REPO_URI%:*} is not yet implemented."
187 ;;
188 esac
189 fi
190 204
191 if [[ ! -d ${EBZR_STORE_DIR} ]] ; then 205 if [[ ! -d ${EBZR_STORE_DIR} ]] ; then
192 debug-print "${FUNCNAME}: initial branch. Creating bzr directory"
193 local save_sandbox_write=${SANDBOX_WRITE} 206 local save_sandbox_write=${SANDBOX_WRITE}
194 addwrite / 207 addwrite /
195 mkdir -p "${EBZR_STORE_DIR}" \ 208 mkdir -p "${EBZR_STORE_DIR}" \
196 || die "${EBZR}: can't mkdir ${EBZR_STORE_DIR}." 209 || die "${EBZR}: can't mkdir ${EBZR_STORE_DIR}"
197 SANDBOX_WRITE=${save_sandbox_write} 210 SANDBOX_WRITE=${save_sandbox_write}
198 fi 211 fi
199 212
200 pushd "${EBZR_STORE_DIR}" > /dev/null \ 213 pushd "${EBZR_STORE_DIR}" > /dev/null \
201 || die "${EBZR}: can't chdir to ${EBZR_STORE_DIR}" 214 || die "${EBZR}: can't chdir to ${EBZR_STORE_DIR}"
202 215
203 EBZR_BRANCH_DIR="${EBZR_STORE_DIR}/${EBZR_CACHE_DIR}" 216 repo_dir=${EBZR_STORE_DIR}/${EBZR_PROJECT}
217 branch_dir=${repo_dir}${EBZR_BRANCH:+/${EBZR_BRANCH}}
204 218
205 addwrite "${EBZR_STORE_DIR}" 219 addwrite "${EBZR_STORE_DIR}"
206 addwrite "${EBZR_BRANCH_DIR}"
207 220
208 debug-print "${FUNCNAME}: EBZR_OPTIONS = ${EBZR_OPTIONS}" 221 # Clean up if the existing local copy is a checkout (as was the case
209
210 # Run bzr_initial_fetch() only if the branch has not been pulled
211 # before or if the existing local copy is a full checkout (as did
212 # an older version of bzr.eclass) 222 # with an older version of bzr.eclass).
213 if [[ ! -d ${EBZR_BRANCH_DIR} ]] ; then 223 # This test can be removed after 1 Mar 2012.
224 if [[ ${EBZR_FETCH_CMD} != *checkout* && -d ${repo_dir}/.bzr/checkout ]]
225 then
226 local tmpname=$(mktemp -u "${repo_dir}._old_.XXXXXX")
227 ewarn "checkout from old version of ${EBZR} found, moving it to:"
228 ewarn "${tmpname}"
229 ewarn "you may manually remove it"
230 mv "${repo_dir}" "${tmpname}" \
231 || die "${EBZR}: can't move old checkout out of the way"
232 fi
233
234 if [[ ! -d ${branch_dir}/.bzr ]]; then
235 if [[ ${repo_dir} != "${branch_dir}" && ! -d ${repo_dir}/.bzr ]]; then
236 einfo "creating shared bzr repository: ${repo_dir}"
237 ${EBZR_INIT_REPO_CMD} "${repo_dir}" \
238 || die "${EBZR}: can't create shared repository"
239 fi
240
241 if [[ -z ${EBZR_INITIAL_URI} ]]; then
214 bzr_initial_fetch "${EBZR_REPO_URI}" "${EBZR_BRANCH_DIR}" 242 bzr_initial_fetch "${EBZR_REPO_URI}" "${branch_dir}"
215 elif [[ ${EBZR_FETCH_CMD} == *lightweight* \ 243 else
216 && -d ${EBZR_BRANCH_DIR}/.bzr/repository ]]; then 244 # Workaround for faster initial download. This clones the
217 einfo "Re-fetching the branch to save space..." 245 # branch from a fast server (which may be out of date), and
218 rm -rf "${EBZR_BRANCH_DIR}" 246 # subsequently pulls from the slow original repository.
219 bzr_initial_fetch "${EBZR_REPO_URI}" "${EBZR_BRANCH_DIR}" 247 bzr_initial_fetch "${EBZR_INITIAL_URI}" "${branch_dir}"
248 if [[ ${EBZR_REPO_URI} != "${EBZR_INITIAL_URI}" ]]; then
249 EBZR_UPDATE_CMD="${EBZR_UPDATE_CMD} --remember --overwrite" \
250 EBZR_OFFLINE="" \
251 bzr_update "${EBZR_REPO_URI}" "${branch_dir}"
252 fi
253 fi
220 else 254 else
221 bzr_update "${EBZR_REPO_URI}" "${EBZR_BRANCH_DIR}" 255 bzr_update "${EBZR_REPO_URI}" "${branch_dir}"
222 fi 256 fi
223 257
224 cd "${EBZR_BRANCH_DIR}" 258 cd "${branch_dir}" || die "${EBZR}: can't chdir to ${branch_dir}"
259
260 # Save revision number in environment. #311101
261 export EBZR_REVNO=$(${EBZR_REVNO_CMD})
225 262
226 einfo "exporting ..." 263 einfo "exporting ..."
227 264 ${EBZR_EXPORT_CMD} ${EBZR_REVISION:+-r ${EBZR_REVISION}} \
228 if [[ -z ${EBZR_REVISION} ]]; then
229 rsync -rlpgo --exclude=".bzr/" . "${WORKDIR}/${P}" \
230 || die "${EBZR}: export failed" 265 "${WORKDIR}/${P}" . || die "${EBZR}: export failed"
231 else 266 einfo "revision ${EBZR_REVISION:-${EBZR_REVNO}} is now in ${WORKDIR}/${P}"
232 # revisions of a lightweight checkout are only available when online
233 [[ -z ${EBZR_OFFLINE} || -d ${EBZR_BRANCH_DIR}/.bzr/repository ]] \
234 || die "${EBZR}: No support for revisions when off-line"
235 ${EBZR_EXPORT_CMD} -r "${EBZR_REVISION}" "${WORKDIR}/${P}" \
236 || die "${EBZR}: export failed"
237 fi
238 267
239 popd > /dev/null 268 popd > /dev/null
240} 269}
241 270
242# @FUNCTION: bzr_bootstrap 271# @FUNCTION: bzr_bootstrap
243# @DESCRIPTION: 272# @DESCRIPTION:
244# Apply patches in ${EBZR_PATCHES} and run ${EBZR_BOOTSTRAP} if specified. 273# Apply patches in ${EBZR_PATCHES} and run ${EBZR_BOOTSTRAP} if specified.
245bzr_bootstrap() { 274bzr_bootstrap() {
246 local patch lpatch 275 local patch lpatch
247 276
248 pushd "${S}" > /dev/null 277 pushd "${S}" > /dev/null || die "${EBZR}: can't chdir to ${S}"
249 278
250 if [[ -n ${EBZR_PATCHES} ]] ; then 279 if [[ -n ${EBZR_PATCHES} ]] ; then
251 einfo "apply patches -->" 280 einfo "apply patches -->"
252 281
253 for patch in ${EBZR_PATCHES} ; do 282 for patch in ${EBZR_PATCHES} ; do
271 einfo "begin bootstrap -->" 300 einfo "begin bootstrap -->"
272 301
273 if [[ -f ${EBZR_BOOTSTRAP} ]] && [[ -x ${EBZR_BOOTSTRAP} ]] ; then 302 if [[ -f ${EBZR_BOOTSTRAP} ]] && [[ -x ${EBZR_BOOTSTRAP} ]] ; then
274 einfo " bootstrap with a file: ${EBZR_BOOTSTRAP}" 303 einfo " bootstrap with a file: ${EBZR_BOOTSTRAP}"
275 "./${EBZR_BOOTSTRAP}" \ 304 "./${EBZR_BOOTSTRAP}" \
276 || die "${EBZR}: can't execute EBZR_BOOTSTRAP." 305 || die "${EBZR}: can't execute EBZR_BOOTSTRAP"
277 else 306 else
278 einfo " bootstrap with commands: ${EBZR_BOOTSTRAP}" 307 einfo " bootstrap with commands: ${EBZR_BOOTSTRAP}"
279 "${EBZR_BOOTSTRAP}" \ 308 "${EBZR_BOOTSTRAP}" \
280 || die "${EBZR}: can't eval EBZR_BOOTSTRAP." 309 || die "${EBZR}: can't eval EBZR_BOOTSTRAP"
281 fi 310 fi
282 fi 311 fi
283 312
284 popd > /dev/null 313 popd > /dev/null
285} 314}
286 315
287# @FUNCTION: bzr_src_unpack 316# @FUNCTION: bzr_src_unpack
288# @DESCRIPTION: 317# @DESCRIPTION:
289# Default src_unpack(). Includes bzr_fetch() and bootstrap(). 318# Default src_unpack(), calls bzr_fetch. For EAPIs 0 and 1, also calls
319# bzr_src_prepare.
290bzr_src_unpack() { 320bzr_src_unpack() {
291 if ! [ -z ${EBZR_BRANCH} ]; then 321 bzr_fetch
292 # This test will go away on 01 Jul 2010
293 eerror "This ebuild uses EBZR_BRANCH which is not supported anymore"
294 eerror "by the bzr.eclass. Please report this to the ebuild's maintainer."
295 die "EBZR_BRANCH still defined"
296 fi
297 bzr_fetch || die "${EBZR}: unknown problem in bzr_fetch()."
298 case "${EAPI:-0}" in 322 case "${EAPI:-0}" in
299 0|1) bzr_src_prepare ;; 323 0|1) bzr_src_prepare ;;
300 esac 324 esac
301} 325}
302 326
303# @FUNCTION: bzr_src_prepare 327# @FUNCTION: bzr_src_prepare
304# @DESCRIPTION: 328# @DESCRIPTION:
305# Default src_prepare(). Executes bzr_bootstrap() for patch 329# Default src_prepare(), calls bzr_bootstrap.
306# application and Make file generation (if needed).
307bzr_src_prepare() { 330bzr_src_prepare() {
308 bzr_bootstrap || die "${EBZR}: unknown problem in bzr_bootstrap()." 331 bzr_bootstrap
309} 332}

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.17

  ViewVC Help
Powered by ViewVC 1.1.20