3 files changed, 3 insertions, 40 deletions
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 46c4313e6bff..b99815602ed1 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,6 +1,4 @@
 AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
-DIST cpuid-20201006.src.tar.gz 118994 BLAKE2B 05c547858358a92b0c9270066dc33e08693922e4ba765edcba7aca201811c54074a0cd683edb3e9dedf2bb0fd23682b3cc5725e4067b27ec27e0fe979eb22f56 SHA512 f037c1707b49e92f1bd605ec87a0995ae36215d075bcbadfed1d11f5fefda43391b48f10d2517334574aa7e243f0b73d22f1fcbfe1fb133aaf5bad1046e8ba5e
 DIST cpuid-20211210.src.tar.gz 129491 BLAKE2B 8aba8449207c39f2082363664b61b55163c8f43804552304d0f9070522dbae867a757019a51f4526f9b85fa541811a8156d517b8ae53ad956a25a56b0d774251 SHA512 42d01890c40f90e6500f643bb4a7f5a8e76c8c76720062add79662a789e0d460d39383ea49a765f206038d72d1db7074d547500998e265ad12fee88af2dc175a
-EBUILD cpuid-20201006-r1.ebuild 597 BLAKE2B 3f7d8c98a6796dcfe78c80365f0d2238f1018cbc85a683ad9a28b3b70f936a99185427b4645073bb2d313821053e7c7d0d2c1c94a00b5330c8d66665690ea648 SHA512 5e3ac12a35b36d088e134b92f652723d8f466287a927cead8162ce321d974f53bb51bf964e9a6f66b42557413eaded47f47d18a6730bd6bb1874155cbd8564f0
-EBUILD cpuid-20211210.ebuild 599 BLAKE2B 8b8ba9702a202768a5371131b67bea23a5cef77329a62e9c5dfe390acc5bd88e152c990982686c6390add7db59aa4c34a4290098e810e268ce12408fdf53ed5b SHA512 ce063b76f6cb0a660d2fa23151399f9a0ac086aaf5024e35576b35ed4eb29afaecf0ec6e4a060e203331cbd5eb0d180fc8370d2db32787d8f55cf3fc778a5449
+EBUILD cpuid-20211210.ebuild 597 BLAKE2B 5c1d26e0b9d3d37343a806a1b6e4f7ac65678f9286633888fbb21375e181fbcc19cd68c9975dad4a9d39d36555f542bfc55fa0a90af85575153301c8a53868ec SHA512 4d10ed0e3c8a96574b29227c07e45c95d3426ed170289fab097df4efb82a997227262f826ff29d0d7f2953728c1ee87345b57d764e02aca5223bd28c8973b7aa
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20201006-r1.ebuild b/sys-apps/cpuid/cpuid-20201006-r1.ebuild
deleted file mode 100644
index 6c29a01ce82b..000000000000
--- a/sys-apps/cpuid/cpuid-20201006-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-20211210.ebuild b/sys-apps/cpuid/cpuid-20211210.ebuild
index de0e99c961d4..687993325c30 100644
--- a/sys-apps/cpuid/cpuid-20211210.ebuild
+++ b/sys-apps/cpuid/cpuid-20211210.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
@@ -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