gentoo resync : 25.11.2020

3 files changed, 2 insertions, 68 deletions

diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index 39af96933190..fdf691c52763 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1,7 +1,5 @@
 AUX README.gentoo 296 BLAKE2B df18c0796912c5cfe6e8f88427ea690512bfd519aa3502528df6f6936571497937a22f8edcd9e9143d915e648f9b341043141cc6d0ae35de55d22d44c0335f6e SHA512 4ae61b89352a4bbe70f4ea1b85eb19e58c2b81475722dda25c289fbe15e7e6e07df51b08471c5d3c5d7a3b12cc09ba599e0d2158dee68c9c66f60908d57b4326
 AUX hw-probe-1.5-disable-automatic-upload.patch 1140 BLAKE2B 47ae86326941c5a86f9efd7614509a9af36261c51ef85f21ea1172ae91c3966c113aa51f8841a56005f75b0370b57dff6196fe49a77c766ce1efd9003ee0e249 SHA512 7cbe2dc17cb513086f85052b43349fb64bd12a0f3671bb37109a20d62cf565f8bc8d9e798a7d0a7e53896d187e8c575f850861e381885f2ac1f40d2c0c919063
-DIST hw-probe-1.5.tar.gz 113996 BLAKE2B 59f6fc27e2cbb99a4b7dd9428e32a93dce2ffcc1133e82539b8836a694e6c5634fe2e172732675acf0d83504907a750c63f138d6dec236039eb7c805010a8383 SHA512 80dd2484bd317ac1e86d7f434626f288648aebf110a4bf81c0c05548abcb19d990119c1690fcb5796384a6c32fd5c1e827698a31165bfc41ef6df9fc7fdd368d
 DIST hw-probe-1.6_beta2.tar.gz 143569 BLAKE2B fc7b7562f86eb1b26fef32a8ed9b4a8d01c5621bedbc7e810d5a011c53d528b000ff9df312cf5e3f0ab455558e08e2b9a3ddcd543cd6856208466721f9a0e13c SHA512 2727e7b0fe449cbb6dd21fc112660df4ec666be845bbfd21037b41372a499dfb80c8c2dc37bd222032c68faadff91192a6d6f5229353cb0fc63b8e3dbd715f5d
-EBUILD hw-probe-1.5-r1.ebuild 2282 BLAKE2B 9992151a7b468d7138ec4a001f5575525489f546c58df29b5eefef9b3db5f6607f2f01f8289f8ad8474d20f21b6f57d1381c8b6c3a446188790912544cca5a54 SHA512 b539734e3a5cf0735c99ba8fdb6aca628e8e84d8d02739676c35c13d1880b891f50f4d8f209d3ca595859f8657e7618900ee39c461c5989580b62afc9b40dcb6
-EBUILD hw-probe-1.6_beta2-r1.ebuild 2449 BLAKE2B 20d24381c6a18034608f9d3fdd5c6075bbe10ec9672faa6dcb4ad3f5ba2b258c8e5cc8d0e9b9c596c64644686b5a65977ee918e537a98212f2c4190daec8e2ae SHA512 80b49c3fb7cc001f476619f47b535139765708ab4d07cc2e45134d4c1bcba1407cbe904f7494bee613b652c6461fb472e5146c12b4f6f0cd7b10267607282916
+EBUILD hw-probe-1.6_beta2-r1.ebuild 2447 BLAKE2B df0aa62976532b17319cf17259211cc493008be2478855574979eb73b3f8cb471eae04ee8b315c49a5eefc828a7be6896b6d2dbe8114a584be42c6b878bd6318 SHA512 43d9118e85be8fdf07b96c1e32c3cdaa27b5e3b2da9b9780fe133481b087be04b33b276618283ec596fc381ead99b7f1765175f89ca04793641065aefc496e0c
 MISC metadata.xml 646 BLAKE2B 1cc93bfb0e3544c4c746e80ff21675fa22d3103e14a040ffedfcfd24e73d8d968decc318e4523a03815e85de4ef85926ac20d4dfdf7cde5a3445ca29f11f6de7 SHA512 2ea8a211186b71ebc008c9999225edef063c8c8e0317d6e4c6149cc6ec6281a84065bef3dc93b4308f8567860fb75c19287aa91b5ab41e6a68229fcbf1c5a474
diff --git a/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild b/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
deleted file mode 100644
index 3d73d2db78ad..000000000000
--- a/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature readme.gentoo-r1
-
-DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
-HOMEPAGE="https://github.com/linuxhw/hw-probe/"
-SRC_URI="https://github.com/linuxhw/hw-probe/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Digest-SHA1
-	net-misc/curl
-	sys-apps/dmidecode
-	sys-apps/edid-decode
-	sys-apps/hwinfo
-	sys-apps/pciutils
-	sys-apps/smartmontools
-	sys-apps/usbutils
-	virtual/perl-Data-Dumper
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.5-disable-automatic-upload.patch" )
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	default
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	optfeature "showing Machine Check Exceptions." app-admin/mcelog
-	optfeature "showing additional I/O statistics." app-admin/sysstat
-	optfeature "showing smart card (reader) information." dev-libs/opensc
-	optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools
-	optfeature "showing information of attached scanners." media-gfx/sane-backends
-	optfeature "showing GPU information provided by MESA." media-libs/mesa
-	optfeature "showing zeroconf statistics." net-dns/avahi
-	optfeature "showing HP printer statistics." net-print/hplip
-	optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill
-	optfeature "showing additional CPU capabilities." sys-apps/cpuid
-	optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm
-	optfeature "showing available I2C sensors." sys-apps/i2c-tools
-	optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi
-	optfeature "showing information about tested memory for faults." sys-apps/memtester
-	optfeature "showing 'Plug & Play' devices." sys-apps/pnputils
-	optfeature "showing systemd boot process information." sys-apps/systemd
-	optfeature "showing ACPI statistics and tables." sys-power/iasl
-	optfeature "showing information about NUMA." sys-process/numactl
-	optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs
-	optfeature "showing available Xinput devices." x11-apps/xinput
-}
diff --git a/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild b/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
index 10f2227e5771..d10255310db4 100644
--- a/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
+++ b/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV_BETA}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/perl