add snakeoil 0.4.1

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

7 files changed, 17 insertions, 271 deletions

diff --git a/dev-python/snakeoil/ChangeLog b/dev-python/snakeoil/ChangeLog
index 2dcde29c8e83..ad00be115f25 100644
--- a/dev-python/snakeoil/ChangeLog
+++ b/dev-python/snakeoil/ChangeLog
@@ -1,6 +1,14 @@
 # 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.40 2011/04/27 16:40:53 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/ChangeLog,v 1.41 2011/06/22 22:00:07 ferringb Exp $
+
+*snakeoil-0.4.1 (22 Jun 2011)
+
+  22 Jun 2011; Brian Harring <ferringb@gentoo.org> -snakeoil-0.3.6.4.ebuild,
+  -snakeoil-0.3.6.5.ebuild, -snakeoil-0.3.7-r1.ebuild,
+  -files/snakeoil-0.3.7-multiprocess.patch, +snakeoil-0.4.1.ebuild,
+  -files/snakeoil-issue-7567-term-invocation.patch:
+  snakeoil 0.4.1; remove old versions.
 
   27 Apr 2011; Brian Harring <ferringb@gentoo.org> snakeoil-0.4.ebuild,
   +files/snakeoil-0.4-lib2to3.patch:
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 4681f3f3643a..4f9dbbea48e0 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,23 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
-DIST snakeoil-0.3.7.tar.bz2 97316 RMD160 9495ac2ac8276bea1cc96998767784f824246a9c SHA1 3602f3ab6cf4b20784ecb1e90f08208888eb6307 SHA256 769e27c5548eccc8b21db5eddae3236d840fbde261f563f9d4381a7068ce0b6c
+DIST snakeoil-0.4.1.tar.bz2 125521 RMD160 fddf9e3ace196207fcd5777d3ad0ec72d3652497 SHA1 f9ef081c6f246ef5e3f7d902045f4e678954597a SHA256 016d5d0d2408932d60badaf5b9cd21f74bc90961e52f254ffc35591e0637e613
 DIST snakeoil-0.4.tar.bz2 124691 RMD160 1cc31afad6950fca7fc96ce536d133b377fe0ac5 SHA1 ee76846f224e3461cc380e1d65e99783ce2f0234 SHA256 af484b71f1c358d144d029b6a4f9a4af50cd16f48c0c15e5cca0b7066935fe8f
-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.1.ebuild 1456 RMD160 f94376ec40d7334c52d5677f2469bd8a955901b3 SHA1 ea7e86ecd42163052113744562e4c4d6ba74f3a4 SHA256 dbe197e8d93ad0cc5f9c7d4d28e69628ed83626e1446fd20c19ed34fa2ca026f
 EBUILD snakeoil-0.4.ebuild 1529 RMD160 43c0379fd2523dc9c37f7588f3e1ef67dc969964 SHA1 b453b450ef2de6d09278cfc114ee1ff83e051249 SHA256 fc2203dbf49ac2c50629ee1ebc46408603e2b917b2db9f69ec1dcbf10ca07077
-MISC ChangeLog 6009 RMD160 13ef57f506fa7ab63fa93d84325df1b35836fd5f SHA1 0de631a9c247c2787a053b92616bc0f6d8763b99 SHA256 74114bd67bc87a399a814adee33ebe12128bb2e09d385691b4e946bd8918bc14
+MISC ChangeLog 6332 RMD160 19fb3c344b250a6ff9cd4ffa34a699c4d1ff5b35 SHA1 bb2700d55c0c48ccf94ce6f302c55d7bd22af551 SHA256 3a3b27d49604df037af9bbf7ba3a88a16f562ee8e74e76a7199d6c40e55b42c6
 MISC metadata.xml 263 RMD160 33d1e2440f53cc20d556d8629ecaebe9205db69b SHA1 527ae61f12d6893ccbd46bb6addec2a868c0c65c SHA256 c93cfff3fe13e72e0bfb83b9e668504226d3edf2c7eb8cd1cfb89fb9a38c0ecd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk24RyQACgkQsiLx3HvNzgec7wCffeGhVEeZ0V6i/IEQME2LnkCK
-J+UAmwaz1GhCK1cxa42IZi2N0bQ+Vcxc
-=egTF
+iEYEARECAAYFAk4CZe0ACgkQsiLx3HvNzgeKUACgurg3rqD2MeeYY8bVUlhcU4hK
+BZMAoKtLiVUy3NtM3Ffh+ICmRSjhloL6
+=HCxL
 -----END PGP SIGNATURE-----
diff --git a/dev-python/snakeoil/files/snakeoil-0.3.7-multiprocess.patch b/dev-python/snakeoil/files/snakeoil-0.3.7-multiprocess.patch
deleted file mode 100644
index 5c7b9ffcf098..000000000000
--- a/dev-python/snakeoil/files/snakeoil-0.3.7-multiprocess.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 1a2408eff074901d98a3ba79af6eebd7444a3a8f Mon Sep 17 00:00:00 2001
-From: Brian Harring <ferringb@gmail.com>
-Date: Tue, 28 Dec 2010 03:48:14 -0800
-Subject: [PATCH 1/4] detect python bug 3770 (gentoo bug 330511), and disable multiprocessing for 2to3 conversion
-
----
- NEWS                             |    5 +++++
- snakeoil/caching_2to3.py         |   13 +++++++++++--
- snakeoil/distutils_extensions.py |    7 ++-----
- 3 files changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 1423171..b92a130 100644
---- a/NEWS
-+++ b/NEWS
-@@ -58,6 +58,10 @@ Snakeoil Release Notes
-   other sequence where it evaluates false.
- 
- 
-+* detect python bug 3770 (gentoo bug 330511), and disable multiprocessing
-+  for 2to3 conversion if it's found.
-+
-+
- snakeoil 0.3.7: June 26th, 2010
- 
- * detect python bug 4660, and disable parallelization in 2to3 conversion if
-@@ -72,6 +76,7 @@ snakeoil 0.3.7: June 26th, 2010
-   for 2.4
- 
- 
-+
- snakeoil 0.3.6.5: May 21st, 2010
- 
- * add discard method to AtomicWriteFile to intentionally discard the
-diff --git a/snakeoil/caching_2to3.py b/snakeoil/caching_2to3.py
-index 407aba4..4c8a3a8 100755
---- a/snakeoil/caching_2to3.py
-+++ b/snakeoil/caching_2to3.py
-@@ -88,8 +88,17 @@ class caching_mixin(object):
- class RefactoringTool(caching_mixin, lib2to3.refactor.RefactoringTool):
-     pass
- 
--class MultiprocessRefactoringTool(caching_mixin, lib2to3.refactor.MultiprocessRefactoringTool):
--    pass
-+multiprocessing_available = False
-+try:
-+    import multiprocessing
-+    # this is to detect python upstream bug 3770
-+    from _multiprocessing import SemLock
-+    multiprocessing_available = True
-+except ImportError:
-+    MultiprocessRefactoringTool = RefactoringTool
-+else:
-+    class MultiprocessRefactoringTool(caching_mixin, lib2to3.refactor.MultiprocessRefactoringTool):
-+        pass
- 
- 
- def StdoutRefactoringTool(*args):
-diff --git a/snakeoil/distutils_extensions.py b/snakeoil/distutils_extensions.py
-index 5883672..2c9b6d3 100644
---- a/snakeoil/distutils_extensions.py
-+++ b/snakeoil/distutils_extensions.py
-@@ -234,11 +234,8 @@ class build_py(dst_build_py.build_py):
- 
-         assert proc_count >= 1
- 
--        if proc_count > 1:
--            try:
--                import multiprocessing
--            except ImportError:
--                proc_count == 1
-+        if proc_count > 1 and not caching_2to3.multiprocessing_available:
-+            proc_count = 1
- 
-         refactor_kls = caching_2to3.MultiprocessRefactoringTool
- 
--- 
-1.7.3.4
-
diff --git a/dev-python/snakeoil/files/snakeoil-issue-7567-term-invocation.patch b/dev-python/snakeoil/files/snakeoil-issue-7567-term-invocation.patch
deleted file mode 100644
index 55aca6504172..000000000000
--- a/dev-python/snakeoil/files/snakeoil-issue-7567-term-invocation.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/snakeoil/test/test_formatters.py b/snakeoil/test/test_formatters.py
-index f6e3038..cf523b2 100644
---- a/snakeoil/test/test_formatters.py
-+++ b/snakeoil/test/test_formatters.py
-@@ -8,6 +8,7 @@
- # aside from that, tests need heavy expansion
- 
- import os
-+import sys
- import pty
- import StringIO
- import tempfile
-@@ -23,6 +24,13 @@ if compatibility.is_py3k:
- else:
-     mk_tempfile = tempfile.TemporaryFile
- 
-+sys_ver = sys.version_info[:3]
-+if (sys_ver >= (2,6,6) and sys_ver < (2,8)) or sys_ver >= (3,2,0):
-+    def issue7567(functor):
-+        functor.skip = "issue 7567 patch breaks multiple term invocations, disabled till it's sorted"
-+        return functor
-+else:
-+    issue7567 = lambda x:x
- 
- class native_PlainTextFormatterTest(TestCase):
- 
-@@ -178,6 +186,7 @@ class TerminfoFormatterTest(TestCase):
-         self.assertEqual(''.join(output), result,
-             msg="given(%r), expected(%r), got(%r)" % (inputs, output, result))
- 
-+    @issue7567
-     def test_terminfo(self):
-         esc = '\x1b['
-         stream = mk_tempfile()
-@@ -206,6 +215,9 @@ class TerminfoFormatterTest(TestCase):
-             formatters.TerminfoHatesOurTerminal,
-             formatters.TerminfoFormatter, stream, term='dumb')
- 
-+    if sys_ver >= (2,6,6) and sys_ver < (2,8):
-+        test_terminfo_hates_term.skip = "issue doesn't exist for 2.6.6 till 2.7"
-+
- 
- def _with_term(term, func, *args, **kwargs):
-     orig_term = os.environ.get('TERM')
-@@ -232,21 +244,25 @@ def _get_pty_pair(encoding='ascii'):
- 
- class GetFormatterTest(TestCase):
- 
-+    @issue7567
-     def test_dumb_terminal(self):
-         master, out = _get_pty_pair()
-         formatter = _with_term('dumb', formatters.get_formatter, master)
-         self.failUnless(isinstance(formatter, formatters.PlainTextFormatter))
- 
-+    @issue7567
-     def test_smart_terminal(self):
-         master, out = _get_pty_pair()
-         formatter = _with_term('xterm', formatters.get_formatter, master)
-         self.failUnless(isinstance(formatter, formatters.TerminfoFormatter))
- 
-+    @issue7567
-     def test_not_a_tty(self):
-         stream = mk_tempfile()
-         formatter = _with_term('xterm', formatters.get_formatter, stream)
-         self.failUnless(isinstance(formatter, formatters.PlainTextFormatter))
- 
-+    @issue7567
-     def test_no_fd(self):
-         stream = StringIO.StringIO()
-         formatter = _with_term('xterm', formatters.get_formatter, stream)
diff --git a/dev-python/snakeoil/snakeoil-0.3.6.5.ebuild b/dev-python/snakeoil/snakeoil-0.3.6.5.ebuild
deleted file mode 100644
index bef081899926..000000000000
--- a/dev-python/snakeoil/snakeoil-0.3.6.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.3.6.5.ebuild,v 1.3 2011/03/22 06:07:56 ferringb Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Miscellaneous python utility code."
-HOMEPAGE="http://www.pkgcore.org/"
-SRC_URI="http://www.pkgcore.org/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="!<sys-apps/pkgcore-0.4.7.8"
-RDEPEND=${DEPEND}
-
-DOCS="AUTHORS NEWS"
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching
-	unset PY2TO3_CACHEDIR
-	python_pkg_setup
-
-	# A hack to install for all versions of Python in the system.
-	# pkgcore needs it to support upgrading to a different Python slot.
-	PYTHON_ABIS=""
-	local python_interpreter
-	for python_interpreter in /usr/bin/python{2.[4-9],3.[1-9]}; do
-		if [[ -x "${python_interpreter}" ]]; then
-			PYTHON_ABIS+=" ${python_interpreter#/usr/bin/python}"
-		fi
-	done
-	export PYTHON_ABIS="${PYTHON_ABIS# }"
-}
-
-src_test() {
-	testing() {
-		local tempdir
-		tempdir="${T}/tests/python-${PYTHON_ABI}"
-		mkdir -p "${tempdir}" || die "tempdir creation failed"
-		cp -r "${S}" "${tempdir}" || die "test copy failed"
-		cd "${tempdir}/${P}"
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/snakeoil/snakeoil-0.3.7-r1.ebuild b/dev-python/snakeoil/snakeoil-0.3.7-r1.ebuild
deleted file mode 100644
index 735ff5df8dbd..000000000000
--- a/dev-python/snakeoil/snakeoil-0.3.7-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.3.7-r1.ebuild,v 1.3 2011/03/22 06:07:56 ferringb Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils distutils
-
-DESCRIPTION="Miscellaneous python utility code."
-HOMEPAGE="http://www.pkgcore.org/"
-SRC_URI="http://www.pkgcore.org/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="!<sys-apps/pkgcore-0.4.7.8"
-RDEPEND=${DEPEND}
-
-DOCS="AUTHORS NEWS"
-
-src_prepare() {
-	epatch "${FILESDIR}/snakeoil-0.3.7-multiprocess.patch"
-	epatch "${FILESDIR}/snakeoil-issue-7567-term-invocation.patch"
-}
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching
-	unset PY2TO3_CACHEDIR
-	python_pkg_setup
-
-	# A hack to install for all versions of Python in the system.
-	# pkgcore needs it to support upgrading to a different Python slot.
-	PYTHON_ABIS=""
-	local python_interpreter
-	for python_interpreter in /usr/bin/python{2.[4-9],3.[1-9]}; do
-		if [[ -x "${python_interpreter}" ]]; then
-			PYTHON_ABIS+=" ${python_interpreter#/usr/bin/python}"
-		fi
-	done
-	export PYTHON_ABIS="${PYTHON_ABIS# }"
-}
-
-src_test() {
-	testing() {
-		local tempdir
-		tempdir="${T}/tests/python-${PYTHON_ABI}"
-		mkdir -p "${tempdir}" || die "tempdir creation failed"
-		cp -r "${S}" "${tempdir}" || die "test copy failed"
-		cd "${tempdir}/${P}"
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/snakeoil/snakeoil-0.3.6.4.ebuild b/dev-python/snakeoil/snakeoil-0.4.1.ebuild
index be1c2ee7bf82..f35ae7013fb5 100644
--- a/dev-python/snakeoil/snakeoil-0.3.6.4.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.6.4.ebuild,v 1.3 2011/03/22 06:07:56 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/snakeoil-0.4.1.ebuild,v 1.1 2011/06/22 22:00:07 ferringb Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"