1 |
commit: 8fb2b4ce43a4f356ff6db728fde15c0a36e34642 |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 29 05:37:10 2020 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 29 05:37:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb2b4ce |
7 |
|
8 |
sys-apps/x86info: bump for py3 |
9 |
|
10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
11 |
|
12 |
sys-apps/x86info/Manifest | 1 + |
13 |
sys-apps/x86info/x86info-1.30-r1.ebuild | 72 +++++++++++++++++++++++++ |
14 |
sys-apps/x86info/x86info-1.30_p20190617.ebuild | 73 ++++++++++++++++++++++++++ |
15 |
3 files changed, 146 insertions(+) |
16 |
|
17 |
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest |
18 |
index bcc650214b0..3fa8bb65f0e 100644 |
19 |
--- a/sys-apps/x86info/Manifest |
20 |
+++ b/sys-apps/x86info/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST x86info-1.30.tgz 95727 BLAKE2B 6e9e345c6b4d05d4a137b898f1cc8a31e901b25b8a3822c06c103298e2ee60c6fada8e1fc314a5fcec04618b9a8a9ce05a4e631dbf9f03a24c5349f13d1e2301 SHA512 0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f |
23 |
+DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3 SHA512 352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6 |
24 |
|
25 |
diff --git a/sys-apps/x86info/x86info-1.30-r1.ebuild b/sys-apps/x86info/x86info-1.30-r1.ebuild |
26 |
new file mode 100644 |
27 |
index 00000000000..5a09ba8a8e7 |
28 |
--- /dev/null |
29 |
+++ b/sys-apps/x86info/x86info-1.30-r1.ebuild |
30 |
@@ -0,0 +1,72 @@ |
31 |
+# Copyright 1999-2017 Gentoo Foundation |
32 |
+# Distributed under the terms of the GNU General Public License v2 |
33 |
+ |
34 |
+EAPI=7 |
35 |
+ |
36 |
+PYTHON_COMPAT=( python2_7 python3_{4..8} ) |
37 |
+ |
38 |
+inherit flag-o-matic linux-info python-any-r1 toolchain-funcs |
39 |
+ |
40 |
+DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility" |
41 |
+HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/" |
42 |
+SRC_URI="http://www.codemonkey.org.uk/projects/x86info/${P}.tgz" |
43 |
+ |
44 |
+LICENSE="GPL-2" |
45 |
+SLOT="0" |
46 |
+KEYWORDS="-* ~amd64 ~x86" |
47 |
+IUSE="" |
48 |
+ |
49 |
+RDEPEND="sys-apps/pciutils:=" |
50 |
+DEPEND=" |
51 |
+ ${PYTHON_DEPS} |
52 |
+ ${RDEPEND}" |
53 |
+ |
54 |
+CONFIG_CHECK="~MTRR ~X86_CPUID" |
55 |
+ |
56 |
+PATCHES=( |
57 |
+ "${FILESDIR}"/1.21-pic.patch |
58 |
+ "${FILESDIR}"/${PN}-1.24-pic.patch #270388 |
59 |
+ "${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch |
60 |
+ "${FILESDIR}"/${PN}-1.30-fix-build-system.patch |
61 |
+) |
62 |
+ |
63 |
+pkg_setup() { |
64 |
+ linux-info_pkg_setup |
65 |
+ python-any-r1_pkg_setup |
66 |
+} |
67 |
+ |
68 |
+src_configure() { |
69 |
+ # These flags taken from the 1.29 ebuild |
70 |
+ append-flags -Wall -Wshadow -Wextra -Wmissing-declarations \ |
71 |
+ -Wdeclaration-after-statement -Wredundant-decls |
72 |
+ append-ldflags -Wl,-z,relro,-z,now |
73 |
+ |
74 |
+ tc-export CC |
75 |
+} |
76 |
+ |
77 |
+src_compile() { |
78 |
+ emake x86info lsmsr |
79 |
+} |
80 |
+ |
81 |
+src_install() { |
82 |
+ dobin x86info lsmsr |
83 |
+ |
84 |
+ insinto /etc/modprobe.d |
85 |
+ newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf |
86 |
+ |
87 |
+ einstalldocs |
88 |
+ doman x86info.1 lsmsr.8 |
89 |
+ |
90 |
+ dodoc -r results |
91 |
+} |
92 |
+ |
93 |
+pkg_preinst() { |
94 |
+ if [[ -a "${EROOT}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info ]]; then |
95 |
+ elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/" |
96 |
+ mv "${EROOT}"/etc/{modules,modprobe}.d/x86info |
97 |
+ fi |
98 |
+ if [[ -a "${EROOT}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info.conf ]]; then |
99 |
+ elog "Adding .conf suffix to x86info in /etc/modprobe.d/" |
100 |
+ mv "${EROOT}"/etc/modprobe.d/x86info{,.conf} |
101 |
+ fi |
102 |
+} |
103 |
|
104 |
diff --git a/sys-apps/x86info/x86info-1.30_p20190617.ebuild b/sys-apps/x86info/x86info-1.30_p20190617.ebuild |
105 |
new file mode 100644 |
106 |
index 00000000000..d8a3b48dfad |
107 |
--- /dev/null |
108 |
+++ b/sys-apps/x86info/x86info-1.30_p20190617.ebuild |
109 |
@@ -0,0 +1,73 @@ |
110 |
+# Copyright 1999-2017 Gentoo Foundation |
111 |
+# Distributed under the terms of the GNU General Public License v2 |
112 |
+ |
113 |
+EAPI=7 |
114 |
+ |
115 |
+PYTHON_COMPAT=( python2_7 python3_{4..8} ) |
116 |
+ |
117 |
+inherit flag-o-matic linux-info python-any-r1 toolchain-funcs |
118 |
+ |
119 |
+DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility" |
120 |
+HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/" |
121 |
+# Upstream stopped versioned releases entirely |
122 |
+COMMIT="8ea5ed19fae1d209eba9257171a10f7afd474618" |
123 |
+SRC_URI="https://github.com/kernelslacker/x86info/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
124 |
+ |
125 |
+LICENSE="GPL-2" |
126 |
+SLOT="0" |
127 |
+KEYWORDS="-* ~amd64 ~x86" |
128 |
+IUSE="" |
129 |
+ |
130 |
+RDEPEND="sys-apps/pciutils:=" |
131 |
+DEPEND=" |
132 |
+ ${PYTHON_DEPS} |
133 |
+ ${RDEPEND}" |
134 |
+ |
135 |
+CONFIG_CHECK="~MTRR ~X86_CPUID" |
136 |
+S="${WORKDIR}/${PN}-${COMMIT}" |
137 |
+ |
138 |
+PATCHES=( |
139 |
+ #"${FILESDIR}"/1.21-pic.patch |
140 |
+ "${FILESDIR}"/${PN}-1.24-pic.patch #270388 |
141 |
+ #"${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch |
142 |
+ #"${FILESDIR}"/${PN}-1.30-fix-build-system.patch |
143 |
+) |
144 |
+ |
145 |
+pkg_setup() { |
146 |
+ linux-info_pkg_setup |
147 |
+ python-any-r1_pkg_setup |
148 |
+} |
149 |
+ |
150 |
+src_configure() { |
151 |
+ # These flags taken from the 1.29 ebuild |
152 |
+ append-flags -Wall -Wshadow -Wextra -Wmissing-declarations \ |
153 |
+ -Wdeclaration-after-statement -Wredundant-decls |
154 |
+ append-ldflags -Wl,-z,relro,-z,now |
155 |
+ |
156 |
+ tc-export CC |
157 |
+} |
158 |
+ |
159 |
+src_compile() { |
160 |
+ emake x86info |
161 |
+} |
162 |
+ |
163 |
+src_install() { |
164 |
+ dobin x86info |
165 |
+ |
166 |
+ insinto /etc/modprobe.d |
167 |
+ newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf |
168 |
+ |
169 |
+ einstalldocs |
170 |
+ doman x86info.1 |
171 |
+} |
172 |
+ |
173 |
+pkg_preinst() { |
174 |
+ if [[ -a "${EROOT}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info ]]; then |
175 |
+ elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/" |
176 |
+ mv "${EROOT}"/etc/{modules,modprobe}.d/x86info |
177 |
+ fi |
178 |
+ if [[ -a "${EROOT}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info.conf ]]; then |
179 |
+ elog "Adding .conf suffix to x86info in /etc/modprobe.d/" |
180 |
+ mv "${EROOT}"/etc/modprobe.d/x86info{,.conf} |
181 |
+ fi |
182 |
+} |