Update py-oauth2client to 2.0.0.

## v2.0.0

* Add django_util (#332)
* Avoid OAuth2Credentials `id_token` going out of sync after a token
  refresh (#337)
* Move to a `contrib` sub-package code not considered a core part of
  the library (#346, #353, #370, #375, #376, #382)
* Add `token_expiry` to `devshell` credentials (#372)
* Move `Storage` locking into a base class (#379)
* Added dictionary storage (#380)
* Added `to_json` and `from_json` methods to all `Credentials`
  classes (#385)
* Fall back to read-only credentials on EACCES errors (#389)
* Coalesced the two `ServiceAccountCredentials`
  classes (#395, #396, #397, #398, #400)

### Special Note About `ServiceAccountCredentials`:
-------------------------------------------------

For JSON keys, you can create a credential via

```py
from oauth2client.service_account import ServiceAccountCredentials
credentials = ServiceAccountCredentials.from_json_keyfile_name(
    key_file_name, scopes=[...])
```

You can still rely on

```py
from oauth2client.client import GoogleCredentials
credentials = GoogleCredentials.get_application_default()
```

returning these credentials when you set the `GOOGLE_APPLICATION_CREDENTIALS`
environment variable.

For `.p12` keys, construct via

```py
credentials = ServiceAccountCredentials.from_p12_keyfil(
    service_account_email, key_file_name, scopes=[...])
```

though we urge you to use JSON keys (rather than `.p12` keys) if you can.

This is equivalent to the previous method

```py
# PRE-oauth2client 2.0.0 EXAMPLE CODE!
from oauth2client.client import SignedJwtAssertionCredentials

with open(key_file_name, 'rb') as key_file:
    private_key = key_file.read()

credentials = SignedJwtAssertionCredentials(
    service_account_email, private_key, scope=[...])
```

3 files changed, 140 insertions, 35 deletions

diff --git a/security/py-oauth2client/Makefile b/security/py-oauth2client/Makefile
index 42ddd6c9fde..63ac77c0643 100644
--- a/security/py-oauth2client/Makefile
+++ b/security/py-oauth2client/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2016/02/15 10:45:40 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/03/03 12:59:55 wiz Exp $
 
-DISTNAME=	oauth2client-1.5.2
+DISTNAME=	oauth2client-2.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security net python
 MASTER_SITES=	-https://github.com/google/oauth2client/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX}
diff --git a/security/py-oauth2client/PLIST b/security/py-oauth2client/PLIST
index 9f40815dd9b..3532e35e934 100644
--- a/security/py-oauth2client/PLIST
+++ b/security/py-oauth2client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/02/15 10:45:40 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/03/03 12:59:55 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -13,45 +13,78 @@ ${PYSITELIB}/oauth2client/_helpers.pyo
 ${PYSITELIB}/oauth2client/_openssl_crypt.py
 ${PYSITELIB}/oauth2client/_openssl_crypt.pyc
 ${PYSITELIB}/oauth2client/_openssl_crypt.pyo
+${PYSITELIB}/oauth2client/_pure_python_crypt.py
+${PYSITELIB}/oauth2client/_pure_python_crypt.pyc
+${PYSITELIB}/oauth2client/_pure_python_crypt.pyo
 ${PYSITELIB}/oauth2client/_pycrypto_crypt.py
 ${PYSITELIB}/oauth2client/_pycrypto_crypt.pyc
 ${PYSITELIB}/oauth2client/_pycrypto_crypt.pyo
-${PYSITELIB}/oauth2client/appengine.py
-${PYSITELIB}/oauth2client/appengine.pyc
-${PYSITELIB}/oauth2client/appengine.pyo
 ${PYSITELIB}/oauth2client/client.py
 ${PYSITELIB}/oauth2client/client.pyc
 ${PYSITELIB}/oauth2client/client.pyo
 ${PYSITELIB}/oauth2client/clientsecrets.py
 ${PYSITELIB}/oauth2client/clientsecrets.pyc
 ${PYSITELIB}/oauth2client/clientsecrets.pyo
+${PYSITELIB}/oauth2client/contrib/__init__.py
+${PYSITELIB}/oauth2client/contrib/__init__.pyc
+${PYSITELIB}/oauth2client/contrib/__init__.pyo
+${PYSITELIB}/oauth2client/contrib/appengine.py
+${PYSITELIB}/oauth2client/contrib/appengine.pyc
+${PYSITELIB}/oauth2client/contrib/appengine.pyo
+${PYSITELIB}/oauth2client/contrib/devshell.py
+${PYSITELIB}/oauth2client/contrib/devshell.pyc
+${PYSITELIB}/oauth2client/contrib/devshell.pyo
+${PYSITELIB}/oauth2client/contrib/dictionary_storage.py
+${PYSITELIB}/oauth2client/contrib/dictionary_storage.pyc
+${PYSITELIB}/oauth2client/contrib/dictionary_storage.pyo
+${PYSITELIB}/oauth2client/contrib/django_orm.py
+${PYSITELIB}/oauth2client/contrib/django_orm.pyc
+${PYSITELIB}/oauth2client/contrib/django_orm.pyo
+${PYSITELIB}/oauth2client/contrib/django_util/__init__.py
+${PYSITELIB}/oauth2client/contrib/django_util/__init__.pyc
+${PYSITELIB}/oauth2client/contrib/django_util/__init__.pyo
+${PYSITELIB}/oauth2client/contrib/django_util/apps.py
+${PYSITELIB}/oauth2client/contrib/django_util/apps.pyc
+${PYSITELIB}/oauth2client/contrib/django_util/apps.pyo
+${PYSITELIB}/oauth2client/contrib/django_util/decorators.py
+${PYSITELIB}/oauth2client/contrib/django_util/decorators.pyc
+${PYSITELIB}/oauth2client/contrib/django_util/decorators.pyo
+${PYSITELIB}/oauth2client/contrib/django_util/signals.py
+${PYSITELIB}/oauth2client/contrib/django_util/signals.pyc
+${PYSITELIB}/oauth2client/contrib/django_util/signals.pyo
+${PYSITELIB}/oauth2client/contrib/django_util/site.py
+${PYSITELIB}/oauth2client/contrib/django_util/site.pyc
+${PYSITELIB}/oauth2client/contrib/django_util/site.pyo
+${PYSITELIB}/oauth2client/contrib/django_util/storage.py
+${PYSITELIB}/oauth2client/contrib/django_util/storage.pyc
+${PYSITELIB}/oauth2client/contrib/django_util/storage.pyo
+${PYSITELIB}/oauth2client/contrib/django_util/views.py
+${PYSITELIB}/oauth2client/contrib/django_util/views.pyc
+${PYSITELIB}/oauth2client/contrib/django_util/views.pyo
+${PYSITELIB}/oauth2client/contrib/flask_util.py
+${PYSITELIB}/oauth2client/contrib/flask_util.pyc
+${PYSITELIB}/oauth2client/contrib/flask_util.pyo
+${PYSITELIB}/oauth2client/contrib/gce.py
+${PYSITELIB}/oauth2client/contrib/gce.pyc
+${PYSITELIB}/oauth2client/contrib/gce.pyo
+${PYSITELIB}/oauth2client/contrib/keyring_storage.py
+${PYSITELIB}/oauth2client/contrib/keyring_storage.pyc
+${PYSITELIB}/oauth2client/contrib/keyring_storage.pyo
+${PYSITELIB}/oauth2client/contrib/locked_file.py
+${PYSITELIB}/oauth2client/contrib/locked_file.pyc
+${PYSITELIB}/oauth2client/contrib/locked_file.pyo
+${PYSITELIB}/oauth2client/contrib/multistore_file.py
+${PYSITELIB}/oauth2client/contrib/multistore_file.pyc
+${PYSITELIB}/oauth2client/contrib/multistore_file.pyo
+${PYSITELIB}/oauth2client/contrib/xsrfutil.py
+${PYSITELIB}/oauth2client/contrib/xsrfutil.pyc
+${PYSITELIB}/oauth2client/contrib/xsrfutil.pyo
 ${PYSITELIB}/oauth2client/crypt.py
 ${PYSITELIB}/oauth2client/crypt.pyc
 ${PYSITELIB}/oauth2client/crypt.pyo
-${PYSITELIB}/oauth2client/devshell.py
-${PYSITELIB}/oauth2client/devshell.pyc
-${PYSITELIB}/oauth2client/devshell.pyo
-${PYSITELIB}/oauth2client/django_orm.py
-${PYSITELIB}/oauth2client/django_orm.pyc
-${PYSITELIB}/oauth2client/django_orm.pyo
 ${PYSITELIB}/oauth2client/file.py
 ${PYSITELIB}/oauth2client/file.pyc
 ${PYSITELIB}/oauth2client/file.pyo
-${PYSITELIB}/oauth2client/flask_util.py
-${PYSITELIB}/oauth2client/flask_util.pyc
-${PYSITELIB}/oauth2client/flask_util.pyo
-${PYSITELIB}/oauth2client/gce.py
-${PYSITELIB}/oauth2client/gce.pyc
-${PYSITELIB}/oauth2client/gce.pyo
-${PYSITELIB}/oauth2client/keyring_storage.py
-${PYSITELIB}/oauth2client/keyring_storage.pyc
-${PYSITELIB}/oauth2client/keyring_storage.pyo
-${PYSITELIB}/oauth2client/locked_file.py
-${PYSITELIB}/oauth2client/locked_file.pyc
-${PYSITELIB}/oauth2client/locked_file.pyo
-${PYSITELIB}/oauth2client/multistore_file.py
-${PYSITELIB}/oauth2client/multistore_file.pyc
-${PYSITELIB}/oauth2client/multistore_file.pyo
 ${PYSITELIB}/oauth2client/service_account.py
 ${PYSITELIB}/oauth2client/service_account.pyc
 ${PYSITELIB}/oauth2client/service_account.pyo
@@ -61,6 +94,78 @@ ${PYSITELIB}/oauth2client/tools.pyo
 ${PYSITELIB}/oauth2client/util.py
 ${PYSITELIB}/oauth2client/util.pyc
 ${PYSITELIB}/oauth2client/util.pyo
-${PYSITELIB}/oauth2client/xsrfutil.py
-${PYSITELIB}/oauth2client/xsrfutil.pyc
-${PYSITELIB}/oauth2client/xsrfutil.pyo
+${PYSITELIB}/tests/__init__.py
+${PYSITELIB}/tests/__init__.pyc
+${PYSITELIB}/tests/__init__.pyo
+${PYSITELIB}/tests/contrib/__init__.py
+${PYSITELIB}/tests/contrib/__init__.pyc
+${PYSITELIB}/tests/contrib/__init__.pyo
+${PYSITELIB}/tests/contrib/test_appengine.py
+${PYSITELIB}/tests/contrib/test_appengine.pyc
+${PYSITELIB}/tests/contrib/test_appengine.pyo
+${PYSITELIB}/tests/contrib/test_devshell.py
+${PYSITELIB}/tests/contrib/test_devshell.pyc
+${PYSITELIB}/tests/contrib/test_devshell.pyo
+${PYSITELIB}/tests/contrib/test_dictionary_storage.py
+${PYSITELIB}/tests/contrib/test_dictionary_storage.pyc
+${PYSITELIB}/tests/contrib/test_dictionary_storage.pyo
+${PYSITELIB}/tests/contrib/test_django_orm.py
+${PYSITELIB}/tests/contrib/test_django_orm.pyc
+${PYSITELIB}/tests/contrib/test_django_orm.pyo
+${PYSITELIB}/tests/contrib/test_django_settings.py
+${PYSITELIB}/tests/contrib/test_django_settings.pyc
+${PYSITELIB}/tests/contrib/test_django_settings.pyo
+${PYSITELIB}/tests/contrib/test_django_util.py
+${PYSITELIB}/tests/contrib/test_django_util.pyc
+${PYSITELIB}/tests/contrib/test_django_util.pyo
+${PYSITELIB}/tests/contrib/test_flask_util.py
+${PYSITELIB}/tests/contrib/test_flask_util.pyc
+${PYSITELIB}/tests/contrib/test_flask_util.pyo
+${PYSITELIB}/tests/contrib/test_gce.py
+${PYSITELIB}/tests/contrib/test_gce.pyc
+${PYSITELIB}/tests/contrib/test_gce.pyo
+${PYSITELIB}/tests/contrib/test_keyring_storage.py
+${PYSITELIB}/tests/contrib/test_keyring_storage.pyc
+${PYSITELIB}/tests/contrib/test_keyring_storage.pyo
+${PYSITELIB}/tests/contrib/test_multistore_file.py
+${PYSITELIB}/tests/contrib/test_multistore_file.pyc
+${PYSITELIB}/tests/contrib/test_multistore_file.pyo
+${PYSITELIB}/tests/contrib/test_xsrfutil.py
+${PYSITELIB}/tests/contrib/test_xsrfutil.pyc
+${PYSITELIB}/tests/contrib/test_xsrfutil.pyo
+${PYSITELIB}/tests/http_mock.py
+${PYSITELIB}/tests/http_mock.pyc
+${PYSITELIB}/tests/http_mock.pyo
+${PYSITELIB}/tests/test__helpers.py
+${PYSITELIB}/tests/test__helpers.pyc
+${PYSITELIB}/tests/test__helpers.pyo
+${PYSITELIB}/tests/test__pure_python_crypt.py
+${PYSITELIB}/tests/test__pure_python_crypt.pyc
+${PYSITELIB}/tests/test__pure_python_crypt.pyo
+${PYSITELIB}/tests/test__pycrypto_crypt.py
+${PYSITELIB}/tests/test__pycrypto_crypt.pyc
+${PYSITELIB}/tests/test__pycrypto_crypt.pyo
+${PYSITELIB}/tests/test_client.py
+${PYSITELIB}/tests/test_client.pyc
+${PYSITELIB}/tests/test_client.pyo
+${PYSITELIB}/tests/test_clientsecrets.py
+${PYSITELIB}/tests/test_clientsecrets.pyc
+${PYSITELIB}/tests/test_clientsecrets.pyo
+${PYSITELIB}/tests/test_crypt.py
+${PYSITELIB}/tests/test_crypt.pyc
+${PYSITELIB}/tests/test_crypt.pyo
+${PYSITELIB}/tests/test_file.py
+${PYSITELIB}/tests/test_file.pyc
+${PYSITELIB}/tests/test_file.pyo
+${PYSITELIB}/tests/test_jwt.py
+${PYSITELIB}/tests/test_jwt.pyc
+${PYSITELIB}/tests/test_jwt.pyo
+${PYSITELIB}/tests/test_service_account.py
+${PYSITELIB}/tests/test_service_account.pyc
+${PYSITELIB}/tests/test_service_account.pyo
+${PYSITELIB}/tests/test_tools.py
+${PYSITELIB}/tests/test_tools.pyc
+${PYSITELIB}/tests/test_tools.pyo
+${PYSITELIB}/tests/test_util.py
+${PYSITELIB}/tests/test_util.pyc
+${PYSITELIB}/tests/test_util.pyo
diff --git a/security/py-oauth2client/distinfo b/security/py-oauth2client/distinfo
index eb07229999e..867235533ac 100644
--- a/security/py-oauth2client/distinfo
+++ b/security/py-oauth2client/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2016/02/15 10:45:40 wiz Exp $
+$NetBSD: distinfo,v 1.5 2016/03/03 12:59:55 wiz Exp $
 
-SHA1 (oauth2client-1.5.2.tar.gz) = a269d0b07126bd09a6fa983c473d793c12c67c35
-RMD160 (oauth2client-1.5.2.tar.gz) = bbdea991db5a654ca4590b34a503c97c2fe8fe87
-SHA512 (oauth2client-1.5.2.tar.gz) = 15f10b52aa93fc10289658d5ff671a247e5c92c5ff2be424a04617fee1a3a82439b829b0f5dcb04e3e84802e02580e366e08356df7ec6e24563a530d2f6b1db5
-Size (oauth2client-1.5.2.tar.gz) = 131665 bytes
+SHA1 (oauth2client-2.0.0.tar.gz) = 4f5e710b85d18df312fed8ecec56e82f73fc5591
+RMD160 (oauth2client-2.0.0.tar.gz) = d952d17777a52754458107c7a5818f9e816ae666
+SHA512 (oauth2client-2.0.0.tar.gz) = 4839f9ea6384fa19ee55ee953ef4e38211afd7e409a77658e535534632dd182aabb857cebc1969bcba5d80c63fa79f965a2c0b1bb2832975c1ed8dd3cd6d3042
+Size (oauth2client-2.0.0.tar.gz) = 148575 bytes