version bump and clean up

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

4 files changed, 53 insertions, 18 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index 4d2fee3ff13d..ee1c9fcd936b 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2011/07/17 11:27:09 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.30 2011/08/16 15:24:55 fauli Exp $
+
+*bzr-2.4.0 (16 Aug 2011)
+
+  16 Aug 2011; Christian Faulhammer <fauli@gentoo.org> -bzr-2.3.3.ebuild,
+  +bzr-2.4.0.ebuild, +files/bzr-2.4.0-no-pyrex-citon.patch:
+  version bump and clean up
 
 *bzr-2.3.4 (17 Jul 2011)
 
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index bf1f93d2a210..bee04b376f24 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -6,20 +6,21 @@ AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d
 AUX bzr-0.90-tests-sgid.patch 607 RMD160 d40336d5c98fb777bdc1366b42ae4fb00e9d56f1 SHA1 5608d6a2e2215453523441ff9890e11aebbc289e SHA256 8bff8a500f96bbade348a11fdc70d00f9166774b8cc0a08c8d8dd3e33326bbcc
 AUX bzr-2.2.0-no-pyrex-citon.patch 1191 RMD160 5096704ac9547fe44e40b954d780141186de70d2 SHA1 1eb07ce2b3847c3a792c603241d209da3b1fffe2 SHA256 e24852b7ef0f698d3c870b71ba615a9452c8a62c6a5e0ac7328e074d4d4adef2
 AUX bzr-2.2.2-python-2.7.patch 1442 RMD160 b3abc70fe110c395f0fe9ea048dd2a3601709254 SHA1 d1ca99405c5d55c62355f947ff9a897985d4f55c SHA256 0595c35539d1845ed21466aeab3115cecb07ee3e424d39ad2683267adc67d24f
+AUX bzr-2.4.0-no-pyrex-citon.patch 1191 RMD160 4890e3d07ddff670f7a6dd3bcea01ef0aab960bb SHA1 17da49727f57d5d234bdafd1fa4b8916eb173f3e SHA256 aee30b05c68ee692825f49b30db8841b93a2ef844c1dd97159cd8d0a8f77fc09
 DIST bzr-2.2.2.tar.gz 6897175 RMD160 888e0f59c88e0fde26adf697a9422ed732cc3329 SHA1 9db8f061d94ba3f0b48dcd623c473c6e8b570b6a SHA256 734ee0c3a64e7b820d6632ae0e2a4bf91add908fdebe5c82865618c38175c8e3
 DIST bzr-2.2.4.tar.gz 6900607 RMD160 57b5daa0ac94d727dee003a66fabea251d49324a SHA1 f63b93bde9372acd792e23c598789ea4c8c35577 SHA256 3ba84414cce4435dd34f4f1d7c94691587e6aa0b6677c361af17d74fb90a657e
-DIST bzr-2.3.3.tar.gz 7034416 RMD160 e13b1a8a541484fdaf7ee90550c2dca13daa6009 SHA1 4c1a0a75243a9c3717e7e7147770636c577826fc SHA256 2de6b6c2b799701f70796c8467f37d26b48993d303b528a5bb6b79b9237025a4
 DIST bzr-2.3.4.tar.gz 7036541 RMD160 f9aca792a406d647c5252d8b4e3ca690df9942aa SHA1 fd4d28abe41835c2c327b21972edb4533fee0ae0 SHA256 336f8cdcaf5539af2600c0412a036cb70578cc641c076bd97bc2d85d44502094
+DIST bzr-2.4.0.tar.gz 7522083 RMD160 68508cf0188fba6507cbef6274c08e3f2038698e SHA1 94f0de11e1acc9f07765174f0a01d7fd01da568a SHA256 b1052d8fdb6e9ee63d98a11186295013d6a0c4cdbe0f832c014dff6a3ecf6be0
 EBUILD bzr-2.2.2-r1.ebuild 4011 RMD160 ac8c527599dd46d6e674ee53a492820d48859472 SHA1 20c133f5bc8adf9252dce4dcce44c899224bad34 SHA256 c2c849efa1229c2cdb0e5f0468a6bec3321a6038ce37782bb87810538316859f
 EBUILD bzr-2.2.4.ebuild 4016 RMD160 c5d119899ad47638ee425444da220406665455e4 SHA1 e087b5131910fe8d849487c1c13cd97cf86ba214 SHA256 e1647eb38d0c03c3f0bd6185b1f63516bb230abbc66cb4bcc3b0c6ec43eb75a1
-EBUILD bzr-2.3.3.ebuild 3709 RMD160 b88b7f0a743e59e153362dfaf7720f3f77724864 SHA1 0743d9040eb05c815cafb3f02877ed6c1a9152d5 SHA256 0e4596da93ba3d13b2f12f0934b59f9c4cfbecf6a49293110b5f24281058023c
 EBUILD bzr-2.3.4.ebuild 3709 RMD160 cb1bce9eca49eb5eb8e5d7483cbe16af0ad9cfb4 SHA1 6f8ae0c0d7309aa4389765c551145b44e9e81467 SHA256 5a0e67d1a0aa5d5a0b408349131747b7a3a2567e4eba060f08dcbdaa536d0e0d
-MISC ChangeLog 22651 RMD160 e8a07c384f84e45623b38f369ac108ff18a60266 SHA1 0ce0b31e9b949f4fcfed23b1403ac6aae22e80e2 SHA256 30a85b335b6a505a43d9421669d45c7e97b0424dc4349f39818d54a0041dd478
+EBUILD bzr-2.4.0.ebuild 4661 RMD160 bfa49e86d2e3e973bf7b9930c1efbfa46092c9af SHA1 d868c7671193eab261f59ebb664e718489fa7aee SHA256 c4736f87728525d779f54109e077b2aa04e35b60f8df6fb88f3de486fcab5bae
+MISC ChangeLog 22840 RMD160 5d076d3b721e0e2ea3aef1466b40298660409061 SHA1 64d4f77cf054ef93c908931c138b89fd0644abb0 SHA256 dc03c718c38ce7d5c7f3521344219d5e921684a1fe64c0e69768bd4f156d7808
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4ixx0ACgkQNQqtfCuFneO12gCcDXebJ5WSFNOTAhS0b+tfC5QT
-J+gAnjvFWYPGf+6ab7WpcvIefBJ2V4K5
-=Pgjn
+iEYEARECAAYFAk5Ki+MACgkQNQqtfCuFneM3HQCgl7P322Y+dC6RuENYKmig4ipj
+CuQAn08KffltbpQSw/WLgRFGWPOslF4O
+=gAvq
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.3.3.ebuild b/dev-vcs/bzr/bzr-2.4.0.ebuild
index 0df499c10272..79d0d9e81b45 100644
--- a/dev-vcs/bzr/bzr-2.3.3.ebuild
+++ b/dev-vcs/bzr/bzr-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3.3.ebuild,v 1.1 2011/05/29 10:03:00 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.4.0.ebuild,v 1.1 2011/08/16 15:24:55 fauli Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -22,9 +22,6 @@ 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"
 
-# Disable until https://bugs.launchpad.net/bzr/+bug/656170 is fixed.
-RESTRICT="test"
-
 RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-lang/python:2.5[xml] dev-python/celementtree )
 	curl? ( dev-python/pycurl )
 	sftp? ( dev-python/paramiko )"
@@ -49,10 +46,7 @@ src_prepare() {
 	distutils_src_prepare
 
 	# Don't regenerate .c files from .pyx when pyrex is found.
-	epatch "${FILESDIR}/${PN}-2.2.0-no-pyrex-citon.patch"
-	# Don't run lock permission tests when running as root
-	# Has to be backported, tests are restricted anyway
-#	epatch "${FILESDIR}/${PN}-0.90-tests-fix_root.patch"
+	epatch "${FILESDIR}/${PN}-2.4.0-no-pyrex-citon.patch"
 	# Fix permission errors when run under directories with setgid set.
 	epatch "${FILESDIR}/${PN}-0.90-tests-sgid.patch"
 }
@@ -71,10 +65,11 @@ src_test() {
 
 	# Define tests which are known to fail below.
 	local skip_tests="("
-	# https://bugs.launchpad.net/bzr/+bug/456471
-	skip_tests+="bzrlib.tests.blackbox.test_version.*|"
 	# https://bugs.launchpad.net/bzr/+bug/392127
-	skip_tests+="test_http.*"
+#	skip_tests+="test_http.*|"
+	# libcurl cannot verify SSL certs
+	# https://bugs.launchpad.net/bzr/+bug/82086
+	skip_tests+="per_transport.TransportTests.test_clone|per_transport.TransportTests.test_connection_sharing|per_transport.TransportTests.test_copy_to|per_transport.TransportTests.test_get|per_transport.TransportTests.test_get_bytes|per_transport.TransportTests.test_get_bytes_unknown_file|per_transport.TransportTests.test_get_directory_read_gives_ReadError|per_transport.TransportTests.test_get_unknown_file|per_transport.TransportTests.test_has|per_transport.TransportTests.test_has_root_works|per_transport.TransportTests.test_readv|per_transport.TransportTests.test_readv_out_of_order|per_transport.TransportTests.test_readv_short_read|per_transport.TransportTests.test_readv_with_adjust_for_latency|per_transport.TransportTests.test_readv_with_adjust_for_latency_with_big_file|per_transport.TransportTests.test_reuse_connection_for_various_paths|test_read_bundle.TestReadMergeableBundleFromURL.test_read_mergeable_respects_possible_transports|test_read_bundle.TestReadMergeableBundleFromURL.test_read_mergeable_from_url|test_read_bundle.TestReadMergeableBundleFromURL.test_read_fail|test_http.TestActivity.test_readv|test_http.TestActivity.test_post|test_http.TestActivity.test_has|test_http.TestActivity.test_get"
 	skip_tests+=")"
 	if [[ -n ${skip_tests} ]]; then
 		einfo "Skipping tests known to fail: ${skip_tests}"
diff --git a/dev-vcs/bzr/files/bzr-2.4.0-no-pyrex-citon.patch b/dev-vcs/bzr/files/bzr-2.4.0-no-pyrex-citon.patch
new file mode 100644
index 000000000000..da5b3c881076
--- /dev/null
+++ b/dev-vcs/bzr/files/bzr-2.4.0-no-pyrex-citon.patch
@@ -0,0 +1,33 @@
+--- setup.py.orig	2011-08-16 17:18:11.280853205 +0200
++++ setup.py	2011-08-16 17:20:12.597637778 +0200
+@@ -178,28 +178,8 @@
+ from distutils.errors import CCompilerError, DistutilsPlatformError
+ from distutils.extension import Extension
+ ext_modules = []
+-try:
+-    try:
+-        from Cython.Distutils import build_ext
+-        from Cython.Compiler.Version import version as pyrex_version
+-    except ImportError:
+-        print("No Cython, trying Pyrex...")
+-        from Pyrex.Distutils import build_ext
+-        from Pyrex.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
+-    pyrex_version_info = tuple(map(int, pyrex_version.split('.')))
+-
++have_pyrex = False
++from distutils.command.build_ext import build_ext
+ 
+ class build_ext_if_possible(build_ext):
+