* [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/files/, sys-apps/cpuid/
@ 2017-06-16 14:03 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2017-06-16 14:03 UTC (permalink / raw
To: gentoo-commits
commit: f299c787bacbbf389046613d7c94f5bbb8e7d98a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 13:51:28 2017 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 14:02:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f299c787
sys-apps/cpuid: Version bump to 20170122
Bug: https://bugs.gentoo.org/611924
sys-apps/cpuid/Manifest | 1 +
sys-apps/cpuid/cpuid-20170122.ebuild | 30 ++++++++++++++++++++++
sys-apps/cpuid/files/cpuid-20170122-Makefile.patch | 28 ++++++++++++++++++++
3 files changed, 59 insertions(+)
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 33784bca9dd..885ca13845a 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -2,3 +2,4 @@ DIST cpuid-20130610.src.tar.gz 65801 SHA256 f87e835a83e69013eee09eded0e9c5ac0ea5
DIST cpuid-20140123.src.tar.gz 67882 SHA256 b85aba5696d382f0dba8dc246bd42d09767089d6181a9cd0633d626f079d79ff SHA512 8b205cc539959dcd63326d5de700e090213f5b7cdbd5e25925b8db774001cbd95df7ccb696fda124226380fef69ea7fe0c0885869b0ec7e07b0c340dc0cd8a5b WHIRLPOOL dfcc1b6ea125fb0b6c13b7edd7f6c37592a2acfbc178f4c65cd7ec1577010ec9cc69919af512681e4af048ab028cb8992d1a282435e5b4aace179c40ff607ac4
DIST cpuid-20150606.src.tar.gz 71882 SHA256 b7607e81e62e4901180d9e2f48fe407033211c3fb300d758a210f746ef518c4e SHA512 6f99266b9720b48ec10f220f8a321d3ed052300960151feb6c45d39b586216745f070241db20afd4d16ac0b3389b634eb31f90c93ea9d12f521012cfe5ab9257 WHIRLPOOL 0c7140b636e7cca8ac0d150cb015170964471a3e00d48f3b7290976c768415773d5741f53937b2773b751a8e830d21e156c3f199de081dd42c50ffd76688e640
DIST cpuid-20151017.src.tar.gz 72787 SHA256 34d35ddd7dab7c9f8b071b7b318d4f99fe112caaa28b6c8571e2ecdaa855db78 SHA512 83e6d49bd043e3f21610e50e5ca98705ee78bb1527f90e184f8aa380bfce82dc4168f5ef7b85e1e337e059668f4c83b20b96578f303bf73383b0241a50cd5296 WHIRLPOOL a28f12a7b403611d0ea0e6d8e08d27be424b2194a7818a5281a37a19d6b412938fb57b4d067461fc754fe469d536b0f009282e14ce619228326aefd6d6f8b892
+DIST cpuid-20170122.src.tar.gz 80046 SHA256 667612aae6704341dd10844e97c84c5c5c8700817a5937a3c293b55013bc4865 SHA512 0e057980c71a0e078254e6b7535747bdf368278932c39943cf7dfafe08443af07297a2b41518499937a710fe6950ba89377cabaada5f6332932650d4d17c1430 WHIRLPOOL 25594a2629c8da251d9cbc511a726cf2a4a235cc361c002fd6fa127c9d589f08938475094ea366861bb83b070d5d5955eac494d2b17958e2204b3e7275fd287c
diff --git a/sys-apps/cpuid/cpuid-20170122.ebuild b/sys-apps/cpuid/cpuid-20170122.ebuild
new file mode 100644
index 00000000000..3c76118816b
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20170122.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+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"
+IUSE=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-20170122-Makefile.patch
+ eapply_user
+}
+
+src_compile() {
+ tc-export CC
+ emake || die "emake failed"
+}
+
+src_install() {
+ emake BUILDROOT="${D}" install || die "email install failed"
+}
diff --git a/sys-apps/cpuid/files/cpuid-20170122-Makefile.patch b/sys-apps/cpuid/files/cpuid-20170122-Makefile.patch
new file mode 100644
index 00000000000..9a02a54563a
--- /dev/null
+++ b/sys-apps/cpuid/files/cpuid-20170122-Makefile.patch
@@ -0,0 +1,28 @@
+diff -ru cpuid-20170122.orig/Makefile cpuid-20170122/Makefile
+--- cpuid-20170122.orig/Makefile 2017-06-16 06:54:32.993875817 -0700
++++ cpuid-20170122/Makefile 2017-06-16 06:55:56.622875498 -0700
+@@ -1,9 +1,3 @@
+-CFLAGS+=-g
+-CPPFLAGS?=
+-LDFLAGS?=
+-ifneq (,$(findstring arch=i386,$(CFLAGS)))
+-CISA=-m32
+-endif
+ CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -Wshadow -Wcast-align -Wredundant-decls -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION)
+
+ PACKAGE=cpuid
+@@ -51,10 +45,10 @@
+ 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 -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 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
++ install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
++ install -D -m 755 cpuinfo2cpuid $(BUILDROOT)/usr/bin/cpuinfo2cpuid
++ install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
+
+ clean:
+ rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/files/, sys-apps/cpuid/
@ 2017-09-04 20:12 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-09-04 20:12 UTC (permalink / raw
To: gentoo-commits
commit: 3e576098d558450422bb20e3375864f97e27bfe4
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 4 20:10:52 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Sep 4 20:11:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e576098
sys-apps/cpuid: Remove old
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-apps/cpuid/Manifest | 4 ---
sys-apps/cpuid/cpuid-20130610.ebuild | 30 ----------------------
sys-apps/cpuid/cpuid-20140123.ebuild | 30 ----------------------
sys-apps/cpuid/cpuid-20150606.ebuild | 30 ----------------------
sys-apps/cpuid/cpuid-20151017.ebuild | 30 ----------------------
sys-apps/cpuid/files/cpuid-20110305-Makefile.patch | 30 ----------------------
sys-apps/cpuid/files/cpuid-20110305-fPIC.patch | 24 -----------------
sys-apps/cpuid/files/cpuid-20150606-Makefile.patch | 21 ---------------
8 files changed, 199 deletions(-)
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 885ca13845a..b0477a0ddc2 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,5 +1 @@
-DIST cpuid-20130610.src.tar.gz 65801 SHA256 f87e835a83e69013eee09eded0e9c5ac0ea5819d569d3b79680cab2b5ea770f4 SHA512 cb31126a7ba7244d44c3b0d86ad93f3ff0956a59af488a27ed482e549a8f628fedf142ac8f238c32e48946b5c76ceba2f5a0b95a9b4df8bf7354ed4dcdbeb0a7 WHIRLPOOL e82d27e1450e85e53074fa37f42ad5e03a0daf3dd153c5d6a8674c72b2e04f266f59b80f2eb90f3f25e8a8b0f473e8aa1ce4991b9eb8d50e76d6e1ae70665ab2
-DIST cpuid-20140123.src.tar.gz 67882 SHA256 b85aba5696d382f0dba8dc246bd42d09767089d6181a9cd0633d626f079d79ff SHA512 8b205cc539959dcd63326d5de700e090213f5b7cdbd5e25925b8db774001cbd95df7ccb696fda124226380fef69ea7fe0c0885869b0ec7e07b0c340dc0cd8a5b WHIRLPOOL dfcc1b6ea125fb0b6c13b7edd7f6c37592a2acfbc178f4c65cd7ec1577010ec9cc69919af512681e4af048ab028cb8992d1a282435e5b4aace179c40ff607ac4
-DIST cpuid-20150606.src.tar.gz 71882 SHA256 b7607e81e62e4901180d9e2f48fe407033211c3fb300d758a210f746ef518c4e SHA512 6f99266b9720b48ec10f220f8a321d3ed052300960151feb6c45d39b586216745f070241db20afd4d16ac0b3389b634eb31f90c93ea9d12f521012cfe5ab9257 WHIRLPOOL 0c7140b636e7cca8ac0d150cb015170964471a3e00d48f3b7290976c768415773d5741f53937b2773b751a8e830d21e156c3f199de081dd42c50ffd76688e640
-DIST cpuid-20151017.src.tar.gz 72787 SHA256 34d35ddd7dab7c9f8b071b7b318d4f99fe112caaa28b6c8571e2ecdaa855db78 SHA512 83e6d49bd043e3f21610e50e5ca98705ee78bb1527f90e184f8aa380bfce82dc4168f5ef7b85e1e337e059668f4c83b20b96578f303bf73383b0241a50cd5296 WHIRLPOOL a28f12a7b403611d0ea0e6d8e08d27be424b2194a7818a5281a37a19d6b412938fb57b4d067461fc754fe469d536b0f009282e14ce619228326aefd6d6f8b892
DIST cpuid-20170122.src.tar.gz 80046 SHA256 667612aae6704341dd10844e97c84c5c5c8700817a5937a3c293b55013bc4865 SHA512 0e057980c71a0e078254e6b7535747bdf368278932c39943cf7dfafe08443af07297a2b41518499937a710fe6950ba89377cabaada5f6332932650d4d17c1430 WHIRLPOOL 25594a2629c8da251d9cbc511a726cf2a4a235cc361c002fd6fa127c9d589f08938475094ea366861bb83b070d5d5955eac494d2b17958e2204b3e7275fd287c
diff --git a/sys-apps/cpuid/cpuid-20130610.ebuild b/sys-apps/cpuid/cpuid-20130610.ebuild
deleted file mode 100644
index c3929343f98..00000000000
--- a/sys-apps/cpuid/cpuid-20130610.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-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"
-IUSE=""
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-20110305-Makefile.patch
- epatch "${FILESDIR}"/${PN}-20110305-fPIC.patch #376245
-}
-
-src_compile() {
- tc-export CC
- emake
-}
-
-src_install() {
- emake BUILDROOT="${D}" install
-}
diff --git a/sys-apps/cpuid/cpuid-20140123.ebuild b/sys-apps/cpuid/cpuid-20140123.ebuild
deleted file mode 100644
index 90643e7bd72..00000000000
--- a/sys-apps/cpuid/cpuid-20140123.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-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"
-IUSE=""
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-20110305-Makefile.patch
- epatch "${FILESDIR}"/${PN}-20110305-fPIC.patch #376245
-}
-
-src_compile() {
- tc-export CC
- emake
-}
-
-src_install() {
- emake BUILDROOT="${D}" install
-}
diff --git a/sys-apps/cpuid/cpuid-20150606.ebuild b/sys-apps/cpuid/cpuid-20150606.ebuild
deleted file mode 100644
index 2b680dd1786..00000000000
--- a/sys-apps/cpuid/cpuid-20150606.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-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"
-IUSE=""
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-20150606-Makefile.patch
- epatch "${FILESDIR}"/${PN}-20110305-fPIC.patch #376245
-}
-
-src_compile() {
- tc-export CC
- emake
-}
-
-src_install() {
- emake BUILDROOT="${D}" install
-}
diff --git a/sys-apps/cpuid/cpuid-20151017.ebuild b/sys-apps/cpuid/cpuid-20151017.ebuild
deleted file mode 100644
index 6d970fc0661..00000000000
--- a/sys-apps/cpuid/cpuid-20151017.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-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"
-IUSE=""
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-20150606-Makefile.patch
- epatch "${FILESDIR}"/${PN}-20110305-fPIC.patch #376245
-}
-
-src_compile() {
- tc-export CC
- emake
-}
-
-src_install() {
- emake BUILDROOT="${D}" install
-}
diff --git a/sys-apps/cpuid/files/cpuid-20110305-Makefile.patch b/sys-apps/cpuid/files/cpuid-20110305-Makefile.patch
deleted file mode 100644
index a3aab8a50f6..00000000000
--- a/sys-apps/cpuid/files/cpuid-20110305-Makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: cpuid-20110305/Makefile
-===================================================================
---- cpuid-20110305.orig/Makefile
-+++ cpuid-20110305/Makefile
-@@ -1,7 +1,3 @@
--CFLAGS=-g
--ifneq (,$(findstring arch=i386,$(CFLAGS)))
--CISA=-m32
--endif
- CFL=$(CFLAGS) $(CISA) -Wall -Wshadow -Wcast-align -Wredundant-decls -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION)
-
- PACKAGE=cpuid
-@@ -36,14 +32,14 @@ BUILDROOT=
- default: $(PROG) $(PROG).man.gz
-
- $(PROG): cpuid.c Makefile
-- $(CC) $(CFL) -o $@ cpuid.c
-+ $(CC) $(CFL) $(LDFLAGS) -o $@ cpuid.c
-
- $(PROG).man.gz: $(PROG).man
- gzip < $< > $@
-
- install: $(PROG) $(PROG).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 -D -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
-+ install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
-
- clean:
- rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
diff --git a/sys-apps/cpuid/files/cpuid-20110305-fPIC.patch b/sys-apps/cpuid/files/cpuid-20110305-fPIC.patch
deleted file mode 100644
index 80cc6774a18..00000000000
--- a/sys-apps/cpuid/files/cpuid-20110305-fPIC.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u cpuid-20110305.orig//cpuid.c cpuid-20110305/cpuid.c
---- cpuid-20110305.orig//cpuid.c 2011-03-04 13:25:16.000000000 -0500
-+++ cpuid-20110305/cpuid.c 2011-07-31 01:53:39.647437813 -0400
-@@ -5319,9 +5319,20 @@
- boolean quiet)
- {
- if (cpuid_fd == USE_INSTRUCTION) {
-+#if defined(__i386__) && defined(__PIC__)
-+ asm("push %%ebx\n"
-+ "cpuid\n"
-+ "movl %%ebx, %1\n"
-+ "pop %%ebx\n"
-+#else
- asm("cpuid"
-+#endif
- : "=a" (words[WORD_EAX]),
-+#if defined(__i386__) && defined(__PIC__)
-+ "=r" (words[WORD_EBX]),
-+#else
- "=b" (words[WORD_EBX]),
-+#endif
- "=c" (words[WORD_ECX]),
- "=d" (words[WORD_EDX])
- : "a" (reg),
diff --git a/sys-apps/cpuid/files/cpuid-20150606-Makefile.patch b/sys-apps/cpuid/files/cpuid-20150606-Makefile.patch
deleted file mode 100644
index f878977ece9..00000000000
--- a/sys-apps/cpuid/files/cpuid-20150606-Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- cpuid-20150606/Makefile
-+++ cpuid-20150606/Makefile
-@@ -1,9 +1,3 @@
--CFLAGS+=-g
--CPPFLAGS?=
--LDFLAGS?=
--ifneq (,$(findstring arch=i386,$(CFLAGS)))
--CISA=-m32
--endif
- CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -Wshadow -Wcast-align -Wredundant-decls -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION)
-
- PACKAGE=cpuid
-@@ -44,7 +38,7 @@
- gzip < $< > $@
-
- install: $(PROG) $(PROG).man.gz
-- install -D -s -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
-+ install -D -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
- install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
-
- clean:
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/files/, sys-apps/cpuid/
@ 2019-12-15 17:24 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2019-12-15 17:24 UTC (permalink / raw
To: gentoo-commits
commit: c1c697cfbfecbf5782a90b471de42e7c3393b126
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 17:18:02 2019 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 17:18:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1c697cf
sys-apps/cpuid: drop old version
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-apps/cpuid/Manifest | 1 -
sys-apps/cpuid/cpuid-20180419.ebuild | 33 ----------------------
sys-apps/cpuid/files/cpuid-20170122-Makefile.patch | 28 ------------------
.../cpuid-20170122-missing-include-sysmacros.patch | 12 --------
4 files changed, 74 deletions(-)
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 326f544e1c6..7e34bf03aaf 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,2 +1 @@
-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-20180419.ebuild b/sys-apps/cpuid/cpuid-20180419.ebuild
deleted file mode 100644
index 0d0367d2cec..00000000000
--- a/sys-apps/cpuid/cpuid-20180419.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
- app-arch/gzip
- dev-lang/perl"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20170122-Makefile.patch
- "${FILESDIR}"/${PN}-20170122-missing-include-sysmacros.patch
-)
-
-src_configure() {
- tc-export CC
-}
-
-src_install() {
- emake BUILDROOT="${ED}" install
- einstalldocs
-}
diff --git a/sys-apps/cpuid/files/cpuid-20170122-Makefile.patch b/sys-apps/cpuid/files/cpuid-20170122-Makefile.patch
deleted file mode 100644
index 9a02a54563a..00000000000
--- a/sys-apps/cpuid/files/cpuid-20170122-Makefile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru cpuid-20170122.orig/Makefile cpuid-20170122/Makefile
---- cpuid-20170122.orig/Makefile 2017-06-16 06:54:32.993875817 -0700
-+++ cpuid-20170122/Makefile 2017-06-16 06:55:56.622875498 -0700
-@@ -1,9 +1,3 @@
--CFLAGS+=-g
--CPPFLAGS?=
--LDFLAGS?=
--ifneq (,$(findstring arch=i386,$(CFLAGS)))
--CISA=-m32
--endif
- CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -Wshadow -Wcast-align -Wredundant-decls -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION)
-
- PACKAGE=cpuid
-@@ -51,10 +45,10 @@
- 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 -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 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
-+ install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
-+ install -D -m 755 cpuinfo2cpuid $(BUILDROOT)/usr/bin/cpuinfo2cpuid
-+ install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
-
- clean:
- rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
diff --git a/sys-apps/cpuid/files/cpuid-20170122-missing-include-sysmacros.patch b/sys-apps/cpuid/files/cpuid-20170122-missing-include-sysmacros.patch
deleted file mode 100644
index bba18a3b354..00000000000
--- a/sys-apps/cpuid/files/cpuid-20170122-missing-include-sysmacros.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/files/, sys-apps/cpuid/
@ 2020-08-11 18:30 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2020-08-11 18:30 UTC (permalink / raw
To: gentoo-commits
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)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/files/, sys-apps/cpuid/
@ 2022-07-29 19:06 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2022-07-29 19:06 UTC (permalink / raw
To: gentoo-commits
commit: f392d896f0940fe9f400afc46c10e9bfb3295608
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 19:02:36 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 19:02:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f392d896
sys-apps/cpuid: drop 20220224
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-apps/cpuid/Manifest | 1 -
sys-apps/cpuid/cpuid-20220224.ebuild | 35 --------------------
sys-apps/cpuid/files/cpuid-20200203-makefile.patch | 37 ----------------------
3 files changed, 73 deletions(-)
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 519d498c327a..86fd2a311a99 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,2 +1 @@
-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-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/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
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-07-29 19:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-04 20:12 [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/files/, sys-apps/cpuid/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2022-07-29 19:06 Conrad Kostecki
2020-08-11 18:30 Conrad Kostecki
2019-12-15 17:24 Conrad Kostecki
2017-06-16 14:03 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox