3 files changed, 189 insertions, 124 deletions

diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile
index 498d8f098336..1de461552de2 100644
--- a/net/py-libcloud/Makefile
+++ b/net/py-libcloud/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libcloud
-PORTVERSION=	0.5.2
+PORTVERSION=	0.6.1
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/py-libcloud/distinfo b/net/py-libcloud/distinfo
index dadec687b4f7..d4dabf5d9208 100644
--- a/net/py-libcloud/distinfo
+++ b/net/py-libcloud/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-libcloud-0.5.2.tar.bz2) = c2fb576ca34518cbef2be6e2178b7406b6eedcac6fbee39611516abc5e9e8b92
-SIZE (apache-libcloud-0.5.2.tar.bz2) = 179159
+SHA256 (apache-libcloud-0.6.1.tar.bz2) = 8e32d640e50fe2b34e5955d9bde56cc04038969a75e0872afcf1ad79572856ae
+SIZE (apache-libcloud-0.6.1.tar.bz2) = 220029
diff --git a/net/py-libcloud/pkg-plist b/net/py-libcloud/pkg-plist
index aacb2c107021..62ee1f5f364d 100644
--- a/net/py-libcloud/pkg-plist
+++ b/net/py-libcloud/pkg-plist
@@ -1,37 +1,75 @@
+%%PYTHON_SITELIBDIR%%/libcloud/dns/__init__.py
+%%PYTHON_SITELIBDIR%%/libcloud/dns/base.py
+%%PYTHON_SITELIBDIR%%/libcloud/dns/providers.py
+%%PYTHON_SITELIBDIR%%/libcloud/dns/types.py
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/__init__.py
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/dummy.py
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/linode.py
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/rackspace.py
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/zerigo.py
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/dummy.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/linode.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/rackspace.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/zerigo.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/dummy.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/linode.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/rackspace.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/dns/drivers/zerigo.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/dns/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/dns/base.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/dns/providers.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/dns/types.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/dns/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/dns/base.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/dns/providers.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/dns/types.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/__init__.py
+%%PYTHON_SITELIBDIR%%/libcloud/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/__init__.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/base.py
-%%PYTHON_SITELIBDIR%%/libcloud/deployment.py
-%%PYTHON_SITELIBDIR%%/libcloud/httplib_ssl.py
-%%PYTHON_SITELIBDIR%%/libcloud/pricing.py
-%%PYTHON_SITELIBDIR%%/libcloud/providers.py
-%%PYTHON_SITELIBDIR%%/libcloud/security.py
-%%PYTHON_SITELIBDIR%%/libcloud/ssh.py
-%%PYTHON_SITELIBDIR%%/libcloud/types.py
-%%PYTHON_SITELIBDIR%%/libcloud/utils.py
+%%PYTHON_SITELIBDIR%%/libcloud/base.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/base.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/common/__init__.py
-%%PYTHON_SITELIBDIR%%/libcloud/common/aws.py
-%%PYTHON_SITELIBDIR%%/libcloud/common/base.py
-%%PYTHON_SITELIBDIR%%/libcloud/common/gogrid.py
-%%PYTHON_SITELIBDIR%%/libcloud/common/rackspace.py
-%%PYTHON_SITELIBDIR%%/libcloud/common/types.py
 %%PYTHON_SITELIBDIR%%/libcloud/common/__init__.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/common/aws.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/common/base.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/common/gogrid.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/common/rackspace.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/common/types.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/common/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/common/aws.py
+%%PYTHON_SITELIBDIR%%/libcloud/common/aws.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/common/aws.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/common/base.py
+%%PYTHON_SITELIBDIR%%/libcloud/common/base.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/common/base.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/common/cloudstack.py
+%%PYTHON_SITELIBDIR%%/libcloud/common/cloudstack.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/common/cloudstack.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/common/gandi.py
+%%PYTHON_SITELIBDIR%%/libcloud/common/gandi.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/common/gandi.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/common/gogrid.py
+%%PYTHON_SITELIBDIR%%/libcloud/common/gogrid.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/common/gogrid.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/common/linode.py
+%%PYTHON_SITELIBDIR%%/libcloud/common/linode.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/common/linode.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/common/openstack.py
+%%PYTHON_SITELIBDIR%%/libcloud/common/openstack.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/common/openstack.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/common/rackspace.py
+%%PYTHON_SITELIBDIR%%/libcloud/common/rackspace.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/common/rackspace.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/common/types.py
+%%PYTHON_SITELIBDIR%%/libcloud/common/types.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/common/types.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/compute/__init__.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/__init__.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/compute/base.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/base.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/base.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/compute/deployment.py
-%%PYTHON_SITELIBDIR%%/libcloud/compute/providers.py
-%%PYTHON_SITELIBDIR%%/libcloud/compute/ssh.py
-%%PYTHON_SITELIBDIR%%/libcloud/compute/types.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/deployment.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/deployment.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/__init__.py
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/__init__.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/__init__.pyo
@@ -44,6 +82,9 @@
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/cloudsigma.py
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/cloudsigma.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/cloudsigma.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/cloudstack.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/cloudstack.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/cloudstack.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/dreamhost.py
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/dreamhost.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/dreamhost.pyo
@@ -74,9 +115,15 @@
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/linode.py
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/linode.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/linode.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/ninefold.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/ninefold.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/ninefold.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/opennebula.py
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/opennebula.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/opennebula.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/openstack.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/openstack.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/openstack.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/opsource.py
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/opsource.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/opsource.pyo
@@ -107,148 +154,166 @@
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/vpsnet.py
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/vpsnet.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/vpsnet.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/compute/__init__.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/compute/base.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/compute/deployment.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/providers.py
 %%PYTHON_SITELIBDIR%%/libcloud/compute/providers.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/compute/ssh.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/compute/types.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/compute/__init__.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/compute/base.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/compute/deployment.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/compute/providers.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/ssh.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/ssh.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/compute/ssh.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/types.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/types.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/compute/types.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/storage/__init__.py
-%%PYTHON_SITELIBDIR%%/libcloud/storage/base.py
-%%PYTHON_SITELIBDIR%%/libcloud/storage/providers.py
-%%PYTHON_SITELIBDIR%%/libcloud/storage/types.py
-%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/__init__.py
-%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/cloudfiles.py
-%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/dummy.py
-%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/s3.py
-%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/cloudfiles.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/dummy.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/s3.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/__init__.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/cloudfiles.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/dummy.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/s3.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/storage/__init__.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/storage/base.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/storage/providers.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/storage/types.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/storage/__init__.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/storage/base.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/storage/providers.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/storage/types.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/data/pricing.json
+%%PYTHON_SITELIBDIR%%/libcloud/deployment.py
+%%PYTHON_SITELIBDIR%%/libcloud/deployment.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/deployment.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/__init__.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/brightbox.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/cloudsigma.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/dreamhost.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/dummy.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/ec2.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/ecp.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/elastichosts.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/gogrid.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/ibm_sbc.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/linode.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/opennebula.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/rackspace.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/rimuhosting.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/slicehost.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/softlayer.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/vcloud.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/voxel.py
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/vpsnet.py
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/brightbox.py
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/brightbox.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/brightbox.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/cloudsigma.py
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/cloudsigma.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/cloudsigma.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/dreamhost.py
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/dreamhost.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/dreamhost.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/dummy.py
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/dummy.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/dummy.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/ec2.py
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/ec2.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/ec2.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/ecp.py
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/ecp.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/ecp.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/elastichosts.py
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/elastichosts.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/elastichosts.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/gogrid.py
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/gogrid.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/ibm_sbc.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/linode.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/opennebula.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/rackspace.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/rimuhosting.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/slicehost.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/softlayer.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/vcloud.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/voxel.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/vpsnet.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/__init__.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/brightbox.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/cloudsigma.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/dreamhost.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/dummy.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/ec2.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/ecp.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/gogrid.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/drivers/elastichosts.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/ibm_sbc.py
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/ibm_sbc.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/ibm_sbc.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/linode.py
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/linode.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/linode.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/opennebula.py
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/opennebula.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/opennebula.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/rackspace.py
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/rackspace.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/rackspace.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/rimuhosting.py
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/rimuhosting.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/rimuhosting.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/slicehost.py
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/slicehost.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/slicehost.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/softlayer.py
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/softlayer.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/softlayer.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/vcloud.py
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/vcloud.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/vcloud.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/voxel.py
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/voxel.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/voxel.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/vpsnet.py
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/vpsnet.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/vpsnet.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/httplib_ssl.py
+%%PYTHON_SITELIBDIR%%/libcloud/httplib_ssl.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/httplib_ssl.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/__init__.py
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/__init__.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/base.py
-%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/providers.py
-%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/types.py
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/base.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/base.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/__init__.py
-%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/gogrid.py
-%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/rackspace.py
 %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/gogrid.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/rackspace.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/cloudstack.py
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/cloudstack.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/cloudstack.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/gogrid.py
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/gogrid.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/gogrid.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/ninefold.py
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/ninefold.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/ninefold.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/rackspace.py
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/rackspace.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/rackspace.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/__init__.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/base.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/providers.py
 %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/providers.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/types.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/__init__.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/base.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/providers.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/types.py
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/types.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/types.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/data/pricing.json
-%%PYTHON_SITELIBDIR%%/libcloud/__init__.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/base.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/deployment.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/httplib_ssl.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/pricing.py
 %%PYTHON_SITELIBDIR%%/libcloud/pricing.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/providers.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/security.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/ssh.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/types.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/utils.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/__init__.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/base.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/deployment.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/httplib_ssl.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/pricing.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/providers.py
+%%PYTHON_SITELIBDIR%%/libcloud/providers.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/providers.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/security.py
+%%PYTHON_SITELIBDIR%%/libcloud/security.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/security.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/ssh.py
+%%PYTHON_SITELIBDIR%%/libcloud/ssh.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/ssh.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/storage/__init__.py
+%%PYTHON_SITELIBDIR%%/libcloud/storage/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/storage/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/storage/base.py
+%%PYTHON_SITELIBDIR%%/libcloud/storage/base.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/storage/base.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/__init__.py
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/atmos.py
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/atmos.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/atmos.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/cloudfiles.py
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/cloudfiles.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/cloudfiles.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/dummy.py
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/dummy.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/dummy.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/google_storage.py
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/google_storage.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/google_storage.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/ninefold.py
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/ninefold.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/ninefold.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/s3.py
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/s3.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/storage/drivers/s3.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/storage/providers.py
+%%PYTHON_SITELIBDIR%%/libcloud/storage/providers.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/storage/providers.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/storage/types.py
+%%PYTHON_SITELIBDIR%%/libcloud/storage/types.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/storage/types.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/types.py
+%%PYTHON_SITELIBDIR%%/libcloud/types.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/types.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/utils.py
+%%PYTHON_SITELIBDIR%%/libcloud/utils.pyc
 %%PYTHON_SITELIBDIR%%/libcloud/utils.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/libcloud/storage/drivers
-@dirrm %%PYTHON_SITELIBDIR%%/libcloud/storage
-@dirrm %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers
-@dirrm %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer
-@dirrm %%PYTHON_SITELIBDIR%%/libcloud/drivers
-@dirrm %%PYTHON_SITELIBDIR%%/libcloud/data
+@dirrm %%PYTHON_SITELIBDIR%%/libcloud/common
 @dirrm %%PYTHON_SITELIBDIR%%/libcloud/compute/drivers
 @dirrm %%PYTHON_SITELIBDIR%%/libcloud/compute
-@dirrm %%PYTHON_SITELIBDIR%%/libcloud/common
+@dirrm %%PYTHON_SITELIBDIR%%/libcloud/data
+@dirrm %%PYTHON_SITELIBDIR%%/libcloud/dns/drivers
+@dirrm %%PYTHON_SITELIBDIR%%/libcloud/dns
+@dirrm %%PYTHON_SITELIBDIR%%/libcloud/drivers
+@dirrm %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers
+@dirrm %%PYTHON_SITELIBDIR%%/libcloud/loadbalancer
+@dirrm %%PYTHON_SITELIBDIR%%/libcloud/storage/drivers
+@dirrm %%PYTHON_SITELIBDIR%%/libcloud/storage
 @dirrm %%PYTHON_SITELIBDIR%%/libcloud