1 |
commit: 20d5319d31378762c32b0b2344e24f37ffbaccd2 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 29 08:51:25 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 29 09:07:52 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d5319d |
7 |
|
8 |
sys-process/htop: use release tarball |
9 |
|
10 |
Closes: https://bugs.gentoo.org/849422 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
sys-process/htop/Manifest | 1 + |
14 |
.../{htop-9999.ebuild => htop-3.2.1-r1.ebuild} | 42 +++++++++------------- |
15 |
sys-process/htop/htop-9999.ebuild | 42 +++++++++------------- |
16 |
3 files changed, 35 insertions(+), 50 deletions(-) |
17 |
|
18 |
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest |
19 |
index bf26ca15fa8c..a84a0344d1f4 100644 |
20 |
--- a/sys-process/htop/Manifest |
21 |
+++ b/sys-process/htop/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
DIST htop-3.1.2.tar.gz 387656 BLAKE2B a9682b6f3475fbae6ab7fd57330271190ec32267c5a8f2aac845cd18c566eaa9beed642c1e67fbc9606f120df600c27ed2ef0480a29ef304875a99898c1f10e4 SHA512 7e08b820042e480ca61137ff24b468804b49b95c1bbedaf82029dd79d29c2c541c5211284ec075692203788bbb868a9d4326ffd24c68419e22eec13ae5012700 |
24 |
DIST htop-3.2.0.tar.gz 393712 BLAKE2B fff50fce1dd58d5738ca4a75a8b4078aa34e9544798c81bb18a2674823ab13a93ecec8c00d034704ecaab6a871efa2b021550dc1f0a03aa86f638c28e84f769e SHA512 174eaa7333fa60e40f67148560c53125e7aaf46a48e7f3ecfa2daa68553c94b3d076d03320afd479dcee07e739c0ff286a81b67cbc994782c33e798d3ed4605c |
25 |
DIST htop-3.2.1.tar.gz 397632 BLAKE2B 301bc421b3ff8136a70603c523dd719d38703288114712a6e178c1a348b1bc9b9d578cdf3cf8fe99a9bcd2d5721cd2a10caeeeb4614b24c4f20a8e103c37d236 SHA512 d7b76e28ee870ac572ba1d9606dec6f9475346a00e599ca15838017c97683f1fc1be40417b9c1e76128cacc8a60ff9ba88c6b237be1835d309f98329b25644fc |
26 |
+DIST htop-3.2.1.tar.xz 406048 BLAKE2B 7addefca7de8f0867220e6415f4585f7e6ecf655d6245e4a8e120552ac738544fde1c2d8e24ce1139209caad23994316e8be9611f6ed0253d60547158d17ff24 SHA512 f412c10ebdec4fb026fb93a79a9b0b84612ad5a0d28e37f06713e6c895f70e92cbd09a8737d04f3d51102295d7a419eb2c3ec3907b96f553fda8ff3d1a2142b6 |
27 |
|
28 |
diff --git a/sys-process/htop/htop-9999.ebuild b/sys-process/htop/htop-3.2.1-r1.ebuild |
29 |
similarity index 73% |
30 |
copy from sys-process/htop/htop-9999.ebuild |
31 |
copy to sys-process/htop/htop-3.2.1-r1.ebuild |
32 |
index f8aa53177141..76b7ce3cb327 100644 |
33 |
--- a/sys-process/htop/htop-9999.ebuild |
34 |
+++ b/sys-process/htop/htop-3.2.1-r1.ebuild |
35 |
@@ -3,25 +3,26 @@ |
36 |
|
37 |
EAPI=8 |
38 |
|
39 |
-PYTHON_COMPAT=( python3_{8..10} ) |
40 |
+PYTHON_COMPAT=( python3_{8..11} ) |
41 |
|
42 |
-inherit autotools fcaps linux-info python-any-r1 xdg-utils |
43 |
+inherit linux-info optfeature python-any-r1 xdg |
44 |
|
45 |
DESCRIPTION="interactive process viewer" |
46 |
HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop" |
47 |
if [[ ${PV} == *9999 ]] ; then |
48 |
- inherit git-r3 |
49 |
EGIT_REPO_URI="https://github.com/htop-dev/htop.git" |
50 |
+ inherit autotools git-r3 |
51 |
else |
52 |
- SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz" |
53 |
+ SRC_URI="https://github.com/htop-dev/htop/releases/download/${PV}/${P}.tar.xz" |
54 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" |
55 |
fi |
56 |
|
57 |
+S="${WORKDIR}/${P/_}" |
58 |
+ |
59 |
LICENSE="BSD GPL-2+" |
60 |
SLOT="0" |
61 |
IUSE="caps debug delayacct hwloc lm-sensors llvm-libunwind openvz unicode unwind vserver" |
62 |
|
63 |
-BDEPEND="virtual/pkgconfig" |
64 |
RDEPEND=" |
65 |
sys-libs/ncurses:=[unicode(+)?] |
66 |
hwloc? ( sys-apps/hwloc:= ) |
67 |
@@ -35,21 +36,15 @@ RDEPEND=" |
68 |
lm-sensors? ( sys-apps/lm-sensors ) |
69 |
) |
70 |
" |
71 |
-DEPEND="${RDEPEND} |
72 |
- ${PYTHON_DEPS}" |
73 |
+DEPEND="${RDEPEND}" |
74 |
+BDEPEND="${PYTHON_DEPS} |
75 |
+ virtual/pkgconfig" |
76 |
|
77 |
DOCS=( ChangeLog README ) |
78 |
|
79 |
CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" |
80 |
|
81 |
-S="${WORKDIR}/${P/_}" |
82 |
- |
83 |
pkg_setup() { |
84 |
- if ! has_version sys-process/lsof ; then |
85 |
- ewarn "To use lsof features in htop (what processes are accessing" |
86 |
- ewarn "what files), you must have sys-process/lsof installed." |
87 |
- fi |
88 |
- |
89 |
python-any-r1_pkg_setup |
90 |
linux-info_pkg_setup |
91 |
} |
92 |
@@ -57,12 +52,15 @@ pkg_setup() { |
93 |
src_prepare() { |
94 |
default |
95 |
|
96 |
- eautoreconf |
97 |
+ if [[ ${PV} == 9999 ]] ; then |
98 |
+ eautoreconf |
99 |
+ fi |
100 |
} |
101 |
|
102 |
src_configure() { |
103 |
if [[ ${CBUILD} != ${CHOST} ]] ; then |
104 |
- export ac_cv_file__proc_{meminfo,stat}=yes #328971 |
105 |
+ # bug #328971 |
106 |
+ export ac_cv_file__proc_{meminfo,stat}=yes |
107 |
fi |
108 |
|
109 |
local myeconfargs=( |
110 |
@@ -97,17 +95,11 @@ src_configure() { |
111 |
) |
112 |
fi |
113 |
|
114 |
- econf ${myeconfargs[@]} |
115 |
+ econf "${myeconfargs[@]}" |
116 |
} |
117 |
|
118 |
pkg_postinst() { |
119 |
- xdg_desktop_database_update |
120 |
- xdg_icon_cache_update |
121 |
- |
122 |
- fcaps cap_sys_ptrace /usr/bin/${PN} |
123 |
-} |
124 |
+ xdg_pkg_postinst |
125 |
|
126 |
-pkg_postrm() { |
127 |
- xdg_desktop_database_update |
128 |
- xdg_icon_cache_update |
129 |
+ optfeature "Viewing processes accessing certain files" sys-process/lsof |
130 |
} |
131 |
|
132 |
diff --git a/sys-process/htop/htop-9999.ebuild b/sys-process/htop/htop-9999.ebuild |
133 |
index f8aa53177141..76b7ce3cb327 100644 |
134 |
--- a/sys-process/htop/htop-9999.ebuild |
135 |
+++ b/sys-process/htop/htop-9999.ebuild |
136 |
@@ -3,25 +3,26 @@ |
137 |
|
138 |
EAPI=8 |
139 |
|
140 |
-PYTHON_COMPAT=( python3_{8..10} ) |
141 |
+PYTHON_COMPAT=( python3_{8..11} ) |
142 |
|
143 |
-inherit autotools fcaps linux-info python-any-r1 xdg-utils |
144 |
+inherit linux-info optfeature python-any-r1 xdg |
145 |
|
146 |
DESCRIPTION="interactive process viewer" |
147 |
HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop" |
148 |
if [[ ${PV} == *9999 ]] ; then |
149 |
- inherit git-r3 |
150 |
EGIT_REPO_URI="https://github.com/htop-dev/htop.git" |
151 |
+ inherit autotools git-r3 |
152 |
else |
153 |
- SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz" |
154 |
+ SRC_URI="https://github.com/htop-dev/htop/releases/download/${PV}/${P}.tar.xz" |
155 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" |
156 |
fi |
157 |
|
158 |
+S="${WORKDIR}/${P/_}" |
159 |
+ |
160 |
LICENSE="BSD GPL-2+" |
161 |
SLOT="0" |
162 |
IUSE="caps debug delayacct hwloc lm-sensors llvm-libunwind openvz unicode unwind vserver" |
163 |
|
164 |
-BDEPEND="virtual/pkgconfig" |
165 |
RDEPEND=" |
166 |
sys-libs/ncurses:=[unicode(+)?] |
167 |
hwloc? ( sys-apps/hwloc:= ) |
168 |
@@ -35,21 +36,15 @@ RDEPEND=" |
169 |
lm-sensors? ( sys-apps/lm-sensors ) |
170 |
) |
171 |
" |
172 |
-DEPEND="${RDEPEND} |
173 |
- ${PYTHON_DEPS}" |
174 |
+DEPEND="${RDEPEND}" |
175 |
+BDEPEND="${PYTHON_DEPS} |
176 |
+ virtual/pkgconfig" |
177 |
|
178 |
DOCS=( ChangeLog README ) |
179 |
|
180 |
CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" |
181 |
|
182 |
-S="${WORKDIR}/${P/_}" |
183 |
- |
184 |
pkg_setup() { |
185 |
- if ! has_version sys-process/lsof ; then |
186 |
- ewarn "To use lsof features in htop (what processes are accessing" |
187 |
- ewarn "what files), you must have sys-process/lsof installed." |
188 |
- fi |
189 |
- |
190 |
python-any-r1_pkg_setup |
191 |
linux-info_pkg_setup |
192 |
} |
193 |
@@ -57,12 +52,15 @@ pkg_setup() { |
194 |
src_prepare() { |
195 |
default |
196 |
|
197 |
- eautoreconf |
198 |
+ if [[ ${PV} == 9999 ]] ; then |
199 |
+ eautoreconf |
200 |
+ fi |
201 |
} |
202 |
|
203 |
src_configure() { |
204 |
if [[ ${CBUILD} != ${CHOST} ]] ; then |
205 |
- export ac_cv_file__proc_{meminfo,stat}=yes #328971 |
206 |
+ # bug #328971 |
207 |
+ export ac_cv_file__proc_{meminfo,stat}=yes |
208 |
fi |
209 |
|
210 |
local myeconfargs=( |
211 |
@@ -97,17 +95,11 @@ src_configure() { |
212 |
) |
213 |
fi |
214 |
|
215 |
- econf ${myeconfargs[@]} |
216 |
+ econf "${myeconfargs[@]}" |
217 |
} |
218 |
|
219 |
pkg_postinst() { |
220 |
- xdg_desktop_database_update |
221 |
- xdg_icon_cache_update |
222 |
- |
223 |
- fcaps cap_sys_ptrace /usr/bin/${PN} |
224 |
-} |
225 |
+ xdg_pkg_postinst |
226 |
|
227 |
-pkg_postrm() { |
228 |
- xdg_desktop_database_update |
229 |
- xdg_icon_cache_update |
230 |
+ optfeature "Viewing processes accessing certain files" sys-process/lsof |
231 |
} |