gentoo auto-resync : 30:07:2022 - 03:08:54

4 files changed, 2 insertions, 77 deletions

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