gentoo xmass resync : 25.12.2021

4 files changed, 2 insertions, 114 deletions

diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index bc68c41c0d99..55a3fc661d82 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,6 +1,3 @@
-DIST usbutils-013.tar.xz 98056 BLAKE2B d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873 SHA512 eb1751e5b82f7a1bdffc667662cebee6fd42f466e59d4eb4c98f0d3723d740305377da1df1ba5831402fddbbd1697bbfa2abd22d9ed175e2dee55d6d007e9e54
 DIST usbutils-014.tar.xz 165884 BLAKE2B aea4f8edd3c7d7bc400fd63a8702b6d0bb50b8ed07196c4a0ed20a615eacf6373794afb9e7d5d81408dc3382848e965ecf8bc1bbec20837e4d1f96ba47cc40b5 SHA512 43c9f6ed14f8d01e014ef39a5d50b3b09031c6bda8261e0945b4cb4287c9107104175b386c2adc61dc7f9f476afb30f9a647a6ece6dee26b4133a4f10af72792
-EBUILD usbutils-013-r1.ebuild 1265 BLAKE2B a035c8d3aeaee690d4b618c98d75de6eafc39deda40ba306d5d628a508ea2c35cd1e522da0c0acfba2fea94b5956b00a5ea32bf56812a196d2ebf1980e494600 SHA512 35a854187104fd4a5768af7dd6ce57b75170b685a389a12f45ea5a75f916e46f32446b5af2c222923af206b64d19711cf6b6019071781619b0a6d8d60bc6fb2e
-EBUILD usbutils-014-r1.ebuild 1328 BLAKE2B 950493cf36450787a49b171353ebf7bb56fd75d88fcee025a694d76d78b21d6458850a3f3ab41797e39c0d6af64201c7df9085b630ec3bdfd5d254e613fa3777 SHA512 360593108c2aab34c6dee0e62524c868c849c7a122a6ad9614cb5a3993ca1c3f5ca3a7cab74effcdad2cb8d6c24ef51584bbc4f4965260abbbd24c11dd8946e1
-EBUILD usbutils-014.ebuild 1321 BLAKE2B d1ee5b521795e6e698f9138629f809de31c5e65c0943cfe565553f2ec770ca7ee3a7f1e1327c8fd2bee207747c510605c955a6fe0be3a278803bfe96e668b88b SHA512 325d1c06286f15d7d6af397a6727bb29a4578ee1f5979655dd718f6dffb7967f756dbe91d5d3b02c12860012abc2557c4e76b34943ba9793c5c0d03f02889adb
+EBUILD usbutils-014-r1.ebuild 1331 BLAKE2B 784f8460e23b0bd885ec86d6c0e4daa2b40a72193d7c82d83e20d3d9b219369c8835ebd283485afae927b7451859ab79c2546a85409363392e12a457b19b490c SHA512 3c7fac95d86331cf4320d8e4ab1bf39907677ea68463c59393be2fc2813b5023cd01a87333cd1c7f603adec60d4eb3f9cba26ea082d45ca0028ec0387bb84a2e
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/usbutils/usbutils-013-r1.ebuild b/sys-apps/usbutils/usbutils-013-r1.ebuild
deleted file mode 100644
index 18fefda1788a..000000000000
--- a/sys-apps/usbutils/usbutils-013-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
-	https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="virtual/libusb:1=
-	virtual/libudev:="
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	sys-apps/hwids
-	python? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	use python && python_fix_shebang lsusb.py.in
-}
-
-src_configure() {
-	local myeconfargs=(
-		--datarootdir="${EPREFIX}/usr/share"
-		--datadir="${EPREFIX}/usr/share/misc"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
-	dobin usbreset # noinst_PROGRAMS, but installed by other distros
-
-	use python || rm -f "${ED}"/usr/bin/lsusb.py
-}
diff --git a/sys-apps/usbutils/usbutils-014-r1.ebuild b/sys-apps/usbutils/usbutils-014-r1.ebuild
index 135aaef523d1..547e7cc8092a 100644
--- a/sys-apps/usbutils/usbutils-014-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-014-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit autotools python-single-r1
 
diff --git a/sys-apps/usbutils/usbutils-014.ebuild b/sys-apps/usbutils/usbutils-014.ebuild
deleted file mode 100644
index adc0efbb6dea..000000000000
--- a/sys-apps/usbutils/usbutils-014.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
-	https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="virtual/libusb:1=
-	virtual/libudev:="
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}
-	sys-apps/hwids
-	python? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	use python && python_fix_shebang lsusb.py.in
-}
-
-src_configure() {
-	local myeconfargs=(
-		--datarootdir="${EPREFIX}/usr/share"
-		--datadir="${EPREFIX}/usr/share/misc"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
-	dobin usbreset # noinst_PROGRAMS, but installed by other distros
-
-	if ! use python ; then
-		rm -f "${ED}"/usr/bin/lsusb.py || die
-	fi
-}