gentoo resync : 22.05.2021

4 files changed, 3 insertions, 110 deletions

diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index ed54b954cabb..6094e140a069 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,6 +1,3 @@
-DIST usbutils-012.tar.xz 98388 BLAKE2B a19d64edeb08bafe3e6a0d6be7cb5196cebb68623cfb5cd21941f109a3f3def774382bc6fe8b68398278e530417190030c8dd39ab982c088329c7acbb36cb672 SHA512 e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66
 DIST usbutils-013.tar.xz 98056 BLAKE2B d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873 SHA512 eb1751e5b82f7a1bdffc667662cebee6fd42f466e59d4eb4c98f0d3723d740305377da1df1ba5831402fddbbd1697bbfa2abd22d9ed175e2dee55d6d007e9e54
-EBUILD usbutils-012.ebuild 1198 BLAKE2B abc18554c8bbc212899f754a773fdf340664e81d5b123bd39c417683bd3b0fe577f4f99f03502ac35fdb942487d1575152c3bbe66add18fa13a764ba41e53942 SHA512 cdbe4025facc03ba57503aa5538f3e08dbda84fecef938950e474fc8cfe495ccb3d3222a4462b4f0179bd546db5a126cfe266b55d35cfb5bd6ea10512472934e
-EBUILD usbutils-013-r1.ebuild 1273 BLAKE2B 9e3dca2dbd592cb04de860c9b1d27dcc6b7142687c0add196ac7c8002c6c4764f7f7883c52965350188c88e0069a2a5d2f8d40a6b7eb37c4e4c345e86a5eca89 SHA512 ac89837fee8a114eecb448bd63d698de7ce277d8a935d4326e43f2f08d2df752302a63c6db86088d334e2b2dab41b7ebd484ba8bdaa6b1ed22e1cc361ad7f549
-EBUILD usbutils-013.ebuild 1200 BLAKE2B 409776c56eb61d8eb175c05bf3bee47644ad616bd7bcc407c45c956a9da955687e05df87e9c5db53ae0df33b14307817d6616c614c405e7d997102118d452bfa SHA512 126041a5f1f37dee41d144a1010da635550ca15a9797f15fb2270774aefbfff4a58cc2e048528402de76586686ee522e54c8c76dd67b2237d2f3a0407069c686
+EBUILD usbutils-013-r1.ebuild 1266 BLAKE2B e715e4c409dee03b1ea41f1fd1ba92d66034f3ce920831b7ed637d2c1a10ec09b887ce0b5173fcc762335c15a86df9584e76625a5a490e21aad03a3870ee0f66 SHA512 e41434a389bd60fc473427eb5f58f27a4856c5037016affffd8c3d09bd5661092e4af9b3504d6ad655981976c70040cdf0b68b08faccc504965642b33cea1f8e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-012.ebuild b/sys-apps/usbutils/usbutils-012.ebuild
deleted file mode 100644
index 31a5985fb585..000000000000
--- a/sys-apps/usbutils/usbutils-012.ebuild
+++ /dev/null
@@ -1,52 +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} )
-
-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
-
-	use python || rm -f "${ED}"/usr/bin/lsusb.py
-}
diff --git a/sys-apps/usbutils/usbutils-013-r1.ebuild b/sys-apps/usbutils/usbutils-013-r1.ebuild
index 9752da75f03d..b63d45b9d12b 100644
--- a/sys-apps/usbutils/usbutils-013-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-013-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 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"
+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} )"
 
diff --git a/sys-apps/usbutils/usbutils-013.ebuild b/sys-apps/usbutils/usbutils-013.ebuild
deleted file mode 100644
index 4b99cf62766f..000000000000
--- a/sys-apps/usbutils/usbutils-013.ebuild
+++ /dev/null
@@ -1,52 +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
-
-	use python || rm -f "${ED}"/usr/bin/lsusb.py
-}