Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/, sys-apps/cpuid/files/
Date: Mon, 04 Sep 2017 20:12:10
Message-Id: 1504555902.0eb6841a14d6e5bc5760af0f7fdbe805725b0ed7.soap@gentoo
1 commit: 0eb6841a14d6e5bc5760af0f7fdbe805725b0ed7
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 4 20:10:45 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 4 20:11:42 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb6841a
7
8 sys-apps/cpuid: Add missing sys/sysmacros.h include
9
10 Closes: https://bugs.gentoo.org/show_bug.cgi?id=604406
11 Package-Manager: Portage-2.3.8, Repoman-2.3.3
12
13 sys-apps/cpuid/cpuid-20170122.ebuild | 27 ++++++++++++----------
14 .../cpuid-20170122-missing-include-sysmacros.patch | 12 ++++++++++
15 2 files changed, 27 insertions(+), 12 deletions(-)
16
17 diff --git a/sys-apps/cpuid/cpuid-20170122.ebuild b/sys-apps/cpuid/cpuid-20170122.ebuild
18 index 3c76118816b..90935677627 100644
19 --- a/sys-apps/cpuid/cpuid-20170122.ebuild
20 +++ b/sys-apps/cpuid/cpuid-20170122.ebuild
21 @@ -3,28 +3,31 @@
22
23 EAPI=6
24
25 -inherit eutils toolchain-funcs
26 +inherit toolchain-funcs
27
28 -DESCRIPTION="Utility to get detailed information about the CPU(s) using the
29 -CPUID instruction"
30 +DESCRIPTION="Utility to get detailed information about the CPU(s) using the CPUID instruction"
31 HOMEPAGE="http://www.etallen.com/cpuid.html"
32 SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
33
34 -KEYWORDS="~amd64 ~x86"
35 -SLOT="0"
36 LICENSE="GPL-2"
37 +SLOT="0"
38 +KEYWORDS="~amd64 ~x86"
39 IUSE=""
40
41 -src_prepare() {
42 - epatch "${FILESDIR}"/${PN}-20170122-Makefile.patch
43 - eapply_user
44 -}
45 +DEPEND="
46 + app-arch/gzip
47 + dev-lang/perl"
48 +
49 +PATCHES=(
50 + "${FILESDIR}"/${PN}-20170122-Makefile.patch
51 + "${FILESDIR}"/${PN}-20170122-missing-include-sysmacros.patch
52 +)
53
54 -src_compile() {
55 +src_configure() {
56 tc-export CC
57 - emake || die "emake failed"
58 }
59
60 src_install() {
61 - emake BUILDROOT="${D}" install || die "email install failed"
62 + emake BUILDROOT="${ED}" install
63 + einstalldocs
64 }
65
66 diff --git a/sys-apps/cpuid/files/cpuid-20170122-missing-include-sysmacros.patch b/sys-apps/cpuid/files/cpuid-20170122-missing-include-sysmacros.patch
67 new file mode 100644
68 index 00000000000..bba18a3b354
69 --- /dev/null
70 +++ b/sys-apps/cpuid/files/cpuid-20170122-missing-include-sysmacros.patch
71 @@ -0,0 +1,12 @@
72 +Bug: https://bugs.gentoo.org/show_bug.cgi?id=604406
73 +
74 +--- a/cpuid.c
75 ++++ b/cpuid.c
76 +@@ -30,6 +30,7 @@
77 + #define _GNU_SOURCE
78 + #include <stdio.h>
79 + #include <sys/types.h>
80 ++#include <sys/sysmacros.h>
81 + #include <sys/stat.h>
82 + #include <fcntl.h>
83 + #include <errno.h>