Drop python 2.7 support from a few ports

With hat:	portmgr

51 files changed, 51 insertions, 57 deletions

diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index 68fb34e52594..f79671c276a4 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -40,7 +40,7 @@ CONFLICTS?=	ansible1-* \
 EXTRA_PATCHES?=
 
 NO_ARCH=	yes
-USES?=		cpe python shebangfix
+USES?=		cpe python:3.6+ shebangfix
 USE_PYTHON=	distutils autoplist concurrent
 CPE_VENDOR=	ansibleworks
 
diff --git a/sysutils/ansible27/Makefile b/sysutils/ansible27/Makefile
index 73128123d341..358fd0cd59af 100644
--- a/sysutils/ansible27/Makefile
+++ b/sysutils/ansible27/Makefile
@@ -15,7 +15,7 @@ CONFLICTS=	ansible-* \
 MASTERDIR=	${.CURDIR}/../ansible
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
-USES=		cpe python
+USES=		cpe python:3.6+
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-sesu \
 		${FILESDIR}/extra-patch-27
 
diff --git a/sysutils/ansible28/Makefile b/sysutils/ansible28/Makefile
index 7467f8ecead2..1495c8372b89 100644
--- a/sysutils/ansible28/Makefile
+++ b/sysutils/ansible28/Makefile
@@ -14,7 +14,7 @@ CONFLICTS=	ansible-* \
 MASTERDIR=	${.CURDIR}/../ansible
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
-USES=		cpe python
+USES=		cpe python:3.6+
 EXTRA_PATCHES=
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/deltarpm/Makefile b/sysutils/deltarpm/Makefile
index f261f156c9a6..8c0f2cb6e473 100644
--- a/sysutils/deltarpm/Makefile
+++ b/sysutils/deltarpm/Makefile
@@ -14,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	librpm.so:archivers/rpm4
 
-USES=		gmake python shebangfix tar:bz2
+USES=		gmake python:3.6+ shebangfix tar:bz2
 USE_PYTHON=	flavors optsuffix
 SHEBANG_FILES=	drpmsync
 
diff --git a/sysutils/jadm/Makefile b/sysutils/jadm/Makefile
index 56fdc3cf3061..3fefdff14f40 100644
--- a/sysutils/jadm/Makefile
+++ b/sysutils/jadm/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko@${PY_F
 		${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate@${PY_FLAVOR} \
 		${PY_IPADDRESS}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 PLIST_FILES=	man/man8/jadm.8.gz
 
diff --git a/sysutils/mog/Makefile b/sysutils/mog/Makefile
index 93107c8c71ae..ee240ae425cb 100644
--- a/sysutils/mog/Makefile
+++ b/sysutils/mog/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${PY_PYGMENTS} \
 		${PYTHON_PKGNAMEPREFIX}mdv>0:devel/py-mdv@${PY_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		python
+USES=		python:3.6+
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils concurrent optsuffix
 NO_ARCH=	yes
diff --git a/sysutils/ohmu/Makefile b/sysutils/ohmu/Makefile
index 151469553f6d..360c8792d232 100644
--- a/sysutils/ohmu/Makefile
+++ b/sysutils/ohmu/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scandir>=1.3:sysutils/py-scandir@${PY_FLAVOR
 USE_GITHUB=	yes
 GH_ACCOUNT=	paul-nechifor
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist distutils concurrent optsuffix
 NO_ARCH=	yes
 
diff --git a/sysutils/py-ansible-runner/Makefile b/sysutils/py-ansible-runner/Makefile
index 7f2898c7ff5e..0069e8e57a1c 100644
--- a/sysutils/py-ansible-runner/Makefile
+++ b/sysutils/py-ansible-runner/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible>2.0:sysutils/ansible@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
-USES=		cpe python
+USES=		cpe python:3.6+
 USE_PYTHON=	distutils autoplist concurrent
 
 CPE_VENDOR=	ansibleworks
diff --git a/sysutils/py-azure-cli-base/Makefile b/sysutils/py-azure-cli-base/Makefile
index 2c12f0bdc047..fabfc5959af5 100644
--- a/sysutils/py-azure-cli-base/Makefile
+++ b/sysutils/py-azure-cli-base/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT
 
 NO_BUILD=	yes
 NO_ARCH=	yes
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	flavors py3kplist
 
 do-install:
diff --git a/sysutils/py-cron-descriptor/Makefile b/sysutils/py-cron-descriptor/Makefile
index a3099ca34eeb..8c50933fd036 100644
--- a/sysutils/py-cron-descriptor/Makefile
+++ b/sysutils/py-cron-descriptor/Makefile
@@ -15,7 +15,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pep8-naming>0:devel/py-pep8-naming@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist concurrent distutils
 
diff --git a/sysutils/py-croniter/Makefile b/sysutils/py-croniter/Makefile
index ad4854a81970..68da3f25f22a 100644
--- a/sysutils/py-croniter/Makefile
+++ b/sysutils/py-croniter/Makefile
@@ -14,7 +14,7 @@ LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-dirsync/Makefile b/sysutils/py-dirsync/Makefile
index 6a8f1d6b9d7d..0401ee0f659f 100644
--- a/sysutils/py-dirsync/Makefile
+++ b/sysutils/py-dirsync/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
 
 CONFLICTS_INSTALL=	p5-File-Dirsync
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/sysutils/py-distro/Makefile b/sysutils/py-distro/Makefile
index c5ee0b819ed7..07e3c1460667 100644
--- a/sysutils/py-distro/Makefile
+++ b/sysutils/py-distro/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Linux OS platform information API
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python shebangfix
+USES=		python:3.6+ shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
 SHEBANG_FILES=	query_local_distro.py
diff --git a/sysutils/py-docker/Makefile b/sysutils/py-docker/Makefile
index f2c31813c603..d705b94b6eea 100644
--- a/sysutils/py-docker/Makefile
+++ b/sysutils/py-docker/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PY_IPADDRESS} \
 		${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docker-pycreds>=0.4.0:security/py-docker-pycreds@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
diff --git a/sysutils/py-drmaa/Makefile b/sysutils/py-drmaa/Makefile
index 1122c2bee020..1dde735a2d44 100644
--- a/sysutils/py-drmaa/Makefile
+++ b/sysutils/py-drmaa/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Interact with DRMAA-compliant distributed resource management systems
 LICENSE=	BSD3CLAUSE
 
 NO_ARCH=	yes
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-execnet/Makefile b/sysutils/py-execnet/Makefile
index df7c0d6f70d8..622dce27dc1e 100644
--- a/sysutils/py-execnet/Makefile
+++ b/sysutils/py-execnet/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apipkg>=1.4:devel/py-apipkg@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/sysutils/py-filelike/Makefile b/sysutils/py-filelike/Makefile
index 98f8a502c084..9733808be03e 100644
--- a/sysutils/py-filelike/Makefile
+++ b/sysutils/py-filelike/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	dikshie@sfc.wide.ad.jp
 COMMENT=	Python module for building and manipulating file-like object
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	distutils autoplist concurrent
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-filelock/Makefile b/sysutils/py-filelock/Makefile
index 0fbea181ca5d..6039f31adc41 100644
--- a/sysutils/py-filelock/Makefile
+++ b/sysutils/py-filelock/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Platform independent file lock
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
diff --git a/sysutils/py-glances/Makefile b/sysutils/py-glances/Makefile
index 42a47d3e98ec..e9ffed2b0a35 100644
--- a/sysutils/py-glances/Makefile
+++ b/sysutils/py-glances/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=5.3.0:sysutils/py-psutil@${PY_FLAVOR
 		${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0.15.2:devel/py-coverage@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 USE_GITHUB=	yes
 
diff --git a/sysutils/py-google-compute-engine/Makefile b/sysutils/py-google-compute-engine/Makefile
index e57873c5cd4e..d212a9ba8aec 100644
--- a/sysutils/py-google-compute-engine/Makefile
+++ b/sysutils/py-google-compute-engine/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR}
 .endif
 
-USES=		python shebangfix
+USES=		python:3.6+ shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
 WRKSRC_SUBDIR=	packages/python-google-compute-engine
diff --git a/sysutils/py-hared/Makefile b/sysutils/py-hared/Makefile
index bcf4b380be3c..f811b239ff72 100644
--- a/sysutils/py-hared/Makefile
+++ b/sysutils/py-hared/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Small Python server for inserting notications into MQTT
 
 LICENSE=	MIT
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 ETCDIR=		${PREFIX}/etc
diff --git a/sysutils/py-honcho/Makefile b/sysutils/py-honcho/Makefile
index 4ef9bc53539f..836a3547cbaf 100644
--- a/sysutils/py-honcho/Makefile
+++ b/sysutils/py-honcho/Makefile
@@ -22,7 +22,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	nickstenning
 
 NO_ARCH=	yes
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 do-test:
diff --git a/sysutils/py-hpilo/Makefile b/sysutils/py-hpilo/Makefile
index 91fd0793227a..38384020e95d 100644
--- a/sysutils/py-hpilo/Makefile
+++ b/sysutils/py-hpilo/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python cli to interact with HP iLO management interface
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	python
+USES=	python:3.6+
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	seveas
diff --git a/sysutils/py-iowait/Makefile b/sysutils/py-iowait/Makefile
index d3a24754756f..7f37d8b1e594 100644
--- a/sysutils/py-iowait/Makefile
+++ b/sysutils/py-iowait/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python module for I/O completion events
 
 LICENSE=	GPLv3
 
-USES=	python
+USES=	python:3.6+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-leviathan/Makefile b/sysutils/py-leviathan/Makefile
index 68864a6268c1..a9b30581a041 100644
--- a/sysutils/py-leviathan/Makefile
+++ b/sysutils/py-leviathan/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/sysutils/py-mitogen/Makefile b/sysutils/py-mitogen/Makefile
index 850ec5e7c642..ca3f49f57c96 100644
--- a/sysutils/py-mitogen/Makefile
+++ b/sysutils/py-mitogen/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ansible accelerator & python library for writing distributed programs
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	distutils autoplist concurrent
 
 NO_ARCH=	yes
diff --git a/sysutils/py-mqttwarn/Makefile b/sysutils/py-mqttwarn/Makefile
index 262163fff53b..0131c1b5c56f 100644
--- a/sysutils/py-mqttwarn/Makefile
+++ b/sysutils/py-mqttwarn/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>=1.13.0:devel/py-six@${PY_FLAVOR} \
 # based on setup.py : tests_require=extras['test'],
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		python shebangfix
+USES=		python:3.6+ shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 SHEBANG_REGEX=	'.*\.py$$'
 
diff --git a/sysutils/py-nagiosplugin/Makefile b/sysutils/py-nagiosplugin/Makefile
index ad9b67fd1219..329c92c9730a 100644
--- a/sysutils/py-nagiosplugin/Makefile
+++ b/sysutils/py-nagiosplugin/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Class library for writing Nagios (Icinga) plugins
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
diff --git a/sysutils/py-packet-python/Makefile b/sysutils/py-packet-python/Makefile
index 938d5a51987e..2a77566f3a7d 100644
--- a/sysutils/py-packet-python/Makefile
+++ b/sysutils/py-packet-python/Makefile
@@ -13,7 +13,7 @@ LICENSE=	LGPL3+
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>2.18.0:www/py-requests@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	distutils autoplist concurrent
 
 NO_ARCH=	yes
diff --git a/sysutils/py-pkginfo/Makefile b/sysutils/py-pkginfo/Makefile
index 32fa58187709..30847f184dbd 100644
--- a/sysutils/py-pkginfo/Makefile
+++ b/sysutils/py-pkginfo/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Query metadatdata from sdists / bdists / installed packages
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/sysutils/py-ploy/Makefile b/sysutils/py-ploy/Makefile
index 4b7dd7e7c9ed..bdaca92e64e0 100644
--- a/sysutils/py-ploy/Makefile
+++ b/sysutils/py-ploy/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${PY_FLAVOR} \
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/sysutils/py-ploy_ezjail/Makefile b/sysutils/py-ploy_ezjail/Makefile
index 24f0e01ae489..75f1328bc0bd 100644
--- a/sysutils/py-ploy_ezjail/Makefile
+++ b/sysutils/py-ploy_ezjail/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/sysutils/py-plumbum/Makefile b/sysutils/py-plumbum/Makefile
index 0a65609a98f3..cc559faace8a 100644
--- a/sysutils/py-plumbum/Makefile
+++ b/sysutils/py-plumbum/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Shell combinators library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/sysutils/py-power/Makefile b/sysutils/py-power/Makefile
index 50d0509025f0..431c99c07435 100644
--- a/sysutils/py-power/Makefile
+++ b/sysutils/py-power/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Cross-platform system power status information for Python
 
 LICENSE=	MIT
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile
index 7f67173be1cb..351e5932d590 100644
--- a/sysutils/py-psutil/Makefile
+++ b/sysutils/py-psutil/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 TEST_DEPENDS=	${PY_ENUM34} \
 		${PY_IPADDRESS}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}psutil121
diff --git a/sysutils/py-psutil121/Makefile b/sysutils/py-psutil121/Makefile
index e2b45bfa25e5..059d464c4d15 100644
--- a/sysutils/py-psutil121/Makefile
+++ b/sysutils/py-psutil121/Makefile
@@ -18,7 +18,7 @@ CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}psutil
 
 PORTSCOUT=	limit:^1\.2\.
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-ptyprocess/Makefile b/sysutils/py-ptyprocess/Makefile
index 6e87ec0641d7..9837227bef2c 100644
--- a/sysutils/py-ptyprocess/Makefile
+++ b/sysutils/py-ptyprocess/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Run a subprocess in a pseudo terminal
 
 LICENSE=	ISCL
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-py-cpuinfo/Makefile b/sysutils/py-py-cpuinfo/Makefile
index 89ff51b6955f..92700626c3b4 100644
--- a/sysutils/py-py-cpuinfo/Makefile
+++ b/sysutils/py-py-cpuinfo/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Module for getting CPU info with pure Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
diff --git a/sysutils/py-python-consul/Makefile b/sysutils/py-python-consul/Makefile
index a324298f3b5b..15026ab8376b 100644
--- a/sysutils/py-python-consul/Makefile
+++ b/sysutils/py-python-consul/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/consul:sysutils/consul \
 				${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
 
 # 2.7 or 3.6+, but it cannot be expressed right now.
-USES=	python
+USES=	python:3.6+
 
 USE_PYTHON=	distutils autoplist
 
diff --git a/sysutils/py-python-consul2/Makefile b/sysutils/py-python-consul2/Makefile
index 9647a3075573..8c41174e5a3a 100644
--- a/sysutils/py-python-consul2/Makefile
+++ b/sysutils/py-python-consul2/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-twisted>=0:devel/py-pytest-twisted@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/sysutils/py-python-crontab/Makefile b/sysutils/py-python-crontab/Makefile
index b12273cfc947..1168ca76228f 100644
--- a/sysutils/py-python-crontab/Makefile
+++ b/sysutils/py-python-crontab/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cron-descriptor>0:sysutils/py-cron-descriptor@${PY_FLAVOR}
 
-USES=		python shebangfix
+USES=		python:3.6+ shebangfix
 SHEBANG_FILES=	${WRKSRC}/tests/data/crontest
 USE_PYTHON=	autoplist distutils
 
diff --git a/sysutils/py-pywatchman/Makefile b/sysutils/py-pywatchman/Makefile
index c054b435b8c3..faee6539504b 100644
--- a/sysutils/py-pywatchman/Makefile
+++ b/sysutils/py-pywatchman/Makefile
@@ -15,7 +15,7 @@ LICENSE_COMB=	multi
 
 RUN_DEPENDS=	watchman>=4:sysutils/watchman
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 USE_GITHUB=	yes
@@ -27,12 +27,6 @@ BROKEN_mips64=	Depends on watchman, which needs c++11-libs
 
 WRKSRC_SUBDIR=	python
 
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == "armv6" || ${ARCH} == "aarch64"
-USES=	python:2.7
-.endif
-
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name "*.so" \
 		-exec ${STRIP_CMD} {} +
diff --git a/sysutils/py-queuelib/Makefile b/sysutils/py-queuelib/Makefile
index 654bf2c82bed..a599989bf6f1 100644
--- a/sysutils/py-queuelib/Makefile
+++ b/sysutils/py-queuelib/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 TEST_DEPENDS:=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 TEST_TARGET=	test
diff --git a/sysutils/py-ranger/Makefile b/sysutils/py-ranger/Makefile
index 4d0bab80e7ef..84a243646cbd 100644
--- a/sysutils/py-ranger/Makefile
+++ b/sysutils/py-ranger/Makefile
@@ -20,7 +20,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		desktop-file-utils python shebangfix
+USES=		desktop-file-utils python:3.6+ shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
 SHEBANG_FILES=	doc/tools/*.py
diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile
index cf36a65c368f..bffe4e94d68a 100644
--- a/sysutils/py-supervisor/Makefile
+++ b/sysutils/py-supervisor/Makefile
@@ -21,7 +21,7 @@ LICENSE_PERMS_REPOZE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0.5.0:devel/py-mock@${PY_FLAVOR}
 
-USES=		python shebangfix
+USES=		python:3.6+ shebangfix
 USE_PYTHON=	autoplist distutils
 USE_RC_SUBR=	supervisord
 SHEBANG_FILES=	supervisor/scripts/*.py supervisor/tests/fixtures/*.py
diff --git a/sysutils/py-tarsnapper/Makefile b/sysutils/py-tarsnapper/Makefile
index 2075213a5f11..3154461296c1 100644
--- a/sysutils/py-tarsnapper/Makefile
+++ b/sysutils/py-tarsnapper/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tarsnap wrapper which expires backups using a gfs-scheme
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
 
diff --git a/sysutils/py-tmuxp/Makefile b/sysutils/py-tmuxp/Makefile
index c9f8a4d923e5..376712069523 100644
--- a/sysutils/py-tmuxp/Makefile
+++ b/sysutils/py-tmuxp/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=7<8:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libtmux>=0.8<0.9:devel/py-libtmux@${PY_FLAVOR} \
 		tmux:sysutils/tmux
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/sysutils/py-uptime/Makefile b/sysutils/py-uptime/Makefile
index bef7ceae495c..a0761a3dc4fd 100644
--- a/sysutils/py-uptime/Makefile
+++ b/sysutils/py-uptime/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Cross-platform uptime library
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 post-install:
diff --git a/sysutils/py-zdaemon/Makefile b/sysutils/py-zdaemon/Makefile
index 9fdce97c1da5..49902b446f38 100644
--- a/sysutils/py-zdaemon/Makefile
+++ b/sysutils/py-zdaemon/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig@${PY_FLAVOR}
 
 NO_ARCH=	yes
-USES=		python zip
+USES=		python:3.6+ zip
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-zfs-autobackup/Makefile b/sysutils/py-zfs-autobackup/Makefile
index 908e5d9526f6..b44e6eff7f9d 100644
--- a/sysutils/py-zfs-autobackup/Makefile
+++ b/sysutils/py-zfs-autobackup/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
diff --git a/sysutils/solaar/Makefile b/sysutils/solaar/Makefile
index dfd849c461f6..1f696fe9e0d5 100644
--- a/sysutils/solaar/Makefile
+++ b/sysutils/solaar/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 # libhidapi.so is only loaded at runtime via ctypes (dlopen)
 RUN_DEPENDS=	${LOCALBASE}/lib/libhidapi.so:comms/hidapi
 
-USES=		python
+USES=		python:3.6+
 USE_GITHUB=	yes
 GH_ACCOUNT=	pwr-Solaar
 GH_PROJECT=	Solaar