Change Python dependency as pointed out by Mike Gilbert in bug 381381

Package-Manager: portage-2.1.10.11/cvs/Linux i686

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index cf1a0ab664b0743d21b4bb61702277041dcfefc6..b9498ab86bf9fee698d1079c87707bb3aafe7a7e 100644 (file)
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/bzr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.34 2011/08/31 09:21:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.35 2011/09/01 08:31:25 fauli Exp $
+
+  01 Sep 2011; Christian Faulhammer <fauli@gentoo.org> bzr-2.4.0.ebuild:
+  Change Python dependency as pointed out by Mike Gilbert in bug 381381
 
   31 Aug 2011; Christian Faulhammer <fauli@gentoo.org> bzr-2.4.0.ebuild:
   Drop privilege setgid patch for tests, is fixed upstream. Drop

diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index fb1acc146c5baf77e5d3d4810a605423c6a1d894..2269322a3cdcde05bfe80c1eb518f2a27d974fd0 100644 (file)
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -10,13 +10,13 @@ AUX bzr-2.4.0-no-pyrex-citon.patch 1191 RMD160 4890e3d07ddff670f7a6dd3bcea01ef0a
 DIST bzr-2.2.2.tar.gz 6897175 RMD160 888e0f59c88e0fde26adf697a9422ed732cc3329 SHA1 9db8f061d94ba3f0b48dcd623c473c6e8b570b6a SHA256 734ee0c3a64e7b820d6632ae0e2a4bf91add908fdebe5c82865618c38175c8e3
 DIST bzr-2.4.0.tar.gz 7522083 RMD160 68508cf0188fba6507cbef6274c08e3f2038698e SHA1 94f0de11e1acc9f07765174f0a01d7fd01da568a SHA256 b1052d8fdb6e9ee63d98a11186295013d6a0c4cdbe0f832c014dff6a3ecf6be0
 EBUILD bzr-2.2.2-r1.ebuild 4008 RMD160 6a66fb84971bd83d155255ba3102ae115e843f51 SHA1 8c6409561102e6db409e04f8fa772c59c7c80459 SHA256 3b06b5af051c8cf0c3a6c9aaa1589852b100e91c195798285d39d5a446ecd7ad
-EBUILD bzr-2.4.0.ebuild 4575 RMD160 5603c3b98a016b6f9b9cdab967f0c10239511b49 SHA1 518aa8310b763b7215053ecb9e30897933bd0ba8 SHA256 c160c6f55984912dc3550a0fc2540a89fc1649584bceec3ce4ecadd2da5f2260
-MISC ChangeLog 23487 RMD160 85e2dba75ec2bf5958eaa5336daf5eecbcb36930 SHA1 4f0e7bd7188a58e72fb9653f1b53d6b8150393c0 SHA256 35d00e2773da8ebdf0d3ee4eab3fc235916d7c21d25f9a737f007b2917298436
+EBUILD bzr-2.4.0.ebuild 4561 RMD160 5609878647dacae25f6ade03c88ff78f57683e15 SHA1 d487e32eb2fc3245a9d7fcc14893ff593d59397f SHA256 5b591262de192575512c1b353fc04fc3e6044c71ab1cf1c3b5a2de057e8ef9e0
+MISC ChangeLog 23633 RMD160 632e61b246aee00a3d8d012380dd5833acb2ff32 SHA1 25cbe25f6d31935c5bff55f559158610b95670f9 SHA256 44d7a374d6fed6532cae83eb955511792f062855f716519a4f5aa663c56f14fd
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5d/TMACgkQNQqtfCuFneP05wCfedRwNLOdCqkCkQFO76eXlBYi
-Fh4AoJ0L+9B8VgSXEjli6QAMvwHKV7Fi
-=8f9W
+iEYEARECAAYFAk5fQusACgkQNQqtfCuFneMb/QCff+EckQlDFA5AEtZBTXPUVBDg
+4OsAn0B2pgZ7J1nuYwB+lK0I/yOWliHW
+=yJrD
 -----END PGP SIGNATURE-----

diff --git a/dev-vcs/bzr/bzr-2.4.0.ebuild b/dev-vcs/bzr/bzr-2.4.0.ebuild
index 0fb5ecbab3b15226213c7a02e5484c5595a3b9d3..4d366f0f65ebd4e2fb52286ca4bc456bf2e8d304 100644 (file)
--- a/dev-vcs/bzr/bzr-2.4.0.ebuild
+++ b/dev-vcs/bzr/bzr-2.4.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.4.0.ebuild,v 1.3 2011/08/31 09:21:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.4.0.ebuild,v 1.4 2011/09/01 08:31:25 fauli Exp $
 
 EAPI="3"
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="2.[45] 3.*"
 
 inherit bash-completion distutils elisp-common eutils versionator
 
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="curl doc emacs +sftp test"
 
-RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-lang/python:2.5[xml] dev-python/celementtree )
+RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-python/celementtree )
        curl? ( dev-python/pycurl )
        sftp? ( dev-python/paramiko )"