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

[Christian Faulhammer]

[Christian Faulhammer (fauli)]

Removal of some ebuilds that are available in the official tree.

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

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

Added www-apps/trac-bzr-0.3.0

[Mark Lee (malept)]

I don't want to merge this until bzr-svn is version bumped in the official tree.

review: Needs Resubmitting (later)

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

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

=== removed directory 'dev-python/dulwich'
=== removed file 'dev-python/dulwich/Manifest'
--- dev-python/dulwich/Manifest	2009-10-16 05:12:39 +0000
+++ dev-python/dulwich/Manifest	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-DIST dulwich-0.4.0.tar.gz 73140 RMD160 d8e1bc1fd4d0ae924becbf9c8047a81f419eed1a SHA1 c8b2dcd11284a5eb80646c8705fd070ea981acb9 SHA256 03c082349f934c332df98072d711874953e1134f17504dc51c16084cf0a81565
-EBUILD dulwich-0.4.0.ebuild 432 RMD160 ca5a32251b38bd16a2a05a570c803d0af734b982 SHA1 1cae60d7226c55c9d030d403b531e41bd8945a90 SHA256 f2b55d0fb9d81921b5e4d1e3ce89ce245bf236bb1f69ba795aef1f67ccd51ade
-EBUILD dulwich-9999.ebuild 430 RMD160 33aa286aa41355208fd2c070cbc613af79b091f3 SHA1 0b9fc66d7b119f93e05fc06138907022b6d2bdf8 SHA256 bc84c1d1ad4edfe3cc0a7820691a97f78dda0c00b64a0a0b8c6c09762bdd8130
-MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4

=== removed file 'dev-python/dulwich/dulwich-0.4.0.ebuild'
--- dev-python/dulwich/dulwich-0.4.0.ebuild	2009-10-16 05:12:39 +0000
+++ dev-python/dulwich/dulwich-0.4.0.ebuild	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.4
-
-inherit distutils
-
-DESCRIPTION="A pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://launchpad.net/dulwich"
-SRC_URI="http://samba.org/~jelmer/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"/${P}

=== removed file 'dev-python/dulwich/dulwich-9999.ebuild'
--- dev-python/dulwich/dulwich-9999.ebuild	2009-05-11 03:33:56 +0000
+++ dev-python/dulwich/dulwich-9999.ebuild	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.4
-
-inherit distutils bzr
-
-DESCRIPTION="A pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://launchpad.net/dulwich"
-SRC_URI=""
-EBZR_REPO_URI="http://people.samba.org/bzr/jelmer/${PN}/trunk"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-

=== removed file 'dev-python/dulwich/metadata.xml'
--- dev-python/dulwich/metadata.xml	2009-03-19 21:12:15 +0000
+++ dev-python/dulwich/metadata.xml	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>[e-mail]</email>
-		<name>Default assignee for new packages</name>
-	</maintainer>
-</pkgmetadata>

=== modified file 'dev-util/bzr-gtk/Manifest'
--- dev-util/bzr-gtk/Manifest	2009-10-15 21:02:58 +0000
+++ dev-util/bzr-gtk/Manifest	2010-02-24 10:31:16 +0000
@@ -1,4 +1,4 @@
-DIST bzr-gtk-0.97.0.tar.gz 242775 RMD160 c87a690f9dd8b81907ca1d902b66a51fb2b0044b SHA1 21498b12a4cc6f5c51e81131da11d7e5a45158a4 SHA256 ba3d5fbf3e05510eeddb92d2fe42e1c36f538e9215c2f0589513c2f814103de1
-EBUILD bzr-gtk-0.97.0.ebuild 1088 RMD160 66c21090745a890b86317d56501b529e716f269f SHA1 c7953a5879e3d19de84469065d434d618981c45f SHA256 37248944f80a32a1f845fddc5bd7486190cfa0e39a0213363c087d2ad7f1fd29
+DIST bzr-gtk-0.98.0.tar.gz 243271 RMD160 5a890f24a0de55092d6892872b5ae6fec3e68165 SHA1 3b1a2f3e5dbc45763ab4a69b4b4ca84bdc49a836 SHA256 ca9f41c66583d04acec7961810aab888dcdee1e36e7395356a9a4ad5e3dcfee8
+EBUILD bzr-gtk-0.98.0.ebuild 1088 RMD160 66c21090745a890b86317d56501b529e716f269f SHA1 c7953a5879e3d19de84469065d434d618981c45f SHA256 37248944f80a32a1f845fddc5bd7486190cfa0e39a0213363c087d2ad7f1fd29
 EBUILD bzr-gtk-9999.ebuild 1153 RMD160 c8aae1d03096e3e27690678c71744a4020625cd1 SHA1 18d620a863b45eb1d3e17250d27f92677429d5a1 SHA256 e0e5e1749ee5c00f38dd32f5232c2a3004cee8c3028e03fadba25920400ecedd
 MISC metadata.xml 504 RMD160 aba1f65905779b31c29d6f829f0ec4a55c2aed56 SHA1 20af29a23820e43c72838a2d34a4643e177fcb46 SHA256 0b0cc9c75e0e6ee159c90f1f924ded64726f4352d0f227e3cfd7f3dd746e7fed

=== renamed file 'dev-util/bzr-gtk/bzr-gtk-0.97.0.ebuild' => 'dev-util/bzr-gtk/bzr-gtk-0.98.0.ebuild'
=== removed directory 'dev-util/bzr-svn'
=== removed file 'dev-util/bzr-svn/Manifest'
--- dev-util/bzr-svn/Manifest	2010-01-23 18:54:39 +0000
+++ dev-util/bzr-svn/Manifest	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-DIST bzr-svn-1.0.2.tar.gz 251988 RMD160 996e96ac3cab3efa5f12baa34b68c265361cc153 SHA1 7438c2be443fbfeab9bc88c582b4a1f46effecb1 SHA256 37c30d86ffb804c8e17f2caa66c824e0a04592b73f99ab04fb7b70b09d6f7c03
-EBUILD bzr-svn-1.0.2.ebuild 810 RMD160 fdc8ef023fbd2901633c07c4b8dc232b35f5c89a SHA1 2c37a658975088dc6be6c8d22bfc74b1e0b4d999 SHA256 3377720ba781597e5eddcba0c55b1966c3ecd22bf79728df5eb8f59c2f3c20b3
-MISC metadata.xml 791 RMD160 a9da80fb5e531d805b9d838e8b9d307bf780be35 SHA1 51b45ac58cc39eebaf97064a1c592259495b9d7c SHA256 e80bff2c256901dbc66620f4630a189fd35210f4a98be2d8621cebd2de57f8b6

=== removed file 'dev-util/bzr-svn/bzr-svn-1.0.2.ebuild'
--- dev-util/bzr-svn/bzr-svn-1.0.2.ebuild	2010-01-23 18:54:39 +0000
+++ dev-util/bzr-svn/bzr-svn-1.0.2.ebuild	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit distutils
-
-MY_P=${P/_rc/rc}
-
-DESCRIPTION="Bazaar plugin that adds support for foreign Subversion repositories."
-HOMEPAGE="http://bazaar-vcs.org/BzrForeignBranches/Subversion"
-SRC_URI="http://samba.org/~jelmer/bzr/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Packager: check compatible bzr versions in info.py
-# and minimum subvertpy version via
-# `grep subvertpy_minimum_version info.py`.
-DEPEND=">=dev-util/bzr-1.16
-	|| ( >=dev-lang/python-2.5[sqlite] >=dev-python/pysqlite-2 )
-	>=dev-python/subvertpy-0.6.1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="AUTHORS FAQ HACKING NEWS README TODO UPGRADING mapping.txt specs/*"

=== removed directory 'dev-util/bzr-svn/files'
=== removed file 'dev-util/bzr-svn/metadata.xml'
--- dev-util/bzr-svn/metadata.xml	2009-10-20 23:03:14 +0000
+++ dev-util/bzr-svn/metadata.xml	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>python</herd>
-  <maintainer>
-  	<email>[e-mail]</email>
-	<name>Peter Volkov</name>
-  </maintainer>
-
-  <longdescription lang="en">
-
-	bzr-svn is a plugin that allows Bazaar direct access to Subversion
-	repositories. It allows most bzr commands to work directly against
-	Subversion repositories, as if you were using bzr with a native bzr
-	repository.
-
-	The plugin can at the moment be used to commit to, pull from, merge from,
-	push to and view logs of Subversion branches from Bazaar.
-
-	It also provides a Bazaar subcommand ("bzr svn-import") for converting
-	complete Subversion repositories to Bazaar repositories.
-
-  </longdescription>
-
-</pkgmetadata>

=== modified file 'profiles/package.mask'
--- profiles/package.mask	2009-10-15 20:27:48 +0000
+++ profiles/package.mask	2010-02-24 10:31:16 +0000
@@ -9,7 +9,6 @@
 ~dev-util/bzr-bisect-9999
 ~dev-util/bzr-dbus-9999
 ~dev-util/bzr-vimdiff-9999
-~dev-python/dulwich-9999
 ~dev-util/bzr-git-9999
 ~dev-util/bzr-cia-9999
 ~dev-util/bzr-interactive-9999

=== added directory 'www-apps/trac-bzr'
=== added file 'www-apps/trac-bzr/ChangeLog'
--- www-apps/trac-bzr/ChangeLog	1970-01-01 00:00:00 +0000
+++ www-apps/trac-bzr/ChangeLog	2010-02-24 10:31:16 +0000
@@ -0,0 +1,9 @@
+# ChangeLog for www-apps/trac-bzr
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*trac-bzr-0.3.0 (06 Jan 2009)
+
+  06 Jan 2010; Martin von Gagern (MvG) <[e-mail]>
+  +trac-bzr-0.3.0.ebuild:
+  Initial import.

=== added file 'www-apps/trac-bzr/Manifest'
--- www-apps/trac-bzr/Manifest	1970-01-01 00:00:00 +0000
+++ www-apps/trac-bzr/Manifest	2010-02-24 10:31:16 +0000
@@ -0,0 +1,4 @@
+DIST TracBzr-0.3.0.tar.gz 24882 RMD160 eb703d2188fabd8fd5b68371d23bb32be34f27a4 SHA1 1574428030900df1eee5ae9e73d9c84d617178e3 SHA256 ed42655fb976b31355eca3de4c4cc66fd9c25706fe006103750e6416a88ce14d
+EBUILD trac-bzr-0.3.0.ebuild 475 RMD160 6b23797e2b04a773d4f1499d9880ce104d732206 SHA1 716d3d5f50e7b7b7c105bbb7e3794881b7261463 SHA256 badd2ee3b32ddca45ac9b13ac01f889ea94e80e2b7f10b9db3f240d5ba1e5a14
+MISC ChangeLog 257 RMD160 95adca7b885b5f8c8fe7d1eafa02fcfd99bc6499 SHA1 068be3f2bb9518ade14857c1e1e780c7c5483a6d SHA256 ac045fb3cd4921c62bce54b6a8faec3b22728dae0abbd5031b221245935042d2
+MISC metadata.xml 302 RMD160 f7f00ac86e9287aed9e2ab7b93ac533420cfa707 SHA1 0723594916425f1503729b08624fa026ddfcd517 SHA256 3e2c82529f40a2abc2e403e16c76a066f60fe9e74d46eb2e3d0c403f2f960943

=== added file 'www-apps/trac-bzr/metadata.xml'
--- www-apps/trac-bzr/metadata.xml	1970-01-01 00:00:00 +0000
+++ www-apps/trac-bzr/metadata.xml	2010-02-24 10:31:16 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>no-herd</herd>
+  <maintainer>
+    <email>[e-mail]</email>
+    <description>trac-bzr maintainer and Gentoo user</description>
+  </maintainer>
+</pkgmetadata>

=== added file 'www-apps/trac-bzr/trac-bzr-0.3.0.ebuild'
--- www-apps/trac-bzr/trac-bzr-0.3.0.ebuild	1970-01-01 00:00:00 +0000
+++ www-apps/trac-bzr/trac-bzr-0.3.0.ebuild	2010-02-24 10:31:16 +0000
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit distutils
+
+MY_PN="TracBzr"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Bazaar plugin for Trac"
+HOMEPAGE="https://launchpad.net/trac-bzr"
+SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=www-apps/trac-0.10"
+
+S="${WORKDIR}/${MY_P}"