8 files changed, 6 insertions, 116 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 135a30380335..e1b9bf7bf6d0 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index df7167b96a52..8d18b7cffd97 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,7 +1,4 @@
-AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
 AUX cpuid-20220620-makefile.patch 1359 BLAKE2B b16bd455de251f3989718fa56c1b19f97d79271998ccf774f74f0886ab8072be482e480604bfad462e0ac9c325470d12e80150e6fc588abfae629cd6499e0ea4 SHA512 680e477460679ae016c95d0e0c5cef916486629011b43cafb5f90c1c097b8c245d4c8b7861a20bdeee05b87b2220ad37a5ca589ff952dd9d7580ca301aac0ada
-DIST cpuid-20220224.src.tar.gz 130706 BLAKE2B 78e0d8296ffafa6eb5a668561bb5c1834c8cffd020f0c052438381f72cddbfe8e85c3e4d662c6aff5224a0b147cd5e20cbce2240f791f2c857c4f584c87b4359 SHA512 7cf41d2429d442b4dfd5d369e394c11916352e16fc56852ea4af71945192903482bc45c38367ff5ae3f8d386ffc65cc61a9b0bec4594589a057557daf54d8562
 DIST cpuid-20220620.src.tar.gz 134487 BLAKE2B 37beeeef5bbeed47d762f093a568e18ac06b32b4c8c4d763656c5310c78b949c60aaf4e874b15485af15be1e31c389692a0ab277a95a0dcb0b66a7dbece50a52 SHA512 e06db43fb12efa1d112267993754965b8a2b07c914766a46a0fe6fdcf023606cfb132eac575726ad9ed7d0e6fc53d728a6d3d3d7abf2f484f002825c791da7b9
-EBUILD cpuid-20220224.ebuild 600 BLAKE2B 9aebdae2673da4c0d88f9178cac0366684a2ace93004c51d1868a48d0dd8c897acb4670a212df69a48b79de99d4536cbf6e488078573fe9a493a5af511e75a3f SHA512 1dde5b326b3f04775419cd24b970d0019baedd82ce2b2afa1a94afd52280ccb4233ecaf4b28a60f0810df66a113c63b1c7da08c324f583a00315c6eed4f7d9ea
-EBUILD cpuid-20220620.ebuild 602 BLAKE2B 0b44750e78eaccaa51fef6961672ee30daffe9d77ec413201a4779b94ecce53fa10539907cdd3d79d1f6dcdc5a3e542c8cfc0a10deaf6fac01d48b9bbffdf089 SHA512 7abdb0e2514f001cae3c99bd2f0e128a2d17e7ee2d38cbeb7d0043635b02747415ff3c3b3ac86fbd2313d2dc6351e1c0a0094c048fa4e4e0146e3fa5b0290d6d
+EBUILD cpuid-20220620.ebuild 600 BLAKE2B 1ebc72661435e3d658e51857de187ab6ebf663548f0431f18c5240350d70bf7bd3390503bb5b45d527f28697ff6eaf0ab093847bf812a109f405ba75f95760d8 SHA512 2a2860ba8cb11dcc186d3cfea20232055a184de370651887aacf9db71ffa6cb80594e057ff8f7a4a81f926f38ef1c148cb2a690f9c1ac371acf46dcb01a3e06a
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20220224.ebuild b/sys-apps/cpuid/cpuid-20220224.ebuild
deleted file mode 100644
index d215e1baa0cf..000000000000
--- a/sys-apps/cpuid/cpuid-20220224.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
-SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BDEPEND="
-	app-arch/gzip
-	dev-lang/perl
-"
-
-DOCS=( "ChangeLog" "FUTURE" )
-
-PATCHES=( "${FILESDIR}/${PN}-20200203-makefile.patch" )
-
-src_prepare() {
-	default
-
-	tc-export CC
-}
-
-src_install() {
-	emake BUILDROOT="${ED}" install
-
-	einstalldocs
-}
diff --git a/sys-apps/cpuid/cpuid-20220620.ebuild b/sys-apps/cpuid/cpuid-20220620.ebuild
index 0f77190b474c..eddf220e872c 100644
--- a/sys-apps/cpuid/cpuid-20220620.ebuild
+++ b/sys-apps/cpuid/cpuid-20220620.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 BDEPEND="
 	app-arch/gzip
diff --git a/sys-apps/cpuid/files/cpuid-20200203-makefile.patch b/sys-apps/cpuid/files/cpuid-20200203-makefile.patch
deleted file mode 100644
index 9cfad5ef594d..000000000000
--- a/sys-apps/cpuid/files/cpuid-20200203-makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,11 +1,11 @@
--CFLAGS+=-g
-+CFLAGS+=
- CPPFLAGS?=
- LDFLAGS?=
- ifneq (,$(findstring arch=i386,$(CFLAGS)))
- CISA=-m32
- endif
- CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -W -Wshadow -Wcast-align -Wredundant-decls -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wimplicit-fallthrough -Wunused-parameter -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION)
--INSTALL_STRIP=-s
-+INSTALL_STRIP=
- 
- PACKAGE=cpuid
- VERSION=20200203
-@@ -40,7 +40,7 @@
- 
- BUILDROOT=
- 
--default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
-+default: $(PROG) cpuinfo2cpuid
- 
- $(PROG): cpuid.c Makefile
- 	$(CC) $(CFL) $(LDFLAGS) -o $@ cpuid.c
-@@ -56,9 +56,9 @@
- 
- install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
- 	install -D $(INSTALL_STRIP) -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
--	install -D -m 444 $(PROG).man.gz       $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
-+	install -D -m 444 $(PROG).man       $(BUILDROOT)/usr/share/man/man1/$(PROG).1
- 	install -D -m 755 cpuinfo2cpuid        $(BUILDROOT)/usr/bin/cpuinfo2cpuid
--	install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
-+	install -D -m 444 cpuinfo2cpuid.man $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1
- 
- clean:
- 	rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 21b1f9083796..44142fcadce7 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -1,15 +1,13 @@
 DIST inxi-3.1.06.1.tar.gz 357819 BLAKE2B e6eb8a34807323d7f46ff029af797e3a13229813bf0cff4b8b874cd21ff1d38459e2181ddf3882b4ee0d29e8c788e2fce1c01f5c295911493292082192c56c2b SHA512 6621252048e95132cfec30e341f72f5942188f273488509614aab28e55ee9987b8f3820e1298c4d9a16b4f3464f1f270fb4c1d5e5a7bf0d2f616b4180193ab6b
-DIST inxi-3.3.04.1.tar.gz 450695 BLAKE2B 3bf2fc9296c9b1e2357e7df2edeb3df5069d48b401be793ab82bd630cfbf45fdc39d6403d851d46dfa9b8e7729da6dc07e96982941396e46493f4531bb29233c SHA512 0ffde2362c79a4269df0f4bbe439e50d24a13969a22f6e84f6caeb8cace2ee49fb075d6051211709efdc831c2f7ef37eaa38d70306bc8f1a86f8ed0dc7dea094
-DIST inxi-3.3.06.1.tar.gz 460416 BLAKE2B a7a5eeade861294c8c18cd9594ef6fd0c681d8ae66b6e1b112dbc968be46a617db666d863f5138883d7651fad8e3b27c4f27a2b518233ffa2aae7e453feab62b SHA512 0e9d7215339235914cfcd7292443199304d44e528545a0c1c3d65d597f57da5c2678c410d215e6c8668c22677f20d62c93bbd7fee02dc74f8c9aab75b1488d00
 DIST inxi-3.3.08.1.tar.gz 467132 BLAKE2B c0254174c0a48936e1f183c16f985838cf74302da706996c1baec0c67b9c4209da5b555805cb668d626eccaa69f95e3cab2605b06d2cc7361a6cd3ff5d88c29e SHA512 bcbb81dd022dbd525ed3811406997c6689f968de8a3b6e0988381d9d2a488617ef3bc966034f9baac8eebb412b8d2e612b7cece29d65bdcb20d8b8cdeca112e6
 DIST inxi-3.3.12.1.tar.gz 495524 BLAKE2B 76b8600ea5bb5430a30bf3876ca80c1dbc8033449c3526c945d7457f3d9176d6299acf6d1a0b3e92c2f84e4b01ba70acbb326cfc9cd5b906e9e5a28550efa670 SHA512 5772b77a35342b6dee7211f31a35552794fddcdb01012e604c501707f1e3756791376b92e5c8f3d8c85493b83f2394d2e6f90f6e473225388975de2e174a2997
 DIST inxi-3.3.13.1.tar.gz 524354 BLAKE2B de12d2145f61b385d636aa9aa1efa057cfa12b010789ec34602ee7567d4db34a960a85b47d17f7a4db8cdb68a44d1085ca2f3be11ca503e5172525d75901d244 SHA512 6eed08ed0efb3574d294127beaec1373df434554ad98debd25ac865b85ab98e81e11f0cee855da0213cbc25fee95ce8504c7eaee90d99b8ad7c63f2b301394f3
 DIST inxi-3.3.17.1.tar.gz 558476 BLAKE2B a53a90a9bbea44da7e2f4c77d2fbd6cf41fd4bcf95defe7c27379b62ccfbeee70e06865034082e4ffd24018312ca0f439d9ef7d746c979fbd4c5fff47b42f165 SHA512 2bf28e8c4bc3d93e309639e04dfafd6e7b2c82b33178c11e138828c8378e1636b1fb16dbae88838e69953020789637745ffa54818ed954624995c1daaf2387cb
+DIST inxi-3.3.20.1.tar.gz 565689 BLAKE2B 0b89e54e22d0c88b57fdc2dcb08fc3cbe6b79a724c12d8eafd2e6eb6639ee1346ef9ee34b09f446464bafa35df87489ff9b40ad9e8de67fbe82c1becdd5af8bf SHA512 bdc4de6d2978ff17bdd4a5366d66fb483a304c61448ef33be902080a75ae6e78eba6bcd31b9a799a1eff01f22cc8e72200f314209e36af4287d8e5256bca4d05
 EBUILD inxi-3.1.06.1.ebuild 807 BLAKE2B 448c656ce3d29ab6068ef103521cb60cec55d27e74294d98885230a1a3b437999187f9633af2b30e61ee8235067750152bd0a67394e4cd071adccc836ef9fa9e SHA512 6f48f6171bf6bfea9bafe1540d7f2a3ad809e3a422a9988420599620133dddccae19423e74998ff988b6e42e45317563884aa4a265b15e9137e635426c5e3004
-EBUILD inxi-3.3.04.1.ebuild 812 BLAKE2B a1889935dae2f8bb4e2b123f40092a2afe972638165475caab81518b1c07320179cd6f36d66193675f885ffaa1ca8b1bc4d1e7b66f3c62d22c51f3166a1d4b5f SHA512 44641459e267d3bf1a8ecf96cff0d54352bf8faf261e33fa751ac1d79f7a6b718ef958300b79858f17362562f2883cf7d0523dcee2d665ec55d2818aefd9dd53
-EBUILD inxi-3.3.06.1.ebuild 820 BLAKE2B 729a7050c2a4227dc0ce4b0c01d6c2a8c545682503312d552e8f5f9018aa04354abe2370ac6b97e97cafd4d6fb9a8af3caf62b79caa4bb71ccdd57fe95ec4f29 SHA512 2cb0591495315c2292549627f3c205613caa14d631f147f3890ee208cac8ff4afc07c3d6e9446f12aa403608b4b520110411c2a90d5ffe9d98e73bc5c5100cb2
 EBUILD inxi-3.3.08.1.ebuild 822 BLAKE2B e0809bcec63b7f57cd126baacc4f463d946d9bb9f7ef235f0e7d21f197fa6b7248da90714a5a8f654a01a1f07a7fe99805587876b35f62f1b7a53b8fcd6f22d4 SHA512 fec2182a7fc229765f9b6861fedaab05b64f97ee6fa0d6bd324c369c53d5d7d567e002b4bb02599430d8c9e155c8776ff54239d0e9fe484ae1ea1ae35fa113d3
 EBUILD inxi-3.3.12.1.ebuild 822 BLAKE2B e0809bcec63b7f57cd126baacc4f463d946d9bb9f7ef235f0e7d21f197fa6b7248da90714a5a8f654a01a1f07a7fe99805587876b35f62f1b7a53b8fcd6f22d4 SHA512 fec2182a7fc229765f9b6861fedaab05b64f97ee6fa0d6bd324c369c53d5d7d567e002b4bb02599430d8c9e155c8776ff54239d0e9fe484ae1ea1ae35fa113d3
 EBUILD inxi-3.3.13.1.ebuild 834 BLAKE2B e917d5256700f690ce449ebd1a6b4f0f517b5e446040086968aed594d8af91f5714304122ab484fbb78671ca93d51c8cf9cc8f2ae541d39cc1cf7bd3679d0537 SHA512 fb82b7d86ccf3ed2840ade49f6ebd0bf252ffdc0a9d4c8e0db29b64b80d926a479bdbb654cdef75de32d7fa05a9ed5e40f5af3bfb85de4eb4a3b85541fb49188
 EBUILD inxi-3.3.17.1.ebuild 834 BLAKE2B e917d5256700f690ce449ebd1a6b4f0f517b5e446040086968aed594d8af91f5714304122ab484fbb78671ca93d51c8cf9cc8f2ae541d39cc1cf7bd3679d0537 SHA512 fb82b7d86ccf3ed2840ade49f6ebd0bf252ffdc0a9d4c8e0db29b64b80d926a479bdbb654cdef75de32d7fa05a9ed5e40f5af3bfb85de4eb4a3b85541fb49188
+EBUILD inxi-3.3.20.1.ebuild 834 BLAKE2B e917d5256700f690ce449ebd1a6b4f0f517b5e446040086968aed594d8af91f5714304122ab484fbb78671ca93d51c8cf9cc8f2ae541d39cc1cf7bd3679d0537 SHA512 fb82b7d86ccf3ed2840ade49f6ebd0bf252ffdc0a9d4c8e0db29b64b80d926a479bdbb654cdef75de32d7fa05a9ed5e40f5af3bfb85de4eb4a3b85541fb49188
 MISC metadata.xml 613 BLAKE2B f444aa0759120064814cacf0fcba57059d87b1c014d78eea52304fb3afb9da9b905e30c1cf1399bfbc0d66442e3d892eb2657543014b905f2bf9a943dc8480d9 SHA512 cbe6e76cb003bb77134398aa1db5a24c47de826eb1f17b07e2cee647b9d58948596c2f4588c7c834332c096ce8b782799f07ed4f47a7b252e85e402324ba76bb
diff --git a/sys-apps/inxi/inxi-3.3.04.1.ebuild b/sys-apps/inxi/inxi-3.3.04.1.ebuild
deleted file mode 100644
index c608479bb8f9..000000000000
--- a/sys-apps/inxi/inxi-3.3.04.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=$(ver_rs 3 '-')
-# 2.3.56 was the last version with no tagged release.
-# It was also the last Bash based release. Later versions are Perl based
-
-DESCRIPTION="The CLI inxi collects and prints hardware and system information"
-HOMEPAGE="https://github.com/smxi/inxi"
-SRC_URI="https://github.com/smxi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="bluetooth hddtemp opengl"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	sys-apps/pciutils
-	sys-apps/usbutils
-	bluetooth? ( net-wireless/bluez )
-	hddtemp? ( app-admin/hddtemp )
-	opengl? ( x11-apps/mesa-progs )
-	"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/sys-apps/inxi/inxi-3.3.06.1.ebuild b/sys-apps/inxi/inxi-3.3.20.1.ebuild
index 3c22d8270f60..49cc31d24326 100644
--- a/sys-apps/inxi/inxi-3.3.06.1.ebuild
+++ b/sys-apps/inxi/inxi-3.3.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="bluetooth hddtemp opengl"
 
 RDEPEND="dev-lang/perl