Add missing eutils inherit and update live ebuild to follow the release one.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 37 insertions, 22 deletions

diff --git a/sys-apps/hwids/ChangeLog b/sys-apps/hwids/ChangeLog
index 8a87b0060ed6..50e946099477 100644
--- a/sys-apps/hwids/ChangeLog
+++ b/sys-apps/hwids/ChangeLog
@@ -1,6 +1,10 @@
 # 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.63 2013/01/08 13:18:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.64 2013/01/08 13:28:13 flameeyes Exp $
+
+  08 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org> hwids-20130108.ebuild,
+  hwids-99999999.ebuild:
+  Add missing eutils inherit and update live ebuild to follow the release one.
 
 *hwids-20130108 (08 Jan 2013)
 
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 00934ac3b3f6..e1fdfbd9dfba 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -4,18 +4,18 @@ Hash: SHA256
 DIST hwids-20121119.tar.gz 374451 SHA256 1748240f1243f9d67fe040cd7001fa7984ffd9e7fc8696071b07f1dfe4586697 SHA512 c417ff274980a4d80540aba55ae9a6284136a61a9c0cb63d718a9bed70bb1dfae43817cc93194637654add0203e78ab94c4514e7c2ba5a777ea973cfaed2be91 WHIRLPOOL ec767a6d55f085abce37237a58fa0cd4b5d91233af342368aa7c54685ac4842b23558bf96d4594ead47ed16d4856b37ce123172761e270f0c6cd5550752874c6
 DIST hwids-20130108.tar.gz 1469297 SHA256 89513304c923ff8c3b24c053523c06b766d37fef14f2b1e583563c566458ab87 SHA512 0a5201ecb4fb52eee7a05a5b2ed30fceca9a17d6424c7781573de6eb348934b9ea3489b082ff1546d5c0b5e98fc263680cc169d58f2043eadf53f8d8570e28ad WHIRLPOOL ef747113f26ea9e93cbb94ef368f785e6a5d5f204df0619ba4c6f045ea0cd352b7d3e327d1155418dbe52a7f5c82080ff4ecd31a02cb417bec16b44c2710edf9
 EBUILD hwids-20121119.ebuild 889 SHA256 363b194f403a001ef0845db831f40a637dec4bd493901f041ee64823fa31669c SHA512 5c5cd232d7bcdaab3d02ed0b85aef2309bc534ba508e247778f1cd9533ae89fe8551a75b1c4475e09678f2fa864c59ac791c8668bb52fed39bc15118f1447def WHIRLPOOL 5a33bf960ad590ceb5d9b303c6b5add1ce9fa3ae18d241fc9e2e68581d7e3bf5c49ba77920a563a4f6ffa893ecf42e2f8bfa7d892bfa94bdc1b54f2768af48ce
-EBUILD hwids-20130108.ebuild 1322 SHA256 390aec2886a32f96524b7e7645c21843699d405f99824d1cc7de9e6fb365140b SHA512 1af71f2b2d0235ea4f6ee91a4eb9367dde229e31b962642bf1a1fc4bd214ec20839feedcf36b5c872d4a58e7a6e34e2925e773040e790afa48552d8b06f08cdf WHIRLPOOL 51279c3e828837bd552a48c1a62611b0d323ec248025a80e6dc9b36140a36e3566477c0ba9581107bb8c76783f14c912137e589428a743a9dc62dd6dd56e2382
-EBUILD hwids-99999999.ebuild 971 SHA256 2a45d8dd047c7e9534c3d1780e4434b0248f739f60e8f3cd615450fc63498223 SHA512 6c2c7115e76c73642ec4bb388541269b2464e00ca8afdd7a2d40f3964782cf2877fa9b0edd98545b0a7880297615d7ba183e1df1b0f52e233c782c99125acac6 WHIRLPOOL f3749418e5331778787d496d6d2f20265fafa7ff7ca22fec0fbaae58570a5f958732b73fe148416e61e66b22f327fce1303e9c55cf8788fb50ebc415e8d4f1af
-MISC ChangeLog 10126 SHA256 814be772da8a5ef852bab1ccad21ec7a7732aeb50de3069365c04ea19cdb9814 SHA512 729f8df01b4ebe69c6e038498ee1bbc45a100716a67bc0ae59cd78f3dd6b5ed9990b10f5de6cf2be2be8eb30f051affb29db632ff00578e659e03d20d15eaf77 WHIRLPOOL 54ca229196fab7d32e7df3eeccb8bfd9f59477fa0157d5e14f1c7ec221c45a253e5c2482b6d46f1b92942b7f9cebc22e27e7473d3e9efe38be854c4d0e40c8de
+EBUILD hwids-20130108.ebuild 1329 SHA256 f62ff66fce3a7e5bf6181f7d933d18decc82752f1675d0cdbc168cde551e175d SHA512 ebe3d8c5551b54ab83b56feebe6f6710435d76834ebb34551a98658d8ac6ccdf91b55eadaca2acab46781ec7cc9613fb635e07d1611f93f1b41ebf5591e2df6b WHIRLPOOL 3e553832f861ea6601dd0dff281ff305610df524bdabbc717eaac7cc57c586060c330e0a53c9f94197b24eb7100e3f6e75ec64ad31236760af67753ca9d2cea0
+EBUILD hwids-99999999.ebuild 1194 SHA256 598b657cc00760d097238799a02ed6529a6b7274c1bd6b2b43598a414184142b SHA512 3e09e45fa2b55198d50d5ce65d6194cb49356a4d03303a0afa56c28e5a0c93662cf3761ae7353d4a390e82da1b194f713c102ad9a47b85047514cd15e64bde8e WHIRLPOOL 3892023b448abc52071ca5231253d8664f6f057b59f10521bfc6c41bc9f972d0b7f8fdff3db41af275d55a4528be7873b7e2d2469d79c1d99e5fd9d38878ddfd
+MISC ChangeLog 10310 SHA256 1f9b66309beae77306ab0733d4e4ee9488b5f7bbbb88d08dfadc8ca4040626e8 SHA512 1c111c85f15ef8c4219a325f10bc47bed4f9aad43f853497e8a8e02bb05857a6e97f4c13fcce4a437148e678761d3efdd963097b270398d7dd4248c3738627aa WHIRLPOOL 2759e5a72f1c9796299fba5a4d2413b994a8df9b75e87c0e107eb060d85943cdb8050b3e678ab5207106802a83cee0bc1f902e014a65a8c872e7bceeb826d532
 MISC metadata.xml 291 SHA256 6a6fbb9d576c975c7f7f488d478ab1db341ea21397f8cd66dc278b13a13a5731 SHA512 6e0af3b85a3693acd83889dabd6ce589c2c8e3e2852820f1135e2ebbe63cf6dd184fcd45f03b7c4ad35414a43543e8c39c7d1b5fa5f72c0e5db2ef907955e462 WHIRLPOOL 465e5e9b5700d6ed972ba129dc114843ec984f377569dfd81f7bb006717e0dc69181f2ffa31308adef1eab32c032d018e6cf519a0714b0ff21ee303dbf250942
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ7ByvAAoJEBzRPIrUMBNClmkH/iGx8h2w6TGr2kXheWDzRWZZ
-9WEuwfcmij4LwJxb6gM7tSGs1lI3txX0LJC1iNW908nz8dMZVXg5hvxLy1xItBqw
-WxttvLJD06WMUbeUbkwiBvnJjbSscNPP/NaxGV3k0JYozAK4HJZkUdtt10QXgPKM
-FUOUI6lVIOiqB42poPzBoNQCoCGBv9T4ns193pE89YCbLAX/x7/z4SJu6fPOXVBY
-JZ1GewAizh8+nqt6YQIi1gIthztJlhoVn76ABRFN6sY1cyHNriV3lGYfX3SzdLv8
-OrZ3vmaEu+s6NCgY74uY+eCLdPtUmecGPq+OZ/kEiMaaQ339Fh9XGPkXI+k7vWk=
-=+u1Y
+iQEcBAEBCAAGBQJQ7B8rAAoJEBzRPIrUMBNCGQsH/2Aeo2MehyV/z4RUH4b69AtB
+lUnfDEA2TfAmx4G9Z7ixIxu4slPB/R47TaR3QVl0Z9GJYFhEHPRhe3ItAUkBKCv4
+J9shuvnAFLCDZy6r+BaLQgHdsOFMeZVr9Et5glsbnHEmB1Q1Dt21GPLen1pYxM9L
+cjwbO41PLBkKAUO7eFA/g/Ktlpa7P65ZFgc40qgC67E+wYAxYPwLzwLrPn8x1Ql3
+gby+vSvycJOpQXSR0sWY72qYg0zgrptdRSh7T06pqGmaKLmOaDkWVTpI3TFJYyIr
+YkOuoWy/4ouCbbI7QDuac+KatA1EZfE+3VGxDwAZQeV/SMD6X5ZSuZM/J23hKf8=
+=ATL7
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwids/hwids-20130108.ebuild b/sys-apps/hwids/hwids-20130108.ebuild
index 7992745ffeac..47ea3156ad6b 100644
--- a/sys-apps/hwids/hwids-20130108.ebuild
+++ b/sys-apps/hwids/hwids-20130108.ebuild
@@ -1,9 +1,9 @@
 # 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-20130108.ebuild,v 1.1 2013/01/08 13:18:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20130108.ebuild,v 1.2 2013/01/08 13:28:13 flameeyes Exp $
 
 EAPI=5
-inherit udev
+inherit udev eutils
 
 DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
 HOMEPAGE="https://github.com/gentoo/hwids"
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index dd8b9e8c8f3e..29883ecddb37 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.13 2012/12/09 16:02:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.14 2013/01/08 13:28:13 flameeyes Exp $
 
 EAPI=5
-inherit udev git-2
+inherit udev eutils git-2
 
 DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
 HOMEPAGE="https://github.com/gentoo/hwids"
@@ -23,15 +23,26 @@ src_prepare() {
 	emake fetch
 }
 
-src_configure() {
-	MAKEOPTS+=" UDEV=$(usex udev)"
-	MAKEOPTS+=" DOCDIR=${EPREFIX}/usr/share/doc/${PF}"
-	MAKEOPTS+=" MISCDIR=${EPREFIX}/usr/share/misc"
-	MAKEOPTS+=" HWDBDIR=${EPREFIX}$(udev_get_udevdir)/hwdb.d"
-	MAKEOPTS+=" DESTDIR=${D}"
+
+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}$(udev_get_udevdir)/hwdb.d" \
+		DESTDIR="${D}"
 }
 
 pkg_postinst() {
+	# until udev introduces a way to compile the database at a given
+	# location, rather than just /, we can't do much on offset root.
+	if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
+		return 0
+	fi
+
 	if use udev && [[ $(udevadm --help 2>&1) == *hwdb* ]]; then
 		udevadm hwdb --update
 	fi