From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1350684-garchives=archives.gentoo.org@lists.gentoo.org>
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 C06E4158086
	for <garchives@archives.gentoo.org>; Sat, 18 Dec 2021 04:39:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 4F84D2BC032;
	Sat, 18 Dec 2021 04:39:43 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id BB1402BC032
	for <gentoo-commits@lists.gentoo.org>; Sat, 18 Dec 2021 04:39:42 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 60942343960
	for <gentoo-commits@lists.gentoo.org>; Sat, 18 Dec 2021 04:39:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 81CD1D0
	for <gentoo-commits@lists.gentoo.org>; Sat, 18 Dec 2021 04:39:37 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1639802365.a86a1f553906b5caac4ead5e176442bf326d75db.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/eudev/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-fs/eudev/eudev-9999.ebuild
X-VCS-Directories: sys-fs/eudev/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: a86a1f553906b5caac4ead5e176442bf326d75db
X-VCS-Branch: master
Date: Sat, 18 Dec 2021 04:39:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4c4ddcce-c1e2-42e9-ba40-5e71ebb5245f
X-Archives-Hash: 9af68a743a12804df81862ae0425f489

commit:     a86a1f553906b5caac4ead5e176442bf326d75db
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 18 03:35:18 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 18 04:39:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86a1f55

sys-fs/eudev: update live ebuild for hwids/hwdb changes upstream

eudev upstream now includes updated hwdb files and shouldn't need hwids.

Bug: https://bugs.gentoo.org/717216
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/eudev/eudev-9999.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 1ed46df87518..991bd8047532 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/gentoo/eudev"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
+IUSE="+kmod introspection rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
@@ -46,10 +46,10 @@ RDEPEND="${COMMON_DEPEND}
 	!<sys-fs/lvm2-2.02.103
 	!<sec-policy/selinux-base-2.20120725-r10
 	!sys-fs/udev
-	!sys-apps/systemd"
+	!sys-apps/systemd
+	!sys-apps/hwids[udev]"
 
-PDEPEND=">=sys-fs/udev-init-scripts-26
-	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
+PDEPEND=">=sys-fs/udev-init-scripts-26"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/udev.h
@@ -113,7 +113,6 @@ multilib_src_configure() {
 		--with-rootlibexecdir="${EPREFIX}"/lib/udev
 		--enable-split-usr
 		--enable-manpages
-		--disable-hwdb
 	)
 
 	# Only build libudev for non-native_abi, and only install it to libdir,
@@ -176,6 +175,9 @@ multilib_src_install_all() {
 	insinto /lib/udev/rules.d
 	doins "${FILESDIR}"/40-gentoo.rules
 
+	insinto /lib/udev/hwdb.d
+	doins hwdb/*.hwdb
+
 	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
 }
 
@@ -204,7 +206,7 @@ pkg_postinst() {
 		fi
 	done
 
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
+	if has_version 'sys-apps/hwids[udev]'; then
 		udevadm hwdb --update --root="${ROOT%/}"
 
 		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda