Updated devel/py-pyutil to 1.8.4.

pkgsrc changes:
- /usr/bin/env python is no longer a valid interpreter, so fix it.

upstream changes:
- Unknown, unfortunately. Upstream doesn't seem to maintain a Changelog.

4 files changed, 131 insertions, 109 deletions

diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile
index e1853ad4be4..bd5dd640162 100644
--- a/devel/py-pyutil/Makefile
+++ b/devel/py-pyutil/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2011/02/25 09:47:22 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/02/12 20:10:42 gls Exp $
 #
 
-DISTNAME=	pyutil-1.7.9
+DISTNAME=	pyutil-1.8.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://pypi.python.org/packages/source/p/pyutil/
 
@@ -21,5 +20,10 @@ DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
 USE_LANGUAGES=	# none
 
+REPLACE_INTERPRETER+=	python
+REPLACE.python.old=	/usr/bin/env python
+REPLACE.python.new=	${PYTHONBIN}
+REPLACE_FILES.python=	pyutil/benchmarks/bench_xor.py pyutil/lineutil.py pyutil/scripts/*.py pyutil/test/*/*.py
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-pyutil/PLIST b/devel/py-pyutil/PLIST
index 205cb69fdc0..30aa878b053 100644
--- a/devel/py-pyutil/PLIST
+++ b/devel/py-pyutil/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/07/24 13:21:49 gdt Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/02/12 20:10:42 gls Exp $
 bin/lines
 bin/randcookie
 bin/randfile
@@ -38,9 +38,6 @@ ${PYSITELIB}/pyutil/benchutil.pyo
 ${PYSITELIB}/pyutil/cache.py
 ${PYSITELIB}/pyutil/cache.pyc
 ${PYSITELIB}/pyutil/cache.pyo
-${PYSITELIB}/pyutil/decimalutil.py
-${PYSITELIB}/pyutil/decimalutil.pyc
-${PYSITELIB}/pyutil/decimalutil.pyo
 ${PYSITELIB}/pyutil/dictutil.py
 ${PYSITELIB}/pyutil/dictutil.pyc
 ${PYSITELIB}/pyutil/dictutil.pyo
@@ -128,94 +125,105 @@ ${PYSITELIB}/pyutil/strutil.pyo
 ${PYSITELIB}/pyutil/test/__init__.py
 ${PYSITELIB}/pyutil/test/__init__.pyc
 ${PYSITELIB}/pyutil/test/__init__.pyo
-${PYSITELIB}/pyutil/test/json_tests/__init__.py
-${PYSITELIB}/pyutil/test/json_tests/__init__.pyc
-${PYSITELIB}/pyutil/test/json_tests/__init__.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_decode.py
-${PYSITELIB}/pyutil/test/json_tests/test_decode.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_decode.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_default.py
-${PYSITELIB}/pyutil/test/json_tests/test_default.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_default.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_dump.py
-${PYSITELIB}/pyutil/test/json_tests/test_dump.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_dump.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_encode_basestring_ascii.py
-${PYSITELIB}/pyutil/test/json_tests/test_encode_basestring_ascii.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_encode_basestring_ascii.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_fail.py
-${PYSITELIB}/pyutil/test/json_tests/test_fail.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_fail.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_float.py
-${PYSITELIB}/pyutil/test/json_tests/test_float.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_float.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_indent.py
-${PYSITELIB}/pyutil/test/json_tests/test_indent.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_indent.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_pass1.py
-${PYSITELIB}/pyutil/test/json_tests/test_pass1.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_pass1.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_pass2.py
-${PYSITELIB}/pyutil/test/json_tests/test_pass2.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_pass2.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_pass3.py
-${PYSITELIB}/pyutil/test/json_tests/test_pass3.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_pass3.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_recursion.py
-${PYSITELIB}/pyutil/test/json_tests/test_recursion.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_recursion.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_separators.py
-${PYSITELIB}/pyutil/test/json_tests/test_separators.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_separators.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_speedups.py
-${PYSITELIB}/pyutil/test/json_tests/test_speedups.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_speedups.pyo
-${PYSITELIB}/pyutil/test/json_tests/test_unicode.py
-${PYSITELIB}/pyutil/test/json_tests/test_unicode.pyc
-${PYSITELIB}/pyutil/test/json_tests/test_unicode.pyo
-${PYSITELIB}/pyutil/test/test_assertutil.py
-${PYSITELIB}/pyutil/test/test_assertutil.pyc
-${PYSITELIB}/pyutil/test/test_assertutil.pyo
-${PYSITELIB}/pyutil/test/test_cache.py
-${PYSITELIB}/pyutil/test/test_cache.pyc
-${PYSITELIB}/pyutil/test/test_cache.pyo
-${PYSITELIB}/pyutil/test/test_decimalutil.py
-${PYSITELIB}/pyutil/test/test_decimalutil.pyc
-${PYSITELIB}/pyutil/test/test_decimalutil.pyo
-${PYSITELIB}/pyutil/test/test_dictutil.py
-${PYSITELIB}/pyutil/test/test_dictutil.pyc
-${PYSITELIB}/pyutil/test/test_dictutil.pyo
-${PYSITELIB}/pyutil/test/test_fileutil.py
-${PYSITELIB}/pyutil/test/test_fileutil.pyc
-${PYSITELIB}/pyutil/test/test_fileutil.pyo
-${PYSITELIB}/pyutil/test/test_iputil.py
-${PYSITELIB}/pyutil/test/test_iputil.pyc
-${PYSITELIB}/pyutil/test/test_iputil.pyo
-${PYSITELIB}/pyutil/test/test_jsonutil.py
-${PYSITELIB}/pyutil/test/test_jsonutil.pyc
-${PYSITELIB}/pyutil/test/test_jsonutil.pyo
-${PYSITELIB}/pyutil/test/test_mathutil.py
-${PYSITELIB}/pyutil/test/test_mathutil.pyc
-${PYSITELIB}/pyutil/test/test_mathutil.pyo
-${PYSITELIB}/pyutil/test/test_odict.py
-${PYSITELIB}/pyutil/test/test_odict.pyc
-${PYSITELIB}/pyutil/test/test_odict.pyo
-${PYSITELIB}/pyutil/test/test_picklesaver.py
-${PYSITELIB}/pyutil/test/test_picklesaver.pyc
-${PYSITELIB}/pyutil/test/test_picklesaver.pyo
-${PYSITELIB}/pyutil/test/test_strutil.py
-${PYSITELIB}/pyutil/test/test_strutil.pyc
-${PYSITELIB}/pyutil/test/test_strutil.pyo
-${PYSITELIB}/pyutil/test/test_template
-${PYSITELIB}/pyutil/test/test_time_format.py
-${PYSITELIB}/pyutil/test/test_time_format.pyc
-${PYSITELIB}/pyutil/test/test_time_format.pyo
-${PYSITELIB}/pyutil/test/test_xor.py
-${PYSITELIB}/pyutil/test/test_xor.pyc
-${PYSITELIB}/pyutil/test/test_xor.pyo
-${PYSITELIB}/pyutil/test/test_zlibutil.py
-${PYSITELIB}/pyutil/test/test_zlibutil.pyc
-${PYSITELIB}/pyutil/test/test_zlibutil.pyo
+${PYSITELIB}/pyutil/test/current/__init__.py
+${PYSITELIB}/pyutil/test/current/__init__.pyc
+${PYSITELIB}/pyutil/test/current/__init__.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/__init__.py
+${PYSITELIB}/pyutil/test/current/json_tests/__init__.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/__init__.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_decode.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_decode.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_decode.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_default.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_default.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_default.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_dump.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_dump.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_dump.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_encode_basestring_ascii.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_encode_basestring_ascii.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_encode_basestring_ascii.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_fail.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_fail.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_fail.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_float.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_float.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_float.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_indent.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_indent.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_indent.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_pass1.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_pass1.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_pass1.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_pass2.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_pass2.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_pass2.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_pass3.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_pass3.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_pass3.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_recursion.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_recursion.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_recursion.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_separators.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_separators.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_separators.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_speedups.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_speedups.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_speedups.pyo
+${PYSITELIB}/pyutil/test/current/json_tests/test_unicode.py
+${PYSITELIB}/pyutil/test/current/json_tests/test_unicode.pyc
+${PYSITELIB}/pyutil/test/current/json_tests/test_unicode.pyo
+${PYSITELIB}/pyutil/test/current/test_assertutil.py
+${PYSITELIB}/pyutil/test/current/test_assertutil.pyc
+${PYSITELIB}/pyutil/test/current/test_assertutil.pyo
+${PYSITELIB}/pyutil/test/current/test_fileutil.py
+${PYSITELIB}/pyutil/test/current/test_fileutil.pyc
+${PYSITELIB}/pyutil/test/current/test_fileutil.pyo
+${PYSITELIB}/pyutil/test/current/test_iputil.py
+${PYSITELIB}/pyutil/test/current/test_iputil.pyc
+${PYSITELIB}/pyutil/test/current/test_iputil.pyo
+${PYSITELIB}/pyutil/test/current/test_jsonutil.py
+${PYSITELIB}/pyutil/test/current/test_jsonutil.pyc
+${PYSITELIB}/pyutil/test/current/test_jsonutil.pyo
+${PYSITELIB}/pyutil/test/current/test_mathutil.py
+${PYSITELIB}/pyutil/test/current/test_mathutil.pyc
+${PYSITELIB}/pyutil/test/current/test_mathutil.pyo
+${PYSITELIB}/pyutil/test/current/test_time_format.py
+${PYSITELIB}/pyutil/test/current/test_time_format.pyc
+${PYSITELIB}/pyutil/test/current/test_time_format.pyo
+${PYSITELIB}/pyutil/test/current/test_verlib.py
+${PYSITELIB}/pyutil/test/current/test_verlib.pyc
+${PYSITELIB}/pyutil/test/current/test_verlib.pyo
+${PYSITELIB}/pyutil/test/current/test_version_class.py
+${PYSITELIB}/pyutil/test/current/test_version_class.pyc
+${PYSITELIB}/pyutil/test/current/test_version_class.pyo
+${PYSITELIB}/pyutil/test/deprecated/__init__.py
+${PYSITELIB}/pyutil/test/deprecated/__init__.pyc
+${PYSITELIB}/pyutil/test/deprecated/__init__.pyo
+${PYSITELIB}/pyutil/test/deprecated/test_dictutil.py
+${PYSITELIB}/pyutil/test/deprecated/test_dictutil.pyc
+${PYSITELIB}/pyutil/test/deprecated/test_dictutil.pyo
+${PYSITELIB}/pyutil/test/deprecated/test_picklesaver.py
+${PYSITELIB}/pyutil/test/deprecated/test_picklesaver.pyc
+${PYSITELIB}/pyutil/test/deprecated/test_picklesaver.pyo
+${PYSITELIB}/pyutil/test/deprecated/test_xor.py
+${PYSITELIB}/pyutil/test/deprecated/test_xor.pyc
+${PYSITELIB}/pyutil/test/deprecated/test_xor.pyo
+${PYSITELIB}/pyutil/test/out_of_shape/__init__.py
+${PYSITELIB}/pyutil/test/out_of_shape/__init__.pyc
+${PYSITELIB}/pyutil/test/out_of_shape/__init__.pyo
+${PYSITELIB}/pyutil/test/out_of_shape/test_cache.py
+${PYSITELIB}/pyutil/test/out_of_shape/test_cache.pyc
+${PYSITELIB}/pyutil/test/out_of_shape/test_cache.pyo
+${PYSITELIB}/pyutil/test/out_of_shape/test_odict.py
+${PYSITELIB}/pyutil/test/out_of_shape/test_odict.pyc
+${PYSITELIB}/pyutil/test/out_of_shape/test_odict.pyo
+${PYSITELIB}/pyutil/test/out_of_shape/test_strutil.py
+${PYSITELIB}/pyutil/test/out_of_shape/test_strutil.pyc
+${PYSITELIB}/pyutil/test/out_of_shape/test_strutil.pyo
+${PYSITELIB}/pyutil/test/out_of_shape/test_zlibutil.py
+${PYSITELIB}/pyutil/test/out_of_shape/test_zlibutil.pyc
+${PYSITELIB}/pyutil/test/out_of_shape/test_zlibutil.pyo
 ${PYSITELIB}/pyutil/testutil.py
 ${PYSITELIB}/pyutil/testutil.pyc
 ${PYSITELIB}/pyutil/testutil.pyo
@@ -225,6 +233,9 @@ ${PYSITELIB}/pyutil/time_format.pyo
 ${PYSITELIB}/pyutil/twistedutil.py
 ${PYSITELIB}/pyutil/twistedutil.pyc
 ${PYSITELIB}/pyutil/twistedutil.pyo
+${PYSITELIB}/pyutil/verlib.py
+${PYSITELIB}/pyutil/verlib.pyc
+${PYSITELIB}/pyutil/verlib.pyo
 ${PYSITELIB}/pyutil/version_class.py
 ${PYSITELIB}/pyutil/version_class.pyc
 ${PYSITELIB}/pyutil/version_class.pyo
@@ -240,3 +251,8 @@ ${PYSITELIB}/pyutil/xor/xor.pyo
 ${PYSITELIB}/pyutil/zlibutil.py
 ${PYSITELIB}/pyutil/zlibutil.pyc
 ${PYSITELIB}/pyutil/zlibutil.pyo
+share/doc/pyutil/COPYING.GPL
+share/doc/pyutil/COPYING.SPL.txt
+share/doc/pyutil/COPYING.TGPPL.html
+share/doc/pyutil/CREDITS
+share/doc/pyutil/README.rst
diff --git a/devel/py-pyutil/distinfo b/devel/py-pyutil/distinfo
index fd8f2bda1a2..a1e8371d28a 100644
--- a/devel/py-pyutil/distinfo
+++ b/devel/py-pyutil/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2010/11/27 18:24:44 gdt Exp $
+$NetBSD: distinfo,v 1.3 2012/02/12 20:10:42 gls Exp $
 
-SHA1 (pyutil-1.7.9.tar.gz) = 372179d8231077c652e1c9933c7f9f1419da3f47
-RMD160 (pyutil-1.7.9.tar.gz) = 7410f2d3c198ce3b38ea75384eb15feb3506a84f
-Size (pyutil-1.7.9.tar.gz) = 151917 bytes
-SHA1 (patch-aa) = 365651c489684e266967985748143b60ad05574d
+SHA1 (pyutil-1.8.4.tar.gz) = 3fcbaf35eeee6df0816b2f1a398cabe969e78cf9
+RMD160 (pyutil-1.8.4.tar.gz) = f6a01a0207597047f273d19eb9b5cc3faddf0da7
+Size (pyutil-1.8.4.tar.gz) = 96186 bytes
+SHA1 (patch-aa) = aa4432f83aeee6fb8b9f9cfb97dc001748e38577
diff --git a/devel/py-pyutil/patches/patch-aa b/devel/py-pyutil/patches/patch-aa
index 2fa4cdbefd8..0a4766ac142 100644
--- a/devel/py-pyutil/patches/patch-aa
+++ b/devel/py-pyutil/patches/patch-aa
@@ -1,15 +1,17 @@
-$NetBSD: patch-aa,v 1.1 2010/11/27 18:24:44 gdt Exp $
+$NetBSD: patch-aa,v 1.2 2012/02/12 20:10:42 gls Exp $
 
 http://tahoe-lafs.org/trac/zfec/ticket/11
 
---- setup.py.orig	2010-06-16 15:49:16.000000000 +0000
+--- setup.py.orig	2011-02-13 07:34:23.000000000 +0000
 +++ setup.py
-@@ -69,7 +69,7 @@ if 'darcsver' in sys.argv[1:]:
- # "sdist" or "bdist_egg"), unless there is a pyutil.egg-info/SOURCE.txt file
- # present which contains a complete list of files that should be included.
- # http://pypi.python.org/pypi/setuptools_darcs
--setup_requires.append('setuptools_darcs >= 1.1.0')
-+# setup_requires.append('setuptools_darcs >= 1.1.0')
+@@ -76,8 +76,8 @@ if 'darcsver' in sys.argv[1:]:
+ # Lucid, so for now you have to manually install it before building
+ # sdists or eggs:
+ # http://bitbucket.org/tarek/distribute/issue/55/revision-control-plugin-automatically-installed-as-a-build-dependency-is-not-present-when-another-build-dependency-is-being
+-if False:
+-    setup_requires.append('setuptools_darcs >= 1.1.0')
++#if False:
++#    setup_requires.append('setuptools_darcs >= 1.1.0')
  
- data_fnames=[ 'COPYING.GPL', 'COPYING.TGPPL.html', 'README.txt', 'CREDITS' ]
  
+ data_fnames=[ 'COPYING.SPL.txt', 'COPYING.GPL', 'COPYING.TGPPL.html', 'README.rst', 'CREDITS' ]