Backport to 0.7.4

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

3 files changed, 35 insertions, 32 deletions

diff --git a/x11-misc/spacefm/ChangeLog b/x11-misc/spacefm/ChangeLog
index 7f30b58f5287..e76916cc1c0b 100644
--- a/x11-misc/spacefm/ChangeLog
+++ b/x11-misc/spacefm/ChangeLog
@@ -1,11 +1,11 @@
 # ChangeLog for x11-misc/spacefm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/spacefm/ChangeLog,v 1.19 2012/04/17 14:04:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/spacefm/ChangeLog,v 1.20 2012/04/17 14:31:01 ssuominen Exp $
 
-  17 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> spacefm-0.7.5.ebuild,
-  spacefm-9999.ebuild:
-  Upstream started forcing sys-fs/udev making SpaceFM a Linux-only application;
-  remove USE="fam" accordingly and always enable INOTIFY support.
+  17 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> spacefm-0.7.4.ebuild,
+  spacefm-0.7.5.ebuild, spacefm-9999.ebuild:
+  Because upstream is now forcing sys-fs/udev we can assume SpaceFM is for
+  Linux only and always enable INOTIFY support.
 
 *spacefm-0.7.5 (17 Apr 2012)
 
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index 8a12d0e9bbf3..2c6d26221cf1 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -9,19 +9,19 @@ DIST spacefm-0.7.5.tar.xz 964796 RMD160 0162890f2963f26033b5d4ea25adb1924d90bad7
 EBUILD spacefm-0.7.1.ebuild 1583 RMD160 478954dd0f5d67cf14a54c16eba3d5ecc70f670e SHA1 740d70161920ce02b654b1c79812736149bd46f2 SHA256 e6c9c786d2e30b69864fd6131d16d782410f25d422108d42e73e958d1cc1a321
 EBUILD spacefm-0.7.2.ebuild 1328 RMD160 899536217dd478fdc76730bd31e4ec0290e365c6 SHA1 edbed1db07fc185e0c98846a60483e5c4d100d2b SHA256 ba1d81f05ac39402c620796ff68e07bc0a56d596c1fe996fdad6e4c49bcd3df9
 EBUILD spacefm-0.7.3.ebuild 1543 RMD160 e827b17f1a89c513e6effb5657aba5aab869f29d SHA1 e13b67916e6e0ce4897493838196f5196d1a5a44 SHA256 d2a4c08620122e49b7fa273f6abfe2830be24a724ae69779f564594d943678a0
-EBUILD spacefm-0.7.4.ebuild 1317 RMD160 3428f7fb409d37e33946fe6775ce311fe5227cbb SHA1 131e871542fb07d73a3de245ae14dee85c10c857 SHA256 6cac260966b6acfea8049557ed0552e2eee5643fd488a57ac8fecbcc5542a9cb
+EBUILD spacefm-0.7.4.ebuild 1458 RMD160 ec76e86fc76e24c74eaae4c56bb7d8f84ddd12fe SHA1 6ff011a33622fb169009266a166de6937b8fdf69 SHA256 c0bd9ff4662a7832c037fa4d3987fc0ca3074058cc63bd473695e1a67348735c
 EBUILD spacefm-0.7.5.ebuild 1496 RMD160 f0a0749d00f1dec744014ccc14b434e6f5848178 SHA1 36c0290edc8bf2d5856c36a47ddb3a499d436f60 SHA256 dceeb8e21d177d202619d7046719cac78b0f880e8d5bf4c8f2c4e7f4068e13de
 EBUILD spacefm-9999.ebuild 1518 RMD160 40a70405b12498434ec2d374a7c984dea7566fee SHA1 34d60a92d5fb881fb8db2690bc72e5e6af9390e1 SHA256 2eb52f31e077990b13780cd1c168e3009f9536c651411622dd56c1fa3d899088
-MISC ChangeLog 3200 RMD160 c37fb3079d2075668aaf3adff928f6ab31d80e65 SHA1 e46e489b0b8f4390785e4f047e40e12cfee633d4 SHA256 d8bb43530c5a71b01ca8baa93e5d67986755ad3143d965e39f5e3d0e3a81f748
+MISC ChangeLog 3199 RMD160 0a474cae9253b8dad49e06b1169ba0433059b7cc SHA1 0886cbef8e392d406bb6a3f85b811fd719a6452d SHA256 e7c753b355ad91a472ce74b05c02f445945c1e86b7dab9496600fbe0c6cfccf5
 MISC metadata.xml 1267 RMD160 c9f249076dd3641c5efbcddd7aa7b1f547d0c319 SHA1 d9dae5be71386d7eb1136928db7d8c2bdec8aae5 SHA256 eb01311283e133a23dd33517f94f2639b6a0a5a403972e368625fc135130a357
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPjXgjAAoJEEdUh39IaPFNyXgIAIAvs9WKBYHhuZvcMI2bS1ij
-fFfrEF41C7zGv2o1spmTpcKKfus5EQrhxY/3tQBG/Yn1adXhez8cKJn9j9SOPMRv
-jAaH8giAa+J7Zw2GofQ/q2/m1wVIIn6IPT5qIYtAKP2UVY85MqpaQNrgeuYQvZs4
-XSNaWsAu5OT8Hr3HibPgVBBAMJTesx0BLcSCQ0joooqmESsnLGBiHK2f69qLQVIS
-Jct1bi3of7OngsNwntNDBuEJd1ngpc6yuB+3XkCQaolww088jnSixOCHLtVd/rvY
-ImCXDUKJpufyYycCFGAK5Vpw2v6PfXG3iVTkFIUqY+nS1kwD6RpjgH5uFk6l12A=
-=95e0
+iQEcBAEBAgAGBQJPjX5XAAoJEEdUh39IaPFNF1IH/07S4VKmHWlxsfn7shIyOeT/
+EgZj3MGk175p94wbE7nPVMCmef+aJVSo2G1zIBiQjV15sF5CPWBee/1n5jVwfYOZ
+EqoAab0P0WNmsKIVzplZOPayBsrPwBxiDnPjbw0tBFDhQGiptTjawFu9XWpIfj5s
+2a7nJ47WEQxQt4iP/9sXuGPT9L3eWE6pO2r1qc4z/ngGMgW2ZjlYudort3ShpA8D
+SLw4h4ZrQRbHEcyTEnjN7hIF75sXju4rBTOUGf/vLlr1STb5WpFpCgYIb2YWjRrX
+ELCnPGXZ79OPdY8/UmXlbpK+EajHuZO/mKnkXugAsKE0+9HnOHd/CVNOxv4qRBg=
+=/Sv6
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/spacefm/spacefm-0.7.4.ebuild b/x11-misc/spacefm/spacefm-0.7.4.ebuild
index e91e9298b950..f0b89f3f261b 100644
--- a/x11-misc/spacefm/spacefm-0.7.4.ebuild
+++ b/x11-misc/spacefm/spacefm-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/spacefm/spacefm-0.7.4.ebuild,v 1.2 2012/04/03 05:55:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/spacefm/spacefm-0.7.4.ebuild,v 1.3 2012/04/17 14:31:01 ssuominen Exp $
 
 EAPI=4
 inherit fdo-mime
@@ -12,29 +12,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="fam gtk kde kernel_linux su udev"
+IUSE="kernel_linux"
 
-COMMON_DEPEND=">=dev-libs/glib-2
+
+RDEPEND="dev-libs/glib:2
 	dev-util/desktop-file-utils
 	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:2
-	x11-libs/startup-notification"
-RDEPEND="${COMMON_DEPEND}
-	virtual/eject
-	virtual/freedesktop-icon-theme
+	x11-libs/pango
+	x11-libs/startup-notification
 	x11-misc/shared-mime-info
-	!kernel_linux? ( fam? ( virtual/fam ) )
-	udev? (
-		sys-fs/udisks:0
-		sys-process/lsof
-	)
-	su? (
-		gtk? ( x11-libs/gksu )
-		kde? ( kde-base/kdesu )
-		|| ( x11-misc/ktsuss x11-libs/gksu kde-base/kdesu )
-	)"
-DEPEND="${COMMON_DEPEND}
+	!kernel_linux? ( virtual/fam )"
+DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig
 	sys-devel/gettext"
@@ -49,6 +41,17 @@ src_configure() {
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	einfo ""
+	elog "To mount as non-root user you need:"
+	elog "  sys-fs/udisks:0"
+	elog "To perform as root functionality you need one of the following:"
+	elog "  x11-misc/ktsuss"
+	elog "  x11-libs/gksu"
+	elog "  kde-base/kdesu"
+	elog "Other optional dependencies:"
+	elog "  sys-process/lsof (device processes)"
+	elog "  virtual/eject (eject media)"
+	einfo""
 }
 
 pkg_postrm() {