commit: 883161e04f4709b720ff0142a6990a70011dbfb7 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Wed Apr 11 02:37:09 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Apr 11 07:28:20 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=883161e0
sys-apps/util-linux: Make USE="nls" enable NLS support in libraries built for non-native ABIs. Also add missing dependency on virtual/libintl. Closes: https://bugs.gentoo.org/652950 sys-apps/util-linux/util-linux-2.32-r3.ebuild | 3 ++- sys-apps/util-linux/util-linux-9999.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.32-r3.ebuild b/sys-apps/util-linux/util-linux-2.32-r3.ebuild index 05cd2776ea6..84635141a03 100644 --- a/sys-apps/util-linux/util-linux-2.32-r3.ebuild +++ b/sys-apps/util-linux/util-linux-2.32-r3.ebuild @@ -32,6 +32,7 @@ IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux RDEPEND="caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) + nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) pam? ( sys-libs/pam ) python? ( ${PYTHON_DEPS} ) readline? ( sys-libs/readline:0= ) @@ -123,7 +124,6 @@ multilib_src_configure() { local myeconfargs=( --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" --with-bashcompletiondir="$(get_bashcompdir)" - $(multilib_native_use_enable nls) $(multilib_native_use_enable suid makeinstall-chown) $(multilib_native_use_enable suid makeinstall-setuid) $(multilib_native_use_with python) @@ -134,6 +134,7 @@ multilib_src_configure() { $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') $(tc-has-tls || echo --disable-tls) + $(use_enable nls) $(use_enable unicode widechar) $(use_enable static-libs static) $(use_with selinux) diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index e4fc6a2c7ad..99693cd3a24 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -32,6 +32,7 @@ IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux RDEPEND="caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) + nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) pam? ( sys-libs/pam ) python? ( ${PYTHON_DEPS} ) readline? ( sys-libs/readline:0= ) @@ -119,7 +120,6 @@ multilib_src_configure() { local myeconfargs=( --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" --with-bashcompletiondir="$(get_bashcompdir)" - $(multilib_native_use_enable nls) $(multilib_native_use_enable suid makeinstall-chown) $(multilib_native_use_enable suid makeinstall-setuid) $(multilib_native_use_with python) @@ -130,6 +130,7 @@ multilib_src_configure() { $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') $(tc-has-tls || echo --disable-tls) + $(use_enable nls) $(use_enable unicode widechar) $(use_enable static-libs static) $(use_with selinux)
