gentoo auto-resync : 05:01:2023 - 18:09:32

3 files changed, 3 insertions, 40 deletions

diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index d650c0083aa1..4d709d8e90af 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,6 +1,4 @@
 AUX cpuid-20220620-makefile.patch 1359 BLAKE2B b16bd455de251f3989718fa56c1b19f97d79271998ccf774f74f0886ab8072be482e480604bfad462e0ac9c325470d12e80150e6fc588abfae629cd6499e0ea4 SHA512 680e477460679ae016c95d0e0c5cef916486629011b43cafb5f90c1c097b8c245d4c8b7861a20bdeee05b87b2220ad37a5ca589ff952dd9d7580ca301aac0ada
-DIST cpuid-20221003.src.tar.gz 138457 BLAKE2B 0eef33fc38ff0bb96bec2928a376cf849a5141e1fd161f1a2649e106543a0eb0b29b13e450ad11e251398dda155dc817944c5c81c3ff0b0fc2d7c92779c3ff0a SHA512 7e787caf59e980cf1eca8012d6269b61cd8bf0a1a79c4534d8bb9924b6eff2fa5c0408bc8581e50ef205a280e7861ca62a7d49e7378faff0f185a97463a115a1
 DIST cpuid-20221201.src.tar.gz 140185 BLAKE2B f9bef888adaaddc9f0b28d85905ab4c86b65b1ef247b7068f0fd7a508021f3ff8322287c5284ae0041effc71b07661a265426f28116faa700edb2fc793452c69 SHA512 fb6ace9c8d7efae628087bdce9d8279c080701b37ecc57f5c9b5d63b0c1991bc0f2c26a2708467e479169f72a41d93c0a70e156726babd5adab366b38ca309c9
-EBUILD cpuid-20221003.ebuild 600 BLAKE2B 1ebc72661435e3d658e51857de187ab6ebf663548f0431f18c5240350d70bf7bd3390503bb5b45d527f28697ff6eaf0ab093847bf812a109f405ba75f95760d8 SHA512 2a2860ba8cb11dcc186d3cfea20232055a184de370651887aacf9db71ffa6cb80594e057ff8f7a4a81f926f38ef1c148cb2a690f9c1ac371acf46dcb01a3e06a
-EBUILD cpuid-20221201.ebuild 602 BLAKE2B 0b44750e78eaccaa51fef6961672ee30daffe9d77ec413201a4779b94ecce53fa10539907cdd3d79d1f6dcdc5a3e542c8cfc0a10deaf6fac01d48b9bbffdf089 SHA512 7abdb0e2514f001cae3c99bd2f0e128a2d17e7ee2d38cbeb7d0043635b02747415ff3c3b3ac86fbd2313d2dc6351e1c0a0094c048fa4e4e0146e3fa5b0290d6d
+EBUILD cpuid-20221201.ebuild 600 BLAKE2B 0ef114696d7551a49446b327ee2ca0ac4207111703b304f75e850ded69988fd3003ea3de01d2253afe260291998c0ff50c5746b77334265b03ca3b8225f6f9fc SHA512 8458a7ce22cb425e738a18a1a764e8793de4e2af15fc6ac0b33af87a4792e00072c1cf8a27dcc1e2ecd0626c3ad9c243000e1eb63641f39a46dd8836bacb8ffa
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20221003.ebuild b/sys-apps/cpuid/cpuid-20221003.ebuild
deleted file mode 100644
index eddf220e872c..000000000000
--- a/sys-apps/cpuid/cpuid-20221003.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}-20220620-makefile.patch" )
-
-src_prepare() {
-	default
-
-	tc-export CC
-}
-
-src_install() {
-	emake BUILDROOT="${ED}" install
-
-	einstalldocs
-}
diff --git a/sys-apps/cpuid/cpuid-20221201.ebuild b/sys-apps/cpuid/cpuid-20221201.ebuild
index 0f77190b474c..fab516d7110f 100644
--- a/sys-apps/cpuid/cpuid-20221201.ebuild
+++ b/sys-apps/cpuid/cpuid-20221201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 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