1 |
commit: 92f8c7bdb4ddb721854b7b14c7dfd06ef64e6278 |
2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 28 23:53:58 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 29 13:17:51 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f8c7bd |
7 |
|
8 |
x11-plugins/wmacpiload-ac: bump EAPI and drop eutils |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
.../wmacpiload-ac-acpi-fix-battery-unit.patch | 6 +++--- |
13 |
.../files/wmacpiload-ac-acpi-segfault.patch | 14 ++++++------- |
14 |
.../files/wmacpiload-ac-acpi-sys-temp-hwmon.patch | 14 ++++++------- |
15 |
.../wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild | 24 +++++++--------------- |
16 |
4 files changed, 24 insertions(+), 34 deletions(-) |
17 |
|
18 |
diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch |
19 |
index 6bf6179e7fc..d0eabc16637 100644 |
20 |
--- a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch |
21 |
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch |
22 |
@@ -1,5 +1,5 @@ |
23 |
---- wmacpiload-0.2.0/src/battery.c 2012-10-18 15:42:04.000000000 +0200 |
24 |
-+++ wmacpiload-0.2.0.new/src/battery.c 2012-10-18 15:43:33.000000000 +0200 |
25 |
+--- a/src/battery.c 2012-10-18 15:42:04.000000000 +0200 |
26 |
++++ b/src/battery.c 2012-10-18 15:43:33.000000000 +0200 |
27 |
@@ -42,7 +42,8 @@ |
28 |
************************************************************************/ |
29 |
|
30 |
@@ -27,4 +27,4 @@ |
31 |
+ if (strcmp(endptr, CAPACITY_UNIT1) == 0 || strcmp(endptr, CAPACITY_UNIT2) == 0) |
32 |
bat->percentage = (int) ((remain * 100.0) / bat->capacity); |
33 |
else |
34 |
- bat->percentage = -1; |
35 |
\ No newline at end of file |
36 |
+ bat->percentage = -1; |
37 |
|
38 |
diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch |
39 |
index 15f8e05579a..2f43cd358b7 100644 |
40 |
--- a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch |
41 |
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch |
42 |
@@ -1,6 +1,6 @@ |
43 |
-diff -ru wmacpiload-0.2.0/include/lib_acpi.h wmacpiload-0.2.0.new//include/lib_acpi.h |
44 |
---- wmacpiload-0.2.0/include/lib_acpi.h 2005-07-21 21:33:19.000000000 -0400 |
45 |
-+++ wmacpiload-0.2.0.new//include/lib_acpi.h 2011-06-20 19:53:30.458953984 -0400 |
46 |
+diff -ru a/include/lib_acpi.h b/include/lib_acpi.h |
47 |
+--- a/include/lib_acpi.h 2005-07-21 21:33:19.000000000 -0400 |
48 |
++++ b/include/lib_acpi.h 2011-06-20 19:53:30.458953984 -0400 |
49 |
@@ -32,7 +32,7 @@ |
50 |
* Macros |
51 |
************************************************************************/ |
52 |
@@ -10,13 +10,13 @@ diff -ru wmacpiload-0.2.0/include/lib_acpi.h wmacpiload-0.2.0.new//include/lib_a |
53 |
|
54 |
/* use ? */ |
55 |
# ifndef ACPI_32_BIT_SUPPORT |
56 |
-diff -ru wmacpiload-0.2.0/src/dockapp.c wmacpiload-0.2.0.new//src/dockapp.c |
57 |
---- wmacpiload-0.2.0/src/dockapp.c 2005-08-16 18:38:36.000000000 -0400 |
58 |
-+++ wmacpiload-0.2.0.new//src/dockapp.c 2011-06-20 19:44:20.022684448 -0400 |
59 |
+diff -ru a/src/dockapp.c b/src/dockapp.c |
60 |
+--- a/src/dockapp.c 2005-08-16 18:38:36.000000000 -0400 |
61 |
++++ b/src/dockapp.c 2011-06-20 19:44:20.022684448 -0400 |
62 |
@@ -431,5 +431,6 @@ |
63 |
void |
64 |
dockapp_cleanup(void) |
65 |
{ |
66 |
+ if (display != NULL) |
67 |
XCloseDisplay(display); |
68 |
- } |
69 |
\ No newline at end of file |
70 |
+ } |
71 |
|
72 |
diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch |
73 |
index 69857717dae..7fb8586ed1e 100644 |
74 |
--- a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch |
75 |
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch |
76 |
@@ -1,6 +1,6 @@ |
77 |
-diff -ru wmacpiload-0.2.0/src/lib_acpi.c wmacpiload-0.2.0.new//src/lib_acpi.c |
78 |
---- wmacpiload-0.2.0/src/lib_acpi.c 2005-07-21 21:41:31.000000000 -0400 |
79 |
-+++ wmacpiload-0.2.0.new//src/lib_acpi.c 2011-06-28 23:37:50.148092904 -0400 |
80 |
+diff -ru a/src/lib_acpi.c b/src/lib_acpi.c |
81 |
+--- a/src/lib_acpi.c 2005-07-21 21:41:31.000000000 -0400 |
82 |
++++ b/src/lib_acpi.c 2011-06-28 23:37:50.148092904 -0400 |
83 |
@@ -83,7 +83,7 @@ |
84 |
if (!k->ac) |
85 |
fprintf(stderr, "%s : no AC adapter detected\n", PACKAGE); |
86 |
@@ -23,9 +23,9 @@ diff -ru wmacpiload-0.2.0/src/lib_acpi.c wmacpiload-0.2.0.new//src/lib_acpi.c |
87 |
char *src; |
88 |
char *end; |
89 |
size_t len; |
90 |
-diff -ru wmacpiload-0.2.0/src/thermal.c wmacpiload-0.2.0.new//src/thermal.c |
91 |
---- wmacpiload-0.2.0/src/thermal.c 2005-09-29 19:32:46.000000000 -0400 |
92 |
-+++ wmacpiload-0.2.0.new//src/thermal.c 2011-06-29 00:18:24.851904854 -0400 |
93 |
+diff -ru a/src/thermal.c b/src/thermal.c |
94 |
+--- a/src/thermal.c 2005-09-29 19:32:46.000000000 -0400 |
95 |
++++ b/src/thermal.c 2011-06-29 00:18:24.851904854 -0400 |
96 |
@@ -30,12 +30,17 @@ |
97 |
#endif |
98 |
|
99 |
@@ -118,4 +118,4 @@ diff -ru wmacpiload-0.2.0/src/thermal.c wmacpiload-0.2.0.new//src/thermal.c |
100 |
+ tz->temp = temp / 1000; |
101 |
} |
102 |
} |
103 |
- |
104 |
\ No newline at end of file |
105 |
+ |
106 |
|
107 |
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild |
108 |
index 5336ef10ddd..05c5ee785de 100644 |
109 |
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild |
110 |
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild |
111 |
@@ -1,11 +1,10 @@ |
112 |
# Copyright 1999-2018 Gentoo Foundation |
113 |
# Distributed under the terms of the GNU General Public License v2 |
114 |
|
115 |
-EAPI="2" |
116 |
- |
117 |
-inherit eutils |
118 |
+EAPI=7 |
119 |
|
120 |
MY_P=${P/-ac} |
121 |
+ |
122 |
DESCRIPTION="WMACPILoad based dockapp to monitor CPU temp and battery time on ACPI kernels" |
123 |
HOMEPAGE="http://wmacpiload.tuxfamily.org/" |
124 |
SRC_URI="http://wmacpiload.tuxfamily.org/download/${MY_P}.tar.bz2" |
125 |
@@ -25,21 +24,12 @@ DEPEND="${RDEPEND} |
126 |
|
127 |
S="${WORKDIR}/${MY_P}" |
128 |
|
129 |
-src_prepare() { |
130 |
- epatch "${FILESDIR}/${PN}-acpi-segfault.patch" || die "epatch failed" |
131 |
- epatch "${FILESDIR}/${PN}-acpi-sys-temp-hwmon.patch" || die "epatch failed" |
132 |
- epatch "${FILESDIR}/${PN}-acpi-fix-battery-unit.patch" || die "epatch failed" |
133 |
-} |
134 |
+PATCHES=( |
135 |
+ "${FILESDIR}/${PN}-acpi-segfault.patch" |
136 |
+ "${FILESDIR}/${PN}-acpi-sys-temp-hwmon.patch" |
137 |
+ "${FILESDIR}/${PN}-acpi-fix-battery-unit.patch" |
138 |
+) |
139 |
|
140 |
src_configure() { |
141 |
econf $(use_enable debug) |
142 |
} |
143 |
- |
144 |
-src_compile() { |
145 |
- emake || die "compile failed" |
146 |
-} |
147 |
- |
148 |
-src_install() { |
149 |
- emake DESTDIR="${D}" install || die "install failed" |
150 |
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO |
151 |
-} |