Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/ppc64le:master commit in: sys-process/procps/, sys-process/procps/files/
Date: Tue, 28 Jun 2016 17:36:10
Message-Id: 1467135513.a0406c827869abb62b3180bf422be4d827b2e15e.blueness@gentoo
1 commit: a0406c827869abb62b3180bf422be4d827b2e15e
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 28 17:38:33 2016 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 28 17:38:33 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/ppc64le.git/commit/?id=a0406c82
7
8 sys-process/procps: copy from tree
9
10 sys-process/procps/Manifest | 4 +
11 .../files/procps-3.3.10-pmap-unreadable.patch | 60 ++++++++++
12 .../procps/files/procps-3.3.10-tests-no-tty.patch | 122 +++++++++++++++++++++
13 .../files/procps-3.3.11-sysctl-manpage.patch | 32 ++++++
14 .../procps/files/procps-3.3.8-kill-neg-pid.patch | 46 ++++++++
15 .../procps-3.3.9-sysctl-load-config-files.patch | 14 +++
16 sys-process/procps/metadata.xml | 16 +++
17 sys-process/procps/procps-3.3.10-r1.ebuild | 67 +++++++++++
18 sys-process/procps/procps-3.3.11-r3.ebuild | 76 +++++++++++++
19 sys-process/procps/procps-3.3.9-r2.ebuild | 61 +++++++++++
20 10 files changed, 498 insertions(+)
21
22 diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
23 new file mode 100644
24 index 0000000..5f7395a
25 --- /dev/null
26 +++ b/sys-process/procps/Manifest
27 @@ -0,0 +1,4 @@
28 +DIST procps-3.3.11-remove_Unix98_output_limits.patch 7582 SHA256 0801b971c630d2d68fe87da0b84842169df38cd88d3854da73b0e9bb45572d29 SHA512 8502264cba62475e3fc218dfde6c8ac375ccbf309843cec3000796e7455f41f287692aafd423f301b6c1a7e5f04c708fe30c2dd305ec3345b7a77b3443e35e55 WHIRLPOOL cbdba6dc94a4bec63f9fae8edc396aa5e59551a1606ed7dee56a65fad2e3d75ea5f391105806262f00103386c47434ec656b55bcefdd565313139355fa31ac61
29 +DIST procps-ng-3.3.10.tar.xz 657232 SHA256 1759229cd0d97da3d200d5599c4ea82726d61fae9c4b7d3edd52c544962791b7 SHA512 cbfa49e79a88a8e7066a9c316ef089f15fa825c5bfbc22ab8a83f53c6f367a7c586cef9c403e360d373d824c471533a15ddb11cd30c561650e6879fe687e7e4f WHIRLPOOL 723dd1c00578a7fa7e3ff47bed60283c30850cc8ae8069c704ba648792809a67c5944dbfd9b7b0159e0be83215b61e6b71b2d76e65b3619aed54223900ffed9b
30 +DIST procps-ng-3.3.11.tar.xz 815920 SHA256 e9493169a2d2adc0bc045538707310c8e877b385e4e296143b62607d2bb044ed SHA512 8ab4770adeba4c7e3cf75bc189278cf7a162ece0f23b862e7f726faccee11bd4524aec622b895f3b4e0b272a739a327a01e91f48834feea513544f0515b250df WHIRLPOOL 1da50ec4e8be9d76086a1112b00eea0daa39a7e579e846b92c12fea23a8303a7287e2d32d41feae93aad7b138768852b004544731fff882236ee3bd9511154ff
31 +DIST procps-ng-3.3.9.tar.xz 560812 SHA256 00f0cb0fadf968ddf605b0ef119846af07386629244d4f3da711a2cecf4e8663 SHA512 62c7270aa48b4346a3198f306d1cb8474f64650bfb67e8cc6c4d41923e50c31c95b3a0367a464823fb50a6137ec0c6352006292ac85b50caf730ec8ec35eb553 WHIRLPOOL dac97433a87badd40b46e3155bf0e30652ed2961a41bc8fca074357431301d250632215512ad752634c9c4f3273a1c75caba1ecf4f5a3c510bee155660dde166
32
33 diff --git a/sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch b/sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch
34 new file mode 100644
35 index 0000000..6976748
36 --- /dev/null
37 +++ b/sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch
38 @@ -0,0 +1,60 @@
39 +https://bugs.gentoo.org/404389
40 +
41 +From 92071e963e6ff50f0e221dde286f3229267b2ff9 Mon Sep 17 00:00:00 2001
42 +From: Craig Small <csmall@×××××××.au>
43 +Date: Sat, 24 Jan 2015 18:53:29 +1100
44 +Subject: [PATCH] pmap: print process even if smaps unreadable
45 +
46 +pmap would previously print the process name if
47 +/proc/PID/smaps could be opened, even if subsequent
48 +reads failed. This actually occurs with other users
49 +PIDs.
50 +
51 +Kernel 3.18rc1 introduced a change where the file could
52 +not been opened, meaning pmap -X 1 previously showed
53 +the process name and nothing else but NOW shows nothing
54 +make check failed because of this.
55 +
56 +This change prints the process name even before trying to open
57 +the file, returning it to previous behaviour.
58 +Thanks to Vincent Bernat for some analysis.
59 +
60 +References:
61 + https://bugs.debian.org/775624
62 + https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=29a40ace841cba9b661711f042d1821cdc4ad47c
63 +
64 +Signed-off-by: Craig Small <csmall@×××××××.au>
65 +---
66 + NEWS | 1 +
67 + pmap.c | 8 ++++----
68 + 2 files changed, 5 insertions(+), 4 deletions(-)
69 +
70 +diff --git a/pmap.c b/pmap.c
71 +index c83617c..17e0e30 100644
72 +--- a/pmap.c
73 ++++ b/pmap.c
74 +@@ -533,6 +533,10 @@ static int one_proc(proc_t * p)
75 + */
76 + int maxcmd = 0xfffff;
77 +
78 ++ escape_command(cmdbuf, p, sizeof cmdbuf, &maxcmd,
79 ++ ESC_ARGS | ESC_BRACKETS);
80 ++ printf("%u: %s\n", p->tgid, cmdbuf);
81 ++
82 + if (x_option || X_option || c_option) {
83 + sprintf(buf, "/proc/%u/smaps", p->tgid);
84 + if ((fp = fopen(buf, "r")) == NULL)
85 +@@ -543,10 +547,6 @@ static int one_proc(proc_t * p)
86 + return 1;
87 + }
88 +
89 +- escape_command(cmdbuf, p, sizeof cmdbuf, &maxcmd,
90 +- ESC_ARGS | ESC_BRACKETS);
91 +- printf("%u: %s\n", p->tgid, cmdbuf);
92 +-
93 + if (X_option || c_option) {
94 + print_extended_maps(fp);
95 + return 0;
96 +--
97 +2.4.0
98 +
99
100 diff --git a/sys-process/procps/files/procps-3.3.10-tests-no-tty.patch b/sys-process/procps/files/procps-3.3.10-tests-no-tty.patch
101 new file mode 100644
102 index 0000000..7a774e5
103 --- /dev/null
104 +++ b/sys-process/procps/files/procps-3.3.10-tests-no-tty.patch
105 @@ -0,0 +1,122 @@
106 +https://bugs.gentoo.org/461302
107 +
108 +From 4050148a4533e8a79cef0d7dcd0c058d78c48a31 Mon Sep 17 00:00:00 2001
109 +From: Craig Small <csmall@×××××××.au>
110 +Date: Sat, 9 May 2015 17:48:12 +1000
111 +Subject: [PATCH] Fix some sched and tty tests
112 +
113 +The ps sched test has been disabled. There are too many
114 +odd build farms this fails in strange ways.
115 +
116 +Other odd build farms have no tty and so some tests check
117 +for no tty and skip if not found.
118 +---
119 + testsuite/config/unix.exp | 9 +++++++++
120 + testsuite/pgrep.test/pgrep.exp | 11 +++++++----
121 + testsuite/pkill.test/pkill.exp | 3 +--
122 + testsuite/ps.test/ps_output.exp | 2 --
123 + testsuite/ps.test/ps_sched_batch.exp | 16 +++++++++-------
124 + 5 files changed, 26 insertions(+), 15 deletions(-)
125 +
126 +diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp
127 +index 522efb1..1318e9a 100644
128 +--- a/testsuite/config/unix.exp
129 ++++ b/testsuite/config/unix.exp
130 +@@ -146,3 +146,12 @@ proc kill_testproc { } {
131 + kill_process $testproc2_pid
132 + file delete $testproc_path
133 + }
134 ++
135 ++proc get_tty {} {
136 ++ if { [catch { set raw_tty [ exec tty ] } msg]} {
137 ++ warning "No TTY found"
138 ++ return ""
139 ++ }
140 ++ regexp "/dev/(.+)" $raw_tty > tty
141 ++ return $tty
142 ++}
143 +diff --git a/testsuite/pgrep.test/pgrep.exp b/testsuite/pgrep.test/pgrep.exp
144 +index 152b6ec..1c6cec6 100644
145 +--- a/testsuite/pgrep.test/pgrep.exp
146 ++++ b/testsuite/pgrep.test/pgrep.exp
147 +@@ -9,8 +9,7 @@ set not_uid [ expr { $uid + 1 } ]
148 + set gid [ exec id -g ]
149 + set not_gid [ expr { $gid + 1 } ]
150 + set ps "${topdir}ps/pscommand"
151 +-set raw_tty [ exec tty ]
152 +-regexp "/dev/(.+)" $raw_tty > tty
153 ++set tty [ get_tty ]
154 +
155 + set test "pgprep with no arguments"
156 + spawn $pgrep
157 +@@ -80,8 +79,12 @@ spawn $pgrep -s 1 $testproc_comm
158 + expect_blank "$test"
159 +
160 + set test "pgrep matches on tty"
161 +-spawn $pgrep -t $tty $testproc_comm
162 +-expect_pass "$test" "^$testproc1_pid\\s+$testproc2_pid\\s*$"
163 ++if { $tty == "" } {
164 ++ untested "$test"
165 ++} else {
166 ++ spawn $pgrep -t $tty $testproc_comm
167 ++ expect_pass "$test" "^$testproc1_pid\\s+$testproc2_pid\\s*$"
168 ++}
169 +
170 + set test "pgrep doesn't match with bogus tty"
171 + spawn $pgrep -t glass $testproc_comm
172 +diff --git a/testsuite/pkill.test/pkill.exp b/testsuite/pkill.test/pkill.exp
173 +index 5eece7d..c583cbe 100644
174 +--- a/testsuite/pkill.test/pkill.exp
175 ++++ b/testsuite/pkill.test/pkill.exp
176 +@@ -9,8 +9,7 @@ set not_uid [ expr { $uid + 1 } ]
177 + set gid [ exec id -g ]
178 + set not_gid [ expr { $gid + 1 } ]
179 + set ps "${topdir}ps/pscommand"
180 +-set raw_tty [ exec tty ]
181 +-regexp "/dev/(.+)" $raw_tty > tty
182 ++set tty [ get_tty ]
183 +
184 + set test "pkill with no arguments"
185 + spawn $pkill
186 +diff --git a/testsuite/ps.test/ps_output.exp b/testsuite/ps.test/ps_output.exp
187 +index 3a6f3d8..1b2c097 100644
188 +--- a/testsuite/ps.test/ps_output.exp
189 ++++ b/testsuite/ps.test/ps_output.exp
190 +@@ -9,8 +9,6 @@ set uid [ exec id -u ]
191 + set not_uid [ expr { $uid + 1 } ]
192 + set gid [ exec id -g ]
193 + set not_gid [ expr { $gid + 1 } ]
194 +-set raw_tty [ exec tty ]
195 +-regexp "/dev/(.+)" $raw_tty > tty
196 +
197 + # All the fields
198 + # Cannot do args,cmd,comm
199 +diff --git a/testsuite/ps.test/ps_sched_batch.exp b/testsuite/ps.test/ps_sched_batch.exp
200 +index e0c31ff..c58b9a2 100644
201 +--- a/testsuite/ps.test/ps_sched_batch.exp
202 ++++ b/testsuite/ps.test/ps_sched_batch.exp
203 +@@ -1,12 +1,14 @@
204 + #
205 + # check the ps SCHED_BATCH scheduler policy output
206 + #
207 +-set ps "${topdir}ps/pscommand"
208 +-set schedbatch "${topdir}testsuite/test-schedbatch"
209 +-
210 +-spawn $schedbatch 18
211 +-
212 ++# This is too flaky on certain build systems to be
213 ++# reliable - CS
214 ++#set ps "${topdir}ps/pscommand"
215 ++#set schedbatch "${topdir}testsuite/test-schedbatch"
216 ++#
217 ++#spawn $schedbatch 18
218 ++#
219 + set test "ps SCHED_BATCH scheduler"
220 +-spawn $ps --no-header -o comm,cls,nice -a
221 +-expect_pass "$test" "\\s+test-schedbatch\\s+B\\s+18"
222 ++#spawn $ps --no-header -o comm,cls,nice -a
223 ++#expect_pass "$test" "\\s+test-schedbatch\\s+B\\s+18"
224 + untested "$test"
225 +--
226 +2.4.0
227 +
228
229 diff --git a/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch b/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch
230 new file mode 100644
231 index 0000000..3523aad
232 --- /dev/null
233 +++ b/sys-process/procps/files/procps-3.3.11-sysctl-manpage.patch
234 @@ -0,0 +1,32 @@
235 +--- procps-ng-3.3.11-orig/sysctl.8
236 ++++ procps-ng-3.3.11/sysctl.8
237 +@@ -123,21 +123,21 @@
238 + \fB\-V\fR, \fB\-\-version\fR
239 + Display version information and exit.
240 + .SH EXAMPLES
241 +-/sbin/sysctl \-a
242 ++/usr/sbin/sysctl \-a
243 + .br
244 +-/sbin/sysctl \-n kernel.hostname
245 ++/usr/sbin/sysctl \-n kernel.hostname
246 + .br
247 +-/sbin/sysctl \-w kernel.domainname="example.com"
248 ++/usr/sbin/sysctl \-w kernel.domainname="example.com"
249 + .br
250 +-/sbin/sysctl \-p/etc/sysctl.conf
251 ++/usr/sbin/sysctl \-p/etc/sysctl.conf
252 + .br
253 +-/sbin/sysctl \-a \-\-pattern forward
254 ++/usr/sbin/sysctl \-a \-\-pattern forward
255 + .br
256 +-/sbin/sysctl \-a \-\-pattern forward$
257 ++/usr/sbin/sysctl \-a \-\-pattern forward$
258 + .br
259 +-/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp'
260 ++/usr/sbin/sysctl \-a \-\-pattern 'net.ipv4.conf.(eth|wlan)0.arp'
261 + .br
262 +-/sbin/sysctl \-\-system \-\-pattern '^net.ipv6'
263 ++/usr/sbin/sysctl \-\-system \-\-pattern '^net.ipv6'
264 + .SH DEPRECATED PARAMETERS
265 + The
266 + .B base_reachable_time
267
268 diff --git a/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch b/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch
269 new file mode 100644
270 index 0000000..0039748
271 --- /dev/null
272 +++ b/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch
273 @@ -0,0 +1,46 @@
274 +From 396cbc4cf36166217d877e2ff7e0a290758b0bc2 Mon Sep 17 00:00:00 2001
275 +From: Mike Frysinger <vapier@g.o>
276 +Date: Thu, 27 Jun 2013 18:37:17 -0400
277 +Subject: [PATCH] kill: fix -PID handling
278 +
279 +Commit 19b6f48990b02aeca211b480625b95b2033c1017 tried to fix -PID
280 +handling, but the new logic ends up skipping over the arg. This is
281 +because getopt increments optind after it processed the -PID (even
282 +though it was an unknown option). We need to decrement it by one
283 +so the loop at the end of the code will process it for us.
284 +
285 +I also fixed some whitespace errors in that same commit.
286 +
287 +URL: http://code.google.com/p/chromium/issues/detail?id=255209
288 +Signed-off-by: Mike Frysinger <vapier@g.o>
289 +---
290 + skill.c | 6 ++++--
291 + 1 file changed, 4 insertions(+), 2 deletions(-)
292 +
293 +diff --git a/skill.c b/skill.c
294 +index fb57305..074c5d7 100644
295 +--- a/skill.c
296 ++++ b/skill.c
297 +@@ -390,7 +390,7 @@ static void __attribute__ ((__noreturn__))
298 + else
299 + sigopt++;
300 +
301 +- opterr=0; /* suppress errors on -123 */
302 ++ opterr = 0; /* suppress errors on -123 */
303 + while (loop == 1 && (i = getopt_long(argc, argv, "l::Ls:hV", longopts, NULL)) != -1)
304 + switch (i) {
305 + case 'l':
306 +@@ -423,7 +423,9 @@ static void __attribute__ ((__noreturn__))
307 + xwarnx(_("invalid argument %c"), optopt);
308 + kill_usage(stderr);
309 + }
310 +- loop=0;
311 ++ /* We need to back off by one since getopt() ate the -PID */
312 ++ --optind;
313 ++ loop = 0;
314 + break;
315 + default:
316 + kill_usage(stderr);
317 +--
318 +1.8.2.1
319 +
320
321 diff --git a/sys-process/procps/files/procps-3.3.9-sysctl-load-config-files.patch b/sys-process/procps/files/procps-3.3.9-sysctl-load-config-files.patch
322 new file mode 100644
323 index 0000000..c6b0a4a
324 --- /dev/null
325 +++ b/sys-process/procps/files/procps-3.3.9-sysctl-load-config-files.patch
326 @@ -0,0 +1,14 @@
327 +http://bugs.gentoo.org/520314
328 +http://gitorious.org/procps/procps/commit/7f6efed9bb85d1e212e06985ea3e06720f6ca949
329 +
330 +--- sysctl.c
331 ++++ sysctl.c
332 +@@ -640,7 +640,7 @@
333 + }
334 +
335 +
336 +- if (stat(DEFAULT_PRELOAD, &ts) < 0 && S_ISREG(ts.st_mode)) {
337 ++ if (stat(DEFAULT_PRELOAD, &ts) == 0 && S_ISREG(ts.st_mode)) {
338 + if (!Quiet)
339 + printf(_("* Applying %s ...\n"), DEFAULT_PRELOAD);
340 + rc |= Preload(DEFAULT_PRELOAD);
341
342 diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
343 new file mode 100644
344 index 0000000..a21aac9
345 --- /dev/null
346 +++ b/sys-process/procps/metadata.xml
347 @@ -0,0 +1,16 @@
348 +<?xml version="1.0" encoding="UTF-8"?>
349 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
350 +<pkgmetadata>
351 +<maintainer type="project">
352 + <email>base-system@g.o</email>
353 + <name>Gentoo Base System</name>
354 +</maintainer>
355 +<use>
356 + <flag name="kill">Build the kill program</flag>
357 + <flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
358 + <flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
359 +</use>
360 +<upstream>
361 + <remote-id type="sourceforge">procps</remote-id>
362 +</upstream>
363 +</pkgmetadata>
364
365 diff --git a/sys-process/procps/procps-3.3.10-r1.ebuild b/sys-process/procps/procps-3.3.10-r1.ebuild
366 new file mode 100644
367 index 0000000..f254f34
368 --- /dev/null
369 +++ b/sys-process/procps/procps-3.3.10-r1.ebuild
370 @@ -0,0 +1,67 @@
371 +# Copyright 1999-2015 Gentoo Foundation
372 +# Distributed under the terms of the GNU General Public License v2
373 +# $Id$
374 +
375 +EAPI="5"
376 +
377 +inherit eutils toolchain-funcs
378 +
379 +DESCRIPTION="standard informational utilities and process-handling tools"
380 +# http://packages.debian.org/sid/procps
381 +HOMEPAGE="http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps"
382 +# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
383 +#FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74"
384 +#SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz"
385 +SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-ng-${PV}.tar.xz"
386 +
387 +LICENSE="GPL-2"
388 +SLOT="0"
389 +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
390 +IUSE="+ncurses modern-top nls selinux static-libs systemd test unicode"
391 +
392 +RDEPEND="!<sys-apps/sysvinit-2.88-r6
393 + ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
394 + selinux? ( sys-libs/libselinux )
395 + systemd? ( >=sys-apps/systemd-209 )"
396 +DEPEND="${RDEPEND}
397 + ncurses? ( virtual/pkgconfig )
398 + systemd? ( virtual/pkgconfig )
399 + test? ( dev-util/dejagnu )"
400 +
401 +S=${WORKDIR}/${PN}-ng-${PV}
402 +
403 +src_prepare() {
404 + epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
405 + epatch "${FILESDIR}"/${P}-pmap-unreadable.patch #404389
406 + epatch "${FILESDIR}"/${P}-tests-no-tty.patch #461302
407 + sed -i -e 's:systemd-login:systemd:' configure || die #501306
408 +}
409 +
410 +src_configure() {
411 + econf \
412 + --exec-prefix="${EPREFIX}" \
413 + --docdir='$(datarootdir)'/doc/${PF} \
414 + $(use_enable modern-top) \
415 + $(use_with ncurses) \
416 + $(use_enable nls) \
417 + $(use_enable selinux libselinux) \
418 + $(use_enable static-libs static) \
419 + $(use_with systemd) \
420 + $(use_enable unicode watch8bit)
421 +}
422 +
423 +src_test() {
424 + emake check </dev/null #461302
425 +}
426 +
427 +src_install() {
428 + default
429 + #dodoc sysctl.conf
430 +
431 + mv "${ED}"/usr/bin/pidof "${ED}"/bin/ || die
432 +
433 + # The configure script is completely whacked in the head
434 + mv "${ED}"/lib* "${ED}"/usr/ || die
435 + gen_usr_ldscript -a procps
436 + prune_libtool_files
437 +}
438
439 diff --git a/sys-process/procps/procps-3.3.11-r3.ebuild b/sys-process/procps/procps-3.3.11-r3.ebuild
440 new file mode 100644
441 index 0000000..9b3187a
442 --- /dev/null
443 +++ b/sys-process/procps/procps-3.3.11-r3.ebuild
444 @@ -0,0 +1,76 @@
445 +# Copyright 1999-2016 Gentoo Foundation
446 +# Distributed under the terms of the GNU General Public License v2
447 +# $Id$
448 +
449 +EAPI=5
450 +
451 +inherit eutils toolchain-funcs flag-o-matic
452 +
453 +DESCRIPTION="standard informational utilities and process-handling tools"
454 +HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
455 +SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz
456 + https://gitlab.com/procps-ng/procps/commit/b2f49b105d23c833d733bf7dfb99cb98e4cae383.patch -> ${PN}-3.3.11-remove_Unix98_output_limits.patch"
457 +
458 +LICENSE="GPL-2"
459 +SLOT="0/5" # libprocps.so
460 +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
461 +IUSE="+kill +ncurses modern-top nls selinux static-libs systemd test unicode"
462 +
463 +RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
464 + selinux? ( sys-libs/libselinux )
465 + systemd? ( >=sys-apps/systemd-209 )"
466 +DEPEND="${RDEPEND}
467 + ncurses? ( virtual/pkgconfig )
468 + systemd? ( virtual/pkgconfig )
469 + test? ( dev-util/dejagnu )"
470 +RDEPEND+="
471 + kill? (
472 + !sys-apps/coreutils[kill]
473 + !sys-apps/util-linux[kill]
474 + )
475 + !<sys-apps/sysvinit-2.88-r6"
476 +
477 +S="${WORKDIR}/${PN}-ng-${PV}"
478 +
479 +PATCHES=(
480 + "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209
481 + "${DISTDIR}"/${P}-remove_Unix98_output_limits.patch # 555200
482 + "${FILESDIR}"/${P}-sysctl-manpage.patch # 565304
483 +)
484 +
485 +src_prepare() {
486 + epatch "${PATCHES[@]}"
487 +}
488 +
489 +src_configure() {
490 + # http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
491 + append-lfs-flags #471102
492 + econf \
493 + --docdir='$(datarootdir)'/doc/${PF} \
494 + $(use_enable kill) \
495 + $(use_enable modern-top) \
496 + $(use_with ncurses) \
497 + $(use_enable nls) \
498 + $(use_enable selinux libselinux) \
499 + $(use_enable static-libs static) \
500 + $(use_with systemd) \
501 + $(use_enable unicode watch8bit)
502 +}
503 +
504 +src_test() {
505 + emake check </dev/null #461302
506 +}
507 +
508 +src_install() {
509 + default
510 + #dodoc sysctl.conf
511 +
512 + dodir /bin
513 + mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
514 + if use kill; then
515 + mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
516 + fi
517 +
518 + gen_usr_ldscript -a procps
519 + prune_libtool_files
520 +}
521
522 diff --git a/sys-process/procps/procps-3.3.9-r2.ebuild b/sys-process/procps/procps-3.3.9-r2.ebuild
523 new file mode 100644
524 index 0000000..4e8e0e6
525 --- /dev/null
526 +++ b/sys-process/procps/procps-3.3.9-r2.ebuild
527 @@ -0,0 +1,61 @@
528 +# Copyright 1999-2015 Gentoo Foundation
529 +# Distributed under the terms of the GNU General Public License v2
530 +# $Id$
531 +
532 +EAPI="4"
533 +
534 +inherit eutils toolchain-funcs
535 +
536 +DESCRIPTION="standard informational utilities and process-handling tools"
537 +# http://packages.debian.org/sid/procps
538 +HOMEPAGE="http://procps.sourceforge.net/ https://gitlab.com/procps-ng/procps"
539 +# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
540 +FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74"
541 +SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz"
542 +
543 +LICENSE="GPL-2"
544 +SLOT="0"
545 +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
546 +IUSE="+ncurses nls selinux static-libs systemd test unicode"
547 +
548 +RDEPEND="!<sys-apps/sysvinit-2.88-r6
549 + ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] )
550 + selinux? ( sys-libs/libselinux )
551 + systemd? ( >=sys-apps/systemd-209 )"
552 +DEPEND="${RDEPEND}
553 + ncurses? ( virtual/pkgconfig )
554 + systemd? ( virtual/pkgconfig )
555 + test? ( dev-util/dejagnu )"
556 +
557 +S=${WORKDIR}/${PN}-ng-${PV}
558 +
559 +src_prepare() {
560 + epatch \
561 + "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch \
562 + "${FILESDIR}"/${P}-sysctl-load-config-files.patch
563 + sed -i -e 's:systemd-login:systemd:' configure || die #501306
564 +}
565 +
566 +src_configure() {
567 + econf \
568 + --exec-prefix="${EPREFIX}" \
569 + --docdir='$(datarootdir)'/doc/${PF} \
570 + $(use_with ncurses) \
571 + $(use_enable nls) \
572 + $(use_enable selinux libselinux) \
573 + $(use_enable static-libs static) \
574 + $(use_with systemd) \
575 + $(use_enable unicode watch8bit)
576 +}
577 +
578 +src_install() {
579 + default
580 +# dodoc sysctl.conf
581 +
582 + mv "${ED}"/usr/bin/pidof "${ED}"/bin/ || die
583 +
584 + # The configure script is completely whacked in the head
585 + mv "${ED}"/lib* "${ED}"/usr/ || die
586 + gen_usr_ldscript -a procps
587 + prune_libtool_files
588 +}