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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 47592158086 for ; Sun, 28 Nov 2021 20:09:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 132682BC05F; Sun, 28 Nov 2021 20:09:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ECB472BC05F for ; Sun, 28 Nov 2021 20:09:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED78E342E5A for ; Sun, 28 Nov 2021 20:08:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6AF0821D for ; Sun, 28 Nov 2021 20:08:56 +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: <1638129249.7cd8b5ff80da9162861e528df29eceaddc282110.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/udev/udev-249.6-r1.ebuild sys-fs/udev/udev-249.6.ebuild sys-fs/udev/udev-9999.ebuild X-VCS-Directories: sys-fs/udev/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 7cd8b5ff80da9162861e528df29eceaddc282110 X-VCS-Branch: master Date: Sun, 28 Nov 2021 20:08:56 +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: 431860a5-796a-48a7-93a3-7b5ea049b527 X-Archives-Hash: 40900c7b325adfd59618f8021a5b3262 commit: 7cd8b5ff80da9162861e528df29eceaddc282110 Author: Mike Gilbert gentoo org> AuthorDate: Thu Nov 25 01:54:40 2021 +0000 Commit: Mike Gilbert gentoo 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 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