Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/files/, sys-process/htop/
Date: Tue, 22 Dec 2020 11:43:50
Message-Id: 1608637422.b2562fdf3e3487a4df4ad99869a49950d89a6353.polynomial-c@gentoo
1 commit: b2562fdf3e3487a4df4ad99869a49950d89a6353
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 22 11:43:22 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 22 11:43:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2562fdf
7
8 sys-process/htop: Removed old
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-process/htop/Manifest | 2 -
14 sys-process/htop/files/htop-2.2.0-gcc-10.patch | 27 ------------
15 sys-process/htop/htop-2.2.0.ebuild | 61 --------------------------
16 sys-process/htop/htop-3.0.1.ebuild | 60 -------------------------
17 4 files changed, 150 deletions(-)
18
19 diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
20 index bb6f3155610..b1210f530c5 100644
21 --- a/sys-process/htop/Manifest
22 +++ b/sys-process/htop/Manifest
23 @@ -1,5 +1,3 @@
24 -DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
25 -DIST htop-3.0.1.tar.gz 179925 BLAKE2B d722bc49d7b546aec1359a5dc838e0f6cc4b17f8d2d2c59fd7fbeaf827233f658ea819f4c69832af5cfd4f836d3d66c223a9580037cf8d6d2ae28c6a6b3499b5 SHA512 0d6a1b0839a94f01429c85a459b0c6439051d1b6e69bf77c6b3bb31c81902a3127936ab9adc5bf1807f4b3d7b10a177a89fb9b883931f8dcf828ed06727d6945
26 DIST htop-3.0.2.tar.gz 176132 BLAKE2B 9abc28461d346eeac7f9741bc1ba08c898d00be013abce972be4370b9b35d92661fcb4521fa715bc779c1c9b56bc3c0eeb5375c0df8ec7585df3774ac67ca504 SHA512 5b578972e40e3229aa8b2bdc931c4c8bceaafd2a150b02e0257ab35a4fbac25852e959ecc472bd6747be57ea8734b59cc4b872a5ac829624cc80e1722c54d868
27 DIST htop-3.0.3.tar.gz 292925 BLAKE2B 7e227188e3954c0cb273b4bc95eaf2e11237daca3d929d4674dcdfc987c4af26e4b08da2b0f184d6d3e06952dee5704e468bf4b7bc03dfa0b6602c058beac495 SHA512 208eff95a0df3ab38f5e3175bb34420c8833ad630c797825a3fb188a1111476a3287aa5f53511c83da90d181afc3e6ea246ea01fbc3227466c5c928a5d70badc
28 DIST htop-3.0.4.tar.gz 296224 BLAKE2B b8fc4fe7c595f0a22b253f1eeea24d571c87401a426b8f6dba0ce15d98ea77ca94bc286428386cbf478f0e7ea4afde0e86e5e6b93bb88af616ba474e45e745f5 SHA512 d57e4fd326791bd2306f4a6ce2c4f4bf0499a0050efbaeb71a211148fa52993f707d8afdf0292dc26234cffdcba84a97e1d4422bc61aec40ba3ef9ebd91ebf6c
29
30 diff --git a/sys-process/htop/files/htop-2.2.0-gcc-10.patch b/sys-process/htop/files/htop-2.2.0-gcc-10.patch
31 deleted file mode 100644
32 index dc49b0bb850..00000000000
33 --- a/sys-process/htop/files/htop-2.2.0-gcc-10.patch
34 +++ /dev/null
35 @@ -1,27 +0,0 @@
36 ---- a/CRT.h
37 -+++ b/CRT.h
38 -@@ -140,7 +140,7 @@ extern const char **CRT_treeStr;
39 -
40 - extern int CRT_delay;
41 -
42 --int* CRT_colors;
43 -+extern int* CRT_colors;
44 -
45 - extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
46 -
47 -@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount;
48 -
49 - extern int CRT_scrollWheelVAmount;
50 -
51 --char* CRT_termType;
52 -+extern char* CRT_termType;
53 -
54 - // TODO move color scheme to Settings, perhaps?
55 -
56 - extern int CRT_colorScheme;
57 -
58 --void *backtraceArray[128];
59 -+extern void *backtraceArray[128];
60 -
61 - #if HAVE_SETUID_ENABLED
62 -
63
64 diff --git a/sys-process/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
65 deleted file mode 100644
66 index fa7b79e33e2..00000000000
67 --- a/sys-process/htop/htop-2.2.0.ebuild
68 +++ /dev/null
69 @@ -1,61 +0,0 @@
70 -# Copyright 1999-2020 Gentoo Authors
71 -# Distributed under the terms of the GNU General Public License v2
72 -
73 -EAPI=6
74 -
75 -PYTHON_COMPAT=( python3_{6,7,8} )
76 -
77 -inherit linux-info python-any-r1
78 -
79 -DESCRIPTION="interactive process viewer"
80 -HOMEPAGE="https://hisham.hm/htop/"
81 -SRC_URI="https://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
82 -
83 -LICENSE="BSD GPL-2"
84 -SLOT="0"
85 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
86 -IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
87 -
88 -RDEPEND="sys-libs/ncurses:0=[unicode?]"
89 -DEPEND="${RDEPEND}
90 - ${PYTHON_DEPS}
91 - virtual/pkgconfig"
92 -
93 -PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
94 -DOCS=( ChangeLog README )
95 -
96 -CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
97 -
98 -pkg_setup() {
99 - if ! has_version sys-process/lsof; then
100 - ewarn "To use lsof features in htop(what processes are accessing"
101 - ewarn "what files), you must have sys-process/lsof installed."
102 - fi
103 -
104 - python-any-r1_pkg_setup
105 - linux-info_pkg_setup
106 -}
107 -
108 -src_prepare() {
109 - rm missing || die
110 -
111 - default
112 -
113 - python_fix_shebang scripts/MakeHeader.py
114 -}
115 -
116 -src_configure() {
117 - [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
118 -
119 - local myeconfargs=(
120 - # fails to build against recent hwloc versions
121 - --disable-hwloc
122 - --enable-taskstats
123 - $(use_enable kernel_linux cgroup)
124 - $(use_enable kernel_linux linux-affinity)
125 - $(use_enable openvz)
126 - $(use_enable unicode)
127 - $(use_enable vserver)
128 - )
129 - econf ${myeconfargs[@]}
130 -}
131
132 diff --git a/sys-process/htop/htop-3.0.1.ebuild b/sys-process/htop/htop-3.0.1.ebuild
133 deleted file mode 100644
134 index eacb7a88db2..00000000000
135 --- a/sys-process/htop/htop-3.0.1.ebuild
136 +++ /dev/null
137 @@ -1,60 +0,0 @@
138 -# Copyright 1999-2020 Gentoo Authors
139 -# Distributed under the terms of the GNU General Public License v2
140 -
141 -EAPI=7
142 -
143 -PYTHON_COMPAT=( python3_{6,7,8} )
144 -
145 -inherit autotools linux-info python-any-r1
146 -
147 -DESCRIPTION="interactive process viewer"
148 -HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
149 -SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
150 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
151 -
152 -LICENSE="BSD GPL-2"
153 -SLOT="0"
154 -IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
155 -
156 -BDEPEND="virtual/pkgconfig"
157 -RDEPEND="sys-libs/ncurses:0=[unicode?]"
158 -DEPEND="${RDEPEND}
159 - ${PYTHON_DEPS}"
160 -
161 -DOCS=( ChangeLog README )
162 -
163 -CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
164 -
165 -PATCHES=()
166 -
167 -pkg_setup() {
168 - if ! has_version sys-process/lsof; then
169 - ewarn "To use lsof features in htop (what processes are accessing"
170 - ewarn "what files), you must have sys-process/lsof installed."
171 - fi
172 -
173 - python-any-r1_pkg_setup
174 - linux-info_pkg_setup
175 -}
176 -
177 -src_prepare() {
178 - default
179 -
180 - eautoreconf
181 -}
182 -
183 -src_configure() {
184 - [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
185 -
186 - local myeconfargs=(
187 - # fails to build against recent hwloc versions
188 - --disable-hwloc
189 - --enable-taskstats
190 - $(use_enable kernel_linux cgroup)
191 - $(use_enable kernel_linux linux-affinity)
192 - $(use_enable openvz)
193 - $(use_enable unicode)
194 - $(use_enable vserver)
195 - )
196 - econf ${myeconfargs[@]}
197 -}