Merge lp:~registry/bzr-gentoo-overlay/bzr-overlay-dev into lp:~malept/bzr-gentoo-overlay/overlay-main

[Christian Faulhammer]

[Christian Faulhammer (fauli)]

Some improvements for the current bzr.eclass...after some testing the Gentoo tree will see the same version.

[Christian Faulhammer (fauli)]

I'd really like to see this branch getting merged as the bzr.eclass has some substantial improvements I want to get tested in the "main" tree before putting it into Portage.

[Mark Lee (malept)]

I'd prefer it if the changes were separate from serkan's, or wait until serkan addresses the questions I have about his changes (see other merge proposal).

review: Abstain

[lp:~registry/bzr-gentoo-overlay/bzr-overlay-dev]

235. By Christian Faulhammer on 2009-03-25

Merge from main line revision 235

236. By Christian Faulhammer on 2009-03-25

bzr.eclass: Fix a typo

237. By Christian Faulhammer on 2009-03-25

bzr.eclass: Make the check for the deprecated EBZR_BRANCH variable actually work

238. By Christian Faulhammer on 2009-03-25

Kill all occurences of EBZR_BRANCH from mainline-merged ebuilds

239. By Christian Faulhammer on 2009-03-25

bzr.eclass: Revert revision 230

The loop was intended to work on wildcarded patch ranges given in
EBZR_PATCHES, so reintroduce it. Spotted by ulm who broke it in the
first place. :)

240. By Christian Faulhammer on 2009-03-25

bzr.eclass: Add a comment to explain that loop

241. By Christian Faulhammer on 2009-03-26

package.mask: collect all live ebuilds in one masking section

242. By Christian Faulhammer on 2009-03-26

package.mask: unmask nautilus-python

243. By Christian Faulhammer on 2009-03-27

bzr-cia, bzr-git, bzr-vimdiff, bzr: Straighten EBZR_REPO_URI as catched by Mark Lee

244. By Christian Faulhammer on 2009-03-27

bzr-eclass: get rid of repository variable

EBZR_REPO_URI can be used instead. Catched by Mark Lee.

245. By Mark Lee on 2009-04-01

bzr-vimdiff: fix branch URI.

246. By Christian Faulhammer on 2009-07-08

merge from trunk revision 280

247. By Christian Faulhammer on 2009-07-08

bzr.eclass: Remove it as it has been imported into the official Gentoo repository

248. By Christian Faulhammer on 2009-07-08

bzr-gtk: Restrict dev-util/bzr to everything below 1.16

249. By Christian Faulhammer on 2009-07-08

bzr-gtk: Adding an live ebuild

250. By Christian Faulhammer on 2009-07-08

bzr-gtk: fix Bazaar dependency for live ebuild

251. By Christian Faulhammer on 2009-07-08

mask live bzr-stats package

252. By Christian Faulhammer on 2009-07-08

bzr-xmloutput: version bump

253. By Christian Faulhammer on 2009-07-10

merge from trunk 281

254. By Christian Faulhammer on 2009-07-13

merge from trunk 283

255. By Christian Faulhammer on 2009-07-13

Mask bzr release candidate

256. By Christian Faulhammer on 2009-07-14

merge from trunk 284

257. By Christian Faulhammer on 2009-07-14

bzr-gtk: Fix Manifest file

258. By Christian Faulhammer on 2009-07-15

merge from trunk 285

259. By Christian Faulhammer on 2009-07-17

bzr-gtk: Merge live ebuild with 0.96 series

260. By Christian Faulhammer on 2009-07-20

merge from trunk 291

261. By Christian Faulhammer on 2009-08-18

merge with trunk 296

262. By Christian Faulhammer on 2009-08-18

bzr-gtk: It works with Bazaar 1.18 RC1, so adjust dependencies

263. By Christian Faulhammer on 2009-08-20

merge from trunk 297

264. By Christian Faulhammer on 2009-08-20

nautilus-python now in Portage tree, thus remove

265. By Christian Faulhammer on 2009-08-20

bzr-svn: It works with Bazaar 1.18RC1, so adjust dependencies

266. By Christian Faulhammer on 2009-08-21

merge with trunk 300

267. By Christian Faulhammer on 2009-08-21

bzr-explorer: New package

268. By Christian Faulhammer on 2009-08-24

Merge with trunk

269. By Christian Faulhammer on 2009-08-25

merge with trunk 302

270. By Christian Faulhammer on 2009-08-27

merge with trunk 307

271. By Christian Faulhammer on 2009-09-07

merge with trunk 309

272. By Christian Faulhammer on 2009-09-08

dev-util/bzr-difftools: initial commit

273. By Christian Faulhammer on 2009-09-08

Mask bzr-difftools live package

274. By Christian Faulhammer on 2009-09-08

Mask bzrtools 2.0.0 package to match Bazaar

275. By Christian Faulhammer on 2009-09-08

Add missing metadata.xml files and update Manifests

276. By Christian Faulhammer on 2009-09-08

merge from trunk 311

277. By Christian Faulhammer on 2009-09-24

remove spurious mask for Bazaar 2.0

278. By Christian Faulhammer on 2009-09-25

merge from trunk 318

279. By Christian Faulhammer on 2009-10-03

merge from trunk revision 321

280. By Christian Faulhammer on 2009-10-06

merge from trunk revision 325

281. By Christian Faulhammer on 2009-10-06

remove bzr-svn, is in Portage tree now

282. By Christian Faulhammer on 2009-10-06

remove subvertpy, is in Portage tree now

283. By Christian Faulhammer on 2009-10-07

bzr-rewrite: Adjust DESCRIPTION a bit

284. By Christian Faulhammer on 2009-10-12

bzr-rewrite: Remove spurious files directory

285. By Christian Faulhammer on 2009-10-12

bzr-dbzs: Remove spurious files directory

286. By Christian Faulhammer on 2009-10-12

bzr-config: Remove spurious files directory

287. By Christian Faulhammer on 2009-10-12

bzr-vimdiff: Remove spurious files directory

288. By Christian Faulhammer on 2009-10-16

merge from trum revision 330

289. By Christian Faulhammer on 2009-11-06

merge from trunk 336

290. By Christian Faulhammer on 2009-11-09

subvertpy has been bumped in main tree, removing

291. By Christian Faulhammer on 2009-11-19

merge from trunk revision 337

292. By Christian Faulhammer on 2009-11-19

www-apps/loggerhead: Add init script written by Aaron Mavrinac in http://ezod.livejournal.com/27170.html

293. By Christian Faulhammer on 2009-11-19

www-apps/loggerhead: add conf.d file

294. By Christian Faulhammer on 2009-11-23

merge from trunk revision 339

295. By Christian Faulhammer on 2009-12-17

bzr-explorer: version bump

296. By Christian Faulhammer on 2009-12-17

bzrtools: use python_get_libdir() to determine search path

297. By Christian Faulhammer on 2009-12-17

bzrtools: Add metadata.xml

298. By Christian Faulhammer on 2009-12-17

bzrtools: Add explicit RDEPEND

299. By Christian Faulhammer on 2009-12-27

merge with trunk revision 343

300. By Christian Faulhammer on 2010-01-04

dulwich: In Portage tree, so removing

301. By Christian Faulhammer on 2010-01-04

bzr-svn: In Portage tree, so removing

302. By Christian Faulhammer on 2010-01-04

package.mask: Removing mask for dulwich live ebuild

303. By Martin von Gagern on 2010-01-06

Added www-apps/trac-bzr-0.3.0

304. By Christian Faulhammer on 2010-01-28

Remove dev-python/testtools, now available in main tree

305. By Christian Faulhammer on 2010-01-28

merge with trunk 349

306. By Christian Faulhammer on 2010-01-28

Remove dev-python/testtools, now available in main tree, for sure

307. By Christian Faulhammer on 2010-02-08

merge from trunk revision 351

308. By Christian Faulhammer on 2010-02-16

merge from trunk revision 353

309. By Christian Faulhammer on 2010-02-21

merge from trunk revision 355

310. By Christian Faulhammer on 2010-02-24

merge from trunk revision 356

311. By Christian Faulhammer on 2010-02-24

bzr-gtk: version bump

312. By Christian Faulhammer on 2010-03-01

merge from trunk revision 357

313. By Christian Faulhammer on 2010-03-03

bzr-gtk: Correct dependency on bzr

314. By Christian Faulhammer on 2010-03-04

merge from trunk revision 358

315. By Christian Faulhammer on 2010-03-05

Change category for all plugins from dev-util/ to dev-vcs/ as it is done in the main tree

316. By Christian Faulhammer on 2010-03-05

Adjust dependencies for new category

317. By Christian Faulhammer on 2010-03-05

Move some more package dependencies to dev-vcs

318. By Christian Faulhammer on 2010-03-05

Move mask to dev-vcs category

319. By Christian Faulhammer on 2010-03-05

bzr: Remove spurious comment line in Emacs support file, elisp-common.eclass will handle description

320. By Christian Faulhammer on 2010-03-05

pkgmove from dev-util to dev-vcs category

321. By Christian Faulhammer on 2010-03-08

bzr-explorer: In main tree now

322. By Christian Faulhammer on 2010-03-08

merge from trunk revision 358

323. By Christian Faulhammer on 2010-03-09

merge from trunk revision 359

324. By Christian Faulhammer on 2010-03-09

merge from lp:~gagern/bzr-gentoo-overlay/trac-bzr revision 304

325. By Christian Faulhammer on 2010-03-09

bzr-rewrite: Transferred to main tree

326. By Martin von Gagern on 2010-03-15

dev-vcs/bzr-bash-completion-1.0.2: new package

327. By Christian Faulhammer on 2010-03-17

bzr-hg: mercurial has moved category

328. By Christian Faulhammer on 2010-03-17

vcscommand: mercurial and git have moved category

329. By Christian Faulhammer on 2010-03-17

vcscommand: version bump

330. By Christian Faulhammer on 2010-03-22

merge from trunk 361

331. By Christian Faulhammer on 2010-03-30

bzr: version bump

332. By Christian Faulhammer on 2010-03-30

trac-bzr: ChangeLog not really needed here

333. By Christian Faulhammer on 2010-03-30

bzr-bash-completion: ChangeLog not really needed here

334. By Christian Faulhammer on 2010-03-30

remove bzr-xmloutput, in official Portage tree

335. By Christian Faulhammer on 2010-04-07

merge from main tree revision 367

336. By Martin von Gagern on 2010-04-10

bzr-bash-completion: version bump to 1.1.0.

337. By Martin von Gagern on 2010-05-18

bzr-bash-completion: version bump to 1.2.0.

338. By Christian Faulhammer on 2010-07-11

merge from trunk revision 370

339. By Christian Faulhammer on 2010-07-11

bzr: version bump to 2.2 Beta 4

340. By Christian Faulhammer on 2010-07-11

bzr: sync with main tree to use proper python.eclass variables

341. By Christian Faulhammer on 2010-07-11

bzr-gtk: sync with main tree to use proper python.eclass variables

342. By Christian Faulhammer on 2010-07-11

bzrtools: sync with main tree to use proper python.eclass variables

343. By Christian Faulhammer on 2010-07-11

bzr-gtk: fix Manifest

344. By Christian Faulhammer on 2010-07-11

bzr-git: version bump

345. By Christian Faulhammer on 2010-07-11

trac-bzr: version bump

346. By Christian Faulhammer on 2010-07-12

Mask 2.2.0 of bzrtools

347. By Christian Faulhammer on 2010-07-29

merge from trunk revision 371

348. By Christian Faulhammer on 2010-07-29

bzrtools: Restrict to Python 2

349. By Christian Faulhammer on 2010-07-29

bzrtools: Restrict to Python 2

350. By Christian Faulhammer on 2010-07-29

bzr-bash-completion: Merged with Bazaar 2.2 series

351. By Christian Faulhammer on 2010-07-29

bzr-bisect: Restrict to Python 2

352. By Christian Faulhammer on 2010-07-29

bzr-cia: Restrict to Python 2

353. By Christian Faulhammer on 2010-07-29

bzr: Correctly restrict to Python 2

354. By Christian Faulhammer on 2010-07-29

bzr-config: Restrict to Python 2

355. By Christian Faulhammer on 2010-07-29

bzr-dbzs: Restrict to Python 2

356. By Christian Faulhammer on 2010-07-29

bzr-difftools: Restrict to Python 2

357. By Christian Faulhammer on 2010-07-29

bzr-git: Restrict to Python 2

358. By Christian Faulhammer on 2010-07-29

bzr-gtk: Restrict to Python 2

359. By Christian Faulhammer on 2010-07-29

Adjust copyright years

360. By Christian Faulhammer on 2010-07-29

bzr-hg: Restrict to Python 2

361. By Christian Faulhammer on 2010-07-29

bzr-interactive: Restrict to Python 2

362. By Christian Faulhammer on 2010-07-29

bzr-loom: Restrict to Python 2

363. By Christian Faulhammer on 2010-07-29

bzr-pager: Restrict to Python 2

364. By Christian Faulhammer on 2010-07-29

bzr-search: Restrict to Python 2

365. By Christian Faulhammer on 2010-07-29

bzr-stats: Restrict to Python 2

366. By Christian Faulhammer on 2010-07-29

bzr-svn: Restrict to Python 2

367. By Christian Faulhammer on 2010-07-29

bzr-vimdiff: Restrict to Python 2

368. By Christian Faulhammer on 2010-07-29

Fix manifests

369. By Christian Faulhammer on 2010-07-29

Keyword all packages ~amd64

370. By Christian Faulhammer on 2010-07-29

bzr-vim: Keyword ~amd64

371. By Christian Faulhammer on 2010-07-29

pyftpdlib: Support Python ABIs

372. By Christian Faulhammer on 2010-07-29

pyftpdlib: version bump

373. By Christian Faulhammer on 2010-07-29

pyftpdlib: add ~amd64

374. By Christian Faulhammer on 2010-07-29

bzr-gedit: add ~amd64

375. By Christian Faulhammer on 2010-07-29

pykerberos: add ~amd64

376. By Martin von Gagern on 2010-08-13

trac-bzr: version bump

377. By Christian Faulhammer on 2010-10-10

bzr-git: Non-live version has been imported into Portage

378. By Christian Faulhammer on 2010-11-27

bzr, bzrtools: Clean up old versions

379. By Christian Faulhammer on 2010-11-27

Drop KEYWORDS on all live ebuilds

380. By Christian Faulhammer on 2010-11-27

bzr-svn: Remove, is in Portage with newer version

Unmerged revisions

380. By Christian Faulhammer on 2010-11-27

bzr-svn: Remove, is in Portage with newer version

379. By Christian Faulhammer on 2010-11-27

Drop KEYWORDS on all live ebuilds

378. By Christian Faulhammer on 2010-11-27

bzr, bzrtools: Clean up old versions

377. By Christian Faulhammer on 2010-10-10

bzr-git: Non-live version has been imported into Portage

376. By Martin von Gagern on 2010-08-13

trac-bzr: version bump

375. By Christian Faulhammer on 2010-07-29

pykerberos: add ~amd64

374. By Christian Faulhammer on 2010-07-29

bzr-gedit: add ~amd64

373. By Christian Faulhammer on 2010-07-29

pyftpdlib: add ~amd64

372. By Christian Faulhammer on 2010-07-29

pyftpdlib: version bump

371. By Christian Faulhammer on 2010-07-29

pyftpdlib: Support Python ABIs

=== modified file 'dev-util/bzr-loom/Manifest'
--- dev-util/bzr-loom/Manifest	2009-02-13 17:24:08 +0000
+++ dev-util/bzr-loom/Manifest	2009-03-04 13:30:01 +0000
@@ -1,4 +1,4 @@
 AUX bzr-loom-1.3-setup-fix.patch 344 RMD160 a0176310cc8c2f8149f07c2d9ac47e80ab698a27 SHA1 9f485a9677f3f1d14a9f6e1b5412db2cca275cf4 SHA256 b29e54737a602e62fb65cd1555931d87dc3d4dadc2927bb19360e087dec8fad2
-EBUILD bzr-loom-1.3.ebuild 509 RMD160 23eeed521afabbb9e0e08aacf37f3ac778a43b3f SHA1 3ab199d82f2337c43af68115870089533577a917 SHA256 e0433b3b882476286586a7d7db3a87c6d32ddc8ef453dfbbaa9bac315ec111af
-EBUILD bzr-loom-9999.ebuild 496 RMD160 bf88472471d6e1488bf3ee55c42ed9fde38c0722 SHA1 ab35f4f292840b5e32a358866acb996f00590707 SHA256 14fbdc9ef60c70416aec0b7a828410c6f5d32d4eff51b97530e97e0ae9031701
+EBUILD bzr-loom-1.3.ebuild 494 RMD160 1b9c2b6b39aa16f03b9ae674451e04723b849ad3 SHA1 73615bf77d3035eea8e6f94fca639eb082b1faa9 SHA256 20e3b1317308617e256d0bfb3e59aa0663c4bd03db5a8dcc84e6d6e769110912
+EBUILD bzr-loom-9999.ebuild 490 RMD160 c81b5e169dde62a7c7d8a18c50979352f98b83c7 SHA1 bb52269af97452221f3d0ee3e5d6fcbeeed70c9f SHA256 02a7a02f0465f59afff84172039d140cf68f95a192e029911e96b4b26056f3f0
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85

=== modified file 'dev-util/bzr-loom/bzr-loom-1.3.ebuild'
--- dev-util/bzr-loom/bzr-loom-1.3.ebuild	2009-02-13 17:24:08 +0000
+++ dev-util/bzr-loom/bzr-loom-1.3.ebuild	2009-03-04 13:30:01 +0000
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,8 +8,7 @@
 threads"
 HOMEPAGE="https://launchpad.net/bzr-loom/"
 SRC_URI=""
-EBZR_REPO_URI="lp:${PN}"
-EBZR_BRANCH="1.3"
+EBZR_REPO_URI="lp:${PN}/1.3"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,7 +18,8 @@
 DEPEND=">=dev-util/bzr-1.0_rc1"
 RDEPEND=""
 
+EBZR_PATCHES="${PN}-1.3-setup-fix.patch"
+
 src_unpack() {
 	bzr_src_unpack
-	epatch "${FILESDIR}"/${P}-setup-fix.patch
 }

=== modified file 'dev-util/bzr-loom/bzr-loom-9999.ebuild'
--- dev-util/bzr-loom/bzr-loom-9999.ebuild	2009-02-13 17:24:08 +0000
+++ dev-util/bzr-loom/bzr-loom-9999.ebuild	2009-03-04 13:30:01 +0000
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -18,7 +18,8 @@
 DEPEND=">=dev-util/bzr-1.0_rc1"
 RDEPEND=""
 
+EBZR_PATCHES="${PN}-1.3-setup-fix.patch"
+
 src_unpack() {
 	bzr_src_unpack
-	epatch "${FILESDIR}"/${PN}-1.3-setup-fix.patch
 }

=== modified file 'dev-util/bzr-search/Manifest'
--- dev-util/bzr-search/Manifest	2009-02-13 16:05:06 +0000
+++ dev-util/bzr-search/Manifest	2009-03-07 03:07:43 +0000
@@ -1,2 +1,2 @@
-EBUILD bzr-search-9999.ebuild 413 RMD160 d042f9f3bbc92b3209ad774451081e6b76b9fd0d SHA1 7d25005d304084140bd34b230fa0e73f964a00f3 SHA256 bc7a52768b91fd4868cd35ef64d2ca1d67b8e1ed182bb18f566d757759802276
+EBUILD bzr-search-9999.ebuild 403 RMD160 a324b6dafe8fbc826a2e1777c35927aa8a07603d SHA1 149a7df35bea41b099c5369e01960c369cd52af8 SHA256 70582827032d05464884e20236017a1dc4d798e97e2c6099517b7049dd6ccb2c
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85

=== modified file 'dev-util/bzr-search/bzr-search-9999.ebuild'
--- dev-util/bzr-search/bzr-search-9999.ebuild	2009-02-13 15:15:59 +0000
+++ dev-util/bzr-search/bzr-search-9999.ebuild	2009-03-07 03:07:43 +0000
@@ -4,7 +4,7 @@
 
 inherit distutils bzr
 
-DESCRIPTION="Generates indices of bzr revisions which can then be searched quickly"
+DESCRIPTION="Generates indices of bzr revisions which can then be searched quickly"
 HOMEPAGE="https://launchpad.net/bzr-search"
 SRC_URI=""
 EBZR_REPO_URI="lp:bzr-search"

=== modified file 'dev-util/bzr-vimdiff/Manifest'
--- dev-util/bzr-vimdiff/Manifest	2009-02-14 15:28:45 +0000
+++ dev-util/bzr-vimdiff/Manifest	2009-03-03 23:44:39 +0000
@@ -1,2 +1,2 @@
-EBUILD bzr-vimdiff-9999.ebuild 730 RMD160 93b78d8edd0c2223caebd13a185c38626fb999a7 SHA1 6511b643178649adb108020e00459a98da52eff3 SHA256 e7e83f2e0c3fde98a6f0ef38e5b22f1d3d56fc463923b71157f11cee5b760ccc
+EBUILD bzr-vimdiff-9999.ebuild 626 RMD160 575829c7fedf184a4ec7affab022470635dcc49a SHA1 8cc07664264502f575b094acfe0ca054e92b9e43 SHA256 b0d50119f201f44bf05cf516c9b12026a846b12f8d129cd6e78f15f460c65b81
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85

=== modified file 'dev-util/bzr-vimdiff/bzr-vimdiff-9999.ebuild'
--- dev-util/bzr-vimdiff/bzr-vimdiff-9999.ebuild	2009-02-14 15:28:45 +0000
+++ dev-util/bzr-vimdiff/bzr-vimdiff-9999.ebuild	2009-03-03 23:44:39 +0000
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,8 +7,7 @@
 DESCRIPTION="Bazaar plugin that displays differences between revisions of a file
 using (g)vimdiff"
 HOMEPAGE="https://launchpad.net/bzr-vimdiff"
-EBZR_REPO_URI="lp:///~bzr/bzr-vimdiff/"
-EBZR_BRANCH="vimdiff"
+EBZR_REPO_URI="lp:///~bzr/bzr-vimdiff/vimdiff"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,10 +22,6 @@
 	)"
 S="${WORKDIR}"/${P}
 
-pkg_setup() {
-	export EBZR_REVISION=`echo "${PV}" | sed -e 's:^.\+_pre\(.*\)$:\1:g' `
-}
-
 src_install() {
 	python_version
 	insinto /usr/lib/python${PYVER}/site-packages/bzrlib/plugins/vimdiff

=== modified file 'dev-util/bzr/Manifest'
--- dev-util/bzr/Manifest	2009-02-20 08:08:09 +0000
+++ dev-util/bzr/Manifest	2009-03-07 03:06:52 +0000
@@ -3,4 +3,4 @@
 AUX bzr-0.90-tests-sgid.patch 611 RMD160 09a40cb4424e7dc86b48a577152cc7297c6333db SHA1 b7c42cb9b5cd5de4ebe11378870c6cf8eae52591 SHA256 e7514aa51c23405ba619c323b1bd6dbafffe5c584d8274d4e1df0c2347fd55a7
 DIST bzr-1.12.tar.gz 4001912 RMD160 20f02d036c03a279d9808bb84ab375039cf4cf2a SHA1 ad220b5ebc299d30feff680031b54685b2318bc7 SHA256 45658319296425b55ad1bb881adc27a311a5d429b3352b8088b2bdb722afe7b8
 EBUILD bzr-1.12.ebuild 2967 RMD160 7e45c087612774661ac32934afcb8b2f8db849f7 SHA1 70e565d1ac7fe09fed7b32f021cee5e1f3be4ee9 SHA256 2fcb6e2012f87b18ecd8b16f835c9dff590368e84042a953c99471b5416c18b7
-EBUILD bzr-9999.ebuild 2787 RMD160 5d0b770ba6b7b69c22a1cc1abf1cd122a52228eb SHA1 5af3f68d7fa3a39dd076f45888bdb3f6369344ca SHA256 4aeb88359b3b1cf7441c6d0b5c4f9285d2abe086e20e1614b90d49165cc73e69
+EBUILD bzr-9999.ebuild 2795 RMD160 67794c9d660997e53ea659d6daab12d7f0863c34 SHA1 2ee5f5501357e926ca56d80912d0283cb24e3c40 SHA256 c2811f49ae05c3bbbb0602ecabca1365a557e89e0cc200ef7c9a445a01d2f658

=== modified file 'dev-util/bzr/bzr-9999.ebuild'
--- dev-util/bzr/bzr-9999.ebuild	2009-02-20 08:08:09 +0000
+++ dev-util/bzr/bzr-9999.ebuild	2009-03-07 03:06:52 +0000
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=1
+
 NEED_PYTHON=2.4
 
 inherit distutils bash-completion elisp-common eutils versionator bzr

=== modified file 'eclass/bzr.eclass'
--- eclass/bzr.eclass	2009-02-24 16:02:58 +0000
+++ eclass/bzr.eclass	2009-03-07 12:29:58 +0000
@@ -15,14 +15,17 @@
 # (distributed source control management system).
 # The eclass was originally derived from the git eclass.
 #
-# Note: Just set EBZR_REPO_URI to the url of the branch and the src_unpack
-# this eclass provides will put an export of the branch in ${WORKDIR}/${PN}.
+# Note: Just set EBZR_REPO_URI to the URI of the branch and the src_unpack()
+# of this eclass will put an export of the branch in ${WORKDIR}/${PN}.
 
 inherit eutils
 
 EBZR="bzr.eclass"
 
-EXPORT_FUNCTIONS src_unpack
+case "${EAPI:-0}" in
+	0|1) EXPORT_FUNCTIONS src_unpack ;;
+	*)   EXPORT_FUNCTIONS src_unpack src_prepare ;;
+esac
 
 HOMEPAGE="http://bazaar-vcs.org/"
 DESCRIPTION="Based on the ${EBZR} eclass"
@@ -31,32 +34,32 @@
 
 # @ECLASS-VARIABLE: EBZR_STORE_DIR
 # @DESCRIPTION:
-# The dir to store the bzr sources.
+# The directory to store all fetched Bazaar live sources.
 EBZR_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bzr-src"
 
 # @ECLASS-VARIABLE: EBZR_FETCH_CMD
 # @DESCRIPTION:
-# The bzr command to fetch the sources.
+# The Bazaar command to fetch the sources.
 EBZR_FETCH_CMD="bzr checkout --lightweight"
 
 # @ECLASS-VARIABLE: EBZR_UPDATE_CMD
 # @DESCRIPTION:
-# The bzr command to update the sources.
+# The Bazaar command to update the sources.
 EBZR_UPDATE_CMD="bzr update"
 
 # @ECLASS-VARIABLE: EBZR_DIFF_CMD
 # @DESCRIPTION:
-# The bzr command to get the diff output.
+# The Bazaar command to get the diff output.
 EBZR_DIFF_CMD="bzr diff"
 
 # @ECLASS-VARIABLE: EBZR_EXPORT_CMD
 # @DESCRIPTION:
-# The bzr command to export a branch.
+# The Bazaar command to export a branch.
 EBZR_EXPORT_CMD="bzr export"
 
 # @ECLASS-VARIABLE: EBZR_REVNO_CMD
 # @DESCRIPTION:
-# The bzr command to list revision number of the branch.
+# The Bazaar command to list a revision number of the branch.
 EBZR_REVNO_CMD="bzr revno"
 
 # @ECLASS-VARIABLE: EBZR_OPTIONS
@@ -66,7 +69,7 @@
 
 # @ECLASS-VARIABLE: EBZR_REPO_URI
 # @DESCRIPTION:
-# The repository uri for the source package.
+# The repository URI for the source package.
 #
 # @CODE
 # Supported protocols:
@@ -77,7 +80,7 @@
 # 		- lp:
 # @CODE
 #
-# Note: lp: seems to be an alias to https://launchpad.net
+# Note: lp: seems to be an alias for https://launchpad.net
 EBZR_REPO_URI="${EBZR_REPO_URI:-}"
 
 # @ECLASS-VARIABLE: EBZR_BOOTSTRAP
@@ -88,29 +91,24 @@
 # @ECLASS-VARIABLE: EBZR_PATCHES
 # @DESCRIPTION:
 # bzr eclass can apply patches in bzr_bootstrap().
-# you can use regexp in this valiable like *.diff or *.patch or etc.
-# NOTE: this patches will applied before EBZR_BOOTSTRAP is processed.
+# You can use regular expressions in this variable like *.diff or
+# *.patch and the like.
+# NOTE: These patches will bei applied before EBZR_BOOTSTRAP is processed.
 #
 # Patches are searched both in ${PWD} and ${FILESDIR}, if not found in either
 # location, the installation dies.
 EBZR_PATCHES="${EBZR_PATCHES:-}"
 
-# @ECLASS-VARIABLE: EBZR_BRANCH
-# @DESCRIPTION:
-# The branch to fetch in bzr_fetch().
-#
-# default: trunk
-EBZR_BRANCH="${EBZR_BRANCH:-trunk}"
-
 # @ECLASS-VARIABLE: EBZR_REVISION
 # @DESCRIPTION:
-# Revision to get, if not latest (see http://bazaar-vcs.org/BzrRevisionSpec or
-# bzr help revisionspec)
+# Revision to fetch, defaults to the latest (see
+# http://bazaar-vcs.org/BzrRevisionSpec or bzr help revisionspec)
 EBZR_REVISION="${EBZR_REVISION:-}"
 
 # @ECLASS-VARIABLE: EBZR_CACHE_DIR
 # @DESCRIPTION:
-# The dir to store the source for the package, relative to EBZR_STORE_DIR.
+# The directory to store the source for the package, relative to
+# EBZR_STORE_DIR.
 #
 # default: ${PN}
 EBZR_CACHE_DIR="${EBZR_CACHE_DIR:-${PN}}"
@@ -133,35 +131,28 @@
 
 # @FUNCTION: bzr_update
 # @DESCRIPTION:
-# Updates the source code from a repository, via ${EBZR_FETCH_CMD}.
+# Updates the source code from a repository, via ${EBZR_UPDATE_CMD}.
 bzr_update() {
 	local repository="${1}";
-	local branch_dir="${2}";
-
-	if [ -d "${EBZR_BRANCH_DIR}"/.bzr/repository/ ]; then
-		einfo "Re-fetching the branch to save space..."
-		rm -rf "${EBZR_BRANCH_DIR}"
-		bzr_initial_fetch "${repository}" "${EBZR_BRANCH_DIR}"
-	else
-
-		# update branch
-		einfo "bzr update start -->"
-		einfo "   repository: ${repository}"
-
-		pushd "${EBZR_BRANCH_DIR}"
-		${EBZR_UPDATE_CMD} ${EBZR_OPTIONS} \
-			|| die "${EBZR}: can't update from ${repository}."
-		popd
-	fi
+
+	# update branch
+	einfo "bzr update start -->"
+	einfo "   repository: ${repository}"
+
+	pushd "${EBZR_BRANCH_DIR}" > /dev/null
+	${EBZR_UPDATE_CMD} ${EBZR_OPTIONS} \
+		|| die "${EBZR}: can't update from ${repository}."
+	popd > /dev/null
 }
 
 
 # @FUNCTION: bzr_fetch
 # @DESCRIPTION:
-# Wrapper function to fetch sources from bazaar via bzr fetch or bzr update,
-# depending on whether there is an existing working copy in ${EBZR_BRANCH_DIR}.
+# Wrapper function to fetch sources from a Bazaar repository via bzr
+# fetch or bzr update, depending on whether there is an existing
+# working copy in ${EBZR_BRANCH_DIR}.
 bzr_fetch() {
-	local EBZR_BRANCH_DIR repository
+	local EBZR_BRANCH_DIR repository="${EBZR_REPO_URI}"
 
 	# EBZR_REPO_URI is empty.
 	[[ ${EBZR_REPO_URI} ]] || die "${EBZR}: EBZR_REPO_URI is empty."
@@ -193,7 +184,7 @@
 		export SANDBOX_WRITE="${SANDBOX_WRITE%%:/}"
 	fi
 
-	pushd "${EBZR_STORE_DIR}" || die "${EBZR}: can't chdir to ${EBZR_STORE_DIR}"
+	pushd "${EBZR_STORE_DIR}" > /dev/null || die "${EBZR}: can't chdir to ${EBZR_STORE_DIR}"
 
 	EBZR_BRANCH_DIR="${EBZR_STORE_DIR}/${EBZR_CACHE_DIR}"
 
@@ -202,17 +193,15 @@
 
 	debug-print "${FUNCNAME}: EBZR_OPTIONS = ${EBZR_OPTIONS}"
 
-	if [[ -n ${EBZR_BRANCH} ]] ; then
-		repository="${EBZR_REPO_URI}/${EBZR_BRANCH}"
-	else
-		repository="${EBZR_REPO_URI}"
-	fi
-
 	# Run bzr_initial_fetch() only if the branch has not been pulled
 	# before or if the existing local copy is a full checkout (as did
 	# an older version of bzr.eclass)
 	if [[ ! -d ${EBZR_BRANCH_DIR} ]] ; then
 		bzr_initial_fetch "${repository}" "${EBZR_BRANCH_DIR}"
+	elif [[ -d "${EBZR_BRANCH_DIR}"/.bzr/repository/ ]]; then
+		einfo "Re-fetching the branch to save space..."
+		rm -rf "${EBZR_BRANCH_DIR}"
+		bzr_initial_fetch "${repository}" "${EBZR_BRANCH_DIR}"
 	else
 		bzr_update "${repository}" "${EBZR_BRANCH_DIR}"
 	fi
@@ -232,16 +221,16 @@
 
 	einfo "Revision ${revision} is now in ${WORKDIR}/${P}"
 
-	popd
+	popd > /dev/null
 }
 
 # @FUNCTION: bzr_bootstrap
 # @DESCRIPTION:
-# Apply patches in ${EBZR_PATCHES} and run ${EBZR_BOOTSTRAP} if specified
+# Apply patches in ${EBZR_PATCHES} and run ${EBZR_BOOTSTRAP} if specified.
 bzr_bootstrap() {
-	local patch lpatch
+	local patch
 
-	pushd "${S}"
+	pushd "${S}" > /dev/null
 
 	if [[ -n ${EBZR_PATCHES} ]] ; then
 		einfo "apply patches -->"
@@ -249,14 +238,10 @@
 		for patch in ${EBZR_PATCHES} ; do
 			if [[ -f ${patch} ]] ; then
 				epatch ${patch}
+			elif [[ -f "${FILESDIR}/${patch}" ]] ; then
+				epatch "${FILESDIR}/${patch}"
 			else
-				for lpatch in "${FILESDIR}"/${patch} ; do
-					if [[ -f ${lpatch} ]] ; then
-						epatch ${lpatch}
-					else
-						die "${EBZR}: ${patch} is not found"
-					fi
-				done
+				die "${EBZR}: ${patch} is not found"
 			fi
 		done
 	fi
@@ -275,13 +260,29 @@
 		fi
 	fi
 
-	popd
+	popd > /dev/null
 }
 
 # @FUNCTION: bzr_src_unpack
 # @DESCRIPTION:
-# default src_unpack. fetch and bootstrap.
+# Default src_unpack(). Includes bzr_fetch() and bootstrap().
 bzr_src_unpack() {
+	if [ -n ${EBZR_BRANCH} ]; then
+		# This test will go away on 01 Jan 2010
+		eerror "This ebuild uses EBZR_BRANCH which is not supported anymore"
+		eerror "by the bzr.eclass.  Please report this to the ebuild maintainer."
+		die "EBZR_BRANCH still defined"
+	fi
 	bzr_fetch || die "${EBZR}: unknown problem in bzr_fetch()."
+	case "${EAPI:-0}" in
+		0|1) bzr_src_prepare ;;
+	esac
+}
+
+# @FUNCTION: bzr_src_prepare
+# @DESCRIPTION:
+# Default src_prepare(). Executes bzr_bootstrap() for patch
+# application and Make file generation (if needed).
+bzr_src_prepare() {
 	bzr_bootstrap || die "${EBZR}: unknown problem in bzr_bootstrap()."
 }