From 1c50fc61fd66f4a937bddc35d5e265cfe31bc94b Mon Sep 17 00:00:00 2001
From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Mon, 31 Dec 2012 13:12:38 +0000
Subject: Version bump (no update in a few days). Solve bug #446578 while at
 it.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
---
 sys-apps/hwids/ChangeLog             |  8 ++++++-
 sys-apps/hwids/hwids-20121225.ebuild | 35 ----------------------------
 sys-apps/hwids/hwids-20121227.ebuild | 45 ++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 36 deletions(-)
 delete mode 100644 sys-apps/hwids/hwids-20121225.ebuild
 create mode 100644 sys-apps/hwids/hwids-20121227.ebuild

(limited to 'sys-apps')

diff --git a/sys-apps/hwids/ChangeLog b/sys-apps/hwids/ChangeLog
index 2bd64c9992cf..88ec237e1a84 100644
--- a/sys-apps/hwids/ChangeLog
+++ b/sys-apps/hwids/ChangeLog
@@ -1,6 +1,12 @@
 # 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.59 2012/12/29 17:31:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.60 2012/12/31 13:12:38 flameeyes Exp $
+
+*hwids-20121227 (31 Dec 2012)
+
+  31 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org> +hwids-20121227.ebuild,
+  -hwids-20121225.ebuild:
+  Version bump (no update in a few days). Solve bug #446578 while at it.
 
   29 Dec 2012; Raúl Porcel <armin76@gentoo.org> hwids-20121119.ebuild:
   alpha/m68k/s390/sh/sparc stable wrt #436186
diff --git a/sys-apps/hwids/hwids-20121225.ebuild b/sys-apps/hwids/hwids-20121225.ebuild
deleted file mode 100644
index bf30eabae815..000000000000
--- a/sys-apps/hwids/hwids-20121225.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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-20121225.ebuild,v 1.1 2012/12/25 09:41:50 flameeyes Exp $
-
-EAPI=5
-inherit udev
-
-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 ~amd64-linux ~x86-linux"
-IUSE="+udev"
-
-DEPEND="udev? ( dev-lang/perl !=sys-fs/udev-196 )"
-RDEPEND="!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1"
-
-S=${WORKDIR}/hwids-${P}
-
-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}"
-}
-
-pkg_postinst() {
-	if use udev && [[ $(udevadm --help 2>&1) == *hwdb* ]]; then
-		udevadm hwdb --update
-	fi
-}
diff --git a/sys-apps/hwids/hwids-20121227.ebuild b/sys-apps/hwids/hwids-20121227.ebuild
new file mode 100644
index 000000000000..6d9eb92f17e6
--- /dev/null
+++ b/sys-apps/hwids/hwids-20121227.ebuild
@@ -0,0 +1,45 @@
+# 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-20121227.ebuild,v 1.1 2012/12/31 13:12:38 flameeyes Exp $
+
+EAPI=5
+inherit udev
+
+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 ~amd64-linux ~x86-linux"
+IUSE="+udev"
+
+DEPEND="udev? ( dev-lang/perl !=sys-fs/udev-196 )"
+RDEPEND="!<sys-apps/pciutils-3.1.9-r2
+	!<sys-apps/usbutils-005-r1"
+
+S=${WORKDIR}/hwids-${P}
+
+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
+}
-- 
cgit v1.2.3-65-gdbad