commit: 415174f27e0c4af5235d51e2e01b9f767b0fd398 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Tue Aug 11 18:28:56 2020 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Aug 11 18:30:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=415174f2
sys-apps/cpuid: drop old version Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> sys-apps/cpuid/Manifest | 1 - sys-apps/cpuid/cpuid-20180519.ebuild | 36 ----------------- .../cpuid-20180519-add-spec-ctrl-output.patch | 10 ----- sys-apps/cpuid/files/cpuid-20180519-makefile.patch | 46 ---------------------- 4 files changed, 93 deletions(-) diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest index b59c55cc307..bbd8bf9e72d 100644 --- a/sys-apps/cpuid/Manifest +++ b/sys-apps/cpuid/Manifest @@ -1,2 +1 @@ -DIST cpuid-20180519.src.tar.gz 84784 BLAKE2B 87098145a378081d296f0473f9106e7c5b6654c2bd63d385dc27e293079adf3a527801fa644000ede53228e087e9e9afdf807a3c8d9cc8eb93826f01a5a89e9a SHA512 565738c41777669e750a2ef2e122ed0568de5ac8cc2584fa5047ba66d42eb5c3324b283bda25605e055d85402a4e2d109bc6d033ccd34243caab728465792669 DIST cpuid-20200427.src.tar.gz 115896 BLAKE2B 0c325fe140ffb9e9d1591d414156d280ac6e802eb652f876fcb6888ea4d6cefd485bc6501179a4f7f3db33ca0fe9f64b83214f883b86bda0c8014b81916d893c SHA512 8f943ac517680c8744563f35654f5b5201fde16cfe24264d8ad171ab517b65a6f50dc569789228e095e2b485e5a0d4fe58e2a0d7f199df2b225652689e3a2e83 diff --git a/sys-apps/cpuid/cpuid-20180519.ebuild b/sys-apps/cpuid/cpuid-20180519.ebuild deleted file mode 100644 index 5150f88eeca..00000000000 --- 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/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 7cb078fe7ec..00000000000 --- 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 e140c322fb1..00000000000 --- 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)
