public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/, sys-apps/cpuid/files/
@ 2017-09-04 20:12 David Seifert
  0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2017-09-04 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     0eb6841a14d6e5bc5760af0f7fdbe805725b0ed7
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  4 20:10:45 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Sep  4 20:11:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb6841a

sys-apps/cpuid: Add missing sys/sysmacros.h include

Closes: https://bugs.gentoo.org/show_bug.cgi?id=604406
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-apps/cpuid/cpuid-20170122.ebuild               | 27 ++++++++++++----------
 .../cpuid-20170122-missing-include-sysmacros.patch | 12 ++++++++++
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/sys-apps/cpuid/cpuid-20170122.ebuild b/sys-apps/cpuid/cpuid-20170122.ebuild
index 3c76118816b..90935677627 100644
--- a/sys-apps/cpuid/cpuid-20170122.ebuild
+++ b/sys-apps/cpuid/cpuid-20170122.ebuild
@@ -3,28 +3,31 @@
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
-DESCRIPTION="Utility to get detailed information about the CPU(s) using the
-CPUID instruction"
+DESCRIPTION="Utility to get detailed information about the CPU(s) using the CPUID instruction"
 HOMEPAGE="http://www.etallen.com/cpuid.html"
 SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20170122-Makefile.patch
-	eapply_user
-}
+DEPEND="
+	app-arch/gzip
+	dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20170122-Makefile.patch
+	"${FILESDIR}"/${PN}-20170122-missing-include-sysmacros.patch
+)
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake || die "emake failed"
 }
 
 src_install() {
-	emake BUILDROOT="${D}" install || die "email install failed"
+	emake BUILDROOT="${ED}" install
+	einstalldocs
 }

diff --git a/sys-apps/cpuid/files/cpuid-20170122-missing-include-sysmacros.patch b/sys-apps/cpuid/files/cpuid-20170122-missing-include-sysmacros.patch
new file mode 100644
index 00000000000..bba18a3b354
--- /dev/null
+++ b/sys-apps/cpuid/files/cpuid-20170122-missing-include-sysmacros.patch
@@ -0,0 +1,12 @@
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=604406
+
+--- a/cpuid.c
++++ b/cpuid.c
+@@ -30,6 +30,7 @@
+ #define _GNU_SOURCE
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/, sys-apps/cpuid/files/
@ 2019-09-20 14:38 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2019-09-20 14:38 UTC (permalink / raw
  To: gentoo-commits

commit:     7f44e80622ecdde9ec3728e9701a071450cd68f6
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Fri Sep 20 07:30:34 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 14:38:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f44e806

sys-apps/cpuid: bump to version 20180519

Also bumped to EAPI=7 and corrected license.

Closes: https://bugs.gentoo.org/645080
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Signed-off-by: Joonas Niilola <juippis <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 ++++++++++++++++++++++
 sys-apps/cpuid/metadata.xml                        | 13 ++++++
 5 files changed, 106 insertions(+)

diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 07dfe7c7e94..c6e29c18901 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,2 +1,3 @@
 DIST cpuid-20170122.src.tar.gz 80046 BLAKE2B 4c6c6719f57b446c92c5636a35aac883497d457719c67acb61db75ce99c46edee368d63e790b6b21ea334293aaed221374229e334cefcc65ea8b05c8ae40d172 SHA512 0e057980c71a0e078254e6b7535747bdf368278932c39943cf7dfafe08443af07297a2b41518499937a710fe6950ba89377cabaada5f6332932650d4d17c1430
 DIST cpuid-20180419.src.tar.gz 82301 BLAKE2B 6905c0946fb9a930c67718067923c8c238031539c95704664160efde8563b0f56aadf3132abc9833310846802f97330edff833b47c006a4f46fec49358b56e31 SHA512 c8e30e45df7be5bdbff7e449b447b4542326a112f563c114c67cc80764070f3f3815ff4f80ceb57360828061bc9fd5f2f24f8e53ae4db47781f36db32141c951
+DIST cpuid-20180519.src.tar.gz 84784 BLAKE2B 87098145a378081d296f0473f9106e7c5b6654c2bd63d385dc27e293079adf3a527801fa644000ede53228e087e9e9afdf807a3c8d9cc8eb93826f01a5a89e9a SHA512 565738c41777669e750a2ef2e122ed0568de5ac8cc2584fa5047ba66d42eb5c3324b283bda25605e055d85402a4e2d109bc6d033ccd34243caab728465792669

diff --git a/sys-apps/cpuid/cpuid-20180519.ebuild b/sys-apps/cpuid/cpuid-20180519.ebuild
new file mode 100644
index 00000000000..045dbac2f81
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20180519.ebuild
@@ -0,0 +1,36 @@
+# 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
new file mode 100644
index 00000000000..7cb078fe7ec
--- /dev/null
+++ b/sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 00000000000..e140c322fb1
--- /dev/null
+++ b/sys-apps/cpuid/files/cpuid-20180519-makefile.patch
@@ -0,0 +1,46 @@
+--- 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)

diff --git a/sys-apps/cpuid/metadata.xml b/sys-apps/cpuid/metadata.xml
index 15fd2f3a22b..2cd77ae0f5f 100644
--- a/sys-apps/cpuid/metadata.xml
+++ b/sys-apps/cpuid/metadata.xml
@@ -5,4 +5,17 @@
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		CPUID dumps detailed information about the CPUs gathered from the CPUID instruction,
+		and also determines the exact model of CPUs. It supports Intel, AMD, and VIA CPUs,
+		as well as older Transmeta, Cyrix, UMC, NexGen, Rise, and SiS CPUs.
+	</longdescription>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/, sys-apps/cpuid/files/
@ 2020-02-04 18:09 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2020-02-04 18:09 UTC (permalink / raw
  To: gentoo-commits

commit:     228180e0d7a54d0b8d826419022cb610ab0993e4
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 17:15:15 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 17:48:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=228180e0

sys-apps/cpuid: bump to version 20200203

Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-apps/cpuid/Manifest                            |  1 +
 sys-apps/cpuid/cpuid-20200203.ebuild               | 33 +++++++++++++++++++
 sys-apps/cpuid/files/cpuid-20200203-makefile.patch | 37 ++++++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 7e34bf03aaf..4c592e48ed0 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1 +1,2 @@
 DIST cpuid-20180519.src.tar.gz 84784 BLAKE2B 87098145a378081d296f0473f9106e7c5b6654c2bd63d385dc27e293079adf3a527801fa644000ede53228e087e9e9afdf807a3c8d9cc8eb93826f01a5a89e9a SHA512 565738c41777669e750a2ef2e122ed0568de5ac8cc2584fa5047ba66d42eb5c3324b283bda25605e055d85402a4e2d109bc6d033ccd34243caab728465792669
+DIST cpuid-20200203.src.tar.gz 113144 BLAKE2B fea8a51559e77bac779cda096e694992090d5b6e4f6efbee3b67f66727267028da062c317ca045155b668292c5f3f6c2d027a59f74d27f138c8ebb529f8df820 SHA512 ae80275fba522688161d08b58d4df6437bad66853a7fce9591b5ca10ecd649ce712616f46d6c9f47a36ff3a1f09c65a10dc70fb409bc58c5e30ae413cfd92aa0

diff --git a/sys-apps/cpuid/cpuid-20200203.ebuild b/sys-apps/cpuid/cpuid-20200203.ebuild
new file mode 100644
index 00000000000..60a214f3c40
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20200203.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 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}-makefile.patch" )
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
+
+src_install() {
+	emake BUILDROOT="${ED}" install
+
+	einstalldocs
+}

diff --git a/sys-apps/cpuid/files/cpuid-20200203-makefile.patch b/sys-apps/cpuid/files/cpuid-20200203-makefile.patch
new file mode 100644
index 00000000000..9cfad5ef594
--- /dev/null
+++ b/sys-apps/cpuid/files/cpuid-20200203-makefile.patch
@@ -0,0 +1,37 @@
+--- 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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/, sys-apps/cpuid/files/
@ 2022-06-28 20:21 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2022-06-28 20:21 UTC (permalink / raw
  To: gentoo-commits

commit:     b4d9af5ab7b05c599af5bd7c37a3c17876bb1ab8
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 20:01:26 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 20:10:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4d9af5a

sys-apps/cpuid: add 20220620

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-apps/cpuid/Manifest                            |  1 +
 sys-apps/cpuid/cpuid-20220620.ebuild               | 35 ++++++++++++++++++++
 sys-apps/cpuid/files/cpuid-20220620-makefile.patch | 37 ++++++++++++++++++++++
 3 files changed, 73 insertions(+)

diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index bb7da4475442..519d498c327a 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1 +1,2 @@
 DIST cpuid-20220224.src.tar.gz 130706 BLAKE2B 78e0d8296ffafa6eb5a668561bb5c1834c8cffd020f0c052438381f72cddbfe8e85c3e4d662c6aff5224a0b147cd5e20cbce2240f791f2c857c4f584c87b4359 SHA512 7cf41d2429d442b4dfd5d369e394c11916352e16fc56852ea4af71945192903482bc45c38367ff5ae3f8d386ffc65cc61a9b0bec4594589a057557daf54d8562
+DIST cpuid-20220620.src.tar.gz 134487 BLAKE2B 37beeeef5bbeed47d762f093a568e18ac06b32b4c8c4d763656c5310c78b949c60aaf4e874b15485af15be1e31c389692a0ab277a95a0dcb0b66a7dbece50a52 SHA512 e06db43fb12efa1d112267993754965b8a2b07c914766a46a0fe6fdcf023606cfb132eac575726ad9ed7d0e6fc53d728a6d3d3d7abf2f484f002825c791da7b9

diff --git a/sys-apps/cpuid/cpuid-20220620.ebuild b/sys-apps/cpuid/cpuid-20220620.ebuild
new file mode 100644
index 000000000000..0f77190b474c
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20220620.ebuild
@@ -0,0 +1,35 @@
+# 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}-20220620-makefile.patch" )
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
+
+src_install() {
+	emake BUILDROOT="${ED}" install
+
+	einstalldocs
+}

diff --git a/sys-apps/cpuid/files/cpuid-20220620-makefile.patch b/sys-apps/cpuid/files/cpuid-20220620-makefile.patch
new file mode 100644
index 000000000000..301ba988f7c1
--- /dev/null
+++ b/sys-apps/cpuid/files/cpuid-20220620-makefile.patch
@@ -0,0 +1,37 @@
+--- 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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/, sys-apps/cpuid/files/
@ 2024-11-04 23:42 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2024-11-04 23:42 UTC (permalink / raw
  To: gentoo-commits

commit:     b67739f35ad1f35569215b985db2161a301be400
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  4 23:39:30 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Nov  4 23:39:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67739f3

sys-apps/cpuid: fix patch

Closes: https://bugs.gentoo.org/942764
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-apps/cpuid/cpuid-20241023.ebuild               |  2 +-
 sys-apps/cpuid/files/cpuid-20241023-makefile.patch | 38 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/sys-apps/cpuid/cpuid-20241023.ebuild b/sys-apps/cpuid/cpuid-20241023.ebuild
index c2868c0d5525..f9116f2c451e 100644
--- a/sys-apps/cpuid/cpuid-20241023.ebuild
+++ b/sys-apps/cpuid/cpuid-20241023.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
 
 DOCS=( "ChangeLog" "FUTURE" )
 
-PATCHES=( "${FILESDIR}/${PN}-20220620-makefile.patch" )
+PATCHES=( "${FILESDIR}/${PN}-20241023-makefile.patch" )
 
 src_prepare() {
 	default

diff --git a/sys-apps/cpuid/files/cpuid-20241023-makefile.patch b/sys-apps/cpuid/files/cpuid-20241023-makefile.patch
new file mode 100644
index 000000000000..fa4d4c02e2a9
--- /dev/null
+++ b/sys-apps/cpuid/files/cpuid-20241023-makefile.patch
@@ -0,0 +1,38 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS+=-g
++CFLAGS+=
+ CPPFLAGS?=
+ LDFLAGS?=
+ ifneq (,$(findstring arch=i386,$(CFLAGS)))
+@@ -6,7 +6,7 @@
+ 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)
+ CFL_OPT=-O3 $(CFL) -Wformat-overflow=2 
+-INSTALL_STRIP=-s
++INSTALL_STRIP=
+ 
+ PACKAGE=cpuid
+ VERSION=20241023
+@@ -41,7 +41,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
+@@ -62,9 +62,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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/, sys-apps/cpuid/files/
@ 2024-12-06 23:12 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2024-12-06 23:12 UTC (permalink / raw
  To: gentoo-commits

commit:     6072b2368375d318263e73d75da9d5743dd9b540
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 23:06:18 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 23:11:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6072b236

sys-apps/cpuid: drop 20240916

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sys-apps/cpuid/Manifest                            |  1 -
 sys-apps/cpuid/cpuid-20240916.ebuild               | 35 --------------------
 sys-apps/cpuid/files/cpuid-20220620-makefile.patch | 37 ----------------------
 3 files changed, 73 deletions(-)

diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 9aeb98cc7d67..6556511aeb2c 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,2 +1 @@
-DIST cpuid-20240916.src.tar.gz 157553 BLAKE2B 2f5ef3264fcc647122a73edf9a2b39110c11a23ac366c99481ec8cec4d7108ce088847b485f6b8e7dece757fb0246bafbbbaad36d0dc8128ade3290988a1f7de SHA512 f78e36400a963d39fb9d1b6dab6d79ea1ab700912aa229a4efc2088e61964fb5ece52c2204fadd34f1f75cfab6f7b659288c8892b86c44568e784283bf3f5278
 DIST cpuid-20241023.src.tar.gz 160816 BLAKE2B de3c5750e8bd90882ac3a13ad81196b0287bd2ee321c54adda18a754e128f9c72b72177874c652ccb02d17ace336c70705c899f3e6493e7f4c655a9f992114ef SHA512 81d4b4de609365fb801d785fab9c4f190885569fa97db10ab5e8f7e227a335313c0bafb02696a0bb1d14d11c49e90979a2b9b60eb970e6d7c617be99142a941b

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/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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-12-06 23:12 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-04 23:42 [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/, sys-apps/cpuid/files/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2024-12-06 23:12 Conrad Kostecki
2022-06-28 20:21 Conrad Kostecki
2020-02-04 18:09 Conrad Kostecki
2019-09-20 14:38 Joonas Niilola
2017-09-04 20:12 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox