1 |
commit: a5371bbe754e942377e7778e715ebe7ce3126a31 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 24 20:47:34 2015 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 24 22:01:27 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5371bbe |
7 |
|
8 |
sys-process/procps, sys-apps/{coreutils,util-linux}: add USE=kill to install `kill` #566264 |
9 |
|
10 |
sys-apps/coreutils/coreutils-8.24.ebuild | 22 +++++++++++++--------- |
11 |
sys-apps/coreutils/metadata.xml | 1 + |
12 |
sys-apps/util-linux/metadata.xml | 1 + |
13 |
sys-apps/util-linux/util-linux-2.27.1.ebuild | 25 +++++++++++++++---------- |
14 |
sys-apps/util-linux/util-linux-9999.ebuild | 25 +++++++++++++++---------- |
15 |
sys-process/procps/metadata.xml | 1 + |
16 |
sys-process/procps/procps-3.3.11-r3.ebuild | 17 +++++++++++++---- |
17 |
7 files changed, 59 insertions(+), 33 deletions(-) |
18 |
|
19 |
diff --git a/sys-apps/coreutils/coreutils-8.24.ebuild b/sys-apps/coreutils/coreutils-8.24.ebuild |
20 |
index 5b88e1c..8b60db7 100644 |
21 |
--- a/sys-apps/coreutils/coreutils-8.24.ebuild |
22 |
+++ b/sys-apps/coreutils/coreutils-8.24.ebuild |
23 |
@@ -24,7 +24,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz |
24 |
LICENSE="GPL-3" |
25 |
SLOT="0" |
26 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" |
27 |
-IUSE="acl caps gmp multicall nls selinux static userland_BSD vanilla xattr" |
28 |
+IUSE="acl caps gmp kill multicall nls selinux static userland_BSD vanilla xattr" |
29 |
|
30 |
LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) |
31 |
caps? ( sys-libs/libcap ) |
32 |
@@ -32,18 +32,22 @@ LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) |
33 |
xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )" |
34 |
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) |
35 |
selinux? ( sys-libs/libselinux ) |
36 |
- nls? ( virtual/libintl ) |
37 |
+ nls? ( virtual/libintl )" |
38 |
+DEPEND="${RDEPEND} |
39 |
+ static? ( ${LIB_DEPEND} ) |
40 |
+ app-arch/xz-utils" |
41 |
+RDEPEND+=" |
42 |
+ kill? ( |
43 |
+ !sys-apps/util-linux[kill] |
44 |
+ !sys-process/procps[kill] |
45 |
+ ) |
46 |
!app-misc/realpath |
47 |
!<sys-apps/util-linux-2.13 |
48 |
!sys-apps/stat |
49 |
!net-mail/base64 |
50 |
!sys-apps/mktemp |
51 |
!<app-forensics/tct-1.18-r1 |
52 |
- !<net-fs/netatalk-2.0.3-r4 |
53 |
-" |
54 |
-DEPEND="${RDEPEND} |
55 |
- static? ( ${LIB_DEPEND} ) |
56 |
- app-arch/xz-utils" |
57 |
+ !<net-fs/netatalk-2.0.3-r4" |
58 |
|
59 |
src_prepare() { |
60 |
if ! use vanilla ; then |
61 |
@@ -87,8 +91,8 @@ src_configure() { |
62 |
--with-packager="Gentoo" \ |
63 |
--with-packager-version="${PVR} (p${PATCH_VER:-0})" \ |
64 |
--with-packager-bug-reports="https://bugs.gentoo.org/" \ |
65 |
- --enable-install-program="arch" \ |
66 |
- --enable-no-install-program="groups,hostname,kill,su,uptime" \ |
67 |
+ --enable-install-program="arch,$(usev kill)" \ |
68 |
+ --enable-no-install-program="groups,hostname,$(usev !kill),su,uptime" \ |
69 |
--enable-largefile \ |
70 |
$(use caps || echo --disable-libcap) \ |
71 |
$(use_enable nls) \ |
72 |
|
73 |
diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml |
74 |
index 1ef77ad..95b8f3e 100644 |
75 |
--- a/sys-apps/coreutils/metadata.xml |
76 |
+++ b/sys-apps/coreutils/metadata.xml |
77 |
@@ -3,6 +3,7 @@ |
78 |
<pkgmetadata> |
79 |
<herd>base-system</herd> |
80 |
<use> |
81 |
+ <flag name='kill'>Build the kill program</flag> |
82 |
<flag name='multicall'>Build all tools into a single `coreutils` program akin to busybox to save space</flag> |
83 |
</use> |
84 |
<upstream> |
85 |
|
86 |
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml |
87 |
index 5dd62ea..cdf5dc7 100644 |
88 |
--- a/sys-apps/util-linux/metadata.xml |
89 |
+++ b/sys-apps/util-linux/metadata.xml |
90 |
@@ -7,6 +7,7 @@ |
91 |
<flag name='cramfs'>build mkfs/fsck helpers for cramfs filesystems</flag> |
92 |
<flag name='cytune'>build cytune for Cyclades-Z multiport serial cards</flag> |
93 |
<flag name='fdformat'>build fdformat (floppy disk format)</flag> |
94 |
+ <flag name='kill'>build the kill program</flag> |
95 |
<flag name='pam'>build runuser helper</flag> |
96 |
<flag name='suid'> |
97 |
install mount/umount as setuid so non-root users may mount/umount devices, |
98 |
|
99 |
diff --git a/sys-apps/util-linux/util-linux-2.27.1.ebuild b/sys-apps/util-linux/util-linux-2.27.1.ebuild |
100 |
index 95c5785..d876072 100644 |
101 |
--- a/sys-apps/util-linux/util-linux-2.27.1.ebuild |
102 |
+++ b/sys-apps/util-linux/util-linux-2.27.1.ebuild |
103 |
@@ -25,16 +25,9 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/" |
104 |
|
105 |
LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" |
106 |
SLOT="0" |
107 |
-IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode" |
108 |
+IUSE="caps +cramfs fdformat kill ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode" |
109 |
|
110 |
-RDEPEND="!sys-process/schedutils |
111 |
- !sys-apps/setarch |
112 |
- !<sys-apps/sysvinit-2.88-r7 |
113 |
- !sys-block/eject |
114 |
- !<sys-libs/e2fsprogs-libs-1.41.8 |
115 |
- !<sys-fs/e2fsprogs-1.41.8 |
116 |
- !<app-shells/bash-completion-1.3-r2 |
117 |
- caps? ( sys-libs/libcap-ng ) |
118 |
+RDEPEND="caps? ( sys-libs/libcap-ng ) |
119 |
cramfs? ( sys-libs/zlib ) |
120 |
ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) |
121 |
pam? ( sys-libs/pam ) |
122 |
@@ -52,6 +45,18 @@ DEPEND="${RDEPEND} |
123 |
nls? ( sys-devel/gettext ) |
124 |
test? ( sys-devel/bc ) |
125 |
virtual/os-headers" |
126 |
+RDEPEND+=" |
127 |
+ kill? ( |
128 |
+ !sys-apps/coreutils[kill] |
129 |
+ !sys-process/procps[kill] |
130 |
+ ) |
131 |
+ !sys-process/schedutils |
132 |
+ !sys-apps/setarch |
133 |
+ !<sys-apps/sysvinit-2.88-r7 |
134 |
+ !sys-block/eject |
135 |
+ !<sys-libs/e2fsprogs-libs-1.41.8 |
136 |
+ !<sys-fs/e2fsprogs-1.41.8 |
137 |
+ !<app-shells/bash-completion-1.3-r2" |
138 |
|
139 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
140 |
|
141 |
@@ -103,7 +108,7 @@ multilib_src_configure() { |
142 |
$(multilib_native_use_enable cramfs) \ |
143 |
$(multilib_native_use_enable fdformat) \ |
144 |
--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \ |
145 |
- --disable-kill \ |
146 |
+ $(use_enable kill) \ |
147 |
--disable-login \ |
148 |
$(multilib_native_use_enable tty-helpers mesg) \ |
149 |
--disable-nologin \ |
150 |
|
151 |
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild |
152 |
index 95c5785..d876072 100644 |
153 |
--- a/sys-apps/util-linux/util-linux-9999.ebuild |
154 |
+++ b/sys-apps/util-linux/util-linux-9999.ebuild |
155 |
@@ -25,16 +25,9 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/" |
156 |
|
157 |
LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" |
158 |
SLOT="0" |
159 |
-IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode" |
160 |
+IUSE="caps +cramfs fdformat kill ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode" |
161 |
|
162 |
-RDEPEND="!sys-process/schedutils |
163 |
- !sys-apps/setarch |
164 |
- !<sys-apps/sysvinit-2.88-r7 |
165 |
- !sys-block/eject |
166 |
- !<sys-libs/e2fsprogs-libs-1.41.8 |
167 |
- !<sys-fs/e2fsprogs-1.41.8 |
168 |
- !<app-shells/bash-completion-1.3-r2 |
169 |
- caps? ( sys-libs/libcap-ng ) |
170 |
+RDEPEND="caps? ( sys-libs/libcap-ng ) |
171 |
cramfs? ( sys-libs/zlib ) |
172 |
ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) |
173 |
pam? ( sys-libs/pam ) |
174 |
@@ -52,6 +45,18 @@ DEPEND="${RDEPEND} |
175 |
nls? ( sys-devel/gettext ) |
176 |
test? ( sys-devel/bc ) |
177 |
virtual/os-headers" |
178 |
+RDEPEND+=" |
179 |
+ kill? ( |
180 |
+ !sys-apps/coreutils[kill] |
181 |
+ !sys-process/procps[kill] |
182 |
+ ) |
183 |
+ !sys-process/schedutils |
184 |
+ !sys-apps/setarch |
185 |
+ !<sys-apps/sysvinit-2.88-r7 |
186 |
+ !sys-block/eject |
187 |
+ !<sys-libs/e2fsprogs-libs-1.41.8 |
188 |
+ !<sys-fs/e2fsprogs-1.41.8 |
189 |
+ !<app-shells/bash-completion-1.3-r2" |
190 |
|
191 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
192 |
|
193 |
@@ -103,7 +108,7 @@ multilib_src_configure() { |
194 |
$(multilib_native_use_enable cramfs) \ |
195 |
$(multilib_native_use_enable fdformat) \ |
196 |
--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \ |
197 |
- --disable-kill \ |
198 |
+ $(use_enable kill) \ |
199 |
--disable-login \ |
200 |
$(multilib_native_use_enable tty-helpers mesg) \ |
201 |
--disable-nologin \ |
202 |
|
203 |
diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml |
204 |
index dca0e7b..f841e54 100644 |
205 |
--- a/sys-process/procps/metadata.xml |
206 |
+++ b/sys-process/procps/metadata.xml |
207 |
@@ -3,6 +3,7 @@ |
208 |
<pkgmetadata> |
209 |
<herd>base-system</herd> |
210 |
<use> |
211 |
+ <flag name='kill'>Build the kill program</flag> |
212 |
<flag name='modern-top'>Enables new startup defaults of top. Keeps old defaults if disabled</flag> |
213 |
<flag name='ncurses'>Build programs that use ncurses: top, slabtop, watch</flag> |
214 |
</use> |
215 |
|
216 |
diff --git a/sys-process/procps/procps-3.3.11-r3.ebuild b/sys-process/procps/procps-3.3.11-r3.ebuild |
217 |
index ecf5d10..b0fc16b 100644 |
218 |
--- a/sys-process/procps/procps-3.3.11-r3.ebuild |
219 |
+++ b/sys-process/procps/procps-3.3.11-r3.ebuild |
220 |
@@ -18,16 +18,21 @@ https://gitlab.com/procps-ng/procps/commit/b2f49b105d23c833d733bf7dfb99cb98e4cae |
221 |
LICENSE="GPL-2" |
222 |
SLOT="0/5" # libprocps.so |
223 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" |
224 |
-IUSE="+ncurses modern-top nls selinux static-libs systemd test unicode" |
225 |
+IUSE="+kill +ncurses modern-top nls selinux static-libs systemd test unicode" |
226 |
|
227 |
-RDEPEND="!<sys-apps/sysvinit-2.88-r6 |
228 |
- ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) |
229 |
+RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) |
230 |
selinux? ( sys-libs/libselinux ) |
231 |
systemd? ( >=sys-apps/systemd-209 )" |
232 |
DEPEND="${RDEPEND} |
233 |
ncurses? ( virtual/pkgconfig ) |
234 |
systemd? ( virtual/pkgconfig ) |
235 |
test? ( dev-util/dejagnu )" |
236 |
+RDEPEND+=" |
237 |
+ kill? ( |
238 |
+ !sys-apps/coreutils[kill] |
239 |
+ !sys-apps/util-linux[kill] |
240 |
+ ) |
241 |
+ !<sys-apps/sysvinit-2.88-r6" |
242 |
|
243 |
S="${WORKDIR}/${PN}-ng-${PV}" |
244 |
|
245 |
@@ -45,6 +50,7 @@ src_prepare() { |
246 |
src_configure() { |
247 |
econf \ |
248 |
--docdir='$(datarootdir)'/doc/${PF} \ |
249 |
+ $(use_enable kill) \ |
250 |
$(use_enable modern-top) \ |
251 |
$(use_with ncurses) \ |
252 |
$(use_enable nls) \ |
253 |
@@ -63,7 +69,10 @@ src_install() { |
254 |
#dodoc sysctl.conf |
255 |
|
256 |
dodir /bin |
257 |
- mv "${ED}"/usr/bin/{ps,kill} "${ED}"/bin || die |
258 |
+ mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die |
259 |
+ if use kill; then |
260 |
+ mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die |
261 |
+ fi |
262 |
|
263 |
gen_usr_ldscript -a procps |
264 |
prune_libtool_files |