Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/files/, sys-apps/cpuid/
Date: Fri, 29 Jul 2022 19:06:46
Message-Id: 1659121356.f392d896f0940fe9f400afc46c10e9bfb3295608.conikost@gentoo
1 commit: f392d896f0940fe9f400afc46c10e9bfb3295608
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 29 19:02:36 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 29 19:02:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f392d896
7
8 sys-apps/cpuid: drop 20220224
9
10 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
11
12 sys-apps/cpuid/Manifest | 1 -
13 sys-apps/cpuid/cpuid-20220224.ebuild | 35 --------------------
14 sys-apps/cpuid/files/cpuid-20200203-makefile.patch | 37 ----------------------
15 3 files changed, 73 deletions(-)
16
17 diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
18 index 519d498c327a..86fd2a311a99 100644
19 --- a/sys-apps/cpuid/Manifest
20 +++ b/sys-apps/cpuid/Manifest
21 @@ -1,2 +1 @@
22 -DIST cpuid-20220224.src.tar.gz 130706 BLAKE2B 78e0d8296ffafa6eb5a668561bb5c1834c8cffd020f0c052438381f72cddbfe8e85c3e4d662c6aff5224a0b147cd5e20cbce2240f791f2c857c4f584c87b4359 SHA512 7cf41d2429d442b4dfd5d369e394c11916352e16fc56852ea4af71945192903482bc45c38367ff5ae3f8d386ffc65cc61a9b0bec4594589a057557daf54d8562
23 DIST cpuid-20220620.src.tar.gz 134487 BLAKE2B 37beeeef5bbeed47d762f093a568e18ac06b32b4c8c4d763656c5310c78b949c60aaf4e874b15485af15be1e31c389692a0ab277a95a0dcb0b66a7dbece50a52 SHA512 e06db43fb12efa1d112267993754965b8a2b07c914766a46a0fe6fdcf023606cfb132eac575726ad9ed7d0e6fc53d728a6d3d3d7abf2f484f002825c791da7b9
24
25 diff --git a/sys-apps/cpuid/cpuid-20220224.ebuild b/sys-apps/cpuid/cpuid-20220224.ebuild
26 deleted file mode 100644
27 index d215e1baa0cf..000000000000
28 --- a/sys-apps/cpuid/cpuid-20220224.ebuild
29 +++ /dev/null
30 @@ -1,35 +0,0 @@
31 -# Copyright 1999-2022 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=8
35 -
36 -inherit toolchain-funcs
37 -
38 -DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
39 -HOMEPAGE="http://www.etallen.com/cpuid.html"
40 -SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
41 -
42 -LICENSE="GPL-2+"
43 -SLOT="0"
44 -KEYWORDS="-* amd64 x86"
45 -
46 -BDEPEND="
47 - app-arch/gzip
48 - dev-lang/perl
49 -"
50 -
51 -DOCS=( "ChangeLog" "FUTURE" )
52 -
53 -PATCHES=( "${FILESDIR}/${PN}-20200203-makefile.patch" )
54 -
55 -src_prepare() {
56 - default
57 -
58 - tc-export CC
59 -}
60 -
61 -src_install() {
62 - emake BUILDROOT="${ED}" install
63 -
64 - einstalldocs
65 -}
66
67 diff --git a/sys-apps/cpuid/files/cpuid-20200203-makefile.patch b/sys-apps/cpuid/files/cpuid-20200203-makefile.patch
68 deleted file mode 100644
69 index 9cfad5ef594d..000000000000
70 --- a/sys-apps/cpuid/files/cpuid-20200203-makefile.patch
71 +++ /dev/null
72 @@ -1,37 +0,0 @@
73 ---- a/Makefile
74 -+++ b/Makefile
75 -@@ -1,11 +1,11 @@
76 --CFLAGS+=-g
77 -+CFLAGS+=
78 - CPPFLAGS?=
79 - LDFLAGS?=
80 - ifneq (,$(findstring arch=i386,$(CFLAGS)))
81 - CISA=-m32
82 - endif
83 - 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)
84 --INSTALL_STRIP=-s
85 -+INSTALL_STRIP=
86 -
87 - PACKAGE=cpuid
88 - VERSION=20200203
89 -@@ -40,7 +40,7 @@
90 -
91 - BUILDROOT=
92 -
93 --default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
94 -+default: $(PROG) cpuinfo2cpuid
95 -
96 - $(PROG): cpuid.c Makefile
97 - $(CC) $(CFL) $(LDFLAGS) -o $@ cpuid.c
98 -@@ -56,9 +56,9 @@
99 -
100 - install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
101 - install -D $(INSTALL_STRIP) -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
102 -- install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
103 -+ install -D -m 444 $(PROG).man $(BUILDROOT)/usr/share/man/man1/$(PROG).1
104 - install -D -m 755 cpuinfo2cpuid $(BUILDROOT)/usr/bin/cpuinfo2cpuid
105 -- install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
106 -+ install -D -m 444 cpuinfo2cpuid.man $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1
107 -
108 - clean:
109 - rm -f $(PROG) $(PROG).i386 $(PROG).x86_64