4 files changed, 27 insertions, 23 deletions

diff --git a/sysutils/py-salt-cloud/Makefile b/sysutils/py-salt-cloud/Makefile
index a9027bdfec83..2abf36b0109f 100644
--- a/sysutils/py-salt-cloud/Makefile
+++ b/sysutils/py-salt-cloud/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	salt-cloud
-PORTVERSION=	0.8.4
+PORTVERSION=	0.8.6
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,12 +21,11 @@ SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 MAN1=		salt-cloud.1
 MAN7=		salt-cloud.7
 
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}salt>0:${PORTSDIR}/sysutils/py-salt \
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}salt>=0.13.0:${PORTSDIR}/sysutils/py-salt \
 		${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}libcloud>=0:${PORTSDIR}/net/py-libcloud \
-		${PYTHON_PKGNAMEPREFIX}paramiko>=0:${PORTSDIR}/security/py-paramiko \
-
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+		${PYTHON_PKGNAMEPREFIX}libcloud>=0.11.4:${PORTSDIR}/net/py-libcloud \
+		${PYTHON_PKGNAMEPREFIX}botocore>=0:${PORTSDIR}/devel/py-botocore \
+		sshpass>=0:${PORTSDIR}/security/sshpass
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/setup.py
diff --git a/sysutils/py-salt-cloud/distinfo b/sysutils/py-salt-cloud/distinfo
index 101a7122d967..e613fdca5566 100644
--- a/sysutils/py-salt-cloud/distinfo
+++ b/sysutils/py-salt-cloud/distinfo
@@ -1,2 +1,2 @@
-SHA256 (salt-cloud-0.8.4.tar.gz) = 376c0cbb0667a54c5ef1a5913bef6a61d72f7dbbe5bf24cabcd4894b66eeaf6a
-SIZE (salt-cloud-0.8.4.tar.gz) = 70189
+SHA256 (salt-cloud-0.8.6.tar.gz) = daa9f5f2cdef8d66a590c29b4058790eebb45582f270d0da2e1eeb4e8757e671
+SIZE (salt-cloud-0.8.6.tar.gz) = 109341
diff --git a/sysutils/py-salt-cloud/files/patch-setup.py b/sysutils/py-salt-cloud/files/patch-setup.py
index a4175ea24a54..ad3af5154ec9 100644
--- a/sysutils/py-salt-cloud/files/patch-setup.py
+++ b/sysutils/py-salt-cloud/files/patch-setup.py
@@ -1,14 +1,13 @@
---- work/salt-cloud-0.6.0/setup.py	2012-07-13 11:50:56.000000000 -0600
-+++ setup.py	2012-07-16 13:07:15.901865171 -0600
-@@ -45,9 +45,9 @@
+--- setup.py	2013-03-13 11:37:54.772115975 -0600
++++ setup.py	2013-03-13 11:38:21.415251065 -0600
+@@ -67,8 +67,8 @@
        package_data={
-           'saltcloud': ['deploy/*'],
+           'saltcloud': ['deploy/*.sh'],
            },
--      data_files=[('share/man/man1',
-+      data_files=[('man/man1',
-                      ['doc/man/salt-cloud.1']),
--                     ('share/man/man7',
-+                     ('man/man7',
-                      ['doc/man/salt-cloud.7'])],
+-      data_files=[('share/man/man1', ['doc/man/salt-cloud.1']),
+-                  ('share/man/man7', ['doc/man/salt-cloud.7'])
++      data_files=[('man/man1', ['doc/man/salt-cloud.1']),
++                  ('man/man7', ['doc/man/salt-cloud.7'])
+                   ],
        scripts=['scripts/salt-cloud'],
-      )
+       **setup_kwargs
diff --git a/sysutils/py-salt-cloud/pkg-plist b/sysutils/py-salt-cloud/pkg-plist
index 85ef943edc6b..5350c6dbf0bf 100644
--- a/sysutils/py-salt-cloud/pkg-plist
+++ b/sysutils/py-salt-cloud/pkg-plist
@@ -11,9 +11,15 @@ bin/salt-cloud
 %%PYTHON_SITELIBDIR%%/saltcloud/clouds/__init__.py
 %%PYTHON_SITELIBDIR%%/saltcloud/clouds/__init__.pyc
 %%PYTHON_SITELIBDIR%%/saltcloud/clouds/__init__.pyo
-%%PYTHON_SITELIBDIR%%/saltcloud/clouds/aws.py
-%%PYTHON_SITELIBDIR%%/saltcloud/clouds/aws.pyc
-%%PYTHON_SITELIBDIR%%/saltcloud/clouds/aws.pyo
+%%PYTHON_SITELIBDIR%%/saltcloud/clouds/botocore_aws.py
+%%PYTHON_SITELIBDIR%%/saltcloud/clouds/botocore_aws.pyc
+%%PYTHON_SITELIBDIR%%/saltcloud/clouds/botocore_aws.pyo
+%%PYTHON_SITELIBDIR%%/saltcloud/clouds/libcloud_aws.py
+%%PYTHON_SITELIBDIR%%/saltcloud/clouds/libcloud_aws.pyc
+%%PYTHON_SITELIBDIR%%/saltcloud/clouds/libcloud_aws.pyo
+%%PYTHON_SITELIBDIR%%/saltcloud/clouds/ec2.py
+%%PYTHON_SITELIBDIR%%/saltcloud/clouds/ec2.pyc
+%%PYTHON_SITELIBDIR%%/saltcloud/clouds/ec2.pyo
 %%PYTHON_SITELIBDIR%%/saltcloud/clouds/gogrid.py
 %%PYTHON_SITELIBDIR%%/saltcloud/clouds/gogrid.pyc
 %%PYTHON_SITELIBDIR%%/saltcloud/clouds/gogrid.pyo
@@ -39,7 +45,7 @@ bin/salt-cloud
 %%PYTHON_SITELIBDIR%%/saltcloud/deploy/Arch.sh
 %%PYTHON_SITELIBDIR%%/saltcloud/deploy/Debian-git.sh
 %%PYTHON_SITELIBDIR%%/saltcloud/deploy/Debian.sh
-%%PYTHON_SITELIBDIR%%/saltcloud/deploy/bootstrap-salt-minion.sh
+%%PYTHON_SITELIBDIR%%/saltcloud/deploy/bootstrap-salt.sh
 %%PYTHON_SITELIBDIR%%/saltcloud/deploy/curl-bootstrap-git.sh
 %%PYTHON_SITELIBDIR%%/saltcloud/deploy/curl-bootstrap.sh
 %%PYTHON_SITELIBDIR%%/saltcloud/deploy/Fedora-git.sh