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

[Mike Gilbert]

commit:     7cd8b5ff80da9162861e528df29eceaddc282110
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 25 01:54:40 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Nov 28 19:54:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd8b5ff

sys-fs/udev: install bundled hwdb data

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

 sys-fs/udev/{udev-249.6.ebuild => udev-249.6-r1.ebuild} | 11 +++++++++--
 sys-fs/udev/udev-9999.ebuild                            | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/sys-fs/udev/udev-249.6.ebuild b/sys-fs/udev/udev-249.6-r1.ebuild
similarity index 97%
rename from sys-fs/udev/udev-249.6.ebuild
rename to sys-fs/udev/udev-249.6-r1.ebuild
index b42753db0add..cc70f84d4598 100644
--- a/sys-fs/udev/udev-249.6.ebuild
+++ b/sys-fs/udev/udev-249.6-r1.ebuild
@@ -83,9 +83,11 @@ RDEPEND="${COMMON_DEPEND}
        acct-group/video
        !sys-apps/gentoo-systemd-integration
        !sys-apps/systemd
+       !sys-apps/hwids[udev]
+"
+PDEPEND="
+       >=sys-fs/udev-init-scripts-34
 "
-PDEPEND=">=sys-apps/hwids-20140304[udev]
-       >=sys-fs/udev-init-scripts-34"
 
 python_check_deps() {
        has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
@@ -185,6 +187,7 @@ multilib_src_compile() {
                        man/udev.7
                        man/systemd-udevd.service.8
                        man/udevadm.8
+                       hwdb.d/60-autosuspend-chromiumos.hwdb
                        rules.d/50-udev-default.rules
                        rules.d/64-btrfs.rules
                )
@@ -239,6 +242,8 @@ multilib_src_install() {
                # Install generated rules (${BUILD_DIR}/rules.d/*.rules)
                insinto /lib/udev/rules.d
                doins rules.d/*.rules
+               insinto /lib/udev/hwdb.d
+               doins hwdb.d/*.hwdb
 
                insinto /usr/share/pkgconfig
                doins src/udev/udev.pc
@@ -263,6 +268,8 @@ multilib_src_install_all() {
        insinto /lib/udev/rules.d
        doins rules.d/*.rules
        doins "${FILESDIR}"/40-gentoo.rules
+       insinto /lib/udev/hwdb.d
+       doins hwdb.d/*.hwdb
 
        dobashcomp shell-completion/bash/udevadm
 

diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index fc79e4aaa550..3b56e4e1f8ea 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -83,9 +83,11 @@ RDEPEND="${COMMON_DEPEND}
        acct-group/video
        !sys-apps/gentoo-systemd-integration
        !sys-apps/systemd
+       !sys-apps/hwids[udev]
+"
+PDEPEND="
+       >=sys-fs/udev-init-scripts-34
 "
-PDEPEND=">=sys-apps/hwids-20140304[udev]
-       >=sys-fs/udev-init-scripts-34"
 
 python_check_deps() {
        has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
@@ -185,6 +187,7 @@ multilib_src_compile() {
                        man/udev.7
                        man/systemd-udevd.service.8
                        man/udevadm.8
+                       hwdb.d/60-autosuspend-chromiumos.hwdb
                        rules.d/50-udev-default.rules
                        rules.d/64-btrfs.rules
                )
@@ -239,6 +242,8 @@ multilib_src_install() {
                # Install generated rules (${BUILD_DIR}/rules.d/*.rules)
                insinto /lib/udev/rules.d
                doins rules.d/*.rules
+               insinto /lib/udev/hwdb.d
+               doins hwdb.d/*.hwdb
 
                insinto /usr/share/pkgconfig
                doins src/udev/udev.pc
@@ -263,6 +268,8 @@ multilib_src_install_all() {
        insinto /lib/udev/rules.d
        doins rules.d/*.rules
        doins "${FILESDIR}"/40-gentoo.rules
+       insinto /lib/udev/hwdb.d
+       doins hwdb.d/*.hwdb
 
        dobashcomp shell-completion/bash/udevadm