From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 75EB013835A for ; Sun, 20 Jun 2021 17:18:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DAD0E085A; Sun, 20 Jun 2021 17:18:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86057E085A for ; Sun, 20 Jun 2021 17:18:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 362DF33E830 for ; Sun, 20 Jun 2021 17:18:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3FF37AF for ; Sun, 20 Jun 2021 17:18:52 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1624209527.92bbf05569214a014f2573891fe489183487467a.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/hwids/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/hwids/hwids-20210613-r1.ebuild sys-apps/hwids/hwids-20210613.ebuild sys-apps/hwids/hwids-99999999.ebuild X-VCS-Directories: sys-apps/hwids/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 92bbf05569214a014f2573891fe489183487467a X-VCS-Branch: master Date: Sun, 20 Jun 2021 17:18:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e1c02478-e444-4ab6-a037-a51f3887e13d X-Archives-Hash: 7c331a949b4aac2df6820fd5ab539253 commit: 92bbf05569214a014f2573891fe489183487467a Author: Mike Gilbert gentoo org> AuthorDate: Sun Jun 20 16:19:41 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Jun 20 17:18:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92bbf055 sys-apps/hwids: call systemd-hwdb when USE=systemd is enabled Signed-off-by: Mike Gilbert gentoo.org> .../hwids/{hwids-20210613.ebuild => hwids-20210613-r1.ebuild} | 8 ++++++-- sys-apps/hwids/hwids-99999999.ebuild | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sys-apps/hwids/hwids-20210613.ebuild b/sys-apps/hwids/hwids-20210613-r1.ebuild similarity index 89% rename from sys-apps/hwids/hwids-20210613.ebuild rename to sys-apps/hwids/hwids-20210613-r1.ebuild index 6f60de83bdb..2f0cac8f8f5 100644 --- a/sys-apps/hwids/hwids-20210613.ebuild +++ b/sys-apps/hwids/hwids-20210613-r1.ebuild @@ -18,9 +18,11 @@ fi LICENSE="|| ( GPL-2 BSD ) public-domain" SLOT="0" -IUSE="+net +pci +udev +usb" +IUSE="+net +pci systemd +udev +usb" +REQUIRED_USE="systemd? ( udev )" RDEPEND=" + systemd? ( sys-apps/systemd[hwdb] ) udev? ( virtual/udev ) " @@ -83,7 +85,9 @@ src_install() { } pkg_postinst() { - if use udev; then + if use systemd; then + systemd-hwdb --root="${ROOT}" update + elif use udev; then udevadm hwdb --update --root="${ROOT}" fi } diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild index fdc4a456ddd..2f0cac8f8f5 100644 --- a/sys-apps/hwids/hwids-99999999.ebuild +++ b/sys-apps/hwids/hwids-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2020 Gentoo Authors +# Copyright 2012-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,9 +18,11 @@ fi LICENSE="|| ( GPL-2 BSD ) public-domain" SLOT="0" -IUSE="+net +pci +udev +usb" +IUSE="+net +pci systemd +udev +usb" +REQUIRED_USE="systemd? ( udev )" RDEPEND=" + systemd? ( sys-apps/systemd[hwdb] ) udev? ( virtual/udev ) " @@ -83,7 +85,9 @@ src_install() { } pkg_postinst() { - if use udev; then + if use systemd; then + systemd-hwdb --root="${ROOT}" update + elif use udev; then udevadm hwdb --update --root="${ROOT}" fi }