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
commit796606b4a81965a1b0bbb4ccae7cc41b9e87ef26 (patch)
tree112192f772c167adf62869e5e194bd78db6e2a0e /dev-util
parentAdd ~sparc (diff)
downloadhistorical-796606b4a81965a1b0bbb4ccae7cc41b9e87ef26.tar.gz
historical-796606b4a81965a1b0bbb4ccae7cc41b9e87ef26.tar.bz2
historical-796606b4a81965a1b0bbb4ccae7cc41b9e87ef26.zip
make Python 2.5 first choice so people get that pulled in in every case
Package-Manager: portage-2.1.6.7/cvs/Linux i686
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/bzr/ChangeLog5
-rw-r--r--dev-util/bzr/Manifest10
-rw-r--r--dev-util/bzr/bzr-1.12.ebuild4
3 files changed, 11 insertions, 8 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/Manifest b/dev-util/bzr/Manifest
index ab400e3f44f3..0111348b441b 100644
--- a/dev-util/bzr/Manifest
+++ b/dev-util/bzr/Manifest
@@ -12,14 +12,14 @@ DIST bzr-1.12.tar.gz 4001912 RMD160 20f02d036c03a279d9808bb84ab375039cf4cf2a SHA
DIST bzr-1.9.tar.gz 3859551 RMD160 490abe4bb0285cf6078461ff9541204e4d6497ca SHA1 963f38dc6cf2657d25588e2311de8e28476eedae SHA256 34cca13aa64cd309a6f8ac47da3e533536206762cb7a4c16cbd2a531d0be20e5
EBUILD bzr-1.10.ebuild 3020 RMD160 75591210dd5295a1c671c44fca76ab91a360d605 SHA1 b2bfc8ea9e671ab3ec4362c58e3a4868c7e31157 SHA256 27f66f37df49fdfec7206043040d653e2f4238da46b7cdd43b52770e99ebb3ce
EBUILD bzr-1.11.ebuild 3409 RMD160 d5c42353491bb9d87383780bea595eb75a31fa00 SHA1 c1bd1c12afd594e8b6d06e62765c6376daf96c32 SHA256 dc9a13a7210d006202f9c856d17b4b6bee16fd1b3df33ee54442a92c49b620b7
-EBUILD bzr-1.12.ebuild 3411 RMD160 817b8b5ad397d56e88736b95946e89d2deb5f150 SHA1 1dca74f5dc4b82eb0edff8a4374f289d2f84dc35 SHA256 c577142a95b3e2fad28f70c899f0ff10d9e00e1d1e841c0f80a105a4387dba9d
+EBUILD bzr-1.12.ebuild 3411 RMD160 5659d5104f4df19ef19a1865508039e20b9ddd40 SHA1 bf494a8cb692c7d6c136a79e91f07c583509a5e4 SHA256 7cb74cdd1f4bc2a248ca93f1207d91d1e3ff511a942710cf0b91a42385394b7f
EBUILD bzr-1.9.ebuild 3001 RMD160 a21fe898994b2a41c7840114b284437974ff453d SHA1 1f3361e811bcb9a2368229ebc49770fbc7e29f27 SHA256 48927b7f15352bdc512a5aa78f02efee9f96d052a5965d54d913dffac6cfb061
-MISC ChangeLog 12671 RMD160 204bf4a74aac7ddb70f4aaa5619dccdf1b48de05 SHA1 a607fa9f8f78d21f1e645e9993cfdabd8b4521ad SHA256 c2f84496ada3e5d55cb260cec06a2809b2329812d908a6da6c4e1b3af3f9e2bd
+MISC ChangeLog 12818 RMD160 d9b9a234d413ab49b22beb697a7436ff73b9d2a7 SHA1 48e4ccc6fe7b65b67830046b3b7277e4c335c153 SHA256 8bca1929bfadf9619e2a24594966f5a799f7db3f206c3b4c92557f557892fac7
MISC metadata.xml 961 RMD160 8720e292b2741eb7c4027931f34bfae6c491c6d2 SHA1 2590b547b33035ab3f85c39e1b0a2e28488c0f3a SHA256 019ca84da46284ea147547b43cd4d5732d700e6d0a26fd0198d59b1c975497dc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkmW8cYACgkQNQqtfCuFneNV/QCdH7hNcBBdbGXvwuCa5IVqC6SB
-4EwAn3/5Y3T9J+CRUmIDpOsHr9sHDXnZ
-=RmWl
+iEYEARECAAYFAkme+74ACgkQNQqtfCuFneO3FQCdE5LskYb/KE95U078xPAs2Pb/
+tBcAn3InPSrBvcmbhwBYv9rvADOdReB7
+=Sjso
-----END PGP SIGNATURE-----
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 )"