Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/coreutils/
Date: Fri, 01 Apr 2016 14:09:51
Message-Id: 1459519760.4473cfa41f7d013af8bf7d967ea5ceac773136eb.floppym@gentoo
1 commit: 4473cfa41f7d013af8bf7d967ea5ceac773136eb
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 1 14:04:36 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 1 14:09:20 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4473cfa4
7
8 sys-apps/coreutils: Move kill to /bin per FHS
9
10 This also makes it consistent with procps and util-linux.
11
12 Package-Manager: portage-2.2.28_p64
13
14 sys-apps/coreutils/coreutils-8.24.ebuild | 5 ++++-
15 sys-apps/coreutils/coreutils-8.25.ebuild | 5 ++++-
16 2 files changed, 8 insertions(+), 2 deletions(-)
17
18 diff --git a/sys-apps/coreutils/coreutils-8.24.ebuild b/sys-apps/coreutils/coreutils-8.24.ebuild
19 index b350b02..bf3fac7 100644
20 --- a/sys-apps/coreutils/coreutils-8.24.ebuild
21 +++ b/sys-apps/coreutils/coreutils-8.24.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2015 Gentoo Foundation
24 +# Copyright 1999-2016 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 # $Id$
27
28 @@ -147,6 +147,9 @@ src_install() {
29 local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
30 mkdir mknod mv pwd rm rmdir stty sync true uname"
31 mv ${fhs} ../../bin/ || die "could not move fhs bins"
32 + if use kill; then
33 + mv kill ../../bin/ || die
34 + fi
35 # move critical binaries into /bin (common scripts)
36 local com="basename chroot cut dir dirname du env expr head mkfifo
37 mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
38
39 diff --git a/sys-apps/coreutils/coreutils-8.25.ebuild b/sys-apps/coreutils/coreutils-8.25.ebuild
40 index 4e858f9..706651c 100644
41 --- a/sys-apps/coreutils/coreutils-8.25.ebuild
42 +++ b/sys-apps/coreutils/coreutils-8.25.ebuild
43 @@ -1,4 +1,4 @@
44 -# Copyright 1999-2015 Gentoo Foundation
45 +# Copyright 1999-2016 Gentoo Foundation
46 # Distributed under the terms of the GNU General Public License v2
47 # $Id$
48
49 @@ -147,6 +147,9 @@ src_install() {
50 local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
51 mkdir mknod mv pwd rm rmdir stty sync true uname"
52 mv ${fhs} ../../bin/ || die "could not move fhs bins"
53 + if use kill; then
54 + mv kill ../../bin/ || die
55 + fi
56 # move critical binaries into /bin (common scripts)
57 local com="basename chroot cut dir dirname du env expr head mkfifo
58 mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"