summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-09-25 17:20:04 +0000
committerZac Medico <zmedico@gentoo.org>2009-09-25 17:20:04 +0000
commit166b614547cbe4d54cbd394c53400e5ac740b9dc (patch)
treee67427a64d976664c288d6da2fa049ab31602393 /dev-lang
parentKeywording for ppc. (diff)
downloadgentoo-2-166b614547cbe4d54cbd394c53400e5ac740b9dc.tar.gz
gentoo-2-166b614547cbe4d54cbd394c53400e5ac740b9dc.tar.bz2
gentoo-2-166b614547cbe4d54cbd394c53400e5ac740b9dc.zip
For python 3, don't remove the encodings directory with USE=build, in
order to avoid 'Fatal Python error: Py_Initialize: can't initialize sys standard streams ImportError: No module named encodings.utf_8'. (Portage version: 2.2_rc41_p14429/cvs/Linux i686)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/python/ChangeLog8
-rw-r--r--dev-lang/python/python-3.1.1-r1.ebuild4
-rw-r--r--dev-lang/python/python-3.1.1.ebuild4
3 files changed, 11 insertions, 5 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 3c8a7d6150c1..faad9ae2da12 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,12 @@
# 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.418 2009/09/23 15:29:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.419 2009/09/25 17:20:04 zmedico Exp $
+
+ 25 Sep 2009; Zac Medico <zmedico@gentoo.org> python-3.1.1.ebuild,
+ python-3.1.1-r1.ebuild:
+ For python 3, don't remove the encodings directory with USE=build, in
+ order to avoid 'Fatal Python error: Py_Initialize: can't initialize sys
+ standard streams ImportError: No module named encodings.utf_8'.
23 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r2.ebuild:
diff --git a/dev-lang/python/python-3.1.1-r1.ebuild b/dev-lang/python/python-3.1.1-r1.ebuild
index e1765c753d6e..d18cf2cf8a23 100644
--- a/dev-lang/python/python-3.1.1-r1.ebuild
+++ b/dev-lang/python/python-3.1.1-r1.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.1-r1.ebuild,v 1.3 2009/09/24 14:31:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.4 2009/09/25 17:20:04 zmedico Exp $
EAPI="2"
@@ -225,7 +225,7 @@ src_install() {
sed -e "s:^OPT=.*:OPT=-DNDEBUG:" -i "${D}usr/$(get_libdir)/python${PYVER}/config/Makefile"
if use build; then
- rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{email,encodings,sqlite3,test,tkinter}
+ rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{email,sqlite3,test,tkinter}
else
use elibc_uclibc && rm -fr "${D}usr/$(get_libdir)/python${PYVER}/test"
use sqlite || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{sqlite3,test/test_sqlite*}
diff --git a/dev-lang/python/python-3.1.1.ebuild b/dev-lang/python/python-3.1.1.ebuild
index d0030ce8673d..334f070f595d 100644
--- a/dev-lang/python/python-3.1.1.ebuild
+++ b/dev-lang/python/python-3.1.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.1.ebuild,v 1.6 2009/08/30 21:34:13 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1.ebuild,v 1.7 2009/09/25 17:20:04 zmedico Exp $
EAPI="2"
@@ -215,7 +215,7 @@ src_install() {
sed -e "s:^OPT=.*:OPT=-DNDEBUG:" -i "${D}usr/$(get_libdir)/python${PYVER}/config/Makefile"
if use build; then
- rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{email,encodings,sqlite3,test,tkinter}
+ rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{email,sqlite3,test,tkinter}
else
use elibc_uclibc && rm -fr "${D}usr/$(get_libdir)/python${PYVER}/test"
use sqlite || rm -fr "${D}usr/$(get_libdir)/python${PYVER}/"{sqlite3,test/test_sqlite*}