| 1 |
commit: 5101f34fde7e0204ba3bcbb15ae94a207a0fb9a8 |
| 2 |
Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jun 26 19:19:14 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 2 15:32:30 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5101f34f |
| 7 |
|
| 8 |
udev.eclass: EAPI 8 support |
| 9 |
|
| 10 |
This also drops EAPIs < 5 to match toolchain-funcs.eclass. |
| 11 |
|
| 12 |
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> |
| 13 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 14 |
|
| 15 |
eclass/udev.eclass | 25 +++++++++++-------------- |
| 16 |
1 file changed, 11 insertions(+), 14 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/udev.eclass b/eclass/udev.eclass |
| 19 |
index 2873ae9a92c..7d5f59ab8d9 100644 |
| 20 |
--- a/eclass/udev.eclass |
| 21 |
+++ b/eclass/udev.eclass |
| 22 |
@@ -1,10 +1,10 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Authors |
| 24 |
+# Copyright 1999-2021 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
# @ECLASS: udev.eclass |
| 28 |
# @MAINTAINER: |
| 29 |
# udev-bugs@g.o |
| 30 |
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 |
| 31 |
+# @SUPPORTED_EAPIS: 5 6 7 8 |
| 32 |
# @BLURB: Default eclass for determining udev directories. |
| 33 |
# @DESCRIPTION: |
| 34 |
# Default eclass for determining udev directories. |
| 35 |
@@ -28,18 +28,17 @@ |
| 36 |
# } |
| 37 |
# @CODE |
| 38 |
|
| 39 |
+case ${EAPI} in |
| 40 |
+ 5|6|7|8) ;; |
| 41 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 42 |
+esac |
| 43 |
+ |
| 44 |
if [[ -z ${_UDEV_ECLASS} ]]; then |
| 45 |
_UDEV_ECLASS=1 |
| 46 |
|
| 47 |
inherit toolchain-funcs |
| 48 |
|
| 49 |
-case ${EAPI:-0} in |
| 50 |
- 0|1|2|3|4|5|6|7) ;; |
| 51 |
- *) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established." |
| 52 |
-esac |
| 53 |
- |
| 54 |
-if [[ ${EAPI:-0} == [0123456] ]]; then |
| 55 |
- RDEPEND="" |
| 56 |
+if [[ ${EAPI} == [56] ]]; then |
| 57 |
DEPEND="virtual/pkgconfig" |
| 58 |
else |
| 59 |
BDEPEND="virtual/pkgconfig" |
| 60 |
@@ -82,8 +81,7 @@ get_udevdir() { |
| 61 |
# @FUNCTION: udev_dorules |
| 62 |
# @USAGE: <rule> [...] |
| 63 |
# @DESCRIPTION: |
| 64 |
-# Install udev rule(s). Uses doins, thus it is fatal in EAPI 4 |
| 65 |
-# and non-fatal in earlier EAPIs. |
| 66 |
+# Install udev rule(s). Uses doins, thus it is fatal. |
| 67 |
udev_dorules() { |
| 68 |
debug-print-function ${FUNCNAME} "${@}" |
| 69 |
|
| 70 |
@@ -97,8 +95,7 @@ udev_dorules() { |
| 71 |
# @FUNCTION: udev_newrules |
| 72 |
# @USAGE: <oldname> <newname> |
| 73 |
# @DESCRIPTION: |
| 74 |
-# Install udev rule with a new name. Uses newins, thus it is fatal |
| 75 |
-# in EAPI 4 and non-fatal in earlier EAPIs. |
| 76 |
+# Install udev rule with a new name. Uses newins, thus it is fatal. |
| 77 |
udev_newrules() { |
| 78 |
debug-print-function ${FUNCNAME} "${@}" |
| 79 |
|
| 80 |
@@ -113,7 +110,7 @@ udev_newrules() { |
| 81 |
# @DESCRIPTION: |
| 82 |
# Run udevadm control --reload to refresh rules and databases |
| 83 |
udev_reload() { |
| 84 |
- if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then |
| 85 |
+ if [[ -n ${ROOT%/} ]]; then |
| 86 |
return 0 |
| 87 |
fi |
Archives