gentoo auto-resync : 01:01:2023 - 20:22:32

2 files changed, 46 insertions, 56 deletions

diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index b19f6224f65c..3b9da0dbe27c 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -9,5 +9,5 @@ AUX nss-pam-ldapd-0.9.11-use-mkstemp.patch 789 BLAKE2B da9525e66873be615cfe90f6a
 AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 BLAKE2B 2e17a92b3650ce4e6627be7ddb2f656cd9ab53e49d7e2b11d078dac0d7a00015d88d861bfdc1378eb25c1b9750ed3811023cc95b04ccf9d028ffc5899dc01cd5 SHA512 c8cccb044a641f673f12db9717bda4c0c4d91bd1933342595d8f3f540449459c5cf14263133487195b223670d450873f608e3ce5b6f1ca775ca7fe0180a9f962
 AUX pynslcd.init 515 BLAKE2B 711ba152ea9cc52198171e451889ab42a224581bae7e4378846f480063ed9a672fdb38b153d6941364d3d06e325d9feb95f6fd17885b4e6181d99393cb54de0a SHA512 56334d86cc027e538d8a0bf9a8b87308e3ae6e91be608a4a630f21c57cc41b6cb5dc6fb3220fed1ca555dd4da6a5c7c10b2776f9e49a7b71a96ece21fc65fed7
 DIST nss-pam-ldapd-0.9.12.tar.gz 791983 BLAKE2B af580d400230db709f7ac09720edd6127b3b26c6987d1e8f6d6535ad8e68fd8cb5cf2a3319e4456fb2af28aba6528f7a5cdc28463ccfee747dbbf6abc35eee87 SHA512 5eca4851a9bcb2779548d193a363a143d6106bfc6463b8d3f0c2d5d7d227ec1e680861383d4813f40b44d1be2ce5f7ed019d838f7f6796e15f96f7411d3bb8f6
-EBUILD nss-pam-ldapd-0.9.12-r1.ebuild 4486 BLAKE2B 47fd337e4c8954496d395ece1aff0e65b6ebe07b45088cf17284500e2f3e4224d4587961af7fb0b177ff4362ee7611f499f283f5fda61c034c91220330c73938 SHA512 69df8cd7b7987f60006093725307b0839176e6786ca63faa8f3397da42a39a87ce3118b08347c97e09f121e19412323efb54a79738e4407647ac1700995ecf4d
+EBUILD nss-pam-ldapd-0.9.12-r2.ebuild 4298 BLAKE2B fc04f41d37652ba44320f6103f33d4bf8712dd4d4c3ec2bd5895a471080afff6e53b7284239d44028b37c0fba8320365156919de38e1782c1714c4fd953dfe84 SHA512 b2d841202b091a88077f1730486587491ea2e6eeca6b65191fac85d291cdf4c8e11e682e219b81072d7416758f9f66c9383af11e18525a559c87e2f18840d544
 MISC metadata.xml 1170 BLAKE2B 5c121a0afae864d757fda18c8546e494804c9b9d6a7d6fe2ad485b6a7bb2ed291776063407721222fa765251c9ca4d945740e8a0aa53da670747fb35cf1b8f9e SHA512 ba534679ae3b983a9b143530112f6495a4a4b5b82077095b3cc62965c1cf808c7a2d098410c00bee195112c5e7ff3afe4b368fa9a1662ce22cf48634229df7cf
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r2.ebuild
index 88f0e013b023..187613b5f998 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r1.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-inherit prefix python-r1 autotools multilib multilib-minimal systemd s6 tmpfiles
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools python-r1 s6 systemd tmpfiles multilib-minimal
 
 DESCRIPTION="NSS module for name lookups using LDAP"
 HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
@@ -14,9 +14,13 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug kerberos +pam pynslcd sasl test +utils"
+REQUIRED_USE="
+	utils? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} pynslcd )
+"
 RESTRICT="!test? ( test )"
 
-COMMON_DEP="
+RDEPEND="
 	acct-group/nslcd
 	acct-user/nslcd
 	net-nds/openldap:=[${MULTILIB_USEDEP}]
@@ -31,34 +35,27 @@ COMMON_DEP="
 	!sys-auth/nss_ldap
 	!sys-auth/pam_ldap
 "
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	test? (
-		${PYTHON_DEPS}
-		dev-python/pylint[${PYTHON_USEDEP}]
-	)
-"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
-	sys-devel/automake
-"
-
-REQUIRED_USE="
-	utils? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} pynslcd )
+	test? ( dev-python/pylint[${PYTHON_USEDEP}] )
 "
 
 PATCHES=(
-	"${FILESDIR}/nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch"
-	"${FILESDIR}/nss-pam-ldapd-0.9.11-use-mkstemp.patch"
-	"${FILESDIR}/nss-pam-ldapd-0.9.11-relative-imports.patch"
-	"${FILESDIR}/nss-pam-ldapd-0.9.11-tests.patch"
-	"${FILESDIR}/nss-pam-ldapd-0.9.11-tests-py39.patch"
+	"${FILESDIR}"/nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch
+	"${FILESDIR}"/nss-pam-ldapd-0.9.11-use-mkstemp.patch
+	"${FILESDIR}"/nss-pam-ldapd-0.9.11-relative-imports.patch
+	"${FILESDIR}"/nss-pam-ldapd-0.9.11-tests.patch
+	"${FILESDIR}"/nss-pam-ldapd-0.9.11-tests-py39.patch
 )
 
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && python_setup
+}
+
 src_prepare() {
 	default
-	use utils && python_setup
+
 	touch pynslcd/__init__.py || die "Could not create __init__.py for pynslcd"
 	mv pynslcd/pynslcd.py pynslcd/main.py || die
 
@@ -66,11 +63,11 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	local -a myconf=(
+	local myconf=(
 		--disable-utils
 		--enable-warnings
 		--with-ldap-lib=openldap
-		--with-ldap-conf-file=/etc/nslcd.conf
+		--with-ldap-conf-file="${EPREFIX}"/etc/nslcd.conf
 		--with-nslcd-pidfile=/run/nslcd/nslcd.pid
 		--with-nslcd-socket=/run/nslcd/socket
 		--with-nss-flavour=glibc
@@ -79,40 +76,43 @@ multilib_src_configure() {
 		$(use_enable kerberos)
 		$(use_enable pam)
 		$(use_enable sasl)
-	)
-
-	# nss libraries always go in /lib on Gentoo
-	if multilib_is_native_abi ; then
-		myconf+=("--with-pam-seclib-dir=${EPREFIX}/$(get_libdir)/security")
-		myconf+=("--libdir=${EPREFIX}/$(get_libdir)")
-	else
-		myconf+=("--with-pam-seclib-dir=/$(get_libdir)/security")
-		myconf+=("--libdir=/$(get_libdir)")
-	fi
 
+		# nss libraries always go in /lib on Gentoo
+		--with-pam-seclib-dir="${EPREFIX}"/$(get_libdir)/security
+		--libdir="${EPREFIX}"/$(get_libdir)
+	)
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_test() {
+	python_test() {
+		cp -l "${S}"/pynslcd/*.py pynslcd/ || die "Could not copy python files for tests"
+		nonfatal emake check || die "tests failed with ${EPYTHON}"
+	}
+
 	pushd "${BUILD_DIR}" >/dev/null || die
 	ln -s ../pynslcd/constants.py utils/constants.py || die
 	python_foreach_impl python_test
 	popd >/dev/null || die
 }
 
-python_test() {
-	cp -l "${S}"/pynslcd/*.py pynslcd/ || die "Could not copy python files for tests"
-	nonfatal emake check || die "tests failed with ${EPYTHON}"
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if use pynslcd; then
+		python_moduleinto pynslcd
+		python_foreach_impl python_domodule pynslcd/*.py
+	fi
 }
 
 multilib_src_install_all() {
-	local script
+	einstalldocs
 
 	newinitd "${FILESDIR}"/nslcd.init nslcd
 	s6_install_service nslcd "${FILESDIR}"/nslcd.s6
 
 	insinto /usr/share/nss-pam-ldapd
-	doins "${WORKDIR}/${P}/nslcd.conf"
+	doins "${WORKDIR}"/${P}/nslcd.conf
 
 	fperms o-r /etc/nslcd.conf
 
@@ -120,12 +120,13 @@ multilib_src_install_all() {
 		python_moduleinto nslcd
 		python_foreach_impl python_domodule utils/*.py
 
+		local script
 		for script in chsh getent; do
 			python_foreach_impl python_newscript utils/${script}.py ${script}.ldap
 		done
 	fi
 	if use pynslcd; then
-		rm -rf "${D}"/usr/share/pynslcd
+		rm -rf "${ED}"/usr/share/pynslcd || die
 		python_moduleinto pynslcd
 		python_foreach_impl python_domodule pynslcd/*.py
 		python_scriptinto /usr/sbin
@@ -137,26 +138,16 @@ multilib_src_install_all() {
 	systemd_newunit "${FILESDIR}"/nslcd.service nslcd.service
 }
 
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use pynslcd; then
-		python_moduleinto pynslcd
-		python_foreach_impl python_domodule pynslcd/*.py
-	fi
-}
-
 pkg_postinst() {
 	tmpfiles_process nslcd.conf
 
-	echo
 	elog "For this to work you must configure /etc/nslcd.conf"
 	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
-	echo
+	elog
 	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
 	elog "start it like this:"
 	elog "  # /etc/init.d/nslcd start"
-	echo
+	elog
 	elog "You can add it to the default runlevel like so:"
 	elog " # rc-update add nslcd default"
 	elog
@@ -167,5 +158,4 @@ pkg_postinst() {
 	elog
 	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
 	elog " is now named /etc/nslcd.conf"
-	echo
 }