diff options
| author |   Brian Harring <ferringb@gentoo.org> | 2011-04-27 16:40:53 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2011-04-27 16:40:53 +0000 |
| commit | 76d6ab277a4d38ec150a2cf52060cdfbfba2d513 (patch) | |
| tree | 9d9d4609ed4ec81caf6035e1cb07da251a0db56b /dev-python/snakeoil | |
| parent | Don't try to use the newer cegui (bug #357761) (diff) | |
| download | gentoo-2-76d6ab277a4d38ec150a2cf52060cdfbfba2d513.tar.gz gentoo-2-76d6ab277a4d38ec150a2cf52060cdfbfba2d513.tar.bz2 gentoo-2-76d6ab277a4d38ec150a2cf52060cdfbfba2d513.zip | |
work around USE=-threads and the resultant affects on lib2to3; can't install for py3k in that scenario, so no revbump necessary
(Portage version: 2.1.9.44/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/snakeoil')
| -rw-r--r-- | dev-python/snakeoil/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/snakeoil/files/snakeoil-0.4-lib2to3.patch | 26 | ||||
| -rw-r--r-- | dev-python/snakeoil/snakeoil-0.4.ebuild | 8 |
3 files changed, 39 insertions, 3 deletions
diff --git a/dev-python/snakeoil/ChangeLog b/dev-python/snakeoil/ChangeLog index 30f89d3873ab..2dcde29c8e83 100644 --- a/dev-python/snakeoil/ChangeLog +++ b/dev-python/snakeoil/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/snakeoil # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/ChangeLog,v 1.39 2011/04/25 03:09:17 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/ChangeLog,v 1.40 2011/04/27 16:40:53 ferringb Exp $ + + 27 Apr 2011; Brian Harring <ferringb@gentoo.org> snakeoil-0.4.ebuild, + +files/snakeoil-0.4-lib2to3.patch: + add buildtime workaround for >=py2.6 when threading is off, thus + multiprocessing + is nonfunctional. *snakeoil-0.4 (25 Apr 2011) diff --git a/dev-python/snakeoil/files/snakeoil-0.4-lib2to3.patch b/dev-python/snakeoil/files/snakeoil-0.4-lib2to3.patch new file mode 100644 index 000000000000..5bd01385416f --- /dev/null +++ b/dev-python/snakeoil/files/snakeoil-0.4-lib2to3.patch @@ -0,0 +1,26 @@ +From 018c3d371ff511525666d62fb71e589e193ace55 Mon Sep 17 00:00:00 2001 +From: Brian Harring <ferringb@gmail.com> +Date: Wed, 27 Apr 2011 09:21:06 -0700 +Subject: [PATCH] handle lack of multiprocessing and the affect it has on lib2to3 apis + +--- + snakeoil/distutils_extensions.py | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/snakeoil/distutils_extensions.py b/snakeoil/distutils_extensions.py +index e4c0672..2a758a4 100644 +--- a/snakeoil/distutils_extensions.py ++++ b/snakeoil/distutils_extensions.py +@@ -243,7 +243,8 @@ class build_py(dst_build_py.build_py): + f = refactor_kls(fixer_names, options=options).refactor + + def f2(*args, **kwds): +- kwds['num_processes'] = proc_count ++ if caching_2to3.multiprocessing_available: ++ kwds['num_processes'] = proc_count + return f(*args, **kwds) + + return f2 +-- +1.7.4.1 + diff --git a/dev-python/snakeoil/snakeoil-0.4.ebuild b/dev-python/snakeoil/snakeoil-0.4.ebuild index e352da6728fa..b8304e17030c 100644 --- a/dev-python/snakeoil/snakeoil-0.4.ebuild +++ b/dev-python/snakeoil/snakeoil-0.4.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/snakeoil-0.4.ebuild,v 1.1 2011/04/25 03:09:17 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/snakeoil-0.4.ebuild,v 1.2 2011/04/27 16:40:53 ferringb Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" -inherit distutils +inherit eutils distutils DESCRIPTION="Miscellaneous python utility code." HOMEPAGE="http://www.pkgcore.org/" @@ -21,6 +21,10 @@ RDEPEND=${DEPEND} DOCS="AUTHORS NEWS" +src_prepare() { + epatch "${FILESDIR}/snakeoil-0.4-lib2to3.patch" +} + pkg_setup() { # disable snakeoil 2to3 caching unset PY2TO3_CACHEDIR |