Fix udev dependency (bug #370361)

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

8 files changed, 20 insertions, 15 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index 007e82f58c28..327801853e4b 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/shotwell
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.17 2011/06/02 15:47:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.18 2011/06/10 09:09:20 angelos Exp $
+
+  10 Jun 2011; Christoph Mende <angelos@gentoo.org> shotwell-0.7.2.ebuild,
+  shotwell-0.8.1.ebuild, shotwell-0.9.1.ebuild, shotwell-0.9.1-r1.ebuild,
+  shotwell-0.9.2.ebuild, shotwell-0.9.3.ebuild, shotwell-0.10.ebuild:
+  Fix udev dependency (bug #370361)
 
   02 Jun 2011; Justin Lecher <jlec@gentoo.org> shotwell-0.10.ebuild:
   Remove unnessecary DEP on gnome-vfs, #369743
diff --git a/media-gfx/shotwell/shotwell-0.10.ebuild b/media-gfx/shotwell/shotwell-0.10.ebuild
index 4a5db20c8a48..77d614906ae2 100644
--- a/media-gfx/shotwell/shotwell-0.10.ebuild
+++ b/media-gfx/shotwell/shotwell-0.10.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/media-gfx/shotwell/shotwell-0.10.ebuild,v 1.2 2011/06/02 15:47:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.10.ebuild,v 1.3 2011/06/10 09:09:20 angelos Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -32,7 +32,7 @@ RDEPEND=">=dev-db/sqlite-3.5.9:3
 	>=media-libs/libraw-0.9.0
 	>=net-libs/libsoup-2.26.0:2.4
 	>=net-libs/webkit-gtk-1.1.5:2
-	>=sys-fs/udev-145[extras]
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
 	>=x11-libs/gtk+-2.18.0:2"
 DEPEND="${RDEPEND}
 	>=dev-lang/vala-0.11.7:0.12"
diff --git a/media-gfx/shotwell/shotwell-0.7.2.ebuild b/media-gfx/shotwell/shotwell-0.7.2.ebuild
index d165462842a1..a96b4686a095 100644
--- a/media-gfx/shotwell/shotwell-0.7.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.7.2.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/media-gfx/shotwell/shotwell-0.7.2.ebuild,v 1.4 2011/03/21 22:03:15 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.7.2.ebuild,v 1.5 2011/06/10 09:09:20 angelos Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -27,7 +27,7 @@ RDEPEND=">=dev-db/sqlite-3.5.9:3
 	>=media-libs/libgphoto2-2.4.2
 	>=net-libs/libsoup-2.26.0:2.4
 	>=net-libs/webkit-gtk-1.1.5:2
-	>=sys-fs/udev-145[extras]
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
 	>=x11-libs/gtk+-2.14.4:2
 	>=media-libs/libraw-0.9.0
 	>=media-libs/gexiv2-0.2.0
diff --git a/media-gfx/shotwell/shotwell-0.8.1.ebuild b/media-gfx/shotwell/shotwell-0.8.1.ebuild
index 5eec8ec6d81d..8936e5dca2e8 100644
--- a/media-gfx/shotwell/shotwell-0.8.1.ebuild
+++ b/media-gfx/shotwell/shotwell-0.8.1.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/media-gfx/shotwell/shotwell-0.8.1.ebuild,v 1.4 2011/04/07 06:43:57 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.8.1.ebuild,v 1.5 2011/06/10 09:09:20 angelos Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -27,7 +27,7 @@ RDEPEND=">=dev-db/sqlite-3.5.9:3
 	>=media-libs/libgphoto2-2.4.2
 	>=net-libs/libsoup-2.26.0:2.4
 	>=net-libs/webkit-gtk-1.1.5:2
-	>=sys-fs/udev-145[extras]
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
 	>=x11-libs/gtk+-2.18.0:2
 	>=media-libs/libraw-0.9.0
 	>=media-libs/gexiv2-0.2.0
diff --git a/media-gfx/shotwell/shotwell-0.9.1-r1.ebuild b/media-gfx/shotwell/shotwell-0.9.1-r1.ebuild
index 2d658eb74de9..6ba8bfe9112a 100644
--- a/media-gfx/shotwell/shotwell-0.9.1-r1.ebuild
+++ b/media-gfx/shotwell/shotwell-0.9.1-r1.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/media-gfx/shotwell/shotwell-0.9.1-r1.ebuild,v 1.1 2011/04/08 10:34:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.9.1-r1.ebuild,v 1.2 2011/06/10 09:09:20 angelos Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -33,7 +33,7 @@ RDEPEND=">=dev-db/sqlite-3.5.9:3
 	>=media-libs/libraw-0.9.0
 	>=net-libs/libsoup-2.26.0:2.4
 	>=net-libs/webkit-gtk-1.1.5:2
-	>=sys-fs/udev-145[extras]
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
 	>=x11-libs/gtk+-2.18.0:2"
 DEPEND="${RDEPEND}
 	>=dev-lang/vala-0.11.7:0.12"
diff --git a/media-gfx/shotwell/shotwell-0.9.1.ebuild b/media-gfx/shotwell/shotwell-0.9.1.ebuild
index 3a255c620cc6..339fbb6e5bdd 100644
--- a/media-gfx/shotwell/shotwell-0.9.1.ebuild
+++ b/media-gfx/shotwell/shotwell-0.9.1.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/media-gfx/shotwell/shotwell-0.9.1.ebuild,v 1.2 2011/04/08 07:04:18 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.9.1.ebuild,v 1.3 2011/06/10 09:09:20 angelos Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -33,7 +33,7 @@ RDEPEND=">=dev-db/sqlite-3.5.9:3
 	>=media-libs/libraw-0.9.0
 	>=net-libs/libsoup-2.26.0:2.4
 	>=net-libs/webkit-gtk-1.1.5:2
-	>=sys-fs/udev-145[extras]
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
 	>=x11-libs/gtk+-2.18.0:2"
 DEPEND="${RDEPEND}
 	>=dev-lang/vala-0.11.7:0.12"
diff --git a/media-gfx/shotwell/shotwell-0.9.2.ebuild b/media-gfx/shotwell/shotwell-0.9.2.ebuild
index cba6cc96a757..e84ac2ba5836 100644
--- a/media-gfx/shotwell/shotwell-0.9.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.9.2.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/media-gfx/shotwell/shotwell-0.9.2.ebuild,v 1.1 2011/04/19 06:02:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.9.2.ebuild,v 1.2 2011/06/10 09:09:20 angelos Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -33,7 +33,7 @@ RDEPEND=">=dev-db/sqlite-3.5.9:3
 	>=media-libs/libraw-0.9.0
 	>=net-libs/libsoup-2.26.0:2.4
 	>=net-libs/webkit-gtk-1.1.5:2
-	>=sys-fs/udev-145[extras]
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
 	>=x11-libs/gtk+-2.18.0:2"
 DEPEND="${RDEPEND}
 	>=dev-lang/vala-0.11.7:0.12"
diff --git a/media-gfx/shotwell/shotwell-0.9.3.ebuild b/media-gfx/shotwell/shotwell-0.9.3.ebuild
index 41d99c47aba8..335f282036b2 100644
--- a/media-gfx/shotwell/shotwell-0.9.3.ebuild
+++ b/media-gfx/shotwell/shotwell-0.9.3.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/media-gfx/shotwell/shotwell-0.9.3.ebuild,v 1.1 2011/05/06 15:28:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.9.3.ebuild,v 1.2 2011/06/10 09:09:20 angelos Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -33,7 +33,7 @@ RDEPEND=">=dev-db/sqlite-3.5.9:3
 	>=media-libs/libraw-0.9.0
 	>=net-libs/libsoup-2.26.0:2.4
 	>=net-libs/webkit-gtk-1.1.5:2
-	>=sys-fs/udev-145[extras]
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
 	>=x11-libs/gtk+-2.18.0:2"
 DEPEND="${RDEPEND}
 	>=dev-lang/vala-0.11.7:0.12"