1 |
commit: b5c59cd9c14353728b310e075c647c0c8ecc260e |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 9 13:21:36 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 9 13:22:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c59cd9 |
7 |
|
8 |
sys-process/htop: Removed old. |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
sys-process/htop/Manifest | 1 - |
14 |
.../htop/files/htop-2.1.0-MakeHeader-python3.patch | 29 -------- |
15 |
sys-process/htop/files/htop-2.1.0-bashisms.patch | 37 --------- |
16 |
.../htop/files/htop-2.1.0-clear_on_sigwinch.patch | 21 ------ |
17 |
.../htop/files/htop-2.1.0-color_issues.patch | 87 ---------------------- |
18 |
sys-process/htop/files/htop-2.1.0-ldflags.patch | 21 ------ |
19 |
.../htop/files/htop-2.1.0-ncurses_cflags.patch | 46 ------------ |
20 |
sys-process/htop/files/htop-2.1.0-sysmacros.patch | 81 -------------------- |
21 |
sys-process/htop/htop-2.1.0-r1.ebuild | 76 ------------------- |
22 |
9 files changed, 399 deletions(-) |
23 |
|
24 |
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest |
25 |
index edcf3a82aed..01c2fd6812c 100644 |
26 |
--- a/sys-process/htop/Manifest |
27 |
+++ b/sys-process/htop/Manifest |
28 |
@@ -1,4 +1,3 @@ |
29 |
DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda |
30 |
-DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb |
31 |
DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e |
32 |
DIST htop-3.0.0_beta5.tar.gz 175780 BLAKE2B f7d03485e74387c656e5a576f0a53c832bac668cee79750402335b2051a17d405392b99316f1546cc76fa83dc3bc85055ca58b928225df0e162ffdb9c1889a5f SHA512 eaa04a278257a1447cd60825083c864d3c23a4a5607447ce05356d550f42ff68a810f14bf91314b7266f9741aab8141d67d98316a31fa7806fb6b858cc804344 |
33 |
|
34 |
diff --git a/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch b/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch |
35 |
deleted file mode 100644 |
36 |
index 7c8590a2991..00000000000 |
37 |
--- a/sys-process/htop/files/htop-2.1.0-MakeHeader-python3.patch |
38 |
+++ /dev/null |
39 |
@@ -1,29 +0,0 @@ |
40 |
-https://bugs.gentoo.org/646880 |
41 |
- |
42 |
---- a/scripts/MakeHeader.py |
43 |
-+++ b/scripts/MakeHeader.py |
44 |
-@@ -1,5 +1,5 @@ |
45 |
- #!/usr/bin/env python |
46 |
--import os, sys, string |
47 |
-+import os, sys, string, io |
48 |
- try: |
49 |
- from cStringIO import StringIO |
50 |
- except ImportError: |
51 |
-@@ -16,7 +16,7 @@ SKIPONE=4 |
52 |
- state = ANY |
53 |
- static = 0 |
54 |
- |
55 |
--file = open(sys.argv[1]) |
56 |
-+file = io.open(sys.argv[1], "r", errors="ignore") |
57 |
- name = sys.argv[1][:-2] |
58 |
- |
59 |
- out = StringIO() |
60 |
-@@ -94,7 +94,7 @@ out.write( "#endif\n" ) |
61 |
- # This prevents a lot of recompilation during development |
62 |
- out.seek(0) |
63 |
- try: |
64 |
-- with open(name + ".h", "r") as orig: |
65 |
-+ with io.open(name + ".h", "r", errors="ignore") as orig: |
66 |
- origcontents = orig.readlines() |
67 |
- except: |
68 |
- origcontents = "" |
69 |
|
70 |
diff --git a/sys-process/htop/files/htop-2.1.0-bashisms.patch b/sys-process/htop/files/htop-2.1.0-bashisms.patch |
71 |
deleted file mode 100644 |
72 |
index 3b5bdabe82f..00000000000 |
73 |
--- a/sys-process/htop/files/htop-2.1.0-bashisms.patch |
74 |
+++ /dev/null |
75 |
@@ -1,37 +0,0 @@ |
76 |
-From d4ea7cd65ccf8551cabb0706167b2c15aad7866d Mon Sep 17 00:00:00 2001 |
77 |
-From: Jesin <jesin00@×××××.com> |
78 |
-Date: Mon, 26 Feb 2018 18:07:52 -0500 |
79 |
-Subject: [PATCH] Fix bashisms (#749) |
80 |
- |
81 |
-The configure script relied on bash-specific extensions to shell syntax |
82 |
-and behavior, causing build failures on systems with other /bin/sh |
83 |
-implementations. This commit replaces those with equivalent constructs |
84 |
-that should work in all POSIX shells. |
85 |
---- |
86 |
- configure.ac | 6 +++--- |
87 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
88 |
- |
89 |
-diff --git a/configure.ac b/configure.ac |
90 |
-index d4bb36b0..3d69756d 100644 |
91 |
---- a/configure.ac |
92 |
-+++ b/configure.ac |
93 |
-@@ -66,7 +66,7 @@ dnl glibc 2.25 deprecates 'major' and 'minor' in <sys/types.h> and requires to |
94 |
- dnl include <sys/sysmacros.h>. However the logic in AC_HEADER_MAJOR has not yet |
95 |
- dnl been updated in Autoconf 2.69, so use a workaround: |
96 |
- m4_version_prereq([2.70], [], |
97 |
--[if test $ac_cv_header_sys_mkdev_h = no; then |
98 |
-+[if test "x$ac_cv_header_sys_mkdev_h" = xno; then |
99 |
- AC_CHECK_HEADER(sys/sysmacros.h, [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, |
100 |
- [Define to 1 if `major', `minor', and `makedev' are declared in <sys/sysmacros.h>.])]) |
101 |
- fi]) |
102 |
-@@ -278,8 +278,8 @@ then |
103 |
- PKG_PROG_PKG_CONFIG() |
104 |
- PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [], [missing_libraries="$missing_libraries libnl-3"]) |
105 |
- PKG_CHECK_MODULES(LIBNL3GENL, libnl-genl-3.0, [], [missing_libraries="$missing_libraries libnl-genl-3"]) |
106 |
-- CFLAGS+=" $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS" |
107 |
-- LIBS+=" $LIBNL3_LIBS $LIBNL3GENL_LIBS" |
108 |
-+ CFLAGS="$CFLAGS $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS" |
109 |
-+ LIBS="$LIBS $LIBNL3_LIBS $LIBNL3GENL_LIBS" |
110 |
- AC_DEFINE(HAVE_DELAYACCT, 1, [Define if delay accounting support should be enabled.]) |
111 |
- fi |
112 |
- |
113 |
|
114 |
diff --git a/sys-process/htop/files/htop-2.1.0-clear_on_sigwinch.patch b/sys-process/htop/files/htop-2.1.0-clear_on_sigwinch.patch |
115 |
deleted file mode 100644 |
116 |
index 3ba7147e3b4..00000000000 |
117 |
--- a/sys-process/htop/files/htop-2.1.0-clear_on_sigwinch.patch |
118 |
+++ /dev/null |
119 |
@@ -1,21 +0,0 @@ |
120 |
-From 5fca258f33e08cd7733940391edbf9e22208de83 Mon Sep 17 00:00:00 2001 |
121 |
-From: guoci <zguoci@×××××.com> |
122 |
-Date: Sat, 17 Feb 2018 13:25:57 -0500 |
123 |
-Subject: [PATCH] call clear() function when SIGWINCH is received. (#660) |
124 |
- |
125 |
---- |
126 |
- Action.c | 1 + |
127 |
- 1 file changed, 1 insertion(+) |
128 |
- |
129 |
-diff --git a/Action.c b/Action.c |
130 |
-index a6394ac3..50ab0bb9 100644 |
131 |
---- a/Action.c |
132 |
-+++ b/Action.c |
133 |
-@@ -185,6 +185,7 @@ static Htop_Reaction sortBy(State* st) { |
134 |
- // ---------------------------------------- |
135 |
- |
136 |
- static Htop_Reaction actionResize(State* st) { |
137 |
-+ clear(); |
138 |
- Panel_resize(st->panel, COLS, LINES-(st->panel->y)-1); |
139 |
- return HTOP_REDRAW_BAR; |
140 |
- } |
141 |
|
142 |
diff --git a/sys-process/htop/files/htop-2.1.0-color_issues.patch b/sys-process/htop/files/htop-2.1.0-color_issues.patch |
143 |
deleted file mode 100644 |
144 |
index 0b4bea8bb95..00000000000 |
145 |
--- a/sys-process/htop/files/htop-2.1.0-color_issues.patch |
146 |
+++ /dev/null |
147 |
@@ -1,87 +0,0 @@ |
148 |
-From ac2dff2881a7ab203750e8edf7a46b69ae492ed0 Mon Sep 17 00:00:00 2001 |
149 |
-From: Hisham Muhammad <hisham@×××××××××.org> |
150 |
-Date: Mon, 5 Feb 2018 07:01:12 +0100 |
151 |
-Subject: [PATCH] Fix color behavior on some terminals. |
152 |
- |
153 |
-Fixes #635. |
154 |
---- |
155 |
- CRT.c | 32 +++++++++++++++++--------------- |
156 |
- CRT.h | 1 + |
157 |
- ColorsPanel.c | 1 + |
158 |
- 3 files changed, 19 insertions(+), 15 deletions(-) |
159 |
- |
160 |
-diff --git a/CRT.c b/CRT.c |
161 |
-index 237e30ef..ca9a10dd 100644 |
162 |
---- a/CRT.c |
163 |
-+++ b/CRT.c |
164 |
-@@ -37,6 +37,7 @@ in the source distribution for its full text. |
165 |
- #define White COLOR_WHITE |
166 |
- |
167 |
- #define ColorPairGrayBlack ColorPair(Magenta,Magenta) |
168 |
-+#define ColorIndexGrayBlack ColorIndex(Magenta,Magenta) |
169 |
- |
170 |
- #define KEY_WHEELUP KEY_F(20) |
171 |
- #define KEY_WHEELDOWN KEY_F(21) |
172 |
-@@ -713,22 +714,23 @@ void CRT_enableDelay() { |
173 |
- |
174 |
- void CRT_setColors(int colorScheme) { |
175 |
- CRT_colorScheme = colorScheme; |
176 |
-- if (colorScheme == COLORSCHEME_BLACKNIGHT) { |
177 |
-- for (int i = 0; i < 8; i++) |
178 |
-- for (int j = 0; j < 8; j++) { |
179 |
-- if (ColorIndex(i,j) != ColorIndex(Magenta,Magenta)) { |
180 |
-- init_pair(ColorIndex(i,j), i, j); |
181 |
-- } |
182 |
-- } |
183 |
-- init_pair(ColorIndex(Magenta,Magenta), 8, 0); |
184 |
-- } else { |
185 |
-- for (int i = 0; i < 8; i++) |
186 |
-- for (int j = 0; j < 8; j++) { |
187 |
-- if (ColorIndex(i,j) != ColorIndex(Magenta,Magenta)) { |
188 |
-- init_pair(ColorIndex(i,j), i, (j==0?-1:j)); |
189 |
-- } |
190 |
-+ |
191 |
-+ for (int i = 0; i < 8; i++) { |
192 |
-+ for (int j = 0; j < 8; j++) { |
193 |
-+ if (ColorIndex(i,j) != ColorPairGrayBlack) { |
194 |
-+ int bg = (colorScheme != COLORSCHEME_BLACKNIGHT) |
195 |
-+ ? (j==0 ? -1 : j) |
196 |
-+ : j; |
197 |
-+ init_pair(ColorIndex(i,j), i, bg); |
198 |
- } |
199 |
-- init_pair(ColorIndex(Magenta,Magenta), 8, -1); |
200 |
-+ } |
201 |
- } |
202 |
-+ |
203 |
-+ int grayBlackFg = COLORS > 8 ? 8 : 0; |
204 |
-+ int grayBlackBg = (colorScheme != COLORSCHEME_BLACKNIGHT) |
205 |
-+ ? -1 |
206 |
-+ : 0; |
207 |
-+ init_pair(ColorIndexGrayBlack, grayBlackFg, grayBlackBg); |
208 |
-+ |
209 |
- CRT_colors = CRT_colorSchemes[colorScheme]; |
210 |
- } |
211 |
-diff --git a/CRT.h b/CRT.h |
212 |
-index 590fff6e..933fe068 100644 |
213 |
---- a/CRT.h |
214 |
-+++ b/CRT.h |
215 |
-@@ -26,6 +26,7 @@ in the source distribution for its full text. |
216 |
- #define White COLOR_WHITE |
217 |
- |
218 |
- #define ColorPairGrayBlack ColorPair(Magenta,Magenta) |
219 |
-+#define ColorIndexGrayBlack ColorIndex(Magenta,Magenta) |
220 |
- |
221 |
- #define KEY_WHEELUP KEY_F(20) |
222 |
- #define KEY_WHEELDOWN KEY_F(21) |
223 |
-diff --git a/ColorsPanel.c b/ColorsPanel.c |
224 |
-index 627a516a..2028335f 100644 |
225 |
---- a/ColorsPanel.c |
226 |
-+++ b/ColorsPanel.c |
227 |
-@@ -78,6 +78,7 @@ static HandlerResult ColorsPanel_eventHandler(Panel* super, int ch) { |
228 |
- this->settings->changed = true; |
229 |
- const Header* header = this->scr->header; |
230 |
- CRT_setColors(mark); |
231 |
-+ clear(); |
232 |
- Panel* menu = (Panel*) Vector_get(this->scr->panels, 0); |
233 |
- Header_draw(header); |
234 |
- RichString_setAttr(&(super->header), CRT_colors[PANEL_HEADER_FOCUS]); |
235 |
|
236 |
diff --git a/sys-process/htop/files/htop-2.1.0-ldflags.patch b/sys-process/htop/files/htop-2.1.0-ldflags.patch |
237 |
deleted file mode 100644 |
238 |
index 386542f3547..00000000000 |
239 |
--- a/sys-process/htop/files/htop-2.1.0-ldflags.patch |
240 |
+++ /dev/null |
241 |
@@ -1,21 +0,0 @@ |
242 |
-From df9922a67eb8e02ab4cf1ff8f24b40f14094e699 Mon Sep 17 00:00:00 2001 |
243 |
-From: Hisham Muhammad <hisham@×××××××××.org> |
244 |
-Date: Sat, 17 Feb 2018 14:50:55 -0200 |
245 |
-Subject: [PATCH] Fix preservation of LDFLAGS value during configure script |
246 |
- |
247 |
-Fixes #738. |
248 |
---- |
249 |
- |
250 |
-diff --git a/configure.ac b/configure.ac |
251 |
-index df922e07..44595050 100644 |
252 |
---- a/configure.ac |
253 |
-+++ b/configure.ac |
254 |
-@@ -167,7 +167,7 @@ m4_define([HTOP_CHECK_SCRIPT], |
255 |
- LIBS="$htop_config_script $LIBS " |
256 |
- htop_script_success=yes |
257 |
- ], []) |
258 |
-- LDFLAGS="$save_LDFLAGS" |
259 |
-+ LDFLAGS="$htop_save_LDFLAGS" |
260 |
- fi |
261 |
- if test "x$htop_script_success" = xno; then |
262 |
- [$5] |
263 |
|
264 |
diff --git a/sys-process/htop/files/htop-2.1.0-ncurses_cflags.patch b/sys-process/htop/files/htop-2.1.0-ncurses_cflags.patch |
265 |
deleted file mode 100644 |
266 |
index 0a25aeb7fa2..00000000000 |
267 |
--- a/sys-process/htop/files/htop-2.1.0-ncurses_cflags.patch |
268 |
+++ /dev/null |
269 |
@@ -1,46 +0,0 @@ |
270 |
-From bc5d46982f3504000567e00f59e4f7a5905597a9 Mon Sep 17 00:00:00 2001 |
271 |
-From: Michael Klein <michael.klein@×××××××××××××××××.de> |
272 |
-Date: Mon, 26 Feb 2018 14:19:01 +0100 |
273 |
-Subject: [PATCH] use CFLAGS from ncurses*-config, if present (#745) |
274 |
- |
275 |
-Fixes #695. |
276 |
---- |
277 |
- configure.ac | 18 ++++++++++++------ |
278 |
- 1 file changed, 12 insertions(+), 6 deletions(-) |
279 |
- |
280 |
-diff --git a/configure.ac b/configure.ac |
281 |
-index 36aebc5e..d4bb36b0 100644 |
282 |
---- a/configure.ac |
283 |
-+++ b/configure.ac |
284 |
-@@ -164,19 +164,25 @@ m4_define([HTOP_CHECK_SCRIPT], |
285 |
- [ |
286 |
- if test ! -z "m4_toupper($HTOP_[$1]_CONFIG_SCRIPT)"; then |
287 |
- # to be used to set the path to ncurses*-config when cross-compiling |
288 |
-- htop_config_script=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --libs 2> /dev/null) |
289 |
-+ htop_config_script_libs=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --libs 2> /dev/null) |
290 |
-+ htop_config_script_cflags=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --cflags 2> /dev/null) |
291 |
- else |
292 |
-- htop_config_script=$([$4] --libs 2> /dev/null) |
293 |
-+ htop_config_script_libs=$([$4] --libs 2> /dev/null) |
294 |
-+ htop_config_script_cflags=$([$4] --cflags 2> /dev/null) |
295 |
- fi |
296 |
- htop_script_success=no |
297 |
- htop_save_LDFLAGS="$LDFLAGS" |
298 |
-- if test ! "x$htop_config_script" = x; then |
299 |
-- LDFLAGS="$htop_config_script $LDFLAGS" |
300 |
-+ htop_save_CFLAGS="$CFLAGS" |
301 |
-+ if test ! "x$htop_config_script_libs" = x; then |
302 |
-+ LDFLAGS="$htop_config_script_libs $LDFLAGS" |
303 |
-+ CFLAGS="$htop_config_script_cflags $CFLAGS" |
304 |
- AC_CHECK_LIB([$1], [$2], [ |
305 |
- AC_DEFINE([$3], 1, [The library is present.]) |
306 |
-- LIBS="$htop_config_script $LIBS " |
307 |
-+ LIBS="$htop_config_script_libs $LIBS " |
308 |
- htop_script_success=yes |
309 |
-- ], []) |
310 |
-+ ], [ |
311 |
-+ CFLAGS="$htop_save_CFLAGS" |
312 |
-+ ]) |
313 |
- LDFLAGS="$htop_save_LDFLAGS" |
314 |
- fi |
315 |
- if test "x$htop_script_success" = xno; then |
316 |
|
317 |
diff --git a/sys-process/htop/files/htop-2.1.0-sysmacros.patch b/sys-process/htop/files/htop-2.1.0-sysmacros.patch |
318 |
deleted file mode 100644 |
319 |
index 0ab1bb0c02a..00000000000 |
320 |
--- a/sys-process/htop/files/htop-2.1.0-sysmacros.patch |
321 |
+++ /dev/null |
322 |
@@ -1,81 +0,0 @@ |
323 |
-From d2d413161bbdf009f232faa5789131326225f838 Mon Sep 17 00:00:00 2001 |
324 |
-From: Explorer09 <explorer09@×××××.com> |
325 |
-Date: Sat, 24 Feb 2018 11:57:18 +0800 |
326 |
-Subject: [PATCH] Fix build failure ('major' undefined) in glibc 2.28. |
327 |
- |
328 |
-glibc 2.28 no longer defines 'major' and 'minor' in <sys/types.h> and |
329 |
-requires us to include <sys/sysmacros.h>. (glibc 2.25 starts |
330 |
-deprecating the macros in <sys/types.h>.) Now do include the latter if |
331 |
-found on the system. |
332 |
- |
333 |
-At the moment, let's also utilize AC_HEADER_MAJOR in configure script. |
334 |
-However as Autoconf 2.69 has not yet updated the AC_HEADER_MAJOR macro |
335 |
-to reflect the glibc change [1], so add a workaround code. |
336 |
- |
337 |
-Fixes #663. Supersedes pull request #729. |
338 |
- |
339 |
-Reference: |
340 |
-[1] https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=e17a30e987d7ee695fb4294a82d987ec3dc9b974 |
341 |
- |
342 |
-Signed-off-by: Kang-Che Sung <explorer09@×××××.com> |
343 |
---- |
344 |
- Process.c | 6 ++++++ |
345 |
- configure.ac | 10 ++++++++++ |
346 |
- linux/LinuxProcessList.c | 6 ++++++ |
347 |
- 3 files changed, 22 insertions(+) |
348 |
- |
349 |
-diff --git a/Process.c b/Process.c |
350 |
-index 2ff778df..845ca54b 100644 |
351 |
---- a/Process.c |
352 |
-+++ b/Process.c |
353 |
-@@ -28,6 +28,12 @@ in the source distribution for its full text. |
354 |
- #include <time.h> |
355 |
- #include <assert.h> |
356 |
- #include <math.h> |
357 |
-+#ifdef MAJOR_IN_MKDEV |
358 |
-+#include <sys/mkdev.h> |
359 |
-+#elif defined(MAJOR_IN_SYSMACROS) || \ |
360 |
-+ (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H) |
361 |
-+#include <sys/sysmacros.h> |
362 |
-+#endif |
363 |
- |
364 |
- #ifdef __ANDROID__ |
365 |
- #define SYS_ioprio_get __NR_ioprio_get |
366 |
-diff --git a/configure.ac b/configure.ac |
367 |
-index 44595050..36aebc5e 100644 |
368 |
---- a/configure.ac |
369 |
-+++ b/configure.ac |
370 |
-@@ -61,6 +61,16 @@ AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h],[ |
371 |
- ]) |
372 |
- AC_CHECK_HEADERS([execinfo.h],[:],[:]) |
373 |
- |
374 |
-+AC_HEADER_MAJOR |
375 |
-+dnl glibc 2.25 deprecates 'major' and 'minor' in <sys/types.h> and requires to |
376 |
-+dnl include <sys/sysmacros.h>. However the logic in AC_HEADER_MAJOR has not yet |
377 |
-+dnl been updated in Autoconf 2.69, so use a workaround: |
378 |
-+m4_version_prereq([2.70], [], |
379 |
-+[if test $ac_cv_header_sys_mkdev_h = no; then |
380 |
-+ AC_CHECK_HEADER(sys/sysmacros.h, [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, |
381 |
-+ [Define to 1 if `major', `minor', and `makedev' are declared in <sys/sysmacros.h>.])]) |
382 |
-+fi]) |
383 |
-+ |
384 |
- # Checks for typedefs, structures, and compiler characteristics. |
385 |
- # ---------------------------------------------------------------------- |
386 |
- AC_HEADER_STDBOOL |
387 |
-diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c |
388 |
-index c8ba89d2..158a7ea2 100644 |
389 |
---- a/linux/LinuxProcessList.c |
390 |
-+++ b/linux/LinuxProcessList.c |
391 |
-@@ -26,6 +26,12 @@ in the source distribution for its full text. |
392 |
- #include <assert.h> |
393 |
- #include <sys/types.h> |
394 |
- #include <fcntl.h> |
395 |
-+#ifdef MAJOR_IN_MKDEV |
396 |
-+#include <sys/mkdev.h> |
397 |
-+#elif defined(MAJOR_IN_SYSMACROS) || \ |
398 |
-+ (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H) |
399 |
-+#include <sys/sysmacros.h> |
400 |
-+#endif |
401 |
- |
402 |
- #ifdef HAVE_DELAYACCT |
403 |
- #include <netlink/attr.h> |
404 |
|
405 |
diff --git a/sys-process/htop/htop-2.1.0-r1.ebuild b/sys-process/htop/htop-2.1.0-r1.ebuild |
406 |
deleted file mode 100644 |
407 |
index c0f863a1c76..00000000000 |
408 |
--- a/sys-process/htop/htop-2.1.0-r1.ebuild |
409 |
+++ /dev/null |
410 |
@@ -1,76 +0,0 @@ |
411 |
-# Copyright 1999-2018 Gentoo Foundation |
412 |
-# Distributed under the terms of the GNU General Public License v2 |
413 |
- |
414 |
-EAPI=6 |
415 |
- |
416 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
417 |
- |
418 |
-inherit autotools linux-info python-single-r1 |
419 |
- |
420 |
-DESCRIPTION="interactive process viewer" |
421 |
-HOMEPAGE="https://hisham.hm/htop/" |
422 |
-SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz" |
423 |
- |
424 |
-LICENSE="BSD GPL-2" |
425 |
-SLOT="0" |
426 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos" |
427 |
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver" |
428 |
- |
429 |
-RDEPEND="sys-libs/ncurses:0=[unicode?]" |
430 |
-DEPEND="${RDEPEND} |
431 |
- ${PYTHON_DEPS} |
432 |
- virtual/pkgconfig" |
433 |
- |
434 |
-REQUIRED_USE=${PYTHON_REQUIRED_USE} |
435 |
- |
436 |
-DOCS=( ChangeLog README ) |
437 |
- |
438 |
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" |
439 |
- |
440 |
-PATCHES=( |
441 |
- |
442 |
- # Fixes from upstream (can usually be removed with next version bump) |
443 |
- "${FILESDIR}/${P}-sysmacros.patch" |
444 |
- "${FILESDIR}/${P}-ldflags.patch" |
445 |
- "${FILESDIR}/${P}-bashisms.patch" |
446 |
- "${FILESDIR}/${P}-ncurses_cflags.patch" |
447 |
- "${FILESDIR}/${P}-clear_on_sigwinch.patch" |
448 |
- "${FILESDIR}/${P}-header_updates.patch" |
449 |
- "${FILESDIR}/${P}-color_issues.patch" |
450 |
-) |
451 |
- |
452 |
-pkg_setup() { |
453 |
- if ! has_version sys-process/lsof; then |
454 |
- ewarn "To use lsof features in htop(what processes are accessing" |
455 |
- ewarn "what files), you must have sys-process/lsof installed." |
456 |
- fi |
457 |
- |
458 |
- python-single-r1_pkg_setup |
459 |
- linux-info_pkg_setup |
460 |
-} |
461 |
- |
462 |
-src_prepare() { |
463 |
- rm missing || die |
464 |
- |
465 |
- default |
466 |
- use python_single_target_python2_7 || \ |
467 |
- eapply "${FILESDIR}/${PN}-2.1.0-MakeHeader-python3.patch" #646880 |
468 |
- eautoreconf |
469 |
- python_fix_shebang scripts/MakeHeader.py |
470 |
-} |
471 |
- |
472 |
-src_configure() { |
473 |
- [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 |
474 |
- |
475 |
- local myeconfargs=( |
476 |
- # fails to build against recent hwloc versions |
477 |
- --disable-hwloc |
478 |
- --enable-taskstats |
479 |
- $(use_enable kernel_linux cgroup) |
480 |
- $(use_enable kernel_linux linux-affinity) |
481 |
- $(use_enable openvz) |
482 |
- $(use_enable unicode) |
483 |
- $(use_enable vserver) |
484 |
- ) |
485 |
- econf ${myeconfargs[@]} |
486 |
-} |