work around USE=-threads and the resultant affects on lib2to3; can't install for py3k in that scenario, so no revbump necessary

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 45 insertions, 8 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/Manifest b/dev-python/snakeoil/Manifest
index 96f166d5a7eb..4681f3f3643a 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX snakeoil-0.3.7-multiprocess.patch 2491 RMD160 b19d4eb8fba2e109f538cfd8b887111172e7fe15 SHA1 0f13277f4685f935741dc45feb6d6c581a3f2edd SHA256 752495e587be4445a17636640aa63ae5313ddd77548f4fc6b00ef45f67d56b2c
+AUX snakeoil-0.4-lib2to3.patch 911 RMD160 e6f4039d3832dca8508bfb5d7fce490fd87ec5cf SHA1 6a5dd64ab76f6d61206eb3a9b8be73b1bc487ad5 SHA256 8ffcdaabb47004a1010d529198e95e9d2fdb81b1de1d3f3da5014ebd8e57c65b
 AUX snakeoil-issue-7567-term-invocation.patch 2430 RMD160 25b8e7a14b760150383e47c0b42e17ce6c76f36e SHA1 5ad3d37cf808ac5a6e4439e6200829be1cbd764e SHA256 5233317d57600df56de3f5b70f4aec421fb1dfe66bd823231ae67e8ed4b219a4
 DIST snakeoil-0.3.6.4.tar.bz2 95636 RMD160 7125114464f0755ddfa15d7f8e31c356b2e78394 SHA1 7cd23193a6d802ae41c08fffa6fd0f8582b61a4f SHA256 beb18c3fd9b9f951951cb06919845a84e9603df0fa79288b43f1961bd62fe5bc
 DIST snakeoil-0.3.6.5.tar.bz2 95510 RMD160 79d4e895677f6a895d277a4d98446ed4fed01857 SHA1 0e915f1b0a9155909a0d90a4be5edb6ee23e7260 SHA256 57414973ccd8aa1df7650aa5c2e9b1f032901d7730cf36e93e12dafba1d8dce2
@@ -10,13 +11,13 @@ DIST snakeoil-0.4.tar.bz2 124691 RMD160 1cc31afad6950fca7fc96ce536d133b377fe0ac5
 EBUILD snakeoil-0.3.6.4.ebuild 1458 RMD160 842f124712aac242499cfa709cedbc97b5ecb50f SHA1 585077188a1cb4c686ae743c0a46bb6728398a45 SHA256 cabdd339c8f4c24d2ff77fe35f0198e60c68868259cebe5bf6a46d70e414646b
 EBUILD snakeoil-0.3.6.5.ebuild 1458 RMD160 d60bdf09e762d3972ce6d4636723cb652562a1de SHA1 1033e227e5326ccb7114409543c8437dcf748d7a SHA256 3d782fa3bcefd69fe8c53eb9c39d1ba31b147a980b7c806d9d7b3feee265d845
 EBUILD snakeoil-0.3.7-r1.ebuild 1605 RMD160 a4119e08e082d43ec149b343d35d8006e9f7001b SHA1 403fc63ae6104b83639f7775ba4fb7f0cfc3fb38 SHA256 f6b5af4f29e004cd0c5b15b08c2e72fc360ab5af69ed2ac166b3ca94af196fac
-EBUILD snakeoil-0.4.ebuild 1454 RMD160 59a16fbf936caf86e46bdd5690c9d1814cda60a9 SHA1 82da4706fa62abd3aae9bd28aa7f652fc5b92334 SHA256 ff332e1fc7765f6026ea2ed72e3794f70777cd683f506c0e773ab4dce598212e
-MISC ChangeLog 5794 RMD160 9e74be53586e23bf0670496b7ed7b5cb2f193d76 SHA1 93a693c5fb4ee22fdfa258ecbf8cc067eb6e1837 SHA256 90a03e3b15fbc7369278733d9fd393b5fe99ac4571431f9fcbf6cdebe75f9cce
+EBUILD snakeoil-0.4.ebuild 1529 RMD160 43c0379fd2523dc9c37f7588f3e1ef67dc969964 SHA1 b453b450ef2de6d09278cfc114ee1ff83e051249 SHA256 fc2203dbf49ac2c50629ee1ebc46408603e2b917b2db9f69ec1dcbf10ca07077
+MISC ChangeLog 6009 RMD160 13ef57f506fa7ab63fa93d84325df1b35836fd5f SHA1 0de631a9c247c2787a053b92616bc0f6d8763b99 SHA256 74114bd67bc87a399a814adee33ebe12128bb2e09d385691b4e946bd8918bc14
 MISC metadata.xml 263 RMD160 33d1e2440f53cc20d556d8629ecaebe9205db69b SHA1 527ae61f12d6893ccbd46bb6addec2a868c0c65c SHA256 c93cfff3fe13e72e0bfb83b9e668504226d3edf2c7eb8cd1cfb89fb9a38c0ecd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk205eUACgkQsiLx3HvNzgenywCgzhZbFgIqzPg9OoEsGfvQkJmc
-9j8AoLxEHekJeKt3w5eiDk4NAyzt3giR
-=Bune
+iEYEARECAAYFAk24RyQACgkQsiLx3HvNzgec7wCffeGhVEeZ0V6i/IEQME2LnkCK
+J+UAmwaz1GhCK1cxa42IZi2N0bQ+Vcxc
+=egTF
 -----END PGP SIGNATURE-----
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