summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2011-06-08 03:36:01 +0000
committerSebastian Pipping <sping@gentoo.org>2011-06-08 03:36:01 +0000
commit942d51e317ff6586a5df5b79c9fc07b651edd5c2 (patch)
tree4e774a4fdcd6f7e122e66bd37ac821c4481803fd /sys-fs/udisks
parentpopt only got pkgconfig in 1.16, and some infra systems have older versions o... (diff)
downloadgentoo-2-942d51e317ff6586a5df5b79c9fc07b651edd5c2.tar.gz
gentoo-2-942d51e317ff6586a5df5b79c9fc07b651edd5c2.tar.bz2
gentoo-2-942d51e317ff6586a5df5b79c9fc07b651edd5c2.zip
sys-fs/udisks: Fix conclit with sys-fs/udev-171 (bug #370283)
(Portage version: 2.1.10/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/udisks')
-rw-r--r--sys-fs/udisks/ChangeLog6
-rw-r--r--sys-fs/udisks/udisks-1.0.2-r4.ebuild5
2 files changed, 8 insertions, 3 deletions
diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 4e2f10fb5245..49d1aaaa1091 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/udisks
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.42 2011/06/07 08:49:25 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.43 2011/06/08 03:36:01 sping Exp $
+
+ 08 Jun 2011; Sebastian Pipping <sping@gentoo.org> udisks-1.0.2-r4.ebuild:
+ Add >=sys-fs/udev-171[gudev] as an alternative dependency to
+ >=sys-fs/udev-147[extras] (bug #370283)
*udisks-1.0.2-r4 (07 Jun 2011)
diff --git a/sys-fs/udisks/udisks-1.0.2-r4.ebuild b/sys-fs/udisks/udisks-1.0.2-r4.ebuild
index 05910cb9dbc4..39acbbe1d150 100644
--- a/sys-fs/udisks/udisks-1.0.2-r4.ebuild
+++ b/sys-fs/udisks/udisks-1.0.2-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.2-r4.ebuild,v 1.1 2011/06/07 08:49:26 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.2-r4.ebuild,v 1.2 2011/06/08 03:36:01 sping Exp $
EAPI=4
inherit eutils bash-completion linux-info
@@ -14,7 +14,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
IUSE="debug doc nls remote-access"
-COMMON_DEPEND=">=sys-fs/udev-147[extras]
+COMMON_DEPEND="
+ || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] )
>=dev-libs/glib-2.16.1:2
>=sys-apps/dbus-1.4.0
>=dev-libs/dbus-glib-0.92