summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2010-10-27 12:49:29 +0000
committerDirkjan Ochtman <djc@gentoo.org>2010-10-27 12:49:29 +0000
commitaea4aaa07b55536e6ee15791ab1b6e2b0930ccfb (patch)
tree9291a7135a6d00a7ac3d2b3b7f926cf461c97490 /dev-lang
parentlibjingle and co. no longer in tree, failed to compile with stable openssl, s... (diff)
downloadgentoo-2-aea4aaa07b55536e6ee15791ab1b6e2b0930ccfb.tar.gz
gentoo-2-aea4aaa07b55536e6ee15791ab1b6e2b0930ccfb.tar.bz2
gentoo-2-aea4aaa07b55536e6ee15791ab1b6e2b0930ccfb.zip
Fix bug 321075.
(Portage version: 2.1.9.22/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/python/ChangeLog5
-rw-r--r--dev-lang/python/python-2.6.6-r1.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 314bb66f4a1b..221f1e5f20d3 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/python
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.498 2010/10/13 09:28:57 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.499 2010/10/27 12:49:29 djc Exp $
+
+ 27 Oct 2010; Dirkjan Ochtman <djc@gentoo.org> python-2.6.6-r1.ebuild:
+ Disable test___all__ to fix bug 321075.
13 Oct 2010; Dirkjan Ochtman <djc@gentoo.org> python-2.6.6-r1.ebuild:
Use mirrors for the patch set.
diff --git a/dev-lang/python/python-2.6.6-r1.ebuild b/dev-lang/python/python-2.6.6-r1.ebuild
index 5e2d3975d055..cbde2be66fc0 100644
--- a/dev-lang/python/python-2.6.6-r1.ebuild
+++ b/dev-lang/python/python-2.6.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild,v 1.2 2010/10/13 09:28:57 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.6-r1.ebuild,v 1.3 2010/10/27 12:49:29 djc Exp $
EAPI="2"
@@ -125,7 +125,7 @@ src_configure() {
use ssl || export PYTHON_DISABLE_SSL="1"
use tk || disable+=" _tkinter"
use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
- export PYTHON_DISABLE_MODULES="${disable}"
+ export PYTHON_DISABLE_MODULES="__all__ ${disable}"
if ! use xml; then
ewarn "You have configured Python without XML support."
@@ -197,7 +197,7 @@ src_test() {
python_enable_pyc
# Skip failing tests.
- local skip_tests="distutils httpservers minidom pyexpat sax tcl"
+ local skip_tests="distutils httpservers minidom pyexpat sax tcl __all__"
# test_ctypes fails with PAX kernel (bug #234498).
host-is-pax && skip_tests+=" ctypes"