This also drops EAPIs < 5 to match toolchain-funcs.eclass. Signed-off-by: David Michael <fedora....@gmail.com> ---
This probably could have been sent in a series with https://archives.gentoo.org/gentoo-dev/message/22db5157cab5d6d173483fbc16377081 eclass/udev.eclass | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/eclass/udev.eclass b/eclass/udev.eclass index 2873ae9a92c..7d5f59ab8d9 100644 --- a/eclass/udev.eclass +++ b/eclass/udev.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: udev.eclass # @MAINTAINER: # udev-b...@gentoo.org -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 +# @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: Default eclass for determining udev directories. # @DESCRIPTION: # Default eclass for determining udev directories. @@ -28,18 +28,17 @@ # } # @CODE +case ${EAPI} in + 5|6|7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac + if [[ -z ${_UDEV_ECLASS} ]]; then _UDEV_ECLASS=1 inherit toolchain-funcs -case ${EAPI:-0} in - 0|1|2|3|4|5|6|7) ;; - *) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established." -esac - -if [[ ${EAPI:-0} == [0123456] ]]; then - RDEPEND="" +if [[ ${EAPI} == [56] ]]; then DEPEND="virtual/pkgconfig" else BDEPEND="virtual/pkgconfig" @@ -82,8 +81,7 @@ get_udevdir() { # @FUNCTION: udev_dorules # @USAGE: <rule> [...] # @DESCRIPTION: -# Install udev rule(s). Uses doins, thus it is fatal in EAPI 4 -# and non-fatal in earlier EAPIs. +# Install udev rule(s). Uses doins, thus it is fatal. udev_dorules() { debug-print-function ${FUNCNAME} "${@}" @@ -97,8 +95,7 @@ udev_dorules() { # @FUNCTION: udev_newrules # @USAGE: <oldname> <newname> # @DESCRIPTION: -# Install udev rule with a new name. Uses newins, thus it is fatal -# in EAPI 4 and non-fatal in earlier EAPIs. +# Install udev rule with a new name. Uses newins, thus it is fatal. udev_newrules() { debug-print-function ${FUNCNAME} "${@}" @@ -113,7 +110,7 @@ udev_newrules() { # @DESCRIPTION: # Run udevadm control --reload to refresh rules and databases udev_reload() { - if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then + if [[ -n ${ROOT%/} ]]; then return 0 fi -- 2.31.1
