Fix udev dependency (bug #370361)

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

9 files changed, 32 insertions, 27 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/Manifest b/media-gfx/shotwell/Manifest
index eecb60ca558a..d41a804013cd 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 0.10-ldflags.patch 1223 RMD160 9eb78d092161abc1f92c35dfc24db717a54881ee SHA1 f090c571beef1a5ba8b05389d1e9c8a9807a3252 SHA256 84ed8a02deee8cbb049b156e8646af54bb844523220eb704fac405aab111bed7
 AUX 0.9.1-ldflags.patch 1063 RMD160 2fbaac4618d2e5b8719abd57404e93e69ef623d7 SHA1 8a0ab5389adbe299433b8def23ea7f581db5e7ed SHA256 efebdfe64f28c48412a11eef6b7e6a68f01d8e75a76360990db46e55694cbaed
@@ -9,19 +9,19 @@ DIST shotwell-0.8.1.tar.bz2 1317586 RMD160 56f1ad906a42ac6ae945a3cbd75a1d769452c
 DIST shotwell-0.9.1.tar.bz2 1456462 RMD160 801a1714246b51d76d0c432e7aa6b1838103d0c1 SHA1 e3d1b4e175352184a2c46da08f7a6ce53939b534 SHA256 cfb3e7ce285e7041a34da9536c4cfcf391fcdaa1074f1dc991ea669be4aa233e
 DIST shotwell-0.9.2.tar.bz2 1457781 RMD160 1d9f15b2b2cbc057c18fdd1979effa70feed16c6 SHA1 7a2a90c74a49e0e4b96a70eb83d2a80df4ea6fa3 SHA256 d664d3cbabacba54a55ab866bc61cf1a9fe052255a1fe873ecbf09ab76104b2e
 DIST shotwell-0.9.3.tar.bz2 1462225 RMD160 ec4317999922f2e709e2060c555694255f924cad SHA1 e0bfba6eb408cfb6fa133e1cc929b2f03c710250 SHA256 d0ed21138bb4299306460e3d7bb162d45a5e21a0aacf224f8fb3790a368919d9
-EBUILD shotwell-0.10.ebuild 1688 RMD160 0e05915f693331ea4cb9a36414585f95cba63ef7 SHA1 6bcbf48ddfb5e17e6c48caca86cb51043e722a07 SHA256 96ed15dfd20d33978dd720691e77fdc971b0e9dd9678517f5c9db958b24d4d55
-EBUILD shotwell-0.7.2.ebuild 1471 RMD160 dc7f5cc33f631825372c81f53eb3b4995b0813a7 SHA1 e35e2c46c3308b3b6a498b621e30829eb9f7e425 SHA256 9cf46af3f09224384f73fb97599c3a33b09156d1a3876b4f02e8d29d2c39fe2a
-EBUILD shotwell-0.8.1.ebuild 1520 RMD160 84dd4e57e25b1aa797b530d577ad83822352d068 SHA1 a19796731ad57f8c14c215c2eb611de982e96446 SHA256 c39e2b1a59e5d7c2d80fc6a9b64822e41a71d25272a758a8dc145cf8569a2048
-EBUILD shotwell-0.9.1-r1.ebuild 1716 RMD160 487af4cd706db475c7fa22218ccba85b8cff98db SHA1 96949e5ceb6fceec54c2d1964014628d1e6be6bf SHA256 0638d059dcc4fcb6254890dacbe413a69a0974329e31f80e7a12e754dae9e51b
-EBUILD shotwell-0.9.1.ebuild 1612 RMD160 2e2eeb8fdc0713177f189998c610f3ce1039a6a3 SHA1 a8e5b628e4d922463fbd01f50bcb9de2f9bf16a0 SHA256 19463281b9412ab8243c1e8d073676558eeb853ee0bf7ac6c54e4ab1b84b1c4e
-EBUILD shotwell-0.9.2.ebuild 1713 RMD160 a2ef22df366585a387ddd7254d7a5037e1b28179 SHA1 218fdf417eca62f998652290997dee3c38519ef4 SHA256 024df7a70ad71e4a1348ba229c554add617d71a8d40afac67f738c3d035baf6b
-EBUILD shotwell-0.9.3.ebuild 1713 RMD160 623bc20de2ded086f3c970e46aa8ae49003e5c65 SHA1 9bd090afe72780c273d8a25f0b141bbbe86010f4 SHA256 441d7327e90fe0b86e459f83bcc9c1684c005eb3e66dff4819521359143228fa
-MISC ChangeLog 2839 RMD160 a41156784d69eff8a5fb257802d84b0b5591ab2c SHA1 6fd630f11c4a2787350aff72d745687d12d92c2c SHA256 da69366dd6f7a418418852723f1e0cef33943845d3e2ec33b3167bab2d62ec6a
+EBUILD shotwell-0.10.ebuild 1723 RMD160 205eafbc9f47932cc7d5593a2ea760061510b3d7 SHA1 48d3c20db0c995e97ed0892062c7679500e9f75b SHA256 b31f3c55a3d11344a051552ea5836868326aff9531e82b9e8d6b24f851432968
+EBUILD shotwell-0.7.2.ebuild 1502 RMD160 a9ba18cbc2d6941fc0ddd6025f009c738ed494c3 SHA1 b9c4773d4bb4a789c00226271bd98adf8e99c2e8 SHA256 196aff7440d207c5b4b0cd50e186ff7a11958789612af702b7ab8377afe22733
+EBUILD shotwell-0.8.1.ebuild 1553 RMD160 43ca3c28c37147435ac11d221686e0ad8a40276c SHA1 f83d4839058d93ba30a3a85a662287bee418518f SHA256 583eda135f08d51cc759642db1e19caf464b61e7fcc66564b1de0900860ef798
+EBUILD shotwell-0.9.1-r1.ebuild 1751 RMD160 4dbec2004001a85e21c3233ba57a5f0b3c2f6dfb SHA1 0c0e0633484e00a1869686708ccab0b81d1a7fe4 SHA256 db552d5cd414e838822ab33cc47ff8f3f882176519ebb91cc34f8713f5fd24f0
+EBUILD shotwell-0.9.1.ebuild 1645 RMD160 1a589808349a1b2249ea20820404925f4c85e2c2 SHA1 bc0dd741d149a17835ce4cf54e56214f655a5798 SHA256 b35e7a8b2f09d224ee6805a17e044131fb410db8e3aeaf4f92fa5e817a72fa67
+EBUILD shotwell-0.9.2.ebuild 1748 RMD160 1ce38203ddc5b3151584b956301035d504411543 SHA1 713f4ea7d9ee5d0f5cfa933e91520d3ca674d62a SHA256 46e77bd2c119374c01e9fbddb0566ee8914b65db06aa777f3025a4d577ad809e
+EBUILD shotwell-0.9.3.ebuild 1748 RMD160 eda6f139cfdac3bdc269c7e3ad7c57bc45b388bc SHA1 e0c41562165b8ef37259a526209541852a77048f SHA256 ccdc1581a0fba50827654bab2815020a2e5dfe7765f62072ffcc3bd86a18f05d
+MISC ChangeLog 3098 RMD160 41e6ea45d0e4555312d5505e08758cf2ef57e9d4 SHA1 ab9cfa8e9e2f64ef4593a59f08467317aaaeda8e SHA256 60f476026347c471af6920aff27d168327282932ae6dea23ef6a5599d9dcf7e6
 MISC metadata.xml 716 RMD160 88c07e7d694d01c8e383721008c46d5e4c64e0b1 SHA1 bccc91bf5588465da9f5065b899edd4c36dbc769 SHA256 82568b3ae3779e3935f77da29b67b08af480dcac4417f2f6eec9785abd99a2a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3nsK0ACgkQgAnW8HDreRbj0QCgqJX4W+qOzQpZExtoY0RdGXRu
-XgMAn10bqQCaJegW/jqLraO0ONtgeikm
-=4OdG
+iF4EAREIAAYFAk3x30cACgkQmWq1bYTyC0ODtgD+PZJ/H6RiR1hY2f1dw1s6J5/v
+ufogh/MuVz5ZikMPFQkA/1MlshGeaguTjQSG5y6BWGWll5LKbnfvnONY8Z1s0Ox8
+=0AOO
 -----END PGP SIGNATURE-----
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"