From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E0D3715813A for ; Wed, 08 Jan 2025 08:42:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF492E0817; Wed, 08 Jan 2025 08:42:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 32B3EE0817 for ; Wed, 08 Jan 2025 08:42:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3882E33FE60 for ; Wed, 08 Jan 2025 08:42:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 969E41187 for ; Wed, 08 Jan 2025 08:42:43 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1736325744.551ca582792c16b7c07273f1dec03fd3ec523a35.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/pam/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/pam/pam-1.7.0_p20241230.ebuild X-VCS-Directories: sys-libs/pam/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 551ca582792c16b7c07273f1dec03fd3ec523a35 X-VCS-Branch: master Date: Wed, 08 Jan 2025 08:42:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: de6d5067-3f1a-4608-b18e-0fca26dc54cc X-Archives-Hash: 2777d64de291f32ee16dd85a038ff157 commit: 551ca582792c16b7c07273f1dec03fd3ec523a35 Author: Sam James gentoo org> AuthorDate: Wed Jan 8 08:35:47 2025 +0000 Commit: Sam James gentoo 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 gentoo.org> Signed-off-by: Sam James 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() {