EBZR_MIRROR_URI is a misnomer, rename it to EBZR_INITIAL_URI.

3 files changed, 21 insertions, 18 deletions

diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 011a8e693315..c7dcc452d652 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -8,13 +8,13 @@ EBUILD emacs-vcs-23.2.92.ebuild 9960 RMD160 8d40053abe474160a6800d822028360ae6a1
 EBUILD emacs-vcs-23.2.93.ebuild 10179 RMD160 56c1f66e633254ff21ec3856265e477ae7dbd84d SHA1 bd8d48f525ecf03143c0f3dbaf06c4d571f17500 SHA256 3239f653cabdf117050b57d655b0d34877fc9317f8f779468ef9396c2ea7686a
 EBUILD emacs-vcs-23.2.94.ebuild 10150 RMD160 7b4f0b580286d53cc76d4e4f8701f11d8c42f799 SHA1 b460b2d3552edfaed4bb9f55a914b80f606dcda3 SHA256 e23eb195177477d3057e06b46a48bd9e9513887624b31df8514b62e4c049eb63
 EBUILD emacs-vcs-23.2.9999-r1.ebuild 10401 RMD160 6aab02c9d7a633e04cc26cc64482e2d32affb905 SHA1 6a281b3e2ca572a5ac3577580f3da0735688536a SHA256 d085cf3904234b4080cc5b7de3f00544fc0d39cd06c504b7598b58c81c3035ce
-EBUILD emacs-vcs-24.0.9999-r1.ebuild 10660 RMD160 489617f4ddcb223670d08f7bf27b803d06f4f5ed SHA1 7fa5160283ad3a41589cda07dee8507ed1cacdc3 SHA256 8546455c7da70f2dcf7edddc4ac1212930a1414e6084e00bc6322f387fd15851
+EBUILD emacs-vcs-24.0.9999-r1.ebuild 10661 RMD160 6d84c02c976ba796cce919baabb07958368ea3ad SHA1 7bb9e59f7f9ef3dd197e92975d145ebfda6458e6 SHA256 c003747a47590d937cb4ab33f8eba5a5728df2bdf3e73e3f3fa128fd6f0abb97
 MISC ChangeLog 57279 RMD160 b4fc16d58fee01f68eb13e97cd94798e0793b714 SHA1 925438b3694b174b87bf173afdbcd8cd22a3a15a SHA256 733d3ea4ad6c7eb004b8cedf83f2a79b143c736ebc0b0e8d3c8391d799c789e4
 MISC metadata.xml 1842 RMD160 57ca3c2d25e695ead4faa6cb01b4d7a03939b511 SHA1 1960513308596b38c3ad7cd248924c903611d39b SHA256 9ebd8972aea68e7b3fd62915725ca35d0678b218d922a467a2c978fe44312ddb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1aJS0ACgkQOeoy/oIi7uyh6gCg2cgbwoQcUf3+II7sUn2PYNd3
-hpgAoNhRRWmdMTcbPjBFbVreSAMkRo+o
-=M/yk
+iEYEARECAAYFAk1f1/0ACgkQOeoy/oIi7uz4ggCgzT9IHwBiOyC5rtygx/htIHEB
+dTYAoLTInfm4r2wAdcJ4q91w1HMmvGRZ
+=MRw6
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild
index bd46d684e98b..d968cf7a8f49 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.5 2011/02/10 20:09:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.6 2011/02/19 14:43:57 ulm Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ if [ "${PV##*.}" = "9999" ]; then
 	EBZR_BRANCH="trunk"
 	EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}"
 	# The mirror at launchpad has much better performance.
-	EBZR_MIRROR_URI="lp:emacs"
+	EBZR_INITIAL_URI="lp:emacs"
 	inherit bzr
 	SRC_URI=""
 else
diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass
index e82bcd4c17ce..d9293346f9c3 100644
--- a/eclass/bzr.eclass
+++ b/eclass/bzr.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.11 2011/02/10 20:08:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.12 2011/02/19 14:43:57 ulm Exp $
 #
 # @ECLASS: bzr.eclass
 # @MAINTAINER:
@@ -82,14 +82,14 @@ esac
 # make sure that dev-vcs/bzr was built with USE="sftp".  In EAPI 2 or
 # later, the eclass will depend on dev-vcs/bzr[sftp].
 
-# @ECLASS-VARIABLE: EBZR_MIRROR_URI
+# @ECLASS-VARIABLE: EBZR_INITIAL_URI
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# The URI of a fast mirror of the source repository.  If this variable
-# is set, the initial branch will be cloned from the mirror, followed
-# by a pull from the original repository.  This is intended for special
-# cases, where download from the original repository is slow, but a fast
-# mirror exists but may be out of date.
+# The URI used for initial branching of the source repository.  If this
+# variable is set, the initial branch will be cloned from the location
+# specified, followed by a pull from ${EBZR_REPO_URI}.  This is intended
+# for special cases, e.g. when download from the original repository is
+# slow, but a fast mirror exists but may be out of date.
 #
 # Normally, this variable needs not be set.
 
@@ -236,15 +236,18 @@ bzr_fetch() {
 				|| die "${EBZR}: can't create shared repository"
 		fi
 
-		if [[ -z ${EBZR_MIRROR_URI} ]]; then
+		if [[ -z ${EBZR_INITIAL_URI} ]]; then
 			bzr_initial_fetch "${EBZR_REPO_URI}" "${branch_dir}"
 		else
 			# Workaround for faster initial download. This clones the
-			# branch from a fast mirror (which may be out of date), and
+			# branch from a fast server (which may be out of date), and
 			# subsequently pulls from the slow original repository.
-			bzr_initial_fetch "${EBZR_MIRROR_URI}" "${branch_dir}"
-			EBZR_UPDATE_CMD="${EBZR_UPDATE_CMD} --remember --overwrite" \
-				EBZR_OFFLINE="" bzr_update "${EBZR_REPO_URI}" "${branch_dir}"
+			bzr_initial_fetch "${EBZR_INITIAL_URI}" "${branch_dir}"
+			if [[ ${EBZR_REPO_URI} != "${EBZR_INITIAL_URI}" ]]; then
+				EBZR_UPDATE_CMD="${EBZR_UPDATE_CMD} --remember --overwrite" \
+					EBZR_OFFLINE="" \
+					bzr_update "${EBZR_REPO_URI}" "${branch_dir}"
+			fi
 		fi
 	else
 		bzr_update "${EBZR_REPO_URI}" "${branch_dir}"