1 |
commit: 31400e1313739f5aec35d7582dc643abf783f714 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 27 11:47:46 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 27 11:48:15 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31400e13 |
7 |
|
8 |
sys-process/htop: drop old |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
sys-process/htop/Manifest | 1 - |
14 |
.../htop/files/htop-3.0.0_beta5-gcc-10.patch | 52 ---------------- |
15 |
sys-process/htop/htop-3.0.0_beta5.ebuild | 72 ---------------------- |
16 |
3 files changed, 125 deletions(-) |
17 |
|
18 |
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest |
19 |
index 9498c38b03f..eb502eadccb 100644 |
20 |
--- a/sys-process/htop/Manifest |
21 |
+++ b/sys-process/htop/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e |
24 |
DIST htop-3.0.0.tar.gz 179371 BLAKE2B 7501d8277eb97e39f7a8e2e9191bdde97deca6f3240a3e497ce55e71b0659122223356d4ff03086f9303b82ea4de0fa4e7909baca6de063ac6b22d7b6530f9be SHA512 36dc37b416b9917005007448fe73fdd6475a3f7f8442a083923d3f5dfb706d0f1731255522a99b67cc547b239acb1c68b144f8d600e243eeba160b2a43e8339a |
25 |
-DIST htop-3.0.0_beta5.tar.gz 175780 BLAKE2B f7d03485e74387c656e5a576f0a53c832bac668cee79750402335b2051a17d405392b99316f1546cc76fa83dc3bc85055ca58b928225df0e162ffdb9c1889a5f SHA512 eaa04a278257a1447cd60825083c864d3c23a4a5607447ce05356d550f42ff68a810f14bf91314b7266f9741aab8141d67d98316a31fa7806fb6b858cc804344 |
26 |
|
27 |
diff --git a/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch b/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch |
28 |
deleted file mode 100644 |
29 |
index 6a2004b3cf7..00000000000 |
30 |
--- a/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch |
31 |
+++ /dev/null |
32 |
@@ -1,52 +0,0 @@ |
33 |
-From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001 |
34 |
-From: David Seifert <soap@g.o> |
35 |
-Date: Thu, 23 Jan 2020 17:27:10 +0100 |
36 |
-Subject: [PATCH] Fix GCC 10 switch to `-fno-common` default |
37 |
- |
38 |
---- |
39 |
- CRT.h | 6 +++--- |
40 |
- linux/LinuxProcess.h | 2 +- |
41 |
- 2 files changed, 4 insertions(+), 4 deletions(-) |
42 |
- |
43 |
-diff --git a/CRT.h b/CRT.h |
44 |
-index 933fe068..65998ac6 100644 |
45 |
---- a/CRT.h |
46 |
-+++ b/CRT.h |
47 |
-@@ -140,7 +140,7 @@ extern const char **CRT_treeStr; |
48 |
- |
49 |
- extern int CRT_delay; |
50 |
- |
51 |
--int* CRT_colors; |
52 |
-+extern int* CRT_colors; |
53 |
- |
54 |
- extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT]; |
55 |
- |
56 |
-@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount; |
57 |
- |
58 |
- extern int CRT_scrollWheelVAmount; |
59 |
- |
60 |
--char* CRT_termType; |
61 |
-+extern char* CRT_termType; |
62 |
- |
63 |
- // TODO move color scheme to Settings, perhaps? |
64 |
- |
65 |
- extern int CRT_colorScheme; |
66 |
- |
67 |
--void *backtraceArray[128]; |
68 |
-+extern void *backtraceArray[128]; |
69 |
- |
70 |
- #if HAVE_SETUID_ENABLED |
71 |
- |
72 |
-diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h |
73 |
-index 6ce3037d..cbd77be9 100644 |
74 |
---- a/linux/LinuxProcess.h |
75 |
-+++ b/linux/LinuxProcess.h |
76 |
-@@ -144,7 +144,7 @@ typedef struct LinuxProcess_ { |
77 |
- #endif |
78 |
- |
79 |
- |
80 |
--long long btime; /* semi-global */ |
81 |
-+extern long long btime; /* semi-global */ |
82 |
- |
83 |
- extern ProcessFieldData Process_fields[]; |
84 |
- |
85 |
|
86 |
diff --git a/sys-process/htop/htop-3.0.0_beta5.ebuild b/sys-process/htop/htop-3.0.0_beta5.ebuild |
87 |
deleted file mode 100644 |
88 |
index 241e898507e..00000000000 |
89 |
--- a/sys-process/htop/htop-3.0.0_beta5.ebuild |
90 |
+++ /dev/null |
91 |
@@ -1,72 +0,0 @@ |
92 |
-# Copyright 1999-2020 Gentoo Authors |
93 |
-# Distributed under the terms of the GNU General Public License v2 |
94 |
- |
95 |
-EAPI=7 |
96 |
- |
97 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
98 |
- |
99 |
-inherit autotools linux-info python-any-r1 |
100 |
- |
101 |
-DESCRIPTION="interactive process viewer" |
102 |
-HOMEPAGE="https://hisham.hm/htop/" |
103 |
-if [[ "${PV}" = *_beta* ]] ; then |
104 |
- SRC_URI="https://github.com/hishamhm/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz" |
105 |
- S="${WORKDIR}/${P/_}" |
106 |
-else |
107 |
- SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz" |
108 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" |
109 |
-fi |
110 |
-LICENSE="BSD GPL-2" |
111 |
-SLOT="0" |
112 |
-IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver" |
113 |
- |
114 |
-RDEPEND="sys-libs/ncurses:0=[unicode?]" |
115 |
-DEPEND="${RDEPEND} |
116 |
- ${PYTHON_DEPS}" |
117 |
-BDEPEND="virtual/pkgconfig" |
118 |
- |
119 |
-DOCS=( ChangeLog README ) |
120 |
- |
121 |
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" |
122 |
- |
123 |
-PATCHES=( |
124 |
- # Fixes from upstream (can usually be removed with next version bump) |
125 |
- "${FILESDIR}"/${PN}-2.1.0-header_updates.patch |
126 |
- "${FILESDIR}"/${PN}-3.0.0_beta5-gcc-10.patch |
127 |
-) |
128 |
- |
129 |
-pkg_setup() { |
130 |
- if ! has_version sys-process/lsof; then |
131 |
- ewarn "To use lsof features in htop (what processes are accessing" |
132 |
- ewarn "what files), you must have sys-process/lsof installed." |
133 |
- fi |
134 |
- |
135 |
- python-any-r1_pkg_setup |
136 |
- linux-info_pkg_setup |
137 |
-} |
138 |
- |
139 |
-src_prepare() { |
140 |
- if [[ "${PV}" != *_beta* ]] ; then |
141 |
- rm missing || die |
142 |
- fi |
143 |
- |
144 |
- default |
145 |
- eautoreconf |
146 |
- python_fix_shebang scripts/MakeHeader.py |
147 |
-} |
148 |
- |
149 |
-src_configure() { |
150 |
- [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 |
151 |
- |
152 |
- local myeconfargs=( |
153 |
- # fails to build against recent hwloc versions |
154 |
- --disable-hwloc |
155 |
- --enable-taskstats |
156 |
- $(use_enable kernel_linux cgroup) |
157 |
- $(use_enable kernel_linux linux-affinity) |
158 |
- $(use_enable openvz) |
159 |
- $(use_enable unicode) |
160 |
- $(use_enable vserver) |
161 |
- ) |
162 |
- econf ${myeconfargs[@]} |
163 |
-} |