4 files changed, 43 insertions, 24 deletions

diff --git a/devel/py-boto/Makefile b/devel/py-boto/Makefile
index 024139e7e7d7..c919daa414b3 100644
--- a/devel/py-boto/Makefile
+++ b/devel/py-boto/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	boto
-PORTVERSION=	0.9d
+PORTVERSION=	1.0a
 CATEGORIES=	devel python
 MASTER_SITES=	http://boto.googlecode.com/files/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-boto/distinfo b/devel/py-boto/distinfo
index 1f9418a15fc3..005895289918 100644
--- a/devel/py-boto/distinfo
+++ b/devel/py-boto/distinfo
@@ -1,3 +1,3 @@
-MD5 (boto-0.9d.tar.gz) = 4b84379c10d7b9fded8f85d679dad6ab
-SHA256 (boto-0.9d.tar.gz) = 3c2b743f78ebc279c2bb3c56ce57e77e9086ee88a941c1ca00e50c391844ef2a
-SIZE (boto-0.9d.tar.gz) = 64031
+MD5 (boto-1.0a.tar.gz) = 3c783c9b8d020d874994c710f1babf27
+SHA256 (boto-1.0a.tar.gz) = d4fedac3f3ba3ad868dd21481ea6301d57d0cbd01ef96e533731e60cbac3a651
+SIZE (boto-1.0a.tar.gz) = 71893
diff --git a/devel/py-boto/files/patch-setup.py b/devel/py-boto/files/patch-setup.py
index 7404371938df..eb91ee8f76e5 100644
--- a/devel/py-boto/files/patch-setup.py
+++ b/devel/py-boto/files/patch-setup.py
@@ -1,12 +1,12 @@
-# Prevent installation of test.py in PREFIX/bin, which would easily
-# conflict with other software.
---- setup.py.orig	Thu Aug 23 19:01:03 2007
-+++ setup.py	Thu Aug 23 19:01:22 2007
-@@ -37,7 +37,7 @@
+--- setup.py.orig	2008-01-19 10:06:45.253272917 +0100
++++ setup.py	2008-01-19 10:07:03.283255219 +0100
+@@ -36,8 +36,8 @@
+       author_email = "mitch@garnaat.com",
        url = "http://code.google.com/p/boto/",
-       packages = [ 'boto', 'boto.sqs', 'boto.s3', 'boto.ec2',
-                    'boto.mturk', 'tests'],
+       packages = [ 'boto', 'boto.sqs', 'boto.s3', 'boto.ec2', 'boto.sdb',
+-                   'boto.mturk', 'boto.contrib', 'tests'],
 -      scripts=['test.py'],
++                   'boto.mturk', 'boto.contrib' ],
 +      scripts=[],
        license = 'MIT',
        platforms = 'Posix; MacOS X; Windows',
diff --git a/devel/py-boto/pkg-plist b/devel/py-boto/pkg-plist
index f793762b1528..d87d6e2084f1 100644
--- a/devel/py-boto/pkg-plist
+++ b/devel/py-boto/pkg-plist
@@ -4,6 +4,15 @@
 %%PYTHON_SITELIBDIR%%/boto/connection.py
 %%PYTHON_SITELIBDIR%%/boto/connection.pyc
 %%PYTHON_SITELIBDIR%%/boto/connection.pyo
+%%PYTHON_SITELIBDIR%%/boto/contrib/__init__.py
+%%PYTHON_SITELIBDIR%%/boto/contrib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/boto/contrib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/boto/contrib/m2helpers.py
+%%PYTHON_SITELIBDIR%%/boto/contrib/m2helpers.pyc
+%%PYTHON_SITELIBDIR%%/boto/contrib/m2helpers.pyo
+%%PYTHON_SITELIBDIR%%/boto/contrib/ymlmessage.py
+%%PYTHON_SITELIBDIR%%/boto/contrib/ymlmessage.pyc
+%%PYTHON_SITELIBDIR%%/boto/contrib/ymlmessage.pyo
 %%PYTHON_SITELIBDIR%%/boto/ec2/__init__.py
 %%PYTHON_SITELIBDIR%%/boto/ec2/__init__.pyc
 %%PYTHON_SITELIBDIR%%/boto/ec2/__init__.pyo
@@ -73,6 +82,27 @@
 %%PYTHON_SITELIBDIR%%/boto/s3/user.py
 %%PYTHON_SITELIBDIR%%/boto/s3/user.pyc
 %%PYTHON_SITELIBDIR%%/boto/s3/user.pyo
+%%PYTHON_SITELIBDIR%%/boto/sdb/__init__.py
+%%PYTHON_SITELIBDIR%%/boto/sdb/__init__.pyc
+%%PYTHON_SITELIBDIR%%/boto/sdb/__init__.pyo
+%%PYTHON_SITELIBDIR%%/boto/sdb/attribute.py
+%%PYTHON_SITELIBDIR%%/boto/sdb/attribute.pyc
+%%PYTHON_SITELIBDIR%%/boto/sdb/attribute.pyo
+%%PYTHON_SITELIBDIR%%/boto/sdb/connection.py
+%%PYTHON_SITELIBDIR%%/boto/sdb/connection.pyc
+%%PYTHON_SITELIBDIR%%/boto/sdb/connection.pyo
+%%PYTHON_SITELIBDIR%%/boto/sdb/domain.py
+%%PYTHON_SITELIBDIR%%/boto/sdb/domain.pyc
+%%PYTHON_SITELIBDIR%%/boto/sdb/domain.pyo
+%%PYTHON_SITELIBDIR%%/boto/sdb/item.py
+%%PYTHON_SITELIBDIR%%/boto/sdb/item.pyc
+%%PYTHON_SITELIBDIR%%/boto/sdb/item.pyo
+%%PYTHON_SITELIBDIR%%/boto/sdb/item_orig.py
+%%PYTHON_SITELIBDIR%%/boto/sdb/item_orig.pyc
+%%PYTHON_SITELIBDIR%%/boto/sdb/item_orig.pyo
+%%PYTHON_SITELIBDIR%%/boto/sdb/queryresultset.py
+%%PYTHON_SITELIBDIR%%/boto/sdb/queryresultset.pyc
+%%PYTHON_SITELIBDIR%%/boto/sdb/queryresultset.pyo
 %%PYTHON_SITELIBDIR%%/boto/sqs/__init__.py
 %%PYTHON_SITELIBDIR%%/boto/sqs/__init__.pyc
 %%PYTHON_SITELIBDIR%%/boto/sqs/__init__.pyo
@@ -91,21 +121,10 @@
 %%PYTHON_SITELIBDIR%%/boto/utils.py
 %%PYTHON_SITELIBDIR%%/boto/utils.pyc
 %%PYTHON_SITELIBDIR%%/boto/utils.pyo
-%%PYTHON_SITELIBDIR%%/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tests/test_ec2connection.py
-%%PYTHON_SITELIBDIR%%/tests/test_ec2connection.pyc
-%%PYTHON_SITELIBDIR%%/tests/test_ec2connection.pyo
-%%PYTHON_SITELIBDIR%%/tests/test_s3connection.py
-%%PYTHON_SITELIBDIR%%/tests/test_s3connection.pyc
-%%PYTHON_SITELIBDIR%%/tests/test_s3connection.pyo
-%%PYTHON_SITELIBDIR%%/tests/test_sqsconnection.py
-%%PYTHON_SITELIBDIR%%/tests/test_sqsconnection.pyc
-%%PYTHON_SITELIBDIR%%/tests/test_sqsconnection.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/boto/ec2
 @dirrm %%PYTHON_SITELIBDIR%%/boto/mturk
 @dirrm %%PYTHON_SITELIBDIR%%/boto/s3
 @dirrm %%PYTHON_SITELIBDIR%%/boto/sqs
+@dirrm %%PYTHON_SITELIBDIR%%/boto/contrib
+@dirrm %%PYTHON_SITELIBDIR%%/boto/sdb
 @dirrm %%PYTHON_SITELIBDIR%%/boto
-@dirrm %%PYTHON_SITELIBDIR%%/tests