diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 36961 -> 36972 bytes | |||
| -rw-r--r-- | eclass/acct-group.eclass | 2 | ||||
| -rw-r--r-- | eclass/acct-user.eclass | 2 | ||||
| -rw-r--r-- | eclass/linux-mod.eclass | 13 | ||||
| -rw-r--r-- | eclass/pam.eclass | 47 | ||||
| -rwxr-xr-x | eclass/tests/toolchain-funcs.sh | 3 | ||||
| -rw-r--r-- | eclass/toolchain-funcs.eclass | 2 |
7 files changed, 17 insertions, 52 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 682174a05a95..4ec89dd88ad6 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/acct-group.eclass b/eclass/acct-group.eclass index 1d5d14290dad..9c46d3a1c215 100644 --- a/eclass/acct-group.eclass +++ b/eclass/acct-group.eclass @@ -75,7 +75,7 @@ readonly ACCT_GROUP_NAME # << Boilerplate ebuild variables >> : ${DESCRIPTION:="System group: ${ACCT_GROUP_NAME}"} : ${SLOT:=0} -: ${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris} +: ${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris} S=${WORKDIR} diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass index 22b0038fbff7..47890e48409a 100644 --- a/eclass/acct-user.eclass +++ b/eclass/acct-user.eclass @@ -115,7 +115,7 @@ readonly ACCT_USER_NAME # << Boilerplate ebuild variables >> : ${DESCRIPTION:="System user: ${ACCT_USER_NAME}"} : ${SLOT:=0} -: ${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris} +: ${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris} S=${WORKDIR} diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass index f5a5a4276369..e0444eacc61a 100644 --- a/eclass/linux-mod.eclass +++ b/eclass/linux-mod.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: linux-mod.eclass @@ -144,9 +144,16 @@ esac 0) die "EAPI=${EAPI} is not supported with MODULES_OPTIONAL_USE_IUSE_DEFAULT due to lack of IUSE defaults" ;; esac -IUSE="kernel_linux ${MODULES_OPTIONAL_USE:+${_modules_optional_use_iuse_default}}${MODULES_OPTIONAL_USE}" +IUSE="kernel_linux dist-kernel + ${MODULES_OPTIONAL_USE:+${_modules_optional_use_iuse_default}}${MODULES_OPTIONAL_USE}" SLOT="0" -RDEPEND="${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (} kernel_linux? ( sys-apps/kmod[tools] ) ${MODULES_OPTIONAL_USE:+)}" +RDEPEND=" + ${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (} + kernel_linux? ( + sys-apps/kmod[tools] + dist-kernel? ( virtual/dist-kernel:= ) + ) + ${MODULES_OPTIONAL_USE:+)}" DEPEND="${RDEPEND} ${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (} sys-apps/sed diff --git a/eclass/pam.eclass b/eclass/pam.eclass index 97fcb89d3f5b..c9de612469b1 100644 --- a/eclass/pam.eclass +++ b/eclass/pam.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: pam.eclass @@ -14,7 +14,7 @@ if [[ -z ${_PAM_ECLASS} ]]; then _PAM_ECLASS=1 -inherit flag-o-matic multilib +inherit flag-o-matic # @FUNCTION: dopamd # @USAGE: <file> [more files] @@ -210,47 +210,4 @@ cleanpamd() { done } -# @FUNCTION: pam_epam_expand -# @USAGE: <pamd file> -# @DESCRIPTION: -# Steer clear, deprecated, don't use, bad experiment -pam_epam_expand() { - sed -n -e 's|#%EPAM-\([[:alpha:]-]\+\):\([-+<>=/.![:alnum:]]\+\)%#.*|\1 \2|p' \ - "$@" | sort -u | while read condition parameter; do - - disable="yes" - - case "$condition" in - If-Has) - message="This can be used only if you have ${parameter} installed" - has_version "$parameter" && disable="no" - ;; - Use-Flag) - message="This can be used only if you enabled the ${parameter} USE flag" - use "$parameter" && disable="no" - ;; - *) - eerror "Unknown EPAM condition '${condition}' ('${parameter}')" - die "Unknown EPAM condition '${condition}' ('${parameter}')" - ;; - esac - - if [ "${disable}" = "yes" ]; then - sed -i -e "/#%EPAM-${condition}:${parameter/\//\\/}%#/d" "$@" - else - sed -i -e "s|#%EPAM-${condition}:${parameter}%#||" "$@" - fi - - done -} - -# Think about it before uncommenting this one, for now run it by hand -# pam_pkg_preinst() { -# eshopts_push -o noglob # so that bash doen't expand "*" -# -# pam_epam_expand "${D}"/etc/pam.d/* -# -# eshopts_pop # reset old shell opts -# } - fi diff --git a/eclass/tests/toolchain-funcs.sh b/eclass/tests/toolchain-funcs.sh index a0a56fd9e5d9..23ac568c4a50 100755 --- a/eclass/tests/toolchain-funcs.sh +++ b/eclass/tests/toolchain-funcs.sh @@ -27,7 +27,8 @@ test-tc-arch-kernel() { tbegin "tc-arch-kernel() (KV=2.6.30)" test-tc-arch-kernel 2.6.30 \ i{3..6}86:x86 x86_64:x86 \ - powerpc{,64}:powerpc i{3..6}86-gentoo-freebsd:i386 + powerpc{,64}:powerpc i{3..6}86-gentoo-freebsd:i386 \ + or1k:openrisc or1k-linux-musl:openrisc tend $? # diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index ec7b920bcfa7..4a4bb27fc084 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -665,7 +665,7 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } mips*) echo mips;; nios2*) echo nios2;; nios*) echo nios;; - or1k|or32*) echo openrisc;; + or1k*|or32*) echo openrisc;; powerpc*) # Starting with linux-2.6.15, the 'ppc' and 'ppc64' trees # have been unified into simply 'powerpc', but until 2.6.16, |