gentoo auto-resync : 23:10:2024 - 04:04:36

4 files changed, 2 insertions, 39 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index ec3a4f09c36e..889145246dc0 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 775c9f9f64f9..23d50c341907 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-20240716.src.tar.gz 155562 BLAKE2B 52625a547c70b7fd45d63fea88acfcc938443f1f53c686896f88ef193240b7b9ea76020a48b187689c27fddad4cba8cdd41044ab57f731e488af14fd1a608fa3 SHA512 1efbd3f98253700d2948573025733fb7a3354d008b968c83078d36ddac834c4adae4eeef288214066ad520d23fa1eb0ea2036f878cde20d982a1810e7305b7a4
 DIST cpuid-20240916.src.tar.gz 157553 BLAKE2B 2f5ef3264fcc647122a73edf9a2b39110c11a23ac366c99481ec8cec4d7108ce088847b485f6b8e7dece757fb0246bafbbbaad36d0dc8128ade3290988a1f7de SHA512 f78e36400a963d39fb9d1b6dab6d79ea1ab700912aa229a4efc2088e61964fb5ece52c2204fadd34f1f75cfab6f7b659288c8892b86c44568e784283bf3f5278
-EBUILD cpuid-20240716.ebuild 608 BLAKE2B aa200b62c4a747cb023b971149c30f4d6b3c69ea505e248aadd7ae3d8e68166eca457b607c1e953a59660c5486103b4a033cf13ba21de17d97db4355d6dc7dee SHA512 988cb0fb9c34d9cd7f3afb49a289294de88125fec858bb6b3d920a46d869e1b675748301cdb2d869d2397d32eded64b18118004f952a5bab47a1ee36a9d00cf9
-EBUILD cpuid-20240916.ebuild 610 BLAKE2B d07e1630231fdf16335eda46ab506f12c810dcd753e7b78138baab9c1f371790460e1ff51d0ecaeac74ced6bdadc7049e496935e01922a346f1dd6d75089f39a SHA512 e6b88a77b8ca8e7aeb6e66c29ccb5070468cf8348092f879d5d3e3a24d6c606da06b68aa71ea20c948bd164a1a5495850496d9dd6e702d300de45ef96e485eb5
+EBUILD cpuid-20240916.ebuild 608 BLAKE2B aa200b62c4a747cb023b971149c30f4d6b3c69ea505e248aadd7ae3d8e68166eca457b607c1e953a59660c5486103b4a033cf13ba21de17d97db4355d6dc7dee SHA512 988cb0fb9c34d9cd7f3afb49a289294de88125fec858bb6b3d920a46d869e1b675748301cdb2d869d2397d32eded64b18118004f952a5bab47a1ee36a9d00cf9
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20240716.ebuild b/sys-apps/cpuid/cpuid-20240716.ebuild
deleted file mode 100644
index 4b2f6e4279a8..000000000000
--- a/sys-apps/cpuid/cpuid-20240716.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 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-alternatives/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-20240916.ebuild b/sys-apps/cpuid/cpuid-20240916.ebuild
index c2868c0d5525..4b2f6e4279a8 100644
--- a/sys-apps/cpuid/cpuid-20240916.ebuild
+++ b/sys-apps/cpuid/cpuid-20240916.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-alternatives/gzip