4 files changed, 222 insertions, 59 deletions

diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile
index e66cea7ec173..fa3af6be3407 100644
--- a/net/py-libcloud/Makefile
+++ b/net/py-libcloud/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	libcloud
-PORTVERSION=	0.4.2
+PORTVERSION=	0.5.0
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	incubator/libcloud
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	apache-${PORTNAME}-incubating-${PORTVERSION}
+DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Standard client library for many popular cloud providers
@@ -22,8 +22,6 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 USE_BZIP2=	yes
 
-WRKSRC=		${WRKDIR}/apache-${PORTNAME}-incubating-${PORTVERSION}
-
 PYDISTUTILS_EGGINFO=	apache_${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg-info
 
 .include <bsd.port.mk>
diff --git a/net/py-libcloud/distinfo b/net/py-libcloud/distinfo
index 18fa0981cb07..0def56467359 100644
--- a/net/py-libcloud/distinfo
+++ b/net/py-libcloud/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-libcloud-incubating-0.4.2.tar.bz2) = 030a0bf48ebc9bf1e1950ff9fffeead5199d587624e2488b5555fe4d92e566aa
-SIZE (apache-libcloud-incubating-0.4.2.tar.bz2) = 118075
+SHA256 (apache-libcloud-0.5.0.tar.bz2) = 797724aa67e3da94e21d54d7a683557e5f7b73524f941da18d3e15be9bc9161c
+SIZE (apache-libcloud-0.5.0.tar.bz2) = 171850
diff --git a/net/py-libcloud/pkg-descr b/net/py-libcloud/pkg-descr
index eae4ede27752..3b3c2177d0fd 100644
--- a/net/py-libcloud/pkg-descr
+++ b/net/py-libcloud/pkg-descr
@@ -3,4 +3,4 @@ cloud server providers. It was created to make it easy for developers
 to build products that work between any of the services that it
 supports.
 
-WWW: http://incubator.apache.org/libcloud/
+WWW: http://libcloud.apache.org/
diff --git a/net/py-libcloud/pkg-plist b/net/py-libcloud/pkg-plist
index 73f0fafff42c..b055388f5077 100644
--- a/net/py-libcloud/pkg-plist
+++ b/net/py-libcloud/pkg-plist
@@ -1,83 +1,248 @@
 %%PYTHON_SITELIBDIR%%/libcloud/__init__.py
-%%PYTHON_SITELIBDIR%%/libcloud/__init__.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/__init__.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/base.py
-%%PYTHON_SITELIBDIR%%/libcloud/base.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/base.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/deployment.py
-%%PYTHON_SITELIBDIR%%/libcloud/deployment.pyc
-%%PYTHON_SITELIBDIR%%/libcloud/deployment.pyo
+%%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/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.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/common/base.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/common/gogrid.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/common/rackspace.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/common/types.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/__init__.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/base.py
+%%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/drivers/__init__.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/bluebox.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/brightbox.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/cloudsigma.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/dreamhost.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/dummy.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/ec2.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/ecp.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/elastichosts.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/gandi.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/gogrid.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/ibm_sbc.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/linode.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/opennebula.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/opsource.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/rackspace.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/rimuhosting.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/slicehost.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/softlayer.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/vcloud.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/voxel.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/vpsnet.py
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/bluebox.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/brightbox.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/cloudsigma.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/dreamhost.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/dummy.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/ec2.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/ecp.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/elastichosts.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/gandi.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/gogrid.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/ibm_sbc.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/linode.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/opennebula.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/opsource.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/rackspace.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/rimuhosting.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/slicehost.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/softlayer.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/vcloud.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/voxel.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/vpsnet.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/bluebox.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/brightbox.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/cloudsigma.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/dreamhost.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/dummy.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/ec2.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/ecp.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/elastichosts.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/gandi.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/gogrid.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/ibm_sbc.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/linode.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/opennebula.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/opsource.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/rackspace.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/rimuhosting.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/slicehost.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/softlayer.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/vcloud.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/compute/drivers/voxel.pyo
+%%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.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.pyo
+%%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/google_storage.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/google_storage.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/google_storage.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/drivers/__init__.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/gogrid.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/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/brightbox.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/cloudsigma.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/dreamhost.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/dummy.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/ec2.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/ecp.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/elastichosts.pyc
+%%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.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/linode.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/opennebula.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/rackspace.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/rimuhosting.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/slicehost.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/softlayer.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/vcloud.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/drivers/voxel.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/drivers/vpsnet.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/httplib_ssl.py
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/__init__.py
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/base.py
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/providers.py
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/types.py
+%%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/gogrid.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/drivers/rackspace.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libcloud/loadbalancer/base.pyc
+%%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.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/httplib_ssl.pyo
-%%PYTHON_SITELIBDIR%%/libcloud/providers.py
+%%PYTHON_SITELIBDIR%%/libcloud/pricing.pyc
 %%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/types.py
 %%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.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/security.pyo
+%%PYTHON_SITELIBDIR%%/libcloud/ssh.pyo
 %%PYTHON_SITELIBDIR%%/libcloud/types.pyo
+%%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/compute/drivers
+@dirrm %%PYTHON_SITELIBDIR%%/libcloud/compute
+@dirrm %%PYTHON_SITELIBDIR%%/libcloud/common
 @dirrm %%PYTHON_SITELIBDIR%%/libcloud