diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-12-25 20:34:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-25 20:34:27 +0000 |
| commit | 0f15659d48c193027158492acb726297501202c5 (patch) | |
| tree | 5502ba879a78b759da28441d418dbbfe08bd8f03 /eclass | |
| parent | 93a93e9a3b53c1a73142a305ea1f8136846942ee (diff) | |
gentoo xmass resync : 25.12.2021
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 36378 -> 36382 bytes | |||
| -rw-r--r-- | eclass/pam.eclass | 13 | ||||
| -rw-r--r-- | eclass/tree-sitter-grammar.eclass | 2 | ||||
| -rw-r--r-- | eclass/vdr-plugin-2.eclass | 4 |
4 files changed, 7 insertions, 12 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 620acda3be65..ab1563632e54 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz 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@gentoo.org> # @AUTHOR: # Diego Pettenò <flameeyes@gentoo.org> -# @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 diff --git a/eclass/tree-sitter-grammar.eclass b/eclass/tree-sitter-grammar.eclass index 7207ecf3ddd7..10baa3c4adb6 100644 --- a/eclass/tree-sitter-grammar.eclass +++ b/eclass/tree-sitter-grammar.eclass @@ -77,7 +77,7 @@ tree-sitter-grammar_src_compile() { ${link} ${LDFLAGS} \ -shared \ *.o \ - -Wl,-soname ${soname} \ + -Wl,--soname=${soname} \ -o "${WORKDIR}"/${soname} || die } diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass index c2f31003fd87..68f960c28caa 100644 --- a/eclass/vdr-plugin-2.eclass +++ b/eclass/vdr-plugin-2.eclass @@ -15,10 +15,10 @@ # Eclass for easing maintenance of vdr plugin ebuilds # @ECLASS-VARIABLE: VDRPLUGIN -# @INTERNAL +# @OUTPUT_VARIABLE # @DESCRIPTION: # The name of the vdr plugin, plain name without "vdr-" or "plugin" prefix or suffix. -# This variable is derived from ${PN} +# This variable is derived from ${PN} and is read-only for the ebuild. # @ECLASS-VARIABLE: VDR_CONFD_FILE # @DEFAULT_UNSET |