commit:     e1ae43e39851c05a7460ffe3779f0e5406c13e3d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 22:48:38 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 18 22:52:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ae43e3

sys-apps/util-linux: add 2.39, drop 2.39_rc2, drop 2.39_rc3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/features/musl/package.use.mask            |   1 +
 sys-apps/util-linux/Manifest                       |   6 +-
 ...inux-2.39_rc2.ebuild => util-linux-2.39.ebuild} |  14 +-
 sys-apps/util-linux/util-linux-2.39_rc3.ebuild     | 383 ---------------------
 sys-apps/util-linux/util-linux-9999.ebuild         |  14 +-
 5 files changed, 25 insertions(+), 393 deletions(-)

diff --git a/profiles/features/musl/package.use.mask 
b/profiles/features/musl/package.use.mask
index 4863d7f0e381..269ec2307904 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -91,6 +91,7 @@ sys-apps/man-pages l10n_sr l10n_sv l10n_uk l10n_vi
 sys-apps/man-pages l10n_ja l10n_ru l10n_zh-CN
 sys-apps/sysvinit nls
 sys-auth/sssd man
+sys-apps/util-linux nls
 
 # Sam James <s...@gentoo.org> (2021-11-07)
 # Disable some sanitizers for LLVM, see bug #753935

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index dcb66e131794..fbcb78e8c66a 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,7 +1,5 @@
 DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 
7f6cd12ec9bc68a6db787be78c1ee19fdfbb37710df36d4278d869676ba531afd414097e57e5287efed6c7c80d6b6ef36d5812ff2bea611080d3ce5bf5ad4ac5
 SHA512 
ada2629b0a8e83ea83513e04f7b1ccceb3b8ab82acd119c5d8389d1abc48c92d0b591f39fb34b1fd65db3ab630f03a672a9f3dacf1a6e4f124bdb083fc1be6d7
 DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 
2468c6b8c881d7a17666aac954edfd421085111937f5d0daada37a679e9bbfe61fc98bb57cca9bf7bea20be483f38e2a758039f9baf5b1a901852e2b5dd014d8
 SHA512 
d8b3e936065ae1dc105b8ce773c874bb037ebf84ee571676509543f79c39950180e7f252c6b0d4500119568ed4ac3aa7117793de839f983e9287f26649e91dad
 DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B 
a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8
 SHA512 
07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957
-DIST util-linux-2.39-rc2.tar.sign 833 BLAKE2B 
ec2ea0c2034b5e8f24c72610e53acc4c922d3d4b84ffd31c3b51849e60a99a6e9bf3e17b773e222f89bc1fe33fb06722e2770b981c7dcc4519bec4db797d8348
 SHA512 
20b1f2ec5368c74f751238451be9ec5f8f74d8c63d331365b00ed06144f6874fe3f44e062e7b52c5d0a05c650353a741c1594e150e58a16544e5ffc8ed100a5b
-DIST util-linux-2.39-rc2.tar.xz 8080452 BLAKE2B 
d2476d1aff1c2e4e3cb3d4b71fa3410ce4db26448139dc439865b03d108acf4c797eb92e9edc2451dca099116fda8950b529f1b22b657d47268164642fe794a6
 SHA512 
11f5b8ed1eb90a4e7161369eafcf0157b205aeded221cd435f95a79d01901bdef289660486849778b3d3c15500db593cad24e0a7f87f52968c9c292ea68040c0
-DIST util-linux-2.39-rc3.tar.sign 833 BLAKE2B 
da99dfaf40efd052414c30ae172ad1a42654d3fcd7fc41fe8ba48f99db3e3b88c2fde863351cd5d354d5a5191e191e21f4867a8e20453e2512e2cc815f591000
 SHA512 
8a311c1bb680f1c71221a9e512bf42f13c7d5f8fb0b888dc7aac04a2e0da6315f58631fc315aa73d34b8275a48c9adfe5d5676fcce905f75d5c88f8aac3abf0f
-DIST util-linux-2.39-rc3.tar.xz 8106892 BLAKE2B 
514f26cf624a39f271a8987a38d51bd36e5494bea5f859abfd67fd4924495457e46519b712c52578c94210aa8bddab707a5ec699be3bb798c8ff22a17d3c4931
 SHA512 
8a93d32a5ceb38d50a4b2c8bfa48bcab7ec9b758c89b5a1a4f7fd74558dce37385bd7ea203345148d4389de4ea60ec42058f9d7889a8075d3e616773d085427e
+DIST util-linux-2.39.tar.sign 833 BLAKE2B 
f4b35d35f1d20094169c8651d127c6d1f37b0946bc72c40f4824d77f8c117a23ae2633ac2449e91ba316d4cac6e4f3c2afb9fd410302683384988dc794062d9e
 SHA512 
f5df4f7e5c39995ad3c7b52f06bfc7759e53d4df82b2b42f09d4570faeff5c156e83e42be053b00b0bfb4a71e27bfa580fb996a92225eb8a0df46d9f296ef4ef
+DIST util-linux-2.39.tar.xz 8103428 BLAKE2B 
39d415b6e303c21d2e5566bd29dd1803c67fbaed079fab85fab620db727a69c96f9c705a3671a639185c78ea1e70f374e21ef8694115ce42fa30c86b546023d1
 SHA512 
3d59a0f114c06be19ef7f86fca37ba5b9073823d011b3fc37997ddb00124b4505ea32903b78798a64dffbccf0ba645a692678ee845cc65a5b321824448a82a94

diff --git a/sys-apps/util-linux/util-linux-2.39_rc2.ebuild 
b/sys-apps/util-linux/util-linux-2.39.ebuild
similarity index 97%
rename from sys-apps/util-linux/util-linux-2.39_rc2.ebuild
rename to sys-apps/util-linux/util-linux-2.39.ebuild
index 80c3a3c10f94..209689b06193 100644
--- a/sys-apps/util-linux/util-linux-2.39_rc2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
        pam python-r1 multilib-minimal multiprocessing systemd
@@ -59,7 +59,10 @@ RDEPEND="
        udev? ( virtual/libudev:= )"
 BDEPEND="
        virtual/pkgconfig
-       nls? ( sys-devel/gettext )
+       nls? (
+               app-text/po4a
+               sys-devel/gettext
+       )
        test? ( sys-devel/bc )
 "
 DEPEND="
@@ -85,7 +88,7 @@ if [[ ${PV} == 9999 ]] ; then
        # Required for man-page generation
        BDEPEND+=" dev-ruby/asciidoctor"
 else
-       BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )"
+       BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-karelzak-20230517 )"
 fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
@@ -137,6 +140,9 @@ src_prepare() {
                        # Subtest 'options-maximum-size-8192' fails
                        hardlink/options
 
+                       # Fails in sandbox
+                       lsns/ioctl_ns
+
                        lsfd/mkfds-symlink
                        lsfd/mkfds-rw-character-device
                )
@@ -215,6 +221,7 @@ multilib_src_configure() {
                $(multilib_native_use_with audit)
                $(tc-has-tls || echo --disable-tls)
                $(use_enable nls)
+               $(use_enable nls poman)
                $(use_enable unicode widechar)
                $(use_enable static-libs static)
                $(use_with ncurses tinfo)
@@ -263,6 +270,7 @@ multilib_src_configure() {
                        --disable-asciidoc
                        --disable-bash-completion
                        --without-systemdsystemunitdir
+                       --disable-poman
 
                        # build libraries
                        --enable-libuuid

diff --git a/sys-apps/util-linux/util-linux-2.39_rc3.ebuild 
b/sys-apps/util-linux/util-linux-2.39_rc3.ebuild
deleted file mode 100644
index 80c3a3c10f94..000000000000
--- a/sys-apps/util-linux/util-linux-2.39_rc3.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
-       pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-       
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git";
-       inherit autotools git-r3
-else
-       
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc
-       inherit verify-sig
-
-       if [[ ${PV} != *_rc* ]] ; then
-               KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
-       fi
-
-       
SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz";
-       SRC_URI+=" verify-sig? ( 
https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ 
https://github.com/util-linux/util-linux";
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger 
magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid 
systemd test tty-helpers udev unicode"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="
-       virtual/libcrypt:=
-       audit? ( >=sys-process/audit-2.6:= )
-       caps? ( sys-libs/libcap-ng )
-       cramfs? ( sys-libs/zlib:= )
-       cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
-       hardlink? ( dev-libs/libpcre2:= )
-       ncurses? (
-               sys-libs/ncurses:=[unicode(+)?]
-               magic? ( sys-apps/file:0= )
-       )
-       nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-       pam? ( sys-libs/pam )
-       python? ( ${PYTHON_DEPS} )
-       readline? ( sys-libs/readline:0= )
-       rtas? ( sys-libs/librtas )
-       selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-       slang? ( sys-libs/slang )
-       !build? ( systemd? ( sys-apps/systemd ) )
-       udev? ( virtual/libudev:= )"
-BDEPEND="
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )
-       test? ( sys-devel/bc )
-"
-DEPEND="
-       ${RDEPEND}
-       virtual/os-headers
-       acct-group/root
-"
-RDEPEND+="
-       hardlink? ( !app-arch/hardlink )
-       logger? ( !>=app-admin/sysklogd-2.0[logger] )
-       kill? (
-               !sys-apps/coreutils[kill]
-               !sys-process/procps[kill]
-       )
-       su? (
-               !<sys-apps/shadow-4.7-r2
-               !>=sys-apps/shadow-4.7-r2[su]
-       )
-       !net-wireless/rfkill
-"
-
-if [[ ${PV} == 9999 ]] ; then
-       # Required for man-page generation
-       BDEPEND+=" dev-ruby/asciidoctor"
-else
-       BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-       if use su && ! use suid ; then
-               elog "su will be installed as suid despite USE=-suid (bug 
#832092)"
-               elog "To use su without suid, see e.g. Portage's suidctl 
feature."
-       fi
-}
-
-src_unpack() {
-       if [[ ${PV} == 9999 ]] ; then
-               git-r3_src_unpack
-               return
-       fi
-
-       if use verify-sig ; then
-               mkdir "${T}"/verify-sig || die
-               pushd "${T}"/verify-sig &>/dev/null || die
-
-               # Upstream sign the decompressed .tar
-               # Let's do it separately in ${T} then cleanup to avoid external
-               # effects on normal unpack.
-               cp "${DISTDIR}"/${MY_P}.tar.xz . || die
-               xz -d ${MY_P}.tar.xz || die
-               verify-sig_verify_detached ${MY_P}.tar 
"${DISTDIR}"/${MY_P}.tar.sign
-
-               popd &>/dev/null || die
-               rm -r "${T}"/verify-sig || die
-       fi
-
-       default
-}
-
-src_prepare() {
-       default
-
-       if use test ; then
-               # Prevent uuidd test failure due to socket path limit, bug 
#593304
-               sed -i \
-                       -e "s|UUIDD_SOCKET=\"\$(mktemp -u 
\"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u 
\"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
-                       tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
-               # Known-failing tests
-               # TODO: investigate these
-               local known_failing_tests=(
-                       # Subtest 'options-maximum-size-8192' fails
-                       hardlink/options
-
-                       lsfd/mkfds-symlink
-                       lsfd/mkfds-rw-character-device
-               )
-
-               local known_failing_test
-               for known_failing_test in "${known_failing_tests[@]}" ; do
-                       einfo "Removing known-failing test: 
${known_failing_test}"
-                       rm tests/ts/${known_failing_test} || die
-               done
-
-       fi
-
-       if [[ ${PV} == 9999 ]] ; then
-               po/update-potfiles
-               eautoreconf
-       else
-               elibtoolize
-       fi
-}
-
-python_configure() {
-       local myeconfargs=(
-               "${commonargs[@]}"
-               --disable-all-programs
-               --disable-bash-completion
-               --without-systemdsystemunitdir
-               --with-python
-               --enable-libblkid
-               --enable-libmount
-               --enable-pylibmount
-       )
-
-       mkdir "${BUILD_DIR}" || die
-       pushd "${BUILD_DIR}" >/dev/null || die
-       ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-       popd >/dev/null || die
-}
-
-multilib_src_configure() {
-       # The scanf test in a run-time test which fails while cross-compiling.
-       # Blindly assume a POSIX setup since we require libmount, and libmount
-       # itself fails when the scanf test fails. bug #531856
-       tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-
-       # bug #485486
-       export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam)
-       # bug #545042
-       export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam)
-
-       # Undo bad ncurses handling by upstream. Fall back to pkg-config.
-       # bug #601530
-       export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
-       export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
-
-       # Avoid automagic dependency on ppc*
-       export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
-
-       # configure args shared by python and non-python builds
-       local commonargs=(
-               
--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-       )
-
-       local myeconfargs=(
-               "${commonargs[@]}"
-               --with-bashcompletiondir="$(get_bashcompdir)"
-               --without-python
-               $(multilib_native_use_enable suid makeinstall-chown)
-               $(multilib_native_use_enable suid makeinstall-setuid)
-               $(multilib_native_use_with readline)
-               $(multilib_native_use_with slang)
-               $(multilib_native_use_with systemd)
-               $(multilib_native_use_with udev)
-               $(multilib_native_usex ncurses "$(use_with magic libmagic)" 
'--without-libmagic')
-               $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" 
'--without-ncursesw')
-               $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" 
'--without-ncurses')
-               $(multilib_native_use_with audit)
-               $(tc-has-tls || echo --disable-tls)
-               $(use_enable nls)
-               $(use_enable unicode widechar)
-               $(use_enable static-libs static)
-               $(use_with ncurses tinfo)
-               $(use_with selinux)
-       )
-
-       if multilib_is_native_abi ; then
-               myeconfargs+=(
-                       --disable-chfn-chsh
-                       --disable-login
-                       --disable-newgrp
-                       --disable-nologin
-                       --disable-pylibmount
-                       --disable-raw
-                       --disable-vipw
-                       --enable-agetty
-                       --enable-bash-completion
-                       --enable-line
-                       --enable-partx
-                       --enable-rename
-                       --enable-rfkill
-                       --enable-schedutils
-                       
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-                       $(use_enable caps setpriv)
-                       $(use_enable cramfs)
-                       $(use_enable fdformat)
-                       $(use_enable hardlink)
-                       $(use_enable kill)
-                       $(use_enable logger)
-                       $(use_enable ncurses pg)
-                       $(use_enable su)
-                       $(use_enable tty-helpers mesg)
-                       $(use_enable tty-helpers wall)
-                       $(use_enable tty-helpers write)
-                       $(use_with cryptsetup)
-               )
-               if [[ ${PV} == *9999 ]] ; then
-                       myeconfargs+=( --enable-asciidoc )
-               else
-                       # Upstream is shipping pre-generated man-pages for 
releases
-                       myeconfargs+=( --disable-asciidoc )
-               fi
-       else
-               myeconfargs+=(
-                       --disable-all-programs
-                       --disable-asciidoc
-                       --disable-bash-completion
-                       --without-systemdsystemunitdir
-
-                       # build libraries
-                       --enable-libuuid
-                       --enable-libblkid
-                       --enable-libsmartcols
-                       --enable-libfdisk
-                       --enable-libmount
-               )
-       fi
-
-       ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-       if multilib_is_native_abi && use python ; then
-               python_foreach_impl python_configure
-       fi
-}
-
-src_configure() {
-       append-lfs-flags
-       multilib-minimal_src_configure
-}
-
-python_compile() {
-       pushd "${BUILD_DIR}" >/dev/null || die
-       emake all
-       popd >/dev/null || die
-}
-
-multilib_src_compile() {
-       emake all
-
-       if multilib_is_native_abi && use python ; then
-               python_foreach_impl python_compile
-       fi
-}
-
-python_test() {
-       pushd "${BUILD_DIR}" >/dev/null || die
-       emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-       popd >/dev/null || die
-}
-
-multilib_src_test() {
-       emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-       if multilib_is_native_abi && use python ; then
-               python_foreach_impl python_test
-       fi
-}
-
-python_install() {
-       pushd "${BUILD_DIR}" >/dev/null || die
-       emake DESTDIR="${D}" install
-       python_optimize
-       popd >/dev/null || die
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi && use python ; then
-               python_foreach_impl python_install
-       fi
-
-       # This needs to be called AFTER python_install call, bug #689190
-       emake DESTDIR="${D}" install
-
-       if multilib_is_native_abi ; then
-               # Need the libs in /
-               gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-       fi
-}
-
-multilib_src_install_all() {
-       dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-       # e2fsprogs-libs didn't install .la files, and .pc work fine
-       find "${ED}" -name "*.la" -delete || die
-
-       if use pam ; then
-               # See 
https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
-               newpamd "${FILESDIR}/runuser.pamd" runuser
-               newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-
-               newpamd "${FILESDIR}/su-l.pamd" su-l
-       fi
-
-       if use su && ! use suid ; then
-               # Always force suid su, even when USE=-suid, as su is useless
-               # for the overwhelming-majority case without suid.
-               # Users who wish to truly have a no-suid su can strip it out
-               # via e.g. Portage's suidctl or some other hook.
-               # See bug #832092
-               fperms u+s /bin/su
-       fi
-
-       # Note:
-       # Bash completion for "runuser" command is provided by same file which
-       # would also provide bash completion for "su" command. However, we don't
-       # use "su" command from this package.
-       # This triggers a known QA warning which we ignore for now to magically
-       # keep bash completion for "su" command which shadow package does not
-       # provide.
-
-       local ver=$(tools/git-version-gen .tarballversion)
-       local major=$(ver_cut 1 ${ver})
-       local minor=$(ver_cut 2 ${ver})
-       local release=$(ver_cut 3 ${ver})
-       export QA_PKGCONFIG_VERSION="${major}.${minor}.${release:-0}"
-}
-
-pkg_postinst() {
-       if ! use tty-helpers ; then
-               elog "The mesg/wall/write tools have been disabled due to 
USE=-tty-helpers."
-       fi
-
-       if [[ -z ${REPLACING_VERSIONS} ]] ; then
-               elog "The agetty util now clears the terminal by default. You"
-               elog "might want to add --noclear to your /etc/inittab lines."
-       fi
-}

diff --git a/sys-apps/util-linux/util-linux-9999.ebuild 
b/sys-apps/util-linux/util-linux-9999.ebuild
index 80c3a3c10f94..209689b06193 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
        pam python-r1 multilib-minimal multiprocessing systemd
@@ -59,7 +59,10 @@ RDEPEND="
        udev? ( virtual/libudev:= )"
 BDEPEND="
        virtual/pkgconfig
-       nls? ( sys-devel/gettext )
+       nls? (
+               app-text/po4a
+               sys-devel/gettext
+       )
        test? ( sys-devel/bc )
 "
 DEPEND="
@@ -85,7 +88,7 @@ if [[ ${PV} == 9999 ]] ; then
        # Required for man-page generation
        BDEPEND+=" dev-ruby/asciidoctor"
 else
-       BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )"
+       BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-karelzak-20230517 )"
 fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
@@ -137,6 +140,9 @@ src_prepare() {
                        # Subtest 'options-maximum-size-8192' fails
                        hardlink/options
 
+                       # Fails in sandbox
+                       lsns/ioctl_ns
+
                        lsfd/mkfds-symlink
                        lsfd/mkfds-rw-character-device
                )
@@ -215,6 +221,7 @@ multilib_src_configure() {
                $(multilib_native_use_with audit)
                $(tc-has-tls || echo --disable-tls)
                $(use_enable nls)
+               $(use_enable nls poman)
                $(use_enable unicode widechar)
                $(use_enable static-libs static)
                $(use_with ncurses tinfo)
@@ -263,6 +270,7 @@ multilib_src_configure() {
                        --disable-asciidoc
                        --disable-bash-completion
                        --without-systemdsystemunitdir
+                       --disable-poman
 
                        # build libraries
                        --enable-libuuid

Reply via email to