summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-04-12 16:29:08 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-04-12 16:29:08 +0000
commit43b3b0b45b63f06476534d04e3ac98772157df34 (patch)
tree2eb7cb9f3964c106653081213cfc4f25c0dafb39 /sys-fs
parentDrop remark about dev-python/psyco as it's going away. Fixes bug #410355 by P... (diff)
downloadgentoo-2-43b3b0b45b63f06476534d04e3ac98772157df34.tar.gz
gentoo-2-43b3b0b45b63f06476534d04e3ac98772157df34.tar.bz2
gentoo-2-43b3b0b45b63f06476534d04e3ac98772157df34.zip
Try to support sys-apps/hwids also in 171-r5 for people who have temporarily masked >= 180 wrt #411737 by Martin von Gagern
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/udev/ChangeLog6
-rw-r--r--sys-fs/udev/udev-171-r5.ebuild8
2 files changed, 11 insertions, 3 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 7b06f73e2a4c..927545284c0f 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.678 2012/04/08 06:37:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.679 2012/04/12 16:29:08 ssuominen Exp $
+
+ 12 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r5.ebuild:
+ Try to support sys-apps/hwids also in 171-r5 for people who have temporarily
+ masked >= 180 wrt #411737 by Martin von Gagern
08 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
Use sys-apps/hwids for -9999 too. See commit 01 Apr 2012 to udev-182-r3.
diff --git a/sys-fs/udev/udev-171-r5.ebuild b/sys-fs/udev/udev-171-r5.ebuild
index 54fae13c87ce..fb7d630a1e17 100644
--- a/sys-fs/udev/udev-171-r5.ebuild
+++ b/sys-fs/udev/udev-171-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r5.ebuild,v 1.10 2012/03/15 08:48:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r5.ebuild,v 1.11 2012/04/12 16:29:08 ssuominen Exp $
EAPI=4
@@ -65,7 +65,11 @@ RDEPEND="${COMMON_DEPEND}
hwdb?
(
>=sys-apps/usbutils-0.82
- || ( >=sys-apps/pciutils-3.1.9-r1[-compress-db] <sys-apps/pciutils-3.1.9-r1[-zlib] )
+ || (
+ ( sys-apps/hwids >=sys-apps/pciutils-3.1.9-r2 )
+ >=sys-apps/pciutils-3.1.9-r1[-compress-db]
+ <sys-apps/pciutils-3.1.9-r1[-zlib]
+ )
)
extras?
(