Revert "pyusb: upgrade from 1.0.2 to 1.1.1"

This reverts commit ac8a23f196d7a3968fef7fb88bd075f510f8a66d.

Reason for revert: b/198777617

BUG=b:198777617
TEST=None

Original change's description:
> pyusb: upgrade from 1.0.2 to 1.1.1
>
> pyusb 1.0.2 is bugged and causes servod to segfault when run in a VM.
> pyusb 1.1.1 fixes this bug.
> Upgrade made using `cros_portage_upgrade` after which the following changes has been applied:
> - dev-python/pyusb/pyusb-1.1.1.ebuild: change PYTHON_COMPAT to support python2.7/3.6 and above
> - eclass/python-utils-r1.eclass: file deleted
>
> BUG=b:191332211
> TEST=run servod in a VM to check that it does not segfault anynore
> TEST=connect to ec_uart_pty through servod4.1 on storo360
> TEST=FEATURES=test emerge-octopus autotest
>
> Change-Id: If985b0e8908380cf3ee4e2bec2fa5f0e457cf35b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2977555
> Tested-by: Romaric Jodin <rjodin@chromium.org>
> Reviewed-by: Mike Frysinger <vapier@chromium.org>
> Commit-Queue: Romaric Jodin <rjodin@chromium.org>

Bug: b:191332211
Change-Id: I9bcc5352ee51132e1d4dd2e07783f815ff7e3f29
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/3194866
Reviewed-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Xianuo Wang <xianuowang@chromium.org>
Commit-Queue: Xianuo Wang <xianuowang@chromium.org>
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 21d7e35..6faeb41 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1 +1 @@
-DIST pyusb-1.1.1.tar.gz 74746 BLAKE2B 795acafae3193e1a415baeb634554c8fdec3f4baa45a61a3eac9e1af4a84634cc540d421b7d8ad20142912fbef6ba53684e2e5b008e48f3e89406a493918ab20 SHA512 19aa82dcb9421d536063a975414855d1474f44b33dc4039e9a001be795061dbd60ed576acb605ae6bab7a0fe10834e5507408757546c7edcd50b43687a65a287
+DIST pyusb-1.0.2.tar.gz 68694 BLAKE2B 8910d9d6d7abd8b0dddf725ad9cc745ce5b06f69a4824a86ed9783918d0fc88d438674852288654964c4555d8278f22d3daab679149c64ea8a6fd3dd2f1cf284 SHA512 6a264b796e17612004196a7a526a7c6df99feac9062f8354540221016411a78a65d413731aea2fc1206ed5ea2b84787078898b9ca3754164f1dfe2a9878b75a5
diff --git a/dev-python/pyusb/metadata.xml b/dev-python/pyusb/metadata.xml
index 892a08c..7a1db2d 100644
--- a/dev-python/pyusb/metadata.xml
+++ b/dev-python/pyusb/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<longdescription>
+		pyusb is a python wrapper for the libusb user space USB device library.
+	</longdescription>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pyusb/pyusb-1.0.2.ebuild b/dev-python/pyusb/pyusb-1.0.2.ebuild
new file mode 100644
index 0000000..b5c2008
--- /dev/null
+++ b/dev-python/pyusb/pyusb-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="USB support for Python"
+HOMEPAGE="https://walac.github.io/pyusb/ https://pypi.org/project/pyusb/"
+SRC_URI="https://github.com/walac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# pypi releases don't include tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+
+### This version is compatible with both 0.X and 1.X versions of libusb
+DEPEND="virtual/libusb:=
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS="README.rst docs/tutorial.rst"
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" testall.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyusb/pyusb-1.1.1.ebuild b/dev-python/pyusb/pyusb-1.1.1.ebuild
deleted file mode 100644
index 4ad89e3..0000000
--- a/dev-python/pyusb/pyusb-1.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8,3_9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="USB support for Python"
-HOMEPAGE="https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="*"
-
-### This version is compatible with both 0.X and 1.X versions of libusb
-DEPEND="virtual/libusb:="
-RDEPEND="${DEPEND}"
-
-DOCS=( README.rst docs/tutorial.rst )
-
-python_test() {
-	cd tests || die
-	"${EPYTHON}" testall.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/metadata/md5-cache/dev-python/pyusb-1.0.2 b/metadata/md5-cache/dev-python/pyusb-1.0.2
new file mode 100644
index 0000000..c75bcdc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyusb-1.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libusb:= dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DESCRIPTION=USB support for Python
+EAPI=6
+HOMEPAGE=https://walac.github.io/pyusb/ https://pypi.org/project/pyusb/
+IUSE=python_targets_python2_7 python_targets_python3_6
+KEYWORDS=*
+LICENSE=BSD
+RDEPEND=virtual/libusb:= dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/walac/pyusb/archive/v1.0.2.tar.gz -> pyusb-1.0.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bce2ac4f8a8de6b8cd3e08647cd6390f
diff --git a/metadata/md5-cache/dev-python/pyusb-1.1.1 b/metadata/md5-cache/dev-python/pyusb-1.1.1
deleted file mode 100644
index 41492cb..0000000
--- a/metadata/md5-cache/dev-python/pyusb-1.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libusb:=
-DESCRIPTION=USB support for Python
-EAPI=7
-HOMEPAGE=https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=*
-LICENSE=BSD
-RDEPEND=virtual/libusb:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyusb/pyusb-1.1.1.tar.gz
-_eclasses_=distutils-r1	198e3b9ddb55ae36b2a50b07ca2877ef	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	toolchain-funcs	f783d68a26b62d6b19e070e6bcada5e6
-_md5_=013776d0504fd75ab5e825d4144dbe9e