Merge lp:~gagern/bzr-gentoo-overlay/bump2 into lp:bzr-gentoo-overlay

[Martin von Gagern]

Bumped a number of packages to their latest versions.

[Christian Faulhammer (fauli)]

All packages from the main tree have been bumped. I only merged the commits that are unique to the overlay.

review: Approve

=== modified file 'Tools/bzr.ini'
--- Tools/bzr.ini	2011-02-12 09:27:03 +0000
+++ Tools/bzr.ini	2011-08-07 15:24:41 +0000
@@ -68,7 +68,7 @@
 
 [dev-python/pyftpdlib]
 url = http://code.google.com/p/pyftpdlib/downloads/list
-command = grep -e '<a href="http://pyftpdlib.googlecode.com/files/pyftpdlib-[0-9][^ ]*\.tar\.gz"' | head -n1 | sed -e 's:.*pyftpdlib-\([0-9][^ ]*\)\.tar\.gz.*:\1:'
+command = grep -e '<a href="//pyftpdlib.googlecode.com/files/pyftpdlib-[0-9][^ ]*\.tar\.gz"' | head -n1 | sed -e 's:.*pyftpdlib-\([0-9][^ ]*\)\.tar\.gz.*:\1:'
 
 # Other packages
 

=== added directory 'dev-vcs/bzr-explorer'
=== added file 'dev-vcs/bzr-explorer/Manifest'
--- dev-vcs/bzr-explorer/Manifest	1970-01-01 00:00:00 +0000
+++ dev-vcs/bzr-explorer/Manifest	2011-08-07 15:24:41 +0000
@@ -0,0 +1,3 @@
+DIST bzr-explorer-1.2.1.tar.gz 1436910 RMD160 8e835af6c213f9ec4e36767130b68e19fc77e981 SHA1 465def3efab1897aec92cbf0bdab4a81d227cfd5 SHA256 d19d80db6fcf854cbe42991bd5ac47beb2ab2b6c2c7914980db2ebd766ef6fd7
+EBUILD bzr-explorer-1.2.1.ebuild 806 RMD160 c6691538ef74d1adb069c84787f85b1dfa7b6c8f SHA1 655788153dd391ba61d9816ee75ca367eacdde4a SHA256 f6607ab78cab34339318d80abaf9148e2f351ec59c39ed3df5b50fb67d113002
+MISC metadata.xml 548 RMD160 6584f99391e5ab9732c71da280f7c72cc6fe8b09 SHA1 c7660cf3322bb1fb62bc96280e711bff2305b084 SHA256 9999d2e2ae17e6f69b0494acf7c6724607ca8bdbd060d8f3f8d87822769df48c

=== added file 'dev-vcs/bzr-explorer/bzr-explorer-1.2.1.ebuild'
--- dev-vcs/bzr-explorer/bzr-explorer-1.2.1.ebuild	1970-01-01 00:00:00 +0000
+++ dev-vcs/bzr-explorer/bzr-explorer-1.2.1.ebuild	2011-08-07 15:24:41 +0000
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-explorer/bzr-explorer-1.1.4.ebuild,v 1.1 2011/07/17 11:47:59 fauli Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils versionator
+
+MY_PV=${PV/_beta/b}
+MY_PV=${MY_PV/_rc/rc}
+LPV=${MY_PV}
+SERIES=$(get_version_component_range 1-2)
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="A high level interface to all commonly used Bazaar features"
+HOMEPAGE="https://launchpad.net/bzr-explorer"
+SRC_URI="http://launchpad.net/${PN}/${SERIES}/${LPV}/+download/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+DEPEND=""
+RDEPEND=">=dev-vcs/bzr-1.14
+		>=dev-vcs/qbzr-0.19
+		gtk? ( dev-vcs/bzr-gtk )"

=== added file 'dev-vcs/bzr-explorer/metadata.xml'
--- dev-vcs/bzr-explorer/metadata.xml	1970-01-01 00:00:00 +0000
+++ dev-vcs/bzr-explorer/metadata.xml	2011-08-07 15:24:41 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>bazaar</herd>
+  <longdescription lang="en">
+    Bazaar Explorer is a desktop application for using the Bazaar
+    Version Control System. It provides a high level interface to all
+    commonly used features, launching "applets" from the QBzr plug-in
+    to provide most of the functionality. Alternatively, the applets
+    from the bzr-gtk plug-in can be used if it is installed.
+  </longdescription>
+</pkgmetadata>

=== modified file 'dev-vcs/bzr-git/Manifest'
--- dev-vcs/bzr-git/Manifest	2010-11-27 11:11:12 +0000
+++ dev-vcs/bzr-git/Manifest	2011-08-07 15:24:41 +0000
@@ -1,2 +1,4 @@
+DIST bzr-git-0.6.1.tar.gz 95047 RMD160 a7c0f09b63fd556d455a8ceddafaaf9dcbc6bf60 SHA1 e4b313a37c7e2ea24f16e39ec5975c47b9011bba SHA256 1f5339d13519e16e6f5c559d6b4560fb4f3120697c266d07169a4192f2093d0b
+EBUILD bzr-git-0.6.1.ebuild 934 RMD160 cb275b0296f0acde57534287a57ace500f86de4a SHA1 db4728a2081471bf10095dccb9bcd98de75bd4f5 SHA256 8b570d0b3a0a8eb12026943651d05ae631d7937b94a660d5da2fc35fd7a37827
 EBUILD bzr-git-9999.ebuild 611 RMD160 f45bce7ceb0b3237c279d7db2958da233c05c999 SHA1 3682c166c2a0ef5e012d81182c529d4554c1f356 SHA256 26cf5d4fcbbd60bec2bfd930883979ca04ab92793aae3333501558b10d22e663
 MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4

=== added file 'dev-vcs/bzr-git/bzr-git-0.6.1.ebuild'
--- dev-vcs/bzr-git/bzr-git-0.6.1.ebuild	1970-01-01 00:00:00 +0000
+++ dev-vcs/bzr-git/bzr-git-0.6.1.ebuild	2011-08-07 15:24:41 +0000
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-git/bzr-git-0.5.4.ebuild,v 1.1 2011/02/12 15:49:06 fauli Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Support for Git branches in Bazaar"
+HOMEPAGE="http://bazaar-vcs.org/BzrForeignBranches/Git"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit bzr
+	EBZR_REPO_URI="lp:bzr-git"
+	KEYWORDS=""
+else
+	SRC_URI="http://samba.org/~jelmer/bzr/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+# Test are broken, they want API functions from Dulwich which are not
+# installed in Gentoo
+RESTRICT="test"
+
+# Check info.py for dulwich and bzr version dependency info.
+# The file should be fairly straightforward to understand.
+DEPEND=""
+RDEPEND=">=dev-python/dulwich-0.5.0
+	>=dev-vcs/bzr-1.15_rc1"

=== added directory 'dev-vcs/bzr-xmloutput'
=== added file 'dev-vcs/bzr-xmloutput/Manifest'
--- dev-vcs/bzr-xmloutput/Manifest	1970-01-01 00:00:00 +0000
+++ dev-vcs/bzr-xmloutput/Manifest	2011-08-07 15:24:41 +0000
@@ -0,0 +1,3 @@
+DIST bzr-xmloutput-0.8.7.final.0.tar.gz 52209 RMD160 97a7371a03c5b3eee1b7650d9ce08f9c7dc8949b SHA1 b6302f3bd3eb138bcdb9080c185fa6e06314e17f SHA256 8cbfc87998bf5bf76707bd424b819d4ff53b31b8bc91447bfa0a0472033c1639
+EBUILD bzr-xmloutput-0.8.7.ebuild 681 RMD160 2b675b54dbfed81b6bce4b967b48e91ac5226430 SHA1 3ee872c1b56fbd98c045c1bf745025001de77515 SHA256 4f8acdb7ab804ccc3b65c23605b04ec751460b8a2015bc209f8a554b33c7d618
+MISC metadata.xml 161 RMD160 e30bbda629ff0856e35f9953ebed101db0879667 SHA1 c50f9338f84437ff9a4002d71a21ab0c3440237c SHA256 10876eb627faa0f7204c3bca5931c5579842b655590d4a4205d095f6137074ec

=== added file 'dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.7.ebuild'
--- dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.7.ebuild	1970-01-01 00:00:00 +0000
+++ dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.7.ebuild	2011-08-07 15:24:41 +0000
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.6.ebuild,v 1.4 2011/01/22 16:27:02 phajdan.jr Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+MY_P="${P}.final.0"
+
+DESCRIPTION="A Bazaar plugin that provides a option to generate XML output for
+builtin commands."
+HOMEPAGE="http://bazaar-vcs.org/XMLOutput"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-vcs/bzr"
+
+S="${WORKDIR}/${MY_P}"

=== added file 'dev-vcs/bzr-xmloutput/metadata.xml'
--- dev-vcs/bzr-xmloutput/metadata.xml	1970-01-01 00:00:00 +0000
+++ dev-vcs/bzr-xmloutput/metadata.xml	2011-08-07 15:24:41 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>bazaar</herd>
+</pkgmetadata>

=== modified file 'www-apps/loggerhead/Manifest'
--- www-apps/loggerhead/Manifest	2011-02-12 09:40:33 +0000
+++ www-apps/loggerhead/Manifest	2011-08-07 15:24:41 +0000
@@ -1,5 +1,5 @@
 AUX loggerhead.confd 70 RMD160 c296a0e5db2ad2e59a9fd0b02e66fbd48a6fa4cc SHA1 be2e6c10f0930620aec3db49bae97a9e26f6268f SHA256 c6bba819e39df844cf7e36bdca19fef8732cce4b01ef7f38cc48365898238596
 AUX loggerhead.init 556 RMD160 4c1ac57d17702c2484a40bdd978ef0afbcb2af72 SHA1 41f599dd7f13232a8205c17a76abef299bacb559 SHA256 93d9c40ca49370db748d56afffafd6b0a8531a751ff6a4e8df6ab9d3e75f9818
-DIST loggerhead-1.18.tar.gz 694822 RMD160 2883ad797da7d6db36449fc299eafd9d3c4af8a8 SHA1 46a379ca0cbdd32b67448acc9f31c4d4cfea7ea8 SHA256 be7a3d0e62e7e24c14949755306419288d5fe2de3a1047a14ecbe15bb5345796
-EBUILD loggerhead-1.18.ebuild 785 RMD160 30c43c8d7909cfa8c2bb950a125c3200db7d0841 SHA1 80749659b33dbc4c7384bfbb697ce2831588ef29 SHA256 1b31045501b96902238e1f0b6010bc37108704c1f77410afc862d9a832d1e12a
+DIST loggerhead-1.18.1.tar.gz 695475 RMD160 a03a119ff82470cba2bccf215bce8c468daf7357 SHA1 dad804c194ddc278d8f4a65460cc480eff937a73 SHA256 f66123abef4e06b893fe91e2c2b367dd9f17d5f523096ff37f33178d004ffdb4
+EBUILD loggerhead-1.18.1.ebuild 864 RMD160 823717d811af4a72611ac39b03269c420c06e80a SHA1 94b9aee5bee3fdcb129454a71baa68545acf1bd6 SHA256 a1600bce1d45f1629742d3dd19fa47db799b186a90695caaec51ddb070b0ec0e
 MISC metadata.xml 380 RMD160 d2836fb3518f6028fe7b94c4fbfe0f953940c162 SHA1 cf0c3edc469fa0a8dc65828ff10de7d99819a177 SHA256 ff299b6067b90a8bf61aff7f5e74854926a8b9a85f3044c0e8da4579a66355a2

=== renamed file 'www-apps/loggerhead/loggerhead-1.18.ebuild' => 'www-apps/loggerhead/loggerhead-1.18.1.ebuild'
--- www-apps/loggerhead/loggerhead-1.18.ebuild	2011-02-12 09:40:33 +0000
+++ www-apps/loggerhead/loggerhead-1.18.1.ebuild	2011-08-07 15:24:41 +0000
@@ -2,6 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
 inherit distutils versionator
 
 PV_BASE=$(get_version_component_range 1-2)

=== modified file 'www-apps/trac-bzr/Manifest'
--- www-apps/trac-bzr/Manifest	2011-02-12 09:38:19 +0000
+++ www-apps/trac-bzr/Manifest	2011-08-07 15:24:41 +0000
@@ -1,3 +1,3 @@
 DIST TracBzr-0.4.2.tar.gz 33614 RMD160 d4f1cc1f286cd437431eee3989eae41205063a93 SHA1 907f9ce09095a7ff561ccc479b5714213510b5b4 SHA256 dfcfb4ea46d97933f520a7b1bcd0416f42be32a5d86f2da47ab446ca10f951fe
-EBUILD trac-bzr-0.4.2.ebuild 451 RMD160 c18ff820d76711232842980683f12947b8ee7f9e SHA1 6bd5cc209c339193c459dd53001d912cd8f5ba25 SHA256 8ddc1924dae8846ea7ddf3083c1b1496a0fa6aff2f73b11a81b6895494a6a9e8
+EBUILD trac-bzr-0.4.2.ebuild 520 RMD160 9e82399d4360e11803e08fc2d150348fcdbec271 SHA1 6ec519d0442fbf8eb03bd78949ea564b56221404 SHA256 2797ac71e47f092137fa19286896bff6bdd97e932d27eb402dc136d1f3df47df
 MISC metadata.xml 302 RMD160 f7f00ac86e9287aed9e2ab7b93ac533420cfa707 SHA1 0723594916425f1503729b08624fa026ddfcd517 SHA256 3e2c82529f40a2abc2e403e16c76a066f60fe9e74d46eb2e3d0c403f2f960943

=== modified file 'www-apps/trac-bzr/trac-bzr-0.4.2.ebuild'
--- www-apps/trac-bzr/trac-bzr-0.4.2.ebuild	2011-02-12 09:38:19 +0000
+++ www-apps/trac-bzr/trac-bzr-0.4.2.ebuild	2011-08-07 15:24:41 +0000
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit distutils