[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mikle Kolyada]

commit:     1de86d8250aae0a9d5a043fcc9e1065e6c435067
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 25 10:46:14 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Dec 25 10:48:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de86d82

eclass/pam.eclass: misc improvements

* EAPI=8
* EAPI=5 gone
* missing die
* cleanup mod_dir logic (openpam is long gone)

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 eclass/pam.eclass | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/eclass/pam.eclass b/eclass/pam.eclass
index 0b3421b5e7c8..9928e746e41e 100644
--- a/eclass/pam.eclass
+++ b/eclass/pam.eclass
@@ -6,14 +6,14 @@
 # Mikle Kolyada <zlogene@g.o>
 # @AUTHOR:
 # Diego Pettenò <flameeyes@g.o>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: Handles pam related tasks
 # @DESCRIPTION:
 # This eclass contains functions to install pamd configuration files and
 # pam modules.
 
 case ${EAPI:-0} in
-	[567]) ;;
+	[678]) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -100,12 +100,7 @@ newpamsecurity() {
 # @DESCRIPTION:
 # Returns the pam modules' directory for current implementation
 getpam_mod_dir() {
-	if has_version sys-libs/pam; then
-		PAM_MOD_DIR=/$(get_libdir)/security
-	else
-		# Unable to find PAM implementation... defaulting
-		PAM_MOD_DIR=/$(get_libdir)/security
-	fi
+	PAM_MOD_DIR=/$(get_libdir)/security
 
 	echo ${PAM_MOD_DIR}
 }
@@ -209,7 +204,7 @@ pamd_mimic() {
 cleanpamd() {
 	while [[ -n $1 ]]; do
 		if ! has_version sys-libs/pam; then
-			sed -i -e '/pam_shells\|pam_console/s:^:#:' "${D}/etc/pam.d/$1"
+			sed -i -e '/pam_shells\|pam_console/s:^:#:' "${D}/etc/pam.d/$1" || die
 		fi
 
 		shift