Fix paramiko dependency, thanks to AnMaster on irc for noticing it was not specific enough. Remove old ebuilds.

(Portage version: 2.1_pre7-r3)

8 files changed, 34 insertions, 61 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index 929f2bddae6c..096694f5ca66 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/bzr
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.9 2006/01/27 13:29:02 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.10 2006/04/02 22:14:17 marienz Exp $
+
+  02 Apr 2006; Marien Zwart <marienz@gentoo.org> -bzr-0.0.9.ebuild,
+  -bzr-0.6.ebuild, bzr-0.7.ebuild:
+  Fix paramiko dependency, thanks to AnMaster on irc for noticing it was not
+  specific enough. Remove old ebuilds.
 
 *bzr-0.7 (27 Jan 2006)
 
diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest
index 797699f8a2bc..668657e456e1 100644
--- a/dev-util/bzr/Manifest
+++ b/dev-util/bzr/Manifest
@@ -1,21 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ac9929860d9fc3d4215a8b3de1c05e57 ChangeLog 1541
+RMD160 b4d23d2a3d0ec20410f043d545cf673f0868ffaf ChangeLog 1541
+SHA256 5c713bdbe730e3d5285f70a5b3aee7d7354288dd53703264b2638715fedbd5af ChangeLog 1541
 MD5 aead7488731c21671c7e77bca6a1e8d4 bzr-0.0.9.ebuild 688
+RMD160 a229e5e87f52397f6ad1cc9c1e41945be92c3dca bzr-0.0.9.ebuild 688
+SHA256 77ccd12579d912fa2258087f11ea69f6d8b8f504c04d00bbadd0d90f5ae25e2b bzr-0.0.9.ebuild 688
 MD5 bd513588df0e2bd410c43e79b6e2890e bzr-0.6.2.ebuild 688
+RMD160 176f7037e1667044212974a2c7dde0033b52f3dc bzr-0.6.2.ebuild 688
+SHA256 126b060b2665d79e7c9f01de43b99dd0ec6d214e7777076285215120eb106b86 bzr-0.6.2.ebuild 688
 MD5 ca9c02bb728de12d464a2b525ff95d87 bzr-0.6.ebuild 686
-MD5 31754bdb52851b5c3ea34460bc26254a bzr-0.7.ebuild 1395
+RMD160 9c6609afcb0740764f84b1199e9a3f35b7cab8bf bzr-0.6.ebuild 686
+SHA256 8eaafd8e6fada0cf53a35de42c4812cf51e1cef858d1d89845b94e980dd9557b bzr-0.6.ebuild 686
+MD5 5daab3940edd565fc9bc96e4fd18377a bzr-0.7.ebuild 1401
+RMD160 7e98b1a5d3e69015abc1afd8574c923872abc227 bzr-0.7.ebuild 1401
+SHA256 7f965208f3405a51e5b0347087d98597ccca84e6ffcf7ff6606086ddc3c83b97 bzr-0.7.ebuild 1401
 MD5 1bf9ed4fac4c7025cdf979065e4de64f files/70bzr-gentoo.el 54
+RMD160 897fb74e83772b5c173dd3ef893c9960abc57939 files/70bzr-gentoo.el 54
+SHA256 65f7c9b56f4b6dbf1c3b799533b611b1e3332fc2d5c240eb339850c5a486dd20 files/70bzr-gentoo.el 54
 MD5 acb969ffd3f24ffa0fa448e6f3d4cf36 files/digest-bzr-0.0.9 61
+RMD160 c0472e63b272c01537f999ccb762a21dcaca4eb6 files/digest-bzr-0.0.9 61
+SHA256 52893716e3d282baac93ea71e1eec799274fd5860aaead337fcf0b97bd8a9e8a files/digest-bzr-0.0.9 61
 MD5 8f97e12c107fb24ebad57f0873b0e78c files/digest-bzr-0.6 59
+RMD160 8da21e5da507380f97549a460a390ae6a32ee1f6 files/digest-bzr-0.6 59
+SHA256 617e210f50adbb8201290fb2f0244f9e9a0216fa9b6f1ba45aa731b640276ba5 files/digest-bzr-0.6 59
 MD5 61a5c235b1f05bbb3f8c606866941097 files/digest-bzr-0.6.2 61
-MD5 ce53e69fc74ceb5842fa335c9112a4a7 files/digest-bzr-0.7 59
+RMD160 6c3c5290e4cb86c78b030d69755635a4de8eaef1 files/digest-bzr-0.6.2 61
+SHA256 5c83e07b2c846c3235d8a68926c41c1a1df0ac5dd339b3b2774fbc9716c8da70 files/digest-bzr-0.6.2 61
+MD5 5617466dc1420b8d09586f5cb4a05585 files/digest-bzr-0.7 223
+RMD160 d3fa94235428a80a02ef091eb8be51f984094204 files/digest-bzr-0.7 223
+SHA256 5a18788b3530e5eb6b81f637238246d44885fde9f2920e9f14803e80403aca5c files/digest-bzr-0.7 223
 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD2iAuW78445TWHXcRAoy1AJ9ZeZf4ualUREtHkL/XHdr0SFilywCcCGoW
-kD42+c6h6QpCJoiU9v5Pzuk=
-=7YVv
------END PGP SIGNATURE-----
+RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
+SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 metadata.xml 218
diff --git a/dev-util/bzr/bzr-0.0.9.ebuild b/dev-util/bzr/bzr-0.0.9.ebuild
deleted file mode 100644
index 75b50e66aa08..000000000000
--- a/dev-util/bzr/bzr-0.0.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.0.9.ebuild,v 1.1 2005/10/07 21:36:02 arj Exp $
-
-inherit distutils
-MY_P="bzr-${PV}"
-PYTHON_MODNAME="bzrlib"
-DESCRIPTION="next generation distributed version control"
-HOMEPAGE="http://bazaar-ng.org/"
-SRC_URI="http://bazaar-ng.org/pkg/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND=">=dev-lang/python-2.4
-	dev-python/elementtree"
-S="${WORKDIR}/${MY_P}"
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	einfo "You may optionally \033[1memerge dev-python/celementtree\033[0m for faster processing."
-}
diff --git a/dev-util/bzr/bzr-0.6.ebuild b/dev-util/bzr/bzr-0.6.ebuild
deleted file mode 100644
index bac5edfed08d..000000000000
--- a/dev-util/bzr/bzr-0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.6.ebuild,v 1.1 2005/10/30 20:21:23 arj Exp $
-
-inherit distutils
-MY_P="bzr-${PV}"
-PYTHON_MODNAME="bzrlib"
-DESCRIPTION="next generation distributed version control"
-HOMEPAGE="http://bazaar-ng.org/"
-SRC_URI="http://bazaar-ng.org/pkg/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND=">=dev-lang/python-2.4
-	dev-python/elementtree"
-S="${WORKDIR}/${MY_P}"
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	einfo "You may optionally \033[1memerge dev-python/celementtree\033[0m for faster processing."
-}
diff --git a/dev-util/bzr/bzr-0.7.ebuild b/dev-util/bzr/bzr-0.7.ebuild
index c6483673d28b..c800576b9471 100644
--- a/dev-util/bzr/bzr-0.7.ebuild
+++ b/dev-util/bzr/bzr-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.7.ebuild,v 1.1 2006/01/27 13:29:02 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.7.ebuild,v 1.2 2006/04/02 22:14:17 marienz Exp $
 
 inherit distutils bash-completion elisp-common
 
@@ -18,7 +18,7 @@ IUSE="emacs"
 DEPEND=">=dev-lang/python-2.4
 	dev-python/celementtree
 	emacs? ( virtual/emacs )
-	dev-python/paramiko"
+	>=dev-python/paramiko-1.5"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/bzr/files/digest-bzr-0.0.9 b/dev-util/bzr/files/digest-bzr-0.0.9
deleted file mode 100644
index 3e09340b86ee..000000000000
--- a/dev-util/bzr/files/digest-bzr-0.0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e6b1e5e561556f29ac00ce00433c9077 bzr-0.0.9.tar.gz 475889
diff --git a/dev-util/bzr/files/digest-bzr-0.6 b/dev-util/bzr/files/digest-bzr-0.6
deleted file mode 100644
index b7f1293255e7..000000000000
--- a/dev-util/bzr/files/digest-bzr-0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ba20e4bd0fa902ae293d458490c756f bzr-0.6.tar.gz 519526
diff --git a/dev-util/bzr/files/digest-bzr-0.7 b/dev-util/bzr/files/digest-bzr-0.7
index 903d34a09886..75af030f14db 100644
--- a/dev-util/bzr/files/digest-bzr-0.7
+++ b/dev-util/bzr/files/digest-bzr-0.7
@@ -1 +1,3 @@
 MD5 5daf99b67478027ed0914edf32997181 bzr-0.7.tar.gz 569679
+RMD160 e207ed79ffd9e88e5f7ab4b618bd584f4734fff4 bzr-0.7.tar.gz 569679
+SHA256 a9abf88785f0d2c397de9cf4ef02cb63462b1458f583d3ce48cd6f7c21e7a36b bzr-0.7.tar.gz 569679