sys-apps/util-linux: Make USE="nls" enable NLS support in libraries built for non...

Also add missing dependency on virtual/libintl.

Closes: https://bugs.gentoo.org/652950

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 05cd2776ea661e37da851e431ff909fd00cf5028..84635141a03c980df7965d9283b5dc2c10cc2852 100644 (file)
--- 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 e4fc6a2c7adc9ffbcaa94af37fc0f16bfe0b5c73..99693cd3a2474d8f4643ac1b92ecfd30f85087af 100644 (file)
--- 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)