Fix /etc/udev/hwdb.bin generation with >=sys-fs/udev-198 (by moving hwdb.bin out from $(DESTDIR) and updating it from pkg_postinst())

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 69 insertions, 11 deletions

diff --git a/sys-apps/hwids/ChangeLog b/sys-apps/hwids/ChangeLog
index ac2c3e41714a..7d03967992a1 100644
--- a/sys-apps/hwids/ChangeLog
+++ b/sys-apps/hwids/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/hwids
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.91 2013/03/10 16:03:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.92 2013/03/10 16:43:18 ssuominen Exp $
+
+*hwids-20130309-r1 (10 Mar 2013)
+
+  10 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +hwids-20130309-r1.ebuild, hwids-99999999.ebuild:
+  Fix /etc/udev/hwdb.bin generation with >=sys-fs/udev-198 (by moving hwdb.bin
+  out from $(DESTDIR) and updating it from pkg_postinst())
 
   10 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> hwids-20130309.ebuild,
   hwids-99999999.ebuild:
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index aac69a734f6e..7008f4659a9f 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -4,18 +4,19 @@ Hash: SHA256
 DIST hwids-20130302.tar.gz 1486329 SHA256 2c8bd8f3535d0bb6a0bada65e6499af8ff5191ca2cda44de6228c05d19444708 SHA512 79fe4b62555ef37cef929a9728c093e659805822e8a63e3229bf0d8391d50ce78b8d479a670be06f3da665ed50dcb7e50e56492d3fc03b530aa19b842680b8dd WHIRLPOOL 7ecb932b2eea48b8669624732236a37413b46e0c92ce4b0b3d1e87b8a53bd4219c9db76a535280429be7db1cf5cf2a4bf2f82f77a3f6da3c3aa4bcb31e5e92f2
 DIST hwids-20130309.tar.gz 1488694 SHA256 d9fa6a96dc9d4b94deac92e496ce1657af47d3313280f2ed488d92f7bc189117 SHA512 2659a5305ef8f952ab3cee6935a10054177a69443e31fa9c18eecdfb572bd101cd7071aa0f6dd8dfc2d03135df9382176887344140d4d78622a97937d8600bb2 WHIRLPOOL c6bd7755926bdc246fd525a24c2a7a20ba9dbd9f568ec672dd3ff9702b39972160a39b36dbab6518a11d01e7c6c4f5a44cbf217a2cc2e9973b77a854b9a05e63
 EBUILD hwids-20130302.ebuild 1021 SHA256 ed4aebe5ba0a692b952e75078f89ea2aaf11d967982facb76f8898a12074dbd8 SHA512 e35a3ddb6c7d4d8028a27f0af9093df521ed8b42ee6550fa21b31f9a606cbddb03d966cd257c261e2486241a869084e8a1b8e0b1c28bcec1c09882d6964f78ba WHIRLPOOL 560e5cd2504be8e9117139d0120107c582045d21f5ff8f7cee90e76fa3da9025e1dd16de678f19ddf560475d762427bc2f60cdb1356b39c02ae2e49ad549a9c9
+EBUILD hwids-20130309-r1.ebuild 1171 SHA256 3cd7e314f2125b90ea88baa2b39244e6784bbb2a7bd8aff162ed01665c483ef7 SHA512 b605b2df4bb020667d7e9acea762ba63743f84a040bf66d24a4a33d04929748110a07de48d60364a2b82f1e1d339539e82c0c7db26e0e2938737938893bfb0da WHIRLPOOL bebb2e02367252cb69e98cf387a75ddab857ecf5b687bb7bdf3001b27a3cb3264869a77d4e66a7d7832892923518b691e04fde4ec2e285f2cf77c2a3d4e4f9de
 EBUILD hwids-20130309.ebuild 1030 SHA256 35065193d61c911486b0b5426ce039500d4d10b0687e274891bdccceca7c953d SHA512 f7b4236a986777773873a0f8be1d3504857914f5e876ab27349bc3635276b32eb13eefd3ebad64f7609078725616f9037dd9a623842e33c0d18f6ddc44768620 WHIRLPOOL b757477a95ee091aa4561a014511d80adc0c27f3fcf6812061fa11d0609a6a164e15f40b7a1911fce8cc42c2ddadad0a3034a51fb1b07d865640f8c98dbee6fa
-EBUILD hwids-99999999.ebuild 883 SHA256 38f8d7603251f336004ebd98e1013d3de68eed6439aea2a65fcf5bbccc06eb42 SHA512 2807bd4743a0c0169f97845c6ad8887bfbc93e034acc394c9e27b49bae73c4a9d0f7079fc7f5df547044274f2f119a841145672499dfe83bb7bcfec66bad0d72 WHIRLPOOL b93bfd63befb015f608fb134f48fd9cd417c38161d6947904d05a5341276d0e125db39d2a3a7021e03e7d62985491ea17ca7d7110d4dd69ee3ccf50c3f5bdb65
-MISC ChangeLog 13999 SHA256 e049c082e195244a2a8b9271f00cd334b8ba2b00be9838f4c18f9040edddf6a7 SHA512 0a445b43106436835c423cb62e7e1cee15a60caa8263f77a9f0c97d7e27979f89b088e908516f246fa7efb4881c98ea80365e3b453c8900f093585a9bfe7ff09 WHIRLPOOL 59b1bb83c41481b8822abcaf8df8057eb8dd967ba4af9270e30b937c44a79d3fed8a76209ecae0cae1df3cb3a43c2ff408df36b5adaae863c83d162af3926e1a
+EBUILD hwids-99999999.ebuild 1003 SHA256 3ae1a26acb92a6fc0c609ba79c9f52c47c72ead9db4edeca911906f930d3853d SHA512 908908ec76e6afc659ad1fab6f9371ade39e8d9c91fd15b8a988a8163702962d1c1632df1b1f173f90d33403ad92e9554637dca2a4f2acba5850b1a26d24d7b9 WHIRLPOOL 3d40fdd1e5d4f9e16a799cd61935492040741b809da2b3661c770bfe58b3c222feb10c63d1bd4040988dc68a2032cae5e64213b14efe0076b7d5e27e28da0462
+MISC ChangeLog 14278 SHA256 1e125f22f8ec69c56e75b3519cc6fa1abe0a1af3dfd0011671444b2315eb5d06 SHA512 db93d6684d1dda7b2f6d79b1556270e83838cd8fb64ebddd66ee25085f2d9b61f0c7a737e003ca4e505c3ac3492585d0887c68d754f261bba091f5db09fbc7b9 WHIRLPOOL 3add6f3960c37ef3adebd402b3a25e5f2af7c14e3f02b4c184806e65cf0041d84bf4413d24f8d40e930dc687f14bbcb7e6a1750db882fc6bd0b5cf58377f0862
 MISC metadata.xml 291 SHA256 6a6fbb9d576c975c7f7f488d478ab1db341ea21397f8cd66dc278b13a13a5731 SHA512 6e0af3b85a3693acd83889dabd6ce589c2c8e3e2852820f1135e2ebbe63cf6dd184fcd45f03b7c4ad35414a43543e8c39c7d1b5fa5f72c0e5db2ef907955e462 WHIRLPOOL 465e5e9b5700d6ed972ba129dc114843ec984f377569dfd81f7bb006717e0dc69181f2ffa31308adef1eab32c032d018e6cf519a0714b0ff21ee303dbf250942
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRPK5BAAoJEEdUh39IaPFN44AIAI7af6cXLJoepDQ5zh+gxj+a
-w5ciCreHzjlvI43eEXPuZOlSwUdpLirXbThVGGT3gXnOXwVNUFjtuDqXtIfej+23
-+X8qKflug/GmfaIuny3LqT/Zyk2BcfNwn9LQaFtmQ8s5FwRcGOBeA/iMhKaysLPT
-trpaW3HS9lobmeM9H86ettPAU+wcsgtJkFGwEhXYp0Gw6LuQ7JsAGRiSm7FFWeUo
-Gj6Z/I/K45wyvu+//ZNYoKusiCwDXyorHUDUiSfdr0poB9COT3sNRB88ljdeRXP9
-PjVUIAEkKy/CT+hNdoj47jI5Z6vR+cYuB6b59uxjmCv4KDyxQdy+t1n0rrZeskU=
-=C0GO
+iQEcBAEBCAAGBQJRPLepAAoJEEdUh39IaPFN5wkIAJ/mZrWzIjqOYukTeT2oUDh+
+/zBI8K0pzPD91axSWrWIGnfP06/7BxwxnS7T5/QdNh4x5jmonwzH321bfOgUABDH
+/68hcPui25+Hhiwlbx47qHNSz/QUthJFSGLqlZQY9vqwQzkPQL/Kv4KFgtqrzW+V
+P4dd+ixgdG+niERT1H/5CHNjfleotPc/S48/FFysG8g6aY5IjKcX80xolOEnV3LX
+SW+JL+zAy2we5xRJT1LwbvAaZG+gDLSLHKx/gpch8BTYMmsQ9S+dE84jjdOzBQvn
+S5e5bnYs/bYFqcyDmYGsQk1xcQGyMsFVa6miNylvpL8DIN8W0QgASjY0ASxMci0=
+=OHuC
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwids/hwids-20130309-r1.ebuild b/sys-apps/hwids/hwids-20130309-r1.ebuild
new file mode 100644
index 000000000000..247561fae40c
--- /dev/null
+++ b/sys-apps/hwids/hwids-20130309-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20130309-r1.ebuild,v 1.1 2013/03/10 16:43:18 ssuominen Exp $
+
+EAPI=5
+inherit udev eutils
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids"
+SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 BSD ) public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+udev"
+
+DEPEND="udev? (
+	dev-lang/perl
+	>=virtual/udev-197-r1
+)"
+RDEPEND="!<sys-apps/pciutils-3.1.9-r2
+	!<sys-apps/usbutils-005-r1"
+
+S=${WORKDIR}/hwids-${P}
+
+src_prepare() {
+	sed -i -e '/udevadm hwdb/d' Makefile || die
+}
+
+src_compile() {
+	emake UDEV=$(usex udev)
+}
+
+src_install() {
+	emake UDEV=$(usex udev) install \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		MISCDIR="${EPREFIX}/usr/share/misc" \
+		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
+		DESTDIR="${D}"
+}
+
+pkg_postinst() {
+	use udev && udevadm hwdb --update --root="${ROOT%/}"
+}
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index 57efca120972..b1563ab6fcf8 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.19 2013/03/10 16:03:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.20 2013/03/10 16:43:18 ssuominen Exp $
 
 EAPI=5
 inherit udev eutils git-2
@@ -24,6 +24,8 @@ RDEPEND="!<sys-apps/pciutils-3.1.9-r2
 
 src_prepare() {
 	emake fetch
+
+	sed -i -e '/udevadm hwdb/d' Makefile || die
 }
 
 src_compile() {
@@ -37,3 +39,7 @@ src_install() {
 		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
 		DESTDIR="${D}"
 }
+
+pkg_postinst() {
+	use udev && udevadm hwdb --update --root="${ROOT%/}"
+}