Update systutils/fabric to 1.3.4.

pkgsrc changes:
- Adjust dependency chain. Now depends on security/py-ssh instead of
security/py-paramiko.

Upstream changes:

The main new feature in Fabric 1.3.x is parallel tasks execution support
(invoked by fab -P).

Releases at the same time in the 1.2.x and 1.3.x branches, including the
same bugfixes.
Changes since the latest release in the 1.2.x branch (1.2.5), included in
branch 1.3:

2012-01-12: released Fabric 1.3.4
[Bug] #492: @parallel did not automatically trigger linewise output, as was
intended. This has been fixed. Thanks to Brandon Huey for the catch.
[Bug] #510: Parallel mode is incompatible with user input, such as
password/hostname prompts, and was causing cryptic Operation not supported
by device errors when such prompts needed to be displayed. This behavior
has been updated to cleanly and obviously abort instead.
[Bug] #494: Fixed regression bug affecting some env values such as env.port
under parallel mode. Symptoms included rsync_project bailing out due to a
None port value when run under @parallel. Thanks to Rob Terhaar for the
report.
[Bug] #339: Don't show imported colors members in --list output. Thanks to
Nick Trew for the report.

4 files changed, 18 insertions, 26 deletions

diff --git a/sysutils/fabric/Makefile b/sysutils/fabric/Makefile
index 13d866fef17..920e06e60c0 100644
--- a/sysutils/fabric/Makefile
+++ b/sysutils/fabric/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2011/12/04 21:44:52 gls Exp $
+# $NetBSD: Makefile,v 1.17 2012/02/12 15:45:34 gls Exp $
 #
 
-VERSION=		1.2.5
+VERSION=		1.3.4
 DISTNAME=		Fabric-${VERSION}
 PKGNAME=		${DISTNAME:S/F/f/}
 CATEGORIES=		sysutils net
-MASTER_SITES=	http://pypi.python.org/packages/source/F/Fabric/
+MASTER_SITES=		http://pypi.python.org/packages/source/F/Fabric/
 
 MAINTAINER=		gls@NetBSD.org
 HOMEPAGE=		http://fabfile.org/
@@ -14,8 +14,7 @@ LICENSE=		2-clause-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=		${PYPKGPREFIX}-paramiko>=1.7:../../security/py-paramiko
-DEPENDS+=		${PYPKGPREFIX}-crypto>=2.1:../../security/py-crypto
+DEPENDS+=		${PYPKGPREFIX}-ssh>=1.7.8:../../security/py-ssh
 
 USE_TOOLS+=		pax
 
diff --git a/sysutils/fabric/PLIST b/sysutils/fabric/PLIST
index bd35ccf4db2..bde0f59a9b5 100644
--- a/sysutils/fabric/PLIST
+++ b/sysutils/fabric/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.10 2011/12/04 21:44:52 gls Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/02/12 15:45:34 gls Exp $
 bin/fab
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/fabfile/__init__.py
 ${PYSITELIB}/fabfile/__init__.pyc
@@ -53,6 +54,9 @@ ${PYSITELIB}/fabric/decorators.pyo
 ${PYSITELIB}/fabric/io.py
 ${PYSITELIB}/fabric/io.pyc
 ${PYSITELIB}/fabric/io.pyo
+${PYSITELIB}/fabric/job_queue.py
+${PYSITELIB}/fabric/job_queue.pyc
+${PYSITELIB}/fabric/job_queue.pyo
 ${PYSITELIB}/fabric/main.py
 ${PYSITELIB}/fabric/main.pyc
 ${PYSITELIB}/fabric/main.pyo
@@ -68,6 +72,9 @@ ${PYSITELIB}/fabric/sftp.pyo
 ${PYSITELIB}/fabric/state.py
 ${PYSITELIB}/fabric/state.pyc
 ${PYSITELIB}/fabric/state.pyo
+${PYSITELIB}/fabric/task_utils.py
+${PYSITELIB}/fabric/task_utils.pyc
+${PYSITELIB}/fabric/task_utils.pyo
 ${PYSITELIB}/fabric/tasks.py
 ${PYSITELIB}/fabric/tasks.pyc
 ${PYSITELIB}/fabric/tasks.pyo
@@ -97,6 +104,7 @@ share/doc/fabric/development.rst
 share/doc/fabric/faq.rst
 share/doc/fabric/index.rst
 share/doc/fabric/installation.rst
+share/doc/fabric/roadmap.rst
 share/doc/fabric/tutorial.rst
 share/doc/fabric/usage/env.rst
 share/doc/fabric/usage/execution.rst
@@ -105,6 +113,7 @@ share/doc/fabric/usage/fabfiles.rst
 share/doc/fabric/usage/interactivity.rst
 share/doc/fabric/usage/library.rst
 share/doc/fabric/usage/output_controls.rst
+share/doc/fabric/usage/parallel.rst
 share/doc/fabric/usage/ssh.rst
 share/doc/fabric/usage/tasks.rst
 @pkgdir share/doc/fabric/changes
diff --git a/sysutils/fabric/distinfo b/sysutils/fabric/distinfo
index 7586dfb3791..06c9e01800b 100644
--- a/sysutils/fabric/distinfo
+++ b/sysutils/fabric/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.12 2011/12/04 21:44:52 gls Exp $
+$NetBSD: distinfo,v 1.13 2012/02/12 15:45:34 gls Exp $
 
-SHA1 (Fabric-1.2.5.tar.gz) = 3993e20289ff85b6f2796a8a5b143303f85792ea
-RMD160 (Fabric-1.2.5.tar.gz) = 78d536540eef7504d0e1a57f84a95b35c93a408a
-Size (Fabric-1.2.5.tar.gz) = 157473 bytes
-SHA1 (patch-aa) = 44f9f2103013b015d6ff5faeff5fba5114680f23
+SHA1 (Fabric-1.3.4.tar.gz) = 71d6cbc0c8c9fda8dde8461dd15b4abf7e888c3f
+RMD160 (Fabric-1.3.4.tar.gz) = ea885b85e2c7a98d00bdb21ba10b7dfbd0287779
+Size (Fabric-1.3.4.tar.gz) = 169199 bytes
diff --git a/sysutils/fabric/patches/patch-aa b/sysutils/fabric/patches/patch-aa
deleted file mode 100644
index a8778b6d241..00000000000
--- a/sysutils/fabric/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2011/11/23 19:14:09 gls Exp $
-
-Disable setuptools usage
-
---- setup.py.orig	2011-10-23 22:35:20.000000000 +0000
-+++ setup.py
-@@ -38,7 +38,7 @@ setup(
-     packages=find_packages(),
-     test_suite='nose.collector',
-     tests_require=['nose', 'fudge'],
--    install_requires=['pycrypto >= 1.9, != 2.4', 'paramiko >=1.7.6'],
-+#    install_requires=['pycrypto >= 1.9, < 2.4', 'paramiko >=1.7.6'],
-     entry_points={
-         'console_scripts': [
-             'fab = fabric.main:main',