Version bump, bug #300350, thank Jeroen Roovers for report. Added missed patch, bug #297268, thank Christian Faulhammer for report.

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

4 files changed, 49 insertions, 7 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index ccbfe6cdb17b..82a42eb2b67e 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/bzr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.120 2010/01/10 00:46:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.121 2010/01/10 11:26:26 pva Exp $
+
+*bzr-2.1.0_beta4 (10 Jan 2010)
+
+  10 Jan 2010; Peter Volkov <pva@gentoo.org> -bzr-2.1.0_beta1.ebuild,
+  +bzr-2.1.0_beta4.ebuild, +files/bzr-2.1-no-pyrex-citon.patch:
+  Version bump, bug #300350, thank Jeroen Roovers for report. Added missed
+  patch, bug #297268, thank Christian Faulhammer for report.
 
   10 Jan 2010; Jeroen Roovers <jer@gentoo.org> bzr-2.0.1.ebuild:
   Stable for HPPA too.
diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest
index 790961f5ac2b..15a97434fc62 100644
--- a/dev-util/bzr/Manifest
+++ b/dev-util/bzr/Manifest
@@ -2,11 +2,12 @@ AUX 71bzr-gentoo.el 124 RMD160 530e4492147cd92d1df4d8a8c013e547e9627f20 SHA1 fe5
 AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d2ea566 SHA1 a41671354dcf7498039c421e81bc7d9fbbc7bb29 SHA256 b2275d04401bd4ba36c0a565f5e6b7c8471ca50acd48bbf5f5d1995b197809ec
 AUX bzr-0.90-tests-sgid.patch 607 RMD160 d40336d5c98fb777bdc1366b42ae4fb00e9d56f1 SHA1 5608d6a2e2215453523441ff9890e11aebbc289e SHA256 8bff8a500f96bbade348a11fdc70d00f9166774b8cc0a08c8d8dd3e33326bbcc
 AUX bzr-1.8-no-pyrex.patch 918 RMD160 36de25bb174bc66b512bd6b25a6cfd8a2cbb1ca3 SHA1 a118057a6f34b9ff2ddc90f01945820d87a983f3 SHA256 f213cd8a2f0444dd130a13e65ede34cade2da33b2ad739c8f4fd48e912ed7ebb
+AUX bzr-2.1-no-pyrex-citon.patch 1123 RMD160 54a57f24f76e555cb77a39c86d6702b3a2ee86ee SHA1 d769bb2f561234e4cf6106b470567537de48daed SHA256 8304a5078ebcfbcdbafdf0e84119b46a289940b6748bff61b158a35d03211157
 DIST bzr-2.0.1.tar.gz 6101477 RMD160 a48492a27942f1001c1270fc8bb974135328c4b5 SHA1 e19c05e052290746de54f65254e056e39ba5e018 SHA256 3438bd7b5d07486d85a63cf47a26f3532ef7fb4019770ca48faddfa9875e06c9
 DIST bzr-2.0.3.tar.gz 6616470 RMD160 3b33e5148ff47e66b0315e964d2b8e565d056675 SHA1 178fe6546d32a1752a9e9abca57db128463bb1e6 SHA256 757969b8bf97c049297bd041b783c197bb3983b05629a4fb07cf75c2def7780b
-DIST bzr-2.1.0b1.tar.gz 6134154 RMD160 b598113951ea3fb308ffaee8df1520bbb5638de9 SHA1 e0f3fa897149a046426da5aa6fbefcf8408320e1 SHA256 4d0db630a4d230e50b4c4c573ba34bd90ff8753e510c47c123155d83a34bfe20
+DIST bzr-2.1.0b4.tar.gz 6733196 RMD160 7a83800cd57278aac7c1dbd82a7f2b6e9e07e7cc SHA1 56b65d0e78f5ed692d17358514041e66809ec7cc SHA256 ba91bd6ada8e5dcc26ff5fccdd89dab4d4eebefe69824f759ce59c58cccc4118
 EBUILD bzr-2.0.1.ebuild 3519 RMD160 70c7ed5ffc82786f50f80712071ec07198d85417 SHA1 d714c0b3e62e03b66ed16b863e33559512f0c326 SHA256 c280494f2d182737464d1a363116715c6d6c9d1db403eaef1721f23b8831406e
 EBUILD bzr-2.0.3.ebuild 3526 RMD160 efaefcf3e69781dd82e6ca42cc98430faf08ad67 SHA1 bfd738f5d3b2be97b87e62aca63b30e0aa3cff52 SHA256 6ef346a563d6a3ae8e76019395e6127c2a843d7f0bdcd0b2d1572e9fcf0a3f55
-EBUILD bzr-2.1.0_beta1.ebuild 3518 RMD160 db7a5e5e5ab2a391642dab46da3773f6a8e811b5 SHA1 8d07154bfa79e0aeba5b09126334a67fce192c62 SHA256 7087f4d90cc993423de85b7272e7cad4d182000afbc7ed4d4fd4cb3d18476449
-MISC ChangeLog 17529 RMD160 8c69601f0e857bfa1f6a1d43b4e24ee311933ac4 SHA1 ef274817b5c4f1c8c1d343624c2bc2158546a3c8 SHA256 109cc208be78b5b69cdd1b1b08ba47f2768893be223a4aaacc84b58edaa96d29
+EBUILD bzr-2.1.0_beta4.ebuild 3509 RMD160 c2a901f6e1cd9e92781a4e4a394b2e5b2786f2d5 SHA1 0393c596dd88f77150637fff57e636f12abb3a49 SHA256 5fc1183aa7552e6f511cab3e269447e33bb8f3ce26e915c0ce297bff262a7fcd
+MISC ChangeLog 17832 RMD160 d75ca00b2c666bd3cfb0c0a6f6aa5f4919628bd6 SHA1 d09f122410e954f04b394c2bdb77b0b1617a29b7 SHA256 c4cdef12c073ad51f4ea1bda5a087cbe7064eca3a8e835f340fd0f277ee99748
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
diff --git a/dev-util/bzr/bzr-2.1.0_beta1.ebuild b/dev-util/bzr/bzr-2.1.0_beta4.ebuild
index 19f49106a898..47db3b88f8b1 100644
--- a/dev-util/bzr/bzr-2.1.0_beta1.ebuild
+++ b/dev-util/bzr/bzr-2.1.0_beta4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.1.0_beta1.ebuild,v 1.2 2009/12/27 14:42:55 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.1.0_beta4.ebuild,v 1.1 2010/01/10 11:26:26 pva Exp $
 
 EAPI=1
 
@@ -20,7 +20,7 @@ SRC_URI="http://launchpad.net/bzr/${SERIES}/${MY_PV}/+download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="curl doc emacs +sftp test"
 
 RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree )
diff --git a/dev-util/bzr/files/bzr-2.1-no-pyrex-citon.patch b/dev-util/bzr/files/bzr-2.1-no-pyrex-citon.patch
new file mode 100644
index 000000000000..3d394b84a4ea
--- /dev/null
+++ b/dev-util/bzr/files/bzr-2.1-no-pyrex-citon.patch
@@ -0,0 +1,34 @@
+=== modified file 'setup.py'
+--- setup.py	2009-10-20 14:04:31 +0000
++++ setup.py	2009-10-20 14:05:01 +0000
+@@ -166,26 +166,9 @@
+ from distutils.errors import CCompilerError, DistutilsPlatformError
+ from distutils.extension import Extension
+ ext_modules = []
+-try:
+-    try:
+-        from Pyrex.Distutils import build_ext
+-        from Pyrex.Compiler.Version import version as pyrex_version
+-    except ImportError:
+-        print "No Pyrex, trying Cython..."
+-        from Cython.Distutils import build_ext
+-        from Cython.Compiler.Version import version as pyrex_version
+-except ImportError:
+-    have_pyrex = False
+-    # try to build the extension from the prior generated source.
+-    print
+-    print ("The python package 'Pyrex' is not available."
+-           " If the .c files are available,")
+-    print ("they will be built,"
+-           " but modifying the .pyx files will not rebuild them.")
+-    print
+-    from distutils.command.build_ext import build_ext
+-else:
+-    have_pyrex = True
++
++have_pyrex = False
++from distutils.command.build_ext import build_ext
+ 
+ 
+ class build_ext_if_possible(build_ext):
+