public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/pam/
Date: Wed, 08 Jan 2025 08:42:43 +0000 (UTC)	[thread overview]
Message-ID: <1736325744.551ca582792c16b7c07273f1dec03fd3ec523a35.sam@gentoo> (raw)

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() {


             reply	other threads:[~2025-01-08  8:42 UTC|newest]

Thread overview: 171+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-08  8:42 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-12 18:41 [gentoo-commits] repo/gentoo:master commit in: sys-libs/pam/ Mike Gilbert
2025-10-01 20:44 Mike Gilbert
2025-08-26 11:57 Sam James
2025-08-14 16:33 Mike Gilbert
2025-07-19  9:00 Sam James
2025-07-18 22:25 Sam James
2025-07-18 22:25 Sam James
2025-07-18 22:14 Sam James
2025-07-18 22:14 Sam James
2025-07-18 22:14 Sam James
2025-06-23 19:23 Mike Gilbert
2025-06-18  2:54 Sam James
2025-04-03 15:26 Sam James
2025-03-13  4:04 Sam James
2025-03-03 18:56 Mike Gilbert
2025-02-23  5:42 Sam James
2025-02-23  5:31 Sam James
2025-02-23  5:21 Sam James
2025-02-23  5:16 Sam James
2025-01-21 19:11 Mike Gilbert
2025-01-14 11:48 Andreas K. Hüttel
2025-01-09  8:31 Sam James
2025-01-08 20:43 Sam James
2025-01-08 10:01 Sam James
2025-01-08  9:50 Sam James
2025-01-08  9:50 Sam James
2025-01-08  8:42 Sam James
2025-01-08  4:56 Sam James
2025-01-08  4:56 Sam James
2024-12-06 12:26 Sam James
2024-07-17  5:56 Sam James
2024-07-17  5:15 Sam James
2024-07-17  4:55 Sam James
2024-07-17  4:55 Sam James
2024-07-17  4:46 Sam James
2024-07-17  4:44 Sam James
2024-07-17  4:44 Sam James
2024-05-03  8:23 Sam James
2024-05-03  8:21 Sam James
2024-05-03  8:21 Sam James
2024-05-03  8:21 Sam James
2024-03-19  3:42 Ionen Wolkens
2024-03-03 23:02 Sam James
2024-03-03  2:48 Sam James
2024-03-02 22:50 Sam James
2024-02-27 23:21 Sam James
2024-02-27 23:04 Sam James
2024-02-27 23:04 Sam James
2024-02-27 23:04 Sam James
2024-02-06 22:41 Sam James
2024-01-08 12:03 Sam James
2023-07-14 16:59 Arthur Zamarin
2023-07-11  8:43 Jakov Smolić
2023-07-08  3:39 Sam James
2023-07-07 10:14 Sam James
2023-07-07  8:10 Jakov Smolić
2023-07-07  4:40 Sam James
2023-07-07  4:40 Sam James
2023-07-07  4:40 Sam James
2023-05-10 18:49 Sam James
2023-05-10 18:49 Sam James
2023-01-13 16:31 Arthur Zamarin
2022-12-26  3:20 Sam James
2022-12-25 21:24 Sam James
2022-12-25 21:24 Sam James
2022-12-25 21:24 Sam James
2022-12-25 20:30 Arthur Zamarin
2022-12-25 20:11 Sam James
2022-12-25 20:11 Sam James
2022-12-21 22:54 Sam James
2022-12-11 12:53 Sam James
2022-09-05  2:22 Sam James
2022-09-04  1:11 Sam James
2022-08-31 12:23 Arthur Zamarin
2022-08-31  6:19 Jakov Smolić
2022-08-31  6:19 Jakov Smolić
2022-08-31  5:12 Arthur Zamarin
2022-08-30 23:58 Sam James
2022-08-30 23:58 Sam James
2022-08-30 22:51 Sam James
2022-08-30 22:51 Sam James
2022-06-27 15:00 Guilherme Amadio
2022-06-27 15:00 Guilherme Amadio
2022-05-15  1:00 Sam James
2021-12-25 10:52 Mikle Kolyada
2021-11-06  2:29 Sam James
2021-11-05 18:52 Mikle Kolyada
2021-09-08  1:22 Sam James
2021-09-03 17:49 Mikle Kolyada
2021-09-01 12:08 Mikle Kolyada
2021-08-18 14:28 Sam James
2021-07-22  6:51 Mikle Kolyada
2021-07-19 20:09 Sam James
2021-07-19 20:06 Mikle Kolyada
2021-03-03 20:02 Sam James
2021-02-18 19:36 Mikle Kolyada
2021-02-18 16:03 Mikle Kolyada
2020-12-16 19:21 Mikle Kolyada
2020-11-25 18:44 Mikle Kolyada
2020-11-25 18:44 Mikle Kolyada
2020-11-13 17:05 Mikle Kolyada
2020-11-13 13:22 Mikle Kolyada
2020-10-10  9:31 Mikle Kolyada
2020-09-13  9:42 Mikle Kolyada
2020-09-12 10:18 Mikle Kolyada
2020-09-07  7:33 Mikle Kolyada
2020-08-29 12:47 Mikle Kolyada
2020-08-29 12:47 Mikle Kolyada
2020-08-20 15:51 Mikle Kolyada
2020-08-20 15:04 Mikle Kolyada
2020-08-09 10:22 Mikle Kolyada
2020-06-28  8:42 Mikle Kolyada
2020-06-18 15:02 Mikle Kolyada
2020-06-17 21:23 Mikle Kolyada
2020-06-17 19:22 Mikle Kolyada
2020-06-17  3:35 Georgy Yakovlev
2020-06-16 21:17 Mikle Kolyada
2020-06-16 16:44 Mikle Kolyada
2020-06-13 20:09 Mike Gilbert
2020-06-13  9:31 Mikle Kolyada
2020-06-10 18:27 Mikle Kolyada
2020-06-08 22:22 Mikle Kolyada
2020-03-15 18:36 Mikle Kolyada
2020-03-12 16:12 Mikle Kolyada
2020-02-13  0:11 Patrick McLean
2020-02-12 19:21 Patrick McLean
2020-01-28 13:06 Mikle Kolyada
2020-01-13 11:55 Mikle Kolyada
2020-01-13 11:55 Mikle Kolyada
2019-12-20 14:44 Mikle Kolyada
2019-11-03 17:17 Mikle Kolyada
2019-08-16 11:25 Mikle Kolyada
2019-05-04  9:33 Mikle Kolyada
2018-11-24 21:03 Mikle Kolyada
2018-11-24 21:00 Mikle Kolyada
2018-11-23 10:04 Mikle Kolyada
2018-11-23  9:46 Mikle Kolyada
2018-11-22 16:17 Mikle Kolyada
2018-11-18 18:24 Mikle Kolyada
2018-11-18 18:24 Mikle Kolyada
2018-10-20 18:28 Mikle Kolyada
2018-10-08  9:32 Mikle Kolyada
2018-10-06 22:08 Sergei Trofimovich
2018-10-06 16:48 Matt Turner
2018-10-06 16:48 Matt Turner
2018-10-05  8:44 Mikle Kolyada
2018-10-05  8:41 Mikle Kolyada
2018-10-05  4:10 Thomas Deutschmann
2018-10-04 22:36 Sergei Trofimovich
2018-10-03 20:42 Mikle Kolyada
2018-10-02 21:11 Mikle Kolyada
2018-10-02 18:32 Sergei Trofimovich
2018-10-02  7:47 Mikle Kolyada
2018-09-30 12:25 Mikle Kolyada
2018-02-26 21:56 Patrice Clement
2017-12-28 22:35 Michael Orlitzky
2017-12-19 22:22 Patrice Clement
2017-12-19 22:22 Patrice Clement
2017-12-19 22:22 Patrice Clement
2017-12-19 22:22 Patrice Clement
2017-12-19 22:22 Patrice Clement
2017-11-23 22:16 Patrice Clement
2017-01-29 20:14 Fabian Groffen
2017-01-17  4:11 Mike Gilbert
2016-12-15 12:13 Lars Wendler
2016-10-21 12:25 Michael Palimaka
2016-05-05  5:47 Mike Frysinger
2015-12-23 16:27 Mike Frysinger
2015-08-19 15:14 Mike Frysinger
2015-08-19 15:14 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1736325744.551ca582792c16b7c07273f1dec03fd3ec523a35.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox