[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/files/, sys-fs/udev/

[Mike Gilbert]

commit:     8c90d2bd447948c268517c779d7ada27a2649949
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 17:25:58 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 17:55:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c90d2bd

sys-fs/udev: move 40-gentoo.rules to FILESDIR

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-fs/udev/files/40-gentoo.rules |  3 +++
 sys-fs/udev/udev-9999.ebuild      | 12 +-----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/sys-fs/udev/files/40-gentoo.rules 
b/sys-fs/udev/files/40-gentoo.rules
new file mode 100644
index 00000000000..6b96bd07051
--- /dev/null
+++ b/sys-fs/udev/files/40-gentoo.rules
@@ -0,0 +1,3 @@
+# Gentoo specific groups
+ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"

diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index cf615425a34..f028328e33e 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -93,16 +93,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       cat <<-EOF > "${T}"/40-gentoo.rules
-       # Gentoo specific floppy and usb groups
-       ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
-       ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-       EOF
-
-       if [[ -d "${WORKDIR}/patches" ]]; then
-               eapply "${WORKDIR}/patches"
-       fi
-
        local PATCHES=(
        )
 
@@ -222,7 +212,7 @@ multilib_src_install_all() {
 
        # see src_prepare() for content of 40-gentoo.rules
        insinto /lib/udev/rules.d
-       doins "${T}"/40-gentoo.rules
+       doins "${FILESDIR}"/40-gentoo.rules
        doins "${S}"/rules.d/*.rules
 
        dobashcomp shell-completion/bash/udevadm