gentoo auto-resync : 09:01:2025 - 06:41:15

2 files changed, 26 insertions, 19 deletions

diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index b0c4834a2364..75483f0552d8 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -6,5 +6,5 @@ DIST Linux-PAM-1.6.1.tar.xz 1054152 BLAKE2B 649b4ff892fbd3eb90adcbd9ccc5b3f5df51
 DIST pam-1.7.0_p20241230.gh.tar.gz 719108 BLAKE2B c37daabae380ce75c630a0af1b9960676bc973c773025bc7f65ae87aebff4ca3b667e16ec9635c7677e8a00e6b26eb590f84b798529c3340cdc2c262e7e5649e SHA512 d9d53ddd420fe754c76303b99c37e5cc2eca3d4af9f64043f3f9e69c3abfc3c05d5a1efdbbdfb39ad46a301a0df7a18425d0e8c110c1d76bad3e62dfa97b61ef
 EBUILD pam-1.5.3-r1.ebuild 4456 BLAKE2B 11d04b870ae3571fa71aa7d1bdaa29eb59b5593899aa70223d3ad708331b875d21ac1ab6b28f06392651db04bca8821c747e478fb87744968d6cc6a23a652951 SHA512 a98f212ddcdef9542e6f3bcd05c3a1f6243b5e2696bf93bd4596ae8f84a88acf0ad7bba4a196dfc91775a20b5d3dff30659406437491f476252f4cb1e7c3c92a
 EBUILD pam-1.6.1.ebuild 4459 BLAKE2B b6c946278113f8c0cf63676382fce8dfee77ed4d02f56314f55734c4c5e32b1dc668d851315ff27fe98c470a61cda43cb9bd31b3430fc859aaa3aca767fd4c33 SHA512 4100f9df870643f57f8d99114d6ff02553d9fc6ebd5fc3a3fea85ab49ec248482bddfe5b0767551d6bcb0a8a42439f9b35cf81f087750aa030d4d9d144f20834
-EBUILD pam-1.7.0_p20241230.ebuild 5323 BLAKE2B 880f4c75b5e6e0da1a952f2fb19188fba66f599fbc5eeb7bad28e3548e369415b70cae37535d12d9334814be50e765fbddab8640a0c70c01aa8b33386789e5e9 SHA512 0912c164362fe7307e16d8301ed0dee1cce4b34119d11c1174c0c96aa2bfb64fdf2df59c295f3f660ad947b1c7fbcc1dd171a80d20941ece9df56971413f94ef
+EBUILD pam-1.7.0_p20241230-r2.ebuild 5504 BLAKE2B a1be041bb0932242cd837a90f7308c6c90c0a9166f363e035f6d6f242fd1f2bfccab66a132a198a748803ece8117cc6f132056a7928974362527cae10bacb52c SHA512 5997a08948cb947068a5c3cfecaf63966db5c746f8e45cf899bf634c0c41cd357a4f8c3f6032b1d790aca5fbe17f93b0ac6bef455bf7757fab00b52fe53a89e6
 MISC metadata.xml 846 BLAKE2B e236bd8c7a53097d96164d9063d1dbb9372cef4ec92731dc43df6731cc7f4fc2935aeeb2e069b6da1d4bce3f1cc6a657e0361208581da615f3f41ec72c02261e SHA512 e2e28deadb2c941f8fa31447ec20c95ccb340d638f8b1e742a89ccc2dbb3c8d88e764f750d6e13c5a6320a612d6f2447689c02862a5e897919d1e9bca7857089
diff --git a/sys-libs/pam/pam-1.7.0_p20241230.ebuild b/sys-libs/pam/pam-1.7.0_p20241230-r2.ebuild
index e711342cb0c1..a50180b88068 100644
--- a/sys-libs/pam/pam-1.7.0_p20241230.ebuild
+++ b/sys-libs/pam/pam-1.7.0_p20241230-r2.ebuild
@@ -35,14 +35,14 @@ fi
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-# Unkeyworded until man pages are figured out
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="audit berkdb elogind examples debug nis nls selinux systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 # meson.build specifically checks for bison and then byacc
 BDEPEND+="
 	|| ( sys-devel/bison dev-util/byacc )
+	app-text/docbook-xsl-ns-stylesheets
 	sys-devel/flex
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
@@ -53,8 +53,9 @@ DEPEND="
 	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
 	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
 	!berkdb? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] )
+	elogind? ( >=sys-auth/elogind-254 )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:=[${MULTILIB_USEDEP}] )
+	systemd? ( >=sys-apps/systemd-254:= )
 	nis? (
 		net-libs/libnsl:=[${MULTILIB_USEDEP}]
 		>=net-libs/libtirpc-0.2.4-r2:=[${MULTILIB_USEDEP}]
@@ -75,7 +76,21 @@ 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.
+	# Also, stub out elinks+w3m which are only used for an index.
+	cat >> ${native_file} <<-EOF || die
+	[binaries]
+	xmlcatalog='true'
+	xmllint='true'
+	elinks='true'
+	w3m='true'
+	EOF
+
 	local emesonargs=(
+		--native-file "${native_file}"
+
 		$(meson_feature audit)
 		$(meson_native_use_bool examples)
 		$(meson_use debug pam-debug)
@@ -85,18 +100,16 @@ multilib_src_configure() {
 
 		-Disadir='.'
 		-Dxml-catalog="${BROOT}"/etc/xml/catalog
+		-Dsbindir="${EPREFIX}"/sbin
 		-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
 
@@ -106,8 +119,8 @@ multilib_src_configure() {
 		# TODO: lastlog is enabled again for now by us as elogind support
 		# wasn't available at first. Even then, disabling lastlog will
 		# probably need a news item.
-		$(meson_feature systemd logind)
-		$(meson_feature elogind)
+		$(meson_native_use_feature systemd logind)
+		$(meson_native_use_feature elogind)
 		-Dpam_lastlog=enabled
 	)
 
@@ -140,12 +153,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() {