gentoo auto-resync : 26:01:2025 - 06:49:21

4 files changed, 2 insertions, 72 deletions

diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index b5c9656c1785..f5ed7f12b3d9 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,6 +1,3 @@
-AUX pyusb-1.2.1-setuptools.patch 1457 BLAKE2B a60b6f4bb8abb3a4d59b325b8eff9af7c88fb093913ea9e8c81ada6bb70d303bc225ddadf2a7ee6308f3fade136d843b7c8d07dc139cd3c04352520a060cb515 SHA512 769e734d60224a2ee58e6192fc7dded8ab821df8360fb9cf0cd2cec0135f68b1aa6a1d996e42847300ca9ca9b00ef318124c53bddb2cf5e5b25523f24bb39cb8
-DIST pyusb-1.2.1.tar.gz 75292 BLAKE2B c1b99f22919ab4beb8e96d664147dc51001c4a48b3acf9ba3961f7f53a9d13277c622e891481fd00b9d34d2ed8a2a0932b7949c13396ea4d76b36f36fcc4cdb0 SHA512 51d0c1165540afa21d6d0ab7315ac77b08083d1cb8e502173dfb1766bc542173f9d7b0070fd14bc71d147e31c3f0780b277093791a7c82485962a04ec62bf0f1
 DIST pyusb-1.3.1.tar.gz 77281 BLAKE2B e86a24022e2ced4286500ca537d964cf974a47204fc70af6dd8993e039ccf47f710cb7a3564417bbd392cac0b4b06acc1de4ad8c880f782604ecae83ce87aae4 SHA512 91dad112b928133f7439c25ba473bfa8b214fc15daa37c8992304032766498694da5a84c8451d1ae007d0eeb9e840f700d071579324fb96d95302a1e6042e208
-EBUILD pyusb-1.2.1-r1.ebuild 694 BLAKE2B b0c2100d55dd5ccec231532b9b0a395d6e671b6b23ec1eb58427acbdb1bbbcf668b131b5a5da467281fb7f8505d2e5abd3c5540b177c244d8311ab4c9133a96d SHA512 5dbcb273f4fae4d57d45375b7fb9fadfc67a67d492649bb4427434ae1382181c79acbe2250fb3bcd7e75490970f63e2bafb8d140d22ef3b773e4150e846fd40b
-EBUILD pyusb-1.3.1.ebuild 684 BLAKE2B 9e8f930198a6b82c5f6186cb5f3e541cac207c54ffec62309fc771d2df538a1ee9d5445f0c9ddecf5a46c219ab05f56d2d9b18724463ae39042c4483c5717657 SHA512 c107ca7d7b0b15f8f64a31dc10752b68b80d9697a2bf535558ee56b61096ae9eeca1434b90b0c020b11ce91a364f8673cfe5f82f85379c0f3409847a977995ab
+EBUILD pyusb-1.3.1.ebuild 682 BLAKE2B ddb207db12cb719ba77763716342f83e08873cc25f78526fa45f5a45cb8c1dd6b1d8d39184186c453d0ce988a0d993e667dc9decc077244b8bdb211543b2f5f9 SHA512 6e0f32fda9e9b56f7a1fd4d7c0cace274451071501e03ce8ae574307e50368aea89cc5d3d5add9adaac20cd405d34646008b01b15cabab06fbeb8aa2b00fe269
 MISC metadata.xml 360 BLAKE2B 2e5a76abee80f87f827d5231436612e05373c2b42a5e4e697806e5a1dcd2c86818408ccb730f5012625685afad19700be608589afb08b02aebc5edca0dbcdf33 SHA512 3d7d8c6cde60c5a057c6f6a004b8ca2166edc8a0a5c3371de15b63312c6ea161447bd2f65ff5c7c54f9477a2cef5d7534168d3785ffca019e9094eb16ac3ccf7
diff --git a/dev-python/pyusb/files/pyusb-1.2.1-setuptools.patch b/dev-python/pyusb/files/pyusb-1.2.1-setuptools.patch
deleted file mode 100644
index 26b5e204d648..000000000000
--- a/dev-python/pyusb/files/pyusb-1.2.1-setuptools.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/pyusb/pyusb/commit/777dea9d718e70d7323c821d4497c706b35742da
-
-From 777dea9d718e70d7323c821d4497c706b35742da Mon Sep 17 00:00:00 2001
-From: Jonas Malaco <jonas@protocubo.io>
-Date: Tue, 12 Jul 2022 03:12:50 -0300
-Subject: [PATCH] version: handle when patch component is missing
-
-actions/checkout@v3 (by default) no longer fetches the tags while
-checking out the repository.  This, combined with our use of
-setuptools_scm post-release scheme, results in tox trying to run the
-tests with version strings that look something like
-
-    pyusb-0.0.post1+g3678fc1.zip
-
-and breaking _get_extended_version_info().
-
-Make _get_extended_version_info() robust against this case.  This is
-preferable to configuring actions/checkout@v3 to fetch the tags as,
-being related shallow clones, it might also happen in other contexts.
-
-Fixes: 678fc1867f4 ("github: update to actions/checkout@v3")
---- a/usb/__init__.py
-+++ b/usb/__init__.py
-@@ -55,9 +55,9 @@
- 
- def _get_extended_version_info(version):
-     import re
--    m = re.match(r'(\d+)\.(\d+)\.(\d+)[.-]?(.*)', version)
--    major, minor, patch, suffix = m.groups()
--    return int(major), int(minor), int(patch), suffix
-+    m = re.match(r'(\d+)\.(\d+)(\.(\d+))?[.-]?(.*)', version)
-+    major, minor, _, patch, suffix = m.groups()
-+    return int(major), int(minor), int(patch or "0"), suffix
- 
- extended_version_info = _get_extended_version_info(__version__)
- version_info = extended_version_info[:3]
-
diff --git a/dev-python/pyusb/pyusb-1.2.1-r1.ebuild b/dev-python/pyusb/pyusb-1.2.1-r1.ebuild
deleted file mode 100644
index 6e5a4090c905..000000000000
--- a/dev-python/pyusb/pyusb-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="USB support for Python"
-HOMEPAGE="https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
-
-### 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 )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-setuptools.patch
-)
-
-python_test() {
-	cd tests || die
-	"${EPYTHON}" testall.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyusb/pyusb-1.3.1.ebuild b/dev-python/pyusb/pyusb-1.3.1.ebuild
index c65c73c487a6..46bf628161eb 100644
--- a/dev-python/pyusb/pyusb-1.3.1.ebuild
+++ b/dev-python/pyusb/pyusb-1.3.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
 
 ### This version is compatible with both 0.X and 1.X versions of libusb
 DEPEND="virtual/libusb:="