Move devel/py-usb to devel/py-pyusb

- While I'm here:
  - Fix USE_GITHUB usage
  - Add NO_ARCH
- Bump PORTREVISION of dependent ports for dependency change

PR:		246547
Submitted by:	sunpoet (myself)
Approved by:	maintainer (timeout, 40 days)

12 files changed, 21 insertions, 14 deletions

diff --git a/MOVED b/MOVED
index 09cb7dbeaef0..b8efa2fdebad 100644
--- a/MOVED
+++ b/MOVED
@@ -15109,3 +15109,4 @@ www/redmine-wiki_notes|www/redmine4|2020-06-25|Removed, build-time extension of
 devel/p5-IO-stringy|devel/p5-IO-Stringy|2020-06-26|New development starts as IO-Stringy
 devel/looks|devel/jgoodies-looks|2020-06-26|Renamed to match upstream
 comms/py-serial|comms/py-pyserial|2020-06-27|Rename to match upstream naming
+devel/py-usb|devel/py-pyusb|2020-06-27|Rename to match upstream naming
diff --git a/cad/k40-whisperer/Makefile b/cad/k40-whisperer/Makefile
index 16d0e8b11485..489847fae993 100644
--- a/cad/k40-whisperer/Makefile
+++ b/cad/k40-whisperer/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	k40-whisperer
 DISTVERSION=	0.45
+PORTREVISION=	1
 CATEGORIES=	cad python
 MASTER_SITES=	http://www.scorchworks.com/K40whisperer/
 DISTNAME=	K40_Whisperer-${DISTVERSION}_src
@@ -13,7 +14,7 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/gpl-3.0.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyusb>0:devel/py-pyusb@${PY_FLAVOR} \
 		${PY_PILLOW}
 
 USES=		python:run,-3.7 shebangfix zip
diff --git a/devel/Makefile b/devel/Makefile
index db32dbc755eb..07932425d807 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4961,6 +4961,7 @@
     SUBDIR += py-pytz
     SUBDIR += py-pyudev
     SUBDIR += py-pyupgrade
+    SUBDIR += py-pyusb
     SUBDIR += py-pyutil
     SUBDIR += py-pyvalid
     SUBDIR += py-pyvisa
@@ -5174,7 +5175,6 @@
     SUBDIR += py-urlimport
     SUBDIR += py-urwid
     SUBDIR += py-urwidtrees
-    SUBDIR += py-usb
     SUBDIR += py-user_agents
     SUBDIR += py-userpath
     SUBDIR += py-utils
diff --git a/devel/py-usb/Makefile b/devel/py-pyusb/Makefile
index d31efcd5265f..2f63707e7a62 100644
--- a/devel/py-usb/Makefile
+++ b/devel/py-pyusb/Makefile
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
-PORTNAME=	usb
+PORTNAME=	pyusb
 PORTVERSION=	1.0.2
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -14,9 +15,8 @@ USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	pyusb
-GH_PROJECT=	py${PORTNAME}
-GH_TAGNAME=	47ca9c3
+
+#NO_ARCH=	yes
 
 PORTDOCS=	*.rst
 
diff --git a/devel/py-pyusb/distinfo b/devel/py-pyusb/distinfo
new file mode 100644
index 000000000000..4248f8157b61
--- /dev/null
+++ b/devel/py-pyusb/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1593249363
+SHA256 (pyusb-pyusb-v1.0.2_GH0.tar.gz) = 49dfa601f28e9399df62004170cfb623197ad32d8399885b7f789775767b50c3
+SIZE (pyusb-pyusb-v1.0.2_GH0.tar.gz) = 68694
diff --git a/devel/py-usb/pkg-descr b/devel/py-pyusb/pkg-descr
index b17c53a19b6c..b17c53a19b6c 100644
--- a/devel/py-usb/pkg-descr
+++ b/devel/py-pyusb/pkg-descr
diff --git a/devel/py-pyvisa-py/Makefile b/devel/py-pyvisa-py/Makefile
index 09474504abbc..9e41651a567b 100644
--- a/devel/py-pyvisa-py/Makefile
+++ b/devel/py-pyvisa-py/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	pyvisa-py
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -23,6 +24,6 @@ SERIAL_DESC=	Access to devices via RS-232
 USB_DESC=	Access to devices via USB
 
 SERIAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyserial>=3.0:comms/py-pyserial@${PY_FLAVOR}
-USB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}usb>=0:devel/py-usb@${PY_FLAVOR}
+USB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-usb/distinfo b/devel/py-usb/distinfo
deleted file mode 100644
index 68e00ca6a416..000000000000
--- a/devel/py-usb/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1516480606
-SHA256 (pyusb-pyusb-1.0.2-47ca9c3_GH0.tar.gz) = 1a7d15e3de08cff86c23c5c3848ed0579aceb6270537186664be5b20eff3c7ba
-SIZE (pyusb-pyusb-1.0.2-47ca9c3_GH0.tar.gz) = 68697
diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile
index 7058d54daeb9..bc7697f0a498 100644
--- a/finance/odoo/Makefile
+++ b/finance/odoo/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	odoo
 PORTVERSION=	13.0
+PORTREVISION=	1
 CATEGORIES=	finance www
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -33,7 +34,7 @@ RUN_DEPENDS=	wkhtmltopdf>0:converters/wkhtmltopdf \
 		${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}usb>=0:devel/py-usb@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vatnumber>=0:finance/py-vatnumber@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${PY_FLAVOR} \
diff --git a/security/py-yubikey-manager/Makefile b/security/py-yubikey-manager/Makefile
index 620582cc4046..fa322b9098a9 100644
--- a/security/py-yubikey-manager/Makefile
+++ b/security/py-yubikey-manager/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	yubikey-manager
 PORTVERSION=	3.1.1
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +20,7 @@ RUN_DEPENDS=	${PY_ENUM34} \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyusb>0:devel/py-pyusb@${PY_FLAVOR} \
 		RSA_SecurID_getpasswd:devel/libccid \
 		pcsc-spy:devel/pcsc-lite \
 		u2f-host:security/libu2f-host \
diff --git a/sysutils/py-leviathan/Makefile b/sysutils/py-leviathan/Makefile
index ca02e465765e..68864a6268c1 100644
--- a/sysutils/py-leviathan/Makefile
+++ b/sysutils/py-leviathan/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	leviathan
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Application to control and monitor NZXT (Asetek) liquid coolers
 LICENSE=	GPLv2
 #LICENSE_FILE=	Not packaged with PyPI sdist
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}usb>=0:devel/py-usb@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/sysutils/py-liquidctl/Makefile b/sysutils/py-liquidctl/Makefile
index 2bdc5cc42277..b84d234f9e3c 100644
--- a/sysutils/py-liquidctl/Makefile
+++ b/sysutils/py-liquidctl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	liquidctl
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docopt>=0:devel/py-docopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}usb>=0:devel/py-usb@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils