Index: branches/2019Q2/sysutils/py-google-compute-engine/Makefile
===================================================================
--- branches/2019Q2/sysutils/py-google-compute-engine/Makefile	(revision 501581)
+++ branches/2019Q2/sysutils/py-google-compute-engine/Makefile	(revision 501582)
@@ -1,55 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	google-compute-engine
 DISTVERSION=	2.8.13
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lucas.kanashiro@collabora.com
 COMMENT=	Guest Environment for Google Compute Engine
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		google_oslogin_control:sysutils/google-compute-engine-oslogin \
 		sudo:security/sudo
 
 .if ${FLAVOR:Upy36:Mpy3*}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR}
 .endif
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
 WRKSRC_SUBDIR=	packages/python-google-compute-engine
 
 NO_ARCH=	yes
 SHEBANG_FILES=	../google-compute-engine/src/usr/bin/google_optimize_local_ssd \
 		../google-compute-engine/src/usr/bin/google_set_multiqueue
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	GoogleCloudPlatform
 GH_PROJECT=	compute-image-packages
 GH_TAGNAME=	20190416
 
 USE_RC_SUBR=	google_accounts_daemon google_clock_skew_daemon \
 		google_instance_setup google_network_daemon google_startup
 
 SUB_LIST=	PYTHON_CMD="${PYTHON_CMD}" \
 		PYTHON_VER="${PYTHON_VER}"
 REINPLACE_ARGS=	-i ''
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d ${STAGEDIR}/etc
 	${INSTALL_DATA} ${FILESDIR}/instance_configs.cfg.distro.sample \
 		${STAGEDIR}${PREFIX}/etc/instance_configs.cfg.distro.sample
 	${INSTALL_DATA} ${FILESDIR}/90-google.conf.sample \
 		${STAGEDIR}${PREFIX}/etc/syslog.d/90-google.conf.sample
 	${INSTALL_DATA} ${FILESDIR}/google_set_hostname \
 		${STAGEDIR}/etc/dhclient-exit-hooks
 
 .include <bsd.port.mk>
Index: branches/2019Q2/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample
===================================================================
--- branches/2019Q2/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample	(revision 501581)
+++ branches/2019Q2/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample	(revision 501582)
@@ -1,14 +1,17 @@
 [Accounts]
 gpasswd_add_cmd = pw groupmod {group} -m {user}
 gpasswd_remove_cmd = pw groupmod {group} -d {user}
 useradd_cmd = pw useradd {user} -m
 userdel_cmd = pw userdel {user} -r
 usermod_cmd = pw usermod {user} -G {groups}
 groupadd_cmd = pw groupadd {group}
 
 [MetadataScripts]
 default_shell = /bin/sh
 
 [InstanceSetup]
 set_multiqueue = false
 optimize_local_ssd = false
+# google-cloud-sdk only supports python2 at the moment, disabling boto will
+# avoid issues when running this agent with python3.
+set_boto_config = false
Index: branches/2019Q2
===================================================================
--- branches/2019Q2	(revision 501581)
+++ branches/2019Q2	(revision 501582)

Property changes on: branches/2019Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r501581