Call udevadm with the hwdb target only if it's supported.

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

4 files changed, 19 insertions, 15 deletions

diff --git a/sys-apps/hwids/ChangeLog b/sys-apps/hwids/ChangeLog
index 7c7fe0f22c14..3e522a33250c 100644
--- a/sys-apps/hwids/ChangeLog
+++ b/sys-apps/hwids/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hwids
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.47 2012/12/02 09:29:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.48 2012/12/02 12:03:42 ssuominen Exp $
+
+  02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> hwids-20121202.2.ebuild,
+  hwids-99999999.ebuild:
+  Call udevadm with the hwdb target only if it's supported.
 
   02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> hwids-20121202.2.ebuild,
   hwids-99999999.ebuild:
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index e4e9214a5658..f67f06e8a5f4 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -7,19 +7,19 @@ DIST hwids-20121202.2.tar.gz 1220061 SHA256 fea0b8f058a007e79d74e94fa1e113d3a164
 DIST hwids-20121202.tar.gz 378016 SHA256 8f447a6aa0cd8d78fa917decf904069fbaea4084628a0a1307fd68b3be5b6577 SHA512 76c495826f62b74f9bc60e4717cd9c927a09eaab78ac2a947ec6a86aa1d549fcea377cd11e7d3da111216598551e993bb4aeeb1cc59df84dd2da2eccf771e1be WHIRLPOOL de1a5c139626430809bcb55aa60e08be9c70eb2657dab5704a4d7d23a0e48ab989931f15aca5e6afa15a0dda7740a591434bb3b692946ea94f9ed4249ccbdde1
 DIST ids-update-20121202.2.pl 8202 SHA256 5967182de1c0cf63b92a0a107b5e782a569de1660fbe25c6adaced4a81426d72 SHA512 819ff6a058682ef0d9f76b38f01cdae3abadc874264493adcab0cce35d6a826196f6d497e7867f6f0a1a0ef45563ed953586a4cded0f992988cea7dd6c047b5f WHIRLPOOL c417a4856d67938906c2a21aebb53ca4536d0e61d6601c5e0cccd3e912357651218798f1cb415703280e930c59d029731cb618963730ca3b422deaf423d5713a
 EBUILD hwids-20121119.ebuild 896 SHA256 6a2f8cb4c8b2cb50ab0b5f277748081b3e561365b9db8ee1b74efd7b046b357d SHA512 d94a75f2215bbfd1cdf368ff79796179f8697e3c86758079db5453d43de73853957b89f39089ce345a9f573c74ca46c0d2bc1d53c13ed365be85abde507a9b2c WHIRLPOOL 33d7c0c23ea05b0be71b4c600d78eb5bc4a4695be973bea0dbe1f9cc2a54d81fa7c19e0080c7cedc6b8ee81ae85b82ed24468996a01b0cef4a1ee9d937b767d8
-EBUILD hwids-20121202.2.ebuild 1554 SHA256 18ec95c7e8632c36a204f52a311ed4c2ed4a7ec2be299220c64874600ac2a659 SHA512 41014ae2b498cc7dc4fb7420c73a170017f40fdfbd5817870f11b7c70ca8a0a92d0041629b90c321cd731c4f961fc11d4915f06b5d18d273a43a12444853c67c WHIRLPOOL 8b212418225fb9a399f87730ad7255264fbd07fbf55110a49bff0eba1b6c4e5881e4b3f3e2aba4c59631c73d36c77b66f3b200c72a593a6943c87e8609a028d3
+EBUILD hwids-20121202.2.ebuild 1550 SHA256 3733684deba82b8b087c3cf96980a21501c80ae57949e86f827e85c77a0d951d SHA512 e8e34a072bc7e0618507c81f0e80b5e4e09c04971e5ed57d96b88d353010de5be10bacd3d4d32937c73080e66d80a5a1f4ac7afb0d4d01799a1c52abd6130ae4 WHIRLPOOL 699a6df836171898bc2bece45c1673428d4a46a634360b67df9efa6b49befa2a9283fef7fa0a570b7cdee2c496ebc332a9f410e908b928582f0e896253d1406f
 EBUILD hwids-20121202.ebuild 852 SHA256 2c15b673b9b8a3b8c497ed2a67284745de333729ac50e1263cd22baccc0c79aa SHA512 2927553b1d657a26898c3fdd3fa64652901887bbcdbbd7370f0afdfbbaaab2eceb9eddeb23e8402357e560d867ec86bc64c165a309ba49a8ee6adb3743f842af WHIRLPOOL b79c4d556ca1bf6596ed223d0fe26ed2b098beceda56e8b8a615983446fae7053c23a16d45149a09aaa40211f85afd747b55d2f78373fd95216c8fcc4a47aeb1
-EBUILD hwids-99999999.ebuild 1371 SHA256 eff969fb40bd3fdc2886f3393f1fb46ef2e8479a0b32dd2318340ee575b8c0dc SHA512 0b9642a007dcc94011a9a87866b011dae9a6937dbd403d93f3d3901fcd969894ca938c8df0c41e9d6fc767fc100c347510ac0e9e06e450d72edb0b4787f053bf WHIRLPOOL d3616861f25ecb86a189403c4c23b4f8d15799b58228b1975e59808ea44c8391617f1b1a5f67849cc955c71358dfbd6c2177aeccebdd0eb906a6de76fda89bb7
-MISC ChangeLog 7392 SHA256 9af2ed572b20baba0cf711788521832aad490ce91547385fa156edf72a6f3835 SHA512 e9b472a2cc1d87a5d84fcef5a0f7c89e95b48708ff06cb57e927a39612ee3107345ec9cbe5b512ec1ef035ced270750356401b2e26ccaf1e2f954a66417c8df7 WHIRLPOOL 2d56e56be445a38c4a33902a30bbfffb1d3f4398d47eaf6b822bee0321ca848309981e6a63b703bdb8b2cc14fa605be13a0309e5e20aee3b1b4e152427f775dc
+EBUILD hwids-99999999.ebuild 1367 SHA256 c02f501277ee74521e75052d1a8b2a681f1bc299986454044a5b3a12b3a3a41f SHA512 1f8942d3b7fb9a8a4f8c64d866121373d5981e1a299a7273f4a597854844e98ff58488420fee57a4a53c56e5c94f9b35d8e56525528f1226c7372347da7605e7 WHIRLPOOL 7203ab00d930dbe82d19d9b5bf66fa7d66af2ff3f37d078a52da293c4bd72b7b69ad5edb7c19c7adfe69c27be1536d659a30dbf7c80210f7398c794354e7e5dd
+MISC ChangeLog 7557 SHA256 c419eb82bbb48681b7a584e901cc3fd0a9a4030588a4e30481ff58220913d802 SHA512 aa36d9c8335f9c2a224d20088e1d53d2189d79f29fc7d0a2b99ef610e742ab7339f70929d2e9fb61a0cda151319947048cf0261fe15e41a316b0ea8fe4abc4c1 WHIRLPOOL ff9f278d957929de1d9d2474e035ec700711f4dd9888f4a66bc2bc654ccd3d48f453ed2ca739091c276ce563623577eec45ea5acedc5221dc03b4a6bc83c7266
 MISC metadata.xml 291 SHA256 6a6fbb9d576c975c7f7f488d478ab1db341ea21397f8cd66dc278b13a13a5731 SHA512 6e0af3b85a3693acd83889dabd6ce589c2c8e3e2852820f1135e2ebbe63cf6dd184fcd45f03b7c4ad35414a43543e8c39c7d1b5fa5f72c0e5db2ef907955e462 WHIRLPOOL 465e5e9b5700d6ed972ba129dc114843ec984f377569dfd81f7bb006717e0dc69181f2ffa31308adef1eab32c032d018e6cf519a0714b0ff21ee303dbf250942
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQux9gAAoJEEdUh39IaPFN8ScIAJUcS6cQ4JLTrDvBkFQOiI4J
-2gcpsElN5er7JjL05k6bcievDvgFWPUEwCpMbogZODE/gwMUonZ/B5Z1cQZf6TVm
-TKdc5TWI+pnHKRm8KKRfGHcmFZ34GTilCxp32EZyANIeGzCIOeITSVHayrykAUYy
-h7O6cbeHqU9Ryl5/UBQ2UoBeIVZQfV1duNYfaJqFRVLlq0M897W8r7VA2XaSxpxb
-GEnN31/adnFDHoaNDUnvl2RTlkvCKN5aOFdEIMQyikd4avG65vuN+hPIfUYEAgR7
-tpTBEZ8ejbpTzUuPe89m3e0sp2oD+5ENhLU+t8QaLRI6FGjoHaylx37DY5SE9+k=
-=b0ta
+iQEcBAEBCAAGBQJQu0OfAAoJEEdUh39IaPFNWNoH/0zbJPEiHQAAr4Hwif6st/C9
+jdGQoPSKWoFaFPVBmQYRK+9waUEI+U0xBG8lMbrI8WU1v/hXSyNma4xHR0WtFDmt
+DMTHZsk/aBgHTrHik06AlYDDEXxHC8O4hUkoCV0JprgjrkxGSSIqwHDbyLLvQbO7
+m35ocB5oRZw+i24Q8n/pbj6fm0gBpoOAZtMj1nO2WXBNFBTfSFMUBoJCZ/4MnvQf
+gMszd4MFs4y7mhg3zOTwTVWzs4QhDYNnSSSpu3ELPW5y6e59CkVPyWRwdETbCKWp
+7pXkR/O7XiTErz6t4I+kJAEiMQzRxGHQqPfCdsbshEgtn9DAMf4iNmvGo1bg7NA=
+=cL/L
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwids/hwids-20121202.2.ebuild b/sys-apps/hwids/hwids-20121202.2.ebuild
index 1f0fa4882019..4319939e19b4 100644
--- a/sys-apps/hwids/hwids-20121202.2.ebuild
+++ b/sys-apps/hwids/hwids-20121202.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20121202.2.ebuild,v 1.4 2012/12/02 09:29:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20121202.2.ebuild,v 1.5 2012/12/02 12:03:42 ssuominen Exp $
 
 EAPI=5
 inherit udev
@@ -52,7 +52,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use udev && has_version '>=virtual/udev-180'; then
+	if use udev && udevadm 2>&1 | grep -qs hwdb; then
 		udevadm hwdb --update
 	fi
 }
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index 1fd8d734fad8..83bf373ab2c7 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.7 2012/12/02 09:29:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.8 2012/12/02 12:03:42 ssuominen Exp $
 
 EAPI=5
 inherit udev
@@ -48,7 +48,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use udev && has_version '>=virtual/udev-180'; then
+	if use udev && udevadm 2>&1 | grep -qs hwdb; then
 		udevadm hwdb --update
 	fi
 }