Update py-google-apitools to 0.5.23.

Now with Python 3 support.

(I forgot to commit this as part of the py-gsutil upgrade. Sorry.)

5 files changed, 8 insertions, 73 deletions

diff --git a/www/py-google-apitools/Makefile b/www/py-google-apitools/Makefile
index c109e14fdc7..8ec62b49419 100644
--- a/www/py-google-apitools/Makefile
+++ b/www/py-google-apitools/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/02/05 15:05:02 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2018/06/16 20:31:12 bsiegert Exp $
 
-DISTNAME=	google-apitools-0.5.21
+DISTNAME=	google-apitools-0.5.23
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/google-apitools/}
@@ -12,7 +12,6 @@ LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-fasteners>=0.14:../../devel/py-fasteners
 DEPENDS+=	${PYPKGPREFIX}-gflags>=3.0.6:../../devel/py-gflags
-DEPENDS+=	${PYPKGPREFIX}-google-apputils>=0.4.0:../../devel/py-google-apputils
 DEPENDS+=	${PYPKGPREFIX}-httplib2>=0.8:../../www/py-httplib2
 DEPENDS+=	${PYPKGPREFIX}-oauth2client>=2.1.0:../../security/py-oauth2client
 DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
@@ -22,10 +21,6 @@ DEPENDS+=	${PYPKGPREFIX}-mock>=1.0.1:../../devel/py-mock
 DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 DEPENDS+=	${PYPKGPREFIX}-unittest2>=0.5.1:../../devel/py-unittest2
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-google-apputils
-
-post-install:
-	${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_INFODIR}/requires.txt.orig
 do-test:
 	cd ${WRKSRC} && nosetests-${PYVERSSUFFIX}
 
diff --git a/www/py-google-apitools/PLIST b/www/py-google-apitools/PLIST
index e972f5e1971..f46eb31bccd 100644
--- a/www/py-google-apitools/PLIST
+++ b/www/py-google-apitools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/02/04 15:04:00 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/06/16 20:31:12 bsiegert Exp $
 bin/gen_client
 ${PYSITELIB}/apitools/__init__.py
 ${PYSITELIB}/apitools/__init__.pyc
@@ -45,18 +45,12 @@ ${PYSITELIB}/apitools/base/protorpclite/util_test.pyo
 ${PYSITELIB}/apitools/base/py/__init__.py
 ${PYSITELIB}/apitools/base/py/__init__.pyc
 ${PYSITELIB}/apitools/base/py/__init__.pyo
-${PYSITELIB}/apitools/base/py/app2.py
-${PYSITELIB}/apitools/base/py/app2.pyc
-${PYSITELIB}/apitools/base/py/app2.pyo
 ${PYSITELIB}/apitools/base/py/base_api.py
 ${PYSITELIB}/apitools/base/py/base_api.pyc
 ${PYSITELIB}/apitools/base/py/base_api.pyo
 ${PYSITELIB}/apitools/base/py/base_api_test.py
 ${PYSITELIB}/apitools/base/py/base_api_test.pyc
 ${PYSITELIB}/apitools/base/py/base_api_test.pyo
-${PYSITELIB}/apitools/base/py/base_cli.py
-${PYSITELIB}/apitools/base/py/base_cli.pyc
-${PYSITELIB}/apitools/base/py/base_cli.pyo
 ${PYSITELIB}/apitools/base/py/batch.py
 ${PYSITELIB}/apitools/base/py/batch.pyc
 ${PYSITELIB}/apitools/base/py/batch.pyo
@@ -69,9 +63,6 @@ ${PYSITELIB}/apitools/base/py/buffered_stream.pyo
 ${PYSITELIB}/apitools/base/py/buffered_stream_test.py
 ${PYSITELIB}/apitools/base/py/buffered_stream_test.pyc
 ${PYSITELIB}/apitools/base/py/buffered_stream_test.pyo
-${PYSITELIB}/apitools/base/py/cli.py
-${PYSITELIB}/apitools/base/py/cli.pyc
-${PYSITELIB}/apitools/base/py/cli.pyo
 ${PYSITELIB}/apitools/base/py/compression.py
 ${PYSITELIB}/apitools/base/py/compression.pyc
 ${PYSITELIB}/apitools/base/py/compression.pyo
@@ -157,9 +148,6 @@ ${PYSITELIB}/apitools/gen/__init__.pyo
 ${PYSITELIB}/apitools/gen/client_generation_test.py
 ${PYSITELIB}/apitools/gen/client_generation_test.pyc
 ${PYSITELIB}/apitools/gen/client_generation_test.pyo
-${PYSITELIB}/apitools/gen/command_registry.py
-${PYSITELIB}/apitools/gen/command_registry.pyc
-${PYSITELIB}/apitools/gen/command_registry.pyo
 ${PYSITELIB}/apitools/gen/extended_descriptor.py
 ${PYSITELIB}/apitools/gen/extended_descriptor.pyc
 ${PYSITELIB}/apitools/gen/extended_descriptor.pyo
@@ -191,12 +179,6 @@ ${PYSITELIB}/apitools/gen/util_test.pyo
 ${PYSITELIB}/apitools/scripts/__init__.py
 ${PYSITELIB}/apitools/scripts/__init__.pyc
 ${PYSITELIB}/apitools/scripts/__init__.pyo
-${PYSITELIB}/apitools/scripts/oauth2l.py
-${PYSITELIB}/apitools/scripts/oauth2l.pyc
-${PYSITELIB}/apitools/scripts/oauth2l.pyo
-${PYSITELIB}/apitools/scripts/oauth2l_test.py
-${PYSITELIB}/apitools/scripts/oauth2l_test.pyc
-${PYSITELIB}/apitools/scripts/oauth2l_test.pyo
 ${PYSITELIB}/apitools/scripts/testdata/fake_client_secrets.json
 ${PYSITELIB}/apitools/scripts/testdata/noninstalled_client_secrets.json
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
@@ -214,9 +196,6 @@ ${PYSITELIB}/samples/dns_sample/__init__.pyo
 ${PYSITELIB}/samples/dns_sample/dns_v1/__init__.py
 ${PYSITELIB}/samples/dns_sample/dns_v1/__init__.pyc
 ${PYSITELIB}/samples/dns_sample/dns_v1/__init__.pyo
-${PYSITELIB}/samples/dns_sample/dns_v1/dns_v1.py
-${PYSITELIB}/samples/dns_sample/dns_v1/dns_v1.pyc
-${PYSITELIB}/samples/dns_sample/dns_v1/dns_v1.pyo
 ${PYSITELIB}/samples/dns_sample/dns_v1/dns_v1_client.py
 ${PYSITELIB}/samples/dns_sample/dns_v1/dns_v1_client.pyc
 ${PYSITELIB}/samples/dns_sample/dns_v1/dns_v1_client.pyo
@@ -232,9 +211,6 @@ ${PYSITELIB}/samples/fusiontables_sample/__init__.pyo
 ${PYSITELIB}/samples/fusiontables_sample/fusiontables_v1/__init__.py
 ${PYSITELIB}/samples/fusiontables_sample/fusiontables_v1/__init__.pyc
 ${PYSITELIB}/samples/fusiontables_sample/fusiontables_v1/__init__.pyo
-${PYSITELIB}/samples/fusiontables_sample/fusiontables_v1/fusiontables_v1.py
-${PYSITELIB}/samples/fusiontables_sample/fusiontables_v1/fusiontables_v1.pyc
-${PYSITELIB}/samples/fusiontables_sample/fusiontables_v1/fusiontables_v1.pyo
 ${PYSITELIB}/samples/fusiontables_sample/fusiontables_v1/fusiontables_v1_client.py
 ${PYSITELIB}/samples/fusiontables_sample/fusiontables_v1/fusiontables_v1_client.pyc
 ${PYSITELIB}/samples/fusiontables_sample/fusiontables_v1/fusiontables_v1_client.pyo
@@ -250,9 +226,6 @@ ${PYSITELIB}/samples/iam_sample/iam_client_test.pyo
 ${PYSITELIB}/samples/iam_sample/iam_v1/__init__.py
 ${PYSITELIB}/samples/iam_sample/iam_v1/__init__.pyc
 ${PYSITELIB}/samples/iam_sample/iam_v1/__init__.pyo
-${PYSITELIB}/samples/iam_sample/iam_v1/iam_v1.py
-${PYSITELIB}/samples/iam_sample/iam_v1/iam_v1.pyc
-${PYSITELIB}/samples/iam_sample/iam_v1/iam_v1.pyo
 ${PYSITELIB}/samples/iam_sample/iam_v1/iam_v1_client.py
 ${PYSITELIB}/samples/iam_sample/iam_v1/iam_v1_client.pyc
 ${PYSITELIB}/samples/iam_sample/iam_v1/iam_v1_client.pyo
@@ -271,9 +244,6 @@ ${PYSITELIB}/samples/servicemanagement_sample/messages_test.pyo
 ${PYSITELIB}/samples/servicemanagement_sample/servicemanagement_v1/__init__.py
 ${PYSITELIB}/samples/servicemanagement_sample/servicemanagement_v1/__init__.pyc
 ${PYSITELIB}/samples/servicemanagement_sample/servicemanagement_v1/__init__.pyo
-${PYSITELIB}/samples/servicemanagement_sample/servicemanagement_v1/servicemanagement_v1.py
-${PYSITELIB}/samples/servicemanagement_sample/servicemanagement_v1/servicemanagement_v1.pyc
-${PYSITELIB}/samples/servicemanagement_sample/servicemanagement_v1/servicemanagement_v1.pyo
 ${PYSITELIB}/samples/servicemanagement_sample/servicemanagement_v1/servicemanagement_v1_client.py
 ${PYSITELIB}/samples/servicemanagement_sample/servicemanagement_v1/servicemanagement_v1_client.pyc
 ${PYSITELIB}/samples/servicemanagement_sample/servicemanagement_v1/servicemanagement_v1_client.pyo
diff --git a/www/py-google-apitools/distinfo b/www/py-google-apitools/distinfo
index b1b2952de08..5264424d4bb 100644
--- a/www/py-google-apitools/distinfo
+++ b/www/py-google-apitools/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.1 2018/02/04 15:04:00 bsiegert Exp $
+$NetBSD: distinfo,v 1.2 2018/06/16 20:31:12 bsiegert Exp $
 
-SHA1 (google-apitools-0.5.21.tar.gz) = c33a6f2469c578f6867dc47e19b3435556121ec7
-RMD160 (google-apitools-0.5.21.tar.gz) = 612e5d221ed4d0c6f8bf638de3695e0ae631f588
-SHA512 (google-apitools-0.5.21.tar.gz) = 369157c2f5ccde2e32fff4c98d01793bfe8a941dcc1b77c4aeb869e8256faffbb47c8570535fa72c44546d09e366d9d869fb930bbccbe7030bdd934c15417342
-Size (google-apitools-0.5.21.tar.gz) = 275370 bytes
-SHA1 (patch-google__apitools.egg-info_requires.txt) = fd69d00d5cc6062009a19e7df1b1c12ec4fd7774
-SHA1 (patch-setup.py) = 94e4a7b395cdb055c312372836213e4e0c7188e1
+SHA1 (google-apitools-0.5.23.tar.gz) = c9753a104444205d76b290f1d88ee26df81e40e5
+RMD160 (google-apitools-0.5.23.tar.gz) = 02a632f81652a55a279e907bb700bff54592f23e
+SHA512 (google-apitools-0.5.23.tar.gz) = c1c72fa733c84e37af356e33bf2e9af927c2824564194f09149065f1d8bdd0fee9cea6ccb2b8fe224db1613c6ae0537df9c1cada00b09ba48465875a8ecdaa7a
+Size (google-apitools-0.5.23.tar.gz) = 236548 bytes
diff --git a/www/py-google-apitools/patches/patch-google__apitools.egg-info_requires.txt b/www/py-google-apitools/patches/patch-google__apitools.egg-info_requires.txt
deleted file mode 100644
index 5b980bb9bdc..00000000000
--- a/www/py-google-apitools/patches/patch-google__apitools.egg-info_requires.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-google__apitools.egg-info_requires.txt,v 1.1 2018/03/02 15:36:47 bsiegert Exp $
-
-Accept any newer gflags version. Python 2.6 compatibility is irrelevant.
---- google_apitools.egg-info/requires.txt.orig	2018-01-16 22:21:20.000000000 +0000
-+++ google_apitools.egg-info/requires.txt
-@@ -5,7 +5,7 @@ six>=1.9.0
- 
- [cli]
- google-apputils>=0.4.0
--python-gflags==3.0.6
-+python-gflags>=3.0.6
- 
- [testing]
- google-apputils>=0.4.0
diff --git a/www/py-google-apitools/patches/patch-setup.py b/www/py-google-apitools/patches/patch-setup.py
deleted file mode 100644
index 3c1c69e478d..00000000000
--- a/www/py-google-apitools/patches/patch-setup.py
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2018/03/02 15:36:47 bsiegert Exp $
-
-Accept any newer gflags version. Python 2.6 compatibility is irrelevant.
---- setup.py.orig	2018-01-16 22:17:29.000000000 +0000
-+++ setup.py
-@@ -36,7 +36,7 @@ REQUIRED_PACKAGES = [
- 
- CLI_PACKAGES = [
-     'google-apputils>=0.4.0',
--    'python-gflags==3.0.6',  # Starting version 3.0.7 py26 is not supported.
-+    'python-gflags>=3.0.6',
- ]
- 
- TESTING_PACKAGES = [