commit: 551ca582792c16b7c07273f1dec03fd3ec523a35 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jan 8 08:35:47 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 8 08:42:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=551ca582
sys-libs/pam: stub out xmllint/xmlcatalog use We don't have docbook5 packaged and it appears to have A Whole History with a blogpost dating back to even 2008 from flameeyes. Anyway, it's only needed for validation of output here, so we can stub it out and stick our heads in the sand. Thanks to ulm for the help. Closes: https://bugs.gentoo.org/913087 Thanks-to: Ulrich Müller <ulm <AT> gentoo.org> Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/pam/pam-1.7.0_p20241230.ebuild | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/sys-libs/pam/pam-1.7.0_p20241230.ebuild b/sys-libs/pam/pam-1.7.0_p20241230.ebuild index e711342cb0c1..d3b578078695 100644 --- a/sys-libs/pam/pam-1.7.0_p20241230.ebuild +++ b/sys-libs/pam/pam-1.7.0_p20241230.ebuild @@ -45,6 +45,7 @@ BDEPEND+=" || ( sys-devel/bison dev-util/byacc ) sys-devel/flex virtual/pkgconfig + virtual/w3m nls? ( sys-devel/gettext ) " DEPEND=" @@ -75,7 +76,18 @@ src_configure() { } multilib_src_configure() { + local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local + # Workaround for docbook5 not being packaged (bug #913087#c4) + # It's only used for validation of output, so stub it out. + cat >> ${native_file} <<-EOF || die + [binaries] + xmlcatalog='true' + xmllint='true' + EOF + local emesonargs=( + --native-file "${native_file}" + $(meson_feature audit) $(meson_native_use_bool examples) $(meson_use debug pam-debug) @@ -86,17 +98,14 @@ multilib_src_configure() { -Disadir='.' -Dxml-catalog="${BROOT}"/etc/xml/catalog -Dsecuredir="${EPREFIX}"/$(get_libdir)/security + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + -Dhtmldir="${EPREFIX}"/usr/share/doc/${PF}/html + -Dpdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf -Ddb=$(usex berkdb 'db' 'gdbm') -Ddb-uniquename=$(db_findver sys-libs/db) - # TODO: Docs are currently disabled as would need to either - # add the deps (some appear unpackaged too?) and possibly - # generate a tarball for them, but not so critical of an issue - # to handle with the Meson migration given this was disabled - # before too (see bug #913087). - #$(meson_native_enabled docs) - -Ddocs=disabled + $(meson_native_enabled docs) -Dpam_unix=enabled @@ -140,12 +149,6 @@ multilib_src_install_all() { use selinux && cat ->> "${ED}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}-selinux.conf <<-_EOF_ d /run/sepermit 0755 root root _EOF_ - - # TODO: See bug #913087 - #local page - #for page in doc/man/*.{3,5,8} modules/*/*.{5,8} ; do - # doman ${page} - #done } pkg_postinst() {
