- Update to 1.1

- Trim Makefile header
- Update supported APIs list in pkg-descr
- Remove files/patch-runsamples.py

5 files changed, 35 insertions, 73 deletions

diff --git a/www/py-google-api-python-client/Makefile b/www/py-google-api-python-client/Makefile
index 792f7350d443..68532ea8b04d 100644
--- a/www/py-google-api-python-client/Makefile
+++ b/www/py-google-api-python-client/Makefile
@@ -1,18 +1,12 @@
-# New ports collection makefile for:	google-api-python-client
-# Date created:		2011-04-16
-# Whom:			Nicola Vitale <nivit@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	google-api-python-client
-#PORTVERSION=
+PORTVERSION=	1.1
 #PORTREVISION=	0
-DISTVERSION=	1.0c2
 CATEGORIES=	www
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES+=	${PORTNAME}-${DISTVERSION}.tar.gz
+DISTFILES=	${PORTNAME}-${DISTVERSION}.tar.gz
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Google API Client Library for Python
@@ -45,12 +39,10 @@ FIND_FILES_BAK=	${WRKDIR}/samples
 FIND_FILES+=	${WRKSRC} -type f -and \( -name "*.py" -or -name "enable-app-engine-project" \) -print0
 FIND_FILES_BAK+=	${WRKSRC} -type f -name "*.bak"
 
-XARGS_ARGS=	-0
-
-REINPLACE_ARGS=	-i.bak -e 's,/usr/bin/env python,&${PYTHON_VER},' \
+REINPLACE_ARGS=	-e 's,/usr/bin/env python,&${PYTHON_VER},' \
 		-e 's,/usr/bin/python.*,${PYTHON_CMD},' \
 		-e 's,../google_appengine,${LOCALBASE}/share/google-appengine,1' \
-		-e "s,'samples/oauth2','${EXAMPLESDIR}',1"
+		-e "s,'samples/oauth2','${EXAMPLESDIR}',1" -i.bak
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
@@ -68,7 +60,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}django>=1.3:${PORTSDIR}/www/py-django
 .endif
 
 post-patch:
-	${FIND} ${FIND_FILES} | ${XARGS} ${XARGS_ARGS} ${REINPLACE_CMD}
+	${FIND} ${FIND_FILES} | ${XARGS} -0 ${REINPLACE_CMD}
 	@${FIND} ${FIND_FILES_BAK} -delete
 
 post-install:
@@ -77,21 +69,12 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/FAQ ${DOCSDIR}/FAQ
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/runsamples.py ${EXAMPLESDIR}/runsamples.py
 	cd ${WRKDIR}/samples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-# www/py-WebTest depends on www/py-webob, which runs only with Python 2.6+
-.if ${PORT_OPTIONS:MWEBTEST} && ${PYTHON_VER} >= 2.6
+.if ${PORT_OPTIONS:MWEBTEST}
 RUN_DEPENDS+=	${PKGNAMEPREFIX}WebTest>=1.3.3:${PORTSDIR}/www/py-WebTest \
 		${PKGNAMEPREFIX}openssl>=0.13:${PORTSDIR}/security/py-openssl
 .endif
 
-.if ${PYTHON_VER} <= 2.5
-RUN_DEPENDS+=	${PKGNAMEPREFIX}simplejson>=2.5.0:${PORTSDIR}/devel/py-simplejson
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/py-google-api-python-client/distinfo b/www/py-google-api-python-client/distinfo
index 3b692e9a01b7..cc977086e034 100644
--- a/www/py-google-api-python-client/distinfo
+++ b/www/py-google-api-python-client/distinfo
@@ -1,4 +1,4 @@
-SHA256 (google-api-python-client-1.0c2.tar.gz) = 78572281fc28b49f495def8a8769e9b8e39b7aa9db41a3bdcfe4328d497c6d94
-SIZE (google-api-python-client-1.0c2.tar.gz) = 94739
-SHA256 (google-api-python-client-samples-1.0c2.tar.gz) = 4d41b1d656ad2920bfd8fd45c45d500479931d4a4be337d6dbb7c48c6996664d
-SIZE (google-api-python-client-samples-1.0c2.tar.gz) = 130434
+SHA256 (google-api-python-client-1.1.tar.gz) = bc88cae1c40446f22d58923fc5a8dbac77da29d6efbe4ae2276cc2f30f724617
+SIZE (google-api-python-client-1.1.tar.gz) = 71178
+SHA256 (google-api-python-client-samples-1.1.tar.gz) = e0465027ca73ec0102ee3043fa7635bd515f5ca4d10a6707acc9a4c98a89b977
+SIZE (google-api-python-client-samples-1.1.tar.gz) = 111364
diff --git a/www/py-google-api-python-client/files/patch-runsamples.py b/www/py-google-api-python-client/files/patch-runsamples.py
deleted file mode 100644
index 7fb4ead111bb..000000000000
--- a/www/py-google-api-python-client/files/patch-runsamples.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./runsamples.py.orig	2012-08-15 14:44:29.000000000 +0200
-+++ ./runsamples.py	2012-08-15 14:44:45.000000000 +0200
-@@ -41,6 +41,8 @@
-   logging.getLogger().setLevel(getattr(logging, FLAGS.logging_level))
- 
-   for dirname in os.listdir(FLAGS.sample_root):
-+    if not os.path.isdir(dirname):
-+      continue
-     fulldirname = os.path.join(FLAGS.sample_root, dirname)
-     if dirname in FLAGS.samples_to_skip:
-       logging.debug('Skipping ' + fulldirname + ' (blacklist)')
diff --git a/www/py-google-api-python-client/pkg-descr b/www/py-google-api-python-client/pkg-descr
index ee3d2bf5ed51..438f29d170d9 100644
--- a/www/py-google-api-python-client/pkg-descr
+++ b/www/py-google-api-python-client/pkg-descr
@@ -1,11 +1,13 @@
 The Google API Client for Python is a client library for accessing
-the adexchangebuyer, adsense, analytics, audit, bigquery, blogger,
-books, calendar, customsearch, discovery, drive, freebase, gan,
-groupssettings, latitude, moderator, oauth2, orkut, pagespeedonline,
-plus, prediction, shopping, siteVerification, taskqueue, tasks,
-translate, urlshortener, and webfonts APIs.
+the adexchangebuyer, adexchangeseller, adsense, adsensehost, analytics,
+androidpublisher, audit, bigquery, blogger, books, calendar, civicinfo,
+compute, coordinate, customsearch, dfareporting, discovery, drive,
+freebase, fusiontables, gan, groupsmigration, groupssettings, latitude,
+licensing, oauth2, orkut, pagespeedonline, plus, prediction, reseller,
+shopping, siteVerification, storage, taskqueue, tasks, translate,
+urlshortener, webfonts, youtube, youtubeAnalytics APIs.
 
 If you wish to use a Google API that is not in that list then you should
 look at the Google Data APIs Python Client Library (devel/py-gdata).
 
-WWW:	http://code.google.com/p/google-api-python-client/
+WWW: http://developers.google.com/api-client-library/python/
diff --git a/www/py-google-api-python-client/pkg-plist b/www/py-google-api-python-client/pkg-plist
index 8a9c9791fdff..09e33baa5f79 100644
--- a/www/py-google-api-python-client/pkg-plist
+++ b/www/py-google-api-python-client/pkg-plist
@@ -1,6 +1,6 @@
 @comment $FreeBSD$
 bin/enable-app-engine-project
-%%PYTHON_SITELIBDIR%%/google_api_python_client-1.0c2-py2.7.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/adexchangebuyer/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/adexchangebuyer/client_secrets.json
@@ -22,6 +22,8 @@ bin/enable-app-engine-project
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/adsense/get_all_ad_units_for_custom_channel.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/adsense/get_all_custom_channels.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/adsense/get_all_custom_channels_for_ad_unit.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/adsense/get_all_saved_ad_styles.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/adsense/get_all_saved_reports.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/adsense/get_all_url_channels.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/adsense/sample_utils.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/analytics/README
@@ -54,15 +56,14 @@ bin/enable-app-engine-project
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blogger/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blogger/blogger.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blogger/client_secrets.json
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coordinate/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coordinate/client_secrets.json
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coordinate/coordinate.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/customsearch/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/customsearch/main.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dailymotion/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dailymotion/app.yaml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dailymotion/index.yaml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dailymotion/main.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dailymotion/welcome.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/django_sample/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/django_sample/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/django_sample/client_secrets.json
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/django_sample/manage.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/django_sample/plus/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/django_sample/plus/models.py
@@ -85,23 +86,12 @@ bin/enable-app-engine-project
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/groupssettings/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/groupssettings/client_secrets.json
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/groupssettings/groupsettings.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtaskqueue_sample/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtaskqueue_sample/gtaskqueue/client_task.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtaskqueue_sample/gtaskqueue/gen_appengine_access_token
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtaskqueue_sample/gtaskqueue/gtaskqueue
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtaskqueue_sample/gtaskqueue/gtaskqueue_puller
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtaskqueue_sample/gtaskqueue/task_cmds.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtaskqueue_sample/gtaskqueue/taskqueue_client.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtaskqueue_sample/gtaskqueue/taskqueue_cmd_base.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtaskqueue_sample/gtaskqueue/taskqueue_cmds.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtaskqueue_sample/gtaskqueue/taskqueue_logger.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtaskqueue_sample/setup.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/keyring/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/keyring/client_secrets.json
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/keyring/plus.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/latitude/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/latitude/client_secrets.json
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/latitude/latitude.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/moderator/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/moderator/client_secrets.json
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/moderator/moderator.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plus/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plus/client_secrets.json
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plus/plus.py
@@ -110,7 +100,6 @@ bin/enable-app-engine-project
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/prediction/language_id.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/prediction/prediction.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/prediction/setup.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/runsamples.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/searchforshopping/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/searchforshopping/basic.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/searchforshopping/crowding.py
@@ -126,6 +115,7 @@ bin/enable-app-engine-project
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/prediction.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/template.tmpl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/urlshortener.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/storage/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/storage_serviceaccount_appengine/app.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/storage_serviceaccount_appengine/listing.xsl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/storage_serviceaccount_appengine/main.py
@@ -139,28 +129,26 @@ bin/enable-app-engine-project
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/threadqueue/main.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/translate/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/translate/main.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tz/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tz/tznever
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/urlshortener/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/urlshortener/client_secrets.json
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/urlshortener/urlshortener.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/youtube/README
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/youtube
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/urlshortener
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tz
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/translate
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/threadqueue
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tasks_appengine/templates
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tasks_appengine/css
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tasks_appengine
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/storage_serviceaccount_appengine
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/storage
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/src
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/service_account
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/searchforshopping
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/prediction
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plus
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/moderator
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/latitude
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gtaskqueue_sample/gtaskqueue
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gtaskqueue_sample
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/keyring
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/groupssettings
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gan/publishers
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gan/events
@@ -171,8 +159,8 @@ bin/enable-app-engine-project
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/django_sample/templates
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/django_sample/plus
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/django_sample
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dailymotion
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/customsearch
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/coordinate
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blogger
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/audit
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/appengine_with_robots