1 |
commit: ec16067bb1ed0297ce5d38698df511c7d30c4ebb |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 29 14:30:06 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 29 14:31:42 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec16067b |
7 |
|
8 |
sys-process/htop: Removed old |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
|
12 |
sys-process/htop/Manifest | 2 - |
13 |
sys-process/htop/files/htop-3.0.3-tinfo.patch | 38 ----- |
14 |
.../htop-3.0.4-sort_column_header_highlight.patch | 153 --------------------- |
15 |
sys-process/htop/htop-3.0.2-r1.ebuild | 62 --------- |
16 |
sys-process/htop/htop-3.0.4-r2.ebuild | 71 ---------- |
17 |
5 files changed, 326 deletions(-) |
18 |
|
19 |
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest |
20 |
index dc292c95277..847ac7b4faa 100644 |
21 |
--- a/sys-process/htop/Manifest |
22 |
+++ b/sys-process/htop/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST htop-3.0.2.tar.gz 176132 BLAKE2B 9abc28461d346eeac7f9741bc1ba08c898d00be013abce972be4370b9b35d92661fcb4521fa715bc779c1c9b56bc3c0eeb5375c0df8ec7585df3774ac67ca504 SHA512 5b578972e40e3229aa8b2bdc931c4c8bceaafd2a150b02e0257ab35a4fbac25852e959ecc472bd6747be57ea8734b59cc4b872a5ac829624cc80e1722c54d868 |
25 |
-DIST htop-3.0.4.tar.gz 296224 BLAKE2B b8fc4fe7c595f0a22b253f1eeea24d571c87401a426b8f6dba0ce15d98ea77ca94bc286428386cbf478f0e7ea4afde0e86e5e6b93bb88af616ba474e45e745f5 SHA512 d57e4fd326791bd2306f4a6ce2c4f4bf0499a0050efbaeb71a211148fa52993f707d8afdf0292dc26234cffdcba84a97e1d4422bc61aec40ba3ef9ebd91ebf6c |
26 |
DIST htop-3.0.5.tar.gz 297931 BLAKE2B a6e62f99ef349809d11bb14b4d515036601aa457507b34a96354607f136cc4e0d3d40a715f1576c70833db051d989fa55142b4f8bba0f5f432ea3676364d9575 SHA512 7dae83ceff6b3f30e69c30c9559dbb3bf69281df006c6a26e4e2c49dd5a147e05ed7bafeeac8ec5bedc8ba670470100cc128209a92654858f98df09a9394594f |
27 |
DIST htop-3.1.0_rc1.tar.gz 378045 BLAKE2B 65d5f2bdb6e41fb0a4edd76c62a36e951bd86a67ebb9908ca712b2ee7b5f9714c3fe5cd4193885b869b96dcd73bbf945ab22fcd31aa11d90598f9d9953ed4b0e SHA512 f917dbb8ba0de1a9f703423c13cec19f0f69da765df320739eeabf0e928495ec70cdd8eb0cca2871226cd6b472a713ee5ebc43aefa02b2ffbd6c29b1208f5cad |
28 |
|
29 |
diff --git a/sys-process/htop/files/htop-3.0.3-tinfo.patch b/sys-process/htop/files/htop-3.0.3-tinfo.patch |
30 |
deleted file mode 100644 |
31 |
index ea65a799ed7..00000000000 |
32 |
--- a/sys-process/htop/files/htop-3.0.3-tinfo.patch |
33 |
+++ /dev/null |
34 |
@@ -1,38 +0,0 @@ |
35 |
-From ead978bce6236a55d75b72e059686766fa708db4 Mon Sep 17 00:00:00 2001 |
36 |
-From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@××××××××××.com> |
37 |
-Date: Mon, 7 Dec 2020 15:30:56 +0100 |
38 |
-Subject: [PATCH] configure: check for additional linker flags for keypad(3) |
39 |
- |
40 |
-Gentoo requires an explicit addition of -ltinfo |
41 |
- |
42 |
-Resolves: https://bugs.gentoo.org/show_bug.cgi?id=690840 |
43 |
---- |
44 |
- configure.ac | 8 ++++++++ |
45 |
- 1 file changed, 8 insertions(+) |
46 |
- |
47 |
-diff --git a/configure.ac b/configure.ac |
48 |
-index 460b16aa..f91d8e92 100644 |
49 |
---- a/configure.ac |
50 |
-+++ b/configure.ac |
51 |
-@@ -217,6 +217,10 @@ if test "x$enable_unicode" = xyes; then |
52 |
- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], |
53 |
- [AC_CHECK_HEADERS([ncurses/curses.h],[:], |
54 |
- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) |
55 |
-+ |
56 |
-+ # check if additional linker flags are needed for keypad(3) |
57 |
-+ # (at this point we already link against a working ncurses library with wide character support) |
58 |
-+ AC_SEARCH_LIBS([keypad], [tinfow tinfo]) |
59 |
- else |
60 |
- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", |
61 |
- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", |
62 |
-@@ -229,6 +233,10 @@ else |
63 |
- [AC_CHECK_HEADERS([ncurses/curses.h],[:], |
64 |
- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], |
65 |
- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) |
66 |
-+ |
67 |
-+ # check if additional linker flags are needed for keypad(3) |
68 |
-+ # (at this point we already link against a working ncurses library) |
69 |
-+ AC_SEARCH_LIBS([keypad], [tinfo]) |
70 |
- fi |
71 |
- |
72 |
- if test "$my_htop_platform" = "freebsd"; then |
73 |
|
74 |
diff --git a/sys-process/htop/files/htop-3.0.4-sort_column_header_highlight.patch b/sys-process/htop/files/htop-3.0.4-sort_column_header_highlight.patch |
75 |
deleted file mode 100644 |
76 |
index a2b6a0d4259..00000000000 |
77 |
--- a/sys-process/htop/files/htop-3.0.4-sort_column_header_highlight.patch |
78 |
+++ /dev/null |
79 |
@@ -1,153 +0,0 @@ |
80 |
-From 86d293125565a15bbd94683080dbc755c5d7edee Mon Sep 17 00:00:00 2001 |
81 |
-From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@××××××××××.com> |
82 |
-Date: Tue, 22 Dec 2020 17:12:38 +0100 |
83 |
-Subject: [PATCH] Restore highlighted header of current sorted process column |
84 |
- |
85 |
---- |
86 |
- MainPanel.c | 10 ++++++++-- |
87 |
- Panel.c | 22 ++++++++++------------ |
88 |
- Panel.h | 6 ++++-- |
89 |
- ScreenManager.c | 2 +- |
90 |
- htop.c | 2 -- |
91 |
- 5 files changed, 23 insertions(+), 19 deletions(-) |
92 |
- |
93 |
-diff --git a/MainPanel.c b/MainPanel.c |
94 |
-index 949138dc..c8a4c059 100644 |
95 |
---- a/MainPanel.c |
96 |
-+++ b/MainPanel.c |
97 |
-@@ -102,7 +102,7 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) { |
98 |
- MainPanel_updateTreeFunctions(this, this->state->settings->treeView); |
99 |
- } |
100 |
- if (reaction & HTOP_UPDATE_PANELHDR) { |
101 |
-- ProcessList_printHeader(this->state->pl, Panel_getHeader(super)); |
102 |
-+ result |= REDRAW; |
103 |
- } |
104 |
- if (reaction & HTOP_REFRESH) { |
105 |
- result |= REFRESH; |
106 |
-@@ -168,13 +168,19 @@ static void MainPanel_drawFunctionBar(Panel* super) { |
107 |
- } |
108 |
- } |
109 |
- |
110 |
-+static void MainPanel_printHeader(Panel* super) { |
111 |
-+ MainPanel* this = (MainPanel*) super; |
112 |
-+ ProcessList_printHeader(this->state->pl, &super->header); |
113 |
-+} |
114 |
-+ |
115 |
- const PanelClass MainPanel_class = { |
116 |
- .super = { |
117 |
- .extends = Class(Panel), |
118 |
- .delete = MainPanel_delete |
119 |
- }, |
120 |
- .eventHandler = MainPanel_eventHandler, |
121 |
-- .drawFunctionBar = MainPanel_drawFunctionBar |
122 |
-+ .drawFunctionBar = MainPanel_drawFunctionBar, |
123 |
-+ .printHeader = MainPanel_printHeader |
124 |
- }; |
125 |
- |
126 |
- MainPanel* MainPanel_new() { |
127 |
-diff --git a/Panel.c b/Panel.c |
128 |
-index b36f1efc..26a0c0ec 100644 |
129 |
---- a/Panel.c |
130 |
-+++ b/Panel.c |
131 |
-@@ -76,13 +76,6 @@ void Panel_setSelectionColor(Panel* this, ColorElements colorId) { |
132 |
- this->selectionColorId = colorId; |
133 |
- } |
134 |
- |
135 |
--RichString* Panel_getHeader(Panel* this) { |
136 |
-- assert (this != NULL); |
137 |
-- |
138 |
-- this->needsRedraw = true; |
139 |
-- return &(this->header); |
140 |
--} |
141 |
-- |
142 |
- inline void Panel_setHeader(Panel* this, const char* header) { |
143 |
- RichString_writeWide(&(this->header), CRT_colors[PANEL_HEADER_FOCUS], header); |
144 |
- this->needsRedraw = true; |
145 |
-@@ -228,15 +221,20 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect |
146 |
- int x = this->x; |
147 |
- int h = this->h; |
148 |
- |
149 |
-+ const int header_attr = focus |
150 |
-+ ? CRT_colors[PANEL_HEADER_FOCUS] |
151 |
-+ : CRT_colors[PANEL_HEADER_UNFOCUS]; |
152 |
-+ if (force_redraw) { |
153 |
-+ if (Panel_printHeaderFn(this)) |
154 |
-+ Panel_printHeader(this); |
155 |
-+ else |
156 |
-+ RichString_setAttr(&this->header, header_attr); |
157 |
-+ } |
158 |
- int headerLen = RichString_sizeVal(this->header); |
159 |
- if (headerLen > 0) { |
160 |
-- int attr = focus |
161 |
-- ? CRT_colors[PANEL_HEADER_FOCUS] |
162 |
-- : CRT_colors[PANEL_HEADER_UNFOCUS]; |
163 |
-- attrset(attr); |
164 |
-+ attrset(header_attr); |
165 |
- mvhline(y, x, ' ', this->w); |
166 |
- if (scrollH < headerLen) { |
167 |
-- RichString_setAttr(&this->header, attr); |
168 |
- RichString_printoffnVal(this->header, y, x, scrollH, |
169 |
- MINIMUM(headerLen - scrollH, this->w)); |
170 |
- } |
171 |
-diff --git a/Panel.h b/Panel.h |
172 |
-index 959c0b78..63659e3c 100644 |
173 |
---- a/Panel.h |
174 |
-+++ b/Panel.h |
175 |
-@@ -37,11 +37,13 @@ typedef enum HandlerResult_ { |
176 |
- |
177 |
- typedef HandlerResult (*Panel_EventHandler)(Panel*, int); |
178 |
- typedef void (*Panel_DrawFunctionBar)(Panel*); |
179 |
-+typedef void (*Panel_PrintHeader)(Panel*); |
180 |
- |
181 |
- typedef struct PanelClass_ { |
182 |
- const ObjectClass super; |
183 |
- const Panel_EventHandler eventHandler; |
184 |
- const Panel_DrawFunctionBar drawFunctionBar; |
185 |
-+ const Panel_PrintHeader printHeader; |
186 |
- } PanelClass; |
187 |
- |
188 |
- #define As_Panel(this_) ((const PanelClass*)((this_)->super.klass)) |
189 |
-@@ -49,6 +51,8 @@ typedef struct PanelClass_ { |
190 |
- #define Panel_eventHandler(this_, ev_) (assert(As_Panel(this_)->eventHandler), As_Panel(this_)->eventHandler((Panel*)(this_), ev_)) |
191 |
- #define Panel_drawFunctionBarFn(this_) As_Panel(this_)->drawFunctionBar |
192 |
- #define Panel_drawFunctionBar(this_) (assert(As_Panel(this_)->drawFunctionBar), As_Panel(this_)->drawFunctionBar((Panel*)(this_))) |
193 |
-+#define Panel_printHeaderFn(this_) As_Panel(this_)->printHeader |
194 |
-+#define Panel_printHeader(this_) (assert(As_Panel(this_)->printHeader), As_Panel(this_)->printHeader((Panel*)(this_))) |
195 |
- |
196 |
- struct Panel_ { |
197 |
- Object super; |
198 |
-@@ -84,8 +88,6 @@ void Panel_done(Panel* this); |
199 |
- |
200 |
- void Panel_setSelectionColor(Panel* this, ColorElements colorId); |
201 |
- |
202 |
--RichString* Panel_getHeader(Panel* this); |
203 |
-- |
204 |
- void Panel_setHeader(Panel* this, const char* header); |
205 |
- |
206 |
- void Panel_move(Panel* this, int x, int y); |
207 |
-diff --git a/ScreenManager.c b/ScreenManager.c |
208 |
-index 57cb564d..4c74e477 100644 |
209 |
---- a/ScreenManager.c |
210 |
-+++ b/ScreenManager.c |
211 |
-@@ -141,7 +141,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) { |
212 |
- |
213 |
- bool timedOut = true; |
214 |
- bool redraw = true; |
215 |
-- bool force_redraw = false; |
216 |
-+ bool force_redraw = true; |
217 |
- bool rescan = false; |
218 |
- int sortTimeout = 0; |
219 |
- int resetSortTimeout = 5; |
220 |
-diff --git a/htop.c b/htop.c |
221 |
-index 4b43ed2a..aa6d9147 100644 |
222 |
---- a/htop.c |
223 |
-+++ b/htop.c |
224 |
-@@ -313,8 +313,6 @@ int main(int argc, char** argv) { |
225 |
- |
226 |
- MainPanel_updateTreeFunctions(panel, settings->treeView); |
227 |
- |
228 |
-- ProcessList_printHeader(pl, Panel_getHeader((Panel*)panel)); |
229 |
-- |
230 |
- State state = { |
231 |
- .settings = settings, |
232 |
- .ut = ut, |
233 |
|
234 |
diff --git a/sys-process/htop/htop-3.0.2-r1.ebuild b/sys-process/htop/htop-3.0.2-r1.ebuild |
235 |
deleted file mode 100644 |
236 |
index 13b5c03ad25..00000000000 |
237 |
--- a/sys-process/htop/htop-3.0.2-r1.ebuild |
238 |
+++ /dev/null |
239 |
@@ -1,62 +0,0 @@ |
240 |
-# Copyright 1999-2021 Gentoo Authors |
241 |
-# Distributed under the terms of the GNU General Public License v2 |
242 |
- |
243 |
-EAPI=7 |
244 |
- |
245 |
-PYTHON_COMPAT=( python3_{7,8} ) |
246 |
- |
247 |
-inherit autotools linux-info python-any-r1 |
248 |
- |
249 |
-DESCRIPTION="interactive process viewer" |
250 |
-HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop" |
251 |
-SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
252 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" |
253 |
- |
254 |
-LICENSE="BSD GPL-2" |
255 |
-SLOT="0" |
256 |
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver" |
257 |
- |
258 |
-BDEPEND="virtual/pkgconfig" |
259 |
-RDEPEND="sys-libs/ncurses:=[unicode(+)?]" |
260 |
-DEPEND="${RDEPEND} |
261 |
- ${PYTHON_DEPS}" |
262 |
- |
263 |
-DOCS=( ChangeLog README ) |
264 |
- |
265 |
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" |
266 |
- |
267 |
-PATCHES=( |
268 |
- "${FILESDIR}/${PN}-3.0.3-tinfo.patch" #690840 |
269 |
-) |
270 |
- |
271 |
-pkg_setup() { |
272 |
- if ! has_version sys-process/lsof; then |
273 |
- ewarn "To use lsof features in htop (what processes are accessing" |
274 |
- ewarn "what files), you must have sys-process/lsof installed." |
275 |
- fi |
276 |
- |
277 |
- python-any-r1_pkg_setup |
278 |
- linux-info_pkg_setup |
279 |
-} |
280 |
- |
281 |
-src_prepare() { |
282 |
- default |
283 |
- |
284 |
- eautoreconf |
285 |
-} |
286 |
- |
287 |
-src_configure() { |
288 |
- [[ ${CBUILD} != ${CHOST} ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 |
289 |
- |
290 |
- local myeconfargs=( |
291 |
- # fails to build against recent hwloc versions |
292 |
- --disable-hwloc |
293 |
- --enable-taskstats |
294 |
- $(use_enable kernel_linux cgroup) |
295 |
- $(use_enable kernel_linux linux-affinity) |
296 |
- $(use_enable openvz) |
297 |
- $(use_enable unicode) |
298 |
- $(use_enable vserver) |
299 |
- ) |
300 |
- econf ${myeconfargs[@]} |
301 |
-} |
302 |
|
303 |
diff --git a/sys-process/htop/htop-3.0.4-r2.ebuild b/sys-process/htop/htop-3.0.4-r2.ebuild |
304 |
deleted file mode 100644 |
305 |
index 65e53029fa2..00000000000 |
306 |
--- a/sys-process/htop/htop-3.0.4-r2.ebuild |
307 |
+++ /dev/null |
308 |
@@ -1,71 +0,0 @@ |
309 |
-# Copyright 1999-2021 Gentoo Authors |
310 |
-# Distributed under the terms of the GNU General Public License v2 |
311 |
- |
312 |
-EAPI=7 |
313 |
- |
314 |
-PYTHON_COMPAT=( python3_{7..9} ) |
315 |
- |
316 |
-inherit autotools linux-info python-any-r1 |
317 |
- |
318 |
-DESCRIPTION="interactive process viewer" |
319 |
-HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop" |
320 |
-SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz" |
321 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" |
322 |
- |
323 |
-LICENSE="BSD GPL-2" |
324 |
-SLOT="0" |
325 |
-IUSE="debug hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver" |
326 |
- |
327 |
-BDEPEND="virtual/pkgconfig" |
328 |
-RDEPEND="sys-libs/ncurses:=[unicode(+)?] |
329 |
- hwloc? ( sys-apps/hwloc ) |
330 |
- lm-sensors? ( sys-apps/lm-sensors )" |
331 |
-DEPEND="${RDEPEND} |
332 |
- ${PYTHON_DEPS}" |
333 |
- |
334 |
-DOCS=( ChangeLog README ) |
335 |
- |
336 |
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" |
337 |
- |
338 |
-S="${WORKDIR}/${P/_}" |
339 |
- |
340 |
-PATCHES=( |
341 |
- "${FILESDIR}/${P}-sort_column_header_highlight.patch" |
342 |
-) |
343 |
- |
344 |
-pkg_setup() { |
345 |
- if ! has_version sys-process/lsof; then |
346 |
- ewarn "To use lsof features in htop (what processes are accessing" |
347 |
- ewarn "what files), you must have sys-process/lsof installed." |
348 |
- fi |
349 |
- |
350 |
- python-any-r1_pkg_setup |
351 |
- linux-info_pkg_setup |
352 |
-} |
353 |
- |
354 |
-src_prepare() { |
355 |
- default |
356 |
- |
357 |
- eautoreconf |
358 |
-} |
359 |
- |
360 |
-src_configure() { |
361 |
- [[ ${CBUILD} != ${CHOST} ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 |
362 |
- |
363 |
- local myeconfargs=( |
364 |
- $(use_enable debug) |
365 |
- $(use_enable hwloc) |
366 |
- $(use_enable openvz) |
367 |
- $(use_enable unicode) |
368 |
- $(use_enable vserver) |
369 |
- $(use_with lm-sensors sensors) |
370 |
- ) |
371 |
- |
372 |
- if ! use hwloc && use kernel_linux ; then |
373 |
- myeconfargs+=( --enable-linux-affinity ) |
374 |
- else |
375 |
- myeconfargs+=( --disable-linux-affinity ) |
376 |
- fi |
377 |
- |
378 |
- econf ${myeconfargs[@]} |
379 |
-} |