Fix libfm dependencies and IUSE.

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

6 files changed, 23 insertions, 32 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/Manifest b/x11-misc/pcmanfm/Manifest
index f9d663a800be..9bef38e8aaf6 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pcmanfm-0.5.2-fix-ca-translation.patch 526 RMD160 23a5b59845c0800cbb217c08652597ab3cb989c2 SHA1 b5ac444885c84971a13f4b5c4d337cdb9ece4794 SHA256 0df0b7830a2b9dc63109d051e5d1a9078793d931dd155bdee1ea40b7e6f60f8b
 AUX pcmanfm-find.desktop.patch 462 RMD160 6f2aafd1806551b0822604c7fbb476d5f3e72734 SHA1 cafa37ccf771890f2413f4960384884adc8948c8 SHA256 c6890d7ad4bd0a17e39db344d9263cae12ea6859955c33a57ec5d78918284a5b
 DIST pcmanfm-0.5.2.tar.bz2 729039 RMD160 15828227f302c96cf1096dd29f4c913f0f0a1ec7 SHA1 4ede3e1cd774a5f789523af102f624d08088d511 SHA256 20e2c8712bc13316b39f40b5c1b95b89ce3e89b69308d2b5704d89c18ae1a150
 DIST pcmanfm-0.9.7.tar.gz 469027 RMD160 a5899e804af75771b3bf9a79b277c5e6ace8e94b SHA1 d1f0b68c650959ad4d54ec54f8c0c2503d6dd5c0 SHA256 38eeb2525b830c09efb229df0c8820c74c7312ac6c8acf2fcdebc35005508411
 DIST pcmanfm-0.9.8.tar.gz 496997 RMD160 4340c007ccb47c3719ebb8531d72a02a0fb2bbab SHA1 0bd82a53e72328b71ca1482bf589314b70c628f8 SHA256 a9335baf127d133da1b2873b3065545bd278fadd4b33e4b91e3d10b165961b68
 EBUILD pcmanfm-0.5.2.ebuild 1738 RMD160 d9423da434aa22593e3223c7691f480b69415ffe SHA1 7ab8616de69e48df917ffef8f84f17fb37a9fd0d SHA256 7143f3d3245d637889fe77be2497bd7761ee7a6762890cfc2a356bcd66be17c9
-EBUILD pcmanfm-0.9.7-r1.ebuild 1265 RMD160 c3d19451f97ba10da95f93e34a0adf82eb5d278d SHA1 9d8cd428802eea139768ae092251e55511a38f91 SHA256 78d1fed634fde2410879c5b3a8ee4d43378f5ea5809f1d53c5c207e6ae7864f8
-EBUILD pcmanfm-0.9.7-r2.ebuild 1298 RMD160 d7c4298564d24acf83b84eb43ed8e007b7ac1648 SHA1 35307885a8e34a6b392377acbfd1841c95761f3c SHA256 2ea1da95ff61ec5eb2c6f88df50b98036b249e2fdfba848df2f94919a1398567
-EBUILD pcmanfm-0.9.8.ebuild 1479 RMD160 552d07a0e997cebdea6d169398ce1950a604cd17 SHA1 b391c8c7a83d609b84f920236efb6a1c8a3877f7 SHA256 1ff12867f7905cd8c0e7a375ba40f5150bc7625eed2890c9dd936a302f0d87db
-EBUILD pcmanfm-9999.ebuild 1485 RMD160 40722c0f12e597804f362d31ced68e1c395be0b1 SHA1 b06f2a0cf937065cf12fddbc0e2e823b1877bd93 SHA256 9508eed5da2fe1ab4ce2c63ebdae2736ec0dd993f37af0852c28f8b0103f5d2b
-MISC ChangeLog 6336 RMD160 2b7afd4eed9024b4cd3b2d62d2cae5198350d2c2 SHA1 8db62f8e5c1d9c5dd73123acacd419d6c5b8dfe4 SHA256 315f63f52a9dc5f71ab95a8368f70d0ddab81a959a07d69f29c21fd8b37550c5
+EBUILD pcmanfm-0.9.7-r1.ebuild 1225 RMD160 522d0b25efca62cac00ee21a580d5394935cac91 SHA1 7278b2bf05dbb4c8482026c0ab77f498ffb36171 SHA256 f36e297a97692ad72b2d20ebe94ff0722f1a53f4dcdba1a4b4ff1a863c4bf76e
+EBUILD pcmanfm-0.9.7-r2.ebuild 1202 RMD160 e0d99ef1bdfedd04f9dc3f04c59ebc2735b4cfd4 SHA1 8f80bad930232d38250ad50d85dea313af0b7d7b SHA256 ef21f77725542660e1ab0fcfa09f7c8c5575e3389db37aa70e6516bb5fb5696b
+EBUILD pcmanfm-0.9.8.ebuild 1456 RMD160 a6bbb1319b459487d489b92a5864c0f47519b0b4 SHA1 9ce58eb3ab98c286e3b43f5dbaadbdbc43a51ce0 SHA256 3d276e1799d902c9a718f0dab8261b1f25320795d923a9167bbdf00b5eea0bf0
+EBUILD pcmanfm-9999.ebuild 1452 RMD160 fc06a38ef70491bb26bb16ea674195855761be75 SHA1 7d8d06a12d6548c00e5e3321122e353b38f09bb4 SHA256 943db0275ec175741b60e560995884b123e9afb139cf1fa5765faaae1c053698
+MISC ChangeLog 6522 RMD160 d3945b1206e9424fc71a675caed50a2a7b9c0e5b SHA1 23e4151869c5079e574e09fcc69622c28eacf920 SHA256 d4d193ebce53c23acd7c4856cb98ae86b8f70b5ea9e76517fad9cada8a4a251f
 MISC metadata.xml 367 RMD160 10b5e212596c6d270b537a2e923b27f31d7a0d5d SHA1 d9a8a0420ea3532a943269a6156e85c68ca36081 SHA256 fd9514402db65161adb35eea1ca3f8a6cf5dc581bcb2b447f74d1d9014ee47bc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0R6wAACgkQ9/cejkQaxBDoNgCfdoYZuSj8gKLRnOQdWDg9YRdl
-UJ0An0/vj7cn/8jo0izWtuWcQztUldAH
-=0NaK
------END PGP SIGNATURE-----
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