gentoo auto-resync : 07:12:2024 - 02:07:26

4 files changed, 2 insertions, 77 deletions

diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index bea71aa46cf0..4a3193e12f49 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,7 +1,4 @@
-AUX cpuid-20220620-makefile.patch 1359 BLAKE2B b16bd455de251f3989718fa56c1b19f97d79271998ccf774f74f0886ab8072be482e480604bfad462e0ac9c325470d12e80150e6fc588abfae629cd6499e0ea4 SHA512 680e477460679ae016c95d0e0c5cef916486629011b43cafb5f90c1c097b8c245d4c8b7861a20bdeee05b87b2220ad37a5ca589ff952dd9d7580ca301aac0ada
 AUX cpuid-20241023-makefile.patch 1409 BLAKE2B 71141aa29ef3e8fdd149506e0f1098dd8c0fc4fa502f99a3105314838106a84ae5d5d4ca4d49adf38f7a8ae52457c1ff9256253ae38af25afd1edb95a6474538 SHA512 64dc0ce070b704180a4a61b47a94365be72fcfabf77adbb2322cb161c4c4e6f041f51b47de2b72d64fe0e7aae20ddfdd4df3a56b5f6d548420866c0e60353281
-DIST cpuid-20240916.src.tar.gz 157553 BLAKE2B 2f5ef3264fcc647122a73edf9a2b39110c11a23ac366c99481ec8cec4d7108ce088847b485f6b8e7dece757fb0246bafbbbaad36d0dc8128ade3290988a1f7de SHA512 f78e36400a963d39fb9d1b6dab6d79ea1ab700912aa229a4efc2088e61964fb5ece52c2204fadd34f1f75cfab6f7b659288c8892b86c44568e784283bf3f5278
 DIST cpuid-20241023.src.tar.gz 160816 BLAKE2B de3c5750e8bd90882ac3a13ad81196b0287bd2ee321c54adda18a754e128f9c72b72177874c652ccb02d17ace336c70705c899f3e6493e7f4c655a9f992114ef SHA512 81d4b4de609365fb801d785fab9c4f190885569fa97db10ab5e8f7e227a335313c0bafb02696a0bb1d14d11c49e90979a2b9b60eb970e6d7c617be99142a941b
-EBUILD cpuid-20240916.ebuild 608 BLAKE2B aa200b62c4a747cb023b971149c30f4d6b3c69ea505e248aadd7ae3d8e68166eca457b607c1e953a59660c5486103b4a033cf13ba21de17d97db4355d6dc7dee SHA512 988cb0fb9c34d9cd7f3afb49a289294de88125fec858bb6b3d920a46d869e1b675748301cdb2d869d2397d32eded64b18118004f952a5bab47a1ee36a9d00cf9
-EBUILD cpuid-20241023.ebuild 610 BLAKE2B c2801812e205dca204aa4c7a59bc22e2c59416c9dd6d989d4dca29405dd33e2b1ba4479596dc47d0332099e0c5889330a7d8582ebda0b2dc84428fa46c52d7aa SHA512 12373735451a97b72717459c524b5b809c95c058302d968e7d87808f146a211f78a7f67518ae19fb2a397e878eb3904bbe91069895b6a856247d48c189f9c347
+EBUILD cpuid-20241023.ebuild 608 BLAKE2B 94ab70e626559c85d26ff02c18d511bd5bff376a8aef7a1d8229d8d4ad2aa5da732b5649df164bcd772d6ff2ce685a9f3e55c35c4e1c99c23778c15bb771e002 SHA512 6d627698a6e90052ba3b3276dedc4518ef060f7b53ac61d45ecca781ecbf749e331a9ddf221dcdc81587c364ea35040c9cf00673d74b001e1b60d5f2ed9386e6
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20240916.ebuild b/sys-apps/cpuid/cpuid-20240916.ebuild
deleted file mode 100644
index 4b2f6e4279a8..000000000000
--- a/sys-apps/cpuid/cpuid-20240916.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-20241023.ebuild b/sys-apps/cpuid/cpuid-20241023.ebuild
index f9116f2c451e..ef15c83a18ba 100644
--- a/sys-apps/cpuid/cpuid-20241023.ebuild
+++ b/sys-apps/cpuid/cpuid-20241023.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
diff --git a/sys-apps/cpuid/files/cpuid-20220620-makefile.patch b/sys-apps/cpuid/files/cpuid-20220620-makefile.patch
deleted file mode 100644
index 301ba988f7c1..000000000000
--- a/sys-apps/cpuid/files/cpuid-20220620-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 -Wundef -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION)
--INSTALL_STRIP=-s
-+INSTALL_STRIP=
- 
- PACKAGE=cpuid
- VERSION=20220620
-@@ -40,7 +40,7 @@
- 
- BUILDROOT=$(DESTDIR)
- 
--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