From 3659dc57a02badbd4a0e34a98d3c2c697e604e6e Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Tue, 4 Aug 2009 05:46:03 +0000 Subject: Fix building with sys-libs/db headers containing non-UTF-8 characters (bug #280001). Package-Manager: portage-13887-svn/cvs/Linux x86_64 --- dev-lang/python/ChangeLog | 7 ++++++- dev-lang/python/Manifest | 4 ++-- dev-lang/python/python-3.1.ebuild | 5 ++++- 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'dev-lang') diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index f02c11c10d95..f5f9eefbb2e5 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/python # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.400 2009/08/02 17:06:21 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.401 2009/08/04 05:46:03 arfrever Exp $ + + 04 Aug 2009; Arfrever Frehtes Taifersar Arahesis + python-3.1.ebuild: + Fix building with sys-libs/db headers containing non-UTF-8 characters (bug + #280001). 02 Aug 2009; Jeremy Olexa metadata.xml: Be more verbose about the 'threads' USE flag. diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 58d3ad625002..52375c9acc97 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -19,6 +19,6 @@ EBUILD python-2.4.6.ebuild 9940 RMD160 2659cc53772a494bfd89a1a3fc6fb05f35b3d17d EBUILD python-2.5.4-r2.ebuild 10691 RMD160 01893e25086cbbcbac9d5aecf2fab2d887a42b2b SHA1 3a99dfdacf14dd215d3415d5174e85a82b14f1c0 SHA256 6c220c17509b37b3651000ef05e2c4513b5f0ffd78080d9963c7255c696a35df EBUILD python-2.5.4-r3.ebuild 8491 RMD160 44e95b1ebad9b3928ac041c226c71f771832cbdf SHA1 2880c22976e592ebd0ec4382f2c08b47dfe35092 SHA256 1d6140123a0d072165e79218dea3185ebb2c43fd5856f6d039d6dd5b9e4cb17e EBUILD python-2.6.2-r1.ebuild 8664 RMD160 bead70e5ae158bef78259562dd2c3995b203fcc4 SHA1 473851f27fca21a39a4621f13f72739caaf1c9f7 SHA256 3095a676195c8e90b702aaa76b748013655983bf951fc88250e52009f3bf5410 -EBUILD python-3.1.ebuild 7840 RMD160 b0fc36e87e02b7f9746490ada90090ca6ca1265c SHA1 fcfe454213f39a290443b9582eafd989a6ac34ae SHA256 4d6241e85bd4c5db9d7a2f96d507aa60caea123bce6bff189a1a9f88aff749ac -MISC ChangeLog 69896 RMD160 d48124fd250f3a40b6569819a4a21ab20e0a25c5 SHA1 8fe90e186f7f52e88a5caf8246f0a706eb6926bb SHA256 3fc1144141338e98f6d4469935c76dc4eeb989c878794e5fe8ee68fd43dff385 +EBUILD python-3.1.ebuild 7988 RMD160 e737a483e87a3d169a8787f68433af36132e9696 SHA1 fc0f8ca3ec1e282b6d3e030a0af1c5269b4edc20 SHA256 5af6bef348b5f62c88a0f95d7e5b2fda20268acb44a8de50bad632ac9866e81d +MISC ChangeLog 70080 RMD160 3a942a6be7dff6df4a9440f852f229c486561e5f SHA1 47a2d005bc48b614d39ff92706706ccb63cba7b4 SHA256 bad0d8dae7e77edf2f8040b3a5a80e883aa60231220f037bd3f862bd695d18f2 MISC metadata.xml 501 RMD160 0cc2c851a7c59ed77809c1f3ac2130710f0700e9 SHA1 59bfd447cf15419f68077913de7228f3556ce6e3 SHA256 51c09ee221463f34722a6c655db605a7d6d683069453d173947e4416a43a071c diff --git a/dev-lang/python/python-3.1.ebuild b/dev-lang/python/python-3.1.ebuild index 5da86bb86aa2..ffc1ba01498b 100644 --- a/dev-lang/python/python-3.1.ebuild +++ b/dev-lang/python/python-3.1.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-lang/python/python-3.1.ebuild,v 1.1 2009/08/01 21:47:32 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.ebuild,v 1.2 2009/08/04 05:46:03 arfrever Exp $ EAPI="2" @@ -73,6 +73,9 @@ src_prepare() { # that stdin is a tty for bug #248081. sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" -i Lib/test/test_file.py || die "sed failed" + # Ignore non-UTF-8 characters (bug #280001) + sed -e "s/f = open(f)\.read()/f = open(f, errors='replace').read()/" -i setup.py || die "sed failed" + eautoreconf } -- cgit v1.2.3-65-gdbad