1 |
commit: 5cf624bcfc8b05eddfd4b29d21a343345993e28e |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 2 13:40:22 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 2 14:15:40 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf624bc |
7 |
|
8 |
sys-apps/xmbmon: Port to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
11 |
|
12 |
sys-apps/xmbmon/Manifest | 3 +- |
13 |
sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch | 10 ++--- |
14 |
sys-apps/xmbmon/files/xmbmon-2.0.5-fflush.patch | 10 +++++ |
15 |
sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch | 4 +- |
16 |
sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch | 4 +- |
17 |
sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild | 54 ++++++++++++----------- |
18 |
6 files changed, 47 insertions(+), 38 deletions(-) |
19 |
|
20 |
diff --git a/sys-apps/xmbmon/Manifest b/sys-apps/xmbmon/Manifest |
21 |
index c1b6979699e..2107a452de1 100644 |
22 |
--- a/sys-apps/xmbmon/Manifest |
23 |
+++ b/sys-apps/xmbmon/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST xmbmon205.tar.gz 142987 SHA256 65b10ebfe53585ac22d6a31d8ef3fea552cb266cf2c124c00421dec1df5a4a4f SHA512 0ee2f3616976af6edc3777391f657d12670be1557f726f67f51edc23866d96d5cd4cfa9ac8aaad52cce2bdd2b9c616efd6edba1a019e4360a0fcaae0aef99a9c WHIRLPOOL f4a77e88315cb86fb6aa61566804cb22b382a6a18d56c96a09dd991033be005ec638361a03cfde21a95e6ef316ed65bbf15d72d03b10810e4dee59e1790e3d7b |
26 |
-DIST xmbmon205_fflush.patch 242 SHA256 f837f465861ce46e4a90d1d3c7a680c1904f7fb91e14efcbad22313c90e2cdc7 SHA512 4ebd6f3870f3b35aafe9424da9e007b269bbdd6944a012e45a6bb18871a1df649245a0992862a2346dd92026e36430130b2061d8308286b93e13571e028684b5 WHIRLPOOL 3bb1a83e9e753642fe6a9bf0deea8743829fe3e27759786f049e03b3fb862adb5c7ed2d69a045d682e1e7afbb207d5f496dbff9d938625d1292583271a804b69 |
27 |
+DIST xmbmon205.tar.gz 142987 BLAKE2B 7c39c78068106c828273c077a2a375bfd4dbfa686a4f6b592a986b6cebec6b3e2ae7c9318ecd1b1d91c0757fe7ebb023ac135aa8167b5c86c3e42c1c173cdb72 SHA512 0ee2f3616976af6edc3777391f657d12670be1557f726f67f51edc23866d96d5cd4cfa9ac8aaad52cce2bdd2b9c616efd6edba1a019e4360a0fcaae0aef99a9c |
28 |
|
29 |
diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch |
30 |
index 27b150e9b0b..bac20690510 100644 |
31 |
--- a/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch |
32 |
+++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch |
33 |
@@ -1,6 +1,5 @@ |
34 |
-diff -Naur xmbmon205.orig/configure xmbmon205/configure |
35 |
---- xmbmon205.orig/configure 2004-08-13 16:22:18.000000000 +0900 |
36 |
-+++ xmbmon205/configure 2005-02-05 11:02:02.496163477 +0900 |
37 |
+--- a/configure |
38 |
++++ b/configure |
39 |
@@ -3489,7 +3489,7 @@ |
40 |
i?86-*-freebsd*) |
41 |
CC=cc |
42 |
@@ -10,9 +9,8 @@ diff -Naur xmbmon205.orig/configure xmbmon205/configure |
43 |
CC=gcc |
44 |
HOSTDEF="-DLINUX" |
45 |
;; |
46 |
-diff -Naur xmbmon205.orig/configure.in xmbmon205/configure.in |
47 |
---- xmbmon205.orig/configure.in 2004-08-13 16:06:31.000000000 +0900 |
48 |
-+++ xmbmon205/configure.in 2005-02-05 11:01:35.414957216 +0900 |
49 |
+--- a/configure.in |
50 |
++++ b/configure.in |
51 |
@@ -19,7 +19,7 @@ |
52 |
i?86-*-freebsd*) |
53 |
CC=cc |
54 |
|
55 |
diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-fflush.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-fflush.patch |
56 |
new file mode 100644 |
57 |
index 00000000000..655b30f7551 |
58 |
--- /dev/null |
59 |
+++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-fflush.patch |
60 |
@@ -0,0 +1,10 @@ |
61 |
+--- a/mbmon.c |
62 |
++++ b/mbmon.c |
63 |
+@@ -640,6 +640,7 @@ |
64 |
+ else if (fanspeed == 7) |
65 |
+ fprintf(out, "%4d\n%4d\n%4d\n", rot1, rot2, rot3); |
66 |
+ } |
67 |
++ fflush(out); |
68 |
+ if (port) { |
69 |
+ #ifdef LOGGING |
70 |
+ if (nfd) |
71 |
|
72 |
diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch |
73 |
index 5a28b52f9ea..e501f448dcf 100644 |
74 |
--- a/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch |
75 |
+++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch |
76 |
@@ -2,8 +2,8 @@ Listen on loopback only with the -l option |
77 |
|
78 |
patch by Mike Frysinger |
79 |
|
80 |
---- mbmon.c |
81 |
-+++ mbmon.c |
82 |
+--- a/mbmon.c |
83 |
++++ b/mbmon.c |
84 |
@@ -41,4 +41,5 @@ |
85 |
static const char *MyName = "mbmon"; |
86 |
int port = 0; |
87 |
|
88 |
diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch |
89 |
index aecb5e7a9b7..1ca30657c23 100644 |
90 |
--- a/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch |
91 |
+++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch |
92 |
@@ -2,8 +2,8 @@ Write a pid when we daemonize |
93 |
|
94 |
patch by Mike Frysinger |
95 |
|
96 |
---- mbmon.c |
97 |
-+++ mbmon.c |
98 |
+--- a/bmon.c |
99 |
++++ b/mbmon.c |
100 |
@@ -229,4 +229,5 @@ |
101 |
static void daemonize() |
102 |
{ |
103 |
|
104 |
diff --git a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild b/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild |
105 |
index da5cef958ff..2b128239d11 100644 |
106 |
--- a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild |
107 |
+++ b/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild |
108 |
@@ -1,13 +1,13 @@ |
109 |
-# Copyright 1999-2008 Gentoo Foundation |
110 |
+# Copyright 1999-2017 Gentoo Foundation |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
|
113 |
-inherit eutils |
114 |
+EAPI=6 |
115 |
|
116 |
MY_P=${PN}${PV//.} |
117 |
+ |
118 |
DESCRIPTION="Mother Board Monitor Program for X Window System" |
119 |
HOMEPAGE="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html" |
120 |
-SRC_URI="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}.tar.gz |
121 |
- http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}_fflush.patch" |
122 |
+SRC_URI="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}.tar.gz" |
123 |
# http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}_A7N8X-VM.patch |
124 |
|
125 |
LICENSE="BSD" |
126 |
@@ -15,21 +15,27 @@ SLOT="0" |
127 |
KEYWORDS="amd64 x86 ~x86-fbsd" |
128 |
IUSE="X" |
129 |
|
130 |
-DEPEND="X? ( x11-libs/libXt |
131 |
- x11-libs/libSM |
132 |
- x11-libs/libX11 |
133 |
- x11-libs/libICE )" |
134 |
+RDEPEND=" |
135 |
+ X? ( |
136 |
+ x11-libs/libXt |
137 |
+ x11-libs/libSM |
138 |
+ x11-libs/libX11 |
139 |
+ x11-libs/libICE |
140 |
+ )" |
141 |
+DEPEND="${RDEPEND}" |
142 |
|
143 |
S=${WORKDIR}/${MY_P} |
144 |
+PATCHES=( |
145 |
+ # "${DISTDIR}"/${MY_P}_A7N8X-VM.patch |
146 |
+ "${FILESDIR}"/${P}-fflush.patch |
147 |
+ "${FILESDIR}"/${P}-amd64.patch |
148 |
+ "${FILESDIR}"/${P}-pid.patch |
149 |
+ "${FILESDIR}"/${P}-loopback.patch |
150 |
+) |
151 |
+ |
152 |
+src_prepare() { |
153 |
+ default |
154 |
|
155 |
-src_unpack() { |
156 |
- unpack ${A} |
157 |
- cd "${S}" |
158 |
- # epatch "${DISTDIR}"/${MY_P}_A7N8X-VM.patch |
159 |
- epatch "${DISTDIR}"/${MY_P}_fflush.patch |
160 |
- epatch "${FILESDIR}"/${P}-amd64.patch |
161 |
- epatch "${FILESDIR}"/${P}-pid.patch |
162 |
- epatch "${FILESDIR}"/${P}-loopback.patch |
163 |
sed -i \ |
164 |
-e "/^CFLAGS=/s/-O3/${CFLAGS}/" \ |
165 |
-e '/^LDFLAGS=-s$/d' \ |
166 |
@@ -40,21 +46,19 @@ src_unpack() { |
167 |
} |
168 |
|
169 |
src_compile() { |
170 |
- econf || die "Configure failed" |
171 |
- emake mbmon || die "Make mbmon failed" |
172 |
- if use X ; then |
173 |
- emake xmbmon || die "Make xmbmon failed" |
174 |
- fi |
175 |
+ emake mbmon |
176 |
+ use X && emake xmbmon |
177 |
} |
178 |
|
179 |
src_install() { |
180 |
- dosbin mbmon || die "mbmon failed" |
181 |
+ dosbin mbmon |
182 |
doman mbmon.1 |
183 |
dodoc ChangeLog* ReadMe* mbmon-rrd.pl |
184 |
|
185 |
- if use X ; then |
186 |
- dosbin xmbmon || die "xmbmon failed" |
187 |
+ if use X; then |
188 |
+ dosbin xmbmon |
189 |
doman xmbmon.1x |
190 |
+ |
191 |
insinto /etc/X11/app-defaults/ |
192 |
newins xmbmon.resources XMBmon |
193 |
fi |
194 |
@@ -64,10 +68,8 @@ src_install() { |
195 |
} |
196 |
|
197 |
pkg_postinst() { |
198 |
- echo |
199 |
einfo "These programs access SMBus/ISA-IO ports without any kind" |
200 |
einfo "of checking. It is, therefore, very dangerous and may cause" |
201 |
einfo "a system-crash. Make sure you read ReadMe," |
202 |
einfo "section 4, 'How to use!'" |
203 |
- echo |
204 |
} |