1 |
commit: a62ac57d84775476f006a5cf2db37056e112a4ee |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 7 13:33:44 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 7 13:33:44 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a62ac57d |
7 |
|
8 |
sys-apps/util-linux: Sync live ebuild. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
sys-apps/util-linux/util-linux-9999.ebuild | 78 ++++++++++++++++-------------- |
13 |
1 file changed, 42 insertions(+), 36 deletions(-) |
14 |
|
15 |
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild |
16 |
index d168cff..e121aa7 100644 |
17 |
--- a/sys-apps/util-linux/util-linux-9999.ebuild |
18 |
+++ b/sys-apps/util-linux/util-linux-9999.ebuild |
19 |
@@ -1,4 +1,4 @@ |
20 |
-# Copyright 1999-2016 Gentoo Foundation |
21 |
+# Copyright 1999-2017 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
EAPI="5" |
25 |
@@ -93,42 +93,48 @@ multilib_src_configure() { |
26 |
tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms |
27 |
export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 |
28 |
export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 |
29 |
- ECONF_SOURCE=${S} \ |
30 |
- econf \ |
31 |
- --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \ |
32 |
- --docdir='${datarootdir}'/doc/${PF} \ |
33 |
- $(multilib_native_use_enable nls) \ |
34 |
- --enable-agetty \ |
35 |
- --with-bashcompletiondir="$(get_bashcompdir)" \ |
36 |
- --enable-bash-completion \ |
37 |
- $(multilib_native_use_enable caps setpriv) \ |
38 |
- --disable-chfn-chsh \ |
39 |
- $(multilib_native_use_enable cramfs) \ |
40 |
- $(multilib_native_use_enable fdformat) \ |
41 |
- --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \ |
42 |
- $(use_enable kill) \ |
43 |
- --disable-login \ |
44 |
- $(multilib_native_use_enable tty-helpers mesg) \ |
45 |
- --disable-nologin \ |
46 |
- --enable-partx \ |
47 |
- $(multilib_native_use_with python) \ |
48 |
- --enable-raw \ |
49 |
- $(multilib_native_use_with readline) \ |
50 |
- --enable-rename \ |
51 |
- --disable-reset \ |
52 |
- --enable-schedutils \ |
53 |
- --disable-su \ |
54 |
- $(multilib_native_use_enable tty-helpers wall) \ |
55 |
- $(multilib_native_use_enable tty-helpers write) \ |
56 |
- $(multilib_native_use_enable suid makeinstall-chown) \ |
57 |
- $(multilib_native_use_enable suid makeinstall-setuid) \ |
58 |
- $(use_with selinux) \ |
59 |
- $(multilib_native_use_with slang) \ |
60 |
- $(use_enable static-libs static) \ |
61 |
- $(multilib_native_use_with systemd) \ |
62 |
- --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \ |
63 |
- $(multilib_native_use_with udev) \ |
64 |
+ |
65 |
+ local myeconfargs=( |
66 |
+ --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" |
67 |
+ --docdir='${datarootdir}'/doc/${PF} |
68 |
+ $(multilib_native_use_enable nls) |
69 |
+ --enable-agetty |
70 |
+ --with-bashcompletiondir="$(get_bashcompdir)" |
71 |
+ --enable-bash-completion |
72 |
+ $(multilib_native_use_enable caps setpriv) |
73 |
+ --disable-chfn-chsh |
74 |
+ $(multilib_native_use_enable cramfs) |
75 |
+ $(multilib_native_use_enable fdformat) |
76 |
+ $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') |
77 |
+ $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') |
78 |
+ $(usex ncurses '' '--without-tinfo') |
79 |
+ $(use_enable unicode widechar) |
80 |
+ $(use_enable kill) |
81 |
+ --disable-login |
82 |
+ $(multilib_native_use_enable tty-helpers mesg) |
83 |
+ --disable-nologin |
84 |
+ --enable-partx |
85 |
+ $(multilib_native_use_with python) |
86 |
+ --enable-raw |
87 |
+ $(multilib_native_use_with readline) |
88 |
+ --enable-rename |
89 |
+ --disable-reset |
90 |
+ --enable-schedutils |
91 |
+ --disable-su |
92 |
+ $(multilib_native_use_enable tty-helpers wall) |
93 |
+ $(multilib_native_use_enable tty-helpers write) |
94 |
+ $(multilib_native_use_enable suid makeinstall-chown) |
95 |
+ $(multilib_native_use_enable suid makeinstall-setuid) |
96 |
+ $(use_with selinux) |
97 |
+ $(multilib_native_use_with slang) |
98 |
+ $(use_enable static-libs static) |
99 |
+ $(multilib_native_use_with systemd) |
100 |
+ --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") |
101 |
+ $(multilib_native_use_with udev) |
102 |
$(tc-has-tls || echo --disable-tls) |
103 |
+ ) |
104 |
+ ECONF_SOURCE=${S} \ |
105 |
+ econf "${myeconfargs[@]}" |
106 |
} |
107 |
|
108 |
multilib_src_compile() { |