hwids: upgraded package to upstream
Upgraded sys-apps/hwids to version 20140627
BUG=chromium:378950
TEST=./build_packages --board=panther && ./build_image --board=panther
completes, contains updated hwids databases
Change-Id: Ic691873a01a999f36ff6451d657ad973fa61e289
Reviewed-on: https://chromium-review.googlesource.com/209266
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Steve Fung <stevefung@chromium.org>
Tested-by: Steve Fung <stevefung@chromium.org>
diff --git a/metadata/md5-cache/sys-apps/hwids-20130915.1 b/metadata/md5-cache/sys-apps/hwids-20130915.1
deleted file mode 100644
index f6492b6..0000000
--- a/metadata/md5-cache/sys-apps/hwids-20130915.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=udev? ( dev-lang/perl >=virtual/udev-171 ) virtual/pkgconfig
-DESCRIPTION=Hardware (PCI, USB, OUI, IAB) IDs databases
-EAPI=5
-HOMEPAGE=https://github.com/gentoo/hwids
-IUSE=+udev
-KEYWORDS=*
-LICENSE=|| ( GPL-2 BSD ) public-domain
-RDEPEND=!<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1 !<net-wireless/bluez-5.4-r12
-SLOT=0
-SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20130915.1.tar.gz
-_eclasses_=eutils a108f00cccac414097bcbbbb5de01762 multilib fac675dcccf94392371a6abee62d909f toolchain-funcs 48b38a216afb92db6314d6c3187abea3 udev a9a8d051efb42bfe884c1db82ce161de
-_md5_=d75f0c97ccf3349e4b3b3f7258114fff
diff --git a/metadata/md5-cache/sys-apps/hwids-20140627 b/metadata/md5-cache/sys-apps/hwids-20140627
new file mode 100644
index 0000000..2051ef5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hwids-20140627
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=udev? ( dev-lang/perl >=virtual/udev-206 ) virtual/pkgconfig
+DESCRIPTION=Hardware (PCI, USB, OUI, IAB) IDs databases
+EAPI=5
+HOMEPAGE=https://github.com/gentoo/hwids
+IUSE=+net +pci +udev +usb
+KEYWORDS=*
+LICENSE=|| ( GPL-2 BSD ) public-domain
+RDEPEND=!<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
+SLOT=0
+SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20140627.tar.gz
+_eclasses_=eutils a108f00cccac414097bcbbbb5de01762 multilib fac675dcccf94392371a6abee62d909f toolchain-funcs 48b38a216afb92db6314d6c3187abea3 udev a9a8d051efb42bfe884c1db82ce161de
+_md5_=1cc7179db41c491087686fe7f5f1767b
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index da4bf91..e5da06d 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1 +1 @@
-DIST hwids-20130915.1.tar.gz 1571277 SHA256 441b58fb6d025b14d60f21ceaddfe3afcc3240105a94b874c1903ff9143c8494 SHA512 3c7b88984c190e3d2fa9c3da726de4a49627239a6cca1d6e3ee8102dcc5dd0c5033251d2ca9ffa280c01791e4f5231624bd3e84093fd75d6c1ebfa6a602a873a WHIRLPOOL caf84900408b71673aa1be44743a49a19bc346bfa5d15c11c8db85cbe64a02adcc30ea3e52d16cb361bf57fd5cea93dec4d1a0b879d44403acac7a7001ee4584
+DIST hwids-20140627.tar.gz 1650936 SHA256 53386ddd0f58def3f6b578226d37313476d457d9a3f6651b9250452802a4af15 SHA512 495eb19e45b5f75e1c003043e1604c2f50efcc7b16d58208004412ef21a643f91bfc1ef0f035ee346fb7b6b5d5dbff4c446aea7b0f5161974a7c9d843ad02f2f WHIRLPOOL 680906049b4ac42856a3ee974e3171b0d3f2ee7a5791236e038e4b98026df65ed644484ce909438ae6c2e47b06f7d50bd94229b705313c6a6a0cb07c01a0869c
diff --git a/sys-apps/hwids/hwids-20130915.1.ebuild b/sys-apps/hwids/hwids-20130915.1.ebuild
deleted file mode 100644
index bf62415..0000000
--- a/sys-apps/hwids/hwids-20130915.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.1.ebuild,v 1.9 2013/12/08 18:25:28 maekke 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="*"
-IUSE="+udev"
-
-DEPEND="udev? (
- dev-lang/perl
- >=virtual/udev-171
-)"
-RDEPEND="!<sys-apps/pciutils-3.1.9-r2
- !<sys-apps/usbutils-005-r1
- !<net-wireless/bluez-5.4-r12"
-
-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
-}
diff --git a/sys-apps/hwids/hwids-20140627.ebuild b/sys-apps/hwids/hwids-20140627.ebuild
new file mode 100644
index 0000000..a728f81
--- /dev/null
+++ b/sys-apps/hwids/hwids-20140627.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20140627.ebuild,v 1.1 2014/06/27 18:50:10 flameeyes Exp $
+
+EAPI=5
+inherit udev eutils
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids"
+if [[ ${PV} == "99999999" ]]; then
+ EGIT_REPO_URI="${HOMEPAGE}.git"
+ inherit git-2
+else
+ SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+ KEYWORDS="*"
+fi
+
+LICENSE="|| ( GPL-2 BSD ) public-domain"
+SLOT="0"
+IUSE="+net +pci +udev +usb"
+
+DEPEND="udev? (
+ dev-lang/perl
+ >=virtual/udev-206
+)"
+[[ ${PV} == "99999999" ]] && DEPEND+=" udev? ( net-misc/curl )"
+RDEPEND="!<sys-apps/pciutils-3.1.9-r2
+ !<sys-apps/usbutils-005-r1"
+
+S=${WORKDIR}/hwids-${P}
+
+src_prepare() {
+ [[ ${PV} == "99999999" ]] && emake fetch
+
+ sed -i -e '/udevadm hwdb/d' Makefile || die
+}
+
+_emake() {
+ emake \
+ NET=$(usex net) \
+ PCI=$(usex pci) \
+ UDEV=$(usex udev) \
+ USB=$(usex usb) \
+ "$@"
+}
+
+src_compile() {
+ _emake
+}
+
+src_install() {
+ _emake 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
+ [ "${ROOT:-/}" = "/" ] && udevadm control --reload
+ fi
+}
diff --git a/sys-apps/hwids/metadata.xml b/sys-apps/hwids/metadata.xml
index 9247431..a5b8441 100644
--- a/sys-apps/hwids/metadata.xml
+++ b/sys-apps/hwids/metadata.xml
@@ -8,4 +8,10 @@
<maintainer>
<email>gregkh@gentoo.org</email>
</maintainer>
+<use>
+ <flag name='net'>Install the oui.txt and iab.txt databases</flag>
+ <flag name='pci'>Install the pci.ids database</flag>
+ <flag name='usb'>Install the usb.ids database</flag>
+ <flag name='udev'>Install hwdb.d rules for udev</flag>
+</use>
</pkgmetadata>
