Skip test failing with C locale (bug #287439).

Package-Manager: portage-14804-svn/cvs/Linux x86_64

5 files changed, 36 insertions, 9 deletions

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index 874ce18ac996..d3bc569d4ef9 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/setuptools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.82 2009/11/08 16:41:39 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.83 2009/11/08 16:54:19 arfrever Exp $
+
+  08 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  setuptools-0.6.6.ebuild, setuptools-0.6.8.ebuild,
+  +files/distribute-0.6.8-C_locale_tests.patch:
+  Skip test failing with C locale (bug #287439).
 
   08 Nov 2009; Tobias Klausmann <klausman@gentoo.org>
   setuptools-0.6.6.ebuild:
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 0bb6111a7bd2..62f9948d3854 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,5 +1,6 @@
 AUX distribute-0.6-provide_setuptools.patch 1738 RMD160 aac0fd198e7607d8c5ec2c4e6cea82d44b6e6fe6 SHA1 d9c575419313561d1ef6636e349b9241de7e40f3 SHA256 2b7f5a271a71e09a2504a1adf1ad3ad64cdde7ec637101c16ca7a7f353a26a35
 AUX distribute-0.6-sandbox.patch 3141 RMD160 44ecc05e769fb87fcc6f297d1bade6abaa8de0ee SHA1 0188eae1184058d3687a2ce24a40046afe133caa SHA256 63b2e8cd06af0251a37341b43a652ecc0361470a00cd26f63310d2ca146dfa27
+AUX distribute-0.6.8-C_locale_tests.patch 387 RMD160 dfee9d9762202d2eb8e87251e0ff4c4ebb093199 SHA1 89873af0e3f450415d38aa4585a30d329a451988 SHA256 9bea15ccacce210eebfc6e6253ef6f25987531e537aa7b5d8e553dc31c1487e0
 AUX setuptools-0.6_rc7-noexe.patch 351 RMD160 6c978d3494b1025e8730796a923dd69f5872a823 SHA1 0f63e1a885f37aca375023ca845de3d7044e7c9d SHA256 772731de7539b71d45da2ac77062965c1ea36294781d4113a2845868b98d8b83
 DIST distribute-0.6.3.tar.gz 412848 RMD160 100b4b9a54589608ae2c5f71f9172088a99b8223 SHA1 f259822547f09726d7c96258a6b3bb6ae9bcb75a SHA256 cc560ae693fe9acb5a525ebe2b5ec0dcf0b05808e999d464dc9bca30d175a466
 DIST distribute-0.6.4.tar.gz 519338 RMD160 6cc5e12e7d1bb268f38b22f688a80e2c3e66c658 SHA1 a2f64bd8552a2c47fb0aefea0fa0e29d992f9fa0 SHA256 27bb04614e07d819f703e9d8310e6438160efbab4c30efc6dc257e65f06ac079
@@ -10,8 +11,8 @@ DIST setuptools-0.6c9.tar.gz 252744 RMD160 bc0ee3821e76b57fd13425b16c4419dbccf95
 EBUILD setuptools-0.6-r1.ebuild 1320 RMD160 d0ceff1a673f022b3cc1e9193faed042579e17f3 SHA1 51c807e08026987a6a2237e00e8f42fdafa3719d SHA256 c47596359c81e2b7f66870566266271b07569d3d6c05f48ab3efe0ac391f1705
 EBUILD setuptools-0.6.3-r3.ebuild 1505 RMD160 5ea5cf10cb36bb941d8fe790351d5e9122f9322a SHA1 2ee60bd5d9902e29f720b65da84e1a164f52f7e3 SHA256 75eae341e01bb3f046d291802639f21727a05019bd400e795fd280e29108fcd6
 EBUILD setuptools-0.6.4.ebuild 1499 RMD160 49d205dfef9c8c00827830fbbf87f777e4d86b28 SHA1 c32a37edbd1a76a5c31b3e102ae1ce67ea284a29 SHA256 5651c9a4619b1773bbf4e4a13831cb31711452968179d27674f05905a3f2dc45
-EBUILD setuptools-0.6.6.ebuild 1680 RMD160 6bf71416e70de82c28ac6a159d6d0fb51aac6646 SHA1 1a5cc3d6502f0c3ed7f881b09b6ed291c356ace5 SHA256 a43cadb20e67953edc189f5f59d557f43f1652848269f3d8ad8b1fde3dfa36ab
-EBUILD setuptools-0.6.8.ebuild 1713 RMD160 acf830e6218d9b0fc178e7d6c5322f674d27b335 SHA1 a587215ea107130cf4c262c78dcc91c612790368 SHA256 4f505795ddc459cc973cebd0179e47482fb98bd449d909d2b42acf4887599d10
+EBUILD setuptools-0.6.6.ebuild 1780 RMD160 99b2e388c47752a0f86bbfd5e6c1d68d0be5c724 SHA1 98cdf0f0fb148202498129eaeb84fe904e2a2b27 SHA256 e11173fac4df0f7708e1957ef3dd31854b4501c55d25646a0755d11566e0bf53
+EBUILD setuptools-0.6.8.ebuild 1807 RMD160 661af4df88f12fb8307800550038628df12bf53e SHA1 d6e329fd23f6075d2ef1cb8933927d64a01d94bc SHA256 324e50485604dbd47033646b1108a3750f754c955a1d222934809173ade3947d
 EBUILD setuptools-0.6_rc9-r1.ebuild 1131 RMD160 08fc600e6701de7357fc1e86dd6fd104ac971d16 SHA1 23bb7017a713eb944861770f4a27e85c097f81e4 SHA256 b417dbe2ad1eaa56aec3361e95b86ae9f5d6255acb02037663617eb5d125c5cb
-MISC ChangeLog 12333 RMD160 e3ae4d4bc1f16eb71b1cfc5f0e9d65343bdaa293 SHA1 1cae3652c19db3724a5a30f82db962331d23de51 SHA256 e3d6a9fa4858542bf5c12399c730c39e91320815223439429519e32ccb7f8d46
+MISC ChangeLog 12556 RMD160 b01846fe4bcc60de84c98b7e1be92c172486b247 SHA1 3a72e330a0be691365216e49fddc46575991a8cb SHA256 f21035737b6a310bb007c07b9a77f27e049ad7e85719cc759aa6825913dc3481
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/setuptools/files/distribute-0.6.8-C_locale_tests.patch b/dev-python/setuptools/files/distribute-0.6.8-C_locale_tests.patch
new file mode 100644
index 000000000000..2580e355486d
--- /dev/null
+++ b/dev-python/setuptools/files/distribute-0.6.8-C_locale_tests.patch
@@ -0,0 +1,11 @@
+--- setuptools/tests/test_resources.py
++++ setuptools/tests/test_resources.py
+@@ -536,6 +536,8 @@
+                              '#!%s -x\n' % self.non_ascii_exe)
+ 
+     def test_get_script_header_jython_workaround(self):
++        if os.environ.get("LC_ALL") == "C":
++            return
+         platform = sys.platform
+         sys.platform = 'java1.5.0_13'
+         stdout = sys.stdout
diff --git a/dev-python/setuptools/setuptools-0.6.6.ebuild b/dev-python/setuptools/setuptools-0.6.6.ebuild
index 72c7da7d9d2a..5d6e34f642e0 100644
--- a/dev-python/setuptools/setuptools-0.6.6.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.6.ebuild
@@ -1,15 +1,18 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.6.ebuild,v 1.5 2009/11/08 16:41:39 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.6.ebuild,v 1.6 2009/11/08 16:54:19 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils eutils
 
-DESCRIPTION="A collection of enhancements to the Python distutils including easy install"
+MY_PN="distribute"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Distribute (fork of Setuptools) is a collection of extensions to Distutils"
 HOMEPAGE="http://pypi.python.org/pypi/distribute"
-SRC_URI="http://pypi.python.org/packages/source/d/distribute/distribute-${PV}.tar.gz"
+SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2.2"
 SLOT="0"
@@ -28,6 +31,8 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-0.6_rc7-noexe.patch"
 
+	epatch "${FILESDIR}/${MY_PN}-0.6.8-C_locale_tests.patch"
+
 	# Remove tests that access the network (bugs #198312, #191117)
 	rm setuptools/tests/test_packageindex.py
 
diff --git a/dev-python/setuptools/setuptools-0.6.8.ebuild b/dev-python/setuptools/setuptools-0.6.8.ebuild
index 0757285a26f2..04d3307fe884 100644
--- a/dev-python/setuptools/setuptools-0.6.8.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.8.ebuild
@@ -1,15 +1,18 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.8.ebuild,v 1.3 2009/11/06 17:47:32 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.8.ebuild,v 1.4 2009/11/08 16:54:19 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils eutils
 
+MY_PN="distribute"
+MY_P="${MY_PN}-${PV}"
+
 DESCRIPTION="Distribute (fork of Setuptools) is a collection of extensions to Distutils"
 HOMEPAGE="http://pypi.python.org/pypi/distribute"
-SRC_URI="http://pypi.python.org/packages/source/d/distribute/distribute-${PV}.tar.gz"
+SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2.2"
 SLOT="0"
@@ -28,6 +31,8 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-0.6_rc7-noexe.patch"
 
+	epatch "${FILESDIR}/${MY_P}-C_locale_tests.patch"
+
 	# Remove tests that access the network (bugs #198312, #191117)
 	rm setuptools/tests/test_packageindex.py