Fix libfm dependencies and IUSE.

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

5 files changed, 18 insertions, 17 deletions

diff --git a/x11-misc/pcmanfm/ChangeLog b/x11-misc/pcmanfm/ChangeLog
index f9102a079968..ede712ca8993 100644
--- a/x11-misc/pcmanfm/ChangeLog
+++ b/x11-misc/pcmanfm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/pcmanfm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/ChangeLog,v 1.39 2010/12/22 12:11:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/ChangeLog,v 1.40 2010/12/26 00:16:54 ssuominen Exp $
+
+  26 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> pcmanfm-0.9.7-r1.ebuild,
+  pcmanfm-0.9.7-r2.ebuild, pcmanfm-0.9.8.ebuild, pcmanfm-9999.ebuild:
+  Fix libfm dependencies and IUSE.
 
   22 Dec 2010; Markos Chandras <hwoarang@gentoo.org> pcmanfm-0.5.2.ebuild,
   metadata.xml:
diff --git a/x11-misc/pcmanfm/pcmanfm-0.9.7-r1.ebuild b/x11-misc/pcmanfm/pcmanfm-0.9.7-r1.ebuild
index dd46250e36f7..73831e06efc4 100644
--- a/x11-misc/pcmanfm/pcmanfm-0.9.7-r1.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-0.9.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-0.9.7-r1.ebuild,v 1.7 2010/07/31 10:46:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-0.9.7-r1.ebuild,v 1.8 2010/12/26 00:16:54 ssuominen Exp $
 
 EAPI="2"
 inherit eutils fdo-mime
@@ -11,13 +11,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug hal udev"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.18:2
 	>=x11-libs/gtk+-2.16:2
-	hal? ( gnome-base/gnome-mount )
-	gnome-base/gvfs[hal?,udev?]
+	gnome-base/gvfs
 	>=lxde-base/menu-cache-0.3.2
 	x11-misc/shared-mime-info
 	>=x11-libs/libfm-0.1.11
diff --git a/x11-misc/pcmanfm/pcmanfm-0.9.7-r2.ebuild b/x11-misc/pcmanfm/pcmanfm-0.9.7-r2.ebuild
index 12b4c776ec02..497d8d7ed20c 100644
--- a/x11-misc/pcmanfm/pcmanfm-0.9.7-r2.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-0.9.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-0.9.7-r2.ebuild,v 1.3 2010/10/24 20:17:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-0.9.7-r2.ebuild,v 1.4 2010/12/26 00:16:54 ssuominen Exp $
 
 EAPI="2"
 inherit eutils fdo-mime
@@ -12,12 +12,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="debug gnome hal udev"
+IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.18:2
 	>=x11-libs/gtk+-2.16:2
-	gnome? ( hal? ( gnome-base/gnome-mount ) )
-	gnome? ( gnome-base/gvfs[hal?,udev?] )
 	>=lxde-base/menu-cache-0.3.2
 	x11-misc/shared-mime-info
 	>=x11-libs/libfm-0.1.11
diff --git a/x11-misc/pcmanfm/pcmanfm-0.9.8.ebuild b/x11-misc/pcmanfm/pcmanfm-0.9.8.ebuild
index b0d3037c7503..b3ed798f2d91 100644
--- a/x11-misc/pcmanfm/pcmanfm-0.9.8.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-0.9.8.ebuild,v 1.1 2010/10/17 11:02:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-0.9.8.ebuild,v 1.2 2010/12/26 00:16:54 ssuominen Exp $
 
 EAPI="2"
 
@@ -12,14 +12,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gnome hal udev"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug"
 
 RDEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2
 	lxde-base/menu-cache
 	x11-misc/shared-mime-info
-	>=x11-libs/libfm-0.1.14[gnome=,hal=,udev=]
+	>=x11-libs/libfm-0.1.14
 	virtual/eject"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
index 746ce676d7ad..bc575fc965df 100644
--- a/x11-misc/pcmanfm/pcmanfm-9999.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-9999.ebuild,v 1.5 2010/10/01 10:59:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-9999.ebuild,v 1.6 2010/12/26 00:16:54 ssuominen Exp $
 
 EAPI="2"
 
@@ -13,13 +13,13 @@ EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug gnome hal udev"
+IUSE="debug"
 
 RDEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2
 	lxde-base/menu-cache
 	x11-misc/shared-mime-info
-	x11-libs/libfm[gnome=,hal=,udev=]
+	x11-libs/libfm
 	virtual/eject"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40