Temporarily use different SRC_URI for http://github.com/gentoo/hwids/pull/4 + make fetch; update for important syntax bug fixes in the udev hwdb files.

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

3 files changed, 71 insertions, 10 deletions

diff --git a/sys-apps/hwids/ChangeLog b/sys-apps/hwids/ChangeLog
index 707c2de57a17..ed4c48a42632 100644
--- a/sys-apps/hwids/ChangeLog
+++ b/sys-apps/hwids/ChangeLog
@@ -1,6 +1,12 @@
 # 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.115 2013/08/11 18:59:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.116 2013/09/15 17:12:59 ssuominen Exp $
+
+*hwids-20130915 (15 Sep 2013)
+
+  15 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> +hwids-20130915.ebuild:
+  Temporarily use different SRC_URI for http://github.com/gentoo/hwids/pull/4 +
+  make fetch; update for important syntax bug fixes in the udev hwdb files.
 
   11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> hwids-20130717-r1.ebuild,
   hwids-99999999.ebuild:
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index e29beb4ab2ba..3f1a99424ad1 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -5,21 +5,23 @@ DIST hwids-20130329.tar.gz 1498583 SHA256 64714243c366d086e24c6da41c73053b0f0ac4
 DIST hwids-20130707.tar.gz 1539522 SHA256 21bd292f5ab5f4e857609e47c95f3cfdea86e4b1ef309f7b893e4d429437e3c5 SHA512 4727503c85bbc200ccb2571325cd4def6fc0645ac0ebd1d3c17bfe86891b8901962664d48c5f087ced7527e233cf8fce9e6e8a6fff706c275540e0a9dbe71b64 WHIRLPOOL b7b65180b1ad0be56a8a141839a39e7fd1335ddffd4d17f1be530b63614f51f01b19fe2a8f87461fe12c4030466c4714588d17652baf162173c19c7f7a05ae0d
 DIST hwids-20130717-keyboard.patch.xz 7380 SHA256 61f724cf3b351334e86eac8ff63c5784c9e9301695dd53e16b2c62feabfd63f7 SHA512 72c04a55bfd81adaf07078b8effc394a8a6a70541e890cb0393a83bf0b53958b486280b5e883aa2f3ab37458efb57bc5367d1989f043b4300a36eea7be008fed WHIRLPOOL 0f9a14f9e8584be5c25cf1c3c42ea781c19b2f14fddfca4e911a52a5cadeb1c6e87c8a83b60e56346cc2654b893e80082a4504fbf355bd48a2a08faabde5d408
 DIST hwids-20130717.tar.gz 1543147 SHA256 7ee05aca2d3c4ad42c429f97e67fcbdc3421111eff17da15711a017e96f994ad SHA512 d7ec2b4bef306e2a20f42c5177e071d086f39723ce7edaf219168f51f1387c2e81d326c7e0ae9f834b63cd540d423819cab813af6e43fe8bbaa37a14c575e098 WHIRLPOOL ebf9c97cc2b0d67789b2849c420e0ffb2a9f303f6139b91334645784f012de35a99c914f3491d03bf06d3b167cd79a3c1029de4e469659aeb267b7759032e095
+DIST hwids-20130915.tar.gz 1567029 SHA256 4b2068c2e5bbf96325bac7a320edad5679b23b1bf5e3215f8d77a140502ebc44 SHA512 0d5471e0c91394777450a26023e5c5dd879f7e5f3465ef4ea3395b891ccbae426c849f096c15bb1f22d21d0c0613844685cd2ced928443b45c14fa368cc32650 WHIRLPOOL 000c541bdfae40f60897ec71afd61cd474385a4df8cb780f95e71b298a9d18b3c432ef54632b1aa0d39c38f5eaa6fc7c83f94aa9e65c7c2cbf591a2af4030118
 EBUILD hwids-20130329.ebuild 1157 SHA256 78fced931fb9853fbc112e5ced89a85b95f8afda559c58e1531967182ce41275 SHA512 f6393e84a4bad69a4a250e60c93cf671fd0f2f038cfe43bbd5070ba6af8e38ee8e9564291c3b9466ecdf025e88bb3ecb9fff4301f1b0f8703085ac6c447bbd53 WHIRLPOOL 2cb7c7dfb61f94a9fd96d989e21dbe9d95626338833880eb3f23c986eae33e78519839167dd4f6e5c95c27db4cbadd2b50a18f5869b70d2899ad35595bac6657
 EBUILD hwids-20130707.ebuild 1168 SHA256 164a470a3fdcbf7a4511a967d4c760dea3591f418692d0af1b3fe4297c6dfbed SHA512 206008495a317f6891eb70119aa43ce7c05dd6d9df29573d23f16cd26296fee7bf07063d21db12f5987332072fbc1d1afb9ef42e36cb69c3b63f78b8ea488d76 WHIRLPOOL acd6212a97dab81238ccf988fe7373d7dff42ff0012e6a8ab90a3db279e50b76179744c90aa7212df6d7a0086fb418b7fd8da4880a43c91119526429293d1dae
 EBUILD hwids-20130717-r1.ebuild 1536 SHA256 a1b70dad0bcfc0b3ae771818c45b6f95bdc82be034ec5d684c108deefebd9b57 SHA512 00424c70fa34d54750740f1622169f0ddfd67d0a31ea375adab11fc50a1e37a7b75cb45e5c9beca612ac22e5d524c594b676445a4c5698a5d9ad3aef92283bed WHIRLPOOL eb8c1d26c3ebbbc6ad1b33cb1c2d46f96106ca257b3d39bab8a3ae7f61b76ac309aee44798fa7597284bc9de2a0906d91567738ebc2220da447dec3f04d2e023
 EBUILD hwids-20130717.ebuild 1168 SHA256 815b2edb7454193bc1ccc0e1348955d07a4b3d8d04b463ddaa4288e3b896dc25 SHA512 e539b1edd2c8f175e7e6ecf25abed82e53177bd083adb55d7d6fcba24090270fcc446ee1cc55f8ed597090c9a0ae67f3f9f0d76583f4d8f8f0ac1e81b9308780 WHIRLPOOL d88d582f70c69733ab646ac743f096bce2b8ce72a1bd9e9f497c65156ca3cae1386c9604d22ee3d61745b33ec3d554b776e9bd8fe8cc65b4f92884ded510ba11
+EBUILD hwids-20130915.ebuild 1488 SHA256 6585d7605da6fe02a64fb8684105c5c8d5574c913ee4f8716ba57bf943265d34 SHA512 42ca88c8eaae9f46a8caa126c278b9cc5bca5bfbd561a9b06f2ee58255e2c1d968a7ff517383cda825b1980a7d8de28717133ebadaf14338dcabbedd824b06dd WHIRLPOOL bd09db880e489d8f367d652646dc195f87d68494258abe5921479c920a6fba4e693594b207a1b1f9cf8ff829627ab47642609cf0a3c5be593e6e829510297f94
 EBUILD hwids-99999999.ebuild 1211 SHA256 6f9f761743a41695010654ea2e575b4a69593ab8adc6bd8bcca5dced806e13a9 SHA512 6cc701ac3e342d524176e340bdc3c5f5e53c5debad1581609201d92ce6c65514424965869631c59278faa01720001e2d6dc0d525a1cae5cf821753515a69f6e2 WHIRLPOOL 9c44146b67205e4ade63666f7774a5dd83d63d95849e2d1d4dc5bbc7665f4a122a4f019c7a637de93c5baa0adf8636c70ac2f90f5168c56fb6c9730c45b6f5c0
-MISC ChangeLog 17536 SHA256 1e634608fd583bfd782a0e89e1d3d2fc922e896ef915f210dca57f51e01c3912 SHA512 3598cb22197c8c204668a64ed858a500983491d39716d4a414752063aa4c3382c931b69655b8416953a111a3034f8b921d59fd10303284c6a18a960ac55d23ff WHIRLPOOL 2a3077c7c27369dac5fb39bdb7709ae1b58fd8599d55b5c440fdf19bf57f5e03cd9c386c4ab85ef69a0e28f7171ff635b760c15c9195202b68de4ec9b65a8595
+MISC ChangeLog 17802 SHA256 f84d5421fc3eefbfa94ae6d01fbd7549ded6ad7f11d6577b4d4376d697d9c697 SHA512 5d4da2c01f7c1563649004e2ece26e015b22603bc9aad4ce9ba884f37d9d07e66a83c1bcd2a74955730a7306dfb90442383de3162f8d553658b177009cbe0556 WHIRLPOOL c0979563f35191f36c321b578848d6e2e3b187fd628081043a7a49faf36aa56dfafb04331c850dc1e55ba5de2ceeca4b308a6cc9599350afdcca123964782706
 MISC metadata.xml 291 SHA256 6a6fbb9d576c975c7f7f488d478ab1db341ea21397f8cd66dc278b13a13a5731 SHA512 6e0af3b85a3693acd83889dabd6ce589c2c8e3e2852820f1135e2ebbe63cf6dd184fcd45f03b7c4ad35414a43543e8c39c7d1b5fa5f72c0e5db2ef907955e462 WHIRLPOOL 465e5e9b5700d6ed972ba129dc114843ec984f377569dfd81f7bb006717e0dc69181f2ffa31308adef1eab32c032d018e6cf519a0714b0ff21ee303dbf250942
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSB96HAAoJEEdUh39IaPFNzj4H/jQpsvnaI8gHf2niF0jX1r14
-sJtwprK6mOhyMF4WKxq7Rqxq86jWWMy9OsMPn5/0Eigrg5Pz3MCecLVRtgnd2Cvv
-pSs4/f8tcvixipV11lr1MXv4MNhOX2DMWyPBhPqzrw+vxS2rGW0QVdfGHxKlypMZ
-BTv0E6o5alc/9bSK77MdlvPTZ9WntwUPAmpJw6QeUrOY30z326bsuNwiKw4Rm5xo
-KJ3Z9OQwR3tJZjANu2GVdF3Hy7alyLQJUn8CB7KVx5obmGiv5AgMchFBIaLJTM/t
-6LPXglEXFGWSwzPwUbcd1sC0NeDBqytoO8oEgD4IM9gteQ5wApTjvnUhuhNqOf8=
-=kfvl
+iQEcBAEBCAAGBQJSNeqCAAoJEEdUh39IaPFNZMAH/iJir9vx2i6AaChwdOmlZc0p
+dokxeYWsiqMa9/dLOKCjWLpqqrPYNlEE4n1PUwDNdLh1vpOSOS1TuwkvwLB1WEE1
+A2WsyaFO1eSvTA3NphBzCCbG/zYdiQvJKQzCQN17ngumUDF58bg6omUt8mw74PMN
+NrnrKOjWtAeGCT2gHMCBbYdDIEWRYcjbaepkObzHL2ZrSYlL9laeOF1ejxaMAu1c
+7FYipGQKXYN5Pj8v/ltwQH9RJTWVq+VR43/XNgEi59Q1x3yykcTx23kCMjSjsqeU
+ofysauy3RmuUxAbdv3/Ve/Ef3CqZf/gn+WJgoDsH3btg1PoXJge5TeSN+L9Hjeg=
+=n7qF
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwids/hwids-20130915.ebuild b/sys-apps/hwids/hwids-20130915.ebuild
new file mode 100644
index 000000000000..c148319f0dc5
--- /dev/null
+++ b/sys-apps/hwids/hwids-20130915.ebuild
@@ -0,0 +1,53 @@
+# 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-20130915.ebuild,v 1.1 2013/09/15 17:12:59 ssuominen Exp $
+
+EAPI=5
+inherit udev eutils
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids"
+# https://github.com/gentoo/hwids/pull/4 + make fetch =
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.gz"
+#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-206
+)"
+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() {
+	if use udev; then
+		udevadm hwdb --update --root="${ROOT%/}"
+		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
+			return 0
+		fi
+		udevadm control --reload
+	fi
+}