1 |
commit: d132a1abba93e343616592e513c0f384c74f8e73 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 5 15:07:49 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 5 15:12:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d132a1ab |
7 |
|
8 |
sys-process/htop: Bump to version 2.1.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
sys-process/htop/Manifest | 1 + |
13 |
sys-process/htop/files/htop-2.1.0-sysmacros.patch | 38 +++++++++++++++ |
14 |
sys-process/htop/htop-2.1.0.ebuild | 59 +++++++++++++++++++++++ |
15 |
3 files changed, 98 insertions(+) |
16 |
|
17 |
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest |
18 |
index bf53ce06053..72879e96ad0 100644 |
19 |
--- a/sys-process/htop/Manifest |
20 |
+++ b/sys-process/htop/Manifest |
21 |
@@ -1,3 +1,4 @@ |
22 |
DIST htop-1.0.3.tar.gz 399306 BLAKE2B 3ce3aad0f72102c2aa6d9c7a198eef5e1591dec41f6fabfbe03f2626e08d0967c023adba8285c94e5b5ac05d3b05ec78964035f0bd70bbdff9f429f9cb052097 SHA512 4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232 |
23 |
DIST htop-2.0.1.tar.gz 477196 BLAKE2B 03b6d7a71cbf261413e828d8678daecc969c76439a1241734d7bed13f7f8a3d22b40ebc4845c924ea6c61ddae20f1b90f78790c634908cf4d161ecb314e57c72 SHA512 57991a55b69028c01549b067ec749099466df5b08a0ed9a65dd779e6d2c8ee0a5d9c330bb6c727b04a349146ad441b7115718e433d1f8232f74b28903fb351ff |
24 |
DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda |
25 |
+DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb |
26 |
|
27 |
diff --git a/sys-process/htop/files/htop-2.1.0-sysmacros.patch b/sys-process/htop/files/htop-2.1.0-sysmacros.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..08f023b442e |
30 |
--- /dev/null |
31 |
+++ b/sys-process/htop/files/htop-2.1.0-sysmacros.patch |
32 |
@@ -0,0 +1,38 @@ |
33 |
+From 25c50af220c2de4542b440b7470a644caf2a3b65 Mon Sep 17 00:00:00 2001 |
34 |
+From: Lars Wendler <polynomial-c@g.o> |
35 |
+Date: Mon, 5 Feb 2018 16:02:19 +0100 |
36 |
+Subject: [PATCH] Add <sys/sysmacros.h> to two files. |
37 |
+ |
38 |
+Future glibc releases will no longer include sysmacros implicitly. |
39 |
+--- |
40 |
+ Process.c | 1 + |
41 |
+ linux/LinuxProcessList.c | 1 + |
42 |
+ 2 files changed, 2 insertions(+) |
43 |
+ |
44 |
+diff --git a/Process.c b/Process.c |
45 |
+index 1836080..5122afb 100644 |
46 |
+--- a/Process.c |
47 |
++++ b/Process.c |
48 |
+@@ -19,6 +19,7 @@ in the source distribution for its full text. |
49 |
+ #include <sys/param.h> |
50 |
+ #include <sys/stat.h> |
51 |
+ #include <sys/types.h> |
52 |
++#include <sys/sysmacros.h> |
53 |
+ #include <unistd.h> |
54 |
+ #include <stdlib.h> |
55 |
+ #include <signal.h> |
56 |
+diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c |
57 |
+index 6f2631a..7522fb1 100644 |
58 |
+--- a/linux/LinuxProcessList.c |
59 |
++++ b/linux/LinuxProcessList.c |
60 |
+@@ -25,6 +25,7 @@ in the source distribution for its full text. |
61 |
+ #include <time.h> |
62 |
+ #include <assert.h> |
63 |
+ #include <sys/types.h> |
64 |
++#include <sys/sysmacros.h> |
65 |
+ #include <fcntl.h> |
66 |
+ |
67 |
+ #ifdef HAVE_DELAYACCT |
68 |
+-- |
69 |
+2.16.1 |
70 |
+ |
71 |
|
72 |
diff --git a/sys-process/htop/htop-2.1.0.ebuild b/sys-process/htop/htop-2.1.0.ebuild |
73 |
new file mode 100644 |
74 |
index 00000000000..1ba6ab8008f |
75 |
--- /dev/null |
76 |
+++ b/sys-process/htop/htop-2.1.0.ebuild |
77 |
@@ -0,0 +1,59 @@ |
78 |
+# Copyright 1999-2018 Gentoo Foundation |
79 |
+# Distributed under the terms of the GNU General Public License v2 |
80 |
+ |
81 |
+EAPI=6 |
82 |
+ |
83 |
+inherit autotools linux-info |
84 |
+ |
85 |
+DESCRIPTION="interactive process viewer" |
86 |
+HOMEPAGE="http://hisham.hm/htop/" |
87 |
+SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz" |
88 |
+ |
89 |
+LICENSE="BSD GPL-2" |
90 |
+SLOT="0" |
91 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" |
92 |
+IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver" |
93 |
+ |
94 |
+RDEPEND="sys-libs/ncurses:0=[unicode?]" |
95 |
+DEPEND="${RDEPEND} |
96 |
+ virtual/pkgconfig" |
97 |
+ |
98 |
+DOCS=( ChangeLog README ) |
99 |
+ |
100 |
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" |
101 |
+ |
102 |
+PATCHES=( |
103 |
+ "${FILESDIR}/${P}-sysmacros.patch" |
104 |
+) |
105 |
+ |
106 |
+pkg_setup() { |
107 |
+ if ! has_version sys-process/lsof; then |
108 |
+ ewarn "To use lsof features in htop(what processes are accessing" |
109 |
+ ewarn "what files), you must have sys-process/lsof installed." |
110 |
+ fi |
111 |
+ |
112 |
+ linux-info_pkg_setup |
113 |
+} |
114 |
+ |
115 |
+src_prepare() { |
116 |
+ rm missing || die |
117 |
+ |
118 |
+ default |
119 |
+ eautoreconf |
120 |
+} |
121 |
+ |
122 |
+src_configure() { |
123 |
+ [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 |
124 |
+ |
125 |
+ local myeconfargs=( |
126 |
+ # fails to build against recent hwloc versions |
127 |
+ --disable-hwloc |
128 |
+ --enable-taskstats |
129 |
+ $(use_enable kernel_linux cgroup) |
130 |
+ $(use_enable kernel_linux linux-affinity) |
131 |
+ $(use_enable openvz) |
132 |
+ $(use_enable unicode) |
133 |
+ $(use_enable vserver) |
134 |
+ ) |
135 |
+ econf ${myeconfargs[@]} |
136 |
+} |