[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

[Mike Gilbert]

commit:     61b3d2ebb4de957a0cc8cd08795f3547834b9f1e
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 20 16:27:45 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 17:18:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61b3d2eb

sys-apps/systemd: call systemd-hwdb update

... instead of udevadm hwdb --update

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

 sys-apps/systemd/systemd-9999.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index 8dd85417f98..3f2168e521b 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -132,7 +132,7 @@ RDEPEND="${COMMON_DEPEND}
 
 # sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
 PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-       hwdb? ( >=sys-apps/hwids-20150417[udev] )
+       hwdb? ( sys-apps/hwids[systemd(+),udev] )
        >=sys-fs/udev-init-scripts-34
        policykit? ( sys-auth/polkit )
        !vanilla? ( sys-apps/gentoo-systemd-integration )"
@@ -459,9 +459,9 @@ pkg_postinst() {
        systemd_update_catalog
 
        # Keep this here in case the database format changes so it gets updated
-       # when required. Despite that this file is owned by sys-apps/hwids.
-       if has_version "sys-apps/hwids[udev]"; then
-               udevadm hwdb --update --root="${EROOT}"
+       # when required.
+       if use hwdb; then
+               systemd-hwdb --root="${ROOT}" update
        fi
 
        udev_reload || FAIL=1