diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-12-04 19:06:17 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-12-04 19:06:17 +0000 |
| commit | fc86630f58fb457b185130d5c7ed00bf6618a55a (patch) | |
| tree | f790aff3eccd1dbd8255ba71783a3a0795de0803 /dev-python | |
| parent | Fixed parallel building, no more forced stripping, added a missing header for... (diff) | |
| download | historical-fc86630f58fb457b185130d5c7ed00bf6618a55a.tar.gz historical-fc86630f58fb457b185130d5c7ed00bf6618a55a.tar.bz2 historical-fc86630f58fb457b185130d5c7ed00bf6618a55a.zip | |
Update patch (bug #287439).
Package-Manager: portage-14926-svn/cvs/Linux x86_64
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/setuptools/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/setuptools/Manifest | 4 | ||||
| -rw-r--r-- | dev-python/setuptools/files/distribute-0.6.8-C_locale_tests.patch | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog index 1bdc85d548ec..08e4760a2e5f 100644 --- a/dev-python/setuptools/ChangeLog +++ b/dev-python/setuptools/ChangeLog @@ -1,6 +1,10 @@ # 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.89 2009/11/18 17:05:19 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.90 2009/12/04 19:06:17 arfrever Exp $ + + 04 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + files/distribute-0.6.8-C_locale_tests.patch: + Update patch (bug #287439). 18 Nov 2009; Raúl Porcel <armin76@gentoo.org> setuptools-0.6.6.ebuild: ia64/s390/sh/sparc stable wrt #291915 diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 59f553066800..130d2c341f14 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1,6 +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 distribute-0.6.8-C_locale_tests.patch 550 RMD160 a0f46df17ceb637896def7373458c30d4021e5a8 SHA1 0647f180eb0f3b19aa31d11774a8b3f69d1c8a8f SHA256 9bad9237138015e0fe921a6b594f2fdd21559b096defa5afc5923a081fc18bb2 AUX distribute-0.6.8-fix_tests.patch 1786 RMD160 f8028e7566b9a2327d6f2052a9c72b3e24b3c25d SHA1 31da15b7fffb8240fc13a1b9c190208c6219c6cb SHA256 e5d771755a457124b24f205648a9caeea248fa92e6ff736efa75bbb36fe3a33c 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 @@ -15,5 +15,5 @@ EBUILD setuptools-0.6.4.ebuild 1600 RMD160 9472d453d0e66d0396201c97fa3d992bc8a70 EBUILD setuptools-0.6.6.ebuild 1831 RMD160 1b031248925c7368c8352241e7b8d9d566938289 SHA1 787e443320322cb38243fe074b676d1886f9b55d SHA256 72e167f4b58ae8c5f560f925f04099c160ff7e85932259d073b5145a73a6ec6e EBUILD setuptools-0.6.8.ebuild 1966 RMD160 d914778c34daf76a2d31d0ac6eae29acfe35c61c SHA1 3cab2582558cf4bc6f8b8fbdb996e52496d726ff SHA256 3cb525bddd51d892bd2a9dba4827dcadc48717d19331a321209458c72415ff25 EBUILD setuptools-0.6_rc9-r1.ebuild 1215 RMD160 1fc0ec07a0f911790b9d4ebd2a70107328ee9b22 SHA1 0a4c7de7e3747322be1bdeb7e698863e44f44e3f SHA256 740faf17e85536e171cdfc9a680f9acd2d6cb48e219ab81a050e6c00a811937f -MISC ChangeLog 13415 RMD160 3d0124d0ad6396bafa69f757ce0d59b1df92df5e SHA1 897a5acd98d32451649ec7d0226da0acdca9cb45 SHA256 92e1333d99f7dfdeba847c6884cd6f180cdeb7cd561060ad9ad435132d9c3ca7 +MISC ChangeLog 13567 RMD160 2be744bd808a290a6998881ba9a8d32369778be8 SHA1 e84f1afaa1ca9b9e2b3ed601911af0233680013a SHA256 f1629460aa898d716196af88f293a33ca87038b1c8dfc480c147402eb0e508c7 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 index 2580e355486d..14ed38adc3ab 100644 --- 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 @@ -1,10 +1,13 @@ +https://bitbucket.org/tarek/distribute/issue/103/ + --- setuptools/tests/test_resources.py +++ setuptools/tests/test_resources.py -@@ -536,6 +536,8 @@ +@@ -536,6 +536,9 @@ '#!%s -x\n' % self.non_ascii_exe) def test_get_script_header_jython_workaround(self): -+ if os.environ.get("LC_ALL") == "C": ++ # This test doesn't work with Python 3 in some locales ++ if sys.version_info >= (3,) and os.environ.get("LC_CTYPE") in (None, "C", "POSIX"): + return platform = sys.platform sys.platform = 'java1.5.0_13' |