3 files changed, 49 insertions, 23 deletions

diff --git a/net/py-python-neutronclient/Makefile b/net/py-python-neutronclient/Makefile
index ba988ac4a04b..e67f82aa846b 100644
--- a/net/py-python-neutronclient/Makefile
+++ b/net/py-python-neutronclient/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	python-neutronclient
-PORTVERSION=	6.0.0
+PORTVERSION=	6.7.0
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,27 +10,53 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	alexander.nusov@nfvexpress.com
 COMMENT=	Client for the OpenStack Neutron API
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cliff>=2.8.0:devel/py-cliff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.0.2:devel/py-osc-lib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}cliff>=0:devel/py-cliff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}os-client-config>=0:devel/py-os-client-config@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.8.0:devel/py-osc-lib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}os-client-config>=1.28.0:devel/py-os-client-config@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.3.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=3.5.1:devel/py-simplejson@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR}
 
 USES=		python shebangfix
-SHEBANG_FILES=	neutronclient/tests/functional/hooks/post_test_hook.sh
-USE_PYTHON=	distutils autoplist noegginfo
+USE_PYTHON=	distutils autoplist
+SHEBANG_FILES=	neutronclient/tests/functional/hooks/gate_hook.sh \
+		neutronclient/tests/functional/hooks/post_test_hook.sh \
+		neutron_test.sh
+
 NO_ARCH=	yes
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.6.2:textproc/py-sphinx@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=1.17.0:textproc/py-openstackdocstheme@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}reno>=2.5.0:textproc/py-reno@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}cliff>=2.8.0:devel/py-cliff@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.3.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}os-client-config>=1.28.0:devel/py-os-client-config@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}oslo.log>=0:devel/py-oslo.log@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}osc-lib>=1.8.0:devel/py-osc-lib@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${PY_FLAVOR}
+DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,install_requires.*,,' ${WRKSRC}/setup.py
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc/build/html && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
+			"! -name .buildinfo -and ! -name objects.inv")
 
 .include <bsd.port.mk>
diff --git a/net/py-python-neutronclient/distinfo b/net/py-python-neutronclient/distinfo
index 9188f76ac927..71f50c8664df 100644
--- a/net/py-python-neutronclient/distinfo
+++ b/net/py-python-neutronclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475931882
-SHA256 (python-neutronclient-6.0.0.tar.gz) = a30556f8b9541e94f44a9911d9af89037710761755758a2c1598fa92809293a2
-SIZE (python-neutronclient-6.0.0.tar.gz) = 205872
+TIMESTAMP = 1527866661
+SHA256 (python-neutronclient-6.7.0.tar.gz) = 2c4d364499a8c282591fbb3f37a7d399301afaf0e97f8a119630184cdea5ad06
+SIZE (python-neutronclient-6.7.0.tar.gz) = 286482
diff --git a/net/py-python-neutronclient/pkg-descr b/net/py-python-neutronclient/pkg-descr
index fb0ef4f04266..a23ee88de4c3 100644
--- a/net/py-python-neutronclient/pkg-descr
+++ b/net/py-python-neutronclient/pkg-descr
@@ -1,5 +1,5 @@
-This is a client for the OpenStack Neutron API. There's a Python
-API (the neutronclient module), and a command-line script (neutron).
-Each implements 100% of the OpenStack Neutron API.
+Client for the OpenStack Neutron API. There's a Python API (the neutronclient
+module), and a command-line script (neutron). Each implements 100% of the
+OpenStack Neutron API.
 
-WWW: https://pypi.org/project/python-neutronclient/
+WWW: https://docs.openstack.org/python-neutronclient/