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:
