summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2009-02-20 18:51:08 +0000
committerChristian Faulhammer <fauli@gentoo.org>2009-02-20 18:51:08 +0000
commit4cc168ae16290a864f1f0d849b611d0cdd182a64 (patch)
treeda2632847555cc07db179c55f8bae1c0ab7c0a36 /dev-util/bzr
parentAdd ~sparc (diff)
downloadgentoo-2-4cc168ae16290a864f1f0d849b611d0cdd182a64.tar.gz
gentoo-2-4cc168ae16290a864f1f0d849b611d0cdd182a64.tar.bz2
gentoo-2-4cc168ae16290a864f1f0d849b611d0cdd182a64.zip
make Python 2.5 first choice so people get that pulled in in every case
(Portage version: 2.1.6.7/cvs/Linux i686)
Diffstat (limited to 'dev-util/bzr')
-rw-r--r--dev-util/bzr/ChangeLog5
-rw-r--r--dev-util/bzr/bzr-1.12.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index a6409cede822..8c3d935a7ede 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/bzr
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.82 2009/02/14 16:30:35 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.83 2009/02/20 18:51:08 fauli Exp $
+
+ 20 Feb 2009; Christian Faulhammer <fauli@gentoo.org> bzr-1.12.ebuild:
+ make Python 2.5 first choice so people get that pulled in in every case
*bzr-1.12 (14 Feb 2009)
diff --git a/dev-util/bzr/bzr-1.12.ebuild b/dev-util/bzr/bzr-1.12.ebuild
index 595a97fabf49..a55e844b6fc2 100644
--- a/dev-util/bzr/bzr-1.12.ebuild
+++ b/dev-util/bzr/bzr-1.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-1.12.ebuild,v 1.1 2009/02/14 16:30:35 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-1.12.ebuild,v 1.2 2009/02/20 18:51:08 fauli Exp $
NEED_PYTHON=2.4
@@ -20,7 +20,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE="curl doc emacs sftp test"
-RDEPEND="|| ( dev-python/celementtree >=dev-lang/python-2.5 )
+RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree )
curl? ( dev-python/pycurl )
sftp? ( dev-python/paramiko )"