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