Fix udev dependency (bug #370395)

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

4 files changed, 15 insertions, 11 deletions

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index 511f5e1b552c..544ec8533cb8 100644
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/thunar
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.122 2011/05/27 08:27:31 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.123 2011/06/07 09:14:20 angelos Exp $
+
+  07 Jun 2011; Christoph Mende <angelos@gentoo.org> thunar-1.2.1.ebuild,
+  thunar-1.2.2.ebuild:
+  Fix udev dependency (bug #370395)
 
 *thunar-1.2.2 (27 May 2011)
 
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 901d36aaf1bf..d43492fc024e 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 DIST Thunar-1.2.1.tar.bz2 4181843 RMD160 ae2892e730a42f866ef2d171762c2cb8a3f8586f SHA1 3517faff327b11871d7ef89aae2a8b9974d6edd7 SHA256 67e9886895771cf3b51af1ac5e13cb9e3892d2546a1a814869f83be06409a49b
 DIST Thunar-1.2.2.tar.bz2 4158257 RMD160 b921b574711a4164cf1b1c73dbef7cd019e1d719 SHA1 314e3d53ec7be1ea578da4d842ecc8dc5958b1bd SHA256 56b07dddde423ae7854c5edd433948a912c27afe2a60689ffc50df3d981e90f6
-EBUILD thunar-1.2.1.ebuild 2040 RMD160 45f95d237efb1037918288fee1ccae6028e6c846 SHA1 50e90d445ce71b3c365ac72c446f40eab5502d45 SHA256 7c704968a029366737050415a4d7f3fd5054791204bb9976e7812fd8cc6b2bd1
-EBUILD thunar-1.2.2.ebuild 2046 RMD160 77efd629fd785ad2eec6736f80c62fc6201e0959 SHA1 c30e4a42d327894f64d2b855664013e48e10d9c2 SHA256 ea8e85012c5ef0c377af270dc2a05935d2688e78e7440a9b959ba32a9b5f9cd5
-MISC ChangeLog 15728 RMD160 43357c498f0a1e0373799eb558a32f1aaae66394 SHA1 dae4c87f194d050fe17c060a2aab15758b7633ab SHA256 6e54b3b9fdce9056a59831a69e1592a0b8fe0d33b1a279776eb4c11cc7b8818b
+EBUILD thunar-1.2.1.ebuild 2071 RMD160 3235f476f77d5a810a11ff213cf98524941ed6e8 SHA1 77f5d67f89caabc9007c92686039875420cbe32a SHA256 8a7ea65f66cfbb7f71cc88625b491dbb4f497646f6a75a82f8eaf13e37651521
+EBUILD thunar-1.2.2.ebuild 2078 RMD160 b2589b8eabfa3b46d1ab5ecf2aba35cd34d8cccd SHA1 29ef66e34aa60e0c28fed1199a9e7f255aba76c1 SHA256 b2dd5872f664cf1483b34298349e01b0eb431191de46ac2072528551604232ff
+MISC ChangeLog 15861 RMD160 800e50e3f1ab7866e75d3a3a611088c5251b5fd6 SHA1 d2a41d3cb7bc8ba9c6ae60cbedbb005c040449c3 SHA256 a4e245f1f8704527615dcce81f12d814c641571dca2e8d2eec0ed59be5d351a7
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3fYHgACgkQmWq1bYTyC0NI3QEAmab92ybeLUbg2W3BPlRoOaAk
-79yy7EhCxdJlnCuqc40A/iye4RZV2dBZgQhi23Uf81nZc4OMeiDQqlECSqGZDbuY
-=xuzN
+iF4EAREIAAYFAk3t6/IACgkQmWq1bYTyC0OtbQD+MLKGnXZFV9ddzYqNCKJZRO56
+necS9Kg2pJolFJhiDRoA/3j8npsTO3wBDSkOhp08jf681axhAPxyDQXQbModYJwX
+=xsGJ
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/thunar/thunar-1.2.1.ebuild b/xfce-base/thunar/thunar-1.2.1.ebuild
index 3eb718e1ee34..f22326713eb0 100644
--- a/xfce-base/thunar/thunar-1.2.1.ebuild
+++ b/xfce-base/thunar/thunar-1.2.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/xfce-base/thunar/thunar-1.2.1.ebuild,v 1.9 2011/05/19 22:14:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.2.1.ebuild,v 1.10 2011/06/07 09:14:20 angelos Exp $
 
 EAPI=4
 inherit virtualx xfconf
@@ -28,7 +28,7 @@ COMMON_DEPEND=">=xfce-base/exo-0.6
 	libnotify? ( x11-libs/libnotify )
 	pcre? ( >=dev-libs/libpcre-6 )
 	startup-notification? ( x11-libs/startup-notification )
-	udev? ( >=sys-fs/udev-145[extras] )
+	udev? ( || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
 	xfce_plugins_trash? ( >=dev-libs/dbus-glib-0.88
 		>=xfce-base/xfce4-panel-4.8 )"
 RDEPEND="${COMMON_DEPEND}
diff --git a/xfce-base/thunar/thunar-1.2.2.ebuild b/xfce-base/thunar/thunar-1.2.2.ebuild
index b90c147964de..db1907b91e1b 100644
--- a/xfce-base/thunar/thunar-1.2.2.ebuild
+++ b/xfce-base/thunar/thunar-1.2.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/xfce-base/thunar/thunar-1.2.2.ebuild,v 1.1 2011/05/27 08:27:31 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.2.2.ebuild,v 1.2 2011/06/07 09:14:20 angelos Exp $
 
 EAPI=4
 inherit virtualx xfconf
@@ -28,7 +28,7 @@ COMMON_DEPEND=">=xfce-base/exo-0.6
 	libnotify? ( x11-libs/libnotify )
 	pcre? ( >=dev-libs/libpcre-6 )
 	startup-notification? ( x11-libs/startup-notification )
-	udev? ( >=sys-fs/udev-145[extras] )
+	udev? ( || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
 	xfce_plugins_trash? ( >=dev-libs/dbus-glib-0.88
 		>=xfce-base/xfce4-panel-4.8 )"
 RDEPEND="${COMMON_DEPEND}