summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2011-09-01 08:31:25 +0000
committerChristian Faulhammer <fauli@gentoo.org>2011-09-01 08:31:25 +0000
commit11584a406102c99a034ddff077b41ae995952049 (patch)
tree3197397de582159ec37ce54a9c9038ba07537eea /dev-vcs/bzr
parentVersion bump to latest. Drop older. (diff)
downloadgentoo-2-11584a406102c99a034ddff077b41ae995952049.tar.gz
gentoo-2-11584a406102c99a034ddff077b41ae995952049.tar.bz2
gentoo-2-11584a406102c99a034ddff077b41ae995952049.zip
Change Python dependency as pointed out by Mike Gilbert in bug 381381
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'dev-vcs/bzr')
-rw-r--r--dev-vcs/bzr/ChangeLog5
-rw-r--r--dev-vcs/bzr/bzr-2.4.0.ebuild8
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index cf1a0ab664b0..b9498ab86bf9 100644
--- 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/bzr-2.4.0.ebuild b/dev-vcs/bzr/bzr-2.4.0.ebuild
index 0fb5ecbab3b1..4d366f0f65eb 100644
--- 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 )"