sysutils/ansible: Sort variables

No functional changes intended.

1 files changed, 34 insertions, 41 deletions

diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index 0fca725e9a61..fb2b48dd0a2d 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -11,64 +11,57 @@ COMMENT=	Radically simple IT automation
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
+RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
-TEST_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
+TEST_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
 
 USES?=		cpe python:3.6+ shebangfix
 CPE_VENDOR=	ansibleworks
-USE_PYTHON=	distutils autoplist concurrent
+USE_PYTHON=	autoplist concurrent distutils
 
-SHEBANG_FILES?=	\
+SHEBANG_FILES?=	test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py \
 		test/lib/ansible_test/_data/injector/python.py \
-		test/lib/ansible_test/_data/versions.py \
-		test/lib/ansible_test/_data/virtualenvcheck.py \
-		test/lib/ansible_test/_data/yamlcheck.py \
-		test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py \
-		test/lib/ansible_test/_data/sanity/import/importer.py \
-		test/lib/ansible_test/_data/sanity/code-smell/metaclass-boilerplate.py \
+		test/lib/ansible_test/_data/sanity/code-smell/action-plugin-docs.py \
+		test/lib/ansible_test/_data/sanity/code-smell/empty-init.py \
 		test/lib/ansible_test/_data/sanity/code-smell/future-import-boilerplate.py \
-		test/lib/ansible_test/_data/sanity/code-smell/use-argspec-type-path.py \
+		test/lib/ansible_test/_data/sanity/code-smell/line-endings.py \
+		test/lib/ansible_test/_data/sanity/code-smell/metaclass-boilerplate.py \
+		test/lib/ansible_test/_data/sanity/code-smell/no-assert.py \
+		test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py \
+		test/lib/ansible_test/_data/sanity/code-smell/no-dict-iteritems.py \
+		test/lib/ansible_test/_data/sanity/code-smell/no-dict-iterkeys.py \
+		test/lib/ansible_test/_data/sanity/code-smell/no-dict-itervalues.py \
 		test/lib/ansible_test/_data/sanity/code-smell/no-get-exception.py \
 		test/lib/ansible_test/_data/sanity/code-smell/no-illegal-filenames.py \
-		test/lib/ansible_test/_data/sanity/code-smell/no-dict-iterkeys.py \
+		test/lib/ansible_test/_data/sanity/code-smell/no-main-display.py \
 		test/lib/ansible_test/_data/sanity/code-smell/no-smart-quotes.py \
-		test/lib/ansible_test/_data/sanity/code-smell/replace-urlopen.py \
 		test/lib/ansible_test/_data/sanity/code-smell/no-unicode-literals.py \
-		test/lib/ansible_test/_data/sanity/code-smell/action-plugin-docs.py \
-		test/lib/ansible_test/_data/sanity/code-smell/no-main-display.py \
-		test/lib/ansible_test/_data/sanity/code-smell/no-dict-itervalues.py \
-		test/lib/ansible_test/_data/sanity/code-smell/no-dict-iteritems.py \
-		test/lib/ansible_test/_data/sanity/code-smell/no-assert.py \
-		test/lib/ansible_test/_data/sanity/code-smell/use-compat-six.py \
-		test/lib/ansible_test/_data/sanity/code-smell/line-endings.py \
-		test/lib/ansible_test/_data/sanity/code-smell/symlinks.py \
+		test/lib/ansible_test/_data/sanity/code-smell/replace-urlopen.py \
 		test/lib/ansible_test/_data/sanity/code-smell/shebang.py \
-		test/lib/ansible_test/_data/sanity/code-smell/empty-init.py \
-		test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py \
-		test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py \
+		test/lib/ansible_test/_data/sanity/code-smell/symlinks.py \
+		test/lib/ansible_test/_data/sanity/code-smell/use-argspec-type-path.py \
+		test/lib/ansible_test/_data/sanity/code-smell/use-compat-six.py \
 		test/lib/ansible_test/_data/sanity/compile/compile.py \
-		test/lib/ansible_test/_data/sanity/validate-modules/main.py
+		test/lib/ansible_test/_data/sanity/import/importer.py \
+		test/lib/ansible_test/_data/sanity/validate-modules/main.py \
+		test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py \
+		test/lib/ansible_test/_data/versions.py \
+		test/lib/ansible_test/_data/virtualenvcheck.py \
+		test/lib/ansible_test/_data/yamlcheck.py
 
-CONFLICTS?=	ansible1-* \
-		ansible23-* \
-		ansible24-* \
-		ansible25-* \
-		ansible27-* \
-		ansible26-* \
-		ansible27-* \
-		ansible28-*
+CONFLICTS?=	ansible1-* ansible23-* ansible24-* ansible25-* ansible26-* \
+		ansible27-* ansible28-*
 
 EXTRA_PATCHES?=
 NO_ARCH=	yes
@@ -109,7 +102,7 @@ post-install-EXAMPLES-on:
 post-stage:
 	${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \
 		-execdir ${RLN} ansible-${PYTHON_VER} {} \;
-	# python autoplist doesn't add this file in plist
+# python autoplist doesn't add this file in plist
 	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory
 
 do-test: