Wait until upstream has accepted the --root patch.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 7 insertions, 56 deletions

diff --git a/sys-apps/hwids/ChangeLog b/sys-apps/hwids/ChangeLog
index 054bcacb0c34..9820e65c8411 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.78 2013/02/07 18:56:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.79 2013/02/07 19:18:32 ssuominen Exp $
+
+  07 Feb 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -hwids-20130131-r1.ebuild, hwids-99999999.ebuild:
+  Wait until upstream has accepted the --root patch.
 
 *hwids-20130131-r1 (07 Feb 2013)
 
diff --git a/sys-apps/hwids/hwids-20130131-r1.ebuild b/sys-apps/hwids/hwids-20130131-r1.ebuild
deleted file mode 100644
index a82a99695fe4..000000000000
--- a/sys-apps/hwids/hwids-20130131-r1.ebuild
+++ /dev/null
@@ -1,49 +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-20130131-r1.ebuild,v 1.1 2013/02/07 18:56:38 ssuominen 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux"
-IUSE="+udev"
-
-DEPEND="udev? ( dev-lang/perl )"
-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
-		if [[ $(udevadm hwdb --help 2>&1) == *root* ]]; then
-			udevadm hwdb --update --root="${ROOT%/}"
-		else
-			udevadm hwdb --update
-		fi
-	fi
-}
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index 24e07d317c14..f97a8d6ea109 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -1,6 +1,6 @@
 # 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.16 2013/02/07 18:56:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.17 2013/02/07 19:18:32 ssuominen Exp $
 
 EAPI=5
 inherit udev eutils git-2
@@ -43,10 +43,6 @@ pkg_postinst() {
 	fi
 
 	if use udev && [[ $(udevadm --help 2>&1) == *hwdb* ]]; then
-		if [[ $(udevadm hwdb --help 2>&1) == *root* ]]; then
-			udevadm hwdb --update --root="${ROOT%/}"
-		else
-			udevadm hwdb --update
-		fi
+		udevadm hwdb --update
 	fi
 }