gentoo resync : 25.08.2020

5 files changed, 2 insertions, 98 deletions

diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 6ae789e26dd2..a951a581516b 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,8 +1,4 @@
-AUX cpuid-20180519-add-spec-ctrl-output.patch 516 BLAKE2B f6c3a5c42afe5a97fd3712a9168b3d883614919a3e00c0bb671275b5227b9a4aebb8185fc27ccdfc3588db412a1234b0962987deb559c70a24afae580d04c49a SHA512 0e14946bf58eb009b65a8b849353b3940f8a13cb0a8ee1d53006b1e36e846785bad1bdeaab35e56b26faf08f5b8d81cf279cbc0de88fc5f13cb8471e8554c96a
-AUX cpuid-20180519-makefile.patch 1618 BLAKE2B ee25815c8f60b77b0e8866100d90767416414ef07e818892e4c552741bb0001b040c2e6ccdbb470fc7eefaa5f428f611d9d8feb03675d91ec603c6794e0262b5 SHA512 272391a70c4b6b31769f6ae4c4c39b942fd0fc7130729c93abd977a5d82f655e3e7513747fdf4abb238bd1ddebb11eb7925e8ebbed393a0704ad9bbef52b6da4
 AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
-DIST cpuid-20180519.src.tar.gz 84784 BLAKE2B 87098145a378081d296f0473f9106e7c5b6654c2bd63d385dc27e293079adf3a527801fa644000ede53228e087e9e9afdf807a3c8d9cc8eb93826f01a5a89e9a SHA512 565738c41777669e750a2ef2e122ed0568de5ac8cc2584fa5047ba66d42eb5c3324b283bda25605e055d85402a4e2d109bc6d033ccd34243caab728465792669
 DIST cpuid-20200427.src.tar.gz 115896 BLAKE2B 0c325fe140ffb9e9d1591d414156d280ac6e802eb652f876fcb6888ea4d6cefd485bc6501179a4f7f3db33ca0fe9f64b83214f883b86bda0c8014b81916d893c SHA512 8f943ac517680c8744563f35654f5b5201fde16cfe24264d8ad171ab517b65a6f50dc569789228e095e2b485e5a0d4fe58e2a0d7f199df2b225652689e3a2e83
-EBUILD cpuid-20180519.ebuild 640 BLAKE2B c4800406ac7f031a9206013f968a945a5625a53523b9abe577d76189dd5cb4e2dff85f77af7142594c49fdd35c51450f4c65c806c11c05578f3393dfe419458e SHA512 ac7f070dc1f1df53607a705d193897312af921b61a3d9358420996ecbc112e0ecf533d3d11ecce5bbb247b1d9090d0592dcf2bf22031e86ba624e490913a9469
-EBUILD cpuid-20200427.ebuild 604 BLAKE2B 8e34b2c78d88273d214fa6df847b6db84d2dc8dcf26514f779e61a9bde540fc3b42946a5bf2b3aa51a238824d2169a08510ce942bdd21e5b0a5b7e112265bf83 SHA512 f68fc7a76850491a58891043465849feb1c71e8f79c0f8ac978dc86289d1e03c964af93cc80d08d2ba4e5ed695f51a3b5d42352a191b48bebad2bf1c93577623
+EBUILD cpuid-20200427.ebuild 602 BLAKE2B bd80e3581f4e15953ad1cfe1fdfb102729316fd9f085d06e38f82ac4f0aa3d97c7989ab2dc9a6d94269faff3b04b205a02b0f44d466e15b57e75ed95c7749d97 SHA512 c4bd77425b100a9f86b56c1c9f386df7eaab703ee44ea62d34f0ad19baac6f7d5a977ac07621615301a2d5aad2fc6b8ba9c0ea0bfef62e92d23bcff2e0c260c3
 MISC metadata.xml 637 BLAKE2B ffd825f4b6e67bff67d861d85f26fe2c3054fe7e8d0433c82faa5f5e8a1c2b75b24284b33ff4cbb9ef4ca97061077f04ef968652ff08adbfa97fa479a0cd6105 SHA512 e7b082eb434cc930af77168e31cc83c1aedc1de4d8e5f431e84325aa7c52cdd180f60aec2487b11c3c31ea6596f9caab32a44a6eb60845a5b0fc64e71c1aa799
diff --git a/sys-apps/cpuid/cpuid-20180519.ebuild b/sys-apps/cpuid/cpuid-20180519.ebuild
deleted file mode 100644
index 5150f88eecac..000000000000
--- a/sys-apps/cpuid/cpuid-20180519.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 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="dev-lang/perl"
-DEPEND="app-arch/gzip"
-
-DOCS=( "ChangeLog" "FUTURE" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-add-spec-ctrl-output.patch"
-	"${FILESDIR}/${P}-makefile.patch"
-)
-
-src_prepare() {
-	default
-
-	tc-export CC
-}
-
-src_install() {
-	emake BUILDROOT="${ED}" install
-
-	einstalldocs
-}
diff --git a/sys-apps/cpuid/cpuid-20200427.ebuild b/sys-apps/cpuid/cpuid-20200427.ebuild
index c48d21a156d2..df1d0117c3b7 100644
--- a/sys-apps/cpuid/cpuid-20200427.ebuild
+++ b/sys-apps/cpuid/cpuid-20200427.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="dev-lang/perl"
 DEPEND="app-arch/gzip"
diff --git a/sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch b/sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch
deleted file mode 100644
index 7cb078fe7eca..000000000000
--- a/sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cpuid.c	2018-05-19 14:09:29.000000000 +0200
-+++ b/cpuid.c	2019-08-08 21:53:03.000000000 +0200
-@@ -4249,6 +4249,7 @@
-           { "fast short REP MOV"                      ,  4,  4, bools },
-           { "PCONFIG"                                 , 18, 18, bools },
-           { "CET_IBT: CET indirect branch tracking"   , 20, 20, bools },
-+          { "SPEC_CTRL: Speculation Control" ,  26,  26, bools },
-       };
-    print_names(value, names, LENGTH(names, named_item),
-                /* max_len => */ 40);
diff --git a/sys-apps/cpuid/files/cpuid-20180519-makefile.patch b/sys-apps/cpuid/files/cpuid-20180519-makefile.patch
deleted file mode 100644
index e140c322fb19..000000000000
--- a/sys-apps/cpuid/files/cpuid-20180519-makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/Makefile	2018-05-19 14:15:37.000000000 +0200
-+++ b/Makefile	2019-08-08 21:43:09.000000000 +0200
-@@ -1,4 +1,4 @@
--CFLAGS+=-g
-+CFLAGS+=
- CPPFLAGS?=
- LDFLAGS?=
- ifneq (,$(findstring arch=i386,$(CFLAGS)))
-@@ -36,7 +36,7 @@
- 
- BUILDROOT=
- 
--default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
-+default: $(PROG) cpuinfo2cpuid cpuinfo2cpuid.man
- 
- $(PROG): cpuid.c Makefile
- 	$(CC) $(CFL) $(LDFLAGS) -o $@ cpuid.c
-@@ -50,11 +50,11 @@
- cpuinfo2cpuid.man.gz: cpuinfo2cpuid.man
- 	gzip < $< > $@
- 
--install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
--	install -D -s -m 755 $(PROG)              $(BUILDROOT)/usr/bin/$(PROG)
--	install -D    -m 444 $(PROG).man.gz       $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
-+install: $(PROG) cpuinfo2cpuid
-+	install -D    -m 755 $(PROG)              $(BUILDROOT)/usr/bin/$(PROG)
-+	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
-@@ -71,10 +71,10 @@
- # Todd's Development rules
- 
- $(PROG).i386: cpuid.c Makefile
--	$(CC) -m32 -Wl,--hash-style=both $(CFL) $(LDFLAGS) -o $@ cpuid.c
-+	$(CC) -m32 $(CFL) -o $@ cpuid.c
- 
- $(PROG).x86_64: cpuid.c Makefile
--	$(CC) -m64 $(CFL) $(LDFLAGS) -o $@ cpuid.c
-+	$(CC) -m64 $(CFL) -o $@ cpuid.c
- 
- todd: $(PROG).i386 $(PROG).x86_64
- 	rm -f ~/.bin/execs/i586/$(PROG)