summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2017-02-07 14:18:37 +0100
committerLars Wendler <polynomial-c@gentoo.org>2017-02-07 14:18:54 +0100
commit26a0c08095658048936bb96b876f93a03fe55783 (patch)
treeefe0cd78f6e9d1726e9f009d90b929965c42b916 /sys-apps
parentsys-apps/util-linux: Removed old. (diff)
downloadgentoo-26a0c08095658048936bb96b876f93a03fe55783.tar.gz
gentoo-26a0c08095658048936bb96b876f93a03fe55783.tar.bz2
gentoo-26a0c08095658048936bb96b876f93a03fe55783.zip
sys-apps/util-linux: Honor USE="-ncurses" again (bug #608532).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/util-linux/util-linux-2.29.1-r1.ebuild (renamed from sys-apps/util-linux/util-linux-2.29.1.ebuild)76
1 files changed, 41 insertions, 35 deletions
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
index ed4531586cc0..22136f4def45 100644
--- a/sys-apps/util-linux/util-linux-2.29.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.29.1-r1.ebuild
@@ -98,42 +98,48 @@ multilib_src_configure() {
tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
- ECONF_SOURCE=${S} \
- econf \
- --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
- --docdir='${datarootdir}'/doc/${PF} \
- $(multilib_native_use_enable nls) \
- --enable-agetty \
- --with-bashcompletiondir="$(get_bashcompdir)" \
- --enable-bash-completion \
- $(multilib_native_use_enable caps setpriv) \
- --disable-chfn-chsh \
- $(multilib_native_use_enable cramfs) \
- $(multilib_native_use_enable fdformat) \
- --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
- $(use_enable kill) \
- --disable-login \
- $(multilib_native_use_enable tty-helpers mesg) \
- --disable-nologin \
- --enable-partx \
- $(multilib_native_use_with python) \
- --enable-raw \
- $(multilib_native_use_with readline) \
- --enable-rename \
- --disable-reset \
- --enable-schedutils \
- --disable-su \
- $(multilib_native_use_enable tty-helpers wall) \
- $(multilib_native_use_enable tty-helpers write) \
- $(multilib_native_use_enable suid makeinstall-chown) \
- $(multilib_native_use_enable suid makeinstall-setuid) \
- $(use_with selinux) \
- $(multilib_native_use_with slang) \
- $(use_enable static-libs static) \
- $(multilib_native_use_with systemd) \
- --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \
- $(multilib_native_use_with udev) \
+
+ local myeconfargs=(
+ --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+ --docdir='${datarootdir}'/doc/${PF}
+ $(multilib_native_use_enable nls)
+ --enable-agetty
+ --with-bashcompletiondir="$(get_bashcompdir)"
+ --enable-bash-completion
+ $(multilib_native_use_enable caps setpriv)
+ --disable-chfn-chsh
+ $(multilib_native_use_enable cramfs)
+ $(multilib_native_use_enable fdformat)
+ $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+ $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+ $(usex ncurses '' '--without-tinfo')
+ $(use_enable unicode widechar)
+ $(use_enable kill)
+ --disable-login
+ $(multilib_native_use_enable tty-helpers mesg)
+ --disable-nologin
+ --enable-partx
+ $(multilib_native_use_with python)
+ --enable-raw
+ $(multilib_native_use_with readline)
+ --enable-rename
+ --disable-reset
+ --enable-schedutils
+ --disable-su
+ $(multilib_native_use_enable tty-helpers wall)
+ $(multilib_native_use_enable tty-helpers write)
+ $(multilib_native_use_enable suid makeinstall-chown)
+ $(multilib_native_use_enable suid makeinstall-setuid)
+ $(use_with selinux)
+ $(multilib_native_use_with slang)
+ $(use_enable static-libs static)
+ $(multilib_native_use_with systemd)
+ --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no")
+ $(multilib_native_use_with udev)
$(tc-has-tls || echo --disable-tls)
+ )
+ ECONF_SOURCE=${S} \
+ econf "${myeconfargs[@]}" "${myconf[@]}"
}
multilib_src_compile() {