Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-process/psmisc/
Date: Mon, 28 Jan 2019 19:37:04
Message-Id: 1548682881.ec5bafed37d10313cd57c7b7c1312da52810be4f.blueness@gentoo
1 commit: ec5bafed37d10313cd57c7b7c1312da52810be4f
2 Author: stefson <herrtimson <AT> yahoo <DOT> de>
3 AuthorDate: Sun Jan 27 21:15:47 2019 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 28 13:41:21 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ec5bafed
7
8 sys-process/psmisc: revert hacks from #330631, this is now fixed by upstream
9
10 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
11
12 sys-process/psmisc/psmisc-23.1-r1.ebuild | 5 -----
13 1 file changed, 5 deletions(-)
14
15 diff --git a/sys-process/psmisc/psmisc-23.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild
16 index e52f2cb..2f8104d 100644
17 --- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
18 +++ b/sys-process/psmisc/psmisc-23.1-r1.ebuild
19 @@ -37,8 +37,6 @@ src_configure() {
20 }
21
22 src_compile() {
23 - # peekfd is a fragile crap hack #330631
24 - nonfatal emake -C src peekfd || touch src/peekfd{.o,}
25 emake
26 }
27
28 @@ -47,9 +45,6 @@ src_install() {
29
30 use X || rm -f "${ED%/}"/usr/bin/pstree.x11
31
32 - [[ -s ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/bin/peekfd
33 - [[ -e ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/share/man/man1/peekfd.1
34 -
35 # fuser is needed by init.d scripts; use * wildcard for #458250
36 dodir /bin
37 mv "${ED%/}"/usr/bin/*fuser "${ED%/}"/bin || die